Merge remote-tracking branch 'origin/master'

.drone.yml

@@ -15,12 +15,12 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
     commands: # 定义在Docker容器中执行的shell命令
       - npm install --registry=https://registry.npmmirror.com
       - npm run build:prod
-      - mkdir -p /home/nginx/html/dms/
-      - cp -r dist /home/nginx/html/dms/
-      - cp -r ssl /home/nginx/html/dms/
-      - cp Dockerfile /home/nginx/html/dms/Dockerfile
-      - cp run.sh /home/nginx/html/dms/run.sh
-      - cp nginx.conf /home/nginx/html/dms/nginx.conf
+      - mkdir -p /home/nginx/html/dms-supplier/
+      - cp -r dist /home/nginx/html/dms-supplier/
+      - cp -r ssl /home/nginx/html/dms-supplier/
+      - cp Dockerfile /home/nginx/html/dms-supplier/Dockerfile
+      - cp run.sh /home/nginx/html/dms-supplier/run.sh
+      - cp nginx.conf /home/nginx/html/dms-supplier/nginx.conf
   - name: build-start
     image: appleboy/drone-ssh #SSH工具镜像
     settings:
@@ -29,11 +29,11 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         from_secret: ssh_user # 远程连接账号
       password:
         from_secret: ssh_password # 从Secret中读取SSH密码
-      port: 7223 # 远程连接端口
+      port: 7222 # 远程连接端口
       command_timeout: 5m # 远程执行命令超时时间
       script:
-        - mkdir -p /home/nginx/html/dms/
-        - cd /home/nginx/html/dms # 进入宿主机构建目录
+        - mkdir -p /home/nginx/html/dms-supplier/
+        - cd /home/nginx/html/dms-supplier # 进入宿主机构建目录
         - chmod +x run.sh #更改为可执行脚本
         - ./run.sh # 运行脚本打包应用镜像并运行
 

nginx.conf

@@ -14,16 +14,16 @@ http {
     client_max_body_size 50m;
 
    server { 
-	listen 80;
+	listen 81;
 	server_name 120.46.159.163;
-    # ssl_certificate  /home/nginx/html/dms/ssl/www.dljpwx.com.crt;
-    # ssl_certificate_key  /home/nginx/html/dms/ssl/www.dljpwx.com.key;
+    # ssl_certificate  /home/nginx/html/dms-supplier/ssl/www.dljpwx.com.crt;
+    # ssl_certificate_key  /home/nginx/html/dms-supplier/ssl/www.dljpwx.com.key;
     # ssl_session_cache   shared:SSL:1m;
     # ssl_ciphers  HIGH:!aNULL:!MD5;
     # ssl_prefer_server_ciphers  on;
     
     location / {
-        root /home/nginx/html/dms/dist;
+        root /home/nginx/html/dms-supplier/dist;
         try_files $uri $uri/ /index.html;
         index  index.html index.htm;
     }
@@ -58,6 +58,13 @@ http {
 	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	proxy_pass http://120.46.159.163:7004/;
     }
+    location /ezhizao-dms-supplier-api/{
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+	    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	    proxy_pass http://120.46.159.163:7005/;
+    }
 
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {

run.sh

@@ -6,7 +6,7 @@ app_name='ezhizao_dms_supplier_vue'
 # 定义挂载目录名称
 volume_name='dms'
 # 定义前端端口
-vue_port=80
+vue_port=81
 # 定义应用版 本 
 app_version='1.0-SNAPSHOT'
 echo '----copy dist----'