Browse Source

feat(system):优化系统公告逻辑并调整删除标记类型- 将SysAnnouncement实体的delFlag字段类型由String改为Integer
- 使用@TableLogic注解标记delFlag为逻辑删除字段
- 统一设置delFlag值时不再使用toString()方法
- 删除公告时调用removeById方法替代手动设置delFlag- 查询未读消息时增加sendStatus条件过滤
-修正多处delFlag赋值逻辑,确保数据一致性

wzq 1 tuần trước cách đây
mục cha
commit
470ef1c830
14 tập tin đã thay đổi với 244 bổ sung107 xóa
  1. 65 0
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/TestWechatConstants.java
  2. 0 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/WeChatProfitSharingService.java
  3. 34 33
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/WechatConstants.java
  4. 0 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/WechatPayV3Utils.java
  5. 2 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/serverPay/WxV3PayConfig.java
  6. BIN
      national-motion-module-system/national-motion-system-biz/src/main/resources/cert/apiclient_cert.p12
  7. 21 21
      national-motion-module-system/national-motion-system-biz/src/main/resources/cert/apiclient_cert.pem
  8. 26 26
      national-motion-module-system/national-motion-system-biz/src/main/resources/cert/apiclient_key.pem
  9. 15 15
      national-motion-module-system/national-motion-system-biz/src/main/resources/cert/platform_cert.pem
  10. BIN
      national-motion-module-system/national-motion-system-biz/src/main/resources/certTest/apiclient_cert.p12
  11. 25 0
      national-motion-module-system/national-motion-system-biz/src/main/resources/certTest/apiclient_cert.pem
  12. 28 0
      national-motion-module-system/national-motion-system-biz/src/main/resources/certTest/apiclient_key.pem
  13. 24 0
      national-motion-module-system/national-motion-system-biz/src/main/resources/certTest/platform_cert.pem
  14. 4 4
      national-motion-module-system/national-motion-system-start/src/main/resources/application-dev.yml

+ 65 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/TestWechatConstants.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.pay.config;
+
+/**
+ * @author wangzhiqiang
+ * @Date 2025/9/9
+ * @Desc 微信支付相关配置
+ */
+public class TestWechatConstants {
+
+    //微信支付服务商商户号
+    public static final String WECHAT_SP_MCH_ID = "1725845681";
+
+    public static final String WECHAT_SP_APPID = "wx43b5b906cc30ed0b";
+
+    public static final String WECHAT_SUB_MCH_ID = "1726971843";
+
+    public static final String WECHAT_SUB_APPID = "wxc032a09413289004";
+
+    public static final String WECHAT_SUB_MCH_NAME = "中数未来(广州)信息技术有限公司";
+
+    public static final String SUB_ORG_CODE = "A01";
+
+    //微信商户平台v3密钥
+    public static final String WECHAT_MCH_SECRET_V3 = "4b64e17419689527b256f07cdf6bd60c";
+
+    //微信商户平台服务商证书序列号
+    public static final String WECHAT_MCH_SERIAL_NUM = "65E9559D81ADA0BDA0CD3CF484A59A8DFB5610BE";
+
+    //微信商户平台证书私钥 即证书中的apiclient_key.pem文件中的内容 可以直接写在这里 也可以用流读取文件
+    public static final String WECHAT_MCH_PRIVATE_KEY = "-----BEGIN PRIVATE KEY-----\n" +
+            "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7aKXAWrNy4W9N\n" +
+            "Mv2Ah9zp1VQDZk68nWX3EfACgHdCXhqF2mhzUqQJHGjumqkSBKdTwDTzgXCcs7EK\n" +
+            "PSIeWXSajfbyn8f5cYupRYESFvrIpiHaRh3aUTNVmfRiXLN6zMSiAUkgPp3mZXzZ\n" +
+            "lp38wPZS1Vl+S8lesETEqnE/qFK6A2MKCjOFbtCNQIsPc4q70JzgAwNx20giHNMm\n" +
+            "h6TN41as1Qu6PVpamvNLgLp4U2GBInURpHLUqVJfQOezCOHUEkDxtcdY30Nb4aIF\n" +
+            "FzSLzGssczduovhm8b57Wy0dD5crGKZVGsix3m9CXd+BshJDYIB/EAivU+npK4Tz\n" +
+            "inA7K0wdAgMBAAECggEASTeFKjVFTmiMl1iIeaKayDAz9nAN6tqDb5ducUvHTAJ/\n" +
+            "0jOWAxgSRgz3YeDClOuEg8/f4BJ98HqzfBCON9UzHP7Br+CEvAuESMmCt5KKv8FI\n" +
+            "EIK8PwLiT1sqgxM8e4lseO6Ppy1PeyfDMy8I4ipxEcOQhysMrRWoiD0eqYQVbd4g\n" +
+            "YfOEsq8EbSHr+sDHgFJM5hEEHEWNvSUUSjifuo861SkYEtjQcg5AKflPce9Fz7Ze\n" +
+            "UNxHEh+gAOvDzkFTlVSnqhUR3G2EeoFSwALwNMNJW4vBiQ16InhAlsUPh5zByPBS\n" +
+            "HAbfiNYNUgYQM5PUy2YSamMXwUAAvNvcrbNUN6PrgQKBgQD4OtObOKB60zZYuRfa\n" +
+            "6lpfIxT4EeaP7aGFc+vL20ZFTEhueWAHw8opznrRwWa3zok1T+PhJHJ0BeLsU+m1\n" +
+            "Y4BVDHNw7rfKxMaw63LL2AGnx2wmeDDm1bliPvnQrc7KVqQsgu31+xuOKcgL5brg\n" +
+            "YdxfXPyHP7vAfI8RaanGHS3luQKBgQDBRm+FAELD/O0Hsn8Eyz6tehTG0AqyLdCE\n" +
+            "DmKjC1cQnQVDWReFRcLjFQZLd3eajNe9L1liyqnKERnJCgsyxaygmZVnt4xdwRSm\n" +
+            "dV76SFV6+kXs9dDILeRNhybyfAIdrijv60gF8uVfUMhbQGtpuEs9e+1UhP5TcvbS\n" +
+            "Y10Q3xQLhQKBgQDTcrjiVkBNoDGBLlolvs+wjt/D2Ou/2rpmRbKsemLHkQ16HaYx\n" +
+            "txQ0vJBesRJgrGywnxcMp9FfB8yfZ3ODcfjVeb+0iYTCExD1j/q/rYbrdrKnqmZt\n" +
+            "m81I5UBEBGpMbbV3vSgbCwYT+X9QsyaXEIV6LmlmhGHYu8HbIVjfS+fW8QKBgQCn\n" +
+            "083Ko+tV3C7G3ExHkWUfpj6cVNK03euOgB9OjO5RUsfbL2WpKGaOYRdSOK722Q4N\n" +
+            "DSyFCI5fFHJbjAklUVkRK8v8f/m2/4467PhIRL9VRjWqCdn9uTvhxlYfgWck9rI9\n" +
+            "gwTLhZt/JNqVwl6DMrDC9vWiysk9FTsWfYm2uL7jMQKBgQDy2kud6Ct2wvN6AakJ\n" +
+            "PrXwvW0FVrI5ieGS4eG0cUWiK/7S1TjyyuF/dJYabxVtXnYXCLTztFigPCVNWeog\n" +
+            "R9FQITYKducHCS/Gjz53ksEeX9LuUB78gyrqiGvq5iyKKOsYvh9j3YmLpZgeQ1CE\n" +
+            "be6f9A6UjSGKP4qEvgJhIy09bw==\n" +
+            "-----END PRIVATE KEY-----";
+
+    //微信小程序支付类型
+    public static final String WECHAT_TRADE_TYPE = "JSAPI";
+
+    //微信小程序密钥
+    public static final String WECHAT_MP_SECRET = "";
+
+}

+ 0 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/WeChatProfitSharingService.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +12,6 @@ import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.modules.pay.entity.ProfitSharingRequest;
 import org.jeecg.modules.pay.entity.Receiver;
 import org.jeecg.modules.pay.entity.ReceiverAddForm;
-import org.jeecg.modules.pay.entity.WxchatCallbackRefundData;
 import org.jeecg.modules.system.app.entity.AppOrder;
 import org.jeecg.modules.system.app.entity.AppOrderProInfo;
 import org.jeecg.modules.system.app.entity.AppProfitSharingInfo;

+ 34 - 33
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/WechatConstants.java

@@ -8,52 +8,53 @@ package org.jeecg.modules.pay.config;
 public class WechatConstants {
 
     //微信支付服务商商户号
-    public static final String WECHAT_SP_MCH_ID = "1725845681";
+    public static final String WECHAT_SP_MCH_ID = "1726394481";
 
-    public static final String WECHAT_SP_APPID = "wx43b5b906cc30ed0b";
+    public static final String WECHAT_SP_APPID = "wxd9fbe93c380adf7c";
 
-    public static final String WECHAT_SUB_MCH_ID = "1726971843";
+    public static final String WECHAT_SUB_MCH_ID = "1729550525";
 
-    public static final String WECHAT_SUB_APPID = "wxc032a09413289004";
+    public static final String WECHAT_SUB_APPID = "wxe70e6c132e5b4c28";
 
-    public static final String WECHAT_SUB_MCH_NAME = "中数未来(广州)信息技术有限公司";
+    public static final String WECHAT_SUB_MCH_NAME = "贵阳观山湖城市商业运营有限公司";
 
     public static final String SUB_ORG_CODE = "A01";
 
     //微信商户平台v3密钥
-    public static final String WECHAT_MCH_SECRET_V3 = "4b64e17419689527b256f07cdf6bd60c";
+    public static final String WECHAT_MCH_SECRET_V3 = "dkrxaNfksjhDFxg1pGVuraIBahNwp1zX";
 
     //微信商户平台服务商证书序列号
-    public static final String WECHAT_MCH_SERIAL_NUM = "65E9559D81ADA0BDA0CD3CF484A59A8DFB5610BE";
+    public static final String WECHAT_MCH_SERIAL_NUM = "43587E67ACF32ADE85B318F93C56FDC1B2388EDE";
+//    public static final String WECHAT_MCH_SERIAL_NUM = "491DF89D133A1562A0AF2C98E8536823CB9B9D3D";
 
     //微信商户平台证书私钥 即证书中的apiclient_key.pem文件中的内容 可以直接写在这里 也可以用流读取文件
     public static final String WECHAT_MCH_PRIVATE_KEY = "-----BEGIN PRIVATE KEY-----\n" +
-            "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7aKXAWrNy4W9N\n" +
-            "Mv2Ah9zp1VQDZk68nWX3EfACgHdCXhqF2mhzUqQJHGjumqkSBKdTwDTzgXCcs7EK\n" +
-            "PSIeWXSajfbyn8f5cYupRYESFvrIpiHaRh3aUTNVmfRiXLN6zMSiAUkgPp3mZXzZ\n" +
-            "lp38wPZS1Vl+S8lesETEqnE/qFK6A2MKCjOFbtCNQIsPc4q70JzgAwNx20giHNMm\n" +
-            "h6TN41as1Qu6PVpamvNLgLp4U2GBInURpHLUqVJfQOezCOHUEkDxtcdY30Nb4aIF\n" +
-            "FzSLzGssczduovhm8b57Wy0dD5crGKZVGsix3m9CXd+BshJDYIB/EAivU+npK4Tz\n" +
-            "inA7K0wdAgMBAAECggEASTeFKjVFTmiMl1iIeaKayDAz9nAN6tqDb5ducUvHTAJ/\n" +
-            "0jOWAxgSRgz3YeDClOuEg8/f4BJ98HqzfBCON9UzHP7Br+CEvAuESMmCt5KKv8FI\n" +
-            "EIK8PwLiT1sqgxM8e4lseO6Ppy1PeyfDMy8I4ipxEcOQhysMrRWoiD0eqYQVbd4g\n" +
-            "YfOEsq8EbSHr+sDHgFJM5hEEHEWNvSUUSjifuo861SkYEtjQcg5AKflPce9Fz7Ze\n" +
-            "UNxHEh+gAOvDzkFTlVSnqhUR3G2EeoFSwALwNMNJW4vBiQ16InhAlsUPh5zByPBS\n" +
-            "HAbfiNYNUgYQM5PUy2YSamMXwUAAvNvcrbNUN6PrgQKBgQD4OtObOKB60zZYuRfa\n" +
-            "6lpfIxT4EeaP7aGFc+vL20ZFTEhueWAHw8opznrRwWa3zok1T+PhJHJ0BeLsU+m1\n" +
-            "Y4BVDHNw7rfKxMaw63LL2AGnx2wmeDDm1bliPvnQrc7KVqQsgu31+xuOKcgL5brg\n" +
-            "YdxfXPyHP7vAfI8RaanGHS3luQKBgQDBRm+FAELD/O0Hsn8Eyz6tehTG0AqyLdCE\n" +
-            "DmKjC1cQnQVDWReFRcLjFQZLd3eajNe9L1liyqnKERnJCgsyxaygmZVnt4xdwRSm\n" +
-            "dV76SFV6+kXs9dDILeRNhybyfAIdrijv60gF8uVfUMhbQGtpuEs9e+1UhP5TcvbS\n" +
-            "Y10Q3xQLhQKBgQDTcrjiVkBNoDGBLlolvs+wjt/D2Ou/2rpmRbKsemLHkQ16HaYx\n" +
-            "txQ0vJBesRJgrGywnxcMp9FfB8yfZ3ODcfjVeb+0iYTCExD1j/q/rYbrdrKnqmZt\n" +
-            "m81I5UBEBGpMbbV3vSgbCwYT+X9QsyaXEIV6LmlmhGHYu8HbIVjfS+fW8QKBgQCn\n" +
-            "083Ko+tV3C7G3ExHkWUfpj6cVNK03euOgB9OjO5RUsfbL2WpKGaOYRdSOK722Q4N\n" +
-            "DSyFCI5fFHJbjAklUVkRK8v8f/m2/4467PhIRL9VRjWqCdn9uTvhxlYfgWck9rI9\n" +
-            "gwTLhZt/JNqVwl6DMrDC9vWiysk9FTsWfYm2uL7jMQKBgQDy2kud6Ct2wvN6AakJ\n" +
-            "PrXwvW0FVrI5ieGS4eG0cUWiK/7S1TjyyuF/dJYabxVtXnYXCLTztFigPCVNWeog\n" +
-            "R9FQITYKducHCS/Gjz53ksEeX9LuUB78gyrqiGvq5iyKKOsYvh9j3YmLpZgeQ1CE\n" +
-            "be6f9A6UjSGKP4qEvgJhIy09bw==\n" +
+            "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDozU6RJZN43U1m\n" +
+            "IYSNg20ukw4dGhmZgs8q082VLl0pY43IRlndQMLcyDh7ZsAwHt1R0YaqM9RvRuBH\n" +
+            "tQcwKHgxiNzXxADx/XoGMAUJz8TiAcv/xbGK8C74Cjq5YUJIlE0f2UH2vQMvihi1\n" +
+            "fPwSsxXJGLgu3/UajXe/zc+YrmhWnpAHU46mVJ/BLEwzBVmfcgGXAPJ/sh57zcSo\n" +
+            "ayWLYLj7nUZ8KI22DEYHDjeZD0i8wcfCVpwfsnqSO3bd2HgXSrDA5UiObXPPypM3\n" +
+            "5Qknf06sXCYa0G2Ui4YlGsC2DTBu0d7p8b/hOe7vyVzXw72uJDQ4GGd8wDiXxnGk\n" +
+            "vnEKTka3AgMBAAECggEBAIeWm/3Znsy0R9IGD4fEViDcMUot218XWsWc2o3alRP4\n" +
+            "Eanln41HnLauPodQzvq33zs6B262BTJSW2ooO2mHCIoBJm7cj5hhg2J7MVQHmKnx\n" +
+            "VflAESnUveZlPtKdnNdc2JaGGO82ItbbXYzGoKHbgALBzPQwKDcw0d/6ZMCOQ+K+\n" +
+            "FrwLi+93HXlW6jGrPAgJ09kcim6efZOHvxFdZq8zMBFoZeiGnGj6G0peHI5PGb8V\n" +
+            "YKjBXiuxHs96w079R3eID1ViiNnGonm6M9AWT2mxMYMt/VPTr0TZUUet6DmKRs+0\n" +
+            "T3XuqoIunpju5RwWDN9CRdIysc5Ylo9U5rnLjBv6ygECgYEA+ipaz9mvqGo9+EQ2\n" +
+            "30VVGpY1W8r4oOZu8pSnmm9FXZFLVznnq0CB22F7fp1WLr3Yr0XoL2NOHZFVtzT8\n" +
+            "5ww9//o/OUgY3uVC9UoosUtSPowAZeldRc2JaFABusQw34/E96BVeuqTZgFxyvo2\n" +
+            "sAmtBfDXHCOjEmwZlaumKNxw3YECgYEA7jtIBTAE70nPTh7s3Kb81L2k0BT2JVki\n" +
+            "VZdBRPqj/mMxu6MEJ5UjzNhZEH3FXHxxC4Oe8v/r1opxs6ES5RnqQ+agtL5mUBn/\n" +
+            "B0327/96DKZWaKFCaoieCUamY/3jqguoIdK80kjGX6xuQISw5tCCJVrnEuxW+CmI\n" +
+            "XDrcOsTGsDcCgYBck+IJe1i7LZ4DS1M3KxREg4P5lVKPUNeMJCEmULlN2CAWhpJK\n" +
+            "WNP1mMy33YfwQkd3DZrQNqLI5GjhJNXWtzwWh8hv7VNu4U73MVt/yQ0Foo/fJw5i\n" +
+            "b57DIKCTOlmP0kelEAuyMi8cF7rBz/j/CoWiZi9k9Xc6sRCCyAP0qSeHgQKBgBpl\n" +
+            "2z8n6QQS67O+XYS9xDpWoVKlX/kXfWR6lDLuiwl/OF2QXL9+GS9zsbrQFPSAnY4n\n" +
+            "EY/fp+RoBt1etddJHdpUTe55QqERoF7Q1tIVPxLzw5NoexGO/eQNPhbKZVXMYN8O\n" +
+            "mPm8Mq8bTkQ779ZDuIgnIH/KTIDHKWL+6rRgZZvVAoGALZn4IpUhcRe7v/+pnYSQ\n" +
+            "6AhmUmTM3OdAA+XJDMuZzDM+5DNmuhZx4Y9sw/Xg1+kejR0W48aFNZ4xhSz89XC6\n" +
+            "rusYJfTda1iqqlaH453yJti98u2EkESJMdY2YlT7H75VjD/A1o1Fn3qnGStn9CKt\n" +
+            "DOukDtlOzybCJFsjG5uBwcg=\n" +
             "-----END PRIVATE KEY-----";
 
     //微信小程序支付类型

+ 0 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/config/WechatPayV3Utils.java

@@ -18,9 +18,7 @@ import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
-import org.jeecg.modules.pay.paytest.SignUtils;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;

+ 2 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/pay/serverPay/WxV3PayConfig.java

@@ -3,8 +3,6 @@ package org.jeecg.modules.pay.serverPay;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.exception.JeecgBootException;
 import org.springframework.stereotype.Component;
- 
-import javax.annotation.PostConstruct;
 
 @Slf4j
 @Component
@@ -29,8 +27,8 @@ public class WxV3PayConfig {
     private String mchSerialNoValue= "5EB65CC0F912EA2ADD3363EA3DA0230DF6DA90BC";
     public static String mchSerialNo= "5EB65CC0F912EA2ADD3363EA3DA0230DF6DA90BC";
  
-    private String privateKeyPathValue= "/cert/apiclient_key.pem";
-    public static String privateKeyPath= "/cert/apiclient_key.pem";
+    private String privateKeyPathValue= "/certTest/apiclient_key.pem";
+    public static String privateKeyPath= "/certTest/apiclient_key.pem";
  
     // 如果需要静态访问,可以使用 @PostConstruct 初始化静态变量
 //    @PostConstruct

BIN
national-motion-module-system/national-motion-system-biz/src/main/resources/cert/apiclient_cert.p12


+ 21 - 21
national-motion-module-system/national-motion-system-biz/src/main/resources/cert/apiclient_cert.pem

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIENDCCAxygAwIBAgIUZelVnYGtoL2gzTz0hKWajftWEL4wDQYJKoZIhvcNAQEL
+MIIEKzCCAxOgAwIBAgIUQ1h+Z6zzKt6Fsxj5PFb9wbI4jt4wDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjUwOTA1MDE0MTEwWhcNMzAwOTA0MDE0MTEwWjCBjTETMBEGA1UEAwwK
-MTcyNTg0NTY4MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTkwNwYDVQQL
-DDDkuK3mlbDmnKrmnaXvvIjmtbfljZfvvInns7vnu5/pm4bmiJDmnInpmZDlhazl
-j7gxCzAJBgNVBAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBALtopcBas3Lhb00y/YCH3OnVVANmTrydZfcR8AKA
-d0JeGoXaaHNSpAkcaO6aqRIEp1PANPOBcJyzsQo9Ih5ZdJqN9vKfx/lxi6lFgRIW
-+simIdpGHdpRM1WZ9GJcs3rMxKIBSSA+neZlfNmWnfzA9lLVWX5LyV6wRMSqcT+o
-UroDYwoKM4Vu0I1Aiw9zirvQnOADA3HbSCIc0yaHpM3jVqzVC7o9Wlqa80uAunhT
-YYEidRGkctSpUl9A57MI4dQSQPG1x1jfQ1vhogUXNIvMayxzN26i+GbxvntbLR0P
-lysYplUayLHeb0Jd34GyEkNggH8QCK9T6ekrhPOKcDsrTB0CAwEAAaOBuTCBtjAJ
-BgNVHRMEAjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGE
-aHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0
-MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFC
-NjU0MjJFMTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEB
-CwUAA4IBAQAM4AlxykqJA/0HK3T4dU5CB02BIGEygu0HH1X2tPrl0kLIVu9J7jfq
-i9PddQ8sjiUP6UjcegkEfvM3kIg66zREJzjFaWFJBdxBYW8ooab3yOO1o80c9cRm
-NoSLNwiumc72xEeARAsjwNiMcYsK3kLRvMOp1zqH99JNWCvDq4oZNVYvnHJH6nPi
-dda8XLswTvUvEJQq0JDDTxgOzIK1BGzLXbaN0fsdsHLrfQ+QnqkIZYyWzLe6WkMR
-V+n0aiZmt5SCu/XMG7hjQpX0Ob8oUmMENcy6bIv/fMwpV+6VD29Gy1l/ykyroxy4
-cNLOIZ6DorRnq/gVKGPhOpfUMHGJTwF8
+Q0EwHhcNMjUwOTAzMDI1NDQ2WhcNMzAwOTAyMDI1NDQ2WjCBhDETMBEGA1UEAwwK
+MTcyNjM5NDQ4MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTAwLgYDVQQL
+DCfotLXpmLPop4LlsbHmuZbpkavpmLPkuqfkuJrmnInpmZDlhazlj7gxCzAJBgNV
+BAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOjNTpElk3jdTWYhhI2DbS6TDh0aGZmCzyrTzZUuXSljjchGWd1A
+wtzIOHtmwDAe3VHRhqoz1G9G4Ee1BzAoeDGI3NfEAPH9egYwBQnPxOIBy//FsYrw
+LvgKOrlhQkiUTR/ZQfa9Ay+KGLV8/BKzFckYuC7f9RqNd7/Nz5iuaFaekAdTjqZU
+n8EsTDMFWZ9yAZcA8n+yHnvNxKhrJYtguPudRnwojbYMRgcON5kPSLzBx8JWnB+y
+epI7dt3YeBdKsMDlSI5tc8/KkzflCSd/TqxcJhrQbZSLhiUawLYNMG7R3unxv+E5
+7u/JXNfDva4kNDgYZ3zAOJfGcaS+cQpORrcCAwEAAaOBuTCBtjAJBgNVHRMEAjAA
+MAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2
+Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJD
+MDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJC
+MjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQAj
+wIp02IkmFpfX1Icbwr9VE+eGKjwVNhp05BczqquZDWiVjmWytG1n1PjveueGd9zD
+Fa/VMhR+bqZdpzFcWsfkwYMm9hUX86cx/tHbgj+p2hYV+gWAdgkUg+6iW5LvNSBS
+u952qPud5Dmelx48sMWfgGEytGlDvAKnufvXWOSmk8pFCOXzpYuJPd5Z61pIQ0no
+esoVMnGSvUYCm8VPPjANXQfm4FPbmQS5iOyts8iP8eDuWIOOx0cBm71jFQm9gAvy
+1rFvjfqe/n0TAxXz7I4CIvTwUeduc65p+/p4me7jurtZPWJ2S5L8Pp+MAt7GE63e
+zl0Fzkd6MZUvH9zybyve
 -----END CERTIFICATE-----

+ 26 - 26
national-motion-module-system/national-motion-system-biz/src/main/resources/cert/apiclient_key.pem

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7aKXAWrNy4W9N
-Mv2Ah9zp1VQDZk68nWX3EfACgHdCXhqF2mhzUqQJHGjumqkSBKdTwDTzgXCcs7EK
-PSIeWXSajfbyn8f5cYupRYESFvrIpiHaRh3aUTNVmfRiXLN6zMSiAUkgPp3mZXzZ
-lp38wPZS1Vl+S8lesETEqnE/qFK6A2MKCjOFbtCNQIsPc4q70JzgAwNx20giHNMm
-h6TN41as1Qu6PVpamvNLgLp4U2GBInURpHLUqVJfQOezCOHUEkDxtcdY30Nb4aIF
-FzSLzGssczduovhm8b57Wy0dD5crGKZVGsix3m9CXd+BshJDYIB/EAivU+npK4Tz
-inA7K0wdAgMBAAECggEASTeFKjVFTmiMl1iIeaKayDAz9nAN6tqDb5ducUvHTAJ/
-0jOWAxgSRgz3YeDClOuEg8/f4BJ98HqzfBCON9UzHP7Br+CEvAuESMmCt5KKv8FI
-EIK8PwLiT1sqgxM8e4lseO6Ppy1PeyfDMy8I4ipxEcOQhysMrRWoiD0eqYQVbd4g
-YfOEsq8EbSHr+sDHgFJM5hEEHEWNvSUUSjifuo861SkYEtjQcg5AKflPce9Fz7Ze
-UNxHEh+gAOvDzkFTlVSnqhUR3G2EeoFSwALwNMNJW4vBiQ16InhAlsUPh5zByPBS
-HAbfiNYNUgYQM5PUy2YSamMXwUAAvNvcrbNUN6PrgQKBgQD4OtObOKB60zZYuRfa
-6lpfIxT4EeaP7aGFc+vL20ZFTEhueWAHw8opznrRwWa3zok1T+PhJHJ0BeLsU+m1
-Y4BVDHNw7rfKxMaw63LL2AGnx2wmeDDm1bliPvnQrc7KVqQsgu31+xuOKcgL5brg
-YdxfXPyHP7vAfI8RaanGHS3luQKBgQDBRm+FAELD/O0Hsn8Eyz6tehTG0AqyLdCE
-DmKjC1cQnQVDWReFRcLjFQZLd3eajNe9L1liyqnKERnJCgsyxaygmZVnt4xdwRSm
-dV76SFV6+kXs9dDILeRNhybyfAIdrijv60gF8uVfUMhbQGtpuEs9e+1UhP5TcvbS
-Y10Q3xQLhQKBgQDTcrjiVkBNoDGBLlolvs+wjt/D2Ou/2rpmRbKsemLHkQ16HaYx
-txQ0vJBesRJgrGywnxcMp9FfB8yfZ3ODcfjVeb+0iYTCExD1j/q/rYbrdrKnqmZt
-m81I5UBEBGpMbbV3vSgbCwYT+X9QsyaXEIV6LmlmhGHYu8HbIVjfS+fW8QKBgQCn
-083Ko+tV3C7G3ExHkWUfpj6cVNK03euOgB9OjO5RUsfbL2WpKGaOYRdSOK722Q4N
-DSyFCI5fFHJbjAklUVkRK8v8f/m2/4467PhIRL9VRjWqCdn9uTvhxlYfgWck9rI9
-gwTLhZt/JNqVwl6DMrDC9vWiysk9FTsWfYm2uL7jMQKBgQDy2kud6Ct2wvN6AakJ
-PrXwvW0FVrI5ieGS4eG0cUWiK/7S1TjyyuF/dJYabxVtXnYXCLTztFigPCVNWeog
-R9FQITYKducHCS/Gjz53ksEeX9LuUB78gyrqiGvq5iyKKOsYvh9j3YmLpZgeQ1CE
-be6f9A6UjSGKP4qEvgJhIy09bw==
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDozU6RJZN43U1m
+IYSNg20ukw4dGhmZgs8q082VLl0pY43IRlndQMLcyDh7ZsAwHt1R0YaqM9RvRuBH
+tQcwKHgxiNzXxADx/XoGMAUJz8TiAcv/xbGK8C74Cjq5YUJIlE0f2UH2vQMvihi1
+fPwSsxXJGLgu3/UajXe/zc+YrmhWnpAHU46mVJ/BLEwzBVmfcgGXAPJ/sh57zcSo
+ayWLYLj7nUZ8KI22DEYHDjeZD0i8wcfCVpwfsnqSO3bd2HgXSrDA5UiObXPPypM3
+5Qknf06sXCYa0G2Ui4YlGsC2DTBu0d7p8b/hOe7vyVzXw72uJDQ4GGd8wDiXxnGk
+vnEKTka3AgMBAAECggEBAIeWm/3Znsy0R9IGD4fEViDcMUot218XWsWc2o3alRP4
+Eanln41HnLauPodQzvq33zs6B262BTJSW2ooO2mHCIoBJm7cj5hhg2J7MVQHmKnx
+VflAESnUveZlPtKdnNdc2JaGGO82ItbbXYzGoKHbgALBzPQwKDcw0d/6ZMCOQ+K+
+FrwLi+93HXlW6jGrPAgJ09kcim6efZOHvxFdZq8zMBFoZeiGnGj6G0peHI5PGb8V
+YKjBXiuxHs96w079R3eID1ViiNnGonm6M9AWT2mxMYMt/VPTr0TZUUet6DmKRs+0
+T3XuqoIunpju5RwWDN9CRdIysc5Ylo9U5rnLjBv6ygECgYEA+ipaz9mvqGo9+EQ2
+30VVGpY1W8r4oOZu8pSnmm9FXZFLVznnq0CB22F7fp1WLr3Yr0XoL2NOHZFVtzT8
+5ww9//o/OUgY3uVC9UoosUtSPowAZeldRc2JaFABusQw34/E96BVeuqTZgFxyvo2
+sAmtBfDXHCOjEmwZlaumKNxw3YECgYEA7jtIBTAE70nPTh7s3Kb81L2k0BT2JVki
+VZdBRPqj/mMxu6MEJ5UjzNhZEH3FXHxxC4Oe8v/r1opxs6ES5RnqQ+agtL5mUBn/
+B0327/96DKZWaKFCaoieCUamY/3jqguoIdK80kjGX6xuQISw5tCCJVrnEuxW+CmI
+XDrcOsTGsDcCgYBck+IJe1i7LZ4DS1M3KxREg4P5lVKPUNeMJCEmULlN2CAWhpJK
+WNP1mMy33YfwQkd3DZrQNqLI5GjhJNXWtzwWh8hv7VNu4U73MVt/yQ0Foo/fJw5i
+b57DIKCTOlmP0kelEAuyMi8cF7rBz/j/CoWiZi9k9Xc6sRCCyAP0qSeHgQKBgBpl
+2z8n6QQS67O+XYS9xDpWoVKlX/kXfWR6lDLuiwl/OF2QXL9+GS9zsbrQFPSAnY4n
+EY/fp+RoBt1etddJHdpUTe55QqERoF7Q1tIVPxLzw5NoexGO/eQNPhbKZVXMYN8O
+mPm8Mq8bTkQ779ZDuIgnIH/KTIDHKWL+6rRgZZvVAoGALZn4IpUhcRe7v/+pnYSQ
+6AhmUmTM3OdAA+XJDMuZzDM+5DNmuhZx4Y9sw/Xg1+kejR0W48aFNZ4xhSz89XC6
+rusYJfTda1iqqlaH453yJti98u2EkESJMdY2YlT7H75VjD/A1o1Fn3qnGStn9CKt
+DOukDtlOzybCJFsjG5uBwcg=
 -----END PRIVATE KEY-----

+ 15 - 15
national-motion-module-system/national-motion-system-biz/src/main/resources/cert/platform_cert.pem

@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIEFDCCAvygAwIBAgIUXrZcwPkS6irdM2PqPaAjDfbakLwwDQYJKoZIhvcNAQEL
+MIIEFDCCAvygAwIBAgIUSR34nRM6FWKgryyY6FNoI8ubnT0wDQYJKoZIhvcNAQEL
 BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
 FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjUwOTA1MDE0MTEwWhcNMzAwOTA0MDE0MTEwWjBuMRgwFgYDVQQDDA9U
+Q0EwHhcNMjUwOTAzMDI1NDQ2WhcNMzAwOTAyMDI1NDQ2WjBuMRgwFgYDVQQDDA9U
 ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl
 bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGEwJDTjERMA8GA1UEBwwIU2hlblpo
-ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZIxyPi1dMyGTlN2L3
-BJCzhHerkmnDX3EEci6TFHTag6/CSfF1RmgxUCfb6AJUn33gGwsACrf/HNTfA+ox
-okzeWmnLrAYMXsiZhO2IZaQJE4oel4pI51nBNaMRcN3HVu9QOCKm9P9USHj4hWPY
-iJvuUpiiMpDmcdrNRLfCS43FSCgozkbO0KYfiCMEhD30RBdOE/WhlCi61A1GeTBK
-9nuQeIsMUQikZH9a4uNi3AMNDwygfR65DSYkqw6feQibo96BYJRpZUILzVM033MA
-fpn1MApk1OUjrO/eq7FR3qOZN4BKsu7gz4nxzydYmnVLNZZFVLHlMMtSp0F5+Xch
-QCGrAgMBAAGjgbkwgbYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwgZsGA1UdHwSB
+ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0n3SaYoZ1HHMleakr
+n2CJJzmTGKm7nEFqJdhCb4p91vym3EYlhC+p+w+b/sTyX1xWzJBqVRVzsU7k7qen
+zRANWwGE2ZaAs99+sfJuggGP2/6WLpuQoHsT1NPl1oManHd+wCITHCHE3ujgt1Yh
+oE3J1KnVJ9qllYh5ZGLtsEF0Va6gFSzQtmCHmqfx/e/D6+irWYqJUkKzSO7mgpB1
+wsx13/bIQ7UUvms1ic7Rl9VerzO867GiXdaOsm3/fYnOhbRfNLq0WfZdSwuZwjnb
+UcorQfKSYIG7G5mUONH7BQ/Jcn40OJnLR8dcJszMgTabzPcbttYSZWxZL3iSnbca
+3kDLAgMBAAGjgbkwgbYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwgZsGA1UdHwSB
 kzCBkDCBjaCBiqCBh4aBhGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMv
 aXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4
 RUJEMiZzZz1IQUNDNDcxQjY1NDIyRTEyQjI3QTlEMzNBODdBRDFDREY1OTI2RTE0
-MDM3MTANBgkqhkiG9w0BAQsFAAOCAQEAk6Oz4E11WD9tT2oG87uj2C1Zp1IjZSOc
-F88cR8CKgbqnGc+gcF8cmixm1sHEYHBXAPKuQXkDOZ73Yi4l8RyIhX6u+GVM6evC
-A60rJyLz7TZ5XJ1G26vucmlcPlhvz11dDknXiuvm4qF3HyiZXLzOVtnDsUTytRST
-HCH4DpvXSt6OWTUj8Gzq4erS7VLh+pdh2hUTlYCw86Pn9hKVK60uqq3GSedgH729
-uuBbfWNAfG4Dwrk8PbkG5hay3Sv2Aac5NK0iok3dLFHGdNYbrxeDozYmYraHSa6d
-9xwN+5EmAW6cnnyiJ6lbp1vcQrR9BGndvOZs+UVIolMk8u1gwyqWdg==
+MDM3MTANBgkqhkiG9w0BAQsFAAOCAQEAGvRSZNxkWv3p2jzznXtIVYKzh/b7PD/F
+lIbcyYwZMrqy9mzNxhLctrw/qZqNAqsuJI0Wx0hepWcZJOGAGHGBfU6fe/yJrWFJ
+W0XLBvQMH0XoG32tryMBiubALUfLgmbMOyAgUTEXKYTFQvTvHAYvqjNHOip0hK8Y
+kKTaL6FXTWCffwAuX7oOw+ndKzRQJFBniSwm3iPRqYcsrWz1BuO6JTDrHxHckBt8
+D0SgOAhy4SPgmJackWqmYnEQC+NtyBvox5UEyOsu3FmvbgVi9+6yYxD8cZIXECSE
+PhbaIeOwn4d4b/PysLT1JhSIp1rrDZGOGOMLx6xUlTfGXyDiyxWfMg==
 -----END CERTIFICATE-----

BIN
national-motion-module-system/national-motion-system-biz/src/main/resources/certTest/apiclient_cert.p12


+ 25 - 0
national-motion-module-system/national-motion-system-biz/src/main/resources/certTest/apiclient_cert.pem

@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIENDCCAxygAwIBAgIUZelVnYGtoL2gzTz0hKWajftWEL4wDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjUwOTA1MDE0MTEwWhcNMzAwOTA0MDE0MTEwWjCBjTETMBEGA1UEAwwK
+MTcyNTg0NTY4MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTkwNwYDVQQL
+DDDkuK3mlbDmnKrmnaXvvIjmtbfljZfvvInns7vnu5/pm4bmiJDmnInpmZDlhazl
+j7gxCzAJBgNVBAYTAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALtopcBas3Lhb00y/YCH3OnVVANmTrydZfcR8AKA
+d0JeGoXaaHNSpAkcaO6aqRIEp1PANPOBcJyzsQo9Ih5ZdJqN9vKfx/lxi6lFgRIW
++simIdpGHdpRM1WZ9GJcs3rMxKIBSSA+neZlfNmWnfzA9lLVWX5LyV6wRMSqcT+o
+UroDYwoKM4Vu0I1Aiw9zirvQnOADA3HbSCIc0yaHpM3jVqzVC7o9Wlqa80uAunhT
+YYEidRGkctSpUl9A57MI4dQSQPG1x1jfQ1vhogUXNIvMayxzN26i+GbxvntbLR0P
+lysYplUayLHeb0Jd34GyEkNggH8QCK9T6ekrhPOKcDsrTB0CAwEAAaOBuTCBtjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGE
+aHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0
+MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFC
+NjU0MjJFMTJCMjdBOUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEB
+CwUAA4IBAQAM4AlxykqJA/0HK3T4dU5CB02BIGEygu0HH1X2tPrl0kLIVu9J7jfq
+i9PddQ8sjiUP6UjcegkEfvM3kIg66zREJzjFaWFJBdxBYW8ooab3yOO1o80c9cRm
+NoSLNwiumc72xEeARAsjwNiMcYsK3kLRvMOp1zqH99JNWCvDq4oZNVYvnHJH6nPi
+dda8XLswTvUvEJQq0JDDTxgOzIK1BGzLXbaN0fsdsHLrfQ+QnqkIZYyWzLe6WkMR
+V+n0aiZmt5SCu/XMG7hjQpX0Ob8oUmMENcy6bIv/fMwpV+6VD29Gy1l/ykyroxy4
+cNLOIZ6DorRnq/gVKGPhOpfUMHGJTwF8
+-----END CERTIFICATE-----

+ 28 - 0
national-motion-module-system/national-motion-system-biz/src/main/resources/certTest/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7aKXAWrNy4W9N
+Mv2Ah9zp1VQDZk68nWX3EfACgHdCXhqF2mhzUqQJHGjumqkSBKdTwDTzgXCcs7EK
+PSIeWXSajfbyn8f5cYupRYESFvrIpiHaRh3aUTNVmfRiXLN6zMSiAUkgPp3mZXzZ
+lp38wPZS1Vl+S8lesETEqnE/qFK6A2MKCjOFbtCNQIsPc4q70JzgAwNx20giHNMm
+h6TN41as1Qu6PVpamvNLgLp4U2GBInURpHLUqVJfQOezCOHUEkDxtcdY30Nb4aIF
+FzSLzGssczduovhm8b57Wy0dD5crGKZVGsix3m9CXd+BshJDYIB/EAivU+npK4Tz
+inA7K0wdAgMBAAECggEASTeFKjVFTmiMl1iIeaKayDAz9nAN6tqDb5ducUvHTAJ/
+0jOWAxgSRgz3YeDClOuEg8/f4BJ98HqzfBCON9UzHP7Br+CEvAuESMmCt5KKv8FI
+EIK8PwLiT1sqgxM8e4lseO6Ppy1PeyfDMy8I4ipxEcOQhysMrRWoiD0eqYQVbd4g
+YfOEsq8EbSHr+sDHgFJM5hEEHEWNvSUUSjifuo861SkYEtjQcg5AKflPce9Fz7Ze
+UNxHEh+gAOvDzkFTlVSnqhUR3G2EeoFSwALwNMNJW4vBiQ16InhAlsUPh5zByPBS
+HAbfiNYNUgYQM5PUy2YSamMXwUAAvNvcrbNUN6PrgQKBgQD4OtObOKB60zZYuRfa
+6lpfIxT4EeaP7aGFc+vL20ZFTEhueWAHw8opznrRwWa3zok1T+PhJHJ0BeLsU+m1
+Y4BVDHNw7rfKxMaw63LL2AGnx2wmeDDm1bliPvnQrc7KVqQsgu31+xuOKcgL5brg
+YdxfXPyHP7vAfI8RaanGHS3luQKBgQDBRm+FAELD/O0Hsn8Eyz6tehTG0AqyLdCE
+DmKjC1cQnQVDWReFRcLjFQZLd3eajNe9L1liyqnKERnJCgsyxaygmZVnt4xdwRSm
+dV76SFV6+kXs9dDILeRNhybyfAIdrijv60gF8uVfUMhbQGtpuEs9e+1UhP5TcvbS
+Y10Q3xQLhQKBgQDTcrjiVkBNoDGBLlolvs+wjt/D2Ou/2rpmRbKsemLHkQ16HaYx
+txQ0vJBesRJgrGywnxcMp9FfB8yfZ3ODcfjVeb+0iYTCExD1j/q/rYbrdrKnqmZt
+m81I5UBEBGpMbbV3vSgbCwYT+X9QsyaXEIV6LmlmhGHYu8HbIVjfS+fW8QKBgQCn
+083Ko+tV3C7G3ExHkWUfpj6cVNK03euOgB9OjO5RUsfbL2WpKGaOYRdSOK722Q4N
+DSyFCI5fFHJbjAklUVkRK8v8f/m2/4467PhIRL9VRjWqCdn9uTvhxlYfgWck9rI9
+gwTLhZt/JNqVwl6DMrDC9vWiysk9FTsWfYm2uL7jMQKBgQDy2kud6Ct2wvN6AakJ
+PrXwvW0FVrI5ieGS4eG0cUWiK/7S1TjyyuF/dJYabxVtXnYXCLTztFigPCVNWeog
+R9FQITYKducHCS/Gjz53ksEeX9LuUB78gyrqiGvq5iyKKOsYvh9j3YmLpZgeQ1CE
+be6f9A6UjSGKP4qEvgJhIy09bw==
+-----END PRIVATE KEY-----

+ 24 - 0
national-motion-module-system/national-motion-system-biz/src/main/resources/certTest/platform_cert.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEFDCCAvygAwIBAgIUXrZcwPkS6irdM2PqPaAjDfbakLwwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjUwOTA1MDE0MTEwWhcNMzAwOTA0MDE0MTEwWjBuMRgwFgYDVQQDDA9U
+ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl
+bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGEwJDTjERMA8GA1UEBwwIU2hlblpo
+ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZIxyPi1dMyGTlN2L3
+BJCzhHerkmnDX3EEci6TFHTag6/CSfF1RmgxUCfb6AJUn33gGwsACrf/HNTfA+ox
+okzeWmnLrAYMXsiZhO2IZaQJE4oel4pI51nBNaMRcN3HVu9QOCKm9P9USHj4hWPY
+iJvuUpiiMpDmcdrNRLfCS43FSCgozkbO0KYfiCMEhD30RBdOE/WhlCi61A1GeTBK
+9nuQeIsMUQikZH9a4uNi3AMNDwygfR65DSYkqw6feQibo96BYJRpZUILzVM033MA
+fpn1MApk1OUjrO/eq7FR3qOZN4BKsu7gz4nxzydYmnVLNZZFVLHlMMtSp0F5+Xch
+QCGrAgMBAAGjgbkwgbYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwgZsGA1UdHwSB
+kzCBkDCBjaCBiqCBh4aBhGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMv
+aXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4
+RUJEMiZzZz1IQUNDNDcxQjY1NDIyRTEyQjI3QTlEMzNBODdBRDFDREY1OTI2RTE0
+MDM3MTANBgkqhkiG9w0BAQsFAAOCAQEAk6Oz4E11WD9tT2oG87uj2C1Zp1IjZSOc
+F88cR8CKgbqnGc+gcF8cmixm1sHEYHBXAPKuQXkDOZ73Yi4l8RyIhX6u+GVM6evC
+A60rJyLz7TZ5XJ1G26vucmlcPlhvz11dDknXiuvm4qF3HyiZXLzOVtnDsUTytRST
+HCH4DpvXSt6OWTUj8Gzq4erS7VLh+pdh2hUTlYCw86Pn9hKVK60uqq3GSedgH729
+uuBbfWNAfG4Dwrk8PbkG5hay3Sv2Aac5NK0iok3dLFHGdNYbrxeDozYmYraHSa6d
+9xwN+5EmAW6cnnyiJ6lbp1vcQrR9BGndvOZs+UVIolMk8u1gwyqWdg==
+-----END CERTIFICATE-----

+ 4 - 4
national-motion-module-system/national-motion-system-start/src/main/resources/application-dev.yml

@@ -356,8 +356,8 @@ wx:
   # 微信小程序
   miniapp:
     configs:
-      - appid: wxc032a09413289004
-        secret: 453c5047ae43288f1d015d48df32a5c0
+      - appid: wxe70e6c132e5b4c28
+        secret: 1b33b5f64d4745d3f6c6a3097a914415
         token: #微信小程序消息服务器配置的token
         aesKey: #微信小程序消息服务器配置的EncodingAESKey
         msgDataFormat: JSON
@@ -392,9 +392,9 @@ baidu:
 # 微信小程序配置
 wechat:
   miniprogram:
-    appid: wxc032a09413289004
+    appid: wxe70e6c132e5b4c28
 #    appid: wx6260718c6fd46efb
-    appsecret: 453c5047ae43288f1d015d48df32a5c0
+    appsecret: 1b33b5f64d4745d3f6c6a3097a914415
 #    appsecret: 353c9d6d84347de7af9a7788a00a725e
     token:
       cache: