feats

.gitignore

@@ -39,3 +39,5 @@ build/
 /deploy/*.zip
 /deploy/.fun/
 /deploy/.env
+
+cert/

pom.xml

@@ -24,6 +24,12 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -116,6 +122,11 @@
 			<artifactId>weixin-java-miniapp</artifactId>
 			<version>3.8.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.binarywang</groupId>
+			<artifactId>weixin-java-pay</artifactId>
+			<version>3.8.0</version>
+		</dependency>
 		<!--weixin-miniapp start-->
 
 		<!--lombok start-->
@@ -150,6 +161,14 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
+						<configuration>
+							<excludes>
+								<exclude>
+									<groupId>org.springframework.boot</groupId>
+									<artifactId>spring-boot-configuration-processor</artifactId>
+								</exclude>
+							</excludes>
+						</configuration>
 					</plugin>
 				</plugins>
 				<resources>
@@ -175,6 +194,14 @@
 					<plugin>
 						<groupId>org.springframework.boot</groupId>
 						<artifactId>spring-boot-maven-plugin</artifactId>
+						<configuration>
+							<excludes>
+								<exclude>
+									<groupId>org.springframework.boot</groupId>
+									<artifactId>spring-boot-configuration-processor</artifactId>
+								</exclude>
+							</excludes>
+						</configuration>
 					</plugin>
 
 					<!-- 跳过测试 -->

src/main/java/com/yunzhi/shigongli/common/WxUtils.java

@@ -3,6 +3,9 @@ package com.yunzhi.shigongli.common;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.yunzhi.shigongli.config.WeixinConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -10,10 +13,12 @@ import org.springframework.stereotype.Component;
 @Component
 public class WxUtils {
     private static WxMaService service;
+    private static WxPayService payService;
 
     @Autowired
     public WxUtils(WeixinConfig config) {
         setService(config);
+        setPay(config);
     }
 
     private void setService(WeixinConfig config) {
@@ -28,7 +33,26 @@ public class WxUtils {
         service.setWxMaConfig(conf);
     }
 
+    private void setPay(WeixinConfig config) {
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setAppId(config.getPay().getAppId());
+        payConfig.setMchId(config.getPay().getMchId());
+        payConfig.setMchKey(config.getPay().getMchKey());
+        payConfig.setSubAppId(config.getPay().getSubAppId());
+        payConfig.setSubMchId(config.getPay().getSubMchId());
+        payConfig.setKeyPath(config.getPay().getKeyPath());
+
+        // 可以指定是否使用沙箱环境
+        payConfig.setUseSandboxEnv(false);
+
+        WxPayService wxPayService = new WxPayServiceImpl();
+        wxPayService.setConfig(payConfig);
+    }
+
     public WxMaService getService() {
         return service;
     }
+    public WxPayService getPayService() {
+        return payService;
+    }
 }

src/main/java/com/yunzhi/shigongli/config/AliyunConfig.java

@@ -12,11 +12,9 @@ public class AliyunConfig {
     private String accessKeyId;
     private String accessKeySecret;
 
-    @NestedConfigurationProperty
-    private Oss oss = new Oss();
+    private Oss oss;
 
-    @NestedConfigurationProperty
-    private Sms sms = new Sms();
+    private Sms sms;
 
     @Data
     public  static class Oss {
@@ -32,8 +30,7 @@ public class AliyunConfig {
 
     @Data
     public static class Sms {
-        @NestedConfigurationProperty
-        private Captcha captcha = new Captcha();
+        private Captcha captcha;
     }
 
     @Data

src/main/java/com/yunzhi/shigongli/config/InterceptorConfig.java

@@ -10,8 +10,7 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "interceptor")
 public class InterceptorConfig {
 
-    @NestedConfigurationProperty
-    private Config permission = new Config();
+    private Config permission;
 
     @Data
     public static class Config {

src/main/java/com/yunzhi/shigongli/config/WeixinConfig.java

@@ -10,8 +10,9 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "weixin")
 public class WeixinConfig {
 
-    @NestedConfigurationProperty
-    private Miniapp miniapp = new Miniapp();
+    private Miniapp miniapp;
+
+    private Pay pay;
 
     @Data
     public static class Miniapp {
@@ -21,4 +22,37 @@ public class WeixinConfig {
         private String aesKey;
         private String msgDataFormat;
     }
+
+    @Data
+    public static class Pay {
+        /**
+         * 设置微信公众号或者小程序等的appid
+         */
+        private String appId;
+
+        /**
+         * 微信支付商户号
+         */
+        private String mchId;
+
+        /**
+         * 微信支付商户密钥
+         */
+        private String mchKey;
+
+        /**
+         * 服务商模式下的子商户公众账号ID，普通模式请不要配置，请在配置文件中将对应项删除
+         */
+        private String subAppId;
+
+        /**
+         * 服务商模式下的子商户号，普通模式请不要配置，最好是请在配置文件中将对应项删除
+         */
+        private String subMchId;
+
+        /**
+         * apiclient_cert.p12文件的绝对路径，或者如果放在项目中，请以classpath:开头指定
+         */
+        private String keyPath;
+    }
 }

src/main/resources/application-dev.yml

@@ -14,3 +14,7 @@ logging:
   level:
     root: info
     springfox: info
+
+weixin:
+  pay:
+    keyPath: E:/work/shigongli/v2/service/cert/apiclient_cert.p12

src/main/resources/application.yml

@@ -45,11 +45,18 @@ aliyun:
 ###
 weixin:
   miniapp:
-    appid: wx75ce0dc4b59e0458
-    secret: 0fb386cad221580dda74b7471460a73e
+    appid: wx06a7372d48d56843
+    secret: ead0c7b1dd40ce828b1fd9bf18183584
     token:
     aesKey:
     msgDataFormat: JSON
+  pay:
+    appId: wx06a7372d48d56843
+    mchId: 1612121997
+    mchKey: fUbYPldU5bUCYRl97vMv69JQujsJ8dj5
+    subAppId:
+    subMchId:
+    keyPath: /yunpan/shigongli/cert/apiclient_cert.p12
 
 ###
 spring: