From c481b8b8595bd7f497c36574565a74f90cbeb868 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 25 Dec 2019 21:12:32 +0800 Subject: [PATCH] =?UTF-8?q?[WxJava][=E5=8D=87=E7=BA=A7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/pom.xml | 4 +- .../com/iformall/config/WechatMpConfig.java | 7 +-- mallinkCallback/pom.xml | 4 +- .../com/iformall/config/WechatMpConfig.java | 33 ----------- .../iformall/config/WechatWebProperties.java | 59 ------------------- .../src/main/resources/application-dev.yml | 1 - mallinkSysAdmin/pom.xml | 4 +- .../com/iformall/config/WechatMpConfig.java | 33 ----------- .../iformall/config/WechatWebProperties.java | 59 ------------------- 9 files changed, 9 insertions(+), 195 deletions(-) delete mode 100644 mallinkCallback/src/main/java/com/iformall/config/WechatMpConfig.java delete mode 100644 mallinkCallback/src/main/java/com/iformall/config/WechatWebProperties.java delete mode 100644 mallinkSysAdmin/src/main/java/com/iformall/config/WechatMpConfig.java delete mode 100644 mallinkSysAdmin/src/main/java/com/iformall/config/WechatWebProperties.java diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml index 4c0dfa3ed..781777ca8 100644 --- a/mallinkAdmin/pom.xml +++ b/mallinkAdmin/pom.xml @@ -13,8 +13,8 @@ mallinkAdmin - 3.3.0 - 3.3.0 + 3.6.0 + 3.6.0 diff --git a/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java index 4dff6c762..4433386c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/WechatMpConfig.java @@ -1,9 +1,9 @@ package com.iformall.config; -import me.chanjar.weixin.mp.api.WxMpConfigStorage; -import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; +import me.chanjar.weixin.mp.config.WxMpConfigStorage; +import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @@ -23,9 +23,8 @@ public class WechatMpConfig { return wxMpService; } - @Bean public WxMpConfigStorage wxConfigProvider(){ - WxMpInMemoryConfigStorage wxConfigProvider = new WxMpInMemoryConfigStorage(); + WxMpDefaultConfigImpl wxConfigProvider = new WxMpDefaultConfigImpl(); wxConfigProvider.setAppId(wechatWebProperties.getAppId()); wxConfigProvider.setSecret(wechatWebProperties.getSecret()); return wxConfigProvider; diff --git a/mallinkCallback/pom.xml b/mallinkCallback/pom.xml index 2a4dba723..1feccd436 100644 --- a/mallinkCallback/pom.xml +++ b/mallinkCallback/pom.xml @@ -13,8 +13,8 @@ mallinkCallback - 3.3.0 - 3.3.0 + 3.6.0 + 3.6.0 diff --git a/mallinkCallback/src/main/java/com/iformall/config/WechatMpConfig.java b/mallinkCallback/src/main/java/com/iformall/config/WechatMpConfig.java deleted file mode 100644 index 4dff6c762..000000000 --- a/mallinkCallback/src/main/java/com/iformall/config/WechatMpConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.iformall.config; - -import me.chanjar.weixin.mp.api.WxMpConfigStorage; -import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage; -import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.stereotype.Component; - -@Component -public class WechatMpConfig { - - @Autowired - private WechatWebProperties wechatWebProperties; - - @Bean - public WxMpService wxMpService() { - //创建WxMpService实例并设置appid和sectret - WxMpService wxMpService = new WxMpServiceImpl(); - //这里的设置方式是跟着这个sdk的文档写的 - wxMpService.setWxMpConfigStorage(wxConfigProvider()); - return wxMpService; - } - - @Bean - public WxMpConfigStorage wxConfigProvider(){ - WxMpInMemoryConfigStorage wxConfigProvider = new WxMpInMemoryConfigStorage(); - wxConfigProvider.setAppId(wechatWebProperties.getAppId()); - wxConfigProvider.setSecret(wechatWebProperties.getSecret()); - return wxConfigProvider; - } -} diff --git a/mallinkCallback/src/main/java/com/iformall/config/WechatWebProperties.java b/mallinkCallback/src/main/java/com/iformall/config/WechatWebProperties.java deleted file mode 100644 index 0b9047399..000000000 --- a/mallinkCallback/src/main/java/com/iformall/config/WechatWebProperties.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.iformall.config; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * Stormeye - */ -@Component -@ConfigurationProperties(prefix = "wechat.web") -public class WechatWebProperties { - /** - * 设置微信第三方平台-微信登录的web应用appid - */ - private String appId; - - /** - * 设置微信第三方平台-微信登录的web应用app secret - */ - private String secret; - - /** - * 网页URL - * @return - */ - private String url; - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public String getSecret() { - return secret; - } - - public void setSecret(String secret) { - this.secret = secret; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, - ToStringStyle.MULTI_LINE_STYLE); - } -} diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 8862be1a5..52edc0080 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -117,6 +117,5 @@ fm: logging: level: - tk.mybatis: debug com.iformall: debug path: ./logs/admin \ No newline at end of file diff --git a/mallinkSysAdmin/pom.xml b/mallinkSysAdmin/pom.xml index e006b484e..f99b954fb 100644 --- a/mallinkSysAdmin/pom.xml +++ b/mallinkSysAdmin/pom.xml @@ -13,8 +13,8 @@ mallinkSysAdmin - 3.3.0 - 3.3.0 + 3.6.0 + 3.6.0 diff --git a/mallinkSysAdmin/src/main/java/com/iformall/config/WechatMpConfig.java b/mallinkSysAdmin/src/main/java/com/iformall/config/WechatMpConfig.java deleted file mode 100644 index 4dff6c762..000000000 --- a/mallinkSysAdmin/src/main/java/com/iformall/config/WechatMpConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.iformall.config; - -import me.chanjar.weixin.mp.api.WxMpConfigStorage; -import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage; -import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.stereotype.Component; - -@Component -public class WechatMpConfig { - - @Autowired - private WechatWebProperties wechatWebProperties; - - @Bean - public WxMpService wxMpService() { - //创建WxMpService实例并设置appid和sectret - WxMpService wxMpService = new WxMpServiceImpl(); - //这里的设置方式是跟着这个sdk的文档写的 - wxMpService.setWxMpConfigStorage(wxConfigProvider()); - return wxMpService; - } - - @Bean - public WxMpConfigStorage wxConfigProvider(){ - WxMpInMemoryConfigStorage wxConfigProvider = new WxMpInMemoryConfigStorage(); - wxConfigProvider.setAppId(wechatWebProperties.getAppId()); - wxConfigProvider.setSecret(wechatWebProperties.getSecret()); - return wxConfigProvider; - } -} diff --git a/mallinkSysAdmin/src/main/java/com/iformall/config/WechatWebProperties.java b/mallinkSysAdmin/src/main/java/com/iformall/config/WechatWebProperties.java deleted file mode 100644 index 0b9047399..000000000 --- a/mallinkSysAdmin/src/main/java/com/iformall/config/WechatWebProperties.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.iformall.config; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * Stormeye - */ -@Component -@ConfigurationProperties(prefix = "wechat.web") -public class WechatWebProperties { - /** - * 设置微信第三方平台-微信登录的web应用appid - */ - private String appId; - - /** - * 设置微信第三方平台-微信登录的web应用app secret - */ - private String secret; - - /** - * 网页URL - * @return - */ - private String url; - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { - this.appId = appId; - } - - public String getSecret() { - return secret; - } - - public void setSecret(String secret) { - this.secret = secret; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - @Override - public String toString() { - return ToStringBuilder.reflectionToString(this, - ToStringStyle.MULTI_LINE_STYLE); - } -}