20220805 部署准备

doc/短信黑名单接口说明文档.md → doc/接口文档/短信黑名单接口说明文档.md

@@ -40,19 +40,6 @@ Content-Type: application/json
 }
 ```
 
-- 测试环境
-
-```http
-POST HTTP://133.96.94.108:12110/sms/blacklist/api/remove/
-Content-Type: application/json
-
-{
-    "phone": "13739798862",
-    "fromSystem": "test",
-    "operator": "test01"
-}
-```
-
 ```json
 HTTP/1.1 200 
 Content-Type: application/json

doc/部署文档/正式环境/bin/run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+nohup java -jar /data1/sms_blk/sms_blk_api-exec.jar > /data1/sms_blk/output.out 2>&1 &

doc/部署文档/正式环境/bin/smsblk.properties

@@ -0,0 +1,8 @@
+blkServer.ipAddress=10.17.182.24
+blkServer.port=50000
+blkServer.systemId=sass2
+blkServer.password=HCdqs!23
+blkServer.heartbeatDelay=15000
+
+# 超时设置
+blkServer.connectTimeout=3000

doc/部署文档/正式环境/正式环境部署文档.md

@@ -0,0 +1 @@
+# 正式环境部署文档

sms_blk_api/bin/test/application.properties → doc/部署文档/测试环境/bin/application.properties

@@ -1,3 +1,3 @@
-server.port=12110
+server.port=12120
 
 logging.level.com.nokia=debug

doc/部署文档/测试环境/bin/run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+nohup java -jar /data1/sms_blk/sms_blk_api-exec.jar > /data1/sms_blk/output.out 2>&1 &

doc/部署文档/测试环境/bin/stop.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+for i in $(ps -ef|grep sms_blk_api-exec.jar |grep -v grep|awk '{print $2}')
+do 
+kill -9 $i;
+done
+

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

@@ -0,0 +1,41 @@
+# 测试环境部署文档
+
+```sh
+# 部署目录 192.168.50.3:/data1/sms_blk/
+# 启动命令 
+sh run.sh
+# 停止命令
+sh stop.sh
+
+# 为了保证能开对测试环境的访问，同时添加了在133.96.94.108上的nginx映射到12110端口
+```
+
+## 接口测试
+
+- 黑名单解除接口
+
+本机访问
+
+```http
+POST HTTP://192.168.50.3:12120/sms/blacklist/api/remove/
+Content-Type: application/json
+
+{
+    "phone": "13739798862",
+    "fromSystem": "test",
+    "operator": "test01"
+}
+```
+
+nginx转发
+
+```http
+POST HTTP://133.96.94.108:12110/sms/blacklist/api/remove/
+Content-Type: application/json
+
+{
+    "phone": "13739798862",
+    "fromSystem": "test",
+    "operator": "test01"
+}
+```

sms_blk_api/bin/application.properties

@@ -1,3 +0,0 @@
-server.port=12110
-
-logging.level.com.nokia=debug

sms_blk_api/bin/run.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-nohup java -jar /data1/s130/sms_blk/sms_blk_api-exec.jar > /data1/s130/sms_blk/output.out 2>&1 &

sms_blk_api/bin/smsblk.properties

@@ -1,8 +0,0 @@
-blkServer.ipAddress=localhost
-blkServer.port=50000
-blkServer.systemId=smsTousu
-blkServer.password=123456
-blkServer.heartbeatDelay=5000
-
-# 超时设置
-blkServer.connectTimeout=3000

sms_blk_api/bin/test/run_test.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-nohup java -jar /data1/s130/sms_blk/test/sms_blk_api-exec-test.jar > /data1/s130/sms_blk/test/output.out 2>&1 &

sms_blk_api/bin/test/stop_test.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-for i in $(ps -ef|grep sms_blk_api-exec-test.jar |grep -v grep|awk '{print $2}')
-do 
-kill -9 $i;
-done
-

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

@@ -33,8 +33,7 @@ public class BlkController {
         // 尝试解除黑名单
         log.debug("入参 -- {} ", params);
         DelBlkResp delBlkResp = new DelBlkResp();
-        // if (socketClientService.delBlk(params.getPhone())) {
-        if (params.getPhone().equals("13231899751")) {
+        if (socketClientService.delBlk(params.getPhone())) {
             delBlkResp.setDelBlkSuccess(true);
             delBlkResp.setDelBlkMessage("成功解除黑名单");
         } else {

sms_blk_api/src/main/java/com/nokia/sms/vo/RequestParams.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 @Data
 public class RequestParams {
-
     private String phone;
     private String fromSystem;
     private String operator;

sms_blk_api/src/main/resources/smsblk.properties

@@ -1,8 +1,8 @@
-blkServer.ipAddress=localhost
+blkServer.ipAddress=10.17.182.24
 blkServer.port=50000
-blkServer.systemId=smsTousu
-blkServer.password=123456
-blkServer.heartbeatDelay=5000
+blkServer.systemId=sass2
+blkServer.password=HCdqs!23
+blkServer.heartbeatDelay=15000
 
 # 超时设置
 blkServer.connectTimeout=3000

sms_blk_server/bin/run.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-nohup java -jar /data1/s130/sms_blacklist/smsBlacklistRemoveApi-exec.jar > /data1/s130/sms_blacklist/output.out 2>&1 &

sms_blk_server/bin/stop.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-for i in $(ps -ef|grep smsBlacklistRemoveApi-exec.jar |grep -v grep|awk '{print $2}')
-do 
-kill -9 $i;
-done
-

sms_blk_server/bin/test/run_test.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-nohup java -jar /data1/s130/sms_blacklist/test/smsBlacklistRemoveApi-exec_test.jar > /data1/s130/sms_blacklist/test/output.out 2>&1 &

sms_blk_server/bin/test/stop_test.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-for i in $(ps -ef|grep smsBlacklistRemoveApi-exec_test.jar |grep -v grep|awk '{print $2}')
-do 
-kill -9 $i;
-done
-