From 6cc97918a5a42e37a3c3867cc5b78a0b9fd43a24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 四月 2022 19:55:41 +0800
Subject: [PATCH] 功能完善
---
app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java b/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java
index 1f1307b..3294f24 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/controller/client/api/UserController.java
@@ -1,6 +1,7 @@
package com.yeshi.makemoney.app.controller.client.api;
import com.yeshi.makemoney.app.dto.user.LoginInfoDTO;
+import com.yeshi.makemoney.app.entity.APPPlatform;
import com.yeshi.makemoney.app.entity.user.UserExtraInfo;
import com.yeshi.makemoney.app.entity.user.UserInfo;
import com.yeshi.makemoney.app.entity.user.UserLoginRecord;
@@ -16,6 +17,7 @@
import com.yeshi.makemoney.app.service.inter.user.UserInfoService;
import com.yeshi.makemoney.app.service.inter.user.WXUserInfoService;
import com.yeshi.makemoney.app.service.inter.vip.VIPService;
+import com.yeshi.makemoney.app.service.manager.PushManager;
import com.yeshi.makemoney.app.service.manager.VerifyCodeManager;
import com.yeshi.makemoney.app.utils.ApiCodeConstant;
import com.yeshi.makemoney.app.utils.ImageUtil;
@@ -71,8 +73,8 @@
@Resource
private VerifyCodeManager verifyCodeManager;
- // @Reference(version = "1.0", check = false)
- private BDeviceTokenService bDeviceTokenService;
+ @Resource
+ private PushManager pushManager;
@Resource
private GoldCornGetRecordService goldCornGetRecordService;
@@ -129,7 +131,7 @@
public void run() {
try {
//鐧诲綍鎴愬姛
- bDeviceTokenService.bindUid(acceptData.getSystem().name(), acceptData.getUtdId(), userInfo.getId() + "");
+ pushManager.bindUid(acceptData.getSystem(), userInfo.getId(), acceptData.getPlatform() == APPPlatform.ios ? acceptData.getIdfa() : acceptData.getUtdId());
} catch (Exception e) {
}
@@ -192,7 +194,7 @@
public String logout(AcceptData acceptData, Long uid) {
try {
//瑙ｇ粦UID
- bDeviceTokenService.unBindUid(acceptData.getSystem().name(), acceptData.getUtdId());
+ pushManager.unBind(acceptData.getSystem(), acceptData.getPlatform() == APPPlatform.ios ? acceptData.getIdfa() : acceptData.getUtdId());
} catch (Exception e) {
e.printStackTrace();
}
@@ -312,26 +314,13 @@
@ResponseBody
@RequestMapping("uploadPushRegId")
public String uploadPushRegId(AcceptData acceptData, Long uid, String regId) {
-
- BPushDeviceToken deviceToken = new BPushDeviceToken();
- deviceToken.setAppCode(acceptData.getSystem().name());
- deviceToken.setDeviceId(acceptData.getUtdId());
- deviceToken.setBuildModel(acceptData.getDeviceType());
- deviceToken.setBuildVersion(acceptData.getOsVersion());
- deviceToken.setToken(regId);
- deviceToken.setType(PushPlatform.jpush);
- if (uid != null) {
- deviceToken.setUid(uid + "");
- }
- deviceToken.setVersionCode(acceptData.getVersion());
-
try {
- bDeviceTokenService.save(deviceToken);
+ pushManager.saveToken(acceptData, uid, regId);
return JsonUtil.loadTrueResult("");
} catch (BPushDeviceTokenException e) {
- return JsonUtil.loadTrueResult(e.getMessage());
+ return JsonUtil.loadTrueResult("涓氬姟鍑洪敊");
} catch (ParamsException e) {
- return JsonUtil.loadTrueResult(e.getMessage());
+ return JsonUtil.loadTrueResult("鍙傛暟閿欒");
}
}
--
Gitblit v1.8.0