Merge branch 'feature/community-center' into preview

# Conflicts:
#	mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java

mcwl-admin/src/main/java/com/mcwl/web/controller/memberCenter/MemberLevelController.java

@@ -18,7 +18,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /***
- * 模型评论
+ * 会员等级
  */
 @RestController
 @RequestMapping("memberLevel")

mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java

@@ -151,7 +151,9 @@ public class SecurityConfig {
                                     "/system/dict/data/type/**",
                                     "/attention/selectAttention",
                                     "/attention/selectUserInfo",
-                                    "/WorkFlowVersion/selectVersionByWorkId"
+                                    "/WorkFlowVersion/selectVersionByWorkId",
+                                    "/memberLevel/list",
+                                    "/memberLevel/getMemberBenefitList"
                             ).permitAll()
                             // 静态资源，可匿名访问
                             .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()

mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java

@@ -97,7 +97,7 @@ public class SysUserAttentionServiceImpl extends ServiceImpl<SysUserAttentionMap
     public SysUserInfo selectUserInfo(Long userId) {
 
         if (userId == null) {
-            userId = SecurityUtils.getUserId();
+            userId = SecurityUtils.getUserIdMax();
         }