diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml
index 1469a7a2..676ba1b3 100644
--- a/blade-auth/pom.xml
+++ b/blade-auth/pom.xml
@@ -8,7 +8,7 @@
SpringBlade
org.springblade
- 2.3.0
+ 2.3.1
blade-auth
diff --git a/blade-common/pom.xml b/blade-common/pom.xml
index 75e3fd4c..ccb0a8b0 100644
--- a/blade-common/pom.xml
+++ b/blade-common/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index ab854619..28e65e22 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index fdb55514..d57322f1 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -5,7 +5,7 @@
blade-ops
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml
index 56cd3040..d3cd4779 100644
--- a/blade-ops/blade-develop/pom.xml
+++ b/blade-ops/blade-develop/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-ops
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml
index b0ea3992..44fe3a4d 100644
--- a/blade-ops/pom.xml
+++ b/blade-ops/pom.xml
@@ -5,7 +5,7 @@
SpringBlade
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml
index bbd1dda2..5dffc93b 100644
--- a/blade-service-api/blade-desk-api/pom.xml
+++ b/blade-service-api/blade-desk-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java
index 41ce214b..6df6af94 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/entity/Notice.java
@@ -15,6 +15,8 @@
*/
package org.springblade.desk.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,6 +37,13 @@ public class Notice extends BaseEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "主键id")
+ private Integer id;
+
/**
* 标题
*/
diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml
index 1e3edb21..4752f0dd 100644
--- a/blade-service-api/blade-dict-api/pom.xml
+++ b/blade-service-api/blade-dict-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml
index 07ca4467..3e282488 100644
--- a/blade-service-api/blade-system-api/pom.xml
+++ b/blade-service-api/blade-system-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java
index 7f2067e7..a10c8bb7 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/AuthClient.java
@@ -15,6 +15,8 @@
*/
package org.springblade.system.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -34,63 +36,70 @@ import org.springblade.core.mp.base.BaseEntity;
@ApiModel(value = "Client对象", description = "Client对象")
public class AuthClient extends BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 客户端id
- */
- @ApiModelProperty(value = "客户端id")
- private String clientId;
- /**
- * 客户端密钥
- */
- @ApiModelProperty(value = "客户端密钥")
- private String clientSecret;
- /**
- * 资源集合
- */
- @ApiModelProperty(value = "资源集合")
- private String resourceIds;
- /**
- * 授权范围
- */
- @ApiModelProperty(value = "授权范围")
- private String scope;
- /**
- * 授权类型
- */
- @ApiModelProperty(value = "授权类型")
- private String authorizedGrantTypes;
- /**
- * 回调地址
- */
- @ApiModelProperty(value = "回调地址")
- private String webServerRedirectUri;
- /**
- * 权限
- */
- @ApiModelProperty(value = "权限")
- private String authorities;
- /**
- * 令牌过期秒数
- */
- @ApiModelProperty(value = "令牌过期秒数")
- private Integer accessTokenValidity;
- /**
- * 刷新令牌过期秒数
- */
- @ApiModelProperty(value = "刷新令牌过期秒数")
- private Integer refreshTokenValidity;
- /**
- * 附加说明
- */
- @ApiModelProperty(value = "附加说明")
- private String additionalInformation;
- /**
- * 自动授权
- */
- @ApiModelProperty(value = "自动授权")
- private String autoapprove;
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "主键id")
+ private Integer id;
+
+ /**
+ * 客户端id
+ */
+ @ApiModelProperty(value = "客户端id")
+ private String clientId;
+ /**
+ * 客户端密钥
+ */
+ @ApiModelProperty(value = "客户端密钥")
+ private String clientSecret;
+ /**
+ * 资源集合
+ */
+ @ApiModelProperty(value = "资源集合")
+ private String resourceIds;
+ /**
+ * 授权范围
+ */
+ @ApiModelProperty(value = "授权范围")
+ private String scope;
+ /**
+ * 授权类型
+ */
+ @ApiModelProperty(value = "授权类型")
+ private String authorizedGrantTypes;
+ /**
+ * 回调地址
+ */
+ @ApiModelProperty(value = "回调地址")
+ private String webServerRedirectUri;
+ /**
+ * 权限
+ */
+ @ApiModelProperty(value = "权限")
+ private String authorities;
+ /**
+ * 令牌过期秒数
+ */
+ @ApiModelProperty(value = "令牌过期秒数")
+ private Integer accessTokenValidity;
+ /**
+ * 刷新令牌过期秒数
+ */
+ @ApiModelProperty(value = "刷新令牌过期秒数")
+ private Integer refreshTokenValidity;
+ /**
+ * 附加说明
+ */
+ @ApiModelProperty(value = "附加说明")
+ private String additionalInformation;
+ /**
+ * 自动授权
+ */
+ @ApiModelProperty(value = "自动授权")
+ private String autoapprove;
}
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java
index 7392e9d2..d9261f21 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Param.java
@@ -15,6 +15,8 @@
*/
package org.springblade.system.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -35,6 +37,13 @@ public class Param extends BaseEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "主键id")
+ private Integer id;
+
/**
* 参数名
*/
diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
index f80520e0..2816d57c 100644
--- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
+++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
@@ -15,6 +15,8 @@
*/
package org.springblade.system.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -35,6 +37,13 @@ public class Tenant extends BaseEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "主键id")
+ private Integer id;
+
/**
* 租户编号
*/
diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml
index 95799ea8..18c9b9d1 100644
--- a/blade-service-api/blade-user-api/pom.xml
+++ b/blade-service-api/blade-user-api/pom.xml
@@ -5,7 +5,7 @@
blade-service-api
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
index af809cc5..0e6490fc 100644
--- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
+++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java
@@ -15,7 +15,10 @@
*/
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.TenantEntity;
@@ -34,6 +37,13 @@ public class User extends TenantEntity {
private static final long serialVersionUID = 1L;
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value = "主键id")
+ private Integer id;
+
/**
* 账号
*/
diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml
index 5aa22200..0f0fc052 100644
--- a/blade-service-api/pom.xml
+++ b/blade-service-api/pom.xml
@@ -5,13 +5,13 @@
SpringBlade
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
blade-service-api
${project.artifactId}
- 2.3.0
+ 2.3.1
pom
SpringBlade 微服务API集合
diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml
index e8852746..ed6fd0bf 100644
--- a/blade-service/blade-desk/pom.xml
+++ b/blade-service/blade-desk/pom.xml
@@ -6,7 +6,7 @@
org.springblade
blade-service
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml
index 04f00073..dcc1149d 100644
--- a/blade-service/blade-log/pom.xml
+++ b/blade-service/blade-log/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index 8599277f..d50a4c0e 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml
index 09039cd9..c10f2f60 100644
--- a/blade-service/blade-user/pom.xml
+++ b/blade-service/blade-user/pom.xml
@@ -5,7 +5,7 @@
blade-service
org.springblade
- 2.3.0
+ 2.3.1
4.0.0
diff --git a/blade-service/pom.xml b/blade-service/pom.xml
index 20c051f6..aee41305 100644
--- a/blade-service/pom.xml
+++ b/blade-service/pom.xml
@@ -7,12 +7,12 @@
org.springblade
SpringBlade
- 2.3.0
+ 2.3.1
blade-service
${project.artifactId}
- 2.3.0
+ 2.3.1
pom
SpringBlade 微服务集合
diff --git a/doc/nacos/blade.yaml b/doc/nacos/blade.yaml
index 31e61817..ff1788fd 100644
--- a/doc/nacos/blade.yaml
+++ b/doc/nacos/blade.yaml
@@ -68,6 +68,10 @@ management:
#blade配置
blade:
+ xss:
+ url:
+ exclude-patterns:
+ - /weixin
secure:
url:
exclude-patterns:
diff --git a/doc/sql/blade-update-2.3.1.sql b/doc/sql/blade-update-2.3.1.sql
new file mode 100644
index 00000000..df744a1a
--- /dev/null
+++ b/doc/sql/blade-update-2.3.1.sql
@@ -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`;
diff --git a/pom.xml b/pom.xml
index 0eae3ee6..81a1f0c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
org.springblade
SpringBlade
- 2.3.0
+ 2.3.1
pom
- 2.3.0
- 2.3.0
+ 2.3.1
+ 2.3.1
1.8
2.9.2
@@ -23,7 +23,7 @@
0.9.0.RELEASE
2.1.4
- 2.1.4.RELEASE
+ 2.1.5.RELEASE
Greenwich.SR1
Cairo-SR7