Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-web/src/main/java/com/bofeng/dao/UserOpenMapper.java

@@ -17,4 +17,6 @@ public interface UserOpenMapper extends BaseMapper<UserOpen> {
     User getUserByHigherId(Long higherId);
 
     UserOpen selectByUserId(@Param("userId") Long userId);
+
+    UserOpen selectByOpenId(@Param("openId") String openId);
 }

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

@@ -0,0 +1,59 @@
+package com.bofeng.service;
+
+import com.baomidou.mybatisplus.toolkit.IdWorker;
+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 java.util.Map;
+
+@Service
+@Transactional(readOnly = true)
+@Slf4j
+public class HomeService {
+
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private UserOpenMapper userOpenMapper;
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public UserOpen getUserOpen() {
+        ParseCurrentOpenId wxToken = userService.currentWxUser();
+        WxMpUser wxMpUser = wxToken.getWxMpUser();
+        UserOpen user = userOpenMapper.selectByOpenId(wxMpUser.getOpenId());
+        if (user == null) {
+            // 账户没有注册,需要注册
+            UserOpen userOpen = new UserOpen();
+            userOpen.setUserId(IdWorker.getId());
+            userOpen.setOpenId(wxMpUser.getOpenId());
+            userOpen.setNickName(wxMpUser.getNickname());
+            userOpen.setSexDesc(wxMpUser.getSexDesc());
+            userOpen.setSex(wxMpUser.getSex());
+            userOpen.setCity(wxMpUser.getCity());
+            userOpen.setProvince(wxMpUser.getProvince());
+            userOpen.setCountry(wxMpUser.getCountry());
+            userOpen.setHeadImgUrl(wxMpUser.getHeadImgUrl());
+            userOpen.setBeActive("Y");
+            userOpenMapper.insert(userOpen);
+            return userOpen;
+        }
+        return user;
+    }
+}

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

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 @Service
 public class SecurityService {

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

@@ -189,26 +189,26 @@ public class UserService {
             return r;
         }
 
-        val user = getUserById(userOpen.getUserId());
-        if (user == null) {
-            model.put("message", "user 不存在 " + userOpen.getUserId());
-            model.put("isError", true);
-            r.setErrorResult(new ModelAndView("/prompt/prompt.ftl", model));
-            r.setError(true);
-            log.error("user 不存在 " + userOpen.getUserId());
-            return r;
-        }
-        if (!Consts.ACT_ENABLE.equals(user.getBeActive())) {
-            model.put("message", "user 被禁用 " + userOpen.getUserId());
-            model.put("isError", true);
-            r.setErrorResult(new ModelAndView("/prompt/prompt.ftl", model));
-            r.setError(true);
-            log.error("user 被禁用 " + userOpen.getUserId());
-            return r;
-        }
+//        val user = getUserById(userOpen.getUserId());
+//        if (user == null) {
+//            model.put("message", "user 不存在 " + userOpen.getUserId());
+//            model.put("isError", true);
+//            r.setErrorResult(new ModelAndView("/prompt/prompt.ftl", model));
+//            r.setError(true);
+//            log.error("user 不存在 " + userOpen.getUserId());
+//            return r;
+//        }
+//        if (!Consts.ACT_ENABLE.equals(user.getBeActive())) {
+//            model.put("message", "user 被禁用 " + userOpen.getUserId());
+//            model.put("isError", true);
+//            r.setErrorResult(new ModelAndView("/prompt/prompt.ftl", model));
+//            r.setError(true);
+//            log.error("user 被禁用 " + userOpen.getUserId());
+//            return r;
+//        }
 
         r.setUserOpen(userOpen);
-        r.setUser(user);
+//        r.setUser(user);
         r.setError(false);
         return r;
     }

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

@@ -1,14 +1,18 @@
 package com.bofeng.wx.controller;
 
+import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.Consts;
-import com.bofeng.entity.ParseCurrentOpenId;
-import com.bofeng.entity.StatisticsOrder;
-import com.bofeng.entity.SubUser;
-import com.bofeng.entity.User;
+import com.bofeng.dao.UserOpenMapper;
+import com.bofeng.entity.*;
+import com.bofeng.service.HomeService;
+import com.bofeng.service.UserOpenService;
+import com.bofeng.service.UserService;
 import com.google.common.collect.Maps;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
 import lombok.val;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,13 +24,12 @@ import java.util.Map;
 @RestController
 public class HomeController {
 
+    @Autowired
+    private HomeService homeService;
+
     @GetMapping("/home/home.html")
     public ModelAndView home(ModelMap model) {
-
-//        Map<String, Object> queryParam = Maps.newLinkedHashMap();
-//        queryParam.put("userId", "12345677");
-//        queryParam.put("statistics", "M");
-
+        UserOpen userOpen = homeService.getUserOpen();
         model.put("user", new JsonWapper("{\"www\": \"er\"}"));
         return new ModelAndView("/home/home.ftl", model);
     }

whepi-web/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ logging:
     console: '%d %-5level %logger{32} - %msg%n'
 
 debug: false
-ui-path: file:/home/www/ws/bofeng/b2b_sale/bofeng-ui
+ui-path: file:/home/www/ws/wuhan_epi/whepi-ui
 secret: hh123 # jwt私钥
 salt: 456 #密码加盐
 token_time_minutes: 720 #12小时有效期
@@ -55,9 +55,9 @@ spring:
     #driverClassName: com.mysql.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     driverClassName: net.sf.log4jdbc.DriverSpy
-    url: jdbc:log4jdbc:mysql://localhost:3306/bofeng?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: bofeng
-    password: 123456
+    url: jdbc:log4jdbc:mysql://localhost:3306/whepi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: whepi
+    password: hust!2020epi
 
   redis:
     database: 8

whepi-web/src/main/resources/mapper/UserOpen.xml

@@ -10,4 +10,9 @@
         select * from sys_user_open
         where user_id=#{userId}
     </select>
+
+    <select id="selectByOpenId" resultType="com.bofeng.entity.UserOpen">
+        select * from sys_user_open
+        where open_id=#{openId}
+    </select>
 </mapper>