center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

perf(登录): 企业微信扫码登录

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-09-05 14:09:42 +08:00
parent b35818f81c
commit dac36d3a06
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/plugins/server/XWecomServer.java
View File

@ -78,7 +78,6 @@ public class XWecomServer {
ModelAndView modelAndView = new ModelAndView("redirect:/");
HttpServletResponse response = ServletUtils.response();
WecomXpackService wecomXpackService = null;
String idToken = null;
try {
Map<String, WecomXpackService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((WecomXpackService.class));
if (beansOfType.keySet().size() == 0) {
@ -123,7 +122,7 @@ public class XWecomServer {
try {
msg = URLEncoder.encode(msg, "UTF-8");
LogUtil.error(e);
Cookie cookie_error = new Cookie("OidcError", msg);
Cookie cookie_error = new Cookie("WecomError", msg);
cookie_error.setPath("/");
return modelAndView;

2
backend/src/main/java/io/dataease/service/sys/SysUserService.java
View File

@ -139,7 +139,7 @@ public class SysUserService {
sysUser.setCreateTime(now);
sysUser.setUpdateTime(now);
sysUser.setEnabled((ObjectUtils.isNotEmpty(userMap.get("status")) && 1 == Integer.parseInt(userMap.get("status").toString())) ? 1L : 0L);
sysUser.setEnabled((ObjectUtils.isNotEmpty(userMap.get("status")) && 1 == Integer.parseInt(userMap.get("status").toString().split("\\.")[0])) ? 1L : 0L);
sysUser.setGender((ObjectUtils.isEmpty(userMap.get("gender")) || "1".equals(userMap.get("gender"))) ? "男" : "女");
sysUser.setLanguage("zh_CN");
sysUser.setFrom(4);