From 1d8cf6ef556b2e7aafd52ad6752de821dcc8d6d3 Mon Sep 17 00:00:00 2001
From: Bunny <1319900154@qq.com>
Date: Sun, 28 Jul 2024 03:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=20feat(=E4=BF=AE=E6=94=B9):=20:recycle:=20?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E4=BD=8D=E7=BD=AE=E5=92=8C=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/pom.xml | 5 +++++
.../cn/bunny/entity/system/user/User.java | 19 ++++++++-----------
pom.xml | 2 +-
service/pom.xml | 5 -----
.../service/admin/config/Knife4jConfig.java | 2 +-
.../src/main/resources/application-dev.yml | 2 +-
.../service/web/config/Knife4jConfig.java | 2 +-
7 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/common/pom.xml b/common/pom.xml
index a253a67..e385851 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -35,5 +35,10 @@
io.jsonwebtoken
jjwt
+
+
+ mysql
+ mysql-connector-java
+
diff --git a/dao/src/main/java/cn/bunny/entity/system/user/User.java b/dao/src/main/java/cn/bunny/entity/system/user/User.java
index 33c086d..b427c50 100644
--- a/dao/src/main/java/cn/bunny/entity/system/user/User.java
+++ b/dao/src/main/java/cn/bunny/entity/system/user/User.java
@@ -9,7 +9,6 @@ import lombok.experimental.Accessors;
import java.io.Serial;
import java.io.Serializable;
-import java.time.LocalDateTime;
/**
*
@@ -28,8 +27,12 @@ public class User extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("昵称")
private String nickName;
+ @ApiModelProperty("用户名")
+ private String username;
@ApiModelProperty("邮箱")
private String email;
+ @ApiModelProperty("手机号")
+ private String phone;
@ApiModelProperty("密码")
private String password;
@ApiModelProperty("头像")
@@ -38,24 +41,18 @@ public class User extends BaseEntity implements Serializable {
private Byte sex;
@ApiModelProperty("个人描述")
private String personDescription;
- @ApiModelProperty("加入时间")
- private LocalDateTime joinTime;
-
- @ApiModelProperty("最后登录时间")
- private LocalDateTime lastLoginTime;
-
+ @ApiModelProperty("文章显示模式")
+ private String articleMode;
+ @ApiModelProperty("页面布局方式")
+ private String layout;
@ApiModelProperty("最后登录IP")
private String lastLoginIp;
-
@ApiModelProperty("最后登录ip地址")
private String lastLoginIpAddress;
-
@ApiModelProperty("积分")
private Integer totalIntegral;
-
@ApiModelProperty("当前积分")
private Integer currentIntegral;
-
@ApiModelProperty("0:禁用 1:正常")
private Byte status;
}
diff --git a/pom.xml b/pom.xml
index 18e610a..b429a9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
8.5.9
1.18.32
0.9.1
- 3.3.3
+ 4.0.0
2.10.1
1.9.21
2023.0.1
diff --git a/service/pom.xml b/service/pom.xml
index 9dedbe6..c06e15e 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -59,11 +59,6 @@
org.aspectj
aspectjweaver
-
-
- mysql
- mysql-connector-java
-
com.zaxxer
diff --git a/service/service-admin/src/main/java/cn/bunny/service/admin/config/Knife4jConfig.java b/service/service-admin/src/main/java/cn/bunny/service/admin/config/Knife4jConfig.java
index 9621031..e636721 100644
--- a/service/service-admin/src/main/java/cn/bunny/service/admin/config/Knife4jConfig.java
+++ b/service/service-admin/src/main/java/cn/bunny/service/admin/config/Knife4jConfig.java
@@ -20,7 +20,7 @@ public class Knife4jConfig {
// 使用协议
License license = new License().name("MIT").url("http://MUT.com");
// 相关信息
- Info info = new Info().title("Bunny-Java-Template").description("Bunny的Java模板").version("v1.0.0").contact(contact).license(license).termsOfService("记得给我start");
+ Info info = new Info().title("Bunny-Java-Template").description("Bunny的Java模板").version("v1.0.0").contact(contact).license(license).termsOfService("维护不易~求个start");
return new OpenAPI().info(info).externalDocs(new ExternalDocumentation());
}
diff --git a/service/service-admin/src/main/resources/application-dev.yml b/service/service-admin/src/main/resources/application-dev.yml
index 1d8defb..e078ec9 100644
--- a/service/service-admin/src/main/resources/application-dev.yml
+++ b/service/service-admin/src/main/resources/application-dev.yml
@@ -9,7 +9,7 @@ bunny:
redis:
host: 192.168.3.100
port: 6379
- database: 1
+ database: 0
password: "123456"
minio:
diff --git a/service/service-web/src/main/java/cn/bunny/service/web/config/Knife4jConfig.java b/service/service-web/src/main/java/cn/bunny/service/web/config/Knife4jConfig.java
index 9da12dc..a3e67c4 100644
--- a/service/service-web/src/main/java/cn/bunny/service/web/config/Knife4jConfig.java
+++ b/service/service-web/src/main/java/cn/bunny/service/web/config/Knife4jConfig.java
@@ -20,7 +20,7 @@ public class Knife4jConfig {
// 使用协议
License license = new License().name("MIT").url("http://MUT.com");
// 相关信息
- Info info = new Info().title("Bunny-Java-Template").description("Bunny的Java模板").version("v1.0.0").contact(contact).license(license).termsOfService("记得给我start");
+ Info info = new Info().title("Bunny-Java-Template").description("Bunny的Java模板").version("v1.0.0").contact(contact).license(license).termsOfService("维护不易~求个start");
return new OpenAPI().info(info).externalDocs(new ExternalDocumentation());
}