From 9abab8ff78bb04ecdbaaf1962fa9c75b0aec933b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 10:18:52 +0800
Subject: [PATCH] 测试修改
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index d4a296d..49497f4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -5,7 +5,6 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
@@ -39,6 +38,7 @@
import com.yeshi.fanli.dto.jd.JDSearchResult;
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.dynamic.InviteMaterial;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -350,7 +350,7 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- hongBaoManageService.getVIPFanLiRate());
+ hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP));
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
@@ -450,8 +450,22 @@
if (goods == null)
out.println("鍟嗗搧宸蹭笅鏋�");
else
- out.println("<html><head><meta charset=utf-8></head><body>"
- + String.format("cat_name:%s <br> cat_leaf_name:%s", goods.getRootCategoryName(), goods.getLeafName())
- + "</body></html>");
+ out.println(
+ "<html><head><meta charset=utf-8></head><body>" + String.format("cat_name:%s <br> cat_leaf_name:%s",
+ goods.getRootCategoryName(), goods.getLeafName()) + "</body></html>");
}
+
+ @RequestMapping("getJedisInfo")
+ public void getJedisInfo(PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("active", jedisPool.getNumActive());
+ data.put("idle", jedisPool.getNumIdle());
+ data.put("waiters", jedisPool.getNumWaiters());
+ out.print(data.toString());
+ }
+
+
+
+
+
}
--
Gitblit v1.8.0