From 0fc7503e65007e953439cfd8601e8a6338908160 Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Sat, 11 Jun 2022 12:37:15 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20forest=5Fuser=20=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20bg=5Fimg=5Furl=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/rymcu/forest/dto/UserDTO.java    |  2 ++
 .../com/rymcu/forest/dto/UserInfoDTO.java     |  2 ++
 .../java/com/rymcu/forest/entity/User.java    |  6 +++++
 src/main/java/mapper/UserMapper.xml           |  5 +++-
 src/main/resources/static/forest.sql          | 25 ++++++++++---------
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/rymcu/forest/dto/UserDTO.java b/src/main/java/com/rymcu/forest/dto/UserDTO.java
index a4d755e..469a457 100644
--- a/src/main/java/com/rymcu/forest/dto/UserDTO.java
+++ b/src/main/java/com/rymcu/forest/dto/UserDTO.java
@@ -19,4 +19,6 @@ public class UserDTO {
     private String nickname;
 
     private String signature;
+
+    private String bgImgUrl;
 }
diff --git a/src/main/java/com/rymcu/forest/dto/UserInfoDTO.java b/src/main/java/com/rymcu/forest/dto/UserInfoDTO.java
index 60ff5e3..aa1b041 100644
--- a/src/main/java/com/rymcu/forest/dto/UserInfoDTO.java
+++ b/src/main/java/com/rymcu/forest/dto/UserInfoDTO.java
@@ -46,4 +46,6 @@ public class UserInfoDTO implements Serializable {
 
     private Integer onlineStatus;
 
+    private String bgImgUrl;
+
 }
diff --git a/src/main/java/com/rymcu/forest/entity/User.java b/src/main/java/com/rymcu/forest/entity/User.java
index 8654f99..642bc03 100644
--- a/src/main/java/com/rymcu/forest/entity/User.java
+++ b/src/main/java/com/rymcu/forest/entity/User.java
@@ -120,4 +120,10 @@ public class User implements Serializable,Cloneable {
     @Column(name = "last_online_time")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date lastOnlineTime;
+
+    /**
+     * 个人中心背景图片
+     * */
+    @Column(name = "bg_img_url")
+    private String bgImgUrl;
 }
\ No newline at end of file
diff --git a/src/main/java/mapper/UserMapper.xml b/src/main/java/mapper/UserMapper.xml
index 11b203c..f2c6cef 100644
--- a/src/main/java/mapper/UserMapper.xml
+++ b/src/main/java/mapper/UserMapper.xml
@@ -20,6 +20,7 @@
         <result column="last_online_time" property="lastOnlineTime"/>
         <result column="created_time" property="createdTime"/>
         <result column="updated_time" property="updatedTime"/>
+        <result column="bg_img_url" property="bgImgUrl"/>
     </resultMap>
     <resultMap id="UserInfoResultMapper" type="com.rymcu.forest.dto.UserInfoDTO">
         <result column="id" property="idUser"/>
@@ -35,6 +36,7 @@
         <result column="last_online_time" property="lastOnlineTime"/>
         <result column="created_time" property="createdTime"/>
         <result column="signature" property="signature"/>
+        <result column="bg_img_url" property="bgImgUrl"/>
     </resultMap>
     <resultMap id="DTOResultMapper" type="com.rymcu.forest.dto.UserDTO">
         <result column="id" property="idUser"/>
@@ -43,6 +45,7 @@
         <result column="avatar_type" property="avatarType"/>
         <result column="avatar_url" property="avatarUrl"/>
         <result column="signature" property="signature"/>
+        <result column="bg_img_url" property="bgImgUrl"/>
     </resultMap>
     <resultMap id="AuthorResultMap" type="com.rymcu.forest.dto.Author">
         <result column="id" property="idUser"/>
@@ -86,7 +89,7 @@
         select id, nickname, sex, avatar_type, avatar_url, email, phone, account, status, signature, last_login_time, last_online_time from forest_user where account = #{account}
     </select>
     <select id="selectUserDTOByAccount" resultMap="DTOResultMapper">
-        select id, nickname, avatar_type, avatar_url, account, signature from forest_user where account = #{account} and status = 0
+        select id, nickname, avatar_type, avatar_url, account, signature, bg_img_url from forest_user where account = #{account} and status = 0
     </select>
     <select id="selectRoleWeightsByUser" resultType="java.lang.Integer">
         select vr.weights from forest_role vr left join forest_user_role vur on vr.id = vur.id_role where vur.id_user = #{idUser}
diff --git a/src/main/resources/static/forest.sql b/src/main/resources/static/forest.sql
index 86a58df..b6d5752 100644
--- a/src/main/resources/static/forest.sql
+++ b/src/main/resources/static/forest.sql
@@ -43,7 +43,7 @@ create table forest_article_thumbs_up
     id_article     bigint null comment '文章表主键',
     id_user        bigint null comment '用户表主键',
     thumbs_up_time datetime null comment '点赞时间'
-) comment '文章点赞表 ';
+) comment '文章点赞表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_bank
 (
@@ -54,7 +54,7 @@ create table forest_bank
     bank_description varchar(512) null comment '银行描述',
     created_by       bigint null comment '创建人',
     created_time     datetime null comment '创建时间'
-) comment '银行表 ';
+) comment '银行表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_bank_account
 (
@@ -66,7 +66,7 @@ create table forest_bank_account
     account_owner   bigint null comment '账户所有者',
     created_time    datetime null comment '创建时间',
     account_type    char default '0' null comment '0: 普通账户 1: 银行账户'
-) comment '银行账户表 ';
+) comment '银行账户表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_comment
 (
@@ -93,7 +93,7 @@ create table forest_currency_issue
     issue_value  decimal(32, 8) null comment '发行数额',
     created_by   bigint null comment '发行人',
     created_time datetime null comment '发行时间'
-) comment '货币发行表 ';
+) comment '货币发行表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_currency_rule
 (
@@ -107,7 +107,7 @@ create table forest_currency_rule
     maximum_money    decimal(32, 8) null comment '上限金额',
     repeat_days      int  default 0 null comment '重复(0: 不重复,单位:天)',
     status           char default '0' null comment '状态'
-) comment '货币规则表 ';
+) comment '货币规则表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_follow
 (
@@ -173,7 +173,7 @@ create table forest_sponsor
     sponsor           bigint null comment '赞赏人',
     sponsorship_time  datetime null comment '赞赏日期',
     sponsorship_money decimal(32, 8) null comment '赞赏金额'
-) comment '赞赏表 ';
+) comment '赞赏表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_tag
 (
@@ -251,7 +251,7 @@ create table forest_transaction_record
     money             decimal(32, 8) null comment '交易金额',
     transaction_type  char default '0' null comment '交易类型',
     transaction_time  datetime null comment '交易时间'
-) comment '交易记录表 ';
+) comment '交易记录表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_user
 (
@@ -271,7 +271,8 @@ create table forest_user
     updated_time    datetime null comment '更新时间',
     last_login_time datetime null comment '最后登录时间',
     signature       varchar(128) null comment '签名',
-    last_online_time datetime null comment '最后在线时间'
+    last_online_time datetime null comment '最后在线时间',
+    bg_img_url       varchar(512)     null comment '背景图片'
 ) comment '用户表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_user_extend
@@ -282,7 +283,7 @@ create table forest_user_extend
     weixin  varchar(32) null comment '微信',
     qq      varchar(32) null comment 'qq',
     blog    varchar(500) null comment '博客'
-) comment '用户扩展表 ';
+) comment '用户扩展表 ' collate = utf8mb4_unicode_ci;
 
 create table forest_user_role
 (
@@ -323,7 +324,7 @@ create table forest_lucene_user_dic
     dic char(32) null comment '字典',
     constraint forest_lucene_user_dic_id_uindex
         unique (id)
-) comment '用户扩展字典';
+) comment '用户扩展字典' collate = utf8mb4_unicode_ci;
 
 alter table forest_lucene_user_dic
     add primary key (id);
@@ -357,7 +358,7 @@ create table forest_file
     created_by   int null comment '创建人',
     file_size    int null comment '文件大小',
     file_type    varchar(10) null comment '文件类型'
-) comment '文件上传记录表';
+) comment '文件上传记录表' collate = utf8mb4_unicode_ci;
 
 create index index_md5_value_created_by
     on forest_file (md5_value, created_by);
@@ -382,4 +383,4 @@ create table forest_login_record
     login_device_id varchar(512) null comment '登录设备/浏览器指纹',
     constraint forest_login_record_id_uindex
         unique (id)
-) comment '登录记录表';
+) comment '登录记录表' collate = utf8mb4_unicode_ci;