Commit f2fa6e3d40b5e28b416c6dcc2ca6dafaacffacb6
1 parent
3e703502
Exists in
dev
1：用户通过钉钉登录时，保存钉钉信息
Showing
3 changed files
with
17 additions
and
0 deletions
Show diff stats
zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/system/RemoteUserService.java
| @@ -2,6 +2,7 @@ package com.chinagas.api.system; | @@ -2,6 +2,7 @@ package com.chinagas.api.system; | ||
| 2 | 2 | ||
| 3 | import com.chinagas.api.system.domain.SysUser; | 3 | import com.chinagas.api.system.domain.SysUser; |
| 4 | import com.chinagas.api.system.domain.SysUserDept; | 4 | import com.chinagas.api.system.domain.SysUserDept; |
| 5 | +import com.chinagas.api.system.domain.SysUserUnite; | ||
| 5 | import com.chinagas.api.system.factory.RemoteUserFallbackFactory; | 6 | import com.chinagas.api.system.factory.RemoteUserFallbackFactory; |
| 6 | import com.chinagas.api.system.model.LoginUser; | 7 | import com.chinagas.api.system.model.LoginUser; |
| 7 | import com.chinagas.common.core.constants.SecurityConstants; | 8 | import com.chinagas.common.core.constants.SecurityConstants; |
| @@ -47,4 +48,7 @@ public interface RemoteUserService { | @@ -47,4 +48,7 @@ public interface RemoteUserService { | ||
| 47 | public R<Boolean> saveUserDept(@RequestBody SysUserDept userDept); | 48 | public R<Boolean> saveUserDept(@RequestBody SysUserDept userDept); |
| 48 | 49 | ||
| 49 | 50 | ||
| 51 | + @PostMapping("/sysUserUnite/saveOrUpdate") | ||
| 52 | + public R<Boolean> insertUserUnite(@RequestBody SysUserUnite sysUserUnite); | ||
| 53 | + | ||
| 50 | } | 54 | } |
zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/system/factory/RemoteUserFallbackFactory.java
| @@ -3,6 +3,7 @@ package com.chinagas.api.system.factory; | @@ -3,6 +3,7 @@ package com.chinagas.api.system.factory; | ||
| 3 | import com.chinagas.api.system.RemoteUserService; | 3 | import com.chinagas.api.system.RemoteUserService; |
| 4 | import com.chinagas.api.system.domain.SysUser; | 4 | import com.chinagas.api.system.domain.SysUser; |
| 5 | import com.chinagas.api.system.domain.SysUserDept; | 5 | import com.chinagas.api.system.domain.SysUserDept; |
| 6 | +import com.chinagas.api.system.domain.SysUserUnite; | ||
| 6 | import com.chinagas.api.system.model.LoginUser; | 7 | import com.chinagas.api.system.model.LoginUser; |
| 7 | import com.chinagas.common.core.domain.R; | 8 | import com.chinagas.common.core.domain.R; |
| 8 | import org.slf4j.Logger; | 9 | import org.slf4j.Logger; |
| @@ -54,6 +55,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ | @@ -54,6 +55,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ | ||
| 54 | return R.fail("添加用户部门关系失败:" + throwable.getMessage()); | 55 | return R.fail("添加用户部门关系失败:" + throwable.getMessage()); |
| 55 | } | 56 | } |
| 56 | 57 | ||
| 58 | + @Override | ||
| 59 | + public R<Boolean> insertUserUnite(SysUserUnite sysUserUnite) { | ||
| 60 | + return R.fail("添加用户钉钉关系失败:" + throwable.getMessage()); | ||
| 61 | + } | ||
| 62 | + | ||
| 57 | }; | 63 | }; |
| 58 | } | 64 | } |
| 59 | } | 65 | } |
zr-cloud/zr-auth/src/main/java/com/chinagas/auth/controller/LoginDdController.java
| @@ -2,6 +2,7 @@ package com.chinagas.auth.controller; | @@ -2,6 +2,7 @@ package com.chinagas.auth.controller; | ||
| 2 | 2 | ||
| 3 | import com.chinagas.api.system.RemoteUserService; | 3 | import com.chinagas.api.system.RemoteUserService; |
| 4 | import com.chinagas.api.system.domain.SysUser; | 4 | import com.chinagas.api.system.domain.SysUser; |
| 5 | +import com.chinagas.api.system.domain.SysUserUnite; | ||
| 5 | import com.chinagas.api.system.model.LoginUser; | 6 | import com.chinagas.api.system.model.LoginUser; |
| 6 | import com.chinagas.auth.service.LoginLogService; | 7 | import com.chinagas.auth.service.LoginLogService; |
| 7 | import com.chinagas.auth.utils.DingingCodeProperties; | 8 | import com.chinagas.auth.utils.DingingCodeProperties; |
| @@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; | @@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; | ||
| 29 | import org.springframework.web.bind.annotation.RestController; | 30 | import org.springframework.web.bind.annotation.RestController; |
| 30 | 31 | ||
| 31 | import java.util.Calendar; | 32 | import java.util.Calendar; |
| 33 | +import java.util.Map; | ||
| 32 | import java.util.concurrent.TimeUnit; | 34 | import java.util.concurrent.TimeUnit; |
| 33 | 35 | ||
| 34 | /** | 36 | /** |
| @@ -104,6 +106,11 @@ public class LoginDdController { | @@ -104,6 +106,11 @@ public class LoginDdController { | ||
| 104 | redisTemplate.opsForValue().increment("user_count", 1); | 106 | redisTemplate.opsForValue().increment("user_count", 1); |
| 105 | redisTemplate.expire("user_count", (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000, TimeUnit.SECONDS); | 107 | redisTemplate.expire("user_count", (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000, TimeUnit.SECONDS); |
| 106 | // 获取登录token | 108 | // 获取登录token |
| 109 | + SysUserUnite sysUserUnite=new SysUserUnite(); | ||
| 110 | + sysUserUnite.setUserId(userInfo.getSysUser().getUserId()); | ||
| 111 | + sysUserUnite.setDingTalkUserId(userid); | ||
| 112 | + sysUserUnite.setDingTalkUnionId(rsp.getResult().getUnionid()); | ||
| 113 | + remoteUserService.insertUserUnite(sysUserUnite); | ||
| 107 | return R.ok(tokenService.createToken(userInfo)); | 114 | return R.ok(tokenService.createToken(userInfo)); |
| 108 | } catch (ApiException e) { | 115 | } catch (ApiException e) { |
| 109 | e.printStackTrace(); | 116 | e.printStackTrace(); |