Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
matrix
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mall
arch
matrix
Commits
8ec9390c
Commit
8ec9390c
authored
Aug 12, 2019
by
李秋伟
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 'master'
test Closes #8 See merge request mall/arch/matrix!5
parents
cba01508
5af7e57a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
2 deletions
+1
-2
AopTransaction.java
common-core/src/main/java/com/secoo/mall/common/core/aop/AopTransaction.java
+0
-1
MatrixeRedisAutoConfiguration.java
redis-starter/src/main/java/com/secoo/mall/redis/config/MatrixeRedisAutoConfiguration.java
+1
-1
No files found.
common-core/src/main/java/com/secoo/mall/common/core/aop/AopTransaction.java
View file @
8ec9390c
...
@@ -29,7 +29,6 @@ public class AopTransaction {
...
@@ -29,7 +29,6 @@ public class AopTransaction {
public
void
createPointCut
()
{
public
void
createPointCut
()
{
}
}
/**
/**
* 更新切入点
* 更新切入点
*/
*/
...
...
redis-starter/src/main/java/com/secoo/mall/redis/config/MatrixeRedisAutoConfiguration.java
View file @
8ec9390c
...
@@ -29,7 +29,7 @@ public class MatrixeRedisAutoConfiguration {
...
@@ -29,7 +29,7 @@ public class MatrixeRedisAutoConfiguration {
redisTemplate
.
setHashValueSerializer
(
stringSerializer
);
redisTemplate
.
setHashValueSerializer
(
stringSerializer
);
return
redisTemplate
;
return
redisTemplate
;
}
}
@Bean
@Bean
@ConditionalOnMissingBean
(
MatrixRedisClusterUtils
.
class
)
@ConditionalOnMissingBean
(
MatrixRedisClusterUtils
.
class
)
public
MatrixRedisClusterUtils
jedisClusterUtils
()
{
public
MatrixRedisClusterUtils
jedisClusterUtils
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment