代码优化，修改Controller中方法，避免名称重复

命名重复会打印如下日志，不介意的可以不修改： s.d.s.w.s.ApiListingReferenceScanner： Generating unique operation named
elunez · Dec 26, 2021 · c75b52e · c75b52e
1 parent db1a20a
commit c75b52e
Show file tree

Hide file tree

Showing 30 changed files with 163 additions and 152 deletions.
diff --git a/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java b/eladmin-common/src/main/java/me/zhengjie/config/RedisConfig.java
@@ -98,7 +98,7 @@ public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisC
     @Override
     public KeyGenerator keyGenerator() {
         return (target, method, params) -> {
-            Map<String,Object> container = new HashMap<>();
+            Map<String,Object> container = new HashMap<>(4);
             Class<?> targetClassClass = target.getClass();
             // 类地址
             container.put("class",targetClassClass.toGenericString());

diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GenConfigController.java
@@ -39,13 +39,13 @@ public class GenConfigController {
 
     @ApiOperation("查询")
     @GetMapping(value = "/{tableName}")
-    public ResponseEntity<Object> query(@PathVariable String tableName){
+    public ResponseEntity<Object> queryGenConfig(@PathVariable String tableName){
         return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK);
     }
 
-    @ApiOperation("修改")
     @PutMapping
-    public ResponseEntity<Object> update(@Validated @RequestBody GenConfig genConfig){
+    @ApiOperation("修改")
+    public ResponseEntity<Object> updateGenConfig(@Validated @RequestBody GenConfig genConfig){
         return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK);
     }
 }
diff --git a/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java b/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java
@@ -49,7 +49,7 @@ public class GeneratorController {
 
     @ApiOperation("查询数据库数据")
     @GetMapping(value = "/tables/all")
-    public ResponseEntity<Object> queryTables(){
+    public ResponseEntity<Object> queryAllTables(){
         return new ResponseEntity<>(generatorService.getTables(), HttpStatus.OK);
     }
 
@@ -71,14 +71,14 @@ public ResponseEntity<Object> queryColumns(@RequestParam String tableName){
 
     @ApiOperation("保存字段数据")
     @PutMapping
-    public ResponseEntity<HttpStatus> save(@RequestBody List<ColumnInfo> columnInfos){
+    public ResponseEntity<HttpStatus> saveColumn(@RequestBody List<ColumnInfo> columnInfos){
         generatorService.save(columnInfos);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @ApiOperation("同步字段数据")
     @PostMapping(value = "sync")
-    public ResponseEntity<HttpStatus> sync(@RequestBody List<String> tables){
+    public ResponseEntity<HttpStatus> syncColumn(@RequestBody List<String> tables){
         for (String table : tables) {
             generatorService.sync(generatorService.getColumns(table), generatorService.query(table));
         }
@@ -87,7 +87,7 @@ public ResponseEntity<HttpStatus> sync(@RequestBody List<String> tables){
 
     @ApiOperation("生成代码")
     @PostMapping(value = "/{tableName}/{type}")
-    public ResponseEntity<Object> generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){
+    public ResponseEntity<Object> generatorCode(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){
         if(!generatorEnabled && type == 0){
             throw new BadRequestException("此环境不允许生成代码，请选择预览或者下载查看！");
         }

diff --git a/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java b/eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java
@@ -46,7 +46,7 @@ public class LogController {
     @ApiOperation("导出数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check()")
-    public void download(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
+    public void exportLog(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
         criteria.setLogType("INFO");
         logService.download(logService.queryAll(criteria), response);
     }
@@ -55,14 +55,14 @@ public void download(HttpServletResponse response, LogQueryCriteria criteria) th
     @ApiOperation("导出错误数据")
     @GetMapping(value = "/error/download")
     @PreAuthorize("@el.check()")
-    public void downloadErrorLog(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
+    public void exportErrorLog(HttpServletResponse response, LogQueryCriteria criteria) throws IOException {
         criteria.setLogType("ERROR");
         logService.download(logService.queryAll(criteria), response);
     }
     @GetMapping
     @ApiOperation("日志查询")
     @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> query(LogQueryCriteria criteria, Pageable pageable){
+    public ResponseEntity<Object> queryLog(LogQueryCriteria criteria, Pageable pageable){
         criteria.setLogType("INFO");
         return new ResponseEntity<>(logService.queryAll(criteria,pageable), HttpStatus.OK);
     }
@@ -86,7 +86,7 @@ public ResponseEntity<Object> queryErrorLog(LogQueryCriteria criteria, Pageable
     @GetMapping(value = "/error/{id}")
     @ApiOperation("日志异常详情查询")
     @PreAuthorize("@el.check()")
-    public ResponseEntity<Object> queryErrorLogs(@PathVariable Long id){
+    public ResponseEntity<Object> queryErrorLogDetail(@PathVariable Long id){
         return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK);
     }
     @DeleteMapping(value = "/del/error")

diff --git a/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java b/eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java
@@ -113,7 +113,7 @@ private String getParameter(Method method, Object[] args) {
             //将RequestParam注解修饰的参数作为请求参数
             RequestParam requestParam = parameters[i].getAnnotation(RequestParam.class);
             if (requestParam != null) {
-                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> map = new HashMap<>(4);
                 String key = parameters[i].getName();
                 if (!StringUtils.isEmpty(requestParam.value())) {
                     key = requestParam.value();

diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java b/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskExecutePool.java
@@ -32,24 +32,17 @@
 @Configuration
 public class AsyncTaskExecutePool implements AsyncConfigurer {
 
-    /** 注入配置类 */
-    private final AsyncTaskProperties config;
-
-    public AsyncTaskExecutePool(AsyncTaskProperties config) {
-        this.config = config;
-    }
-
     @Override
     public Executor getAsyncExecutor() {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         //核心线程池大小
-        executor.setCorePoolSize(config.getCorePoolSize());
+        executor.setCorePoolSize(AsyncTaskProperties.corePoolSize);
         //最大线程数
-        executor.setMaxPoolSize(config.getMaxPoolSize());
+        executor.setMaxPoolSize(AsyncTaskProperties.maxPoolSize);
         //队列容量
-        executor.setQueueCapacity(config.getQueueCapacity());
+        executor.setQueueCapacity(AsyncTaskProperties.queueCapacity);
         //活跃时间
-        executor.setKeepAliveSeconds(config.getKeepAliveSeconds());
+        executor.setKeepAliveSeconds(AsyncTaskProperties.keepAliveSeconds);
         //线程名字前缀
         executor.setThreadNamePrefix("el-async-");
         // setRejectedExecutionHandler：当pool已经达到max size的时候，如何处理新任务

diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java b/eladmin-system/src/main/java/me/zhengjie/config/thread/AsyncTaskProperties.java
@@ -16,6 +16,7 @@
 package me.zhengjie.config.thread;
 
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -26,14 +27,33 @@
  */
 @Data
 @Component
-@ConfigurationProperties(prefix = "task.pool")
 public class AsyncTaskProperties {
 
-    private int corePoolSize;
+    public static int corePoolSize;
 
-    private int maxPoolSize;
+    public static int maxPoolSize;
 
-    private int keepAliveSeconds;
+    public static int keepAliveSeconds;
 
-    private int queueCapacity;
+    public static int queueCapacity;
+
+    @Value("${task.pool.core-pool-size}")
+    public void setCorePoolSize(int corePoolSize) {
+        AsyncTaskProperties.corePoolSize = corePoolSize;
+    }
+
+    @Value("${task.pool.max-pool-size}")
+    public void setMaxPoolSize(int maxPoolSize) {
+        AsyncTaskProperties.maxPoolSize = maxPoolSize;
+    }
+
+    @Value("${task.pool.keep-alive-seconds}")
+    public void setKeepAliveSeconds(int keepAliveSeconds) {
+        AsyncTaskProperties.keepAliveSeconds = keepAliveSeconds;
+    }
+
+    @Value("${task.pool.queue-capacity}")
+    public void setQueueCapacity(int queueCapacity) {
+        AsyncTaskProperties.queueCapacity = queueCapacity;
+    }
 }
diff --git a/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java b/eladmin-system/src/main/java/me/zhengjie/config/thread/ThreadPoolExecutorUtil.java
@@ -15,8 +15,6 @@
  */
 package me.zhengjie.config.thread;
 
-import me.zhengjie.utils.SpringContextHolder;
-
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -29,13 +27,12 @@
 public class ThreadPoolExecutorUtil {
 
     public static ThreadPoolExecutor getPoll(){
-        AsyncTaskProperties properties = SpringContextHolder.getBean(AsyncTaskProperties.class);
         return new ThreadPoolExecutor(
-                properties.getCorePoolSize(),
-                properties.getMaxPoolSize(),
-                properties.getKeepAliveSeconds(),
+                AsyncTaskProperties.corePoolSize,
+                AsyncTaskProperties.maxPoolSize,
+                AsyncTaskProperties.keepAliveSeconds,
                 TimeUnit.SECONDS,
-                new ArrayBlockingQueue<>(properties.getQueueCapacity()),
+                new ArrayBlockingQueue<>(AsyncTaskProperties.queueCapacity),
                 new TheadFactoryName()
         );
     }

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/AppController.java
@@ -47,22 +47,22 @@ public class AppController {
     @ApiOperation("导出应用数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('app:list')")
-    public void download(HttpServletResponse response, AppQueryCriteria criteria) throws IOException {
+    public void exportApp(HttpServletResponse response, AppQueryCriteria criteria) throws IOException {
         appService.download(appService.queryAll(criteria), response);
     }
 
     @ApiOperation(value = "查询应用")
     @GetMapping
 	@PreAuthorize("@el.check('app:list')")
-    public ResponseEntity<Object> query(AppQueryCriteria criteria, Pageable pageable){
+    public ResponseEntity<Object> queryApp(AppQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(appService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
     @Log("新增应用")
     @ApiOperation(value = "新增应用")
     @PostMapping
 	@PreAuthorize("@el.check('app:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody App resources){
+    public ResponseEntity<Object> createApp(@Validated @RequestBody App resources){
         appService.create(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
@@ -71,7 +71,7 @@ public ResponseEntity<Object> create(@Validated @RequestBody App resources){
     @ApiOperation(value = "修改应用")
     @PutMapping
 	@PreAuthorize("@el.check('app:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody App resources){
+    public ResponseEntity<Object> updateApp(@Validated @RequestBody App resources){
         appService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
@@ -80,7 +80,7 @@ public ResponseEntity<Object> update(@Validated @RequestBody App resources){
     @ApiOperation(value = "删除应用")
 	@DeleteMapping
 	@PreAuthorize("@el.check('app:del')")
-    public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
+    public ResponseEntity<Object> deleteApp(@RequestBody Set<Long> ids){
         appService.delete(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DatabaseController.java
@@ -55,22 +55,22 @@ public class DatabaseController {
 	@ApiOperation("导出数据库数据")
 	@GetMapping(value = "/download")
 	@PreAuthorize("@el.check('database:list')")
-	public void download(HttpServletResponse response, DatabaseQueryCriteria criteria) throws IOException {
+	public void exportDatabase(HttpServletResponse response, DatabaseQueryCriteria criteria) throws IOException {
 		databaseService.download(databaseService.queryAll(criteria), response);
 	}
 
     @ApiOperation(value = "查询数据库")
     @GetMapping
 	@PreAuthorize("@el.check('database:list')")
-    public ResponseEntity<Object> query(DatabaseQueryCriteria criteria, Pageable pageable){
+    public ResponseEntity<Object> queryDatabase(DatabaseQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(databaseService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
     @Log("新增数据库")
     @ApiOperation(value = "新增数据库")
     @PostMapping
 	@PreAuthorize("@el.check('database:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody Database resources){
+    public ResponseEntity<Object> createDatabase(@Validated @RequestBody Database resources){
 		databaseService.create(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
@@ -79,7 +79,7 @@ public ResponseEntity<Object> create(@Validated @RequestBody Database resources)
     @ApiOperation(value = "修改数据库")
     @PutMapping
 	@PreAuthorize("@el.check('database:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody Database resources){
+    public ResponseEntity<Object> updateDatabase(@Validated @RequestBody Database resources){
         databaseService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
@@ -88,7 +88,7 @@ public ResponseEntity<Object> update(@Validated @RequestBody Database resources)
     @ApiOperation(value = "删除数据库")
     @DeleteMapping
 	@PreAuthorize("@el.check('database:del')")
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
+    public ResponseEntity<Object> deleteDatabase(@RequestBody Set<String> ids){
         databaseService.delete(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
@@ -105,7 +105,7 @@ public ResponseEntity<Object> testConnect(@Validated @RequestBody Database resou
 	@ApiOperation(value = "执行SQL脚本")
 	@PostMapping(value = "/upload")
 	@PreAuthorize("@el.check('database:add')")
-	public ResponseEntity<Object> upload(@RequestBody MultipartFile file, HttpServletRequest request)throws Exception{
+	public ResponseEntity<Object> uploadDatabase(@RequestBody MultipartFile file, HttpServletRequest request)throws Exception{
 		String id = request.getParameter("id");
 		DatabaseDto database = databaseService.findById(id);
 		String fileName;

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployController.java
@@ -57,22 +57,22 @@ public class DeployController {
 	@ApiOperation("导出部署数据")
 	@GetMapping(value = "/download")
 	@PreAuthorize("@el.check('database:list')")
-	public void download(HttpServletResponse response, DeployQueryCriteria criteria) throws IOException {
+	public void exportDeployData(HttpServletResponse response, DeployQueryCriteria criteria) throws IOException {
 		deployService.download(deployService.queryAll(criteria), response);
 	}
 
     @ApiOperation(value = "查询部署")
     @GetMapping
 	@PreAuthorize("@el.check('deploy:list')")
-    public ResponseEntity<Object> query(DeployQueryCriteria criteria, Pageable pageable){
+    public ResponseEntity<Object> queryDeployData(DeployQueryCriteria criteria, Pageable pageable){
     	return new ResponseEntity<>(deployService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
     @Log("新增部署")
     @ApiOperation(value = "新增部署")
     @PostMapping
 	@PreAuthorize("@el.check('deploy:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody Deploy resources){
+    public ResponseEntity<Object> createDeploy(@Validated @RequestBody Deploy resources){
 		deployService.create(resources);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
@@ -81,7 +81,7 @@ public ResponseEntity<Object> create(@Validated @RequestBody Deploy resources){
     @ApiOperation(value = "修改部署")
     @PutMapping
 	@PreAuthorize("@el.check('deploy:edit')")
-    public ResponseEntity<Object> update(@Validated @RequestBody Deploy resources){
+    public ResponseEntity<Object> updateDeploy(@Validated @RequestBody Deploy resources){
         deployService.update(resources);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
@@ -90,7 +90,7 @@ public ResponseEntity<Object> update(@Validated @RequestBody Deploy resources){
 	@ApiOperation(value = "删除部署")
 	@DeleteMapping
 	@PreAuthorize("@el.check('deploy:del')")
-	public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
+	public ResponseEntity<Object> deleteDeploy(@RequestBody Set<Long> ids){
 		deployService.delete(ids);
 		return new ResponseEntity<>(HttpStatus.OK);
 	}
@@ -99,7 +99,7 @@ public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
 	@ApiOperation(value = "上传文件部署")
 	@PostMapping(value = "/upload")
 	@PreAuthorize("@el.check('deploy:edit')")
-	public ResponseEntity<Object> upload(@RequestBody MultipartFile file, HttpServletRequest request)throws Exception{
+	public ResponseEntity<Object> uploadDeploy(@RequestBody MultipartFile file, HttpServletRequest request)throws Exception{
 		Long id = Long.valueOf(request.getParameter("id"));
 		String fileName = "";
 		if(file != null){

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java b/eladmin-system/src/main/java/me/zhengjie/modules/mnt/rest/DeployHistoryController.java
@@ -45,22 +45,22 @@ public class DeployHistoryController {
     @ApiOperation("导出部署历史数据")
     @GetMapping(value = "/download")
     @PreAuthorize("@el.check('deployHistory:list')")
-    public void download(HttpServletResponse response, DeployHistoryQueryCriteria criteria) throws IOException {
+    public void exportDeployHistory(HttpServletResponse response, DeployHistoryQueryCriteria criteria) throws IOException {
         deployhistoryService.download(deployhistoryService.queryAll(criteria), response);
     }
 
     @ApiOperation(value = "查询部署历史")
     @GetMapping
 	@PreAuthorize("@el.check('deployHistory:list')")
-    public ResponseEntity<Object> query(DeployHistoryQueryCriteria criteria, Pageable pageable){
+    public ResponseEntity<Object> queryDeployHistory(DeployHistoryQueryCriteria criteria, Pageable pageable){
         return new ResponseEntity<>(deployhistoryService.queryAll(criteria,pageable),HttpStatus.OK);
     }
 
     @Log("删除DeployHistory")
     @ApiOperation(value = "删除部署历史")
 	@DeleteMapping
     @PreAuthorize("@el.check('deployHistory:del')")
-    public ResponseEntity<Object> delete(@RequestBody Set<String> ids){
+    public ResponseEntity<Object> deleteDeployHistory(@RequestBody Set<String> ids){
         deployhistoryService.delete(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }