Jelajahi Sumber

增加jimureport报表引擎

xuzuoyun 4 tahun lalu
induk
melakukan
b1a4d7fa7d

+ 5 - 0
jeecg-boot-module-system/pom.xml

@@ -169,6 +169,11 @@
             <artifactId>pagehelper</artifactId>
             <version>5.1.11</version>
         </dependency>
+        <dependency>
+            <groupId>com.jimureport</groupId>
+            <artifactId>spring-boot-starter-jimureport</artifactId>
+            <version>1.1-beta</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/config/MybatisPlusConfig.java

@@ -4,7 +4,6 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
 
 /**
  * 单数据源配置(jeecg.datasource.open = false时生效)

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

@@ -90,6 +90,9 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/ctop/bytedanceInterestCategory/**", "anon");
         filterChainDefinitionMap.put("/template/creative/words/get", "anon");
         filterChainDefinitionMap.put("template/bytedance/industry/list", "anon");
+        //报表设计器排除
+        filterChainDefinitionMap.put("/design/report/**", "anon");
+        filterChainDefinitionMap.put("/**/*.css.map", "anon");
 
         filterChainDefinitionMap.put("/bytedance/batch/creative/words/get", "anon");
         filterChainDefinitionMap.put("/bytedance/batch/action/text", "anon");

+ 7 - 0
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -174,6 +174,13 @@ mybatis-plus:
     #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #jeecg专用配置
 jeecg:
+  #积木报表设置
+  jmreport:
+    mode: dev
+    #是否需要校验token
+    is_verify_token: false
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
   elasticsearch:
     cluster-nodes:
     check-enabled: false

+ 7 - 0
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -144,6 +144,13 @@ mybatis-plus:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #jeecg专用配置
 jeecg:
+  #积木报表设置
+  jmreport:
+    mode: dev
+    #是否需要校验token
+    is_verify_token: false
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
   elasticsearch:
     cluster-nodes:
     check-enabled: false

+ 7 - 0
jeecg-boot-module-system/src/main/resources/application-prod2.yml

@@ -136,6 +136,13 @@ mybatis-plus:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #jeecg专用配置
 jeecg:
+  #积木报表设置
+  jmreport:
+    mode: dev
+    #是否需要校验token
+    is_verify_token: false
+    #必须校验方法
+    verify_methods: remove,delete,save,add,update
   elasticsearch:
     cluster-nodes:
     check-enabled: false

+ 5 - 5
module-crawler/src/main/java/cn/com/ctop/crawler/modules/taobao/service/impl/TaobaoJhsbybtServiceImpl.java

@@ -138,19 +138,19 @@ public class TaobaoJhsbybtServiceImpl implements TaobaoJhsbybtService {
 
     public static void main(String[] args) {
         try {
-            PrintStream out = new PrintStream("D:/bybt1102.csv");
+            PrintStream out = new PrintStream("D:/bybt1208.csv");
             System.setOut(out);
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         }
+
+        Boolean hasMore = true;
         System.out.println("商品id,商品名,销量,商品logo,设计图,商品图,商品链接,正常价,,,补贴价,补贴券");
 
         TaobaoJhsbybtServiceImpl tb = new TaobaoJhsbybtServiceImpl();
-        tb.taobaoLogin("流行之道","xzy19890417");
-//        tb.taobaoLogin("m228419161","cxq121119..");
+//        tb.taobaoLogin("流行之道","xzy19890417");
+        tb.taobaoLogin("m228419161","cxq121119..");
         int i = 1;
-
-        Boolean hasMore = true;
         while (hasMore) {
             try {
                 String result = tb.getGoodsList(i);

+ 0 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/graphql/entity/KuaishouUserCookie.java

@@ -7,9 +7,7 @@ import lombok.Data;
 @Data
 @TableName("ctop_kuaishou_user_cookie")
 public class KuaishouUserCookie {
-    @TableId
     private String userId;
-    @TableId
     private String ksid;
     private String eid;
     private String cookie;

+ 2 - 1
pom.xml

@@ -91,7 +91,7 @@
         <java.version>1.8</java.version>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mybatis-plus.version>3.1.2</mybatis-plus.version>
+        <mybatis-plus.version>3.3.2</mybatis-plus.version>
         <druid.version>1.1.10</druid.version>
         <commons.version>2.6</commons.version>
         <aliyun-java-sdk-core.version>3.5.0</aliyun-java-sdk-core.version>
@@ -476,6 +476,7 @@
             <artifactId>tencentcloud-sdk-java</artifactId>
             <version>3.1.62</version><!-- 注:这里只是示例版本号,请获取并替换为 最新的版本号 -->
         </dependency>
+
     </dependencies>
 
     <dependencyManagement>