From 07b89087cd5a99882f3494fa3192bab67090c5e8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 22 八月 2023 22:06:12 +0800
Subject: [PATCH] 本地提交提交
---
Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml | 2
Source/UBCS/ubcs-ops/ubcs-swagger/src/main/resources/application.yml | 2
Source/UBCS/ubcs-ops/ubcs-report/src/main/resources/application.yml | 2
Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml | 2
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/application-dev.yml | 2
Source/UBCS/ubcs-ops/ubcs-xxljob-admin/pom.xml | 20 -
Source/UBCS/ubcs-service/ubcs-desk/src/main/resources/application-dev.yml | 2
Source/UBCS/ubcs-ops/ubcs-flow/pom.xml | 20 -
Source/UBCS/ubcs-ops/ubcs-report/pom.xml | 20 -
Source/UBCS/ubcs-auth/pom.xml | 22 +-
Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml | 0
Source/UBCS/pom.xml | 128 ++++++++-------
Source/UBCS/ubcs-ops/ubcs-swagger/pom.xml | 20 -
Source/UBCS/ubcs-ops/ubcs-log/pom.xml | 20 -
Source/UBCS/ubcs-auth/src/main/resources/application-dev.yml | 2
Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml | 2
Source/UBCS/ubcs-service/ubcs-desk/pom.xml | 20 -
Source/UBCS/ubcs-service/ubcs-system/pom.xml | 20 -
Source/UBCS/ubcs-gateway/pom.xml | 22 +-
Source/UBCS/ubcs-service/ubcs-omd/pom.xml | 20 -
Source/UBCS/ubcs-ops/ubcs-develop/pom.xml | 9 +
Source/UBCS/ubcs-ops/ubcs-log/src/main/resources/application-dev.yml | 2
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml | 2
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 27 --
Source/UBCS/ubcs-service/ubcs-user/src/main/resources/application-dev.yml | 2
Source/UBCS/ubcs-ops/ubcs-admin/pom.xml | 20 -
Source/UBCS/ubcs-ops/ubcs-xxljob/pom.xml | 20 -
Source/UBCS/ubcs-ops/ubcs-xxljob/src/main/resources/application.yml | 2
Source/UBCS/ubcs-ops/ubcs-develop/src/main/resources/application-dev.yml | 2
Source/UBCS/ubcs-service/ubcs-user/pom.xml | 20 -
Source/UBCS/ubcs-ops/ubcs-xxljob-admin/src/main/resources/application.yml | 2
Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application.yml | 2
Source/UBCS/ubcs-ops/ubcs-resource/pom.xml | 20 -
33 files changed, 187 insertions(+), 291 deletions(-)
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index 9a71e3e..0898c3a 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>
@@ -107,6 +107,11 @@
<resources>
<resource>
<directory>src/main/resources</directory>
+ <excludes>
+ <exclude>bootstrap.yml</exclude>
+ <exclude>application.yml</exclude>
+ <exclude>application-prop.yml</exclude>
+ </excludes>
</resource>
<resource>
<directory>src/main/java</directory>
@@ -120,91 +125,90 @@
<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>
+ <!--瑙ｅ喅windows鍛戒护琛岀獥鍙ｄ腑鏂囦贡鐮�-->
+ <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>
+ <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/ubcs-auth/pom.xml b/Source/UBCS/ubcs-auth/pom.xml
index 691329f..09af516 100644
--- a/Source/UBCS/ubcs-auth/pom.xml
+++ b/Source/UBCS/ubcs-auth/pom.xml
@@ -137,23 +137,21 @@
<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-antrun-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../target/libs</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/Source/UBCS/ubcs-auth/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-auth/src/main/resources/application-dev.yml
index cd2c2ea..fd3888b 100644
--- a/Source/UBCS/ubcs-auth/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-auth/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36001
+ port: 8100
#鏁版嵁婧愰厤缃�
spring:
diff --git a/Source/UBCS/ubcs-gateway/pom.xml b/Source/UBCS/ubcs-gateway/pom.xml
index 32bc4ee..8cb1a50 100644
--- a/Source/UBCS/ubcs-gateway/pom.xml
+++ b/Source/UBCS/ubcs-gateway/pom.xml
@@ -79,23 +79,21 @@
<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-antrun-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../target/libs</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
similarity index 100%
rename from Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml
rename to Source/UBCS/ubcs-gateway/src/main/resources/application-prod.yml
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml b/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
index 8452e72..5c9f4fd 100644
--- a/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
server:
- port: 37000
+ port: 80
spring:
cloud:
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-admin/src/main/resources/bootstrap.yml b/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
index 695d740..ea894bc 100644
--- a/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-admin/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
server:
- port: 36002
+ port: 8101
undertow:
threads:
# 璁剧疆IO绾跨▼鏁�, 瀹冧富瑕佹墽琛岄潪闃诲鐨勪换鍔�,瀹冧滑浼氳礋璐ｅ涓繛鎺�, 榛樿璁剧疆姣忎釜CPU鏍稿績涓�涓嚎绋�
diff --git a/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml b/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
index c9a8aa3..f31f1c4 100644
--- a/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-develop/pom.xml
@@ -54,8 +54,15 @@
<build>
<plugins>
<plugin>
+ <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/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/resources/application-dev.yml
index d667252..e81d987 100644
--- a/Source/UBCS/ubcs-ops/ubcs-develop/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-develop/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36003
+ port: 7007
#鏁版嵁婧愰厤缃�
spring:
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml b/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
index 3906de0..9cd7e69 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
@@ -93,23 +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-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-flow/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application.yml
index 876f63e..8171d20 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/resources/application.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36004
+ port: 8108
#flowable閰嶇疆
flowable:
diff --git a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
index bf9c330..61338ad 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
@@ -43,23 +43,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-log/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-ops/ubcs-log/src/main/resources/application-dev.yml
index 401a739..8c1f22c 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-log/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36005
+ port: 8103
#鏁版嵁婧愰厤缃�
spring:
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-report/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-report/src/main/resources/application.yml
index c49f35c..027a146 100644
--- a/Source/UBCS/ubcs-ops/ubcs-report/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-report/src/main/resources/application.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36006
+ port: 8108
#鎶ヨ〃閰嶇疆
report:
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-ops/ubcs-resource/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
index 9fe53c6..2d8f0be 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/src/main/resources/application.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36007
+ port: 8010
#榛樿瀵硅薄瀛樺偍閰嶇疆
oss:
diff --git a/Source/UBCS/ubcs-ops/ubcs-swagger/pom.xml b/Source/UBCS/ubcs-ops/ubcs-swagger/pom.xml
index 0deb14e..e38382b 100644
--- a/Source/UBCS/ubcs-ops/ubcs-swagger/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-swagger/pom.xml
@@ -33,23 +33,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-swagger/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-swagger/src/main/resources/application.yml
index 122c3b1..79ad80d 100644
--- a/Source/UBCS/ubcs-ops/ubcs-swagger/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-swagger/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 36008
+ port: 18000
knife4j:
enableAggregation: true
cloud:
diff --git a/Source/UBCS/ubcs-ops/ubcs-xxljob-admin/pom.xml b/Source/UBCS/ubcs-ops/ubcs-xxljob-admin/pom.xml
index 78079e2..8f3fa0e 100644
--- a/Source/UBCS/ubcs-ops/ubcs-xxljob-admin/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-xxljob-admin/pom.xml
@@ -102,23 +102,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-xxljob-admin/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-xxljob-admin/src/main/resources/application.yml
index fd9a6b1..3ef159d 100644
--- a/Source/UBCS/ubcs-ops/ubcs-xxljob-admin/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-xxljob-admin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 36013
+ port: 7009
servlet:
context-path: /xxl-job-admin
diff --git a/Source/UBCS/ubcs-ops/ubcs-xxljob/pom.xml b/Source/UBCS/ubcs-ops/ubcs-xxljob/pom.xml
index a6c2e62..52cc39f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-xxljob/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-xxljob/pom.xml
@@ -38,23 +38,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-xxljob/src/main/resources/application.yml b/Source/UBCS/ubcs-ops/ubcs-xxljob/src/main/resources/application.yml
index 3fb60a6..4e09197 100644
--- a/Source/UBCS/ubcs-ops/ubcs-xxljob/src/main/resources/application.yml
+++ b/Source/UBCS/ubcs-ops/ubcs-xxljob/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 36009
+ port: 7008
logging:
config: classpath:logback.xml
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml
index 8931921..1b88517 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/resources/application-prod.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 8107
+ port: 8102
#鏁版嵁婧愰厤缃�
spring:
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 319b461..8e7482e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -96,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>
@@ -148,7 +142,6 @@
<scope>compile</scope>
</dependency>
<!--axis2 end -->
-
<dependency>
<groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-file-api</artifactId>
@@ -160,23 +153,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-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-desk/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-desk/src/main/resources/application-dev.yml
index 0c72c1b..2a4cb8c 100644
--- a/Source/UBCS/ubcs-service/ubcs-desk/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-desk/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36010
+ port: 8105
#鏁版嵁婧愰厤缃�
spring:
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
index 43686d4..d3bb936 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 2c5f838..fb53bea 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/pom.xml
@@ -51,23 +51,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/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/application-dev.yml
index fde6cb1..319873b 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36011
+ port: 8106
#鏁版嵁婧愰厤缃�
spring:
diff --git a/Source/UBCS/ubcs-service/ubcs-user/pom.xml b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
index 412fd2d..8408aea 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
@@ -52,23 +52,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/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/application-dev.yml
index 5ce5be4..d72ad24 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36012
+ port: 8102
#鏁版嵁婧愰厤缃�
spring:
datasource:
--
Gitblit v1.9.3