瀏覽代碼

新团配置

yumeng 10 月之前
父節點
當前提交
4ca3ec807b

+ 1 - 0
ruixuan-admin/src/main/resources/application-dev.yml

@@ -231,6 +231,7 @@ accept:
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
   yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
+  rx2: 5AR6Kz61PEfNDcTV3Zb7dA==
 
 ownership:
   id: ruixuan

+ 1 - 0
ruixuan-admin/src/main/resources/application-mgs.yml

@@ -217,6 +217,7 @@ accept:
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
   yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
+  rx2: 5AR6Kz61PEfNDcTV3Zb7dA==
 
 ownership:
   id: miaogousi

+ 1 - 0
ruixuan-admin/src/main/resources/application-prod.yml

@@ -217,6 +217,7 @@ accept:
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
   yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
+  rx2: 5AR6Kz61PEfNDcTV3Zb7dA==
 
 ownership:
   id: ruixuan

+ 1 - 0
ruixuan-admin/src/main/resources/application-rocket.yml

@@ -217,6 +217,7 @@ accept:
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
   yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
+  rx2: 5AR6Kz61PEfNDcTV3Zb7dA==
 
 ownership:
   id: rocket

+ 1 - 0
ruixuan-admin/src/main/resources/application-yufu.yml

@@ -217,6 +217,7 @@ accept:
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
   yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
+  rx2: 5AR6Kz61PEfNDcTV3Zb7dA==
 
 ownership:
   id: yufu

+ 1 - 0
ruixuan-admin/src/main/resources/application-yuxiu.yml

@@ -217,6 +217,7 @@ accept:
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
   yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
+  rx2: 5AR6Kz61PEfNDcTV3Zb7dA==
 
 ownership:
   id: yuxiu

+ 1 - 0
ruixuan-admin/src/main/resources/application-zhishui.yml

@@ -217,6 +217,7 @@ accept:
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
   yufuPrivateKey: sFZaU+J4d/jzC3p0zVCRuA==
   yuXiuPrivateKey: NuclZ8h4wS1FFs+7X5DyRg==
+  rx2: 5AR6Kz61PEfNDcTV3Zb7dA==
 
 
 ownership:

+ 36 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -79,6 +79,8 @@ public class SupplyChainController extends BaseController {
 
     @Value("${accept.zhiShuiPrivateKey}")
     private String zhiShuiPrivateKey;
+    @Value("${accept.rx2}")
+    private String rx2PrivateKey;
 
 
     @Value("${ownership.id}")
@@ -2385,6 +2387,40 @@ public class SupplyChainController extends BaseController {
     }
 
 
+    @PostMapping(value = "/rx2")
+    public Map<String, Object> rx2(@RequestBody String eventsEncoded) {
+        try {
+            logger.info("RX2食品消息订阅");
+            String events = PlatformEventSecurityUtil.decode(eventsEncoded, rx2PrivateKey);
+            JSONObject eventJSon = JSONObject.parseObject(events);
+            fxNowService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        if (!Check.isNull(eventJSon)) {
+                            String event = eventJSon.getString("event");
+                            if ("kwaishop_distribute_order_change_notify".equals(event)) {
+                                supplyChainService.updateOrder(eventJSon);
+                            } else if ("kwaishop_distribute_activity_item_change".equals(event)) {
+                                supplyChainService.updateItem(eventJSon);
+                            }
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        } catch (KsMerchantApiException e) {
+            e.printStackTrace();
+        }
+        //返回成功
+        Map<String, Object> result = new HashMap<>();
+        result.put("result", 1);
+        return result;
+
+    }
+
+
     @PostMapping(value = "/yufuAccept")
     public Map<String, Object> yufuAccept(@RequestBody String eventsEncoded) {
         try {