'commit'

ds-build/src/main/java/Util/PublishUtil.java

@@ -133,7 +133,10 @@ public class PublishUtil {
         String imageId = kv.getStr("message").replace("[", "").replace("]", "");
         System.out.println("镜像打包完成，镜像ID=" + imageId);
 
-        System.out.println("测试命令:docker run -p 80:80 -d " + projectName + ":" + newVersion);
+        //登录镜像仓库
+        cmd = "docker login --username=驿来特充电 --password=ylt5033. registry.cn-hangzhou.aliyuncs.com";
+        ssh.exec(cmd);
+        //  System.out.println("测试命令:docker run -p 80:80 -d " + projectName + ":" + newVersion);
 //        System.out.println("打标签...");
 //        cmd = "docker tag " + imageId + " registry.cn-hangzhou.aliyuncs.com/yltcharge/" + projectName + ":" + newVersion;
 //        ssh.exec(cmd);

ds-build/src/main/java/build_ds_base.java

@@ -0,0 +1,10 @@
+import Util.PublishUtil;
+
+public class build_ds_base {
+    public static void main(String[] args) throws Exception {
+        //项目名称
+        String projectName = "ds-base";
+        PublishUtil.publish(projectName);
+        System.out.println("开始生成镜像");
+    }
+}

ds-build/src/main/resources/publishImage.json

@@ -10,6 +10,13 @@
       "localLibPath": "",
       "localStatic": "static",
       "localNginxConf": "nginx.conf"
+    },
+    {
+      "projectName": "ds-base",
+      "workingPath": "D:/dsWork/dsExam/ds-base/",
+      "localLibPath": "D:/dsWork/dsExam/ds-base/lib/",
+      "localStatic": "D:/dsWork/dsExam/ds-base/WebRoot/",
+      "localNginxConf": ""
     }
   ]
 }

ds-build/target/classes/publishImage.json

@@ -10,6 +10,13 @@
       "localLibPath": "",
       "localStatic": "static",
       "localNginxConf": "nginx.conf"
+    },
+    {
+      "projectName": "ds-base",
+      "workingPath": "D:/dsWork/dsExam/ds-base/",
+      "localLibPath": "D:/dsWork/dsExam/ds-base/lib/",
+      "localStatic": "D:/dsWork/dsExam/ds-base/WebRoot/",
+      "localNginxConf": ""
     }
   ]
 }

操作文档/驿来特公众号配合基础数据需要做的修改工作.md

@@ -28,6 +28,10 @@
 
 
 
+#### 模拟一个JWT出来测试一下
+
+
+
 #### 4、数据权限功能增加
 
 - 原来没有数据权限的概念，需要增加上，为以后的功能接口做准备。