郭超 před 4 roky
rodič
revize
13421b30ae

+ 3 - 7
.idea/workspace.xml

@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="41dc853c-f418-44c7-ba5d-2164f3f0373a" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/.env" beforeDir="false" afterPath="$PROJECT_DIR$/business/.env" 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" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,12 +20,6 @@
       </list>
     </option>
   </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>CROWD_PATH</find>
-      <find>FILE_STORE_BASE_PATH</find>
-    </findStrings>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
@@ -191,7 +187,7 @@
       <workItem from="1610264520879" duration="862000" />
       <workItem from="1610343907658" duration="548000" />
       <workItem from="1618465186243" duration="1756000" />
-      <workItem from="1622184011904" duration="10583000" />
+      <workItem from="1622184011904" duration="12031000" />
     </task>
     <servers />
   </component>

+ 1 - 5
business/.env

@@ -1,6 +1,4 @@
 ## common.env
-## 私有云版本号
-VERSION=2020_12_1
 ## 数据文件根目录
 #FILE_STORE_BASE_PATH
 
@@ -10,8 +8,6 @@ MONGO_FILE_PATH=mongo
 ##crowd.env
 CROWD_TAG=latest
 CROWD_PATH=crowd
-CROWD_REVIEW_PATH=word
 BACKEND_STORE_DIR=TestFileSystem
 FRONTEND_STORE_DIR=TestFileSystem
-
-
+FRONTEND_STATIC_FILE=frontend-html

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

@@ -10,7 +10,7 @@ services:
     ports:
       - 27117:27017
     volumes:
-      - ${FILE_STORE_BASE_PATH}/{MONGO_FILE_PATH}:/data/db
+      - ${FILE_STORE_BASE_PATH}/${MONGO_FILE_PATH}:/data/db
     command: mongod --auth
     tty: true
 
@@ -25,7 +25,7 @@ services:
       - 8090:8090
     volumes:
       - ${FILE_STORE_BASE_PATH}/${BACKEND_STORE_DIR}:/var/www
-    command: java -jar -Dspring.profiles.active=private-cloud -Dspring.data.mongodb.uri=mongodb://mooctest:mooctest@121.196.124.158:27117/test -Dserver.ip=172.16.100.98 -Dserver.port=8090 -DthirdPartTool.main.site=http://172.16.100.98:8080 bug-0.0.1-SNAPSHOT.jar ##-Dhost需要根据实际地址修改
+    command: java -jar -Dspring.profiles.active=private-cloud -Dspring.data.mongodb.uri=mongodb://mooctest:mooctest@121.196.124.158:27117/test -Dserver.ip=192.168.31.157 -Dserver.port=8090 -DthirdPartTool.main.site=http://192.168.31.157:8080 bug-0.0.1-SNAPSHOT.jar ##-Dhost需要根据实际地址修改
   # 众测服务前端
   crowd_service_frontend:
     restart: always
@@ -38,6 +38,7 @@ services:
     volumes:
       - ${FILE_STORE_BASE_PATH}/${FRONTEND_STORE_DIR}:/var/www
       - ${FILE_STORE_BASE_PATH}/nginx:/etc/nginx
+      - ${FILE_STORE_BASE_PATH}/${FRONTEND_STATIC_FILE}:/usr/share/nginx/html
   # 报告融合前后端
   crowd_service_review:
     restart: always
@@ -49,4 +50,4 @@ services:
       - 9004:9004
     volumes:
       - ${FILE_STORE_BASE_PATH}/${BACKEND_STORE_DIR}/sgns.wiki.word:/project/sgns.wiki.word
-    command: java -jar -Dspring.profiles.active=private-cloud -Dmongodb.host=121.196.124.158 -Dmongodb.port=27117 -DbaseUrl.report.host=172.16.100.98:8090 -DbaseUrl.excel=http://172.16.100.98:9003/generateReport -Dserver.port=9004 crowd_review-1.0-SNAPSHOT.jar ##-Dhost需要根据实际地址修改
+    command: java -jar -Dspring.profiles.active=private-cloud -Dmongodb.host=121.196.124.158 -Dmongodb.port=27117 -DbaseUrl.report.host=192.168.31.157:8090 -DbaseUrl.excel=http://192.168.31.157:9003/generateReport -Dserver.port=9004 crowd_review-1.0-SNAPSHOT.jar ##-Dhost需要根据实际地址修改

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

@@ -1,6 +1,6 @@
 server {
         listen       81;
-        server_name  172.16.100.98; #改成对应的HOST
+        server_name  192.168.31.157; #改成对应的HOST
         root /usr/share/nginx/html;
         #charset koi8-r;
         client_max_body_size 100m;