yinruoxi

修改：
    1.Sonar代码检测错误修改

xueyi-common/xueyi-common-core/src/main/java/com/xueyi/common/core/utils/file/FileUtil.java

@@ -234,27 +234,21 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
             destFile.delete();
         }
         //将文件合并
-        FileOutputStream fos = null;
-        try {
-            fos = new FileOutputStream(destFile);
+        try (FileOutputStream fos = new FileOutputStream(destFile)) {
             for (File file : files) {
                 logger.info("merge file:{},fileSize:{}", file.getAbsolutePath(),FileUtil.size(file));
-                FileInputStream fis = new FileInputStream(file);
-                byte[] bytes = new byte[1024];
-                int len = 0;
-                while ((len = fis.read(bytes)) != -1) {
-                    fos.write(bytes, 0, len);
+                try (FileInputStream fis = new FileInputStream(file);){
+                    byte[] bytes = new byte[1024];
+                    int len = 0;
+                    while ((len = fis.read(bytes)) != -1) {
+                        fos.write(bytes, 0, len);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-                fis.close();
             }
         } catch (Exception e) {
             e.printStackTrace();
-        } finally {
-            try {
-                fos.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
         }
     }
 

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/netty/client/NettyClient.java

@@ -76,8 +76,7 @@ public class NettyClient {
     public void connect() {
 
 
-        EventLoopGroup workerGroup = new NioEventLoopGroup();
-        try {
+        try (EventLoopGroup workerGroup = new NioEventLoopGroup()){
             HttpUrl authUrl = getAuthorizationUrl(hostUrl, APIKEY, APISecret);
             String url = authUrl.toString().replace("https://","wss://").replace("http://","ws://");
             URI uri = new URI(url);
@@ -144,10 +143,11 @@ public class NettyClient {
             }
             channel.writeAndFlush("介绍下自己");
 //            mChannelFuture.channel().closeFuture().sync();
+        }catch (InterruptedException ie) {
+            ie.printStackTrace();
+            Thread.currentThread().interrupt();
         } catch (Exception e) {
             e.printStackTrace();
-        } finally {
-            workerGroup.shutdownGracefully();
         }
     }
 

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/netty/client/WebSocketClient.java

@@ -78,6 +78,9 @@ public class WebSocketClient extends WebSocketListener {
                 WebSocket webSocket = okHttpClient.newWebSocket(request,new WebSocketClient());
                 LOCK.wait();
                 System.out.println("查询完成");
+            } catch (InterruptedException ie) {
+                ie.printStackTrace();
+                Thread.currentThread().interrupt();
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -260,7 +263,7 @@ public class WebSocketClient extends WebSocketListener {
 
                         if (INSTANCE.redisTemplate.hasKey("gpt:websocket:1")) {
                             DmWebSocketMessageVo message = (DmWebSocketMessageVo) INSTANCE.redisTemplate.opsForValue().get("gpt:websocket:1");
-                            if (StringUtils.isNotEmpty(message.getTemplate()) && message.getTemplate().equals("birthday")) {
+                            if (message != null && StringUtils.isNotEmpty(message.getTemplate()) && message.getTemplate().equals("birthday")) {
                                 JSONObject birthdayJo = new JSONObject();
                                 birthdayJo.put("content", answer);
                                 birthdayJo.put("timestamp", message.getFormat().get("timestamp"));

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/context/TerminalSecurityContextHolder.java

@@ -39,4 +39,8 @@ public class TerminalSecurityContextHolder {
         }
         return map;
     }
+
+    public static void remove() {
+        THREAD_LOCAL.remove();
+    }
 }

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/SparkServiceImpl.java

@@ -33,6 +33,7 @@ public class SparkServiceImpl implements ISysLlmService {
 
             } catch (InterruptedException e) {
                 e.printStackTrace();
+                Thread.currentThread().interrupt();
             }
             String result = redisTemplate.opsForValue().get("group:websocket:content");
             LlmResponse response = new LlmResponse();

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/template/FreeChatTemplate.java

@@ -53,7 +53,7 @@ public class FreeChatTemplate implements BaseTemplate{
 
             String[] blockedWord = {"科大讯飞", "认知模型", "抱歉","认知智能模型"};
             for(String a :blockedWord){
-                if(result.contains(a)){
+                if(result != null && result.contains(a)){
                     result = "";
                     break;
                 }