调整 web.devops.builds 包中的接口和静态文件

web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/BuildDirController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/BuildDirController.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.builds.controller.page;
+package cn.reghao.bnt.web.devops.builds.controller;
 
 import cn.reghao.bnt.web.devops.builds.service.BuildDirService;
 import cn.reghao.jutil.jdk.result.Result;
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @Api(tags = "构建目录配置接口")
 @RestController
-@RequestMapping("/api/app/config/build/dir")
+@RequestMapping("/api/build/dir")
 public class BuildDirController {
     private final BuildDirService buildDirService;
 

web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/CompilerConfigController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/CompilerConfigController.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.builds.controller.page;
+package cn.reghao.bnt.web.devops.builds.controller;
 
 import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
 import cn.reghao.bnt.web.devops.builds.service.CompilerConfigService;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @Api(tags = "应用编译配置接口")
 @RestController
-@RequestMapping("/api/app/config/build/compiler")
+@RequestMapping("/api/build/compiler")
 public class CompilerConfigController {
     private final CompilerConfigService compilerConfigService;
 

web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/DockerRegistryController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @Api(tags = "DockerRegistry 配置接口")
 @RestController
-@RequestMapping("/api/app/config/docker")
+@RequestMapping("/api/docker")
 public class DockerRegistryController {
     private final DockerRegistryService dockerRegistryService;
 

web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/PackerConfigController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/PackerConfigController.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.builds.controller.page;
+package cn.reghao.bnt.web.devops.builds.controller;
 
 import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
 import cn.reghao.bnt.web.devops.builds.service.PackerConfigService;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @Api(tags = "应用打包配置接口")
 @RestController
-@RequestMapping("/api/app/config/build/packer")
+@RequestMapping("/api/build/packer")
 public class PackerConfigController {
     private final PackerConfigService packerConfigService;
 

web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/RepoAuthConfigController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/RepoAuthConfigController.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.builds.controller.page;
+package cn.reghao.bnt.web.devops.builds.controller;
 
 import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
 import cn.reghao.bnt.web.devops.builds.service.RepoAuthConfigService;
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @Api(tags = "仓库认证配置接口")
 @RestController
-@RequestMapping("/api/app/config/build/repoauth")
+@RequestMapping("/api/build/repoauth")
 public class RepoAuthConfigController {
     private final RepoAuthConfigService repoAuthConfigService;
 

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

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.controller.page.config;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
 import cn.reghao.bnt.web.devops.builds.model.po.BuildDir;
 import cn.reghao.bnt.web.util.db.PageSort;
@@ -23,7 +23,7 @@ import java.util.List;
 @Slf4j
 @Api(tags = "构建目录配置页面")
 @Controller
-@RequestMapping("/app/config/build/dir")
+@RequestMapping("/build/dir")
 public class BuildDirPageController {
     private final BuildDirService buildDirService;
 
@@ -42,7 +42,7 @@ public class BuildDirPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", list);
-        return "/devops/app/config/build/builddir";
+        return "/devops/build/builddir";
     }
 
     @ApiOperation(value = "目录容量详情页面")
@@ -56,6 +56,6 @@ public class BuildDirPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", list);
-        return "/devops/app/config/build/builddir";
+        return "/devops/build/builddir";
     }
 }

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

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.controller.page.config;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
 import cn.reghao.bnt.web.devops.builds.db.repository.CompilerConfigRepository;
 import cn.reghao.bnt.web.devops.builds.model.po.CompilerConfig;
@@ -27,7 +27,7 @@ import java.util.List;
 @Slf4j
 @Api(tags = "应用编译配置页面")
 @Controller
-@RequestMapping("/app/config/build/compiler")
+@RequestMapping("/build/compiler")
 public class CompilerPageController {
     private final CompilerConfigRepository compilerConfigRepository;
 
@@ -43,19 +43,19 @@ public class CompilerPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/devops/app/config/compiler/index";
+        return "/devops/build/compiler/index";
     }
 
     @GetMapping("/add")
     public String addCompilerPage(Model model) {
         setCompilerModel(model);
-        return "/devops/app/config/compiler/add";
+        return "/devops/build/compiler/add";
     }
 
     @GetMapping("/edit/{id}")
     public String editCompilerPage(@PathVariable("id") CompilerConfig compilerConfig, Model model) {
         model.addAttribute("compiler", compilerConfig);
-        return "/devops/app/config/compiler/edit";
+        return "/devops/build/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 "/devops/app/config/compiler/detail";
+        return "/devops/build/compiler/detail";
     }
 }

web/src/main/java/cn/reghao/bnt/web/devops/app/controller/page/DockerRegistryPageController.java → web/src/main/java/cn/reghao/bnt/web/devops/builds/controller/page/DockerRegistryPageController.java

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.controller.page;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
 import cn.reghao.bnt.web.devops.builds.db.repository.DockerRegistryRepository;
 import cn.reghao.bnt.web.devops.builds.model.po.DockerRegistry;
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 @Api(tags = "Docker 认证配置页面")
 @Controller
-@RequestMapping("/app/config/docker")
+@RequestMapping("/docker")
 public class DockerRegistryPageController {
     private final DockerRegistryRepository dockerAuthRepository;
 
@@ -35,13 +35,13 @@ public class DockerRegistryPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/devops/app/config/docker/index";
+        return "/devops/build/docker/index";
     }
 
     @ApiOperation(value = "DockerRegistry 添加页面")
     @GetMapping("/registry/add")
     public String addRepoAuthPage(Model model) {
-        return "/devops/app/config/docker/add";
+        return "/devops/build/docker/add";
     }
 
     @ApiOperation(value = "DockerRegistry 编辑页面")
@@ -49,13 +49,13 @@ public class DockerRegistryPageController {
     public String editRepoAuthPage(@PathVariable("id") DockerRegistry dockerRegistry, Model model) {
         dockerRegistry.setNull();
         model.addAttribute("dockerRegistry", dockerRegistry);
-        return "/devops/app/config/docker/edit";
+        return "/devops/build/docker/edit";
     }
 
     @GetMapping("/registry/detail/{id}")
     public String repoAuthDetailPage(@PathVariable("id") DockerRegistry dockerRegistry, Model model) {
         dockerRegistry.setPassword("******");
         model.addAttribute("dockerRegistry", dockerRegistry);
-        return "/devops/app/config/docker/detail";
+        return "/devops/build/docker/detail";
     }
 }

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

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.controller.page.config;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
 import cn.reghao.bnt.web.devops.builds.db.repository.PackerConfigRepository;
 import cn.reghao.bnt.web.devops.builds.model.po.PackerConfig;
@@ -27,7 +27,7 @@ import java.util.List;
 @Slf4j
 @Api(tags = "应用打包配置页面")
 @Controller
-@RequestMapping("/app/config/build/packer")
+@RequestMapping("/build/packer")
 public class PackerPageController {
     private final PackerConfigRepository packerConfigRepository;
 
@@ -43,19 +43,19 @@ public class PackerPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/devops/app/config/packer/index";
+        return "/devops/build/packer/index";
     }
 
     @GetMapping("/add")
     public String addPackerPage(Model model) {
         setPackerModel(model);
-        return "/devops/app/config/packer/add";
+        return "/devops/build/packer/add";
     }
 
     @GetMapping("/edit/{id}")
     public String editPackerPage(@PathVariable("id") PackerConfig packerConfig, Model model) {
         model.addAttribute("packer", packerConfig);
-        return "/devops/app/config/packer/edit";
+        return "/devops/build/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 "/devops/app/config/packer/detail";
+        return "/devops/build/packer/detail";
     }
 }

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

@@ -1,4 +1,4 @@
-package cn.reghao.bnt.web.devops.app.controller.page.config;
+package cn.reghao.bnt.web.devops.builds.controller.page;
 
 import cn.reghao.bnt.web.devops.builds.db.repository.RepoAuthConfigRepository;
 import cn.reghao.bnt.web.devops.builds.model.po.RepoAuthConfig;
@@ -27,7 +27,7 @@ import java.util.List;
 @Slf4j
 @Api(tags = "仓库认证配置页面")
 @Controller
-@RequestMapping("/app/config/build")
+@RequestMapping("/build")
 public class RepoAuthPageController {
     private final RepoAuthConfigRepository repoAuthConfigRepository;
 
@@ -43,14 +43,14 @@ public class RepoAuthPageController {
 
         model.addAttribute("page", page);
         model.addAttribute("list", page.getContent());
-        return "/devops/app/config/repoauth/index";
+        return "/devops/build/repoauth/index";
     }
 
     @ApiOperation(value = "仓库认证添加页面")
     @GetMapping("/repoauth/add")
     public String addRepoAuthPage(Model model) {
         setRepoAuthModel(model);
-        return "/devops/app/config/repoauth/add";
+        return "/devops/build/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 "/devops/app/config/repoauth/edit";
+        return "/devops/build/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 "/devops/app/config/repoauth/detail";
+        return "/devops/build/repoauth/detail";
     }
 }

web/src/main/resources/templates/devops/app/config/build/builddir.html → web/src/main/resources/templates/devops/build/builddir.html

@@ -30,7 +30,7 @@
                     <td th:text="${item.availStr}">分区可用</td>
                     <td>
                         <a class="ajax-post"
-                           th:href="@{'/api/app/config/build/dir/erase'}">清空</a>
+                           th:href="@{'/api/build/dir/erase'}">清空</a>
                     </td>
                 </tr>
                 </tbody>

web/src/main/resources/templates/devops/app/config/compiler/add.html → web/src/main/resources/templates/devops/build/compiler/add.html

@@ -5,7 +5,7 @@
 
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/app/config/build/compiler}">
+    <form th:action="@{/api/build/compiler}">
         <div class="layui-form-item">
             <label class="layui-form-label required">编译类型<i id="compile_type_tips" class="fa fa-question-circle"></i></label>
             <div class="layui-input-inline">

web/src/main/resources/templates/devops/app/config/compiler/edit.html → web/src/main/resources/templates/devops/build/compiler/edit.html

@@ -5,7 +5,7 @@
 
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/app/config/build/compiler}">
+    <form th:action="@{/api/build/compiler}">
         <!--<input type="hidden" name="machineId" th:value="${machineId}"/>-->
         <div class="layui-form-item">
             <label class="layui-form-label">编译类型</label>

web/src/main/resources/templates/devops/app/config/compiler/index.html → web/src/main/resources/templates/devops/build/compiler/index.html

@@ -36,14 +36,14 @@
                     <td th:text="${item.name}">编译名字</td>
                     <td th:text="${item.homePath}">编译器主目录</td>
                     <td>
-                        <a class="open-popup" data-title="编译脚本" th:attr="data-url=@{'/app/config/build/compiler/detail/'+${item.id}}"
+                        <a class="open-popup" data-title="编译脚本" th:attr="data-url=@{'/build/compiler/detail/'+${item.id}}"
                            data-size="640,480" href="#">查看</a>
                     </td>
                     <td>
-                        <a class="open-popup" data-title="编辑" th:attr="data-url=@{'/app/config/build/compiler/edit/'+${item.id}}"
+                        <a class="open-popup" data-title="编辑" th:attr="data-url=@{'/build/compiler/edit/'+${item.id}}"
                            data-size="640,480" href="#">编辑</a>
                         <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.name} + '?'"
-                           th:href="@{'/api/app/config/build/compiler/' + ${item.id}}">删除</a>
+                           th:href="@{'/api/build/compiler/' + ${item.id}}">删除</a>
                     </td>
                 </tr>
                 </tbody>

web/src/main/resources/templates/devops/app/config/docker/add.html → web/src/main/resources/templates/devops/build/docker/add.html

@@ -5,7 +5,7 @@
 
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/app/config/docker/registry}">
+    <form th:action="@{/api/docker/registry}">
         <div class="layui-form-item">
             <label class="layui-form-label required">Registry Url</label>
             <div class="layui-input-inline">

web/src/main/resources/templates/devops/app/config/docker/edit.html → web/src/main/resources/templates/devops/build/docker/edit.html

@@ -5,7 +5,7 @@
 
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/app/config/docker/registry}">
+    <form th:action="@{/api/docker/registry}">
         <div class="layui-form-item">
             <label class="layui-form-label required">RegistryUrl</label>
             <div class="layui-input-inline">

web/src/main/resources/templates/devops/app/config/docker/index.html → web/src/main/resources/templates/devops/build/docker/index.html

@@ -31,12 +31,12 @@
                 <tr th:each="item:${list}">
                     <td th:text="${item.registryUrl}">仓库类型</td>
                     <td>
-                        <a class="open-popup" data-title="详细" th:attr="data-url=@{'/app/config/docker/registry/detail/'+${item.id}}"
+                        <a class="open-popup" data-title="详细" th:attr="data-url=@{'/docker/registry/detail/'+${item.id}}"
                            data-size="640,480" href="#">详细</a>
-                        <a class="open-popup" data-title="编辑" th:attr="data-url=@{'/app/config/docker/registry/edit/'+${item.id}}"
+                        <a class="open-popup" data-title="编辑" th:attr="data-url=@{'/docker/registry/edit/'+${item.id}}"
                            data-size="640,480" href="#">编辑</a>
                         <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.registryUrl} + '?'"
-                           th:href="@{'/api/app/config/docker/registry/' + ${item.id}}">删除</a>
+                           th:href="@{'/api/docker/registry/' + ${item.id}}">删除</a>
                     </td>
                 </tr>
                 </tbody>

web/src/main/resources/templates/devops/app/config/packer/add.html → web/src/main/resources/templates/devops/build/packer/add.html

@@ -5,7 +5,7 @@
 
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/app/config/build/packer}">
+    <form th:action="@{/api/build/packer}">
         <div class="layui-form-item">
             <label class="layui-form-label required">打包类型</label>
             <div class="layui-input-inline">

web/src/main/resources/templates/devops/app/config/packer/edit.html → web/src/main/resources/templates/devops/build/packer/edit.html

@@ -5,7 +5,7 @@
 
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/app/config/build/packer}">
+    <form th:action="@{/api/build/packer}">
         <input type="hidden" name="id" th:value="${packer.id}"/>
         <div class="layui-form-item">
             <label class="layui-form-label">打包类型</label>

web/src/main/resources/templates/devops/app/config/packer/index.html → web/src/main/resources/templates/devops/build/packer/index.html

@@ -35,12 +35,12 @@
                     <td th:text="${item.name}">打包名字</td>
                     <td th:text="${item.targetPath}">存放位置</td>
                     <td>
-                        <a class="open-popup" data-title="详细" th:attr="data-url=@{'/app/config/build/packer/detail/'+${item.id}}"
+                        <a class="open-popup" data-title="详细" th:attr="data-url=@{'/build/packer/detail/'+${item.id}}"
                            data-size="640,480" href="#">详细</a>
-                        <a class="open-popup" data-title="编辑" th:attr="data-url=@{'/app/config/build/packer/edit/'+${item.id}}"
+                        <a class="open-popup" data-title="编辑" th:attr="data-url=@{'/build/packer/edit/'+${item.id}}"
                            data-size="640,480" href="#">编辑</a>
                         <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.name} + '?'"
-                           th:href="@{'/api/app/config/build/packer/' + ${item.id}}">删除</a>
+                           th:href="@{'/api/build/packer/' + ${item.id}}">删除</a>
                     </td>
                 </tr>
                 </tbody>

web/src/main/resources/templates/devops/app/config/repoauth/add.html → web/src/main/resources/templates/devops/build/repoauth/add.html

@@ -5,7 +5,7 @@
 
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/app/config/build/repoauth}">
+    <form th:action="@{/api/build/repoauth}">
         <div class="layui-form-item">
             <label class="layui-form-label required">仓库类型<i id="repo_type_tips" class="fa fa-question-circle"></i></label>
             <div class="layui-input-inline">

web/src/main/resources/templates/devops/app/config/repoauth/edit.html → web/src/main/resources/templates/devops/build/repoauth/edit.html

@@ -5,7 +5,7 @@
 
 <body>
 <div class="layui-form timo-compile">
-    <form th:action="@{/api/app/config/build/repoauth}">
+    <form th:action="@{/api/build/repoauth}">
         <div class="layui-form-item">
             <label class="layui-form-label required">仓库类型</label>
             <div class="layui-input-inline">

web/src/main/resources/templates/devops/app/config/repoauth/index.html → web/src/main/resources/templates/devops/build/repoauth/index.html

@@ -35,12 +35,12 @@
                     <td th:text="${item.name}">认证名字</td>
                     <td th:text="${item.authType}">认证类型</td>
                     <td>
-                        <a class="open-popup" data-title="详细" th:attr="data-url=@{'/app/config/build/repoauth/detail/'+${item.id}}"
+                        <a class="open-popup" data-title="详细" th:attr="data-url=@{'/build/repoauth/detail/'+${item.id}}"
                            data-size="640,480" href="#">详细</a>
-                        <a class="open-popup" data-title="编辑" th:attr="data-url=@{'/app/config/build/repoauth/edit/'+${item.id}}"
+                        <a class="open-popup" data-title="编辑" th:attr="data-url=@{'/build/repoauth/edit/'+${item.id}}"
                            data-size="640,480" href="#">编辑</a>
                         <a class="ajax-delete" th:attr="data-msg='确定要删除 '+ ${item.name} + '?'"
-                           th:href="@{'/api/app/config/build/repoauth/' + ${item.id}}">删除</a>
+                           th:href="@{'/api/build/repoauth/' + ${item.id}}">删除</a>
                     </td>
                 </tr>
                 </tbody>