修改日志

pom.xml

@@ -28,7 +28,7 @@
 
     <junit.version>3.8.1</junit.version>
 
-    <jfinal.version>5.0.8</jfinal.version>
+    <jfinal.version>5.1.2.4</jfinal.version>
 
     <cos.version>2017.5</cos.version>
 
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>com.archser</groupId>
       <artifactId>jfinal</artifactId>
-        <version>5.0.8</version>
+        <version>5.1.3.1</version>
     </dependency>
 	<!-- 东方通依赖 -->
    <!--  <dependency>

src/main/java/com/archser/aserver/common/config/MainConfig.java

@@ -10,6 +10,7 @@ import com.archser.aserver.model._MappingKit;
 import com.archser.aserver.util.SharedDisk;
 import com.archser.aserver.websocket.MessageWebSocket;
 import com.jfinal.config.*;
+import com.jfinal.ext.handler.RequestHandler;
 import com.jfinal.ext.handler.UrlSkipHandler;
 import com.jfinal.ext.proxy.CglibProxyFactory;
 import com.jfinal.json.MixedJsonFactory;
@@ -200,9 +201,10 @@ public class MainConfig extends JFinalConfig {
   @Override
   public void configHandler(Handlers me) {
     // 说明：druid的统计页面涉及安全性 需要自行处理根据登录权限判断是否能访问统计页面
-    // me.add(DruidKit.getDruidStatViewHandler()); // druid 统计页面功能
+    // me.add(DruidKit.getDruidStatViewHandler()); // druid 统a计页面功能
     me.add(new UrlSkipHandler("^/services/.+", false));
     me.add(new UrlSkipHandler("/*\\.ws/", false));
+    me.add(new RequestHandler());
   }
 
   /**

src/main/java/com/archser/aserver/controller/HelperController.java

 package com.archser.aserver.controller;
 
+import com.archser.aserver.util.FinalStringUtil;
 import java.io.File;
 import java.net.URLEncoder;
 import javax.servlet.http.HttpServletRequest;
@@ -38,10 +39,10 @@ public class HelperController extends Controller {
       String searchText = getPara("searchText","");
       Page<Helper> list = helperService.getList(pageNumber, pageSize,searchText);
       renderJson(Ret.ok("list",list));
-      logService.saveAsLog("access", username, JwtInterceptor.getIpAddr(getRequest()), "应用管理-帮助中心-帮助中心","aserver");
+      logService.saveAsLog("access", "应用管理-帮助中心-帮助中心", FinalStringUtil.QUERY);
     } catch (Exception e) {
       e.printStackTrace();
-      logService.saveAsLogByFile("error",username,"应用管理-帮助中心-获取帮助中心数据错误",null,e.getMessage(),JwtInterceptor.getIpAddr(getRequest()));
+      logService.saveAsLogByFile("error","应用管理-帮助中心-获取帮助中心数据错误",null,e.getMessage(),FinalStringUtil.QUERY);
       renderJson(Ret.fail("message","服务器出现异常,请联系管理员!"));
     }
   }
@@ -54,15 +55,15 @@ public class HelperController extends Controller {
       String description = getPara("description");
       Integer type = getParaToInt("type");
       if (helperService.add(file, name, description, type)){
-        logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()), "应用管理-帮助中心-添加帮助中心数据成功","aserver");
+        logService.saveAsLog("operate", "应用管理-帮助中心-添加帮助中心数据成功",FinalStringUtil.ADD);
         renderJson(Ret.ok("data", "添加成功!"));
         return;
       }
-      logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()), "应用管理-帮助中心-添加帮助中心数据失败","aserver");
+      logService.saveAsLog("operate", "应用管理-帮助中心-添加帮助中心数据失败",FinalStringUtil.ADD);
       renderJson(Ret.ok("data", "添加失败!"));
     } catch (Exception e) {
       e.printStackTrace();
-      logService.saveAsLogByFile("error",username,"应用管理-帮助中心-添加帮助中心数据错误",null,e.getMessage(),JwtInterceptor.getIpAddr(getRequest()));
+      logService.saveAsLogByFile("error","应用管理-帮助中心-添加帮助中心数据错误",null,e.getMessage(),FinalStringUtil.ADD);
       renderJson(Ret.fail("msg","服务器出现异常,请联系管理员!"));
     }
   }
@@ -75,15 +76,15 @@ public class HelperController extends Controller {
       String description = getPara("description");
       Integer type = getParaToInt("type");
       if (helperService.edit(id, name, description, type)){
-        logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()), "应用管理-帮助中心-修改帮助中心数据成功","aserver");
+        logService.saveAsLog("operate", "应用管理-帮助中心-修改帮助中心数据成功",FinalStringUtil.UPDATE);
         renderJson(Ret.ok("msg", "修改成功"));
       } else {
-        logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()), "应用管理-帮助中心-修改帮助中心数据失败","aserver");
+        logService.saveAsLog("operate", "应用管理-帮助中心-修改帮助中心数据失败",FinalStringUtil.UPDATE);
         renderJson(Ret.fail("msg","修改失败!"));
       }
     } catch (Exception e) {
       e.printStackTrace();
-      logService.saveAsLogByFile("error",username,"应用管理-帮助中心-修改帮助中心数据错误",null,e.getMessage(),JwtInterceptor.getIpAddr(getRequest()));
+      logService.saveAsLogByFile("error","应用管理-帮助中心-修改帮助中心数据错误",null,e.getMessage(),FinalStringUtil.UPDATE);
       renderJson(Ret.fail("msg","服务器出现异常,请联系管理员!"));
     }
   }
@@ -93,15 +94,15 @@ public class HelperController extends Controller {
     try {
       String ids = getPara("ids");
       if ( helperService.remove(ids)){
-        logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()), "应用管理-帮助中心-删除帮助中心数据成功","aserver");
+        logService.saveAsLog("operate", "应用管理-帮助中心-删除帮助中心数据成功",FinalStringUtil.DELETE);
         renderJson(Ret.ok("msg", "删除成功!"));
       } else {
-        logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()), "应用管理-帮助中心-删除帮助中心数据失败","aserver");
+        logService.saveAsLog("operate", "应用管理-帮助中心-删除帮助中心数据失败",FinalStringUtil.DELETE);
         renderJson(Ret.fail("msg","删除失败!"));
       }
     } catch (Exception e) {
       e.printStackTrace();
-      logService.saveAsLogByFile("error",username,"应用管理-帮助中心-删除帮助中心数据错误",null,e.getMessage(),JwtInterceptor.getIpAddr(getRequest()));
+      logService.saveAsLogByFile("error","应用管理-帮助中心-删除帮助中心数据错误",null,e.getMessage(),FinalStringUtil.DELETE);
       renderJson(Ret.fail("msg","服务器出现异常,请联系管理员!"));
     }
   }

src/main/java/com/archser/aserver/controller/IndexController.java

 package com.archser.aserver.controller;
 
+import com.archser.aserver.util.FinalStringUtil;
 import com.archser.aserver.util.redis.InfoSystem;
 import com.archser.aserver.util.redis.InfoUser;
 import java.math.BigInteger;
@@ -86,13 +87,12 @@ public class IndexController extends Controller {
 		int a = userService.updatePwd(password, username);
 		if (a == 0) {
 			this.renderJson(Ret.fail("msg", "修改失败"));
-			logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()),
-					username + "修改密码操作:修改密码失败", "aserver");
+			logService.saveAsLog("operate",
+					username + "修改密码操作:修改密码失败", FinalStringUtil.UPDATE);
 			return;
 		}
 		this.renderJson(Ret.ok("msg", "修改成功"));
-		logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()), username + "修改密码操作:修改密码成功",
-				"aserver");
+		logService.saveAsLog("operate", username + "修改密码操作:修改密码成功", FinalStringUtil.UPDATE);
 	}
 
 	private String decrypt(String sm2Cipher) throws InvalidCipherTextException {
@@ -124,7 +124,7 @@ public class IndexController extends Controller {
 		User user = InfoUser.getUser(username);
 		if (user == null) {
 			this.renderJson(Ret.fail("msg", "用户名或密码不存在: " + username));
-			logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "该用户非本系统用户正在非法登录", app);
+			logService.saveAsLog("login", "该用户非本系统用户正在非法登录", FinalStringUtil.QUERY);
 			return;
 		}
 		/**chenyong 20201116 add 增加演示时提醒 start**/
@@ -154,13 +154,13 @@ public class IndexController extends Controller {
 			boolean isExistThreeMemberUsers = userCount != null && (userCount > 0);
 			if (isExistThreeMemberUsers) {
 				this.renderJson(Ret.fail("msg", "已开启三员管理，admin失效了。"));
-				logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "登录失败,原因:已开启三员管理", app);
+				logService.saveAsLog("login", "登录失败,原因:已开启三员管理", FinalStringUtil.QUERY);
 				return;
 			}
 		}
 		if (user.getLocked() != null && Integer.parseInt(user.getLocked()) == 1) {
 			this.renderJson(Ret.fail("msg", "当前账户已被锁定"));
-			logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "登录失败,原因:该用户已被锁定", app);
+			logService.saveAsLog("login","登录失败,原因:该用户已被锁定", FinalStringUtil.QUERY);
 			return;
 		}
 		if (!password.equals(user.getPassword())) {
@@ -172,8 +172,7 @@ public class IndexController extends Controller {
 					this.renderJson(Ret.fail("msg", "用户名或密码验证失败,您的账户于两小时后才可登录！"));
 				} else {
 					this.renderJson(Ret.fail("msg", "用户名或密码验证失败,您还有" + errorCount + "次机会！"));
-					logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "登录失败,原因:密码验证错误",
-							app);
+					logService.saveAsLog("login", "登录失败,原因:密码验证错误", FinalStringUtil.QUERY);
 				}
 			}
 			return ;
@@ -201,8 +200,7 @@ public class IndexController extends Controller {
 			boolean noLockedRolesFlag = noLockedRolesCount != null && (noLockedRolesCount > 0);
 			if (!noLockedRolesFlag) {
 				this.renderJson(Ret.fail("msg", "拥有的角色全部被锁定，不能登录系统了。"));
-				logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "登录失败,原因:该用户拥有的角色全部被锁定",
-						app);
+				logService.saveAsLog("login", "登录失败,原因:该用户拥有的角色全部被锁定", FinalStringUtil.QUERY);
 				return;
 			}
 		}
@@ -210,14 +208,12 @@ public class IndexController extends Controller {
 		System system = InfoSystem.getSystem(app);
 		if (system == null) {
 			this.renderJson(Ret.fail("msg", "没有找到应用：" + app));
-			logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "登录失败,原因:没有找到应用" + app,
-					app);
+			logService.saveAsLog("login", "登录失败,原因:没有找到应用" + app, FinalStringUtil.QUERY);
 			return;
 		}
 		if (StrKit.isBlank(system.getPrivatekey()) || StrKit.isBlank(system.getKeyid())) {
 			this.renderJson(Ret.fail("msg", "没有找到应用的密钥：" + app));
-			logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "登录失败,原因:没有找到应用的密钥" + app,
-					app);
+			logService.saveAsLog("login", "登录失败,原因:没有找到应用的密钥" + app, FinalStringUtil.QUERY);
 			return;
 		}
 
@@ -235,8 +231,8 @@ public class IndexController extends Controller {
 		if (!"admin".equals(user.getUsername())) {
 			if ((systemList == null || systemList.isEmpty())) {
 				this.renderJson(Ret.fail("msg", "您没有权限登录" + system.getTitle() + "系统"));
-				logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()),
-						"登录失败,原因:您没有权限登录此系统" + app, app);
+				logService.saveAsLog("login",
+						"登录失败,原因:您没有权限登录此系统" + app, FinalStringUtil.QUERY);
 				return;
 			}
 
@@ -270,14 +266,14 @@ public class IndexController extends Controller {
 
 			Boolean aBoolean = userService.verifyPassword(verify);
 			this.renderJson(Ret.ok("token", jws).set("callback", callback).set("verify",aBoolean));
-			logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), username + "登录" + app + "成功", app);
+			logService.saveAsLog("login", username + "登录" + app + "成功", FinalStringUtil.QUERY);
 			/**
 			 * 20200706 lidecai 将用户信息保存到Redis end
 			 */
 		} catch (Exception e) {
 			log.error("生成登录票据失败", e);
 			this.renderJson(Ret.fail("msg", "生成登录票据失败"));
-			logService.saveAsLog("login", username, JwtInterceptor.getIpAddr(getRequest()), "生成登录票据失败", app);
+			logService.saveAsLog("login", "生成登录票据失败", FinalStringUtil.QUERY);
 		}
 	}
 	
@@ -512,12 +508,11 @@ public class IndexController extends Controller {
 					// 签名
 					.signWith(KeysUtil.privatekey(system.getPrivatekey()), SignatureAlgorithm.RS256).compact();
 			this.renderJson(Ret.ok("token", jws));
-			logService.saveAsLog("login", userName, JwtInterceptor.getIpAddr(getRequest()),
-					userName + "登录" + app + "成功", app);
+			logService.saveAsLog("login", userName + "登录" + app + "成功", FinalStringUtil.QUERY);
 		} catch (Exception e) {
 			log.error("生成登录票据失败", e);
 			this.renderJson(Ret.fail("msg", "生成登录票据失败"));
-			logService.saveAsLog("login", userName, JwtInterceptor.getIpAddr(getRequest()), "生成登录票据失败", app);
+			logService.saveAsLog("login", "生成登录票据失败", FinalStringUtil.QUERY);
 		}
 	}
 

src/main/java/com/archser/aserver/controller/MenuController.java

 package com.archser.aserver.controller;
 
+import com.archser.aserver.util.FinalStringUtil;
 import com.archser.aserver.util.redis.InfoSystem;
 import com.archser.aserver.util.redis.InfoUser;
 import java.util.ArrayList;
@@ -125,12 +126,10 @@ public class MenuController extends Controller {
     System systemStr = System.dao.findById(MeunStr.getSystemId());
     if (star.save()) {
       this.renderJson(Ret.ok("star", star.getId()));
-      logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()),
-          MeunStr.getTitle() + "-菜单加星成功", systemStr.getName());
+      logService.saveAsLog("operate", MeunStr.getTitle() + "-菜单加星成功", FinalStringUtil.ADD);
     } else {
       this.renderJson(Ret.fail("msg", "菜单加星操作失败"));
-      logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()),
-          MeunStr.getTitle() + "-菜单加星失败", systemStr.getName());
+      logService.saveAsLog("operate", MeunStr.getTitle() + "-菜单加星失败", FinalStringUtil.ADD);
     }
   }
 
@@ -148,8 +147,7 @@ public class MenuController extends Controller {
     System systemStr = System.dao.findById(MeunStr.getSystemId());
     Db.update(Db.getSqlPara("deleteMenuStar", Kv.by("userId", userId).set("menuId", menuId)));
     this.renderJson(Ret.ok("star", 0));
-    logService.saveAsLog("operate", username, JwtInterceptor.getIpAddr(getRequest()),
-        MeunStr.getTitle() + "-菜单取消加星成功", systemStr.getName());
+    logService.saveAsLog("operate", MeunStr.getTitle() + "-菜单取消加星成功", FinalStringUtil.DELETE);
   }
 
   /**
@@ -175,7 +173,7 @@ public class MenuController extends Controller {
     String username = getAttr("username");
     String ip = JwtInterceptor.getIpAddr(getRequest());
     String content = title + "-功能访问-" + routName;
-    logService.saveAsLog("access", username, ip, content, app);
+    logService.saveAsLog("access", content, FinalStringUtil.QUERY);
     renderJson(Ret.ok());
 
   }

src/main/java/com/archser/aserver/controller/MessageController.java

 package com.archser.aserver.controller;
 
+import com.archser.aserver.util.FinalStringUtil;
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
 
@@ -82,12 +83,10 @@ public class MessageController extends Controller {
 		  boolean deleted = this.messageService.deleteMessage(ids.split(","));
 		  if (deleted) {
 			  renderJson(Ret.ok());
-			  logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-						"个人首页-消息中心-删除消息-" + "-已删除了"+ids.split(",").length+"个消息","aserver");			  
+			  logService.saveAsLog("operate", "个人首页-消息中心-删除消息-" + "-已删除了"+ids.split(",").length+"个消息", FinalStringUtil.DELETE);
 		}else {
 			 renderJson(Ret.fail());
-			 logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-						"个人首页-消息中心-删除消息-删除消息失败","aserver");
+			 logService.saveAsLog("operate", "个人首页-消息中心-删除消息-删除消息失败",FinalStringUtil.DELETE);
 		}
 	  }
 	  

src/main/java/com/archser/aserver/controller/SettingController.java

 package com.archser.aserver.controller;
 
+import com.archser.aserver.util.FinalStringUtil;
 import com.jfinal.kit.PropKit;
 import java.io.File;
 import java.io.FileInputStream;
@@ -74,11 +75,9 @@ public class SettingController extends Controller {
     /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 start */
     if (configs != null && configs.size() != 0) {
       this.renderJson(Ret.ok("configs", configs));
-      logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-          "应用管理-配置-查询数据包含：" + searchText + "的数据", "aserver");
+      logService.saveAsLog("operate", "应用管理-配置-查询数据包含：" + searchText + "的数据", FinalStringUtil.QUERY);
     } else {
-      logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-          "应用管理-配置-查询数据失败", "aserver");
+      logService.saveAsLog("operate", "应用管理-配置-查询数据失败", FinalStringUtil.QUERY);
     }
     /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 end */
   }
@@ -189,21 +188,18 @@ public class SettingController extends Controller {
       /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 start */
       if (success) {
         renderJson(Ret.ok("ok", "添加成功"));
-        logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-            "应用管理-配置-添加配置-配置名称为-" + config.getName() + "-添加成功", "aserver");
+        logService.saveAsLog("operate",
+            "应用管理-配置-添加配置-配置名称为-" + config.getName() + "-添加成功", FinalStringUtil.ADD);
       } else {
-        logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-            "应用管理-配置-添加配置-配置名称为-" + config.getName() + "-添加失败", "aserver");
+        logService.saveAsLog("operate", "应用管理-配置-添加配置-配置名称为-" + config.getName() + "-添加失败", FinalStringUtil.ADD);
       }
     } else if (config.getId() != 0) {
       success = config.update();
       if (success) {
         renderJson(Ret.ok("ok", "修改成功"));
-        logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-            "应用管理-配置-编辑配置-配置名称为-" + config.getName() + "-修改成功", "aserver");
+        logService.saveAsLog("operate", "应用管理-配置-编辑配置-配置名称为-" + config.getName() + "-修改成功", FinalStringUtil.UPDATE);
       } else {
-        logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-            "应用管理-配置-编辑配置-配置名称为-" + config.getName() + "-修改失败", "aserver");
+        logService.saveAsLog("operate", "应用管理-配置-编辑配置-配置名称为-" + config.getName() + "-修改失败", FinalStringUtil.UPDATE);
       }
       /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 end */
     }
@@ -228,12 +224,10 @@ public class SettingController extends Controller {
     }
     if (success) {
       renderJson(Ret.ok());
-      logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-          "应用管理-配置-删除配置-配置名称为-" + sb.substring(0, sb.lastIndexOf(",")) + "-删除成功", "aserver");
+      logService.saveAsLog("operate", "应用管理-配置-删除配置-配置名称为-" + sb.substring(0, sb.lastIndexOf(",")) + "-删除成功", FinalStringUtil.DELETE);
     } else {
       renderJson(Ret.fail("msg", "删除数据出错"));
-      logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-          "应用管理-配置-删除配置-配置名称为-" + sb.substring(0, sb.lastIndexOf(",")) + "-删除失败", "aserver");
+      logService.saveAsLog("operate", "应用管理-配置-删除配置-配置名称为-" + sb.substring(0, sb.lastIndexOf(",")) + "-删除失败", FinalStringUtil.DELETE);
     }
     /** xiaoying 20200715 YZJ-4212 功能操作中没有应用管理的日志 end */
   }

src/main/java/com/archser/aserver/controller/SystemController.java

@@ -4,6 +4,7 @@ import com.archser.aserver.interceptor.JwtInterceptor;
 import com.archser.aserver.model.System;
 import com.archser.aserver.service.LogService;
 import com.archser.aserver.service.SystemService;
+import com.archser.aserver.util.FinalStringUtil;
 import com.archser.aserver.util.JwtUtils;
 import com.archser.aserver.util.redis.InfoSystem;
 import com.archser.aserver.util.redis.RedisConvert;
@@ -55,13 +56,13 @@ public class SystemController extends Controller {
 			system.set("ID", System.SEQ_NEXTVAL);
 			system.save();
 			renderJson(Ret.ok("ok", "添加成功"));
-			logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-					"添加-" + system.getName() + "-系统模块成功", "aserver");
+			logService.saveAsLog("operate",
+					"添加-" + system.getName() + "-系统模块成功", FinalStringUtil.ADD);
 		} else if (system.getId() != 0) {
 			system.update();
 			renderJson(Ret.ok("ok", "修改成功"));
-			logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-					"修改-" + system.getName() + "-系统模块成功", "aserver");
+			logService.saveAsLog("operate",
+					"修改-" + system.getName() + "-系统模块成功", FinalStringUtil.UPDATE);
 		}
 		new Thread(() ->{
 			InfoSystem.saveSystem(system);
@@ -92,12 +93,10 @@ public class SystemController extends Controller {
 			new Thread(() ->{
 				InfoSystem.deleteSystem(finalSystemName);
 			}).start();
-			logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()),
-					"删除" + systemName, "aserver");
+			logService.saveAsLog("operate", "删除" + systemName, FinalStringUtil.DELETE);
 		} else {
 			renderJson(Ret.fail("msg", "删除数据出错"));
-			logService.saveAsLog("operate", getAttr("username"), JwtInterceptor.getIpAddr(getRequest()), "删除系统模块数据失败",
-					"aserver");
+			logService.saveAsLog("operate", "删除系统模块数据失败", FinalStringUtil.DELETE);
 		}
 	}
 

src/main/java/com/archser/aserver/generator/MyGenerator.java

@@ -20,11 +20,11 @@ public class MyGenerator extends Generator {
   }
 
   public static void main(String[] args) {
-    Prop p = new Prop("config-pro.properties");
+    Prop p = new Prop("AppConfig-pro.properties");
 
-    String url = p.get("jdbcUrl");
-    String user = p.get("user");
-    String password = p.get("password");
+    String url = p.get("jdbc.url");
+    String user = p.get("jdbc.username");
+    String password = p.get("jdbc.password");
 
     DruidPlugin dp = new DruidPlugin(url, user, password);
     dp.start();

src/main/java/com/archser/aserver/model/base/BaseLog.java

@@ -152,4 +152,79 @@ public abstract class BaseLog<M extends BaseLog<M>> extends Model<M> implements
 		return getStr("URL");
 	}
 	
+	/**
+	 * 用户名
+	 */
+	public M setUsername(java.lang.String username) {
+		set("USERNAME", username);
+		return (M)this;
+	}
+	
+	/**
+	 * 用户名
+	 */
+	public java.lang.String getUsername() {
+		return getStr("USERNAME");
+	}
+	
+	/**
+	 * 操作结束时间
+	 */
+	public M setEndTime(java.util.Date endTime) {
+		set("END_TIME", endTime);
+		return (M)this;
+	}
+	
+	/**
+	 * 操作结束时间
+	 */
+	public java.util.Date getEndTime() {
+		return get("END_TIME");
+	}
+	
+	/**
+	 * 动作类型
+	 */
+	public M setAction(java.lang.String action) {
+		set("ACTION", action);
+		return (M)this;
+	}
+	
+	/**
+	 * 动作类型
+	 */
+	public java.lang.String getAction() {
+		return getStr("ACTION");
+	}
+	
+	/**
+	 * 通过此获取sql
+	 */
+	public M setSessionId(java.lang.String sessionId) {
+		set("SESSION_ID", sessionId);
+		return (M)this;
+	}
+	
+	/**
+	 * 通过此获取sql
+	 */
+	public java.lang.String getSessionId() {
+		return getStr("SESSION_ID");
+	}
+	
+	/**
+	 * 备注
+	 */
+	public M setRemarks(java.lang.String remarks) {
+		set("REMARKS", remarks);
+		return (M)this;
+	}
+	
+	/**
+	 * 备注
+	 */
+	public java.lang.String getRemarks() {
+		return getStr("REMARKS");
+	}
+	
 }

src/main/java/com/archser/aserver/service/LogService.java

 package com.archser.aserver.service;
 
+import com.jfinal.ext.request.RequestContextHolder;
+import com.jfinal.plugin.activerecord.Record;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
@@ -7,40 +9,31 @@ import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Date;
 import com.archser.aserver.model.Log;
-import com.archser.aserver.model.User;
 import com.jfinal.kit.PathKit;
-import com.jfinal.plugin.activerecord.Db;
 
 public class LogService {
+
+	private static final String appName = "aserver";
 	private static DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss");
 	private SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-	public void saveAsLog(String type, String user, String ip, String content, String app) {
+	public void saveAsLog(String type, String content, String action) {
 		try {
-			Log asLog = new Log();
-			asLog.set("ID", "SEQ_LOG.nextval");
-			asLog.setType(type);
-			Integer userId = Db.queryInt(Db.getSql("getUserId"), user);
-			asLog.setUserId(userId);
-			asLog.setContent(content);
-			// 把时间精确到秒
-			SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-			Date date = new Date();
-			String time = format2.format(date);
-			Date date2 = format2.parse(time);
-			asLog.setCreateTime(date2);
-			asLog.setIp(ip);
-			asLog.setSystemType(app);
-			asLog.save();
+			//修改日志保存方式
+			Record asLog = RequestContextHolder.getLog();
+			if (asLog != null) {
+				asLog.set("type", type);
+				asLog.set("content", content);
+				asLog.set("systemtype", appName);
+				asLog.set("action", action);
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 	}
 
-	public void saveAsLogByFile(String type, String user, String content, InputStream ins, Object fileContent,
-			String ip) {
+	public void saveAsLogByFile(String type, String content, InputStream ins, Object fileContent, String action) {
 		try {
 			LocalDateTime ldtt = LocalDateTime.now();
 			String filename = ldtt.format(format);
@@ -67,21 +60,14 @@ public class LogService {
 				outputStream.write(string);
 				outputStream.close();
 			}
-			Log asLog = new Log();
-			asLog.set("ID", Log.SEQ_NEXTVAL);
-			asLog.setType(type);
-			User asUser = User.dao.findFirst(Db.getSql("getUserId"), user);
-			asLog.setUserId(asUser == null ? null : asUser.getId());
-			asLog.setContent(content);
-// 把时间精确到秒
-			Date date = new Date();
-			String time = format2.format(date);
-			Date date2 = format2.parse(time);
-			asLog.setCreateTime(date2);
-			asLog.setSystemType("accession");
-			asLog.setExtending(path);
-			asLog.setIp(ip);
-			asLog.save();
+			Record asLog = RequestContextHolder.getLog();
+			if (asLog != null) {
+				asLog.set("type", type);
+				asLog.set("content", content);
+				asLog.set("systemtype", appName);
+				asLog.set("extending", path);
+				asLog.set("action", action);
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com/archser/aserver/util/FinalStringUtil.java

+package com.archser.aserver.util;
+
+/**
+ * 定义错误信息，所有返回前端的信息都从这里获取
+ * 
+ * @ClassName: FinalErrorUtil
+ * @author: 李德才
+ * @date: 2020年6月23日 上午9:28:25
+ */
+public class FinalStringUtil {
+	
+	public static final String NULL_POINTER = "获取参数失败，请联系管理员或重试";
+	
+	public static final String SAVE_ERROR = "保存数据失败";
+	
+	public static final String  GET_DATA_ERROR = "获取数据失败";
+	
+	public static final String UPADTE_ERROR = "修改数据失败";
+	
+	public static final String DELETE_ERROR = "删除数据失败";
+	
+	public static final String NULL_DATA = "没有检索到数据";
+	
+	public static final String NOT_SAVE_DATA = "尚未添加数据";
+	
+	public static final String ADD = "添加";
+
+	public static final String DELETE = "删除";
+
+	public static final String UPDATE = "修改";
+
+	public static final String QUERY = "查询";
+
+}