Merge remote-tracking branch 'origin/master'

zengh

2022-08-01 daa6dce26ec80c58a0013b73c44a409a96f4cfc7

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java

@@ -116,8 +116,9 @@
    @ApiOperation(value = "退出登录")
    public Kv logout() {
        BladeUser user = AuthUtil.getUser();
        String token = JwtUtil.getToken(WebUtil.getRequest().getHeader(TokenConstant.HEADER));
        // 清空redis保存的token
        if (user != null && jwtProperties.getState()) {
            String token = JwtUtil.getToken(WebUtil.getRequest().getHeader(TokenConstant.HEADER));
            JwtUtil.removeAccessToken(user.getTenantId(), String.valueOf(user.getUserId()), token);
        }
        return Kv.create().set("success", "true").set("msg", "success");

 src/main/resources/application-dev.yml

@@ -12,10 +12,13 @@
    #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
    #  commandTimeout: 5000
  datasource:
    # MySql
    url: jdbc:mysql://localhost:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: zhny
    password: ZHny@2022
    username: root
    password: root
    # MySql
#    url: jdbc:mysql://127.0.0.1:3306/zhny?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#    username: zhny
#    password: ZHny@2022
    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
    #username: postgres
@@ -40,6 +43,10 @@

#blade配置
blade:
  token:
    state: true
    #blade.token.state 配置的是token的状态，如果改成true，token就会保存到redis变成有状态化。
    #如果要提高token过期时间，可以到【应用管理】来配置token的时间
  #分布式锁配置
  lock:
    ##是否启用分布式锁