瀏覽代碼

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/test/TestController.java
wujiefeng 1 年之前
父節點
當前提交
a62fdd2e2c

+ 33 - 14
PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/test/TestController.java

@@ -1,28 +1,47 @@
 package com.zhongshu.payment.server.core.controller.test;
 
+import com.zhongshu.card.client.model.feign.ProjectWxPayModel;
+import com.zhongshu.card.client.model.feign.ProjectWxPayParam;
+import com.zhongshu.card.client.model.payment.paySetting.WxPayConfigModel;
+import com.zhongshu.card.client.ret.ResultContent;
+import com.zhongshu.card.client.service.ProjectPaySettingFeignService;
+import com.zhongshu.card.client.service.ProjectPaySettingService;
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.File;
+import java.util.UUID;
+
 @RestController
 @RequestMapping("test")
 @Tag(name = "测试")
 public class TestController {
 
-//    @Resource
-//    ProjectPaySettingFeignService projectPaySettingService;
-//
-//    @Operation(summary = "测试接口", description = "测试接口")
-//    @RequestMapping(value = "text", method = {RequestMethod.GET})
-//    public ResultContent text() {
-//        ProjectWxPayParam param = new ProjectWxPayParam();
-//        param.setAppId(WxV3PayConfig.APP_ID);
-//        ResultContent<WxPayConfigModel> resultContent = projectPaySettingService.getProjectWxPayConfig(param);
-//        if (resultContent.isSuccess()){
-//            Log.info(resultContent.getContent());
-//        }
-//        return ResultContent.buildSuccess();
-//    }
+    private static final Logger log = LoggerFactory.getLogger(TestController.class);
+
+    @Autowired
+    ProjectPaySettingFeignService projectPaySettingService;
+
+    @Operation(summary = "测试接口", description = "测试接口")
+    @RequestMapping(value = "text", method = {RequestMethod.GET})
+    public ResultContent text() {
+        ProjectWxPayParam param = new ProjectWxPayParam();
+        param.setAppId("wx92ae04fb0f325887");
+        ResultContent<WxPayConfigModel> content = projectPaySettingService.getProjectWxPayConfig(param);
+        WxPayConfigModel model = content.getContent();
+
+        String path = Thread.currentThread().getContextClassLoader().getResource("").getPath() + "apiclientkey/apiclient_key_1680033836.pem";
+        log.info("path: {}", path);
+        File file = new File(path);
+        log.info("file: {}", file.getAbsolutePath());
+        return ResultContent.buildSuccess(model);
+    }
 
 
 }

+ 28 - 0
PaymentServer/src/main/resources/apiclientkey/apiclient_key_1680033836.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDfvdY3mxJyft2s
+RE9J0pjREpcakERbc84ak+Fbi0EgO93TFhKwxY1A4KGaN3nwnzQqr42VBWr68iKJ
+i5b1vdadWp3ITPK2lkBuUHkNcFE/WoldOlLPfuZLPyPW1GmA9A8Zg5BfDOBEgaVd
++qmcYjYRCq9sgnZTPV1RuRcVw6/N1rREJsk0ddyl2oy9YvEFHiX1xrg8w+kCxohR
+B0wSHkq/2dEG6VOc8ABPAtgOIyL1rbEwe9eLMBGhzKTg+5OiwLE/vl51B/V5L7cc
+baS/naGenVkb1JQ0Oi49ZsKpa+53zr3vMXtVKhu7Y4DM67u5tkygiIMkeF1QlZy/
+K7QuWySHAgMBAAECggEBAMJD6ya2v0qoesJjQVDAySzm7koDL0cUgsSy174LaA2b
+zVvFU48myCGnqMjlGDxjjwDtEopsfNnMuU4h5H4USa6wikTrAuakCOd/ecvAVNsk
+Oha3WEWPUlfNR8n0/nIX9rBZelX9MRBqXPH/fZsp7vXXCD+3+xMFOeyGP9QG57NY
+8+PeKKC7v68Br5FkjM3NqZO3+3odTDmHQo7dH4THKAKjHKtdEedypxgRaj43ty4m
+01jQuuAPLAaXK/ymUMQ87Mj298cO+4tudu9qLWTwNyuLJoSkw9h37gM3l5SkrIC5
+tob9ZdIowcayaHayf2esdX63vVV2pGnbUZ+FIh6ETeECgYEA8kUh7abzCV/bPCUa
+Z5RfNV4fF6B0hKpDgWIXYUWBFibEzjVu7NBaIhM0qUGFXbAYjvVIcDE3aOraFGU8
+cNQ/lXP9/kWOca7GHu4sPaB9/yN9nx/gY5ErvX+VZ0KpcKHt5pmW6ByR/dY06FYz
+4Va4MRkb8r5nHByM6wZjgBSaObECgYEA7GvkSbjQyydvS0EbofQHuuRaj4TWAY0Q
+y6fOh3yiZxJnJncdXjDCcxkzwv+pK0HyirOSlWBAZdpxXOLwz46LiphMgO2e/y4B
+FW9F2Tw5X1BOffvG8m8vbtw7ZrFKpk0Wt/lYdLGSM3chJc4BdXeKJL8VTbA2r5uu
+Mm+DqiX9F7cCgYBlkBnDGSP1oBu2QQ+qsIahRs3eB8QRAZe/G7IVcx/Ee4gxsjDI
+UigW9No0wmT4e6Qv+h/d+KPz9dBqkG4gFrp5GuE1wU8P1Wb0/H/Lbgaj+Orm1GQr
+GWau0Fd/rHB/6UJkU6rxr1h8g1o2tDyXkNUysAYJY0yyej2RIWKBBSIKYQKBgQDl
+wxjyWI150dJEVXsQUsOsar5kGhmNGlYHRgbd/08pUmYyqLI+1q4zA3wddy8l3gpj
+p46+YvNSyQ9A0UBsxkBwqgA3kDbkEgZ1mVVNgEzVh4swvp6i/1EesSN9crF0mxiI
+JOhFSEkogQ8S2XjrewgjHB0NCkKrOWX6mAtiMVcdUwKBgQCv3k/5iHGhAeMaG0gw
+U6koX7mOKa7/ncyOUxAvIXydjHWvgUcakAcK3e7PLGFQZb5cBzYb60q2oFqhvbbR
+M0d3TGDWGr0yQlKokJEMMAsY00iRZx2dubb8XZHAp/GnFRDneXJyt+rEocMJgnIL
+6Oc7DnJ7pbe2NXhlAYBSq7lLeA==
+-----END PRIVATE KEY-----