添加proginn-work的项目

command/Start.php

@@ -162,6 +162,7 @@ class Start
             system("cp -Rf /workspace/projects/festival {$directory}");
             system("cp -Rf /workspace/projects/docker-test {$directory}");
             system("cp -Rf /workspace/projects/proginn-user {$directory}");
+            system("cp -Rf /workspace/projects/proginn-work {$directory}");
             // 创建日志相关目录
             mkdir($directory . '/log/pm2', 0777, true); //
             mkdir($directory . '/log/proginn_cache', 0777, true); //

config/nginx/template/proginn.nginx.conf

@@ -187,6 +187,11 @@ server {
         proxy_set_header Host {{domain}}.test.proginn.com;
     }
 
+    location ^~ /wapi {
+        proxy_pass http://127.0.0.1:5001;
+        proxy_set_header Host {{domain}}.test.proginn.com;
+    }
+
     location ~ ^/company$ {
         proxy_pass http://127.0.0.1:3000;
         proxy_set_header Host $host;
@@ -474,3 +479,60 @@ server {
 
     access_log /data/log/user_proginn_access.log proginn-logid;
 }
+# 用户模块
+server {
+    listen 5000;
+    server_name {{domain}}.test.proginn.com;
+
+    root /proginn-user/public/;
+    index index.php index.html index.htm;
+
+
+    location / {
+        if (!-e $request_filename) {
+            rewrite  ^(.*)$  /index.php?s=$1  last;
+            break;
+        }
+    }
+    set $temp_request_id $http_x_request_id;
+    if ($temp_request_id = "") {
+        set $temp_request_id $request_id;
+    }
+
+    location ~ \.php$ {
+        fastcgi_pass unix:/var/run/php7-fpm.sock;
+        fastcgi_index index.php;
+        include fastcgi_params;
+    }
+
+    access_log /data/log/user_proginn_access.log proginn-logid;
+}
+
+# 工作模块
+server {
+    listen 5001;
+    server_name {{domain}}.test.proginn.com;
+
+    root /proginn-user/public/;
+    index index.php index.html index.htm;
+
+
+    location / {
+        if (!-e $request_filename) {
+            rewrite  ^(.*)$  /index.php?s=$1  last;
+            break;
+        }
+    }
+    set $temp_request_id $http_x_request_id;
+    if ($temp_request_id = "") {
+        set $temp_request_id $request_id;
+    }
+
+    location ~ \.php$ {
+        fastcgi_pass unix:/var/run/php7-fpm.sock;
+        fastcgi_index index.php;
+        include fastcgi_params;
+    }
+
+    access_log /data/log/work_proginn_access.log proginn-logid;
+}

dockerfile/template.yml

@@ -9,6 +9,7 @@ services:
       - /workspace/containers/<containerName>/proginn:/code:rw
       - /workspace/containers/<containerName>/boss:/boss:rw
       - /workspace/containers/<containerName>/proginn-user:/proginn-user:rw
+      - /workspace/containers/<containerName>/proginn-work:/proginn-work:rw
       - /workspace/containers/<containerName>/proginn-frontend:/proginn-frontend:rw
       - /workspace/containers/<containerName>/festival:/festival:rw
       - /workspace/containers/<containerName>/log/:/var/log/nginx
@@ -20,6 +21,7 @@ services:
       - /workspace/kaifain:/workspace/kaifain:rw
       - /var/www/.ssh:/var/www/.ssh:ro
       - /workspace/projects/docker-test/tp/.env:/proginn-user/.env
+      - /workspace/projects/docker-test/tp/.env:/proginn-work/.env
     command: /data/docker/shell/container-up.sh
     networks:
       proginn:

shell/container-code-update.sh

@@ -3,8 +3,10 @@
 # 更新代码
 cd /code && git fetch origin $PROGINN_BRANCH
 cd /code && git checkout -f origin/$PROGINN_BRANCH
-cd /proginn-user && git fetch origin $PROGINN_BRANCH
-cd /proginn-user && git checkout -f origin/$PROGINN_BRANCH
+cd /proginn-user && git fetch origin dev
+cd /proginn-user && git checkout -f dev
+cd /proginn-work && git fetch origin dev
+cd /proginn-work && git checkout -f dev
 cd /boss && git fetch origin $ROOTER_BRANCH
 cd /boss && git checkout -f origin/$ROOTER_BRANCH
 cd /proginn-frontend && git fetch origin $PROGINN_FRONTEND_BRANCH