zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-08 12:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Refactoring code. 格式化代码

Browse Source
This commit is contained in:
lbw committed 2022-06-21 20:59:28 +08:00
1 parent e5a5c115da
commit 21dda92616
5 files changed
+28 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClient
* @param clientDetailsDTO
* @return
*/
private SysOauthClientDetails insertOrUpdate(SysOauthClientDetailsDTO clientDetailsDTO){
private SysOauthClientDetails insertOrUpdate(SysOauthClientDetailsDTO clientDetailsDTO) {
// copy dto 对象
SysOauthClientDetails clientDetails = new SysOauthClientDetails();
BeanUtils.copyProperties(clientDetailsDTO, clientDetails);
pigx-visual/pigx-jimu-platform/src/main/java/com/pig4cloud/pigx/bi/config/JimuReportTokenService.java
+11
View File
@@ -9,6 +9,7 @@ import lombok.RequiredArgsConstructor;
import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
/**
@@ -33,6 +34,16 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
// @formatter:off
}
@Override
public Map<String, Object> getUserInfo(String token) {
String username = this.getUsername(token);
Map<String, Object> 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<Map<String, Object>> result = tokenService.queryToken(token, SecurityConstants.FROM_IN);
pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/reportexcel/util/CellType.java
+3 -3
View File
@@ -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;
pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java
+10 -16
View File
@@ -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;
pigx-visual/pigx-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java
+3 -6
View File
@@ -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;