Merge branch 'master' of http://103.249.252.109:90/lcy/education

src/main/java/org/rcisoft/business/bcode/model/BCodeLxc.java

@@ -37,5 +37,8 @@ public class BCodeLxc {
     /*workingDir*/
     private String workingDir;
 
+    /*章节id*/
+    private String chapterId;
+
 
 }

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

@@ -52,13 +52,11 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
     @Override
     public CommandResult startBCodeLxc(BCodeLxc lxc) {
         CommandResult result = null;
-        List<Integer> ports  = null;
+        List<String> ports  = null;
         /*初始化port 20000 - 30000 */
         Integer port = global.getLxcInitPort();
         Integer maxPort = global.getLxcMaxPort();
-        byte[] portResult = rcRedisServiceImpl.getBytes("lxcPorts");
-        if(null != portResult)
-            ports = SerializationUtils.deserializer(portResult, List.class);
+        ports = rcRedisServiceImpl.getList("lxcPorts");
         if(null == ports || 0 == ports.size())
             ports = new ArrayList<>();
         else
@@ -68,10 +66,10 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
             result = new CommandResult(ResultCode.FAIL,"端口全部占用,请稍后!",lxc);
             return result;
         }
-        ports.add(port);
+        ports.add(port.toString());
         /*1.freemarker 生成模板*/
         Map param = new HashMap<>();
-        param.put("lxcName",lxc.getUserId());
+        param.put("lxcName",lxc.getUserId() + "_" + lxc.getSl());
         param.put("lxcPort",port);
         param.put("lxcPath",lxc.getWorkingDir());
 
@@ -96,13 +94,15 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
         Date endTime = new Date(lxc.getStartDate().getTime() + ( global.getLxcMinu() * 60 * 1000 ));
         lxc.setShutdownDate(endTime);
         /*3.redis 放置状态*/
-        rcRedisServiceImpl.setBytes(global.getLxcPrefix() + lxc.getUserId(),
+        String key = global.getLxcPrefix() + "_" + lxc.getUserId();
+        rcRedisServiceImpl.setBytes(key,
                 SerializationUtils.serializer(lxc));
         /*4.定时关闭 */
         schedulerFactoryBean.getScheduler();
         /*任务参数*/
         Map jobParam = new HashMap();
-        jobParam.put("containerName","_" + lxc.getUserId());
+        jobParam.put("redisKeyId",key);
+        jobParam.put("containerName",this.getModelProject(lxc.getCode()) + "_" + lxc.getUserId());
         jobParam.put("containerPath",destPath);
         jobParam.put("containerPort",port);
         JobDetail job = JobBuilder.newJob(StopLxcJob.class).
@@ -125,9 +125,10 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
             log.error(e.getMessage());
         }
         /*5.端口放进去 */
-        ports.add(port);
-        rcRedisServiceImpl.setBytes("lxcPorts",
-                SerializationUtils.serializer(ports));
+        rcRedisServiceImpl.setList("lxcKeys",
+                key);
+        rcRedisServiceImpl.setList("lxcPorts",
+                port.toString());
         return result;
     }
 
@@ -138,7 +139,7 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
      * @param maxPort
      * @return
      */
-    private synchronized Integer getIdleWithPorts(List<Integer> ports, Integer port, Integer maxPort) {
+    private synchronized Integer getIdleWithPorts(List<String> ports, Integer port, Integer maxPort) {
         int choosePort = 0;
         /*端口占用满了*/
         if(ports.size() -1  == maxPort - port)
@@ -147,7 +148,7 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
         for(int i = port ; i < maxPort - port ; i++){
             flag = false;
             for (int j = 0 ; j < ports.size() ; j++){
-                if(port == ports.get(j)) {
+                if(port == Integer.parseInt(ports.get(j))) {
                     flag = true;
                     break;
                 }
@@ -170,7 +171,7 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
         if(global.getJavaProject().equals(code))
             return "java";
         else if(global.getHtmlProject().equals(code))
-            return "html";
+            return "apache";
         else
             return "";
     }

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

@@ -18,6 +18,7 @@ import org.rcisoft.business.bstudent.entity.BStudentDto;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.result.CommandResult;
+import org.rcisoft.core.result.ResultExceptionEnum;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.service.RcRedisService;
 import org.rcisoft.core.service.SerializationUtils;
@@ -76,13 +77,13 @@ public class BCodeServiceImpl implements BCodeService {
             return this.readSimpleFile(slId,chapId,CodeType.SIM_JAVA,userInfo,studentCode);
         /*java 工程*/
         if(examType.equals(global.getJavaProject()))
-            return this.readProjectFile(slId,chapId,userInfo,studentCode);
+            return this.readProjectFile(slId,chapId,userInfo,studentCode,global.getJavaProject());
         /*html 单文件*/
         if(examType.equals(global.getHtmlSimple()))
             return this.readSimpleFile(slId,chapId,CodeType.SIM_HTML,userInfo,studentCode);
         /*html 工程*/
         if(examType.equals(global.getHtmlProject()))
-            return this.readProjectFile(slId,chapId,userInfo,studentCode);
+            return this.readProjectFile(slId,chapId,userInfo,studentCode,global.getHtmlProject());
         return null;
     }
 
@@ -140,7 +141,8 @@ public class BCodeServiceImpl implements BCodeService {
      * @param userInfo
      * @return
      */
-    private List<BCodeFile> readProjectFile(String slId, String chapterId, String userInfo, String StudentCode) {
+    private List<BCodeFile> readProjectFile(String slId, String chapterId, String userInfo, String StudentCode,
+        String examCode) {
         BCodeLxc lxc = new BCodeLxc();
         Map param = new HashMap<>();
         List<BCodeFile> codeFile = new ArrayList<>();
@@ -153,8 +155,38 @@ public class BCodeServiceImpl implements BCodeService {
                 + global.getCOURSE_PROJECT_LOCATION() + File.separator
                 + userInfo + File.separator
                 + StudentCode;
+        /*工程 容器docker dir*/
+        String dirPath = global.getBASE_UPLOAD_SERVER_LOCATION() + File.separator
+                + global.getCOURSE_LOCATION() + File.separator
+                + global.getSL_LOCATION() + File.separator
+                + slId + File.separator
+                + chapterId +File.separator
+                + global.getCOURSE_PROJECT_LOCATION() + File.separator
+                + userInfo + File.separator;
         lxc.setUserId(userInfo);
-        lxc.setWorkingDir(path);
+        lxc.setWorkingDir(dirPath);
+        lxc.setCode(examCode);
+        lxc.setSl(slId);
+        lxc.setChapterId(chapterId);
+        /*容器是否已启动*/
+        byte[] results = rcRedisServiceImpl.getBytes(global.getLxcPrefix() + "_" + lxc.getUserId());
+        if(null != results) {
+            lxc = SerializationUtils.deserializer(results, BCodeLxc.class);
+            /*别的课或别的节已开启容器,返回错误*/
+            if(null != lxc && (!slId.equals(lxc.getSl()) || !chapterId.equals(lxc.getChapterId()))){
+                throw new ServiceException(ResultExceptionEnum.EXIST_LXC_SERVER);
+            }
+            else if(null != lxc){
+                /*容器参数*/
+                param.put("port", lxc.getContainerPort());
+                param.put("endTime",lxc.getShutdownDate().getTime());
+            }
+            /*开启容器*/
+            else
+                this.startLxc(param,lxc);
+        }
+        else
+            this.startLxc(param,lxc);
         try{
             File simplePath = new File(path);
             BCodeFile simpleCodeFile = null;
@@ -168,22 +200,6 @@ public class BCodeServiceImpl implements BCodeService {
                 //codeFile.add(simpleCodeFile);
                 getFileList(simplePath,codeFile,simpleCodeFile,isFile);
             }
-            /*容器是否已启动*/
-            byte[] results = rcRedisServiceImpl.getBytes(global.getLxcPrefix() + lxc.getUserId());
-            if(null != results) {
-                lxc = SerializationUtils.deserializer(results, BCodeLxc.class);
-                /*已开启*/
-                if(null != lxc && codeFile.size() > 0){
-                    /*容器参数*/
-                    param.put("port", lxc.getContainerPort());
-                    param.put("endTime",lxc.getShutdownDate().getTime());
-                }
-                /*开启容器*/
-                else
-                    this.startLxc(param,lxc);
-            }
-            else
-                //this.startLxc(param,lxc);
             codeFile.get(0).setLxcParam(param);
 
         }catch (Exception e){

src/main/java/org/rcisoft/business/bcode/task/ClearLxcJob.java

+package org.rcisoft.business.bcode.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.rcisoft.business.bcode.model.BCodeLxc;
+import org.rcisoft.common.component.Global;
+import org.rcisoft.core.command.LxcCommand;
+import org.rcisoft.core.result.CommandResult;
+import org.rcisoft.core.service.RcRedisService;
+import org.rcisoft.core.service.SerializationUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by lcy on 18/1/10.
+ *
+ *
+ * 项目启动时,清除已到期的容器
+ *             解决因 服务器down 而造成的 stopLxcJob 未执行问题
+ *
+ *
+ */
+@Component
+@Slf4j
+public class ClearLxcJob implements Job {
+
+    @Autowired
+    private RcRedisService rcRedisServiceImpl;
+
+    @Autowired
+    private LxcCommand lxcCommand;
+
+    @Autowired
+    private Global global;
+
+
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        /*所有启动的容器*/
+        List<String> keys = rcRedisServiceImpl.getList("lxcKeys");
+        if(null == keys || 0 == keys.size())
+            return;
+        /*name*/
+        for (String key :
+                keys) {
+            this.stopLxc(key);
+        }
+    }
+
+    /**
+     * 关闭容器
+     * @param key
+     */
+    private void  stopLxc(String key) {
+        String containerPath = null;
+        byte[] results = rcRedisServiceImpl.getBytes(key);
+        BCodeLxc lxc = null;
+        if (null != results) {
+            lxc = SerializationUtils.deserializer(results, BCodeLxc.class);
+            if (null == lxc)
+                return;
+            Date shutdown = lxc.getShutdownDate();
+            /*未到点*/
+            if(null != shutdown && shutdown.after(new Date()))
+                return;
+            /*到点了*/
+            containerPath = global.getBASE_UPLOAD_SERVER_LOCATION() + File.separator +
+                    global.getLxcDockerfilePath() + File.separator + lxc.getUserId()  + File.separator;
+            /*关闭容器*/
+            /*2.docker-compose 起容器*/
+            CommandResult commandResult = null;
+            commandResult = lxcCommand.startOrDownLxc(containerPath,false);
+            if(!commandResult.isSuccess())
+                return;
+            /*3.移除容器*/
+            rcRedisServiceImpl.remove(key);
+            /*4.移除端口*/
+            rcRedisServiceImpl.removeList("lxcKeys",
+                    key);
+            rcRedisServiceImpl.removeList("lxcPorts",lxc.getContainerPort() + "");
+        }
+    }
+}

src/main/java/org/rcisoft/business/bcode/task/StopLxcJob.java

@@ -28,9 +28,11 @@ public class StopLxcJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         /*1.容器名称*/
+
+        String redisKeyId = jobExecutionContext.getMergedJobDataMap().getString("redisKeyId");
         String containerName = jobExecutionContext.getMergedJobDataMap().getString("containerName");
         String containerPath = jobExecutionContext.getMergedJobDataMap().getString("containerPath");
-        String containerPort = jobExecutionContext.getMergedJobDataMap().getString("containerPort");
+        int containerPort = jobExecutionContext.getMergedJobDataMap().getInt("containerPort");
         if(StringUtils.isEmpty(containerName) || StringUtils.isEmpty(containerPath)){
             log.info("----任务异常----");
             return;
@@ -44,7 +46,13 @@ public class StopLxcJob implements Job {
         /*2.docker-compose 起容器*/
         CommandResult commandResult = null;
         commandResult = lxcCommand.startOrDownLxc(containerPath,false);
-        /*3.移除端口*/
-
+        if(!commandResult.isSuccess())
+            return;
+        /*3.移除容器*/
+        rcRedisServiceImpl.remove(redisKeyId);
+        /*4.移除端口*/
+        rcRedisServiceImpl.removeList("lxcKeys",
+                redisKeyId);
+        rcRedisServiceImpl.removeList("lxcPorts",containerPort + "");
     }
 }

src/main/java/org/rcisoft/business/blesson/entity/BLesson.java

@@ -9,7 +9,6 @@ import org.rcisoft.core.entity.IdEntity;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.Date;
 
 /**
  * Created with CodeGenerator on .

src/main/java/org/rcisoft/business/listener/RcListener.java

+package org.rcisoft.business.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.quartz.SchedulerFactoryBean;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * Created by lcy on 18/1/19.
+ *
+ *
+ *
+ * JobDetail job = JobBuilder.newJob(ClearLxcJob.class).
+ withIdentity(IDENTITY_LXC_GROUP, JOB_LXC_GROUP).
+ usingJobData(new JobDataMap(new HashMap())).build();
+ Trigger trigger = TriggerBuilder.newTrigger().forJob(job)
+ .usingJobData(new JobDataMap(new HashMap()))
+ .withIdentity(IDENTITY_LXC_GROUP)
+ .startNow().build();
+ // 触发器时间设定
+ Scheduler sched = schedulerFactoryBean.getScheduler();
+
+        try {
+                sched.scheduleJob(job, trigger);
+                // 启动
+                if (!sched.isShutdown()) {
+                sched.start();
+                }
+                }catch (Exception e){
+                log.error(e.getMessage());
+                }
+ */
+@Slf4j
+public class RcListener implements ServletContextListener {
+
+
+    /*任务组名*/
+    private static final String JOB_LXC_GROUP = "lxc_clear_job_group";
+    /*触发器组名*/
+    private static final String TRIGGER_LXC_GROUP = "lxc_clear_trigger_group";
+    /*任务 identity*/
+    private static final String IDENTITY_LXC_GROUP = "lxc_clear_job";
+
+    @Autowired
+    private SchedulerFactoryBean schedulerFactoryBean;
+
+
+    @Override
+    public void contextDestroyed(ServletContextEvent arg0) {
+
+    }
+
+    /**
+     * 执行任务
+     * @param arg0
+     */
+    @Override
+    public void contextInitialized(ServletContextEvent arg0) {
+
+    }
+}

src/main/java/org/rcisoft/config/MvcConfig.java

@@ -4,11 +4,13 @@ import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.rcisoft.business.listener.RcListener;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.result.Result;
 import org.rcisoft.core.result.ResultCode;
 import org.rcisoft.core.util.ResultGenerator;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -237,4 +239,16 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
             ContentNegotiationConfigurer configurer) {
         configurer.favorPathExtension(false);
     }
+
+
+    /**
+     * 监听器
+     * @return
+     */
+    @Bean
+    public ServletListenerRegistrationBean servletListenerRegistrationBean(){
+        ServletListenerRegistrationBean servletListenerRegistrationBean = new ServletListenerRegistrationBean();
+        servletListenerRegistrationBean.setListener(new RcListener());
+        return servletListenerRegistrationBean;
+    }
 }

src/main/java/org/rcisoft/config/QuartzConfig.java

 package org.rcisoft.config;
 
+import org.rcisoft.core.component.RcJobFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
@@ -12,6 +14,9 @@ public class QuartzConfig {
 
 
 
+    @Autowired
+    private RcJobFactory rcJobFactory;
+
     /**
      * attention:
      * Details：定义quartz调度工厂
@@ -19,6 +24,8 @@ public class QuartzConfig {
     @Bean(name = "scheduler")
     public SchedulerFactoryBean schedulerFactory() {
         SchedulerFactoryBean bean = new SchedulerFactoryBean();
+        /*可以注入bean*/
+        bean.setJobFactory(rcJobFactory);
         // 用于quartz集群,QuartzScheduler 启动时更新己存在的Job
         bean.setOverwriteExistingJobs(true);
         // 延时启动，应用启动1秒后

src/main/java/org/rcisoft/core/command/LxcCommand.java

@@ -44,9 +44,9 @@ public class LxcCommand {
 
     public  CommandResult startOrDownLxc(String dest,boolean isStart){
         if("1".equals(global.getLxcIsRemote()))
-            return this.startOrDownLxc(dest,true,true);
+            return this.startOrDownLxc(dest,isStart,true);
         else
-            return this.startOrDownLxc(dest,true,false);
+            return this.startOrDownLxc(dest,isStart,false);
     }
 
     /**
@@ -70,7 +70,7 @@ public class LxcCommand {
                 Runtime.getRuntime().exec("cd " + dest + " && " + START_LXC_COMMAND);
             else{
                 if (isRemote)
-                    remoteExecuteCommand.execute(START_LXC_COMMAND,dest);
+                    remoteExecuteCommand.execute(DOWN_LXC_COMMAND,dest);
                 else
                     Runtime.getRuntime().exec("cd " + dest + " && " + DOWN_LXC_COMMAND);
                 dirPath.delete();

src/main/java/org/rcisoft/core/result/ResultExceptionEnum.java

@@ -21,6 +21,7 @@ public enum ResultExceptionEnum {
     SERVER_HAS_APP(4007,"服务器仍有关联应用，不可删除"),
     OS_HAS_SERVER(4008,"操作系统仍有关联服务器，不可删除"),
     START_LXC_SERVER(4009,"启动容器失败"),
+    EXIST_LXC_SERVER(4010,"已开始其他课程实验,请先关闭其他课程实验"),
     ;
 
     private Integer code;

src/main/java/org/rcisoft/core/service/RcRedisService.java

@@ -2,6 +2,8 @@ package org.rcisoft.core.service;
 
 import redis.clients.jedis.Jedis;
 
+import java.util.List;
+
 /**
  * Created by lcy on 18/1/8.
  */
@@ -46,4 +48,29 @@ public interface RcRedisService {
      * @return
      */
     public byte[] getBytes(String key);
+
+    /**
+     * 清除
+     * @param key
+     */
+    public void remove(String key);
+
+    /**
+     * 获取list
+     * @param key
+     */
+    public List getList(String key);
+
+    /**
+     * set list
+     * @param key
+     * @param value
+     */
+    public void setList(String key,String value);
+
+    /**
+     * 从 list 中 删除
+     * @param key
+     */
+    public void removeList(String key,String value);
 }

src/main/java/org/rcisoft/core/service/impl/RcRedisServiceImpl.java

@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
+import java.util.List;
+
 /**
  * Created by lcy on 18/1/8.
  */
@@ -93,4 +95,69 @@ public class RcRedisServiceImpl implements RcRedisService {
         }
         return result;
     }
+
+    @Override
+    public void remove(String key) {
+        Jedis jedis=null;
+        try{
+            jedis = getResource();
+            jedis.del(key);
+            log.info("Redis del success - " + key );
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("Redis set error: "+ e.getMessage() +" - " + key );
+        }finally{
+            returnResource(jedis);
+        }
+
+    }
+
+    @Override
+    public List getList(String key) {
+        Jedis jedis=null;
+        List result = null ;
+        try{
+            jedis = getResource();
+            result = jedis.lrange(key, 0, -1);
+            log.info("Redis get list success - " + key + ", value:" + result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("Redis set error: "+ e.getMessage() +" - " + key );
+        }finally{
+            returnResource(jedis);
+        }
+        return result;
+    }
+
+
+
+    @Override
+    public void setList(String key, String value) {
+        Jedis jedis=null;
+        try{
+            jedis = getResource();
+            jedis.rpush(key, value);
+            log.info("Redis set list success - " + key + ", value:" + value);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("Redis set error: "+ e.getMessage() +" - " + key + ", value:" + value);
+        }finally{
+            returnResource(jedis);
+        }
+    }
+
+    @Override
+    public void removeList(String key,String value) {
+        Jedis jedis=null;
+        try{
+            jedis = getResource();
+            jedis.lrem(key,1,value);
+            log.info("Redis remove list success - " + key + ", value:" + value);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("Redis set error: "+ e.getMessage() +" - " + key + ", value:" + value);
+        }finally{
+            returnResource(jedis);
+        }
+    }
 }

src/main/java/org/rcisoft/core/util/FreemarkerUtil.java

@@ -42,7 +42,7 @@ public class FreemarkerUtil {
             /*目录不存在*/
             if(!dirFile.exists())
                 dirFile.mkdirs();
-            Template template = freemarkerConfiguration.getTemplate(model); // freeMarker template
+            Template template = freemarkerConfiguration.getTemplate("lxc" + File.separator + model + ".ftl"); // freeMarker template
             template.process(param,new FileWriter(new File(destPath + LxcCommand.LXC_SETTING_NAME)));
             commandResult = new CommandResult(ResultCode.SUCCESS,null,null);
         }catch (Exception e){

src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@ server:
 druid:
   url: jdbc:mysql://127.0.0.1:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
   username: root
-  password: liuzhichao
+  password: cy
   initial-size: 1
   min-idle: 1
   max-active: 20
@@ -74,7 +74,7 @@ lxc:
   lxc_dockerfilePath: /eduLxc
   lxc_initPort: 20001
   lxc_maxPort: 30000
-  lxc_minu: 30
+  lxc_minu: 15
   lxc_isRemote: 1
 springfox:
   documentation:
@@ -104,7 +104,7 @@ global:
     min_password: 6
     max_password: 16
   path:
-    base_upload_server_location: /Users/liuzhichao/eduServer
+    base_upload_server_location: /working/resource/eduServer/
     course_location: course
     lesson_location: lesson
     sl_location: sl
@@ -141,7 +141,7 @@ global:
     html_project: '1002'
 
 serverLxc:
-  ip: 127.0.0.1
+  ip: 192.168.1.130
   username: root
   password: 123456
 

src/main/resources/application-prod.yml

@@ -54,22 +54,19 @@ spring:
   resources:
     add-mappings: false
   redis:
-      host: 106.2.3.134
-      port: 7481
-      pool:
-        max-idle: 50
-        max-active: 1000
-        min-idle: 5
-        max-wait: -1
-      database: 0
-      password: ''
-
-
-springfox:
-  documentation:
-    swagger:
-      v2:
-        path: /api-docs
+    host: 106.2.3.134
+    port: 7481
+    pool:
+      max-idle: 50
+      max-active: 1000
+      min-idle: 5
+      max-wait: -1
+    database: 0
+    password: ''
+  freemarker:
+    charset: UTF-8
+    suffix: .ftl
+    template-loader-path: classpath:/templates/
 
 lxc:
   lxc_prefix: lessonLxc
@@ -79,6 +76,12 @@ lxc:
   lxc_maxPort: 30000
   lxc_minu: 30
   lxc_isRemote: 1
+springfox:
+  documentation:
+    swagger:
+      v2:
+        path: /api-docs
+
 jwt:
   header: Authorization
   secret: mySecret
@@ -138,6 +141,6 @@ global:
     html_project: '1002'
 
 serverLxc:
-  ip: 127.0.0.1
+  ip: 192.168.1.130
   username: root
-  password: 123456
+  password: 123456
\ No newline at end of file

src/main/resources/logback-spring.xml

@@ -24,7 +24,7 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径-->
-            <fileNamePattern>/Users/liuzhichao/logback/info.%d.log</fileNamePattern>
+            <fileNamePattern>/working/test/info.%d.log</fileNamePattern>
         </rollingPolicy>
     </appender>
 
@@ -45,7 +45,7 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径-->
-            <fileNamePattern>/Users/liuzhichao/logback/error.%d.log</fileNamePattern>
+            <fileNamePattern>/working/test/error.%d.log</fileNamePattern>
         </rollingPolicy>
     </appender>
     <!--

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

 version: '2'
 services:
-  java:
+  apache:
     image: httpd:2.4
     container_name: 'apache_${lxcName}'
     restart: always
     ports:
-      - '${lxcPort}:80'
+      - '${lxcPort?c}:80'
     volumes:
       - ${lxcPath}:/var/www/html/data/
\ No newline at end of file

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

@@ -5,6 +5,7 @@ services:
     container_name: 'java_${lxcName}'
     restart: always
     ports:
-      - '${lxcPort}:80'
+      - '${lxcPort?c}:80'
     volumes:
-      - ${lxcPath}:/var/www/html/data/
+      - ${lxcPath}:/working/code
\ No newline at end of file
+    command: tail -f /dev/null
\ No newline at end of file