Commit ac35cca0 authored by 李丛阳's avatar 李丛阳

code

parent f617328e
...@@ -78,7 +78,8 @@ public class BCodeLxcServiceImpl implements BCodeLxcService { ...@@ -78,7 +78,8 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
/*启动路径*/ /*启动路径*/
String dockerPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() + File.separator + String dockerPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() + File.separator +
global.getLxcDockerfilePath() + File.separator + lxc.getUserId() + 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 result = freemarkerUtil.generatorFileFromModel(this.getModelProject(lxc.getCode()),destPath
,param); ,param);
if(!result.isSuccess()) { if(!result.isSuccess()) {
......
...@@ -2,7 +2,10 @@ package org.rcisoft.business.bcode.service.impl; ...@@ -2,7 +2,10 @@ package org.rcisoft.business.bcode.service.impl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils; 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.dao.BChapterRepository;
import org.rcisoft.business.bchapter.entity.BChapter; import org.rcisoft.business.bchapter.entity.BChapter;
import org.rcisoft.business.bcode.model.*; import org.rcisoft.business.bcode.model.*;
...@@ -11,7 +14,6 @@ import org.rcisoft.business.bcode.service.BCodeService; ...@@ -11,7 +14,6 @@ import org.rcisoft.business.bcode.service.BCodeService;
import org.rcisoft.business.brslstudent.dao.BRSlStudentRepository; import org.rcisoft.business.brslstudent.dao.BRSlStudentRepository;
import org.rcisoft.business.bsl.dao.BSlRepository; import org.rcisoft.business.bsl.dao.BSlRepository;
import org.rcisoft.business.bsl.entity.BSl; import org.rcisoft.business.bsl.entity.BSl;
import org.rcisoft.business.bstudent.dao.BStudentRepository;
import org.rcisoft.business.bstudent.entity.BStudentDto; import org.rcisoft.business.bstudent.entity.BStudentDto;
import org.rcisoft.common.component.Global; import org.rcisoft.common.component.Global;
import org.rcisoft.core.exception.ServiceException; import org.rcisoft.core.exception.ServiceException;
...@@ -161,7 +163,7 @@ public class BCodeServiceImpl implements BCodeService { ...@@ -161,7 +163,7 @@ public class BCodeServiceImpl implements BCodeService {
+ userInfo + File.separator + userInfo + File.separator
+ StudentCode; + StudentCode;
/*工程 容器docker dir*/ /*工程 容器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.getCOURSE_LOCATION() + File.separator
+ global.getSL_LOCATION() + File.separator + global.getSL_LOCATION() + File.separator
+ slId + File.separator + slId + File.separator
......
...@@ -7,4 +7,4 @@ services: ...@@ -7,4 +7,4 @@ services:
ports: ports:
- '${lxcPort?c}:80' - '${lxcPort?c}:80'
volumes: volumes:
- ${lxcPath}:/var/www/html/data/ - ${lxcPath}:/usr/local/apache2/htdocs/
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment