From 24021e6c6d9110b880b3511949565783ce02f66f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 7 Oct 2019 07:34:51 +0800 Subject: [PATCH 1/4] :bookmark: Releasing / Version tags. 3.4.0 --- .gogs/ISSUE_TEMPLATE.md | 9 +-------- docker-compose.yml | 2 +- pigx-auth/pom.xml | 2 +- pigx-common/pigx-common-bom/pom.xml | 2 +- pigx-common/pigx-common-core/pom.xml | 2 +- pigx-common/pigx-common-data/pom.xml | 2 +- pigx-common/pigx-common-datasource/pom.xml | 2 +- pigx-common/pigx-common-gateway/pom.xml | 2 +- pigx-common/pigx-common-job/pom.xml | 2 +- pigx-common/pigx-common-log/pom.xml | 2 +- pigx-common/pigx-common-minio/pom.xml | 2 +- pigx-common/pigx-common-security/pom.xml | 2 +- pigx-common/pigx-common-sequence/pom.xml | 2 +- pigx-common/pigx-common-swagger/pom.xml | 2 +- pigx-common/pigx-common-transaction/pom.xml | 2 +- pigx-common/pom.xml | 2 +- pigx-gateway/pom.xml | 2 +- pigx-register/pom.xml | 2 +- pigx-upms/pigx-upms-api/pom.xml | 2 +- pigx-upms/pigx-upms-biz/pom.xml | 2 +- pigx-upms/pom.xml | 2 +- pigx-visual/pigx-activiti/pom.xml | 2 +- pigx-visual/pigx-codegen/pom.xml | 2 +- pigx-visual/pigx-daemon-elastic-job/pom.xml | 2 +- pigx-visual/pigx-daemon-quartz/pom.xml | 2 +- pigx-visual/pigx-monitor/pom.xml | 4 ++-- pigx-visual/pigx-mp-manager/pom.xml | 2 +- pigx-visual/pigx-pay/pom.xml | 2 +- pigx-visual/pigx-sso-client-demo/pom.xml | 2 +- pigx-visual/pigx-tx-manager/pom.xml | 2 +- pigx-visual/pom.xml | 2 +- pom.xml | 2 +- 32 files changed, 33 insertions(+), 40 deletions(-) diff --git a/.gogs/ISSUE_TEMPLATE.md b/.gogs/ISSUE_TEMPLATE.md index b6b857e2c..bde32283e 100644 --- a/.gogs/ISSUE_TEMPLATE.md +++ b/.gogs/ISSUE_TEMPLATE.md @@ -1,13 +1,6 @@ -特别说明： 为了方便其他群友查阅和工程师定位问题 -- 工单支持MD 语法格式化，注意可读性喔 -- 若问题已经解决，请及时反馈并关闭工单 -- 问题范围请局限PigX 现有功能范围内，扩展业务问题直接关闭 - ---- ### 环境信息 （*） -- pigx版本: -- 是否二开: +- pigx版本: - 是否修改包名: --- diff --git a/docker-compose.yml b/docker-compose.yml index b325a95e9..df5e13d54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: image: zookeeper:3.4.13 restart: always - pigx-xxl-job-admin: + pigx-xxl: image: pig4cloud/xxl-job-admin:2.1.0 restart: always environment: diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 93b92caa5..911a157e1 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.3.0 + 3.4.0 pigx-auth diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index c9e7fc9f9..17d1e60e4 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -16,7 +16,7 @@ pigx 公共版本控制 - 3.3.0 + 3.4.0 3.1.0 1.1.18 8.0.16 diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 28858aaae..fec0b2f67 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index 612c50f72..1be202094 100644 --- a/pigx-common/pigx-common-data/pom.xml +++ b/pigx-common/pigx-common-data/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-data diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index 760659d21..45d080038 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -5,7 +5,7 @@ pigx-common com.pig4cloud - 3.3.0 + 3.4.0 4.0.0 diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index 09de8c001..a4e136b67 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-gateway diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index 335c8243f..6466ce3f2 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 5deb7224f..0380248be 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-log diff --git a/pigx-common/pigx-common-minio/pom.xml b/pigx-common/pigx-common-minio/pom.xml index 4a21c7df2..6d4c8224f 100755 --- a/pigx-common/pigx-common-minio/pom.xml +++ b/pigx-common/pigx-common-minio/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-minio diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 8235f6342..7a8b64062 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-security diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index c4dddaedf..91ca9a6c9 100755 --- a/pigx-common/pigx-common-sequence/pom.xml +++ b/pigx-common/pigx-common-sequence/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-sequence diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 0eea82b0f..a52d751a1 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-swagger diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml index 4679d31e4..313f9335a 100644 --- a/pigx-common/pigx-common-transaction/pom.xml +++ b/pigx-common/pigx-common-transaction/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.3.0 + 3.4.0 pigx-common-transaction diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index 296aaaef1..c2a49742d 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.3.0 + 3.4.0 pigx-common diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 135c8a82c..f6a4a9d89 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.3.0 + 3.4.0 pigx-gateway diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 1168c187e..14bed8e7c 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 3.3.0 + 3.4.0 pigx-register diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index 4dd0bda41..3f8d07199 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.3.0 + 3.4.0 pigx-upms-api diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index eb98d3994..46a603f43 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.3.0 + 3.4.0 pigx-upms-biz diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index 55faf0813..b16fd43a1 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.3.0 + 3.4.0 pigx-upms diff --git a/pigx-visual/pigx-activiti/pom.xml b/pigx-visual/pigx-activiti/pom.xml index 478321c24..61f3fd408 100644 --- a/pigx-visual/pigx-activiti/pom.xml +++ b/pigx-visual/pigx-activiti/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 pigx-activiti diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 2c7162888..a50503344 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 pigx-codegen diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index 0d1869882..f9927e76e 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 pigx-daemon-elastic-job diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index c1c1af119..7570b5a54 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 4.0.0 diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 9d5022649..c6bae9291 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 pigx-monitor @@ -36,7 +36,7 @@ com.pig4cloud pigx-common-core - 3.3.0 + 3.4.0 org.springframework.boot diff --git a/pigx-visual/pigx-mp-manager/pom.xml b/pigx-visual/pigx-mp-manager/pom.xml index 375d73ad1..aba302d6f 100755 --- a/pigx-visual/pigx-mp-manager/pom.xml +++ b/pigx-visual/pigx-mp-manager/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 pigx-mp-manager diff --git a/pigx-visual/pigx-pay/pom.xml b/pigx-visual/pigx-pay/pom.xml index 3138bb194..7a2d38731 100755 --- a/pigx-visual/pigx-pay/pom.xml +++ b/pigx-visual/pigx-pay/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 pigx-pay diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index 6b023b6f3..58d7a6ff5 100644 --- a/pigx-visual/pigx-sso-client-demo/pom.xml +++ b/pigx-visual/pigx-sso-client-demo/pom.xml @@ -29,7 +29,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index bbe60986f..1f258e793 100644 --- a/pigx-visual/pigx-tx-manager/pom.xml +++ b/pigx-visual/pigx-tx-manager/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.3.0 + 3.4.0 pigx-tx-manager diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 5a2161d1d..d6ec4c047 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.3.0 + 3.4.0 pigx-visual diff --git a/pom.xml b/pom.xml index a9525fa21..e1ec77a90 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.3.0 + 3.4.0 ${project.artifactId} pom From 47f613a75853f982885c10d179315e598ffec42a Mon Sep 17 00:00:00 2001 From: jclazz Date: Wed, 9 Oct 2019 15:04:28 +0800 Subject: [PATCH 2/4] fix #613 --- .../pigx/common/core/constant/CacheConstants.java | 7 +++++++ .../pigx/common/data/cache/RedisAutoCacheManager.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java index 808dfe2a1..d3623f892 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java @@ -8,6 +8,13 @@ package com.pig4cloud.pigx.common.core.constant; */ public interface CacheConstants { + /** + * 全局缓存，在缓存名称上加上该前缀表示该缓存不区分租户，比如: + *

+ * {@code @Cacheable(value = CacheConstants.GLOBALLY+CacheConstants.MENU_DETAILS, key = "#roleId + '_menu'", unless = "#result == null")} + */ + String GLOBALLY = "gl@"; + /** * 菜单信息缓存 */ diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java index 24595b95e..28563f73c 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/RedisAutoCacheManager.java @@ -18,6 +18,7 @@ package com.pig4cloud.pigx.common.data.cache; import cn.hutool.core.util.StrUtil; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.Cache; @@ -73,6 +74,10 @@ public class RedisAutoCacheManager extends RedisCacheManager { */ @Override public Cache getCache(String name) { + // see https://gitee.wang/pig/pigx/issues/613 + if(name.startsWith(CacheConstants.GLOBALLY)){ + return super.getCache(name); + } return super.getCache(TenantContextHolder.getTenantId() + StrUtil.COLON + name); } } From 5cb53c3e3b66c921bf48ed5b65aa26e0da99b58c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Fri, 11 Oct 2019 11:14:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E5=92=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E3=80=82?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E4=B8=8D=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java | 2 +- .../pig4cloud/pigx/daemon/quartz/util/JarTaskInvok.java | 2 +- .../pigx/daemon/quartz/util/JavaClassTaskInvok.java | 8 ++++---- .../pigx/daemon/quartz/util/SpringBeanTaskInvok.java | 6 +++--- .../pig4cloud/pigx/manager/manager/ModelInfoManager.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index b7732e0fe..8af1ad385 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -173,7 +173,7 @@ public class PigxTokenEndpoint { redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer()); Page result = new Page(MapUtil.getInt(params, PaginationConstants.CURRENT), MapUtil.getInt(params, PaginationConstants.SIZE)); result.setRecords(redisTemplate.opsForValue().multiGet(pages)); - result.setTotal(Long.valueOf(redisTemplate.keys(key).size())); + result.setTotal((long) redisTemplate.keys(key).size()); return R.ok(result); } diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JarTaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JarTaskInvok.java index b0bd72a41..f2a694a08 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JarTaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JarTaskInvok.java @@ -52,7 +52,7 @@ public class JarTaskInvok implements ITaskInvok { } processBuilder.command(commands); try { - Process process = processBuilder.start(); + processBuilder.start(); } catch (IOException e) { log.error("定时任务jar反射执行异常,执行任务：{}", sysJob.getExecutePath()); throw new TaskException("定时任务jar反射执行异常,执行任务：" + sysJob.getExecutePath()); diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JavaClassTaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JavaClassTaskInvok.java index 9ffeaa793..dbae08bb3 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JavaClassTaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/JavaClassTaskInvok.java @@ -37,10 +37,10 @@ import java.lang.reflect.Method; public class JavaClassTaskInvok implements ITaskInvok { @Override public void invokMethod(SysJob sysJob) throws TaskException { - Object obj = null; - Class clazz = null; - Method method = null; - Object returnValue = null; + Object obj; + Class clazz; + Method method; + Object returnValue; try { if (StrUtil.isNotEmpty(sysJob.getMethodParamsValue())) { clazz = Class.forName(sysJob.getClassName()); diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/SpringBeanTaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/SpringBeanTaskInvok.java index 52fb29c12..00491ebe2 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/SpringBeanTaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/SpringBeanTaskInvok.java @@ -40,9 +40,9 @@ import java.lang.reflect.Method; public class SpringBeanTaskInvok implements ITaskInvok { @Override public void invokMethod(SysJob sysJob) throws TaskException { - Object target = null; - Method method = null; - Object returnValue = null; + Object target; + Method method; + Object returnValue; //通过Spring上下文去找 也有可能找不到 target = SpringContextHolder.getBean(sysJob.getClassName()); try { diff --git a/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/manager/ModelInfoManager.java b/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/manager/ModelInfoManager.java index ed7cea3ee..78ecc7601 100644 --- a/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/manager/ModelInfoManager.java +++ b/pigx-visual/pigx-tx-manager/src/main/java/com/pig4cloud/pigx/manager/manager/ModelInfoManager.java @@ -29,7 +29,7 @@ public class ModelInfoManager { private static ModelInfoManager manager = null; - private List modelInfos = new CopyOnWriteArrayList(); + private List modelInfos = new CopyOnWriteArrayList<>(); public static ModelInfoManager getInstance() { if (manager == null) { From 9b916b9092aabc1f9ef52f532cb836845abb02af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Fri, 11 Oct 2019 11:15:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?:sparkles:=20#654=20quartz=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BD=BF=E7=94=A8Rest=20=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/daemon/quartz/util/RestTaskInvok.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/RestTaskInvok.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/RestTaskInvok.java index 296a615a1..6b1b4cf4f 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/RestTaskInvok.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/util/RestTaskInvok.java @@ -17,14 +17,12 @@ package com.pig4cloud.pigx.daemon.quartz.util; -import com.pig4cloud.pigx.common.core.constant.CommonConstants; -import com.pig4cloud.pigx.common.core.util.R; +import cn.hutool.http.HttpUtil; import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; import com.pig4cloud.pigx.daemon.quartz.exception.TaskException; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; /** * 定时任务rest反射实现 @@ -32,16 +30,16 @@ import org.springframework.web.client.RestTemplate; * @author 郑健楠 */ @Slf4j -@Component("restTaskInvok") @AllArgsConstructor +@Component("restTaskInvok") public class RestTaskInvok implements ITaskInvok { - private RestTemplate restTemplate; - @Override public void invokMethod(SysJob sysJob) throws TaskException { - R r = restTemplate.getForObject(sysJob.getExecutePath(), R.class); - if (CommonConstants.FAIL == r.getCode()) { + try { + HttpUtil.createGet(sysJob.getExecutePath()) + .execute(); + } catch (Exception e) { log.error("定时任务restTaskInvok异常,执行任务：{}", sysJob.getExecutePath()); throw new TaskException("定时任务restTaskInvok业务执行失败,任务：" + sysJob.getExecutePath()); }