zs

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/AdaptationServiceImpl.java

@@ -84,7 +84,7 @@ public class AdaptationServiceImpl implements AdaptationService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return ServerResponse.success(project);
+        return ServerResponse.success(project1);
     }
 
     @Override

src/main/java/com/zjty/adaptationmaster/base/enums/Const.java

@@ -2,8 +2,10 @@ package com.zjty.adaptationmaster.base.enums;
 
 
 import org.apache.tomcat.websocket.server.WsFilter;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -43,6 +45,6 @@ public class Const {
     public static Map<String,Long> transferCountMap = new ConcurrentHashMap<>();
 
   public static final String MAVENHOME = "D:\\Program Files\\apache-maven-3.5.4-bin\\apache-maven-3.5.4";
-  public static final String CTLPATH = "/home/user/AAS-V9.0/bin/appctl.cmd";
+  public static final String CTLPATH = "/home/taiyuan/桌面/AAS-V9.0/bin/appctl";
   public static final String CTLPWD = "Qwert123!@#";
 }

src/main/java/com/zjty/adaptationmaster/utils/Adaptor.java

@@ -174,9 +174,9 @@ public class Adaptor {
             }
             //originalFileDao.saveAll(originalFiles);
             //adaptationDetailLogEntityDao.saveAll(detailsLogEntities);
-//            Project one = projectDao.getOne(project.getId());
-//            one.setStage(1);
-            Project one = new Project();
+            Project one = projectDao.getOne(project.getId());
+            one.setStage(1);
+            //Project one = new Project();
             return ServerResponse.success("替换成功",one);
         } catch (IOException e) {
             e.printStackTrace();

src/main/resources/application-dev.properties

 # mysql数据库配置
-spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://localhost:5866/adaptation
-spring.datasource.username=sysdba
-spring.datasource.password=highgo@123
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://localhost:3306/adaptation?useSSL=false&serverTimezone=UTC&characterEncoding=utf-8
+spring.datasource.username=root
+spring.datasource.password=root
 

src/main/resources/application.properties

@@ -38,10 +38,12 @@ spring.thymeleaf.cache=false
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/uploads/
 
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
-spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults = false
-
 #highgo
 highgo.driver=org.postgresql.Driver
 highgo.connectionType=postgresql
-highgo.dbName=template1
\ No newline at end of file
+highgo.dbName=template1
+
+#中间件
+MAVENHOME=D:\\Program Files\\apache-maven-3.5.4-bin\\apache-maven-3.5.4
+CTLPATH=/home/taiyuan/桌面/AAS-V9.0/bin/appctl
+CTLPWD=Qwert123!@#
\ No newline at end of file