BJ_ZTEITS-Developers / parking-cloud-yudao

Commit a1e6348a37d85cfbd93c0bdfc9b6fcba357b4955

Authored by YunaiV
1 parent ee25b8ae

移除 weixin starter 组件，直接改成 wxjava starter

Inline Side-by-side
Showing 8 changed files with 15 additions and 117 deletions
yudao-dependencies/pom.xml
  View file @a1e6348
... ... @@ -73,7 +73,7 @@
73 73 <justauth.version>1.0.8</justauth.version>
74 74 <jimureport.version>1.6.1</jimureport.version>
75 75 <xercesImpl.version>2.12.2</xercesImpl.version>
76   - <weixin-java.version>4.5.0</weixin-java.version>
  76 + <weixin-java.version>4.5.7.B</weixin-java.version>
77 77 </properties>
78 78  
79 79 <dependencyManagement>
... ... @@ -115,11 +115,6 @@
115 115 </dependency>
116 116 <dependency>
117 117 <groupId>cn.iocoder.boot</groupId>
118   - <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
119   - <version>${revision}</version>
120   - </dependency>
121   - <dependency>
122   - <groupId>cn.iocoder.boot</groupId>
123 118 <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
124 119 <version>${revision}</version>
125 120 </dependency>
... ... @@ -626,11 +621,6 @@
626 621 </dependency>
627 622 <dependency>
628 623 <groupId>com.github.binarywang</groupId>
629   - <artifactId>weixin-java-mp</artifactId>
630   - <version>${weixin-java.version}</version>
631   - </dependency>
632   - <dependency>
633   - <groupId>com.github.binarywang</groupId>
634 624 <artifactId>wx-java-mp-spring-boot-starter</artifactId>
635 625 <version>${weixin-java.version}</version>
636 626 </dependency>
... ...
yudao-framework/pom.xml
  View file @a1e6348
... ... @@ -31,7 +31,6 @@
31 31 <module>yudao-spring-boot-starter-biz-sms</module>
32 32  
33 33 <module>yudao-spring-boot-starter-biz-pay</module>
34   - <module>yudao-spring-boot-starter-biz-weixin</module>
35 34 <module>yudao-spring-boot-starter-biz-tenant</module>
36 35 <module>yudao-spring-boot-starter-biz-data-permission</module>
37 36 <module>yudao-spring-boot-starter-biz-error-code</module>
... ...
yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml deleted
View file @ee25b8a
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<project xmlns="http://maven.apache.org/POM/4.0.0"
3   - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4   - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5   - <parent>
6   - <groupId>cn.iocoder.boot</groupId>
7   - <artifactId>yudao-framework</artifactId>
8   - <version>${revision}</version>
9   - </parent>
10   - <modelVersion>4.0.0</modelVersion>
11   - <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
12   - <packaging>jar</packaging>
13   -
14   - <name>${project.artifactId}</name>
15   - <description>微信拓展
16   - 1. 基于 weixin-java-mp 库，对接微信公众号平台。目前主要解决微信公众号的支付场景。
17   - 2. 基于 weixin-java-miniapp 库，对接微信小程序。目前主要解决微信小程序的一键登录场景。
18   - </description>
19   - <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
20   -
21   - <dependencies>
22   - <dependency>
23   - <groupId>cn.iocoder.boot</groupId>
24   - <artifactId>yudao-common</artifactId>
25   - </dependency>
26   -
27   - <!-- Test 测试相关 -->
28   - <dependency>
29   - <groupId>cn.iocoder.boot</groupId>
30   - <artifactId>yudao-spring-boot-starter-test</artifactId>
31   - <scope>test</scope>
32   - </dependency>
33   -
34   - <!-- 三方云服务相关 -->
35   - <dependency>
36   - <groupId>com.github.binarywang</groupId>
37   - <artifactId>wx-java-mp-spring-boot-starter</artifactId>
38   - </dependency>
39   - <dependency>
40   - <groupId>com.github.binarywang</groupId>
41   - <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
42   - </dependency>
43   - </dependencies>
44   -
45   -</project>
yudao-framework/yudao-spring-boot-starter-biz-weixin/src/main/java/cn/iocoder/yudao/framework/weixin/package-info.java deleted
View file @ee25b8a
1   -/**
2   - * 微信拓展
3   - * 1. 基于 weixin-java-mp 库，对接微信公众号平台。目前主要解决微信公众号的支付场景。
4   - * 2. 基于 weixin-java-miniapp 库，对接微信小程序。目前主要解决微信小程序的一键登录场景。
5   - */
6   -package cn.iocoder.yudao.framework.weixin;
7   -
yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/java/cn/iocoder/yudao/framework/weixin/WxMpServiceTest.java deleted
View file @ee25b8a
1   -package cn.iocoder.yudao.framework.weixin;
2   -
3   -import me.chanjar.weixin.common.error.WxErrorException;
4   -import me.chanjar.weixin.mp.api.WxMpService;
5   -import org.junit.jupiter.api.Test;
6   -import org.springframework.boot.autoconfigure.SpringBootApplication;
7   -import org.springframework.boot.test.context.SpringBootTest;
8   -
9   -import javax.annotation.Resource;
10   -
11   -@SpringBootTest(classes = WxMpServiceTest.Application.class)
12   -public class WxMpServiceTest {
13   -
14   - @Resource
15   - private WxMpService wxMpService;
16   -
17   - @Test
18   - public void testGetAccessToken() throws WxErrorException {
19   - String accessToken = wxMpService.getAccessToken();
20   - System.out.println(accessToken);
21   - }
22   -
23   - @Test
24   - public void testGet() throws WxErrorException {
25   - String jsapiTicket = wxMpService.getJsapiTicket();
26   - System.out.println(jsapiTicket);
27   - }
28   -
29   - @SpringBootApplication
30   - public static class Application {
31   -
32   - }
33   -
34   -}
yudao-framework/yudao-spring-boot-starter-biz-weixin/src/test-integration/resources/application.yml deleted
View file @ee25b8a
1   ---- #################### 微信公众号相关配置 ####################
2   -wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
3   - mp:
4   - # 公众号配置(必填)
5   - app-id: wx041349c6f39b268b
6   - secret: 5abee519483bc9f8cb37ce280e814bd0
7   - # 存储配置，解决 AccessToken 的跨节点的共享
8   -# config-storage:
9   -# type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
10   -# key-prefix: wx # Redis Key 的前缀 TODO 芋艿：解决下 Redis key 管理的配置
11   -# http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
yudao-module-mp/yudao-module-mp-biz/pom.xml
  View file @a1e6348
... ... @@ -41,10 +41,6 @@
41 41 </dependency>
42 42 <dependency>
43 43 <groupId>cn.iocoder.boot</groupId>
44   - <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
45   - </dependency>
46   - <dependency>
47   - <groupId>cn.iocoder.boot</groupId>
48 44 <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
49 45 </dependency>
50 46  
... ... @@ -89,6 +85,11 @@
89 85 <artifactId>yudao-spring-boot-starter-excel</artifactId>
90 86 </dependency>
91 87  
  88 + <!-- 三方云服务相关 -->
  89 + <dependency>
  90 + <groupId>com.github.binarywang</groupId>
  91 + <artifactId>wx-java-mp-spring-boot-starter</artifactId> <!-- 微信登录（公众号） -->
  92 + </dependency>
92 93 </dependencies>
93 94  
94 95 </project>
... ...
yudao-module-system/yudao-module-system-biz/pom.xml
  View file @a1e6348
... ... @@ -54,10 +54,6 @@
54 54 <groupId>cn.iocoder.boot</groupId>
55 55 <artifactId>yudao-spring-boot-starter-biz-ip</artifactId>
56 56 </dependency>
57   - <dependency>
58   - <groupId>cn.iocoder.boot</groupId>
59   - <artifactId>yudao-spring-boot-starter-biz-weixin</artifactId>
60   - </dependency>
61 57  
62 58 <!-- Web 相关 -->
63 59 <dependency>
... ... @@ -122,6 +118,15 @@
122 118 <artifactId>spring-boot-starter-justauth</artifactId> <!-- 社交登陆（例如说，个人微信、企业微信等等） -->
123 119 </dependency>
124 120  
  121 + <dependency>
  122 + <groupId>com.github.binarywang</groupId>
  123 + <artifactId>wx-java-mp-spring-boot-starter</artifactId> <!-- 微信登录（公众号） -->
  124 + </dependency>
  125 + <dependency>
  126 + <groupId>com.github.binarywang</groupId>
  127 + <artifactId>wx-java-miniapp-spring-boot-starter</artifactId> <!-- 微信登录（小程序） -->
  128 + </dependency>
  129 +
125 130 </dependencies>
126 131  
127 132 </project>
... ...