Skip to content

Commit 5370947

Browse files
TaXueWWLTaXueWWL
committed
snowalker--增加redisson密码连接
1 parent c9aa98c commit 5370947

File tree

20 files changed

+164
-103
lines changed

20 files changed

+164
-103
lines changed

‎redis-distributed-lock-core/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@
8888
<artifactId>redisson</artifactId>
8989
<version>3.5.4</version>
9090
</dependency>
91+
<dependency>
92+
<groupId>javax.annotation</groupId>
93+
<artifactId>javax.annotation-api</artifactId>
94+
<version>1.3.2</version>
95+
<scope>compile</scope>
96+
</dependency>
9197

9298
</dependencies>
9399

‎redis-distributed-lock-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\annotation\RedisLock.java
2-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\lock\RedisDistributedLock.java
3-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\lock\redisson\RedissonManager.java
4-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\lock\redisson\RedissonLock.java
5-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\config\RedisPool.java
6-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\config\RedisPoolUtil.java
7-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\util\PropertiesUtil.java
8-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\handler\RedisLockHandler.java
9-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\lock\DistributedLock.java
1+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\annotation\RedisLock.java
2+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\config\RedisPoolUtil.java
3+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\util\PropertiesUtil.java
4+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\lock\redisson\RedissonLock.java
5+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\lock\DistributedLock.java
6+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\lock\redisson\RedissonManager.java
7+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\config\RedisPool.java
8+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\handler\RedisLockHandler.java
9+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-core\src\main\java\com\snowalker\lock\RedisDistributedLock.java

‎redis-distributed-lock-demo-spring/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
</properties>
3737

3838
<dependencies>
39-
<!--<dependency>-->
40-
<!--<groupId>com.snowalker</groupId>-->
41-
<!--<artifactId>redis-distributed-lock-starter</artifactId>-->
42-
<!--<version>1.0.0</version>-->
43-
<!--</dependency>-->
39+
<dependency>
40+
<groupId>com.snowalker</groupId>
41+
<artifactId>redis-distributed-lock-starter</artifactId>
42+
<version>1.2.0</version>
43+
</dependency>
4444
<dependency>
4545
<groupId>com.snowalker</groupId>
4646
<artifactId>redis-distributed-lock-core</artifactId>
@@ -98,7 +98,6 @@
9898
<version>2.6.1</version>
9999
<scope>compile</scope>
100100
</dependency>
101-
102101
<dependency>
103102
<groupId>com.alibaba</groupId>
104103
<artifactId>fastjson</artifactId>

‎redis-distributed-lock-demo-spring/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-demo-spring\src\main\java\com\snowalker\AlipayGatewayServerBootstrap.java
2-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-demo-spring\src\main\java\com\snowalker\executor\ExecutorA.java
3-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-demo-spring\src\main\java\com\snowalker\executor\ExecutorB.java
4-
C:\Users\snowalker\IdeaProjects\redis-distributed-lock\redis-distributed-lock-demo-spring\src\main\java\com\snowalker\executor\ExecutorRedisson.java
1+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-demo-spring\src\main\java\com\snowalker\executor\ExecutorRedisson.java
2+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-demo-spring\src\main\java\com\snowalker\executor\ExecutorA.java
3+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-demo-spring\src\main\java\com\snowalker\AlipayGatewayServerBootstrap.java
4+
C:\Users\12108\IdeaProjects\redis-distributed-lock\redis-distributed-lock-demo-spring\src\main\java\com\snowalker\executor\ExecutorB.java

‎redis-distributed-lock-starter-demo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.5.3.RELEASE</version>
17+
<version>2.1.3.RELEASE</version>
1818
<relativePath/> <!-- lookup parent from repository -->
1919
</parent>
2020

@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.snowalker</groupId>
4646
<artifactId>redis-distributed-lock-starter</artifactId>
47-
<version>1.1.1</version>
47+
<version>1.2.0</version>
4848
</dependency>
4949

5050
<dependency>

‎redis-distributed-lock-starter-demo/src/main/java/com/snowalker/RedisDistributedLockStarterDemoApplication.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
11
package com.snowalker;
22

3-
import com.snowalker.executor.rmqtest.MyRMQReveiver;
43
import com.snowalker.lock.redisson.config.EnableRedissonLock;
54
import org.springframework.boot.SpringApplication;
65
import org.springframework.boot.autoconfigure.SpringBootApplication;
7-
import org.springframework.context.ConfigurableApplicationContext;
8-
import org.springframework.context.annotation.ComponentScan;
96
import org.springframework.scheduling.annotation.EnableScheduling;
107

118
@EnableRedissonLock
129
@EnableScheduling
1310
@SpringBootApplication
14-
@ComponentScan(basePackages = {"com.snowalker", "com.gyjx.marketing"})
1511
public class RedisDistributedLockStarterDemoApplication {
1612

1713
public static void main(String[] args) throws Exception {
18-
ConfigurableApplicationContext context =
19-
SpringApplication.run(RedisDistributedLockStarterDemoApplication.class, args);
20-
// ConfigTest configTest = (ConfigTest) context.getBean("configTest");
21-
// MyRMQSender sender = context.getBean(MyRMQSender.class);
22-
// sender.send();
14+
SpringApplication.run(RedisDistributedLockStarterDemoApplication.class, args);
2315
}
2416

2517

‎redis-distributed-lock-starter-demo/src/main/java/com/snowalker/executor/ExecutorRedissonNormal.java‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
//package com.snowalker.executor;
2-
//
3-
//import com.snowalker.lock.redisson.RedissonLock;
4-
//import org.slf4j.Logger;
5-
//import org.slf4j.LoggerFactory;
6-
//import org.springframework.beans.factory.annotation.Autowired;
7-
//import org.springframework.scheduling.annotation.Scheduled;
8-
//import org.springframework.stereotype.Component;
9-
//
10-
///**
11-
// * @author wuwl@19pay.com.cn
12-
// * @date 2018-7-9
13-
// * @desc 纯java调用
14-
// */
15-
//@Component
16-
//public class ExecutorRedissonNormal {
17-
//
18-
// private static final Logger LOGGER = LoggerFactory.getLogger(ExecutorRedissonNormal.class);
19-
//
20-
// @Autowired
21-
// RedissonLock redissonLock;
22-
//
23-
// @Scheduled(cron = "${redis.lock.cron}")
24-
// public void execute() throws InterruptedException {
25-
// if (redissonLock.lock("redisson", 10)) {
26-
// LOGGER.info("[ExecutorRedisson]--执行定时任务开始，休眠三秒");
27-
// Thread.sleep(3000);
28-
// System.out.println("=======================业务逻辑=============================");
29-
// LOGGER.info("[ExecutorRedisson]--执行定时任务结束，休眠三秒");
30-
// redissonLock.release("redisson");
31-
// } else {
32-
// LOGGER.info("[ExecutorRedisson]获取锁失败");
33-
// }
34-
//
35-
// }
36-
//
37-
//}
1+
package com.snowalker.executor;
2+
3+
import com.snowalker.lock.redisson.RedissonLock;
4+
import org.slf4j.Logger;
5+
import org.slf4j.LoggerFactory;
6+
import org.springframework.beans.factory.annotation.Autowired;
7+
import org.springframework.scheduling.annotation.Scheduled;
8+
import org.springframework.stereotype.Component;
9+
10+
/**
11+
* @author wuwl@19pay.com.cn
12+
* @date 2018-7-9
13+
* @desc 纯java调用
14+
*/
15+
@Component
16+
public class ExecutorRedissonNormal {
17+
18+
private static final Logger LOGGER = LoggerFactory.getLogger(ExecutorRedissonNormal.class);
19+
20+
@Autowired
21+
RedissonLock redissonLock;
22+
23+
@Scheduled(cron = "${redis.lock.cron}")
24+
public void execute() throws InterruptedException {
25+
if (redissonLock.lock("redisson", 10)) {
26+
LOGGER.info("[ExecutorRedisson]--执行定时任务开始，休眠三秒");
27+
Thread.sleep(3000);
28+
System.out.println("=======================业务逻辑=============================");
29+
LOGGER.info("[ExecutorRedisson]--执行定时任务结束，休眠三秒");
30+
redissonLock.release("redisson");
31+
} else {
32+
LOGGER.info("[ExecutorRedisson]获取锁失败");
33+
}
34+
35+
}
36+
37+
}

‎redis-distributed-lock-starter-demo/src/main/resources/application.properties‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
##########################################################################
22
#
3-
# �����˿ں�
3+
# 基础配置
44
#
55
##########################################################################
6-
server.port=8888
6+
server.port=8889
77
# app-name (need to modify)
88
spring.application.name=redis-distributed-lock-demo-spring
99
########################################################################
1010
#
11-
# ��־����
11+
# 日志配置
1212
#
1313
#########################################################################
1414
logging.pattern.console=%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) |-%-5level [%thread] %c [%L] -| %msg%n
@@ -19,9 +19,11 @@ logging.level.com.gaoyang=DEBUG
1919
redis.lock.cron=0/5 * * * * ?
2020
########################################################################
2121
#
22-
# redisson�ֲ�ʽ������
22+
# redisson配置
2323
#
2424
#########################################################################
2525
redisson.lock.server.address=127.0.0.1:6379
26+
redisson.lock.server.password=
27+
redisson.lock.server.database=1
2628
redisson.lock.server.type=standalone
2729

‎redis-distributed-lock-starter/.mvn/wrapper/maven-wrapper.jar‎

-46.5 KB
Binary file not shown.

‎redis-distributed-lock-starter/.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)