记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit fd18c58e authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/test' into test

parents 52cb493f 1894f164
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 79 deletions
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/test/java/com/liquidnet/service/adam/test/TestRedis.java 0 → 100644
View file @ fd18c58e
package com.liquidnet.service.adam.test;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
* @version V1.0
* @Description: TODO
* @class: TestRedis
* @Package com.liquidnet.service.adam.test
* @Copyright: LightNet @ Copyright (c) 2021
* @date 2021/7/29 13:36
*/
@Slf4j
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest
public class TestRedis {
@Autowired
private RedisUtil redisUtil;
@Test
public void getsetValu(){
System.out.println(redisUtil.sGet("kylin:agent:info"));
System.out.println(redisUtil.sHasKey("kylin:agent:info",14));
}
}
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/test/java/com/liquidnet/service/DragonPayTest.java
View file @ fd18c58e
package com.liquidnet.service; //package com.liquidnet.service;
//
import com.alibaba.fastjson.JSON; //import com.alibaba.fastjson.JSON;
import com.liquidnet.commons.lang.util.JsonUtils; //import com.liquidnet.commons.lang.util.JsonUtils;
import org.apache.http.NameValuePair; //import com.liquidnet.service.dragon.utils.ObjectUtil;
import org.apache.http.message.BasicNameValuePair; //import org.apache.http.NameValuePair;
//import org.apache.http.message.BasicNameValuePair;
import java.util.ArrayList; //import org.springframework.util.MultiValueMap;
import java.util.HashMap; //
import java.util.List; //import java.util.ArrayList;
import java.util.Map; //import java.util.HashMap;
//import java.util.List;
/** //import java.util.Map;
* @author AnJiabin <anjiabin@zhengzai.tv> //
* @version V1.0 ///**
* @Description: TODO // * @author AnJiabin <anjiabin@zhengzai.tv>
* @class: DragonPayTest // * @version V1.0
* @Package com.liquidnet.service // * @Description: TODO
* @Copyright: LightNet @ Copyright (c) 2021 // * @class: DragonPayTest
* @date 2021/7/27 13:47 // * @Package com.liquidnet.service
*/ // * @Copyright: LightNet @ Copyright (c) 2021
//@RunWith(SpringJUnit4ClassRunner.class) // * @date 2021/7/27 13:47
//@SpringBootTest // */
public class DragonPayTest { ////@RunWith(SpringJUnit4ClassRunner.class)
////@SpringBootTest
public static void testMap(){ //public class DragonPayTest {
List<NameValuePair> nvps = new ArrayList<NameValuePair>(); //
nvps.add(new BasicNameValuePair("status", "1")); // public static void testMap(){
nvps.add(new BasicNameValuePair("type", "TICKET")); // List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("code", "PAY20210727111746415639688")); // nvps.add(new BasicNameValuePair("status", "1"));
nvps.add(new BasicNameValuePair("paymentId", "4200001121202107274119605305")); // nvps.add(new BasicNameValuePair("type", "TICKET"));
nvps.add(new BasicNameValuePair("orderCode", "11766977997930496418880635")); // nvps.add(new BasicNameValuePair("code", "PAY20210727111746415639688"));
nvps.add(new BasicNameValuePair("price", "0.01")); // nvps.add(new BasicNameValuePair("paymentId", "4200001121202107274119605305"));
nvps.add(new BasicNameValuePair("paymentType", "APPWEPAY")); // nvps.add(new BasicNameValuePair("orderCode", "11766977997930496418880635"));
nvps.add(new BasicNameValuePair("paymentAt", "2021-07-27 11:18:03")); // nvps.add(new BasicNameValuePair("price", "0.01"));
String jsonData = JSON.toJSONString(nvps); // nvps.add(new BasicNameValuePair("paymentType", "APPWEPAY"));
System.out.println("jsonDate === "+jsonData); // nvps.add(new BasicNameValuePair("paymentAt", "2021-07-27 11:18:03"));
System.out.println("covertNVPS2Params jsonDate === "+covertNVPS2Params(nvps)); // String jsonData = JSON.toJSONString(nvps);
System.out.println("covertNVPS2Params jsonDate === "+ JsonUtils.toJson(covertNVPS2Params(nvps))); // System.out.println("jsonDate === "+jsonData);
System.out.println("covertNVPS2Params jsonDate === "+ covertNVPS2KeyValue(nvps)); // System.out.println("covertNVPS2Params jsonDate === "+covertNVPS2Params(nvps));
} // System.out.println("covertNVPS2Params jsonDate === "+ JsonUtils.toJson(covertNVPS2Params(nvps)));
private static ArrayList<NameValuePair> covertParams2NVPS(Map<String, Object> params) { // System.out.println("covertNVPS2KeyValue jsonDate === "+ covertNVPS2KeyValue(nvps));
ArrayList<NameValuePair> pairs = new ArrayList<NameValuePair>(); // }
for (Map.Entry<String, Object> param : params.entrySet()) { //
pairs.add(new BasicNameValuePair(param.getKey(), String.valueOf(param.getValue()))); // public static void testMap2() {
} // MultiValueMap<String, String> params = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
// params.add("status", "1");
return pairs; // params.add("type", "TICKET");
} // params.add("code","PAY20210727111746415639688");
private static Map<String, Object> covertNVPS2Params(List<NameValuePair> nvpList) { // params.add("paymentId", "4200001121202107274119605305");
Map<String, Object> rsMap = new HashMap<>(); // params.add("orderCode", "11766977997930496418880635");
for (NameValuePair nameValuePair : nvpList) { // params.add("price", "0.01");
rsMap.put(nameValuePair.getName(),nameValuePair.getValue()); // params.add("paymentType", "APPWEPAY");
} // params.add("paymentAt", "2021-07-27 11:18:03");
return rsMap; // String jsonData = JsonUtils.toJson(params);
} // System.out.println("jsonData === "+jsonData);
// System.out.println("jsonData === " + covertNVPS2KeyValue(params));
private static String covertNVPS2KeyValue(List<NameValuePair> nvpList) { // }
StringBuffer sb = new StringBuffer(); // private static ArrayList<NameValuePair> covertParams2NVPS(Map<String, Object> params) {
for (NameValuePair nameValuePair : nvpList) { // ArrayList<NameValuePair> pairs = new ArrayList<NameValuePair>();
sb.append(nameValuePair.getName()+":"+nameValuePair.getValue()+"\n"); // for (Map.Entry<String, Object> param : params.entrySet()) {
} // pairs.add(new BasicNameValuePair(param.getKey(), String.valueOf(param.getValue())));
return sb.toString(); // }
} //
// return pairs;
public static void main(String[] args) { // }
testMap(); // private static ArrayList<NameValuePair> covertParams2NVPS(MultiValueMap<String, String> params) {
} // ArrayList<NameValuePair> pairs = new ArrayList<NameValuePair>();
} // for (Map.Entry<String, List<String>>param : params.entrySet()) {
// pairs.add(new BasicNameValuePair(param.getKey(), param.getValue()));
// }
//
// return pairs;
// }
// private static Map<String, Object> covertNVPS2Params(List<NameValuePair> nvpList) {
// Map<String, Object> rsMap = new HashMap<>();
// for (NameValuePair nameValuePair : nvpList) {
// rsMap.put(nameValuePair.getName(),nameValuePair.getValue());
// }
// return rsMap;
// }
//
// private static String covertNVPS2KeyValue(List<NameValuePair> nvpList) {
// StringBuffer sb = new StringBuffer();
// for (NameValuePair nameValuePair : nvpList) {
// sb.append(nameValuePair.getName()+":"+nameValuePair.getValue()+"\n");
// }
// return sb.toString();
// }
//
// private static String covertNVPS2KeyValue(Map<String, String> mapParam) {
// ArrayList<NameValuePair> pairs = covertParams2NVPS(mapParam);
// return covertNVPS2KeyValue(pairs);
// }
//
// public static void main(String[] args) {
//
// testMap();
// testMap2();
// }
//}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java
View file @ fd18c58e
...@@ -39,18 +39,18 @@ public class KylinOrderTicketsController { ...@@ -39,18 +39,18 @@ public class KylinOrderTicketsController {
@Autowired @Autowired
IKylinOrderTicketsOrderService orderTicketsOrderService; IKylinOrderTicketsOrderService orderTicketsOrderService;
@PostMapping("pre") // @PostMapping("pre")
@ApiOperation("下单") // @ApiOperation("下单")
@ApiResponse(code = 200, message = "接口返回对象参数") // @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayInnerResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) { // public ResponseDto<PayInnerResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
return orderTicketsOrderService.checkCanOrder(payOrderParam); // return orderTicketsOrderService.checkCanOrder(payOrderParam);
} // }
@DecryptAndVerify(decryptedClass = PayOrderParam.class) @DecryptAndVerify(decryptedClass = PayOrderParam.class)
@PostMapping("pre2") @PostMapping("pre")
@ApiOperation("下单2") @ApiOperation("下单")
@ApiResponse(code = 200, message = "接口返回对象参数") @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PayInnerResultVo> checkCanOrder2(@RequestBody @Valid EncryptedReq<PayOrderParam> encryptedReq) { public ResponseDto<PayInnerResultVo> checkCanOrder(@RequestBody @Valid EncryptedReq<PayOrderParam> encryptedReq) {
PayOrderParam payOrderParam = encryptedReq.getData(); PayOrderParam payOrderParam = encryptedReq.getData();
return orderTicketsOrderService.checkCanOrder(payOrderParam); return orderTicketsOrderService.checkCanOrder(payOrderParam);
} }
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/test/java/com/liquidnet/service/order/test/CodecTest.java
View file @ fd18c58e
...@@ -33,7 +33,8 @@ public class CodecTest { ...@@ -33,7 +33,8 @@ public class CodecTest {
System.out.println("时间戳：" + timestamp); System.out.println("时间戳：" + timestamp);
// UserLoginReq userLoginReq = new UserLoginReq("admin", "admin"); // UserLoginReq userLoginReq = new UserLoginReq("admin", "admin");
// String data = JSON.toJSONString(userLoginReq); // String data = JSON.toJSONString(userLoginReq);
String data = "{\"number\":1,\"ticketId\":\"2811887059054592999181\",\"isElectronic\":1,\"isExpress\":0,\"deviceFrom\":\"wap\",\"actual\":0.01,\"performanceId\":\"2811713813327872196937\",\"timeId\":\"2811766812553216086853\",\"returnUrl\":\"http://testm.zhengzai.tv/#/order/status?order_type=ticket&order_id=\",\"showUrl\":\"http://testm.zhengzai.tv/#/order/status?order_type=ticket&order_id=\",\"expressType\":2,\"agentId\":0,\"payType\":\"alipay\"}"; // String data = "{\"number\":1,\"ticketId\":\"2811887059054592999181\",\"isElectronic\":1,\"isExpress\":0,\"deviceFrom\":\"wap\",\"actual\":0.01,\"performanceId\":\"2811713813327872196937\",\"timeId\":\"2811766812553216086853\",\"returnUrl\":\"http://testm.zhengzai.tv/#/order/status?order_type=ticket&order_id=\",\"showUrl\":\"http://testm.zhengzai.tv/#/order/status?order_type=ticket&order_id=\",\"expressType\":2,\"agentId\":0,\"payType\":\"alipay\"}";
String data = "{\"number\":1,\"ticketId\":\"11316\",\"isElectronic\":1,\"isExpress\":0,\"deviceFrom\":\"wap\",\"actual\":220,\"performanceId\":\"5936371\",\"timeId\":\"126207700372889606864872\",\"returnUrl\":\"http://172.16.2.120:8080/#/pay/status?order_type=ticket&order_id=\",\"showUrl\":\"http://172.16.2.120:8080/#/pay/status?order_type=ticket&order_id=\",\"expressType\":1,\"agentId\":0,\"payType\":\"wepay\"}";
System.out.println("加密前的数据：" + data); System.out.println("加密前的数据：" + data);
String encryptedData = CodecUtil.aesEncrypt(data); String encryptedData = CodecUtil.aesEncrypt(data);
System.out.println("加密后的数据：" + encryptedData); System.out.println("加密后的数据：" + encryptedData);
...@@ -46,3 +47,12 @@ public class CodecTest { ...@@ -46,3 +47,12 @@ public class CodecTest {
System.out.println("加密后的请求：" + JSON.toJSONString(encryptedReq)); System.out.println("加密后的请求：" + JSON.toJSONString(encryptedReq));
} }
} }
//CodecUtil.AES_SECRET_KEY_BYTES=== XjjkaLnlzAFbR399IP4kdQ==
// f52666839c984e5720a06a9ca4673dd12e8f4ffa
// 时间戳：1627622460314
// 加密前的数据：{"number":1,"ticketId":"11316","isElectronic":1,"isExpress":0,"deviceFrom":"wap","actual":220,"performanceId":"5936371","timeId":"126207700372889606864872","returnUrl":"http://172.16.2.120:8080/#/pay/status?order_type=ticket&order_id=","showUrl":"http://172.16.2.120:8080/#/pay/status?order_type=ticket&order_id=","expressType":1,"agentId":0,"payType":"wepay"}
// 加密后的数据：HGGFm1DHHYnRZHgvB25eSEneEFPRCvNcrheFlSTGRRLVzY4QscH4v1TmzJ5MXzhIfh3iYsBj/NEfZ7ynNZ2qO8QeOTxBLjVJSxU3NZNArsz52BpMmbF70GlGT5b++0QszHvDo9lNTMHNWLqh8711tdYxLbtFMMKTSpJcvzJOiyCmA3d5vLdkNvZ9IjkTrjoDQ3KEYCumGUue6n4CmA6VRqSvc4HnD6A4tkzyhgOR5o0pLJduvnkuGSqtsdZpkBnXpos91xTfNNUm7i1tiYPZXA0EVn7OfFfh+zEEfyQx/Nfn3SNQ079abatubI4Yko4NoP7FgG2i5J6JVB6UgpWqeMcKHACDlxQmadTdQ9eR4qCjKlf38MoNuAIfdwLCSHPeMRjgl2WeQAqCmOR/+L7V8pGDYZR+6oFgBjl6zx3HANJsMhpNsUPKYO9qO1iqdGsMuq7ZYlXlNy1txroij5usZcLHwD/bmOXKO/X07yV559g=
// 签名：4465b794fe277545cfcd37cdbf7dbecae491213f
// 加密后的请求：{"encryptedData":"HGGFm1DHHYnRZHgvB25eSEneEFPRCvNcrheFlSTGRRLVzY4QscH4v1TmzJ5MXzhIfh3iYsBj/NEfZ7ynNZ2qO8QeOTxBLjVJSxU3NZNArsz52BpMmbF70GlGT5b++0QszHvDo9lNTMHNWLqh8711tdYxLbtFMMKTSpJcvzJOiyCmA3d5vLdkNvZ9IjkTrjoDQ3KEYCumGUue6n4CmA6VRqSvc4HnD6A4tkzyhgOR5o0pLJduvnkuGSqtsdZpkBnXpos91xTfNNUm7i1tiYPZXA0EVn7OfFfh+zEEfyQx/Nfn3SNQ079abatubI4Yko4NoP7FgG2i5J6JVB6UgpWqeMcKHACDlxQmadTdQ9eR4qCjKlf38MoNuAIfdwLCSHPeMRjgl2WeQAqCmOR/+L7V8pGDYZR+6oFgBjl6zx3HANJsMhpNsUPKYO9qO1iqdGsMuq7ZYlXlNy1txroij5usZcLHwD/bmOXKO/X07yV559g=","sign":"4465b794fe277545cfcd37cdbf7dbecae491213f","timestamp":1627622460314}
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