Skip to content

Commit 574157c

Browse files
click33click33
committed
简化 redis 和 rpc 相关集成包的包名.
1 parent 387af98 commit 574157c

File tree

48 files changed

+95
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+95
-94
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<p align="center">
22
<img alt="logo" src="https://sa-token.cc/logo.png" width="150" height="150">
33
</p>
4-
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.34.0</h1>
4+
<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.34.1</h1>
55
<h4 align="center">一个轻量级 Java 权限认证框架，让鉴权变得简单、优雅！</h4>
66
<p align="center">
77
<a href="https://gitee.com/dromara/sa-token/stargazers"><img src="https://gitee.com/dromara/sa-token/badge/star.svg?theme=gvp"></a>

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
<!-- 一些属性 -->
3838
<properties>
39-
<revision>1.34.0</revision>
39+
<revision>1.34.1</revision>
4040
<jdk.version>1.8</jdk.version>
4141
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
4242
<project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>

‎sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ private SaTokenConsts() {
2121
/**
2222
* Sa-Token 当前版本号
2323
*/
24-
public static final String VERSION_NO = "v1.34.0";
24+
public static final String VERSION_NO = "v1.34.1";
2525

2626
/**
2727
* Sa-Token 开源地址 Gitee

‎sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- 定义 Sa-Token 版本号 -->
1818
<properties>
19-
<sa-token.version>1.34.0</sa-token.version>
19+
<sa-token.version>1.34.1</sa-token.version>
2020
</properties>
2121

2222
<dependencies>
@@ -41,7 +41,7 @@
4141
<!-- Sa-Token 整合Redis (使用jackson序列化方式) -->
4242
<dependency>
4343
<groupId>cn.dev33</groupId>
44-
<artifactId>sa-token-dao-redis-jackson</artifactId>
44+
<artifactId>sa-token-redis-jackson</artifactId>
4545
<version>${sa-token.version}</version>
4646
</dependency>
4747

‎sa-token-demo/sa-token-demo-alone-redis/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- 定义 Sa-Token 版本号 -->
1818
<properties>
19-
<sa-token.version>1.34.0</sa-token.version>
19+
<sa-token.version>1.34.1</sa-token.version>
2020
</properties>
2121

2222
<dependencies>
@@ -41,7 +41,7 @@
4141
<!-- Sa-Token 整合Redis (使用jackson序列化方式) -->
4242
<dependency>
4343
<groupId>cn.dev33</groupId>
44-
<artifactId>sa-token-dao-redis-jackson</artifactId>
44+
<artifactId>sa-token-redis-jackson</artifactId>
4545
<version>${sa-token.version}</version>
4646
</dependency>
4747

‎sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@SpringBootApplication
1414
public class SaTokenAloneRedisApplication {
1515

16-
public static void main(String[] args) throws ClassNotFoundException {
16+
public static void main(String[] args) {
1717
SpringApplication.run(SaTokenAloneRedisApplication.class, args);
1818
System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
1919
}

‎sa-token-demo/sa-token-demo-case/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<!-- 定义 Sa-Token 版本号 -->
1919
<properties>
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>
@@ -42,7 +42,7 @@
4242
<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
4343
<dependency>
4444
<groupId>cn.dev33</groupId>
45-
<artifactId>sa-token-dao-redis-jackson</artifactId>
45+
<artifactId>sa-token-redis-jackson</artifactId>
4646
<version>${sa-token.version}</version>
4747
</dependency>
4848

‎sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<java.version>1.8</java.version>
1919
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>
@@ -38,7 +38,7 @@
3838
<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
3939
<dependency>
4040
<groupId>cn.dev33</groupId>
41-
<artifactId>sa-token-dao-redis-jackson</artifactId>
41+
<artifactId>sa-token-redis-jackson</artifactId>
4242
<version>${sa-token.version}</version>
4343
</dependency>
4444
<dependency>
@@ -68,7 +68,7 @@
6868
<!-- Sa-Token 整合 Dubbo -->
6969
<dependency>
7070
<groupId>cn.dev33</groupId>
71-
<artifactId>sa-token-context-dubbo</artifactId>
71+
<artifactId>sa-token-dubbo</artifactId>
7272
<version>${sa-token.version}</version>
7373
</dependency>
7474

‎sa-token-demo/sa-token-demo-dubbo-provider/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<java.version>1.8</java.version>
1919
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>
@@ -38,7 +38,7 @@
3838
<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
3939
<dependency>
4040
<groupId>cn.dev33</groupId>
41-
<artifactId>sa-token-dao-redis-jackson</artifactId>
41+
<artifactId>sa-token-redis-jackson</artifactId>
4242
<version>${sa-token.version}</version>
4343
</dependency>
4444
<dependency>
@@ -68,7 +68,7 @@
6868
<!-- Sa-Token 整合 Dubbo -->
6969
<dependency>
7070
<groupId>cn.dev33</groupId>
71-
<artifactId>sa-token-context-dubbo</artifactId>
71+
<artifactId>sa-token-dubbo</artifactId>
7272
<version>${sa-token.version}</version>
7373
</dependency>
7474

‎sa-token-demo/sa-token-demo-grpc/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2929
<lombok.version>1.18.10</lombok.version>
30-
<sa-token.version>1.34.0</sa-token.version>
30+
<sa-token.version>1.34.1</sa-token.version>
3131
</properties>
3232

3333
<dependencies>
@@ -58,12 +58,12 @@
5858
</dependency>
5959
<dependency>
6060
<groupId>cn.dev33</groupId>
61-
<artifactId>sa-token-dao-redis-jackson</artifactId>
61+
<artifactId>sa-token-redis-jackson</artifactId>
6262
<version>${sa-token.version}</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>cn.dev33</groupId>
66-
<artifactId>sa-token-context-grpc</artifactId>
66+
<artifactId>sa-token-grpc</artifactId>
6767
<version>${sa-token.version}</version>
6868
</dependency>
6969
</dependencies>

‎sa-token-demo/sa-token-demo-jwt/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- 定义 Sa-Token 版本号 -->
1818
<properties>
19-
<sa-token.version>1.34.0</sa-token.version>
19+
<sa-token.version>1.34.1</sa-token.version>
2020
</properties>
2121

2222
<dependencies>
@@ -44,7 +44,7 @@
4444
<!-- Sa-Token 整合 Redis (使用jackson序列化方式) -->
4545
<dependency>
4646
<groupId>cn.dev33</groupId>
47-
<artifactId>sa-token-dao-redis-jackson</artifactId>
47+
<artifactId>sa-token-redis-jackson</artifactId>
4848
<version>${sa-token.version}</version>
4949
</dependency>
5050
<dependency>

‎sa-token-demo/sa-token-demo-oauth2-client/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<java.version>1.8</java.version>
1818
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
1919
<!-- 定义 Sa-Token 版本号 -->
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>

‎sa-token-demo/sa-token-demo-oauth2-server/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<java.version>1.8</java.version>
1818
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
1919
<!-- 定义 Sa-Token 版本号 -->
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>
@@ -45,7 +45,7 @@
4545
<!-- Sa-Token整合Redis (使用jackson序列化方式) -->
4646
<dependency>
4747
<groupId>cn.dev33</groupId>
48-
<artifactId>sa-token-dao-redis-jackson</artifactId>
48+
<artifactId>sa-token-redis-jackson</artifactId>
4949
<version>${sa-token.version}</version>
5050
</dependency>
5151
<dependency>

‎sa-token-demo/sa-token-demo-quick-login/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- 定义 Sa-Token 版本号 -->
1818
<properties>
19-
<sa-token.version>1.34.0</sa-token.version>
19+
<sa-token.version>1.34.1</sa-token.version>
2020
</properties>
2121

2222
<dependencies>

‎sa-token-demo/sa-token-demo-remember-me/server_project/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</parent>
1818

1919
<properties>
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>
@@ -37,7 +37,7 @@
3737
<!-- Sa-Token 插件：整合redis (使用jackson序列化方式) -->
3838
<dependency>
3939
<groupId>cn.dev33</groupId>
40-
<artifactId>sa-token-dao-redis-jackson</artifactId>
40+
<artifactId>sa-token-redis-jackson</artifactId>
4141
<version>${sa-token.version}</version>
4242
</dependency>
4343
<dependency>

‎sa-token-demo/sa-token-demo-solon/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- 定义 Sa-Token 版本号 -->
1818
<properties>
19-
<sa-token.version>1.34.0</sa-token.version>
19+
<sa-token.version>1.34.1</sa-token.version>
2020
<solon.version>2.2.3</solon.version>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -47,7 +47,7 @@
4747
<!-- sa-token整合redis (使用jdk默认序列化方式) -->
4848
<!-- <dependency>
4949
<groupId>cn.dev33</groupId>
50-
<artifactId>sa-token-dao-redisx</artifactId>
50+
<artifactId>sa-token-redisx</artifactId>
5151
<version>${sa-token.version}</version>
5252
</dependency> -->
5353

‎sa-token-demo/sa-token-demo-springboot-redis/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<!-- 定义 Sa-Token 版本号 -->
1919
<properties>
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>
@@ -42,14 +42,14 @@
4242
<!-- Sa-Token 整合 Redis (使用jdk默认序列化方式) -->
4343
<!-- <dependency>
4444
<groupId>cn.dev33</groupId>
45-
<artifactId>sa-token-dao-redis</artifactId>
45+
<artifactId>sa-token-redis</artifactId>
4646
<version>${sa-token.version}</version>
4747
</dependency> -->
4848

4949
<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
5050
<dependency>
5151
<groupId>cn.dev33</groupId>
52-
<artifactId>sa-token-dao-redis-jackson</artifactId>
52+
<artifactId>sa-token-redis-jackson</artifactId>
5353
<version>${sa-token.version}</version>
5454
</dependency>
5555

‎sa-token-demo/sa-token-demo-springboot-redisson/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<!-- 定义 Sa-Token 版本号 -->
1919
<properties>
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>
@@ -42,7 +42,7 @@
4242
<!-- Sa-Token整合 Redisson (使用jackson序列化方式) -->
4343
<dependency>
4444
<groupId>cn.dev33</groupId>
45-
<artifactId>sa-token-dao-redisson-jackson</artifactId>
45+
<artifactId>sa-token-redisson-jackson</artifactId>
4646
<version>${sa-token.version}</version>
4747
</dependency>
4848

‎sa-token-demo/sa-token-demo-springboot/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<!-- 定义 Sa-Token 版本号 -->
1919
<properties>
20-
<sa-token.version>1.34.0</sa-token.version>
20+
<sa-token.version>1.34.1</sa-token.version>
2121
</properties>
2222

2323
<dependencies>

‎sa-token-demo/sa-token-demo-springboot3-redis/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- 定义 Sa-Token 版本号 -->
1818
<properties>
19-
<sa-token.version>1.34.0</sa-token.version>
19+
<sa-token.version>1.34.1</sa-token.version>
2020
</properties>
2121

2222
<dependencies>
@@ -41,14 +41,14 @@
4141
<!-- Sa-Token 整合 Redis (使用jdk默认序列化方式) -->
4242
<!-- <dependency>
4343
<groupId>cn.dev33</groupId>
44-
<artifactId>sa-token-dao-redis</artifactId>
44+
<artifactId>sa-token-redis</artifactId>
4545
<version>${sa-token.version}</version>
4646
</dependency> -->
4747

4848
<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
4949
<dependency>
5050
<groupId>cn.dev33</groupId>
51-
<artifactId>sa-token-dao-redis-jackson</artifactId>
51+
<artifactId>sa-token-redis-jackson</artifactId>
5252
<version>${sa-token.version}</version>
5353
</dependency>
5454

‎sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- 定义 Sa-Token 版本号 -->
1818
<properties>
19-
<sa-token.version>1.34.0</sa-token.version>
19+
<sa-token.version>1.34.1</sa-token.version>
2020
<solon.version>2.2.3</solon.version>
2121
</properties>
2222

@@ -46,7 +46,7 @@
4646
<!-- Sa-Token 插件：整合redis (使用jackson序列化方式) -->
4747
<dependency>
4848
<groupId>cn.dev33</groupId>
49-
<artifactId>sa-token-dao-redisx</artifactId>
49+
<artifactId>sa-token-redisx</artifactId>
5050
<version>${sa-token.version}</version>
5151
</dependency>
5252

‎sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SsoConfig {
2121
* 构建建 SaToken redis dao（如果不需要 redis；可以注释掉）
2222
* */
2323
@Bean
24-
public SaTokenDao saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
24+
public SaTokenDao saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
2525
return saTokenDao;
2626
}
2727

‎sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/app.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ sa-token:
2525
secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
2626
# ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明）
2727

28-
sa-token-dao: #名字可以随意取
28+
sa-token: #名字可以随意取
2929
redis:
3030
server: "localhost:6379"
3131
password: 123456

‎sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!-- 定义 Sa-Token 版本号 -->
1818
<properties>
19-
<sa-token.version>1.34.0</sa-token.version>
19+
<sa-token.version>1.34.1</sa-token.version>
2020
</properties>
2121

2222
<dependencies>
@@ -44,7 +44,7 @@
4444
<!-- Sa-Token 整合 redisx -->
4545
<dependency>
4646
<groupId>cn.dev33</groupId>
47-
<artifactId>sa-token-dao-redisx</artifactId>
47+
<artifactId>sa-token-redisx</artifactId>
4848
<version>${sa-token.version}</version>
4949
</dependency>
5050

‎sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class SaConfig {
1616
* 配置 Sa-Token 单独使用的Redis连接 （此处需要和SSO-Server端连接同一个Redis）
1717
* */
1818
@Bean
19-
public SaTokenDao saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
19+
public SaTokenDao saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
2020
return saTokenDao;
2121
}
2222
}

0 commit comments

Comments
 (0)