Jelajahi Sumber

通用service整合到common包

xueyiming 6 bulan lalu
induk
melakukan
0c867aade2
100 mengubah file dengan 529 tambahan dan 400 penghapusan
  1. 1 1
      api-module/src/main/java/com/tzld/piaoquan/api/GrowthServerApplication.java
  2. 1 1
      api-module/src/main/java/com/tzld/piaoquan/api/common/enums/ReplyStrategyServiceEnum.java
  3. 1 1
      api-module/src/main/java/com/tzld/piaoquan/api/component/TouLiuHttpClient.java
  4. 1 1
      api-module/src/main/java/com/tzld/piaoquan/api/config/DataSourceConfig.java
  5. 2 2
      api-module/src/main/java/com/tzld/piaoquan/api/controller/AccountDetailController.java
  6. 3 3
      api-module/src/main/java/com/tzld/piaoquan/api/controller/MessageController.java
  7. 8 8
      api-module/src/main/java/com/tzld/piaoquan/api/controller/TencentWeComController.java
  8. 4 4
      api-module/src/main/java/com/tzld/piaoquan/api/controller/ThirdPartyController.java
  9. 1 1
      api-module/src/main/java/com/tzld/piaoquan/api/controller/WeComController.java
  10. 0 39
      api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/UserMapper.java
  11. 1 1
      api-module/src/main/java/com/tzld/piaoquan/api/model/po/GhDetailExample.java
  12. 5 5
      api-module/src/main/java/com/tzld/piaoquan/api/mq/MessageCallbackProducer.java
  13. 2 4
      api-module/src/main/java/com/tzld/piaoquan/api/service/GhAccessTokenService.java
  14. 2 2
      api-module/src/main/java/com/tzld/piaoquan/api/service/GhDetailService.java
  15. 0 15
      api-module/src/main/java/com/tzld/piaoquan/api/service/MessageAttachmentService.java
  16. 1 1
      api-module/src/main/java/com/tzld/piaoquan/api/service/ThirdPartyService.java
  17. 0 16
      api-module/src/main/java/com/tzld/piaoquan/api/service/UserService.java
  18. 1 1
      api-module/src/main/java/com/tzld/piaoquan/api/service/WeComService.java
  19. 4 56
      api-module/src/main/java/com/tzld/piaoquan/api/service/impl/GhAccessTokenServiceImpl.java
  20. 3 3
      api-module/src/main/java/com/tzld/piaoquan/api/service/impl/GhDetailServiceImpl.java
  21. 13 13
      api-module/src/main/java/com/tzld/piaoquan/api/service/impl/ThirdPartyServiceImpl.java
  22. 2 2
      api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComServiceImpl.java
  23. 4 4
      api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/ThirdPartyPushMessageStrategyV1.java
  24. 2 2
      api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/WeComPushMessageStrategyV1.java
  25. 1 1
      api-module/src/main/resources/mybatis-generator-config.xml
  26. 4 4
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/base/CommonResponse.java
  27. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/MessageConstant.java
  28. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/OtherServerURL.java
  29. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/RedisConstant.java
  30. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/ResponseConstant.java
  31. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/TimeConstant.java
  32. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/WeComConstant.java
  33. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/WeComServerConstant.java
  34. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/CorpEnum.java
  35. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/ExceptionCodeEnum.java
  36. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/MessageAttachmentTypeEnum.java
  37. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/SourceEnum.java
  38. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/TimeEnum.java
  39. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/common/exception/CustomizeException.java
  40. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/component/HttpPoolClient.java
  41. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/component/ODPSManager.java
  42. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/config/HttpClientConfig.java
  43. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/config/RedisConfig.java
  44. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/config/XxlJobConfig.java
  45. 5 5
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/CorpMapper.java
  46. 5 5
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/GuaranteesVideoMapper.java
  47. 8 5
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/HistoryMessageBackupMapper.java
  48. 8 6
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/HistoryMessageMapper.java
  49. 5 5
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/MessageAttachmentMapper.java
  50. 8 6
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/SendMessageMapper.java
  51. 5 5
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/StaffMapper.java
  52. 5 5
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/StaffWithUserMapper.java
  53. 39 0
      common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/WeComUserMapper.java
  54. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/AdPutFlowParam.java
  55. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/ExternalUser.java
  56. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/MiniprogramRecord.java
  57. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/PushMessage.java
  58. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/SendDetail.java
  59. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/VideoCombination.java
  60. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/VideoDetail.java
  61. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/VideoParam.java
  62. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/XxlJobParam.java
  63. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/AlertMessage.java
  64. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/AlertMessageExample.java
  65. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/Corp.java
  66. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/CorpExample.java
  67. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/GuaranteesVideo.java
  68. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/GuaranteesVideoExample.java
  69. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/HistoryMessage.java
  70. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/HistoryMessageExample.java
  71. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/MessageAttachment.java
  72. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/MessageAttachmentExample.java
  73. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/SendMessage.java
  74. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/SendMessageExample.java
  75. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/Staff.java
  76. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/StaffExample.java
  77. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/StaffWithUser.java
  78. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/StaffWithUserExample.java
  79. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/WeComUser.java
  80. 4 4
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/WeComUserExample.java
  81. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/model/vo/GuaranteedParam.java
  82. 10 0
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/HistoryMessageService.java
  83. 7 7
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/HistoryMessageServiceImpl.java
  84. 189 20
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/MessageAttachmentServiceImpl.java
  85. 11 11
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/MessageServiceImpl.java
  86. 12 12
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/WeComAccessTokenServiceImpl.java
  87. 42 42
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/WeComUserServiceImpl.java
  88. 21 0
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/MessageAttachmentService.java
  89. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/MessageService.java
  90. 7 0
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/WeComAccessTokenService.java
  91. 3 3
      common-module/src/main/java/com/tzld/piaoquan/growth/common/service/WeComUserService.java
  92. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/DateUtil.java
  93. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/HttpClientUtil.java
  94. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/HttpPoolClientUtil.java
  95. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/LarkRobotUtil.java
  96. 2 2
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/MessageUtil.java
  97. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/OdpsUtil.java
  98. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/TimeUtil.java
  99. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/ToolUtils.java
  100. 1 1
      common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/URLUtil.java

+ 1 - 1
api-module/src/main/java/com/tzld/piaoquan/api/GrowthServerApplication.java

@@ -7,7 +7,7 @@ import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 @ComponentScan({
-        "com.tzld.piaoquan.common.*",
+        "com.tzld.piaoquan.growth.common.*",
         "com.tzld.piaoquan.offline.*",
         "com.tzld.piaoquan.api.*"
 })

+ 1 - 1
api-module/src/main/java/com/tzld/piaoquan/api/common/enums/ReplyStrategyServiceEnum.java

@@ -3,7 +3,7 @@ package com.tzld.piaoquan.api.common.enums;
 public enum ReplyStrategyServiceEnum {
 
 
-    PUSH_MESSAGE_STRATEGY_V1("PUSH_MESSAGE_STRATEGY_V1", "第三方微信公众号推送策略V1"),
+    THIRD_PARTY_PUSH_MESSAGE_STRATEGY_V1("THIRD_PARTY_PUSH_MESSAGE_STRATEGY_V1", "第三方微信公众号推送策略V1"),
     WE_COM_PUSH_MESSAGE_STRATEGY_V1("WE_COM_PUSH_MESSAGE_STRATEGY_V1", "企业微信推送策略V1"),
     ;
 

+ 1 - 1
api-module/src/main/java/com/tzld/piaoquan/api/component/TouLiuHttpClient.java

@@ -2,7 +2,7 @@ package com.tzld.piaoquan.api.component;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.common.component.HttpPoolClient;
+import com.tzld.piaoquan.growth.common.component.HttpPoolClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

+ 1 - 1
api-module/src/main/java/com/tzld/piaoquan/api/config/DataSourceConfig.java

@@ -18,7 +18,7 @@ import javax.sql.DataSource;
 
 @Configuration
 @MapperScan(basePackages = "com.tzld.piaoquan.api.dao.mapper", sqlSessionFactoryRef = "growthSqlSessionFactory")
-@MapperScan(basePackages = "com.tzld.piaoquan.offline.dao.mapper", sqlSessionFactoryRef = "growthSqlSessionFactory")
+@MapperScan(basePackages = "com.tzld.piaoquan.growth.common.dao.mapper", sqlSessionFactoryRef = "growthSqlSessionFactory")
 public class DataSourceConfig {
     static final String MAPPER_LOCATION_MASTER = "classpath*:mapper/**/*.xml";
 

+ 2 - 2
api-module/src/main/java/com/tzld/piaoquan/api/controller/AccountDetailController.java

@@ -6,8 +6,8 @@ import com.tzld.piaoquan.api.model.vo.GhDetailVo;
 import com.tzld.piaoquan.api.model.vo.GhTypeVo;
 import com.tzld.piaoquan.api.model.vo.StrategyStatusVo;
 import com.tzld.piaoquan.api.service.GhDetailService;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

+ 3 - 3
api-module/src/main/java/com/tzld/piaoquan/api/controller/MessageController.java

@@ -1,9 +1,9 @@
 package com.tzld.piaoquan.api.controller;
 
 
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.model.vo.GuaranteedParam;
-import com.tzld.piaoquan.api.service.MessageAttachmentService;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.model.vo.GuaranteedParam;
+import com.tzld.piaoquan.growth.common.service.MessageAttachmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 8 - 8
api-module/src/main/java/com/tzld/piaoquan/api/controller/TencentWeComController.java

@@ -1,10 +1,10 @@
 package com.tzld.piaoquan.api.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.common.common.constant.WeComServerConstant;
-import com.tzld.piaoquan.api.service.UserService;
-import com.tzld.piaoquan.common.utils.wecom.WXBizMsgCrypt;
-import com.tzld.piaoquan.common.utils.wecom.WxUtil;
+import com.tzld.piaoquan.growth.common.common.constant.WeComServerConstant;
+import com.tzld.piaoquan.growth.common.service.WeComUserService;
+import com.tzld.piaoquan.growth.common.utils.wecom.WXBizMsgCrypt;
+import com.tzld.piaoquan.growth.common.utils.wecom.WxUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +21,7 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import static com.tzld.piaoquan.common.common.enums.CorpEnum.HNWQ;
+import static com.tzld.piaoquan.growth.common.common.enums.CorpEnum.HNWQ;
 
 @Slf4j
 @RestController
@@ -30,7 +30,7 @@ public class TencentWeComController {
 
 
     @Autowired
-    private UserService userService;
+    private WeComUserService weComUserService;
 
     @GetMapping("/verify")
     public void verifyGet(HttpServletRequest request, HttpServletResponse response) {
@@ -105,14 +105,14 @@ public class TencentWeComController {
                     String userId = (String) suiteMap.get("UserID");
                     String externalUserId = (String) suiteMap.get("ExternalUserID");
                     log.info("addStaffWithUser userId={} externalUserId={}", userId, externalUserId);
-                    userService.addStaffWithUser(externalUserId, userId, HNWQ.getId());
+                    weComUserService.addStaffWithUser(externalUserId, userId, HNWQ.getId());
                 }
 
                 if (StringUtils.isNotEmpty(changeType) && changeType.equals("del_follow_user")) {
                     String userId = (String) suiteMap.get("UserID");
                     String externalUserId = (String) suiteMap.get("ExternalUserID");
                     log.info("delStaffWithUser userId={} externalUserId={}", userId, externalUserId);
-                    userService.delStaffWithUser(externalUserId, userId, System.currentTimeMillis());
+                    weComUserService.delStaffWithUser(externalUserId, userId, System.currentTimeMillis());
                 }
             }
         } catch (Exception e) {

+ 4 - 4
api-module/src/main/java/com/tzld/piaoquan/api/controller/ThirdPartyController.java

@@ -3,9 +3,9 @@ package com.tzld.piaoquan.api.controller;
 
 import com.tzld.piaoquan.api.model.vo.*;
 import com.tzld.piaoquan.api.mq.MessageCallbackProducer;
-import com.tzld.piaoquan.api.service.AccessTokenService;
+import com.tzld.piaoquan.api.service.GhAccessTokenService;
 import com.tzld.piaoquan.api.service.ThirdPartyService;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,7 +16,7 @@ import java.util.List;
 public class ThirdPartyController {
 
     @Autowired
-    private AccessTokenService accessTokenService;
+    private GhAccessTokenService ghAccessTokenService;
 
     @Autowired
     private ThirdPartyService thirdPartyService;
@@ -26,7 +26,7 @@ public class ThirdPartyController {
 
     @PostMapping("/accessToken/get")
     public CommonResponse<AccessTokenVo> getAccessToken(@RequestBody AccessTokenParam param) {
-        return accessTokenService.getAccessToken(param);
+        return ghAccessTokenService.getAccessToken(param);
     }
 
     @PostMapping("/pushMessage/get")

+ 1 - 1
api-module/src/main/java/com/tzld/piaoquan/api/controller/WeComController.java

@@ -3,7 +3,7 @@ package com.tzld.piaoquan.api.controller;
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageParam;
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageVo;
 import com.tzld.piaoquan.api.service.WeComService;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

+ 0 - 39
api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/UserMapper.java

@@ -1,39 +0,0 @@
-package com.tzld.piaoquan.api.dao.mapper;
-
-import com.tzld.piaoquan.common.model.po.User;
-import com.tzld.piaoquan.common.model.po.UserExample;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Mapper
-@Repository
-public interface UserMapper {
-    long countByExample(UserExample example);
-
-    int deleteByExample(UserExample example);
-
-    int deleteByPrimaryKey(Long id);
-
-    int insert(User record);
-
-    int insertSelective(User record);
-
-    List<User> selectByExample(UserExample example);
-
-    User selectByPrimaryKey(Long id);
-
-    int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
-
-    int updateByExample(@Param("record") User record, @Param("example") UserExample example);
-
-    int updateByPrimaryKeySelective(User record);
-
-    int updateByPrimaryKey(User record);
-
-    Long selectIdByExternalUserId(String externalUserId);
-
-    void insertList(@Param("list") List<User> list);
-}

+ 1 - 1
api-module/src/main/java/com/tzld/piaoquan/api/model/po/GhDetailExample.java

@@ -1,7 +1,7 @@
 package com.tzld.piaoquan.api.model.po;
 
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 5 - 5
api-module/src/main/java/com/tzld/piaoquan/api/mq/MessageCallbackProducer.java

@@ -6,9 +6,9 @@ import com.aliyun.openservices.ons.api.SendResult;
 import com.aliyun.openservices.ons.api.bean.ProducerBean;
 
 import com.tzld.piaoquan.api.model.vo.CallbackParam;
-import com.tzld.piaoquan.api.service.AccessTokenService;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.common.enums.ExceptionCodeEnum;
+import com.tzld.piaoquan.api.service.GhAccessTokenService;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.enums.ExceptionCodeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,13 +30,13 @@ public class MessageCallbackProducer {
     private ProducerBean producer;
 
     @Autowired
-    private AccessTokenService accessTokenService;
+    private GhAccessTokenService ghAccessTokenService;
 
     public CommonResponse<Void> sendMessage(CallbackParam param) {
         if (param == null || param.getAccessToken() == null) {
             return CommonResponse.create(ExceptionCodeEnum.PARAMS_ERROR, "参数错误");
         }
-        if (!accessTokenService.validateAccessToken(param.getAccessToken())) {
+        if (!ghAccessTokenService.validateAccessToken(param.getAccessToken())) {
             return CommonResponse.create(ExceptionCodeEnum.PARAMS_ERROR, "accessToken错误或者已失效");
         }
         Message message = new Message();

+ 2 - 4
api-module/src/main/java/com/tzld/piaoquan/api/service/AccessTokenService.java → api-module/src/main/java/com/tzld/piaoquan/api/service/GhAccessTokenService.java

@@ -3,11 +3,9 @@ package com.tzld.piaoquan.api.service;
 import com.tzld.piaoquan.api.common.enums.SecretEnum;
 import com.tzld.piaoquan.api.model.vo.AccessTokenParam;
 import com.tzld.piaoquan.api.model.vo.AccessTokenVo;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 
-public interface AccessTokenService {
-
-    String getWeComAccessToken(Long corpId);
+public interface GhAccessTokenService {
 
     CommonResponse<AccessTokenVo> getAccessToken(AccessTokenParam param);
 

+ 2 - 2
api-module/src/main/java/com/tzld/piaoquan/api/service/GhDetailService.java

@@ -2,8 +2,8 @@ package com.tzld.piaoquan.api.service;
 
 
 import com.tzld.piaoquan.api.model.vo.GhDetailVo;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 public interface GhDetailService {
 

+ 0 - 15
api-module/src/main/java/com/tzld/piaoquan/api/service/MessageAttachmentService.java

@@ -1,15 +0,0 @@
-package com.tzld.piaoquan.api.service;
-
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.model.po.MessageAttachment;
-import com.tzld.piaoquan.common.model.vo.GuaranteedParam;
-
-import java.util.List;
-
-public interface MessageAttachmentService {
-
-    void addMiniProgram(List<MessageAttachment> messageAttachmentList, Long createTime);
-
-    CommonResponse<Void> createGuaranteedMiniProgram(GuaranteedParam guaranteedParam);
-
-}

+ 1 - 1
api-module/src/main/java/com/tzld/piaoquan/api/service/ThirdPartyService.java

@@ -4,7 +4,7 @@ package com.tzld.piaoquan.api.service;
 import com.tzld.piaoquan.api.model.vo.PushMessageParam;
 import com.tzld.piaoquan.api.model.vo.PushMessageVo;
 import com.tzld.piaoquan.api.model.vo.ReportUvVo;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

+ 0 - 16
api-module/src/main/java/com/tzld/piaoquan/api/service/UserService.java

@@ -1,16 +0,0 @@
-package com.tzld.piaoquan.api.service;
-
-import com.tzld.piaoquan.common.model.po.Staff;
-
-
-public interface UserService {
-
-
-    void addStaffWithUser(String externalUserId, String staffUserId, Long corpId);
-
-    void insertStaffWithUser(String externalUserId, Staff staff, Long corpId);
-
-    void delStaffWithUser(String externalUserId, String carrierId, Long deleteTime);
-
-    void delStaffWithUser(Long userId, Long staffId, Long deleteTime);
-}

+ 1 - 1
api-module/src/main/java/com/tzld/piaoquan/api/service/WeComService.java

@@ -4,7 +4,7 @@ package com.tzld.piaoquan.api.service;
 
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageParam;
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageVo;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 
 import java.util.List;
 

+ 4 - 56
api-module/src/main/java/com/tzld/piaoquan/api/service/impl/AccessTokenServiceImpl.java → api-module/src/main/java/com/tzld/piaoquan/api/service/impl/GhAccessTokenServiceImpl.java

@@ -1,82 +1,30 @@
 package com.tzld.piaoquan.api.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.tzld.piaoquan.api.common.enums.SecretEnum;
 import com.tzld.piaoquan.api.model.vo.AccessTokenParam;
 import com.tzld.piaoquan.api.model.vo.AccessTokenVo;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.common.enums.ExceptionCodeEnum;
-import com.tzld.piaoquan.common.component.HttpPoolClient;
-import com.tzld.piaoquan.api.dao.mapper.CorpMapper;
-import com.tzld.piaoquan.common.model.po.Corp;
-import com.tzld.piaoquan.common.model.po.CorpExample;
-import com.tzld.piaoquan.api.service.AccessTokenService;
-import com.tzld.piaoquan.common.utils.LarkRobotUtil;
+import com.tzld.piaoquan.api.service.GhAccessTokenService;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.enums.ExceptionCodeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import static com.tzld.piaoquan.common.common.constant.RedisConstant.WE_COM_ACCESS_TOKEN;
-import static com.tzld.piaoquan.common.common.constant.WeComConstant.GET_WE_COM_ACCESS_TOKEN_URL;
-
 @Slf4j
 @Service
-public class AccessTokenServiceImpl implements AccessTokenService {
+public class GhAccessTokenServiceImpl implements GhAccessTokenService {
 
     private static final String ACCESS_TOKEN_LIST = "access_token_list";
 
-    @Autowired
-    private HttpPoolClient httpPoolClient;
-
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
     @Autowired
     private RedisTemplate<String, String> stringRedisTemplate;
 
-    @Autowired
-    private CorpMapper corpMapper;
-
-    @Override
-    public String getWeComAccessToken(Long corpId) {
-        try {
-            String key = String.format(WE_COM_ACCESS_TOKEN, corpId);
-            String accessToken = (String) redisTemplate.opsForValue().get(key);
-            if (StringUtils.isNotEmpty(accessToken)) {
-                return accessToken;
-            }
-            CorpExample example = new CorpExample();
-            example.createCriteria().andIdEqualTo(corpId);
-            List<Corp> corps = corpMapper.selectByExample(example);
-            if (CollectionUtils.isEmpty(corps)) {
-                LarkRobotUtil.sendMessage("查询不到主体,获取access_token失败");
-                return "";
-            }
-            Corp corp = corps.get(0);
-            String cropId = corp.getCorpId();
-            String secret = corp.getSecret();
-            String res = httpPoolClient.get(String.format(GET_WE_COM_ACCESS_TOKEN_URL +
-                    "?corpid=%s&corpsecret=%s", cropId, secret));
-            JSONObject jsonObject = JSONObject.parseObject(res);
-            Long expiresIn = jsonObject.getLong("expires_in");
-            String newAccessToken = jsonObject.getString("access_token");
-            redisTemplate.opsForValue().set(key, newAccessToken, expiresIn, TimeUnit.SECONDS);
-            return newAccessToken;
-        } catch (IOException e) {
-            LarkRobotUtil.sendMessage("getWeComAccessToken error:" + e);
-            log.error("getWeComAccessToken error", e);
-        }
-        return "";
-    }
 
     @Override
     public CommonResponse<AccessTokenVo> getAccessToken(AccessTokenParam param) throws RuntimeException {

+ 3 - 3
api-module/src/main/java/com/tzld/piaoquan/api/service/impl/GhDetailServiceImpl.java

@@ -8,9 +8,9 @@ import com.tzld.piaoquan.api.model.po.GhDetail;
 import com.tzld.piaoquan.api.model.po.GhDetailExample;
 import com.tzld.piaoquan.api.model.vo.GhDetailVo;
 import com.tzld.piaoquan.api.service.GhDetailService;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.utils.DateUtil;
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.utils.DateUtil;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

+ 13 - 13
api-module/src/main/java/com/tzld/piaoquan/api/service/impl/ThirdPartyServiceImpl.java

@@ -12,15 +12,15 @@ import com.tzld.piaoquan.api.model.po.GhDetailExample;
 import com.tzld.piaoquan.api.model.vo.PushMessageParam;
 import com.tzld.piaoquan.api.model.vo.PushMessageVo;
 import com.tzld.piaoquan.api.model.vo.ReportUvVo;
-import com.tzld.piaoquan.api.service.AccessTokenService;
+import com.tzld.piaoquan.api.service.GhAccessTokenService;
 import com.tzld.piaoquan.api.service.ThirdPartyService;
 import com.tzld.piaoquan.api.service.strategy.ReplyStrategyService;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.common.constant.TimeConstant;
-import com.tzld.piaoquan.common.common.enums.ExceptionCodeEnum;
-import com.tzld.piaoquan.common.component.ODPSManager;
-import com.tzld.piaoquan.common.utils.DateUtil;
-import com.tzld.piaoquan.common.utils.LarkRobotUtil;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.constant.TimeConstant;
+import com.tzld.piaoquan.growth.common.common.enums.ExceptionCodeEnum;
+import com.tzld.piaoquan.growth.common.component.ODPSManager;
+import com.tzld.piaoquan.growth.common.utils.DateUtil;
+import com.tzld.piaoquan.growth.common.utils.LarkRobotUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -47,7 +47,7 @@ public class ThirdPartyServiceImpl implements ThirdPartyService {
     private ApplicationContext applicationContext;
 
     @Autowired
-    private AccessTokenService accessTokenService;
+    private GhAccessTokenService ghAccessTokenService;
 
     @Autowired
     private ODPSManager odpsManager;
@@ -70,10 +70,10 @@ public class ThirdPartyServiceImpl implements ThirdPartyService {
         if (param == null || StringUtils.isEmpty(param.getGhId()) || StringUtils.isEmpty(param.getAccessToken())) {
             return CommonResponse.create(ExceptionCodeEnum.PARAMS_ERROR, "参数错误");
         }
-        if (!accessTokenService.validateAccessToken(param.getAccessToken())) {
+        if (!ghAccessTokenService.validateAccessToken(param.getAccessToken())) {
             return CommonResponse.create(ExceptionCodeEnum.PARAMS_ERROR, "accessToken错误或者已失效");
         }
-        SecretEnum secretEnum = accessTokenService.getSecretEnum(param.getAccessToken());
+        SecretEnum secretEnum = ghAccessTokenService.getSecretEnum(param.getAccessToken());
         if (secretEnum == null) {
             return CommonResponse.create(ExceptionCodeEnum.PARAMS_ERROR, "获取secret失败");
         }
@@ -125,10 +125,10 @@ public class ThirdPartyServiceImpl implements ThirdPartyService {
         if (StringUtils.isEmpty(date) || !DateUtil.isValidDate(date) || StringUtils.isEmpty(accessToken)) {
             return CommonResponse.create(ExceptionCodeEnum.PARAMS_ERROR, "参数错误");
         }
-        if (!accessTokenService.validateAccessToken(accessToken)) {
+        if (!ghAccessTokenService.validateAccessToken(accessToken)) {
             return CommonResponse.create(ExceptionCodeEnum.PARAMS_ERROR, "accessToken错误或者已失效");
         }
-        SecretEnum secretEnum = accessTokenService.getSecretEnum(accessToken);
+        SecretEnum secretEnum = ghAccessTokenService.getSecretEnum(accessToken);
         if (secretEnum == null) {
             return CommonResponse.create(ExceptionCodeEnum.PARAMS_ERROR, "获取secret失败");
         }
@@ -174,7 +174,7 @@ public class ThirdPartyServiceImpl implements ThirdPartyService {
         for (Map.Entry<String, ReplyStrategyService> stringReplyStrategyServiceEntry : strategyServiceMap.entrySet()) {
             ReplyStrategyService replyStrategyService = stringReplyStrategyServiceEntry.getValue();
             // 使用策略层
-            if (replyStrategyService.support(ReplyStrategyServiceEnum.PUSH_MESSAGE_STRATEGY_V1)) {
+            if (replyStrategyService.support(ReplyStrategyServiceEnum.THIRD_PARTY_PUSH_MESSAGE_STRATEGY_V1)) {
                 BucketDataParam bucketDataParam = new BucketDataParam();
                 bucketDataParam.setGhId(param.getGhId());
                 bucketDataParam.setChannel(channel);

+ 2 - 2
api-module/src/main/java/com/tzld/piaoquan/api/service/impl/WeComServiceImpl.java

@@ -14,8 +14,8 @@ import com.tzld.piaoquan.api.model.vo.WeComPushMessageParam;
 import com.tzld.piaoquan.api.model.vo.WeComPushMessageVo;
 import com.tzld.piaoquan.api.service.WeComService;
 import com.tzld.piaoquan.api.service.strategy.ReplyStrategyService;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.common.enums.ExceptionCodeEnum;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.enums.ExceptionCodeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 4 - 4
api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/PushMessageStrategyV1.java → api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/ThirdPartyPushMessageStrategyV1.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Service
-public class PushMessageStrategyV1 implements ReplyStrategyService {
+public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
 
     /**
      * 实验分桶数量
@@ -59,7 +59,7 @@ public class PushMessageStrategyV1 implements ReplyStrategyService {
 
     @Override
     public ReplyBucketData getResult(BucketDataParam bucketDataParam) {
-        log.info("PushMessageStrategyV1 start");
+        log.info("ThirdPartyPushMessageStrategyV1 start");
         // 0 获取策略key
         JSONObject bucketStrategyConfigJsonObject = JSON.parseObject(bucketStrategyConfig);
         Set<String> keyedSet = bucketStrategyConfigJsonObject.keySet();
@@ -133,7 +133,7 @@ public class PushMessageStrategyV1 implements ReplyStrategyService {
                     .filter(x -> x.getGhId().equals(bucketDataParam.getGhId()))
                     .collect(Collectors.toList());
             if (CollectionUtils.isEmpty(collect)) {
-                log.error("PushMessageStrategyV1 insertSmallData 算法排序数据异常,data:" + JSON.toJSONString(smallDataCgiReplyList));
+                log.error("ThirdPartyPushMessageStrategyV1 insertSmallData 算法排序数据异常,data:" + JSON.toJSONString(smallDataCgiReplyList));
                 continue;
             }
             // 清上个版本的策略数据
@@ -257,6 +257,6 @@ public class PushMessageStrategyV1 implements ReplyStrategyService {
 
     @Override
     public Boolean support(ReplyStrategyServiceEnum key) {
-        return ReplyStrategyServiceEnum.PUSH_MESSAGE_STRATEGY_V1.equals(key);
+        return ReplyStrategyServiceEnum.THIRD_PARTY_PUSH_MESSAGE_STRATEGY_V1.equals(key);
     }
 }

+ 2 - 2
api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/WeComPushMessageStrategyV1.java

@@ -58,7 +58,7 @@ public class WeComPushMessageStrategyV1 implements ReplyStrategyService {
 
     @Override
     public ReplyBucketData getResult(BucketDataParam bucketDataParam) {
-        log.info("PushMessageStrategyV1 start");
+        log.info("ThirdPartyPushMessageStrategyV1 start");
         // 0 获取策略key
         JSONObject bucketStrategyConfigJsonObject = JSON.parseObject(bucketStrategyConfig);
         Set<String> keyedSet = bucketStrategyConfigJsonObject.keySet();
@@ -132,7 +132,7 @@ public class WeComPushMessageStrategyV1 implements ReplyStrategyService {
                     .filter(x -> x.getGhId().equals(bucketDataParam.getGhId()))
                     .collect(Collectors.toList());
             if (CollectionUtils.isEmpty(collect)) {
-                log.error("PushMessageStrategyV1 insertSmallData 算法排序数据异常,data:" + JSON.toJSONString(smallDataCgiReplyList));
+                log.error("ThirdPartyPushMessageStrategyV1 insertSmallData 算法排序数据异常,data:" + JSON.toJSONString(smallDataCgiReplyList));
                 continue;
             }
             // 清上个版本的策略数据

+ 1 - 1
api-module/src/main/resources/mybatis-generator-config.xml

@@ -56,7 +56,7 @@
 <!--        <table tableName="we_com_staff" domainObjectName="Staff" alias=""/>-->
 <!--        <table tableName="we_com_staff_with_user" domainObjectName="StaffWithUser" alias=""/>-->
 <!--        <table tableName="we_com_send_message" domainObjectName="SendMessage" alias=""/>-->
-<!--        <table tableName="we_com_user" domainObjectName="User" alias=""/>-->
+<!--        <table tableName="we_com_user" domainObjectName="WeComUser" alias=""/>-->
 <!--        <table tableName="we_com_corp" domainObjectName="Corp" alias=""/>-->
 
     </context>

+ 4 - 4
common-module/src/main/java/com/tzld/piaoquan/common/common/base/CommonResponse.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/base/CommonResponse.java

@@ -1,12 +1,12 @@
-package com.tzld.piaoquan.common.common.base;
+package com.tzld.piaoquan.growth.common.common.base;
 
-import com.tzld.piaoquan.common.common.enums.ExceptionCodeEnum;
+import com.tzld.piaoquan.growth.common.common.enums.ExceptionCodeEnum;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import static com.tzld.piaoquan.common.common.constant.ResponseConstant.SUCCESS_CODE;
-import static com.tzld.piaoquan.common.common.constant.ResponseConstant.SUCCESS_MSG;
+import static com.tzld.piaoquan.growth.common.common.constant.ResponseConstant.SUCCESS_CODE;
+import static com.tzld.piaoquan.growth.common.common.constant.ResponseConstant.SUCCESS_MSG;
 
 /**
  * Common Response

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/constant/MessageConstant.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/MessageConstant.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.constant;
+package com.tzld.piaoquan.growth.common.common.constant;
 
 public interface MessageConstant {
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/constant/OtherServerURL.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/OtherServerURL.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.constant;
+package com.tzld.piaoquan.growth.common.common.constant;
 
 public interface OtherServerURL {
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/constant/RedisConstant.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/RedisConstant.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.constant;
+package com.tzld.piaoquan.growth.common.common.constant;
 
 public interface RedisConstant {
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/constant/ResponseConstant.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/ResponseConstant.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.constant;
+package com.tzld.piaoquan.growth.common.common.constant;
 
 /**
  * 响应常量

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/constant/TimeConstant.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/TimeConstant.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.constant;
+package com.tzld.piaoquan.growth.common.common.constant;
 
 public interface TimeConstant {
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/constant/WeComConstant.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/WeComConstant.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.constant;
+package com.tzld.piaoquan.growth.common.common.constant;
 
 public interface WeComConstant {
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/constant/WeComServerConstant.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/WeComServerConstant.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.constant;
+package com.tzld.piaoquan.growth.common.common.constant;
 
 public interface WeComServerConstant {
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/enums/CorpEnum.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/CorpEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.enums;
+package com.tzld.piaoquan.growth.common.common.enums;
 
 import lombok.Getter;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/enums/ExceptionCodeEnum.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/ExceptionCodeEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.enums;
+package com.tzld.piaoquan.growth.common.common.enums;
 
 import lombok.Getter;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/enums/MessageAttachmentTypeEnum.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/MessageAttachmentTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.enums;
+package com.tzld.piaoquan.growth.common.common.enums;
 
 import lombok.Getter;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/enums/SourceEnum.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/SourceEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.enums;
+package com.tzld.piaoquan.growth.common.common.enums;
 
 import lombok.Getter;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/common/enums/TimeEnum.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/TimeEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.common.enums;
+package com.tzld.piaoquan.growth.common.common.enums;
 
 import lombok.Getter;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/common/exception/CustomizeException.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/common/exception/CustomizeException.java

@@ -1,7 +1,7 @@
-package com.tzld.piaoquan.common.common.exception;
+package com.tzld.piaoquan.growth.common.common.exception;
 
 
-import com.tzld.piaoquan.common.common.enums.ExceptionCodeEnum;
+import com.tzld.piaoquan.growth.common.common.enums.ExceptionCodeEnum;
 import lombok.Getter;
 import lombok.Setter;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/component/HttpPoolClient.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/component/HttpPoolClient.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.component;
+package com.tzld.piaoquan.growth.common.component;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/component/ODPSManager.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/component/ODPSManager.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.component;
+package com.tzld.piaoquan.growth.common.component;
 
 import com.aliyun.odps.Instance;
 import com.aliyun.odps.Odps;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/config/HttpClientConfig.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/config/HttpClientConfig.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.config;
+package com.tzld.piaoquan.growth.common.config;
 
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.CloseableHttpClient;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/config/RedisConfig.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.config;
+package com.tzld.piaoquan.growth.common.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/config/XxlJobConfig.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/config/XxlJobConfig.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.config;
+package com.tzld.piaoquan.growth.common.config;
 
 import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import org.springframework.beans.factory.annotation.Value;

+ 5 - 5
api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/CorpMapper.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/CorpMapper.java

@@ -1,13 +1,13 @@
-package com.tzld.piaoquan.api.dao.mapper;
-
-import com.tzld.piaoquan.common.model.po.Corp;
-import com.tzld.piaoquan.common.model.po.CorpExample;
-import java.util.List;
+package com.tzld.piaoquan.growth.common.dao.mapper;
 
+import com.tzld.piaoquan.growth.common.model.po.Corp;
+import com.tzld.piaoquan.growth.common.model.po.CorpExample;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface CorpMapper {

+ 5 - 5
api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/GuaranteesVideoMapper.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/GuaranteesVideoMapper.java

@@ -1,13 +1,13 @@
-package com.tzld.piaoquan.api.dao.mapper;
-
-import com.tzld.piaoquan.common.model.po.GuaranteesVideo;
-import com.tzld.piaoquan.common.model.po.GuaranteesVideoExample;
-import java.util.List;
+package com.tzld.piaoquan.growth.common.dao.mapper;
 
+import com.tzld.piaoquan.growth.common.model.po.GuaranteesVideo;
+import com.tzld.piaoquan.growth.common.model.po.GuaranteesVideoExample;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface GuaranteesVideoMapper {

+ 8 - 5
offline-module/src/main/java/com/tzld/piaoquan/offline/dao/mapper/OfflineHistoryMessageMapper.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/HistoryMessageBackupMapper.java

@@ -1,13 +1,16 @@
-package com.tzld.piaoquan.offline.dao.mapper;
+package com.tzld.piaoquan.growth.common.dao.mapper;
 
-import com.tzld.piaoquan.common.model.po.HistoryMessage;
-import com.tzld.piaoquan.common.model.po.HistoryMessageExample;
-import java.util.List;
+import com.tzld.piaoquan.growth.common.model.po.HistoryMessage;
+import com.tzld.piaoquan.growth.common.model.po.HistoryMessageExample;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+@Mapper
 @Repository
-public interface OfflineHistoryMessageMapper {
+public interface HistoryMessageBackupMapper {
     long countByExample(HistoryMessageExample example);
 
     int deleteByExample(HistoryMessageExample example);

+ 8 - 6
offline-module/src/main/java/com/tzld/piaoquan/offline/dao/mapper/OfflineHistoryMessageBackupMapper.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/HistoryMessageMapper.java

@@ -1,14 +1,16 @@
-package com.tzld.piaoquan.offline.dao.mapper;
-
-import com.tzld.piaoquan.common.model.po.HistoryMessage;
-import com.tzld.piaoquan.common.model.po.HistoryMessageExample;
-import java.util.List;
+package com.tzld.piaoquan.growth.common.dao.mapper;
 
+import com.tzld.piaoquan.growth.common.model.po.HistoryMessage;
+import com.tzld.piaoquan.growth.common.model.po.HistoryMessageExample;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+@Mapper
 @Repository
-public interface OfflineHistoryMessageBackupMapper {
+public interface HistoryMessageMapper {
     long countByExample(HistoryMessageExample example);
 
     int deleteByExample(HistoryMessageExample example);

+ 5 - 5
api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/MessageAttachmentMapper.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/MessageAttachmentMapper.java

@@ -1,13 +1,13 @@
-package com.tzld.piaoquan.api.dao.mapper;
-
-import com.tzld.piaoquan.common.model.po.MessageAttachment;
-import com.tzld.piaoquan.common.model.po.MessageAttachmentExample;
-import java.util.List;
+package com.tzld.piaoquan.growth.common.dao.mapper;
 
+import com.tzld.piaoquan.growth.common.model.po.MessageAttachment;
+import com.tzld.piaoquan.growth.common.model.po.MessageAttachmentExample;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface MessageAttachmentMapper {

+ 8 - 6
offline-module/src/main/java/com/tzld/piaoquan/offline/dao/mapper/OfflineSendMessageMapper.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/SendMessageMapper.java

@@ -1,15 +1,17 @@
-package com.tzld.piaoquan.offline.dao.mapper;
+package com.tzld.piaoquan.growth.common.dao.mapper;
 
-import com.tzld.piaoquan.common.model.po.SendMessage;
-import com.tzld.piaoquan.common.model.po.SendMessageExample;
+import com.tzld.piaoquan.growth.common.model.po.SendMessage;
+import com.tzld.piaoquan.growth.common.model.po.SendMessageExample;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.Date;
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
 
+@Mapper
 @Repository
-public interface OfflineSendMessageMapper {
+public interface SendMessageMapper {
     long countByExample(SendMessageExample example);
 
     int deleteByExample(SendMessageExample example);

+ 5 - 5
api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/StaffMapper.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/StaffMapper.java

@@ -1,13 +1,13 @@
-package com.tzld.piaoquan.api.dao.mapper;
-
-import com.tzld.piaoquan.common.model.po.Staff;
-import com.tzld.piaoquan.common.model.po.StaffExample;
-import java.util.List;
+package com.tzld.piaoquan.growth.common.dao.mapper;
 
+import com.tzld.piaoquan.growth.common.model.po.Staff;
+import com.tzld.piaoquan.growth.common.model.po.StaffExample;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface StaffMapper {

+ 5 - 5
api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/StaffWithUserMapper.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/StaffWithUserMapper.java

@@ -1,13 +1,13 @@
-package com.tzld.piaoquan.api.dao.mapper;
-
-import com.tzld.piaoquan.common.model.po.StaffWithUser;
-import com.tzld.piaoquan.common.model.po.StaffWithUserExample;
-import java.util.List;
+package com.tzld.piaoquan.growth.common.dao.mapper;
 
+import com.tzld.piaoquan.growth.common.model.po.StaffWithUser;
+import com.tzld.piaoquan.growth.common.model.po.StaffWithUserExample;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface StaffWithUserMapper {

+ 39 - 0
common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/WeComUserMapper.java

@@ -0,0 +1,39 @@
+package com.tzld.piaoquan.growth.common.dao.mapper;
+
+import com.tzld.piaoquan.growth.common.model.po.WeComUser;
+import com.tzld.piaoquan.growth.common.model.po.WeComUserExample;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface WeComUserMapper {
+    long countByExample(WeComUserExample example);
+
+    int deleteByExample(WeComUserExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(WeComUser record);
+
+    int insertSelective(WeComUser record);
+
+    List<WeComUser> selectByExample(WeComUserExample example);
+
+    WeComUser selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") WeComUser record, @Param("example") WeComUserExample example);
+
+    int updateByExample(@Param("record") WeComUser record, @Param("example") WeComUserExample example);
+
+    int updateByPrimaryKeySelective(WeComUser record);
+
+    int updateByPrimaryKey(WeComUser record);
+
+    Long selectIdByExternalUserId(String externalUserId);
+
+    void insertList(@Param("list") List<WeComUser> list);
+}

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/AdPutFlowParam.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/AdPutFlowParam.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/ExternalUser.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/ExternalUser.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/MiniprogramRecord.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/MiniprogramRecord.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/PushMessage.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/PushMessage.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/SendDetail.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/SendDetail.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/VideoCombination.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/VideoCombination.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 import lombok.ToString;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/VideoDetail.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/VideoDetail.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/VideoParam.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/VideoParam.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/bo/XxlJobParam.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/XxlJobParam.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.bo;
+package com.tzld.piaoquan.growth.common.model.bo;
 
 import lombok.Data;
 import lombok.ToString;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/po/AlertMessage.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/AlertMessage.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/AlertMessageExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/AlertMessageExample.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/po/Corp.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/Corp.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/CorpExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/CorpExample.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/po/GuaranteesVideo.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/GuaranteesVideo.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/GuaranteesVideoExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/GuaranteesVideoExample.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/po/HistoryMessage.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/HistoryMessage.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/HistoryMessageExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/HistoryMessageExample.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/po/MessageAttachment.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/MessageAttachment.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/MessageAttachmentExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/MessageAttachmentExample.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/po/SendMessage.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/SendMessage.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/SendMessageExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/SendMessageExample.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/po/Staff.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/Staff.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/StaffExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/StaffExample.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/model/po/StaffWithUser.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/StaffWithUser.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/StaffWithUserExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/StaffWithUserExample.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/po/User.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/WeComUser.java

@@ -1,8 +1,8 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
 import java.util.Date;
 
-public class User {
+public class WeComUser {
     private Long id;
 
     private Long corpId;

+ 4 - 4
common-module/src/main/java/com/tzld/piaoquan/common/model/po/UserExample.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/WeComUserExample.java

@@ -1,12 +1,12 @@
-package com.tzld.piaoquan.common.model.po;
+package com.tzld.piaoquan.growth.common.model.po;
 
-import com.tzld.piaoquan.common.utils.page.Page;
+import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-public class UserExample {
+public class WeComUserExample {
     protected String orderByClause;
 
     protected boolean distinct;
@@ -15,7 +15,7 @@ public class UserExample {
 
     protected Page page;
 
-    public UserExample() {
+    public WeComUserExample() {
         oredCriteria = new ArrayList<Criteria>();
     }
 

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/model/vo/GuaranteedParam.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/model/vo/GuaranteedParam.java

@@ -1,6 +1,6 @@
-package com.tzld.piaoquan.common.model.vo;
+package com.tzld.piaoquan.growth.common.model.vo;
 
-import com.tzld.piaoquan.common.model.bo.VideoParam;
+import com.tzld.piaoquan.growth.common.model.bo.VideoParam;
 import lombok.Data;
 import lombok.ToString;
 

+ 10 - 0
common-module/src/main/java/com/tzld/piaoquan/growth/common/service/HistoryMessageService.java

@@ -0,0 +1,10 @@
+package com.tzld.piaoquan.growth.common.service;
+
+import com.tzld.piaoquan.growth.common.model.po.HistoryMessage;
+
+import java.util.List;
+
+public interface HistoryMessageService {
+
+    void batchInsertHistoryMessage(List<HistoryMessage> historyMessageList);
+}

+ 7 - 7
offline-module/src/main/java/com/tzld/piaoquan/offline/service/Impl/OfflineHistoryMessageServiceImpl.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/HistoryMessageServiceImpl.java

@@ -1,9 +1,9 @@
-package com.tzld.piaoquan.offline.service.Impl;
+package com.tzld.piaoquan.growth.common.service.Impl;
 
 import com.google.common.collect.Lists;
-import com.tzld.piaoquan.common.model.po.HistoryMessage;
-import com.tzld.piaoquan.offline.dao.mapper.OfflineHistoryMessageMapper;
-import com.tzld.piaoquan.offline.service.OfflineHistoryMessageService;
+import com.tzld.piaoquan.growth.common.dao.mapper.HistoryMessageMapper;
+import com.tzld.piaoquan.growth.common.model.po.HistoryMessage;
+import com.tzld.piaoquan.growth.common.service.HistoryMessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -11,10 +11,10 @@ import org.springframework.util.CollectionUtils;
 import java.util.List;
 
 @Service
-public class OfflineHistoryMessageServiceImpl implements OfflineHistoryMessageService {
+public class HistoryMessageServiceImpl implements HistoryMessageService {
 
     @Autowired
-    private OfflineHistoryMessageMapper offlineHistoryMessageMapper;
+    private HistoryMessageMapper historyMessageMapper;
 
     @Override
     public void batchInsertHistoryMessage(List<HistoryMessage> historyMessageList) {
@@ -23,7 +23,7 @@ public class OfflineHistoryMessageServiceImpl implements OfflineHistoryMessageSe
         }
         List<List<HistoryMessage>> partition = Lists.partition(historyMessageList, 1000);
         for (List<HistoryMessage> historyMessages : partition) {
-            offlineHistoryMessageMapper.insertList(historyMessages);
+            historyMessageMapper.insertList(historyMessages);
         }
     }
 }

+ 189 - 20
api-module/src/main/java/com/tzld/piaoquan/api/service/impl/MessageAttachmentServiceImpl.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/MessageAttachmentServiceImpl.java

@@ -1,36 +1,46 @@
-package com.tzld.piaoquan.api.service.impl;
+package com.tzld.piaoquan.growth.common.service.Impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.api.dao.mapper.GuaranteesVideoMapper;
-import com.tzld.piaoquan.api.dao.mapper.MessageAttachmentMapper;
-import com.tzld.piaoquan.api.service.MessageAttachmentService;
-import com.tzld.piaoquan.common.common.base.CommonResponse;
-import com.tzld.piaoquan.common.common.enums.MessageAttachmentTypeEnum;
-import com.tzld.piaoquan.common.component.HttpPoolClient;
-import com.tzld.piaoquan.common.model.bo.VideoDetail;
-import com.tzld.piaoquan.common.model.bo.VideoParam;
-import com.tzld.piaoquan.common.model.po.GuaranteesVideo;
-import com.tzld.piaoquan.common.model.po.GuaranteesVideoExample;
-import com.tzld.piaoquan.common.model.po.MessageAttachment;
-import com.tzld.piaoquan.common.model.po.MessageAttachmentExample;
-import com.tzld.piaoquan.common.model.vo.GuaranteedParam;
-import com.tzld.piaoquan.common.utils.DateUtil;
-import com.tzld.piaoquan.common.utils.LarkRobotUtil;
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.common.enums.MessageAttachmentTypeEnum;
+import com.tzld.piaoquan.growth.common.component.HttpPoolClient;
+import com.tzld.piaoquan.growth.common.dao.mapper.GuaranteesVideoMapper;
+import com.tzld.piaoquan.growth.common.dao.mapper.MessageAttachmentMapper;
+import com.tzld.piaoquan.growth.common.model.bo.AdPutFlowParam;
+import com.tzld.piaoquan.growth.common.model.bo.VideoDetail;
+import com.tzld.piaoquan.growth.common.model.bo.VideoParam;
+import com.tzld.piaoquan.growth.common.model.po.*;
+import com.tzld.piaoquan.growth.common.model.vo.GuaranteedParam;
+import com.tzld.piaoquan.growth.common.service.WeComAccessTokenService;
+import com.tzld.piaoquan.growth.common.service.MessageAttachmentService;
+import com.tzld.piaoquan.growth.common.utils.DateUtil;
+import com.tzld.piaoquan.growth.common.utils.LarkRobotUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
-import static com.tzld.piaoquan.common.common.constant.MessageConstant.MAX_VIDEO_NUM;
-import static com.tzld.piaoquan.common.common.constant.MessageConstant.appid;
-import static com.tzld.piaoquan.common.common.constant.OtherServerURL.POST_VIDEO_DETAIL_URL;
-import static com.tzld.piaoquan.common.common.constant.TimeConstant.MILLISECOND_DAY;
+import static com.tzld.piaoquan.growth.common.common.constant.MessageConstant.MAX_VIDEO_NUM;
+import static com.tzld.piaoquan.growth.common.common.constant.MessageConstant.appid;
+import static com.tzld.piaoquan.growth.common.common.constant.OtherServerURL.POST_ADD_TENCENT;
+import static com.tzld.piaoquan.growth.common.common.constant.OtherServerURL.POST_VIDEO_DETAIL_URL;
+import static com.tzld.piaoquan.growth.common.common.constant.TimeConstant.MILLISECOND_DAY;
+import static com.tzld.piaoquan.growth.common.common.constant.WeComConstant.POST_WE_COM_MEDIA_UPLOAD;
 
 
 @Slf4j
@@ -40,9 +50,15 @@ public class MessageAttachmentServiceImpl implements MessageAttachmentService {
     @Autowired
     private HttpPoolClient httpPoolClient;
 
+    @Autowired
+    private WeComAccessTokenService weComAccessTokenService;
+
     @Autowired
     private MessageAttachmentMapper messageAttachmentMapper;
 
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
     @Autowired
     private GuaranteesVideoMapper guaranteesVideoMapper;
 
@@ -196,6 +212,28 @@ public class MessageAttachmentServiceImpl implements MessageAttachmentService {
         guaranteesVideoMapper.insertSelective(guaranteesVideo);
     }
 
+    @Override
+    public GuaranteedParam getGuaranteedVideo(String date) {
+        GuaranteesVideoExample example = new GuaranteesVideoExample();
+        example.createCriteria().andDateEqualTo(date).andIsDeleteEqualTo(0);
+        List<GuaranteesVideo> guaranteesVideos = guaranteesVideoMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(guaranteesVideos)) {
+            LarkRobotUtil.sendMessage("获保底视频空,@薛一鸣");
+            return null;
+        }
+        GuaranteedParam guaranteedParam = new GuaranteedParam();
+        guaranteedParam.setDate(date);
+        List<VideoParam> videoParams = new ArrayList<>();
+        for (GuaranteesVideo guaranteesVideo : guaranteesVideos) {
+            VideoParam videoParam = new VideoParam();
+            videoParam.setStaffId(guaranteesVideo.getStaffId());
+            List<Long> videoIds = JSONArray.parseArray(guaranteesVideo.getVideoIds(), Long.class);
+            videoParam.setVideoIds(videoIds);
+            videoParams.add(videoParam);
+        }
+        guaranteedParam.setVideoParamList(videoParams);
+        return guaranteedParam;
+    }
 
     public Map<Long, VideoDetail> getVideoDetail(Set<Long> videoIdList) {
         try {
@@ -222,5 +260,136 @@ public class MessageAttachmentServiceImpl implements MessageAttachmentService {
         return new HashMap<>();
     }
 
+    @Override
+    public String getPicMediaId(String cover, Long corpId) {
+        String mediaId = (String) redisTemplate.opsForValue().get(cover);
+        if (StringUtils.isNotEmpty(mediaId)) {
+            return mediaId;
+        }
+        String filePath = UUID.randomUUID() + ".jpg"; // 临时文件路径
+        try {
+            HttpURLConnection httpUrl = (HttpURLConnection) new URL(cover).openConnection();
+            httpUrl.connect();
+            InputStream inputStream = httpUrl.getInputStream();
+
+            // 将文件内容写入临时文件
+            try (OutputStream outputStream = Files.newOutputStream(Paths.get(filePath))) {
+                byte[] buffer = new byte[4096];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
+            }
+            inputStream.close();
+            httpUrl.disconnect();
+            File file = new File(filePath);
+            String weComAccessToken = weComAccessTokenService.getWeComAccessToken(corpId);
+            String url = String.format(POST_WE_COM_MEDIA_UPLOAD + "?access_token=%s&type=%s", weComAccessToken, "image");
+            String res = httpPoolClient.post(url, file);
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            if (jsonObject != null && jsonObject.getInteger("errcode") == 0) {
+                mediaId = jsonObject.getString("media_id");
+                redisTemplate.opsForValue().set(cover, mediaId, 2, TimeUnit.DAYS);
+            }
+            Files.delete(Paths.get(filePath));
+        } catch (Exception e) {
+            log.error("getPicMediaId error", e);
+        }
+        return mediaId;
+    }
+
 
+    @Override
+    public String getPage(Staff staff, Long videoId) {
+        try {
+            if (staff == null || staff.getCarrierId() == null) {
+                return "";
+            }
+            String page = selectPage(videoId, staff.getCarrierId(), "企微", "日常推送");
+            if (StringUtils.isNotEmpty(page)) {
+                return page;
+            }
+            return insertPage(staff.getCarrierId(), videoId, staff.getRemark());
+        } catch (IOException e) {
+            log.error("MessageAttachmentService getPage error", e);
+        }
+        return null;
+    }
+
+    private String insertPage(String carrierId, Long videoId, String remark) throws IOException {
+        AdPutFlowParam param = new AdPutFlowParam();
+        param.setChannel("tencentqw");
+        param.setPath("pages/category.html");
+        param.setPutCarrierId(carrierId);
+        param.setPutScene("touliu");
+        param.setPutStartDate(DateUtil.getDayDateString("yyyy-MM-dd"));
+        param.setPutTypeOne("企微");
+        param.setPutTypeTwo("日常推送");
+        param.setPutTypeThree("位置X");
+        param.setRemark(remark);
+        param.setVideoId(videoId);
+        Map<String, String> requestParam = new HashMap<>();
+        String jumpPage = "pages/user-videos?id=${videoId}&fromGzh=1&rootShareId=${uuid}&shareId=${uuid}&rootSourceId=[rootSourceId]"
+                .replace("${videoId}", "" + videoId)
+                .replace("${uuid}", "" + UUID.randomUUID());
+        requestParam.put("jumpPage", jumpPage);
+        param.setRequestParam(requestParam);
+        String res = httpPoolClient.post(POST_ADD_TENCENT, JSONObject.toJSONString(param));
+        JSONObject jsonObject = JSONObject.parseObject(res);
+        JSONObject data = jsonObject.getJSONObject("data");
+        return data.getString("url");
+    }
+
+    public String selectPage(Long videoId, String carrierId, String typeOne, String typeTwo) {
+        int totalPage = 1;
+        for (int n = 1; n <= totalPage; n++) {
+            String url = getUrl(videoId, n);
+            try {
+                String res = httpPoolClient.get(url);
+                JSONObject jsonObject = JSONObject.parseObject(res);
+                JSONObject data = jsonObject.getJSONObject("data");
+                if (data == null) {
+                    continue;
+                }
+                if (data.getInteger("totalPage") != null) {
+                    totalPage = data.getInteger("totalPage");
+                }
+                JSONArray objs = data.getJSONArray("objs");
+                for (int i = 0; i < objs.size(); i++) {
+                    JSONObject obj = objs.getJSONObject(i);
+                    String putCarrierId = obj.getString("putCarrierId");
+                    String page = obj.getString("url");
+                    String putTypeOne = obj.getString("putTypeOne");
+                    String putTypeTwo = obj.getString("putTypeTwo");
+
+                    if (StringUtils.isEmpty(putCarrierId) || StringUtils.isEmpty(page) || StringUtils.isEmpty(putTypeOne) || StringUtils.isEmpty(putTypeTwo)) {
+                        continue;
+                    }
+
+                    if (putCarrierId.equals(carrierId) && putTypeOne.equals(typeOne) && putTypeTwo.equals(typeTwo)) {
+                        return page;
+                    }
+                }
+            } catch (IOException e) {
+                log.error("Error fetching data from API for videoId: " + videoId + ", page: " + n, e);
+            }
+        }
+        return null;
+    }
+
+    private static String getUrl(Long videoId, int n) {
+        String baseUrl = "https://api.piaoquantv.com/ad/put/flow/list/tencent";
+        String putScene = "touliu";
+        String channel = "tencentqw";
+        int pageSize = 20;
+        return String.format(
+                "%s?videoId=%d&putScene=%s&channel=%s&currentPage=%d&pageSize=%d",
+                baseUrl,
+                videoId,
+                putScene,
+                channel,
+                n,
+                pageSize
+        );
+    }
 }

+ 11 - 11
offline-module/src/main/java/com/tzld/piaoquan/offline/service/Impl/OfflineMessageServiceImpl.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/MessageServiceImpl.java

@@ -1,35 +1,35 @@
-package com.tzld.piaoquan.offline.service.Impl;
+package com.tzld.piaoquan.growth.common.service.Impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.common.common.constant.MessageConstant;
-import com.tzld.piaoquan.common.component.HttpPoolClient;
-import com.tzld.piaoquan.offline.service.OfflineAccessTokenService;
-import com.tzld.piaoquan.offline.service.OfflineMessageService;
-import com.tzld.piaoquan.common.utils.DateUtil;
-import com.tzld.piaoquan.common.utils.LarkRobotUtil;
+import com.tzld.piaoquan.growth.common.common.constant.MessageConstant;
+import com.tzld.piaoquan.growth.common.component.HttpPoolClient;
+import com.tzld.piaoquan.growth.common.service.WeComAccessTokenService;
+import com.tzld.piaoquan.growth.common.service.MessageService;
+import com.tzld.piaoquan.growth.common.utils.DateUtil;
+import com.tzld.piaoquan.growth.common.utils.LarkRobotUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 
-import static com.tzld.piaoquan.common.common.constant.WeComConstant.POST_WE_COM_ADD_MSG_TEMPLATE;
+import static com.tzld.piaoquan.growth.common.common.constant.WeComConstant.POST_WE_COM_ADD_MSG_TEMPLATE;
 
 
 @Slf4j
 @Service
-public class OfflineMessageServiceImpl implements OfflineMessageService {
+public class MessageServiceImpl implements MessageService {
 
     @Autowired
     private HttpPoolClient httpPoolClient;
 
     @Autowired
-    private OfflineAccessTokenService offlineAccessTokenService;
+    private WeComAccessTokenService weComAccessTokenService;
 
     @Override
     public boolean pushWeComMessage(JSONObject jsonObject, Long corpId) {
         try {
-            String accessToken = offlineAccessTokenService.getWeComAccessToken(corpId);
+            String accessToken = weComAccessTokenService.getWeComAccessToken(corpId);
             String url = POST_WE_COM_ADD_MSG_TEMPLATE
                     + "?access_token=" + accessToken;
             String s = httpPoolClient.post(url, jsonObject.toJSONString());

+ 12 - 12
offline-module/src/main/java/com/tzld/piaoquan/offline/service/Impl/OfflineAccessTokenServiceImpl.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/WeComAccessTokenServiceImpl.java

@@ -1,12 +1,12 @@
-package com.tzld.piaoquan.offline.service.Impl;
+package com.tzld.piaoquan.growth.common.service.Impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.common.component.HttpPoolClient;
-import com.tzld.piaoquan.offline.dao.mapper.OfflineCorpMapper;
-import com.tzld.piaoquan.common.model.po.Corp;
-import com.tzld.piaoquan.common.model.po.CorpExample;
-import com.tzld.piaoquan.offline.service.OfflineAccessTokenService;
-import com.tzld.piaoquan.common.utils.LarkRobotUtil;
+import com.tzld.piaoquan.growth.common.component.HttpPoolClient;
+import com.tzld.piaoquan.growth.common.dao.mapper.CorpMapper;
+import com.tzld.piaoquan.growth.common.model.po.Corp;
+import com.tzld.piaoquan.growth.common.model.po.CorpExample;
+import com.tzld.piaoquan.growth.common.service.WeComAccessTokenService;
+import com.tzld.piaoquan.growth.common.utils.LarkRobotUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,12 +18,12 @@ import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.tzld.piaoquan.common.common.constant.RedisConstant.WE_COM_ACCESS_TOKEN;
-import static com.tzld.piaoquan.common.common.constant.WeComConstant.GET_WE_COM_ACCESS_TOKEN_URL;
+import static com.tzld.piaoquan.growth.common.common.constant.RedisConstant.WE_COM_ACCESS_TOKEN;
+import static com.tzld.piaoquan.growth.common.common.constant.WeComConstant.GET_WE_COM_ACCESS_TOKEN_URL;
 
 @Slf4j
 @Service
-public class OfflineAccessTokenServiceImpl implements OfflineAccessTokenService {
+public class WeComAccessTokenServiceImpl implements WeComAccessTokenService {
 
     @Autowired
     private HttpPoolClient httpPoolClient;
@@ -32,7 +32,7 @@ public class OfflineAccessTokenServiceImpl implements OfflineAccessTokenService
     private RedisTemplate<String, Object> redisTemplate;
 
     @Autowired
-    private OfflineCorpMapper offlineCorpMapper;
+    private CorpMapper corpMapper;
 
     @Override
     public String getWeComAccessToken(Long corpId) {
@@ -44,7 +44,7 @@ public class OfflineAccessTokenServiceImpl implements OfflineAccessTokenService
             }
             CorpExample example = new CorpExample();
             example.createCriteria().andIdEqualTo(corpId);
-            List<Corp> corps = offlineCorpMapper.selectByExample(example);
+            List<Corp> corps = corpMapper.selectByExample(example);
             if (CollectionUtils.isEmpty(corps)) {
                 LarkRobotUtil.sendMessage("查询不到主体,获取access_token失败");
                 return "";

+ 42 - 42
api-module/src/main/java/com/tzld/piaoquan/api/service/impl/UserServiceImpl.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/WeComUserServiceImpl.java

@@ -1,15 +1,15 @@
-package com.tzld.piaoquan.api.service.impl;
+package com.tzld.piaoquan.growth.common.service.Impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.piaoquan.common.component.HttpPoolClient;
-import com.tzld.piaoquan.api.dao.mapper.StaffMapper;
-import com.tzld.piaoquan.api.dao.mapper.StaffWithUserMapper;
-import com.tzld.piaoquan.api.dao.mapper.UserMapper;
-import com.tzld.piaoquan.api.service.AccessTokenService;
-import com.tzld.piaoquan.api.service.UserService;
-import com.tzld.piaoquan.common.model.po.*;
-import com.tzld.piaoquan.common.utils.LarkRobotUtil;
+import com.tzld.piaoquan.growth.common.component.HttpPoolClient;
+import com.tzld.piaoquan.growth.common.dao.mapper.StaffMapper;
+import com.tzld.piaoquan.growth.common.dao.mapper.StaffWithUserMapper;
+import com.tzld.piaoquan.growth.common.dao.mapper.WeComUserMapper;
+import com.tzld.piaoquan.growth.common.model.po.*;
+import com.tzld.piaoquan.growth.common.service.WeComAccessTokenService;
+import com.tzld.piaoquan.growth.common.service.WeComUserService;
+import com.tzld.piaoquan.growth.common.utils.LarkRobotUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,19 +21,19 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static com.tzld.piaoquan.common.common.constant.WeComConstant.GET_WE_COM_EXTERNAL_CONTACT_GET;
+import static com.tzld.piaoquan.growth.common.common.constant.WeComConstant.GET_WE_COM_EXTERNAL_CONTACT_GET;
 
 @Slf4j
 @Service
-public class UserServiceImpl implements UserService {
+public class WeComUserServiceImpl implements WeComUserService {
     @Autowired
     private HttpPoolClient httpPoolClient;
 
     @Autowired
-    private AccessTokenService accessTokenService;
+    private WeComAccessTokenService weComAccessTokenService;
 
     @Autowired
-    private UserMapper userMapper;
+    private WeComUserMapper weComUserMapper;
 
     @Autowired
     private StaffWithUserMapper staffWithUserMapper;
@@ -53,10 +53,10 @@ public class UserServiceImpl implements UserService {
     @Override
     public void insertStaffWithUser(String externalUserId, Staff staff, Long corpId) {
         try {
-            UserExample userExample = new UserExample();
-            userExample.createCriteria().andExternalUserIdEqualTo(externalUserId);
-            List<User> userList = userMapper.selectByExample(userExample);
-            if (CollectionUtils.isEmpty(userList)) {
+            WeComUserExample weComUserExample = new WeComUserExample();
+            weComUserExample.createCriteria().andExternalUserIdEqualTo(externalUserId);
+            List<WeComUser> weComUserList = weComUserMapper.selectByExample(weComUserExample);
+            if (CollectionUtils.isEmpty(weComUserList)) {
                 JSONObject userDetail = getUserDetail(externalUserId, corpId);
                 if (userDetail == null) {
                     return;
@@ -82,19 +82,19 @@ public class UserServiceImpl implements UserService {
                 String avatar = externalContact.getString("avatar");
                 Integer type = externalContact.getInteger("type");
                 Integer gender = externalContact.getInteger("gender");
-                User user = new User();
-                user.setExternalUserId(externalUserId);
-                user.setCreatedAt(createAt);
-                user.setName(name);
-                user.setUnionId(unionId);
-                user.setAvatar(avatar);
-                user.setType(type);
-                user.setGender(gender);
-                user.setCorpId(corpId);
-                userMapper.insert(user);
-                Long userId = user.getId();
+                WeComUser weComUser = new WeComUser();
+                weComUser.setExternalUserId(externalUserId);
+                weComUser.setCreatedAt(createAt);
+                weComUser.setName(name);
+                weComUser.setUnionId(unionId);
+                weComUser.setAvatar(avatar);
+                weComUser.setType(type);
+                weComUser.setGender(gender);
+                weComUser.setCorpId(corpId);
+                weComUserMapper.insert(weComUser);
+                Long userId = weComUser.getId();
                 if (userId == null) {
-                    log.error("insertStaffWithUserJob insert user error user={}", user);
+                    log.error("insertStaffWithUserJob insert weComUser error weComUser={}", weComUser);
                     return;
                 }
                 if (CollectionUtils.isEmpty(staffUserIdList)) {
@@ -115,14 +115,14 @@ public class UserServiceImpl implements UserService {
                     staffWithUserMapper.insert(staffWithUser);
                 }
             } else {
-                User user = userList.get(0);
+                WeComUser weComUser = weComUserList.get(0);
                 StaffWithUserExample staffWithUserExample = new StaffWithUserExample();
-                staffWithUserExample.createCriteria().andUserIdEqualTo(user.getId()).andStaffIdEqualTo(staff.getId());
+                staffWithUserExample.createCriteria().andUserIdEqualTo(weComUser.getId()).andStaffIdEqualTo(staff.getId());
                 List<StaffWithUser> staffWithUserList = staffWithUserMapper.selectByExample(staffWithUserExample);
                 if (CollectionUtils.isEmpty(staffWithUserList)) {
                     StaffWithUser staffWithUser = new StaffWithUser();
                     staffWithUser.setStaffId(staff.getId());
-                    staffWithUser.setUserId(user.getId());
+                    staffWithUser.setUserId(weComUser.getId());
                     staffWithUserMapper.insert(staffWithUser);
                 } else {
                     StaffWithUser staffWithUser = staffWithUserList.get(0);
@@ -147,12 +147,12 @@ public class UserServiceImpl implements UserService {
         if (staff == null) {
             return;
         }
-        User user = getUser(externalUserId);
-        if (user == null) {
+        WeComUser weComUser = getUser(externalUserId);
+        if (weComUser == null) {
             return;
         }
         StaffWithUserExample example = new StaffWithUserExample();
-        example.createCriteria().andStaffIdEqualTo(staff.getId()).andUserIdEqualTo(user.getId());
+        example.createCriteria().andStaffIdEqualTo(staff.getId()).andUserIdEqualTo(weComUser.getId());
         List<StaffWithUser> staffWithUserList = staffWithUserMapper.selectByExample(example);
         if (CollectionUtils.isEmpty(staffWithUserList) || staffWithUserList.get(0).getIsDelete() == 1) {
             return;
@@ -194,20 +194,20 @@ public class UserServiceImpl implements UserService {
         return staffList.get(0);
     }
 
-    private User getUser(String externalUserId) {
-        UserExample userExample = new UserExample();
-        userExample.createCriteria().andExternalUserIdEqualTo(externalUserId);
-        List<User> userList = userMapper.selectByExample(userExample);
-        if (CollectionUtils.isEmpty(userList)) {
+    private WeComUser getUser(String externalUserId) {
+        WeComUserExample weComUserExample = new WeComUserExample();
+        weComUserExample.createCriteria().andExternalUserIdEqualTo(externalUserId);
+        List<WeComUser> weComUserList = weComUserMapper.selectByExample(weComUserExample);
+        if (CollectionUtils.isEmpty(weComUserList)) {
             log.error("getUser user empty externalUserId={}", externalUserId);
             return null;
         }
-        return userList.get(0);
+        return weComUserList.get(0);
     }
 
 
     public JSONObject getUserDetail(String externalUserId, Long corpId) throws IOException {
-        String weComAccessToken = accessTokenService.getWeComAccessToken(corpId);
+        String weComAccessToken = weComAccessTokenService.getWeComAccessToken(corpId);
         String url = String.format(GET_WE_COM_EXTERNAL_CONTACT_GET + "?access_token=%s&external_userid=%s", weComAccessToken, externalUserId);
         String res = httpPoolClient.get(url);
         JSONObject jsonObject = JSONObject.parseObject(res);

+ 21 - 0
common-module/src/main/java/com/tzld/piaoquan/growth/common/service/MessageAttachmentService.java

@@ -0,0 +1,21 @@
+package com.tzld.piaoquan.growth.common.service;
+
+import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
+import com.tzld.piaoquan.growth.common.model.po.MessageAttachment;
+import com.tzld.piaoquan.growth.common.model.po.Staff;
+import com.tzld.piaoquan.growth.common.model.vo.GuaranteedParam;
+
+import java.util.List;
+
+public interface MessageAttachmentService {
+
+    void addMiniProgram(List<MessageAttachment> messageAttachmentList, Long createTime);
+
+    CommonResponse<Void> createGuaranteedMiniProgram(GuaranteedParam guaranteedParam);
+
+    GuaranteedParam getGuaranteedVideo(String date);
+
+    String getPicMediaId(String cover, Long corpId);
+
+    String getPage(Staff staff, Long videoId);
+}

+ 2 - 2
offline-module/src/main/java/com/tzld/piaoquan/offline/service/OfflineMessageService.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/service/MessageService.java

@@ -1,8 +1,8 @@
-package com.tzld.piaoquan.offline.service;
+package com.tzld.piaoquan.growth.common.service;
 
 import com.alibaba.fastjson.JSONObject;
 
-public interface OfflineMessageService {
+public interface MessageService {
 
     boolean pushWeComMessage(JSONObject jsonObject, Long corpId);
 

+ 7 - 0
common-module/src/main/java/com/tzld/piaoquan/growth/common/service/WeComAccessTokenService.java

@@ -0,0 +1,7 @@
+package com.tzld.piaoquan.growth.common.service;
+
+public interface WeComAccessTokenService {
+
+    String getWeComAccessToken(Long corpId);
+
+}

+ 3 - 3
offline-module/src/main/java/com/tzld/piaoquan/offline/service/OfflineUserService.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/service/WeComUserService.java

@@ -1,9 +1,9 @@
-package com.tzld.piaoquan.offline.service;
+package com.tzld.piaoquan.growth.common.service;
 
-import com.tzld.piaoquan.common.model.po.Staff;
+import com.tzld.piaoquan.growth.common.model.po.Staff;
 
 
-public interface OfflineUserService {
+public interface WeComUserService {
 
 
     void addStaffWithUser(String externalUserId, String staffUserId, Long corpId);

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/utils/DateUtil.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/DateUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 
 import java.time.Instant;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/utils/HttpClientUtil.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/HttpClientUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 import java.util.HashMap;
 import java.util.Map;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/utils/HttpPoolClientUtil.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/HttpPoolClientUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/utils/LarkRobotUtil.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/LarkRobotUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;

+ 2 - 2
common-module/src/main/java/com/tzld/piaoquan/common/utils/MessageUtil.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/MessageUtil.java

@@ -1,8 +1,8 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
-import static com.tzld.piaoquan.common.common.constant.MessageConstant.defaultName;
+import static com.tzld.piaoquan.growth.common.common.constant.MessageConstant.defaultName;
 
 public class MessageUtil {
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/utils/OdpsUtil.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/OdpsUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 import com.aliyun.odps.Instance;
 import com.aliyun.odps.Odps;

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/utils/TimeUtil.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/TimeUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 import java.util.Calendar;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/utils/ToolUtils.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/ToolUtils.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 import java.nio.charset.StandardCharsets;
 

+ 1 - 1
common-module/src/main/java/com/tzld/piaoquan/common/utils/URLUtil.java → common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/URLUtil.java

@@ -1,4 +1,4 @@
-package com.tzld.piaoquan.common.utils;
+package com.tzld.piaoquan.growth.common.utils;
 
 import java.net.URLDecoder;
 

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini