diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 2ebf6a1de..3764e81af 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -32,7 +32,7 @@ 3.0.3 1.13.1 2.3.6.RELEASE - 1.2.75 + 1.2.83 2.3.0 3.0.52.ALL 1.11.543 diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/annotation/SysLog.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/annotation/SysLog.java index 884991e32..b4e27fa4d 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/annotation/SysLog.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/annotation/SysLog.java @@ -34,6 +34,12 @@ public @interface SysLog { * 描述 * @return {String} */ - String value(); + String value() default ""; + + /** + * spel 表达式 + * @return 日志描述 + */ + String expression() default ""; } diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java index d2e3234bb..1ea5507ec 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java @@ -58,11 +58,19 @@ public class SysLogAspect { log.debug("[类名]:{},[方法]:{}", strClassName, strMethodName); String value = sysLog.value(); - if (StrUtil.contains(value, "#")) { + String expression = sysLog.expression(); + // 当前表达式存在 SPEL，会覆盖 value 的值 + if (StrUtil.isNotBlank(expression)) { // 解析SPEL MethodSignature signature = (MethodSignature) point.getSignature(); EvaluationContext context = SysLogUtils.getContext(point.getArgs(), signature.getMethod()); - value = SysLogUtils.getValue(context, value, String.class); + try { + value = SysLogUtils.getValue(context, expression, String.class); + } + catch (Exception e) { + // SPEL 表达式异常，则获取 value 的值 + log.error("@SysLog 解析SPEL {} 异常", expression); + } } SysLogDTO logDTO = SysLogUtils.getSysLog(); diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java index e1b3e2121..3dbe3e461 100755 --- a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java @@ -1,7 +1,7 @@ package com.pig4cloud.pigx.common.sequence.range.impl.db; -import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import com.pig4cloud.pigx.common.sequence.exception.SeqException; import com.pig4cloud.pigx.common.sequence.range.impl.db.provider.SqlProviderFactory; @@ -21,6 +21,8 @@ abstract class BaseDbHelper { private static final long DELTA = 100000000L; + private final static DefaultIdentifierGenerator identifierGenerator = new DefaultIdentifierGenerator(); + /** * 创建表 * @param dataSource DB来源 @@ -60,7 +62,7 @@ abstract class BaseDbHelper { try { conn = dataSource.getConnection(); stmt = conn.prepareStatement(SQL_PROVIDER_FACTORY.getInsertRangeSql().replace("#tableName", tableName)); - stmt.setLong(1, RandomUtil.randomLong(12)); + stmt.setLong(1, identifierGenerator.nextId(null)); stmt.setString(2, name); stmt.setLong(3, stepStart); stmt.setTimestamp(4, new Timestamp(System.currentTimeMillis())); diff --git a/pigx-gateway/src/main/resources/logback-spring.xml b/pigx-gateway/src/main/resources/logback-spring.xml index 779ee5e25..232d13ee7 100644 --- a/pigx-gateway/src/main/resources/logback-spring.xml +++ b/pigx-gateway/src/main/resources/logback-spring.xml @@ -25,64 +25,66 @@ 2. 注意修改 的value模块 --> - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - - + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + - - - ${log.path}/debug.log - - ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz - 50MB - 30 - - - %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n - - + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + - - - ${log.path}/error.log - - ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz - 50MB - 30 - - - %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n - - - ERROR - - + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + - - - + + + + - - - - - - - - - - + + + + + + + + + + + diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java index 5c2564ee5..ad504283a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java @@ -129,6 +129,7 @@ public class SysClientController { * 同步缓存字典 * @return R */ + @Inner(false) @SysLog("同步终端") @PutMapping("/sync") public R sync() { diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java index fca40e2c3..1ed1f97e5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -79,6 +79,28 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl - 2.6.7 + 2.6.8 2021.0.2 2021.0.1.0 UTF-8