12.25修改操作日志

qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterGoodsServiceImpl.java

@@ -2,6 +2,7 @@ package com.qianhe.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.common.utils.StringUtils;
 import com.qianhe.system.domain.*;
 import com.qianhe.system.mapper.*;
@@ -175,7 +176,7 @@ public class WaterGoodsServiceImpl implements IWaterGoodsService
     @Transactional
     public int insertWaterGoods(WaterGoodsVo waterGoodsVo)
     {
-        waterGoodsVo.setCreateUser("管理员");
+        waterGoodsVo.setCreateUser(SecurityUtils.getLoginUser().getUsername());
         waterGoodsVo.setCreateTime(DateUtils.getNowDate());
         int i = waterGoodsMapper.insertWaterGoods(waterGoodsVo);
         //新增封面图

qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterSpeServiceImpl.java

 package com.qianhe.system.service.impl;
 
 import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.common.utils.StringUtils;
 import com.qianhe.system.domain.WaterSpe;
 import com.qianhe.system.domain.WaterSpeVal;
@@ -70,7 +71,7 @@ public class WaterSpeServiceImpl implements IWaterSpeService
     @Override
     public int insertWaterSpe(WaterSpeVo waterSpeVo)
     {
-        waterSpeVo.setCreateUser("管理员");
+        waterSpeVo.setCreateUser(SecurityUtils.getLoginUser().getUsername());
         waterSpeVo.setCreateTime(DateUtils.getNowDate());
         int i = waterSpeMapper.insertWaterSpe(waterSpeVo);
         insertWaterSpeVal(waterSpeVo);

qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterStationServiceImpl.java

 package com.qianhe.system.service.impl;
 
 import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.common.utils.StringUtils;
 import com.qianhe.system.domain.WaterStation;
 import com.qianhe.system.domain.WaterStationUser;
@@ -85,7 +86,7 @@ public class WaterStationServiceImpl implements IWaterStationService
         WaterStation w = gaodeToTencent(waterStation.getStationLon(),waterStation.getStationLat());
         waterStation.setStationLonTen(w.getStationLonTen());
         waterStation.setStationLatTen(w.getStationLatTen());
-        waterStation.setCreateUser("管理员");
+        waterStation.setCreateUser(SecurityUtils.getLoginUser().getUsername());
         waterStation.setCreateTime(DateUtils.getNowDate());
         int i = waterStationMapper.insertWaterStation(waterStation);
         return i;

qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterStationUserServiceImpl.java

@@ -2,6 +2,7 @@ package com.qianhe.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qianhe.common.utils.DateUtils;
+import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.system.domain.WaterStationUser;
 import com.qianhe.system.mapper.WaterStationUserMapper;
 import com.qianhe.system.service.IWaterStationUserService;
@@ -56,7 +57,7 @@ public class WaterStationUserServiceImpl extends ServiceImpl<WaterStationUserMap
     @Override
     public int insertWaterStationUser(WaterStationUser waterStationUser)
     {
-        waterStationUser.setCreateUser("管理员");
+        waterStationUser.setCreateUser(SecurityUtils.getLoginUser().getUsername());
         waterStationUser.setCreateTime(DateUtils.getNowDate());
         return waterStationUserMapper.insertWaterStationUser(waterStationUser);
     }

qianhe-admin/src/main/java/com/qianhe/system/vo/WaterOrderVo.java

@@ -29,6 +29,7 @@ public class WaterOrderVo {
     private String orderNum;
 
     /** 用户手机号 */
+    @Excel(name = "用户电话", needMerge = true)
     private Long userPhone;
 
     /** 用户省 */

qianhe-admin/src/main/resources/application.yml

@@ -37,7 +37,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.qianhe: debug
     org.springframework: warn
 
 # 用户配置

qianhe-common/src/main/java/com/qianhe/common/core/domain/model/LoginUser.java

@@ -17,6 +17,11 @@ public class LoginUser implements UserDetails
     private static final long serialVersionUID = 1L;
 
     /**
+     * 登录类型
+     */
+    private String type;
+
+    /**
      * 用户ID
      */
     private Long userId;
@@ -71,6 +76,14 @@ public class LoginUser implements UserDetails
      */
     private SysUser user;
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public Long getUserId()
     {
         return userId;

qianhe-common/src/main/java/com/qianhe/common/utils/SecurityUtils.java

@@ -16,6 +16,17 @@ import com.qianhe.common.exception.ServiceException;
  */
 public class SecurityUtils
 {
+
+    private static LoginUser loginUser1;
+
+    public static LoginUser getLoginUser1() {
+        return loginUser1;
+    }
+
+    public static void setLoginUser1(LoginUser loginUser1) {
+        SecurityUtils.loginUser1 = loginUser1;
+    }
+
     /**
      * 用户ID
      **/

qianhe-framework/src/main/java/com/qianhe/framework/aspectj/LogAspect.java

@@ -5,8 +5,10 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.qianhe.common.core.domain.model.MpLoginUser;
 import com.qianhe.framework.manager.AsyncManager;
 import com.qianhe.framework.manager.factory.AsyncFactory;
+import com.qianhe.framework.util.UserInfoUtil;
 import org.apache.commons.lang3.ArrayUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -15,6 +17,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.NamedThreadLocal;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
@@ -40,6 +43,10 @@ import com.qianhe.system.domain.SysOperLog;
 @Component
 public class LogAspect
 {
+
+    @Autowired
+    UserInfoUtil userInfoUtil;
+
     private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
 
     /** 排除敏感属性字段 */
@@ -85,7 +92,7 @@ public class LogAspect
         try
         {
             // 获取当前的用户
-            LoginUser loginUser = SecurityUtils.getLoginUser();
+            LoginUser loginUser = SecurityUtils.getLoginUser1();
 
             // *========数据库日志=========*//
             SysOperLog operLog = new SysOperLog();
@@ -94,10 +101,16 @@ public class LogAspect
             String ip = IpUtils.getIpAddr();
             operLog.setOperIp(ip);
             operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
-            if (loginUser != null)
-            {
+            if (StringUtils.isNull(loginUser)){
+                MpLoginUser mpLoginUser = userInfoUtil.getMpLoginUser();
+                operLog.setOperName(mpLoginUser.getNickName());
+            }else {
                 operLog.setOperName(loginUser.getUsername());
             }
+//            if (loginUser != null)
+//            {
+//                operLog.setOperName(loginUser.getUsername());
+//            }
 
             if (e != null)
             {

qianhe-framework/src/main/java/com/qianhe/framework/config/SecurityConfig.java

@@ -119,7 +119,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 //通用接口放行
                 .antMatchers("/common/**").permitAll()
                 //测试放行所有接口
-                .antMatchers("/system/**").permitAll()
+//                .antMatchers("/system/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

qianhe-framework/src/main/java/com/qianhe/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -45,8 +45,9 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
         String mpToken = mpTokenService.getToken(request);
         if (StringUtils.isNotEmpty(mpToken)) {
             MpLoginUser mpLoginUser = mpTokenService.getMpLoginUser(mpToken);
-            userInfoUtil.setMpLoginUser(mpLoginUser);
             if (StringUtils.isNotNull(mpLoginUser)) {
+                mpLoginUser.setType("1");
+                userInfoUtil.setMpLoginUser(mpLoginUser);
                 mpTokenService.verifyToken(mpLoginUser);
                 UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(mpLoginUser, null, null);
                 authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
@@ -58,6 +59,8 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
         LoginUser loginUser = tokenService.getLoginUser(request);
         if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
         {
+            loginUser.setType("2");
+            SecurityUtils.setLoginUser1(loginUser);
             tokenService.verifyToken(loginUser);
             UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
             authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));