From 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 28 十一月 2023 11:00:42 +0800
Subject: [PATCH] 修改课题管理bug
---
pom.xml | 112 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 90 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index c736979..1ecb2c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<id>central</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
- <url>http://repo.springsource.org/libs-milestone</url>
+ <url>https://repo.springsource.org/libs-milestone</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@@ -21,13 +21,13 @@
<repository>
<id>prime-repo</id>
<name>PrimeFaces Maven Repository</name>
- <url>http://repository.primefaces.org</url>
+ <url>https://repository.primefaces.org</url>
<layout>default</layout>
</repository>
</repositories>
<properties>
- <spring.version>4.3.8.RELEASE</spring.version>
+ <spring.version>4.3.29.RELEASE</spring.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@@ -140,7 +140,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.2</version>
+ <version>1.1.2</version>
</dependency>
<dependency>
@@ -227,6 +227,7 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.40</version>
+<!-- <version>8.0.20</version>-->
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -322,29 +323,29 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.2.3</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
- <version>1.2.3</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-ehcache</artifactId>
- <version>1.2.3</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
- <version>1.2.3</version>
+ <version>1.6.0</version>
</dependency>
<!--- end shiro -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.8</version>
+ <version>1.2.75</version>
</dependency>
<dependency>
<groupId>com.google.collections</groupId>
@@ -360,7 +361,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.0.pr3</version>
+ <version>2.9.10.7</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.mail/mail -->
<dependency>
@@ -368,31 +369,33 @@
<artifactId>mail</artifactId>
<version>1.4.1</version>
</dependency>
-
+ <dependency >
+ <groupId >com.sun.mail </groupId >
+ <artifactId >javax.mail </artifactId >
+ <version >1.6.0 </version >
+ </dependency >
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>4.0.1</version>
+ <version>4.1.1</version>
</dependency>
-
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
- <version>3.17</version>
+ <version>4.1.1</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.9</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.20</version>
+ </dependency>
</dependencies>
<profiles>
<profile>
<id>test</id>
<properties>
- <profile.active>test</profile.active>
+ <profile.active>gslab</profile.active>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
@@ -464,11 +467,64 @@
<profile.active>shgjs</profile.active>
</properties>
</profile>
+ <profile>
+ <id>zkyshs</id>
+ <properties>
+ <profile.active>zkyshs</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>gslab</id>
+ <properties>
+ <profile.active>gslab</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>zkdsz</id>
+ <properties>
+ <profile.active>zkdsz</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>xjdx</id>
+ <properties>
+ <profile.active>xjdx</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>aky</id>
+ <properties>
+ <profile.active>aky</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>silkroad</id>
+ <properties>
+ <profile.active>silkroad</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>guotai</id>
+ <properties>
+ <profile.active>guotai</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>cq</id>
+ <properties>
+ <profile.active>cq</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>sdy</id>
+ <properties>
+ <profile.active>sdy</profile.active>
+ </properties>
+ </profile>
</profiles>
<build>
<finalName>smartlab</finalName>
<filters>
-
<filter>src/main/webapp/WEB-INF/${profile.active}/${profile.active}.properties</filter>
</filters>
<plugins>
@@ -479,6 +535,14 @@
<target>1.8</target>
<encoding>UTF-8</encoding>
<skip>true</skip>
+ <excludes>
+ <exclude>
+ resources/template/*
+ </exclude>
+ <exclude>
+ resources/*.docx
+ </exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
@@ -525,6 +589,10 @@
<include>message.properties</include>
</includes>
</resource>
+ <resource>
+ <directory>src/main/webapp/WEB-INF</directory>
+ <filtering>true</filtering>
+ </resource>
</resources>
</build>
</project>
--
Gitblit v1.9.2