dev

command/Start.php

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

config/nginx/template/proginn.nginx.conf

@@ -574,25 +574,3 @@ server {
 
     access_log /data/log/user_proginn_access.log proginn-logid;
 }
-
-# bituni
-server {
-    listen 80;
-    server_name qd.test-bituni.proginn.com;
-
-    set $temp_request_id $http_x_request_id;
-    if ($temp_request_id = "") {
-        set $temp_request_id $request_id;
-    }
-
-    location ~ ^/(composer.json|composer.lock|ThinkPHP/|vendor/|src/|bin/|App/|.git) {
-        deny all;
-    }
-
-    location / {
-      proxy_pass http://127.0.0.1:3001;
-      proxy_set_header Host qd.test-bituni.proginn.com;
-    }
-
-    access_log /data/log/kafain.log proginn-logid;
-}

dockerfile/template.yml

@@ -10,7 +10,6 @@ services:
       - /workspace/containers/<containerName>/boss:/boss:rw
       - /workspace/containers/<containerName>/proginn-user:/proginn-user:rw
       - /workspace/containers/<containerName>/proginn-bituni:/proginn-bituni:rw
-      - /workspace/containers/<containerName>/proginn-child:/proginn-child:rw
       - /workspace/containers/<containerName>/proginn-frontend:/proginn-frontend:rw
       - /workspace/containers/<containerName>/festival:/festival:rw
       - /workspace/containers/<containerName>/log/:/var/log/nginx

shell/container-code-update.sh

@@ -18,12 +18,3 @@ if [[ "$current_git_branch_latest_id" != "$current_git_branch_last_id" ]]; then
    # cd /proginn-frontend && rm -rf node_modules && npx yarn --registry=https://registry.npm.taobao.org install
     cd /proginn-frontend && pm2 reload ecosystem.config.yml
 fi
-
-cd /proginn-child && git fetch origin $PROGINN_FRONTEND_BRANCH
-cd /proginn-child && git checkout -f origin/$PROGINN_FRONTEND_BRANCH
-cd /proginn-child && current_git_branch_latest_id_child=`git rev-parse HEAD`
-current_git_branch_last_id_child=`cat /var/www/.proginn-child-commit-id`
-if [[ "$current_git_branch_latest_id_child" != "$current_git_branch_last_id_child" ]]; then
-    echo "$current_git_branch_latest_id_child" > /var/www/.proginn-child-commit-id
-    cd /proginn-child && pm2 reload proginn-child
-fi

shell/container-up.sh

@@ -98,9 +98,6 @@ su -c "cd /workspace/kaifain/client && npx yarn --registry=https://registry.npm.
 su -c "cd /proginn-frontend && rm -rf node_modules && npx yarn --registry=https://registry.npm.taobao.org install" -s /bin/bash - www-data
 su -c "cd /proginn-frontend && pm2 start ecosystem.config.yml" -s /bin/bash - www-data
 
-su -c "cd /proginn-child && rm -rf node_modules && npx yarn --registry=https://registry.npm.taobao.org install" -s /bin/bash - www-data
-su -c "cd /proginn-child && pm2 start --name proginn-child npm -- run start" -s /bin/bash - www-data
-
 # 启动定时脚本
 service cron restart