还原之前的配置

command/Start.php

@@ -160,7 +160,6 @@ 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}");
             // 创建日志相关目录
             mkdir($directory . '/log/pm2', 0777, true); //
             mkdir($directory . '/log/proginn_cache', 0777, true); //
@@ -192,7 +191,6 @@ class Start
             system("sudo cp -f {$directory}/config/logrotate.conf /etc/logrotate.d/{$name}");
             // 写入项目变量 Found orphan containers
             file_put_contents($directory . '/config/.env', "COMPOSE_PROJECT_NAME={$name}");
-            //file_put_contents($directory . '/.env', file_get_contents("../proginn_service/.env"));
             // 启动容器
             system("docker-compose -p {$name} -f {$directory}/config/docker.yml up -d");
             // 重载Nginx

config/nginx/template/proginn.nginx.conf

@@ -433,32 +433,4 @@ server {
         proxy_set_header Host {{domain}}.test.proginn.com;
     }
     access_log /data/log/festival.log proginn-logid;
-}
-# 用户模块
-server {
-    listen 80;
-    server_name {{domain}}.test-user.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;
 }

config/nginx/template/proxy.nginx.conf

@@ -436,77 +436,4 @@ server {
             return 200;
         }
     }
-}
-
-# api user
-server {
-    listen 80;
-    server_name {{domain}}.test-user.proginn.com;
-
-    set $temp_request_id $http_x_request_id;
-    if ($temp_request_id = "") {
-        set $temp_request_id $request_id;
-    }
-    set $temp_scheme $http_x_forwarded_proto;
-    if ($temp_scheme = "") {
-        set $temp_scheme $scheme;
-    }
-    set $temp_addr $http_x_forwarded_for;
-    if ($temp_addr = "") {
-        set $temp_addr $remote_addr;
-    }
-    add_header 'X-Request-Id' "$temp_request_id";
-    access_log /data/log/jishuin-access.log proginn-logid;
-
-    if ($http_user_agent ~* (SemrushBot|python|MJ12bot|AhrefsBot|AhrefsBot|hubspot|opensiteexplorer|leiki|webmeup|DotBot|Baiduspider|spider)) {
-        return 444;
-    }
-    if ($http_referer ~* (lottery|shishissc)) {
-        return 444;
-    }
-    location / {
-        limit_req zone=byip burst=100;
-        proxy_pass http://{{ip}}/;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP  $temp_addr;
-        proxy_set_header X-Forwarded-For $temp_addr;
-        proxy_set_header X-Forwarded-Proto $temp_scheme;
-        proxy_set_header X-Scheme $temp_scheme;
-        proxy_set_header Origin $http_origin;
-        proxy_set_header X-Request-Id $temp_request_id;
-        proxy_http_version 1.1;
-
-        #=========================CORS nginx配置=============================
-        if ($http_origin ~* (https?://([^\.]+\.)*proginn\.com(:[0-9]+)?)$) {
-            set $cors "true";
-        }
-        if ($request_method = 'OPTIONS') {
-            set $cors "${cors}options";
-        }
-        if ($request_method = 'GET') {
-            set $cors "${cors}get";
-        }
-        if ($request_method = 'POST') {
-            set $cors "${cors}post";
-        }
-        if ($cors = "trueget") {
-            add_header 'Access-Control-Allow-Origin' "$http_origin";
-            add_header 'Access-Control-Allow-Credentials' 'true';
-        }
-        if ($cors = "truepost") {
-            add_header 'Access-Control-Allow-Origin' "$http_origin";
-            add_header 'Access-Control-Allow-Credentials' 'true';
-        }
-        if ($cors = "trueoptions") {
-            add_header 'Access-Control-Allow-Origin' "$http_origin";
-            # add_header 'Access-Control-Allow-Origin' '*';
-            add_header 'Access-Control-Allow-Credentials' 'true';
-            add_header 'Access-Control-Max-Age' 1728000;
-            add_header 'Access-Control-Allow-Headers' 'Authorization,Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since,X-CSRF-TOKEN,Cookie,x-xsrf-token,X-Request-Id';
-            add_header 'Content-Length' 0;
-            add_header 'Content-Type' 'text/plain charset=UTF-8';
-            # return 204;
-            return 200;
-        }
-    }
 }

shell/container-code-update.sh

@@ -5,8 +5,6 @@ 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`