Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

切库修改

Browse Source
master
zhaoxiaolin 1 week ago
parent f3a345953c
commit 35f5c33c88
7 changed files with 74 additions and 14 deletions
Show Stats Download Patch File Download Diff File

9
op-common/op-common-security/src/main/java/com/op/common/security/service/TokenService.java
Unescape Escape View File

@ -19,7 +19,7 @@ import com.op.system.api.model.LoginUser;
/**
* token验证处理
*
*
* @author OP
*/
@Component
@ -144,9 +144,14 @@ public class TokenService {
// 根据uuid将loginUser缓存
String userKey = getTokenKey(loginUser.getToken());
redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
String username = loginUser.getUsername();
// 重置过期时间
String pool = redisService.getCacheObject(CacheConstants.USER_POOL_NAME_CURRENT + username);
redisService.setCacheObject(CacheConstants.USER_POOL_NAME_CURRENT + username, pool, expireTime, TimeUnit.MINUTES);
}
private String getTokenKey(String token) {
return ACCESS_TOKEN + token;
}
}
}

11
op-gateway/src/main/java/com/op/gateway/filter/AuthFilter.java
Unescape Escape View File

@ -23,7 +23,7 @@ import reactor.core.publisher.Mono;
/**
* 网关鉴权
*
*
* @author OP
*/
@Component
@ -57,11 +57,14 @@ public class AuthFilter implements GlobalFilter, Ordered {
}
String userkey = JwtUtils.getUserKey(claims);
boolean islogin = redisService.hasKey(getTokenKey(userkey));
if (!islogin) {
String username = JwtUtils.getUserName(claims);
boolean isPoolName = redisService.hasKey(CacheConstants.USER_POOL_NAME_CURRENT + username);
if (!islogin || !isPoolName) {
return unauthorizedResponse(exchange, "登录状态已过期");
}
String userid = JwtUtils.getUserId(claims);
String username = JwtUtils.getUserName(claims);
if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) {
return unauthorizedResponse(exchange, "令牌验证失败");
}
@ -116,4 +119,4 @@ public class AuthFilter implements GlobalFilter, Ordered {
public int getOrder() {
return -200;
}
}
}

43
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
Unescape Escape View File

@ -107,7 +107,15 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
DynamicDataSourceContextHolder.push("master");
R<List<Map<String, String>>> dateSources0 = new R<>();
try {
dateSources0 = remoteUserService.getPoolNameList(sysUser);
}finally {
DynamicDataSourceContextHolder.poll();
}
List<Map<String, String>> dateSources = dateSources0.getData();
ExecutorService executorService = new ThreadPoolExecutor(
dateSources.size(),
@ -138,7 +146,13 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
DynamicDataSourceContextHolder.push("master");
R<List<Map<String, String>>> dateSources0 = new R<>();
try {
dateSources0 = remoteUserService.getPoolNameList(sysUser);
}finally {
DynamicDataSourceContextHolder.poll();
}
List<Map<String, String>> dateSources = dateSources0.getData();
ExecutorService executorService = new ThreadPoolExecutor(
dateSources.size(),
@ -169,7 +183,13 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
DynamicDataSourceContextHolder.push("master");
R<List<Map<String, String>>> dateSources0 = new R<>();
try {
dateSources0 = remoteUserService.getPoolNameList(sysUser);
}finally {
DynamicDataSourceContextHolder.poll();
}
List<Map<String, String>> dateSources = dateSources0.getData();
ExecutorService executorService = new ThreadPoolExecutor(
dateSources.size(),
@ -201,7 +221,13 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
DynamicDataSourceContextHolder.push("master");
R<List<Map<String, String>>> dateSources0 = new R<>();
try {
dateSources0 = remoteUserService.getPoolNameList(sysUser);
}finally {
DynamicDataSourceContextHolder.poll();
}
List<Map<String, String>> dateSources = dateSources0.getData();
ExecutorService executorService = new ThreadPoolExecutor(
dateSources.size(),
@ -235,7 +261,13 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
DynamicDataSourceContextHolder.push("master");
R<List<Map<String, String>>> dateSources0 = new R<>();
try {
dateSources0 = remoteUserService.getPoolNameList(sysUser);
}finally {
DynamicDataSourceContextHolder.poll();
}
List<Map<String, String>> dateSources = dateSources0.getData();
ExecutorService executorService = new ThreadPoolExecutor(
dateSources.size(),
@ -300,6 +332,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
}
//切线后 创建点检工单
@Override
public AjaxResult createSpotCheckWorkOrder(com.op.system.api.domain.device.WorkOrderTangentDTO workOrderTangentDTO) {
DynamicDataSourceContextHolder.push(workOrderTangentDTO.getFactoryCode());// 这是数据源的key
logger.info(workOrderTangentDTO.getFactoryCode() + "工厂切线接口传输参数：" + JSONArray.toJSONString(workOrderTangentDTO));

5
op-modules/op-device/src/main/resources/mapper/device/EquSpareApplyMapper.xml
Unescape Escape View File

@ -33,7 +33,10 @@
</resultMap>
<sql id="selectEquSpareApplyVo">
select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model, spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people, attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code , unit_price , total_price from equ_spare_apply
select apply_id, apply_code, work_code,parent_code,apply_type,spare_code, spare_name, spare_model,
spare_quantity, spare_group_line, spare_use_equipment, apply_time, apply_people, apply_approve_people,
attr1, attr2, attr3, del_flag, create_by, create_time, update_by, update_time, factory_code ,
unit_price , total_price from equ_spare_apply
</sql>
<select id="selectEquSpareApplyList" parameterType="EquSpareApply" resultMap="EquSpareApplyResult">

8
op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java
Unescape Escape View File

@ -132,7 +132,13 @@ public class MesPrepareServiceImpl implements IMesPrepareService {
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
DynamicDataSourceContextHolder.push("master");
R<List<Map<String, String>>> dateSources0 = new R<>();
try {
dateSources0 = remoteUserService.getPoolNameList(sysUser);
}finally {
DynamicDataSourceContextHolder.poll();
}
List<Map<String, String>> dateSources = dateSources0.getData();
ExecutorService executorService = new ThreadPoolExecutor(
dateSources.size(),

10
op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java
Unescape Escape View File

@ -457,7 +457,15 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
// 加载sf-cloud库的sys_datasource
SysUser sysUser = new SysUser();
sysUser.setUserId(1L);
R<List<Map<String, String>>> dateSources0 = remoteUserService.getPoolNameList(sysUser);
DynamicDataSourceContextHolder.push("master");
R<List<Map<String, String>>> dateSources0 = new R<>();
try {
dateSources0 = remoteUserService.getPoolNameList(sysUser);
}finally {
DynamicDataSourceContextHolder.poll();
}
List<Map<String, String>> dateSources = dateSources0.getData();
ExecutorService executorService = new ThreadPoolExecutor(
dateSources.size(),

2
op-modules/op-system/src/main/java/com/op/system/service/impl/SysUserServiceImpl.java
Unescape Escape View File

@ -695,6 +695,8 @@ public class SysUserServiceImpl implements ISysUserService {
}catch (Exception e) {
e.printStackTrace();
return R.fail(e.getMessage());
}finally {
DynamicDataSourceContextHolder.poll();
}
}

Write Preview
Loading…
Cancel
Save