新增摩登小程序

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -212,6 +212,9 @@ liquidnet:
       smile:
         appid: wx4956704fe769112c
         secret: 645919ab4a4c48eb8e73aea38752adfa
+      modern:
+        appid: wxe3a093ce7278d5b1
+        secret: 14d531f87dffd3cbbd668ae9f475f1ff
   umeng:
     ios:
       appkey: 54fe819bfd98c546b50004f0

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -212,6 +212,9 @@ liquidnet:
       smile:
         appid: wx4956704fe769112c
         secret: 645919ab4a4c48eb8e73aea38752adfa
+      modern:
+        appid: wxe3a093ce7278d5b1
+        secret: 14d531f87dffd3cbbd668ae9f475f1ff
   umeng:
     ios:
       appkey: 54fe819bfd98c546b50004f0

liquidnet-bus-config/liquidnet-config/application-test2.yml

@@ -212,6 +212,9 @@ liquidnet:
       smile:
         appid: wx4956704fe769112c
         secret: 645919ab4a4c48eb8e73aea38752adfa
+      modern:
+        appid: wxe3a093ce7278d5b1
+        secret: 14d531f87dffd3cbbd668ae9f475f1ff
   umeng:
     ios:
       appkey: 54fe819bfd98c546b50004f0

liquidnet-bus-config/liquidnet-config/application-yace.yml

@@ -212,6 +212,9 @@ liquidnet:
       smile:
         appid: wx4956704fe769112c
         secret: 645919ab4a4c48eb8e73aea38752adfa
+      modern:
+        appid: wxe3a093ce7278d5b1
+        secret: 14d531f87dffd3cbbd668ae9f475f1ff
   umeng:
     ios:
       appkey: 54fe819bfd98c546b50004f0

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/config/WechatMaConfigure.java

@@ -38,6 +38,9 @@ public class WechatMaConfigure {
     private static String appletAppidSmile;
     private static String appletSecretSmile;
 
+    private static String appletAppidModern;
+    private static String appletSecretModern;
+
     @Value("${liquidnet.wechat.applet.strawberry.appid}")
     public void setAppletAppidStrawberry(String appletAppidStrawberry) {
         WechatMaConfigure.appletAppidStrawberry = appletAppidStrawberry;
@@ -92,12 +95,22 @@ public class WechatMaConfigure {
         WechatMaConfigure.appletSecretSmile = appletSecretSmile;
     }
 
+    @Value("${liquidnet.wechat.applet.modern.appid}")
+    public void setAppletAppidModern(String appletAppidModern) {
+        WechatMaConfigure.appletAppidModern = appletAppidModern;
+    }
+    @Value("${liquidnet.wechat.applet.modern.secret}")
+    public void setAppletSecretModern(String appletSecretModern) {
+        WechatMaConfigure.appletSecretModern = appletSecretModern;
+    }
+
     private WxMaService wxMaAppletStrawberryService;
     private WxMaService wxMaAppletFiveService;
     private WxMaService wxMaAppletMdskService;
     private WxMaService wxMaAppletZhengzaiService;
     private WxMaService wxMaAppletAirshipService;
     private WxMaService wxMaAppletSmileService;
+    private WxMaService wxMaAppletModernService;
 
     private WxMaMessageRouter wxMaStrawberryMessageRouter;
     private WxMaMessageRouter wxMaFiveMessageRouter;
@@ -105,6 +118,7 @@ public class WechatMaConfigure {
     private WxMaMessageRouter wxMaZhengzaiMessageRouter;
     private WxMaMessageRouter wxMaAirshipMessageRouter;
     private WxMaMessageRouter wxMaSmileMessageRouter;
+    private WxMaMessageRouter wxMaModernMessageRouter;
 
     @Autowired
     private StringRedisTemplate stringRedisTemplate;
@@ -183,12 +197,24 @@ public class WechatMaConfigure {
                 this.setWxMaConfig(wxMaDefaultConfig);
             }
         };
+        wxMaAppletModernService = new WxMaServiceImpl() {
+            {
+                RedisTemplateWxRedisOps redisTemplateWxRedisOps = new RedisTemplateWxRedisOps(stringRedisTemplate);
+                WxMaRedisBetterConfigImpl wxMaDefaultConfig = new WxMaRedisBetterConfigImpl(redisTemplateWxRedisOps, "sweet:accessToken:applet:modern");
+                wxMaDefaultConfig.setAppid(appletAppidModern);
+                wxMaDefaultConfig.setSecret(appletSecretModern);
+                wxMaDefaultConfig.setMsgDataFormat("JSON");
+
+                this.setWxMaConfig(wxMaDefaultConfig);
+            }
+        };
         wxMaStrawberryMessageRouter = new WxMaMessageRouter(wxMaAppletStrawberryService);
         wxMaFiveMessageRouter = new WxMaMessageRouter(wxMaAppletFiveService);
         wxMaMdskMessageRouter = new WxMaMessageRouter(wxMaAppletMdskService);
         wxMaZhengzaiMessageRouter = new WxMaMessageRouter(wxMaAppletZhengzaiService);
         wxMaAirshipMessageRouter = new WxMaMessageRouter(wxMaAppletAirshipService);
         wxMaSmileMessageRouter = new WxMaMessageRouter(wxMaAppletSmileService);
+        wxMaModernMessageRouter = new WxMaMessageRouter(wxMaAppletModernService);
     }
 
     public WxMaService getWxMaService(Integer anum) {
@@ -205,6 +231,8 @@ public class WechatMaConfigure {
                 return wxMaAppletAirshipService;
             case 6:
                 return wxMaAppletSmileService;
+            case 7:
+                return wxMaAppletModernService;
         }
         return null;
     }
@@ -223,6 +251,8 @@ public class WechatMaConfigure {
                 return appletAppidAirship;
             case 6:
                 return appletAppidSmile;
+            case 7:
+                return appletAppidModern;
         }
         return "";
     }
@@ -241,6 +271,8 @@ public class WechatMaConfigure {
                 return wxMaAirshipMessageRouter;
             case 6:
                 return wxMaSmileMessageRouter;
+            case 7:
+                return wxMaModernMessageRouter;
         }
         return null;
     }