浏览代码

@IPU_FIXBUG_2021@weihf@将mongodb的事务控制类改名,避免和数据库事务控制类同名。自定义redis配置类里增加缺省值,避免不配置导致服务报错。

weihf 4 年之前
父节点
当前提交
9b384da8d0

+ 2 - 2
ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/aspect/TransactionAspect.java

10
import com.ai.ipu.nosql.mongodb.MongoCacheFactory;
10
import com.ai.ipu.nosql.mongodb.MongoCacheFactory;
11

11

12
@Aspect
12
@Aspect
13
public class TransactionAspect {
14
    transient protected ILogger log = IpuLoggerFactory.createLogger(TransactionAspect.class);
13
public class MongoTransactionAspect {
14
    transient protected ILogger log = IpuLoggerFactory.createLogger(MongoTransactionAspect.class);
15
    final static String executionService = "execution(* com.ai..service..*Impl.process*(..))";
15
    final static String executionService = "execution(* com.ai..service..*Impl.process*(..))";
16
    
16
    
17
    @Pointcut(executionService)
17
    @Pointcut(executionService)

+ 5 - 5
ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/cache/DefineRedisConfig.java

12
@EnableCaching
12
@EnableCaching
13
@Configuration
13
@Configuration
14
public class DefineRedisConfig extends RedisConfig{
14
public class DefineRedisConfig extends RedisConfig{
15
	@Value("${define.redis1.database}")
15
	@Value("${define.redis1.database:1}")
16
    private int dbIndex;
16
    private int dbIndex;
17

17

18
    @Value("${define.redis1.host}")
18
    @Value("${define.redis1.host:127.0.0.1}")
19
    private String host;
19
    private String host;
20

20

21
    @Value("${define.redis1.port}")
21
    @Value("${define.redis1.port:6379}")
22
    private int port;
22
    private int port;
23

23

24
    @Value("${define.redis1.password}")
24
    @Value("${define.redis1.password:null}")
25
    private String password;
25
    private String password;
26

26

27
    @Value("${define.redis1.timeout}")
27
    @Value("${define.redis1.timeout:1000}")
28
    private int timeout;
28
    private int timeout;
29

29

30
    /**
30
    /**

+ 4 - 4
ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/cache/RedisConfig.java

15
@EnableCaching
15
@EnableCaching
16
@Configuration
16
@Configuration
17
public class RedisConfig {
17
public class RedisConfig {
18
    @Value("${spring.redis.pool.max-active}")
18
    @Value("${spring.redis.pool.max-active:10}")
19
    private int redisPoolMaxActive;
19
    private int redisPoolMaxActive;
20

20

21
    @Value("${spring.redis.pool.max-wait}")
21
    @Value("${spring.redis.pool.max-wait:1000}")
22
    private int redisPoolMaxWait;
22
    private int redisPoolMaxWait;
23

23

24
    @Value("${spring.redis.pool.max-idle}")
24
    @Value("${spring.redis.pool.max-idle:10}")
25
    private int redisPoolMaxIdle;
25
    private int redisPoolMaxIdle;
26

26

27
    @Value("${spring.redis.pool.min-idle}")
27
    @Value("${spring.redis.pool.min-idle:3}")
28
    private int redisPoolMinIdle;
28
    private int redisPoolMinIdle;
29

29

30
 
30
 

+ 1 - 1
ipu-rest-demo/src/main/resources/ipu-spring-mvc.xml

13
    <context:component-scan base-package="com.ai.ipu.server.demo" />
13
    <context:component-scan base-package="com.ai.ipu.server.demo" />
14
    <!-- 扫描ipu-spring-nacos -->
14
    <!-- 扫描ipu-spring-nacos -->
15
    <context:component-scan base-package="com.ai.ipu.nacos.*" />
15
    <context:component-scan base-package="com.ai.ipu.nacos.*" />
16
    <bean id="transcationAspects" class="com.ai.ipu.server.demo.aspect.TransactionAspect" />
16
    <bean id="mongoTranscationAspects" class="com.ai.ipu.server.demo.aspect.MongoTransactionAspect" />
17
</beans> 
17
</beans>