From d5165d2cdaeab2be112b805addf438466b59bedd Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 18 三月 2025 10:36:01 +0800
Subject: [PATCH] 单点登录完成
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 2 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java | 2 +-
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 2 +-
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java | 18 ++++++++++++++++--
ruoyi-admin/src/main/resources/application.yml | 6 +++---
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
index f507f30..349ce8a 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.dto.DeviceRecordDto;
import com.ruoyi.device.excel.DeviceRecordExportWord;
import com.ruoyi.device.mapper.DeviceMapper;
@@ -13,6 +14,8 @@
import com.ruoyi.device.pojo.DeviceRecord;
import com.ruoyi.device.service.DeviceRecordService;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.system.domain.vo.SysRoleVo;
+import com.ruoyi.system.mapper.SysRoleMenuMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -40,12 +43,23 @@
@Resource
private DeviceMapper deviceMapper;
+ @Resource
+ private SysRoleMenuMapper sysRoleMenuMapper;
+
@Override
public IPage<DeviceRecordDto> deviceRecordPage(Integer deviceId, Page page, String sampleCode, String managementNumber) {
// todo:浠呯湅鑷繁
- Integer userId = null;
+ Long userId = SecurityUtils.getUserId();
+ // 鑾峰彇鏉冮檺鍒ゆ柇鏄惁鏄粎鐪嬫垜
+ SysRoleVo sysRoleVo = sysRoleMenuMapper.selectRoleMenu("get:device:record", userId);
- return baseMapper.deviceRecordPage(deviceId, page, sampleCode, managementNumber, userId);
+ Integer testUserId = null;
+ //娌℃湁浠呯湅鎴戞潈闄愯烦杩�
+ if (sysRoleVo != null && sysRoleVo.getIsRersonal() != null && sysRoleVo.getIsRersonal().equals(1)) {
+ testUserId = SecurityUtils.getUserId().intValue();
+ }
+
+ return baseMapper.deviceRecordPage(deviceId, page, sampleCode, managementNumber, testUserId);
}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 690f2d7..0575c58 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -90,9 +90,9 @@
#闆嗗洟缁熶竴鐧诲綍
sso:
- url: https://ztt-sso.asuncloud.net
- clientId: 47ded514-f447-43b4-afdf-181c10e2222d
- clientSecret: appSecret:ea93d26a68863da5d71a6e3355ec22df
+ url: https://ztt-sso.ztt.cn
+ clientId: 6ca77685-e304-4c0e-9e63-3839e166742f
+ clientSecret: 496e2809629ea5beb4118b10c95d702f
callbackUrl: https://ztzb-lims.ztt.cn/thirdpartylogin
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
index 2b7c3b3..8cf04a9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -59,7 +59,7 @@
Object idToken = redisTemplate.opsForValue().get("ssoOauthToken:idToken:" + userName);
if (idToken != null) {
loginOutUrl = ssoBean.getUrl() + "/oauth2/sessions/logout?id_token_hint=" + idToken;
- redisTemplate.delete("ssoOauthToken:idToken:" + SecurityUtils.getUsername());
+ redisTemplate.delete("ssoOauthToken:idToken:" + userName);
AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.sso.logout.success")));
} else {
AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 367e578..88fc7b5 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -259,7 +259,7 @@
Authentication authentication = null;
SysUser sysUser = sysUserService.selectUserByUserName(username);
if (sysUser == null) {
- throw new ServiceException("鍗曠偣鐧诲綍楠岃瘉澶辫触");
+ throw new ServiceException("褰撳墠绯荤粺娌℃湁璇ョ敤鎴�");
}
try
{
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index f16af39..400ae9a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -25,7 +25,7 @@
is_custom
from user
where del_flag = '0'
- and id != ) a
+ and id != 1) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
--
Gitblit v1.9.3