From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/pom.xml | 125 ++---------------------------------------
1 files changed, 6 insertions(+), 119 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/pom.xml b/Source/plt-web/plt-web-parent/plt-web/pom.xml
index df1c4e0..12d5e13 100644
--- a/Source/plt-web/plt-web-parent/plt-web/pom.xml
+++ b/Source/plt-web/plt-web-parent/plt-web/pom.xml
@@ -12,6 +12,7 @@
<artifactId>plt-web</artifactId>
<dependencies>
+ <!--骞冲彴鐨勫寘-->
<dependency>
<groupId>com.vci</groupId>
<artifactId>plt-web-base</artifactId>
@@ -30,56 +31,23 @@
</exclusion>
</exclusions>
</dependency>
- <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>
+ <artifactId>plt-web-api</artifactId>
</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>
+ <artifactId>plt-starter</artifactId>
</dependency>
<dependency>
<groupId>com.vci</groupId>
- <artifactId>plt-poi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.vci</groupId>
- <artifactId>plt-web-base</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>plt-web-permission</artifactId>
</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>
<!--寮�鍚� cache 缂撳瓨 -->
@@ -101,62 +69,11 @@
<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</groupId>
- <artifactId>plt-starter</artifactId>
- <version>${platform.version}</version>
- </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.9.11</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-->
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.13.3</version>
- </dependency>
</dependencies>
<build>
<finalName>plt-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>
@@ -170,7 +87,6 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
-<!-- <excludeGroupIds>com.vci.platform</excludeGroupIds>-->
</configuration>
</execution>
</executions>
@@ -193,35 +109,6 @@
</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>-->
-
</plugins>
</build>
--
Gitblit v1.9.3