From e4a21963a581ed4f4776052732077728e2154c00 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 27 四月 2023 15:39:30 +0800
Subject: [PATCH] 增加config取消分页接口
---
.gitignore | 1
ardLog/logs/hikSdk.log | 4 +
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 12 +++
ardLog/logs/sys-error.log | 109 +++++++++++++++++++++++++++
ardLog/logs/sys-info.log | 10 ++
ardLog/logs/SdkLog_1_W.log | 84 ++++++++++++++------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 8 ++
ardLog/logs/sys-user.log | 3
8 files changed, 205 insertions(+), 26 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b19a568
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/ardLog/
diff --git a/ardLog/logs/SdkLog_1_W.log b/ardLog/logs/SdkLog_1_W.log
index 3dbb9c6..a7356b0 100644
--- a/ardLog/logs/SdkLog_1_W.log
+++ b/ardLog/logs/SdkLog_1_W.log
@@ -1,26 +1,58 @@
-[2023-04-24 12:16:49.513][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[D:/Workspaces/ard/RuoYi-Vue-master-pg/RuoYi-Vue-master/lib/zlib1.dll], hHandleRet[1836187648]
-[2023-04-24 12:16:49.513][INF] The COM:HCCoreBase ver is 6.1.4.15, 2020_03_05. Async:1.
-[2023-04-24 12:16:49.513][INF] The COM:Core ver is 6.1.9.47, 2022_11_11. Async:1.
-[2023-04-24 12:16:49.513][INF] This HCNetSDK ver is 6.1.9.47 Ver 2022_11_11.
-[2023-04-24 12:16:49.672][INF] Login dev 112.98.126.2:21502.
-[2023-04-24 12:16:49.672][INF] dwTotalNum[2048]
-[2023-04-24 12:16:49.697][INF] Private connect 112.98.126.2:21502 sock=4336 this=0x33292e44 cmd=0x10000 port=58009
-[2023-04-24 12:16:49.697][INF] LogonDev1 in[112.98.126.2:21502]
-[2023-04-24 12:16:49.701][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[D:/Workspaces/ard/RuoYi-Vue-master-pg/RuoYi-Vue-master/lib/libcrypto-1_1-x64.dll], hHandleRet[294649856]
-[2023-04-24 12:16:49.701][DBG] Load [libcrypto-1_1-x64.dll] SUCC, Real Path[D:\Workspaces\ard\RuoYi-Vue-master-pg\RuoYi-Vue-master\lib\libcrypto-1_1-x64.dll]
-[2023-04-24 12:16:49.703][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[D:/Workspaces/ard/RuoYi-Vue-master-pg/RuoYi-Vue-master/lib/libssl-1_1-x64.dll], hHandleRet[299761664]
-[2023-04-24 12:16:49.703][DBG] Load [libssl-1_1-x64.dll] SUCC, Real Path[D:\Workspaces\ard\RuoYi-Vue-master-pg\RuoYi-Vue-master\lib\libssl-1_1-x64.dll]
-[2023-04-24 12:16:49.703][INF] SSLTRANSAPI::IsAllAPILoaded, SSL_library_init Unload
-[2023-04-24 12:16:49.703][INF] OpenSSL, Not All Function Loaded!
-[2023-04-24 12:16:49.703][INF] SSLTRANSAPI::PrintVersion, OpenSSL version info [OpenSSL 1.1.1l 24 Aug 2021]
-[2023-04-24 12:16:49.703][INF] CSSLTrans::SSLCtxInit, dwSSLVersion[6], m_fnTLSServerMethod
-[2023-04-24 12:16:49.706][ERR] CSSLTrans::SSLTrans_CTX_Load_CA, invalid path[D:/Workspaces/ard/RuoYi-Vue-master-pg/RuoYi-Vue-master/lib/cert/\]
-[2023-04-24 12:16:50.258][INF] The COM:HCCoreBase ver is 6.1.4.15, 2020_03_05. Async:1.
-[2023-04-24 12:16:50.258][INF] The COM:Core ver is 6.1.9.47, 2022_11_11. Async:1.
-[2023-04-24 12:16:50.258][INF] This HCNetSDK ver is 6.1.9.47 Ver 2022_11_11.
-[2023-04-24 12:16:50.259][INF] Login dev 112.98.126.2:21400.
-[2023-04-24 12:16:51.287][INF] Private connect 112.98.126.2:21400 sock=4352 this=0x33292e44 cmd=0x10000 port=58010
-[2023-04-24 12:16:51.287][INF] LogonDev1 in[112.98.126.2:21400]
-[2023-04-24 12:16:56.299][ERR] LogonDev1[112.98.126.2]
-[2023-04-24 12:16:56.299][ERR] [112.98.126.2:21400]PRO_LoginHikDevice fail[err=10].[0x00000000,0x00000000]
-[2023-04-24 12:16:56.299][ERR] CMemberMgrBase::AllocIndex2, MemberStart Failed, iIndex[1]
+[2023-04-24 13:27:29.321][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[D:/Workspaces/ard/RuoYi-Vue-master/lib/zlib1.dll], hHandleRet[1840185344]
+[2023-04-24 13:27:29.321][INF] The COM:HCCoreBase ver is 6.1.4.15, 2020_03_05. Async:1.
+[2023-04-24 13:27:29.321][INF] The COM:Core ver is 6.1.9.47, 2022_11_11. Async:1.
+[2023-04-24 13:27:29.321][INF] This HCNetSDK ver is 6.1.9.47 Ver 2022_11_11.
+[2023-04-24 13:27:29.410][INF] Login dev 112.98.126.2:21502.
+[2023-04-24 13:27:29.410][INF] dwTotalNum[2048]
+[2023-04-24 13:27:29.441][INF] Private connect 112.98.126.2:21502 sock=4152 this=0x32f9e1f4 cmd=0x10000 port=57460
+[2023-04-24 13:27:29.441][INF] LogonDev1 in[112.98.126.2:21502]
+[2023-04-24 13:27:29.442][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[D:/Workspaces/ard/RuoYi-Vue-master/lib/libcrypto-1_1-x64.dll], hHandleRet[294649856]
+[2023-04-24 13:27:29.443][DBG] Load [libcrypto-1_1-x64.dll] SUCC, Real Path[D:\Workspaces\ard\RuoYi-Vue-master\lib\libcrypto-1_1-x64.dll]
+[2023-04-24 13:27:29.444][DBG] CCoreGlobalCtrlBase::LoadDSo, HPR_LoadDSo Succ, Path[D:/Workspaces/ard/RuoYi-Vue-master/lib/libssl-1_1-x64.dll], hHandleRet[612106240]
+[2023-04-24 13:27:29.444][DBG] Load [libssl-1_1-x64.dll] SUCC, Real Path[D:\Workspaces\ard\RuoYi-Vue-master\lib\libssl-1_1-x64.dll]
+[2023-04-24 13:27:29.444][INF] SSLTRANSAPI::IsAllAPILoaded, SSL_library_init Unload
+[2023-04-24 13:27:29.444][INF] OpenSSL, Not All Function Loaded!
+[2023-04-24 13:27:29.444][INF] SSLTRANSAPI::PrintVersion, OpenSSL version info [OpenSSL 1.1.1l 24 Aug 2021]
+[2023-04-24 13:27:29.444][INF] CSSLTrans::SSLCtxInit, dwSSLVersion[6], m_fnTLSServerMethod
+[2023-04-24 13:27:29.446][ERR] CSSLTrans::SSLTrans_CTX_Load_CA, invalid path[D:/Workspaces/ard/RuoYi-Vue-master/lib/cert/\]
+[2023-04-24 13:27:29.895][INF] The COM:HCCoreBase ver is 6.1.4.15, 2020_03_05. Async:1.
+[2023-04-24 13:27:29.895][INF] The COM:Core ver is 6.1.9.47, 2022_11_11. Async:1.
+[2023-04-24 13:27:29.895][INF] This HCNetSDK ver is 6.1.9.47 Ver 2022_11_11.
+[2023-04-24 13:27:29.895][INF] Login dev 112.98.126.2:21400.
+[2023-04-24 13:27:29.929][INF] Private connect 112.98.126.2:21400 sock=4184 this=0x32f9e1f4 cmd=0x10000 port=57461
+[2023-04-24 13:27:29.929][INF] LogonDev1 in[112.98.126.2:21400]
+[2023-04-24 13:27:34.931][ERR] LogonDev1[112.98.126.2]
+[2023-04-24 13:27:34.931][ERR] [112.98.126.2:21400]PRO_LoginHikDevice fail[err=10].[0x00000000,0x00000000]
+[2023-04-24 13:27:34.931][ERR] CMemberMgrBase::AllocIndex2, MemberStart Failed, iIndex[1]
+[2023-04-24 13:28:49.220][DBG] CComBase::Load, Load szDllPath[D:/Workspaces/ard/RuoYi-Vue-master/lib/HCNetSDKCom/HCVoiceTalk.dll] SUCC
+[2023-04-24 13:28:49.220][INF] AbilityAnalyze---Init-- start
+[2023-04-24 13:28:49.220][ERR] AbilityAnalyze---open zip package error, package path D:/Workspaces/ard/RuoYi-Vue-master/lib/LocalXml.zip
+[2023-04-24 13:28:49.220][INF] The COM:VoiceTalk ver is 6.1.9.47, 2022_11_11.
+[2023-04-24 13:28:49.222][DBG] CComBase::Load, Load szDllPath[D:/Workspaces/ard/RuoYi-Vue-master/lib/HCNetSDKCom/HCGeneralCfgMgr.dll] SUCC
+[2023-04-24 13:28:49.223][INF] The COM:HCGeneralCfgMgr ver is 6.1.9.47, 2022_11_11.
+[2023-04-24 13:28:49.225][DBG] CComBase::Load, Load szDllPath[D:/Workspaces/ard/RuoYi-Vue-master/lib/HCNetSDKCom/HCPlayBack.dll] SUCC
+[2023-04-24 13:28:49.225][INF] The COM:HCPlayback ver is 6.1.9.47, 2022_11_11.
+[2023-04-24 13:28:49.227][DBG] CComBase::Load, Load szDllPath[D:/Workspaces/ard/RuoYi-Vue-master/lib/HCNetSDKCom/HCIndustry.dll] SUCC
+[2023-04-24 13:28:49.227][INF] The COM:HCIndustry ver is 6.1.9.47, 2022_11_11.
+[2023-04-24 13:28:49.229][DBG] CComBase::Load, Load szDllPath[D:/Workspaces/ard/RuoYi-Vue-master/lib/HCNetSDKCom/HCDisplay.dll] SUCC
+[2023-04-24 13:28:49.229][INF] The COM:HCDisplay ver is 6.1.9.47, 2022_11_11.
+[2023-04-24 13:28:49.231][DBG] CComBase::Load, Load szDllPath[D:/Workspaces/ard/RuoYi-Vue-master/lib/HCNetSDKCom/HCPreview.dll] SUCC
+[2023-04-24 13:28:49.231][INF] The COM:Preview ver is 6.1.9.47, 2022_11_11.
+[2023-04-24 13:28:49.233][DBG] CComBase::Load, Load szDllPath[D:/Workspaces/ard/RuoYi-Vue-master/lib/HCNetSDKCom/HCAlarm.dll] SUCC
+[2023-04-24 13:28:49.233][INF] The COM:HCAlarm ver is 6.1.9.47, 2022_11_11.
+[2023-04-24 13:28:49.279][INF] Private connect 112.98.126.2:21502 sock=7332 this=0x32f9e1f4 cmd=0x30292 port=60567
+[2023-04-24 13:28:59.488][INF] Private connect 112.98.126.2:21502 sock=7184 this=0x32f9e1f4 cmd=0x30203 port=52452
+[2023-04-24 13:28:59.809][INF] Private connect 112.98.126.2:21502 sock=7360 this=0x32f9e1f4 cmd=0x30203 port=52453
+[2023-04-24 13:29:01.030][INF] Private connect 112.98.126.2:21502 sock=7416 this=0x32f9e1f4 cmd=0x30203 port=60604
+[2023-04-24 13:29:01.046][INF] Private connect 112.98.126.2:21502 sock=7404 this=0x32f9e960 cmd=0x30203 port=60605
+[2023-04-24 13:29:02.087][INF] Private connect 112.98.126.2:21502 sock=7480 this=0x32f9e1f4 cmd=0x30203 port=61577
+[2023-04-24 13:29:02.332][INF] Private connect 112.98.126.2:21502 sock=7512 this=0x32f9e1f4 cmd=0x30203 port=61578
+[2023-04-24 13:29:03.321][INF] Private connect 112.98.126.2:21502 sock=7556 this=0x32f9e1f4 cmd=0x30203 port=61579
+[2023-04-24 13:29:03.742][INF] Private connect 112.98.126.2:21502 sock=7592 this=0x32f9e1f4 cmd=0x30203 port=61580
+[2023-04-24 13:29:05.327][INF] Private connect 112.98.126.2:21502 sock=7628 this=0x32f9e1f4 cmd=0x30203 port=61581
+[2023-04-24 13:29:06.068][INF] Private connect 112.98.126.2:21502 sock=7680 this=0x32f9e1f4 cmd=0x30203 port=50409
+[2023-04-24 13:29:07.592][INF] Private connect 112.98.126.2:21502 sock=7696 this=0x32f9e1f4 cmd=0x30203 port=58175
+[2023-04-24 13:29:10.126][INF] Private connect 112.98.126.2:21502 sock=7744 this=0x32f9e1f4 cmd=0x30203 port=58837
+[2023-04-24 13:29:23.995][INF] Private connect 112.98.126.2:21502 sock=7760 this=0x32f9e1f4 cmd=0x111070 port=62632
+[2023-04-24 13:29:24.051][DBG] COM_CaptureJPEGPicture_NEW [0, 1, 1049503136, 1101070400, 1101070400, 1048576]
+[2023-04-24 13:29:24.090][INF] Private connect 112.98.126.2:21502 sock=7760 this=0x32f9e1f4 cmd=0x30009 port=62633
diff --git a/ardLog/logs/hikSdk.log b/ardLog/logs/hikSdk.log
index b695c64..c5910c4 100644
--- a/ardLog/logs/hikSdk.log
+++ b/ardLog/logs/hikSdk.log
@@ -42,3 +42,7 @@
11:05:13.945 [http-nio-8080-exec-24] INFO hikSdk - [picCutCate,1135] - 涓婁紶鏂囦欢鎴愬姛!http://192.168.1.15:9001/pic/20230424/ce38d4d3f0c848cab48fc6b59f3a7182.jpeg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20230424%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230424T030513Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=05a6f43cb9636afe4a933ea241659e191f6887d26ca7f30cca29e5bd72cd691d
12:16:50.229 [loginExecutor-1] INFO hikSdk - [loginAll,172] - 鐩告満112.98.126.2:21502鐧诲綍鎴愬姛锛�0
12:16:56.299 [loginExecutor-1] INFO hikSdk - [loginAll,175] - 鐩告満112.98.126.2:21400鐧诲綍澶辫触锛�-1
+13:27:29.869 [loginExecutor-1] INFO hikSdk - [loginAll,172] - 鐩告満112.98.126.2:21502鐧诲綍鎴愬姛锛�0
+13:27:34.931 [loginExecutor-1] INFO hikSdk - [loginAll,175] - 鐩告満112.98.126.2:21400鐧诲綍澶辫触锛�-1
+13:29:24.845 [http-nio-8080-exec-25] INFO hikSdk - [captureJPEGPicture,1045] - -----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------true
+13:29:24.909 [http-nio-8080-exec-25] INFO hikSdk - [captureJPEGPicture,1051] - -----------澶勭悊瀹屾垚鎴浘鏁版嵁----------
diff --git a/ardLog/logs/sys-error.log b/ardLog/logs/sys-error.log
index 0f53680..84f6769 100644
--- a/ardLog/logs/sys-error.log
+++ b/ardLog/logs/sys-error.log
@@ -472,3 +472,112 @@
at com.sun.jna.Native.extractFromResourcePath(Native.java:1145)
at com.sun.jna.NativeLibrary.loadLibrary(NativeLibrary.java:281)
... 46 common frames omitted
+13:28:37.894 [http-nio-8080-exec-1] ERROR c.r.f.w.e.GlobalExceptionHandler - [handleServiceException,57] - 鑾峰彇鐢ㄦ埛淇℃伅寮傚父
+com.ruoyi.common.exception.ServiceException: 鑾峰彇鐢ㄦ埛淇℃伅寮傚父
+ at com.ruoyi.common.utils.SecurityUtils.getLoginUser(SecurityUtils.java:73)
+ at com.ruoyi.web.controller.system.SysLoginController.getInfo(SysLoginController.java:70)
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ at java.lang.reflect.Method.invoke(Method.java:498)
+ at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:205)
+ at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:150)
+ at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:117)
+ at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:895)
+ at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808)
+ at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)
+ at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1067)
+ at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:963)
+ at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)
+ at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898)
+ at javax.servlet.http.HttpServlet.service(HttpServlet.java:655)
+ at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)
+ at javax.servlet.http.HttpServlet.service(HttpServlet.java:764)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:111)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:111)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:114)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at com.ruoyi.common.filter.RepeatableFilter.doFilter(RepeatableFilter.java:39)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:327)
+ at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:115)
+ at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:81)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:121)
+ at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:115)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:126)
+ at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:81)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:105)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:149)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter.doFilterInternal(JwtAuthenticationTokenFilter.java:42)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:111)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:103)
+ at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:89)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.header.HeaderWriterFilter.doHeadersAfter(HeaderWriterFilter.java:90)
+ at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:75)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:110)
+ at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:80)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:55)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+ at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:336)
+ at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:211)
+ at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:183)
+ at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:354)
+ at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:267)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
+ at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:117)
+ at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
+ at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
+ at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:197)
+ at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97)
+ at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541)
+ at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:135)
+ at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
+ at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
+ at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:360)
+ at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:399)
+ at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
+ at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:890)
+ at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1743)
+ at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
+ at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191)
+ at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659)
+ at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
+ at java.lang.Thread.run(Thread.java:748)
diff --git a/ardLog/logs/sys-info.log b/ardLog/logs/sys-info.log
index d860ce2..a12fbbf 100644
--- a/ardLog/logs/sys-info.log
+++ b/ardLog/logs/sys-info.log
@@ -83,3 +83,13 @@
12:16:50.229 [loginExecutor-1] INFO hikSdk - [loginAll,172] - 鐩告満112.98.126.2:21502鐧诲綍鎴愬姛锛�0
12:16:54.620 [restartedMain] INFO c.r.RuoYiApplication - [logStarted,61] - Started RuoYiApplication in 47.31 seconds (JVM running for 49.117)
12:16:56.299 [loginExecutor-1] INFO hikSdk - [loginAll,175] - 鐩告満112.98.126.2:21400鐧诲綍澶辫触锛�-1
+13:27:20.224 [restartedMain] INFO c.r.RuoYiApplication - [logStarting,55] - Starting RuoYiApplication using Java 1.8.0_202 on FQ-AEMXTINJBENH with PID 4064 (D:\Workspaces\ard\RuoYi-Vue-master\ruoyi-admin\target\classes started by Administrator in D:\Workspaces\ard\RuoYi-Vue-master)
+13:27:20.226 [restartedMain] INFO c.r.RuoYiApplication - [logStartupProfileInfo,686] - The following 2 profiles are active: "druid", "ard"
+13:27:29.869 [loginExecutor-1] INFO hikSdk - [loginAll,172] - 鐩告満112.98.126.2:21502鐧诲綍鎴愬姛锛�0
+13:27:32.602 [restartedMain] INFO c.r.RuoYiApplication - [logStarted,61] - Started RuoYiApplication in 12.772 seconds (JVM running for 13.938)
+13:27:34.931 [loginExecutor-1] INFO hikSdk - [loginAll,175] - 鐩告満112.98.126.2:21400鐧诲綍澶辫触锛�-1
+13:28:40.843 [schedule-pool-1] INFO sys-user - [run,55] - [127.0.0.1]鍐呯綉IP[admin][Success][鐧诲綍鎴愬姛]
+13:28:46.087 [schedule-pool-1] INFO sys-user - [run,55] - [127.0.0.1]鍐呯綉IP[admin][Success][鐧诲綍鎴愬姛]
+13:29:24.845 [http-nio-8080-exec-25] INFO hikSdk - [captureJPEGPicture,1045] - -----------杩欓噷寮�濮嬪浘鐗囧瓨鍏ュ唴瀛�----------true
+13:29:24.909 [http-nio-8080-exec-25] INFO hikSdk - [captureJPEGPicture,1051] - -----------澶勭悊瀹屾垚鎴浘鏁版嵁----------
+13:31:17.994 [SpringApplicationShutdownHook] INFO sys-user - [shutdownAsyncManager,31] - ====鍏抽棴鍚庡彴浠诲姟浠诲姟绾跨▼姹�====
diff --git a/ardLog/logs/sys-user.log b/ardLog/logs/sys-user.log
index 5b29498..fec9b80 100644
--- a/ardLog/logs/sys-user.log
+++ b/ardLog/logs/sys-user.log
@@ -12,3 +12,6 @@
11:02:14.420 [SpringApplicationShutdownHook] INFO sys-user - [shutdownAsyncManager,31] - ====鍏抽棴鍚庡彴浠诲姟浠诲姟绾跨▼姹�====
11:04:45.885 [schedule-pool-2] INFO sys-user - [run,55] - [127.0.0.1]鍐呯綉IP[admin][Success][鐧诲綍鎴愬姛]
12:14:57.184 [restartedMain] INFO sys-user - [shutdownAsyncManager,31] - ====鍏抽棴鍚庡彴浠诲姟浠诲姟绾跨▼姹�====
+13:28:40.843 [schedule-pool-1] INFO sys-user - [run,55] - [127.0.0.1]鍐呯綉IP[admin][Success][鐧诲綍鎴愬姛]
+13:28:46.087 [schedule-pool-1] INFO sys-user - [run,55] - [127.0.0.1]鍐呯綉IP[admin][Success][鐧诲綍鎴愬姛]
+13:31:17.994 [SpringApplicationShutdownHook] INFO sys-user - [shutdownAsyncManager,31] - ====鍏抽棴鍚庡彴浠诲姟浠诲姟绾跨▼姹�====
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 93b2664..72581a4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -47,6 +47,14 @@
return getDataTable(list);
}
+ @PreAuthorize("@ss.hasPermi('system:config:list')")
+ @GetMapping("/lists")
+ public AjaxResult lists(SysConfig config)
+ {
+ List<SysConfig> list = configService.selectConfigList(config);
+ return toAjaxList(list);
+ }
+
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:config:export')")
@PostMapping("/export")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 2a33326..5ccd601 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -148,6 +148,18 @@
{
return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
+
+ /**
+ * 鍝嶅簲杩斿洖缁撴灉
+ *
+ * @param list 褰卞搷鐨勯泦鍚�
+ * @return 鎿嶄綔缁撴灉
+ */
+ protected AjaxResult toAjaxList(List list)
+ {
+ return list.size() > 0 ? AjaxResult.success(list) : AjaxResult.error();
+ }
+
/**
* 鍝嶅簲杩斿洖缁撴灉
*
--
Gitblit v1.9.3