Ver código fonte

修改mongo配置

郭超 4 anos atrás
pai
commit
f22a51cb5f

+ 6 - 4
.idea/workspace.xml

@@ -5,7 +5,9 @@
       <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/conf.d/default.conf" beforeDir="false" afterPath="$PROJECT_DIR$/business/nginx/conf.d/default.conf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/business/private-docker/mongo/setup.sh" beforeDir="false" afterPath="$PROJECT_DIR$/business/private-docker/mongo/setup.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/nginx/sites-enabled/default" beforeDir="false" afterPath="$PROJECT_DIR$/business/nginx/sites-enabled/default" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/private-docker/mongo/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/business/private-docker/mongo/Dockerfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/business/private-docker/mongo/setup.sh" beforeDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -100,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/TestFileSystem" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/business/private-docker/mongo/data" />
     <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" />
@@ -114,8 +116,8 @@
       <recent name="$PROJECT_DIR$/business" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/business/TestFileSystem" />
       <recent name="$PROJECT_DIR$/business/private-docker/mongo/data" />
+      <recent name="$PROJECT_DIR$/business/TestFileSystem" />
       <recent name="$PROJECT_DIR$/business" />
       <recent name="$PROJECT_DIR$/crowd/nginx" />
       <recent name="$PROJECT_DIR$/crowd" />
@@ -188,7 +190,7 @@
       <workItem from="1610264520879" duration="862000" />
       <workItem from="1610343907658" duration="548000" />
       <workItem from="1618465186243" duration="1756000" />
-      <workItem from="1622184011904" duration="18608000" />
+      <workItem from="1622184011904" duration="21792000" />
     </task>
     <servers />
   </component>

+ 7 - 5
business/docker-compose-multi.yml

@@ -5,13 +5,14 @@ services:
     container_name: crowd_service_mongo
     image: "crowd-service-mongo:${CROWD_TAG}"
     environment:
+      - MONGO_INITDB_DATABASE=test
       - MONGO_INITDB_ROOT_USERNAME=mooctest
       - MONGO_INITDB_ROOT_PASSWORD=mooctest
     ports:
-      - 27117:27017
+      - 27217:27017
     volumes:
       - ${FILE_STORE_BASE_PATH}/${MONGO_FILE_PATH}:/data/db
-    command: mongod --auth
+    command: --bind_ip_all
     tty: true
 
   # 众测服务后端
@@ -26,7 +27,8 @@ services:
     volumes:
       - ${FILE_STORE_BASE_PATH}/${BACKEND_STORE_DIR}:/var/www
       - /home/xcc/crowd-service/TestFileSystem/RequirementDoc:/var/www/RequirementDoc
-    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=8091 bug-0.0.1-SNAPSHOT.jar
+      #- /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 --thirdPartTool.main.site=http://121.196.124.158:8200 --server.port=8091 bug-0.0.1-SNAPSHOT.jar
     ##--host需要根据实际地址修改;主站配置(信创、慕测)
 
   # 众测服务前端
@@ -54,7 +56,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=27117 --baseurl.report.host=192.168.31.157:8091 --baseurl.report.excel=http://192.168.31.157:9003/generateReport --server.port=9004 crowd_review-1.0-SNAPSHOT.jar
+    command: java -jar --spring.profiles.active=private-cloud --mongodb.host=121.196.124.158 --mongodb.port=27217 --baseurl.report.host=121.196.124.158:8091 --baseurl.report.excel=http://121.196.124.158:9003/generateReport --server.port=9004 crowd_review-1.0-SNAPSHOT.jar
     ##--host需要根据实际地址修改;此处有众测后端端口配置和报告导出地址配置
 
   # 报告导出工具
@@ -66,5 +68,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://192.168.31.157:81 --server.port=9003 export-excel.jar
+    command: java -jar --spring.profiles.active=private-cloud --crowd.frontend=http://121.196.124.158:81 --server.port=9003 export-excel.jar
     ##--host需要根据实际地址修改;如果前端端口修改了此处也要修改

+ 1 - 3
business/nginx/conf.d/default.conf

@@ -1,5 +1,3 @@
 upstream crowd-service-backend-api{
     server crowd_service_backend:8091;
-}
-
-
+}

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

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

+ 1 - 3
business/private-docker/mongo/Dockerfile

@@ -2,11 +2,9 @@ FROM mongo
 
 ENV WORKSPACE /usr/local/work
 ENV AUTO_RUN_DIR /docker-entrypoint-initdb.d
-ENV INSTALL_MONGO_SHELL setup.sh
 
 RUN mkdir -p $WORKSPACE
 
 COPY ./data/*.json $WORKSPACE/
-COPY ./$INSTALL_MONGO_SHELL $AUTO_RUN_DIR/
 
-RUN chmod a+x $AUTO_RUN_DIR/$INSTALL_MONGO_SHELL
+RUN chmod a+x $AUTO_RUN_DIR/$INSTALL_MONGO_SHELL

+ 0 - 29
business/private-docker/mongo/setup.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-mongo <<EOF
-
-use test
-db.createCollection("_properties");
-db.createCollection("AggTaskStatus");
-EOF
-
-mongoimport --db test --collection _properties --file $WORKSPACE/_properties.metadata.json
-mongoimport --db test --collection AggTaskStatus --file $WORKSPACE/AggTaskStatus.metadata.json
-
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");
-#db.createCollection("_properties");