diff --git a/bd-business/bd-business-activity/src/main/resources/bootstrap.yml b/bd-business/bd-business-activity/src/main/resources/bootstrap.yml index f8444dc..92a3457 100644 --- a/bd-business/bd-business-activity/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-activity/src/main/resources/bootstrap.yml @@ -20,11 +20,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml b/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml index b1774f5..788ddb8 100644 --- a/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-bonus/src/main/resources/bootstrap.yml @@ -27,11 +27,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-member/src/main/resources/bootstrap.yml b/bd-business/bd-business-member/src/main/resources/bootstrap.yml index bc4f9e2..9f4ebee 100644 --- a/bd-business/bd-business-member/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-member/src/main/resources/bootstrap.yml @@ -27,11 +27,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-report/src/main/resources/bootstrap.yml b/bd-business/bd-business-report/src/main/resources/bootstrap.yml index 956e8a5..8dbbbdc 100644 --- a/bd-business/bd-business-report/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-report/src/main/resources/bootstrap.yml @@ -20,11 +20,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml index c5de936..1785389 100644 --- a/bd-business/bd-business-sale/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-sale/src/main/resources/bootstrap.yml @@ -21,11 +21,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-scm/src/main/resources/bootstrap.yml b/bd-business/bd-business-scm/src/main/resources/bootstrap.yml index dff4b59..793d23c 100644 --- a/bd-business/bd-business-scm/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-scm/src/main/resources/bootstrap.yml @@ -27,11 +27,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 188d792..2b3ff15 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -1098,7 +1098,7 @@ public class EnumsController extends BaseController { public AjaxResult getELanguages() { List enumEntityList = new ArrayList<>(); 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); } diff --git a/bd-business/bd-business-system/src/main/resources/bootstrap.yml b/bd-business/bd-business-system/src/main/resources/bootstrap.yml index 43dd342..765baae 100644 --- a/bd-business/bd-business-system/src/main/resources/bootstrap.yml +++ b/bd-business/bd-business-system/src/main/resources/bootstrap.yml @@ -27,11 +27,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ELanguages.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ELanguages.java index 85c0890..fdc03a5 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ELanguages.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ELanguages.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 语言 - * - * @author: hzs */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/sys/SysUser.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/sys/SysUser.java index 75593be..6a019f2 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/sys/SysUser.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/sys/SysUser.java @@ -85,6 +85,11 @@ public class SysUser extends BaseEntity { */ private Integer authority; + /** + * 短信验证(0=是,1=否) + */ + private Integer sms; + /** * 所属角色组 */ diff --git a/bd-gateway/src/main/resources/bootstrap.yml b/bd-gateway/src/main/resources/bootstrap.yml index 4692afd..ec3687a 100644 --- a/bd-gateway/src/main/resources/bootstrap.yml +++ b/bd-gateway/src/main/resources/bootstrap.yml @@ -22,11 +22,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/bd-third/src/main/resources/bootstrap.yml b/bd-third/src/main/resources/bootstrap.yml index 7fe9c55..cfe1e1f 100644 --- a/bd-third/src/main/resources/bootstrap.yml +++ b/bd-third/src/main/resources/bootstrap.yml @@ -20,11 +20,13 @@ spring: server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ config: # 配置中心地址 server-addr: @config.server-addr@ username: @config.username@ password: @config.password@ + namespace: @config.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/pom.xml b/pom.xml index cefa67d..f9da26e 100644 --- a/pom.xml +++ b/pom.xml @@ -463,7 +463,7 @@ 172.26.201.166:8848 - a91fa65c-7ddd-43d6-9c5b-8253a32fd24a + DEFAULT_GROUP