Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/WeChatController.java

@@ -25,6 +25,8 @@ import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.enums.WxMpApiUrl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ExitCodeEvent;
 import org.springframework.http.ResponseEntity;
@@ -64,6 +66,8 @@ public class WeChatController {
     @Autowired
     private RedisHelper redisHelper;
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(WeChatController.class);
+
     /**
      * 调用的第一个接口，获取微信公众号CODE，获取openid
      */
@@ -114,12 +118,13 @@ public class WeChatController {
      * 跳转首页权限
      */
     @GetMapping("/getPageAuthorization")
-    public void getPageAuthorization() throws UnsupportedEncodingException {
+    public void getPageAuthorization(@RequestParam(value = "openId",required = false) String openId) throws UnsupportedEncodingException {
         String http = "https://";
         String code = request.getParameter("code");
-        String userAgent = request.getHeader("User-Agent");
-        String openId = request.getParameter("openId");
-        if((openId != null) && (StringUtils.isNotBlank(openId))){
+        System.out.println("String openId:  "+openId);
+        LOGGER.info("String openId:  "+openId);
+
+        if((openId != null) && (openId != "")){
             try{
                 LambdaQueryWrapper<MceMbuser> queryWrapper = Wrappers.lambdaQuery();
                 queryWrapper.eq(MceMbuser::getOpenid,openId).last("LIMIT 1");
@@ -142,18 +147,21 @@ public class WeChatController {
                 String sendUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+constant.WE_CHAT_APP_ID+"&redirect_uri="+url+"&response_type=code&scope=snsapi_base&state=abc123#wechat_redirect";
                 try{
                     System.out.println("sendUrl: "+sendUrl);
+                    LOGGER.info("sendUrl: "+sendUrl);
                     response.sendRedirect(sendUrl);
                 }catch (IOException e){
                     throw new BusinessException(e.getMessage());
                 }
             }else{
                 System.out.println("code:  "+code);
+                LOGGER.info("code:  "+code);
                 try {
                     WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code);
 
                     String openid = wxOAuth2AccessToken.getOpenId();
                     String access_token = wxOAuth2AccessToken.getAccessToken();
                     System.out.println("openid:  "+openid);
+                    LOGGER.info("openid:  "+openid);
                     LambdaQueryWrapper<MceMbuser> queryWrapper = Wrappers.lambdaQuery();
                     queryWrapper.eq(MceMbuser::getOpenid,openid).last("LIMIT 1");
                     MceMbuser one = mceMbuserService.getOne(queryWrapper);