合并分支 'qa' 到 'master'

pom.xml

@@ -52,7 +52,6 @@
         <dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
-            <version>${minio.version}</version>
             <optional>true</optional>
         </dependency>
 
@@ -78,6 +77,17 @@
         <dependency>
             <groupId>com.wangxiaolu.sfa</groupId>
             <artifactId>wangxiaolu-sfa-api-system</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.protobuf</groupId>
+                    <artifactId>protobuf-java</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- protobuf -->
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -109,20 +119,20 @@
             <artifactId>jimureport-spring-boot-starter</artifactId>
             <version>${jeccg.jimureport.version}</version>
         </dependency>
+        <!-- mongo、redis和文件数据集支持包，按需引入 -->
         <dependency>
             <groupId>org.jeecgframework.jimureport</groupId>
             <artifactId>jimureport-nosql-starter</artifactId>
-            <version>${jeccg.jimureport.version}</version>
         </dependency>
+        <!-- 后台导出接口Echart图表支持包，按需引入 -->
         <dependency>
             <groupId>org.jeecgframework.jimureport</groupId>
-            <artifactId>jimubi-spring-boot-starter</artifactId>
-            <version>${jeccg.jimureport.version}</version>
+            <artifactId>jimureport-echarts-starter</artifactId>
         </dependency>
+        <!-- 后台导出接口BIbi图表支持包，按需引入 -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <optional>true</optional>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>jimubi-spring-boot-starter</artifactId>
         </dependency>
 
         <!-- hutool -->
@@ -131,6 +141,34 @@
             <artifactId>hutool-all</artifactId>
         </dependency>
     </dependencies>
+
+    <repositories>
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jeecg</id>
+            <name>jeecg Repository</name>
+            <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+         <repository>
+            <id>jeecg-snapshots</id>
+            <name>jeecg snapshots Repository</name>
+            <url>https://maven.jeecg.org/nexus/content/repositories/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>

src/main/java/com/link/report/domain/dao/impl/ReportShareDaoImpl.java

@@ -11,6 +11,9 @@ import java.util.List;
 
 /**
  * 报表分享数据
+ * @author lvbencai
+ * @version 1.0
+ * @date 2024/6/27 15:05
  */
 @Component
 public class ReportShareDaoImpl  implements ReportShareDao {

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

@@ -91,6 +91,8 @@ public class CustomerGroupServiceImpl implements CustomerGroupService {
                 groupQueryWq.setName(customerGroupDto.getGroupName());
                 List<CustomerGroupDto> existGroupDtos = groupDao.queryList(groupQueryWq);
                 if (ObjectUtil.isEmpty(existGroupDtos)) {
+//                    Snowflake snowflake = IdUtil.createSnowflake(1L, 1L);
+//                    groupAddVo.setGroupId(snowflake.nextIdStr());
                     groupAddVo.setGroupId(IdUtil.getSnowflakeNextIdStr());
                     groupAddVo.setCreateUserId(userid);
                     groupAddVo.setUpdateUserId(userid);

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

@@ -81,11 +81,14 @@ public class CustomerReportGroupServiceImpl implements CustomerReportGroupServic
 
         // 新增
         List<CustomerReportGroup> items = new ArrayList<>();
+        // 创建 Snowflake 实例（指定 workerId 和 datacenterId）
+//        Snowflake snowflake = IdUtil.createSnowflake(1L, 1L);
         for (CustomerReportGroupVo vo : customerReportGroupVo) {
             List<ReportItemsDto> itemsDtos = vo.getItems();
             for (ReportItemsDto item : itemsDtos) {
                 CustomerReportGroup dto = new CustomerReportGroup();
                 // 雪花算法生成id
+//                dto.setId(snowflake.nextIdStr());
                 dto.setId(IdUtil.getSnowflakeNextIdStr());
                 dto.setGroupId(vo.getGroupId());
                 dto.setReportId(item.getReportId());

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

@@ -35,6 +35,10 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
     @Override
     public String getToken(HttpServletRequest request) {
         String token = "";
+        // 定时任务会为空
+        if (request == null) {
+            return "";
+        }
         if (request != null) {
             token = request.getParameter("token");
             if (ObjectUtil.isEmpty(token)) {
@@ -64,6 +68,9 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
     @Override
     public String[] getRoles(String s) {
         LoginUser loginUser = tokenService.getLoginUser(s);
+        if (ObjectUtil.isEmpty(loginUser)) {
+            return new String[0];
+        }
         Set<String> roles = loginUser.getRoles();
         // it可以设计任何报表
         if (!ObjectUtil.isAllNotEmpty(loginUser.getSysUser(), loginUser.getSysUser().getDept()
@@ -80,6 +87,13 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
      */
     @Override
     public Boolean verifyToken(String s) {
+        HttpServletRequest request = ServletUtils.getRequest();
+        String requestURI = request.getRequestURI();
+        // 排除分享页面的一些不需要校验的请求url
+        if (requestURI.contains("/jmreport/dictCodeSearch") ||
+                requestURI.contains("/jmreport/query/multiple/initValue")) {
+            return true;
+        }
         if (s != null && s.length() > 0) {
             LoginUser loginUser = tokenService.getLoginUser(s);
             return loginUser != null;
@@ -105,8 +119,13 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
      */
     @Override
     public String getTenantId() {
-        String token = ServletUtils.getRequest().getParameter("token");
-        String header = ServletUtils.getRequest().getHeader("X-Access-Token");
+        HttpServletRequest request = ServletUtils.getRequest();
+        // 定时任务会为空
+        if (null == request) {
+            return "NO";
+        }
+        String token = request.getParameter("token");
+        String header = request.getHeader("X-Access-Token");
         LoginUser loginUser = null;
         if (StringUtils.isNoneBlank(token)) {
             loginUser = tokenService.getLoginUser(token);