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 |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/whyc/util/CommonUtil.java b/src/main/java/com/whyc/util/CommonUtil.java
index 7e25a7b..9024575 100644
--- a/src/main/java/com/whyc/util/CommonUtil.java
+++ b/src/main/java/com/whyc/util/CommonUtil.java
@@ -52,17 +52,35 @@
         return baseDirPath;
     }
 
-    /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
-    public static void record(long uId, int operationType, String msg){
-        docLogService.record(uId,operationType,msg);
+    /**
+     * 鑾峰彇椤圭洰鎵�鍦ㄦ枃浠跺す璺緞
+     * @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){
-        docLogService.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){
-        docLogService.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