DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级各种组件版本，以符合安全要求

Browse Source
This commit is contained in:
lixuetao
2024-01-16 11:13:47 +08:00
parent 0b3556e470
commit 2e41251b98
6 changed files with 151 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-login/pom.xml
+29 -29
View File
@@ -19,44 +19,44 @@
<java_source_version>1.8</java_source_version> <java_source_version>1.8</java_source_version>
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<ehcache.version>2.6.6</ehcache.version> <ehcache.version>2.6.6</ehcache.version>
<shiro.version>1.4.0-RC2</shiro.version> <shiro.version>1.12.0</shiro.version>
<!--<spring.version>4.3.9.RELEASE</spring.version>--> <!--<spring.version>4.3.9.RELEASE</spring.version>-->
<aspectj.version>1.8.5</aspectj.version> <aspectj.version>1.8.5</aspectj.version>
<org.apache.maven.plugins.version>3.7.0</org.apache.maven.plugins.version> <org.apache.maven.plugins.version>3.7.0</org.apache.maven.plugins.version>
<!--adc-da-version--> <!--adc-da-version-->
<adc-da-sys.version>4.0.0</adc-da-sys.version> <adc-da-sys.version>4.0.0</adc-da-sys.version>
<adc-da-util.version>RELEASE</adc-da-util.version> <adc-da-util.version>2.3.2</adc-da-util.version>
<adc-da-base.version>RELEASE</adc-da-base.version> <adc-da-base.version>3.0.0-SNAPSHOT</adc-da-base.version>
<adc-da-swagger.version>RELEASE</adc-da-swagger.version> <adc-da-swagger.version>2.3.3</adc-da-swagger.version>
</properties> </properties>
<repositories> <!-- <repositories>-->
<repository> <!-- <repository>-->
<id>central</id> <!-- <id>central</id>-->
<url>http://60.247.58.121:8182/repository/public</url> <!-- <url>http://60.247.58.121:8182/repository/public</url>-->
<releases> <!-- <releases>-->
<enabled>true</enabled> <!-- <enabled>true</enabled>-->
<updatePolicy>always</updatePolicy> <!-- <updatePolicy>always</updatePolicy>-->
</releases> <!-- </releases>-->
<snapshots> <!-- <snapshots>-->
<enabled>false</enabled> <!-- <enabled>false</enabled>-->
</snapshots> <!-- </snapshots>-->
</repository> <!-- </repository>-->
<repository> <!-- <repository>-->
<id>snapshot</id> <!-- <id>snapshot</id>-->
<url>http://60.247.58.121:8182/repository/snapshots/</url> <!-- <url>http://60.247.58.121:8182/repository/snapshots/</url>-->
<releases> <!-- <releases>-->
<enabled>false</enabled> <!-- <enabled>false</enabled>-->
</releases> <!-- </releases>-->
<snapshots> <!-- <snapshots>-->
<enabled>true</enabled> <!-- <enabled>true</enabled>-->
<updatePolicy>always</updatePolicy> <!-- <updatePolicy>always</updatePolicy>-->
<checksumPolicy>warn</checksumPolicy> <!-- <checksumPolicy>warn</checksumPolicy>-->
</snapshots> <!-- </snapshots>-->
</repository> <!-- </repository>-->
</repositories> <!-- </repositories>-->
<distributionManagement> <distributionManagement>
<repository> <repository>
adc-da-login/src/main/java/com/adc/da/login/rest/LogController.java
+9 -8
View File
@@ -39,14 +39,15 @@ public class LogController {
// } // }
try { try {
UserEO user = UserUtils.getUser(); UserEO user = UserUtils.getUser();
MiLogEO miLogEO = new MiLogEO(); if (user != null){
miLogEO.setId(UUID.randomUUID().toString().replaceAll("-","")); MiLogEO miLogEO = new MiLogEO();
miLogEO.setAccessPage(accessPage); miLogEO.setId(UUID.randomUUID().toString().replaceAll("-",""));
miLogEO.setAccount(user.getAccount()); miLogEO.setAccessPage(accessPage);
miLogEO.setUserName(user.getUsname()); miLogEO.setAccount(user.getAccount());
miLogEO.setOperateDate(new Date()); miLogEO.setUserName(user.getUsname());
dao.save(miLogEO); miLogEO.setOperateDate(new Date());
dao.save(miLogEO);
}
} catch (Exception e) { } catch (Exception e) {
logger.error("日志添加异常", e); logger.error("日志添加异常", e);
adc-da-main/logs/system/adc-da.system_all.2023-04-28.0.log
+1 -1
View File
@@ -1,5 +1,5 @@
[2023-04-28 20:13:13.246] [main] [INFO ] com.adc.da.AdcDaApplication - Starting AdcDaApplication v2.5.0 on DESKTOP-AE5FJUH with PID 14776 (D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-main\target\adc-da-main-2.5.0.jar started by 15022 in D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-main\target) [2023-04-28 20:13:13.246] [main] [INFO ] com.adc.da.AdcDaApplication - Starting AdcDaApplication v2.5.0 on DESKTOP-AE5FJUH with PID 14776 (D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-main\target\adc-da-main-2.5.0.jar started by 15022 in D:\desktop\hzwl\dazhong\faw-report-library-boot\adc-da-main\target)
[2023-04-28 20:13:13.253] [main] [DEBUG] com.adc.da.AdcDaApplication - Running with Spring Boot v2.1.5.RELEASE, Spring v5.1.7.RELEASE [2023-04-28 20:13:13.253] [main] [DEBUG] com.adc.da.AdcDaApplication - Running with Spring Boot v2.5.15, Spring v5.1.7.RELEASE
[2023-04-28 20:13:13.255] [main] [INFO ] com.adc.da.AdcDaApplication - The following profiles are active: dev [2023-04-28 20:13:13.255] [main] [INFO ] com.adc.da.AdcDaApplication - The following profiles are active: dev
[2023-04-28 20:13:15.346] [main] [INFO ] o.s.d.r.config.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode! [2023-04-28 20:13:15.346] [main] [INFO ] o.s.d.r.config.RepositoryConfigurationDelegate - Multiple Spring Data modules found, entering strict repository configuration mode!
[2023-04-28 20:13:15.350] [main] [INFO ] o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data repositories in DEFAULT mode. [2023-04-28 20:13:15.350] [main] [INFO ] o.s.d.r.config.RepositoryConfigurationDelegate - Bootstrapping Spring Data repositories in DEFAULT mode.
adc-da-main/pom.xml
+41 -47
View File
@@ -35,31 +35,31 @@
<!--</configuration>--> <!--</configuration>-->
<!--</server>--> <!--</server>-->
<!--</servers>--> <!--</servers>-->
<repositories> <!-- <repositories>-->
<repository> <!-- <repository>-->
<id>adc</id> <!-- <id>adc</id>-->
<url>http://60.247.58.121:8182/repository/public</url> <!-- <url>http://60.247.58.121:8182/repository/public</url>-->
<releases> <!-- <releases>-->
<enabled>true</enabled> <!-- <enabled>true</enabled>-->
<updatePolicy>always</updatePolicy> <!-- <updatePolicy>always</updatePolicy>-->
</releases> <!-- </releases>-->
<snapshots> <!-- <snapshots>-->
<enabled>false</enabled> <!-- <enabled>false</enabled>-->
</snapshots> <!-- </snapshots>-->
</repository> <!-- </repository>-->
<repository> <!-- <repository>-->
<id>snapshot</id> <!-- <id>snapshot</id>-->
<url>http://60.247.58.121:8182/repository/snapshots/</url> <!-- <url>http://60.247.58.121:8182/repository/snapshots/</url>-->
<releases> <!-- <releases>-->
<enabled>false</enabled> <!-- <enabled>false</enabled>-->
</releases> <!-- </releases>-->
<snapshots> <!-- <snapshots>-->
<enabled>true</enabled> <!-- <enabled>true</enabled>-->
<updatePolicy>always</updatePolicy> <!-- <updatePolicy>always</updatePolicy>-->
<checksumPolicy>warn</checksumPolicy> <!-- <checksumPolicy>warn</checksumPolicy>-->
</snapshots> <!-- </snapshots>-->
</repository> <!-- </repository>-->
</repositories> <!-- </repositories>-->
<dependencies> <dependencies>
<!--<dependency>--> <!--<dependency>-->
@@ -89,7 +89,7 @@
<dependency> <dependency>
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-util</artifactId> <artifactId>adc-da-util</artifactId>
<version>2.3.3-SNAPSHOT</version> <version>2.3.2</version>
</dependency> </dependency>
<!-- 系统管理组件 --> <!-- 系统管理组件 -->
<!--<dependency>--> <!--<dependency>-->
@@ -199,11 +199,11 @@
<!--<version>2.5.0</version>--> <!--<version>2.5.0</version>-->
<!--</dependency>--> <!--</dependency>-->
<dependency> <!-- <dependency>-->
<groupId>javax.servlet</groupId> <!-- <groupId>javax.servlet</groupId>-->
<artifactId>javax.servlet-api</artifactId> <!-- <artifactId>javax.servlet-api</artifactId>-->
<version>3.1.0</version> <!-- <version>3.1.0</version>-->
</dependency> <!-- </dependency>-->
<!-- <dependency> --> <!-- <dependency> -->
@@ -240,11 +240,11 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- 代码生成组件 --> <!-- 代码生成组件 -->
<dependency> <!-- <dependency>-->
<groupId>com.adc</groupId> <!-- <groupId>com.adc</groupId>-->
<artifactId>adc-da-gen</artifactId> <!-- <artifactId>adc-da-gen</artifactId>-->
<version>2.3.2-SNAPSHOT</version> <!-- <version>2.3.2-SNAPSHOT</version>-->
</dependency> <!-- </dependency>-->
<!-- Druid数据库连接池组件 --> <!-- Druid数据库连接池组件 -->
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>com.adc</groupId>--> <!--<groupId>com.adc</groupId>-->
@@ -270,12 +270,6 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<!-- jdk1.7支持2.4.6版本es客户端,jdk1.8支持6.0版本es客户端 --> <!-- jdk1.7支持2.4.6版本es客户端,jdk1.8支持6.0版本es客户端 -->
<!--<dependency>--> <!--<dependency>-->
<!--<groupId>org.elasticsearch</groupId>--> <!--<groupId>org.elasticsearch</groupId>-->
@@ -303,7 +297,7 @@
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId> <artifactId>mybatis-plus-generator</artifactId>
<version>3.2.0</version> <version>${mybatis-plus.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.freemarker</groupId> <groupId>org.freemarker</groupId>
@@ -343,10 +337,10 @@
<artifactId>mssql-jdbc</artifactId> <artifactId>mssql-jdbc</artifactId>
</dependency> </dependency>
<!-- 支持oracle 12c的驱动 --> <!-- 支持oracle 12c的驱动 -->
<dependency> <!-- <dependency>-->
<groupId>com.oracle</groupId> <!-- <groupId>com.oracle</groupId>-->
<artifactId>ojdbc7</artifactId> <!-- <artifactId>ojdbc7</artifactId>-->
</dependency> <!-- </dependency>-->
<!-- 支持MySQL的驱动 --> <!-- 支持MySQL的驱动 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
adc-da-sys/pom.xml
+16 -16
View File
@@ -15,24 +15,24 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<!--<spring.version>4.3.9.RELEASE</spring.version>--> <!--<spring.version>4.3.9.RELEASE</spring.version>-->
<mybatis.version>3.4.2</mybatis.version> <mybatis.version>3.4.2</mybatis.version>
<shiro.version>1.4.0-RC2</shiro.version> <shiro.version>1.12.0</shiro.version>
<aspectj.version>1.8.5</aspectj.version> <aspectj.version>1.8.5</aspectj.version>
<org.apache.maven.plugins.version>3.7.0</org.apache.maven.plugins.version> <org.apache.maven.plugins.version>3.7.0</org.apache.maven.plugins.version>
<ehcache.version>2.6.6</ehcache.version> <ehcache.version>2.6.6</ehcache.version>
</properties> </properties>
<repositories> <!-- <repositories>-->
<repository> <!-- <repository>-->
<id>adc</id> <!-- <id>adc</id>-->
<url>http://60.247.58.121:8182/repository/public</url> <!-- <url>http://60.247.58.121:8182/repository/public</url>-->
<releases> <!-- <releases>-->
<enabled>true</enabled> <!-- <enabled>true</enabled>-->
</releases> <!-- </releases>-->
<snapshots> <!-- <snapshots>-->
<enabled>true</enabled> <!-- <enabled>true</enabled>-->
</snapshots> <!-- </snapshots>-->
</repository> <!-- </repository>-->
</repositories> <!-- </repositories>-->
<distributionManagement> <distributionManagement>
<repository> <repository>
@@ -58,7 +58,7 @@
<dependency> <dependency>
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-swagger</artifactId> <artifactId>adc-da-swagger</artifactId>
<version>RELEASE</version> <version>2.3.3</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
@@ -69,7 +69,7 @@
<dependency> <dependency>
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-base</artifactId> <artifactId>adc-da-base</artifactId>
<version>RELEASE</version> <version>3.0.0-SNAPSHOT</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>adc-da-util</artifactId> <artifactId>adc-da-util</artifactId>
@@ -80,7 +80,7 @@
<dependency> <dependency>
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-util</artifactId> <artifactId>adc-da-util</artifactId>
<version>RELEASE</version> <version>2.3.2</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>log4j</groupId> <groupId>log4j</groupId>
pom.xml
+55 -49
View File
@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.5.RELEASE</version> <version>2.5.15</version>
<relativePath/> <relativePath/>
</parent> </parent>
@@ -20,7 +20,7 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<java_source_version>1.8</java_source_version> <java_source_version>1.8</java_source_version>
<java_target_version>1.8</java_target_version> <java_target_version>1.8</java_target_version>
<spring.boot.version>2.1.5.RELEASE</spring.boot.version> <spring.boot.version>2.5.15</spring.boot.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<fastjson.version>1.2.9</fastjson.version> <fastjson.version>1.2.9</fastjson.version>
<slf4j.version>1.7.21</slf4j.version> <slf4j.version>1.7.21</slf4j.version>
@@ -28,17 +28,18 @@
<aspectj.version>1.8.5</aspectj.version> <aspectj.version>1.8.5</aspectj.version>
<jackson.version>2.12.5</jackson.version> <jackson.version>2.12.5</jackson.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version> <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
<mybatis-plus.version>3.2.0</mybatis-plus.version> <mybatis-plus.version>3.3.1</mybatis-plus.version>
<mybatis.version>3.5.6</mybatis.version>
<oracle.driver.version>12.1.0.1</oracle.driver.version> <oracle.driver.version>12.1.0.1</oracle.driver.version>
<mysql.driver.version>8.0.13</mysql.driver.version> <mysql.driver.version>8.0.27</mysql.driver.version>
<sqlserver.driver.version>6.1.0.jre7</sqlserver.driver.version> <sqlserver.driver.version>6.1.0.jre7</sqlserver.driver.version>
<commons-lang3.version>3.5</commons-lang3.version> <commons-lang3.version>3.5</commons-lang3.version>
<commons-io.version>2.5</commons-io.version> <commons-io.version>2.5</commons-io.version>
<commons-codec.version>1.10</commons-codec.version> <commons-codec.version>1.10</commons-codec.version>
<commons-configuration.version>1.10</commons-configuration.version> <commons-configuration.version>1.10</commons-configuration.version>
<!-- <elasticsearch.version>2.4.6</elasticsearch.version>--> <!-- <elasticsearch.version>2.4.6</elasticsearch.version>-->
<shiro.version>1.4.0-RC2</shiro.version> <shiro.version>1.12.0</shiro.version>
<tomcat.version>8.5.37</tomcat.version> <!-- <tomcat.version>8.5.37</tomcat.version>-->
<poi.version>3.16</poi.version> <poi.version>3.16</poi.version>
</properties> </properties>
@@ -51,29 +52,34 @@
</modules> </modules>
<repositories> <repositories>
<repository> <repository>
<id>adc</id> <id>nexus-aliyun</id>
<url>http://60.247.58.121:8182/repository/public</url> <name>Nexus aliyun</name>
<releases> <url>https://maven.aliyun.com/repository/public</url>
<enabled>true</enabled> </repository>
<updatePolicy>always</updatePolicy> <!-- <repository>-->
</releases> <!-- <id>adc</id>-->
<snapshots> <!-- <url>http://60.247.58.121:8182/repository/public</url>-->
<enabled>false</enabled> <!-- <releases>-->
</snapshots> <!-- <enabled>true</enabled>-->
</repository> <!-- <updatePolicy>always</updatePolicy>-->
<repository> <!-- </releases>-->
<id>snapshot</id> <!-- <snapshots>-->
<url>http://60.247.58.121:8182/repository/snapshots/</url> <!-- <enabled>false</enabled>-->
<releases> <!-- </snapshots>-->
<enabled>false</enabled> <!-- </repository>-->
</releases> <!-- <repository>-->
<snapshots> <!-- <id>snapshot</id>-->
<enabled>true</enabled> <!-- <url>http://60.247.58.121:8182/repository/snapshots/</url>-->
<updatePolicy>always</updatePolicy> <!-- <releases>-->
<checksumPolicy>warn</checksumPolicy> <!-- <enabled>false</enabled>-->
</snapshots> <!-- </releases>-->
</repository> <!-- <snapshots>-->
<!-- <enabled>true</enabled>-->
<!-- <updatePolicy>always</updatePolicy>-->
<!-- <checksumPolicy>warn</checksumPolicy>-->
<!-- </snapshots>-->
<!-- </repository>-->
</repositories> </repositories>
<distributionManagement> <distributionManagement>
@@ -189,7 +195,7 @@
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
<version>3.5.3</version> <version>3.5.6</version>
</dependency> </dependency>
@@ -205,12 +211,12 @@
<artifactId>mssql-jdbc</artifactId> <artifactId>mssql-jdbc</artifactId>
<version>${sqlserver.driver.version}</version> <version>${sqlserver.driver.version}</version>
</dependency> </dependency>
<!-- 支持oracle 12c的驱动 --> <!-- &lt;!&ndash; 支持oracle 12c的驱动 &ndash;&gt;-->
<dependency> <!-- <dependency>-->
<groupId>com.oracle</groupId> <!-- <groupId>com.oracle</groupId>-->
<artifactId>ojdbc7</artifactId> <!-- <artifactId>ojdbc7</artifactId>-->
<version>${oracle.driver.version}</version> <!-- <version>${oracle.driver.version}</version>-->
</dependency> <!-- </dependency>-->
<!-- 支持MySQL的驱动 --> <!-- 支持MySQL的驱动 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
@@ -250,7 +256,7 @@
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
<version>1.3.3</version> <version>1.5</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -355,17 +361,17 @@
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>javax.servlet</groupId> <!-- <groupId>javax.servlet</groupId>-->
<artifactId>javax.servlet-api</artifactId> <!-- <artifactId>javax.servlet-api</artifactId>-->
<version>3.1.0</version> <!-- <version>3.1.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>javax.servlet</groupId> <!-- <groupId>javax.servlet</groupId>-->
<artifactId>servlet-api</artifactId> <!-- <artifactId>servlet-api</artifactId>-->
<version>2.5</version> <!-- <version>2.5</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
@@ -420,7 +426,7 @@
<dependency> <dependency>
<groupId>com.adc</groupId> <groupId>com.adc</groupId>
<artifactId>adc-da-swagger</artifactId> <artifactId>adc-da-swagger</artifactId>
<version>RELEASE</version> <version>2.3.3</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
@@ -526,7 +532,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
<version>2.1.5.RELEASE</version> <version>2.5.15</version>
</dependency> </dependency>
</dependencies> </dependencies>