From c87738a78f57e6f68a0111d68ef3748b29dc1eda Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 23 六月 2021 12:21:59 +0800
Subject: [PATCH] 修改试剂排序
---
pom.xml | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 986a8fb..9786c9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
</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>
@@ -322,29 +322,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 +360,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,7 +368,11 @@
<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>
@@ -446,6 +450,36 @@
<profile.active>qhyhs</profile.active>
</properties>
</profile>
+ <profile>
+ <id>szygs</id>
+ <properties>
+ <profile.active>szygs</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>zkysh</id>
+ <properties>
+ <profile.active>zkysh</profile.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>shgjs</id>
+ <properties>
+ <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>
</profiles>
<build>
<finalName>smartlab</finalName>
@@ -461,6 +495,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>
@@ -479,6 +521,14 @@
<webResources>
<resource>
<directory>src/main/webapp</directory>
+ <excludes>
+ <exclude>
+ resources/template/*
+ </exclude>
+ <exclude>
+ resources/*.docx
+ </exclude>
+ </excludes>
<filtering>true</filtering>
<targetPath>./</targetPath>
</resource>
--
Gitblit v1.9.2