From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +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/IntegralControllerV2.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
index 56dc804..5ce6856 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -34,6 +34,7 @@
import com.yeshi.fanli.exception.integral.IntegralExchangeException;
import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.integral.CodePublishRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralExchangeRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralExchangeService;
@@ -53,6 +54,9 @@
@RequestMapping("api/v2/integral")
public class IntegralControllerV2 {
+ @Resource
+ private ConfigService configService;
+
@Resource
private UserInfoService userInfoService;
@@ -359,6 +363,7 @@
JSONObject data = new JSONObject();
data.put("count", count);
data.put("list", getGson().toJson(list));
+ data.put("helpLink", configService.get("publish_list_help_link"));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0