From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
log/xzs.20240524.log | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/log/xzs.20240524.log b/log/xzs.20240524.log
index 86a8306..8931816 100644
--- a/log/xzs.20240524.log
+++ b/log/xzs.20240524.log
@@ -5,7 +5,7 @@
2024-05-24 11:43:52.638 WARN 10168 --- [restartedMain] io.undertow.websockets.jsr : UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used
2024-05-24 11:43:52.657 INFO 10168 --- [restartedMain] io.undertow.servlet : Initializing Spring embedded WebApplicationContext
2024-05-24 11:43:52.657 INFO 10168 --- [restartedMain] o.s.web.context.ContextLoader : Root WebApplicationContext: initialization completed in 18314 ms
-2024-05-24 11:43:53.939 INFO 10168 --- [restartedMain] o.s.s.web.DefaultSecurityFilterChain : Creating filter chain: any request, [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@1bf677ee, org.springframework.security.web.context.SecurityContextPersistenceFilter@67a7faa2, org.springframework.security.web.header.HeaderWriterFilter@680133f1, org.springframework.web.filter.CorsFilter@4cd1f5f1, org.springframework.security.web.authentication.logout.LogoutFilter@3a5afb3c, com.ycl.jxkg.configuration.spring.security.RestLoginAuthenticationFilter@50ffd446, org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter@381510bc, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@73394e57, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@5688593f, org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter@599265e7, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@11c1704e, org.springframework.security.web.session.SessionManagementFilter@30281832, org.springframework.security.web.access.ExceptionTranslationFilter@2d3b2263, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@ec3bd3c]
+2024-05-24 11:43:53.939 INFO 10168 --- [restartedMain] o.s.s.web.DefaultSecurityFilterChain : Creating filter chain: any request, [org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter@1bf677ee, org.springframework.security.web.context.SecurityContextPersistenceFilter@67a7faa2, org.springframework.security.web.header.HeaderWriterFilter@680133f1, org.springframework.web.filter.CorsFilter@4cd1f5f1, org.springframework.security.web.authentication.logout.LogoutFilter@3a5afb3c, com.ycl.jxkg.config.spring.security.RestLoginAuthenticationFilter@50ffd446, org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter@381510bc, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@73394e57, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@5688593f, org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter@599265e7, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@11c1704e, org.springframework.security.web.session.SessionManagementFilter@30281832, org.springframework.security.web.access.ExceptionTranslationFilter@2d3b2263, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@ec3bd3c]
2024-05-24 11:43:54.251 INFO 10168 --- [restartedMain] o.s.b.d.a.OptionalLiveReloadServer : LiveReload server is running on port 35729
2024-05-24 11:43:54.305 INFO 10168 --- [restartedMain] org.xnio : XNIO version 3.3.8.Final
2024-05-24 11:43:54.312 INFO 10168 --- [restartedMain] org.xnio.nio : XNIO NIO Implementation Version 3.3.8.Final
@@ -16,34 +16,34 @@
2024-05-24 11:44:00.637 INFO 10168 --- [XNIO-1 task-1] o.s.web.servlet.DispatcherServlet : Completed initialization in 21 ms
2024-05-24 11:45:09.638 INFO 10168 --- [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource : HikariPool-1 - Starting...
2024-05-24 11:45:10.228 INFO 10168 --- [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource : HikariPool-1 - Start completed.
-2024-05-24 11:45:10.253 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.UserMapper.getUserByUserName : ==> Preparing: select id, user_uuid, user_name, password, real_name, age, sex, birth_day, user_level, phone, role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id from t_user where deleted=0 and user_name=? limit 1
+2024-05-24 11:45:10.253 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.UserMapper.getUserByUserName : ==> Preparing: select id, user_uuid, user_name, password, real_name, age, sex, birth_day, user_level, phone, role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id from t_user where deleted=0 and user_name=? limit 1
2024-05-24 11:45:10.319 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.UserMapper.getUserByUserName : ==> Parameters: admin(String)
2024-05-24 11:45:10.944 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.UserMapper.getUserByUserName : <== Total: 1
-2024-05-24 11:45:11.013 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.UserMapper.getUserByUserName : ==> Preparing: select id, user_uuid, user_name, password, real_name, age, sex, birth_day, user_level, phone, role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id from t_user where deleted=0 and user_name=? limit 1
+2024-05-24 11:45:11.013 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.UserMapper.getUserByUserName : ==> Preparing: select id, user_uuid, user_name, password, real_name, age, sex, birth_day, user_level, phone, role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id from t_user where deleted=0 and user_name=? limit 1
2024-05-24 11:45:11.014 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.UserMapper.getUserByUserName : ==> Parameters: admin(String)
2024-05-24 11:45:11.020 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.UserMapper.getUserByUserName : <== Total: 1
-2024-05-24 11:45:11.058 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.U.insertSelective : ==> Preparing: insert into t_user_event_log ( user_id, user_name, real_name, content, create_time ) values ( ?, ?, ?, ?, ? )
+2024-05-24 11:45:11.058 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.U.insertSelective : ==> Preparing: insert into t_user_event_log ( user_id, user_name, real_name, content, create_time ) values ( ?, ?, ?, ?, ? )
2024-05-24 11:45:11.063 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.U.insertSelective : ==> Parameters: 2(Integer), admin(String), 绠＄悊鍛�(String), admin 鐧诲綍浜嗗涔嬫�濆紑婧愯�冭瘯绯荤粺(String), 2024-05-24 11:45:11.021(Timestamp)
2024-05-24 11:45:11.372 DEBUG 10168 --- [XNIO-1 task-2] r.c.y.j.r.U.insertSelective : <== Updates: 1
-2024-05-24 11:45:12.226 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Preparing: SELECT count(*) from t_exam_paper where deleted=0
-2024-05-24 11:45:12.226 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Parameters:
+2024-05-24 11:45:12.226 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Preparing: SELECT count(*) from t_exam_paper where deleted=0
+2024-05-24 11:45:12.226 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Parameters:
2024-05-24 11:45:12.444 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : <== Total: 1
-2024-05-24 11:45:12.447 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.QuestionMapper.selectAllCount : ==> Preparing: SELECT count(*) from t_question where deleted=0
-2024-05-24 11:45:12.448 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.QuestionMapper.selectAllCount : ==> Parameters:
+2024-05-24 11:45:12.447 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.QuestionMapper.selectAllCount : ==> Preparing: SELECT count(*) from t_question where deleted=0
+2024-05-24 11:45:12.448 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.QuestionMapper.selectAllCount : ==> Parameters:
2024-05-24 11:45:12.508 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.QuestionMapper.selectAllCount : <== Total: 1
-2024-05-24 11:45:12.510 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Preparing: SELECT count(*) from t_exam_paper_answer
-2024-05-24 11:45:12.512 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Parameters:
+2024-05-24 11:45:12.510 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Preparing: SELECT count(*) from t_exam_paper_answer
+2024-05-24 11:45:12.512 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Parameters:
2024-05-24 11:45:12.562 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : <== Total: 1
-2024-05-24 11:45:12.563 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Preparing: SELECT count(*) from t_exam_paper_question_customer_answer
-2024-05-24 11:45:12.564 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Parameters:
+2024-05-24 11:45:12.563 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Preparing: SELECT count(*) from t_exam_paper_question_customer_answer
+2024-05-24 11:45:12.564 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : ==> Parameters:
2024-05-24 11:45:12.584 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectAllCount : <== Total: 1
-2024-05-24 11:45:12.592 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.U.selectCountByDate : ==> Preparing: SELECT create_time as name,COUNT(create_time) as value from ( SELECT DATE_FORMAT(create_time,'%Y-%m-%d') as create_time from t_user_event_log WHERE create_time between ? and ? ) a GROUP BY create_time
+2024-05-24 11:45:12.592 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.U.selectCountByDate : ==> Preparing: SELECT create_time as name,COUNT(create_time) as value from ( SELECT DATE_FORMAT(create_time,'%Y-%m-%d') as create_time from t_user_event_log WHERE create_time between ? and ? ) a GROUP BY create_time
2024-05-24 11:45:12.593 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.U.selectCountByDate : ==> Parameters: 2024-05-01 00:00:00.0(Timestamp), 2024-05-31 23:59:59.0(Timestamp)
2024-05-24 11:45:12.719 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.U.selectCountByDate : <== Total: 2
-2024-05-24 11:45:12.726 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectCountByDate : ==> Preparing: SELECT create_time as name,COUNT(create_time) as value from ( SELECT DATE_FORMAT(create_time,'%Y-%m-%d') as create_time from t_exam_paper_question_customer_answer WHERE create_time between ? and ? ) a GROUP BY create_time
+2024-05-24 11:45:12.726 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectCountByDate : ==> Preparing: SELECT create_time as name,COUNT(create_time) as value from ( SELECT DATE_FORMAT(create_time,'%Y-%m-%d') as create_time from t_exam_paper_question_customer_answer WHERE create_time between ? and ? ) a GROUP BY create_time
2024-05-24 11:45:12.729 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectCountByDate : ==> Parameters: 2024-05-01 00:00:00.0(Timestamp), 2024-05-31 23:59:59.0(Timestamp)
2024-05-24 11:45:12.732 DEBUG 10168 --- [XNIO-1 task-3] r.c.y.j.r.E.selectCountByDate : <== Total: 0
-2024-05-24 11:56:29.373 ERROR 10168 --- [XNIO-1 task-8] com.ycl.jxkg.utility.JsonUtil : Unrecognized token 'username': was expecting ('true', 'false' or 'null')
+2024-05-24 11:56:29.373 ERROR 10168 --- [XNIO-1 task-8] com.ycl.jxkg.utils.JsonUtil : Unrecognized token 'username': was expecting ('true', 'false' or 'null')
at [Source: (io.undertow.servlet.spec.ServletInputStreamImpl); line: 1, column: 10]
com.fasterxml.jackson.core.JsonParseException: Unrecognized token 'username': was expecting ('true', 'false' or 'null')
@@ -57,8 +57,8 @@
at com.fasterxml.jackson.databind.ObjectMapper._initForReading(ObjectMapper.java:4141)
at com.fasterxml.jackson.databind.ObjectMapper._readMapAndClose(ObjectMapper.java:4000)
at com.fasterxml.jackson.databind.ObjectMapper.readValue(ObjectMapper.java:3070)
- at com.ycl.jxkg.utility.JsonUtil.toJsonObject(JsonUtil.java:92)
- at com.ycl.jxkg.configuration.spring.security.RestLoginAuthenticationFilter.attemptAuthentication(RestLoginAuthenticationFilter.java:41)
+ at com.ycl.jxkg.utils.JsonUtil.toJsonObject(JsonUtil.java:92)
+ at com.ycl.jxkg.config.spring.security.RestLoginAuthenticationFilter.attemptAuthentication(RestLoginAuthenticationFilter.java:41)
at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:212)
at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)
at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)
@@ -116,8 +116,8 @@
2024-05-24 11:56:29.413 ERROR 10168 --- [XNIO-1 task-8] io.undertow.request : UT005023: Exception handling request to /api/user/login
-java.lang.NullPointerException: Cannot invoke "com.ycl.jxkg.configuration.spring.security.AuthenticationBean.isRemember()" because "authenticationBean" is null
- at com.ycl.jxkg.configuration.spring.security.RestLoginAuthenticationFilter.attemptAuthentication(RestLoginAuthenticationFilter.java:42)
+java.lang.NullPointerException: Cannot invoke "com.ycl.jxkg.config.spring.security.AuthenticationBean.isRemember()" because "authenticationBean" is null
+ at com.ycl.jxkg.config.spring.security.RestLoginAuthenticationFilter.attemptAuthentication(RestLoginAuthenticationFilter.java:42)
at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:212)
at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)
at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)
@@ -173,7 +173,7 @@
at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
at java.base/java.lang.Thread.run(Thread.java:833)
-2024-05-24 13:33:10.265 ERROR 10168 --- [XNIO-1 task-11] com.ycl.jxkg.utility.JsonUtil : Unrecognized token 'username': was expecting ('true', 'false' or 'null')
+2024-05-24 13:33:10.265 ERROR 10168 --- [XNIO-1 task-11] com.ycl.jxkg.utils.JsonUtil : Unrecognized token 'username': was expecting ('true', 'false' or 'null')
at [Source: (io.undertow.servlet.spec.ServletInputStreamImpl); line: 1, column: 10]
com.fasterxml.jackson.core.JsonParseException: Unrecognized token 'username': was expecting ('true', 'false' or 'null')
@@ -187,8 +187,8 @@
at com.fasterxml.jackson.databind.ObjectMapper._initForReading(ObjectMapper.java:4141)
at com.fasterxml.jackson.databind.ObjectMapper._readMapAndClose(ObjectMapper.java:4000)
at com.fasterxml.jackson.databind.ObjectMapper.readValue(ObjectMapper.java:3070)
- at com.ycl.jxkg.utility.JsonUtil.toJsonObject(JsonUtil.java:92)
- at com.ycl.jxkg.configuration.spring.security.RestLoginAuthenticationFilter.attemptAuthentication(RestLoginAuthenticationFilter.java:41)
+ at com.ycl.jxkg.utils.JsonUtil.toJsonObject(JsonUtil.java:92)
+ at com.ycl.jxkg.config.spring.security.RestLoginAuthenticationFilter.attemptAuthentication(RestLoginAuthenticationFilter.java:41)
at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:212)
at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)
at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)
@@ -246,8 +246,8 @@
2024-05-24 13:33:10.295 ERROR 10168 --- [XNIO-1 task-11] io.undertow.request : UT005023: Exception handling request to /api/user/login
-java.lang.NullPointerException: Cannot invoke "com.ycl.jxkg.configuration.spring.security.AuthenticationBean.isRemember()" because "authenticationBean" is null
- at com.ycl.jxkg.configuration.spring.security.RestLoginAuthenticationFilter.attemptAuthentication(RestLoginAuthenticationFilter.java:42)
+java.lang.NullPointerException: Cannot invoke "com.ycl.jxkg.config.spring.security.AuthenticationBean.isRemember()" because "authenticationBean" is null
+ at com.ycl.jxkg.config.spring.security.RestLoginAuthenticationFilter.attemptAuthentication(RestLoginAuthenticationFilter.java:42)
at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:212)
at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334)
at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116)
--
Gitblit v1.8.0