From 55decb4dbc08c3e8c27f7517aac053c10a3fcd61 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 13 Jul 2021 17:42:47 +0800
Subject: [PATCH] no message

---
 .env.docker                                   |  1 -
 .env.example                                  |  1 -
 cmd                                           | 14 ++++++++++
 docker-compose.yml                            |  4 +--
 docker/nginx/default.conf                     | 26 ++++++++++++++++---
 resources/assets/js/components/OnlyOffice.vue |  3 +--
 resources/assets/js/pages/manage.vue          |  2 +-
 7 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/.env.docker b/.env.docker
index 89b4da38..9b72dda0 100644
--- a/.env.docker
+++ b/.env.docker
@@ -6,7 +6,6 @@ APP_URL=http://localhost
 
 APP_PORT=2222
 APP_PORT_SSL=2223
-APP_PORT_ONLYOFFICE=2224
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
diff --git a/.env.example b/.env.example
index 3ddb0d36..db24d140 100644
--- a/.env.example
+++ b/.env.example
@@ -6,7 +6,6 @@ APP_URL=http://localhost
 
 APP_PORT=2222
 APP_PORT_SSL=2223
-APP_PORT_ONLYOFFICE=2224
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
diff --git a/cmd b/cmd
index 1f726442..f2bedaca 100755
--- a/cmd
+++ b/cmd
@@ -32,6 +32,19 @@ supervisorctl_restart() {
     fi
 }
 
+check_docker() {
+    docker -v &> /dev/null
+    if [ $? -ne  0 ]; then
+        echo -e "${Error} ${RedBG} 未安装 Docker！${Font}"
+        exit 1
+    fi
+    docker-compose -v &> /dev/null
+    if [ $? -ne  0 ]; then
+        echo -e "${Error} ${RedBG} 未安装 Docker-compose！${Font}"
+        exit 1
+    fi
+}
+
 check_node() {
     npm -v > /dev/null
     if [ $? -ne  0 ]; then
@@ -86,6 +99,7 @@ env_init() {
 
 COMPOSE="docker-compose"
 env_init
+check_docker
 
 if [ $# -gt 0 ];then
     if [[ "$1" == "init" ]] || [[ "$1" == "install" ]]; then
diff --git a/docker-compose.yml b/docker-compose.yml
index c6f2feb0..5acd91a6 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -81,9 +81,7 @@ services:
 
   office:
     container_name: "dooteak-office-${DOCKER_ID}"
-    image: "onlyoffice/documentserver"
-    ports:
-      - "${APP_PORT_ONLYOFFICE}:80"
+    image: "onlyoffice/documentserver:6.3.1.32"
     volumes:
       - ./docker/office/data:/var/www/onlyoffice/Data
       - ./docker/office/logs:/var/log/onlyoffice
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index f0804e77..e024d19e 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -2,10 +2,14 @@ map $http_upgrade $connection_upgrade {
     default upgrade;
     ''      close;
 }
-upstream swoole {
+upstream service {
     server 10.22.22.2:20000 weight=5 max_fails=3 fail_timeout=30s;
     keepalive 16;
 }
+upstream office {
+    server 10.22.22.6 weight=5 max_fails=3 fail_timeout=30s;
+    keepalive 16;
+}
 server {
     listen 80;
 
@@ -28,6 +32,22 @@ server {
         allow all;
     }
 
+    location ~* ^/(6.3.1-32|cache/files|web-apps/apps)/ {
+        proxy_http_version 1.1;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Real-PORT $remote_port;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header Host $http_host;
+        proxy_set_header Scheme $scheme;
+        proxy_set_header Server-Protocol $server_protocol;
+        proxy_set_header Server-Name $server_name;
+        proxy_set_header Server-Addr $server_addr;
+        proxy_set_header Server-Port $server_port;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_pass http://office;
+    }
+
     location =/ws {
         proxy_http_version 1.1;
         proxy_set_header X-Real-IP $remote_addr;
@@ -41,7 +61,7 @@ server {
         proxy_set_header Server-Port $server_port;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $connection_upgrade;
-        proxy_pass http://swoole;
+        proxy_pass http://service;
     }
 
     location @laravels {
@@ -56,7 +76,7 @@ server {
         proxy_set_header Server-Name $server_name;
         proxy_set_header Server-Addr $server_addr;
         proxy_set_header Server-Port $server_port;
-        proxy_pass http://swoole;
+        proxy_pass http://service;
     }
 }
 
diff --git a/resources/assets/js/components/OnlyOffice.vue b/resources/assets/js/components/OnlyOffice.vue
index 8a5d8861..76bc4402 100644
--- a/resources/assets/js/components/OnlyOffice.vue
+++ b/resources/assets/js/components/OnlyOffice.vue
@@ -85,8 +85,7 @@ export default {
                 if (!url) {
                     return;
                 }
-                const uri = new URL(this.$store.state.method.apiUrl('web-apps'));
-                $A.loadScript(`http://${uri.hostname}:2224/web-apps/apps/api/documents/api.js`, () => {
+                $A.loadScript("web-apps/apps/api/documents/api.js", () => {
                     this.loadFile()
                 })
             },
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 6a930437..a1a292a4 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="page-manage">
+    <div v-show="userId > 0" class="page-manage">
         <div class="manage-box-menu">
             <Dropdown
                 class="manage-box-dropdown"