CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/community-center' into preview 

# Conflicts:
#	mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java
master
yang 2025-02-21 16:30:11 +08:00
parent 41bdbfaa81 1bf1ab1619
commit 0e114c87c0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java
View File

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

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

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