diff --git a/app/Module/Doo.php b/app/Module/Doo.php index a5a7bd486..310d2edac 100644 --- a/app/Module/Doo.php +++ b/app/Module/Doo.php @@ -43,7 +43,7 @@ class Doo char* tokenDecode(char* val); char* translate(char* val, char* val); char* md5s(char* text, char* password); - EOF, app_path("Module/Lib/doo.so")); + EOF, "/usr/lib/doo/doo.so"); $token = $token ?: Base::headerOrInput('token'); $language = $language ?: Base::headerOrInput('language'); self::$doo->initialize("/var/www", $token, $language); diff --git a/app/Module/Lib/doo.h b/app/Module/Lib/doo.h deleted file mode 100644 index f8d4267b4..000000000 --- a/app/Module/Lib/doo.h +++ /dev/null @@ -1,95 +0,0 @@ -/* Code generated by cmd/cgo; DO NOT EDIT. */ - -/* package command-line-arguments */ - - -#line 1 "cgo-builtin-export-prolog" - -#include - -#ifndef GO_CGO_EXPORT_PROLOGUE_H -#define GO_CGO_EXPORT_PROLOGUE_H - -#ifndef GO_CGO_GOSTRING_TYPEDEF -typedef struct { const char *p; ptrdiff_t n; } _GoString_; -#endif - -#endif - -/* Start of preamble from import "C" comments. */ - - - - -/* End of preamble from import "C" comments. */ - - -/* Start of boilerplate cgo prologue. */ -#line 1 "cgo-gcc-export-header-prolog" - -#ifndef GO_CGO_PROLOGUE_H -#define GO_CGO_PROLOGUE_H - -typedef signed char GoInt8; -typedef unsigned char GoUint8; -typedef short GoInt16; -typedef unsigned short GoUint16; -typedef int GoInt32; -typedef unsigned int GoUint32; -typedef long long GoInt64; -typedef unsigned long long GoUint64; -typedef GoInt64 GoInt; -typedef GoUint64 GoUint; -typedef size_t GoUintptr; -typedef float GoFloat32; -typedef double GoFloat64; -#ifdef _MSC_VER -#include -typedef _Fcomplex GoComplex64; -typedef _Dcomplex GoComplex128; -#else -typedef float _Complex GoComplex64; -typedef double _Complex GoComplex128; -#endif - -/* - static assertion to make sure the file is being used on architecture - at least with matching size of GoInt. -*/ -typedef char _check_for_64_bit_pointer_matching_GoInt[sizeof(void*)==64/8 ? 1:-1]; - -#ifndef GO_CGO_GOSTRING_TYPEDEF -typedef _GoString_ GoString; -#endif -typedef void *GoMap; -typedef void *GoChan; -typedef struct { void *t; void *v; } GoInterface; -typedef struct { void *data; GoInt len; GoInt cap; } GoSlice; - -#endif - -/* End of boilerplate cgo prologue. */ - -#ifdef __cplusplus -extern "C" { -#endif - -extern void initialize(char* work, char* lang); -extern void setUserToken(char* token); -extern char* license(); -extern char* licenseDecode(char* license); -extern GoUint8 licenseSave(char* license); -extern int userId(); -extern char* userExpiredAt(); -extern char* userEmail(); -extern char* userEncrypt(); -extern char* userToken(); -extern char* userCreate(char* email, char* password); -extern char* tokenEncode(int userid, char* email, char* encrypt, int days); -extern char* tokenDecode(char* token); -extern char* translate(char* text, char* langType); -extern char* md5s(char* text, char* password); - -#ifdef __cplusplus -} -#endif diff --git a/app/Module/Lib/doo.so b/app/Module/Lib/doo.so deleted file mode 100644 index f6afa2233..000000000 Binary files a/app/Module/Lib/doo.so and /dev/null differ diff --git a/docker-compose.yml b/docker-compose.yml index 7c530ec6e..de65f67b6 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: php: container_name: "dootask-php-${APP_ID}" - image: "kuaifan/php:swoole-8.0.rc3" + image: "kuaifan/php:swoole-8.0.rc4" shm_size: "1024m" volumes: - ./docker/crontab/crontab.conf:/etc/supervisor/conf.d/crontab.conf @@ -12,7 +12,6 @@ services: - ./docker/log/supervisor:/var/log/supervisor - ./:/var/www environment: - TZ: "Asia/Shanghai" LANG: "C.UTF-8" MODE: "production" MYSQL_HOST: "${DB_HOST}" @@ -36,8 +35,6 @@ services: volumes: - ./docker/nginx:/etc/nginx/conf.d - ./public:/var/www/public - environment: - TZ: "Asia/Shanghai" networks: extnetwork: ipv4_address: "${APP_IPPR}.3" @@ -53,8 +50,6 @@ services: redis: container_name: "dootask-redis-${APP_ID}" image: "redis:alpine" - environment: - TZ: "Asia/Shanghai" networks: extnetwork: ipv4_address: "${APP_IPPR}.4" @@ -70,7 +65,6 @@ services: - ./docker/mysql/conf.d:/etc/mysql/conf.d - ./docker/mysql/data:/var/lib/mysql environment: - TZ: "Asia/Shanghai" MYSQL_PREFIX: "${DB_PREFIX}" MYSQL_ROOT_PASSWORD: "${DB_ROOT_PASSWORD}" MYSQL_DATABASE: "${DB_DATABASE}" @@ -95,7 +89,6 @@ services: - ./docker/office/resources/spreadsheeteditor/main/resources/css/app.css:/var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/main/resources/css/app.css - ./docker/office/resources/spreadsheeteditor/mobile/css/887.css:/var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/mobile/css/887.css environment: - TZ: "Asia/Shanghai" JWT_ENABLED: false networks: extnetwork: @@ -107,7 +100,6 @@ services: image: "kuaifan/fileview:4.1.0-SNAPSHOT-RC20" platform: linux/amd64 environment: - TZ: "Asia/Shanghai" KK_CONTEXT_PATH: "/fileview" KK_OFFICE_PREVIEW_SWITCH_DISABLED: true KK_FILE_UPLOAD_ENABLED: true @@ -129,8 +121,6 @@ services: networks: extnetwork: ipv4_address: "${APP_IPPR}.8" - environment: - TZ: "Asia/Shanghai" depends_on: - drawio-export restart: unless-stopped @@ -142,8 +132,6 @@ services: networks: extnetwork: ipv4_address: "${APP_IPPR}.9" - environment: - TZ: "Asia/Shanghai" volumes: - ./docker/drawio/export/fonts:/usr/share/fonts/drawio restart: unless-stopped @@ -154,8 +142,6 @@ services: networks: extnetwork: ipv4_address: "${APP_IPPR}.10" - environment: - TZ: "Asia/Shanghai" restart: unless-stopped networks: diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 96b733374..01f1ffe88 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -2154,6 +2154,9 @@ export default { break; case 'filepos': + if (this.windowSmall) { + this.$store.dispatch("openDialog", 0); + } this.goForward({name: 'manage-file', params: value}); break;