提交2020.06.12

src/main/java/cn/quantgroup/report/controller/CheckController.java

@@ -27,8 +27,10 @@ public class CheckController {
     @RequestMapping(value="check")
     public ResponseEntity<String> check(){
         if(map!=null && map.size()>0){
+            log.info("check....1");
             return new ResponseEntity<String>(HttpStatus.NOT_FOUND);
         }else{
+            log.info("check....0");
             return new ResponseEntity<String>(HttpStatus.OK);
         }
     }

src/main/java/cn/quantgroup/report/controller/ManualToolController.java

@@ -24,35 +24,6 @@ public class ManualToolController {
   private UserOcrService userOcrService;
 
 
-
-
-  @RequestMapping("/dealWithExcelData")
-  public GlobalResponse dealWithExcelData(String filePath,String type){
-    return manualToolService.dealWithExcelData(filePath,type);
-  }
-
-
-  @RequestMapping("/removeD3LoanIdChunfu")
-  public String remove_D3_loanId_chunfu(String oldDataFile, String cfLoanIdLogFile, String newFileName, String rmIdFileName,String rmPhoneFileName){
-    return manualToolService.remove_D3_loanId_chunfu(oldDataFile,cfLoanIdLogFile,newFileName,rmIdFileName,rmPhoneFileName);
-  }
-  @RequestMapping("/checkD3loanIdInD2")
-  public String check_D3loanId_InD2(String d3LoanIdFile, String d2File, String inFileName, String notInFileName){
-    return manualToolService.check_D3loanId_InD2(d3LoanIdFile,d2File,inFileName,notInFileName);
-  }
-  @RequestMapping("/checkD2loanIdInD3WanJie")
-  public String check_D2loanId_InD3WanJie(String d3LoanIdFile, String d2File, String notWJFileName){
-    return manualToolService.check_D2loanId_InD3WanJie(d3LoanIdFile,d2File,notWJFileName);
-  }
-
-  @RequestMapping("/newD3ReplaceReqId")
-  public String newD3ReplaceReqId(String newD3FilePath, String newD3FileNames, String oldD3ReqIdFile, String mapNotEmptyFile){
-     manualToolService.newD3ReplaceReqId(newD3FilePath,newD3FileNames,oldD3ReqIdFile,mapNotEmptyFile);
-    return "调用结束";
-  }
-
-
-
   @RequestMapping("/deleteRedisKey")
   public Map<String,Object> deleteRedisKey(String key1, String key2, String key3){
     try{
@@ -73,6 +44,9 @@ public class ManualToolController {
   }
 
 
+
+
+
   @RequestMapping("/synGrowingUser")
   public String synGrowingUser(String startnyr, String endnyr) {
     userOcrService.synGrowingUserOcr(startnyr, endnyr);

src/main/java/cn/quantgroup/report/controller/external/CommonSourceController.java

 package cn.quantgroup.report.controller.external;
 
-import cn.quantgroup.report.service.baihang.BaiHangQueryService;
 import cn.quantgroup.report.service.common.CommonQueryService;
-import cn.quantgroup.report.utils.IdUtils;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.ImmutableMap;
 import lombok.extern.slf4j.Slf4j;
-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.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 /**
  * Created by fengjunkai on 2018/8/13 0013 下午 4:48
  **/
@@ -25,9 +18,6 @@ public class CommonSourceController {
     @Autowired
     private CommonQueryService queryService;
 
-    @Autowired
-    private BaiHangQueryService baiHangQueryService;
-
     @RequestMapping("/query")
     public Object commonQuery(String source_types, String uuid, String name, String phone, String identity, String backDate, String business_type, String order_id, boolean isReadCache){
         Object object = queryService.commonQuery(source_types, uuid, name, phone, identity, backDate, business_type, order_id, isReadCache);
@@ -35,35 +25,6 @@ public class CommonSourceController {
     }
 
 
-    /**
-     * -----------------------------------------------------------------------------<br>
-     * 描  述: 百行个人征信报告查询 <br>
-     * 创建人: yanhui.Hao <br>
-     * 创建时间: 2020.05.13 16:53 <br>
-     * 最后修改人:  <br>
-     * 最后修改时间: 2020.05.13 16:53 <br>
-     * 入参说明: [transactionId, uuid, identity, phone, name, queryReason, loanId] <br>
-     * 出参说明: java.lang.String <br>
-     * -----------------------------------------------------------------------------
-     */
-    @RequestMapping("/zxlmbh/persionCreditReport")
-    public String persionCreditReport(String key, String transactionId, String uuid, String identity, String phone, String name, String queryReason, String loanId) {
-        Map<String, Object> resultMap = null;
-        if(StringUtils.isEmpty(key) || !"b5140fb2-2c85-4b5a-abcf-3e97528014db".equals(key)){
-            resultMap = ImmutableMap.of("code", "301", "msg", "权限参数不能为空！");
-        }
-
-        if (StringUtils.isAnyBlank(identity, name, queryReason)) {
-            resultMap = ImmutableMap.of("code", "301", "msg", "业务参数不能为空！");
-        }else{
-            if (StringUtils.isEmpty(transactionId)) {
-                transactionId = IdUtils.getUuid();
-            }
-            resultMap = baiHangQueryService.queryBaiHangQ1OfZxlm(transactionId, uuid, identity, phone, name, queryReason, loanId);
-        }
-
-        return JSON.toJSONString(resultMap);
-    }
 
 
 

src/main/resources/baihang/rsa_private_key.pem

------BEGIN PRIVATE KEY-----
-duiFangWeiTiGong
------END PRIVATE KEY-----

src/main/resources/baihang/rsa_public_key.pem

------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCKkr3ojBpD3Ry0RKIVPYwfxu1hAnihpnqTShMUc+eou7qNtZaLhNV5rV/yPYEZBgoNGcJkPP3+vhcSdGHy+ItAgRicxykT+5ANIxevyLisPOLF4pSQPdemmwnmfsheV1l0VwB1uc4T4c9QEFeLz/d/SiPDwnYdCisRR5RKz/YrWwIDAQAB
------END PUBLIC KEY-----

src/main/resources/baihang/rsa_public_key_test.pem

------BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWXGJSOw/qQBXaui9Z7NITO4wV3f5Ysh7tbC9op/X33AI6JP8Zlnh7+ZPmuddrYHc683n+qdU3cONCaOTuWmBiXNDQfRqMkR69vpGJel7l9RpFqlR7pyWGkZ1Bac4wUXT+ewPjutT6LyKUaBbIV8Z4jIqO7j/qtvqJt1oHzNzZtwIDAQAB
------END PUBLIC KEY-----

src/main/resources/logback-dev.xml

@@ -2,13 +2,11 @@
 <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"/>
+              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} -&#45;&#45; [%thread] [%file:%line] %logger - %msg%n}"/>-->
+    <property name="FILE_LOG_PATTERN"
+              value="${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} --- [%logger{50}:%line] - %msg%n}"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <layout class="ch.qos.logback.classic.PatternLayout">
@@ -16,25 +14,35 @@
         </layout>
     </appender>
 
-     <!--logstash-->
-    <appender name="stash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-    <destination>172.30.220.6:9646</destination>
-    <!-- encoder is required -->
-    <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>/vpants/risk-datasource/logs/renhang-report.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>
+                /vpants/risk-datasource/logs/renhang-report.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:9652</destination>
+        <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"/>
 
-    <root level="INFO">
+    <root level="info">
         <appender-ref ref="STDOUT"/>
-        <appender-ref ref="stash"/>
+        <appender-ref ref="FILE"/>
+        <!--<appender-ref ref="stash"/>-->
     </root>
 
-</configuration>
-
+</configuration>
\ No newline at end of file
-
-