'commit'

ds-base/dsBase.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../dsBase" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/../dsBase/src/main/resource" type="java-resource" />
+    </content>
+  </component>
+</module>

dsBase/src/main/java/com/dsideal/base/Menu/Controller/MenuController.java

@@ -190,7 +190,8 @@ public class MenuController extends Controller {
     @EmptyInterface({"menu_name", "url", "memo", "identity_ids"})
     @IsNumericInterface({"menu_id", "sort_id", "for_school", "for_bureau"})
     @LengthInterface({"menu_name,1,32", "memo,1,255"})
-    public void UpdateMenu(int menu_id, int sort_id, String menu_name, String identity_ids, String url, String memo, int for_school, int for_bureau,String icon,int isFull) {
+    public void UpdateMenu(int menu_id, int sort_id, String menu_name, String identity_ids, String url, String memo,
+                           int for_school, int for_bureau,String icon,int isFull) {
         model.UpdateMenu(menu_id, menu_name, sort_id, url, memo, identity_ids, for_school, for_bureau,icon,isFull);
         renderJson(CommonUtil.returnMessageJson(true, "修改成功！"));
     }

dsBase/src/main/resource/Sql/menu.sql

@@ -34,7 +34,9 @@ select identity_id from t_base_menu_privilage where menu_id=?
 
   -- 获取指定的节点信息
   #sql("selectSingle")
-    select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo,t1.create_time,t1.update_ts,t1.level_id,t1.for_school,t1.for_bureau,
+    select t1.menu_id,t1.menu_name,t1.parent_id,t1.sort_id,t1.url,t1.memo,
+           t1.create_time,t1.update_ts,t1.level_id,t1.for_school,t1.for_bureau,
+           t1.icon,t1.isFull,
        (select count(1) from t_base_menu as t2 where t1.menu_id=t2.parent_id) as is_leaf
     from t_base_menu as t1 where t1.menu_id=?
   #end

dsBaseWeb/Dockerfile

@@ -1,6 +1,6 @@
 FROM  swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/nginx:alpine
-RUN rm /etc/nginx/conf.d/default.conf
-RUN rm /etc/nginx/nginx.conf
+RUN if [ -f /etc/nginx/conf.d/default.conf ]; then rm /etc/nginx/conf.d/default.conf; fi
+RUN if [ -f /etc/nginx/nginx.conf ]; then rm /etc/nginx/nginx.conf; fi
 COPY nginx.conf /etc/nginx/
 COPY default.conf /etc/nginx/conf.d/
 COPY ds-base /usr/share/nginx/html/ds-base

dsBuild/src/main/java/Publish.java

@@ -9,9 +9,10 @@ import com.jfinal.kit.Kv;
 public class Publish {
 
     public static void main(String[] args) throws Exception {
+        PublishUtil.bluePrint("欢迎使用一站式镜像打包上传生成器V1.0");
+
         //1、探测当前目录下有哪些以ds开头的目录，这些目录都是待发布的项目
         List<String> projectNames = PublishUtil.getProjectNames();
-
         List<ProjectBean> listProject = new ArrayList<>();
 
         int idx = 0;
@@ -27,9 +28,12 @@ public class Publish {
             listProject.add(pb);
         }
         //让用户选择要发布的项目
+        System.out.println();
         int choiceProject = PublishUtil.userSelectProject(listProject);
+        System.out.println();
         //让用户选择要发布的仓库
         Kv choiceWarehouse = PublishUtil.userSelectWarehouse();
+        System.out.println();
         //让用户选择使用哪个配置文件进行打镜像?
         //这个项目下有以application_?.yaml形式的配置文件，分配ID为1，2，3，...,让用户选择使用哪个进行镜像打包
         String choiceConfig = PublishUtil.userSelectConfig(listProject,choiceProject);

dsBuild/src/main/java/Util/PublishUtil.java

@@ -21,6 +21,16 @@ public class PublishUtil {
         ssh.exec(cmd);
     }
 
+    public static void bluePrint(String msg) {
+        // 设置文本颜色
+        System.out.println("\033[34m" + msg + "\033[0m"); // 蓝色
+    }
+
+    public static void redPrint(String msg) {
+        // 设置文本颜色
+        System.out.println("\033[31m" + msg + "\033[0m"); // 红色文本
+    }
+
     /**
      * 删除本机所有Docker镜像
      * docker images --format "{{.Repository}}:{{.Tag}}" | xargs -r docker rmi -f
@@ -103,13 +113,13 @@ public class PublishUtil {
             int cnt = 0;
             int pos;
             for (int i = workingPath.length() - 1; ; i--) {
-                if (workingPath.charAt(i) == '/') cnt++;
+                if (workingPath.charAt(i) == '\\') cnt++;
                 if (cnt == 2) {
                     pos = i;
                     break;
                 }
             }
-            String localFile = workingPath.substring(0, pos) + "/static.zip";
+            String localFile = workingPath.substring(0, pos) + "\\static.zip";
             if (FileUtil.exist(localFile)) {
                 FileUtil.del(localFile);
             }
@@ -210,6 +220,7 @@ public class PublishUtil {
      * @return 项目名称
      */
     public static String getPublishProjectName(String pathName) {
+
         //遍历 pathName的每个字符，如果是不是大写字母，就照抄下来，如果是大写字母，就变成小写字母，并且在小写字母前面加上下划线_
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < pathName.length(); i++) {
@@ -249,9 +260,9 @@ public class PublishUtil {
      */
     public static int userSelectProject(List<ProjectBean> listProject) {
         Scanner scanner = new Scanner(System.in); // 创建Scanner对象来读取控制台输入
-        int choice = -1;
+        int choice;
         while (true) {
-            System.out.println("请选择您本次要发布的项目编号：");
+            redPrint("1、请选择您本次要发布的项目编号：");
             for (ProjectBean projectBean : listProject) {
                 System.out.print(projectBean.getId() + ":" + projectBean.getDevProjectName() + " ");
             }
@@ -283,7 +294,7 @@ public class PublishUtil {
         //输出choice对应的项目名称
         Kv kv = Kv.create();
         while (true) {
-            System.out.println("请选择您本次要发布的仓库：");
+            redPrint("2、请选择您本次要发布的仓库：");
             System.out.println("1：驿来特仓库  2:黄海私人仓库");
             int choice = scanner.nextInt(); // 读取用户输入的整数
 
@@ -352,7 +363,7 @@ public class PublishUtil {
         Scanner scanner = new Scanner(System.in); // 创建Scanner对象来读取控制台输入
         //输出choice对应的项目名称
         while (true) {
-            System.out.println("请选择您本次要发布的配置文件：");
+            redPrint("3、请选择您本次要发布的配置文件：");
             for (int i = 0; i < setConfigFiles.size(); i++) {
                 System.out.print((i + 1) + ":" + setConfigFiles.get(i) + " ");
             }