code

src/main/java/org/rcisoft/business/bcode/service/impl/BCodeLxcServiceImpl.java

@@ -78,7 +78,8 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
         /*启动路径*/
         String dockerPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() + File.separator +
                 global.getLxcDockerfilePath() + File.separator + lxc.getUserId()  + File.separator;
-        param.put("lxcPath",dockerPath);
+        /*文件路径*/
+        param.put("lxcPath",lxc.getWorkingDir());
         result = freemarkerUtil.generatorFileFromModel(this.getModelProject(lxc.getCode()),destPath
                 ,param);
         if(!result.isSuccess()) {

src/main/java/org/rcisoft/business/bcode/service/impl/BCodeServiceImpl.java

@@ -2,7 +2,10 @@ package org.rcisoft.business.bcode.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
-import org.quartz.*;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
 import org.rcisoft.business.bchapter.dao.BChapterRepository;
 import org.rcisoft.business.bchapter.entity.BChapter;
 import org.rcisoft.business.bcode.model.*;
@@ -11,7 +14,6 @@ import org.rcisoft.business.bcode.service.BCodeService;
 import org.rcisoft.business.brslstudent.dao.BRSlStudentRepository;
 import org.rcisoft.business.bsl.dao.BSlRepository;
 import org.rcisoft.business.bsl.entity.BSl;
-import org.rcisoft.business.bstudent.dao.BStudentRepository;
 import org.rcisoft.business.bstudent.entity.BStudentDto;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.core.exception.ServiceException;
@@ -161,7 +163,7 @@ public class BCodeServiceImpl implements BCodeService {
                 + userInfo + File.separator
                 + StudentCode;
         /*工程 容器docker dir*/
-        String dirPath = global.getBASE_UPLOAD_SERVER_LOCATION() + File.separator
+        String dirPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() + File.separator
                 + global.getCOURSE_LOCATION() + File.separator
                 + global.getSL_LOCATION() + File.separator
                 + slId + File.separator

src/main/resources/templates/lxc/apache.ftl

@@ -7,4 +7,4 @@ services:
     ports:
       - '${lxcPort?c}:80'
     volumes:
-      - ${lxcPath}:/var/www/html/data/
\ No newline at end of file
+      - ${lxcPath}:/usr/local/apache2/htdocs/
\ No newline at end of file