github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎉 2.3.1.RELEASE

Browse Source
This commit is contained in:
smallchill 2019-05-16 23:42:42 +08:00
parent ce18b0c5a7
commit 1c3c7c0dcc
24 changed files with 137 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blade-auth/pom.xml
View File

@ -8,7 +8,7 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<artifactId>blade-auth</artifactId> <artifactId>blade-auth</artifactId>

2
blade-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-gateway/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-admin/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/blade-develop/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-ops</artifactId> <artifactId>blade-ops</artifactId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-ops/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-desk-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

9
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java
View File

@ -15,6 +15,8 @@
*/ */
package org.springblade.desk.entity; package org.springblade.desk.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -35,6 +37,13 @@ public class Notice extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/** /**
* 标题 * 标题
*/ */

2
blade-service-api/blade-dict-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service-api/blade-system-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

121
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java
View File

@ -15,6 +15,8 @@
*/ */
package org.springblade.system.entity; package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -34,63 +36,70 @@ import org.springblade.core.mp.base.BaseEntity;
@ApiModel(value = "Client对象", description = "Client对象") @ApiModel(value = "Client对象", description = "Client对象")
public class AuthClient extends BaseEntity { public class AuthClient extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 客户端id * 主键id
*/ */
@ApiModelProperty(value = "客户端id") @TableId(value = "id", type = IdType.AUTO)
private String clientId; @ApiModelProperty(value = "主键id")
/** private Integer id;
* 客户端密钥
*/ /**
@ApiModelProperty(value = "客户端密钥") * 客户端id
private String clientSecret; */
/** @ApiModelProperty(value = "客户端id")
* 资源集合 private String clientId;
*/ /**
@ApiModelProperty(value = "资源集合") * 客户端密钥
private String resourceIds; */
/** @ApiModelProperty(value = "客户端密钥")
* 授权范围 private String clientSecret;
*/ /**
@ApiModelProperty(value = "授权范围") * 资源集合
private String scope; */
/** @ApiModelProperty(value = "资源集合")
* 授权类型 private String resourceIds;
*/ /**
@ApiModelProperty(value = "授权类型") * 授权范围
private String authorizedGrantTypes; */
/** @ApiModelProperty(value = "授权范围")
* 回调地址 private String scope;
*/ /**
@ApiModelProperty(value = "回调地址") * 授权类型
private String webServerRedirectUri; */
/** @ApiModelProperty(value = "授权类型")
* 权限 private String authorizedGrantTypes;
*/ /**
@ApiModelProperty(value = "权限") * 回调地址
private String authorities; */
/** @ApiModelProperty(value = "回调地址")
* 令牌过期秒数 private String webServerRedirectUri;
*/ /**
@ApiModelProperty(value = "令牌过期秒数") * 权限
private Integer accessTokenValidity; */
/** @ApiModelProperty(value = "权限")
* 刷新令牌过期秒数 private String authorities;
*/ /**
@ApiModelProperty(value = "刷新令牌过期秒数") * 令牌过期秒数
private Integer refreshTokenValidity; */
/** @ApiModelProperty(value = "令牌过期秒数")
* 附加说明 private Integer accessTokenValidity;
*/ /**
@ApiModelProperty(value = "附加说明") * 刷新令牌过期秒数
private String additionalInformation; */
/** @ApiModelProperty(value = "刷新令牌过期秒数")
* 自动授权 private Integer refreshTokenValidity;
*/ /**
@ApiModelProperty(value = "自动授权") * 附加说明
private String autoapprove; */
@ApiModelProperty(value = "附加说明")
private String additionalInformation;
/**
* 自动授权
*/
@ApiModelProperty(value = "自动授权")
private String autoapprove;
} }

9
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java
View File

@ -15,6 +15,8 @@
*/ */
package org.springblade.system.entity; package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -35,6 +37,13 @@ public class Param extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/** /**
* 参数名 * 参数名
*/ */

9
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
View File

@ -15,6 +15,8 @@
*/ */
package org.springblade.system.entity; package org.springblade.system.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -35,6 +37,13 @@ public class Tenant extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/** /**
* 租户编号 * 租户编号
*/ */

2
blade-service-api/blade-user-api/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

10
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
View File

@ -15,7 +15,10 @@
*/ */
package org.springblade.system.user.entity; package org.springblade.system.user.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.TenantEntity; import org.springblade.core.mp.base.TenantEntity;
@ -34,6 +37,13 @@ public class User extends TenantEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "主键id")
private Integer id;
/** /**
* 账号 * 账号
*/ */

4
blade-service-api/pom.xml
View File

@ -5,13 +5,13 @@
<parent> <parent>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId> <artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.3.0</version> <version>2.3.1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>SpringBlade 微服务API集合</description> <description>SpringBlade 微服务API集合</description>

2
blade-service/blade-desk/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service/blade-log/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service/blade-system/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
blade-service/blade-user/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
blade-service/pom.xml
View File

@ -7,12 +7,12 @@
<parent> <parent>
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<version>2.3.0</version> <version>2.3.1</version>
</parent> </parent>
<artifactId>blade-service</artifactId> <artifactId>blade-service</artifactId>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<version>2.3.0</version> <version>2.3.1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>SpringBlade 微服务集合</description> <description>SpringBlade 微服务集合</description>

4
doc/nacos/blade.yaml
View File

@ -68,6 +68,10 @@ management:
#blade配置 #blade配置
blade: blade:
xss:
url:
exclude-patterns:
- /weixin
secure: secure:
url: url:
exclude-patterns: exclude-patterns:

9
doc/sql/blade-update-2.3.1.sql Normal file
View File

@ -0,0 +1,9 @@
ALTER TABLE `blade_log_error`
ADD COLUMN `remote_ip` varchar(255) NULL COMMENT '操作IP地址' AFTER `line_number`,
ADD COLUMN `time` varchar(64) NULL COMMENT '执行时间' AFTER `params`;
ALTER TABLE `blade_log_usual`
ADD COLUMN `remote_ip` varchar(255) NULL COMMENT '操作IP地址' AFTER `request_uri`,
ADD COLUMN `method_class` varchar(255) NULL COMMENT '方法类' AFTER `remote_ip`,
ADD COLUMN `method_name` varchar(255) NULL COMMENT '方法名' AFTER `method_class`,
ADD COLUMN `time` datetime(0) NULL COMMENT '执行时间' AFTER `params`;

8
pom.xml
View File

@ -5,12 +5,12 @@
<groupId>org.springblade</groupId> <groupId>org.springblade</groupId>
<artifactId>SpringBlade</artifactId> <artifactId>SpringBlade</artifactId>
<version>2.3.0</version> <version>2.3.1</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<blade.tool.version>2.3.0</blade.tool.version> <blade.tool.version>2.3.1</blade.tool.version>
<blade.project.version>2.3.0</blade.project.version> <blade.project.version>2.3.1</blade.project.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<swagger.version>2.9.2</swagger.version> <swagger.version>2.9.2</swagger.version>
@ -23,7 +23,7 @@
<alibaba.cloud.version>0.9.0.RELEASE</alibaba.cloud.version> <alibaba.cloud.version>0.9.0.RELEASE</alibaba.cloud.version>
<spring.boot.admin.version>2.1.4</spring.boot.admin.version> <spring.boot.admin.version>2.1.4</spring.boot.admin.version>
<spring.boot.version>2.1.4.RELEASE</spring.boot.version> <spring.boot.version>2.1.5.RELEASE</spring.boot.version>
<spring.cloud.version>Greenwich.SR1</spring.cloud.version> <spring.cloud.version>Greenwich.SR1</spring.cloud.version>
<spring.platform.version>Cairo-SR7</spring.platform.version> <spring.platform.version>Cairo-SR7</spring.platform.version>