Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-CLIENT-TEMP into qingban

.env.development

@@ -13,7 +13,7 @@ VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # 开发接口地址
 VITE_APP_API_URL = 'http://192.168.101.4:7103'
 # Websocket地址
-VITE_WEBSOCKET_URL = 'ws://192.168.101.4:8079'
+VITE_WEBSOCKET_URL = 'ws://192.168.101.4:7103'
 ``
 # 是否启用 Mock 服务
 VITE_MOCK_DEV_SERVER = false

.env.production

@@ -1,7 +1,7 @@
 ## 生产环境
 NODE_ENV='production'
 
-# 代理前缀 三江环境
+# 代理前缀
 VITE_APP_BASE_API = '/client-server'
 
 # 上传文件接口地址
@@ -9,4 +9,5 @@ VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # VITE_APP_UPLOAD_URL = '/minio-server'
 
 # Websocket地址
-VITE_WEBSOCKET_URL = 'ws://192.168.101.4:8079'
+#VITE_WEBSOCKET_URL = 'ws://192.168.101.4:7103'
+VITE_WEBSOCKET_URL = 'ws://192.168.100.123:7103'

.gitignore

@@ -3,6 +3,7 @@ docker/dist
 .DS_Store
 docker/dist
 dist-ssr
+dist
 *.local
 .history
 

docker/Dockerfile

@@ -7,29 +7,29 @@ RUN echo "server {  \
                       listen       80; \
                       client_max_body_size 100m;\
                       location   /client-server/ { \
-                      proxy_pass              http://192.168.101.4:7103/; \
-                      proxy_redirect          off; \
-                      proxy_set_header        Host mes-server; \
-                      proxy_set_header        X-Real-IP \$remote_addr; \
-                      proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
-                  } \
-                  location /jgfile/ { \
+                        proxy_pass              http://192.168.101.4:7103/; \
+                        proxy_redirect          off; \
+                        proxy_set_header        Host mes-server; \
+                        proxy_set_header        X-Real-IP \$remote_addr; \
+                        proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
+                     } \
+                      location /jgfile/ { \
                               proxy_pass          http://192.168.101.4:9000/jgfile/; \
                               proxy_redirect      off; \
                               proxy_set_header    Host jgfile; \
                               proxy_set_header    X-Real-IP \$remote_addr; \
                               proxy_set_header    X-Forwarded-For \$proxy_add_x_forwarded_for; \
                       } \
-                  #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
-                  location / { \
-                     root   /var/www/html/; \
-                      index  index.html index.htm; \
-                      if (!-e \$request_filename) { \
-                          rewrite ^(.*)\$ /index.html?s=\$1 last; \
-                          break; \
+                      #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
+                      location / { \
+                         root   /var/www/html/; \
+                          index  index.html index.htm; \
+                          if (!-e \$request_filename) { \
+                              rewrite ^(.*)\$ /index.html?s=\$1 last; \
+                              break; \
+                          } \
                       } \
-                  } \
-                  access_log  /var/log/nginx/access.log ; \
+                      access_log  /var/log/nginx/access.log ; \
               } " > /etc/nginx/conf.d/default.conf \
     &&  mkdir  -p  /var/www \
     &&  mkdir -p /var/www/html