BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 7f657ee9313299f587de8a199558e1cadd99c464

Authored by YunaiV
1 parent c3318656

优化 mp-java 库的依赖管理

Inline Side-by-side
Showing 5 changed files with 21 additions and 12 deletions
yudao-dependencies/pom.xml
  View file @7f657ee
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 <justauth.version>1.0.1</justauth.version> 71 <justauth.version>1.0.1</justauth.version>
72 <jimureport.version>1.5.8</jimureport.version> 72 <jimureport.version>1.5.8</jimureport.version>
73 <xercesImpl.version>2.12.2</xercesImpl.version> 73 <xercesImpl.version>2.12.2</xercesImpl.version>
74 - <wx-java-mp.version>4.5.0</wx-java-mp.version> 74 + <weixin-java.version>4.5.0</weixin-java.version>
75 </properties> 75 </properties>
76 76
77 <dependencyManagement> 77 <dependencyManagement>
@@ -600,8 +600,23 @@ @@ -600,8 +600,23 @@
600 600
601 <dependency> 601 <dependency>
602 <groupId>com.github.binarywang</groupId> 602 <groupId>com.github.binarywang</groupId>
  603 + <artifactId>weixin-java-pay</artifactId>
  604 + <version>${weixin-java.version}</version>
  605 + </dependency>
  606 + <dependency>
  607 + <groupId>com.github.binarywang</groupId>
  608 + <artifactId>weixin-java-mp</artifactId>
  609 + <version>${weixin-java.version}</version>
  610 + </dependency>
  611 + <dependency>
  612 + <groupId>com.github.binarywang</groupId>
603 <artifactId>wx-java-mp-spring-boot-starter</artifactId> 613 <artifactId>wx-java-mp-spring-boot-starter</artifactId>
604 - <version>${wx-java-mp.version}</version> 614 + <version>${weixin-java.version}</version>
  615 + </dependency>
  616 + <dependency>
  617 + <groupId>com.github.binarywang</groupId>
  618 + <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
  619 + <version>${weixin-java.version}</version>
605 </dependency> 620 </dependency>
606 621
607 <!-- 积木报表--> 622 <!-- 积木报表-->
yudao-framework/yudao-spring-boot-starter-biz-pay/pom.xml
  View file @7f657ee
@@ -63,9 +63,7 @@ @@ -63,9 +63,7 @@
63 <dependency> 63 <dependency>
64 <groupId>com.github.binarywang</groupId> 64 <groupId>com.github.binarywang</groupId>
65 <artifactId>weixin-java-pay</artifactId> 65 <artifactId>weixin-java-pay</artifactId>
66 - <version>4.5.0</version>  
67 </dependency> 66 </dependency>
68 - <!-- TODO 芋艿：清理 -->  
69 67
70 <!-- Test 测试相关 --> 68 <!-- Test 测试相关 -->
71 <dependency> 69 <dependency>
yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
  View file @7f657ee
@@ -34,16 +34,12 @@ @@ -34,16 +34,12 @@
34 <!-- 三方云服务相关 --> 34 <!-- 三方云服务相关 -->
35 <dependency> 35 <dependency>
36 <groupId>com.github.binarywang</groupId> 36 <groupId>com.github.binarywang</groupId>
37 -<!-- <artifactId>weixin-java-mp</artifactId>-->  
38 <artifactId>wx-java-mp-spring-boot-starter</artifactId> 37 <artifactId>wx-java-mp-spring-boot-starter</artifactId>
39 - <version>4.5.0</version>  
40 </dependency> 38 </dependency>
41 <dependency> 39 <dependency>
42 <groupId>com.github.binarywang</groupId> 40 <groupId>com.github.binarywang</groupId>
43 <artifactId>wx-java-miniapp-spring-boot-starter</artifactId> 41 <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
44 - <version>4.5.0</version>  
45 </dependency> 42 </dependency>
46 - <!-- TODO 芋艿：清理 -->  
47 </dependencies> 43 </dependencies>
48 44
49 </project> 45 </project>
yudao-server/src/main/resources/application-dev.yaml
  View file @7f657ee
@@ -147,14 +147,14 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta @@ -147,14 +147,14 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta
147 # 存储配置，解决 AccessToken 的跨节点的共享 147 # 存储配置，解决 AccessToken 的跨节点的共享
148 config-storage: 148 config-storage:
149 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 149 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
150 - key-prefix: wx # Redis Key 的前缀 TODO 芋艿：解决下 Redis key 管理的配置 150 + key-prefix: wx # Redis Key 的前缀
151 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 151 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
152 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 152 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
153 appid: wx63c280fe3248a3e7 153 appid: wx63c280fe3248a3e7
154 secret: 6f270509224a7ae1296bbf1c8cb97aed 154 secret: 6f270509224a7ae1296bbf1c8cb97aed
155 config-storage: 155 config-storage:
156 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 156 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
157 - key-prefix: wa # Redis Key 的前缀 TODO 芋艿：解决下 Redis key 管理的配置 157 + key-prefix: wa # Redis Key 的前缀
158 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 158 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
159 159
160 --- #################### 芋道相关配置 #################### 160 --- #################### 芋道相关配置 ####################
yudao-server/src/main/resources/application-local.yaml
  View file @7f657ee
@@ -170,14 +170,14 @@ wx: @@ -170,14 +170,14 @@ wx:
170 # 存储配置，解决 AccessToken 的跨节点的共享 170 # 存储配置，解决 AccessToken 的跨节点的共享
171 config-storage: 171 config-storage:
172 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 172 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
173 - key-prefix: wx # Redis Key 的前缀 TODO 芋艿：解决下 Redis key 管理的配置 173 + key-prefix: wx # Redis Key 的前缀
174 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 174 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
175 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 175 miniapp: # 小程序配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档
176 appid: wx62056c0d5e8db250 176 appid: wx62056c0d5e8db250
177 secret: 333ae72f41552af1e998fe1f54e1584a 177 secret: 333ae72f41552af1e998fe1f54e1584a
178 config-storage: 178 config-storage:
179 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取 179 type: RedisTemplate # 采用 RedisTemplate 操作 Redis，会自动从 Spring 中获取
180 - key-prefix: wa # Redis Key 的前缀 TODO 芋艿：解决下 Redis key 管理的配置 180 + key-prefix: wa # Redis Key 的前缀
181 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 181 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台
182 182
183 --- #################### 芋道相关配置 #################### 183 --- #################### 芋道相关配置 ####################