Merge branch 'zj-niwodai' of http://git.quantgroup.cn/data-spider/asset-server into zj-niwodai

src/main/java/com/quantgroup/asset/distribution/config/http/HttpClientConfig.java

@@ -23,9 +23,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ClassUtils;
 
 import javax.net.ssl.*;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.*;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.security.KeyManagementException;
@@ -107,7 +105,7 @@ public class HttpClientConfig {
     }
 
     @Bean("niwodaiHttpsClient")
-    public CloseableHttpClient niwodaiHttpsClient() throws Exception{
+    public CloseableHttpClient niwodaiHttpsClient() throws Exception {
         /**
          * 创建TrustManager
          */
@@ -125,11 +123,13 @@ public class HttpClientConfig {
                 return null;
             }
         };
-        String classesPath = this.getClass().getClassLoader().getResource("niwodai/").getPath();
+        String classesPath = "/niwodai";
         KeyStore keyStore = KeyStore.getInstance("PKCS12");
-        keyStore.load(new FileInputStream(new File(classesPath + "qg-keystore.jks")), "password".toCharArray());
+        keyStore.load(HttpClientConfig.class.getResourceAsStream(classesPath + "/qg-keystore.jks"), "password".toCharArray());
+        KeyStore trustStore = KeyStore.getInstance("JKS");
+        trustStore.load(HttpClientConfig.class.getResourceAsStream(classesPath + "/qg-truststore.jks"), "password".toCharArray());
         SSLContext sslcontext = SSLContexts.custom()
-                .loadTrustMaterial(new File(classesPath + "qg-truststore.jks"), "password".toCharArray(), new TrustSelfSignedStrategy())
+                .loadTrustMaterial(trustStore, new TrustSelfSignedStrategy())
                 .loadKeyMaterial(keyStore, "password".toCharArray())
                 .build();
         SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
@@ -168,5 +168,7 @@ public class HttpClientConfig {
                 .setRetryHandler(retryHandler)
                 .setKeepAliveStrategy(keepAliveStrategy)
                 .build();
+
     }
+
 }

src/test/java/com/quantgroup/asset/distribution/niwodai/NiwodaiTest.java

 package com.quantgroup.asset.distribution.niwodai;
 
-import cn.quantgroup.motan.bean.UserInfo;
-import cn.quantgroup.motan.vo.UserSysResult;
 import cn.quantgroup.user.IUserSdkService;
 import cn.quantgroup.user.UserSdkServiceFactory;
 import com.alibaba.fastjson.JSON;
-import com.google.common.base.Stopwatch;
 import com.quantgroup.asset.distribution.AssetDistributionBootstrap;
-import com.quantgroup.asset.distribution.model.form.AssetForm;
-import com.quantgroup.asset.distribution.service.funding.IAidFundRouteRecordService;
-import com.quantgroup.asset.distribution.service.jpa.entity.AidLoanFundRouteRecord;
+import com.quantgroup.asset.distribution.model.entity.fund.FundConfigCondition;
+import com.quantgroup.asset.distribution.model.entity.fund.FundConfigSimulationVO;
+import com.quantgroup.asset.distribution.service.funding.IFundModuleService;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiAssetService;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiService;
 import com.quantgroup.asset.distribution.service.niwodai.vo.*;
-import com.quantgroup.asset.distribution.service.redis.IRedisService;
 import com.quantgroup.asset.distribution.util.GZIPUtils;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.junit.Test;
@@ -25,9 +21,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.PostConstruct;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
+import java.util.List;
 import java.util.Map;
 
 @RunWith(SpringRunner.class)
@@ -39,16 +33,13 @@ public class NiwodaiTest {
 	@Autowired
 	private INiwodaiAssetService niwodaiAssetService;
 	@Autowired
-	private IAidFundRouteRecordService aidFundRouteRecordService;
-	@Autowired
-	private IRedisService<AidLoanFundRouteRecord> redisService;
-	@Autowired
 	@Qualifier("httpClient")
 	private CloseableHttpClient httpClient;
 	@Value("${user.sdk.url}")
 	private String userSysUrl;
 	private IUserSdkService userSdkService;
-
+	@Autowired
+	private IFundModuleService fundModuleService;
 	@PostConstruct
 	private void init() {
 		userSdkService = UserSdkServiceFactory.generateSDKService(userSysUrl, httpClient);
@@ -56,7 +47,7 @@ public class NiwodaiTest {
 
 	@Test
 	public void testCheck() throws Exception {
-		NiwodaiDataImportCheckResponseVO responseVO = niwodaiAssetService.preAudit("9f7f857c-10c3-42aa-8fc5-31c37e988b3e");
+		NiwodaiDataImportCheckResponseVO responseVO = niwodaiAssetService.dataCheck("9f7f857c-10c3-42aa-8fc5-31c37e988b3e");
 		System.out.println(JSON.toJSONString(responseVO));
 	}
 
@@ -75,36 +66,25 @@ public class NiwodaiTest {
 
 	@Test
 	public void testIncoming() {
-		AssetForm assetForm = new AssetForm();
-		assetForm.setUuid("ae7d04bf-1c5a-475b-98d2-b193be88cf2f");
-		assetForm.setBizNo("1028791648161");
-		NiwodaiIncomingResponseVO vo = niwodaiAssetService.incoming(assetForm,new HashMap<>(),1);
+		NiwodaiIncomingResponseVO vo = niwodaiAssetService.incoming("2f0c65a8-c94e-4e03-87c6-b0ae99b100f0","AN000000135399103854755840","10000",12);
 		System.out.println(JSON.toJSONString(vo));
 	}
 
 	@Test
-	public void testRedis() {
-		String bizNo = "427114368038989811";
-		String fundId = "240";
-		AidLoanFundRouteRecord record = aidFundRouteRecordService.findByBizNoAndFundId(bizNo, fundId);
-		redisService.setEntityEx("testestst", record, 5, TimeUnit.MINUTES);
-
-		AidLoanFundRouteRecord record1 = redisService.getEntity("testestst");
-		aidFundRouteRecordService.updateAidLoanFundRouteRecordStatus(record1, 3);
-		System.out.println("完成");
+	public void testResult(){
+		NiwodaiIncomingResultResponseVO vo = niwodaiAssetService.incomingResult("AN000000135399103854755840");
+		System.out.println(JSON.toJSONString(vo));
 	}
 
 	@Test
-	public void testResult() {
-//		String bizNo = "AN00000013443572551716033";
-//		System.out.println(niwodaiAssetService.incomingResult(bizNo));
-		System.out.println(JSON.toJSONString(userSdkService.findUserInfoByUuid("c5e485e2-8cfc-4d65-b090-47d96e4fca41").getData()));
+	public void testFund(){
+		fundModuleService.getAllConditionsOfFundConfig(1L);
 	}
 
-	public static void main(String[] args) throws InterruptedException {
-		Stopwatch stopwatch = Stopwatch.createStarted();
-		System.out.println(stopwatch.elapsed(TimeUnit.MILLISECONDS));
-		TimeUnit.SECONDS.sleep(10);
-		System.out.println(stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
+	@Test
+	public void testFundResult(){
+		List<FundConfigCondition> list = ((FundConfigSimulationVO)fundModuleService.getAllConditionsOfFundConfig(7L).getBody()).getConditionsCase();
+		fundModuleService.simulationCases(list,7L);
 	}
+
 }