Skip to content

A
asset-distribution
Commit a4da5274 authored by liwenbin's avatar liwenbin
Browse files
Options

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

parents 8400bdac 352eb876
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 45 deletions
src/main/java/com/quantgroup/asset/distribution/config/http/HttpClientConfig.java
View file @ a4da5274
...@@ -23,9 +23,7 @@ import org.springframework.context.annotation.Configuration; ...@@ -23,9 +23,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.io.File; import java.io.*;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.security.KeyManagementException; import java.security.KeyManagementException;
...@@ -107,7 +105,7 @@ public class HttpClientConfig { ...@@ -107,7 +105,7 @@ public class HttpClientConfig {
} }
@Bean("niwodaiHttpsClient") @Bean("niwodaiHttpsClient")
public CloseableHttpClient niwodaiHttpsClient() throws Exception{ public CloseableHttpClient niwodaiHttpsClient() throws Exception {
/** /**
* 创建TrustManager * 创建TrustManager
*/ */
...@@ -125,11 +123,13 @@ public class HttpClientConfig { ...@@ -125,11 +123,13 @@ public class HttpClientConfig {
return null; return null;
} }
}; };
String classesPath = this.getClass().getClassLoader().getResource("niwodai/").getPath(); String classesPath = "/niwodai";
KeyStore keyStore = KeyStore.getInstance("PKCS12"); 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() SSLContext sslcontext = SSLContexts.custom()
.loadTrustMaterial(new File(classesPath + "qg-truststore.jks"), "password".toCharArray(), new TrustSelfSignedStrategy()) .loadTrustMaterial(trustStore, new TrustSelfSignedStrategy())
.loadKeyMaterial(keyStore, "password".toCharArray()) .loadKeyMaterial(keyStore, "password".toCharArray())
.build(); .build();
SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory( SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
...@@ -168,5 +168,7 @@ public class HttpClientConfig { ...@@ -168,5 +168,7 @@ public class HttpClientConfig {
.setRetryHandler(retryHandler) .setRetryHandler(retryHandler)
.setKeepAliveStrategy(keepAliveStrategy) .setKeepAliveStrategy(keepAliveStrategy)
.build(); .build();
} }
} }
src/test/java/com/quantgroup/asset/distribution/niwodai/NiwodaiTest.java
View file @ a4da5274
package com.quantgroup.asset.distribution.niwodai; 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.IUserSdkService;
import cn.quantgroup.user.UserSdkServiceFactory; import cn.quantgroup.user.UserSdkServiceFactory;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.google.common.base.Stopwatch;
import com.quantgroup.asset.distribution.AssetDistributionBootstrap; import com.quantgroup.asset.distribution.AssetDistributionBootstrap;
import com.quantgroup.asset.distribution.model.form.AssetForm; import com.quantgroup.asset.distribution.model.entity.fund.FundConfigCondition;
import com.quantgroup.asset.distribution.service.funding.IAidFundRouteRecordService; import com.quantgroup.asset.distribution.model.entity.fund.FundConfigSimulationVO;
import com.quantgroup.asset.distribution.service.jpa.entity.AidLoanFundRouteRecord; import com.quantgroup.asset.distribution.service.funding.IFundModuleService;
import com.quantgroup.asset.distribution.service.niwodai.INiwodaiAssetService; import com.quantgroup.asset.distribution.service.niwodai.INiwodaiAssetService;
import com.quantgroup.asset.distribution.service.niwodai.INiwodaiService; import com.quantgroup.asset.distribution.service.niwodai.INiwodaiService;
import com.quantgroup.asset.distribution.service.niwodai.vo.*; import com.quantgroup.asset.distribution.service.niwodai.vo.*;
import com.quantgroup.asset.distribution.service.redis.IRedisService;
import com.quantgroup.asset.distribution.util.GZIPUtils; import com.quantgroup.asset.distribution.util.GZIPUtils;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.junit.Test; import org.junit.Test;
...@@ -25,9 +21,7 @@ import org.springframework.boot.test.context.SpringBootTest; ...@@ -25,9 +21,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import java.math.BigDecimal; import java.util.List;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
import java.util.Map; import java.util.Map;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
...@@ -39,16 +33,13 @@ public class NiwodaiTest { ...@@ -39,16 +33,13 @@ public class NiwodaiTest {
@Autowired @Autowired
private INiwodaiAssetService niwodaiAssetService; private INiwodaiAssetService niwodaiAssetService;
@Autowired @Autowired
private IAidFundRouteRecordService aidFundRouteRecordService;
@Autowired
private IRedisService<AidLoanFundRouteRecord> redisService;
@Autowired
@Qualifier("httpClient") @Qualifier("httpClient")
private CloseableHttpClient httpClient; private CloseableHttpClient httpClient;
@Value("${user.sdk.url}") @Value("${user.sdk.url}")
private String userSysUrl; private String userSysUrl;
private IUserSdkService userSdkService; private IUserSdkService userSdkService;
@Autowired
private IFundModuleService fundModuleService;
@PostConstruct @PostConstruct
private void init() { private void init() {
userSdkService = UserSdkServiceFactory.generateSDKService(userSysUrl, httpClient); userSdkService = UserSdkServiceFactory.generateSDKService(userSysUrl, httpClient);
...@@ -56,7 +47,7 @@ public class NiwodaiTest { ...@@ -56,7 +47,7 @@ public class NiwodaiTest {
@Test @Test
public void testCheck() throws Exception { 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)); System.out.println(JSON.toJSONString(responseVO));
} }
...@@ -75,36 +66,25 @@ public class NiwodaiTest { ...@@ -75,36 +66,25 @@ public class NiwodaiTest {
@Test @Test
public void testIncoming() { public void testIncoming() {
AssetForm assetForm = new AssetForm(); NiwodaiIncomingResponseVO vo = niwodaiAssetService.incoming("2f0c65a8-c94e-4e03-87c6-b0ae99b100f0","AN000000135399103854755840","10000",12);
assetForm.setUuid("ae7d04bf-1c5a-475b-98d2-b193be88cf2f");
assetForm.setBizNo("1028791648161");
NiwodaiIncomingResponseVO vo = niwodaiAssetService.incoming(assetForm,new HashMap<>(),1);
System.out.println(JSON.toJSONString(vo)); System.out.println(JSON.toJSONString(vo));
} }
@Test @Test
public void testRedis() { public void testResult(){
String bizNo = "427114368038989811"; NiwodaiIncomingResultResponseVO vo = niwodaiAssetService.incomingResult("AN000000135399103854755840");
String fundId = "240"; System.out.println(JSON.toJSONString(vo));
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("完成");
} }
@Test @Test
public void testResult() { public void testFund(){
// String bizNo = "AN00000013443572551716033"; fundModuleService.getAllConditionsOfFundConfig(1L);
// System.out.println(niwodaiAssetService.incomingResult(bizNo));
System.out.println(JSON.toJSONString(userSdkService.findUserInfoByUuid("c5e485e2-8cfc-4d65-b090-47d96e4fca41").getData()));
} }
public static void main(String[] args) throws InterruptedException { @Test
Stopwatch stopwatch = Stopwatch.createStarted(); public void testFundResult(){
System.out.println(stopwatch.elapsed(TimeUnit.MILLISECONDS)); List<FundConfigCondition> list = ((FundConfigSimulationVO)fundModuleService.getAllConditionsOfFundConfig(7L).getBody()).getConditionsCase();
TimeUnit.SECONDS.sleep(10); fundModuleService.simulationCases(list,7L);
System.out.println(stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment