willliamguo 3 年之前
父節點
當前提交
b3dd268fa1
共有 4 個文件被更改,包括 13 次插入5 次删除
  1. 6 0
      .idea/google-java-format.xml
  2. 2 0
      .idea/workspace.xml
  3. 3 3
      business/docker-compose-multi.yml
  4. 2 2
      business/nginx/sites-enabled/default

+ 6 - 0
.idea/google-java-format.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GoogleJavaFormatSettings">
+    <option name="enabled" value="false" />
+  </component>
+</project>

+ 2 - 0
.idea/workspace.xml

@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="41dc853c-f418-44c7-ba5d-2164f3f0373a" name="Default" comment="update">
+      <change afterPath="$PROJECT_DIR$/.idea/google-java-format.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/docker-compose-multi.yml" beforeDir="false" afterPath="$PROJECT_DIR$/business/docker-compose-multi.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/business/nginx/sites-enabled/default" beforeDir="false" afterPath="$PROJECT_DIR$/business/nginx/sites-enabled/default" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />

+ 3 - 3
business/docker-compose-multi.yml

@@ -29,7 +29,7 @@ services:
       - ${FILE_STORE_BASE_PATH}/${BACKEND_STORE_DIR}:/var/www
       - /home/xcc/crowd-service/TestFileSystem/RequirementDoc:/var/www/RequirementDoc
       #- /Users/guochao/Desktop/project/data/cofortest/RequirementDoc:/var/www/RequirementDoc
-    command: java -jar --spring.profiles.active=private-cloud --spring.data.mongodb.uri=mongodb://mooctest:mooctest@121.196.124.158:27217/test --server.ip=121.196.124.158 --main.site=http://121.196.124.158:8200 --server.port=8091 bug-0.0.1-SNAPSHOT.jar
+    command: java -jar --spring.profiles.active=private-cloud --spring.data.mongodb.uri=mongodb://mooctest:mooctest@121.40.93.243:27217/test --server.ip=121.40.93.243 --main.site=http://121.40.93.243:8200 --server.port=8091 bug-0.0.1-SNAPSHOT.jar
     ##--host需要根据实际地址修改;主站配置(信创、慕测)
 
   # 众测服务前端
@@ -57,7 +57,7 @@ services:
       - 9004:9004
     volumes:
       - ${FILE_STORE_BASE_PATH}/${BACKEND_STORE_DIR}/sgns.wiki.word:/project/sgns.wiki.word
-    command: java -jar --spring.profiles.active=private-cloud --mongodb.host=121.196.124.158 --mongodb.port=27217 --baseurl.report.host=121.196.124.158:81 --baseurl.report.excel=http://121.196.124.158:9003/generateReport --server.port=9004 crowd_review-1.0-SNAPSHOT.jar
+    command: java -jar --spring.profiles.active=private-cloud --mongodb.host=121.40.93.243 --mongodb.port=27217 --baseurl.report.host=121.40.93.243:81 --baseurl.report.excel=http://121.40.93.243:9003/generateReport --server.port=9004 crowd_review-1.0-SNAPSHOT.jar
     ##--host需要根据实际地址修改;此处有众测后端端口配置和报告导出地址配置
 
   # 报告导出工具
@@ -69,5 +69,5 @@ services:
       - 9003:9003
     volumes:
       - ${FILE_STORE_BASE_PATH}/${FRONTEND_STORE_DIR}:/var/www
-    command: java -jar --spring.profiles.active=private-cloud --crowd.frontend=http://121.196.124.158:81 --server.port=9003 export-excel.jar
+    command: java -jar --spring.profiles.active=private-cloud --crowd.frontend=http://121.40.93.243:81 --server.port=9003 export-excel.jar
     ##--host需要根据实际地址修改;如果前端端口修改了此处也要修改

+ 2 - 2
business/nginx/sites-enabled/default

@@ -1,7 +1,7 @@
 server {
 
     listen		80;
-    server_name	121.196.124.158; #改成对应的HOST
+    server_name	121.40.93.243; #改成对应的HOST
 
     location / {
         root   /usr/share/nginx/html;
@@ -24,7 +24,7 @@ server {
     }
 
     location /QC {
-        proxy_pass http://121.196.124.158:8080;
+        proxy_pass http://121.40.93.243:8080;
     }
 
     location /var {