From 58e6dec8c583778714bb1447755f9ffc46b0c5ec Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 14:48:38 +0800
Subject: [PATCH] fix:补充提交
---
screen-api/src/main/resources/application-dev.yml | 1
screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java | 2
screen-api/src/main/java/com/moral/api/service/UserService.java | 1
screen-api/src/main/java/com/moral/api/controller/AppUserController.java | 9 +++-
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 72 +++++++++++++++++++++---------------
screen-api/src/main/resources/application-qa.yml | 1
screen-common/src/main/java/com/moral/util/TokenUtils.java | 21 ++++++++++
screen-common/src/main/java/com/moral/constant/Constants.java | 7 +++
screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java | 2
screen-api/src/main/resources/application-cjl.yml | 1
screen-api/src/main/resources/application-local.yml | 1
11 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
index af15b1c..ffe52c1 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
@@ -3,6 +3,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +31,6 @@
@Autowired
private UserService userService;
-
-
@ApiOperation(value = "������������")
@PostMapping("logins")
public ResultMessage login(@RequestBody Map<String, Object> parameters) {
@@ -55,5 +54,11 @@
return ResultMessage.ok(result);
}
+ @GetMapping("/wx/exit")
+ @ApiOperation(value = "���������������")
+ public ResultMessage updateUserId(@RequestParam @ApiParam(value = "userId",name = "������������") Integer userId) {
+ userService.updateUserId(userId);
+ return ResultMessage.ok();
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
index 8ebcc3d..4cd66bc 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/CruiserDataConsumer.java
@@ -34,7 +34,7 @@
-@Component
+/*@Component*/
@Slf4j
public class CruiserDataConsumer implements ConsumerSeekAware {
diff --git a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
index 4882e3d..929dfff 100644
--- a/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/exception/consumer/SecondDataConsumer.java
@@ -35,7 +35,7 @@
-@Component
+/*@Component*/
@Slf4j
public class SecondDataConsumer implements ConsumerSeekAware {
diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 109c3ac..9a27915 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -51,5 +51,6 @@
//���������������������
Map<String, Object> wxLogin(String code);
+ boolean updateUserId(Integer userId);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index b21803f..e6b33b5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.moral.api.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -101,6 +102,11 @@
return userMapper.selectUserInfo(parameters);
}
+ /**
+ * ���������������
+ * @param parameters
+ * @return
+ */
@Override
@Transactional
public Map<String, Object> loginSmallRoutine(Map<String, Object> parameters) {
@@ -113,30 +119,12 @@
result.put("msg", ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return result;
}
- //������������
- String password = parameters.get("password").toString();
- //������������
- password = AESUtils.decrypt(password, AESKey);
- if (!MD5Utils.saltMD5Verify(password, userBo.getPassword())) {
- result.put("code", ResponseCodeEnum.PASSWORD_INVALID.getCode());
- result.put("msg", ResponseCodeEnum.PASSWORD_INVALID.getMsg());
- return result;
- }
//������������������
if (Constants.DELETE.equals(userBo.getIsDelete())) {
result.put("code", ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
result.put("msg", ResponseCodeEnum.ACCOUNT_IS_DELETE.getMsg());
return result;
}
- //������������������
- if (userBo.getExpireTime() != null && userBo.getExpireTime().getTime() < System.currentTimeMillis()) {
- result.put("code", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getCode());
- result.put("msg", ResponseCodeEnum.ACCOUNT_IS_EXPIRE.getMsg());
- return result;
- }
-// JSONObject SessionKeyOpenId = WechatUtils.getSessionKeyOrOpenId(parameters.get("code").toString());
-// String openid = SessionKeyOpenId.getString("openid");
-// String sessionKey = SessionKeyOpenId.getString("session_key");
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(userBo.getUnitId());
//������������������
Map<String, Object> userInfo = new LinkedHashMap<>();
@@ -154,25 +142,21 @@
try {
//������token������������redis
- String token = TokenUtils.getToken(userBo.getId().toString(), userInfo);
+ String token = TokenUtils.getTokenApp(new StringBuffer("00").append(userBo.getId().toString()).toString(),userInfo);
result.put("token", token);
+ result.put("userName", userBo.getUserName());
+ result.put("unitId",userBo.getUnitId());
+ result.put("userId", userBo.getId());
+ result.put("account", userBo.getAccount());
+ result.put("unName",Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
result.put("msg", ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
return result;
}
- //������
- HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
- UserLog userLog = new UserLog();
- userLog.setType(Constants.LOGIN_OPERTATE_TYPE);
- userLog.setIp(WebUtils.getIpAddr(request));
- userLog.setOperateId(userBo.getId());
- userLog.setOrganizationId(userBo.getOrganizationId());
- userLog.setContent("������������������" + userBo.getAccount());
- userLogMapper.insert(userLog);
+ sysLog("������������������" + userBo.getAccount()+";openId:"+openId,userBo);
//������openId���user������
-
User user = userMapper.selectById(userBo.getId());
user.setOpenId(openId);
userMapper.updateById(user);
@@ -225,10 +209,17 @@
userInfo.put("wechat", user.getWechat());
userInfo.put("expireTime", DateUtils.dateToDateString(user.getExpireTime()));
userInfo.put("isAdmin", user.getIsAdmin());
+ ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(user.getUnitId());
try {
//������token������������redis
- String token = TokenUtils.getToken(user.getId().toString(), userInfo);
+ String token = TokenUtils.getTokenApp(new StringBuffer("00").append(user.getId().toString()).toString(),userInfo);
result.put("token", token);
+ result.put("token", token);
+ result.put("userName", user.getUserName());
+ result.put("unitId",user.getUnitId());
+ result.put("userId", user.getId());
+ result.put("account", user.getAccount());
+ result.put("unName",Objects.nonNull(responsibilityUnit.getAreaName())?responsibilityUnit.getAreaName():"���������������������");
} catch (Exception e) {
log.error("token���������������" + e.getMessage());
result.put("code", ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode());
@@ -237,10 +228,31 @@
}
result.put("code", ResponseCodeEnum.SUCCESS.getCode());
result.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ sysLog("������������������" + user.getAccount()+" ;openId:"+openid,user);
return result;
}
@Override
+ public boolean updateUserId(Integer userId) {
+ User user = userMapper.selectById(userId);
+ user.setOpenId("0");
+ userMapper.updateById(user);
+ sysLog(userId+"������������������",user);
+ return true;
+ }
+ private void sysLog(String cont,User user){
+ //������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ UserLog userLog = new UserLog();
+ userLog.setType(Constants.LOGIN_OPERTATE_APP);
+ userLog.setIp(WebUtils.getIpAddr(request));
+ userLog.setOperateId(user.getId());
+ userLog.setOrganizationId(user.getOrganizationId());
+ userLog.setContent(cont);
+ userLogMapper.insert(userLog);
+ }
+
+ @Override
public Map<String, Object> login(Map<String, Object> parameters) {
UserBO userBo = selectUserInfo(parameters);
Map<String, Object> result = new HashMap<>();
diff --git a/screen-api/src/main/resources/application-cjl.yml b/screen-api/src/main/resources/application-cjl.yml
index e2ff30e..67ded93 100644
--- a/screen-api/src/main/resources/application-cjl.yml
+++ b/screen-api/src/main/resources/application-cjl.yml
@@ -119,6 +119,7 @@
interceptor:
exclude:
- /login
+ - /AppUser/**
- /swagger-ui.html
- /swagger-resources/**
- /swagger-ui.html/**
diff --git a/screen-api/src/main/resources/application-dev.yml b/screen-api/src/main/resources/application-dev.yml
index 78c754e..4e093b1 100644
--- a/screen-api/src/main/resources/application-dev.yml
+++ b/screen-api/src/main/resources/application-dev.yml
@@ -111,6 +111,7 @@
interceptor:
exclude:
- /login
+ - /AppUser/**
- /swagger-ui.html
- /swagger-resources/**
- /swagger-ui.html/**
diff --git a/screen-api/src/main/resources/application-local.yml b/screen-api/src/main/resources/application-local.yml
index fb92f00..f75bd80 100644
--- a/screen-api/src/main/resources/application-local.yml
+++ b/screen-api/src/main/resources/application-local.yml
@@ -118,6 +118,7 @@
interceptor:
exclude:
- /login
+ - /AppUser/**
- /swagger-ui.html
- /swagger-resources/**
- /swagger-ui.html/**
diff --git a/screen-api/src/main/resources/application-qa.yml b/screen-api/src/main/resources/application-qa.yml
index 3e5baa9..3cbbba3 100644
--- a/screen-api/src/main/resources/application-qa.yml
+++ b/screen-api/src/main/resources/application-qa.yml
@@ -122,6 +122,7 @@
interceptor:
exclude:
- /login
+ - /AppUser/**
- /swagger-ui.html
- /swagger-resources/**
- /swagger-ui.html/**
diff --git a/screen-common/src/main/java/com/moral/constant/Constants.java b/screen-common/src/main/java/com/moral/constant/Constants.java
index ad910db..a49dc6a 100644
--- a/screen-common/src/main/java/com/moral/constant/Constants.java
+++ b/screen-common/src/main/java/com/moral/constant/Constants.java
@@ -65,11 +65,16 @@
public static final String WEB_CHANNEL = "0";
/*
- * ������������������
+ * ������������������ web
* */
public static final String LOGIN_OPERTATE_TYPE = "0";
/*
+ * ������������������ app
+ * */
+ public static final String LOGIN_OPERTATE_APP = "1";
+
+ /*
* ������������������
* */
public static final String INSERT_OPERATE_TYPE = "1";
diff --git a/screen-common/src/main/java/com/moral/util/TokenUtils.java b/screen-common/src/main/java/com/moral/util/TokenUtils.java
index d82f09e..e8ae947 100644
--- a/screen-common/src/main/java/com/moral/util/TokenUtils.java
+++ b/screen-common/src/main/java/com/moral/util/TokenUtils.java
@@ -76,6 +76,27 @@
ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
}
}
+ public static String getTokenApp(String uid, Object userInfo) {
+ //������������token
+ try {
+ //������token
+ String token = TokenEncryptUtils.encoded(uid + "/" + System.currentTimeMillis() / 1000);
+ //������������token
+ String oldToken = (String) redisTemplate.opsForHash().get("user_token", uid);
+ if (oldToken != null)
+ redisTemplate.delete(oldToken);
+ //���token���������value���
+ redisTemplate.opsForValue().set(token, userInfo);
+ //redisTemplate.expire(token, validity_time, TimeUnit.SECONDS);
+ //���token���������Hash���
+ redisTemplate.opsForHash().put("user_token", uid, token);
+ return token;
+ } catch (Exception e) {
+ log.error("token���������������" + e.getMessage());
+ throw new TokenException(ResponseCodeEnum.TOKEN_CREATE_ERROR.getCode(),
+ ResponseCodeEnum.TOKEN_CREATE_ERROR.getMsg());
+ }
+ }
/**
--
Gitblit v1.8.0