luminghui
/
itax-admin-lxzy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: luminghui:9c24dd9be9b93f2a4d009226ec105a7cb10b74a2
Branches Tags
luminghui:master
...
compare: luminghui:51a0980425fd709bad6a20cb8616711b53803f16
Branches Tags
luminghui:master

3 Commits
9c24dd9be9 ... 51a0980425

Author SHA1 Message Date
路明慧 51a0980425 release:外放登陆
10 months ago
路明慧 2246d0d94c release:优化
10 months ago
路明慧 1e76990117 release:单点登录初版
10 months ago
15 changed files with 432 additions and 16 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 2
      i-taxsso-core/src/main/java/com/dxhy/SaveCookieController.java
  2. 6
      itaxBase-admin/pom.xml
  3. 5
      itaxBase-admin/src/main/java/com/dxhy/itax/config/ItaxAdminConfig.java
  4. 282
      itaxBase-admin/src/main/java/com/dxhy/itax/modules/common/controller/WebController.java
  5. 12
      itaxBase-admin/src/main/java/com/dxhy/itax/modules/management/controller/SysUserController.java
  6. 14
      itaxBase-admin/src/main/resources/bootstrap-std.yaml
  7. 22
      itaxBase-admin/src/main/resources/bootstrap.yaml
  8. 2
      itaxBase-admin/src/main/resources/logback-spring.xml
  9. 7
      itaxBase-common/pom.xml
  10. 2
      itaxBase-common/src/main/java/com/dxhy/itax/dao/SysUserDao.java
  11. 18
      itaxBase-common/src/main/java/com/dxhy/itax/model/JwtToken.java
  12. 57
      itaxBase-common/src/main/java/com/dxhy/itax/service/OATokenService.java
  13. 2
      itaxBase-common/src/main/java/com/dxhy/itax/service/UserService.java
  14. 9
      itaxBase-common/src/main/java/com/dxhy/itax/service/impl/UserServiceImpl.java
  15. 4
      itaxBase-common/src/main/resources/mapper/SysUserDao.xml

2
i-taxsso-core/src/main/java/com/dxhy/SaveCookieController.java
Unescape View File

@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
@Slf4j
public class SaveCookieController {
@Value("${dxhy.sso.redirect_url:''}")
@Value("${oauth.singleLogin:''}")
private String redirectUrl;
/**

6
itaxBase-admin/pom.xml
Unescape View File

@ -20,6 +20,12 @@
</properties>
<dependencies>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.4.0</version>
</dependency>
<!-- Spring Cloud Nacos Service Config -->
<dependency>
<groupId>com.alibaba.cloud</groupId>

5
itaxBase-admin/src/main/java/com/dxhy/itax/config/ItaxAdminConfig.java
Unescape View File

@ -81,6 +81,11 @@ public class ItaxAdminConfig {
private String pwdAesKey;
@Value("${oauth.singleLogin}")
private String lxOauth;
@Value("${oauth.whitelist}")
private String whitelist;

282
itaxBase-admin/src/main/java/com/dxhy/itax/modules/common/controller/WebController.java
Unescape View File

@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.auth0.jwt.JWT;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dxhy.itax.annotation.SysLog;
import com.dxhy.itax.config.*;
@ -16,8 +18,10 @@ import com.dxhy.itax.dto.response.QsTypeResponse;
import com.dxhy.itax.dto.response.TabInfoResponse;
import com.dxhy.itax.dto.response.XxTabinfoResponse;
import com.dxhy.itax.entity.CountItemConfig;
import com.dxhy.itax.entity.SysUserEntity;
import com.dxhy.itax.entity.SystenConfiguration;
import com.dxhy.itax.enums.*;
import com.dxhy.itax.model.JwtToken;
import com.dxhy.itax.model.LoginModel;
import com.dxhy.itax.model.UserInfo;
import com.dxhy.itax.openapi.model.ShortMessageRequest;
@ -40,6 +44,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@ -49,7 +54,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.MalformedURLException;
import java.net.URLDecoder;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@ -104,6 +112,9 @@ public class WebController {
@Autowired
private ItaxAdminConfig itaxAdminConfig;
@Autowired
private OATokenService oaTokenService;
private Set<String> urlSet = new HashSet<String>();
private final String firCount = "1";
@ -156,6 +167,265 @@ public class WebController {
}
}
@RequestMapping("/otherLogin")
public void otherLogin(LoginModel loginModel,HttpServletResponse response) throws IOException {
//开始执行登录
String username = AESUtil.aesDecrypt(loginModel.getDxhyu());
log.info("用户{}，登录开始", username);
if (StringUtils.isBlank(itaxAdminConfig.getWhitelist()) || !Arrays.asList(itaxAdminConfig.getWhitelist()).contains(username)){
log.info("用户{}，登录失败，未配置白名单", username);
response.setCharacterEncoding("UTF-8");
response.getWriter().write("<!DOCTYPE html> \n" +
"<html lang=\"zh-CN\"> \n" +
"<head> \n" +
" <meta charset=\"UTF-8\"> \n" +
" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"> \n" +
" <title>发票系统登陆结果</title> \n" +
" <style> \n" +
" body { \n" +
" font-family: Arial, sans-serif; \n" +
" margin: 40px; \n" +
" padding: 20px; \n" +
" background-color: #f4f4f4; \n" +
" color: #333; \n" +
" } \n" +
" .container { \n" +
" background-color: #fff; \n" +
" padding: 20px; \n" +
" border-radius: 8px; \n" +
" box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); \n" +
" } \n" +
" h2 { \n" +
" color: #5cb85c; \n" +
" } \n" +
" /* 添加这个类来指定查询结果提示的颜色为红色 */ \n" +
" .result-error { \n" +
" color: red; \n" +
" } \n" +
" p { \n" +
" margin: 10px 0; \n" +
" } \n" +
" </style> \n" +
"</head> \n" +
"<body> \n" +
" <div class=\"container\"> \n" +
" <h2 class=\"result-error\">登陆失败</h2>\n" +
" <!-- 使用新的类名来指定颜色 --> \n" +
" <p>登录失败，未配置管理员登陆白名单</p>\n" +
" <p>请尝试以下解决方案：</p> \n" +
" <ul> \n" +
" <li>添加用户名白名单</li>\n" +
" </ul> \n" +
" </div> \n" +
"</body> \n" +
"</html>");
return;
}
ReturnT<UserInfo> result = userService.findUser(loginModel.getDxhyu(), loginModel.getDxhyp());
log.info("用户{}，登录结果：{}", username, JSON.toJSONString(result));
if (result.getCode() != SUCCESS_CODE){
response.setCharacterEncoding("UTF-8");
response.getWriter().write(result.getMsg());
return;
}
boolean ifRem = false;
SsoUser xxlUser = new SsoUser();
xxlUser.setUserId(result.getData().getUserid());
UserInfoRequestDto userInfoRequestDto = new UserInfoRequestDto();
userInfoRequestDto.setUserId(result.getData().getUserid());
Result result1 = userService.queryUserInfo(userInfoRequestDto);
try {
if (result1.get("code").equals("0000")) {
xxlUser = JsonUtils.getInstance().parseObject(result1.get("data").toString(), SsoUser.class);
if(CollectionUtil.isNotEmpty(xxlUser.getTaxplayercodeDeptList())){
xxlUser.setCurrentDeptId(xxlUser.getTaxplayercodeDeptList().get(0).getDeptId());
}
log.info("获取到的用户信息{}，{}", xxlUser.getUserId());
}
} catch (Exception ex) {
log.info("获取菜单异常" + JSONObject.toJSONString(ex));
log.info("用户{}，登录失败", username);
}
xxlUser.setUsername(username);
xxlUser.setVersion(UUID.randomUUID().toString().replaceAll("-", ""));
xxlUser.setExpireMinite(SsoLoginStore.getRedisExpireMinite());
xxlUser.setExpireFreshTime(System.currentTimeMillis());
// 2、make session id
String sessionId = SsoSessionIdHelper.makeSessionId(xxlUser);
log.info("存储的用户信息{}，{}", xxlUser.getUserId());
// 3、login, store storeKey + cookie sessionId
SsoWebLoginHelper.login(response, sessionId, xxlUser, ifRem);
log.info("用户{}，登录成功，sessionID是{}", username, sessionId);
//4.更新last_login_time
userService.updateLastLoginTime(xxlUser.getUserId());
String url = itaxAdminConfig.getItaxbenchfront();
log.info("外放登陆跳转地址：{}", url);
response.sendRedirect(url);
}
@RequestMapping("/sso/singleLogin")
public void singleLogin(HttpServletResponse response) throws IOException {
response.sendRedirect(itaxAdminConfig.getLxOauth());
}
@RequestMapping("/singleLogin")
public void reOA(@RequestParam Map<String,Object> params,HttpServletResponse response) throws IOException {
Object code = params.get("code");
if(code==null){
log.info("单电登陆code为空");
response.setCharacterEncoding("UTF-8");
response.getWriter().write("<!DOCTYPE html> \n" +
"<html lang=\"zh-CN\"> \n" +
"<head> \n" +
" <meta charset=\"UTF-8\"> \n" +
" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"> \n" +
" <title>发票系统单点登陆结果</title> \n" +
" <style> \n" +
" body { \n" +
" font-family: Arial, sans-serif; \n" +
" margin: 40px; \n" +
" padding: 20px; \n" +
" background-color: #f4f4f4; \n" +
" color: #333; \n" +
" } \n" +
" .container { \n" +
" background-color: #fff; \n" +
" padding: 20px; \n" +
" border-radius: 8px; \n" +
" box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); \n" +
" } \n" +
" h2 { \n" +
" color: #5cb85c; \n" +
" } \n" +
" /* 添加这个类来指定查询结果提示的颜色为红色 */ \n" +
" .result-error { \n" +
" color: red; \n" +
" } \n" +
" p { \n" +
" margin: 10px 0; \n" +
" } \n" +
" </style> \n" +
"</head> \n" +
"<body> \n" +
" <div class=\"container\"> \n" +
" <h2 class=\"result-error\">单点登陆失败</h2>\n" +
" <!-- 使用新的类名来指定颜色 --> \n" +
" <p>罗欣统一认证系统未返回发票系统有效参数</p>\n" +
" <p>请尝试以下解决方案：</p> \n" +
" <ul> \n" +
" <li>联系运维人员，排查相关问题。</li>\n" +
" </ul> \n" +
" </div> \n" +
"</body> \n" +
"</html>");
return;
}
log.info("单点登陆code"+code.toString());
JwtToken jwt = oaTokenService.getOauth2Token(code.toString());
DecodedJWT decode = JWT.decode(jwt.getAccessToken());
String username = decode.getClaim("preferred_username").asString();
log.debug("单电登陆解析accessToken：{}",JSON.toJSONString(decode));
//开始执行登录
log.info("用户{}，登录开始", username);
boolean ifRem = false;
SysUserEntity user = userService.findUserByName(username);
log.info("用户查询结果{}",JSON.toJSONString(user));
if (user == null){
response.setCharacterEncoding("UTF-8");
PrintWriter writer = response.getWriter();
writer.write("<!DOCTYPE html> \n" +
"<html lang=\"zh-CN\"> \n" +
"<head> \n" +
" <meta charset=\"UTF-8\"> \n" +
" <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"> \n" +
" <title>发票系统单点登陆结果</title> \n" +
" <style> \n" +
" body { \n" +
" font-family: Arial, sans-serif; \n" +
" margin: 40px; \n" +
" padding: 20px; \n" +
" background-color: #f4f4f4; \n" +
" color: #333; \n" +
" } \n" +
" .container { \n" +
" background-color: #fff; \n" +
" padding: 20px; \n" +
" border-radius: 8px; \n" +
" box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); \n" +
" } \n" +
" h2 { \n" +
" color: #5cb85c; \n" +
" } \n" +
" /* 添加这个类来指定查询结果提示的颜色为红色 */ \n" +
" .result-error { \n" +
" color: red; \n" +
" } \n" +
" p { \n" +
" margin: 10px 0; \n" +
" } \n" +
" </style> \n" +
"</head> \n" +
"<body> \n" +
" <div class=\"container\"> \n" +
" <h2 class=\"result-error\">单点登陆失败</h2>\n" +
" <!-- 使用新的类名来指定颜色 --> \n" +
" <p>您在发票系统中的信息未找到。</p>\n" +
" <p>请尝试以下解决方案：</p> \n" +
" <ul> \n" +
" <li>联系运维人员，请求配置相关信息。</li>\n" +
" </ul> \n" +
" </div> \n" +
"</body> \n" +
"</html>");
return;
}
SsoUser xxlUser = new SsoUser();
xxlUser.setUserId(user.getUserId());
UserInfoRequestDto userInfoRequestDto = new UserInfoRequestDto();
userInfoRequestDto.setUserId(user.getUserId());
Result result1 = userService.queryUserInfo(userInfoRequestDto);
try {
if (result1.get("code").equals("0000")) {
xxlUser = JsonUtils.getInstance().parseObject(result1.get("data").toString(), SsoUser.class);
if(CollectionUtil.isNotEmpty(xxlUser.getTaxplayercodeDeptList())){
xxlUser.setCurrentDeptId(xxlUser.getTaxplayercodeDeptList().get(0).getDeptId());
}
log.info("获取到的用户信息{}，{}", xxlUser.getUserId());
}
} catch (Exception ex) {
log.info("获取菜单异常" + JSONObject.toJSONString(ex));
log.info("用户{}，登录失败", username);
}
xxlUser.setUsername(user.getUsername());
xxlUser.setVersion(UUID.randomUUID().toString().replaceAll("-", ""));
xxlUser.setExpireMinite(SsoLoginStore.getRedisExpireMinite());
xxlUser.setExpireFreshTime(System.currentTimeMillis());
// 2、make session id
String sessionId = SsoSessionIdHelper.makeSessionId(xxlUser);
log.info("存储的用户信息{}，{}", xxlUser.getUserId());
// 3、login, store storeKey + cookie sessionId
SsoWebLoginHelper.login(response, sessionId, xxlUser, ifRem);
log.info("用户{}，登录成功，sessionID是{}", username, sessionId);
//4.更新last_login_time
userService.updateLastLoginTime(xxlUser.getUserId());
String url = itaxAdminConfig.getItaxbenchfront();
log.info("单点登陆跳转地址：{}", url);
response.sendRedirect(url);
}
/**
* Login
* 实现单点登录并进行跳转方法
@ -170,6 +440,14 @@ public class WebController {
@RequestBody LoginModel loginModel) {
String username = loginModel.getDxhyu();
log.info("用户{}，登录开始", username);
String name = AESUtil.aesDecrypt(username);
log.info("用户{}，解密后用户名是{}", username, name);
if (StringUtils.isBlank(itaxAdminConfig.getWhitelist()) || !Arrays.asList(itaxAdminConfig.getWhitelist()).contains(name)){
log.info("用户{}，登录失败，未配置白名单", name);
return new ReturnT<String>(FAIL_CODE, "请使用统一认证方式登陆，临时使用请联系管理员开通白名单");
}
boolean ifRem = (loginModel.getIfRemember() != null && "on".equals(loginModel.getIfRemember())) ? true : false;
@ -417,9 +695,9 @@ public class WebController {
if (xxlUser == null) {
returnT = Result.error(11001, "未登录");
if(ConfigureConstant.STRING_1.equals(itaxAdminConfig.userCenterType())){
returnT.put("redirectUrl",itaxAdminConfig.getRedirectUrl());
returnT.put("redirectUrl",itaxAdminConfig.getLxOauth());
}else {
returnT.put("redirectUrl",itaxAdminConfig.getOmpRedirectUrl());
returnT.put("redirectUrl",itaxAdminConfig.getLxOauth());
}
return returnT;
} else {

12
itaxBase-admin/src/main/java/com/dxhy/itax/modules/management/controller/SysUserController.java
Unescape View File

@ -3,6 +3,8 @@ package com.dxhy.itax.modules.management.controller;
import cn.hutool.core.util.ZipUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.dxhy.itax.util.AesEncryptUtil;
import com.dxhy.itax.utils.AESUtil;
import org.apache.commons.lang3.StringUtils;
import com.dxhy.itax.annotation.SysLog;
import com.dxhy.itax.config.ItaxAdminConfig;
@ -29,6 +31,9 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.*;
@ -268,5 +273,12 @@ public class SysUserController {
return userService.updatePassword(userPasswordDto);
}
public static void main(String[] args) throws UnsupportedEncodingException {
String ysq = URLEncoder.encode(AESUtil.aesEncrypt("shunhe"), "UTF-8");
String s = URLEncoder.encode(AESUtil.aesEncrypt("admin@1234"), "UTF-8");
System.out.println("http://10.18.90.125:10000/itaxAdmin/otherLogin?dxhyu="+ysq+"&dxhyp="+s);
System.out.println("http://10.18.90.124:10000/itaxAdmin/otherLogin?dxhyu="+ysq+"&dxhyp="+s);
}
}

14
itaxBase-admin/src/main/resources/bootstrap-std.yaml
Unescape View File

@ -4,15 +4,15 @@ spring:
nacos:
config:
# Nacos config 地址
server-addr: ${nacos.address}
server-addr: 10.18.90.125:33000
# Nacos config 命名空间,对应配置中的名称(sims_order_namespace)
namespace: ${nacos.namespace}
namespace: dxhy-nacos
# Nacos config 分组
group: itax-admin
# Nacos config 登录用户名
username: ${nacos.username}
username: admin
# Nacos config 登录密码
password: ${nacos.password}
password: Invoice.nacos.!1
# Nacos config 配置文件前缀
prefix: application
# Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
@ -27,8 +27,8 @@ spring:
# Nacos discovery 配置
discovery:
# Nacos discovery 服务地址
server-addr: ${nacos.address}
username: ${nacos.username}
server-addr: nacos-1.itax.local:33000
username: admin
# Nacos config 登录密码
password: ${nacos.password}
password: Invoice.nacos.!1
enabled: off

22
itaxBase-admin/src/main/resources/bootstrap.yaml
Unescape View File

@ -1,13 +1,31 @@
# 此文件不可少,Spring Cloud读取配置必须
#本机ip地址获取:${spring.cloud.client.ip-address}
spring:
security:
oauth2:
client:
registration:
custom:
client-id: ele-cloud
client-secret: ON1DXvYpmEgf97Jhw61Kc4SejfliQN1Z
authorization-grant-type: authorization_code
redirect-uri: http://10.18.90.125:10000/itaxAdmin/singleLogin
provider:
custom:
authorization-uri: https://auth.luoxin.cn:8443/auth/realms/Luoxin/protocol/openid-connect/auth
token-uri: https://auth.luoxin.cn:8443/auth/realms/Luoxin/protocol/openid-connect/token
user-info-uri: https://auth.luoxin.cn:8443/auth/realms/Luoxin/protocol/openid-connect/userinfo
user-name-attribute: email
resourceserver:
jwt:
jwk-set-uri: ${JWK_SET_URI:https://auth.luoxin.cn:8443/auth/realms/Luoxin/protocol/openid-connect/certs}
application:
name: itax-admin
profiles:
# Spring 配置文件读取
active: @deployType@
active: std
#active: @deployType@
#active: std
#active: dev
jackson:
# jackson 日期格式化

2
itaxBase-admin/src/main/resources/logback-spring.xml
Unescape View File

@ -5,7 +5,7 @@
<property name="LOG_PATH" value="@logging.file@"/>
<property name="LOG_LEVEL" value="@logging.level@"/>
<property name="LOG_LEVEL" value="debug"/>
<!--设置系统日志目录-->
<property name="APP_DIR" value="itax-admin"/>
<!-- 记录日志天数 -->

7
itaxBase-common/pom.xml
Unescape View File

@ -11,6 +11,13 @@
<description>itaxBase-common</description>
<dependencies>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>

2
itaxBase-common/src/main/java/com/dxhy/itax/dao/SysUserDao.java
Unescape View File

@ -198,4 +198,6 @@ public interface SysUserDao extends BaseMapper<SysUserEntity> {
Integer queryCount(@Param("deptIdList")List<Long> deptIdList);
SysUserEntity findUserByName(String userName);
}

18
itaxBase-common/src/main/java/com/dxhy/itax/model/JwtToken.java
Unescape View File

@ -0,0 +1,18 @@
package com.dxhy.itax.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@NoArgsConstructor
@AllArgsConstructor
@Getter
@Setter
public class JwtToken {
@JsonProperty("access_token")
private String accessToken;
@JsonProperty("refresh_token")
private String refreshToken;
}

57
itaxBase-common/src/main/java/com/dxhy/itax/service/OATokenService.java
Unescape View File

@ -0,0 +1,57 @@
package com.dxhy.itax.service;
import com.alibaba.fastjson.JSON;
import com.dxhy.itax.model.JwtToken;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.http.*;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
@Slf4j
@Component
public class OATokenService {
@Value("${spring.security.oauth2.client.provider.custom.token-uri}")
String oauth2TokenUrl;
@Value("${spring.security.oauth2.client.registration.custom.authorization-grant-type}")
String grant_type;
@Value("${spring.security.oauth2.client.registration.custom.client-id}")
String client_id;
@Value("${spring.security.oauth2.client.registration.custom.client-secret}")
String client_secret;
@Value("${spring.security.oauth2.client.registration.custom.redirect-uri}")
String redirect_uri;
public JwtToken getOauth2Token(String authCode) {
RestTemplate simpleRestTemplate = new RestTemplateBuilder()
.build();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
map.add("grant_type", grant_type);
map.add("client_id", client_id);
map.add("client_secret", client_secret);
map.add("code", authCode);
map.add("redirect_uri", redirect_uri);
log.info("请求参数：" + JSON.toJSONString(map));
HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
ResponseEntity<JwtToken> res = simpleRestTemplate.exchange(
oauth2TokenUrl,
HttpMethod.POST,
request,
JwtToken.class
);
return res.getBody();
}
}

2
itaxBase-common/src/main/java/com/dxhy/itax/service/UserService.java
Unescape View File

@ -177,4 +177,6 @@ public interface UserService {
* @param sysUserEntitys
*/
void impUserCheck(List<SysUserEntity> sysUserEntitys);
SysUserEntity findUserByName(String userName);
}

9
itaxBase-common/src/main/java/com/dxhy/itax/service/impl/UserServiceImpl.java
Unescape View File

@ -466,7 +466,8 @@ public class UserServiceImpl implements UserService {
sysUserEntity.setMobile(AESUtil.aesEncrypt(sysUserEntity.getMobile()));
//密码base64 md5
SysUserEntity finalUserEntity = ItaxBeanTransitionUtils.md5AndBase64password(sysUserEntity, adminUserOperateDto.getPassword(),itaxConfig.userCenterType());
finalUserEntity.setLoginCount(2);
finalUserEntity.setLastLoginTime(new Date());
//添加用户主体
log.debug("添加用户"+ JSONObject.toJSONString(finalUserEntity));
sysUserDao.insert(finalUserEntity);
@ -1087,6 +1088,7 @@ public class UserServiceImpl implements UserService {
UserInfo queryPara = new UserInfo();
queryPara.setUsername(username);
UserInfo userInfo = sysUserDao.seletUserByUAP(queryPara,ConfigureConstant.STRING_1);
log.info("用户名：{}，密码：{}，查询用户信息：{}", username, password, JSONObject.toJSONString(userInfo));
if (userInfo == null) {
return new ReturnT<UserInfo>(ReturnT.FAIL_CODE, "用户名或密码不正确！");
}
@ -1267,4 +1269,9 @@ public class UserServiceImpl implements UserService {
}
}
@Override
public SysUserEntity findUserByName(String userName) {
return sysUserDao.findUserByName(userName);
}
}

4
itaxBase-common/src/main/resources/mapper/SysUserDao.xml
Unescape View File

@ -527,4 +527,8 @@
</if>
</where>
</select>
<select id="findUserByName" parameterType="java.lang.String" resultType="com.dxhy.itax.entity.SysUserEntity">
select * from sys_user where username = #{userName}
</select>
</mapper>
Write Preview
Loading…
Cancel
Save