同步新的代码仓库

command/Start.php

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

config/nginx/template/proginn.nginx.conf

@@ -434,3 +434,31 @@ server {
     }
     access_log /data/log/festival.log proginn-logid;
 }
+# 用户模块
+server {
+    listen 80;
+    server_name {{domain}}user.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;
+}

dockerfile/template.yml

@@ -8,6 +8,7 @@ services:
       - /workspace/projects/docker-test/:/data/docker
       - /workspace/containers/<containerName>/proginn:/code:rw
       - /workspace/containers/<containerName>/boss:/boss:rw
+      - /workspace/containers/<containerName>/proginn-user:/proginn-user:rw
       - /workspace/containers/<containerName>/proginn-frontend:/proginn-frontend:rw
       - /workspace/containers/<containerName>/festival:/festival:rw
       - /workspace/containers/<containerName>/log/:/var/log/nginx
@@ -35,6 +36,7 @@ services:
       - NODE_ENV=development
     extra_hosts:
       - "<domain>.test.proginn.com:172.17.255.24"
+      -  "<domain>user.test.proginn.com:172.17.255.24"
       - "<domain>.test-rooter.proginn.com:172.17.255.24"
       - "<domain>.test-jishuin.proginn.com:172.17.255.24"
       - "git.proginn.com:172.17.17.49"

shell/container-code-update.sh

@@ -5,6 +5,8 @@ cd /code && git fetch origin $PROGINN_BRANCH
 cd /code && git checkout -f origin/$PROGINN_BRANCH
 cd /boss && git fetch origin $ROOTER_BRANCH
 cd /boss && git checkout -f origin/$ROOTER_BRANCH
+cd /proginn-user && git fetch origin dev
+cd /proginn-user && git checkout -f origin/dev
 cd /proginn-frontend && git fetch origin $PROGINN_FRONTEND_BRANCH
 cd /proginn-frontend && git checkout -f origin/$PROGINN_FRONTEND_BRANCH
 cd /proginn-frontend && current_git_branch_latest_id=`git rev-parse HEAD`