diff --git a/adc-da-login/pom.xml b/adc-da-login/pom.xml
index 0f8fa98..b5d1e46 100644
--- a/adc-da-login/pom.xml
+++ b/adc-da-login/pom.xml
@@ -19,44 +19,44 @@
1.8
1.8
2.6.6
- 1.4.0-RC2
+ 1.12.0
1.8.5
3.7.0
4.0.0
- RELEASE
- RELEASE
- RELEASE
+ 2.3.2
+ 3.0.0-SNAPSHOT
+ 2.3.3
-
-
- central
- http://60.247.58.121:8182/repository/public
-
- true
- always
-
-
- false
-
-
-
- snapshot
- http://60.247.58.121:8182/repository/snapshots/
-
- false
-
-
- true
- always
- warn
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/adc-da-login/src/main/java/com/adc/da/login/rest/LogController.java b/adc-da-login/src/main/java/com/adc/da/login/rest/LogController.java
index 6d4adeb..4878bcb 100644
--- a/adc-da-login/src/main/java/com/adc/da/login/rest/LogController.java
+++ b/adc-da-login/src/main/java/com/adc/da/login/rest/LogController.java
@@ -39,14 +39,15 @@ public class LogController {
// }
try {
UserEO user = UserUtils.getUser();
- MiLogEO miLogEO = new MiLogEO();
- miLogEO.setId(UUID.randomUUID().toString().replaceAll("-",""));
- miLogEO.setAccessPage(accessPage);
- miLogEO.setAccount(user.getAccount());
- miLogEO.setUserName(user.getUsname());
- miLogEO.setOperateDate(new Date());
- dao.save(miLogEO);
-
+ if (user != null){
+ MiLogEO miLogEO = new MiLogEO();
+ miLogEO.setId(UUID.randomUUID().toString().replaceAll("-",""));
+ miLogEO.setAccessPage(accessPage);
+ miLogEO.setAccount(user.getAccount());
+ miLogEO.setUserName(user.getUsname());
+ miLogEO.setOperateDate(new Date());
+ dao.save(miLogEO);
+ }
} catch (Exception e) {
logger.error("日志添加异常", e);
diff --git a/adc-da-main/logs/system/adc-da.system_all.2023-04-28.0.log b/adc-da-main/logs/system/adc-da.system_all.2023-04-28.0.log
index cdfcdfa..011dc18 100644
--- a/adc-da-main/logs/system/adc-da.system_all.2023-04-28.0.log
+++ b/adc-da-main/logs/system/adc-da.system_all.2023-04-28.0.log
@@ -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.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: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.
diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml
index 707c128..adef461 100644
--- a/adc-da-main/pom.xml
+++ b/adc-da-main/pom.xml
@@ -35,31 +35,31 @@
-
-
- adc
- http://60.247.58.121:8182/repository/public
-
- true
- always
-
-
- false
-
-
-
- snapshot
- http://60.247.58.121:8182/repository/snapshots/
-
- false
-
-
- true
- always
- warn
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -89,7 +89,7 @@
com.adc
adc-da-util
- 2.3.3-SNAPSHOT
+ 2.3.2
@@ -199,11 +199,11 @@
-
- javax.servlet
- javax.servlet-api
- 3.1.0
-
+
+
+
+
+
@@ -240,11 +240,11 @@
-
- com.adc
- adc-da-gen
- 2.3.2-SNAPSHOT
-
+
+
+
+
+
@@ -270,12 +270,6 @@
-
- log4j
- log4j
- 1.2.17
-
-
@@ -303,7 +297,7 @@
com.baomidou
mybatis-plus-generator
- 3.2.0
+ ${mybatis-plus.version}
org.freemarker
@@ -343,10 +337,10 @@
mssql-jdbc
-
- com.oracle
- ojdbc7
-
+
+
+
+
mysql
diff --git a/adc-da-sys/pom.xml b/adc-da-sys/pom.xml
index 15c3865..ea9b1ff 100644
--- a/adc-da-sys/pom.xml
+++ b/adc-da-sys/pom.xml
@@ -15,24 +15,24 @@
1.8
3.4.2
- 1.4.0-RC2
+ 1.12.0
1.8.5
3.7.0
2.6.6
-
-
- adc
- http://60.247.58.121:8182/repository/public
-
- true
-
-
- true
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -58,7 +58,7 @@
com.adc
adc-da-swagger
- RELEASE
+ 2.3.3
javax.mail
@@ -69,7 +69,7 @@
com.adc
adc-da-base
- RELEASE
+ 3.0.0-SNAPSHOT
adc-da-util
@@ -80,7 +80,7 @@
com.adc
adc-da-util
- RELEASE
+ 2.3.2
log4j
diff --git a/pom.xml b/pom.xml
index 4e40dff..0a99fbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.springframework.boot
spring-boot-starter-parent
- 2.1.5.RELEASE
+ 2.5.15
@@ -20,7 +20,7 @@
1.8
1.8
1.8
- 2.1.5.RELEASE
+ 2.5.15
4.12
1.2.9
1.7.21
@@ -28,17 +28,18 @@
1.8.5
2.12.5
1.9.13
- 3.2.0
+ 3.3.1
+ 3.5.6
12.1.0.1
- 8.0.13
+ 8.0.27
6.1.0.jre7
3.5
2.5
1.10
1.10
- 1.4.0-RC2
- 8.5.37
+ 1.12.0
+
3.16
@@ -51,29 +52,34 @@
-
- adc
- http://60.247.58.121:8182/repository/public
-
- true
- always
-
-
- false
-
-
-
- snapshot
- http://60.247.58.121:8182/repository/snapshots/
-
- false
-
-
- true
- always
- warn
-
-
+
+ nexus-aliyun
+ Nexus aliyun
+ https://maven.aliyun.com/repository/public
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -189,7 +195,7 @@
org.mybatis
mybatis
- 3.5.3
+ 3.5.6
@@ -205,12 +211,12 @@
mssql-jdbc
${sqlserver.driver.version}
-
-
- com.oracle
- ojdbc7
- ${oracle.driver.version}
-
+
+
+
+
+
+
mysql
@@ -250,7 +256,7 @@
commons-fileupload
commons-fileupload
- 1.3.3
+ 1.5
@@ -355,17 +361,17 @@
1.2
-
- javax.servlet
- javax.servlet-api
- 3.1.0
-
+
+
+
+
+
-
- javax.servlet
- servlet-api
- 2.5
-
+
+
+
+
+
javax.servlet
@@ -420,7 +426,7 @@
com.adc
adc-da-swagger
- RELEASE
+ 2.3.3
javax.mail
@@ -526,7 +532,7 @@
org.springframework.boot
spring-boot-starter-data-redis
- 2.1.5.RELEASE
+ 2.5.15