Merge remote-tracking branch 'origin/master'

yongqi-common/src/main/java/com/yongqi/common/enums/UserType.java

@@ -18,7 +18,10 @@ public enum UserType {
      * pc端
      * pc端
      */
      */
     SYS_USER("sys_user"),
     SYS_USER("sys_user"),
-
+    /**
+     * 小程序端
+     */
+    XCX_USER("xcx"),
     /**
     /**
      * app端
      * app端
      */
      */

yongqi-system/src/main/java/com/yongqi/system/service/SysLoginService.java

@@ -125,7 +125,6 @@ public class SysLoginService {
             sessionInfo = wxMaService.getUserService().getSessionInfo(xcxCode);
             sessionInfo = wxMaService.getUserService().getSessionInfo(xcxCode);
         } catch (WxErrorException e) {
         } catch (WxErrorException e) {
             log.error("获取微信openid失败：{}",e.getMessage());
             log.error("获取微信openid失败：{}",e.getMessage());
-            e.printStackTrace();
         }
         }
         if (sessionInfo == null) {
         if (sessionInfo == null) {
             throw new RuntimeException("获取微信信息失败");
             throw new RuntimeException("获取微信信息失败");