From 1fd1b3310f363b3e3960b9defc28b48909569b55 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 7 Feb 2025 17:22:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/src/main/resources/config/jeesite-core.yml | 13 ++++++++----- web-api/src/main/resources/config/application.yml | 8 ++++---- web/src/main/resources/config/application.yml | 8 ++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 4f3ad7f7..058bbf2c 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -102,9 +102,12 @@ spring: main: bannerMode: "off" -# 日志配置 +# 日志配置（fatal、error、warn、info、debug） logging: config: classpath:config/logback-spring.xml +# level: +# root: warn +# com.jeesite: debug # MyBatis 相关 mybatis: @@ -301,8 +304,8 @@ role: Company: { ctrlTypeClass: "com.jeesite.modules.sys.entity.Company", ctrlDataClass: "com.jeesite.modules.sys.utils.EmpUtils", - ctrlDataAttrName: "company.companyCode", - ctrlDataParentCodesAttrName: "company.parentCodes" + ctrlDataAttrName: "companyCodes", + ctrlDataParentCodesAttrName: "companyParentCodess" } }, 5: { @@ -315,8 +318,8 @@ role: Company: { ctrlTypeClass: "com.jeesite.modules.sys.entity.Company", ctrlDataClass: "com.jeesite.modules.sys.utils.EmpUtils", - ctrlDataAttrName: "company.companyCode", - ctrlDataParentCodesAttrName: "company.parentCodes" + ctrlDataAttrName: "companyCodes", + ctrlDataParentCodesAttrName: "companyParentCodess" } } } diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index 748e93e8..97b9e2fa 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -474,8 +474,8 @@ user: # Company: { # ctrlTypeClass: "com.jeesite.modules.sys.entity.Company", # ctrlDataClass: "com.jeesite.modules.sys.utils.EmpUtils", -# ctrlDataAttrName: "company.companyCode", -# ctrlDataParentCodesAttrName: "company.parentCodes" +# ctrlDataAttrName: "companyCodes", +# ctrlDataParentCodesAttrName: "companyParentCodess" # } # }, # 5: { @@ -488,8 +488,8 @@ user: # Company: { # ctrlTypeClass: "com.jeesite.modules.sys.entity.Company", # ctrlDataClass: "com.jeesite.modules.sys.utils.EmpUtils", -# ctrlDataAttrName: "company.companyCode", -# ctrlDataParentCodesAttrName: "company.parentCodes" +# ctrlDataAttrName: "companyCodes", +# ctrlDataParentCodesAttrName: "companyParentCodess" # } # } # } diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 5e65ab28..21dd443d 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -474,8 +474,8 @@ user: # Company: { # ctrlTypeClass: "com.jeesite.modules.sys.entity.Company", # ctrlDataClass: "com.jeesite.modules.sys.utils.EmpUtils", -# ctrlDataAttrName: "company.companyCode", -# ctrlDataParentCodesAttrName: "company.parentCodes" +# ctrlDataAttrName: "companyCodes", +# ctrlDataParentCodesAttrName: "companyParentCodess" # } # }, # 5: { @@ -488,8 +488,8 @@ user: # Company: { # ctrlTypeClass: "com.jeesite.modules.sys.entity.Company", # ctrlDataClass: "com.jeesite.modules.sys.utils.EmpUtils", -# ctrlDataAttrName: "company.companyCode", -# ctrlDataParentCodesAttrName: "company.parentCodes" +# ctrlDataAttrName: "companyCodes", +# ctrlDataParentCodesAttrName: "companyParentCodess" # } # } # }