Merge pull request 'feat(修改): ♻️ 修改包位置和配置' (#9) from dev into master

Reviewed-on: #9

common/pom.xml

@@ -35,5 +35,10 @@
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
         </dependency>
+        <!--mysql 驱动-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
     </dependencies>
 </project>

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;
 
 /**
  * <p>
@@ -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;
 }

pom.xml

@@ -40,7 +40,7 @@
         <minio.version>8.5.9</minio.version>
         <lombok.version>1.18.32</lombok.version>
         <jwt.version>0.9.1</jwt.version>
-        <easyexcel.version>3.3.3</easyexcel.version>
+        <easyexcel.version>4.0.0</easyexcel.version>
         <jodatime.version>2.10.1</jodatime.version>
         <aspectj.version>1.9.21</aspectj.version>
         <cloud.version>2023.0.1</cloud.version>

service/pom.xml

@@ -59,11 +59,6 @@
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
-        <!--mysql-->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
         <!-- mysql连接池 -->
         <dependency>
             <groupId>com.zaxxer</groupId>

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());
     }

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:

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());
     }