Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
SpringBlade
提交
7396ece9
S
SpringBlade
项目概览
int
/
SpringBlade
10 个月 前同步成功
通知
16
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SpringBlade
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7396ece9
编写于
2月 11, 2020
作者:
S
smallchill
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🎉
2.6.1.RELEASE,增加登陆验证码,支持Seata1.0
上级
8d75be2c
变更
41
隐藏空白更改
内联
并排
Showing
41 changed file
with
222 addition
and
224 deletion
+222
-224
README.md
README.md
+2
-2
blade-auth/pom.xml
blade-auth/pom.xml
+7
-1
blade-auth/src/main/java/org/springblade/auth/config/RegistryConfiguration.java
...va/org/springblade/auth/config/RegistryConfiguration.java
+0
-39
blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java
.../java/org/springblade/auth/controller/AuthController.java
+21
-0
blade-auth/src/main/java/org/springblade/auth/granter/CaptchaTokenGranter.java
...ava/org/springblade/auth/granter/CaptchaTokenGranter.java
+80
-0
blade-auth/src/main/java/org/springblade/auth/granter/TokenGranterBuilder.java
...ava/org/springblade/auth/granter/TokenGranterBuilder.java
+1
-0
blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
...h/src/main/java/org/springblade/auth/utils/TokenUtil.java
+3
-0
blade-common/pom.xml
blade-common/pom.xml
+1
-1
blade-common/src/main/java/org/springblade/common/cache/CacheNames.java
...rc/main/java/org/springblade/common/cache/CacheNames.java
+2
-0
blade-gateway/pom.xml
blade-gateway/pom.xml
+1
-1
blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java
...n/java/org/springblade/gateway/provider/AuthProvider.java
+3
-0
blade-ops/blade-admin/pom.xml
blade-ops/blade-admin/pom.xml
+1
-1
blade-ops/blade-develop/pom.xml
blade-ops/blade-develop/pom.xml
+1
-1
blade-ops/blade-resource/pom.xml
blade-ops/blade-resource/pom.xml
+1
-1
blade-ops/blade-seata-order/pom.xml
blade-ops/blade-seata-order/pom.xml
+1
-1
blade-ops/blade-seata-order/src/main/java/org/springblade/seata/order/config/OrderConfiguration.java
...rg/springblade/seata/order/config/OrderConfiguration.java
+0
-39
blade-ops/blade-seata-order/src/main/java/org/springblade/seata/order/feign/IStorageClient.java
...ava/org/springblade/seata/order/feign/IStorageClient.java
+1
-1
blade-ops/blade-seata-order/src/main/resources/application-dev.yml
.../blade-seata-order/src/main/resources/application-dev.yml
+21
-0
blade-ops/blade-seata-order/src/main/resources/registry.conf
blade-ops/blade-seata-order/src/main/resources/registry.conf
+0
-20
blade-ops/blade-seata-storage/pom.xml
blade-ops/blade-seata-storage/pom.xml
+1
-1
blade-ops/blade-seata-storage/src/main/java/org/springblade/seata/storage/SeataStorageApplication.java
...rg/springblade/seata/storage/SeataStorageApplication.java
+0
-4
blade-ops/blade-seata-storage/src/main/java/org/springblade/seata/storage/config/StorageConfiguration.java
...pringblade/seata/storage/config/StorageConfiguration.java
+0
-39
blade-ops/blade-seata-storage/src/main/java/org/springblade/seata/storage/controller/StorageController.java
...ringblade/seata/storage/controller/StorageController.java
+1
-0
blade-ops/blade-seata-storage/src/main/resources/application-dev.yml
...lade-seata-storage/src/main/resources/application-dev.yml
+21
-0
blade-ops/blade-seata-storage/src/main/resources/registry.conf
...-ops/blade-seata-storage/src/main/resources/registry.conf
+0
-20
blade-ops/pom.xml
blade-ops/pom.xml
+1
-1
blade-service-api/blade-demo-api/pom.xml
blade-service-api/blade-demo-api/pom.xml
+1
-1
blade-service-api/blade-desk-api/pom.xml
blade-service-api/blade-desk-api/pom.xml
+1
-1
blade-service-api/blade-dict-api/pom.xml
blade-service-api/blade-dict-api/pom.xml
+1
-1
blade-service-api/blade-system-api/pom.xml
blade-service-api/blade-system-api/pom.xml
+1
-1
blade-service-api/blade-user-api/pom.xml
blade-service-api/blade-user-api/pom.xml
+1
-1
blade-service-api/pom.xml
blade-service-api/pom.xml
+2
-2
blade-service/blade-demo/pom.xml
blade-service/blade-demo/pom.xml
+1
-1
blade-service/blade-desk/pom.xml
blade-service/blade-desk/pom.xml
+1
-1
blade-service/blade-log/pom.xml
blade-service/blade-log/pom.xml
+1
-1
blade-service/blade-system/pom.xml
blade-service/blade-system/pom.xml
+1
-1
blade-service/blade-user/pom.xml
blade-service/blade-user/pom.xml
+1
-1
blade-service/pom.xml
blade-service/pom.xml
+2
-2
doc/sql/seata/seata.sql
doc/sql/seata/seata.sql
+26
-26
pom.xml
pom.xml
+10
-10
script/docker/.env
script/docker/.env
+1
-1
未找到文件。
README.md
浏览文件 @
7396ece9
<p
align=
"center"
>
<img
src=
"https://img.shields.io/badge/Release-V2.6.
0
-green.svg"
alt=
"Downloads"
>
<img
src=
"https://img.shields.io/badge/Release-V2.6.
1
-green.svg"
alt=
"Downloads"
>
<img
src=
"https://img.shields.io/badge/JDK-1.8+-green.svg"
alt=
"Build Status"
>
<img
src=
"https://img.shields.io/badge/license-Apache%202-blue.svg"
alt=
"Build Status"
>
<img
src=
"https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR1-blue.svg"
alt=
"Coverage Status"
>
<img
src=
"https://img.shields.io/badge/Spring%20Boot-2.2.
2
.RELEASE-blue.svg"
alt=
"Downloads"
>
<img
src=
"https://img.shields.io/badge/Spring%20Boot-2.2.
4
.RELEASE-blue.svg"
alt=
"Downloads"
>
<a
target=
"_blank"
href=
"https://bladex.vip"
>
<img
src=
"https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg"
alt=
"Downloads"
>
</a>
...
...
blade-auth/pom.xml
浏览文件 @
7396ece9
...
...
@@ -8,7 +8,7 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<artifactId>
blade-auth
</artifactId>
...
...
@@ -48,6 +48,12 @@
<artifactId>
blade-core-swagger
</artifactId>
<version>
${blade.tool.version}
</version>
</dependency>
<!-- Captcha -->
<dependency>
<groupId>
com.github.whvcse
</groupId>
<artifactId>
easy-captcha
</artifactId>
<version>
${captcha.version}
</version>
</dependency>
<!-- MySQL -->
<dependency>
<groupId>
mysql
</groupId>
...
...
blade-auth/src/main/java/org/springblade/auth/config/RegistryConfiguration.java
已删除
100644 → 0
浏览文件 @
8d75be2c
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springblade.auth.config
;
import
org.springblade.core.secure.registry.SecureRegistry
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
/**
* secure模块api放行配置
*
* @author Chill
*/
@Configuration
public
class
RegistryConfiguration
implements
WebMvcConfigurer
{
@Bean
public
SecureRegistry
secureRegistry
()
{
SecureRegistry
secureRegistry
=
new
SecureRegistry
();
secureRegistry
.
excludePathPatterns
(
"/token/**"
);
return
secureRegistry
;
}
}
blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java
浏览文件 @
7396ece9
...
...
@@ -15,6 +15,7 @@
*/
package
org.springblade.auth.controller
;
import
com.wf.captcha.SpecCaptcha
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiParam
;
...
...
@@ -23,15 +24,22 @@ import org.springblade.auth.granter.ITokenGranter;
import
org.springblade.auth.granter.TokenGranterBuilder
;
import
org.springblade.auth.granter.TokenParameter
;
import
org.springblade.auth.utils.TokenUtil
;
import
org.springblade.common.cache.CacheNames
;
import
org.springblade.core.secure.AuthInfo
;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.support.Kv
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.core.tool.utils.RedisUtil
;
import
org.springblade.core.tool.utils.WebUtil
;
import
org.springblade.system.user.entity.UserInfo
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.UUID
;
import
java.util.concurrent.TimeUnit
;
/**
* 认证模块
*
...
...
@@ -42,6 +50,8 @@ import org.springframework.web.bind.annotation.RestController;
@Api
(
value
=
"用户授权认证"
,
tags
=
"授权接口"
)
public
class
AuthController
{
private
RedisUtil
redisUtil
;
@PostMapping
(
"token"
)
@ApiOperation
(
value
=
"获取认证token"
,
notes
=
"传入租户ID:tenantId,账号:account,密码:password"
)
public
R
<
AuthInfo
>
token
(
@ApiParam
(
value
=
"授权类型"
,
required
=
true
)
@RequestParam
(
defaultValue
=
"password"
,
required
=
false
)
String
grantType
,
...
...
@@ -70,4 +80,15 @@ public class AuthController {
return
R
.
data
(
TokenUtil
.
createAuthInfo
(
userInfo
));
}
@GetMapping
(
"/captcha"
)
public
R
<
Kv
>
captcha
()
{
SpecCaptcha
specCaptcha
=
new
SpecCaptcha
(
130
,
48
,
5
);
String
verCode
=
specCaptcha
.
text
().
toLowerCase
();
String
key
=
UUID
.
randomUUID
().
toString
();
// 存入redis并设置过期时间为30分钟
redisUtil
.
set
(
CacheNames
.
CAPTCHA_KEY
+
key
,
verCode
,
30L
,
TimeUnit
.
MINUTES
);
// 将key和base64返回给前端
return
R
.
data
(
Kv
.
init
().
set
(
"key"
,
key
).
set
(
"image"
,
specCaptcha
.
toBase64
()));
}
}
blade-auth/src/main/java/org/springblade/auth/granter/CaptchaTokenGranter.java
0 → 100644
浏览文件 @
7396ece9
/*
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the dreamlu.net developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
package
org.springblade.auth.granter
;
import
lombok.AllArgsConstructor
;
import
org.springblade.auth.enums.BladeUserEnum
;
import
org.springblade.auth.utils.TokenUtil
;
import
org.springblade.common.cache.CacheNames
;
import
org.springblade.core.log.exception.ServiceException
;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.utils.*
;
import
org.springblade.system.user.entity.UserInfo
;
import
org.springblade.system.user.feign.IUserClient
;
import
org.springframework.stereotype.Component
;
import
javax.servlet.http.HttpServletRequest
;
/**
* 验证码TokenGranter
*
* @author Chill
*/
@Component
@AllArgsConstructor
public
class
CaptchaTokenGranter
implements
ITokenGranter
{
public
static
final
String
GRANT_TYPE
=
"captcha"
;
private
IUserClient
userClient
;
private
RedisUtil
redisUtil
;
@Override
public
UserInfo
grant
(
TokenParameter
tokenParameter
)
{
HttpServletRequest
request
=
WebUtil
.
getRequest
();
String
key
=
request
.
getHeader
(
TokenUtil
.
CAPTCHA_HEADER_KEY
);
String
code
=
request
.
getHeader
(
TokenUtil
.
CAPTCHA_HEADER_CODE
);
// 获取验证码
String
redisCode
=
String
.
valueOf
(
redisUtil
.
get
(
CacheNames
.
CAPTCHA_KEY
+
key
));
// 判断验证码
if
(
code
==
null
||
!
StringUtil
.
equalsIgnoreCase
(
redisCode
,
code
))
{
throw
new
ServiceException
(
TokenUtil
.
CAPTCHA_NOT_CORRECT
);
}
String
tenantId
=
tokenParameter
.
getArgs
().
getStr
(
"tenantId"
);
String
account
=
tokenParameter
.
getArgs
().
getStr
(
"account"
);
String
password
=
tokenParameter
.
getArgs
().
getStr
(
"password"
);
UserInfo
userInfo
=
null
;
if
(
Func
.
isNoneBlank
(
account
,
password
))
{
// 获取用户类型
String
userType
=
tokenParameter
.
getArgs
().
getStr
(
"userType"
);
R
<
UserInfo
>
result
;
// 根据不同用户类型调用对应的接口返回数据,用户可自行拓展
if
(
userType
.
equals
(
BladeUserEnum
.
WEB
.
getName
()))
{
result
=
userClient
.
userInfo
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
));
}
else
if
(
userType
.
equals
(
BladeUserEnum
.
APP
.
getName
()))
{
result
=
userClient
.
userInfo
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
));
}
else
{
result
=
userClient
.
userInfo
(
tenantId
,
account
,
DigestUtil
.
encrypt
(
password
));
}
userInfo
=
result
.
isSuccess
()
?
result
.
getData
()
:
null
;
}
return
userInfo
;
}
}
blade-auth/src/main/java/org/springblade/auth/granter/TokenGranterBuilder.java
浏览文件 @
7396ece9
...
...
@@ -38,6 +38,7 @@ public class TokenGranterBuilder {
static
{
granterPool
.
put
(
PasswordTokenGranter
.
GRANT_TYPE
,
SpringUtil
.
getBean
(
PasswordTokenGranter
.
class
));
granterPool
.
put
(
CaptchaTokenGranter
.
GRANT_TYPE
,
SpringUtil
.
getBean
(
CaptchaTokenGranter
.
class
));
granterPool
.
put
(
RefreshTokenGranter
.
GRANT_TYPE
,
SpringUtil
.
getBean
(
RefreshTokenGranter
.
class
));
}
...
...
blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
浏览文件 @
7396ece9
...
...
@@ -33,6 +33,9 @@ import java.util.Map;
*/
public
class
TokenUtil
{
public
final
static
String
CAPTCHA_HEADER_KEY
=
"Captcha-Key"
;
public
final
static
String
CAPTCHA_HEADER_CODE
=
"Captcha-Code"
;
public
final
static
String
CAPTCHA_NOT_CORRECT
=
"验证码不正确"
;
public
final
static
String
TENANT_HEADER_KEY
=
"Tenant-Id"
;
public
final
static
String
DEFAULT_TENANT_ID
=
"000000"
;
public
final
static
String
USER_TYPE_HEADER_KEY
=
"User-Type"
;
...
...
blade-common/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-common/src/main/java/org/springblade/common/cache/CacheNames.java
浏览文件 @
7396ece9
...
...
@@ -27,4 +27,6 @@ public interface CacheNames {
String
DICT_VALUE
=
"dict:value"
;
String
DICT_LIST
=
"dict:list"
;
String
CAPTCHA_KEY
=
"blade:auth::captcha:"
;
}
blade-gateway/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java
浏览文件 @
7396ece9
...
...
@@ -35,6 +35,7 @@ public class AuthProvider {
static
{
defaultSkipUrl
.
add
(
"/example"
);
defaultSkipUrl
.
add
(
"/token/**"
);
defaultSkipUrl
.
add
(
"/captcha/**"
);
defaultSkipUrl
.
add
(
"/actuator/health/**"
);
defaultSkipUrl
.
add
(
"/v2/api-docs/**"
);
defaultSkipUrl
.
add
(
"/v2/api-docs-ext/**"
);
...
...
@@ -42,6 +43,8 @@ public class AuthProvider {
defaultSkipUrl
.
add
(
"/log/**"
);
defaultSkipUrl
.
add
(
"/menu/routes"
);
defaultSkipUrl
.
add
(
"/menu/auth-routes"
);
defaultSkipUrl
.
add
(
"/order/create/**"
);
defaultSkipUrl
.
add
(
"/storage/deduct/**"
);
defaultSkipUrl
.
add
(
"/error/**"
);
defaultSkipUrl
.
add
(
"/assets/**"
);
}
...
...
blade-ops/blade-admin/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-develop/pom.xml
浏览文件 @
7396ece9
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
org.springblade
</groupId>
<artifactId>
blade-ops
</artifactId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-resource/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-seata-order/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-seata-order/src/main/java/org/springblade/seata/order/config/OrderConfiguration.java
已删除
100644 → 0
浏览文件 @
8d75be2c
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springblade.seata.order.config
;
import
org.springblade.core.secure.registry.SecureRegistry
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
/**
* secure模块api放行配置
*
* @author Chill
*/
@Configuration
public
class
OrderConfiguration
implements
WebMvcConfigurer
{
@Bean
public
SecureRegistry
secureRegistry
()
{
SecureRegistry
secureRegistry
=
new
SecureRegistry
();
secureRegistry
.
excludePathPatterns
(
"/order/create/**"
);
return
secureRegistry
;
}
}
blade-ops/blade-seata-order/src/main/java/org/springblade/seata/order/feign/IStorageClient.java
浏览文件 @
7396ece9
...
...
@@ -19,7 +19,7 @@ public interface IStorageClient {
* @param count 数量
* @return boolean
*/
@GetMapping
(
"/deduct"
)
@GetMapping
(
"/
storage/
deduct"
)
int
deduct
(
@RequestParam
(
"commodityCode"
)
String
commodityCode
,
@RequestParam
(
"count"
)
Integer
count
);
}
blade-ops/blade-seata-order/src/main/resources/application-dev.yml
浏览文件 @
7396ece9
...
...
@@ -8,3 +8,24 @@ spring:
url
:
jdbc:mysql://localhost:3306/seata_order?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username
:
root
password
:
root
# seata配置
seata
:
tx-service-group
:
blade-seata-order-group
#registry:
# type: nacos
# nacos:
# server-addr: localhost
#config:
# type: nacos
# nacos:
# server-addr: localhost
service
:
grouplist
:
127.0.0.1:8091
vgroup-mapping
:
default
disable-global-transaction
:
false
client
:
support
:
spring
:
datasource-autoproxy
:
false
rm-report-success-enable
:
false
blade-ops/blade-seata-order/src/main/resources/registry.conf
已删除
100644 → 0
浏览文件 @
8d75be2c
registry
{
# file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
type
=
"nacos"
nacos
{
serverAddr
=
"localhost"
namespace
=
""
cluster
=
"default"
}
}
config
{
# file、nacos 、apollo、zk、consul、etcd3
type
=
"nacos"
nacos
{
serverAddr
=
"localhost"
namespace
=
""
}
}
blade-ops/blade-seata-storage/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-seata-storage/src/main/java/org/springblade/seata/storage/SeataStorageApplication.java
浏览文件 @
7396ece9
...
...
@@ -18,10 +18,6 @@ package org.springblade.seata.storage;
import
org.springblade.core.launch.BladeApplication
;
import
org.springblade.core.launch.constant.AppConstant
;
import
org.springblade.core.transaction.annotation.SeataCloudApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
;
import
org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker
;
import
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
import
org.springframework.cloud.openfeign.EnableFeignClients
;
/**
...
...
blade-ops/blade-seata-storage/src/main/java/org/springblade/seata/storage/config/StorageConfiguration.java
已删除
100644 → 0
浏览文件 @
8d75be2c
/**
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springblade.seata.storage.config
;
import
org.springblade.core.secure.registry.SecureRegistry
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
/**
* secure模块api放行配置
*
* @author Chill
*/
@Configuration
public
class
StorageConfiguration
implements
WebMvcConfigurer
{
@Bean
public
SecureRegistry
secureRegistry
()
{
SecureRegistry
secureRegistry
=
new
SecureRegistry
();
secureRegistry
.
excludePathPatterns
(
"/deduct/**"
);
return
secureRegistry
;
}
}
blade-ops/blade-seata-storage/src/main/java/org/springblade/seata/storage/controller/StorageController.java
浏览文件 @
7396ece9
...
...
@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
* @author Chill
*/
@RestController
@RequestMapping
(
"storage"
)
@AllArgsConstructor
public
class
StorageController
{
...
...
blade-ops/blade-seata-storage/src/main/resources/application-dev.yml
浏览文件 @
7396ece9
...
...
@@ -8,3 +8,24 @@ spring:
url
:
jdbc:mysql://localhost:3306/seata_storage?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username
:
root
password
:
root
# seata配置
seata
:
tx-service-group
:
blade-seata-storage-group
#registry:
# type: nacos
# nacos:
# server-addr: localhost
#config:
# type: nacos
# nacos:
# server-addr: localhost
service
:
grouplist
:
127.0.0.1:8091
vgroup-mapping
:
default
disable-global-transaction
:
false
client
:
support
:
spring
:
datasource-autoproxy
:
false
rm-report-success-enable
:
false
blade-ops/blade-seata-storage/src/main/resources/registry.conf
已删除
100644 → 0
浏览文件 @
8d75be2c
registry
{
# file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
type
=
"nacos"
nacos
{
serverAddr
=
"localhost"
namespace
=
""
cluster
=
"default"
}
}
config
{
# file、nacos 、apollo、zk、consul、etcd3
type
=
"nacos"
nacos
{
serverAddr
=
"localhost"
namespace
=
""
}
}
blade-ops/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-demo-api/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-desk-api/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-dict-api/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-system-api/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-user-api/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,13 +5,13 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
blade-service-api
</artifactId>
<name>
${project.artifactId}
</name>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
<packaging>
pom
</packaging>
<description>
SpringBlade 微服务API集合
</description>
...
...
blade-service/blade-demo/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-desk/pom.xml
浏览文件 @
7396ece9
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
org.springblade
</groupId>
<artifactId>
blade-service
</artifactId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-log/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-system/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-user/pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/pom.xml
浏览文件 @
7396ece9
...
...
@@ -7,12 +7,12 @@
<parent>
<groupId>
org.springblade
</groupId>
<artifactId>
SpringBlade
</artifactId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
</parent>
<artifactId>
blade-service
</artifactId>
<name>
${project.artifactId}
</name>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
<packaging>
pom
</packaging>
<description>
SpringBlade 微服务集合
</description>
...
...
doc/sql/seata/seata.sql
浏览文件 @
7396ece9
...
...
@@ -11,7 +11,7 @@
Target Server Version : 50723
File Encoding : 65001
Date: 1
3/11/2019 18:14:10
Date: 1
0/02/2020 23:42:58
*/
SET
NAMES
utf8mb4
;
...
...
@@ -23,57 +23,57 @@ SET FOREIGN_KEY_CHECKS = 0;
DROP
TABLE
IF
EXISTS
`branch_table`
;
CREATE
TABLE
`branch_table`
(
`branch_id`
bigint
(
20
)
NOT
NULL
,
`xid`
varchar
(
128
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NOT
NULL
,
`xid`
varchar
(
128
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NOT
NULL
,
`transaction_id`
bigint
(
20
)
NULL
DEFAULT
NULL
,
`resource_group_id`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
,
`resource_id`
varchar
(
256
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
,
`lock_key`
varchar
(
128
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
,
`branch_type`
varchar
(
8
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
,
`resource_group_id`
varchar
(
32
)
CHARACTER
SET
utf8
COLLATE
utf8_general_ci
NULL
DEFAULT
NULL
,
`resource_id`
varchar
(
256
)
CHARACTER
SET
utf8
COLLATE
utf8_general_ci
NULL
DEFAULT
NULL
,
`branch_type`
varchar
(
8
)
CHARACTER
SET
utf8
COLLATE
utf8_general_ci
NULL
DEFAULT
NULL
,
`status`
tinyint
(
4
)
NULL
DEFAULT
NULL
,
`client_id`
varchar
(
64
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`application_data`
varchar
(
2000
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`gmt_create`
datetime
(
0
)
NULL
DEFAULT
NULL
,
`gmt_modified`
datetime
(
0
)
NULL
DEFAULT
NULL
,
`client_id`
varchar
(
64
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`application_data`
varchar
(
2000
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`gmt_create`
datetime
(
6
)
NULL
DEFAULT
NULL
,
`gmt_modified`
datetime
(
6
)
NULL
DEFAULT
NULL
,
PRIMARY
KEY
(
`branch_id`
)
USING
BTREE
,
INDEX
`idx_xid`
(
`xid`
)
USING
BTREE
)
ENGINE
=
InnoDB
CHARACTER
SET
=
utf8
mb4
COLLATE
=
utf8mb4
_general_ci
;
)
ENGINE
=
InnoDB
CHARACTER
SET
=
utf8
COLLATE
=
utf8
_general_ci
;
-- ----------------------------
-- Table structure for global_table
-- ----------------------------
DROP
TABLE
IF
EXISTS
`global_table`
;
CREATE
TABLE
`global_table`
(
`xid`
varchar
(
128
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NOT
NULL
,
`xid`
varchar
(
128
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NOT
NULL
,
`transaction_id`
bigint
(
20
)
NULL
DEFAULT
NULL
,
`status`
tinyint
(
4
)
NOT
NULL
,
`application_id`
varchar
(
32
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`transaction_service_group`
varchar
(
32
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`transaction_name`
varchar
(
128
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`application_id`
varchar
(
32
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`transaction_service_group`
varchar
(
32
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`transaction_name`
varchar
(
128
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`timeout`
int
(
11
)
NULL
DEFAULT
NULL
,
`begin_time`
bigint
(
20
)
NULL
DEFAULT
NULL
,
`application_data`
varchar
(
2000
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`application_data`
varchar
(
2000
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`gmt_create`
datetime
(
0
)
NULL
DEFAULT
NULL
,
`gmt_modified`
datetime
(
0
)
NULL
DEFAULT
NULL
,
PRIMARY
KEY
(
`xid`
)
USING
BTREE
,
INDEX
`idx_gmt_modified_status`
(
`gmt_modified`
,
`status`
)
USING
BTREE
,
INDEX
`idx_transaction_id`
(
`transaction_id`
)
USING
BTREE
)
ENGINE
=
InnoDB
CHARACTER
SET
=
utf8
mb4
COLLATE
=
utf8mb4
_general_ci
;
)
ENGINE
=
InnoDB
CHARACTER
SET
=
utf8
COLLATE
=
utf8
_general_ci
;
-- ----------------------------
-- Table structure for lock_table
-- ----------------------------
DROP
TABLE
IF
EXISTS
`lock_table`
;
CREATE
TABLE
`lock_table`
(
`row_key`
varchar
(
128
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NOT
NULL
,
`xid`
varchar
(
96
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`transaction_id`
mediumtext
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
,
`branch_id`
mediumtext
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
,
`resource_id`
varchar
(
256
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`table_name`
varchar
(
32
)
CHARACTER
SET
utf8
mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`pk`
varchar
(
3
2
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4
_general_ci
NULL
DEFAULT
NULL
,
`row_key`
varchar
(
128
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NOT
NULL
,
`xid`
varchar
(
96
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`transaction_id`
bigint
(
20
)
NULL
DEFAULT
NULL
,
`branch_id`
bigint
(
20
)
NOT
NULL
,
`resource_id`
varchar
(
256
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`table_name`
varchar
(
32
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`pk`
varchar
(
3
6
)
CHARACTER
SET
utf8
COLLATE
utf8
_general_ci
NULL
DEFAULT
NULL
,
`gmt_create`
datetime
(
0
)
NULL
DEFAULT
NULL
,
`gmt_modified`
datetime
(
0
)
NULL
DEFAULT
NULL
,
PRIMARY
KEY
(
`row_key`
)
USING
BTREE
)
ENGINE
=
InnoDB
CHARACTER
SET
=
utf8mb4
COLLATE
=
utf8mb4_general_ci
;
PRIMARY
KEY
(
`row_key`
)
USING
BTREE
,
INDEX
`idx_branch_id`
(
`branch_id`
)
USING
BTREE
)
ENGINE
=
InnoDB
CHARACTER
SET
=
utf8
COLLATE
=
utf8_general_ci
;
SET
FOREIGN_KEY_CHECKS
=
1
;
pom.xml
浏览文件 @
7396ece9
...
...
@@ -5,26 +5,26 @@
<groupId>
org.springblade
</groupId>
<artifactId>
SpringBlade
</artifactId>
<version>
2.6.
0
</version>
<version>
2.6.
1
</version>
<packaging>
pom
</packaging>
<properties>
<blade.tool.version>
2.6.
0
</blade.tool.version>
<blade.project.version>
2.6.
0
</blade.project.version>
<blade.tool.version>
2.6.
1
</blade.tool.version>
<blade.project.version>
2.6.
1
</blade.project.version>
<java.version>
1.8
</java.version>
<maven.plugin.version>
3.8.1
</maven.plugin.version>
<swagger.version>
2.9.2
</swagger.version>
<swagger.models.version>
1.5.21
</swagger.models.version>
<knife4j.version>
2.0.1
</knife4j.version>
<mybatis.plus.version>
3.2.0
</mybatis.plus.version>
<curator.framework.version>
4.0.1
</curator.framework.version>
<mybatis.plus.version>
3.3.1
</mybatis.plus.version>
<protostuff.version>
1.6.0
</protostuff.version>
<captcha.version>
1.6.2
</captcha.version>
<mica.auto.version>
1.1.0
</mica.auto.version>
<alibaba.cloud.version>
2.
1.1
.RELEASE
</alibaba.cloud.version>
<spring.boot.admin.version>
2.2.
0
</spring.boot.admin.version>
<alibaba.cloud.version>
2.
2.0
.RELEASE
</alibaba.cloud.version>
<spring.boot.admin.version>
2.2.
2
</spring.boot.admin.version>
<spring.boot.version>
2.2.
2
.RELEASE
</spring.boot.version>
<spring.boot.version>
2.2.
4
.RELEASE
</spring.boot.version>
<spring.cloud.version>
Hoxton.SR1
</spring.cloud.version>
<spring.platform.version>
Cairo-SR8
</spring.platform.version>
...
...
@@ -132,7 +132,7 @@
<repositories>
<repository>
<id>
aliyun-repos
</id>
<url>
http://maven.aliyun.com/nexus/content/groups/public/
</url>
<url>
http
s
://maven.aliyun.com/nexus/content/groups/public/
</url>
<snapshots>
<enabled>
false
</enabled>
</snapshots>
...
...
@@ -142,7 +142,7 @@
<pluginRepositories>
<pluginRepository>
<id>
aliyun-plugin
</id>
<url>
http://maven.aliyun.com/nexus/content/groups/public/
</url>
<url>
http
s
://maven.aliyun.com/nexus/content/groups/public/
</url>
<snapshots>
<enabled>
false
</enabled>
</snapshots>
...
...
script/docker/.env
浏览文件 @
7396ece9
REGISTER=192.168.0.157/blade
TAG=2.6.
0
TAG=2.6.
1
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录