| 
															
																@@ -92,9 +92,6 @@ public class LogAspect 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             // 请求的地址
 
															 | 
															
															 | 
															
																             // 请求的地址
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
 
															 | 
															
															 | 
															
																             String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             operLog.setOperIp(ip);
 
															 | 
															
															 | 
															
																             operLog.setOperIp(ip);
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            // 返回参数
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            operLog.setJsonResult(JSON.toJSONString(jsonResult));
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
 
															 | 
															
															 | 
															
																             operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             if (loginUser != null)
 
															 | 
															
															 | 
															
																             if (loginUser != null)
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             {
 
															 | 
															
															 | 
															
																             {
 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -113,7 +110,7 @@ public class LogAspect 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             // 设置请求方式
 
															 | 
															
															 | 
															
																             // 设置请求方式
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
 
															 | 
															
															 | 
															
																             operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             // 处理设置注解上的参数
 
															 | 
															
															 | 
															
																             // 处理设置注解上的参数
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-            getControllerMethodDescription(joinPoint, controllerLog, operLog);
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             // 保存数据库
 
															 | 
															
															 | 
															
																             // 保存数据库
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
 
															 | 
															
															 | 
															
																             AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -133,7 +130,7 @@ public class LogAspect 
															 | 
														
													
												
													
														
															| 
															 | 
															
																      * @param operLog 操作日志
 
															 | 
															
															 | 
															
																      * @param operLog 操作日志
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																      * @throws Exception
 
															 | 
															
															 | 
															
																      * @throws Exception
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																      */
 
															 | 
															
															 | 
															
																      */
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																-    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception
 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     {
 
															 | 
															
															 | 
															
																     {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         // 设置action动作
 
															 | 
															
															 | 
															
																         // 设置action动作
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         operLog.setBusinessType(log.businessType().ordinal());
 
															 | 
															
															 | 
															
																         operLog.setBusinessType(log.businessType().ordinal());
 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@@ -147,6 +144,11 @@ public class LogAspect 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             // 获取参数的信息,传入到数据库中。
 
															 | 
															
															 | 
															
																             // 获取参数的信息,传入到数据库中。
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																             setRequestValue(joinPoint, operLog);
 
															 | 
															
															 | 
															
																             setRequestValue(joinPoint, operLog);
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																         }
 
															 | 
															
															 | 
															
																         }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        // 是否需要保存response,参数和值
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        {
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+            operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000));
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																+        }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     }
 
															 | 
															
															 | 
															
																     }
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
 
															 | 
															
															 | 
															
																 
 
															 | 
														
													
												
													
														
															| 
															 | 
															
																     /**
 
															 | 
															
															 | 
															
																     /**
 
															 |