调解系统修改

2024-04-02 15:56:40 +08:00
parent 08f4aca27c
commit 72026ee6f4
51 changed files with 3102 additions and 3242 deletions
@@ -1,5 +1,6 @@
 package com.ruoyi.framework.web.service;

+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.digest.MD5;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
@@ -237,9 +238,8 @@ public class SysLoginService
            user.setUserName(username);
            user.setPassword(SecurityUtils.encryptPassword("abc123456"));
            user.setNickName(username);
-            // 代理人角色相当于申请人角色
-            if(loginBody.getRoleName().contains("代理人")){
-                loginBody.setRoleName("申请人");
+            if(username.contains("@")){
+                user.setEmail(username);
            }
            // 根据角色名查询角色id
            Long roleIdByName = roleMapper.selectRoleIdByName(loginBody.getRoleName());
@@ -258,4 +258,26 @@ public class SysLoginService
        ajax.put(Constants.TOKEN, token);
        return ajax;
    }
+
+    /**
+     * 对接BM，根据用户名查询token
+     * @param loginBody
+     * @return
+     */
+    public AjaxResult selectTokenByUserName(LoginBody loginBody) {
+        String username = loginBody.getUsername();
+        String currentTicket = MD5.create().digestHex("BM" + username);
+        if(!currentTicket.equals(loginBody.getTicket())){
+            return AjaxResult.error("ticket校验失败");
+        }
+
+        Object cacheObject = redisCache.getCacheObject(CacheConstants.LOGIN_USERNAME_TOKEN_KEY + username);
+        if(ObjectUtil.isEmpty(cacheObject)){
+            return AjaxResult.error("登录时间过长，请重新登录");
+        }
+
+        AjaxResult result = AjaxResult.success();
+        result.put("token",(String) cacheObject);
+        return result;
+    }
 }
@@ -123,7 +123,9 @@ public class TokenService
        claims.put("userName",loginUser.getUsername());
        claims.put("userId",loginUser.getUserId());
        claims.put(Constants.LOGIN_USER_KEY, token);
-        return createToken(claims);
+        String createToken = createToken(claims);
+        redisCache.setCacheObject(CacheConstants.LOGIN_USERNAME_TOKEN_KEY+loginUser.getUsername(),createToken, expireTime, TimeUnit.MINUTES);
+        return createToken;
    }

    /**
@@ -154,6 +156,7 @@ public class TokenService
        // 根据uuid将loginUser缓存
        String userKey = getTokenKey(loginUser.getToken());
        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+
    }

    /**