Browse Source

修改算法对比

Huhu 3 years ago
parent
commit
0fb2d04122

+ 4 - 2
src/main/java/io/renren/modules/sys/controller/algs/algTrainController.java

@@ -610,7 +610,7 @@ public class algTrainController {
      */
     @GetMapping("/getHost")
     public R getHost(){
-        return R.ok().put("host",host);
+        return R.ok().put("host",remoteDocker);
     }
 
     /**
@@ -619,8 +619,10 @@ public class algTrainController {
      * @return
      */
     @GetMapping("/deleteContainer")
-    public R deleteContainer(String containerId) throws DockerException, InterruptedException {
+    public R deleteContainer(String containerId,String port) throws DockerException, InterruptedException {
         DockerClientUtils.deleteContainer(containerId);
+        ServerPort serverPort=new ServerPort(Long.parseLong(port),0);
+        serverPortService.updateServerPort(serverPort);//将端口释放
         return R.ok();
     }
 

+ 5 - 5
src/main/resources/application.yml

@@ -27,13 +27,13 @@ host-password: root
 host-basepath: /opt/uploadFile
 host-port: 22
 key-needed: false
-key-location: D:/Program Files/secretKey/lab1
+key-location: F:/Program Files/secretKey/lab1
 
 #docker证书存放路径
-docker_ca: D:/aiplat/school_ca
+docker_ca: F:/aiplat/school_ca
 
 #minio暂存文件地址
-tempFileLocation: D:/aiplat/test0708/testPython.py
+tempFileLocation: F:/aiplat/test0708/testPython.py
 
 #获取kafka实时数据ip与端口
 realTimeKafka1: 10.168.57.10:9092
@@ -44,10 +44,10 @@ realTimeKafka3: 10.168.57.12:9092
 resultToDB: 10.168.57.10
 
 #数据预处理数据集存放文件夹
-datasetLocation: D:/aiplat/demoCSV
+datasetLocation: F:/aiplat/demoCSV
 
 #数据预处理python文件存放文件夹
-dataPreProcessLocation: D:/aiplat/dataPreProcess
+dataPreProcessLocation: F:/aiplat/dataPreProcess
 
 spring:
   # 环境 dev|test|prod