diff --git a/buildpackage/src/main/resources/logback-spring.xml b/buildpackage/src/main/resources/logback-spring.xml index 2b63869a..780f5c31 100644 --- a/buildpackage/src/main/resources/logback-spring.xml +++ b/buildpackage/src/main/resources/logback-spring.xml @@ -31,42 +31,121 @@ - - - - - - - - - - - - - - - - ${LOG_PATH}/info.log + + + INFO + ACCEPT + DENY + ${MAX_FILE_SIZE} ${MAX_HISTORY} - ${LOG_PATH}/%d{yyyy-MM-dd}/%d{yyyy-MM-dd-HH}/%d{yyyy-MM-dd-HH}.%i.log + + ${LOG_PATH}/%d{yyyy-MM-dd}/info/info_%d{yyyyMMdd}.%i.log + + + ${MAX_FILE_SIZE} + + + + + + %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + + + + + + ${MAX_FILE_SIZE} + + ${MAX_HISTORY} + ${LOG_PATH}/%d{yyyy-MM-dd}/warn/warn_%d{yyyyMMdd}.%i.log ${MAX_FILE_SIZE} + + + WARN + ACCEPT + DENY + %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + + + + ${MAX_FILE_SIZE} + + ${MAX_HISTORY} + ${LOG_PATH}/%d{yyyy-MM-dd}/error/error_%d{yyyyMMdd}.%i.log + + + ${MAX_FILE_SIZE} + + + + + ERROR + ACCEPT + DENY + + + %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + + + + + + + + + ${MAX_FILE_SIZE} + + ${MAX_HISTORY} + ${LOG_PATH}/%d{yyyy-MM-dd}/all/all_%d{yyyyMMdd}.%i.log + + + ${MAX_FILE_SIZE} + + + + + %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{50} - %msg%n + + + + + + + - \ No newline at end of file + + + + + + + + + diff --git a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml index c5e8ba94..0b9db66d 100644 --- a/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml +++ b/service/src/main/java/com/hzya/frame/mdm/mdmModule/entity/MdmModuleEntity.xml @@ -163,7 +163,6 @@ modify_time , sts , org_id , - sorts, sts, )values( @@ -182,7 +181,6 @@ #{modify_time} , #{sts} , #{org_id} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_module a WHERE a.sts = 'Y' ), 'Y', ) @@ -267,22 +265,24 @@ where id = #{id}