Merge remote-tracking branch 'origin/dev' into dev

virtual-patient-rasa/src/main/java/com/supervision/VirtualPatientRasaApplication.java

@@ -1,4 +1,4 @@
-package com.superversion.rasa;
+package com.supervision;
 
 import com.supervision.config.WebConfig;
 import org.mybatis.spring.annotation.MapperScan;
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.FilterType;
 
 @SpringBootApplication
 @MapperScan(basePackages = {"com.supervision.**.mapper"})
-@ComponentScan(basePackages = {"com.superversion"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {WebConfig.class}))
+@ComponentScan(basePackages = {"com.supervision"},excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {WebConfig.class}))
 public class VirtualPatientRasaApplication {
 
     public static void main(String[] args) {

virtual-patient-rasa/src/main/java/com/supervision/rasa/config/ThreadPoolExecutorConfig.java

@@ -1,4 +1,4 @@
-package com.superversion.rasa.config;
+package com.supervision.rasa.config;
 
 import java.util.concurrent.*;
 

virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaCmdController.java

@@ -1,8 +1,8 @@
-package com.superversion.rasa.controller;
+package com.supervision.rasa.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.superversion.rasa.pojo.vo.RasaArgument;
-import com.superversion.rasa.service.RasaCmdService;
+import com.supervision.rasa.pojo.vo.RasaArgument;
+import com.supervision.rasa.service.RasaCmdService;
 import com.supervision.exception.BusinessException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.*;
-import java.net.ServerSocket;
 import java.util.concurrent.*;
 
 @Api(tags = "rasa文件保存")

virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaFileController.java

@@ -1,7 +1,7 @@
-package com.superversion.rasa.controller;
+package com.supervision.rasa.controller;
 
 
-import com.superversion.rasa.service.RasaFileService;
+import com.supervision.rasa.service.RasaFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -9,9 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
 import java.io.IOException;
-import java.util.UUID;
 
 @Api(tags = "rasa文件保存")
 @RestController

virtual-patient-rasa/src/main/java/com/supervision/rasa/controller/RasaTalkController.java

@@ -1,6 +1,6 @@
-package com.superversion.rasa.controller;
+package com.supervision.rasa.controller;
 
-import com.superversion.rasa.service.RasaTalkService;
+import com.supervision.rasa.service.RasaTalkService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/RasaReqDTO.java

@@ -1,4 +1,4 @@
-package com.superversion.rasa.pojo.dto;
+package com.supervision.rasa.pojo.dto;
 
 import lombok.Data;
 

virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/dto/RasaResDTO.java

@@ -1,4 +1,4 @@
-package com.superversion.rasa.pojo.dto;
+package com.supervision.rasa.pojo.dto;
 
 import lombok.Data;
 

virtual-patient-rasa/src/main/java/com/supervision/rasa/pojo/vo/RasaArgument.java

@@ -1,4 +1,4 @@
-package com.superversion.rasa.pojo.vo;
+package com.supervision.rasa.pojo.vo;
 
 import lombok.Data;
 

virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaCmdService.java

@@ -1,6 +1,6 @@
-package com.superversion.rasa.service;
+package com.supervision.rasa.service;
 
-import com.superversion.rasa.pojo.vo.RasaArgument;
+import com.supervision.rasa.pojo.vo.RasaArgument;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;

virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaFileService.java

@@ -1,4 +1,4 @@
-package com.superversion.rasa.service;
+package com.supervision.rasa.service;
 
 import org.springframework.web.multipart.MultipartFile;
 

virtual-patient-rasa/src/main/java/com/supervision/rasa/service/RasaTalkService.java

@@ -1,4 +1,4 @@
-package com.superversion.rasa.service;
+package com.supervision.rasa.service;
 
 import java.util.List;
 

virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaCmdServiceImpl.java

@@ -1,20 +1,15 @@
-package com.superversion.rasa.service.impl;
+package com.supervision.rasa.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
-import com.superversion.rasa.config.ThreadPoolExecutorConfig;
-import com.superversion.rasa.pojo.vo.RasaArgument;
-import com.superversion.rasa.service.RasaCmdService;
-import com.supervision.model.RasaModelInfo;
+import com.supervision.rasa.config.ThreadPoolExecutorConfig;
+import com.supervision.rasa.pojo.vo.RasaArgument;
+import com.supervision.rasa.service.RasaCmdService;
 import com.supervision.model.User;
-import com.supervision.service.RasaModeService;
 import com.supervision.service.UserService;
-import com.supervision.service.impl.UserServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.omg.CORBA.TRANSACTION_MODE;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaFileServiceImpl.java

@@ -1,8 +1,8 @@
-package com.superversion.rasa.service.impl;
+package com.supervision.rasa.service.impl;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ZipUtil;
-import com.superversion.rasa.service.RasaFileService;
+import com.supervision.rasa.service.RasaFileService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

virtual-patient-rasa/src/main/java/com/supervision/rasa/service/impl/RasaTalkServiceImpl.java

@@ -1,10 +1,10 @@
-package com.superversion.rasa.service.impl;
+package com.supervision.rasa.service.impl;
 
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
-import com.superversion.rasa.pojo.dto.RasaReqDTO;
-import com.superversion.rasa.pojo.dto.RasaResDTO;
-import com.superversion.rasa.service.RasaTalkService;
+import com.supervision.rasa.pojo.dto.RasaReqDTO;
+import com.supervision.rasa.pojo.dto.RasaResDTO;
+import com.supervision.rasa.service.RasaTalkService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

virtual-patient-rasa/src/main/java/com/supervision/rasa/util/PortUtil.java

@@ -1,12 +1,9 @@
-package com.superversion.rasa.util;
+package com.supervision.rasa.util;
 
-import jdk.nashorn.internal.runtime.regexp.JoniRegExp;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.net.Socket;
-import java.util.TreeMap;
-import java.util.function.Predicate;
 
 @Slf4j
 public class PortUtil {

virtual-patient-rasa/src/test/java/com/supervision/rasa/VirtualPatientRasaApplicationTests.java

@@ -1,4 +1,4 @@
-package com.superversion.rasa;
+package com.supervision.rasa;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;