Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/service/HomeService.java

@@ -1,20 +1,31 @@
 package com.bofeng.service;
 
 import com.baomidou.mybatisplus.toolkit.IdWorker;
-import com.bofeng.JwtHelper;
 import com.bofeng.dao.UserOpenMapper;
 import com.bofeng.entity.ParseCurrentOpenId;
 import com.bofeng.entity.UserOpen;
+import com.google.common.base.Strings;
+import com.google.common.collect.Maps;
+import com.yvan.springmvc.HttpParameterParser;
+import com.yvan.springmvc.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.servlet.ModelAndView;
 
-import static com.bofeng.JwtHelper.getAuthHeader;
+import java.util.Map;
 
 @Service
 @Transactional(readOnly = true)
+@Slf4j
 public class HomeService {
 
     @Autowired
@@ -23,7 +34,7 @@ public class HomeService {
     private UserOpenMapper userOpenMapper;
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void getUserOpen() {
+    public UserOpen getUserOpen() {
         ParseCurrentOpenId wxToken = userService.currentWxUser();
         WxMpUser wxMpUser = wxToken.getWxMpUser();
         UserOpen user = userOpenMapper.selectByOpenId(wxMpUser.getOpenId());
@@ -41,14 +52,8 @@ public class HomeService {
             userOpen.setHeadImgUrl(wxMpUser.getHeadImgUrl());
             userOpen.setBeActive("Y");
             userOpenMapper.insert(userOpen);
-        } else {
-            Long userId = user.getUserId();
-//            String userId = JwtHelper.getUserId();
-            System.out.println(userId);
+            return userOpen;
         }
+        return user;
     }
-
-//    public void setUserInfo(UserOpen userOpen) {
-//        JwtHelper.setU
-//    }
 }

whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java

@@ -29,7 +29,7 @@ public class HomeController {
 
     @GetMapping("/home/home.html")
     public ModelAndView home(ModelMap model) {
-        homeService.getUserOpen();
+        UserOpen userOpen = homeService.getUserOpen();
         model.put("user", new JsonWapper("{\"www\": \"er\"}"));
         return new ModelAndView("/home/home.ftl", model);
     }