Accept Merge Request #100: (qa -> main)

src/main/java/com/link/report/service/impl/JimuReportTokenServiceImpl.java

@@ -34,9 +34,15 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
      */
     @Override
     public String getToken(HttpServletRequest request) {
-        String token = request.getParameter("token");
+        String token =  "";
+        if (request != null) {
+            token = request.getParameter("token");
+            if (ObjectUtil.isEmpty(token)) {
+                token = request.getHeader("X-Access-Token");
+            }
+        }
         String jmToken = request.getHeader("token");
-        if (token == null || token.length() == 0) {
+        if (ObjectUtil.isEmpty(token) && ObjectUtil.isNotEmpty(jmToken)) {
             token = jmToken;
         }
         LoginUser loginUser = tokenService.getLoginUser(token);
@@ -82,6 +88,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
     }
 
 
+
     /**
      * 自定义请求头
      */
@@ -144,8 +151,16 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
         if (loginUser == null) {
             return new String[0];
         }
+        Set<String> permissions = loginUser.getPermissions();
+        if(ObjectUtil.isNotEmpty(permissions)){
+             permissions.add("drag:datasource:testConnection");
+            permissions.add("onl:drag:clear:recoverry");
+            permissions.add("drag:analysis:sql");
+            permissions.add("drag:design:getTotalData");
+           return permissions .toArray(new String[0]);
+        }
 
-        return loginUser.getPermissions().toArray(new String[0]);
+        return new String[0];
     }
 
 }