diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 707d8804e9..88de37d1ee 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -73,7 +73,7 @@ 1.0.8 1.6.1 2.12.2 - 4.5.0 + 4.5.7.B @@ -113,11 +113,6 @@ yudao-spring-boot-starter-biz-pay ${revision} - - cn.iocoder.boot - yudao-spring-boot-starter-biz-weixin - ${revision} - cn.iocoder.boot yudao-spring-boot-starter-biz-tenant @@ -624,11 +619,6 @@ weixin-java-pay ${weixin-java.version} - - com.github.binarywang - weixin-java-mp - ${weixin-java.version} - com.github.binarywang wx-java-mp-spring-boot-starter diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index f2e39a908a..6a8212314f 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -31,7 +31,6 @@ yudao-spring-boot-starter-biz-sms yudao-spring-boot-starter-biz-pay - yudao-spring-boot-starter-biz-weixin yudao-spring-boot-starter-biz-tenant yudao-spring-boot-starter-biz-data-permission yudao-spring-boot-starter-biz-error-code diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml b/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml deleted file mode 100644 index b67e542cfd..0000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - cn.iocoder.boot - yudao-framework - ${revision} - - 4.0.0 - yudao-spring-boot-starter-biz-weixin - jar - - ${project.artifactId} - 微信拓展 - 1. 基于 weixin-java-mp 库，对接微信公众号平台。目前主要解决微信公众号的支付场景。 - 2. 基于 weixin-java-miniapp 库，对接微信小程序。目前主要解决微信小程序的一键登录场景。 - - https://github.com/YunaiV/ruoyi-vue-pro - - - - cn.iocoder.boot - yudao-common - - - - - cn.iocoder.boot - yudao-spring-boot-starter-test - test - - - - - com.github.binarywang - wx-java-mp-spring-boot-starter - - - com.github.binarywang - wx-java-miniapp-spring-boot-starter - - - - diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/java/cn/iocoder/yudao/framework/weixin/package-info.java b/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/java/cn/iocoder/yudao/framework/weixin/package-info.java deleted file mode 100644 index cf15f39bf0..0000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/java/cn/iocoder/yudao/framework/weixin/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * 微信拓展 - * 1. 基于 weixin-java-mp 库，对接微信公众号平台。目前主要解决微信公众号的支付场景。 - * 2. 基于 weixin-java-miniapp 库，对接微信小程序。目前主要解决微信小程序的一键登录场景。 - */ -package cn.iocoder.yudao.framework.weixin; - diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/java/cn/iocoder/yudao/framework/weixin/WxMpServiceTest.java b/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/java/cn/iocoder/yudao/framework/weixin/WxMpServiceTest.java deleted file mode 100644 index 392e651c52..0000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/java/cn/iocoder/yudao/framework/weixin/WxMpServiceTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.iocoder.yudao.framework.weixin; - -import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.mp.api.WxMpService; -import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.context.SpringBootTest; - -import javax.annotation.Resource; - -@SpringBootTest(classes = WxMpServiceTest.Application.class) -public class WxMpServiceTest { - - @Resource - private WxMpService wxMpService; - - @Test - public void testGetAccessToken() throws WxErrorException { - String accessToken = wxMpService.getAccessToken(); - System.out.println(accessToken); - } - - @Test - public void testGet() throws WxErrorException { - String jsapiTicket = wxMpService.getJsapiTicket(); - System.out.println(jsapiTicket); - } - - @SpringBootApplication - public static class Application { - - } - -} diff --git a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/resources/application.yml b/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/resources/application.yml deleted file mode 100644 index 9b30060a81..0000000000 --- a/yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/resources/application.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- #################### 微信公众号相关配置 #################### -wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档 - mp: - # 公众号配置(必填) - app-id: wx041349c6f39b268b - secret: 5abee519483bc9f8cb37ce280e814bd0 - # 存储配置，解决 AccessToken 的跨节点的共享 -# config-storage: -# type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 -# key-prefix: wx # Redis Key 的前缀 TODO 芋艿：解决下 Redis key 管理的配置 -# http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 diff --git a/yudao-module-mp/yudao-module-mp-biz/pom.xml b/yudao-module-mp/yudao-module-mp-biz/pom.xml index f1a2176987..c7d1b49730 100644 --- a/yudao-module-mp/yudao-module-mp-biz/pom.xml +++ b/yudao-module-mp/yudao-module-mp-biz/pom.xml @@ -39,10 +39,6 @@ cn.iocoder.boot yudao-spring-boot-starter-biz-operatelog - - cn.iocoder.boot - yudao-spring-boot-starter-biz-weixin - cn.iocoder.boot yudao-spring-boot-starter-biz-tenant @@ -89,6 +85,11 @@ yudao-spring-boot-starter-excel + + + com.github.binarywang + wx-java-mp-spring-boot-starter + diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml index a203770b98..dc8a1b4547 100644 --- a/yudao-module-system/yudao-module-system-biz/pom.xml +++ b/yudao-module-system/yudao-module-system-biz/pom.xml @@ -54,10 +54,6 @@ cn.iocoder.boot yudao-spring-boot-starter-biz-ip - - cn.iocoder.boot - yudao-spring-boot-starter-biz-weixin - @@ -122,6 +118,15 @@ spring-boot-starter-justauth + + com.github.binarywang + wx-java-mp-spring-boot-starter + + + com.github.binarywang + wx-java-miniapp-spring-boot-starter + +