diff --git a/pom.xml b/pom.xml index 5a54969..045f4fb 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ junit junit - 4.11 + 4.8.2 test diff --git a/src/main/java/com/lakala/moss/util/PropertiesUtil.java b/src/main/java/com/lakala/moss/util/PropertiesUtil.java index 7aac8d3..c5fd8a5 100644 --- a/src/main/java/com/lakala/moss/util/PropertiesUtil.java +++ b/src/main/java/com/lakala/moss/util/PropertiesUtil.java @@ -1,6 +1,8 @@ package com.lakala.moss.util; import java.io.*; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -143,7 +145,16 @@ public class PropertiesUtil { * 静态内部类,单例模式,保证只有一个实例变量 */ private static class PropertiesUtilHolder { - private static PropertiesUtil instance = new PropertiesUtil(propertiesParentPath, fileEncode); + private static PropertiesUtil instance; + + static { + String parentPath = propertiesParentPath; + if (!Files.exists(Paths.get(parentPath))) { + parentPath = PropertiesUtil.class.getClassLoader() + .getResource(DEFAULT_PROPERTIES_NAME).getPath().replace(DEFAULT_PROPERTIES_NAME, ""); + } + instance = new PropertiesUtil(parentPath, fileEncode); + } } /** * 加载配置文件,需要进行加锁 diff --git a/src/main/resources/moss-sdk.properties b/src/main/resources/moss-sdk.properties index 07907db..7becfd1 100644 --- a/src/main/resources/moss-sdk.properties +++ b/src/main/resources/moss-sdk.properties @@ -1,8 +1,8 @@ api.versionId = 1.0 -api.businessChannel = C00000001 +api.businessChannel = C00000097 api.channelId = API -api.order.url = https://moss.wsmsd.cn/ord-api/unified/v3 +api.order.url = https://moss.lakala.com/ord-api/unified/v3 -mer.pub.key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/g7kWVjxMV1f0CTqp4GxCwRCB6zIWOeclSvqycRUa2YjYYd92bQn+KtpogYLuzaKT0ns24wCWVar+pVx7cokG2mJsQfe4epZQcq+tBgZcIE6nSVBp9dfWMX8w6AtT3QLURqzP9tMFXrysisKbdy54kNOUPcGWC0rg11oK6BvXbwIDAQAB -mer.pri.key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL+DuRZWPExXV/QJOqngbELBEIHrMhY55yVK+rJxFRrZiNhh33ZtCf4q2miBgu7NopPSezbjAJZVqv6lXHtyiQbaYmxB97h6llByr60GBlwgTqdJUGn119YxfzDoC1PdAtRGrM/20wVevKyKwpt3LniQ05Q9wZYLSuDXWgroG9dvAgMBAAECgYBh8o6A3A3uxWUYTHgSVdNIuNEmgRGWyHptWlGpXah7mPIiKLxPJylLMsONW1+JnuYdUDLwOV0dhib0IcKQ6F0nnq7CYqyPr6nL32pu0bGQbxjl6PgtYD0qc85AMHOJ5/NYujSKzW+HxByDNa6u7+m1LXDIgVm2qhiy/xYaKX58wQJBAPKPeStpZn2hzMjhmL6X0A1Xvvr+LaUgZHVOC/AA1eoGcGCPmmGHETMU1e7+ZW1Ti/JErABOqrI7bQTVHascdLECQQDKIDRJqP0CbXvJh5ThpinwpVRJ4BxTUxRs+9lCQDZ23SmFE0HhSgUZL4EMsrdPNzmdH2W56TYy3Ivpyl/SapYfAkEA5b9FuvvDiz3FFYSxQ93Rv8Gb8Gru2xgabw20uuhftaHRsXRzeusPPH4AwLWPZoUa6idnb4cToWwuL8SYrGlwkQJADtwDPA8SWqVV3mD7TwN6PdjJs4yoSG/pJoH1XOt/lYl4zfG2fCuG6G0Xnald1JMIx0ZRojNE6sRP/OYF2WBAnQJBAMIAdErHJLrKNo2ZSuJj9hrg51f540J95BjOYkXct25vX4ih3W2981gH08K+D4sk/kOLyTe1FOozJZLjjgSHfCs= -moss.pub.key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDI/54uIovSxoDNwK+RkdXSnIwjlKPZBFcv6kYyPV9A8iyCgwcIfydXpA2ueCecyg/xPfLbFfiZpQsOUJvebtoOzAKGK9F48G7yGOG/ZhfS1ZM5LOWSVpy8sqMj8YgAhK42ZlIEivBwSdlwKkFsjDw02P57McfC0VvyVUsd/68cvwIDAQAB \ No newline at end of file +mer.pub.key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCy2yf8AeYn1Ff6PD+qwuP2pczSfxq1A6ewvD345HmM8JGvqnbMXqy/iSEHFf0N4cHHTVVESg1ISuqRYLg2O3ULT4n8cvR3DrUJm8SM7vdYqhna5N9MBH9t8LlwJLAlNuYlpsnreC62xALgmTeZpKIyNOazRAdTNcbOIkcaDojMywIDAQAB +mer.pri.key=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALLbJ/wB5ifUV/o8P6rC4/alzNJ/GrUDp7C8PfjkeYzwka+qdsxerL+JIQcV/Q3hwcdNVURKDUhK6pFguDY7dQtPifxy9HcOtQmbxIzu91iqGdrk30wEf23wuXAksCU25iWmyet4LrbEAuCZN5mkojI05rNEB1M1xs4iRxoOiMzLAgMBAAECgYEAouCVnxeToz3rCIUJbdahhyIiTqdViPbVJUuoHBrk3obOBW11VlP5eUvF+g/6LUQkFf3E4rWVNvqSduXfm/O1d5glAwy2/oyZz5WHEGNKwVdTl125v22+9f0ZcE1slqBvvBDzSLwB8UedWLx9ZT7qQpuCZDNyobEKJ6h2tp21FfECQQD04qLQYNx1FCoCQlAICx/a81R0jdIwP9+NIrWZM+dSGYOK/YysKHb5j9+muwXulrryU86z7CCV8a/1yZyCpeylAkEAuvlQwdZpAf8ejcDE5naRy/a4mhedkg+nQAg4YAEO/TInEYhDua4WgMEwe6k9R0KhLVQSTkcMNbsEpjIwjMVorwJAWudmmQPb0npRvdTv8Ixwns6FI18iD1cmnTWtQ9nInOlrs0S724yJ3cpSs4npgc/iReJmcNPOpNq6/vqAZt9BIQJAWkRzkKGLIMOiZJ1kcj9cNDRw+zPbhuC3xloxnWflbKgB5Jz81XAOvSqH1avnQbgRSGkGTXRPmMEphXNFrTDBUQJAL6WUyojb0i+06vmlhtP5mLF5U7/7F2qs5IHqyNcGeuCDf73LHKVvyN5TH4tzmEwPzN0BCNowJLxHrZF/t0cReg== +moss.pub.key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD3E6H3qfgqF7aKypmSuzMIRuL/pRFMzsyqMlSEzzo2aJqN7w8Lb2tfVRfnAUVKMFyDxUzNWER4E/UfR4ymo0YHOaiIJI3AHWdJngJyGgK+SfvYDs9rqC++yisrzYv/TN3fZ93Ru1YWOYi4x4lBSCC9UX2b28hwx32MpJHT7gIrMQIDAQAB \ No newline at end of file diff --git a/src/test/java/com/lakala/moss/MossApiTest.java b/src/test/java/com/lakala/moss/MossApiTest.java index 6dbc714..1cfa5ee 100644 --- a/src/test/java/com/lakala/moss/MossApiTest.java +++ b/src/test/java/com/lakala/moss/MossApiTest.java @@ -45,27 +45,33 @@ public class MossApiTest { logger.info("res={}",gson.toJson(res)); } // 订单支付-独立支付 + //{"order_no":"PY17567817943290000000362", + // "total_amount":"2.00", + // "mer_no":"M00000233", + // "remark":"学费缴纳", + // "notify_url":"https://zj.zjhzzsb.com/api/pay/lkl/notify", + // "pay_scene":"0","account_type":"ALIPAY,WECHAT,UQRCODEPAY","subject":"学费缴纳协议 - 梦想班(2026)"} @Test public void testOrderPay(){ Gson gson = new GsonBuilder().disableHtmlEscaping().create(); IMossApiService mossApi = new MossApiServiceImpl(); OrderPayReq req = new OrderPayReq(); - req.setOrder_no("DemoMOSS202502250000012"); + req.setOrder_no("PY17567817943290000000362"); req.setTotal_amount("1"); - req.setMer_no("M00000036"); - req.setRemark("测试"); - req.setNotify_url(""); - req.setPay_scene("1"); - req.setAccount_type("UQRCODEPAY"); - req.setSubject("测试标题"); - req.setOrder_eff_time("15"); - req.setTrans_type("51"); - req.setUser_id("olpr-0sYaDrxaT5GmLUgUenVcDPo"); - LocationInfo location_info = new LocationInfo(); - location_info.setRequest_ip("36.45.36.95"); - location_info.setBase_station("00 6361 58130"); - location_info.setLocation("+37.123456789,-121.123456789"); - req.setLocation_info(location_info); + req.setMer_no("M00000233"); + req.setRemark("学费缴纳"); + req.setNotify_url("https://zj.zjhzzsb.com/api/pay/lkl/notify"); + req.setPay_scene("0"); + req.setAccount_type("ALIPAY,WECHAT,UQRCODEPAY"); + req.setSubject("学费缴纳协议 - 梦想班(2026)"); +// req.setOrder_eff_time("15"); +// req.setTrans_type("51"); +// req.setUser_id("olpr-0sYaDrxaT5GmLUgUenVcDPo"); +// LocationInfo location_info = new LocationInfo(); +// location_info.setRequest_ip("36.45.36.95"); +// location_info.setBase_station("00 6361 58130"); +// location_info.setLocation("+37.123456789,-121.123456789"); +// req.setLocation_info(location_info); ApiRes res = mossApi.OrderPay(req); logger.info("res={}",gson.toJson(res)); }