From 5e4dc516540f0fef0961e6e120de47a53d62b552 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 13 十月 2023 12:16:11 +0800
Subject: [PATCH] 修改获取免密登录账号缓存问题
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml | 23 ++
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 33 ++-
Source/UBCS/ubcs-ops/ubcs-admin/pom.xml | 20 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 5
Source/UBCS/ubcs-ops/ubcs-flow/pom.xml | 22 +-
Source/UBCS/ubcs-ops/ubcs-report/pom.xml | 20 +
Source/UBCS/ubcs-auth/pom.xml | 27 +-
Source/UBCS/pom.xml | 132 +++++++--------
Source/UBCS/ubcs-service/ubcs-user/pom.xml | 20 +
Source/UBCS/ubcs-ops/ubcs-log/pom.xml | 20 +
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/src/main/resources/application-dev.yml | 25 +++
Source/UBCS/ubcs-gateway/pom.xml | 22 +-
Source/UBCS/ubcs-ops/ubcs-resource/pom.xml | 20 +
Source/UBCS/ubcs-service/ubcs-omd/pom.xml | 20 +
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java | 1
19 files changed, 276 insertions(+), 178 deletions(-)
diff --git a/Source/UBCS/pom.xml b/Source/UBCS/pom.xml
index e93ff76..5757e07 100644
--- a/Source/UBCS/pom.xml
+++ b/Source/UBCS/pom.xml
@@ -10,6 +10,7 @@
<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>
@@ -28,7 +29,6 @@
<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,7 +41,6 @@
<module>ubcs-plugin-api</module>
<module>ubcs-service</module>
<module>ubcs-service-api</module>
-<!-- <module>ubcs-codeApply</module>-->
</modules>
<dependencyManagement>
@@ -107,13 +106,6 @@
<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>
@@ -127,91 +119,91 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version> <!-- 濡傛灉 spring.boot.version 鐗堟湰淇敼锛屽垯杩欓噷涔熻璺熺潃淇敼 -->
+ <version>${spring.boot.version}</version>
<configuration>
<fork>true</fork>
- <!--瑙ｅ喅windows鍛戒护琛岀獥鍙ｄ腑鏂囦贡鐮�-->
- <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
- <!-- 鎷嗗紑渚濊禆-->
- <layout>ZIP</layout>
- <outputDirectory>../../target</outputDirectory>
- <includes>
- <include>
- <!-- 鎺掗櫎鎵�鏈塉ar -->
- <groupId>nothing</groupId>
- <artifactId>nothing</artifactId>
- </include>
- </includes>
+ <finalName>${project.build.finalName}</finalName>
</configuration>
<executions>
<execution>
<goals>
- <goal>repackage</goal> <!-- 灏嗗紩鍏ョ殑 jar 鎵撳叆鍏朵腑 -->
+ <goal>repackage</goal>
</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-dependency-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>copy-dependencies</id>
<phase>package</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>run</goal>
</goals>
<configuration>
- <outputDirectory>${server.lib.path}</outputDirectory>
- <excludeTransitive>false</excludeTransitive>
- <stripVersion>false</stripVersion>
- <includeScope>runtime</includeScope>
+ <tasks>
+ <!--suppress UnresolvedMavenProperty -->
+ <copy overwrite="true"
+ tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
+ file="${project.build.directory}/${project.artifactId}.jar" />
+ </tasks>
</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/ubcs-auth/pom.xml b/Source/UBCS/ubcs-auth/pom.xml
index c99f2db..691329f 100644
--- a/Source/UBCS/ubcs-auth/pom.xml
+++ b/Source/UBCS/ubcs-auth/pom.xml
@@ -132,31 +132,28 @@
<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>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
<configuration>
- <outputDirectory>../target</outputDirectory>
+ <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>
</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>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
index 7b92db7..8d35ec3 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeSocialEndpoint.java
@@ -16,7 +16,6 @@
*/
package com.vci.ubcs.auth.endpoint;
-import com.vci.ubcs.starter.util.HttpUtils;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthCallback;
diff --git a/Source/UBCS/ubcs-gateway/pom.xml b/Source/UBCS/ubcs-gateway/pom.xml
index 2b0073d..32bc4ee 100644
--- a/Source/UBCS/ubcs-gateway/pom.xml
+++ b/Source/UBCS/ubcs-gateway/pom.xml
@@ -79,21 +79,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
<configuration>
- <outputDirectory>../target</outputDirectory>
+ <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>
</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>
+ <artifactId>maven-antrun-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-dev.yml
new file mode 100644
index 0000000..6cf84cc
--- /dev/null
+++ b/Source/UBCS/ubcs-gateway/src/main/resources/application-dev.yml
@@ -0,0 +1,25 @@
+blade:
+ #澶氬洟闃熷崗浣滄湇鍔￠厤缃�
+ loadbalancer:
+ #寮�鍚厤缃�
+ enabled: true
+ #鐏板害鐗堟湰
+ #version: 3.0.0
+ #璐熻浇鍧囪 浼樺厛璋冪敤鐨刬p娈�
+ prior-ip-pattern:
+ - 192.168.0.*
+ - 127.0.0.1
+server:
+ port: 80
+
+spring:
+ cloud:
+ gateway:
+ discovery:
+ locator:
+ enabled: true
+ loadbalancer:
+ retry:
+ enabled: true
+ main:
+ web-application-type: reactive
diff --git a/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml b/Source/UBCS/ubcs-gateway/src/main/resources/bootstrap.yml
index 6d2cc08..4f2e2ae 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: 80
+ port: 37000
spring:
cloud:
diff --git a/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml b/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
index 02f9465..687992d 100644
--- a/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-admin/pom.xml
@@ -95,15 +95,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml b/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
index 9b4e7bc..3906de0 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/pom.xml
@@ -93,15 +93,19 @@
<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>
+ <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>
</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 61338ad..bf9c330 100644
--- a/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-log/pom.xml
@@ -43,15 +43,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-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 83b8022..bdc4700 100644
--- a/Source/UBCS/ubcs-ops/ubcs-report/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-report/pom.xml
@@ -47,15 +47,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-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 4ed1e1f..cca7a4f 100644
--- a/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml
+++ b/Source/UBCS/ubcs-ops/ubcs-resource/pom.xml
@@ -97,15 +97,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-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 ac37aeb..e83446e 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/pom.xml
@@ -7,9 +7,10 @@
<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>${bladex.project.version}</version>
+ <version>3.0.1.RELEASE</version>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
@@ -50,15 +51,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
index 20d5d55..9c6eef1 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -47,7 +47,7 @@
* 涓绘暟鎹垎绫绘湇鍔�
*/
@Autowired(required = true)
- private ICodeClassifyClient codeClassifyClient;
+ private ICodeClassifyClient codeClassifyClient;
/***
* 涓氬姟鏁版嵁灞炴�ф湇鍔�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index aed5804..8099f3d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -16,11 +16,6 @@
<modelVersion>4.0.0</modelVersion>
- <properties>
- <!-- 鎸夊悇妯″潡瀹為檯鐩綍灞傛瀹氫箟鐩稿鏁版嵁锛屼娇鎵�鏈夋湇鍔℃ā鍧楄緭鍑鸿祫婧愭眹鑱氬埌鐩稿悓鐩綍 -->
- <boot-jar-output>../devops</boot-jar-output>
- </properties>
-
<dependencies>
<dependency>
<groupId>com.vci.ubcs</groupId>
@@ -96,6 +91,12 @@
<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>
@@ -142,6 +143,7 @@
<scope>compile</scope>
</dependency>
<!--axis2 end -->
+
<dependency>
<groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-file-api</artifactId>
@@ -153,20 +155,29 @@
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
</dependency>
+
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
index f5735ba..88db082 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -1,13 +1,9 @@
package com.vci.ubcs.code.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.applyjtcodeservice.vo.BaseModelVO;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
-import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.enumpack.CodeClassifyProcessUseEnum;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
import com.vci.ubcs.code.service.ICodeClassifyValueService;
@@ -16,7 +12,6 @@
import com.vci.ubcs.code.vo.ComponentRule;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.starter.annotation.VciBusinessLog;
-import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.*;
import io.swagger.annotations.Api;
diff --git a/Source/UBCS/ubcs-service/ubcs-desk/pom.xml b/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
index a4db87f..f46d50e 100644
--- a/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-desk/pom.xml
@@ -73,15 +73,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-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 d8e3280..327b1f6 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-omd/pom.xml
@@ -86,15 +86,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-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 fb53bea..2c5f838 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/pom.xml
@@ -51,15 +51,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-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 8408aea..412fd2d 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/pom.xml
@@ -52,15 +52,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
+ <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>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3