소스 검색

Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouController.java
syh 4 년 전
부모
커밋
06609771ab

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -144,6 +144,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ks/web/test", "anon");
         filterChainDefinitionMap.put("/ureport/**", "anon");
         filterChainDefinitionMap.put("/job/test/*", "anon");
+        filterChainDefinitionMap.put("/kuaishou/**", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<>(1);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -366,7 +366,7 @@ public class ProjectMemberController {
      *
      * @return
      */
-    @GetMapping("/getOwnProjects")
+    @PostMapping("/getOwnProjects")
     public Result<List<ProjectMember>> getOwnProjects(@RequestBody JSONObject data) {
         Result<List<ProjectMember>> result = new Result<>();
         JSONArray ids = data.getJSONArray("mediaIds");