From af19ac7baff7abfc7ddaed1ae341d6d7a171c602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Fri, 28 Feb 2020 15:19:27 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E7=89=B9=E6=80=A7.=C2=A0=20pigx-common-feing=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81META-INF=20=E8=87=AA=E5=8A=A8=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/data/mybatis/MybatisPlusConfiguration.java | 1 - .../pigx-upms-biz/src/main/resources/tenant/tenant.properties | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java index c6c6fbc81..905110f05 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java @@ -83,7 +83,6 @@ public class MybatisPlusConfiguration { */ @Bean @ConditionalOnMissingBean - @ConditionalOnBean(RemoteDataScopeService.class) public DataScopeHandle dataScopeHandle() { return new PigxDefaultDatascopeHandle(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/tenant/tenant.properties b/pigx-upms/pigx-upms-biz/src/main/resources/tenant/tenant.properties index edb2c730c..8d4fba6b5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/tenant/tenant.properties +++ b/pigx-upms/pigx-upms-biz/src/main/resources/tenant/tenant.properties @@ -1,6 +1,6 @@ # \u79DF\u6237\u521D\u59CB\u5316\u9ED8\u8BA4\u914D\u7F6E defaultUsername=admin defaultPassword=123456 -defaultRoleCode=ROLE_admin +defaultRoleCode=ROLE_ADMIN defaultRoleName=\u79DF\u6237\u9ED8\u8BA4\u89D2\u8272 defaultDeptName=\u79DF\u6237\u9ED8\u8BA4\u90E8\u95E8 \ No newline at end of file