20220803 v1.0 能开测试版本

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

@@ -14,14 +14,42 @@ Content-Type: application/json
 
 ## 接口2： 黑名单解除接口
 
+- 本地访问
+
 ```http
-POST HTTP://127.0.0.1:12110/sms/blacklist/api/remove/
+POST HTTP://127.0.0.1:12120/sms/blacklist/api/remove/
 Content-Type: application/json
 
 {
-    "phoneNumber": "13231899751",
+    "phone": "13739798862",
+    "fromSystem": "test",
+    "operator": "test01"
+}
+```
+
+- 正式环境
+
+```http
+POST HTTP://133.96.94.108:12120/sms/blacklist/api/remove/
+Content-Type: application/json
+
+{
+    "phone": "13739798862",
+    "fromSystem": "test",
+    "operator": "test01"
+}
+```
+
+- 测试环境
+
+```http
+POST HTTP://133.96.94.108:12110/sms/blacklist/api/remove/
+Content-Type: application/json
+
+{
+    "phone": "13739798862",
     "fromSystem": "test",
-    "operatorId": "test01"
+    "operator": "test01"
 }
 ```
 
@@ -42,3 +70,22 @@ Connection: close
   }
 }
 ```
+
+```json
+HTTP/1.1 200 
+Content-Type: application/json
+Transfer-Encoding: chunked
+Date: Wed, 03 Aug 2022 01:10:35 GMT
+Connection: close
+
+{
+  "success": true,
+  "code": 200,
+  "message": "成功",
+  "data": {
+    "delBlkSuccess": false,
+    "delBlkMessage": "解除黑名单失败"
+  }
+}
+
+```

sms_blk_api/bin/application.properties

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

sms_blk_api/bin/run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-nohup java -jar /data1/s130/sms_blacklist/smsBlacklistRemoveApi-exec.jar > /data1/s130/sms_blacklist/output.out 2>&1 &
+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

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

sms_blk_api/bin/stop.sh

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

sms_blk_api/bin/test/application.properties

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

sms_blk_api/bin/test/run_test.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-nohup java -jar /data1/s130/sms_blacklist/test/smsBlacklistRemoveApi-exec_test.jar > /data1/s130/sms_blacklist/test/output.out 2>&1 &
+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,5 +1,5 @@
 #!/bin/bash
-for i in $(ps -ef|grep smsBlacklistRemoveApi-exec_test.jar |grep -v grep|awk '{print $2}')
+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/pom.xml

@@ -31,7 +31,19 @@
     </dependencies>
 
     <build>
-        
+        <finalName>sms_blk_api</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- 把systemPath指定的依赖一起打包到BOOT-INF/lib -->
+                    <includeSystemScope>true</includeSystemScope>
+                    <!-- 打包1个带exec的可执行jar包和一个不带exec的可作为依赖的jar包 -->
+                    <classifier>exec</classifier>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
 </project>

sms_blk_api/src/main/java/com/nokia/sms/config/BlkConfig.java

@@ -3,13 +3,15 @@ package com.nokia.sms.config;
 import java.io.IOException;
 import java.util.Properties;
 
+import org.springframework.core.io.ClassPathResource;
+
 public class BlkConfig {
 
     private static final Properties PROPERTIES = new Properties();
 
     static {
         try {
-            PROPERTIES.load(ClassLoader.getSystemResourceAsStream("smsblk.properties"));
+            PROPERTIES.load(new ClassPathResource("smsblk.properties").getInputStream());
         } catch (IOException e) {
             e.printStackTrace();
         }

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

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

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

@@ -49,7 +49,7 @@ public class SocketClientService {
 
     public SocketClientService(ThreadPoolTaskScheduler socketScheduler) throws ConnectFailedException {
         this.socketScheduler = socketScheduler;
-        connect();
+        // connect();
     }
 
     /*

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

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class RequestParams {
 
-    private String phoneNumber;
+    private String phone;
     private String fromSystem;
-    private String operatorId;
+    private String operator;
 }

sms_blk_api/src/main/resources/application.properties

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