20220819

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

@@ -0,0 +1,53 @@
+# 正式环境测试文档
+
+## 接口测试  TODO 需要补充异常情况测试样例
+
+- 查询接口
+
+```http
+POST HTTP://192.168.70.130:12120/sms/blacklist/api/query/
+Content-Type: application/json
+
+{
+    "phoneNumber": "13231899751",
+    "fromSystem": "test"
+}
+```
+
+nginx转发
+
+```http
+POST HTTP://133.96.94.108:12120/sms/blacklist/api/query/
+Content-Type: application/json
+
+{
+    "phoneNumber": "13231899751",
+    "fromSystem": "test"
+}
+```
+
+- 黑名单解除接口
+
+```http
+POST HTTP://192.168.70.130:12120/sms/blacklist/api/remove/
+Content-Type: application/json
+
+{
+    "phone": "13231899751",
+    "fromSystem": "test",
+    "operator": "test01"
+}
+```
+
+- nginx转发
+
+```http
+POST HTTP://133.96.94.108:12120/sms/blacklist/api/remove/
+Content-Type: application/json
+
+{
+    "phone": "13231899751",
+    "fromSystem": "test",
+    "operator": "test01"
+}
+```

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

@@ -7,7 +7,7 @@
 - sms_blk_api.exec.jar
 
 ```sh
-# 部署目录 192.168.50.3:/data1/sms_blk/sms_blk_api/
+# 部署目录 192.168.70.130:/data1/sms_blk/sms_blk_api/
 # 启动命令 
 sh run.sh
 # 停止命令
@@ -22,7 +22,7 @@ sh stop.sh
 ## 部署前要把测试环境停掉，修改数据库连接为正式环境的配置，把 192.168.10.7:/data1/sms_blk/sms_blk_interface/download/ 下的文件入库，再部署正式环境，需要在xxl启动任务
 
 ```sh
-# 部署目录 192.168.50.3:/data1/sms_blk/sms_blk_interface/
+# 部署目录 192.168.70.130:/data1/sms_blk/sms_blk_interface/
 # 启动命令 
 sh run.sh
 # 停止命令
@@ -35,54 +35,6 @@ sh stop.sh
 
 数据库URL jdbc:postgresql://192.168.10.54:5432/sqmmt
 
-## 接口测试
+管理帐号postgres / PgRichr00t!
 
-- 查询接口
-
-```http
-POST HTTP://192.168.70.130:12120/sms/blacklist/api/query/
-Content-Type: application/json
-
-{
-    "phoneNumber": "13231899751",
-    "fromSystem": "test"
-}
-```
-
-nginx转发
-
-```http
-POST HTTP://133.96.94.108:12120/sms/blacklist/api/query/
-Content-Type: application/json
-
-{
-    "phoneNumber": "13231899751",
-    "fromSystem": "test"
-}
-```
-
-- 黑名单解除接口
-
-```http
-POST HTTP://192.168.70.130:12120/sms/blacklist/api/remove/
-Content-Type: application/json
-
-{
-    "phone": "13231899751",
-    "fromSystem": "test",
-    "operator": "test01"
-}
-```
-
-- nginx转发
-
-```http
-POST HTTP://133.96.94.108:12120/sms/blacklist/api/remove/
-Content-Type: application/json
-
-{
-    "phone": "13231899751",
-    "fromSystem": "test",
-    "operator": "test01"
-}
-```
+请先创建帐号 sms_blk / Sms@Richr00t 然后使用新帐号部署

sms_blk_api/src/test/java/com/nokia/sms/ApiTest.java

@@ -1,20 +1,15 @@
 package com.nokia.sms;
 
-import com.nokia.sms.service.QueryService;
-import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-@Slf4j
 @SpringBootTest
 class ApiTest {
     @Autowired
     private JdbcTemplate jdbcTemplate;
-    @Autowired
-    private QueryService queryService;
 
     @Test
     void test() {

sms_blk_interface/src/test/java/com/nokia/sms/SyncTest.java

@@ -1,6 +1,5 @@
 package com.nokia.sms;
 
-import com.nokia.sms.task.SyncTask;
 import de.siegmar.fastcsv.reader.CsvReader;
 import de.siegmar.fastcsv.reader.CsvRow;
 import lombok.extern.slf4j.Slf4j;
@@ -23,11 +22,10 @@ import java.util.stream.Stream;
 class SyncTest {
     @Autowired
     private JdbcTemplate jdbcTemplate;
-    @Autowired
-    private SyncTask syncTask;
 
     @Test
-    void test() {}
+    void test() {
+    }
 
     /**
      * 测试导入数据
@@ -36,7 +34,7 @@ class SyncTest {
     void testImport() {
         String path = "z:/data";
         // 读取目标文件夹下的文件
-        try(Stream<Path> stream = Files.list(Paths.get(path))) {
+        try (Stream<Path> stream = Files.list(Paths.get(path))) {
             List<Path> pathList = stream.collect(Collectors.toList());
             log.info("pathList: {}", pathList);
             for (Path t : pathList) {
@@ -45,7 +43,7 @@ class SyncTest {
                 log.info("file: {}", t.getFileName().toString());
                 try (CsvReader csvReader = CsvReader.builder().build(t, StandardCharsets.UTF_8)) {
                     for (CsvRow row : csvReader) {
-                        Object[] o1 = new Object[]{
+                        Object[] o1 = new Object[] {
                                 row.getField(0),
                                 Integer.valueOf(row.getField(1)),
                                 row.getField(2),
@@ -55,7 +53,7 @@ class SyncTest {
                                 Integer.valueOf(row.getField(6)),
                         };
                         l1.add(o1);
-                        Object[] o2 = new Object[]{
+                        Object[] o2 = new Object[] {
                                 row.getField(0),
                                 Integer.valueOf(row.getField(1)),
                                 row.getField(2),
@@ -66,7 +64,7 @@ class SyncTest {
                                 t.getFileName().toString()
                         };
                         l2.add(o2);
-//                        log.info("{}: {}", row.getOriginalLineNumber(), o1);
+                        // log.info("{}: {}", row.getOriginalLineNumber(), o1);
                     }
                 }
                 log.info("blacklist");