From fefdadc58ceac766e8e4e13a6e06be6ee001a48b Mon Sep 17 00:00:00 2001 From: beeajax <1105173470@qq.com> Date: Sun, 18 Jun 2023 02:45:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/docus/server/AppRunBootstrap.java | 1 - collect-sdry/src/main/resources/bootstrap.yml | 34 +++--- .../collect/web/job/AbstractCollectJob.java | 7 +- .../web/service/ITaskConfigService.java | 2 +- data-config/js-report-config.xml | 25 ---- data-config/js-table-type.json | 6 - .../js-webservice-template-request.xml | 25 ---- .../js-webservice-template-response.xml | 11 -- docus-starter-log/.gitignore | 10 -- docus-starter-log/pom.xml | 22 ---- .../java/com/docus/log/EnableTrackGroup.java | 12 -- .../log/EnableTrackGroupConfiguration.java | 15 --- .../docus/log/EnableTrackGroupSelector.java | 19 --- .../docus/log/EnableTrackGroupSettings.java | 5 - .../docus/log/annotation/LogTrackGroup.java | 21 ---- .../com/docus/log/annotation/TrackGroup.java | 38 ------ .../docus/log/aspect/TrackGroupAspect.java | 112 ------------------ .../com/docus/log/context/TrackContext.java | 45 ------- .../com/docus/log/context/TrackHelper.java | 56 --------- .../log/processor/AbstractProcessor.java | 51 -------- .../docus/log/processor/ITrackProcessor.java | 12 -- pom.xml | 11 +- 22 files changed, 28 insertions(+), 512 deletions(-) delete mode 100644 data-config/js-report-config.xml delete mode 100644 data-config/js-table-type.json delete mode 100644 data-config/js-webservice-template-request.xml delete mode 100644 data-config/js-webservice-template-response.xml delete mode 100644 docus-starter-log/.gitignore delete mode 100644 docus-starter-log/pom.xml delete mode 100644 docus-starter-log/src/main/java/com/docus/log/EnableTrackGroup.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupConfiguration.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupSelector.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupSettings.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/annotation/LogTrackGroup.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/annotation/TrackGroup.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/aspect/TrackGroupAspect.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/context/TrackContext.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/context/TrackHelper.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/processor/AbstractProcessor.java delete mode 100644 docus-starter-log/src/main/java/com/docus/log/processor/ITrackProcessor.java diff --git a/collect-sdry/src/main/java/com/docus/server/AppRunBootstrap.java b/collect-sdry/src/main/java/com/docus/server/AppRunBootstrap.java index 9a711e5..4be0bfa 100644 --- a/collect-sdry/src/main/java/com/docus/server/AppRunBootstrap.java +++ b/collect-sdry/src/main/java/com/docus/server/AppRunBootstrap.java @@ -1,6 +1,5 @@ package com.docus.server; - import com.docus.log.EnableTrackGroup; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index 8dc13b0..ddbeaef 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -13,92 +13,92 @@ spring: #公司病案的文件服务数据库 master: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #公司病案的系统服务数据库 system: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_system?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #公司病案的基础服务数据库 record: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_medicalrecord?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: docus - password: docus702 + username: root + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #医院的用户/科室/基础数据的数据库 his: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #病理数据 bl: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #电生理系统数据 ecg: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #电子病历系统数据 emr: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #护理文书系统数据 hl: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #手麻系统数据 issubmit: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #lis系统数据 lis: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/lis?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #Pacs系统数据视图 pacs: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #vte静脉血栓栓塞症 vte: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource #重症系统数据 zz: url: jdbc:log4jdbc:mysql://127.0.0.1:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai username: root - password: root@123456 + password: root driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource # rabbitmq: @@ -108,7 +108,7 @@ spring: # password: guest redis: host: redis.docus.cn - password: JSdocus@702 + # password: JSdocus@702 cloud: nacos: discovery: diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java index ec43383..3a19dfd 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java @@ -15,6 +15,7 @@ import com.docus.server.sys.service.IPowerThirdLoginService; import com.docus.server.sys.service.IPowerUserService; import com.xxl.job.core.context.XxlJobHelper; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; @@ -116,12 +117,14 @@ public abstract class AbstractCollectJob implements IJob { } } - private void updateTaskState(TaskConfig taskConfig) { + @Transactional + public void updateTaskState(TaskConfig taskConfig) { taskConfig.setState(StateEnum.OK); taskConfigService.updateById(taskConfig); } - private void updateTaskState(String message, TaskConfig taskConfig) { + @Transactional + public void updateTaskState(String message, TaskConfig taskConfig) { taskConfig.setState(StateEnum.FAIL); taskConfig.setLastErrorMsg(message.length() > 1000 ? message.substring(0, 1000) : message); taskConfigService.updateById(taskConfig); diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java index c71d955..c35d5c7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java @@ -6,9 +6,9 @@ import com.docus.server.common.service.IBaseService; import java.util.Date; public interface ITaskConfigService extends IBaseService { + void updateAllPointerDate(String id, Date date); void updateIncPointerDate(String id, Date date); - } diff --git a/data-config/js-report-config.xml b/data-config/js-report-config.xml deleted file mode 100644 index d74c2a3..0000000 --- a/data-config/js-report-config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - /Request/Msg/INHOSP_INDEX_NO - - /Request/Msg/INHOSP_NO - - /Request/Msg/INHOSP_NUM - - /Request/Msg/UNIQUE_FILE - - /Request/Msg/FILE_NAME - - /Request/Msg/PDF_PATH - - /Request/Msg/TABLE_TYPE - - - - /Request/Msg/TABLE_TYPE - - - - - \ No newline at end of file diff --git a/data-config/js-table-type.json b/data-config/js-table-type.json deleted file mode 100644 index 58c9f99..0000000 --- a/data-config/js-table-type.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "icu": "重症文件分段id", - "sa": "手麻文件分段id", - "examination": "检验报告文件分段id", - "other": "其他文件分段id" -} \ No newline at end of file diff --git a/data-config/js-webservice-template-request.xml b/data-config/js-webservice-template-request.xml deleted file mode 100644 index 0d32ef2..0000000 --- a/data-config/js-webservice-template-request.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - 123456 - - 012345 - - 012345 - - 2 - - icu - - 20220303111800 - - 20220303111801 - - http://192.168.1.108:9012/file/0123_01.pdf - - 0123_01 - - AESHASHMD5DEFIND - - diff --git a/data-config/js-webservice-template-response.xml b/data-config/js-webservice-template-response.xml deleted file mode 100644 index 8ceb826..0000000 --- a/data-config/js-webservice-template-response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - 0 - - 123456 - - 成功！ - - \ No newline at end of file diff --git a/docus-starter-log/.gitignore b/docus-starter-log/.gitignore deleted file mode 100644 index 7672b7f..0000000 --- a/docus-starter-log/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/.gradle -/.idea -classes/ -/.settings -/build -/.classpath -/.project -*.iml -**/target - diff --git a/docus-starter-log/pom.xml b/docus-starter-log/pom.xml deleted file mode 100644 index 7ab85f1..0000000 --- a/docus-starter-log/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - - com.docus - docus-bom - 1.0-SNAPSHOT - - - docus-starter-log - 1.0-SNAPSHOT - - - - org.springframework.boot - spring-boot-starter-aop - - - diff --git a/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroup.java b/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroup.java deleted file mode 100644 index dd00fd0..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroup.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.docus.log; - -import org.springframework.context.annotation.Import; - -import java.lang.annotation.*; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Import({EnableTrackGroupSelector.class}) -@Inherited -public @interface EnableTrackGroup { -} diff --git a/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupConfiguration.java b/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupConfiguration.java deleted file mode 100644 index fd584b2..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupConfiguration.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.docus.log; - -import com.docus.log.aspect.TrackGroupAspect; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class EnableTrackGroupConfiguration { - - @Bean - public TrackGroupAspect logTrackGroupAspect() { - return new TrackGroupAspect(); - } - -} diff --git a/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupSelector.java b/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupSelector.java deleted file mode 100644 index d3acc35..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupSelector.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.docus.log; - -import org.springframework.context.annotation.ImportSelector; -import org.springframework.core.annotation.AnnotationAttributes; -import org.springframework.core.type.AnnotationMetadata; -import org.springframework.util.Assert; - -public class EnableTrackGroupSelector implements ImportSelector { - - @Override - public String[] selectImports(AnnotationMetadata importingClassMetadata) { - AnnotationAttributes annotationAttributes = AnnotationAttributes.fromMap(importingClassMetadata.getAnnotationAttributes(EnableTrackGroup.class.getName(), false)); - Assert.notNull(annotationAttributes, String.format( - "@EnableTrackGroup is not present on importing class '%s' as expected", - importingClassMetadata.getClassName())); - return new String[]{EnableTrackGroupConfiguration.class.getName()}; - } - -} diff --git a/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupSettings.java b/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupSettings.java deleted file mode 100644 index 8031d89..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/EnableTrackGroupSettings.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.docus.log; - -public class EnableTrackGroupSettings { - -} diff --git a/docus-starter-log/src/main/java/com/docus/log/annotation/LogTrackGroup.java b/docus-starter-log/src/main/java/com/docus/log/annotation/LogTrackGroup.java deleted file mode 100644 index 3db5d1a..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/annotation/LogTrackGroup.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.docus.log.annotation; - -import com.docus.log.processor.ITrackProcessor; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD}) -public @interface LogTrackGroup { - - String group(); - - String desc() default ""; - - String action(); - - Class processor(); -} diff --git a/docus-starter-log/src/main/java/com/docus/log/annotation/TrackGroup.java b/docus-starter-log/src/main/java/com/docus/log/annotation/TrackGroup.java deleted file mode 100644 index 610af75..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/annotation/TrackGroup.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.docus.log.annotation; - -import com.docus.log.processor.ITrackProcessor; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD}) -public @interface TrackGroup { - - /** - * 组概念 - */ - String group() default ""; - - /** - * 描述概念 - */ - String desc() default ""; - - /** - * 动作概念 - */ - String action() default ""; - - /** - * 初始化bean概念 - */ - String[] beanNames() default {}; - - /** - * 处理器概念 - */ - Class processor(); -} diff --git a/docus-starter-log/src/main/java/com/docus/log/aspect/TrackGroupAspect.java b/docus-starter-log/src/main/java/com/docus/log/aspect/TrackGroupAspect.java deleted file mode 100644 index 8a68f6e..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/aspect/TrackGroupAspect.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.docus.log.aspect; - -import com.docus.log.annotation.LogTrackGroup; -import com.docus.log.annotation.TrackGroup; -import com.docus.log.context.TrackContext; -import com.docus.log.context.TrackHelper; -import com.docus.log.processor.ITrackProcessor; -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.Signature; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; - -import java.util.HashMap; - -/** - * @author linruifeng - */ -@Aspect -@Slf4j -public class TrackGroupAspect { - - @Autowired - private ApplicationContext applicationContext; - - /** - * 通用业务处理 - */ - @Around("@annotation(trackGroup)") - public Object execute(final ProceedingJoinPoint joinPoint, TrackGroup trackGroup) throws Throwable { - log.info("=== AOP @TrackGroup 切面启动器监听处理事件开始 ==="); - TrackContext context = getContext(joinPoint, trackGroup); - - ITrackProcessor processor = applicationContext.getAutowireCapableBeanFactory().createBean(trackGroup.processor()); - try { - Object beforeResult = processor.beforeProcess(context); - context.setBeforeResult(beforeResult); - TrackContext.init(context.getParams()); - Object afterReturnResult = joinPoint.proceed(); - context.setAfterReturnResult(afterReturnResult); - TrackHelper.setParams(context.getParams()); - return processor.process(context); - } catch (Exception ex) { - context.setError(true); - context.setExMessageResult(ex.getMessage()); - return processor.process(context); - } finally { - processor.afterProcess(context); - TrackContext.clear(); - log.info("=== AOP @TrackGroup 切面启动器监听处理事件结束 ==="); - } - } - - /** - * 通用日志处理 - */ - @Around("@annotation(logTrackGroup)") - public Object execute(final ProceedingJoinPoint joinPoint, LogTrackGroup logTrackGroup) throws Throwable { - log.info("=== AOP @LogTrackGroup 切面启动器监听处理事件开始 ==="); - final Object result; - TrackContext context = getContext(joinPoint, logTrackGroup); - ITrackProcessor processor = applicationContext.getAutowireCapableBeanFactory().createBean(logTrackGroup.processor()); - try { - result = joinPoint.proceed(); - context.setAfterReturnResult(result); - processor.process(context); - } catch (Exception ex) { - context.setError(true); - context.setExMessageResult(ex.getMessage()); - processor.process(context); - throw new RuntimeException(ex.getMessage()); - } - log.info("=== AOP @LogTrackGroup 切面启动器监听处理事件结束 ==="); - return result; - } - - private TrackContext getContext(final ProceedingJoinPoint joinPoint, TrackGroup logTrackGroup) { - TrackContext context = new TrackContext(); - Signature signature = joinPoint.getSignature(); - context.setClassType(signature.getDeclaringType()); - context.setClassName(signature.getDeclaringTypeName()); - context.setMethodName(signature.getName()); - context.setArgs(joinPoint.getArgs()); - - context.setGroup(logTrackGroup.group()); - context.setDesc(logTrackGroup.desc()); - context.setAction(logTrackGroup.action()); - context.setBeanNames(logTrackGroup.beanNames()); - context.setProcessor(logTrackGroup.processor()); - context.setParams(new HashMap<>()); - return context; - } - - private TrackContext getContext(final ProceedingJoinPoint joinPoint, LogTrackGroup logTrackGroup) { - TrackContext context = new TrackContext(); - Signature signature = joinPoint.getSignature(); - context.setClassType(signature.getDeclaringType()); - context.setClassName(signature.getDeclaringTypeName()); - context.setMethodName(signature.getName()); - context.setArgs(joinPoint.getArgs()); - - context.setGroup(logTrackGroup.group()); - context.setDesc(logTrackGroup.desc()); - context.setAction(logTrackGroup.action()); - context.setProcessor(logTrackGroup.processor()); - context.setParams(new HashMap<>()); - return context; - } - -} diff --git a/docus-starter-log/src/main/java/com/docus/log/context/TrackContext.java b/docus-starter-log/src/main/java/com/docus/log/context/TrackContext.java deleted file mode 100644 index 9aa4d7b..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/context/TrackContext.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.docus.log.context; - -import com.docus.log.processor.ITrackProcessor; -import lombok.Data; - -import java.util.Map; - -@Data -public class TrackContext { - private static final ThreadLocal CONTEXT_HOLDER = new ThreadLocal<>(); - - private Class classType; - private String className; - private String methodName; - private Object[] args; - - private Object beforeResult; - private Object afterReturnResult; - private boolean error = false; - private String exMessageResult; - - private String group; - private String desc; - private String action; - private String[] beanNames; - private Class processor; - private Map params; - - //初始化 - public static void init(Map params) { - CONTEXT_HOLDER.remove(); - TrackContext context = new TrackContext(); - context.setParams(params); - CONTEXT_HOLDER.set(context); - } - - public static TrackContext get() { - return CONTEXT_HOLDER.get(); - } - - //清除线程变量 - public static void clear() { - CONTEXT_HOLDER.remove(); - } -} diff --git a/docus-starter-log/src/main/java/com/docus/log/context/TrackHelper.java b/docus-starter-log/src/main/java/com/docus/log/context/TrackHelper.java deleted file mode 100644 index c8ba7a1..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/context/TrackHelper.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.docus.log.context; - -import java.util.Map; - -/** - * helper for xxl-job - * - * @author xuxueli 2020-11-05 - */ -public final class TrackHelper { - - - // ---------------------- base info ---------------------- - - /** - * current JobId - * - * @return - */ - public static Object getValue(String key) { - TrackContext trackContext = TrackContext.get(); - if (trackContext == null) { - return null; - } - - return trackContext.getParams().get(key); - } - - /** - * current JobParam - * - * @return - */ - public static Map getParams() { - TrackContext trackContext = TrackContext.get(); - if (trackContext == null) { - return null; - } - - return trackContext.getParams(); - } - - public static void setParams(Map params) { - TrackContext trackContext = TrackContext.get(); - if (trackContext == null) { - return; - } - - trackContext.getParams().putAll(params); - } - - public static void clear() { - TrackContext.clear(); - } - -} diff --git a/docus-starter-log/src/main/java/com/docus/log/processor/AbstractProcessor.java b/docus-starter-log/src/main/java/com/docus/log/processor/AbstractProcessor.java deleted file mode 100644 index 70ef448..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/processor/AbstractProcessor.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.docus.log.processor; - -import com.docus.log.context.TrackContext; -import com.docus.log.context.TrackHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public abstract class AbstractProcessor implements ITrackProcessor { - - private final Logger logger = LoggerFactory.getLogger(AbstractProcessor.class); - - public boolean validate(TrackContext context) { - return context != null - && context.getGroup() != null - && context.getProcessor() != null; - } - - /** - * 前置通知 - */ - @Override - public Object beforeProcess(TrackContext context) { - logger.info("=== AOP 前置通知 ==="); - return null; - } - - /** - * 后置通知和异常通知 - */ - @Override - public Object process(TrackContext context) { - if (validate(context)) { - Object o = doProcess(context); - TrackHelper.setParams(context.getParams()); - return o; - } - return null; - } - - protected abstract Object doProcess(TrackContext context); - - /** - * 最后通知 - */ - @Override - public Object afterProcess(TrackContext context) { - logger.info("=== AOP 最后通知 ==="); - return null; - } - -} diff --git a/docus-starter-log/src/main/java/com/docus/log/processor/ITrackProcessor.java b/docus-starter-log/src/main/java/com/docus/log/processor/ITrackProcessor.java deleted file mode 100644 index dd172b0..0000000 --- a/docus-starter-log/src/main/java/com/docus/log/processor/ITrackProcessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.docus.log.processor; - -import com.docus.log.context.TrackContext; - -public interface ITrackProcessor { - - Object beforeProcess(TrackContext context); - - Object process(TrackContext context); - - Object afterProcess(TrackContext context); -} diff --git a/pom.xml b/pom.xml index d0854f5..a3c2379 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,11 @@ docus-excel-starter 1.0-SNAPSHOT - + + com.docus + docus-log-starter + 1.0-SNAPSHOT + com.docus docus-base-starter @@ -213,11 +217,6 @@ dynamic-datasource-spring-boot-starter 3.4.0 - - com.docus - docus-starter-log - 1.0-SNAPSHOT - io.netty netty-all