From de66f4361608b5169b17be6f49233b3bb29f3713 Mon Sep 17 00:00:00 2001 From: BlackR <413626226@qq.com> Date: Fri, 20 May 2022 13:46:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20log=20insert=20?= =?UTF-8?q?spel=20=E6=89=A7=E8=A1=8C=E6=8A=A5=E9=94=99.=20:sparkles:=20Int?= =?UTF-8?q?roducing=20new=20features.=20support=20spel=20'expression'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/common/log/annotation/SysLog.java | 6 ++++++ .../pigx/common/log/aspect/SysLogAspect.java | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) 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..5f9375c8b 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 @@ -36,4 +36,10 @@ public @interface SysLog { */ String value(); + /** + * 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 78dcec15a..1e1a81374 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,18 @@ public class SysLogAspect { log.debug("[类名]:{},[方法]:{}", strClassName, strMethodName); String value = sysLog.value(); - if (StrUtil.isNotBlank(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(); From 80455d09c21ff95a2f7f7cc723f523f724185411 Mon Sep 17 00:00:00 2001 From: BlackR <413626226@qq.com> Date: Fri, 20 May 2022 14:40:55 +0800 Subject: [PATCH 2/4] :sparkles: Introducing new features. support spel 'expression' --- .../java/com/pig4cloud/pigx/common/log/annotation/SysLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5f9375c8b..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,7 +34,7 @@ public @interface SysLog { * 描述 * @return {String} */ - String value(); + String value() default ""; /** * spel 表达式 From 5467e94e21302100bcd6ec9d4e31c70b5012146c Mon Sep 17 00:00:00 2001 From: lbw Date: Sat, 28 May 2022 13:50:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20common-sequence?= =?UTF-8?q?=20=E5=85=A5=E8=A1=A8=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AFID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-common/pigx-common-bom/pom.xml | 2 +- .../pigx/common/log/aspect/SysLogAspect.java | 3 +- .../sequence/range/impl/db/BaseDbHelper.java | 6 +- .../src/main/resources/logback-spring.xml | 114 +++++++++--------- pom.xml | 2 +- 5 files changed, 66 insertions(+), 61 deletions(-) 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/aspect/SysLogAspect.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java index 1e1a81374..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 @@ -66,7 +66,8 @@ public class SysLogAspect { EvaluationContext context = SysLogUtils.getContext(point.getArgs(), signature.getMethod()); try { value = SysLogUtils.getValue(context, expression, String.class); - } catch (Exception e) { + } + catch (Exception e) { // SPEL 表达式异常，则获取 value 的值 log.error("@SysLog 解析SPEL {} 异常", expression); } 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/pom.xml b/pom.xml index ad747c3b8..4979dfbb2 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ - 2.6.7 + 2.6.8 2021.0.2 2021.0.1.0 UTF-8 From c28562847cac651343c553aaf956fa790794a385 Mon Sep 17 00:00:00 2001 From: yuanly Date: Sat, 28 May 2022 21:53:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=96=B0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AFbug=E4=BF=AE=E5=A4=8D=EF=BC=9B=202=E3=80=81?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=97=B6=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=BC=93=E5=AD=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/SysClientController.java | 1 + .../SysOauthClientDetailsServiceImpl.java | 53 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) 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