Merge remote-tracking branch 'origin/dev/one' into dev/one

admin-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"admin-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

bi-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"bi-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

config-server/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"config-server"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="native">
         <root level="INFO">
@@ -252,7 +260,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -265,7 +273,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/LantoneProductWrapper.java

@@ -30,6 +30,31 @@ public class LantoneProductWrapper extends LantoneProduct {
      */
     private Integer openedServiceStatus;
 
+    /**
+     * 计费方式
+     */
+    private String [] chargeTypeArray;
+    /**
+     * 接入方式（1：嵌入式，2：接口方式，3：online）
+     */
+    private String [] accessTypeArray;
+
+    public String[] getChargeTypeArray() {
+        return chargeTypeArray;
+    }
+
+    public void setChargeTypeArray(String[] chargeTypeArray) {
+        this.chargeTypeArray = chargeTypeArray;
+    }
+
+    public String[] getAccessTypeArray() {
+        return accessTypeArray;
+    }
+
+    public void setAccessTypeArray(String[] accessTypeArray) {
+        this.accessTypeArray = accessTypeArray;
+    }
+
     public Date getStartTime() {
         return startTime;
     }

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -23,6 +23,7 @@ import com.diagbot.vo.AddProductsVO;
 import com.diagbot.vo.LantoneProductSelectVO;
 import com.diagbot.vo.OppendedProductVO;
 import com.diagbot.vo.UpdateProductVO;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -111,7 +112,12 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      */
     public List<LantoneProductWrapper> opendedProductByCurrentUser() {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        return this.opendedProductByUserId(userId);
+        List<LantoneProductWrapper> list = this.opendedProductByUserId(userId);
+        for (LantoneProductWrapper product : list) {
+            product.setAccessTypeArray(product.getAccessType().split(",|，"));
+            product.setChargeTypeArray(product.getChargeType().split(",|，"));
+        }
+        return list;
     }
 
     /**

diagbotman-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"diagbotman-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

eureka-server/src/main/resources/application-test.yml

@@ -0,0 +1,8 @@
+server:
+  port: 8761
+eureka:
+  client:
+    register-with-eureka: false
+    fetch-registry: false
+    serviceUrl:
+      defaultZone: http://eureka1:${server.port}/eureka/

feedback-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"feedback-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

knowledge-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"knowledge-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

log-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"log-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

monitor-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"monitor-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

uaa-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"uaa-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>
 

user-service/src/main/resources/logback-spring.xml

@@ -213,7 +213,7 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
@@ -221,6 +221,14 @@
         </encoder>
     </appender>
 
+    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>192.168.2.241:5044</destination>
+        <!-- encoder必须配置,有多种可选 -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"user-service"}</customFields>
+        </encoder>
+    </appender>
+
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
@@ -242,7 +250,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHDEV"/>
         </root>
     </springProfile>
 
@@ -255,7 +263,7 @@
             <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
             <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASH"/>
+            <appender-ref ref="LOGSTASHTEST"/>
         </root>
     </springProfile>