From cfe70b1259c2f452105f046ffaba99c86234fc18 Mon Sep 17 00:00:00 2001 From: dftre <3066417822@qq.com> Date: Tue, 8 Oct 2024 13:54:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=BE=AE=E4=BF=A1=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=92=8C=E5=85=AC=E4=BC=97=E5=8F=B7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E7=9A=84=20open=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了 oauth.wx.miniapp 和 oauth.wx.pub 配置中的 open 字段 - 移除了 WxMiniAppConstant 和 WxPubConstant 类中的 open 字段相关代码 添加了一些属性标识 --- .../src/main/resources/application-auth.yml | 2 -- .../oauth/wx/constant/WxMiniAppConstant.java | 10 ------ .../oauth/wx/constant/WxPubConstant.java | 11 ------ ...itional-spring-configuration-metadata.json | 34 +++++++++++++++++++ ...itional-spring-configuration-metadata.json | 14 ++++++++ .../datasource/DataSourceManagement.java | 4 +-- ...itional-spring-configuration-metadata.json | 24 +++++++++++++ 7 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 ruoyi-auth/ruoyi-oauth-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 ruoyi-auth/ruoyi-tfa-phone/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 ruoyi-middleware/ruoyi-middleware-minio/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/ruoyi-admin/src/main/resources/application-auth.yml b/ruoyi-admin/src/main/resources/application-auth.yml index 8669e17..c56f24f 100644 --- a/ruoyi-admin/src/main/resources/application-auth.yml +++ b/ruoyi-admin/src/main/resources/application-auth.yml @@ -2,12 +2,10 @@ oauth: wx: miniapp: - open: true appId: appId appSecret: appSecret url: https://api.weixin.qq.com/sns/jscode2session pub: - open: true appId: appId appSecret: appSecret url: https://api.weixin.qq.com/sns/oauth2/access_token diff --git a/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/constant/WxMiniAppConstant.java b/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/constant/WxMiniAppConstant.java index 094e830..364ba73 100644 --- a/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/constant/WxMiniAppConstant.java +++ b/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/constant/WxMiniAppConstant.java @@ -14,16 +14,6 @@ public class WxMiniAppConstant { @Value("${oauth.wx.miniapp.url}") private String url; - @Value("${oauth.wx.miniapp.open}") - private Boolean open; - - public Boolean getOpen() { - return open; - } - - public void setOpen(Boolean open) { - this.open = open; - } public String getUrl() { return url; diff --git a/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/constant/WxPubConstant.java b/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/constant/WxPubConstant.java index faae67e..bebbab6 100644 --- a/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/constant/WxPubConstant.java +++ b/ruoyi-auth/ruoyi-oauth-wx/src/main/java/com/ruoyi/oauth/wx/constant/WxPubConstant.java @@ -14,9 +14,6 @@ public class WxPubConstant { @Value("${oauth.wx.pub.url}") private String url; - @Value("${oauth.wx.pub.open}") - private Boolean open; - public String getUrl() { return url; } @@ -41,12 +38,4 @@ public class WxPubConstant { this.appSecret = appSecret; } - public Boolean getOpen() { - return open; - } - - public void setOpen(Boolean open) { - this.open = open; - } - } diff --git a/ruoyi-auth/ruoyi-oauth-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ruoyi-auth/ruoyi-oauth-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..8af98a8 --- /dev/null +++ b/ruoyi-auth/ruoyi-oauth-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,34 @@ +{ + "properties": [ + { + "name": "oauth.wx.miniapp.app-id", + "type": "java.lang.String", + "description": "微信小程序appid" + }, + { + "name": "oauth.wx.miniapp.app-secret", + "type": "java.lang.String", + "description": "微信小程序appSecret" + }, + { + "name": "oauth.wx.miniapp.url", + "type": "java.lang.String", + "description": "微信小程序认证地址" + }, + { + "name": "oauth.wx.pub.app-id", + "type": "java.lang.String", + "description": "微信公众号appid" + }, + { + "name": "oauth.wx.pub.app-secret", + "type": "java.lang.String", + "description": "微信公众号appSecret" + }, + { + "name": "oauth.wx.pub.url", + "type": "java.lang.String", + "description": "微信公众号认证地址" + } + ] +} \ No newline at end of file diff --git a/ruoyi-auth/ruoyi-tfa-phone/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ruoyi-auth/ruoyi-tfa-phone/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..e2a786b --- /dev/null +++ b/ruoyi-auth/ruoyi-tfa-phone/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,14 @@ +{ + "properties": [ + { + "name": "tfa.phone.dysms.app-id", + "type": "java.lang.String", + "description": "阿里云短信 AccessKey ID" + }, + { + "name": "tfa.phone.dysms.app-secret", + "type": "java.lang.String", + "description": "阿里云短信 AccessKey Secret" + } + ] +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceManagement.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceManagement.java index 0538e64..91bbdda 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceManagement.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/datasource/DataSourceManagement.java @@ -9,13 +9,13 @@ import javax.sql.DataSource; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; import com.ruoyi.common.service.datasource.CreateDataSource; import com.ruoyi.framework.config.DynamicDataSourceProperties; -@Component +@Configuration public class DataSourceManagement implements InitializingBean { private Map targetDataSources = new HashMap<>(); diff --git a/ruoyi-middleware/ruoyi-middleware-minio/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ruoyi-middleware/ruoyi-middleware-minio/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..e9b7c92 --- /dev/null +++ b/ruoyi-middleware/ruoyi-middleware-minio/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,24 @@ +{ + "properties": [ + { + "name": "minio.enable", + "type": "java.lang.Boolean", + "description": "是否开启minio" + }, + { + "name": "minio.downLoadLimit", + "type": "java.lang.Integer", + "description": "下载最大限制" + }, + { + "name": "minio.primary", + "type": "java.lang.String", + "description": "默认存储名称" + }, + { + "name": "minio.client", + "type": "java.lang.Array", + "description": "默认存储名称" + } + ] +} \ No newline at end of file