Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsExam

ds-base/dsBase.iml

@@ -1,8 +0,0 @@
-<?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>

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

@@ -66,7 +66,7 @@ public class PublishUtil {
         LocalDateTime now = LocalDateTime.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         String newVersion = now.format(formatter);
-        newVersion = newVersion.replace(" ", "").replace("-", "").replace(":", "");
+        newVersion = choiceConfig + "_" + newVersion.replace(" ", "").replace("-", "").replace(":", "");
 
         //准备工作
         String remotePath = "/usr/local/" + projectName + "/";