diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index fdad6e4650..79bfa3c411 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -81,7 +81,7 @@ 1.0.8 1.6.1 2.12.2 - 4.5.0 + 4.5.7.B @@ -135,11 +135,6 @@ yudao-spring-boot-starter-biz-pay ${revision} - - cn.iocoder.cloud - yudao-spring-boot-starter-biz-weixin - ${revision} - cn.iocoder.cloud yudao-spring-boot-starter-biz-tenant @@ -628,11 +623,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 95e09880b9..546f427232 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -34,7 +34,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-module-mp/yudao-module-mp-biz/pom.xml b/yudao-module-mp/yudao-module-mp-biz/pom.xml index ff1d72262f..5b62f30495 100644 --- a/yudao-module-mp/yudao-module-mp-biz/pom.xml +++ b/yudao-module-mp/yudao-module-mp-biz/pom.xml @@ -46,10 +46,6 @@ cn.iocoder.cloud yudao-spring-boot-starter-biz-operatelog - - cn.iocoder.cloud - yudao-spring-boot-starter-biz-weixin - cn.iocoder.cloud yudao-spring-boot-starter-biz-tenant @@ -114,6 +110,11 @@ yudao-spring-boot-starter-excel + + + com.github.binarywang + wx-java-mp-spring-boot-starter + diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/resources/application-dev.yaml b/yudao-module-mp/yudao-module-mp-biz/src/main/resources/application-dev.yaml index 22f7f128fa..7384793538 100644 --- a/yudao-module-mp/yudao-module-mp-biz/src/main/resources/application-dev.yaml +++ b/yudao-module-mp/yudao-module-mp-biz/src/main/resources/application-dev.yaml @@ -68,19 +68,7 @@ spring: lock4j: acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒 expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒 ---- #################### wx #################### -wx: - miniapp: # 小程序配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 - # appid: wx62056c0d5e8db250 - # secret: 333ae72f41552af1e998fe1f54e1584a - appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 - secret: 6f270509224a7ae1296bbf1c8cb97aed - token: evol - aes-key: 2a7b3b20c537e52e74afd395eb85f61f - config-storage: - type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取 - key-prefix: wa # Redis Key 的前缀 - http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 + --- #################### 监控相关配置 #################### # Actuator 监控端点的配置项 diff --git a/yudao-module-mp/yudao-module-mp-biz/src/main/resources/application-local.yaml b/yudao-module-mp/yudao-module-mp-biz/src/main/resources/application-local.yaml index 941c29ade2..928d8e705a 100644 --- a/yudao-module-mp/yudao-module-mp-biz/src/main/resources/application-local.yaml +++ b/yudao-module-mp/yudao-module-mp-biz/src/main/resources/application-local.yaml @@ -104,19 +104,7 @@ logging: level: # 配置自己写的 MyBatis Mapper 打印日志 cn.iocoder.yudao.module.mp.dal.mysql: debug ---- #################### wx #################### -wx: - miniapp: # 小程序配置(必填),参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md 文档 - # appid: wx62056c0d5e8db250 - # secret: 333ae72f41552af1e998fe1f54e1584a - appid: wx63c280fe3248a3e7 # wenhualian的接口测试号 - secret: 6f270509224a7ae1296bbf1c8cb97aed - token: evol - aes-key: 2a7b3b20c537e52e74afd395eb85f61f - config-storage: - type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取 - key-prefix: wa # Redis Key 的前缀 - http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 + --- #################### 芋道相关配置 #################### # 芋道配置项,设置当前项目所有自定义的配置 diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml index f1d2844ffa..d1cd799040 100644 --- a/yudao-module-system/yudao-module-system-biz/pom.xml +++ b/yudao-module-system/yudao-module-system-biz/pom.xml @@ -74,10 +74,6 @@ cn.iocoder.cloud yudao-spring-boot-starter-biz-ip - - cn.iocoder.cloud - yudao-spring-boot-starter-biz-weixin - @@ -166,6 +162,16 @@ com.xingyuv spring-boot-starter-justauth + + + com.github.binarywang + wx-java-mp-spring-boot-starter + + + com.github.binarywang + wx-java-miniapp-spring-boot-starter + +