20220819

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

@@ -18,6 +18,7 @@ sh stop.sh
 ```
 
 - sms_blk_interface-exec.jar
+
 ## 部署前要把测试环境停掉，修改数据库连接为正式环境的配置，把 192.168.10.7:/data1/sms_blk/sms_blk_interface/download/ 下的文件入库，再部署正式环境，需要在xxl启动任务
 
 ```sh

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

@@ -4,8 +4,8 @@ import com.nokia.common.http.R;
 import com.nokia.sms.service.QueryService;
 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.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,7 +17,6 @@ import java.util.Map;
 /**
  * 黑名单查询及解除接口类
  */
-@Slf4j
 @RestController
 @RequestMapping("/sms/blacklist/api/")
 public class BlkController {
@@ -61,6 +60,7 @@ public class BlkController {
      */
     @PostMapping("query")
     public R query(@RequestBody RequestParams params) {
-        return queryService.query(params);
+        QueryResp resp = queryService.query(params);
+        return R.ok().data(resp);
     }
 }

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

@@ -1,9 +1,7 @@
 package com.nokia.sms.service;
 
-import com.nokia.common.http.R;
 import com.nokia.sms.vo.QueryResp;
 import com.nokia.sms.vo.RequestParams;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -12,7 +10,6 @@ import org.springframework.util.CollectionUtils;
 import java.util.Collections;
 import java.util.Map;
 
-@Slf4j
 @Service
 public class QueryService {
     private final JdbcTemplate jdbcTemplate;
@@ -21,7 +18,7 @@ public class QueryService {
         this.jdbcTemplate = jdbcTemplate;
     }
 
-    public R query(RequestParams params) {
+    public QueryResp query(RequestParams params) {
         Map<String, Object> current = getBlackListInfo(params.getPhone());
         QueryResp r = new QueryResp();
         r.setQuerySuccess(false);
@@ -30,12 +27,12 @@ public class QueryService {
             jdbcTemplate.queryForMap(sql, params.getPhone());
         } catch (EmptyResultDataAccessException e) {
             r.setQueryMessage("无加黑记录");
-            return R.ok().data(r);
+            return r;
         }
 
         if (CollectionUtils.isEmpty(current)) {
             r.setQueryMessage("曾在黑名单，已解黑");
-            return R.ok().data(r);
+            return r;
         }
 
         QueryResp.QueryResultDTO dto = new QueryResp.QueryResultDTO();
@@ -47,7 +44,7 @@ public class QueryService {
         r.setQuerySuccess(true);
         r.setQueryMessage("当前在黑名单");
         r.setQueryResult(dto);
-        return R.ok().data(r);
+        return r;
     }
 
     /**

sms_blk_interface/src/main/java/com/nokia/common/ssh/SSHUtil.java

@@ -54,6 +54,7 @@ public class SSHUtil {
     /**
      * 获取文件列表
      */
+    @SuppressWarnings("rawtypes")
     public List<String> ls(String path) throws JSchException, SftpException {
         session = getConnectSession();
         channelSftp = (ChannelSftp) session.openChannel("sftp");
@@ -65,7 +66,6 @@ public class SSHUtil {
             if (".".equals(fileName) || "..".equals(fileName)) {
                 continue;
             }
-
             fileNameList.add(fileName);
             channelSftp.quit();
             session.disconnect();