second commit

src/main/java/com/example/afrishop_v3/controllers/SearchController.java

@@ -2,7 +2,7 @@ package com.example.afrishop_v3.controllers;
 
 import com.example.afrishop_v3.base.Result;
 import com.example.afrishop_v3.enums.ResultCodeEnum;
-import com.example.afrishop_v3.models.TbCfSearchEntity;
+import com.example.afrishop_v3.models.TbCfSearch;
 import com.example.afrishop_v3.repository.TbCfSearchEntityRepository;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,16 +18,16 @@ public class SearchController {
     }
 
     @PostMapping("/save")
-    public Result save(@RequestBody TbCfSearchEntity tbCfSearchEntity) {
+    public Result save(@RequestBody TbCfSearch tbCfSearch) {
 
-        TbCfSearchEntity entity = repository.save(tbCfSearchEntity);
+        TbCfSearch entity = repository.save(tbCfSearch);
 
         return new Result<>(entity);
     }
 
     @GetMapping("/getRecords/{userId}")
     public Result getRecords(@PathVariable("userId") String userId) {
-        List<TbCfSearchEntity> list = repository.getAllByUserId(userId);
+        List<TbCfSearch> list = repository.getAllByUserId(userId);
         return new Result<>(list);
     }
 

src/main/java/com/example/afrishop_v3/controllers/TbCfHomePageEntityController.java

 package com.example.afrishop_v3.controllers;
 
 import com.example.afrishop_v3.base.Result;
-import com.example.afrishop_v3.models.TbCfHomePageEntity;
+import com.example.afrishop_v3.models.TbCfHomePage;
 import com.example.afrishop_v3.repository.TbCfHomePageEntityRepository;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,8 +20,8 @@ public class TbCfHomePageEntityController {
     }
 
     @GetMapping("/img")
-    public Result<List<TbCfHomePageEntity>> getStartPageImage(@RequestParam(value = "version", defaultValue = "0") Integer version) {
-        List<TbCfHomePageEntity> all = repository.getAllByImgVersionAndEnableFlag(version, 1);
+    public Result<List<TbCfHomePage>> getStartPageImage(@RequestParam(value = "version", defaultValue = "0") Integer version) {
+        List<TbCfHomePage> all = repository.getAllByImgVersionAndEnableFlag(version, 1);
         return new Result<>(all);
     }
 }

src/main/java/com/example/afrishop_v3/models/TbCfHomePageEntity.java → src/main/java/com/example/afrishop_v3/models/TbCfHomePage.java

@@ -15,11 +15,9 @@ import java.io.Serializable;
  * @author lipengjun
  * @date 2020-03-31 15:36:05
  */
-@Entity(name = "tb_cf_home_page")
-@Table(name = "tb_cf_home_page")
 @Getter
 @Setter
-public class TbCfHomePageEntity {
+public class TbCfHomePage {
 
     /**
      * 启动页id

src/main/java/com/example/afrishop_v3/models/TbCfSearchEntity.java → src/main/java/com/example/afrishop_v3/models/TbCfSearch.java

@@ -10,7 +10,7 @@ import javax.persistence.Id;
 @Entity
 @Getter
 @Setter
-public class TbCfSearchEntity{
+public class TbCfSearch {
 
     /**
      * 搜索ID

src/main/java/com/example/afrishop_v3/models/TbCfSortEntity.java → src/main/java/com/example/afrishop_v3/models/TbCfSort.java

@@ -18,7 +18,7 @@ import java.util.Date;
 @Entity
 @Getter
 @Setter
-public class TbCfSortEntity{
+public class TbCfSort {
 
     /**
      * 首页排序ID

src/main/java/com/example/afrishop_v3/models/TbCfUserInfo.java

+package com.example.afrishop_v3.models;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户表实体
+ * 表名 tb_cf_user_info
+ *
+ * @author lipengjun
+ * @date 2020-02-20 12:04:18
+ */
+@Entity
+@Getter
+@Setter
+public class TbCfUserInfo {
+
+    /**
+     * 用户id
+     */
+    @Id
+    private String userId;
+    /**
+     * 用户编号
+     */
+    private String userNo;
+    /**
+     * 用户类型（1邮箱、2facebook、3twitter、4手机）
+     */
+    private Integer userType;
+    /**
+     * 账号
+     */
+    private String account;
+    /**
+     * 用户头像地址
+     */
+    private String avatar;
+    /**
+     * 用户名
+     */
+    private String nick;
+    /**
+     * 电话号码
+     */
+    private String phone;
+    /**
+     * 是否绑定手机
+     */
+    private Integer phoneFlag;
+    /**
+     * 密码
+     */
+    private String password;
+    /**
+     * 上一次登录时间
+     */
+    private Date lastLoginTime;
+    /**
+     * 上一次登录IP
+     */
+    private String lastLoginIp;
+    /**
+     * 登录次数
+     */
+    private Integer loginCount;
+    /**
+     * 邮箱
+     */
+    private String email;
+    /**
+     * facebook账号
+     */
+    private String facebook;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 性别,0未知，1男性，2女性
+     */
+    private Integer sex;
+    /**
+     * 生日
+     */
+    private String birthday;
+    /**
+     * 默认地址id
+     */
+    private String defaultAddressId;
+    /**
+     * 发出邀请的用户
+     */
+    private String invitedUserId;
+    /**
+     * 总共邀请数量
+     */
+    private Integer invitedCount;
+    /**
+     * 是否有效
+     */
+    private Integer enableFlag;
+    /**
+     * 邮箱是否已经验证
+     */
+    private Integer emailFlag;
+    /**
+     * 0未发送，1已发送
+     */
+    private Integer isSend;
+
+    private String token;
+    private String firebaseUid;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getFirebaseUid() {
+        return firebaseUid;
+    }
+
+    public void setFirebaseUid(String firebaseUid) {
+        this.firebaseUid = firebaseUid;
+    }
+
+    /**
+     * 设置：用户id
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取：用户id
+     */
+    public String getUserId() {
+        return userId;
+    }
+    /**
+     * 设置：用户编号
+     */
+    public void setUserNo(String userNo) {
+        this.userNo = userNo;
+    }
+
+    /**
+     * 获取：用户编号
+     */
+    public String getUserNo() {
+        return userNo;
+    }
+    /**
+     * 设置：用户类型（1邮箱、2facebook、3twitter、4手机）
+     */
+    public void setUserType(Integer userType) {
+        this.userType = userType;
+    }
+
+    /**
+     * 获取：用户类型（1邮箱、2facebook、3twitter、4手机）
+     */
+    public Integer getUserType() {
+        return userType;
+    }
+    /**
+     * 设置：账号
+     */
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    /**
+     * 获取：账号
+     */
+    public String getAccount() {
+        return account;
+    }
+    /**
+     * 设置：用户头像地址
+     */
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    /**
+     * 获取：用户头像地址
+     */
+    public String getAvatar() {
+        return avatar;
+    }
+    /**
+     * 设置：用户名
+     */
+    public void setNick(String nick) {
+        this.nick = nick;
+    }
+
+    /**
+     * 获取：用户名
+     */
+    public String getNick() {
+        return nick;
+    }
+    /**
+     * 设置：电话号码
+     */
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    /**
+     * 获取：电话号码
+     */
+    public String getPhone() {
+        return phone;
+    }
+    /**
+     * 设置：是否绑定手机
+     */
+    public void setPhoneFlag(Integer phoneFlag) {
+        this.phoneFlag = phoneFlag;
+    }
+
+    /**
+     * 获取：是否绑定手机
+     */
+    public Integer getPhoneFlag() {
+        return phoneFlag;
+    }
+    /**
+     * 设置：密码
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    /**
+     * 获取：密码
+     */
+    public String getPassword() {
+        return password;
+    }
+    /**
+     * 设置：上一次登录时间
+     */
+    public void setLastLoginTime(Date lastLoginTime) {
+        this.lastLoginTime = lastLoginTime;
+    }
+
+    /**
+     * 获取：上一次登录时间
+     */
+    public Date getLastLoginTime() {
+        return lastLoginTime;
+    }
+    /**
+     * 设置：上一次登录IP
+     */
+    public void setLastLoginIp(String lastLoginIp) {
+        this.lastLoginIp = lastLoginIp;
+    }
+
+    /**
+     * 获取：上一次登录IP
+     */
+    public String getLastLoginIp() {
+        return lastLoginIp;
+    }
+    /**
+     * 设置：登录次数
+     */
+    public void setLoginCount(Integer loginCount) {
+        this.loginCount = loginCount;
+    }
+
+    /**
+     * 获取：登录次数
+     */
+    public Integer getLoginCount() {
+        return loginCount;
+    }
+    /**
+     * 设置：邮箱
+     */
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    /**
+     * 获取：邮箱
+     */
+    public String getEmail() {
+        return email;
+    }
+    /**
+     * 设置：facebook账号
+     */
+    public void setFacebook(String facebook) {
+        this.facebook = facebook;
+    }
+
+    /**
+     * 获取：facebook账号
+     */
+    public String getFacebook() {
+        return facebook;
+    }
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+    /**
+     * 设置：性别,0未知，1男性，2女性
+     */
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    /**
+     * 获取：性别,0未知，1男性，2女性
+     */
+    public Integer getSex() {
+        return sex;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    /**
+     * 设置：默认地址id
+     */
+    public void setDefaultAddressId(String defaultAddressId) {
+        this.defaultAddressId = defaultAddressId;
+    }
+
+    /**
+     * 获取：默认地址id
+     */
+    public String getDefaultAddressId() {
+        return defaultAddressId;
+    }
+    /**
+     * 设置：发出邀请的用户
+     */
+    public void setInvitedUserId(String invitedUserId) {
+        this.invitedUserId = invitedUserId;
+    }
+
+    /**
+     * 获取：发出邀请的用户
+     */
+    public String getInvitedUserId() {
+        return invitedUserId;
+    }
+    /**
+     * 设置：总共邀请数量
+     */
+    public void setInvitedCount(Integer invitedCount) {
+        this.invitedCount = invitedCount;
+    }
+
+    /**
+     * 获取：总共邀请数量
+     */
+    public Integer getInvitedCount() {
+        return invitedCount;
+    }
+    /**
+     * 设置：是否有效
+     */
+    public void setEnableFlag(Integer enableFlag) {
+        this.enableFlag = enableFlag;
+    }
+
+    /**
+     * 获取：是否有效
+     */
+    public Integer getEnableFlag() {
+        return enableFlag;
+    }
+    /**
+     * 设置：邮箱是否已经验证
+     */
+    public void setEmailFlag(Integer emailFlag) {
+        this.emailFlag = emailFlag;
+    }
+
+    /**
+     * 获取：邮箱是否已经验证
+     */
+    public Integer getEmailFlag() {
+        return emailFlag;
+    }
+    /**
+     * 设置：0未发送，1已发送
+     */
+    public void setIsSend(Integer isSend) {
+        this.isSend = isSend;
+    }
+
+    /**
+     * 获取：0未发送，1已发送
+     */
+    public Integer getIsSend() {
+        return isSend;
+    }
+}

src/main/java/com/example/afrishop_v3/repository/TbCfHomePageEntityRepository.java

 package com.example.afrishop_v3.repository;
 
-import com.example.afrishop_v3.models.TbCfHomePageEntity;
+import com.example.afrishop_v3.models.TbCfHomePage;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import java.util.List;
 
-public interface TbCfHomePageEntityRepository extends PagingAndSortingRepository<TbCfHomePageEntity,String> {
-    List<TbCfHomePageEntity> getAllByImgVersionAndEnableFlag(Integer imgVersion, Integer enableFlag);
+public interface TbCfHomePageEntityRepository extends PagingAndSortingRepository<TbCfHomePage,String> {
+    List<TbCfHomePage> getAllByImgVersionAndEnableFlag(Integer imgVersion, Integer enableFlag);
 }

src/main/java/com/example/afrishop_v3/repository/TbCfSearchEntityRepository.java

 package com.example.afrishop_v3.repository;
 
-import com.example.afrishop_v3.models.TbCfSearchEntity;
+import com.example.afrishop_v3.models.TbCfSearch;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import java.util.List;
 
-public interface TbCfSearchEntityRepository extends PagingAndSortingRepository<TbCfSearchEntity,String> {
-    List<TbCfSearchEntity> getAllByUserId(String userId);
+public interface TbCfSearchEntityRepository extends PagingAndSortingRepository<TbCfSearch,String> {
+    List<TbCfSearch> getAllByUserId(String userId);
 
     @Modifying
     @Query("delete from tb_cf_search u where u.id in ?1")

src/main/java/com/example/afrishop_v3/repository/TbCfSortEntityRepository.java

 package com.example.afrishop_v3.repository;
 
-import com.example.afrishop_v3.models.TbCfSortEntity;
+import com.example.afrishop_v3.models.TbCfSort;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-public interface TbCfSortEntityRepository extends PagingAndSortingRepository<TbCfSortEntity,String> {
+public interface TbCfSortEntityRepository extends PagingAndSortingRepository<TbCfSort,String> {
 }

src/main/resources/queries.sql

+create index tb_cf_search_user_id_index
+	on tb_cf_search (user_id);
+
+alter table tb_cf_search
+	add constraint tb_cf_search_tb_cf_user_info_user_id_fk
+		foreign key (user_id) references tb_cf_user_info (user_id);
+