From db331894dca28ceadb69f53194a4a62edb9ce9e5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 十二月 2023 11:50:30 +0800
Subject: [PATCH] 特殊字符转义类修改,pom调整打包方式,编写systemctl命令方式启动脚本

---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml                                              |   23 -
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java |    4 
 Source/UBCS/ubcs-service/ubcs-code/pom.xml                                                            |   33 +--
 Source/UBCS/service-systemctl-restart.sh                                                              |   84 +++++++
 Source/UBCS/ubcs-ops/ubcs-admin/pom.xml                                                               |   20 -
 Source/UBCS/ubcs-ops/ubcs-flow/pom.xml                                                                |   22 -
 Source/UBCS/ubcs-ops/ubcs-report/pom.xml                                                              |   20 -
 Source/UBCS/ubcs-auth/pom.xml                                                                         |   46 +++-
 Source/UBCS/pom.xml                                                                                   |  132 ++++++-----
 Source/UBCS/ubcs-service/ubcs-user/pom.xml                                                            |   20 -
 Source/UBCS/ubcs-ops/ubcs-log/pom.xml                                                                 |   38 +--
 Source/UBCS/ubcs-service/ubcs-desk/pom.xml                                                            |   20 -
 Source/UBCS/ubcs-service/ubcs-system/pom.xml                                                          |   30 +-
 Source/UBCS/ubcs-gateway/pom.xml                                                                      |   41 ++-
 Source/UBCS/ubcs-ops/ubcs-resource/pom.xml                                                            |   20 -
 Source/UBCS/ubcs-service/ubcs-omd/pom.xml                                                             |   20 -
 Source/UBCS/ubcs-ops/ubcs-develop/pom.xml                                                             |   30 +-
 17 files changed, 324 insertions(+), 279 deletions(-)

diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index 5757e07..6cbe0a9 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -10,7 +10,6 @@
 
     <properties>
         <bladex.project.version>3.0.1.RELEASE</bladex.project.version>
-
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.0</maven.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -29,6 +28,7 @@
         <docker.password>Harbor12345</docker.password>
         <docker.namespace>ubcs</docker.namespace>
         <docker.plugin.version>1.4.13</docker.plugin.version>
+        <server.lib.path>../../target/libs</server.lib.path>
     </properties>
 
     <modules>
@@ -41,6 +41,7 @@
         <module>ubcs-plugin-api</module>
         <module>ubcs-service</module>
         <module>ubcs-service-api</module>
+        <!--<module>ubcs-codeApply</module>-->
     </modules>
 
     <dependencyManagement>
@@ -106,6 +107,13 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>bootstrap.yml</exclude>
+                    <exclude>application.yml</exclude>
+                    <exclude>application-dev.yml</exclude>
+                    <exclude>application-test.yml</exclude>
+                    <exclude>application-prop.yml</exclude>
+                </excludes>
             </resource>
             <resource>
                 <directory>src/main/java</directory>
@@ -119,91 +127,91 @@
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>${spring.boot.version}</version>
+                    <version>${spring.boot.version}</version> <!-- 濡傛灉 spring.boot.version 鐗堟湰淇敼锛屽垯杩欓噷涔熻璺熺潃淇敼 -->
                     <configuration>
                         <fork>true</fork>
-                        <finalName>${project.build.finalName}</finalName>
+                        <!--瑙e喅windows鍛戒护琛岀獥鍙d腑鏂囦贡鐮�-->
+                        <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+                        <!-- 鎷嗗紑渚濊禆-->
+                        <layout>ZIP</layout>
+                        <outputDirectory>../../target</outputDirectory>
+                        <includes>
+                            <include>
+                                <!-- 鎺掗櫎鎵�鏈塉ar -->
+                                <groupId>nothing</groupId>
+                                <artifactId>nothing</artifactId>
+                            </include>
+                        </includes>
                     </configuration>
                     <executions>
                         <execution>
                             <goals>
-                                <goal>repackage</goal>
+                                <goal>repackage</goal> <!-- 灏嗗紩鍏ョ殑 jar 鎵撳叆鍏朵腑 -->
                             </goals>
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>com.spotify</groupId>
-                    <artifactId>dockerfile-maven-plugin</artifactId>
-                    <version>${docker.plugin.version}</version>
-                    <configuration>
-                        <username>${docker.username}</username>
-                        <password>${docker.password}</password>
-                        <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                        <tag>${project.version}</tag>
-                        <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                        <buildArgs>
-                            <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                        </buildArgs>
-                    </configuration>
-                    <!--瀛愭湇鍔℃坊鍔犲涓嬮厤缃紝杩愯 mvn deploy 鍛戒护渚夸細鑷姩鎵撳寘闀滃儚-->
-                    <!--<executions>
-                        <execution>
-                            <id>default</id>
-                            <goals>
-                                <goal>build</goal>
-                                <goal>push</goal>
-                            </goals>
-                        </execution>
-                    </executions>-->
-                </plugin>
+                <!--姝ゆ彃浠剁敤浜庡皢渚濊禆鍖呮娊鍑�-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
+                    <artifactId>maven-dependency-plugin</artifactId>
                     <executions>
                         <execution>
+                            <id>copy-dependencies</id>
                             <phase>package</phase>
                             <goals>
-                                <goal>run</goal>
+                                <goal>copy-dependencies</goal>
                             </goals>
                             <configuration>
-                                <tasks>
-                                    <!--suppress UnresolvedMavenProperty -->
-                                    <copy overwrite="true"
-                                          tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
-                                          file="${project.build.directory}/${project.artifactId}.jar" />
-                                </tasks>
+                                <outputDirectory>${server.lib.path}</outputDirectory>
+                                <excludeTransitive>false</excludeTransitive>
+                                <stripVersion>false</stripVersion>
+                                <includeScope>runtime</includeScope>
                             </configuration>
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven.plugin.version}</version>
+                    <configuration>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
+                        <encoding>UTF-8</encoding>
+                        <compilerArgs>
+                            <arg>-parameters</arg>
+                        </compilerArgs>
+                    </configuration>
+                </plugin>
+                <!-- 鍩轰簬maven-jar-plugin鎻掍欢瀹炵幇鎶婁緷璧杍ar瀹氫箟鍐欏叆杈撳嚭jar鐨凪ETA-INFO/MANIFEST鏂囦欢 -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+                                <!--<classpathPrefix>./libs</classpathPrefix>-->
+                                <classpathPrefix>/data1/ubcs/ubcs-server/libs</classpathPrefix>
+                                <useUniqueVersions>false</useUniqueVersions>
+                            </manifest>
+                        </archive>
+                        <excludes>
+                            <exclude>application-dev.yml</exclude>
+                            <exclude>application-prod.yml</exclude>
+                            <exclude>application.yml</exclude>
+                            <exclude>lib/*</exclude>
+                        </excludes>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven.plugin.version}</version>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>UTF-8</encoding>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 
     <repositories>
diff --git a/Source/UBCS/service-systemctl-restart.sh b/Source/UBCS/service-systemctl-restart.sh
new file mode 100644
index 0000000..220e203
--- /dev/null
+++ b/Source/UBCS/service-systemctl-restart.sh
@@ -0,0 +1,84 @@
+# 1銆佹墦鍖�
+mvn clean package
+
+echo '-----------------------------------------------------------'
+echo '---------------mvn clean package鍛戒护鎵ц瀹屾垚------------------'
+echo '-----------------------------------------------------------'
+
+# 2銆佸鍒秎ibs渚濊禆鏂囦欢鍒版寚瀹氱洰褰�
+cp ./target/libs/* /data1/ubcs/ubcs-server/libs
+
+echo '-----------------------------------------------------------'
+echo '--------------------libs涓璲ar澶嶅埗瀹屾垚------------------------'
+echo '-----------------------------------------------------------'
+
+# 3銆佸鍒舵瘡涓湇鍔ar杩涜鏇挎崲
+echo '-------------------ubcs-admin 鏈嶅姟姝e湪閲嶅惎--------------------'
+cp ./target/ubcs-admin.jar /data1/ubcs/ubcs-server/libs/ubcs_admin/
+systemctl restart ubcs-admin.service
+echo '---------------ubcs-admin 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯------------------'
+
+echo '--------------ubcs-applyjtcodeservice 鏈嶅姟姝e湪閲嶅惎------------'
+cp ./target/ubcs-applyjtcodeservice.jar /data1/ubcs/ubcs-server/libs/ubcs_applyjtcodeservice/
+systemctl restart ubcs-applyjtcodeservice.service
+echo '----------ubcs-applyjtcodeservice 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯----------'
+
+echo '-------------------ubcs-auth 鏈嶅姟姝e湪閲嶅惎------------------ --'
+cp ./target/ubcs-auth.jar /data1/ubcs/ubcs-server/libs/ubcs_auth/
+systemctl restart ubcs-auth.service
+echo '---------------ubcs-auth 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯-------------------'
+
+echo '-------------------ubcs-code 鏈嶅姟姝e湪閲嶅惎---------------------'
+cp ./target/ubcs-code.jar /data1/ubcs/ubcs-server/libs/ubcs_code/
+systemctl restart ubcs-code.service
+echo '---------------ubcs-code 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯-------------------'
+
+echo '-------------------ubcs-desk 鏈嶅姟姝e湪閲嶅惎---------------------'
+cp ./target/ubcs-desk.jar /data1/ubcs/ubcs-server/libs/ubcs_desk/
+systemctl restart ubcs-desk.service
+echo '---------------ubcs-desk 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯-------------------'
+
+echo '-------------------ubcs-flow 鏈嶅姟姝e湪閲嶅惎--------------------'
+cp ./target/ubcs-flow.jar /data1/ubcs/ubcs-server/libs/ubcs_flow/
+systemctl restart ubcs-flow.service
+echo '---------------ubcs-flow 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯------------------'
+
+echo '-------------------ubcs-gateway 鏈嶅姟姝e湪閲嶅惎-----------------'
+cp ./target/ubcs-gateway.jar /data1/ubcs/ubcs-server/libs/ubcs_gateway/
+systemctl restart ubcs-gateway.service
+echo '---------------ubcs-gateway 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯---------------'
+
+echo '-------------------ubcs-log 鏈嶅姟姝e湪閲嶅惎---------------------'
+cp ./target/ubcs-log.jar /data1/ubcs/ubcs-server/libs/ubcs_log/
+systemctl restart ubcs-log.service
+echo '---------------ubcs-log 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯-------------------'
+
+echo '-------------------ubcs-omd 鏈嶅姟姝e湪閲嶅惎---------------------'
+cp ./target/ubcs-omd.jar /data1/ubcs/ubcs-server/libs/ubcs_omd/
+systemctl restart ubcs-omd.service
+echo '---------------ubcs-omd 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯-------------------'
+
+echo '-------------------ubcs-report 鏈嶅姟姝e湪閲嶅惎-------------------'
+cp ./target/ubcs-report.jar /data1/ubcs/ubcs-server/libs/ubcs_report/
+systemctl restart ubcs-report.service
+echo '---------------ubcs-report 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯-----------------'
+
+echo '-------------------ubcs-resource 鏈嶅姟姝e湪閲嶅惎------------------'
+cp ./target/ubcs-resource.jar /data1/ubcs/ubcs-server/libs/ubcs_resource/
+systemctl restart ubcs-resource.service
+echo '---------------ubcs-resource 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯----------------'
+
+echo '-------------------ubcs-system 鏈嶅姟姝e湪閲嶅惎---------------------'
+cp ./target/ubcs-system.jar /data1/ubcs/ubcs-server/libs/ubcs_system/
+systemctl restart ubcs-system.service
+echo '---------------ubcs-system 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯-------------------'
+
+echo '--------------------ubcs-user 鏈嶅姟姝e湪閲嶅惎----------------------'
+cp ./target/ubcs-user.jar /data1/ubcs/ubcs-server/libs/ubcs_user/
+systemctl restart ubcs-user.service
+echo '----------------ubcs-user 鏈嶅姟閲嶅惎鍛戒护鎵ц瀹屾瘯--------------------'
+
+
+
+
+
diff --git a/Source/UBCS/ubcs-auth/pom.xml b/Source/UBCS/ubcs-auth/pom.xml
index 691329f..cce9282 100644
--- a/Source/UBCS/ubcs-auth/pom.xml
+++ b/Source/UBCS/ubcs-auth/pom.xml
@@ -132,28 +132,50 @@
             <artifactId>activation</artifactId>
             <version>1.1.1</version>
         </dependency>-->
+        <dependency>
+            <groupId>com.vci.ubcs</groupId>
+            <artifactId>ubcs-util-api</artifactId>
+            <version>3.0.1.RELEASE</version>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
+                    <outputDirectory>../target</outputDirectory>
                 </configuration>
+            </plugin>
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>./target/libs</outputDirectory>
+                </configuration>
+            </plugin>-->
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>../target/libs</outputDirectory>
+                            <excludeTransitive>false</excludeTransitive>
+                            <stripVersion>false</stripVersion>
+                            <includeScope>runtime</includeScope>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-gateway/pom.xml b/Source/UBCS/ubcs-gateway/pom.xml
index 32bc4ee..16d3f2d 100644
--- a/Source/UBCS/ubcs-gateway/pom.xml
+++ b/Source/UBCS/ubcs-gateway/pom.xml
@@ -79,23 +79,40 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
+                    <outputDirectory>../target</outputDirectory>
                 </configuration>
+            </plugin>
+            <!--<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <outputDirectory>./target/libs</outputDirectory>
+                </configuration>
+            </plugin>-->
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>../target/libs</outputDirectory>
+                            <excludeTransitive>false</excludeTransitive>
+                            <stripVersion>false</stripVersion>
+                            <includeScope>runtime</includeScope>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml b/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
index 687992d..02f9465 100644
--- a/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
@@ -95,23 +95,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml b/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
index f31f1c4..e683deb 100644
--- a/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
@@ -51,20 +51,20 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+     <!--<build>
+         <plugins>
+             <plugin>
+                 <groupId>org.springframework.boot</groupId>
+                 <artifactId>spring-boot-maven-plugin</artifactId>
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-dependency-plugin</artifactId>
+             </plugin>
+             <plugin>
+                 <artifactId>maven-surefire-plugin</artifactId>
+             </plugin>
+         </plugins>
+     </build>-->
 
 </project>
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml b/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
index 3906de0..9b4e7bc 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
@@ -93,19 +93,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
index 918a217..651035d 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
@@ -29,15 +29,15 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-tenant</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.oracle.database.jdbc</groupId>-->
-<!--            <artifactId>ojdbc8</artifactId>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>cn.easyproject</groupId>-->
-<!--            <artifactId>orai18n</artifactId>-->
-<!--            <version>${orai18n.version}</version>-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.oracle.database.jdbc</groupId>-->
+        <!--            <artifactId>ojdbc8</artifactId>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>cn.easyproject</groupId>-->
+        <!--            <artifactId>orai18n</artifactId>-->
+        <!--            <version>${orai18n.version}</version>-->
+        <!--        </dependency>-->
         <dependency>
             <groupId>com.vci.ubcs</groupId>
             <artifactId>ubcs-log-api</artifactId>
@@ -61,23 +61,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-report/pom.xml b/Source/UBCS/ubcs-ops/ubcs-report/pom.xml
index bdc4700..83b8022 100644
--- a/Source/UBCS/ubcs-ops/ubcs-report/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-report/pom.xml
@@ -47,23 +47,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml b/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml
index cca7a4f..4ed1e1f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml
@@ -97,23 +97,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml
index e83446e..ac37aeb 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml
@@ -7,10 +7,9 @@
         <artifactId>ubcs-service</artifactId>
         <version>3.0.1.RELEASE</version>
     </parent>
-    <groupId>com.vci.ubcs</groupId>
     <artifactId>ubcs-applyjtcodeservice</artifactId>
     <name>${project.artifactId}</name>
-    <version>3.0.1.RELEASE</version>
+    <version>${bladex.project.version}</version>
     <packaging>jar</packaging>
 
     <modelVersion>4.0.0</modelVersion>
@@ -51,23 +50,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 8099f3d..aed5804 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -16,6 +16,11 @@
 
     <modelVersion>4.0.0</modelVersion>
 
+    <properties>
+        <!-- 鎸夊悇妯″潡瀹為檯鐩綍灞傛瀹氫箟鐩稿鏁版嵁锛屼娇鎵�鏈夋湇鍔℃ā鍧楄緭鍑鸿祫婧愭眹鑱氬埌鐩稿悓鐩綍 -->
+        <boot-jar-output>../devops</boot-jar-output>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.vci.ubcs</groupId>
@@ -91,12 +96,6 @@
             <version>3.0.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <!--杈炬ⅵ鏁版嵁搴撻┍鍔�-->
-        <!--<dependency>
-            <groupId>com.dameng</groupId>
-            <artifactId>DmJdbcDriver18</artifactId>
-            <optional>true</optional>
-        </dependency>-->
         <!--axis2 begin -->
         <dependency>
             <groupId>org.apache.axis2</groupId>
@@ -143,7 +142,6 @@
             <scope>compile</scope>
         </dependency>
         <!--axis2 end -->
-
         <dependency>
             <groupId>com.vci.ubcs</groupId>
             <artifactId>ubcs-file-api</artifactId>
@@ -155,29 +153,20 @@
             <version>3.0.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index b8482cd..ef3bc27 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -4378,7 +4378,9 @@
 		// 鏌ヨ涓嶉渶瑕佸弬涓庡叧閿睘鎬ф牎楠岀殑闄よ嚜宸变互澶栫殑鎵�鏈夊垎绫籵id
 		final String isParticipateCheckOids = classifyService.selectLeafByParentClassifyOid(classifyFullInfo.getTopClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO().getOid());
 		final BladeUser user = AuthUtil.getUser();
-		List<ClientBusinessObject> repeatDataMap = cboList.parallelStream().filter(cbo -> {
+		cboList = new CopyOnWriteArrayList<>(cboList);
+		// TODO:Thread limit exceeded replacing blocked 寮傚父鏄繖閮ㄥ垎浠g爜鎶涘嚭鐨�,鎵�浠ユ殏鏃跺皢parallelStream鏀规垚浜唖tream
+		List<ClientBusinessObject> repeatDataMap = cboList.stream().filter(cbo -> {
 			//姣忚閮藉緱鏌ヨ.濡傛灉鍏朵腑鍑虹幇浜嗛敊璇紝鎴戜滑灏辩洿鎺ユ姏鍑哄紓甯革紝鍏朵綑鐨勬樉绀�
 			//VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
 			Map<String, String> conditionMap = new HashMap<>();
diff --git a/Source/UBCS/ubcs-service/ubcs-desk/pom.xml b/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
index f46d50e..a4db87f 100644
--- a/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
@@ -73,23 +73,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
index 327b1f6..d8e3280 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
@@ -86,23 +86,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-system/pom.xml b/Source/UBCS/ubcs-service/ubcs-system/pom.xml
index 1b1716d..16e06e5 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/pom.xml
@@ -32,11 +32,11 @@
             <artifactId>ubcs-system-api</artifactId>
             <version>3.0.1.RELEASE</version>
             <exclusions>
-            <exclusion>
-                <groupId>org.springblade</groupId>
-                <artifactId>blade-starter-log</artifactId>
-            </exclusion>
-        </exclusions>
+                <exclusion>
+                    <groupId>org.springblade</groupId>
+                    <artifactId>blade-starter-log</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.vci.ubcs</groupId>
@@ -60,23 +60,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/Source/UBCS/ubcs-service/ubcs-user/pom.xml b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
index 711161d..99c69dd 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
@@ -58,23 +58,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <configuration>
-                    <username>${docker.username}</username>
-                    <password>${docker.password}</password>
-                    <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
-                    <tag>${project.version}</tag>
-                    <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                    <buildArgs>
-                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-                    </buildArgs>
-                    <skip>false</skip>
-                </configuration>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

--
Gitblit v1.9.3