From 21dda926162fe1eae746e5edc205e7bbe33fc370 Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 21 Jun 2022 20:59:28 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysOauthClientDetailsServiceImpl.java | 2 +- .../bi/config/JimuReportTokenService.java | 11 ++++++++ .../modules/reportexcel/util/CellType.java | 6 ++--- .../core/route/ExecutorRouteStrategyEnum.java | 26 +++++++------------ .../admin/core/trigger/TriggerTypeEnum.java | 9 +++---- 5 files changed, 28 insertions(+), 26 deletions(-) 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 1ed1f97e5..704935925 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 @@ -100,7 +100,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl getUserInfo(String token) { + String username = this.getUsername(token); + Map map = new HashMap<>(4); + map.put("username", username); + map.put("access_token", token); + // 将所有信息存放至map 解析sql会根据map的键值解析,可自定义其他值 + return map; + } + @Override public Boolean verifyToken(String token) { R> result = tokenService.queryToken(token, SecurityConstants.FROM_IN); diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/CellType.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/CellType.java index 547f917bf..33b4787bc 100644 --- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/CellType.java +++ b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/CellType.java @@ -5,9 +5,9 @@ package com.anjiplus.template.gaea.business.modules.reportexcel.util; */ public enum CellType { - DYNAMIC_MERGE("DYNAMIC_MERGE", "动态合并单元格"), DYNAMIC("DYNAMIC", "动态单元格"), STATIC("STATIC", "静态单元格"), STATIC_AUTO( - "STATIC_AUTO", "静态扩展单元格"), STATIC_MERGE("STATIC_MERGE", - "静态合并单元格"), STATIC_MERGE_AUTO("STATIC_MERGE_AUTO", "静态合并扩展单元格"), BLACK("BLACK", "空白单元格"); + DYNAMIC_MERGE("DYNAMIC_MERGE", "动态合并单元格"), DYNAMIC("DYNAMIC", "动态单元格"), STATIC("STATIC", "静态单元格"), + STATIC_AUTO("STATIC_AUTO", "静态扩展单元格"), STATIC_MERGE("STATIC_MERGE", "静态合并单元格"), + STATIC_MERGE_AUTO("STATIC_MERGE_AUTO", "静态合并扩展单元格"), BLACK("BLACK", "空白单元格"); private String code; diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java index 90adb7574..b747003de 100755 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java @@ -8,22 +8,16 @@ import com.xxl.job.admin.core.util.I18nUtil; */ public enum ExecutorRouteStrategyEnum { - FIRST(I18nUtil.getString("jobconf_route_first"), new ExecutorRouteFirst()), LAST( - I18nUtil.getString("jobconf_route_last"), new ExecutorRouteLast()), ROUND( - I18nUtil.getString("jobconf_route_round"), new ExecutorRouteRound()), RANDOM( - I18nUtil.getString("jobconf_route_random"), new ExecutorRouteRandom()), CONSISTENT_HASH( - I18nUtil.getString("jobconf_route_consistenthash"), - new ExecutorRouteConsistentHash()), LEAST_FREQUENTLY_USED( - I18nUtil.getString("jobconf_route_lfu"), - new ExecutorRouteLFU()), LEAST_RECENTLY_USED( - I18nUtil.getString("jobconf_route_lru"), - new ExecutorRouteLRU()), FAILOVER( - I18nUtil.getString("jobconf_route_failover"), - new ExecutorRouteFailover()), BUSYOVER( - I18nUtil.getString("jobconf_route_busyover"), - new ExecutorRouteBusyover()), SHARDING_BROADCAST( - I18nUtil.getString("jobconf_route_shard"), - null); + FIRST(I18nUtil.getString("jobconf_route_first"), new ExecutorRouteFirst()), + LAST(I18nUtil.getString("jobconf_route_last"), new ExecutorRouteLast()), + ROUND(I18nUtil.getString("jobconf_route_round"), new ExecutorRouteRound()), + RANDOM(I18nUtil.getString("jobconf_route_random"), new ExecutorRouteRandom()), + CONSISTENT_HASH(I18nUtil.getString("jobconf_route_consistenthash"), new ExecutorRouteConsistentHash()), + LEAST_FREQUENTLY_USED(I18nUtil.getString("jobconf_route_lfu"), new ExecutorRouteLFU()), + LEAST_RECENTLY_USED(I18nUtil.getString("jobconf_route_lru"), new ExecutorRouteLRU()), + FAILOVER(I18nUtil.getString("jobconf_route_failover"), new ExecutorRouteFailover()), + BUSYOVER(I18nUtil.getString("jobconf_route_busyover"), new ExecutorRouteBusyover()), + SHARDING_BROADCAST(I18nUtil.getString("jobconf_route_shard"), null); ExecutorRouteStrategyEnum(String title, ExecutorRouter router) { this.title = title; diff --git a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java index a9f5042a5..a07672698 100755 --- a/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java +++ b/pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java @@ -9,12 +9,9 @@ import com.xxl.job.admin.core.util.I18nUtil; */ public enum TriggerTypeEnum { - MANUAL(I18nUtil.getString("jobconf_trigger_type_manual")), CRON( - I18nUtil.getString("jobconf_trigger_type_cron")), RETRY( - I18nUtil.getString("jobconf_trigger_type_retry")), PARENT( - I18nUtil.getString("jobconf_trigger_type_parent")), API( - I18nUtil.getString("jobconf_trigger_type_api")), MISFIRE( - I18nUtil.getString("jobconf_trigger_type_misfire")); + MANUAL(I18nUtil.getString("jobconf_trigger_type_manual")), CRON(I18nUtil.getString("jobconf_trigger_type_cron")), + RETRY(I18nUtil.getString("jobconf_trigger_type_retry")), PARENT(I18nUtil.getString("jobconf_trigger_type_parent")), + API(I18nUtil.getString("jobconf_trigger_type_api")), MISFIRE(I18nUtil.getString("jobconf_trigger_type_misfire")); private TriggerTypeEnum(String title) { this.title = title;