修改compose.yml

.idea/workspace.xml

@@ -3,6 +3,10 @@
   <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/TestFileSystem/image/admin.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/TestFileSystem/image/adminPublish.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/TestFileSystem/image/student.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/TestFileSystem/image/teacher.png" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/business/docker-compose-multi.yml" beforeDir="false" afterPath="$PROJECT_DIR$/business/docker-compose-multi.yml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -98,7 +102,7 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/business/private-docker/mongo/data" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/business/TestFileSystem" />
     <property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
     <property name="project.structure.last.edited" value="SDKs" />
     <property name="project.structure.proportion" value="0.15" />
@@ -107,12 +111,13 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/business/TestFileSystem/xinchuang" />
       <recent name="$PROJECT_DIR$/business/private-docker" />
       <recent name="$PROJECT_DIR$/business" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/business/private-docker/mongo/data" />
       <recent name="$PROJECT_DIR$/business/TestFileSystem" />
+      <recent name="$PROJECT_DIR$/business/private-docker/mongo/data" />
       <recent name="$PROJECT_DIR$/business" />
       <recent name="$PROJECT_DIR$/crowd/nginx" />
       <recent name="$PROJECT_DIR$/crowd" />
@@ -185,7 +190,7 @@
       <workItem from="1610264520879" duration="862000" />
       <workItem from="1610343907658" duration="548000" />
       <workItem from="1618465186243" duration="1756000" />
-      <workItem from="1622184011904" duration="15270000" />
+      <workItem from="1622184011904" duration="15679000" />
     </task>
     <servers />
   </component>

business/docker-compose-multi.yml

@@ -25,7 +25,9 @@ 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=192.168.31.157 -Dserver.port=8090 -DthirdPartTool.main.site=http://192.168.31.157:8080 bug-0.0.1-SNAPSHOT.jar ##-Dhost需要根据实际地址修改
+    command: java -jar --spring.profiles.active=private-cloud --spring.data.mongodb.uri=mongodb://mooctest:mooctest@121.196.124.158:27117/test --server.ip=192.168.31.157 --thirdPartTool.main.site=http://192.168.31.157:8080 --server.port=8090 bug-0.0.1-SNAPSHOT.jar
+    ##--host需要根据实际地址修改；主站配置（信创、慕测）
+
   # 众测服务前端
   crowd_service_frontend:
     restart: always
@@ -38,6 +40,7 @@ services:
     volumes:
       - ${FILE_STORE_BASE_PATH}/${FRONTEND_STORE_DIR}:/var/www
       - ${FILE_STORE_BASE_PATH}/nginx:/etc/nginx
+
   # 报告融合前后端
   crowd_service_review:
     restart: always
@@ -45,20 +48,22 @@ services:
     image: "crowd-service-review:${CROWD_TAG}"
     depends_on:
       - mongodb
+      - crowd_service_export
     ports:
       - 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=192.168.31.157:8090 -Dbaseurl.report.excel=http://192.168.31.157:9003/generateReport -Dserver.port=9004 crowd_review-1.0-SNAPSHOT.jar ##-Dhost需要根据实际地址修改
+    command: java -jar --spring.profiles.active=private-cloud --mongodb.host=121.196.124.158 --mongodb.port=27117 --baseurl.report.host=192.168.31.157:8090 --baseurl.report.excel=http://192.168.31.157:9003/generateReport --server.port=9004 crowd_review-1.0-SNAPSHOT.jar
+    ##--host需要根据实际地址修改；此处有众测后端端口配置和报告导出地址配置
+
   # 报告导出工具
   crowd_service_export:
     restart: always
     container_name: crowd_service_export
     image: "crowd-service-export:${CROWD_TAG}"
-    depends_on:
-      - crowd_service_review
     ports:
       - 9003:9003
     volumes:
       - ${FILE_STORE_BASE_PATH}/${FRONTEND_STORE_DIR}:/var/www
-    command: java -jar -Dspring.profiles.active=private-cloud -Dexport.path=/var/www/xinchuang/excel -Dcrowd.frontend=http://192.168.31.157:81 -Dserver.port=9003 export-excel.jar ##-Dhost需要根据实际地址修改
+    command: java -jar --spring.profiles.active=private-cloud --crowd.frontend=http://192.168.31.157:81 --server.port=9003 export-excel.jar
+    ##--host需要根据实际地址修改；如果前端端口修改了此处也要修改