diff --git a/pom.xml b/pom.xml index a5d3514..98d058d 100644 --- a/pom.xml +++ b/pom.xml @@ -170,10 +170,10 @@ src/main/resources + true **/** - false @@ -278,14 +278,20 @@ dev + + + true + - + + dev pro - + + pro diff --git a/src/main/java/com/dpkj/modules/chs/controller/AlipayController.java b/src/main/java/com/dpkj/modules/chs/controller/AlipayController.java index 66452a7..b45ddd5 100644 --- a/src/main/java/com/dpkj/modules/chs/controller/AlipayController.java +++ b/src/main/java/com/dpkj/modules/chs/controller/AlipayController.java @@ -1,20 +1,8 @@ package com.dpkj.modules.chs.controller; -import cn.hutool.core.lang.Console; -import com.alibaba.fastjson.JSONObject; -import com.dpkj.common.config.ChsConfig; -import com.dpkj.common.constant.ChsConst; -import com.dpkj.common.vo.Result; -import com.dpkj.modules.chs.dll.AlipayDll; -import com.dpkj.modules.chs.entity.AlipayEcRequestData; import com.dpkj.modules.chs.service.IAlipayService; -import com.sun.jna.Memory; -import com.sun.jna.Pointer; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,54 +16,6 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/chs/alipay") public class AlipayController { - private final IAlipayService alipayService; - private final ChsConfig charsConfig; - - - @GetMapping("test") - public Result test() { - try { - AlipayDll.Dll dll = AlipayDll.instance(); - // Native.load("libeay32", AlipayDll.Dll.class); - // Native.load("ssleay32", AlipayDll.Dll.class); - - - JSONObject data = new JSONObject(); - AlipayEcRequestData alipayEcRequestData = new AlipayEcRequestData() - .setOrgId(charsConfig.getOrgcode()) - .setTransType(ChsConst.APITYPE_DECODE) - .setData(data); - String dataJson = JSONObject.toJSONString(alipayEcRequestData); - - Pointer resultStr = new Memory(1024 * 10); - String rs = dll.NationEcTrans( - "http://172.16.11.13:5946/api/chs/qrCodeQuery", - dataJson, - resultStr - ); - String rsStrString = resultStr.getString(0, "GB18030"); - Console.log(rsStrString); - Console.log(rs); - - return Result.ok("成功", rsStrString); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("失败"); - } - } - - @PostMapping("qrCodeQuery") - public Result qrCodeQuery(@RequestBody JSONObject data) { - try { - - Console.log(data); - return Result.ok("成功", null); - } catch (Exception e) { - e.printStackTrace(); - return Result.error("失败"); - } - } - } diff --git a/src/main/java/com/dpkj/modules/chs/service/impl/AlipayServiceImpl.java b/src/main/java/com/dpkj/modules/chs/service/impl/AlipayServiceImpl.java index 2359566..f6bc781 100644 --- a/src/main/java/com/dpkj/modules/chs/service/impl/AlipayServiceImpl.java +++ b/src/main/java/com/dpkj/modules/chs/service/impl/AlipayServiceImpl.java @@ -1,6 +1,5 @@ package com.dpkj.modules.chs.service.impl; -import cn.hutool.core.lang.Console; import com.dpkj.modules.chs.dll.AlipayDll; import com.dpkj.modules.chs.service.IAlipayService; import lombok.extern.slf4j.Slf4j; @@ -17,22 +16,22 @@ import javax.annotation.PostConstruct; @Service public class AlipayServiceImpl implements IAlipayService { - private AlipayDll.Dll dll = AlipayDll.instance(); + private AlipayDll.Dll dll; - public AlipayServiceImpl() throws AlipayDll.DllRegistrationException { - } - @PostConstruct public void postConstruct() { log.info("[AlipayServiceImpl][postConstruct][医保DLL] 初始化动态链接库"); + try { + dll = AlipayDll.instance(); + } catch (AlipayDll.DllRegistrationException e) { + // TODO 萧道子 2025/6/19 : + } initPrinter(); } private void initPrinter() { - Console.log(dll); + } - - } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 12a9ee7..d5b756f 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,29 @@ server: port: 5948 + servlet: + context-path: /api + tomcat: + max-swallow-size: -1 + error: + include-exception: true + include-stacktrace: ALWAYS + include-message: ALWAYS + compression: + enabled: true + min-response-size: 1024 + mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* + +logging: + level: + com.dpkj: debug + +spring: + servlet: + multipart: + max-file-size: 10MB + max-request-size: 10MB + resource: + static-locations: classpath:/static/,classpath:/public/ dpkj: #后端项目访问地址 #https://yinyitong.yzqingyan.cn/ http://172.16.11.13:15946/ ttps://yinyitong.yzqingyan.cn diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index a06acd7..47bf1f5 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,5 +1,29 @@ server: port: 5946 + servlet: + context-path: /api + tomcat: + max-swallow-size: -1 + error: + include-exception: true + include-stacktrace: ALWAYS + include-message: ALWAYS + compression: + enabled: true + min-response-size: 1024 + mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* + +logging: + level: + com.dpkj: debug + +spring: + servlet: + multipart: + max-file-size: 10MB + max-request-size: 10MB + resource: + static-locations: classpath:/static/,classpath:/public/ dpkj: #后端项目访问地址 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 44381a2..670ddab 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,29 +1,5 @@ -server: - servlet: - context-path: /api - tomcat: - max-swallow-size: -1 - error: - include-exception: true - include-stacktrace: ALWAYS - include-message: ALWAYS - compression: - enabled: true - min-response-size: 1024 - mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* - -logging: - level: - com.dpkj: debug - spring: - servlet: - multipart: - max-file-size: 10MB - max-request-size: 10MB - resource: - static-locations: classpath:/static/,classpath:/public/ application: - name: ems-express-bridge + name: yinyitong-zhongyuyuan-dll-stand profiles: - active: pro + active: '@profile.name@' diff --git a/src/main/resources/win32-x86/AlipayChs.dll b/src/main/resources/win32-x86/AlipayChs.dll index 5d0cf23..e69de29 100644 Binary files a/src/main/resources/win32-x86/AlipayChs.dll and b/src/main/resources/win32-x86/AlipayChs.dll differ