脱敏功能吸怪

ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/SensitiveServiceImpl.java

 package org.dromara.demo.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.sensitive.core.SensitiveService;
@@ -25,6 +26,9 @@ public class SensitiveServiceImpl implements SensitiveService {
         if (!LoginHelper.isLogin()) {
             return true;
         }
+        if (StringUtils.equals(LoginHelper.getUserType().getUserType(), UserType.APP_USER.getUserType())) {
+            return false;
+        }
         boolean roleExist = StringUtils.isNotBlank(roleKey);
         boolean permsExist = StringUtils.isNotBlank(perms);
         if (roleExist && permsExist) {

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/resource/RuoYiServerApplication.java → ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/RuoYiServerApplication.java

-package org.dromara.resource;
+package org.dromara.server;
 
 import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/resource/base/BaseController.java → ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/base/BaseController.java

-package org.dromara.resource.base;
+package org.dromara.server.base;
 
 /**
  * @author hzh

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/resource/controller/airport/AirportController.java → ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java

-package org.dromara.resource.controller.airport;
+package org.dromara.server.controller.airport;
 
 
 import com.alibaba.fastjson.JSON;
@@ -20,7 +20,7 @@ import org.dromara.common.ys.model.res.comomResource.AirportModel;
 import org.dromara.common.ys.service.AirPortService;
 import org.dromara.common.ys.service.CommonResourceService;
 import org.dromara.common.ys.service.InsuranceService;
-import org.dromara.resource.base.BaseController;
+import org.dromara.server.base.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/resource/controller/train/TrainController.java → ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/train/TrainController.java

-package org.dromara.resource.controller.train;
+package org.dromara.server.controller.train;
 
 import com.alibaba.fastjson.JSON;
 import io.seata.spring.annotation.GlobalTransactional;
@@ -13,7 +13,7 @@ import org.dromara.common.ys.model.res.comomResource.CityModel;
 import org.dromara.common.ys.model.res.train.AllStationModel;
 import org.dromara.common.ys.service.CommonResourceService;
 import org.dromara.common.ys.service.TrainService;
-import org.dromara.resource.base.BaseController;
+import org.dromara.server.base.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/resource/controller/vehicle/VehiclesController.java → ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/vehicle/VehiclesController.java

-package org.dromara.resource.controller.vehicle;
+package org.dromara.server.controller.vehicle;
 
 
 import io.seata.spring.annotation.GlobalTransactional;
@@ -8,7 +8,7 @@ import org.dromara.common.ys.constant.TripType;
 import org.dromara.common.ys.model.req.vehicles.EstimateJsycPriceModel;
 import org.dromara.common.ys.model.req.vehicles.EstimateYyycPriceModel;
 import org.dromara.common.ys.service.VehiclesService;
-import org.dromara.resource.base.BaseController;
+import org.dromara.server.base.BaseController;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.core.enums.UserStatus;
+import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.DateUtils;
@@ -172,7 +173,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
         loginUser.setUserId(sysUser.getUserId());
         loginUser.setUsername(sysUser.getUserName());
         loginUser.setNickname(sysUser.getNickName());
-        loginUser.setUserType(sysUser.getUserType());
+        loginUser.setUserType(UserType.APP_USER.getUserType());
         loginUser.setOpenid(openid);
         return loginUser;
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java

 package org.dromara.system.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.sensitive.core.SensitiveService;
@@ -26,6 +27,9 @@ public class SysSensitiveServiceImpl implements SensitiveService {
         if (!LoginHelper.isLogin()) {
             return true;
         }
+        if (StringUtils.equals(LoginHelper.getUserType().getUserType(), UserType.APP_USER.getUserType())) {
+            return false;
+        }
         boolean roleExist = StringUtils.isNotEmpty(roleKey);
         boolean permsExist = StringUtils.isNotEmpty(perms);
         if (roleExist && permsExist) {