From b848451e8889fea12ce40b7818c1b8d84b50ea02 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 01 九月 2022 13:41:07 +0800
Subject: [PATCH] 权限管理组合操作
---
src/main/java/com/whyc/util/CommonUtil.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/whyc/util/CommonUtil.java b/src/main/java/com/whyc/util/CommonUtil.java
index 84942d4..9024575 100644
--- a/src/main/java/com/whyc/util/CommonUtil.java
+++ b/src/main/java/com/whyc/util/CommonUtil.java
@@ -1,7 +1,8 @@
package com.whyc.util;
-import com.whyc.pojo.UserInf;
-import com.whyc.service.UserLogService;
+import com.whyc.constant.YamlProperties;
+import com.whyc.pojo.DocUser;
+import com.whyc.service.DocLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Component;
@@ -15,16 +16,16 @@
@Component
public class CommonUtil {
- private static UserLogService userLogService;
+ private static DocLogService docLogService;
@Autowired
- public void setUserLogService(UserLogService userLogService) {
- CommonUtil.userLogService = userLogService;
+ public void setUserLogService(DocLogService docLogService) {
+ CommonUtil.docLogService = docLogService;
}
/**鑾峰彇褰撳墠Session涓殑灞炴�ser*/
- public static UserInf getUser(HttpServletRequest request) {
- return (UserInf) request.getSession().getAttribute("user");
+ public static DocUser getUser(HttpServletRequest request) {
+ return (DocUser) request.getSession().getAttribute("user");
}
public static String classesPath(){
@@ -33,17 +34,53 @@
return jarFile.toString();
}
- /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
- public static void record(long uId, int operationType, String msg){
- userLogService.record(uId,operationType,msg);
+ /**
+ * 鑾峰彇瀛樻斁鏂囦欢鐨勬牴璺緞
+ * @return 杩斿洖瀛樻斁鏂囦欢鐨勬牴璺緞
+ */
+ public static String getRootFile(){
+ ApplicationHome applicationHome = new ApplicationHome(CommonUtil.class);
+ File jarFile = applicationHome.getDir();
+ String baseDirPath;
+ if(YamlProperties.runModel == 1) {
+ //寮�鍙戣矾寰�
+ baseDirPath = jarFile.getParentFile().toString()+File.separator+"doc_file"+File.separator;
+ }else {
+ //鎵撳寘璺緞
+ baseDirPath = jarFile.toString()+File.separator+"doc_file"+File.separator;
+ }
+ return baseDirPath;
+ }
+
+ /**
+ * 鑾峰彇椤圭洰鎵�鍦ㄦ枃浠跺す璺緞
+ * @return 鑾峰彇椤圭洰鎵�鍦ㄦ枃浠跺す璺緞
+ */
+ public static String getProjectDir(){
+ ApplicationHome applicationHome = new ApplicationHome(CommonUtil.class);
+ File jarFile = applicationHome.getDir();
+ String baseDirPath;
+ if(YamlProperties.runModel == 1) {
+ //寮�鍙戣矾寰�
+ baseDirPath = jarFile.getParentFile().toString();
+ }else {
+ //鎵撳寘璺緞
+ baseDirPath = jarFile.toString();
+ }
+ return baseDirPath;
}
/**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
- public static void record(long uId, int operationType, String msg,String msgDetail){
- userLogService.record(uId,operationType,msg,msgDetail);
+ public static void record(long uId,String name, int operationType, String msg){
+ docLogService.record(uId,name,operationType,msg);
+ }
+
+ /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
+ public static void record(long uId,String name, int operationType, String msg,String msgDetail){
+ docLogService.record(uId,name,operationType,msg,msgDetail);
}
/**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
- public static void record2(HttpServletRequest request,long uId, int operationType, String msg,String msgDetail){
- userLogService.record2(request,uId,operationType,msg,msgDetail);
+ public static void record2(HttpServletRequest request,long uId,String name, int operationType, String msg,String msgDetail){
+ docLogService.record2(request,uId,name,operationType,msg,msgDetail);
}
}
--
Gitblit v1.9.1