集成积木报表1.9.4版本

nc_wms_java/pom.xml

@@ -59,6 +59,7 @@
         <freemarker.version>2.3.33</freemarker.version>
         <jsoup.version>1.18.1</jsoup.version>
         <tika.version>3.1.0</tika.version>
+        <jimureport-spring.version>1.9.4</jimureport-spring.version>
     </properties>
 
     <dependencyManagement>
@@ -339,6 +340,12 @@
                 <version>${tika.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.jeecgframework.jimureport</groupId>
+                <artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
+                <version>${jimureport-spring.version}</version>
+            </dependency>
+
         </dependencies>
 
     </dependencyManagement>

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java

@@ -24,11 +24,11 @@ public class MvcConfig implements WebMvcConfigurer {
     private AdminInterceptor adminInterceptor;
 
 
-
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(adminInterceptor)
                 .excludePathPatterns(SwaggerConfig.SWAGGER_WHITELIST)
+                .excludePathPatterns("/jmreport/**", "/jimubi/**")
                 .addPathPatterns("/**");
     }
 

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/jimuReport/JimuReportTokenServiceImpl.java

@@ -0,0 +1,77 @@
+package net.lab1024.sa.admin.module.business.wms.jimuReport;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
+import org.springframework.stereotype.Component;
+
+@Component
+public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
+    /**
+     * 通过请求获取Token
+     *
+     * @param request
+     * @return
+     */
+    @Override
+    public String getToken(HttpServletRequest request) {
+        return "123456";
+    }
+
+    /**
+     * 自定义获取租户
+     *
+     * @return
+     */
+    @Override
+    public String getTenantId() {
+        return "1";
+    }
+
+    /**
+     * 通过Token获取登录人用户名
+     *
+     * @param token
+     * @return
+     */
+    @Override
+    public String getUsername(String token) {
+        return "admin";
+    }
+
+    /**
+     * 自定义用户拥有的角色
+     *
+     * @param token
+     * @return
+     */
+    @Override
+    public String[] getRoles(String token) {
+        return new String[]{"admin", "lowdeveloper", "dbadeveloper"};
+    }
+
+    /**
+     * 自定义用户拥有的权限指令
+     *
+     * @param token
+     * @return
+     */
+    @Override
+    public String[] getPermissions(String token) {
+        //drag:datasource:testConnection   仪表盘数据库连接测试
+        //onl:drag:clear:recovery          清空回收站
+        //drag:analysis:sql                SQL解析
+        //drag:design:getTotalData         仪表盘对Online表单展示数据
+        return new String[]{"drag:datasource:testConnection", "onl:drag:clear:recovery", "drag:analysis:sql", "drag:design:getTotalData"};
+    }
+
+    /**
+     * Token校验
+     *
+     * @param token
+     * @return
+     */
+    @Override
+    public Boolean verifyToken(String token) {
+        return true;
+    }
+}

nc_wms_java/sa-base/pom.xml

@@ -289,6 +289,11 @@
             <artifactId>tika-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>jimureport-spring-boot3-starter-fastjson2</artifactId>
+        </dependency>
+
     </dependencies>
 
 

nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/listener/WebServerListener.java

@@ -66,6 +66,8 @@ public class WebServerListener implements ApplicationListener<WebServerInitializ
         String externalUrl = URLUtil.normalize(String.format("http://%s:%d%s", ip, port, contextPath), false, true);
         String swaggerUrl = URLUtil.normalize(String.format("http://localhost:%d%s/swagger-ui/index.html", port, contextPath), false, true);
         String knife4jUrl = URLUtil.normalize(String.format("http://localhost:%d%s/doc.html", port, contextPath), false, true);
+        String jiMuReportUrl = URLUtil.normalize(String.format("http://localhost:%d%s/jmreport/list", port, contextPath), false, true);
+
         log.warn("\n{}\n" +
                         "\t当前启动环境:\t{} , {}" +
                         "\n\t返回码初始化:\t完成{}个返回码初始化" +
@@ -73,8 +75,9 @@ public class WebServerListener implements ApplicationListener<WebServerInitializ
                         "\n\t服务外网地址:\t{}" +
                         "\n\tSwagger地址:\t{}" +
                         "\n\tknife4j地址:\t{}" +
+                        "\n\t积木报表地址:\t{}" +
                         "\n-------------------------------------------------------------------------------------\n",
-                title, profile, environmentEnum.getDesc(), codeCount, localhostUrl, externalUrl, swaggerUrl, knife4jUrl);
+                title, profile, environmentEnum.getDesc(), codeCount, localhostUrl, externalUrl, swaggerUrl, knife4jUrl,jiMuReportUrl);
     }
 
     /**

nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml

@@ -168,3 +168,22 @@ smart:
     db-refresh-enabled: true
     # 数据库配置检测-执行间隔 默认120秒 可选
     db-refresh-interval: 60
+
+jeecg :
+  jmreport:
+    #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
+    saasMode: tenant
+    # 平台上线安全配置(v1.6.2+ 新增)
+    firewall:
+      # 数据源安全 (开启后，不允许使用平台数据源、SQL解析不允许select * 查询、禁止测试数据源连接是否正确)
+      # 数据源安全下，预留角色有权限使用 select * 和测试数据源链接
+      dataSourceSafe: true
+      # 低代码开发模式（dev:开发模式，prod:发布模式关闭报表设计，预留角色admin、lowdeveloper可设计, prodsf:发布安全模式 彻底关闭报表设计）
+      lowCodeMode: dev
+      # api数据集内网ip白名单，在发布模式下只只能向设置了白名单的内网服务器发送请求。
+      apiDsIpWhite:
+        - 192.168.1.69
+        - 192.168.1.2
+        - 10.22.1.0/24
+      # sql注入检查级别（all:所有, simple:简单校验, none:不校验）
+      sqlInjectionLevel: all