From f07aca58c4e1d96c8e75c90b021b00c593bcffff Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 28 五月 2024 11:36:17 +0800
Subject: [PATCH] 1、平台接口修改以及web端后台的修改。 2、对平台的更新jar包上传。
---
Source/platformProject/vci-platform-web/pom.xml | 481 +++++++++++++++++++++++++++++-----------------------
1 files changed, 268 insertions(+), 213 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/pom.xml b/Source/platformProject/vci-platform-web/pom.xml
index 11b3900..bf18b06 100644
--- a/Source/platformProject/vci-platform-web/pom.xml
+++ b/Source/platformProject/vci-platform-web/pom.xml
@@ -11,243 +11,298 @@
<artifactId>vci-platform-web</artifactId>
- <dependencies>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-starter-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.vci.corba</groupId>
- <artifactId>plt-slice</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>D:/work/newplatform/Bin/lib/common/plt-slice.jar</systemPath>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-starter-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>pom</type>
+ </dependency>
+<!-- ddd-->
+ <dependency>
+ <groupId>com.vci.corba</groupId>
+ <artifactId>plt-slice</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-starter-web</artifactId>
- <version>1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-starter-corba</artifactId>
- <version>1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency><!--鏂囦欢鐨勪俊鎭�-->
- <groupId>com.vci</groupId>
- <artifactId>vci-file-api</artifactId>
- <version>1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-file-integration</artifactId>
- <version>1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-starter-word</artifactId>
- <version>1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.vci</groupId>
- <artifactId>vci-starter-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-starter-poi</artifactId>
- <version>1.0-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.vci</groupId>
- <artifactId>vci-starter-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>eu.bitwalker</groupId>
- <artifactId>UserAgentUtils</artifactId>
- <version>1.20</version>
- </dependency>
- <!--寮�鍚� cache 缂撳瓨 -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
- <version>2.1.3.RELEASE</version>
- </dependency>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-starter-web</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-starter-corba</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency><!--鏂囦欢鐨勪俊鎭�-->
+ <groupId>com.vci</groupId>
+ <artifactId>vci-file-api</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-file-integration</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-starter-word</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-starter-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-starter-poi</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-starter-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>eu.bitwalker</groupId>
+ <artifactId>UserAgentUtils</artifactId>
+ <version>1.20</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/com.github.jsqlparser/jsqlparser -->
+ <dependency>
+ <groupId>com.github.jsqlparser</groupId>
+ <artifactId>jsqlparser</artifactId>
+ <version>4.9</version>
+ </dependency>
- <!-- ehcache缂撳瓨 -->
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>2.9.1</version><!--$NO-MVN-MAN-VER$ -->
- </dependency>
+ <!--寮�鍚� cache 缂撳瓨 -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-cache</artifactId>
+ <version>2.1.3.RELEASE</version>
+ </dependency>
- <dependency><!--java bean 鍜寈ml杞崲-->
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.10</version>
- </dependency>
- <dependency><!--浠ｇ爜鐢熸垚鍣ㄦ墍闇�妯℃澘-->
- <artifactId>velocity</artifactId>
- <groupId>org.apache.velocity</groupId>
- <version>1.7</version>
- </dependency>
- <dependency><!--鏁版嵁搴撴搷浣滃伐鍏�-->
- <groupId>com.vci.platform</groupId>
- <artifactId>ddlTool-client</artifactId>
- <version>${vciplt.version}</version>
- </dependency>
- <dependency><!--鏁版嵁搴撴搷浣滃伐鍏�-->
- <groupId>com.vci.platform</groupId>
- <artifactId>ddlTool-common</artifactId>
- <version>${vciplt.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vci.client</groupId>
- <artifactId>plt-clientbase</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>D:/work/newplatform/Bin/lib/client/plt-clientbase.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>com.zeroc</groupId>
- <artifactId>icegridgui.jar</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>D:/work/newplatform/Bin/lib/common/icegridgui.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>com.vci.common</groupId>
- <artifactId>plt-common.jar</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>D:/work/newplatform/Bin/lib/common/plt-common.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-starter</artifactId>
- <version>2022.1-SNAPSHOT</version>
- </dependency>
+ <!-- ehcache缂撳瓨 -->
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>2.9.1</version><!--$NO-MVN-MAN-VER$ -->
+ </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.9.11</version>
- </dependency>
+ <dependency><!--java bean 鍜寈ml杞崲-->
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.10</version>
+ </dependency>
+ <dependency><!--浠ｇ爜鐢熸垚鍣ㄦ墍闇�妯℃澘-->
+ <artifactId>velocity</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>1.7</version>
+ </dependency>
+ <dependency><!--鏁版嵁搴撴搷浣滃伐鍏�-->
+ <groupId>com.vci.platform</groupId>
+ <artifactId>ddlTool-client</artifactId>
+ <version>${vciplt.version}</version>
+ </dependency>
+ <dependency><!--鏁版嵁搴撴搷浣滃伐鍏�-->
+ <groupId>com.vci.platform</groupId>
+ <artifactId>ddlTool-common</artifactId>
+ <version>${vciplt.version}</version>
+ </dependency>
+<!-- ddd-->
+ <dependency>
+ <groupId>com.vci.client</groupId>
+ <artifactId>plt-clientbase</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
+<!-- ddd-->
+ <dependency>
+ <groupId>com.zeroc</groupId>
+ <artifactId>icegridgui</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
+<!-- dd-->
+ <dependency>
+ <groupId>com.vci.common</groupId>
+ <artifactId>plt-common</artifactId>
+ <version>1.0.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-platform-starter</artifactId>
+ <version>2022.1-SNAPSHOT</version>
+ </dependency>
+<!-- ddd-->
+ <dependency>
+ <groupId>com.vci.client</groupId>
+ <artifactId>plt-client</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.9.11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
- <!--redis start-->
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-redis</artifactId>
- <version>2.1.5.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>2.9.0</version>
- </dependency>
- <!--redis end-->
- </dependencies>
+ <!--redis start-->
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-redis</artifactId>
+ <version>2.1.5.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>redis.clients</groupId>
+ <artifactId>jedis</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+ <!--redis end-->
+ </dependencies>
<build>
<finalName>vci-platform-web</finalName>
<plugins>
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-jar-plugin</artifactId>-->
+<!-- <configuration>-->
+<!-- <archive>-->
+<!-- <manifest>-->
+<!-- <addClasspath>false</addClasspath>-->
+<!-- <classpathPrefix>lib/</classpathPrefix>-->
+<!-- <useUniqueVersions>false</useUniqueVersions>-->
+<!-- </manifest>-->
+<!-- </archive>-->
+<!-- <excludes>-->
+<!-- <exclude>application-prod.yml</exclude>-->
+<!-- <exclude>application-db.yml</exclude>-->
+<!-- <exclude>properties/conf.properties</exclude>-->
+<!-- </excludes>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+<!-- <excludeGroupIds>com.vci.platform</excludeGroupIds>-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.2</version>
<configuration>
<archive>
<manifest>
- <addClasspath>false</addClasspath>
+ <addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
- <useUniqueVersions>false</useUniqueVersions>
</manifest>
</archive>
<excludes>
- <exclude>application-prod.yml</exclude>
- <exclude>application-db.yml</exclude>
<exclude>properties/conf.properties</exclude>
+ <exclude>properties/eventConf.properties</exclude>
+ <exclude>lib/*</exclude>
</excludes>
</configuration>
</plugin>
-<!-- <plugin>-->
-<!-- <groupId>org.springframework.boot</groupId>-->
-<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!-- <configuration>-->
-<!-- <!–閲嶅啓鍖呭惈渚濊禆锛屽寘鍚笉瀛樺湪鐨勪緷璧栵紝jar閲屾病鏈塸om閲岀殑渚濊禆–>-->
-<!-- <includes>-->
-<!-- <include>-->
-<!-- <groupId>null</groupId>-->
-<!-- <artifactId>null</artifactId>-->
-<!-- </include>-->
-<!-- </includes>-->
-<!-- <layout>ZIP</layout>-->
-<!-- <!–浣跨敤澶栭儴閰嶇疆鏂囦欢锛宩ar鍖呴噷娌℃湁璧勬簮鏂囦欢–>-->
-<!-- <addResources>true</addResources>-->
-<!-- </configuration>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <goals>-->
-<!-- <goal>repackage</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <!–閰嶇疆jar鍖呯壒娈婃爣璇� 閰嶇疆鍚庯紝淇濈暀鍘熸枃浠讹紝鐢熸垚鏂版枃浠� *-run.jar –>-->
-<!-- <!–閰嶇疆jar鍖呯壒娈婃爣璇� 涓嶉厤缃紝鍘熸枃浠跺懡鍚嶄负 *.jar.original锛岀敓鎴愭柊鏂囦欢 *.jar –>-->
-<!-- <!–<classifier>run</classifier>–>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
+ <!-- <plugin>-->
+ <!-- <groupId>org.springframework.boot</groupId>-->
+ <!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
+ <!-- <configuration>-->
+ <!-- <!–閲嶅啓鍖呭惈渚濊禆锛屽寘鍚笉瀛樺湪鐨勪緷璧栵紝jar閲屾病鏈塸om閲岀殑渚濊禆–>-->
+ <!-- <includes>-->
+ <!-- <include>-->
+ <!-- <groupId>null</groupId>-->
+ <!-- <artifactId>null</artifactId>-->
+ <!-- </include>-->
+ <!-- </includes>-->
+ <!-- <layout>ZIP</layout>-->
+ <!-- <!–浣跨敤澶栭儴閰嶇疆鏂囦欢锛宩ar鍖呴噷娌℃湁璧勬簮鏂囦欢–>-->
+ <!-- <addResources>true</addResources>-->
+ <!-- </configuration>-->
+ <!-- <executions>-->
+ <!-- <execution>-->
+ <!-- <goals>-->
+ <!-- <goal>repackage</goal>-->
+ <!-- </goals>-->
+ <!-- <configuration>-->
+ <!-- <!–閰嶇疆jar鍖呯壒娈婃爣璇� 閰嶇疆鍚庯紝淇濈暀鍘熸枃浠讹紝鐢熸垚鏂版枃浠� *-run.jar –>-->
+ <!-- <!–閰嶇疆jar鍖呯壒娈婃爣璇� 涓嶉厤缃紝鍘熸枃浠跺懡鍚嶄负 *.jar.original锛岀敓鎴愭柊鏂囦欢 *.jar –>-->
+ <!-- <!–<classifier>run</classifier>–>-->
+ <!-- </configuration>-->
+ <!-- </execution>-->
+ <!-- </executions>-->
+ <!-- </plugin>-->
</plugins>
</build>
+
</project>
\ No newline at end of file
--
Gitblit v1.9.3