Merge branch 'feature/newApplet-20220419' into 'master'

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

See merge request !64

src/main/java/cn/quantgroup/xyqb/service/middleoffice/applet/impl/AppletServiceImpl.java

@@ -129,7 +129,7 @@ public class AppletServiceImpl implements IAppletService {
             }
             iOauthLoginInfoService.addLoginInfo(user, tenantId);
 
-            if (!unionId.equals(wechatUserInfo.getUnionId())) {
+            if (unionId != null && !unionId.equals(wechatUserInfo.getUnionId()) ) {
                 iWeChatUserRepository.updateUserUnionId(wechatUserInfo.getUserId(), appName, unionId);
             }
 

src/main/java/cn/quantgroup/xyqb/service/session/impl/SessionServiceImpl.java

@@ -24,11 +24,8 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 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.servlet.http.HttpServletRequest;
 import java.sql.Timestamp;
 import java.util.*;
 import java.util.concurrent.TimeUnit;