20220809 测试环境部署查询接口

doc/部署文档/测试环境/测试环境部署文档.md

@@ -13,6 +13,30 @@ sh stop.sh
 
 ## 接口测试
 
+- 接口1： 黑名单查询接口
+
+```http
+POST HTTP://192.168.50.3:12120/sms/blacklist/api/query/
+Content-Type: application/json
+
+{
+    "phoneNumber": "13231899751",
+    "fromSystem": "test"
+}
+```
+
+nginx转发
+
+```http
+POST HTTP://133.96.94.108:12110/sms/blacklist/api/query/
+Content-Type: application/json
+
+{
+    "phoneNumber": "13231899751",
+    "fromSystem": "test"
+}
+```
+
 - 黑名单解除接口
 
 本机访问

sms_blk_api/src/main/java/com/nokia/sms/controller/BlkController.java

@@ -3,6 +3,7 @@ package com.nokia.sms.controller;
 import com.nokia.common.http.R;
 import com.nokia.sms.service.SocketClientService;
 import com.nokia.sms.vo.DelBlkResp;
+import com.nokia.sms.vo.QueryResp;
 import com.nokia.sms.vo.RequestParams;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -31,7 +32,8 @@ public class BlkController {
         // 尝试解除黑名单
         log.debug("入参 -- {} ", params);
         DelBlkResp delBlkResp = new DelBlkResp();
-        if (socketClientService.delBlk(params.getPhone())) {
+        // if (socketClientService.delBlk(params.getPhone())) {
+        if (params.getPhone().equals("13231899751")) {
             delBlkResp.setDelBlkSuccess(true);
             delBlkResp.setDelBlkMessage("成功解除黑名单");
         } else {
@@ -47,6 +49,19 @@ public class BlkController {
      */
     @PostMapping("query")
     public R query(@RequestBody RequestParams params) {
-        return socketClientService.query(params);
+        log.debug("入参 -- {} ", params);
+        QueryResp r = new QueryResp();
+        r.setQuerySuccess(true);
+        r.setQueryMessage("成功");
+        QueryResp.QueryResultDTO dto = new QueryResp.QueryResultDTO();
+        dto.setReason("手动加黑");
+        dto.setStartTime("20220807012233");
+        dto.setEndTime("20220807012233");
+        dto.setSmsData("这是一条推销短信");
+        dto.setDescribe("推销");
+        dto.setAllowToDel(true);
+        r.setQueryResult(dto);
+        log.debug("返回 -- {}", r);
+        return R.ok().data(r);
     }
 }

sms_blk_api/src/main/java/com/nokia/sms/service/QueryService.java

@@ -0,0 +1,8 @@
+package com.nokia.sms.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class QueryService {
+
+}

sms_blk_api/src/main/java/com/nokia/sms/service/SocketClientService.java

@@ -1,6 +1,5 @@
 package com.nokia.sms.service;
 
-import com.nokia.common.http.R;
 import com.nokia.sms.config.BlkConfig;
 import com.nokia.sms.entity.BindRespStatus;
 import com.nokia.sms.entity.DelBlkBody;
@@ -8,8 +7,6 @@ import com.nokia.sms.entity.DelBlkRespStatus;
 import com.nokia.sms.exception.ConnectFailedException;
 import com.nokia.sms.exception.ParseException;
 import com.nokia.sms.message.ClientMessageUtil;
-import com.nokia.sms.vo.QueryResp;
-import com.nokia.sms.vo.RequestParams;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.stereotype.Service;
@@ -50,24 +47,7 @@ public class SocketClientService {
 
     public SocketClientService(ThreadPoolTaskScheduler socketScheduler) throws ConnectFailedException {
         this.socketScheduler = socketScheduler;
-        connect();
-    }
-
-    public R query(RequestParams params) {
-        log.debug("入参 -- {} ", params);
-        QueryResp r = new QueryResp();
-        r.setQuerySuccess(true);
-        r.setQueryMessage("成功");
-        QueryResp.QueryResultDTO dto = new QueryResp.QueryResultDTO();
-        dto.setReason("手动加黑");
-        dto.setStartTime("20220807012233");
-        dto.setEndTime("20220807012233");
-        dto.setSmsData("这是一条推销短信");
-        dto.setDescribe("推销");
-        dto.setAllowToDel(true);
-        r.setQueryResult(dto);
-        log.debug("返回 -- {}", r);
-        return R.ok().data(r);
+        // connect();
     }
 
     /*