Commit 255e2c4d authored by 李健华's avatar 李健华

新增百度和支付宝小程序登陆注册

parent 434240a7
...@@ -129,7 +129,7 @@ public class AppletServiceImpl implements IAppletService { ...@@ -129,7 +129,7 @@ public class AppletServiceImpl implements IAppletService {
} }
iOauthLoginInfoService.addLoginInfo(user, tenantId); iOauthLoginInfoService.addLoginInfo(user, tenantId);
if (!unionId.equals(wechatUserInfo.getUnionId())) { if (unionId != null && !unionId.equals(wechatUserInfo.getUnionId()) ) {
iWeChatUserRepository.updateUserUnionId(wechatUserInfo.getUserId(), appName, unionId); iWeChatUserRepository.updateUserUnionId(wechatUserInfo.getUserId(), appName, unionId);
} }
......
...@@ -24,11 +24,8 @@ import org.springframework.data.redis.core.RedisTemplate; ...@@ -24,11 +24,8 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment