Commit 7f61646b by zhangkb

修改jackson-databind版本和修改redis配置文件

parent eabbf0fd
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
<fastjson.version>1.2.70</fastjson.version> <fastjson.version>1.2.70</fastjson.version>
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version> <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
<easypoi.version>4.1.3</easypoi.version> <easypoi.version>4.1.3</easypoi.version>
<jackson.version>2.11.0</jackson.version>
<jackson.version.databind>${jackson.version}</jackson.version.databind>
</properties> </properties>
<dependencies> <dependencies>
...@@ -175,6 +177,12 @@ ...@@ -175,6 +177,12 @@
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot-starter</artifactId>
<version>3.0.3</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
......
package com.keymobile.tagmanager; package com.keymobile.tagmanager;
import org.jasypt.encryption.StringEncryptor;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import com.keymobile.auth.common.security.ApplicationHelper;
import com.ulisesbocchio.jasyptspringboot.environment.StandardEncryptableEnvironment;
@EnableFeignClients @EnableFeignClients
@SpringBootApplication @SpringBootApplication
@EnableCaching @EnableCaching
...@@ -15,6 +20,22 @@ public class TagManagerApplication { ...@@ -15,6 +20,22 @@ public class TagManagerApplication {
public static void main(String[] args) { public static void main(String[] args) {
System.setProperty("es.set.netty.runtime.available.processors", "false"); System.setProperty("es.set.netty.runtime.available.processors", "false");
SpringApplication.run(TagManagerApplication.class, args); SpringApplication.run(TagManagerApplication.class, args);
// new SpringApplicationBuilder()
// .environment(StandardEncryptableEnvironment.builder().encryptor(stringEncryptor()).build())
// .sources(TagManagerApplication.class).run(args);
}
private static StringEncryptor stringEncryptor() {
return new StringEncryptor() {
@Override
public String encrypt(String s) {
return ApplicationHelper.getEncryptor().encrypt(s);
} }
@Override
public String decrypt(String s) {
return ApplicationHelper.getEncryptor().decrypt(s);
}
};
}
} }
...@@ -12,6 +12,7 @@ import org.springframework.data.redis.core.ValueOperations; ...@@ -12,6 +12,7 @@ import org.springframework.data.redis.core.ValueOperations;
import org.springframework.data.redis.core.ZSetOperations; import org.springframework.data.redis.core.ZSetOperations;
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer;
import org.springframework.session.data.redis.config.ConfigureRedisAction;
@Configuration @Configuration
public class RedisConf { public class RedisConf {
...@@ -103,4 +104,10 @@ public class RedisConf { ...@@ -103,4 +104,10 @@ public class RedisConf {
@Bean @Bean
public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) { public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
return redisTemplate.opsForZSet(); return redisTemplate.opsForZSet();
}} }
@Bean
public static ConfigureRedisAction configureRedisAction(){
return ConfigureRedisAction.NO_OP;
}
}
jasypt.encryptor.algorithm=PBEWithMD5AndDES
jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment