From 4e61d0c7a08973b15dd6a43cd6a2deb8c4b5cddd Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Wed, 12 May 2021 14:38:08 +0800
Subject: [PATCH] 20210512

---
 .../main/resources/application-util-test.yml  |  2 +-
 .../com/ccsens/ht/service/ImportService.java  |  1 +
 ht/src/main/resources/application-test.yml    | 34 +++++++++----------
 tall/src/main/resources/application-dev.yml   |  2 +-
 tall/src/main/resources/application-test.yml  |  4 +--
 tall/src/main/resources/application.yml       |  4 +--
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml
index 5bac785a..569f6b37 100644
--- a/cloudutil/src/main/resources/application-util-test.yml
+++ b/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
diff --git a/ht/src/main/java/com/ccsens/ht/service/ImportService.java b/ht/src/main/java/com/ccsens/ht/service/ImportService.java
index 495598d9..4a3e2ba2 100644
--- a/ht/src/main/java/com/ccsens/ht/service/ImportService.java
+++ b/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());
diff --git a/ht/src/main/resources/application-test.yml b/ht/src/main/resources/application-test.yml
index 925ea9b2..8c9dace3 100644
--- a/ht/src/main/resources/application-test.yml
+++ b/ht/src/main/resources/application-test.yml
@@ -7,23 +7,23 @@ spring:
     name: ht
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    rabbitmq:
-      host: 127.0.0.1
-      password: 111111
-      port: 5672
-      username: admin
-    redis:
-      database: 0
-      host: 127.0.0.1
-      jedis:
-        pool:
-          max-active: 200
-          max-idle: 10
-          max-wait: -1ms
-          min-idle: 0
-      password: ''
-      port: 6379
-      timeout: 1000ms
+  rabbitmq:
+    host: 127.0.0.1
+    password: guest
+    port: 5672
+    username: guest
+  redis:
+    database: 0
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: 200
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+    password: ''
+    port: 6379
+    timeout: 1000ms
 
 
 swagger:
diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml
index 205b745e..35e6d4f6 100644
--- a/tall/src/main/resources/application-dev.yml
+++ b/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
diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml
index f6badbae..e1a36254 100644
--- a/tall/src/main/resources/application-test.yml
+++ b/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
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index 1d881c2f..eca66951 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
\ No newline at end of file
+    active: test
+    include: util-test,common
\ No newline at end of file