From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java |   63 +++++++++++++------------------
 1 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java b/springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java
index ba281ef..5a8c929 100644
--- a/springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java
+++ b/springboot/src/main/java/com/java110/boot/controller/app/charge/NotifyDingDingChargeController.java
@@ -6,6 +6,7 @@
 import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto;
 import com.java110.intf.common.INotifyChargeV1InnerServiceSMO;
 import com.java110.utils.cache.MappingCache;
+import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -18,8 +19,16 @@
 import javax.servlet.http.HttpServletRequest;
 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);
@@ -44,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" +
@@ -57,9 +66,17 @@
         notifyChargeOrderDto.setMachineCode(id);
         notifyChargeOrderDto.setPortCode(port);
         notifyChargeOrderDto.setBodyParam(postInfo);
+        notifyChargeOrderDto.setReason(param.getString("typeName"));
 
-        return notifyChargeV1InnerServiceSMOImpl.finishCharge(notifyChargeOrderDto);
+        ResultVo resultVo = null;
+        resultVo = notifyChargeV1InnerServiceSMOImpl.finishCharge(notifyChargeOrderDto);
 
+        if (resultVo.getCode() == ResultVo.CODE_OK) {
+            resultVo.setCode(200);
+            resultVo.setMsg("success");
+        }
+
+        return ResultVo.createResponseEntity(resultVo);
     }
 
     /**
@@ -73,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" +
@@ -89,40 +106,12 @@
 
     }
 
-    /**
-     * <p>鏀粯鍥炶皟Api</p>
-     *
-     * @param request
-     * @throws Exception
-     */
-    @RequestMapping(path = "/{id}/{port}/event", method = RequestMethod.POST)
-    public ResponseEntity<String> chargeHeartbeat(
-            @PathVariable String id,
-            @PathVariable String port,
-            @RequestBody String postInfo,
-            HttpServletRequest request) {
-        if (!validateSign(request)) {
-            return new ResponseEntity<>("{\n" +
-                    "\"code\" : -1,\n" +
-                    "\"msg\" : \"閴存潈澶辫触\"\n" +
-                    "}", HttpStatus.OK);
-        }
-
-        NotifyChargeOrderDto notifyChargeOrderDto = new NotifyChargeOrderDto();
-        notifyChargeOrderDto.setMachineCode(id);
-        notifyChargeOrderDto.setPortCode(port);
-        notifyChargeOrderDto.setBodyParam(postInfo);
-
-        return notifyChargeV1InnerServiceSMOImpl.chargeHeartBeat(notifyChargeOrderDto);
-
-    }
-
-    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 {

--
Gitblit v1.8.0