调整 web 模块中的包结构和模板文件目录结构

web/src/main/java/cn/reghao/bnt/web/account/controller/AccountAuthController.java

@@ -7,7 +7,7 @@ import cn.reghao.bnt.web.account.model.po.Menu;
 import cn.reghao.bnt.web.account.model.po.User;
 import cn.reghao.bnt.web.account.service.HomeService;
 import cn.reghao.bnt.web.account.service.UserContext;
-import cn.reghao.bnt.web.devops.sys.db.repository.SysMessageRepository;
+import cn.reghao.bnt.web.sys.db.repository.SysMessageRepository;
 import cn.reghao.jutil.jdk.jvm.JVM;
 import cn.reghao.jutil.jdk.jvm.model.JvmInfo;
 import cn.reghao.jutil.jdk.machine.id.MachineIdLinux;

web/src/main/java/cn/reghao/bnt/web/admin/controller/page/ContentPageController.java

@@ -101,7 +101,7 @@ public class ContentPageController {
         model.addAttribute("type", type);
         model.addAttribute("page", Page.empty());
         model.addAttribute("list", Collections.emptyList());
-        return "/app/rcmdindex";
+        return "/devops/app/rcmdindex";
     }
 
     @ApiOperation(value = "搜索模块")
@@ -122,6 +122,6 @@ public class ContentPageController {
         model.addAttribute("type", type);
         model.addAttribute("page", Page.empty());
         model.addAttribute("list", Collections.emptyList());
-        return "/app/searchindex";
+        return "/devops/app/searchindex";
     }
 }

web/src/main/java/cn/reghao/bnt/web/admin/controller/page/GatewayPageController.java

@@ -25,6 +25,6 @@ public class GatewayPageController {
     public String buildDirPage(Model model) {
         model.addAttribute("page", Page.empty());
         model.addAttribute("list", Collections.emptyList());
-        return "/app/config/build/builddir";
+        return "/devops/app/config/build/builddir";
     }
 }

web/src/main/java/cn/reghao/bnt/web/admin/controller/page/MessagePageController.java

@@ -25,6 +25,6 @@ public class MessagePageController {
     public String buildDirPage(Model model) {
         model.addAttribute("page", Page.empty());
         model.addAttribute("list", Collections.emptyList());
-        return "/app/config/build/builddir";
+        return "/devops/app/config/build/builddir";
     }
 }

web/src/main/java/cn/reghao/bnt/web/admin/rpc/AdminServiceImpl.java

@@ -2,8 +2,8 @@ package cn.reghao.bnt.web.admin.rpc;
 
 import cn.reghao.bnt.admin.api.dto.AdminMessage;
 import cn.reghao.bnt.admin.api.iface.AdminService;
-import cn.reghao.bnt.web.devops.sys.db.repository.SysMessageRepository;
-import cn.reghao.bnt.web.devops.sys.model.po.SysMessage;
+import cn.reghao.bnt.web.sys.db.repository.SysMessageRepository;
+import cn.reghao.bnt.web.sys.model.po.SysMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;

web/src/main/java/cn/reghao/bnt/web/config/spring/AppLifecycle.java

@@ -12,8 +12,8 @@ import cn.reghao.bnt.web.devops.app.service.config.BuildDirService;
 import cn.reghao.bnt.web.devops.log.Appenders;
 import cn.reghao.bnt.web.devops.log.LoggerConfig;
 import cn.reghao.bnt.web.devops.machine.service.MachineService;
-import cn.reghao.bnt.web.devops.sys.db.repository.SysMessageRepository;
-import cn.reghao.bnt.web.devops.sys.model.po.SysMessage;
+import cn.reghao.bnt.web.sys.db.repository.SysMessageRepository;
+import cn.reghao.bnt.web.sys.model.po.SysMessage;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.ApplicationArguments;

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/BuildDeployPageController.java

@@ -78,7 +78,7 @@ public class BuildDeployPageController {
         model.addAttribute("type", type);
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/app/bd/index";
+        return "/devops/app/bd/index";
     }
 
     @ApiOperation(value = "应用部署页面")
@@ -90,7 +90,7 @@ public class BuildDeployPageController {
         model.addAttribute("appId", appId);
         model.addAttribute("buildLogId", buildLogId);
         model.addAttribute("list", list);
-        return "/app/bd/deploy";
+        return "/devops/app/bd/deploy";
     }
 
     @ApiOperation(value = "构建结果页面")
@@ -106,7 +106,7 @@ public class BuildDeployPageController {
         }
 
         model.addAttribute("list", list);
-        return "/app/bd/log/buildresult";
+        return "/devops/app/bd/log/buildresult";
     }
 
     @ApiOperation(value = "历史构建页面")
@@ -116,7 +116,7 @@ public class BuildDeployPageController {
         Page<BuildLogVO> buildLogs = buildDeployLogPage.buildLogVOs(appId, pageRequest);
         model.addAttribute("page", buildLogs);
         model.addAttribute("list", buildLogs.getContent());
-        return "/app/bd/log/buildlog";
+        return "/devops/app/bd/log/buildlog";
     }
 
     @ApiOperation(value = "构建配置页面")
@@ -125,7 +125,7 @@ public class BuildDeployPageController {
         BuildLog buildLog = buildDeployLogPage.findByBuildLogId(buildLogId);
         BuildConfigSnapshot buildConfigSnapshot = buildLog.getBuildConfigSnapshot();
         model.addAttribute("buildConfigSnapshot", buildConfigSnapshot);
-        return "/app/bd/log/buildconfig";
+        return "/devops/app/bd/log/buildconfig";
     }
 
     @ApiOperation(value = "构建耗时页面")
@@ -134,6 +134,6 @@ public class BuildDeployPageController {
         BuildLog buildLog = buildDeployLogPage.findByBuildLogId(buildLogId);
         BuildConsumed buildConsumed = buildLog.getBuildConsumed();
         model.addAttribute("buildConsumed", buildConsumed);
-        return "/app/bd/log/buildtime";
+        return "/devops/app/bd/log/buildtime";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/StatusPageController.java

@@ -62,7 +62,7 @@ public class StatusPageController {
             model.addAttribute("env", env);
             model.addAttribute("page", page);
             model.addAttribute("list", pageList.getList());
-            return "/app/stat/index1";
+            return "/devops/app/stat/index1";
         }
 
         PageRequest pageRequest = PageSort.pageRequest();
@@ -76,7 +76,7 @@ public class StatusPageController {
         model.addAttribute("status", status);
         model.addAttribute("page", appRunnings);
         model.addAttribute("list", pageList.getList());
-        return "/app/stat/index1";
+        return "/devops/app/stat/index1";
     }
 
     @ApiOperation(value = "应用运行状态详情页面")
@@ -84,6 +84,6 @@ public class StatusPageController {
     public String statusPage2(@PathVariable(value = "appId") String appId, Model model) {
         List<AppRunning> list = deployStat.getAppRunning(appId);
         model.addAttribute("list", list);
-        return "/app/stat/index2";
+        return "/devops/app/stat/index2";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/AppConfigPageController.java

@@ -72,7 +72,7 @@ public class AppConfigPageController {
             model.addAttribute("type", type);
             model.addAttribute("page", page);
             model.addAttribute("list", page.getContent());
-            return "/app/config/app/index";
+            return "/devops/app/config/app/index";
         }
 
         PageRequest pageRequest = PageSort.pageRequest();
@@ -82,13 +82,13 @@ public class AppConfigPageController {
         model.addAttribute("type", type);
         model.addAttribute("page", appPage);
         model.addAttribute("list", appPage.getContent());
-        return "/app/config/app/index";
+        return "/devops/app/config/app/index";
     }
 
     @GetMapping("/add")
     public String addAppConfigPage(Model model) {
         setAppModel(model);
-        return "/app/config/app/add";
+        return "/devops/app/config/app/add";
     }
 
     private void setAppModel(Model model) {
@@ -131,7 +131,7 @@ public class AppConfigPageController {
     public String editAppConfigPage(@PathVariable("id") AppConfig app, Model model) {
         setAppModel(model);
         model.addAttribute("app", app);
-        return "/app/config/app/edit";
+        return "/devops/app/config/app/edit";
     }
 
     @GetMapping("/copy/{appId}")
@@ -139,7 +139,7 @@ public class AppConfigPageController {
         List<KeyValue> envs = getEnvList();
         model.addAttribute("environments", envs);
         model.addAttribute("appId", appId);
-        return "/app/config/app/copy";
+        return "/devops/app/config/app/copy";
     }
 
     private List<KeyValue> getEnvList() {
@@ -155,6 +155,6 @@ public class AppConfigPageController {
     public String appConfigPage(@PathVariable("appId") String appId, Model model) {
         AppConfig app = appConfigQuery.findByAppId(appId);
         model.addAttribute("app", app);
-        return "/app/config/app/detail";
+        return "/devops/app/config/app/detail";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/AppDeployConfigPageController.java

@@ -44,7 +44,7 @@ public class AppDeployConfigPageController {
         model.addAttribute("appId", appId);
         model.addAttribute("page", page);
         model.addAttribute("list", list);
-        return "/app/config/app/deploy/index";
+        return "/devops/app/config/app/deploy/index";
     }
 
     @GetMapping("/add/{appId}")
@@ -55,7 +55,7 @@ public class AppDeployConfigPageController {
         model.addAttribute("appId", appId);
         model.addAttribute("packType", appConfig.getPackerConfig().getType());
         model.addAttribute("machines", machines);
-        return "/app/config/app/deploy/add";
+        return "/devops/app/config/app/deploy/add";
     }
 
     @GetMapping("/edit/{appId}/{machineId}")
@@ -64,7 +64,7 @@ public class AppDeployConfigPageController {
                                     Model model) {
         AppDeployConfig appDeployConfig = deployConfigPage.findByAppIdAndMachineId(appId, machineId);
         model.addAttribute("appDeployConfig", appDeployConfig);
-        return "/app/config/app/deploy/edit";
+        return "/devops/app/config/app/deploy/edit";
     }
 
     @GetMapping("/detail/{appId}/{machineId}")
@@ -72,6 +72,6 @@ public class AppDeployConfigPageController {
                                 Model model) {
         AppDeployConfig appDeployConfig = deployConfigPage.findByAppIdAndMachineId(appId, machineId);
         model.addAttribute("deployConfigVO", new AppDeployConfigVo(appDeployConfig));
-        return "/app/config/app/deploy/detail";
+        return "/devops/app/config/app/deploy/detail";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/BuildDirPageController.java

@@ -42,7 +42,7 @@ public class BuildDirPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", list);
-        return "/app/config/build/builddir";
+        return "/devops/app/config/build/builddir";
     }
 
     @ApiOperation(value = "目录容量详情页面")
@@ -56,6 +56,6 @@ public class BuildDirPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", list);
-        return "/app/config/build/builddir";
+        return "/devops/app/config/build/builddir";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/CompilerPageController.java

@@ -43,19 +43,19 @@ public class CompilerPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/app/config/compiler/index";
+        return "/devops/app/config/compiler/index";
     }
 
     @GetMapping("/add")
     public String addCompilerPage(Model model) {
         setCompilerModel(model);
-        return "/app/config/compiler/add";
+        return "/devops/app/config/compiler/add";
     }
 
     @GetMapping("/edit/{id}")
     public String editCompilerPage(@PathVariable("id") CompilerConfig compilerConfig, Model model) {
         model.addAttribute("compiler", compilerConfig);
-        return "/app/config/compiler/edit";
+        return "/devops/app/config/compiler/edit";
     }
 
     private void setCompilerModel(Model model) {
@@ -71,6 +71,6 @@ public class CompilerPageController {
     @GetMapping("/detail/{id}")
     public String compilerDetailPage(@PathVariable("id") CompilerConfig compilerConfig, Model model) {
         model.addAttribute("compiler", compilerConfig);
-        return "/app/config/compiler/detail";
+        return "/devops/app/config/compiler/detail";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/PackerPageController.java

@@ -43,19 +43,19 @@ public class PackerPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/app/config/packer/index";
+        return "/devops/app/config/packer/index";
     }
 
     @GetMapping("/add")
     public String addPackerPage(Model model) {
         setPackerModel(model);
-        return "/app/config/packer/add";
+        return "/devops/app/config/packer/add";
     }
 
     @GetMapping("/edit/{id}")
     public String editPackerPage(@PathVariable("id") PackerConfig packerConfig, Model model) {
         model.addAttribute("packer", packerConfig);
-        return "/app/config/packer/edit";
+        return "/devops/app/config/packer/edit";
     }
 
     private void setPackerModel(Model model) {
@@ -71,6 +71,6 @@ public class PackerPageController {
     @GetMapping("/detail/{id}")
     public String packerDetailPage(@PathVariable("id") PackerConfig packerConfig, Model model) {
         model.addAttribute("packer", packerConfig);
-        return "/app/config/packer/detail";
+        return "/devops/app/config/packer/detail";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/config/RepoAuthPageController.java

@@ -43,14 +43,14 @@ public class RepoAuthPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/app/config/repoauth/index";
+        return "/devops/app/config/repoauth/index";
     }
 
     @ApiOperation(value = "仓库认证添加页面")
     @GetMapping("/repoauth/add")
     public String addRepoAuthPage(Model model) {
         setRepoAuthModel(model);
-        return "/app/config/repoauth/add";
+        return "/devops/app/config/repoauth/add";
     }
 
     @ApiOperation(value = "仓库认证编辑页面")
@@ -58,7 +58,7 @@ public class RepoAuthPageController {
     public String editRepoAuthPage(@PathVariable("id") RepoAuthConfig repoAuth, Model model) {
         repoAuth.setNull();
         model.addAttribute("repoAuth", repoAuth);
-        return "/app/config/repoauth/edit";
+        return "/devops/app/config/repoauth/edit";
     }
 
     private void setRepoAuthModel(Model model) {
@@ -80,6 +80,6 @@ public class RepoAuthPageController {
     public String repoAuthDetailPage(@PathVariable("id") RepoAuthConfig repoAuth, Model model) {
         repoAuth.setPassword("******");
         model.addAttribute("repoAuth", repoAuth);
-        return "/app/config/repoauth/detail";
+        return "/devops/app/config/repoauth/detail";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/service/bd/impl/BuildDeployNotifyImpl.java

@@ -5,9 +5,9 @@ import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
 import cn.reghao.bnt.web.devops.app.model.po.log.BuildLog;
 import cn.reghao.bnt.web.devops.app.model.po.log.DeployLog;
 import cn.reghao.bnt.web.devops.app.service.bd.BuildDeployNotify;
-import cn.reghao.bnt.web.devops.notification.model.BuildNotifyMsg;
-import cn.reghao.bnt.web.devops.notification.model.DeployNotifyMsg;
-import cn.reghao.bnt.web.devops.notification.service.NotifyService;
+import cn.reghao.bnt.web.sys.model.vo.BuildNotifyMsg;
+import cn.reghao.bnt.web.sys.model.vo.DeployNotifyMsg;
+import cn.reghao.bnt.web.sys.service.NotifyService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

web/src/main/java/cn/reghao/bnt/web/devops/app/service/bd/webhook/WebhookService.java

@@ -4,8 +4,8 @@ import cn.reghao.bnt.web.devops.app.db.query.AppConfigQuery;
 import cn.reghao.bnt.web.devops.app.model.po.config.AppConfig;
 import cn.reghao.bnt.web.devops.app.service.bd.BuildApp;
 import cn.reghao.bnt.web.devops.app.service.bd.webhook.event.*;
-import cn.reghao.bnt.web.devops.notification.service.NotifyService;
-import cn.reghao.bnt.web.devops.notification.service.notifier.ding.DingMsg;
+import cn.reghao.bnt.web.sys.service.NotifyService;
+import cn.reghao.bnt.web.sys.service.notifier.ding.DingMsg;
 import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import com.google.gson.JsonObject;

web/src/main/java/cn/reghao/bnt/web/devops/log/controller/AppLogController.java

@@ -26,19 +26,19 @@ public class AppLogController {
     @ApiOperation(value = "应用实时日志页面")
     @GetMapping(value = "/app/log/online")
     public String appLogPage() {
-        return "/app/stat/log";
+        return "/devops/app/stat/log";
     }
 
     @ApiOperation(value = "应用历史日志页面")
     @GetMapping(value = "/app/log/offline")
     public String appLog() {
-        return "/app/stat/log1";
+        return "/devops/app/stat/log1";
     }
 
     @ApiOperation(value = "Nginx 日志页面")
     @GetMapping(value = "/app/log/nginx")
     public String nginxLog() {
-        return "/app/stat/nginxlog";
+        return "/devops/app/stat/nginxlog";
     }
 
     @GetMapping(value = "/api/log/nginx/chart", produces = MediaType.APPLICATION_JSON_VALUE)

web/src/main/java/cn/reghao/bnt/web/devops/machine/controller/page/MachineHostPageController.java

@@ -72,7 +72,7 @@ public class MachineHostPageController {
         model.addAttribute("env", env);
         model.addAttribute("page", page1);
         model.addAttribute("list", pageList.getList());
-        return "/machine/host/index";
+        return "/devops/machine/host/index";
     }
 
     @ApiOperation(value = "机器所属环境设置页面")
@@ -86,7 +86,7 @@ public class MachineHostPageController {
         model.addAttribute("machineId", machineId);
         model.addAttribute("environments", envs);
         model.addAttribute("env", env);
-        return "/machine/host/env";
+        return "/devops/machine/host/env";
     }
 
     @ApiOperation(value = "SSH 认证设置页面")
@@ -108,7 +108,7 @@ public class MachineHostPageController {
         model.addAttribute("machineIpv4", machineIpv4);
         model.addAttribute("ipv4List", ipv4List);
         model.addAttribute("sshAuth", machineSshAuth.getSshAuth());
-        return "/machine/host/sshauth";
+        return "/devops/machine/host/sshauth";
     }
 
     @ApiOperation(value = "SSH 控制台页面")
@@ -130,7 +130,7 @@ public class MachineHostPageController {
         sshConnData.setPassword(sshAuth.getPassword());
 
         model.addAttribute("sshConnData", sshConnData);
-        return "/machine/host/webssh";
+        return "/devops/machine/host/webssh";
     }
 
     @ApiOperation(value = "机器信息详情页面")
@@ -138,13 +138,13 @@ public class MachineHostPageController {
     public String hostDetailPage(@PathVariable("machineId") String machineId, Model model) {
         MachineInfoVO machineInfoVO = machineHostPage.hostDetailPage(machineId);
         model.addAttribute("machine", machineInfoVO);
-        return "/machine/host/detail";
+        return "/devops/machine/host/detail";
     }
 
     @ApiOperation(value = "dagnet 日志页面")
     @GetMapping("/agentlog/{machineId}")
     public String agentLogPage(@PathVariable("machineId") String machineId, Model model) {
         model.addAttribute("list", Collections.emptyList());
-        return "/machine/host/agentlog";
+        return "/devops/machine/host/agentlog";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/machine/service/ClusterService.java

@@ -1,7 +1,7 @@
 package cn.reghao.bnt.web.devops.machine.service;
 
-import cn.reghao.bnt.web.devops.notification.service.NotifyService;
-import cn.reghao.bnt.web.devops.notification.service.notifier.ding.DingMsg;
+import cn.reghao.bnt.web.sys.service.NotifyService;
+import cn.reghao.bnt.web.sys.service.notifier.ding.DingMsg;
 import cn.reghao.bnt.web.devops.machine.model.dto.KeepalivedState;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

web/src/main/java/cn/reghao/bnt/web/devops/notification/controller/EmailAccountController.java → web/src/main/java/cn/reghao/bnt/web/sys/controller/EmailAccountController.java

@@ -1,11 +1,11 @@
-package cn.reghao.bnt.web.devops.notification.controller;
+package cn.reghao.bnt.web.sys.controller;
 
 import cn.reghao.bnt.web.util.db.PageSort;
-import cn.reghao.bnt.web.devops.notification.db.repository.EmailAccountRepository;
-import cn.reghao.bnt.web.devops.notification.db.repository.NotifyReceiverRepository;
-import cn.reghao.bnt.web.devops.notification.model.NotifyType;
-import cn.reghao.bnt.web.devops.notification.model.po.EmailAccount;
-import cn.reghao.bnt.web.devops.notification.model.po.NotifyReceiver;
+import cn.reghao.bnt.web.sys.db.repository.EmailAccountRepository;
+import cn.reghao.bnt.web.sys.db.repository.NotifyReceiverRepository;
+import cn.reghao.bnt.web.sys.model.vo.NotifyType;
+import cn.reghao.bnt.web.sys.model.po.EmailAccount;
+import cn.reghao.bnt.web.sys.model.po.NotifyReceiver;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.string.StringRegexp;
 import io.swagger.annotations.Api;

web/src/main/java/cn/reghao/bnt/web/devops/notification/controller/NotifyReceiverController.java → web/src/main/java/cn/reghao/bnt/web/sys/controller/NotifyReceiverController.java

@@ -1,11 +1,11 @@
-package cn.reghao.bnt.web.devops.notification.controller;
+package cn.reghao.bnt.web.sys.controller;
 
 import cn.reghao.bnt.web.util.db.PageSort;
-import cn.reghao.bnt.web.devops.notification.db.repository.EmailAccountRepository;
-import cn.reghao.bnt.web.devops.notification.db.repository.NotifyReceiverRepository;
-import cn.reghao.bnt.web.devops.notification.model.NotifyType;
-import cn.reghao.bnt.web.devops.notification.model.po.EmailAccount;
-import cn.reghao.bnt.web.devops.notification.model.po.NotifyReceiver;
+import cn.reghao.bnt.web.sys.db.repository.EmailAccountRepository;
+import cn.reghao.bnt.web.sys.db.repository.NotifyReceiverRepository;
+import cn.reghao.bnt.web.sys.model.vo.NotifyType;
+import cn.reghao.bnt.web.sys.model.po.EmailAccount;
+import cn.reghao.bnt.web.sys.model.po.NotifyReceiver;
 import cn.reghao.jutil.jdk.result.WebResult;
 import cn.reghao.jutil.jdk.string.StringRegexp;
 import io.swagger.annotations.Api;

web/src/main/java/cn/reghao/bnt/web/devops/sys/controller/SysPageController.java → web/src/main/java/cn/reghao/bnt/web/sys/controller/SysPageController.java

@@ -1,7 +1,7 @@
-package cn.reghao.bnt.web.devops.sys.controller;
+package cn.reghao.bnt.web.sys.controller;
 
-import cn.reghao.bnt.web.devops.sys.model.po.SysMessage;
-import cn.reghao.bnt.web.devops.sys.db.repository.SysMessageRepository;
+import cn.reghao.bnt.web.sys.model.po.SysMessage;
+import cn.reghao.bnt.web.sys.db.repository.SysMessageRepository;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;

web/src/main/java/cn/reghao/bnt/web/devops/notification/db/repository/EmailAccountRepository.java → web/src/main/java/cn/reghao/bnt/web/sys/db/repository/EmailAccountRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.notification.db.repository;
+package cn.reghao.bnt.web.sys.db.repository;
 
-import cn.reghao.bnt.web.devops.notification.model.po.EmailAccount;
+import cn.reghao.bnt.web.sys.model.po.EmailAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/notification/db/repository/NotifyReceiverRepository.java → web/src/main/java/cn/reghao/bnt/web/sys/db/repository/NotifyReceiverRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.notification.db.repository;
+package cn.reghao.bnt.web.sys.db.repository;
 
-import cn.reghao.bnt.web.devops.notification.model.po.NotifyReceiver;
+import cn.reghao.bnt.web.sys.model.po.NotifyReceiver;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

web/src/main/java/cn/reghao/bnt/web/devops/sys/db/repository/SysMessageRepository.java → web/src/main/java/cn/reghao/bnt/web/sys/db/repository/SysMessageRepository.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.sys.db.repository;
+package cn.reghao.bnt.web.sys.db.repository;
 
-import cn.reghao.bnt.web.devops.sys.model.po.SysMessage;
+import cn.reghao.bnt.web.sys.model.po.SysMessage;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;

web/src/main/java/cn/reghao/bnt/web/devops/notification/model/po/EmailAccount.java → web/src/main/java/cn/reghao/bnt/web/sys/model/po/EmailAccount.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.notification.model.po;
+package cn.reghao.bnt.web.sys.model.po;
 
 import cn.reghao.bnt.web.util.db.BaseEntity;
 import lombok.Getter;

web/src/main/java/cn/reghao/bnt/web/devops/notification/model/po/NotifyReceiver.java → web/src/main/java/cn/reghao/bnt/web/sys/model/po/NotifyReceiver.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.notification.model.po;
+package cn.reghao.bnt.web.sys.model.po;
 
-import cn.reghao.bnt.web.devops.notification.model.NotifyType;
+import cn.reghao.bnt.web.sys.model.vo.NotifyType;
 import cn.reghao.bnt.web.util.db.BaseEntity;
 import cn.reghao.bnt.web.util.validator.ValidEnum;
 import lombok.Getter;

web/src/main/java/cn/reghao/bnt/web/devops/sys/model/po/SysMessage.java → web/src/main/java/cn/reghao/bnt/web/sys/model/po/SysMessage.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.sys.model.po;
+package cn.reghao.bnt.web.sys.model.po;
 
 import cn.reghao.bnt.web.util.db.BaseEntity;
 import lombok.AllArgsConstructor;

web/src/main/java/cn/reghao/bnt/web/devops/notification/model/BuildNotifyMsg.java → web/src/main/java/cn/reghao/bnt/web/sys/model/vo/BuildNotifyMsg.java

@@ -1,7 +1,7 @@
-package cn.reghao.bnt.web.devops.notification.model;
+package cn.reghao.bnt.web.sys.model.vo;
 
 import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
-import cn.reghao.bnt.web.devops.notification.service.notifier.ding.DingMsg;
+import cn.reghao.bnt.web.sys.service.notifier.ding.DingMsg;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import lombok.Data;
 

web/src/main/java/cn/reghao/bnt/web/devops/notification/model/DeployNotifyMsg.java → web/src/main/java/cn/reghao/bnt/web/sys/model/vo/DeployNotifyMsg.java

@@ -1,8 +1,8 @@
-package cn.reghao.bnt.web.devops.notification.model;
+package cn.reghao.bnt.web.sys.model.vo;
 
 import cn.reghao.bnt.web.devops.app.model.po.log.BuildLog;
 import cn.reghao.bnt.web.devops.app.model.po.log.DeployLog;
-import cn.reghao.bnt.web.devops.notification.service.notifier.ding.DingMsg;
+import cn.reghao.bnt.web.sys.service.notifier.ding.DingMsg;
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.result.ResultStatus;
 import lombok.Data;

web/src/main/java/cn/reghao/bnt/web/devops/notification/model/NotifyType.java → web/src/main/java/cn/reghao/bnt/web/sys/model/vo/NotifyType.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.notification.model;
+package cn.reghao.bnt.web.sys.model.vo;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/notification/service/NotifyService.java → web/src/main/java/cn/reghao/bnt/web/sys/service/NotifyService.java

@@ -1,13 +1,13 @@
-package cn.reghao.bnt.web.devops.notification.service;
+package cn.reghao.bnt.web.sys.service;
 
-import cn.reghao.bnt.web.devops.notification.service.notifier.ding.DingMsg;
-import cn.reghao.bnt.web.devops.notification.service.notifier.ding.DingNotify;
-import cn.reghao.bnt.web.devops.notification.service.notifier.email.EmailMsg;
-import cn.reghao.bnt.web.devops.notification.service.notifier.email.EmailNotify;
-import cn.reghao.bnt.web.devops.notification.db.repository.NotifyReceiverRepository;
-import cn.reghao.bnt.web.devops.notification.model.NotifyType;
-import cn.reghao.bnt.web.devops.notification.model.po.NotifyReceiver;
-import cn.reghao.bnt.web.devops.notification.service.notifier.Notify;
+import cn.reghao.bnt.web.sys.service.notifier.ding.DingMsg;
+import cn.reghao.bnt.web.sys.service.notifier.ding.DingNotify;
+import cn.reghao.bnt.web.sys.service.notifier.email.EmailMsg;
+import cn.reghao.bnt.web.sys.service.notifier.email.EmailNotify;
+import cn.reghao.bnt.web.sys.db.repository.NotifyReceiverRepository;
+import cn.reghao.bnt.web.sys.model.vo.NotifyType;
+import cn.reghao.bnt.web.sys.model.po.NotifyReceiver;
+import cn.reghao.bnt.web.sys.service.notifier.Notify;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

web/src/main/java/cn/reghao/bnt/web/devops/notification/service/notifier/Notify.java → web/src/main/java/cn/reghao/bnt/web/sys/service/notifier/Notify.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.notification.service.notifier;
+package cn.reghao.bnt.web.sys.service.notifier;
 
 /**
  * @author reghao

web/src/main/java/cn/reghao/bnt/web/devops/notification/service/notifier/NotifyMsg.java → web/src/main/java/cn/reghao/bnt/web/sys/service/notifier/NotifyMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.notification.service.notifier;
+package cn.reghao.bnt.web.sys.service.notifier;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

web/src/main/java/cn/reghao/bnt/web/devops/notification/service/notifier/ding/DingMsg.java → web/src/main/java/cn/reghao/bnt/web/sys/service/notifier/ding/DingMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.notification.service.notifier.ding;
+package cn.reghao.bnt.web.sys.service.notifier.ding;
 
 import lombok.Data;
 

web/src/main/java/cn/reghao/bnt/web/devops/notification/service/notifier/ding/DingNotify.java → web/src/main/java/cn/reghao/bnt/web/sys/service/notifier/ding/DingNotify.java

@@ -1,6 +1,6 @@
-package cn.reghao.bnt.web.devops.notification.service.notifier.ding;
+package cn.reghao.bnt.web.sys.service.notifier.ding;
 
-import cn.reghao.bnt.web.devops.notification.service.notifier.Notify;
+import cn.reghao.bnt.web.sys.service.notifier.Notify;
 import cn.reghao.jutil.jdk.http.WebRequest;
 import cn.reghao.jutil.jdk.http.WebResponse;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;

web/src/main/java/cn/reghao/bnt/web/devops/notification/service/notifier/email/EmailMsg.java → web/src/main/java/cn/reghao/bnt/web/sys/service/notifier/email/EmailMsg.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.notification.service.notifier.email;
+package cn.reghao.bnt.web.sys.service.notifier.email;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

web/src/main/java/cn/reghao/bnt/web/devops/notification/service/notifier/email/EmailNotify.java → web/src/main/java/cn/reghao/bnt/web/sys/service/notifier/email/EmailNotify.java

@@ -1,8 +1,8 @@
-package cn.reghao.bnt.web.devops.notification.service.notifier.email;
+package cn.reghao.bnt.web.sys.service.notifier.email;
 
-import cn.reghao.bnt.web.devops.notification.db.repository.EmailAccountRepository;
-import cn.reghao.bnt.web.devops.notification.model.po.EmailAccount;
-import cn.reghao.bnt.web.devops.notification.service.notifier.Notify;
+import cn.reghao.bnt.web.sys.db.repository.EmailAccountRepository;
+import cn.reghao.bnt.web.sys.model.po.EmailAccount;
+import cn.reghao.bnt.web.sys.service.notifier.Notify;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

web/src/test/java/cn/reghao/bnt/web/devops/AppConfigTest.java

@@ -6,9 +6,9 @@ import cn.reghao.bnt.web.devops.app.db.repository.AppDeployingRepository;
 import cn.reghao.bnt.web.devops.app.db.repository.config.AppConfigRepository;
 import cn.reghao.bnt.web.devops.app.db.repository.config.AppDeployConfigRepository;
 import cn.reghao.bnt.web.devops.app.model.po.AppBuilding;
-import cn.reghao.bnt.web.devops.notification.service.NotifyService;
-import cn.reghao.bnt.web.devops.notification.db.repository.EmailAccountRepository;
-import cn.reghao.bnt.web.devops.notification.db.repository.NotifyReceiverRepository;
+import cn.reghao.bnt.web.sys.service.NotifyService;
+import cn.reghao.bnt.web.sys.db.repository.EmailAccountRepository;
+import cn.reghao.bnt.web.sys.db.repository.NotifyReceiverRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;