## 调整配置;
This commit is contained in:
parent
264b7ad41b
commit
004d483898
|
|
@ -20,11 +20,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
|
|
@ -20,11 +20,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
|
|
@ -1098,7 +1098,7 @@ public class EnumsController extends BaseController {
|
||||||
public AjaxResult getELanguages() {
|
public AjaxResult getELanguages() {
|
||||||
List<EnumEntity> enumEntityList = new ArrayList<>();
|
List<EnumEntity> enumEntityList = new ArrayList<>();
|
||||||
for (ELanguages value : ELanguages.values()) {
|
for (ELanguages value : ELanguages.values()) {
|
||||||
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), value.getLocal(), EnumsPrefixConstants.CYCLE));
|
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), value.getLocal(), EnumsPrefixConstants.LANGUAGES));
|
||||||
}
|
}
|
||||||
return AjaxResult.success(enumEntityList);
|
return AjaxResult.success(enumEntityList);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,6 @@ import lombok.Getter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 语言
|
* 语言
|
||||||
*
|
|
||||||
* @author: hzs
|
|
||||||
*/
|
*/
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Getter
|
@Getter
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,11 @@ public class SysUser extends BaseEntity {
|
||||||
*/
|
*/
|
||||||
private Integer authority;
|
private Integer authority;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 短信验证(0=是,1=否)
|
||||||
|
*/
|
||||||
|
private Integer sms;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 所属角色组
|
* 所属角色组
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -22,11 +22,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
|
|
@ -20,11 +20,13 @@ spring:
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: @config.server-addr@
|
server-addr: @config.server-addr@
|
||||||
username: @config.username@
|
username: @config.username@
|
||||||
password: @config.password@
|
password: @config.password@
|
||||||
|
namespace: @config.namespace@
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
||||||
|
|
|
||||||
2
pom.xml
2
pom.xml
|
|
@ -463,7 +463,7 @@
|
||||||
<!-- <config.server-addr>101.200.72.71:8848</config.server-addr>-->
|
<!-- <config.server-addr>101.200.72.71:8848</config.server-addr>-->
|
||||||
<config.server-addr>172.26.201.166:8848</config.server-addr>
|
<config.server-addr>172.26.201.166:8848</config.server-addr>
|
||||||
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID,不能使用名称,默认为空-->
|
<!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID,不能使用名称,默认为空-->
|
||||||
<config.namespace>a91fa65c-7ddd-43d6-9c5b-8253a32fd24a</config.namespace>
|
<config.namespace></config.namespace>
|
||||||
<!--Nacos配置分组名称-->
|
<!--Nacos配置分组名称-->
|
||||||
<config.group>DEFAULT_GROUP</config.group>
|
<config.group>DEFAULT_GROUP</config.group>
|
||||||
<!--Nacos用户名-->
|
<!--Nacos用户名-->
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue