调整

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysLogController.java

@@ -6,24 +6,18 @@ import com.devplatform.admin.modules.sys.bean.SysLogEntity;
 import com.devplatform.admin.modules.sys.bean.SysUserEntity;
 import com.devplatform.admin.modules.sys.model.SysLogModel;
 import com.devplatform.admin.modules.sys.service.SysLogService;
-import com.devplatform.admin.modules.sys.service.SysSystemService;
 import com.devplatform.common.util.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import java.util.Date;
-import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 系统日志
@@ -41,8 +35,6 @@ public class SysLogController extends AbstractController {
 
   @Autowired private SysLogService sysLogService;
 
-  @Autowired private SysSystemService sysSystemService;
-
   /** 列表 */
   @ApiOperation(value = "根据条件获取分页数据列表", notes = "根据条件获取分页数据列表")
   @ApiImplicitParam(
@@ -95,21 +87,4 @@ public class SysLogController extends AbstractController {
       sysLogService.save(sysLog);
     }
   }
-
-  /** 保存站点子系统日志信息,用于fegin调用 */
-  @ApiOperation(value = "保存站点子系统日志信息", notes = "保存日志信息")
-  @PostMapping("/saveLogRoutesSub")
-  public void saveLogRoutesSub(
-      String operation,
-      String blockName,
-      String detail,
-      String method,
-      Object param,
-      SysUserEntity user,
-      Long startTime,
-      String sysSign,
-      String stationId) {
-    sysLogService.saveLogRoutesSub(
-        operation, blockName, detail, method, param, user, startTime, sysSign, stationId);
-  }
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/controller/SysLoginController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.devplatform.admin.common.annotation.SysLogMethod;
 import com.devplatform.admin.common.utils.*;
 import com.devplatform.admin.modules.sys.bean.SysLogEntity;
-import com.devplatform.admin.modules.sys.bean.SysSystem;
 import com.devplatform.admin.modules.sys.bean.SysUserEntity;
 import com.devplatform.admin.modules.sys.bean.SysUserRoleEntity;
 import com.devplatform.admin.modules.sys.form.SysLoginForm;
@@ -63,8 +62,6 @@ public class SysLoginController extends AbstractController {
     private ShiroService shiroService;
     @Autowired
     private SysLogService sysLogService;
-    @Autowired
-    private SysSystemService sysSystemService;
 
     /**
      * 验证码
@@ -106,12 +103,10 @@ public class SysLoginController extends AbstractController {
         if (!captcha) {
             return R.error("验证码不正确");
         }
-        SysSystem sysSystem = sysSystemService.getById(Constants.CODE);
-
         String u = Aes.decrypt(form.getUsername());
         String p = Aes.decrypt(form.getPassword());
         // 用户信息
-        SysUserEntity user = sysUserService.queryByUserName(u, sysSystem.getCode());
+        SysUserEntity user = sysUserService.queryByUserName(u);
         // 账号不存在、密码错误
         if (user == null || !user.getPassword().equals(new Sha256Hash(p, user.getSalt()).toHex())) {
             return R.error("账号或密码不正确");
@@ -140,7 +135,6 @@ public class SysLoginController extends AbstractController {
         }
         user.setRoleIdList(roleIdList);
         String jwtToken = null;
-        user.setSysSystem(sysSystem);
         try {
             jwtToken =
                     JwtUtil.createJwt("longingJWT", JwtUtil.generalSubject(user), 1000 * 60 * 60 * 24 * 7);
@@ -157,13 +151,12 @@ public class SysLoginController extends AbstractController {
             return R.error("用户登录无权限，请联系管理员！");
         }
         // 记录登录日志
-        saveLog("登录", "系统登录", "登录系统成功", "com.devplatform.admin.modules.sys.controller.SysLoginController.login()", form, user, startTime, sysSystem.getCode());
+        saveLog("登录", "系统登录", "登录系统成功", "com.devplatform.admin.modules.sys.controller.SysLoginController.login()", form, user, startTime);
         return R.ok()
                 .put("token", jwtToken)
                 .put("permissions", permissions)
                 .put("userId", user.getUserId())
-                .put("userName", user.getName())
-                .put("sysSystem", JSON.toJSONString(sysSystem));
+                .put("userName", user.getName());
     }
 
     private void saveLog(
@@ -173,8 +166,7 @@ public class SysLoginController extends AbstractController {
             String method,
             Object param,
             SysUserEntity user,
-            Long startTime,
-            String sysSign) {
+            Long startTime) {
         // 记录登录日志
         SysLogEntity sysLog = new SysLogEntity();
         sysLog.setOperation(operation);
@@ -198,8 +190,6 @@ public class SysLoginController extends AbstractController {
         sysLog.setTime(endTime - startTime);
         sysLog.setCreateDate(new Date());
         sysLog.setCreateBy(user.getUserId());
-        sysLog.setSysSign(sysSign);
-        sysLog.setStationId(sysSign);
         // 保存系统日志
         sysLogService.save(sysLog);
     }
@@ -221,12 +211,10 @@ public class SysLoginController extends AbstractController {
         if (!captcha) {
             return R.error("验证码不正确");
         }
-        SysSystem sysSystem = sysSystemService.getById(Constants.CODE);
         String u = Aes.decrypt(form.getUsername());
         String p = Aes.decrypt(form.getPassword());
         // 用户信息
-        SysUserEntity user =
-                sysUserService.queryByUserName(u, sysSystem.getCode());
+        SysUserEntity user = sysUserService.queryByUserName(u);
         // 账号不存在、密码错误
         if (user == null || !user.getPassword().equals(new Sha256Hash(p, user.getSalt()).toHex())) {
             return R.error("账号或密码不正确");
@@ -248,7 +236,7 @@ public class SysLoginController extends AbstractController {
             return R.ok().put("token", token).put("permissions", permissions);
         }
         // 记录登录日志
-        saveLog("登录", "系统登录", "登录系统成功", "com.devplatform.admin.modules.sys.controller.SysLoginController.sso()", form, user, startTime, null);
+        saveLog("登录", "系统登录", "登录系统成功", "com.devplatform.admin.modules.sys.controller.SysLoginController.sso()", form, user, startTime);
         return R.error("Authorization Token 不能为空！");
     }
 

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/dao/SysUserDao.java

@@ -42,7 +42,7 @@ public interface SysUserDao extends MyBaseMapper<SysUserEntity> {
    * @return
    */
   SysUserEntity queryByUserName(
-      @Param("username") String username, @Param("stationId") String stationId);
+      @Param("username") String username);
 
   /**
    * 查询用户列表

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/SysUserService.java

@@ -36,10 +36,9 @@ public interface SysUserService extends MyBaseService<SysUserEntity> {
   /**
    * 根据用户名，查询系统用户
    * @param username
-   * @param stationId
    * @return
    */
-  SysUserEntity queryByUserName(String username, String stationId);
+  SysUserEntity queryByUserName(String username);
 
   /**
    * 保存用户

microservice-admin/src/main/java/com/devplatform/admin/modules/sys/service/impl/SysUserServiceImpl.java

@@ -50,8 +50,8 @@ public class SysUserServiceImpl extends MyBaseServiceImpl<SysUserDao, SysUserEnt
     }
 
     @Override
-    public SysUserEntity queryByUserName(String username, String stationId) {
-        return baseMapper.queryByUserName(username, stationId);
+    public SysUserEntity queryByUserName(String username) {
+        return baseMapper.queryByUserName(username);
     }
 
     @Override

microservice-admin/src/main/resources/mapper/sys/SysUserDao.xml

@@ -24,9 +24,6 @@
         FROM sys_user
         WHERE deleted = 0
         AND username = #{username}
-        <if test="stationId != null and stationId != ''">
-            AND station_id = #{stationId}
-        </if>
     </select>