diff --git a/zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/system/RemoteUserService.java b/zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/system/RemoteUserService.java index 6abdaef..044cca8 100644 --- a/zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/system/RemoteUserService.java +++ b/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; import com.chinagas.api.system.domain.SysUser; import com.chinagas.api.system.domain.SysUserDept; +import com.chinagas.api.system.domain.SysUserUnite; import com.chinagas.api.system.factory.RemoteUserFallbackFactory; import com.chinagas.api.system.model.LoginUser; import com.chinagas.common.core.constants.SecurityConstants; @@ -47,4 +48,7 @@ public interface RemoteUserService { public R saveUserDept(@RequestBody SysUserDept userDept); + @PostMapping("/sysUserUnite/saveOrUpdate") + public R insertUserUnite(@RequestBody SysUserUnite sysUserUnite); + } diff --git a/zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/system/factory/RemoteUserFallbackFactory.java b/zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/system/factory/RemoteUserFallbackFactory.java index af47ce3..89f8544 100644 --- a/zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/system/factory/RemoteUserFallbackFactory.java +++ b/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; import com.chinagas.api.system.RemoteUserService; import com.chinagas.api.system.domain.SysUser; import com.chinagas.api.system.domain.SysUserDept; +import com.chinagas.api.system.domain.SysUserUnite; import com.chinagas.api.system.model.LoginUser; import com.chinagas.common.core.domain.R; import org.slf4j.Logger; @@ -54,6 +55,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory insertUserUnite(SysUserUnite sysUserUnite) { + return R.fail("添加用户钉钉关系失败:" + throwable.getMessage()); + } + }; } } diff --git a/zr-cloud/zr-auth/src/main/java/com/chinagas/auth/controller/LoginDdController.java b/zr-cloud/zr-auth/src/main/java/com/chinagas/auth/controller/LoginDdController.java index 24b9567..ba82ff9 100644 --- a/zr-cloud/zr-auth/src/main/java/com/chinagas/auth/controller/LoginDdController.java +++ b/zr-cloud/zr-auth/src/main/java/com/chinagas/auth/controller/LoginDdController.java @@ -2,6 +2,7 @@ package com.chinagas.auth.controller; import com.chinagas.api.system.RemoteUserService; import com.chinagas.api.system.domain.SysUser; +import com.chinagas.api.system.domain.SysUserUnite; import com.chinagas.api.system.model.LoginUser; import com.chinagas.auth.service.LoginLogService; import com.chinagas.auth.utils.DingingCodeProperties; @@ -29,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.Calendar; +import java.util.Map; import java.util.concurrent.TimeUnit; /** @@ -104,6 +106,11 @@ public class LoginDdController { redisTemplate.opsForValue().increment("user_count", 1); redisTemplate.expire("user_count", (cal.getTimeInMillis() - System.currentTimeMillis()) / 1000, TimeUnit.SECONDS); // 获取登录token + SysUserUnite sysUserUnite=new SysUserUnite(); + sysUserUnite.setUserId(userInfo.getSysUser().getUserId()); + sysUserUnite.setDingTalkUserId(userid); + sysUserUnite.setDingTalkUnionId(rsp.getResult().getUnionid()); + remoteUserService.insertUserUnite(sysUserUnite); return R.ok(tokenService.createToken(userInfo)); } catch (ApiException e) { e.printStackTrace(); -- libgit2 0.21.2