Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-03-17 e20c58a63d3827d9c55cd5f387568fb0916b9590

 springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java

@@ -20,10 +20,15 @@
import java.util.Base64;

/**
 * http://demo.homecommunity.cn/app/equipments/{id}/{port}/finish
 * <p>
 * 需要给叮叮厂家提供
 * http://demo.homecommunity.cn/app
 * 注意demo.homecommunity.cn 改成自己的域名
 * 叮叮充电桩 结束充电回调处理类
 */
@RestController
@RequestMapping(path = "/equipments")
@RequestMapping(path = "/app/equipments")
public class NotifyDingDingChargeController extends BaseController {

    private final static Logger logger = LoggerFactory.getLogger(NotifyDingDingChargeController.class);
@@ -48,7 +53,7 @@
            @PathVariable String port,
            @RequestBody String postInfo,
            HttpServletRequest request) {
        if (!validateSign(request)) {
        if (!validateSign(request, "/equipments/" + id + "/" + port + "/finish", postInfo)) {
            return new ResponseEntity<>("{\n" +
                    "\"code\" : -1,\n" +
                    "\"msg\" : \"鉴权失败\"\n" +
@@ -63,8 +68,8 @@
        notifyChargeOrderDto.setBodyParam(postInfo);
        notifyChargeOrderDto.setReason(param.getString("typeName"));


        ResultVo resultVo = notifyChargeV1InnerServiceSMOImpl.finishCharge(notifyChargeOrderDto);
        ResultVo resultVo = null;
        resultVo = notifyChargeV1InnerServiceSMOImpl.finishCharge(notifyChargeOrderDto);

        if (resultVo.getCode() == ResultVo.CODE_OK) {
            resultVo.setCode(200);
@@ -85,7 +90,7 @@
            @PathVariable String id,
            @RequestBody String postInfo,
            HttpServletRequest request) {
        if (!validateSign(request)) {
        if (!validateSign(request, "/equipments/" + id + "/event", postInfo)) {
            return new ResponseEntity<>("{\n" +
                    "\"code\" : -1,\n" +
                    "\"msg\" : \"鉴权失败\"\n" +
@@ -101,12 +106,12 @@

    }

    private boolean validateSign(HttpServletRequest request) {
        String appId = request.getParameter("appid");
        String timestamp = request.getParameter("timestamp");
        String sign = request.getParameter("sign");
    private boolean validateSign(HttpServletRequest request, String url, String postInfo) {
        String appId = request.getHeader("appid");
        String timestamp = request.getHeader("timestamp");
        String sign = request.getHeader("sign");
        String secret = MappingCache.getValue(DING_DING_DOMAIN, DING_DING_APP_SECURE);
        String data = "appid=" + appId + "&timestamp=" + timestamp;
        String data = "appid=" + appId + "&content=" + postInfo + "&timestamp=" + timestamp + "&uri=" + url;
        SecretKey secretKey = new SecretKeySpec(secret.getBytes(), "HmacMD5");
        Mac mac = null;
        try {