Browse Source

feat: server port & deploy haproxy

ryanemax 5 months ago
parent
commit
9706f7096d
2 changed files with 17 additions and 4 deletions
  1. 15 3
      server/deploy.sh
  2. 2 1
      server/server.js

+ 15 - 3
server/deploy.sh

@@ -4,6 +4,7 @@ npx vite build
 DEV_HOST=root@dbo.fmode.cn
 # 生产主机(生产环境服务器)
 PROD_HOST=root@8.140.98.43
+# PROD_HOST=root@123.57.204.89
 # 部署路径
 DIR_SERVER=/opt/edu-textbook-server
 
@@ -24,7 +25,7 @@ cd ..
 ssh $DEV_HOST "mkdir -p $DIR_SERVER"
 scp dist/server.tar.gz $DEV_HOST:$DIR_SERVER/
 ssh $DEV_HOST "scp -r $DIR_SERVER/server.tar.gz $PROD_HOST:/opt/"
-ssh $DEV_HOST "ssh $PROD_HOST \"cd /opt/ && tar zxvf server.tar.gz && cp -rf server/* edu-textbook-server/\"" # 仅安装prod
+ssh $DEV_HOST "ssh $PROD_HOST \"cd /opt/ && tar zxvf server.tar.gz && mkdir -p edu-textbook-server && cp -rf server/* edu-textbook-server/\"" # 仅安装prod
 ssh $DEV_HOST "ssh $PROD_HOST \"cd /opt/ && cp server.tar.gz /var/www/edu-textbook\"" # 仅安装prod
 
 
@@ -38,5 +39,16 @@ ssh $DEV_HOST "ssh $PROD_HOST \"cd /opt/ && cp server.tar.gz /var/www/edu-textbo
 # 启动过程
 ssh $DEV_HOST "ssh $PROD_HOST \"cd $DIR_SERVER && ls -lah\"" # 仅安装prod
 ssh $DEV_HOST "ssh $PROD_HOST \"cd $DIR_SERVER && npm i --omit=dev --force\"" # 仅安装prod
-ssh $DEV_HOST "ssh $PROD_HOST \"cd $DIR_SERVER && pm2 stop server.js\""
-ssh $DEV_HOST "ssh $PROD_HOST \"cd $DIR_SERVER && pm2 start server.js\""
+ssh $DEV_HOST "ssh $PROD_HOST \"cd $DIR_SERVER && pm2 stop server server2 server3 server4 server5 server6 server7 server8\""
+ssh $DEV_HOST "ssh $PROD_HOST \"cd $DIR_SERVER && pm2 start server server2 server3 server4 server5 server6 server7 server8\""
+# ssh $DEV_HOST "ssh $PROD_HOST \"cd $DIR_SERVER && pm2 stop server.js\""
+# ssh $DEV_HOST "ssh $PROD_HOST \"cd $DIR_SERVER && pm2 start server.js\""
+
+# pm2 start -f --name=server1 server.js -- --port=61337
+# pm2 start -f --name=server2 server.js -- --port=61338
+# pm2 start -f --name=server3 server.js -- --port=61339
+# pm2 start -f --name=server4 server.js -- --port=61340
+# pm2 start -f --name=server5 server.js -- --port=61341
+# pm2 start -f --name=server6 server.js -- --port=61342
+# pm2 start -f --name=server7 server.js -- --port=61343
+# pm2 start -f --name=server8 server.js -- --port=61344

+ 2 - 1
server/server.js

@@ -40,6 +40,7 @@ global.config['PARSE_MASTERKEY'] = process.env["PARSE_MASTERKEY"] || appConfig["
 global.config['SEGMENT_COUNT'] = process.env["SEGMENT_COUNT"] || appConfig["SEGMENT_COUNT"] || false
 
 global.config["LOCAL"] = argv.local || process.env["LOCAL"] || appConfig["LOCAL"] || global.config['DATABASE_LOCAL'] ||  false
+global.config["PORT"] = argv.port || process.env["PORT"] || appConfig["PORT"] || global.config['PORT'] ||  61337
 
 
 import  {textbookRouter} from "./api/textbook/routes";
@@ -83,7 +84,7 @@ app.use(cors({
 }));
 
 global.parseConfig = {
-  port : 61337,
+  port : global.config["PORT"],
   allowClientClassCreation: true,
   allowExpiredAuthDataToken: false,
   encodeParseObjectInCloudFunction: false,