From dbc8f0b2058d809e6dad0ada92d391109cbb4f57 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 15 十一月 2019 15:05:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
index bde152b..9246634 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java
@@ -147,7 +147,7 @@
text = text.trim();
try {
- TokenVO tokenVO = tokenRecordService.discernToken(text, uid);
+ TokenVO tokenVO = tokenRecordService.discernToken(text, uid, acceptData);
out.print(JsonUtil.loadTrueResult(tokenVO));
return;
} catch (TokenRecordException e) {
@@ -506,7 +506,7 @@
@RequestMapping(value = "tokenReceive", method = RequestMethod.POST)
public void tokenReceive(AcceptData acceptData, Long uid, String token, PrintWriter out) {
try {
- String msg = tokenRecordService.receiveToken(token, uid);
+ String msg = tokenRecordService.receiveToken(token, uid, acceptData);
out.print(JsonUtil.loadTrueResult(msg));
} catch (TokenRecordException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
--
Gitblit v1.8.0