diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 80fc70738..6aa06a63b 100755 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -79,28 +79,28 @@ class IndexController extends InvokeController } $array = [ "office/web-apps/apps/api/documents/api.js?hash=" . Base::getVersion(), - "office/7.2.2-56/web-apps/vendor/requirejs/require.js", - "office/7.2.2-56/web-apps/apps/api/documents/api.js", - "office/7.2.2-56/sdkjs/common/AllFonts.js", - "office/7.2.2-56/web-apps/vendor/xregexp/xregexp-all-min.js", - "office/7.2.2-56/web-apps/vendor/sockjs/sockjs.min.js", - "office/7.2.2-56/web-apps/vendor/jszip/jszip.min.js", - "office/7.2.2-56/web-apps/vendor/jszip-utils/jszip-utils.min.js", - "office/7.2.2-56/sdkjs/common/libfont/wasm/fonts.js", - "office/7.2.2-56/sdkjs/common/Charts/ChartStyles.js", - "office/7.2.2-56/sdkjs/slide/themes//themes.js", + "office/7.3.0-184/web-apps/vendor/requirejs/require.js", + "office/7.3.0-184/web-apps/apps/api/documents/api.js", + "office/7.3.0-184/sdkjs/common/AllFonts.js", + "office/7.3.0-184/web-apps/vendor/xregexp/xregexp-all-min.js", + "office/7.3.0-184/web-apps/vendor/sockjs/sockjs.min.js", + "office/7.3.0-184/web-apps/vendor/jszip/jszip.min.js", + "office/7.3.0-184/web-apps/vendor/jszip-utils/jszip-utils.min.js", + "office/7.3.0-184/sdkjs/common/libfont/wasm/fonts.js", + "office/7.3.0-184/sdkjs/common/Charts/ChartStyles.js", + "office/7.3.0-184/sdkjs/slide/themes//themes.js", - "office/7.2.2-56/web-apps/apps/presentationeditor/main/app.js", - "office/7.2.2-56/sdkjs/slide/sdk-all-min.js", - "office/7.2.2-56/sdkjs/slide/sdk-all.js", + "office/7.3.0-184/web-apps/apps/presentationeditor/main/app.js", + "office/7.3.0-184/sdkjs/slide/sdk-all-min.js", + "office/7.3.0-184/sdkjs/slide/sdk-all.js", - "office/7.2.2-56/web-apps/apps/documenteditor/main/app.js", - "office/7.2.2-56/sdkjs/word/sdk-all-min.js", - "office/7.2.2-56/sdkjs/word/sdk-all.js", + "office/7.3.0-184/web-apps/apps/documenteditor/main/app.js", + "office/7.3.0-184/sdkjs/word/sdk-all-min.js", + "office/7.3.0-184/sdkjs/word/sdk-all.js", - "office/7.2.2-56/web-apps/apps/spreadsheeteditor/main/app.js", - "office/7.2.2-56/sdkjs/cell/sdk-all-min.js", - "office/7.2.2-56/sdkjs/cell/sdk-all.js", + "office/7.3.0-184/web-apps/apps/spreadsheeteditor/main/app.js", + "office/7.3.0-184/sdkjs/cell/sdk-all-min.js", + "office/7.3.0-184/sdkjs/cell/sdk-all.js", ]; foreach ($array as &$item) { $item = url($item); diff --git a/cmd b/cmd index 86ad47a57..9f50e9afc 100755 --- a/cmd +++ b/cmd @@ -84,6 +84,15 @@ docker_name() { echo `$COMPOSE ps | awk '{print $1}' | grep "\-$1\-"` } +mix_manifest() { + local file=$1 + if [[ `uname` == 'Linux' ]]; then + sed -i '/\"\/uploads/d' ${cur_path}/$file/mix-manifest.json + else + docker run -it --rm -v ${cur_path}/$file:/public alpine sh -c "sed -i '/\"\/uploads/d' /public/mix-manifest.json" + fi +} + run_compile() { local type=$1 check_node @@ -96,6 +105,7 @@ run_compile() { if [ "$type" = "prod" ]; then rm -rf "./public/js/build" npx mix --production + mix_manifest "public" echo "$(rand_string 16)" > ./public/js/hash else npx mix watch --hot @@ -125,6 +135,7 @@ run_electron() { # if [ "$argv" != "dev" ] && [ "$argv" != "--nobuild" ]; then npx mix --production -- --env --electron + mix_manifest "electron/public" fi if [ "$argv" == "dev" ]; then run_exec php "php bin/run --mode=$argv" @@ -243,15 +254,6 @@ arg_get() { echo $value } -is_arm() { - local get_arch=`arch` - if [[ $get_arch =~ "aarch" ]] || [[ $get_arch =~ "arm" ]]; then - echo "yes" - else - echo "no" - fi -} - #################################################################################### #################################################################################### #################################################################################### @@ -264,11 +266,6 @@ fi if [ $# -gt 0 ]; then if [[ "$1" == "init" ]] || [[ "$1" == "install" ]]; then shift 1 - # 判断架构 - if [[ "$(is_arm)" == "yes" ]] && [[ -z "$(arg_get force)" ]]; then - echo -e "${Error} ${RedBG}暂不支持arm架构,强制安装请使用:./cmd install --force${Font}" - exit 1 - fi # 初始化文件 if [[ -n "$(arg_get relock)" ]]; then rm -rf node_modules diff --git a/docker-compose.yml b/docker-compose.yml index 1fb54cca3..4d2f58adb 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" + image: "kuaifan/php:swoole-8.0.rc1" shm_size: "1024m" volumes: - ./docker/crontab/crontab.conf:/etc/supervisor/conf.d/crontab.conf @@ -82,7 +82,7 @@ services: office: container_name: "dootask-office-${APP_ID}" - image: "onlyoffice/documentserver:7.2.2.56" + image: "onlyoffice/documentserver:7.3.0.184" volumes: - ./docker/office/logs:/var/log/onlyoffice - ./docker/office/data:/var/www/onlyoffice/Data @@ -103,7 +103,8 @@ services: fileview: container_name: "dootask-fileview-${APP_ID}" - image: "kuaifan/fileview:4.1.0-SNAPSHOT-RC18" + image: "kuaifan/fileview:4.1.0-SNAPSHOT-RC19" + platform: linux/amd64 environment: TZ: "Asia/Shanghai" KK_CONTEXT_PATH: "/fileview" @@ -117,7 +118,7 @@ services: drawio-webapp: container_name: "dootask-drawio-webapp-${APP_ID}" - image: "jgraph/drawio:16.6.1" + image: "jgraph/drawio:20.8.20" volumes: - ./docker/drawio/webapp/index.html:/usr/local/tomcat/webapps/draw/index.html - ./docker/drawio/webapp/stencils:/usr/local/tomcat/webapps/draw/stencils @@ -136,6 +137,7 @@ services: drawio-export: container_name: "dootask-drawio-export-${APP_ID}" image: "jgraph/export-server" + platform: linux/amd64 networks: extnetwork: ipv4_address: "${APP_IPPR}.9" diff --git a/docker/drawio/webapp/index.html b/docker/drawio/webapp/index.html index 17c3ee491..42a1fb84c 100644 --- a/docker/drawio/webapp/index.html +++ b/docker/drawio/webapp/index.html @@ -5,11 +5,11 @@
- diagrams.net (formerly draw.io) is free online diagram software. You can use it as a flowchart maker, network diagram software, to create UML online, as an ER diagram tool, + draw.io is free online diagram software. You can use it as a flowchart maker, network diagram software, to create UML online, as an ER diagram tool, to design database schema, to build BPMN online, as a circuit diagram maker, and more. draw.io can import .vsdx, Gliffy™ and Lucidchart™ files .