silent 4 лет назад
Родитель
Сommit
b03d7add92

+ 3 - 1
src/main/java/org/springblade/gateway/active_gateway/controller/AppActiveProductController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.gateway.active_gateway.service.AppActiveProductService;
 import org.springblade.sing.active.entity.ActiveHelpRecord;
@@ -28,8 +29,9 @@ public class AppActiveProductController extends BladeController {
 	private AppActiveProductService activeService;
 
 	/**
-	 * 活动助力
+	 * 作品助力
 	 */
+	@ApiLog("作品助力")
 	@PostMapping("/productHelp")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "作品助力", notes = "传入activeHelpRecord")

+ 4 - 0
src/main/java/org/springblade/gateway/goods_gateway/controller/AppHelpGoodsController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.tool.api.R;
 import org.springblade.gateway.goods_gateway.service.AppHelpGoodsService;
 import org.springblade.payment.cmcc.request.CmccDectOrderRequest;
@@ -38,6 +39,7 @@ public class AppHelpGoodsController {
 	/**
 	 * 兑换道具
 	 */
+	@ApiLog("兑换道具")
 	@PostMapping("/exchangeProps")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "兑换道具", notes = "传入pointRecord")
@@ -61,6 +63,7 @@ public class AppHelpGoodsController {
 	/**
 	 * 创建道具订单
 	 */
+	@ApiLog("创建道具订单")
 	@PostMapping("/createPropsOrder")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "创建道具订单", notes = "传入cmccPointRecord")
@@ -94,6 +97,7 @@ public class AppHelpGoodsController {
 	/**
 	 * 发送验证码
 	 */
+	@ApiLog("发送验证码")
 	@PostMapping("/sendCmccSms")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "创建道具订单", notes = "传入cmccPlaceOrderRequest")

+ 10 - 5
src/main/java/org/springblade/payment/cmcc/util/CmccUtil.java

@@ -6,10 +6,10 @@ import cn.hutool.crypto.SecureUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.utils.SpringContextHolder;
+import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.DigestUtil;
@@ -31,8 +31,12 @@ import java.util.*;
  * @Date: Created in 11:43 2021/11/11
  * @Modified By:
  */
-@Slf4j
 public class CmccUtil {
+	/**
+	 * 日志
+	 */
+	private static final BladeLogger logger = SpringContextHolder.getBean(BladeLogger.class);
+
 	/**
 	 * cmcc配置
 	 */
@@ -89,12 +93,12 @@ public class CmccUtil {
 		//添加SignKey
 		param.add(cmccPointConfig.getSignKey());
 		String paramValue = ArrayUtil.join(param.toArray(), "");
-		log.warn("CMCC-排序后参数:{}", paramValue);
+		logger.warn("CMCC-排序后参数:{}", paramValue);
 		//进行签名
 		cmccRequest.setSign(SecureUtil.md5(paramValue));
 //		cmccRequest.setCheckType("01");
 //		cmccRequest.setSign(SecureUtil.md5(cmccRequest.getRequestId()+cmccPointConfig.getSignKey()));
-		log.warn("CMCC-签名后参数:{}", JSONObject.toJSONString(cmccRequest));
+		logger.warn("CMCC-签名后参数:{}", JSONObject.toJSONString(cmccRequest));
 		return cmccRequest;
 	}
 
@@ -198,7 +202,8 @@ public class CmccUtil {
 		HttpResponse httpResponse = HttpRequest.post(new StringBuilder(cmccPointConfig.getUrl()).append(url).toString())
 			//添加参数,进行签名
 			.body(JSONObject.toJSONString(cmccRequest)).execute();
-		log.info("CMCC-请求响应内容:{}", httpResponse.body());
+
+		logger.info("CMCC-请求响应内容:{}", httpResponse.body());
 		JSONObject jsonObject = JSONObject.parseObject(httpResponse.body());
 		CmccResponse cmccResponse;
 		if (ObjectUtils.isNotEmpty(jsonObject.get("respCode"))) {