This commit is contained in:
iizmg
2021-02-25 15:39:01 +08:00
parent e4395aae95
commit be06e58465
6 changed files with 51 additions and 38 deletions
+1 -1
View File
@@ -14,7 +14,7 @@
<project.build.date>${maven.build.timestamp}</project.build.date>
<udf-api.version>1.0</udf-api.version>
<udf-starter.version>1.0.0</udf-starter.version>
<springboot.version>2.3.0.RELEASE</springboot.version>
<springboot.version>2.4.3</springboot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name" : "udf-app",
"name" : "itkk",
"appid" : "__UNI__71A3799",
"description" : "udf-app",
"description" : "itkk",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
+7 -7
View File
@@ -12,19 +12,19 @@
<!-- 公共参数 -->
<properties>
<udf-starter.version>1.0.0</udf-starter.version>
<springboot.version>2.3.0.RELEASE</springboot.version>
<springboot.version>2.4.3</springboot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-lang3.version>3.10</commons-lang3.version>
<commons-lang3.version>3.11</commons-lang3.version>
<commons-compress.version>1.20</commons-compress.version>
<druid-spring-boot-starter.version>1.1.22</druid-spring-boot-starter.version>
<mybatis-spring-boot-starter.version>2.1.2</mybatis-spring-boot-starter.version>
<mybatis-plus-boot-starter.version>3.3.2</mybatis-plus-boot-starter.version>
<guava.version>29.0-jre</guava.version>
<poi.version>4.1.2</poi.version>
<druid-spring-boot-starter.version>1.2.5</druid-spring-boot-starter.version>
<mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
<mybatis-plus-boot-starter.version>3.4.2</mybatis-plus-boot-starter.version>
<guava.version>30.1-jre</guava.version>
<poi.version>5.0.0</poi.version>
<thumbnailator.version>0.4.11</thumbnailator.version>
</properties>
<!--子模块 -->
@@ -174,16 +174,29 @@ public class DbCacheService {
DbCacheEntity entity = getEntity(key);
//判空
if (entity == null) {
//新增缓存
//实例化
entity = new DbCacheEntity();
entity.setK(key);
entity.setV(value);
entity.setCreateTime(System.currentTimeMillis());
entity.setExpire(expire);
entity.setExpireTime(entity.getCreateTime() + entity.getExpire());
entity.setCreateDate(new Date());
entity.setUpdateDate(new Date());
iDbCacheRepository.insert(entity);
//新增缓存
try {
entity.setK(key);
entity.setV(value);
entity.setCreateTime(System.currentTimeMillis());
entity.setExpire(expire);
entity.setExpireTime(entity.getCreateTime() + entity.getExpire());
entity.setCreateDate(new Date());
entity.setUpdateDate(new Date());
iDbCacheRepository.insert(entity);
} catch (Exception e) {
log.warn("添加缓存失败,转为更新缓存");
//更新缓存
entity.setK(key);
entity.setV(value);
entity.setCreateTime(System.currentTimeMillis());
entity.setExpire(expire);
entity.setExpireTime(entity.getCreateTime() + entity.getExpire());
entity.setUpdateDate(new Date());
iDbCacheRepository.updateById(entity);
}
} else {
//更新缓存
entity.setV(value);
@@ -1,10 +1,11 @@
package org.itkk.udf.starter.core;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.core.parser.ISqlParser;
import com.baomidou.mybatisplus.extension.MybatisMapWrapperFactory;
import com.baomidou.mybatisplus.extension.parsers.BlockAttackSqlParser;
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.common.cache.Cache;
@@ -22,6 +23,7 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.http.client.BufferingClientHttpRequestFactory;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
@@ -32,7 +34,6 @@ import org.springframework.web.client.RestTemplate;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -54,7 +55,10 @@ public class CoreConfiguration {
*/
@Bean
public List<ConfigurationCustomizer> configurationCustomizersProvider() {
return Lists.newArrayList(configuration -> configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory()));
return Lists.newArrayList(
configuration -> configuration.setObjectWrapperFactory(new MybatisMapWrapperFactory()),
configuration -> configuration.setUseDeprecatedExecutor(false)
);
}
/**
@@ -132,18 +136,14 @@ public class CoreConfiguration {
}
/**
* 分页插件
*
* @return
* 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除)
*/
@Bean
public PaginationInterceptor paginationInterceptor() {
PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
List<ISqlParser> sqlParserList = new ArrayList<>();
// 攻击 SQL 阻断解析器、加入解析链
sqlParserList.add(new BlockAttackSqlParser());
paginationInterceptor.setSqlParserList(sqlParserList);
return paginationInterceptor;
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
return interceptor;
}
/**
@@ -219,9 +219,9 @@ public class CoreConfiguration {
public ClientHttpRequestFactory requestFactory() {
SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
requestFactory.setConnectTimeout(coreProperties.getHttpConnectTimeout());
//requestFactory.setReadTimeout(coreProperties.getHttpReadTimeout());
requestFactory.setReadTimeout(coreProperties.getHttpReadTimeout());
requestFactory.setBufferRequestBody(coreProperties.getBufferRequestBody());
return requestFactory;
return new BufferingClientHttpRequestFactory(requestFactory);
}
/**
@@ -77,8 +77,8 @@ public class CoreProperties implements ApplicationContextAware {
/**
* http读取超时时间
*/
//@NotNull(message = CORE_PROPERTIES_PRE_FIX + ".httpReadTimeout不能为空")
//private Integer httpReadTimeout = 5000;
@NotNull(message = CORE_PROPERTIES_PRE_FIX + ".httpReadTimeout不能为空")
private Integer httpReadTimeout = 5000;
/**
* RestTemplate是否允许大消息体