Merge branch 'fund_expert_org' of http://47.100.44.39:10001/zhoupeng/tamp_fund into fund_expert_org

pom.xml

@@ -40,6 +40,15 @@
         </dependency>
 
         <!-- boot starter -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-sleuth</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

src/main/java/com/tanpu/fund/service/impl/ProductPrivateServiceImpl.java

@@ -227,8 +227,10 @@ public class ProductPrivateServiceImpl implements ProductPrivateService, Constan
                 }
 
                 FundInfo info = infoMap.get(fundId);
-                vo.setFundName(info.getFundShortName());
-                vo.setRatioId(ProductEnums.IndexEnum.getValue(info.getPrimaryBenchmarkId()));
+                if (info != null) {
+                    vo.setFundName(info.getFundShortName());
+                    vo.setRatioId(ProductEnums.IndexEnum.getValue(info.getPrimaryBenchmarkId()));
+                }
                 FundCount fundCount = fundCountMap.get(fundId);
                 if (fundCount != null) {
                     vo.setRetIncep(multiply100(fundCount.getRetIncep()));

src/main/java/com/tanpu/fund/service/impl/ProductServiceImpl.java

@@ -1660,6 +1660,9 @@ public class ProductServiceImpl implements ProductService, Constant {
     public List<FundSameResp> querySamefund(String fundId) {
         //查询同类基金
         FundInfo fundInfo = fundInfoMapper.selectByPrimaryKey(fundId);
+        if (fundInfo == null || fundInfo.getSubstrategy() == null) {
+            return Collections.emptyList();
+        }
 
         PageMethod.startPage(1, 10);
         FundCountExample example = new FundCountExample();

src/main/resources/application-test.properties

@@ -83,6 +83,9 @@ spring.cloud.consul.discovery.enabled=false
 spring.cloud.consul.enabled=false
 apollo.bootstrap.enabled=false
 
+spring.zipkin.enabled=false
+spring.sleuth.sampler.probability=1.0
+
 logging.level.com.tanpu=debug
 
 

src/main/resources/bootstrap.yml

+spring:
+  application:
+    name: service-fund
\ No newline at end of file

src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
+
 <configuration scan="true" scanPeriod="15 seconds">
+	<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 
 	<property name="LOG_PATH" value="/data/logs"/>
 	<property name="LOG_FILE" value="app"/>
 
+	<property name="CONSOLE_LOG_PATTERN"
+			  value="%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) [uid:%X{X-UserID:- }] %clr(${PID:- }){magenta} %clr(-){faint} %clr([%t]){faint} %clr(%logger{40}:%line %M){cyan}%clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+	<property name="CONSOLE_LOG_CHARSET" value="${CONSOLE_LOG_CHARSET:-UTF-8}"/>
+	<property name="FILE_LOG_PATTERN"
+			  value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} [uid:%X{X-UserID:- }] ${PID:- } - [%t] %logger{40}:%line %M:%m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<property name="FILE_LOG_CHARSET" value="${FILE_LOG_CHARSET:-UTF-8}"/>
+
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{500}:%line - %msg%n</pattern>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+			<charset>${CONSOLE_LOG_CHARSET}</charset>
 		</encoder>
 	</appender>
 
 	<!-- info日志记录器，日期滚动记录 -->
 	<appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%line - %msg%n</pattern>
+			<pattern>${FILE_LOG_PATTERN}</pattern>
+			<charset>${CONSOLE_LOG_CHARSET}</charset>
 		</encoder>
 		<append>true</append>
 		<file>${LOG_PATH}/${LOG_FILE}.log</file>
@@ -29,8 +40,10 @@
 	<!-- ERROR日志记录器，日期滚动记录 -->
 	<appender name="errorFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%line - %msg%n</pattern>
+			<pattern>${FILE_LOG_PATTERN}</pattern>
+			<charset>${CONSOLE_LOG_CHARSET}</charset>
 		</encoder>
+
 		<append>true</append>
 
 		<file>${LOG_PATH}/error.log</file>