fix:调整接口地址

src/main/java/com/iflytop/gd/app/controller/AuthController.java

@@ -11,10 +11,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
 
@@ -32,11 +29,12 @@ public class AuthController {
 
     @Operation(summary = "账号密码登录")
     @PostMapping("/login")
-    public Result<String> login(@RequestBody LoginDTO loginDTO) {
+    public Result<User> login(@RequestBody LoginDTO loginDTO) {
         User user = userService.getOne(new LambdaQueryWrapper<>(User.class).eq(User::getUsername, loginDTO.getUsername()));
         if (user != null && !Objects.equals(user.getDeleted(), Deleted.ENABLE) && user.getPassword().equals(loginDTO.getPassword())) {
             userService.setCurrentUser(user);
-            return Result.success();
+            user.setPassword(null);
+            return Result.success(user);
         }
         return Result.failed(ResultCode.INVALID_CREDENTIALS);
     }
@@ -47,4 +45,10 @@ public class AuthController {
         userService.clearCurrentUser();
         return Result.success();
     }
+
+    @Operation(summary = "获取当前登录用户")
+    @GetMapping("/current")
+    public Result<User> current() {
+        return Result.success(userService.getCurrentUser());
+    }
 }

src/main/java/com/iflytop/gd/app/controller/CmdController.java

@@ -1,7 +1,7 @@
 package com.iflytop.gd.app.controller;
 
 import com.iflytop.gd.common.cmd.CommandHandler;
-import com.iflytop.gd.app.service.cmd.CommandHandlerRegistry;
+import com.iflytop.gd.app.core.CommandHandlerRegistry;
 import com.iflytop.gd.app.model.dto.CmdDTO;
 import com.iflytop.gd.app.service.exceptions.UnSupportCommandException;
 import com.iflytop.gd.common.result.Result;

src/main/java/com/iflytop/gd/app/controller/CraftsController.java

@@ -33,7 +33,7 @@ public class CraftsController {
     }
 
     @Operation(summary = "添加新工艺")
-    @PostMapping("/")
+    @PostMapping("")
     public Result<String> addCrafts(@RequestBody Crafts crafts) {
         Crafts existingCrafts = craftsService.findByName(crafts.getName());
         if (existingCrafts == null) {
@@ -48,9 +48,8 @@ public class CraftsController {
     }
 
     @Operation(summary = "更新工艺")
-    @PutMapping("/{id}")
-    public Result<String> updateCrafts(@PathVariable Long id, @RequestBody Crafts crafts) {
-        crafts.setId(id);
+    @PutMapping("")
+    public Result<String> updateCrafts(@RequestBody Crafts crafts) {
         boolean isSuccess = craftsService.updateCrafts(crafts);
         if (isSuccess) {
             return Result.success();

src/main/java/com/iflytop/gd/app/controller/OresController.java

@@ -31,7 +31,7 @@ public class OresController {
     }
 
     @Operation(summary = "添加新矿石")
-    @PostMapping("/")
+    @PostMapping("")
     public Result<String> addOres(@RequestBody Ores ores) {
         Ores existingOres = oresService.findByName(ores.getName());
         if (existingOres == null) {
@@ -46,11 +46,10 @@ public class OresController {
     }
 
     @Operation(summary = "更新矿石")
-    @PutMapping("/{id}")
-    public Result<String> updateOres(@PathVariable Long id, @RequestBody Ores ores) {
+    @PutMapping("")
+    public Result<String> updateOres(@RequestBody Ores ores) {
         Ores existingOres = oresService.findByName(ores.getName());
         if (existingOres == null) {
-            ores.setId(id);
             boolean isSuccess = oresService.updateOres(ores);
             if (isSuccess) {
                 return Result.success();

src/main/java/com/iflytop/gd/app/controller/SolutionsController.java

@@ -31,7 +31,7 @@ public class SolutionsController {
     }
 
     @Operation(summary = "添加新溶液")
-    @PostMapping("/")
+    @PostMapping("")
     public Result<String> addSolutions(@RequestBody Solutions solutions) {
         Solutions existingSolutions = solutionsService.findByName(solutions.getName());
         if (existingSolutions == null) {
@@ -46,11 +46,10 @@ public class SolutionsController {
     }
 
     @Operation(summary = "更新溶液")
-    @PutMapping("/{id}")
-    public Result<String> updateSolutions(@PathVariable Long id, @RequestBody Solutions solutions) {
+    @PutMapping("")
+    public Result<String> updateSolutions(@RequestBody Solutions solutions) {
         Solutions existingSolutions = solutionsService.findByName(solutions.getName());
         if (existingSolutions == null) {
-            solutions.setId(id);
             boolean isSuccess = solutionsService.updateSolutions(solutions);
             if (isSuccess) {
                 return Result.success();

src/main/java/com/iflytop/gd/app/controller/UserController.java

@@ -28,6 +28,7 @@ public class UserController {
     @GetMapping("/list")
     public PageResult<User> getAllUsers(BasePageQuery pageQuery) {
         IPage<User> result = userService.page(new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()), null);
+        result.getRecords().forEach(user -> user.setPassword(null));
         return PageResult.success(result);
     }
 
@@ -46,12 +47,6 @@ public class UserController {
         return Result.failed();
     }
 
-    @Operation(summary = "当前用户信息")
-    @GetMapping("/current")
-    public Result<User> currentUser() {
-        return Result.success(userService.getCurrentUser());
-    }
-
     @Operation(summary = "更新用户信息")
     @PutMapping("")
     public Result<String> updateUser(@RequestBody User user) {

src/main/java/com/iflytop/gd/app/service/cmd/BaseCommandHandler.java → src/main/java/com/iflytop/gd/app/core/BaseCommandHandler.java

@@ -1,4 +1,4 @@
-package com.iflytop.gd.app.service.cmd;
+package com.iflytop.gd.app.core;
 
 
 

src/main/java/com/iflytop/gd/app/service/cmd/CommandHandlerRegistry.java → src/main/java/com/iflytop/gd/app/core/CommandHandlerRegistry.java

@@ -1,4 +1,4 @@
-package com.iflytop.gd.app.service.cmd;
+package com.iflytop.gd.app.core;
 
 import com.iflytop.gd.app.service.exceptions.UnSupportCommandException;
 import com.iflytop.gd.common.annotation.CommandMapping;
@@ -21,8 +21,6 @@ public class CommandHandlerRegistry implements ApplicationContextAware {
     private final Map<String, CommandHandler> handlerMap = new HashMap<>();
     private ApplicationContext applicationContext;
 
-    private final String SEPARATOR = ":";
-
     @Override
     public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException {
         this.applicationContext = applicationContext;
@@ -54,14 +52,4 @@ public class CommandHandlerRegistry implements ApplicationContextAware {
         }
         return handlerMap.get(commandName);
     }
-
-
-    /**
-     * 通过模块名称和命令名称生成命令标识符
-     * @return
-     */
-    private String generateCommandIdentifier(@NotNull String moduleName, @NotNull String commandName) {
-
-        return moduleName + SEPARATOR + commandName;
-    }
 }

src/main/java/com/iflytop/gd/debug/controller/CmdDebugController.java

@@ -4,7 +4,7 @@ import com.iflytop.gd.app.model.dto.CmdDTO;
 import com.iflytop.gd.app.service.exceptions.UnSupportCommandException;
 import com.iflytop.gd.common.result.Result;
 import com.iflytop.gd.common.cmd.CommandHandler;
-import com.iflytop.gd.app.service.cmd.CommandHandlerRegistry;
+import com.iflytop.gd.app.core.CommandHandlerRegistry;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -28,14 +28,14 @@ public class CmdDebugController {
         String commandName = cmdDTO.getCommand();
         try {
             CommandHandler commandHandler = registry.getCommandHandler(commandName);
-            log.info("业务指令开始执行");
+            log.info("调试指令开始执行");
             commandHandler.handle(cmdDTO);
         } catch (UnSupportCommandException exception) {
-            log.error("未找到对应的业务指令");
-            String errorMsg = "未找到对应的业务指令, commandName=" + commandName;
+            log.error("未找到对应的调试指令");
+            String errorMsg = "未找到对应的调试指令, commandName=" + commandName;
             return Result.failed(errorMsg);
         } catch (Exception e) {
-            log.error("执行业务指令发生异常: {}", cmdDTO, e);
+            log.error("执行调试指令发生异常: {}", cmdDTO, e);
             return Result.failed(e.getMessage());
         }
         return Result.success();