From 17a89644871237228f768f14f8abaec298a1746f Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Wed, 3 Jul 2024 11:09:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0online=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=B8=BA3.7.0=E6=9C=80=E6=96=B0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecg-boot/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 5acd781a7..23828e108 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -260,7 +260,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.boot3</groupId>
 				<artifactId>hibernate-re</artifactId>
-				<version>3.6.1-GA</version>
+				<version>3.7.0</version>
 			</dependency>
 			<!-- update-begin-author:chenrui -date:20240104  for：[issue/5723]指定jaxb-runtime版本 -->
 			<dependency>

From 0e4d30487834674cd89be87959dfc4df4f63a7c3 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Wed, 3 Jul 2024 11:56:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg-system-biz/pom.xml                  |   6 +-
 .../JimuDragExternalServiceImpl.java          | 204 +++++++++---------
 .../jimureport/JimuReportTokenService.java    | 162 +++++++-------
 3 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
index fc24cc998..30400b5d9 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
@@ -35,9 +35,9 @@
 			<artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.jeecgframework.boot3</groupId>
-			<artifactId>jimureport-drag</artifactId>
-			<version>2.0.2</version>
+			<groupId>org.jeecgframework.jimureport</groupId>
+			<artifactId>drag-free-springboot3</artifactId>
+			<version>1.1.2</version>
 		</dependency>
 	<!-- 积木报表 mongo redis 支持包 
 		<dependency>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java
index b53033096..33223b43e 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java
@@ -1,102 +1,102 @@
-//package org.jeecg.config.jimureport;
-//
-//import lombok.extern.slf4j.Slf4j;
-//import org.jeecg.common.api.dto.LogDTO;
-//import org.jeecg.common.system.api.ISysBaseAPI;
-//import org.jeecg.common.system.vo.DictModel;
-//import org.jeecg.common.util.oConvertUtils;
-//import org.jeecg.modules.base.service.BaseCommonService;
-//import org.jeecg.modules.drag.service.IOnlDragExternalService;
-//import org.jeecg.modules.drag.vo.DragDictModel;
-//import org.jeecg.modules.drag.vo.DragLogDTO;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Lazy;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * @Description: 字典处理
-// * @Author: lsq
-// * @Date:2023-01-09
-// * @Version:V1.0
-// */
-//@Slf4j
-//@Service("onlDragExternalServiceImpl")
-//public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
-//
-//    @Autowired
-//    @Lazy
-//    private BaseCommonService baseCommonService;
-//
-//    @Autowired
-//    @Lazy
-//    private ISysBaseAPI sysBaseApi;
-//    /**
-//     *  根据多个字典code查询多个字典项
-//     * @param codeList
-//     * @return key = dictCode ； value=对应的字典项
-//     */
-//    @Override
-//    public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) {
-//        Map<String, List<DragDictModel>> manyDragDictItems  = new HashMap<>();
-//        Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
-//        dictItemsMap.forEach((k,v)->{
-//            List<DragDictModel> dictItems  = new ArrayList<>();
-//            v.forEach(dictItem->{
-//                DragDictModel dictModel = new DragDictModel();
-//                BeanUtils.copyProperties(dictItem,dictModel);
-//                dictItems.add(dictModel);
-//            });
-//            manyDragDictItems.put(k,dictItems);
-//        });
-//        return manyDragDictItems;
-//    }
-//
-//    /**
-//     *
-//     * @param dictCode
-//     * @return
-//     */
-//    @Override
-//    public List<DragDictModel> getDictItems(String dictCode) {
-//        List<DragDictModel> dictItems  = new ArrayList<>();
-//        if(oConvertUtils.isNotEmpty(dictCode)){
-//            List<DictModel> dictItemsList = sysBaseApi.getDictItems(dictCode);
-//            dictItemsList.forEach(dictItem->{
-//                DragDictModel dictModel = new DragDictModel();
-//                BeanUtils.copyProperties(dictItem,dictModel);
-//                dictItems.add(dictModel);
-//            });
-//        }
-//        return dictItems;
-//    }
-//
-//    /**
-//     * 添加日志
-//     * @param dragLogDTO
-//     */
-//    @Override
-//    public void addLog(DragLogDTO dragLogDTO) {
-//        if(oConvertUtils.isNotEmpty(dragLogDTO)){
-//            LogDTO dto = new LogDTO();
-//            BeanUtils.copyProperties(dragLogDTO,dto);
-//            baseCommonService.addLog(dto);
-//        }
-//    }
-//
-//    /**
-//     * 保存日志
-//     * @param logMsg
-//     * @param logType
-//     * @param operateType
-//     */
-//    @Override
-//    public void addLog(String logMsg, int logType, int operateType) {
-//        baseCommonService.addLog(logMsg,logType,operateType);
-//    }
-//}
\ No newline at end of file
+package org.jeecg.config.jimureport;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.dto.LogDTO;
+import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.base.service.BaseCommonService;
+import org.jeecg.modules.drag.service.IOnlDragExternalService;
+import org.jeecg.modules.drag.vo.DragDictModel;
+import org.jeecg.modules.drag.vo.DragLogDTO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: 字典处理
+ * @Author: lsq
+ * @Date:2023-01-09
+ * @Version:V1.0
+ */
+@Slf4j
+@Service("onlDragExternalServiceImpl")
+public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
+
+    @Autowired
+    @Lazy
+    private BaseCommonService baseCommonService;
+
+    @Autowired
+    @Lazy
+    private ISysBaseAPI sysBaseApi;
+    /**
+     *  根据多个字典code查询多个字典项
+     * @param codeList
+     * @return key = dictCode ； value=对应的字典项
+     */
+    @Override
+    public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) {
+        Map<String, List<DragDictModel>> manyDragDictItems  = new HashMap<>();
+        Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
+        dictItemsMap.forEach((k,v)->{
+            List<DragDictModel> dictItems  = new ArrayList<>();
+            v.forEach(dictItem->{
+                DragDictModel dictModel = new DragDictModel();
+                BeanUtils.copyProperties(dictItem,dictModel);
+                dictItems.add(dictModel);
+            });
+            manyDragDictItems.put(k,dictItems);
+        });
+        return manyDragDictItems;
+    }
+
+    /**
+     *
+     * @param dictCode
+     * @return
+     */
+    @Override
+    public List<DragDictModel> getDictItems(String dictCode) {
+        List<DragDictModel> dictItems  = new ArrayList<>();
+        if(oConvertUtils.isNotEmpty(dictCode)){
+            List<DictModel> dictItemsList = sysBaseApi.getDictItems(dictCode);
+            dictItemsList.forEach(dictItem->{
+                DragDictModel dictModel = new DragDictModel();
+                BeanUtils.copyProperties(dictItem,dictModel);
+                dictItems.add(dictModel);
+            });
+        }
+        return dictItems;
+    }
+
+    /**
+     * 添加日志
+     * @param dragLogDTO
+     */
+    @Override
+    public void addLog(DragLogDTO dragLogDTO) {
+        if(oConvertUtils.isNotEmpty(dragLogDTO)){
+            LogDTO dto = new LogDTO();
+            BeanUtils.copyProperties(dragLogDTO,dto);
+            baseCommonService.addLog(dto);
+        }
+    }
+
+    /**
+     * 保存日志
+     * @param logMsg
+     * @param logType
+     * @param operateType
+     */
+    @Override
+    public void addLog(String logMsg, int logType, int operateType) {
+        baseCommonService.addLog(logMsg,logType,operateType);
+    }
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
index 0b5871c86..81950d66c 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
@@ -1,81 +1,81 @@
-//package org.jeecg.config.jimureport;
-//
-//import lombok.extern.slf4j.Slf4j;
-//import org.jeecg.common.system.util.JwtUtil;
-//import org.jeecg.common.system.vo.SysUserCacheInfo;
-//import org.jeecg.common.util.RedisUtil;
-//import org.jeecg.common.util.TokenUtils;
-//import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
-//import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Lazy;
-//import org.springframework.stereotype.Component;
-//import org.springframework.util.CollectionUtils;
-//
-//import jakarta.servlet.http.HttpServletRequest;
-//import java.util.HashMap;
-//import java.util.Map;
-//import java.util.Set;
-//
-///**
-// * 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制)
-// *  * 1.自定义获取登录token
-// *  * 2.自定义获取登录用户
-// * @author: jeecg-boot
-// */
-//
-//
-//@Slf4j
-//@Component
-//public class JimuReportTokenService implements JmReportTokenServiceI {
-//    @Autowired
-//    private SysBaseApiImpl sysBaseApi;
-//    @Autowired
-//    @Lazy
-//    private RedisUtil redisUtil;
-//
-//    @Override
-//    public String getToken(HttpServletRequest request) {
-//        return TokenUtils.getTokenByRequest(request);
-//    }
-//
-//    @Override
-//    public String getUsername(String token) {
-//        return JwtUtil.getUsername(token);
-//    }
-//
-//    @Override
-//    public String[] getRoles(String token) {
-//        String username = JwtUtil.getUsername(token);
-//        Set roles = sysBaseApi.getUserRoleSet(username);
-//        if(CollectionUtils.isEmpty(roles)){
-//            return null;
-//        }
-//        return (String[]) roles.toArray(new String[roles.size()]);
-//    }
-//
-//    @Override
-//    public Boolean verifyToken(String token) {
-//        return TokenUtils.verifyToken(token, sysBaseApi, redisUtil);
-//    }
-//
-//    @Override
-//    public Map<String, Object> getUserInfo(String token) {
-//        Map<String, Object> map = new HashMap(5);
-//        String username = JwtUtil.getUsername(token);
-//        //此处通过token只能拿到一个信息 用户账号  后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义
-//        SysUserCacheInfo userInfo = null;
-//        try {
-//            userInfo = sysBaseApi.getCacheUser(username);
-//        } catch (Exception e) {
-//            log.error("获取用户信息异常:"+ e.getMessage());
-//            return map;
-//        }
-//        //设置账号名
-//        map.put(SYS_USER_CODE, userInfo.getSysUserCode());
-//        //设置部门编码
-//        map.put(SYS_ORG_CODE, userInfo.getSysOrgCode());
-//        // 将所有信息存放至map 解析sql/api会根据map的键值解析
-//        return map;
-//    }
-//}
+package org.jeecg.config.jimureport;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.system.vo.SysUserCacheInfo;
+import org.jeecg.common.util.RedisUtil;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
+import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制)
+ *  * 1.自定义获取登录token
+ *  * 2.自定义获取登录用户
+ * @author: jeecg-boot
+ */
+
+
+@Slf4j
+@Component
+public class JimuReportTokenService implements JmReportTokenServiceI {
+    @Autowired
+    private SysBaseApiImpl sysBaseApi;
+    @Autowired
+    @Lazy
+    private RedisUtil redisUtil;
+
+    @Override
+    public String getToken(HttpServletRequest request) {
+        return TokenUtils.getTokenByRequest(request);
+    }
+
+    @Override
+    public String getUsername(String token) {
+        return JwtUtil.getUsername(token);
+    }
+
+    @Override
+    public String[] getRoles(String token) {
+        String username = JwtUtil.getUsername(token);
+        Set roles = sysBaseApi.getUserRoleSet(username);
+        if(CollectionUtils.isEmpty(roles)){
+            return null;
+        }
+        return (String[]) roles.toArray(new String[roles.size()]);
+    }
+
+    @Override
+    public Boolean verifyToken(String token) {
+        return TokenUtils.verifyToken(token, sysBaseApi, redisUtil);
+    }
+
+    @Override
+    public Map<String, Object> getUserInfo(String token) {
+        Map<String, Object> map = new HashMap(5);
+        String username = JwtUtil.getUsername(token);
+        //此处通过token只能拿到一个信息 用户账号  后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义
+        SysUserCacheInfo userInfo = null;
+        try {
+            userInfo = sysBaseApi.getCacheUser(username);
+        } catch (Exception e) {
+            log.error("获取用户信息异常:"+ e.getMessage());
+            return map;
+        }
+        //设置账号名
+        map.put(SYS_USER_CODE, userInfo.getSysUserCode());
+        //设置部门编码
+        map.put(SYS_ORG_CODE, userInfo.getSysOrgCode());
+        // 将所有信息存放至map 解析sql/api会根据map的键值解析
+        return map;
+    }
+}