diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantConfigProperties.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantConfigProperties.java index eb637aea8..899ba9de3 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantConfigProperties.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantConfigProperties.java @@ -20,7 +20,7 @@ public class PigxTenantConfigProperties { /** * 维护租户列名称 */ - private String column; + private String column="tenant_id"; /** * 多租户的数据表集合 diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java index 6c5aa8f7f..12729a7b7 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/tenant/PigxTenantHandler.java @@ -54,8 +54,7 @@ public class PigxTenantHandler implements TenantHandler { */ @Override public String getTenantIdColumn() { - return StrUtil.isNotBlank(properties.getColumn()) - ? properties.getColumn() : "tenant_id"; + return properties.getColumn(); } /** diff --git a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/service/MinioTemplate.java b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/service/MinioTemplate.java index 77c3837b2..35e822eff 100755 --- a/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/service/MinioTemplate.java +++ b/pigx-common/pigx-common-minio/src/main/java/com/pig4cloud/common/minio/service/MinioTemplate.java @@ -178,9 +178,9 @@ public class MinioTemplate implements InitializingBean { @Override public void afterPropertiesSet() throws Exception { - Assert.hasText(endpoint, "Minio url 为空。"); - Assert.hasText(accessKey, "Minio accessKey 为空。"); - Assert.hasText(secretKey, "Minio accessKey 为空。"); + Assert.hasText(endpoint, "Minio url 为空"); + Assert.hasText(accessKey, "Minio accessKey为空"); + Assert.hasText(secretKey, "Minio secretKey为空"); this.client = new MinioClient(endpoint, accessKey, secretKey); } diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml index 2f5831775..9649e755d 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -99,8 +99,8 @@ security: client: # 默认放行url,如果子模块重写这里的配置就会被覆盖 ignore-urls: - - '/actuator/**' - - '/v2/api-docs' + - /actuator/** + - /v2/api-docs resource: loadBalanced: true token-info-uri: http://pigx-auth/oauth/check_token diff --git a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml index e1d035822..d034e6b8d 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml @@ -7,12 +7,12 @@ security: scope: server # 默认放行url,子模块重写时application-dev.yml中的公共配置会被覆盖,所以要把公共配置中的放行url再写一次 ignore-urls: - - '/actuator/**' - - '/v2/api-docs' - - '/user/info/*' - - '/social/info/*' - - '/mobile/*' - - '/log/save' + - /actuator/** + - /v2/api-docs + - /user/info/* + - /social/info/* + - /mobile/* + - /log/save # 数据源 spring: