Browse Source

account 模块和 myblog 项目对齐

reghao 2 năm trước cách đây
mục cha
commit
ec11809d0b

+ 2 - 3
manager/src/main/java/cn/reghao/devops/manager/home/controller/page/LoginPageController.java → manager/src/main/java/cn/reghao/devops/manager/account/controller/AccountAuthController.java

@@ -1,6 +1,5 @@
-package cn.reghao.devops.manager.home.controller.page;
+package cn.reghao.devops.manager.account.controller;
 
-import cn.reghao.devops.manager.home.service.HomeService;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.servlet.error.ErrorController;
@@ -17,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 @Api(tags = "登录页和首页")
 @Controller
-public class LoginPageController implements ErrorController {
+public class AccountAuthController implements ErrorController {
     @GetMapping("/login")
     public String toLogin(Model model) {
         model.addAttribute("isCaptcha", false);

+ 2 - 2
manager/src/main/java/cn/reghao/devops/manager/account/controller/UserController.java → manager/src/main/java/cn/reghao/devops/manager/account/controller/AccountProfileController.java

@@ -24,10 +24,10 @@ import java.util.List;
 @Api(tags = "用户接口")
 @RequestMapping("/api/rbac/user")
 @RestController
-public class UserController {
+public class AccountProfileController {
     private final AccountService accountService;
 
-    public UserController(AccountService accountService) {
+    public AccountProfileController(AccountService accountService) {
         this.accountService = accountService;
     }
 

+ 0 - 34
manager/src/main/java/cn/reghao/devops/manager/home/controller/AppEnvController.java

@@ -1,34 +0,0 @@
-package cn.reghao.devops.manager.home.controller;
-
-import cn.reghao.jutil.jdk.result.WebResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author reghao
- * @date 2022-05-12 11:01:16
- */
-@Api(tags = "应用环境接口")
-@RestController
-@RequestMapping("/api/sys/env")
-public class AppEnvController {
-    @ApiOperation(value = "添加/修改应用环境")
-    @PostMapping(produces = MediaType.APPLICATION_JSON_VALUE)
-    public String addAppEnv() {
-        return WebResult.success("暂未实现");
-    }
-
-    @ApiOperation(value = "删除应用环境")
-    @DeleteMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String deleteAppEnv(@PathVariable("id") int id) {
-        return WebResult.success("暂未实现");
-    }
-
-    @ApiOperation(value = "设置为默认环境")
-    @PostMapping(value = "/setdefault/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String setDefault(@PathVariable("id") int id) {
-        return WebResult.success("暂未实现");
-    }
-}

+ 0 - 51
manager/src/main/java/cn/reghao/devops/manager/home/controller/HomeController.java

@@ -1,51 +0,0 @@
-package cn.reghao.devops.manager.home.controller;
-
-import cn.reghao.devops.manager.app.db.repository.config.AppConfigRepository;
-import cn.reghao.devops.manager.app.model.constant.AppType;
-import cn.reghao.devops.manager.app.model.po.config.AppConfig;
-import cn.reghao.devops.manager.home.model.NameValue;
-import cn.reghao.jutil.jdk.result.WebResult;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2022-09-23 11:24:18
- */
-@Slf4j
-@Api(tags = "首页接口")
-@RequestMapping("/api/home")
-@RestController
-public class HomeController {
-    private final AppConfigRepository appConfigRepository;
-
-    public HomeController(AppConfigRepository appConfigRepository) {
-        this.appConfigRepository = appConfigRepository;
-    }
-
-    @GetMapping(value = "/app", produces = MediaType.APPLICATION_JSON_VALUE)
-    public String appStatistic(@RequestParam("env") String env) {
-        PageRequest pageRequest = PageRequest.of(0, 1);
-
-        List<NameValue> list = new ArrayList<>();
-        for (AppType appType : AppType.values()) {
-            String type = appType.getName();
-            Page<AppConfig> page = appConfigRepository.findByEnvAndAppType(env, type, pageRequest);
-            Long total = page.getTotalElements();
-            if (total != 0) {
-                list.add(new NameValue(type, total.intValue()));
-            }
-        }
-        return WebResult.success(list);
-    }
-}