fix conflict

pom.xml

@@ -297,7 +297,6 @@
             <version>2.1.5</version>
 
         </dependency>
-
         <!-- protobuf依赖-->
         <dependency>
             <groupId>com.google.protobuf</groupId>

src/main/java/com/quantgroup/asset/distribution/config/datasource/DataSourceConfig.java

@@ -21,12 +21,12 @@ import com.alibaba.druid.pool.DruidDataSource;
 @Configuration
 public class DataSourceConfig {
 	
-	@Value("${spring.datasource.primary.url}")  
-    private String dbUrl;  
-    @Value("${spring.datasource.primary.username}")  
-    private String username;  
-    @Value("${spring.datasource.primary.password}")  
-    private String password;  
+	@Value("${spring.datasource.primary.url}")
+    private String dbUrl;
+    @Value("${spring.datasource.primary.username}")
+    private String username;
+    @Value("${spring.datasource.primary.password}")
+    private String password;
     @Value("${spring.datasource.primary.driver-class-name}")  
     private String driverClassName;  
       

src/main/java/com/quantgroup/asset/distribution/controller/FundModuleController.java

 package com.quantgroup.asset.distribution.controller;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Stopwatch;
 import com.quantgroup.asset.distribution.constant.FundModuleConstants;
 import com.quantgroup.asset.distribution.enums.response.FundModuleResponse;
 import com.quantgroup.asset.distribution.model.response.GlobalResponse;
-import com.quantgroup.asset.distribution.service.approval.IApprovalLogService;
 import com.quantgroup.asset.distribution.service.funding.IFundModuleService;
 import com.quantgroup.asset.distribution.util.fund.module.ChannelFundConfigUtil;
 
@@ -109,7 +106,6 @@ public class FundModuleController {
 		return findChannelFundConfigCommon(configId, 2);
 	}
 
-
 	private GlobalResponse saveChannelFundsConfigCommon(Integer type, Long id, String bizChannel, String funds, String remarks,
 														String auditor, String proposer, int oldOrNew) {
 		log.info("资方模块接口, 新增或修改资方配置开始, type : {}, id : {}, bizChannel : {}, funds : {}, remarks : {}, auditor : {}, proposer : {}", type, id, bizChannel, funds, remarks, auditor, proposer);
@@ -182,4 +178,5 @@ public class FundModuleController {
 		log.info("资方模块接口, 根据id获取资方配置, configId : {} 耗时 : {}, response : {}", configId, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS), JSON.toJSONString(response));
 		return response;
 	}
+
 }

src/main/java/com/quantgroup/asset/distribution/service/niwodai/impl/NiwodaiAssetServiceImpl.java

@@ -52,9 +52,9 @@ public class NiwodaiAssetServiceImpl implements INiwodaiAssetService {
     private String userSysUrl;
     private IUserSdkService userSdkService;
 
-    Gson GSON = new Gson();
+   private static Gson GSON = new Gson();
 
-    private static String[] companyNames = new String[]{"1","2"};
+    private static String[] companyNames = new String[]{"外企人力资源公司","中智人力资源公司","新绿人力资源公司","东浩人力资源公司"};
 
     @PostConstruct
     private void init() {
@@ -182,7 +182,11 @@ public class NiwodaiAssetServiceImpl implements INiwodaiAssetService {
             mapResult.put("checkResult", false);
             log.error("查询用户中心数据发生异常, userId: {} ", userId, e);
         }
-        return mapResult;
+        if (null == mapResult.get("info")){
+            return new HashMap<>();
+        }else {
+            return (Map<String, Object>) mapResult.get("info");
+        }
     }
 
     public static void check(BasicInfo2Detail basicInfo2Detail, Map<String,Object> map, String userId, Map<String,Object> convertMap){

src/test/resources/META-INF/app.properties

+app.id=asset-distribution
+namespace=application,tech.service.urls,tech.common,tech.sleuth,tech.deploy,tech.msg.sdk
\ No newline at end of file

src/test/resources/logback-dev.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+    <springProperty name="spring.application.name" source="spring.application.name"/>
+    <property name="LOG_LEVEL_PATTERN"
+              value="%clr(%5p) %clr([${spring.application.name:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]){yellow}"/>
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%10.10t]){faint} [%40.40file:%4.4line] %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!-- 这里面定义了 CONSOLE_LOG_PATTERN, FILE_LOG_PATTERN 等日志格式, 还定义了一些日志级别 -->
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </layout>
+    </appender>
+
+    <logger name="com.atomikos" level="warn"/>
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.mybatis" level="warn"/>
+    <logger name="org.apache" level="warn"/>
+    <logger name="ch.qos.logback" level="warn"/>
+    <logger name="org.apache.kafka.clients" level="error"/>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>
+
+
+

src/test/resources/logback-k8s.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+    <springProperty name="spring.application.name" source="spring.application.name"/>
+    <property name="LOG_LEVEL_PATTERN"
+              value="%5p [${spring.application.name:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]"/>
+    <property name="FILE_LOG_PATTERN"
+              value="${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} --- [%thread] [%file:%line] %logger - %msg%n}"/>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/home/quant_group/logs/asset-distribution.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>
+                /home/quant_group/logs/asset-distribution.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+            <maxHistory>7</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="com.atomikos" level="warn"/>
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.mybatis" level="warn"/>
+    <logger name="org.apache" level="warn"/>
+    <logger name="ch.qos.logback" level="warn"/>
+    <logger name="org.apache.kafka.clients" level="error"/>
+
+    <root level="info">
+        <appender-ref ref="FILE"/>
+    </root>
+
+</configuration>
\ No newline at end of file

src/test/resources/logback-pro.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+    <springProperty name="spring.application.name" source="spring.application.name"/>
+    <property name="LOG_LEVEL_PATTERN"
+              value="%5p [${spring.application.name:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]"/>
+    <property name="FILE_LOG_PATTERN"
+              value="${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} --- [%thread] [%file:%line] %logger - %msg%n}"/>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/home/quant_group/asset-distribution/logs/asset-distribution.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>
+                /home/quant_group/asset-distribution/logs/asset-distribution.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+            <maxHistory>7</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- logstash -->
+    <appender name="stash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>172.30.220.6:9623</destination>
+        <!-- encoder is required -->
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>
+
+    <logger name="com.atomikos" level="warn"/>
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.mybatis" level="warn"/>
+    <logger name="org.apache" level="warn"/>
+    <logger name="ch.qos.logback" level="warn"/>
+    <logger name="org.apache.kafka.clients" level="error"/>
+
+    <root level="info">
+        <appender-ref ref="FILE"/>
+        <appender-ref ref="stash"/>
+    </root>
+
+</configuration>
\ No newline at end of file

src/test/resources/logback-qa.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<configuration>
+    <springProperty name="spring.application.name" source="spring.application.name"/>
+    <property name="LOG_LEVEL_PATTERN"
+              value="%5p [${spring.application.name:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]"/>
+    <property name="FILE_LOG_PATTERN"
+              value="${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} --- [%thread] [%file:%line] %logger - %msg%n}"/>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/vpants/shaun/asset-distribution-9051/logs/rule-engine.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>
+                /vpants/shaun/asset-distribution-9051/logs/rule-engine.log.%d{yyyy-MM-dd}
+            </fileNamePattern>
+            <maxHistory>7</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="com.atomikos" level="warn"/>
+    <logger name="org.springframework" level="warn"/>
+    <logger name="org.mybatis" level="warn"/>
+    <logger name="org.apache" level="warn"/>
+    <logger name="ch.qos.logback" level="warn"/>
+    <logger name="org.apache.kafka.clients" level="error"/>
+
+    <root level="info">
+        <appender-ref ref="FILE"/>
+    </root>
+
+</configuration>
\ No newline at end of file

src/test/resources/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+
+    <!-- 测试环境+开发环境. 多个使用逗号隔开. -->
+    <springProfile name="test,dev">
+        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+            <layout class="ch.qos.logback.classic.PatternLayout">
+                <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
+            </layout>
+        </appender>
+        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <file>logs/rule-engine.log</file>
+            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+                <fileNamePattern>logs/asset-distribution.log.%d{yyyy-MM-dd}</fileNamePattern>
+                <maxHistory>7</maxHistory>
+            </rollingPolicy>
+            <layout class="ch.qos.logback.classic.PatternLayout">
+                <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
+            </layout>
+        </appender>
+
+        <logger name="com.atomikos" level="warn"/>
+        <logger name="org.springframework" level="warn"/>
+        <logger name="org.mybatis" level="warn"/>
+        <logger name="org.apache" level="warn"/>
+        <logger name="ch.qos.logback" level="warn"/>
+        <logger name="org.apache.kafka.clients" level="error"/>
+
+
+        <root level="info">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 生产环境. -->
+    <springProfile name="product">
+        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+            <layout class="ch.qos.logback.classic.PatternLayout">
+                <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
+            </layout>
+        </appender>
+
+        <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+            <file>/home/quant_group/asset-distribution/logs/asset-distribution.log</file>
+            <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+                <fileNamePattern>/home/quant_group/asset-distribution/logs/asset-distribution.log.%d{yyyy-MM-dd}</fileNamePattern>
+                <maxHistory>7</maxHistory>
+            </rollingPolicy>
+            <layout class="ch.qos.logback.classic.PatternLayout">
+                <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
+            </layout>
+        </appender>
+        <!-- logstash -->
+        <appender name="stash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+            <destination>172.30.220.6:9650</destination>
+            <!-- encoder is required -->
+            <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" />
+        </appender>
+
+        <logger name="org.springframework" level="warn"/>
+        <logger name="org.apache" level="warn"/>
+        <logger name="ch.qos.logback" level="warn"/>
+        <logger name="org.apache.kafka.clients" level="error"/>
+
+        <root level="INFO">
+            <appender-ref ref="FILE"/>
+            <appender-ref ref="stash"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file