沙雅分支上传

bus-interceptor/pom.xml

@@ -18,6 +18,7 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

common/pom.xml

@@ -9,8 +9,10 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>com.lantone</groupId>
     <artifactId>common</artifactId>
-    <name>common</name>
+<!--    <name>common</name>-->
+    <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <description>工具类及其它通用代码模块</description>
 
@@ -106,7 +108,37 @@
         </dependency>
     </dependencies>
 
+<!--    <build>-->
+<!--        <finalName>common</finalName>-->
+<!--    </build>-->
     <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <classifier>exec</classifier>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                    <include>**/*.json</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+        </resources>
         <finalName>common</finalName>
     </build>
 <!--    <build>-->
@@ -114,27 +146,11 @@
 <!--            <plugin>-->
 <!--                <groupId>org.springframework.boot</groupId>-->
 <!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--                    <classifier>exec</classifier>-->
+<!--                </configuration>-->
 <!--            </plugin>-->
 <!--        </plugins>-->
-
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/java</directory>-->
-<!--                <includes>-->
-<!--                    <include>**/*.properties</include>-->
-<!--                    <include>**/*.xml</include>-->
-<!--                    <include>**/*.json</include>-->
-<!--                </includes>-->
-<!--                <filtering>false</filtering>-->
-<!--            </resource>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <includes>-->
-<!--                    <include>**/*.*</include>-->
-<!--                </includes>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--        <finalName>common</finalName>-->
 <!--    </build>-->
 
 </project>

common/src/main/java/com/lantone/common/util/EnDecodeUtil.java

@@ -52,10 +52,10 @@ public class EnDecodeUtil {
     }
 
 
-    public static void main(String[] args) {
-        String abc = "201811081616";
-        String c = encode(abc);
-        System.out.println(c);
-        System.out.println(decode(c));
-    }
+//    public static void main(String[] args) {
+//        String abc = "201811081616";
+//        String c = encode(abc);
+//        System.out.println(c);
+//        System.out.println(decode(c));
+//    }
 }

common/src/main/java/com/lantone/common/util/ExcelUtil.java

@@ -115,23 +115,23 @@ public class ExcelUtil {
         return flag;
     }
 
-    public static void main(String[] args) {
-        String[] headerNames = { "项目名称", "所属类别", "参考范围" };
-        String[] dataMapKeys = { "项目名称", "所属类别", "参考范围" };
-        Map<String, String> map = Maps.newHashMap();
-        map.put("项目名称", "大幅度发放到");
-        map.put("所属类别", "大幅度发");
-        map.put("参考范围", "而非");
-        Map<String, String> map2 = Maps.newHashMap();
-        map2.put("项目名称", "大幅度发放到");
-        map2.put("所属类别", "大幅度发");
-        map2.put("参考范围", "而非");
-
-        List<Map<String, String>> list = Lists.newArrayList();
-        list.add(map);
-        list.add(map2);
-
-        ExcelUtil.createExcel(false, false, "C:\\Users\\Administrator\\Desktop\\1234567", "med_qcresult_info", "fefefefef", headerNames, dataMapKeys, list);
-    }
+//    public static void main(String[] args) {
+//        String[] headerNames = { "项目名称", "所属类别", "参考范围" };
+//        String[] dataMapKeys = { "项目名称", "所属类别", "参考范围" };
+//        Map<String, String> map = Maps.newHashMap();
+//        map.put("项目名称", "大幅度发放到");
+//        map.put("所属类别", "大幅度发");
+//        map.put("参考范围", "而非");
+//        Map<String, String> map2 = Maps.newHashMap();
+//        map2.put("项目名称", "大幅度发放到");
+//        map2.put("所属类别", "大幅度发");
+//        map2.put("参考范围", "而非");
+//
+//        List<Map<String, String>> list = Lists.newArrayList();
+//        list.add(map);
+//        list.add(map2);
+//
+//        ExcelUtil.createExcel(false, false, "C:\\Users\\Administrator\\Desktop\\1234567", "med_qcresult_info", "fefefefef", headerNames, dataMapKeys, list);
+//    }
 
 }

common/src/main/java/com/lantone/common/util/JasyptUtil.java

@@ -57,13 +57,13 @@ public class JasyptUtil {
         return config;
     }
 
-    public static void main(String[] args) {
-        // 加密
-        String encPwd = encyptPwd("jasypt", "lantone");
-        // 解密
-        String decPwd = decyptPwd("jasypt", encPwd);
-        System.out.println(encPwd);
-        System.out.println(decPwd);
-    }
+//    public static void main(String[] args) {
+//        // 加密
+//        String encPwd = encyptPwd("jasypt", "lantone");
+//        // 解密
+//        String decPwd = decyptPwd("jasypt", encPwd);
+//        System.out.println(encPwd);
+//        System.out.println(decPwd);
+//    }
 
 }

common/src/main/java/com/lantone/common/util/ListUtil.java

@@ -79,10 +79,10 @@ public class ListUtil {
         return arrayList;
     }
 
-    public static void main(String[] args) throws Exception {
-        String[] i ={"A","B"};
-        List<String> o = arrayToList(i);
-        System.out.println("输入参数:"+ i);
-        System.out.println("输出参数:"+ o);
-    }
+//    public static void main(String[] args) throws Exception {
+//        String[] i ={"A","B"};
+//        List<String> o = arrayToList(i);
+//        System.out.println("输入参数:"+ i);
+//        System.out.println("输出参数:"+ o);
+//    }
 }

dblayer-mbg/pom.xml

@@ -18,6 +18,7 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

gateway-service/pom.xml

@@ -18,6 +18,7 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>

mdsp-service/pom.xml

@@ -29,6 +29,7 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

message-service/pom.xml

@@ -18,6 +18,7 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

report-service/src/main/java/com/lantone/report/vo/ApprovedVo.java

@@ -27,7 +27,7 @@ public class ApprovedVo {
     private Long id;
 
     @ApiModelProperty(value = "工作流节点", hidden = true)
-    private Long workFlowNodeId;
+    private Long workFlowNodeId = 1L;
 
     @ApiModelProperty(value = "审核人id", hidden = true)
     private Long appealId;

report-service/src/main/java/com/lantone/report/vo/RejectedVo.java

@@ -24,7 +24,7 @@ public class RejectedVo {
     private Long id;
 
     @ApiModelProperty(value = "工作流节点", hidden = true)
-    private Long workFlowNodeId;
+    private Long workFlowNodeId = 1L;
 
     @ApiModelProperty(value = "审核人id", hidden = true)
     private Long appealId;

structure-center/pom.xml

@@ -15,9 +15,11 @@
     <description>数据后结构化服务</description>
 
     <dependencies>
+        <!-- 工具类及其它通用代码模块 -->
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -33,45 +35,6 @@
         </dependency>
     </dependencies>
 
-<!--    <build>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--            </plugin>-->
-<!--            <plugin>-->
-<!--                <groupId>com.spotify</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--    </build>-->
-<!--    <build>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-
-<!--        <resources>-->
-<!--            <resource>-->
-<!--                <directory>src/main/java</directory>-->
-<!--                <includes>-->
-<!--                    <include>**/*.properties</include>-->
-<!--                    <include>**/*.xml</include>-->
-<!--                    <include>**/*.json</include>-->
-<!--                </includes>-->
-<!--                <filtering>false</filtering>-->
-<!--            </resource>-->
-<!--            <resource>-->
-<!--                <directory>src/main/resources</directory>-->
-<!--                <includes>-->
-<!--                    <include>**/*.*</include>-->
-<!--                </includes>-->
-<!--            </resource>-->
-<!--        </resources>-->
-<!--        <finalName>structure-center</finalName>-->
-<!--    </build>-->
     <build>
         <plugins>
             <plugin>

user-auth/pom.xml

@@ -18,6 +18,7 @@
         <dependency>
             <groupId>com.lantone</groupId>
             <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>