Merge branch 'system-165' of uskycloud/usky-cloud into master

base-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -114,8 +114,9 @@ public class TokenService
         }
         catch (Exception e)
         {
+            e.printStackTrace();
         }
-        return user;
+        return null;
     }
 
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/HceArticle.java

@@ -1,5 +1,6 @@
 package com.usky.system.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -88,6 +89,7 @@ public class HceArticle implements Serializable {
     /**
      * 内容排序
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer sortindex;
 
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysTenantConfig.java

@@ -145,5 +145,8 @@ public class SysTenantConfig implements Serializable {
      */
     private String cloudUrl;
 
-
+    /**
+     * 是否开启消息通知: 1、不开启 2、开启
+     */
+    private Integer messageStatus;
 }

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantConfigMapper.xml

@@ -28,6 +28,7 @@
         <result column="large_screen_url" property="largeScreenUrl"/>
         <result column="cloud_type" property="cloudType"/>
         <result column="cloud_url" property="cloudUrl"/>
+        <result column="message_status" property="messageStatus"/>
     </resultMap>
     <select id="getTenantConfig" resultType="com.usky.system.service.vo.SysTenantConfigVo">
         SELECT