From e145880a9ce786108df18bf139e062e3de3c714a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 10 十月 2022 16:59:14 +0800
Subject: [PATCH] 1
---
data/db.sql | 10 +++
src/main/resources/mapper/sys/OperateMapper.xml | 8 +-
src/main/java/com/lf/server/config/InitConfig.java | 4
src/main/java/com/lf/server/helper/RestHelper.java | 8 +-
src/main/java/com/lf/server/interceptor/AuthInterceptor.java | 49 ++++++++-------
src/main/java/com/lf/server/config/ScheduleConfig.java | 4
src/main/resources/logback-spring.xml | 5 -
src/main/java/com/lf/server/controller/all/FileController.java | 2
src/main/java/com/lf/server/aspect/LogAspect.java | 8 ++
src/main/java/com/lf/server/service/all/FileService.java | 4
src/main/java/com/lf/server/entity/sys/OperateEntity.java | 20 ++++++
src/main/java/com/lf/server/helper/EnumHelper.java | 8 +-
src/main/java/com/lf/server/service/all/ScheduleService.java | 6 +-
13 files changed, 86 insertions(+), 50 deletions(-)
diff --git a/data/db.sql b/data/db.sql
index cecbb36..1a0b608 100644
--- a/data/db.sql
+++ b/data/db.sql
@@ -264,11 +264,14 @@
select * from lf.sys_login;
select * from lf.sys_login_2022;
select * from lf.sys_login_2024;
+select a.*,b.uname from lf.sys_login a inner join lf.sys_user b on a.userid = b.id;
----------------------------------------------------------------------------------------------------- 6.鎿嶄綔鏃ュ織琛�
-- DROP TABLE IF EXISTS lf.sys_operate;
create table lf.sys_operate(
id serial8,
modular varchar(60),
+ module1 varchar(50),
+ module2 varchar(50),
url varchar(1024),
ip varchar(30),
exec bigint,
@@ -295,6 +298,8 @@
comment on table lf.sys_operate is '鎿嶄綔鏃ュ織琛�';
comment on column lf.sys_operate.id is '涓婚敭ID';
comment on column lf.sys_operate.modular is '鎿嶄綔妯″潡锛氬 鏁版嵁绠＄悊\鐩綍绠＄悊';
+comment on column lf.sys_operate.modular1 is '涓�绾фā鍧楋細濡� 鏁版嵁绠＄悊';
+comment on column lf.sys_operate.modular2 is '浜岀骇妯″潡锛氬 鐩綍绠＄悊';
comment on column lf.sys_operate.url is '鎿嶄綔缃戝潃';
comment on column lf.sys_operate.ip is 'IP鍦板潃';
comment on column lf.sys_operate.exec is '鎿嶄綔鏃堕棿锛氬崟浣嶄负姣';
@@ -304,6 +309,11 @@
comment on column lf.sys_operate.optime is '鎿嶄綔鏃堕棿';
comment on column lf.sys_operate.bak is '澶囨敞';
+alter table lf.sys_operate add column modular1 varchar(50);
+alter table lf.sys_operate add column modular2 varchar(50);
+select split_part(modular,'\',1),split_part(modular,'\',2) from lf.sys_operate;
+update lf.sys_operate set modular1=split_part(modular,'\',1),modular2=split_part(modular,'\',2);
+
/*insert into lf.sys_operate (modular,url,ip,type) values ('鏁版嵁绠＄悊\鐩綍绠＄悊','data/manage/update','192.168.20.106',5);
insert into lf.sys_operate (modular,url,ip,type,optime) values ('鏁版嵁绠＄悊\鐩綍绠＄悊','data/manage/delete','192.168.20.107',4,'2024-01-02');*/
diff --git a/src/main/java/com/lf/server/aspect/LogAspect.java b/src/main/java/com/lf/server/aspect/LogAspect.java
index a2f1cf7..1094838 100644
--- a/src/main/java/com/lf/server/aspect/LogAspect.java
+++ b/src/main/java/com/lf/server/aspect/LogAspect.java
@@ -44,6 +44,8 @@
private final static String DOWNLOAD = "download";
+ private final static String SPLIT = "\\";
+
private static final Log log = LogFactory.getLog(LogAspect.class);
@Pointcut("@annotation(com.lf.server.aspect.SysLog)")
@@ -90,7 +92,9 @@
// 璁剧疆妯″潡
Api api = clazz.getAnnotation(Api.class);
if (api != null) {
- oe.setModular(api.tags()[0]);
+ String[] strs = api.tags()[0].split(SPLIT);
+ oe.setModular1(strs[0]);
+ oe.setModular1(strs[1]);
}
// 璁剧疆绫诲悕\鏂规硶鍚嶃�佺被鍒�
@@ -110,7 +114,7 @@
operateService.insertOperate(oe);
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
}
diff --git a/src/main/java/com/lf/server/config/InitConfig.java b/src/main/java/com/lf/server/config/InitConfig.java
index 194d6f8..06d07b8 100644
--- a/src/main/java/com/lf/server/config/InitConfig.java
+++ b/src/main/java/com/lf/server/config/InitConfig.java
@@ -24,9 +24,9 @@
try {
pathHelper.init();
- log.info("*****************绯荤粺鍚姩瀹屾瘯*****************");
+ log.info("*****************绯荤粺鍚姩瀹屾瘯*****************" + "\n");
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
}
}
diff --git a/src/main/java/com/lf/server/config/ScheduleConfig.java b/src/main/java/com/lf/server/config/ScheduleConfig.java
index 7332c59..cbaae94 100644
--- a/src/main/java/com/lf/server/config/ScheduleConfig.java
+++ b/src/main/java/com/lf/server/config/ScheduleConfig.java
@@ -39,7 +39,7 @@
WebSocketService.broadCastInfo(json);
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
}
@@ -55,7 +55,7 @@
WebSocketService.broadCastInfo(json);
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
}
}
diff --git a/src/main/java/com/lf/server/controller/all/FileController.java b/src/main/java/com/lf/server/controller/all/FileController.java
index 9102db4..db76f07 100644
--- a/src/main/java/com/lf/server/controller/all/FileController.java
+++ b/src/main/java/com/lf/server/controller/all/FileController.java
@@ -117,7 +117,7 @@
outputStream.close();
fileInputStream.close();
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
}
}
diff --git a/src/main/java/com/lf/server/entity/sys/OperateEntity.java b/src/main/java/com/lf/server/entity/sys/OperateEntity.java
index 7c79b3f..5076345 100644
--- a/src/main/java/com/lf/server/entity/sys/OperateEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/OperateEntity.java
@@ -15,6 +15,10 @@
private String modular;
+ private String modular1;
+
+ private String modular2;
+
private String url;
private String ip;
@@ -47,6 +51,22 @@
this.modular = modular;
}
+ public String getModular1() {
+ return modular1;
+ }
+
+ public void setModular1(String modular1) {
+ this.modular1 = modular1;
+ }
+
+ public String getModular2() {
+ return modular2;
+ }
+
+ public void setModular2(String modular2) {
+ this.modular2 = modular2;
+ }
+
public String getUrl() {
return url;
}
diff --git a/src/main/java/com/lf/server/helper/EnumHelper.java b/src/main/java/com/lf/server/helper/EnumHelper.java
index 629f293..27fbcab 100644
--- a/src/main/java/com/lf/server/helper/EnumHelper.java
+++ b/src/main/java/com/lf/server/helper/EnumHelper.java
@@ -47,8 +47,8 @@
break;
}
}
- } catch (Exception e) {
- log.error(e.getMessage());
+ } catch (Exception ex) {
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
return result;
}
@@ -75,8 +75,8 @@
break;
}
}
- } catch (Exception e) {
- log.error(e.getMessage());
+ } catch (Exception ex) {
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
return result;
}
diff --git a/src/main/java/com/lf/server/helper/RestHelper.java b/src/main/java/com/lf/server/helper/RestHelper.java
index 385b3f3..43b0c12 100644
--- a/src/main/java/com/lf/server/helper/RestHelper.java
+++ b/src/main/java/com/lf/server/helper/RestHelper.java
@@ -150,7 +150,7 @@
return EntityUtils.toString(entity, StaticData.TEXT_ENCODER);
} catch (Exception ex) {
- log.error(ex);
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
return getErrorInfo(uri, ex);
}
@@ -178,7 +178,7 @@
return EntityUtils.toString(entity, StaticData.TEXT_ENCODER);
} catch (Exception ex) {
- log.error(ex);
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
return getErrorInfo(uri, ex);
}
@@ -196,7 +196,7 @@
return rest.getForObject(uri, String.class);
} catch (Exception ex) {
- log.error(ex);
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
return getErrorInfo(uri, ex);
}
@@ -216,7 +216,7 @@
return rest.postForObject(uri, entity, String.class);
} catch (Exception ex) {
- log.error(ex);
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
return getErrorInfo(uri, ex);
}
diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index c6d9b4a..b721fec 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -4,6 +4,9 @@
import com.lf.server.entity.all.HttpStatus;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
+import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
import com.lf.server.service.sys.TokenService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -43,37 +46,37 @@
*/
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
- //noinspection AlibabaRemoveCommentedCode
try {
System.out.println(request.getRequestURI().toLowerCase() + "," + (handler instanceof HandlerMethod));
-// // 闈炴柟娉曪紝鏃犻渶鎷︽埅
-// if (!(handler instanceof HandlerMethod)) {
-// return true;
-// }
-//
-// // 鏃犻渶鎺堟潈
-// if (noNeedAuth(request)) {
-// return true;
-// }
-//
-// String token = WebHelper.getToken(request);
-// if (StringHelper.isNull(token)) {
-// WebHelper.write2Page(response, NO_TOKEN);
-// return false;
-// }
-//
-// UsersEntity ue = tokenService.getCurrentUser(request);
-// if (ue == null) {
-// WebHelper.write2Page(response, NO_LOGIN);
-// return false;
-// }
+ // 闈炴柟娉曪紝鏃犻渶鎷︽埅
+ if (!(handler instanceof HandlerMethod)) {
+ return true;
+ }
+ // 鏃犻渶鎺堟潈
+ if (noNeedAuth(request)) {
+ return true;
+ }
+
+ String token = WebHelper.getToken(request);
+ if (StringHelper.isNull(token)) {
+ WebHelper.write2Page(response, NO_TOKEN);
+ return false;
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(request);
+ if (ue == null) {
+ WebHelper.write2Page(response, NO_LOGIN);
+ return false;
+ }
+
+ //noinspection AlibabaRemoveCommentedCode
// 鏉冮檺鏍￠獙
return true;
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
return false;
}
}
diff --git a/src/main/java/com/lf/server/service/all/FileService.java b/src/main/java/com/lf/server/service/all/FileService.java
index c4973fa..47e558e 100644
--- a/src/main/java/com/lf/server/service/all/FileService.java
+++ b/src/main/java/com/lf/server/service/all/FileService.java
@@ -66,7 +66,7 @@
}
}
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
}
@@ -85,7 +85,7 @@
// 浠� utf-8鐨勭紪鐮佹牸寮忔潵瑙ｆ瀽 value鍊�
value = item.getString("utf-8");
} catch (Exception ex) {
- log.error(ex.getStackTrace());
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
// 杈撳嚭鍒版帶鍒跺彴
diff --git a/src/main/java/com/lf/server/service/all/ScheduleService.java b/src/main/java/com/lf/server/service/all/ScheduleService.java
index 70cc807..e1a6a42 100644
--- a/src/main/java/com/lf/server/service/all/ScheduleService.java
+++ b/src/main/java/com/lf/server/service/all/ScheduleService.java
@@ -155,13 +155,13 @@
// Ping閫氬湴鍧�
socket.connect(add, 2000);
} catch (Exception e) {
- log.error(e.getStackTrace());
+ log.error(e.getMessage() + e.getStackTrace() + "\n");
list.add(re);
} finally {
try {
socket.close();
- } catch (Exception e) {
- log.error(e.getStackTrace());
+ } catch (Exception ex) {
+ log.error(ex.getMessage() + ex.getStackTrace() + "\n");
}
}
}
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index ef72342..9176473 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- scan 閰嶇疆鏂囦欢濡傛灉鍙戠敓鏀瑰彉锛屽皢浼氳閲嶆柊鍔犺浇 scanPeriod 妫�娴嬮棿闅旀椂闂�-->
<configuration scan="true" scanPeriod="60 seconds" debug="false">
- <contextName>jcpimserver</contextName>
+ <contextName>LFServer</contextName>
<!-- 鏂囦欢鍚嶇О -->
<property name="log.name.info" value="info" />
@@ -94,7 +94,7 @@
<logger name="com.apache.ibatis" level="DEBUG"></logger>
<!-- additivity:鏄惁鍦ㄧ埗(杩欓噷涓簉oot鑺傜偣)杈撳嚭, 榛樿 true; -->
- <logger name="com.jcpim" level="INFO" additivity="true">
+ <logger name="com.lf.server" level="INFO" additivity="true">
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</logger>
@@ -102,5 +102,4 @@
<root level="INFO">
<appender-ref ref="STDOUT" />
</root>
-
</configuration>
diff --git a/src/main/resources/mapper/sys/OperateMapper.xml b/src/main/resources/mapper/sys/OperateMapper.xml
index 7bdd193..e9cd65c 100644
--- a/src/main/resources/mapper/sys/OperateMapper.xml
+++ b/src/main/resources/mapper/sys/OperateMapper.xml
@@ -42,10 +42,10 @@
<insert id="insertOperates" >
insert into lf.sys_operate
- (modular,url,ip,exec,clazz,type,userid,optime,bak)
+ (modular1,modular2,url,ip,exec,clazz,type,userid,optime,bak)
values
- <foreach collection="list" item="item" index="index" separator="," >
- (#{modular},#{url},#{ip},#{exec},#{clazz},#{type},#{userid},now(),#{bak})
+ <foreach collection="list" item="item" index="index" separator="," >
+ (#{modular1},#{modular2},#{url},#{ip},#{exec},#{clazz},#{type},#{userid},now(),#{bak})
</foreach>
</insert>
@@ -61,6 +61,6 @@
</delete>
<update id="updateOperate">
- update lf.sys_operate set modular=#{modular},url=#{url},ip=#{ip},exec=#{exec},clazz=#{clazz},type=#{type},userid=#{userid},optime=now(),bak=#{bak} where id=#{id}
+ update lf.sys_operate set modular1=#{modular1},modular2=#{modular2},url=#{url},ip=#{ip},exec=#{exec},clazz=#{clazz},type=#{type},userid=#{userid},optime=now(),bak=#{bak} where id=#{id}
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3