Merge branch 'dev' of git.xmmakeit.com:huangjiay/iot-platform-server into dev

server-common/src/main/java/com/makeit/utils/user/plat/PlatUserUtil.java

@@ -34,16 +34,16 @@ public class PlatUserUtil {
 
 
     public static PlatUserVO getUserVO() {
     public static PlatUserVO getUserVO() {
 
 
-        PlatUserVO userVO = THREAD_LOCAL_USER.get();
-        if (userVO != null) {
-            return userVO;
-        }
-
-        //或者这里用策略模式
-        WechatUserInfo wechatUserInfo = WechatUserUtil.getUserVOCanNull();
-        if (wechatUserInfo != null) {
-            return BeanDtoVoUtils.convert(wechatUserInfo, PlatUserVO.class);
-        }
+//        PlatUserVO userVO = THREAD_LOCAL_USER.get();
+//        if (userVO != null) {
+//            return userVO;
+//        }
+
+//        //或者这里用策略模式
+//        WechatUserInfo wechatUserInfo = WechatUserUtil.getUserVOCanNull();
+//        if (wechatUserInfo != null) {
+//            return BeanDtoVoUtils.convert(wechatUserInfo, PlatUserVO.class);
+//        }
 
 
         PlatUserLoginVO tntUserLoginVO = TokenUtil.getTntUserDetail();
         PlatUserLoginVO tntUserLoginVO = TokenUtil.getTntUserDetail();
         if (tntUserLoginVO != null) {
         if (tntUserLoginVO != null) {