feat: add page data cache and limit

README.md

@@ -23,18 +23,13 @@
 
 1.  git拉去项目
  
-2.  发布达梦数据库驱动包
-```bash
-mvn install:install-file -Dfile=lib/Dm7JdbcDriver18.jar -DgroupId=com.dm -DartifactId=Dm7JdbcDriver -Dversion=1.8 -Dpackaging=jar 
-``` 
-3.  发布oracle数据库驱动包
-```bash
-mvn install:install-file -Dfile=lib/ojdbc6.jar -DgroupId=com.oracle -DartifactId=ojdbc6 -Dversion=11.2.0.4 -Dpackaging=jar
-``` 
-4.  刷新maven依赖
-5.  进入目录
+2. 刷新maven依赖
+
+3. 进入目录
 ```bash 
 cd hcframe-parent/ 
 ```   
-6.  执行``mvn install``
-7.  刷新maven依赖
+
+4. 执行``mvn install``
+
+5. 刷新maven依赖

hcframe-parent/hcframe-activiti/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>parent</artifactId>
-        <groupId>com.hcframe</groupId>
+        <groupId>com.taixingyiji</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -17,20 +17,26 @@
     </properties>
     <dependencies>
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-boot-starter</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-base</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.2.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.activiti</groupId>
             <artifactId>activiti-spring-boot-starter</artifactId>
             <version>7.1.0.M1</version>
         </dependency>
+        <dependency>
+            <groupId>com.taixingyiji</groupId>
+            <artifactId>hcframe-base</artifactId>
+            <version>1.2.2-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ActivitiApplication.java

@@ -1,6 +1,6 @@
-package com.hcframe.activiti;
+package com.taixingyiji.activiti;
 
-import com.hcframe.base.module.datasource.config.DataSourceConfiguration;
+import com.taixingyiji.base.module.datasource.config.DataSourceConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -21,8 +21,8 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableCaching
 //@EnableDiscoveryClient
 //@EnableFeignClients
-@MapperScan(basePackages = "com.hcframe.**.dao")
-@ComponentScan(basePackages = {"com.hcframe.**"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {DataSourceConfiguration.class}))
+@MapperScan(basePackages = "com.taixingyiji.**.dao")
+@ComponentScan(basePackages = {"com.taixingyiji.**"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {DataSourceConfiguration.class}))
 public class ActivitiApplication {
 
     public static void main(String[] args) {

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/ServletInitializer.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti;
+package com.taixingyiji.activiti;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/ActivitiUtils.java

@@ -1,9 +1,9 @@
-package com.hcframe.activiti.activiti;
+package com.taixingyiji.activiti.activiti;
 
-import com.hcframe.base.common.ResultPageInfo;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.EmptyCheckUtils;
+import com.taixingyiji.base.common.ResultPageInfo;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.EmptyCheckUtils;
 import org.activiti.engine.*;
 import org.activiti.engine.impl.ProcessInstanceQueryProperty;
 import org.activiti.engine.impl.TaskQueryProperty;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/CommonProcessDefinition.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti.activiti;
+package com.taixingyiji.activiti.activiti;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/activiti/CommonTask.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti.activiti;
+package com.taixingyiji.activiti.activiti;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/common/ShiroRealmConfig.java

@@ -1,8 +1,8 @@
-package com.hcframe.activiti.common;
+package com.taixingyiji.activiti.common;
 
-import com.hcframe.base.module.auth.dao.FtUserDao;
-import com.hcframe.base.module.shiro.service.ShiroType;
-import com.hcframe.base.module.shiro.service.SystemRealm;
+import com.taixingyiji.base.module.auth.dao.FtUserDao;
+import com.taixingyiji.base.module.shiro.service.ShiroType;
+import com.taixingyiji.base.module.shiro.service.SystemRealm;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.springframework.stereotype.Component;
 

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/ProcessController.java

@@ -1,9 +1,9 @@
-package com.hcframe.activiti.controller;
+package com.taixingyiji.activiti.controller;
 
-import com.hcframe.activiti.activiti.CommonProcessDefinition;
-import com.hcframe.activiti.service.ProcessService;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.activiti.activiti.CommonProcessDefinition;
+import com.taixingyiji.activiti.service.ProcessService;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import io.lettuce.core.dynamic.annotation.Param;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/controller/TaskController.java

@@ -1,10 +1,10 @@
-package com.hcframe.activiti.controller;
+package com.taixingyiji.activiti.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.hcframe.activiti.activiti.CommonTask;
-import com.hcframe.activiti.service.TaskSysService;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.activiti.activiti.CommonTask;
+import com.taixingyiji.activiti.service.TaskSysService;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/BackReasonDao.java

@@ -1,7 +1,7 @@
-package com.hcframe.activiti.dao;
+package com.taixingyiji.activiti.dao;
 
-import com.hcframe.activiti.entity.BackReason;
-import com.hcframe.base.common.Mapper;
+import com.taixingyiji.activiti.entity.BackReason;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * (BackReason)表数据库访问层

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/CandidateUserDao.java

@@ -1,8 +1,8 @@
-package com.hcframe.activiti.dao;
+package com.taixingyiji.activiti.dao;
 
 
-import com.hcframe.activiti.entity.CandidateUser;
-import com.hcframe.base.common.Mapper;
+import com.taixingyiji.activiti.entity.CandidateUser;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * (CandidateUser)表数据库访问层

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskDao.java

@@ -1,8 +1,8 @@
-package com.hcframe.activiti.dao;
+package com.taixingyiji.activiti.dao;
 
 
-import com.hcframe.activiti.entity.DataTask;
-import com.hcframe.base.common.Mapper;
+import com.taixingyiji.activiti.entity.DataTask;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * (DataTask)表数据库访问层

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/dao/DataTaskHisDao.java

@@ -1,7 +1,7 @@
-package com.hcframe.activiti.dao;
+package com.taixingyiji.activiti.dao;
 
-import com.hcframe.activiti.entity.DataTaskHis;
-import com.hcframe.base.common.Mapper;
+import com.taixingyiji.activiti.entity.DataTaskHis;
+import tk.mybatis.mapper.common.Mapper;
 
 /**
  * (DataTaskHis)表数据库访问层

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/BackReason.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti.entity;
+package com.taixingyiji.activiti.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/CandidateUser.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti.entity;
+package com.taixingyiji.activiti.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/DataTask.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti.entity;
+package com.taixingyiji.activiti.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/entity/DataTaskHis.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti.entity;
+package com.taixingyiji.activiti.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/ProcessService.java

@@ -1,8 +1,8 @@
-package com.hcframe.activiti.service;
+package com.taixingyiji.activiti.service;
 
-import com.hcframe.activiti.activiti.CommonProcessDefinition;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.activiti.activiti.CommonProcessDefinition;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/TaskSysService.java

@@ -1,8 +1,8 @@
-package com.hcframe.activiti.service;
+package com.taixingyiji.activiti.service;
 
-import com.hcframe.activiti.activiti.CommonTask;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.activiti.activiti.CommonTask;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.WebPageInfo;
 
 import java.util.Map;
 

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/ProcessServiceImpl.java

@@ -1,12 +1,12 @@
-package com.hcframe.activiti.service.impl;
+package com.taixingyiji.activiti.service.impl;
 
-import com.hcframe.activiti.activiti.ActivitiUtils;
-import com.hcframe.activiti.activiti.CommonProcessDefinition;
-import com.hcframe.activiti.service.ProcessService;
-import com.hcframe.activiti.utils.FileUtil;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.activiti.activiti.ActivitiUtils;
+import com.taixingyiji.activiti.activiti.CommonProcessDefinition;
+import com.taixingyiji.activiti.service.ProcessService;
+import com.taixingyiji.activiti.utils.FileUtil;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.repository.Deployment;
 import org.slf4j.Logger;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/service/impl/TaskSysServiceImpl.java

@@ -1,21 +1,21 @@
-package com.hcframe.activiti.service.impl;
+package com.taixingyiji.activiti.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.hcframe.activiti.activiti.ActivitiUtils;
-import com.hcframe.activiti.activiti.CommonTask;
-import com.hcframe.activiti.dao.BackReasonDao;
-import com.hcframe.activiti.dao.CandidateUserDao;
-import com.hcframe.activiti.dao.DataTaskDao;
-import com.hcframe.activiti.dao.DataTaskHisDao;
-import com.hcframe.activiti.entity.BackReason;
-import com.hcframe.activiti.entity.CandidateUser;
-import com.hcframe.activiti.entity.DataTask;
-import com.hcframe.activiti.entity.DataTaskHis;
-import com.hcframe.activiti.service.TaskSysService;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.common.utils.EmptyCheckUtils;
+import com.taixingyiji.activiti.activiti.ActivitiUtils;
+import com.taixingyiji.activiti.activiti.CommonTask;
+import com.taixingyiji.activiti.dao.BackReasonDao;
+import com.taixingyiji.activiti.dao.CandidateUserDao;
+import com.taixingyiji.activiti.dao.DataTaskDao;
+import com.taixingyiji.activiti.dao.DataTaskHisDao;
+import com.taixingyiji.activiti.entity.BackReason;
+import com.taixingyiji.activiti.entity.CandidateUser;
+import com.taixingyiji.activiti.entity.DataTask;
+import com.taixingyiji.activiti.entity.DataTaskHis;
+import com.taixingyiji.activiti.service.TaskSysService;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.taixingyiji.base.common.utils.EmptyCheckUtils;
 import org.activiti.engine.*;
 import org.activiti.engine.task.Task;
 import org.springframework.beans.BeanUtils;

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/servicetask/TaskServe.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti.servicetask;
+package com.taixingyiji.activiti.servicetask;
 
 
 

hcframe-parent/hcframe-activiti/src/main/java/com/taixingyiji/activiti/utils/FileUtil.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti.utils;
+package com.taixingyiji.activiti.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

hcframe-parent/hcframe-activiti/src/main/resources/mapping/BackReasonDao.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.common.com.hcframe.activiti.dao.BackReasonDao">
+<mapper namespace="com.common.com.taixingyiji.activiti.dao.BackReasonDao">
 
-    <resultMap type="com.hcframe.activiti.entity.BackReason" id="BackReasonMap">
+    <resultMap type="com.taixingyiji.activiti.entity.BackReason" id="BackReasonMap">
         <result property="backId" column="back_id" jdbcType="INTEGER"/>
         <result property="taskId" column="task_id" jdbcType="VARCHAR"/>
         <result property="reason" column="reason" jdbcType="VARCHAR"/>

hcframe-parent/hcframe-activiti/src/main/resources/mapping/CandidateUserDao.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.common.com.hcframe.activiti.dao.CandidateUserDao">
+<mapper namespace="com.common.com.taixingyiji.activiti.dao.CandidateUserDao">
 
-    <resultMap type="com.hcframe.activiti.entity.CandidateUser" id="CandidateUserMap">
+    <resultMap type="com.taixingyiji.activiti.entity.CandidateUser" id="CandidateUserMap">
         <result property="caId" column="ca_id" jdbcType="INTEGER"/>
         <result property="taskId" column="task_id" jdbcType="VARCHAR"/>
         <result property="userId" column="user_id" jdbcType="INTEGER"/>

hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskDao.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.common.com.hcframe.activiti.dao.DataTaskDao">
+<mapper namespace="com.common.com.taixingyiji.activiti.dao.DataTaskDao">
 
-    <resultMap type="com.hcframe.activiti.entity.DataTask" id="DataTaskMap">
+    <resultMap type="com.taixingyiji.activiti.entity.DataTask" id="DataTaskMap">
         <result property="dataTaskId" column="data_task_id" jdbcType="INTEGER"/>
         <result property="tableName" column="table_name" jdbcType="VARCHAR"/>
         <result property="tableId" column="table_id" jdbcType="VARCHAR"/>

hcframe-parent/hcframe-activiti/src/main/resources/mapping/DataTaskHisDao.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.common.com.hcframe.activiti.dao.DataTaskHisDao">
+<mapper namespace="com.common.com.taixingyiji.activiti.dao.DataTaskHisDao">
 
-    <resultMap type="com.hcframe.activiti.entity.DataTaskHis" id="DataTaskHisMap">
+    <resultMap type="com.taixingyiji.activiti.entity.DataTaskHis" id="DataTaskHisMap">
         <result property="dataTaskId" column="data_task_id" jdbcType="INTEGER"/>
         <result property="tableName" column="table_name" jdbcType="VARCHAR"/>
         <result property="tableId" column="table_id" jdbcType="VARCHAR"/>

hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/ActivitiApplicationTests.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti;
+package com.taixingyiji.activiti;
 
 
 import org.junit.jupiter.api.Test;

hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TaskControllerTest.java

@@ -1,11 +1,11 @@
-package com.hcframe.activiti;
+package com.taixingyiji.activiti;
 
 import com.alibaba.fastjson.JSONObject;
-import com.hcframe.activiti.activiti.ActivitiUtils;
-import com.hcframe.activiti.activiti.CommonTask;
-import com.hcframe.activiti.controller.TaskController;
-import com.hcframe.base.common.ResultPageInfo;
-import com.hcframe.base.common.WebPageInfo;
+import com.taixingyiji.activiti.activiti.ActivitiUtils;
+import com.taixingyiji.activiti.activiti.CommonTask;
+import com.taixingyiji.activiti.controller.TaskController;
+import com.taixingyiji.base.common.ResultPageInfo;
+import com.taixingyiji.base.common.WebPageInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

hcframe-parent/hcframe-activiti/src/test/java/com/taixingyiji/activiti/TestClass.java

@@ -1,4 +1,4 @@
-package com.hcframe.activiti;
+package com.taixingyiji.activiti;
 
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;

hcframe-parent/hcframe-base/pom.xml

@@ -4,33 +4,66 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>parent</artifactId>
-        <groupId>com.hcframe</groupId>
+        <groupId>com.taixingyiji</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>hcframe-base</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+        <log4j2.version>2.17.0</log4j2.version>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-to-slf4j</artifactId>
+            <version>2.17.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-data-redis</artifactId>-->
-<!--        </dependency>-->
         <dependency>
-            <groupId>com.hcframe</groupId>
+            <groupId>org.fusesource.jansi</groupId>
+            <artifactId>jansi</artifactId>
+            <version>1.17.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.taixingyiji</groupId>
             <artifactId>hcframe-redis-starter</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
@@ -75,13 +108,19 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.70</version>
+            <version>1.2.83</version>
         </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>2.0.2</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!--            <version>3.4.3.4</version>-->
+<!--        </dependency>-->
         <!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
         <dependency>
             <groupId>javax.validation</groupId>
@@ -139,7 +178,7 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.13</version>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -183,13 +222,13 @@
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.dm</groupId>-->
+<!--            <artifactId>Dm7JdbcDriver</artifactId>-->
+<!--            <version>1.8</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>com.dm</groupId>
-            <artifactId>Dm7JdbcDriver</artifactId>
-            <version>1.8</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle</groupId>
+            <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc6</artifactId>
             <version>11.2.0.4</version>
         </dependency>

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/SimpleCORSFilter.java

@@ -1,47 +0,0 @@
-package com.hcframe.base.common.config;
-
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.*;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * 跨域支持
-
- */
-@WebFilter
-@Component
-@Order(Ordered.HIGHEST_PRECEDENCE)
-public class SimpleCORSFilter implements Filter {
-
-	@Override
-	public void destroy() {
-
-	}
-
-	@Override
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
-//		HttpServletRequest httpServletRequest = (HttpServletRequest) request;
-//		String myOrigin = httpServletRequest.getHeader("origin");
-//		HttpServletResponse httpServletResponse = (HttpServletResponse) response;
-//		httpServletResponse.setHeader("Access-Control-Allow-Origin", myOrigin);
-//		httpServletResponse.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
-//		httpServletResponse.setHeader("Access-Control-Max-Age", "3600");
-//		httpServletResponse.setHeader("Access-Control-Allow-Headers", "x-requested-with, X-Access-Token, datasource-Key");
-//		// 是否支持cookie跨域
-//		httpServletResponse.addHeader("Access-Control-Allow-Credentials", "true");
-        chain.doFilter(request, response);
-	}
-
-	@Override
-	public void init(FilterConfig arg0) throws ServletException {
-
-	}
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/config/WebMvcConfig.java

@@ -1,9 +0,0 @@
-package com.hcframe.base.common.config;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.FormContentFilter;
-
-@Component
-public class WebMvcConfig extends FormContentFilter {
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/utils/MyPageHelper.java

@@ -1,15 +0,0 @@
-package com.hcframe.base.common.utils;
-
-import com.hcframe.base.common.WebPageInfo;
-import com.github.pagehelper.PageHelper;
-
-public class MyPageHelper {
-
-    public static void start(WebPageInfo webPageInfo) {
-        if (WebPageInfo.hasSort(webPageInfo)) {
-            PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize(), webPageInfo.getSortSql());
-        } else {
-            PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize());
-        }
-    }
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java

@@ -1,14 +0,0 @@
-package com.hcframe.base.module.auth.dao;
-
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.auth.entity.FtUser;
-
-/**
- * (FtUser)表数据库访问层
- *
- * @author lhc
- * @since 2020-02-11 19:29:10
- */
-public interface FtUserDao extends Mapper<FtUser> {
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/service/AuthFunctionService.java

@@ -1,5 +0,0 @@
-package com.hcframe.base.module.auth.service;
-
-public interface AuthFunctionService {
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/data/service/TableService.java

@@ -1,45 +0,0 @@
-package com.hcframe.base.module.data.service;
-
-import com.alibaba.fastjson.JSONArray;
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.WebPageInfo;
-import com.hcframe.base.module.data.module.Condition;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
-import java.util.Map;
-
-public interface TableService {
-
-    int save(OsSysTable osSysTable, Map<String, Object> map);
-
-    ResultVO<Map<String,Object>> saveWithDate(OsSysTable osSysTable, Map<String, Object> map);
-
-    ResultVO<Integer> update(OsSysTable osSysTable, Map<String, Object> map, Integer version);
-
-    ResultVO<Integer> updateWithDate(OsSysTable tableName, Map<String, Object> map, Integer version);
-
-    ResultVO<Integer> delete(OsSysTable tableName, String ids);
-
-    ResultVO<List<Map<String,Object>>> getListNoPage(OsSysTable tableName, Map<String, Object> map);
-
-    ResultVO<Integer> updateBatch(OsSysTable osSysTable, Map<String, Object> map);
-
-    ResultVO<Integer> updateBatchWithDate(OsSysTable osSysTable, Map<String, Object> map);
-
-    ResultVO<Integer> saveBatch(OsSysTable osSysTable, String map);
-
-    ResultVO<Integer> saveBatchWithDate(OsSysTable osSysTable, String data);
-
-    ResultVO<Map<String,Object>> getBaseTableInfo(String tableNames);
-
-    PageInfo<Map<String,Object>> searchSingleTables(String map, OsSysTable tableName, WebPageInfo webPageInfo);
-
-
-    PageInfo<Map<String,Object>> searchJoinTables(String data, WebPageInfo webPageInfo, OsSysTable tableName);
-
-    ResultVO<Integer> logicDelete(OsSysTable tableName, String ids);
-
-    Condition.ConditionBuilder getQueryBuilder(JSONArray query, Condition.ConditionBuilder builder);
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java

@@ -1,16 +0,0 @@
-package com.hcframe.base.module.datasource.dao;
-
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.datasource.entity.DatasourceConfig;
-
-/**
- * (DatasourceConfig)表数据库访问层
- *
- * @author lhc
- * @since 2020-09-23 09:28:03
- */
-public interface DatasourceConfigDao extends Mapper<DatasourceConfig> {
-
-
-    int  getCount();
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java

@@ -1,14 +0,0 @@
-package com.hcframe.base.module.datasource.dao;
-
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.datasource.entity.DatasourceToken;
-
-/**
- * (DatasourceToken)表数据库访问层
- *
- * @author makejava
- * @since 2020-10-10 10:35:49
- */
-public interface DatasourceTokenDao extends Mapper<DatasourceToken> {
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java

@@ -1,15 +0,0 @@
-package com.hcframe.base.module.datasource.dao;
-
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.datasource.entity.DatasourceType;
-
-/**
- * (DatasourceType)表数据库访问层
- *
- * @author lhc
- * @since 2020-09-28 15:18:29
- */
-public interface DatasourceTypeDao extends Mapper<DatasourceType> {
-
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/service/DatasourceTypeService.java

@@ -1,9 +0,0 @@
-package com.hcframe.base.module.datasource.service;
-
-import com.hcframe.base.module.datasource.entity.DatasourceType;
-
-import java.util.List;
-
-public interface DatasourceTypeService {
-    List<DatasourceType> getAllInfo();
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java

@@ -1,16 +0,0 @@
-package com.hcframe.base.module.shiro.dao;
-
-
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.shiro.FtToken;
-
-/**
- * (FtToken)表数据库访问层
- *
- * @author lhc
- * @since 2020-02-11 20:26:15
- */
-public interface FtTokenDao extends Mapper<FtToken> {
-
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/service/ShiroService.java

@@ -1,21 +0,0 @@
-package com.hcframe.base.module.shiro.service;
-
-
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.shiro.FtToken;
-
-import java.util.Date;
-
-/**
- * @author lhc
- */
-public interface ShiroService {
-
-    ResultVO createToken(String userId,String token, Date expireTime);
-
-    ResultVO logout(String accessToken);
-
-    FtToken findByToken(String accessToken);
-
-    Object findByUserId(String userId);
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java

@@ -1,20 +0,0 @@
-package com.hcframe.base.module.tableconfig.dao;
-
-
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.tableconfig.entity.OsSysField;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * (OsSysField)表数据库访问层
- *
- * @author lhc
- * @since 2020-03-17 17:26:53
- */
-public interface OsSysFieldDao extends Mapper<OsSysField> {
-
-    List<String> getTableAlise(@Param("ids") String ids);
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java

@@ -1,16 +0,0 @@
-package com.hcframe.base.module.tableconfig.dao;
-
-
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.tableconfig.entity.OsSysSelect;
-
-/**
- * (OsSysSelect)表数据库访问层
- *
- * @author lhc
- * @since 2020-03-17 17:42:34
- */
-public interface OsSysSelectDao extends Mapper<OsSysSelect> {
-
-
-}

hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java

@@ -1,12 +0,0 @@
-package com.hcframe.base.module.tableconfig.dao;
-
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
-import org.apache.ibatis.annotations.Param;
-
-public interface OsSysTableMapper extends Mapper<OsSysTable> {
-
-
-    OsSysTable getTableAllInfo(@Param("typeName") String typeName);
-
-}

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ControllerExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common;
+package com.taixingyiji.base.common;
 
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authz.AuthorizationException;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/MyMapper.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common;
+package com.taixingyiji.base.common;
 
 import tk.mybatis.mapper.common.*;
 
@@ -6,7 +6,7 @@ import tk.mybatis.mapper.common.*;
  * @description 调用tkmapper进行接口封装
  * @param <T>
  */
-public interface Mapper<T> extends
+public interface MyMapper<T> extends
         BaseMapper<T>,
         ExampleMapper<T>,
         RowBoundsMapper<T>,

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/RestControllerExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common;
+package com.taixingyiji.base.common;
 
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ResultPageInfo.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common;
+package com.taixingyiji.base.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ResultVO.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common;
+package com.taixingyiji.base.common;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
@@ -66,7 +66,7 @@ public class ResultVO<T> {
      * @return ResultVO
      */
     public static <T> ResultVO<T> getSuccess() {
-        return new ResultVO<>();
+        return new ResultVO<T>();
     }
     /**
      * 请求成功  状态码 1
@@ -88,7 +88,7 @@ public class ResultVO<T> {
      * @return ResultVO
      */
     public static <T> ResultVO<T> getFailed(String msg) {
-        return new ResultVO<>(FAILED, msg);
+        return new ResultVO<T>(FAILED, msg);
     }
 
     /**

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/ServiceException.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common;
+package com.taixingyiji.base.common;
 
 /***
  * @description 自定义异常类

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/WebPageInfo.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common;
+package com.taixingyiji.base.common;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -51,6 +51,11 @@ public class WebPageInfo implements Serializable {
             example = "asc")
     private String order = ASC;
 
+    @ApiModelProperty(
+            value = "开启缓存"
+    )
+    private boolean enableCache = false;
+
     public static boolean hasSort(WebPageInfo webPageInfo) {
         return !StringUtils.isBlank(webPageInfo.getSortField());
     }

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/FrameConfig.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.config;
+package com.taixingyiji.base.common.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -13,4 +13,7 @@ public class FrameConfig {
     private Boolean showControllerLog = true;
     private Boolean multiDataSource = true;
     private Boolean cas = false;
+    private Boolean singleClientLogin= false;
+    private Integer pageMaxCache = 100000;
+    private Integer pageCacheTime = 60;
 }

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/GetHttpSession.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.config;
+package com.taixingyiji.base.common.config;
 
 import javax.servlet.http.HttpSession;
 import javax.websocket.HandshakeResponse;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SimpleCORSFilter.java

@@ -1,4 +1,4 @@
-package com.sinoparasoft.storage.config;
+package com.taixingyiji.base.common.config;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -27,16 +27,6 @@ public class SimpleCORSFilter implements Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
 			throws IOException, ServletException {
-		/*String[] whiteList = {"http://fwh.castscs.org.cn", "http://localhost"};
-		HttpServletRequest httpServletRequest = (HttpServletRequest) request;
-		String myOrigin = httpServletRequest.getHeader("origin");
-		boolean isValid = false;
-		for( String ip : whiteList ) {
-			if( myOrigin != null && myOrigin.equals(ip) ){
-				isValid = true;
-				break;
-			}
-		}*/
 		HttpServletRequest httpServletRequest = (HttpServletRequest) request;
 		String myOrigin = httpServletRequest.getHeader("origin");
 		HttpServletResponse httpServletResponse = (HttpServletResponse) response;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.config;
+package com.taixingyiji.base.common.config;
 
 import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import com.github.xiaoymin.knife4j.spring.filter.SecurityBasicAuthFilter;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/SwaggerEntity.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.config;
+package com.taixingyiji.base.common.config;
 
 import lombok.Data;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.sinoparasoft.storage.config;
+package com.taixingyiji.base.common.config;
 
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.FormContentFilter;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/annotation/EnableHcFrame.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.config.annotation;
+package com.taixingyiji.base.common.config.annotation;
 
 import org.springframework.context.annotation.Import;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/config/webSessionListener.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.config;
+package com.taixingyiji.base.common.config;
 
 import javax.servlet.ServletRequestEvent;
 import javax.servlet.ServletRequestListener;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/DateUtil.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import java.time.*;
 import java.time.format.DateTimeFormatter;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/EmptyCheckUtils.java

@@ -1,6 +1,6 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
-import com.hcframe.base.common.ServiceException;
+import com.taixingyiji.base.common.ServiceException;
 import org.springframework.util.StringUtils;
 
 public class EmptyCheckUtils {

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/EncryptUtil.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 
 import org.apache.shiro.codec.Base64;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/HttpClient.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/JudgeException.java

@@ -1,6 +1,6 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
-import com.hcframe.base.common.ServiceException;
+import com.taixingyiji.base.common.ServiceException;
 
 import java.util.Objects;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/ListUtil.java

@@ -1,7 +1,7 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 
-import com.hcframe.base.common.ServiceException;
+import com.taixingyiji.base.common.ServiceException;
 
 import java.util.List;
 import java.util.Map;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MD5Util.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import org.springframework.util.DigestUtils;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailAuthenticator.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import javax.mail.Authenticator;
 import javax.mail.PasswordAuthentication;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailBean.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import java.util.List;
 import java.util.Properties;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MailOperate.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 
 import javax.activation.DataHandler;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/MyPageHelper.java

@@ -0,0 +1,107 @@
+package com.taixingyiji.base.common.utils;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageInfo;
+import com.taixingyiji.base.common.WebPageInfo;
+import com.github.pagehelper.PageHelper;
+import com.taixingyiji.base.common.config.FrameConfig;
+import com.taixingyiji.base.module.cache.CacheService;
+import com.taixingyiji.base.module.cache.base.BaseCache;
+import com.taixingyiji.base.module.cache.emum.CacheType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+@Component
+public class MyPageHelper {
+
+    private static MyPageHelper myPageHelper;
+    @Autowired
+    BaseCache baseCache;
+
+    @Autowired
+    FrameConfig frameConfig;
+
+    @PostConstruct
+    public void init() {
+        myPageHelper = this;
+    }
+
+    public static void start(WebPageInfo webPageInfo) {
+        if (WebPageInfo.hasSort(webPageInfo)) {
+            PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize(), webPageInfo.getSortSql()).setAsyncCount(true);
+        } else {
+            PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize()).setAsyncCount(true);
+        }
+    }
+
+    public static void noCount(WebPageInfo webPageInfo) {
+        if (WebPageInfo.hasSort(webPageInfo)) {
+            PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize(), false).setOrderBy(webPageInfo.getSortSql());
+        } else {
+            PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize(), false);
+        }
+    }
+
+    public static PageInfo<Map<String, Object>> noCount(WebPageInfo webPageInfo, Supplier<List<Map<String, Object>>> querySupplier) {
+        if (WebPageInfo.hasSort(webPageInfo)) {
+            return PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize(), webPageInfo.getSortSql()).count(false).doSelectPageInfo(querySupplier::get);
+        } else {
+            return PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize()).count(false).doSelectPageInfo(querySupplier::get);
+        }
+    }
+
+    public static PageInfo<Map<String, Object>> myStart(WebPageInfo webPageInfo, Supplier<List<Map<String, Object>>> querySupplier) {
+        if (WebPageInfo.hasSort(webPageInfo)) {
+            return PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize(), webPageInfo.getSortSql()).doSelectPageInfo(querySupplier::get);
+        } else {
+            return PageHelper.startPage(webPageInfo.getPageNum(), webPageInfo.getPageSize()).doSelectPageInfo(querySupplier::get);
+        }
+    }
+
+    public static PageInfo<Map<String, Object>> start(WebPageInfo webPageInfo, String sql, Supplier<List<Map<String, Object>>> querySupplier) {
+        Long currentTime = System.currentTimeMillis();
+        String data = myPageHelper.baseCache.get(CacheType.pageCache.toString(), sql, String.class);
+        JSONObject jsonObject = new JSONObject();
+        if (StringUtils.isEmpty(data)) {
+            PageInfo<Map<String, Object>> result = myStart(webPageInfo, querySupplier);
+            jsonObject.set("time", currentTime);
+            jsonObject.set("count", result.getTotal());
+            if(result.getTotal() > myPageHelper.frameConfig.getPageMaxCache()){
+                myPageHelper.baseCache.add(CacheType.pageCache.toString(), sql, jsonObject.toString(), String.class);
+            }
+            return result;
+        } else {
+            JSONObject cacheJson = JSONUtil.parseObj(data);
+            Long saveTime = (Long) cacheJson.get("time");
+            long timeDiffInSeconds = (currentTime - saveTime) / 1000;
+            if (timeDiffInSeconds > myPageHelper.frameConfig.getPageCacheTime()) {
+                Thread thread = new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        PageInfo<Map<String, Object>> result = myStart(webPageInfo, querySupplier);
+                        jsonObject.set("time", currentTime);
+                        jsonObject.set("count", result.getTotal());
+                        myPageHelper.baseCache.add(CacheType.pageCache.toString(), sql, jsonObject.toString(), String.class);
+                    }
+                });
+                thread.start();
+            }
+            long total = cacheJson.get("count", Long.class);
+            noCount(webPageInfo);
+            PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(querySupplier.get());
+            pageInfo.setTotal(total);
+            return pageInfo;
+        }
+    }
+
+    public static void orderBy(String sortField, String order) {
+        PageHelper.orderBy(sortField + " " + order);
+    }
+}

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/ObjectUtil.java

@@ -1,14 +1,16 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.module.data.annotation.DataIgnore;
-import com.hcframe.base.module.data.exception.BaseMapperException;
-import com.hcframe.base.module.data.module.DataMap;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.module.data.annotation.DataIgnore;
+import com.taixingyiji.base.module.data.exception.BaseMapperException;
+import com.taixingyiji.base.module.data.module.DataMap;
+import tk.mybatis.mapper.annotation.ColumnType;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -20,6 +22,7 @@ public class ObjectUtil {
     private static final String STRING = "class java.lang.String";
     private static final String INTEGER = "class java.lang.Integer";
     private static final String LONG = "class java.lang.LONG";
+    private static final String BIG_INTEGER = "class java.math.BigInteger";
 
     public static Map<String, Object> objToMap(Object obj) {
         Class<?> clazz = obj.getClass();
@@ -106,7 +109,12 @@ public class ObjectUtil {
                 if (!fieldName.equals(SERIAL_VERSION_UID)) {
                     if (!org.springframework.util.StringUtils.isEmpty(field.get(obj))) {
                         Object value = field.get(obj);
-                        map.put(StringUtils.toUnderScoreUpperCase(fieldName), value);
+                        if (field.getAnnotation(ColumnType.class) != null) {
+                            ColumnType columnType = field.getAnnotation(ColumnType.class);
+                            map.put(columnType.column(), value);
+                        } else {
+                            map.put(StringUtils.toUnderScoreUpperCase(fieldName), value);
+                        }
                     }
                     if (field.getAnnotation(DataIgnore.class) == null) {
                         fieldList.add(StringUtils.toUnderScoreUpperCase(fieldName));
@@ -135,6 +143,10 @@ public class ObjectUtil {
             if (LONG.equals(str)) {
                 value = Long.valueOf(value.toString());
             }
+            if (BIG_INTEGER.equals(str)) {
+                value = Long.valueOf(value.toString());
+            }
+
             try {
                 field.set(obj, value);
             } catch (IllegalAccessException e) {
@@ -145,4 +157,25 @@ public class ObjectUtil {
         }
     }
 
+    public static <T> T mapToObj(Map<String, Object> map, Class<?> clazz) {
+        try {
+            Object obj = clazz.newInstance();
+            Field[] fields = obj.getClass().getDeclaredFields();
+            for (Field field : fields) {
+                int mod = field.getModifiers();
+                if (Modifier.isStatic(mod) || Modifier.isFinal(mod)) {
+                    continue;
+                }
+                field.setAccessible(true);
+                String key = StringUtils.toUnderScoreUpperCase(field.getName());
+                if (map.containsKey(key)) {
+                    field.set(obj, map.get(key));
+                }
+            }
+            return (T) obj;
+        } catch (InstantiationException | IllegalAccessException e) {
+            throw new ServiceException(e);
+        }
+    }
+
 }

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/RandomUtil.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import java.util.Random;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/RegexUtil.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import java.util.regex.Pattern;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/SpringContextUtil.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import java.util.*;
 
@@ -411,7 +411,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     }
 
     public static void main(String[] args) {
-        Long l = 1l;
-        System.out.println(l.toString());
+        String str = "USER_ID";
+        System.out.println(toCamelCase(str));
     }
 }

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/TableNameUtil.java

@@ -1,9 +1,9 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
-import com.hcframe.base.module.cache.emum.CacheType;
-import com.hcframe.base.module.cache.impl.TableCache;
-import com.hcframe.base.module.tableconfig.dao.OsSysTableMapper;
-import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import com.taixingyiji.base.module.cache.emum.CacheType;
+import com.taixingyiji.base.module.cache.impl.TableCache;
+import com.taixingyiji.base.module.tableconfig.dao.OsSysTableMapper;
+import com.taixingyiji.base.module.tableconfig.entity.OsSysTable;
 import lombok.val;
 import org.springframework.stereotype.Component;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/TokenProccessor.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import java.util.UUID;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/UserInfoUtil.java

@@ -1,7 +1,7 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
-import com.hcframe.base.module.shiro.FtToken;
-import com.hcframe.base.module.shiro.service.ShiroService;
+import com.taixingyiji.base.module.shiro.FtToken;
+import com.taixingyiji.base.module.shiro.service.ShiroService;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/utils/XssClass.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.common.utils;
+package com.taixingyiji.base.common.utils;
 
 import static org.thymeleaf.util.StringUtils.split;
 
@@ -27,4 +27,10 @@ public class XssClass {
         }
         return false;
     }
+
+    public static void main(String[] args) {
+        String str = "http://10.12.0.65";
+        System.out.println(sqlInj(str));
+
+    }
 }

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/constants/AuthConstants.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.module.auth.constants;
+package com.taixingyiji.base.module.auth.constants;
 
 /**
  * @author lhc

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/controller/AuthFunctionController.java

@@ -1,9 +1,9 @@
-package com.hcframe.base.module.auth.controller;
+package com.taixingyiji.base.module.auth.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.auth.entity.OsSysMenu;
-import com.hcframe.base.module.auth.service.AuthFunctionService;
-import com.hcframe.base.module.auth.service.MenuService;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.module.auth.service.AuthFunctionService;
+import com.taixingyiji.base.module.auth.service.MenuService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/controller/FtUserController.java

@@ -1,9 +1,9 @@
-package com.hcframe.base.module.auth.controller;
+package com.taixingyiji.base.module.auth.controller;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.module.auth.service.FtUserService;
-import com.hcframe.base.module.log.annotation.LogAnno;
-import com.hcframe.base.module.shiro.service.ShiroService;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.module.auth.service.FtUserService;
+import com.taixingyiji.base.module.log.annotation.LogAnno;
+import com.taixingyiji.base.module.shiro.service.ShiroService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/dao/FtUserDao.java

@@ -0,0 +1,14 @@
+package com.taixingyiji.base.module.auth.dao;
+
+import com.taixingyiji.base.common.MyMapper;
+import com.taixingyiji.base.module.auth.entity.FtUser;
+
+/**
+ * (FtUser)表数据库访问层
+ *
+ * @author lhc
+ * @since 2020-02-11 19:29:10
+ */
+public interface FtUserDao extends MyMapper<FtUser> {
+
+}

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/dao/OsSysMenuDao.java

@@ -1,7 +1,7 @@
-package com.hcframe.base.module.auth.dao;
+package com.taixingyiji.base.module.auth.dao;
 
-import com.hcframe.base.common.Mapper;
-import com.hcframe.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.common.MyMapper;
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.Set;
  * @author makejava
  * @since 2020-12-09 09:57:20
  */
-public interface OsSysMenuDao extends Mapper<OsSysMenu> {
+public interface OsSysMenuDao extends MyMapper<OsSysMenu> {
 
     List<OsSysMenu> selectMenu();
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/entity/FtUser.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.module.auth.entity;
+package com.taixingyiji.base.module.auth.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/entity/OsSysMenu.java

@@ -1,6 +1,6 @@
-package com.hcframe.base.module.auth.entity;
+package com.taixingyiji.base.module.auth.entity;
 
-import com.hcframe.base.module.data.annotation.DataIgnore;
+import com.taixingyiji.base.module.data.annotation.DataIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/AuthFunctionService.java

@@ -0,0 +1,5 @@
+package com.taixingyiji.base.module.auth.service;
+
+public interface AuthFunctionService {
+
+}

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/FtUserService.java

@@ -1,7 +1,7 @@
-package com.hcframe.base.module.auth.service;
+package com.taixingyiji.base.module.auth.service;
 
 
-import com.hcframe.base.common.ResultVO;
+import com.taixingyiji.base.common.ResultVO;
 
 import javax.servlet.http.HttpServletRequest;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/MenuService.java

@@ -1,8 +1,8 @@
-package com.hcframe.base.module.auth.service;
+package com.taixingyiji.base.module.auth.service;
 
 
-import com.hcframe.base.module.auth.entity.OsSysMenu;
-import com.hcframe.base.module.auth.vo.RouterVo;
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.module.auth.vo.RouterVo;
 
 import java.util.List;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/AuthFunctionServiceImpl.java

@@ -1,6 +1,6 @@
-package com.hcframe.base.module.auth.service.impl;
+package com.taixingyiji.base.module.auth.service.impl;
 
-import com.hcframe.base.module.auth.service.AuthFunctionService;
+import com.taixingyiji.base.module.auth.service.AuthFunctionService;
 import org.springframework.stereotype.Service;
 
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/FtUserServiceImpl.java

@@ -1,15 +1,15 @@
-package com.hcframe.base.module.auth.service.impl;
+package com.taixingyiji.base.module.auth.service.impl;
 
-import com.hcframe.base.common.ResultVO;
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.common.config.FrameConfig;
-import com.hcframe.base.common.utils.MD5Util;
-import com.hcframe.base.common.utils.TokenProccessor;
-import com.hcframe.base.module.auth.dao.FtUserDao;
-import com.hcframe.base.module.auth.entity.FtUser;
-import com.hcframe.base.module.auth.service.FtUserService;
-import com.hcframe.base.module.shiro.dao.FtTokenDao;
-import com.hcframe.base.module.shiro.service.ShiroService;
+import com.taixingyiji.base.common.ResultVO;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.common.config.FrameConfig;
+import com.taixingyiji.base.common.utils.MD5Util;
+import com.taixingyiji.base.common.utils.TokenProccessor;
+import com.taixingyiji.base.module.auth.dao.FtUserDao;
+import com.taixingyiji.base.module.auth.entity.FtUser;
+import com.taixingyiji.base.module.auth.service.FtUserService;
+import com.taixingyiji.base.module.shiro.dao.FtTokenDao;
+import com.taixingyiji.base.module.shiro.service.ShiroService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/service/impl/MenuServiceImpl.java

@@ -1,12 +1,12 @@
-package com.hcframe.base.module.auth.service.impl;
+package com.taixingyiji.base.module.auth.service.impl;
 
-import com.hcframe.base.common.utils.StringUtils;
-import com.hcframe.base.module.auth.constants.AuthConstants;
-import com.hcframe.base.module.auth.dao.OsSysMenuDao;
-import com.hcframe.base.module.auth.entity.OsSysMenu;
-import com.hcframe.base.module.auth.service.MenuService;
-import com.hcframe.base.module.auth.vo.MetaVo;
-import com.hcframe.base.module.auth.vo.RouterVo;
+import com.taixingyiji.base.common.utils.StringUtils;
+import com.taixingyiji.base.module.auth.constants.AuthConstants;
+import com.taixingyiji.base.module.auth.dao.OsSysMenuDao;
+import com.taixingyiji.base.module.auth.entity.OsSysMenu;
+import com.taixingyiji.base.module.auth.service.MenuService;
+import com.taixingyiji.base.module.auth.vo.MetaVo;
+import com.taixingyiji.base.module.auth.vo.RouterVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/vo/MetaVo.java

@@ -1,5 +1,5 @@
 /**/
-package com.hcframe.base.module.auth.vo;
+package com.taixingyiji.base.module.auth.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/auth/vo/RouterVo.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.module.auth.vo;
+package com.taixingyiji.base.module.auth.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/CacheService.java

@@ -1,6 +1,6 @@
-package com.hcframe.base.module.cache;
+package com.taixingyiji.base.module.cache;
 
-import com.hcframe.base.module.cache.emum.CacheType;
+import com.taixingyiji.base.module.cache.emum.CacheType;
 
 import java.util.List;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/base/BaseCache.java

@@ -1,4 +1,4 @@
-package com.hcframe.base.module.cache.base;
+package com.taixingyiji.base.module.cache.base;
 
 import org.springframework.cache.Cache;
 

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/cache/base/impl/BaseCacheImpl.java

@@ -1,7 +1,7 @@
-package com.hcframe.base.module.cache.base.impl;
+package com.taixingyiji.base.module.cache.base.impl;
 
-import com.hcframe.base.common.ServiceException;
-import com.hcframe.base.module.cache.base.BaseCache;
+import com.taixingyiji.base.common.ServiceException;
+import com.taixingyiji.base.module.cache.base.BaseCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;