From d2de773007fa20fed88e0ca40c3e9864f1415f67 Mon Sep 17 00:00:00 2001
From: DYL0109 <1332079466@qq.com>
Date: 星期三, 19 二月 2025 13:58:50 +0800
Subject: [PATCH] !88 格式化 Merge pull request !88 from DYL0109/dyl_dev
---
zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java | 71 ++++++++---------
zhitan-generator/src/main/java/com/zhitan/generator/config/GenConfig.java | 47 +++++------
zhitan-quartz/src/main/java/com/zhitan/quartz/controller/SysJobController.java | 104 ++++++++-----------------
3 files changed, 90 insertions(+), 132 deletions(-)
diff --git a/zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java b/zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java
index 04ee184..f7530a2 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/config/BaseConfig.java
@@ -5,29 +5,40 @@
/**
* 璇诲彇椤圭洰鐩稿叧閰嶇疆
- *
+ *
* @author zhitan
*/
@Component
@ConfigurationProperties(prefix = "base")
-public class BaseConfig
-{
- /** 椤圭洰鍚嶇О */
+public class BaseConfig {
+ /**
+ * 椤圭洰鍚嶇О
+ */
private String name;
- /** 鐗堟湰 */
+ /**
+ * 鐗堟湰
+ */
private String version;
- /** 鐗堟潈骞翠唤 */
+ /**
+ * 鐗堟潈骞翠唤
+ */
private String copyrightYear;
- /** 涓婁紶璺緞 */
+ /**
+ * 涓婁紶璺緞
+ */
private static String profile;
- /** 鑾峰彇鍦板潃寮�鍏� */
+ /**
+ * 鑾峰彇鍦板潃寮�鍏�
+ */
private static boolean addressEnabled;
- /** 楠岃瘉鐮佺被鍨� */
+ /**
+ * 楠岃瘉鐮佺被鍨�
+ */
private static String captchaType;
/**
@@ -36,53 +47,43 @@
private String domainName;
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
- public String getVersion()
- {
+ public String getVersion() {
return version;
}
- public void setVersion(String version)
- {
+ public void setVersion(String version) {
this.version = version;
}
- public String getCopyrightYear()
- {
+ public String getCopyrightYear() {
return copyrightYear;
}
- public void setCopyrightYear(String copyrightYear)
- {
+ public void setCopyrightYear(String copyrightYear) {
this.copyrightYear = copyrightYear;
}
- public static String getProfile()
- {
+ public static String getProfile() {
return profile;
}
- public void setProfile(String profile)
- {
+ public void setProfile(String profile) {
BaseConfig.profile = profile;
}
- public static boolean isAddressEnabled()
- {
+ public static boolean isAddressEnabled() {
return addressEnabled;
}
- public void setAddressEnabled(boolean addressEnabled)
- {
+ public void setAddressEnabled(boolean addressEnabled) {
BaseConfig.addressEnabled = addressEnabled;
}
@@ -97,32 +98,28 @@
/**
* 鑾峰彇瀵煎叆涓婁紶璺緞
*/
- public static String getImportPath()
- {
+ public static String getImportPath() {
return getProfile() + "/import";
}
/**
* 鑾峰彇澶村儚涓婁紶璺緞
*/
- public static String getAvatarPath()
- {
+ public static String getAvatarPath() {
return getProfile() + "/avatar";
}
/**
* 鑾峰彇涓嬭浇璺緞
*/
- public static String getDownloadPath()
- {
+ public static String getDownloadPath() {
return getProfile() + "/download/";
}
/**
* 鑾峰彇涓婁紶璺緞
*/
- public static String getUploadPath()
- {
+ public static String getUploadPath() {
return getProfile() + "/upload";
}
diff --git a/zhitan-generator/src/main/java/com/zhitan/generator/config/GenConfig.java b/zhitan-generator/src/main/java/com/zhitan/generator/config/GenConfig.java
index 4988259..dad763c 100644
--- a/zhitan-generator/src/main/java/com/zhitan/generator/config/GenConfig.java
+++ b/zhitan-generator/src/main/java/com/zhitan/generator/config/GenConfig.java
@@ -7,67 +7,66 @@
/**
* 璇诲彇浠ｇ爜鐢熸垚鐩稿叧閰嶇疆
- *
+ *
* @author zhitan
*/
@Component
@ConfigurationProperties(prefix = "gen")
-@PropertySource(value = { "classpath:generator.yml" })
-public class GenConfig
-{
- /** 浣滆�� */
+@PropertySource(value = {"classpath:generator.yml"})
+public class GenConfig {
+ /**
+ * 浣滆��
+ */
public static String author;
- /** 鐢熸垚鍖呰矾寰� */
+ /**
+ * 鐢熸垚鍖呰矾寰�
+ */
public static String packageName;
- /** 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸false */
+ /**
+ * 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸false
+ */
public static boolean autoRemovePre;
- /** 琛ㄥ墠缂�(绫诲悕涓嶄細鍖呭惈琛ㄥ墠缂�) */
+ /**
+ * 琛ㄥ墠缂�(绫诲悕涓嶄細鍖呭惈琛ㄥ墠缂�)
+ */
public static String tablePrefix;
- public static String getAuthor()
- {
+ public static String getAuthor() {
return author;
}
@Value("${author}")
- public void setAuthor(String author)
- {
+ public void setAuthor(String author) {
GenConfig.author = author;
}
- public static String getPackageName()
- {
+ public static String getPackageName() {
return packageName;
}
@Value("${packageName}")
- public void setPackageName(String packageName)
- {
+ public void setPackageName(String packageName) {
GenConfig.packageName = packageName;
}
- public static boolean getAutoRemovePre()
- {
+ public static boolean getAutoRemovePre() {
return autoRemovePre;
}
@Value("${autoRemovePre}")
- public void setAutoRemovePre(boolean autoRemovePre)
- {
+ public void setAutoRemovePre(boolean autoRemovePre) {
GenConfig.autoRemovePre = autoRemovePre;
}
- public static String getTablePrefix()
- {
+ public static String getTablePrefix() {
return tablePrefix;
}
@Value("${tablePrefix}")
- public void setTablePrefix(String tablePrefix)
- {
+ public void setTablePrefix(String tablePrefix) {
GenConfig.tablePrefix = tablePrefix;
}
}
diff --git a/zhitan-quartz/src/main/java/com/zhitan/quartz/controller/SysJobController.java b/zhitan-quartz/src/main/java/com/zhitan/quartz/controller/SysJobController.java
index 2a35da4..3bdd6a6 100644
--- a/zhitan-quartz/src/main/java/com/zhitan/quartz/controller/SysJobController.java
+++ b/zhitan-quartz/src/main/java/com/zhitan/quartz/controller/SysJobController.java
@@ -1,23 +1,5 @@
package com.zhitan.quartz.controller;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.zhitan.quartz.domain.SysJob;
-import com.zhitan.quartz.service.ISysJobService;
-import com.zhitan.quartz.util.CronUtils;
-import com.zhitan.quartz.util.ScheduleUtils;
-import org.quartz.SchedulerException;
-import javax.annotation.Resource;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.zhitan.common.annotation.Log;
import com.zhitan.common.constant.Constants;
import com.zhitan.common.core.controller.BaseController;
@@ -27,16 +9,26 @@
import com.zhitan.common.exception.job.TaskException;
import com.zhitan.common.utils.StringUtils;
import com.zhitan.common.utils.poi.ExcelUtil;
+import com.zhitan.quartz.domain.SysJob;
+import com.zhitan.quartz.service.ISysJobService;
+import com.zhitan.quartz.util.CronUtils;
+import com.zhitan.quartz.util.ScheduleUtils;
+import org.quartz.SchedulerException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author zhitan
*/
@RestController
@RequestMapping("/monitor/job")
-public class SysJobController extends BaseController
-{
+public class SysJobController extends BaseController {
@Resource
private ISysJobService jobService;
@@ -45,8 +37,7 @@
*/
@PreAuthorize("@ss.hasPermi('monitor:job:list')")
@GetMapping("/list")
- public TableDataInfo list(SysJob sysJob)
- {
+ public TableDataInfo list(SysJob sysJob) {
startPage();
List<SysJob> list = jobService.selectJobList(sysJob);
return getDataTable(list);
@@ -58,8 +49,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:export')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SysJob sysJob)
- {
+ public void export(HttpServletResponse response, SysJob sysJob) {
List<SysJob> list = jobService.selectJobList(sysJob);
ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
util.exportExcel(response, list, "瀹氭椂浠诲姟");
@@ -70,8 +60,7 @@
*/
@PreAuthorize("@ss.hasPermi('monitor:job:query')")
@GetMapping(value = "/{jobId}")
- public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
- {
+ public AjaxResult getInfo(@PathVariable("jobId") Long jobId) {
return success(jobService.selectJobById(jobId));
}
@@ -81,30 +70,18 @@
@PreAuthorize("@ss.hasPermi('monitor:job:add')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
- {
- if (!CronUtils.isValid(job.getCronExpression()))
- {
+ public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException {
+ if (!CronUtils.isValid(job.getCronExpression())) {
return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
- }
- else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
- {
+ } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
- {
+ } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
- {
+ } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
- {
+ } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
- }
- else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
- {
+ } else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) {
return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
}
job.setCreateBy(getUsername());
@@ -117,30 +94,18 @@
@PreAuthorize("@ss.hasPermi('monitor:job:edit')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
- {
- if (!CronUtils.isValid(job.getCronExpression()))
- {
+ public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException {
+ if (!CronUtils.isValid(job.getCronExpression())) {
return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
- }
- else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
- {
+ } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
- {
+ } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
- {
+ } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
- {
+ } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
- }
- else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
- {
+ } else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) {
return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
}
job.setUpdateBy(getUsername());
@@ -153,8 +118,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
- {
+ public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException {
SysJob newJob = jobService.selectJobById(job.getJobId());
newJob.setStatus(job.getStatus());
return toAjax(jobService.changeStatus(newJob));
@@ -166,8 +130,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
@PutMapping("/run")
- public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
- {
+ public AjaxResult run(@RequestBody SysJob job) throws SchedulerException {
boolean result = jobService.run(job);
return result ? success() : error("浠诲姟涓嶅瓨鍦ㄦ垨宸茶繃鏈燂紒");
}
@@ -178,8 +141,7 @@
@PreAuthorize("@ss.hasPermi('monitor:job:remove')")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
@DeleteMapping("/{jobIds}")
- public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
- {
+ public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException {
jobService.deleteJobByIds(jobIds);
return success();
}
--
Gitblit v1.9.3