修改数据库名

src/main/java/com/miekir/shibei/bean/CouponBean.java

@@ -1,4 +1,4 @@
-package com.miekir.shibei.bean;
+package com.miekir.shibei.bean.db;
 
 
 import javax.persistence.*;
@@ -11,7 +11,7 @@ import javax.persistence.*;
  * Description: 优惠券实体
  */
 @Entity
-@Table(name = "t_coupon", schema = "shibei", catalog = "")
+@Table(name = "t_coupon", schema = "eden", catalog = "")
 public class CouponBean {
     /**
      * 模板Id

src/main/java/com/miekir/shibei/bean/Feedback.java

@@ -1,4 +1,4 @@
-package com.miekir.shibei.bean;
+package com.miekir.shibei.bean.db;
 
 import javax.persistence.*;
 
@@ -6,7 +6,7 @@ import javax.persistence.*;
  * Created by Jason on 2018/8/26.
  */
 @Entity
-@Table(name = "t_feedback", schema = "shibei", catalog = "")
+@Table(name = "t_feedback", schema = "eden", catalog = "")
 public class Feedback {
     private Integer id;
     private String email;

src/main/java/com/miekir/shibei/bean/GoodsBean.java

@@ -1,4 +1,4 @@
-package com.miekir.shibei.bean;
+package com.miekir.shibei.bean.db;
 
 import javax.persistence.*;
 
@@ -10,7 +10,7 @@ import javax.persistence.*;
  * Description: 商品实体
  */
 @Entity
-@Table(name = "t_goods", schema = "shibei", catalog = "")
+@Table(name = "t_goods", schema = "eden", catalog = "")
 public class GoodsBean {
     public static final int TYPE_RECOMMEND = 0;
     public static final int TYPE_TECHNOLOGY = 1;

src/main/java/com/miekir/shibei/bean/JsonBean.java

@@ -1,4 +1,4 @@
-package com.miekir.shibei.bean;
+package com.miekir.shibei.bean.db;
 
 import javax.persistence.*;
 
@@ -10,7 +10,7 @@ import javax.persistence.*;
  * Description: json
  */
 @Entity
-@Table(name = "t_json", schema = "shibei", catalog = "")
+@Table(name = "t_json", schema = "eden", catalog = "")
 public class JsonBean {
 
     @Id

src/main/java/com/miekir/shibei/bean/SystemBean.java

@@ -1,4 +1,4 @@
-package com.miekir.shibei.bean;
+package com.miekir.shibei.bean.db;
 
 import javax.persistence.*;
 
@@ -6,7 +6,7 @@ import javax.persistence.*;
  * 系统控制类
  */
 @Entity
-@Table(name = "t_system", schema = "shibei", catalog = "")
+@Table(name = "t_system", schema = "eden", catalog = "")
 public class SystemBean {
     /**
      * 模板Id

src/main/java/com/miekir/shibei/bean/UpgradeBean.java

@@ -1,4 +1,4 @@
-package com.miekir.shibei.bean;
+package com.miekir.shibei.bean.db;
 
 import javax.persistence.*;
 
@@ -6,7 +6,7 @@ import javax.persistence.*;
  * Created by Jason on 2019/09/29.
  */
 @Entity
-@Table(name = "t_upgrade", schema = "shibei", catalog = "")
+@Table(name = "t_upgrade", schema = "eden", catalog = "")
 public class UpgradeBean {
     // Id自增，注意，一个表只能有一个主键，否则服务器会报500错误，启动失败
     @Id

src/main/java/com/miekir/shibei/bean/User.java

@@ -1,4 +1,4 @@
-package com.miekir.shibei.bean;
+package com.miekir.shibei.bean.db;
 
 import javax.persistence.*;
 
@@ -6,7 +6,7 @@ import javax.persistence.*;
  * Created by Jason on 2018/8/26.
  */
 @Entity
-@Table(name = "t_user", schema = "shibei", catalog = "")
+@Table(name = "t_user", schema = "eden", catalog = "")
 public class User {
     //private Integer id;
     private String email;

src/main/java/com/miekir/shibei/controller/api/CouponController.java

@@ -1,8 +1,7 @@
 package com.miekir.shibei.controller.api;
 
 import com.alibaba.fastjson.JSON;
-import com.miekir.shibei.bean.CouponBean;
-import com.miekir.shibei.bean.GoodsBean;
+import com.miekir.shibei.bean.db.CouponBean;
 import com.miekir.shibei.bean.ResponseResult;
 import com.miekir.shibei.bean.ResultCode;
 import com.miekir.shibei.repository.CouponRepository;

src/main/java/com/miekir/shibei/controller/api/GoodsController.java

@@ -2,11 +2,11 @@ package com.miekir.shibei.controller.api;
 
 import com.alibaba.fastjson.JSON;
 import com.miekir.shibei.bean.*;
+import com.miekir.shibei.bean.db.GoodsBean;
 import com.miekir.shibei.repository.GoodsRepository;
 import com.miekir.shibei.repository.UserRepository;
 import com.miekir.shibei.tool.RequestTool;
 import com.miekir.shibei.tool.StringTool;
-import com.miekir.shibei.tool.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
@@ -14,9 +14,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.UnsupportedEncodingException;
 import java.util.List;
-import java.util.Map;
 
 @Controller
 public class GoodsController {

src/main/java/com/miekir/shibei/controller/api/JsonController.java

@@ -1,23 +1,19 @@
 package com.miekir.shibei.controller.api;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.parser.Feature;
-import com.alibaba.fastjson.serializer.SerializeConfig;
 import com.miekir.shibei.bean.*;
+import com.miekir.shibei.bean.db.JsonBean;
+import com.miekir.shibei.bean.db.SystemBean;
+import com.miekir.shibei.bean.db.User;
 import com.miekir.shibei.repository.JsonRepository;
 import com.miekir.shibei.repository.SystemRepository;
 import com.miekir.shibei.repository.UserRepository;
 import com.miekir.shibei.tool.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-
 @Controller
 public class JsonController {
     // 自动装配

src/main/java/com/miekir/shibei/controller/api/SystemController.java

@@ -2,6 +2,9 @@ package com.miekir.shibei.controller.api;
 
 import com.alibaba.fastjson.JSON;
 import com.miekir.shibei.bean.*;
+import com.miekir.shibei.bean.db.Feedback;
+import com.miekir.shibei.bean.db.SystemBean;
+import com.miekir.shibei.bean.db.UpgradeBean;
 import com.miekir.shibei.constants.ServerConstants;
 import com.miekir.shibei.repository.FeedbackRepository;
 import com.miekir.shibei.repository.SystemRepository;

src/main/java/com/miekir/shibei/controller/api/UserController.java

@@ -3,7 +3,7 @@ package com.miekir.shibei.controller.api;
 import com.alibaba.fastjson.JSON;
 import com.miekir.shibei.bean.ResponseResult;
 import com.miekir.shibei.bean.ResultCode;
-import com.miekir.shibei.bean.User;
+import com.miekir.shibei.bean.db.User;
 import com.miekir.shibei.repository.UserRepository;
 import com.miekir.shibei.tool.CodeGenerator;
 import com.miekir.shibei.tool.TextUtils;

src/main/java/com/miekir/shibei/interceptor/AuthInterceptor.java

@@ -3,7 +3,7 @@ package com.miekir.shibei.interceptor;
 import com.alibaba.fastjson.JSON;
 import com.miekir.shibei.bean.ResponseResult;
 import com.miekir.shibei.bean.ResultCode;
-import com.miekir.shibei.bean.User;
+import com.miekir.shibei.bean.db.User;
 import com.miekir.shibei.repository.UserRepository;
 import com.miekir.shibei.tool.TextUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/miekir/shibei/repository/CouponRepository.java

@@ -1,7 +1,6 @@
 package com.miekir.shibei.repository;
 
-import com.miekir.shibei.bean.CouponBean;
-import com.miekir.shibei.bean.GoodsBean;
+import com.miekir.shibei.bean.db.CouponBean;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/com/miekir/shibei/repository/FeedbackRepository.java

@@ -1,6 +1,6 @@
 package com.miekir.shibei.repository;
 
-import com.miekir.shibei.bean.Feedback;
+import com.miekir.shibei.bean.db.Feedback;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/miekir/shibei/repository/GoodsRepository.java

@@ -1,7 +1,6 @@
 package com.miekir.shibei.repository;
 
-import com.miekir.shibei.bean.GoodsBean;
-import com.miekir.shibei.bean.JsonBean;
+import com.miekir.shibei.bean.db.GoodsBean;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;

src/main/java/com/miekir/shibei/repository/JsonRepository.java

@@ -1,12 +1,9 @@
 package com.miekir.shibei.repository;
 
-import com.miekir.shibei.bean.CouponBean;
-import com.miekir.shibei.bean.JsonBean;
+import com.miekir.shibei.bean.db.JsonBean;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Created by sjj on 2015/10/24 0024.

src/main/java/com/miekir/shibei/repository/SystemRepository.java

@@ -1,10 +1,8 @@
 package com.miekir.shibei.repository;
 
-import com.miekir.shibei.bean.CouponBean;
-import com.miekir.shibei.bean.SystemBean;
+import com.miekir.shibei.bean.db.SystemBean;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/com/miekir/shibei/repository/UpgradeRepository.java

@@ -1,6 +1,6 @@
 package com.miekir.shibei.repository;
 
-import com.miekir.shibei.bean.UpgradeBean;
+import com.miekir.shibei.bean.db.UpgradeBean;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

src/main/java/com/miekir/shibei/repository/UserRepository.java

@@ -1,6 +1,6 @@
 package com.miekir.shibei.repository;
 
-import com.miekir.shibei.bean.User;
+import com.miekir.shibei.bean.db.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/miekir/shibei/tool/RequestTool.java

@@ -1,7 +1,6 @@
 package com.miekir.shibei.tool;
 
-import com.alibaba.fastjson.JSON;
-import com.miekir.shibei.bean.User;
+import com.miekir.shibei.bean.db.User;
 import com.miekir.shibei.constants.ServerConstants;
 import com.miekir.shibei.repository.UserRepository;
 import org.springframework.http.HttpHeaders;

src/main/resources/META-INF/persistence.xml

@@ -9,7 +9,7 @@
             <!--schema一定要先在MySQL Workbench建好，schema其实相当于真正的数据库，数据库都没有，怎么可能成功呢。
             MySQL Workbench中新建Schema的时候，一定要选择utf8-utf8_general_ci，否则会乱码，导致插入数据库出错。这里的schema是shibei，如下：-->
             <property name="hibernate.connection.url"
-                      value="jdbc:mysql://localhost:3306/shibei"/>
+                      value="jdbc:mysql://localhost:3306/eden"/>
             <!-- 数据库连接的驱动 -->
             <property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"/>
             <!-- 数据库连接的用户名 -->