Просмотр исходного кода

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

# Conflicts:
#	jeecg-boot-module-system/src/main/resources/application-test.yml
yumeng 5 лет назад
Родитель
Сommit
25a7192b49

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

@@ -81,8 +81,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ctop/byteDance/homePage/report/*", "anon");
         filterChainDefinitionMap.put("/ctop/material/top/cost", "anon");
 
-        filterChainDefinitionMap.put("/pangolin/**", "anon");
-
         filterChainDefinitionMap.put("/generic/**", "anon");
         filterChainDefinitionMap.put("/", "anon");
         filterChainDefinitionMap.put("/doc.html", "anon");

+ 6 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/PangolinController.java

@@ -41,7 +41,6 @@ public class PangolinController {
     public Map<String, Object> channelList(@RequestBody JSONObject data) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String userId = user.getId();
-//        String userId = "6b4c821adc414dc8b7718ab63ccbfcaf";
         String roleCode = sysRoleService.getRoleCodeByUserId(userId);
         if(null!=roleCode&&(roleCode.equals("admin"))){
             userId = null;
@@ -52,8 +51,7 @@ public class PangolinController {
     @PostMapping("api/app/list")
     public Map<String, Object> appList(@RequestBody JSONObject data) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//        String userId = user.getId();
-        String userId = "6b4c821adc414dc8b7718ab63ccbfcaf";
+        String userId = user.getId();
         String roleCode = sysRoleService.getRoleCodeByUserId(userId);
         if(null!=roleCode&&(roleCode.equals("admin"))){
             userId = null;
@@ -66,9 +64,8 @@ public class PangolinController {
     public Map<String,Object> memberList(){
         Map<String, Object> resultMap = new HashMap<>();
         try {
-//            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//            String userId = user.getId();
-            String userId = "6b4c821adc414dc8b7718ab63ccbfcaf";
+            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            String userId = user.getId();
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             if (null!=roleCode&&"admin".equals(roleCode)) {
                 userId = null;
@@ -88,8 +85,7 @@ public class PangolinController {
     @PostMapping("api/realtime")
     public Map<String, Object> realTime(@RequestBody JSONObject data) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//        String userId = user.getId();
-        String userId = "6b4c821adc414dc8b7718ab63ccbfcaf";
+        String userId = user.getId();
         String roleCode = sysRoleService.getRoleCodeByUserId(userId);
         if(null!=roleCode&&(roleCode.equals("admin"))){
             userId = null;
@@ -103,8 +99,7 @@ public class PangolinController {
     @PostMapping("api/activation/list")
     public Map<String, Object> activationList(@RequestBody JSONObject data) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//        String userId = user.getId();
-        String userId = "6b4c821adc414dc8b7718ab63ccbfcaf";
+        String userId = user.getId();
         String roleCode = sysRoleService.getRoleCodeByUserId(userId);
         if(null!=roleCode&&(roleCode.equals("admin"))){
             userId = null;
@@ -119,8 +114,7 @@ public class PangolinController {
     public Map<String,Object> checkAppList(@RequestBody JSONObject data) {
         Map<String,Object> result = new HashMap<>();
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//        String userId = user.getId();
-        String userId = "6b4c821adc414dc8b7718ab63ccbfcaf";
+        String userId = user.getId();
         String roleCode = sysRoleService.getRoleCodeByUserId(userId);
         if(null!=roleCode&&(roleCode.equals("admin"))){
             userId = null;

+ 0 - 1
jeecg-boot-module-system/src/main/resources/application-test.yml

@@ -130,7 +130,6 @@ mybatis-plus:
       id-type: 4
       # 默认数据库表下划线命名
       table-underline: true
-
   #分页pageHelper
 pagehelper:
   helper-dialect: mysql

+ 1 - 1
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/service/impl/MaterialUploadServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.manage.modules.edu.service.impl;
+package cn.com.ctop.manage.modules.material.service.impl;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.MaterialInfo;