From 9af47b4c0c25c5c2159ac6ceefced88dec72a2f9 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 25 十月 2024 16:58:18 +0800
Subject: [PATCH] Merge branch 'master' into herb-new
---
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java | 142 ++++++++++++++++++++++++++++-------------------
1 files changed, 85 insertions(+), 57 deletions(-)
diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
index 3bd057c..dc7f7cf 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
@@ -24,67 +24,95 @@
@Slf4j
public class BaseCommonServiceImpl implements BaseCommonService {
- @Resource
- private BaseCommonMapper baseCommonMapper;
+ @Resource
+ private BaseCommonMapper baseCommonMapper;
- @Override
- public void addLog(LogDTO logDTO) {
- if(oConvertUtils.isEmpty(logDTO.getId())){
- logDTO.setId(String.valueOf(IdWorker.getId()));
- }
- //淇濆瓨鏃ュ織锛堝紓甯告崟鑾峰鐞嗭紝闃叉鏁版嵁澶ぇ瀛樺偍澶辫触锛屽鑷翠笟鍔″け璐ワ級JT-238
- try {
- logDTO.setCreateTime(new Date());
- baseCommonMapper.saveLog(logDTO);
- } catch (Exception e) {
- log.warn(" LogContent length : "+logDTO.getLogContent().length());
- log.warn(e.getMessage());
- }
+ @Override
+ public void addLog(LogDTO logDTO) {
+ if (oConvertUtils.isEmpty(logDTO.getId())) {
+ logDTO.setId(String.valueOf(IdWorker.getId()));
+ }
+ //淇濆瓨鏃ュ織锛堝紓甯告崟鑾峰鐞嗭紝闃叉鏁版嵁澶ぇ瀛樺偍澶辫触锛屽鑷翠笟鍔″け璐ワ級JT-238
+ try {
+ logDTO.setCreateTime(new Date());
+ baseCommonMapper.saveLog(logDTO);
+ } catch (Exception e) {
+ log.warn(" LogContent length : " + logDTO.getLogContent().length());
+ log.warn(e.getMessage());
+ }
+ }
+
+ @Override
+ public void addLog(String logContent, Integer logType, Integer operatetype, LoginUser user) {
+ LogDTO sysLog = new LogDTO();
+ sysLog.setId(String.valueOf(IdWorker.getId()));
+ //娉ㄨВ涓婄殑鎻忚堪,鎿嶄綔鏃ュ織鍐呭
+ sysLog.setLogContent(logContent);
+ sysLog.setLogType(logType);
+ sysLog.setOperateType(operatetype);
+ try {
+ //鑾峰彇request
+ HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+ //璁剧疆IP鍦板潃
+ sysLog.setIp(IpUtils.getIpAddr(request));
+ } catch (Exception e) {
+ sysLog.setIp("127.0.0.1");
+ }
+ //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ if (user == null) {
+ try {
+ user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ } catch (Exception e) {
+ //e.printStackTrace();
+ }
+ }
+ if (user != null) {
+ sysLog.setUserid(user.getUsername());
+ sysLog.setUsername(user.getRealname());
+ }
+ sysLog.setCreateTime(new Date());
+ //淇濆瓨鏃ュ織锛堝紓甯告崟鑾峰鐞嗭紝闃叉鏁版嵁澶ぇ瀛樺偍澶辫触锛屽鑷翠笟鍔″け璐ワ級JT-238
+ try {
+ baseCommonMapper.saveLog(sysLog);
+ } catch (Exception e) {
+ log.warn(" LogContent length : " + sysLog.getLogContent().length());
+ log.warn(e.getMessage());
+ }
+ }
+
+ @Override
+ public void addLog(String logContent, Integer logType, Integer operateType) {
+ addLog(logContent, logType, operateType, null);
+ }
+
+ @Override
+ public void addLog(String logContent, Integer logType, Integer operatetype, Integer tenantId, String methods) {
+ LogDTO sysLog = new LogDTO();
+ sysLog.setId(String.valueOf(IdWorker.getId()));
+ //娉ㄨВ涓婄殑鎻忚堪,鎿嶄綔鏃ュ織鍐呭
+ sysLog.setLogContent(logContent);
+ sysLog.setLogType(logType);
+ sysLog.setOperateType(operatetype);
+ sysLog.setMethod(methods);
+ sysLog.setTenantId(tenantId);
+ try {
+ //鑾峰彇request
+ HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
+ //璁剧疆IP鍦板潃
+ sysLog.setIp(IpUtils.getIpAddr(request));
+ } catch (Exception e) {
+ sysLog.setIp("127.0.0.1");
}
- @Override
- public void addLog(String logContent, Integer logType, Integer operatetype, LoginUser user) {
- LogDTO sysLog = new LogDTO();
- sysLog.setId(String.valueOf(IdWorker.getId()));
- //娉ㄨВ涓婄殑鎻忚堪,鎿嶄綔鏃ュ織鍐呭
- sysLog.setLogContent(logContent);
- sysLog.setLogType(logType);
- sysLog.setOperateType(operatetype);
- try {
- //鑾峰彇request
- HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
- //璁剧疆IP鍦板潃
- sysLog.setIp(IpUtils.getIpAddr(request));
- } catch (Exception e) {
- sysLog.setIp("127.0.0.1");
- }
- //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- if(user==null){
- try {
- user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- } catch (Exception e) {
- //e.printStackTrace();
- }
- }
- if(user!=null){
- sysLog.setUserid(user.getUsername());
- sysLog.setUsername(user.getRealname());
- }
- sysLog.setCreateTime(new Date());
- //淇濆瓨鏃ュ織锛堝紓甯告崟鑾峰鐞嗭紝闃叉鏁版嵁澶ぇ瀛樺偍澶辫触锛屽鑷翠笟鍔″け璐ワ級JT-238
- try {
- baseCommonMapper.saveLog(sysLog);
- } catch (Exception e) {
- log.warn(" LogContent length : "+sysLog.getLogContent().length());
- log.warn(e.getMessage());
- }
+ sysLog.setCreateTime(new Date());
+ //淇濆瓨鏃ュ織锛堝紓甯告崟鑾峰鐞嗭紝闃叉鏁版嵁澶ぇ瀛樺偍澶辫触锛屽鑷翠笟鍔″け璐ワ級JT-238
+ try {
+ baseCommonMapper.saveLog(sysLog);
+ } catch (Exception e) {
+ log.warn(" LogContent length : " + sysLog.getLogContent().length());
+ log.warn(e.getMessage());
}
-
- @Override
- public void addLog(String logContent, Integer logType, Integer operateType) {
- addLog(logContent, logType, operateType, null);
- }
-
+ }
}
--
Gitblit v1.9.3