From 43c61bcae067778d50e2d8124a7fe722d8c05437 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期二, 27 九月 2022 11:56:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1ca78f7..91d9d9e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -205,7 +205,7 @@
 
     /*...........................璧e窞鏂板..............浠ヤ笅.............璧e窞鏂板...........................*/
     @PostMapping("/rpc/watchDog/auth/v1")
-    @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
+//    @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
     public synchronized R hostName(@RequestHeader(required = false) String appkey,
                                    @RequestBody(required = false) HeartBeat param,
                                    HttpServletRequest request){
@@ -221,8 +221,8 @@
         return R.ok();
     }
 
-    @PostMapping("/rcp/pakIn/auth/v1")
-    @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙h皟鐢�")
+    @PostMapping("/rpc/pakIn/auth/v1")
+//    @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙h皟鐢�")
     public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                    @RequestBody(required = false) CombParam param,
                                    HttpServletRequest request){
@@ -238,9 +238,26 @@
         map.put("isComplete",true);
         return R.ok(map);
     }
+    @PostMapping("/rpc/pakOut/auth/v1")
+//    @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙h皟鐢�")
+    public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
+                                   @RequestBody(required = false) CombParam param,
+                                   HttpServletRequest request){
+
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        //鍑哄簱寮�濮�
+        openService.combPackOut(param);
+
+        Map<String,Boolean> map=new HashMap<>();
+        map.put("isComplete",true);
+        return R.ok(map);
+    }
 
     @PostMapping("/rpv/infoReview/auth/v1")
-    @AppAuth(memo = "娴嬭瘯鏉$爜淇℃伅澶嶆牳璇锋眰")
+//    @AppAuth(memo = "娴嬭瘯鏉$爜淇℃伅澶嶆牳璇锋眰")
     public synchronized R infoReview(@RequestHeader(required = false) String appkey,
                                    @RequestBody(required = false) Review param,
                                    HttpServletRequest request){
@@ -254,7 +271,7 @@
         return R.ok();
     }
     @PostMapping("/rpv/testFinish/auth/v1")
-    @AppAuth(memo = "娴嬭瘯瀹屾垚")
+//    @AppAuth(memo = "娴嬭瘯瀹屾垚")
     public synchronized R testFinish(@RequestHeader(required = false) String appkey,
                                 @RequestBody(required = false) Review param,
                                 HttpServletRequest request){

--
Gitblit v1.9.1