将 content-service 的 hb 模块移到 chat 模块

content/content-service/src/main/java/cn/reghao/tnb/content/app/hb/controller/HongbaoController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/controller/HongbaoController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.hb.controller;
+package cn.reghao.tnb.content.app.chat.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
-import cn.reghao.tnb.content.app.hb.model.dto.HongbaoDto;
-import cn.reghao.tnb.content.app.hb.service.HongbaoService;
+import cn.reghao.tnb.content.app.chat.model.dto.HongbaoDto;
+import cn.reghao.tnb.content.app.chat.service.HongbaoService;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

content/content-service/src/main/java/cn/reghao/tnb/content/app/hb/db/mapper/HongbaoMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/HongbaoMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.hb.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.hb.model.po.Hongbao;
+import cn.reghao.tnb.content.app.chat.model.po.Hongbao;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/hb/db/mapper/HongbaoReceiverMapper.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/db/mapper/HongbaoReceiverMapper.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.hb.db.mapper;
+package cn.reghao.tnb.content.app.chat.db.mapper;
 
 import cn.reghao.jutil.jdk.db.BaseMapper;
-import cn.reghao.tnb.content.app.hb.model.po.HongbaoReceiver;
+import cn.reghao.tnb.content.app.chat.model.po.HongbaoReceiver;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

content/content-service/src/main/java/cn/reghao/tnb/content/app/hb/model/constant/ReceiverType.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/constant/ReceiverType.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.hb.model.constant;
+package cn.reghao.tnb.content.app.chat.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

content/content-service/src/main/java/cn/reghao/tnb/content/app/hb/model/dto/HongbaoDto.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/dto/HongbaoDto.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.hb.model.dto;
+package cn.reghao.tnb.content.app.chat.model.dto;
 
 import cn.reghao.jutil.validator.ValidEnum;
-import cn.reghao.tnb.content.app.hb.model.constant.ReceiverType;
+import cn.reghao.tnb.content.app.chat.model.constant.ReceiverType;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/hb/model/po/Hongbao.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/Hongbao.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.hb.model.po;
+package cn.reghao.tnb.content.app.chat.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.hb.model.dto.HongbaoDto;
+import cn.reghao.tnb.content.app.chat.model.dto.HongbaoDto;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/hb/model/po/HongbaoReceiver.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/model/po/HongbaoReceiver.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.hb.model.po;
+package cn.reghao.tnb.content.app.chat.model.po;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.common.auth.UserContext;

content/content-service/src/main/java/cn/reghao/tnb/content/app/hb/service/HongbaoService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/chat/service/HongbaoService.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.content.app.hb.service;
+package cn.reghao.tnb.content.app.chat.service;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.tool.id.SnowFlake;
-import cn.reghao.tnb.content.app.hb.db.mapper.HongbaoMapper;
-import cn.reghao.tnb.content.app.hb.db.mapper.HongbaoReceiverMapper;
-import cn.reghao.tnb.content.app.hb.model.dto.HongbaoDto;
-import cn.reghao.tnb.content.app.hb.model.po.Hongbao;
-import cn.reghao.tnb.content.app.hb.model.po.HongbaoReceiver;
+import cn.reghao.tnb.content.app.chat.db.mapper.HongbaoMapper;
+import cn.reghao.tnb.content.app.chat.db.mapper.HongbaoReceiverMapper;
+import cn.reghao.tnb.content.app.chat.model.dto.HongbaoDto;
+import cn.reghao.tnb.content.app.chat.model.po.Hongbao;
+import cn.reghao.tnb.content.app.chat.model.po.HongbaoReceiver;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/config/mybatis/SqlSessionConfig.java

@@ -25,7 +25,6 @@ import java.util.Map;
         "cn.reghao.tnb.content.app.chat.db.mapper",
         "cn.reghao.tnb.content.app.exam.db.mapper",
         "cn.reghao.tnb.content.app.mall.db.mapper",
-        "cn.reghao.tnb.content.app.hb.db.mapper",
         "cn.reghao.tnb.content.app.geo.db.mapper"
 },
         sqlSessionFactoryRef = "sqlSessionFactory")

content/content-service/src/main/resources/application-dev.yml

@@ -1,33 +1,30 @@
-log:
-  wsUrl: ws://127.0.0.1:4030/ws/log/push
-  token: 012345678
 dubbo:
   registry:
-    address: zookeeper://localhost:2181
+    address: zookeeper://192.168.0.210:2181
 spring:
   cloud:
     discovery:
       enabled: true
     zookeeper:
-      connect-string: localhost:2181
+      connect-string: 192.168.0.210:2181
   data:
     mongodb:
-      host: 127.0.0.1
-      database: "tnb_content_rdb"
+      host: 192.168.0.210
+      database: "tnb_content_tdb"
       authentication-database: admin
-      username: dev
-      password: Dev@123456
+      username: test
+      password: Test@123456
   redis:
     database: 0
-    host: localhost
+    host: 192.168.0.210
     port: 6379
-    password: Dev@123456
+    password: Test@123456
   rabbitmq:
-    host: 127.0.0.1
+    host: 192.168.0.210
     port: 5672
     virtual-host: /
-    username: dev
-    password: Dev@123456
+    username: test
+    password: Test@123456
   shardingsphere:
     datasource:
       names: master,slave
@@ -38,12 +35,12 @@ spring:
       master:
         type: com.zaxxer.hikari.HikariDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbcUrl: jdbc:mysql://127.0.0.1/tnb_content_rdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
-        username: dev
-        password: Dev@123456
+        jdbcUrl: jdbc:mysql://192.168.0.210/tnb_content_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
+        username: test
+        password: Test@123456
       slave:
         type: com.zaxxer.hikari.HikariDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbcUrl: jdbc:mysql://127.0.0.1/tnb_content_rdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
-        username: dev
-        password: Dev@123456
+        jdbcUrl: jdbc:mysql://192.168.0.210/tnb_content_tdb?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8
+        username: test
+        password: Test@123456

content/content-service/src/main/resources/mapper/hb/HongbaoMapper.xml → content/content-service/src/main/resources/mapper/chat/HongbaoMapper.xml

@@ -1,23 +1,23 @@
 <?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="cn.reghao.tnb.content.app.hb.db.mapper.HongbaoMapper">
+<mapper namespace="cn.reghao.tnb.content.app.chat.db.mapper.HongbaoMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into hongbao
+        insert into chat_hongbao
         (`hongbao_id`,`receiver_type`,`receiver_id`,`amount`,`num`,`remain`,`remark`,`create_by`,`create_at`)
         values
         (#{hongbaoId},#{receiverType},#{receiverId},#{amount},#{num},#{remain},#{remark},#{createBy},#{createAt})
     </insert>
 
     <update id="updateHongbaoRemainDecr">
-        update hongbao
+        update chat_hongbao
         set remain=if(remain &lt; 1, 0, remain-1)
         where hongbao_id=#{hongbaoId}
     </update>
     
-    <select id="findHongbaoById" resultType="cn.reghao.tnb.content.app.hb.model.po.Hongbao">
+    <select id="findHongbaoById" resultType="cn.reghao.tnb.content.app.chat.model.po.Hongbao">
         select *
-        from hongbao
+        from chat_hongbao
         where hongbao_id=#{hongbaoId}
     </select>
 </mapper>

content/content-service/src/main/resources/mapper/hb/HongbaoReceiverMapper.xml → content/content-service/src/main/resources/mapper/chat/HongbaoReceiverMapper.xml

@@ -1,22 +1,22 @@
 <?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="cn.reghao.tnb.content.app.hb.db.mapper.HongbaoReceiverMapper">
+<mapper namespace="cn.reghao.tnb.content.app.chat.db.mapper.HongbaoReceiverMapper">
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
-        insert into hongbao_receiver
+        insert into chat_hongbao_receiver
         (`hongbao_id`,`receiver_id`,`amount`,`remark`,`create_at`)
         values
         (#{hongbaoId},#{receiverId},#{amount},#{remark},#{createAt})
     </insert>
 
-    <select id="findById" resultType="cn.reghao.tnb.content.app.hb.model.po.HongbaoReceiver">
+    <select id="findById" resultType="cn.reghao.tnb.content.app.chat.model.po.HongbaoReceiver">
         select *
-        from hongbao_receiver
+        from chat_hongbao_receiver
         where hongbao_id=#{hongbaoId} and reciever_id=#{receiverId}
     </select>
-    <select id="findByHongbaoId" resultType="cn.reghao.tnb.content.app.hb.model.po.HongbaoReceiver">
+    <select id="findByHongbaoId" resultType="cn.reghao.tnb.content.app.chat.model.po.HongbaoReceiver">
         select *
-        from hongbao_receiver
+        from chat_hongbao_receiver
         where hongbao_id=#{hongbaoId}
     </select>
 </mapper>