FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
feat: 默认用户登录admin

See merge request !3
This commit is contained in:
super_liu
2021-06-16 05:19:38 +00:00
parent 827d59bb7b a671d60556
commit 7d28313fdc
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-jwtLogin/src/main/java/com/adc/da/login/rest/LoginRestController.java
+12 -2
View File
@@ -9,8 +9,10 @@ import com.adc.da.login.vo.LoginVO;
import com.adc.da.sys.entity.MenuEO; import com.adc.da.sys.entity.MenuEO;
import com.adc.da.sys.entity.UserEO; import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.service.IUserEOService; import com.adc.da.sys.service.IUserEOService;
import com.adc.da.sys.vo.UserVO;
import com.adc.da.util.Encodes; import com.adc.da.util.Encodes;
import com.adc.da.util.PasswordUtils; import com.adc.da.util.PasswordUtils;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -20,10 +22,13 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import sun.misc.BASE64Encoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -124,7 +129,7 @@ public class LoginRestController {
public ResponseMessage<String> loginRest(HttpServletRequest request, HttpServletResponse response, public ResponseMessage<String> loginRest(HttpServletRequest request, HttpServletResponse response,
@RequestParam @NotNull(message = "请输入用户名") String username, @RequestParam @NotNull(message = "请输入用户名") String username,
@RequestParam @NotNull(message = "请输入密码") String password, @RequestParam @NotNull(message = "请输入密码") String password,
@RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) { @RequestParam(value = "isRememberMe", defaultValue = "false") Boolean isRememberMe, String verifyCode) throws UnsupportedEncodingException {
UserEO userEO = userService.getUserByLoginNameNotDeleted(username); UserEO userEO = userService.getUserByLoginNameNotDeleted(username);
if (null == userEO) { if (null == userEO) {
log.info("用户[{}]身份验证失败", username); log.info("用户[{}]身份验证失败", username);
@@ -138,7 +143,12 @@ public class LoginRestController {
String token = JWTUtil.sign(username, userEO.getUsid(),userEO.getPassword()); String token = JWTUtil.sign(username, userEO.getUsid(),userEO.getPassword());
response.setHeader("Authorization", token); response.setHeader("Authorization", token);
response.addHeader("Access-Control-Allow-Headers", "Authorization"); response.addHeader("Access-Control-Allow-Headers", "Authorization");
return Result.success(token); // 加密重要信息
BASE64Encoder encoder = new BASE64Encoder();
String userStr = JSON.toJSONString(userEO);
String userStr2 = URLEncoder.encode(userStr,"UTF-8");
userStr = encoder.encode(userStr2.getBytes());
return Result.success(userStr);
} else { } else {
log.info("用户[{}]密码验证失败", username); log.info("用户[{}]密码验证失败", username);
return Result.error("r0011", "您输入的帐号或密码有误"); return Result.error("r0011", "您输入的帐号或密码有误");
adc-da-jwtLogin/src/main/java/com/adc/da/login/util/UserUtils.java
+9 -7
View File
@@ -1,5 +1,6 @@
package com.adc.da.login.util; package com.adc.da.login.util;
import cn.hutool.core.util.ObjectUtil;
import com.adc.da.login.security.JWTRealm; import com.adc.da.login.security.JWTRealm;
import com.adc.da.login.security.JWTRealm.Principal; import com.adc.da.login.security.JWTRealm.Principal;
import com.adc.da.sys.entity.MenuEO; import com.adc.da.sys.entity.MenuEO;
@@ -81,11 +82,11 @@ public class UserUtils {
* 获取当前登录用户名 * 获取当前登录用户名
*/ */
public static String getUserName() { public static String getUserName() {
JWTRealm.Principal principal = (Principal) SecurityUtils.getSubject().getPrincipal(); // JWTRealm.Principal principal = (Principal) SecurityUtils.getSubject().getPrincipal();
if (principal != null) { // if (principal != null) {
return principal.getLoginName(); // return principal.getLoginName();
} // }
return null; return "admin";
} }
/** /**
@@ -106,12 +107,13 @@ public class UserUtils {
public static UserEO getUser() { public static UserEO getUser() {
UserEO user = (UserEO) CacheUtils.getCache(CURRENT_USER); UserEO user = (UserEO) CacheUtils.getCache(CURRENT_USER);
if (user == null) { if (user == null) {
user = new UserEO();
String userName = getUserName(); String userName = getUserName();
if (StringUtils.isNotEmpty(userName)) { if (StringUtils.isNotEmpty(userName)) {
UserEO userInDb = userService.getUserByLoginNameNotDeleted(userName); UserEO userInDb = userService.getUserByLoginNameNotDeleted(userName);
user = ObjectUtils.clone(userInDb); user = ObjectUtil.clone(userInDb);
user.setPassword(null); user.setPassword("");
CacheUtils.putCache(CURRENT_USER, user); CacheUtils.putCache(CURRENT_USER, user);
} }
} }