移除微信小程序和公众号配置中的 open 字段
- 删除了 oauth.wx.miniapp 和 oauth.wx.pub 配置中的 open 字段 - 移除了 WxMiniAppConstant 和 WxPubConstant 类中的 open 字段相关代码 添加了一些属性标识
This commit is contained in:
parent
7dde9af9e6
commit
cfe70b1259
@ -2,12 +2,10 @@
|
|||||||
oauth:
|
oauth:
|
||||||
wx:
|
wx:
|
||||||
miniapp:
|
miniapp:
|
||||||
open: true
|
|
||||||
appId: appId
|
appId: appId
|
||||||
appSecret: appSecret
|
appSecret: appSecret
|
||||||
url: https://api.weixin.qq.com/sns/jscode2session
|
url: https://api.weixin.qq.com/sns/jscode2session
|
||||||
pub:
|
pub:
|
||||||
open: true
|
|
||||||
appId: appId
|
appId: appId
|
||||||
appSecret: appSecret
|
appSecret: appSecret
|
||||||
url: https://api.weixin.qq.com/sns/oauth2/access_token
|
url: https://api.weixin.qq.com/sns/oauth2/access_token
|
||||||
|
@ -14,16 +14,6 @@ public class WxMiniAppConstant {
|
|||||||
@Value("${oauth.wx.miniapp.url}")
|
@Value("${oauth.wx.miniapp.url}")
|
||||||
private String 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() {
|
public String getUrl() {
|
||||||
return url;
|
return url;
|
||||||
|
@ -14,9 +14,6 @@ public class WxPubConstant {
|
|||||||
@Value("${oauth.wx.pub.url}")
|
@Value("${oauth.wx.pub.url}")
|
||||||
private String url;
|
private String url;
|
||||||
|
|
||||||
@Value("${oauth.wx.pub.open}")
|
|
||||||
private Boolean open;
|
|
||||||
|
|
||||||
public String getUrl() {
|
public String getUrl() {
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
@ -41,12 +38,4 @@ public class WxPubConstant {
|
|||||||
this.appSecret = appSecret;
|
this.appSecret = appSecret;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Boolean getOpen() {
|
|
||||||
return open;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOpen(Boolean open) {
|
|
||||||
this.open = open;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -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": "微信公众号认证地址"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -9,13 +9,13 @@ import javax.sql.DataSource;
|
|||||||
import org.springframework.beans.factory.InitializingBean;
|
import org.springframework.beans.factory.InitializingBean;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
import org.springframework.stereotype.Component;
|
|
||||||
|
|
||||||
import com.ruoyi.common.service.datasource.CreateDataSource;
|
import com.ruoyi.common.service.datasource.CreateDataSource;
|
||||||
import com.ruoyi.framework.config.DynamicDataSourceProperties;
|
import com.ruoyi.framework.config.DynamicDataSourceProperties;
|
||||||
|
|
||||||
@Component
|
@Configuration
|
||||||
public class DataSourceManagement implements InitializingBean {
|
public class DataSourceManagement implements InitializingBean {
|
||||||
private Map<String, DataSource> targetDataSources = new HashMap<>();
|
private Map<String, DataSource> targetDataSources = new HashMap<>();
|
||||||
|
|
||||||
|
@ -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": "默认存储名称"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user