diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index b7663b78..60768f8d 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -131,8 +131,7 @@ public class TokenController { @PostMapping("loginByMall") public R loginByMall(@RequestBody LoginUser loginUser) { // 用户注册 - sysLoginService.loginByMall(loginUser); - return R.ok(null,"登录成功"); + return R.ok(sysLoginService.loginByMall(loginUser)); } @ApiOperation("微服务平台认证接口") diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java index af5e5501..b4a3a374 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/service/SysLoginService.java @@ -12,14 +12,18 @@ import com.bonus.sgzb.common.core.text.Convert; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.utils.ip.IpUtils; import com.bonus.sgzb.common.redis.service.RedisService; +import com.bonus.sgzb.common.security.service.TokenService; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.system.api.RemoteUserService; import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.model.LoginUser; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; /** * 登录校验方法 @@ -40,6 +44,10 @@ public class SysLoginService { @Autowired private RedisService redisService; + @Autowired + private TokenService tokenService; + + /** * 用户名密码登录 */ @@ -232,7 +240,22 @@ public class SysLoginService { } - public void loginByMall(LoginUser loginUser) { - + public Map loginByMall(LoginUser loginUser) { + String username = loginUser.getUsername(); + HashMap hashMap = new HashMap(); + String token = loginUser.getToken(); + // 表示商城登录该系统的标识 + if (StringUtils.isNotBlank(token)) { + R userInfo = remoteUserService.getUserInfo(username, SecurityConstants.INNER); + if (ObjectUtils.isNotEmpty(userInfo.getData())) { + return tokenService.createToken(userInfo.getData()); + } else { + hashMap.put("login_user", "该用户未注册"); + return hashMap; + } + } else { + hashMap.put("login_user", "token为空"); + return hashMap; + } } }