feat: 接口割接

sms_blk_api/build-dir/run.sh

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

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

@@ -50,7 +50,7 @@ public class BlkController {
         }
 
         // 解黑失败
-        if (!socketClientService.delBlk(params.getPhone())) {
+        if (!socketClientService.delBlk("86" + params.getPhone())) {
             return R.ok().data(delBlkResp);
         }
 

sms_blk_api/src/main/java/com/nokia/sms/message/ClientMessageUtil.java

@@ -1,11 +1,5 @@
 package com.nokia.sms.message;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import com.nokia.sms.entity.BindRespStatus;
 import com.nokia.sms.entity.CommandId;
 import com.nokia.sms.entity.DelBlkBody;
@@ -13,6 +7,12 @@ import com.nokia.sms.entity.DelBlkRespStatus;
 import com.nokia.sms.exception.ParseException;
 import com.nokia.sms.exception.PhoneNumberCanNotBeNullException;
 
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 public class ClientMessageUtil {
 
     private static final DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
@@ -24,7 +24,7 @@ public class ClientMessageUtil {
         // 初始化header
         MessageHeader header = new MessageHeader();
         // header 12 + body 16+20 所以是48字节
-        header.setMessageLength(38);
+        header.setMessageLength(48);
         header.setCommandId(CommandId.SMIT_BIND);
         // 所有的初始连接需要从0开始
         header.setSequenceNumber(0L);
@@ -45,7 +45,7 @@ public class ClientMessageUtil {
         System.out.println("authCodeString : " + authCodeString);
         MessageDigest digest = MessageDigest.getInstance("SHA-1");
         // sha1以后为20字节
-        System.arraycopy(digest.digest(authCodeString.getBytes()), 0, message, 18, 20);
+        System.arraycopy(digest.digest(authCodeString.getBytes()), 0, message, 28, 20);
         return message;
     }
 
@@ -57,7 +57,7 @@ public class ClientMessageUtil {
         // 初始化header
         MessageHeader header = new MessageHeader();
         // header 12 + body 21 + 1 + 1 + 1 所以是36字节
-        header.setMessageLength(27);
+        header.setMessageLength(36);
         header.setCommandId(CommandId.SMIT_DELBLK);
         // 从客户端获取下一个序号
         header.setSequenceNumber(sequenceNumber);
@@ -73,9 +73,9 @@ public class ClientMessageUtil {
         byte[] blkNumByteArray = delBlkBody.getBlkNum().getBytes();
         System.arraycopy(blkNumByteArray, 0, message, 12, blkNumByteArray.length);
         // 填充 block_type
-        message[24] = delBlkBody.getBlock_type();
-        message[25] = delBlkBody.getBlk_type();
-        message[26] = delBlkBody.getProvince_code();
+        message[33] = delBlkBody.getBlock_type();
+        message[34] = delBlkBody.getBlk_type();
+        message[35] = delBlkBody.getProvince_code();
         return message;
     }
 

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

@@ -14,7 +14,8 @@ import org.springframework.web.client.RestTemplate;
 @Slf4j
 @Service
 public class QueryService {
-    public static final String URL = "http://10.17.182.24:8082/task/queryBlack";
+//    public static final String URL = "http://10.17.182.24:8082/task/queryBlack";
+    public static final String URL = "http://10.17.183.121:18081/task/queryBlack";
 
     public QueryResp query(QueryDTO params) {
         RestTemplate restTemplate = new RestTemplate();

sms_blk_api/src/main/resources/smsblk.properties

@@ -1,9 +1,18 @@
-#blkServer.ipAddress=127.0.0.1
-blkServer.ipAddress=10.17.182.24
-blkServer.port=50001
-# 账号/密码：sass2/HCdqs!23 sass2/gFdqsD13
-blkServer.systemId=sass2
-blkServer.password=gFdqsD13
+##blkServer.ipAddress=127.0.0.1
+#blkServer.ipAddress=10.17.182.24
+#blkServer.port=50001
+## 账号/密码：sass2/HCdqs!23 sass2/gFdqsD13
+#blkServer.systemId=sass2
+#blkServer.password=gFdqsD13
+#blkServer.heartbeatDelay=15000
+#
+## 超时设置
+#blkServer.connectTimeout=3000
+
+blkServer.ipAddress=10.17.183.121
+blkServer.port=18082
+blkServer.systemId=user
+blkServer.password=Fd2#@&
 blkServer.heartbeatDelay=15000
 
 # 超时设置