From 58137d4f560dc16900ea99e0a7a07080b7751e5f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 20 十一月 2023 20:17:47 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/system/entity/UserLogin.java | 12 ++++++++++++
src/main/java/com/zy/common/web/AuthController.java | 3 ++-
src/main/java/com/zy/common/config/AdminInterceptor.java | 2 +-
src/main/resources/mapper/UserLoginMapper.xml | 1 +
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 3932e07..a7888eb 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -107,7 +107,7 @@
private boolean check(HttpServletRequest request, HttpServletResponse response, String memo) {
try {
String token = request.getHeader("token");
- UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
+ UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token).eq("system", "WMS"));
if (null == userLogin){
Http.response(response, BaseRes.DENIED);
return false;
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index c8bca4a..ba50e08 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -75,11 +75,12 @@
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
- userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()));
+ userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()).eq("system", "WMS"));
UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
userLogin.setCreateTime(new Date());
+ userLogin.setSystem("WMS");
userLoginService.insert(userLogin);
Map<String, Object> res = new HashMap<>();
res.put("username", user.getUsername());
diff --git a/src/main/java/com/zy/system/entity/UserLogin.java b/src/main/java/com/zy/system/entity/UserLogin.java
index 550db54..eba5efa 100644
--- a/src/main/java/com/zy/system/entity/UserLogin.java
+++ b/src/main/java/com/zy/system/entity/UserLogin.java
@@ -42,6 +42,12 @@
@TableField("create_time")
private Date createTime;
+ /**
+ * 鐧诲綍绯荤粺
+ */
+ @TableField("system")
+ private String system;
+
public Long getId() {
return id;
}
@@ -89,5 +95,11 @@
this.createTime = createTime;
}
+ public String getSystem() {
+ return system;
+ }
+ public void setSystem(String system) {
+ this.system = system;
+ }
}
diff --git a/src/main/resources/mapper/UserLoginMapper.xml b/src/main/resources/mapper/UserLoginMapper.xml
index 3fdd032..1ea02ce 100644
--- a/src/main/resources/mapper/UserLoginMapper.xml
+++ b/src/main/resources/mapper/UserLoginMapper.xml
@@ -8,6 +8,7 @@
<result column="user_id" property="userId" />
<result column="token" property="token" />
<result column="create_time" property="createTime" />
+ <result column="system" property="system" />
</resultMap>
--
Gitblit v1.9.1