feat(*): 开发debug接口

- 开发debug接口

feat(*): 开发debug接口
- 开发debug接口
张志伟
1 parent c752417d
Showing 7 changed files with 155 additions and 9 deletions
fw-hermes-common/src/main/java/cn/fw/hermes/common/constant/Constant.java
fw-hermes-domain/src/main/java/cn/fw/hermes/domain/db/Hermes.java
fw-hermes-server/src/main/kotlin/cn/fw/hermes/controller/app/XgController.kt
fw-hermes-server/src/main/kotlin/cn/fw/hermes/controller/common/XinGeDebugController.kt
fw-hermes-service/src/main/java/cn/fw/hermes/service/data/HermesService.java
fw-hermes-service/src/main/java/cn/fw/hermes/service/data/impl/HermesServiceImpl.java
fw-hermes-service/src/main/kotlin/cn/fw/hermes/service/biz/XgPushBizService.kt
@@ -63,4 +63,8 @@ public interface Constant {
      * 更新消息
      */
     String UPDATE_MSG = "UpdateNotice";
+    /**
+     * 无效信鸽token
+     */
+    String inValidToken = "#";
 }
@@ -50,6 +50,10 @@ public class Hermes extends BaseAuditableTimeEntity&lt;Hermes, Long&gt; {
      */
     private AccountStateEnum state;
     /**
+     * 信鸽设备token
+     */
+    private String xgToken;
+    /**
      * 创建日期
      */
     @JsonDeserialize(using = LocalDateTimeSerializerProcessor.LocalDateDeserializer.class)
+package cn.fw.hermes.controller.app
+
+import cn.fw.common.web.annotation.ControllerMethod
+import cn.fw.common.web.util.ResultBuilder
+import cn.fw.data.base.domain.common.Message
+import cn.fw.hermes.domain.enums.AccountTypeEnum
+import cn.fw.hermes.service.biz.XgPushBizService
+import cn.fw.security.auth.client.annotation.Authorization
+import cn.fw.security.auth.client.annotation.IgnoreAuth
+import cn.fw.security.auth.client.enums.AuthType
+import org.springframework.validation.annotation.Validated
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
+
+/**
+ * 信鸽相关控制器
+ *
+ * @author : kurisu
+ * @version : 1.0
+ * @desc : 信鸽相关控制器
+ * @date : 2024-01-05 18:08
+ */
+@Validated
+@RestController
+@RequestMapping("/app/xinge")
+@Authorization(AuthType.APP)
+class XgController(private val xgPushBizService: XgPushBizService) {
+
+    @IgnoreAuth
+    @ControllerMethod("绑定信鸽token")
+    @PostMapping("/bind")
+    fun bindToken(@RequestParam("userId") userId: Long?, @RequestParam("xgToken") xgToken: String): Message<Void> {
+        xgPushBizService.saveUserToken(userId, AccountTypeEnum.B_USER, xgToken)
+        return ResultBuilder.success()
+    }
+}
@@ -4,6 +4,7 @@ package cn.fw.hermes.controller.common
 import cn.fw.common.web.annotation.ControllerMethod
 import cn.fw.common.web.util.ResultBuilder.success
 import cn.fw.data.base.domain.common.Message
+import cn.fw.hermes.domain.enums.AccountTypeEnum
 import cn.fw.hermes.domain.xinge.XinGeProfile
 import cn.fw.hermes.service.biz.XgPushBizService
 import cn.fw.hermes.service.property.XinGeProperty
@@ -13,6 +14,7 @@ import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
+import javax.validation.constraints.NotNull
  
 /**
  * 信鸽debug类
@@ -29,8 +31,8 @@ import org.springframework.web.bind.annotation.RestController
 class XinGeDebugController(private val xinGeProperty: XinGeProperty, private val xgPushBizService: XgPushBizService) {
     @ControllerMethod("信鸽推送测试消息")
     @GetMapping("/send/msg")
-    fun sendMsg(): Message<Void> {
-        xgPushBizService.sendData()
+    fun sendMsg(@NotNull(message = "用户id不能为空") userId: Long?): Message<Void> {
+        userId?.let { xgPushBizService.sendData(it, AccountTypeEnum.B_USER) }
         return success()
     }
  
@@ -15,5 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface HermesService extends IService<Hermes> {
     Hermes queryByUserId(Long userId, AccountTypeEnum accountTypeEnum);
+
     void saveByDto(HermesDTO dto);
 }
@@ -30,14 +30,14 @@ public class HermesServiceImpl extends ServiceImpl&lt;HermesMapper, Hermes&gt; impleme
     @Override
     public Hermes queryByUserId(Long userId, AccountTypeEnum type) {
         return getOne(Wrappers.<Hermes>lambdaQuery()
-                        .eq(Hermes::getUserId, userId)
-                        .eq(Hermes::getAccountType, type)
-                , Boolean.FALSE);
+                .eq(Hermes::getUserId, userId)
+                .eq(Hermes::getAccountType, type)
+            , Boolean.FALSE);
     }
  
     @Transactional(rollbackFor = Exception.class)
     @Override
-    @CacheEvict(cacheNames = Constant.ACCOUNT_CACHE_KEY, key = "#dto.userId", condition = "#dto.id != null")
+    @CacheEvict(cacheNames = Constant.ACCOUNT_CACHE_KEY, key = "#dto.userId+':'+#dto.accountType.name()", condition = "#dto.id != null")
     public void saveByDto(HermesDTO dto) {
         Hermes db = new Hermes();
         BeanUtils.copyProperties(dto, db);
 package cn.fw.hermes.service.biz
  
+import cn.fw.common.businessvalidator.Validator.BV
+import cn.fw.common.util.logInfo
+import cn.fw.hermes.common.constant.Constant
+import cn.fw.hermes.domain.db.Hermes
+import cn.fw.hermes.domain.enums.AccountTypeEnum
+import cn.fw.hermes.service.data.HermesService
+import com.baomidou.mybatisplus.core.toolkit.Wrappers
 import com.tencent.xinge.XingeApp
 import com.tencent.xinge.bean.AudienceType
 import com.tencent.xinge.bean.Message
 import com.tencent.xinge.bean.MessageAndroid
 import com.tencent.xinge.bean.MessageType
+import com.tencent.xinge.device.account.AccountBindOperatorType
+import com.tencent.xinge.device.account.AccountBindRequest
+import com.tencent.xinge.device.account.AccountTypePair
+import com.tencent.xinge.device.account.TokenAccountsPair
 import com.tencent.xinge.push.app.PushAppRequest
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.cloud.context.config.annotation.RefreshScope
+import org.springframework.data.redis.core.StringRedisTemplate
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 import java.util.*
  
  
@@ -19,10 +37,49 @@ import java.util.*
  * @date : 2024-01-04 15:54
  */
 @Service
-class XgPushBizService(private val xingeApp: XingeApp) {
+@RefreshScope
+class XgPushBizService(
+    @Value("\${spring.cache.custom.global-prefix}:xg:token")
+    private val keyPrefix: String,
+    private val xingeApp: XingeApp,
+    private val hermesService: HermesService,
+    private val stringRedisTemplate: StringRedisTemplate
+) {
  
+    /**
+     * 储存和更新用户腾讯信鸽设备的token
+     */
+    @Transactional(rollbackFor = [Exception::class])
+    fun saveUserToken(userId: Long?, accountType: AccountTypeEnum, xgToken: String) {
+        BV.notNull(userId) { "用户信息不存在" }
+        userId?.let {
+            val hermes = hermesService.queryByUserId(it, accountType)
+            hermes?.run {
+                val cacheKey = "${keyPrefix}:${accountType.name}"
+                val hashOps = stringRedisTemplate.boundHashOps<String, String>(cacheKey)
+                val clearUserIds = blankingToken(it, accountType, xgToken)
+                CoroutineScope(Dispatchers.IO).launch {
+                    clearTokenAccount(xgToken, identifier)
+                }
+                val her = Hermes()
+                her.id = id
+                her.xgToken = xgToken
+                if (her.updateById()) {
+                    hashOps.put(it.toString(), xgToken)
+                }
+                if (clearUserIds.isNotEmpty()) {
+                    val clearUserList = clearUserIds.map { userId -> userId.toString() }.toTypedArray()
+                    hashOps.delete(*clearUserList)
+                }
+            }
+        }
+    }
  
-    fun sendData() {
+    fun sendData(userId: Long, accountType: AccountTypeEnum) {
+        val xgToken = getUserToken(userId, accountType)
+        BV.isFalse(Constant.inValidToken == xgToken) {
+            "用户设备未找到"
+        }
         val pushAppRequest = PushAppRequest()
         pushAppRequest.audience_type = AudienceType.token
         pushAppRequest.message_type = MessageType.notify
@@ -39,7 +96,47 @@ class XgPushBizService(private val xingeApp: XingeApp) {
         messageAndroid.setnCategory("CATEGORY_REMINDER")
         messageAndroid.ring_raw = "xg_ring"
         message.android = messageAndroid
-        pushAppRequest.token_list = arrayListOf("02b9c9dc7b4c2c392f08fd793397e4f50571")
+        pushAppRequest.token_list = arrayListOf(xgToken)
         this.xingeApp.pushApp(pushAppRequest)
     }
+
+    private fun getUserToken(userId: Long, accountType: AccountTypeEnum): String {
+        val cacheKey = "${keyPrefix}:${accountType.name}"
+        val hashOps = stringRedisTemplate.boundHashOps<String, String>(cacheKey)
+        val xToken = hashOps.get(userId.toString())
+        return xToken ?: hermesService.queryByUserId(userId, accountType)?.xgToken ?: Constant.inValidToken
+    }
+
+    private fun clearTokenAccount(token: String, account: String) {
+        val request = AccountBindRequest()
+        request.operatorType = AccountBindOperatorType.BatchCoverAccount
+        val accountTypePair = AccountTypePair()
+        accountTypePair.account = account
+
+        val accountTypePairs = arrayListOf(accountTypePair)
+        request.accountList = accountTypePairs
+
+        val tokenAccountsPair = TokenAccountsPair()
+        tokenAccountsPair.accountList = accountTypePairs
+        tokenAccountsPair.token = token
+
+        request.tokenAccounts = arrayListOf(tokenAccountsPair)
+        val bindRes = this.xingeApp.accountBind(request)
+        logInfo("给[{}]绑定账号[{}], 结果: {}", token, account, bindRes)
+    }
+
+    private fun blankingToken(userId: Long, accountType: AccountTypeEnum, xgToken: String): List<Long> {
+        val list = hermesService.list(
+            Wrappers.lambdaQuery<Hermes>()
+                .eq(Hermes::getXgToken, xgToken)
+                .eq(Hermes::getAccountType, accountType)
+                .ne(Hermes::getUserId, userId)
+        )
+        if (list.isNullOrEmpty()) {
+            return listOf()
+        }
+        list.forEach { it.xgToken = Constant.inValidToken }
+        hermesService.updateBatchById(list)
+        return list.map(Hermes::getUserId)
+    }
 }