修改 recharge 表的位置

book-dao/src/main/java/com/book/dao/cpsshard/mapper/RechargeMapper.java → book-dao/src/main/java/com/book/dao/cps/mapper/RechargeMapper.java

@@ -1,7 +1,7 @@
-package com.book.dao.cpsshard.mapper;
+package com.book.dao.cps.mapper;
 
-import com.book.dao.cpsshard.entity.Recharge;
-import com.book.dao.cpsshard.pojo.example.RechargeExample;
+import com.book.dao.cps.pojo.Recharge;
+import com.book.dao.cps.pojo.example.RechargeExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

book-dao/src/main/java/com/book/dao/cpsshard/entity/Recharge.java → book-dao/src/main/java/com/book/dao/cps/pojo/Recharge.java

@@ -1,4 +1,4 @@
-package com.book.dao.cpsshard.entity;
+package com.book.dao.cps.pojo;
 
 import java.io.Serializable;
 import java.util.ArrayList;

book-dao/src/main/java/com/book/dao/cpsshard/pojo/example/RechargeExample.java → book-dao/src/main/java/com/book/dao/cps/pojo/example/RechargeExample.java

@@ -1,6 +1,7 @@
-package com.book.dao.cpsshard.pojo.example;
+package com.book.dao.cps.pojo.example;
+
+import com.book.dao.cps.pojo.Recharge;
 
-import com.book.dao.cpsshard.entity.Recharge;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -1846,6 +1847,6 @@ public class RechargeExample {
          *
          * @mbg.generated Sun Aug 22 13:51:10 CST 2021
          */
-        void example(com.book.dao.cpsshard.pojo.example.RechargeExample example);
+        void example(RechargeExample example);
     }
 }

book-dao/src/main/resources/mapper/cpsshard/RechargeMapper.xml → book-dao/src/main/resources/mapper/cps/RechargeMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.book.dao.cpsshard.mapper.RechargeMapper">
-  <resultMap id="BaseResultMap" type="com.book.dao.cpsshard.entity.Recharge">
+<mapper namespace="com.book.dao.cps.mapper.RechargeMapper">
+  <resultMap id="BaseResultMap" type="com.book.dao.cps.pojo.Recharge">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -99,7 +99,7 @@
     id, user_id, type, kandian, free_kandian, remain_free_kandian, free_endtime, day, 
     hour, book_id, createtime, updatetime, notes, edit_type
   </sql>
-  <select id="selectByExample" parameterType="com.book.dao.cpsshard.pojo.example.RechargeExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="com.book.dao.cps.pojo.example.RechargeExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -202,7 +202,7 @@
     delete from recharge
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.book.dao.cpsshard.pojo.example.RechargeExample">
+  <delete id="deleteByExample" parameterType="com.book.dao.cps.pojo.example.RechargeExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -213,7 +213,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.book.dao.cpsshard.entity.Recharge">
+  <insert id="insert" parameterType="com.book.dao.cps.pojo.Recharge">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -346,7 +346,7 @@
       </otherwise>
     </choose>
   </insert>
-  <select id="countByExample" parameterType="com.book.dao.cpsshard.pojo.example.RechargeExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="com.book.dao.cps.pojo.example.RechargeExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -507,7 +507,7 @@
     </choose>
     where id = #{record.id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.book.dao.cpsshard.entity.Recharge">
+  <update id="updateByPrimaryKey" parameterType="com.book.dao.cps.pojo.Recharge">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -529,7 +529,7 @@
       edit_type = #{editType,jdbcType=CHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <select id="selectOneByExample" parameterType="com.book.dao.cpsshard.pojo.example.RechargeExample" resultMap="BaseResultMap">
+  <select id="selectOneByExample" parameterType="com.book.dao.cps.pojo.example.RechargeExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -821,7 +821,7 @@
       </otherwise>
     </choose>
   </insert>
-  <insert id="upsert" parameterType="com.book.dao.cpsshard.entity.Recharge">
+  <insert id="upsert" parameterType="com.book.dao.cps.pojo.Recharge">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.

book-server/src/main/java/com/book/server/service/impl/BookServiceImpl.java

@@ -6,14 +6,13 @@ import com.book.dao.cps.entity.UploadBook;
 import com.book.dao.cps.mapper.*;
 import com.book.dao.cps.pojo.*;
 import com.book.dao.cpsshard.entity.Consume;
-import com.book.dao.cpsshard.entity.Recharge;
+import com.book.dao.cps.pojo.Recharge;
 import com.book.dao.cpsshard.entity.UserRecentlyRead;
 import com.book.dao.cpsshard.mapper.ConsumeMapper;
-import com.book.dao.cpsshard.mapper.RechargeMapper;
-import com.book.dao.cpsshard.mapper.UserRecentlyRead2Mapper;
+import com.book.dao.cps.mapper.RechargeMapper;
 import com.book.dao.cpsshard.mapper.UserRecentlyReadMapper;
 import com.book.dao.cpsshard.pojo.example.ConsumeExample;
-import com.book.dao.cpsshard.pojo.example.RechargeExample;
+import com.book.dao.cps.pojo.example.RechargeExample;
 import com.book.dao.cpsshard.pojo.example.UserRecentlyReadExample;
 import com.book.server.common.entity.Result;
 import com.book.server.common.entity.ResultCode;
@@ -23,7 +22,6 @@ import com.book.server.common.util.JsonUtils;
 import com.book.dao.cps.pojo.example.*;
 import com.book.dao.VO.*;
 import com.book.server.config.Const;
-import com.book.server.myevent.TestEvent;
 import com.book.server.myevent.UserRecentReadEvent;
 import com.book.server.service.BookService;
 import com.book.server.service.CacheService;