From 912962f1474f1b647bbe3958bb0d741497a22088 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Fri, 14 Oct 2022 16:12:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/modules/cache/BothCacheManager.java | 19 --------------- .../org/nl/modules/cache/CacheConfig.java | 23 ------------------ .../nl/modules/cache/LocalCacheManager.java | 19 --------------- .../org/nl/modules/cache/NlCacheManager.java | 13 ---------- .../nl/modules/cache/RemoteCacheManager.java | 24 ------------------- .../nl/modules/quartz/utils/ExecutionJob.java | 3 ++- .../src/test/java/org/nl/day01/Test.java | 0 .../java/org/nl/test/GenerateClazzMethod.java | 0 .../src/test/java/org/nl/test/HelloWorld.java | 0 9 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/BothCacheManager.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/CacheConfig.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/LocalCacheManager.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/NlCacheManager.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/RemoteCacheManager.java create mode 100644 acs/hd/nladmin-system/src/test/java/org/nl/day01/Test.java create mode 100644 acs/hd/nladmin-system/src/test/java/org/nl/test/GenerateClazzMethod.java create mode 100644 acs/hd/nladmin-system/src/test/java/org/nl/test/HelloWorld.java diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/BothCacheManager.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/BothCacheManager.java deleted file mode 100644 index e90a29b..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/BothCacheManager.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.modules.cache; - -import com.alicp.jetcache.Cache; -import com.alicp.jetcache.anno.CacheType; -import com.alicp.jetcache.anno.CreateCache; -import lombok.Data; - -@Data -public class BothCacheManager extends NlCacheManager { - /** - * 使用 @CreateCache 注解创建Cache实例; - * 未定义默认值的参数，将使用yml中指定的全局配置; - * 缓存在 Local，也可以配置成 both 开启两级缓存 - */ - @CreateCache(expire = 5 * 60, cacheType = CacheType.BOTH, localLimit = 10) - private Cache defaultCache; - @CreateCache(expire = 5 * 60, cacheType = CacheType.BOTH, localLimit = 10) - private Cache systemCache; -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/CacheConfig.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/CacheConfig.java deleted file mode 100644 index 9e7e7cf..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/CacheConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.nl.modules.cache; - -import com.alicp.jetcache.anno.CacheConsts; -import com.alicp.jetcache.anno.CacheType; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class CacheConfig { - @Value("${jetcache.defaultCacheType}") - private String cacheType; - - @Bean(name = "sysCacheManager") - public NlCacheManager sysCacheManager() { - CacheConsts.isUndefined(2); - if (CacheType.BOTH.name().equals(cacheType)) return new BothCacheManager(); - if (CacheType.LOCAL.name().equals(cacheType)) return new LocalCacheManager(); - if (CacheType.REMOTE.name().equals(cacheType)) return new RemoteCacheManager(); - return new LocalCacheManager(); - } - -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/LocalCacheManager.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/LocalCacheManager.java deleted file mode 100644 index a719e03..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/LocalCacheManager.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.modules.cache; - -import com.alicp.jetcache.Cache; -import com.alicp.jetcache.anno.CacheType; -import com.alicp.jetcache.anno.CreateCache; -import lombok.Data; - -@Data -public class LocalCacheManager extends NlCacheManager { - /** - * 使用 @CreateCache 注解创建Cache实例; - * 未定义默认值的参数，将使用yml中指定的全局配置; - * 缓存在 Local，也可以配置成 both 开启两级缓存 - */ - @CreateCache(expire = 5 * 60, cacheType = CacheType.LOCAL, localLimit = 10) - private Cache defaultCache; - @CreateCache(expire = 5 * 60, cacheType = CacheType.LOCAL, localLimit = 10) - private Cache systemCache; -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/NlCacheManager.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/NlCacheManager.java deleted file mode 100644 index 0a74664..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/NlCacheManager.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nl.modules.cache; - -import com.alicp.jetcache.Cache; -import lombok.Data; - -@Data -public abstract class NlCacheManager { - private Cache defaultCache; - private Cache systemCache; - public void test(){ - System.out.println(this.getClass().getName()); - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/RemoteCacheManager.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/RemoteCacheManager.java deleted file mode 100644 index 54347a8..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/cache/RemoteCacheManager.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.nl.modules.cache; - -import com.alicp.jetcache.Cache; -import com.alicp.jetcache.anno.CacheType; -import com.alicp.jetcache.anno.CreateCache; -import lombok.Data; - -@Data -public class RemoteCacheManager extends NlCacheManager { - /** - * 使用 @CreateCache 注解创建Cache实例; - * 未定义默认值的参数，将使用yml中指定的全局配置; - * 缓存在 Local，也可以配置成 both 开启两级缓存 - */ - @CreateCache(expire = 5 * 60, cacheType = CacheType.REMOTE, localLimit = 10) - private Cache defaultCache; - @CreateCache(expire = 5 * 60, cacheType = CacheType.REMOTE, localLimit = 10) - private Cache systemCache; - - @Override - public void test() { - System.out.println(this.getClass().getName()); - } -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java index 8a66de6..72b153f 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java @@ -129,8 +129,9 @@ public class ExecutionJob extends QuartzJobBean { // EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e)); // emailService.send(emailVo, emailService.find()); } - } finally { log.info(QUARTZ_MARKER, logDto.toString()); + } finally { + //quartzLogRepository.save(log); } } diff --git a/acs/hd/nladmin-system/src/test/java/org/nl/day01/Test.java b/acs/hd/nladmin-system/src/test/java/org/nl/day01/Test.java new file mode 100644 index 0000000..e69de29 diff --git a/acs/hd/nladmin-system/src/test/java/org/nl/test/GenerateClazzMethod.java b/acs/hd/nladmin-system/src/test/java/org/nl/test/GenerateClazzMethod.java new file mode 100644 index 0000000..e69de29 diff --git a/acs/hd/nladmin-system/src/test/java/org/nl/test/HelloWorld.java b/acs/hd/nladmin-system/src/test/java/org/nl/test/HelloWorld.java new file mode 100644 index 0000000..e69de29