20210512

cloudutil/src/main/resources/application-util-test.yml

@@ -20,7 +20,7 @@ eureka:
     service-url:
       # 指定eureka server通信地址，注意/eureka/小尾巴不能少
       #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
-      defaultZone: http://admin:admin@192.168.31.13:7010/eureka/
+      defaultZone: http://admin:admin@192.168.4.113:7010/eureka/
   instance:
     # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
     prefer-ip-address: true

ht/src/main/java/com/ccsens/ht/service/ImportService.java

@@ -416,6 +416,7 @@ public class ImportService implements IImportService {
         log.info("追加选项{}", json.get(Constant.Import.RELATION_OPTION));
         JSONArray options = json.getJSONArray(Constant.Import.RELATION_OPTION);
         for (Object obj: options) {
+            log.info("导入的选项信息{}", obj);
             HtQuestionRecordOption recordOption = JSONObject.parseObject(((JSONObject) obj).toJSONString(), HtQuestionRecordOption.class);
             if (CollectionUtil.isEmpty(questionRecords)) {
                 recordOption.setId(snowflake.nextId());

ht/src/main/resources/application-test.yml

@@ -7,23 +7,23 @@ spring:
     name: ht
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    rabbitmq:
+  rabbitmq:
-      host: 127.0.0.1
+    host: 127.0.0.1
-      password: 111111
+    password: guest
-      port: 5672
+    port: 5672
-      username: admin
+    username: guest
-    redis:
+  redis:
-      database: 0
+    database: 0
-      host: 127.0.0.1
+    host: 127.0.0.1
-      jedis:
+    jedis:
-        pool:
+      pool:
-          max-active: 200
+        max-active: 200
-          max-idle: 10
+        max-idle: 10
-          max-wait: -1ms
+        max-wait: -1ms
-          min-idle: 0
+        min-idle: 0
-      password: ''
+    password: ''
-      port: 6379
+    port: 6379
-      timeout: 1000ms
+    timeout: 1000ms
 
 
 swagger:

tall/src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: 192.168.31.13
+    host: 192.168.4.113
 #    host: 127.0.0.1
     password: 111111
     port: 5672

tall/src/main/resources/application-test.yml

@@ -12,9 +12,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
     host: 127.0.0.1
-    password: 111111
+    password: guest
     port: 5672
-    username: admin
+    username: guest
   redis:
     database: 0
     host: 127.0.0.1

tall/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
+    active: test
-    include: util-dev,common
+    include: util-test,common