Merge branch 'master' of http://121.40.98.15:3001/kym/charge-java

miniapp/pom.xml

@@ -60,6 +60,18 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

miniapp/src/main/resources/application.yml

@@ -95,8 +95,8 @@ wechat:
     notifyUrl: https://www.kuaiyuman.cn/api/payment/notify
 #    certPath: /data/wwwroot/charge/config/cert/apiclient_cert.pem
 #    keyPath: /data/wwwroot/charge/config/cert/apiclient_key.pem
-    certPath: D:/快与慢充电桩/微信支付证书/apiclient_cert.pem
-    keyPath: D:/快与慢充电桩/微信支付证书/apiclient_key.pem
+    certPath: classpath:apiclient_cert.pem
+    keyPath: classpath:apiclient_key.pem
 
   miniapp:
     appid: wx369fcff95d387bde