Skip to content

E
education
Commit f2e65622 authored by xingyuji's avatar xingyuji
Browse files
Options

1.BCodeLxc.java 添加属性userCode; 

2.BCodeLxcServiceImpl.java 修改startBCodeLxc方法；
3.FreemarkerUtil.java 修改generateFileFromModel方法；
parent 8645d847
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 251 deletions
pom.xml
View file @ f2e65622
......@@ -6,8 +6,17 @@
<groupId>org.rcisoft</groupId>
<artifactId>education</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>education2.0.1</name>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.3.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<description> education 2.0</description>
......@@ -381,7 +390,7 @@
<build>
<finalName>education</finalName>
<finalName>edu</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
......
src/main/java/org/rcisoft/business/bcode/model/BCodeLxc.java
View file @ f2e65622
......@@ -34,6 +34,9 @@ public class BCodeLxc {
/*用户id*/
private String userId;
/*用户code*/
private String userCode;
/*workingDir*/
private String workingDir;
......
src/main/java/org/rcisoft/business/bcode/service/impl/BCodeLxcServiceImpl.java
View file @ f2e65622
......@@ -13,6 +13,7 @@ import org.rcisoft.core.service.RcRedisService;
import org.rcisoft.core.service.SerializationUtils;
import org.rcisoft.core.util.FreemarkerUtil;
import org.rcisoft.core.util.TaskUtil;
import org.rcisoft.core.util.UserUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.stereotype.Service;
......@@ -57,27 +58,35 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
/*初始化port 20000 - 30000 */
Integer port = global.getLxcInitPort();
Integer maxPort = global.getLxcMaxPort();
Integer portSSH = global.getLxcInitPort()+10000;
Integer maxPortSSH = global.getLxcMaxPort()+10000;
ports = rcRedisServiceImpl.getList("lxcPorts");
if(null == ports || 0 == ports.size())
ports = new ArrayList<>();
else
else{
port = this.getIdleWithPorts(ports,port,maxPort);
portSSH = this.getIdleWithPorts(ports,portSSH,maxPortSSH);
}
/*端口满了*/
if(0 == port) {
if(0 == port||0 == portSSH) {
result = new CommandResult(ResultCode.FAIL,"端口全部占用,请稍后!",lxc);
return result;
}
ports.add(port.toString());
ports.add(portSSH.toString());
/*1.freemarker 生成模板*/
Map param = new HashMap<>();
param.put("lxcName",lxc.getUserId() + "_" + lxc.getSl());
param.put("lxcPort",port);
param.put("lxcCode",lxc.getUserCode());
param.put("lxcSshPort",portSSH);
/* config path*/
String destPath = global.getBASE_UPLOAD_SERVER_LOCATION() + File.separator +
global.getLxcDockerfilePath() + File.separator + lxc.getUserId() + File.separator;
/*启动路径*/
String dockerPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() + File.separator +
global.getLxcDockerfilePath() + File.separator + lxc.getUserId() + File.separator;
String dockerPath = global.getPHYSICAL_UPLOAD_SERVER_LOCATION() +
global.getLxcDockerfilePath() + "/" + lxc.getUserId() + "/";
/*文件路径*/
param.put("lxcPath",lxc.getWorkingDir());
result = freemarkerUtil.generatorFileFromModel(this.getModelProject(lxc.getCode()),destPath
......@@ -94,6 +103,9 @@ public class BCodeLxcServiceImpl implements BCodeLxcService {
result = new CommandResult(ResultCode.FAIL,"容器启动失败!",lxc);
return result;
}
if(global.getJavaProject().equals(lxc.getCode()))
port = portSSH;
lxc.setContainerPort(port);
lxc.setStartDate(new Date());
lxc.setTotalMin(global.getLxcMinu());
......
src/main/java/org/rcisoft/business/bcode/service/impl/BCodeServiceImpl.java
View file @ f2e65622
......@@ -173,6 +173,7 @@ public class BCodeServiceImpl implements BCodeService {
lxc.setUserId(userInfo);
lxc.setWorkingDir(dirPath);
lxc.setCode(examCode);
lxc.setUserCode(StudentCode);
lxc.setSl(slId);
lxc.setChapterId(chapterId);
/*容器是否已启动*/
......
src/main/java/org/rcisoft/core/command/LxcCommand.java
View file @ f2e65622
......@@ -36,6 +36,10 @@ public class LxcCommand {
* 配置文件
*/
public static final String LXC_SETTING_NAME = "docker-compose.yml";
/**
* 子配置文件（Java目录下）
*/
public static final String LXC_JAVA_NAME = "Dockerfile";
public CommandResult startOrDownLxc(String dest){
return this.startOrDownLxc(dest,true);
......
src/main/java/org/rcisoft/core/util/FreemarkerUtil.java
View file @ f2e65622
......@@ -4,6 +4,7 @@ import freemarker.template.Configuration;
import freemarker.template.Template;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.rcisoft.common.component.Global;
import org.rcisoft.core.command.LxcCommand;
import org.rcisoft.core.result.CommandResult;
import org.rcisoft.core.result.ResultCode;
......@@ -24,6 +25,7 @@ public class FreemarkerUtil {
@Autowired
Configuration freemarkerConfiguration;
/**
* 根据模板构建文件
* @param model
......@@ -38,11 +40,24 @@ public class FreemarkerUtil {
commandResult = new CommandResult(ResultCode.FAIL,"目录不存在",null);
return commandResult;
}
File dirFile = new File(destPath);
File dirFile1 = new File(destPath);
File dirFile2 = new File(destPath+ "java" + File.separator );
/*目录不存在*/
if(!dirFile.exists())
dirFile.mkdirs();
if(!dirFile1.exists()){
dirFile1.mkdirs();
}
if(!dirFile2.exists()){
dirFile2.mkdirs();
}
if(model.equals("java")) {
Template template = freemarkerConfiguration.getTemplate("lxc" + File.separator + model + File.separator + LxcCommand.LXC_JAVA_NAME + ".ftl");
template.process(param,new FileWriter(new File(destPath + "java" + File.separator + LxcCommand.LXC_JAVA_NAME)));
}
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/templates/lxc/java/Dockerfile.ftl
View file @ f2e65622
FROM maven:3.5-ibmjava-8
FROM java_exam_cy:0.1
COPY settings.xml /usr/share/apache-maven-3.3.9/conf/
RUN groupadd java_${lxcName}
RUN groupadd java_${lxcCode}
RUN useradd -g java_${lxcName} user_${lxcName}
RUN useradd -g java_${lxcCode} user_${lxcCode}
RUN echo "user_${lxcName}:1234" | chpasswd
RUN echo "user_${lxcCode}:${lxcCode}" | chpasswd
......
src/main/resources/templates/lxc/java/settings.xml deleted 100755 → 0
View file @ 8645d847
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<!--
| This is the configuration file for Maven. It can be specified at two levels:
|
| 1. User Level. This settings.xml file provides configuration for a single user,
| and is normally provided in ${user.home}/.m2/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
|
| -s /path/to/user/settings.xml
|
| 2. Global Level. This settings.xml file provides configuration for all Maven
| users on a machine (assuming they're all using the same Maven
| installation). It's normally provided in
| ${maven.conf}/settings.xml.
|
| NOTE: This location can be overridden with the CLI option:
|
| -gs /path/to/global/settings.xml
|
| The sections in this sample file are intended to give you a running start at
| getting the most out of your Maven installation. Where appropriate, the default
| values (values used when the setting is not specified) are provided.
|
|-->
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- localRepository
| The path to the local repository maven will use to store artifacts.
|
| Default: ${user.home}/.m2/repository
-->
<localRepository>/working/resource/eduMaven/</localRepository>
<!-- interactiveMode
| This will determine whether maven prompts you when it needs input. If set to false,
| maven will use a sensible default value, perhaps based on some other setting, for
| the parameter in question.
|
| Default: true
<interactiveMode>true</interactiveMode>
-->
<!-- offline
| Determines whether maven should attempt to connect to the network when executing a build.
| This will have an effect on artifact downloads, artifact deployment, and others.
|
| Default: false
<offline>false</offline>
-->
<!-- pluginGroups
| This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
| when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
| "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
|-->
<pluginGroups>
<!-- pluginGroup
| Specifies a further group identifier to use for plugin lookup.
<pluginGroup>com.your.plugins</pluginGroup>
-->
</pluginGroups>
<!-- proxies
| This is a list of proxies which can be used on this machine to connect to the network.
| Unless otherwise specified (by system property or command-line switch), the first proxy
| specification in this list marked as active will be used.
|-->
<proxies>
<!-- proxy
| Specification for one proxy, to be used in connecting to the network.
|
<proxy>
<id>optional</id>
<active>true</active>
<protocol>http</protocol>
<username>proxyuser</username>
<password>proxypass</password>
<host>proxy.host.net</host>
<port>80</port>
<nonProxyHosts>local.net|some.host.com</nonProxyHosts>
</proxy>
-->
</proxies>
<!-- servers
| This is a list of authentication profiles, keyed by the server-id used within the system.
| Authentication profiles can be used whenever maven must make a connection to a remote server.
|-->
<servers>
<!-- server
| Specifies the authentication information to use when connecting to a particular server, identified by
| a unique name within the system (referred to by the 'id' attribute below).
|
| NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
| used together.
|
<server>
<id>deploymentRepo</id>
<username>repouser</username>
<password>repopwd</password>
</server>
-->
<!-- Another sample, using keys to authenticate.
<server>
<id>siteServer</id>
<privateKey>/path/to/private/key</privateKey>
<passphrase>optional; leave empty if not used.</passphrase>
</server>
-->
</servers>
<!-- mirrors
| This is a list of mirrors to be used in downloading artifacts from remote repositories.
|
| It works like this: a POM may declare a repository to use in resolving certain artifacts.
| However, this repository may have problems with heavy traffic at times, so people have mirrored
| it to several places.
|
| That repository definition will have a unique id, so we can create a mirror reference for that
| repository, to be used as an alternate download site. The mirror site will be the preferred
| server for that repository.
|-->
<mirrors>
<!-- mirror
| Specifies a repository mirror site to use instead of a given repository. The repository that
| this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
| for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
|
<mirror>
<id>mirrorId</id>
<mirrorOf>repositoryId</mirrorOf>
<name>Human Readable Name for this Mirror.</name>
<url>http://my.repository.com/repo/path</url>
</mirror>
-->
<mirror>
<id>nexus-aliyun</id>
<mirrorOf>external:*</mirrorOf>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
</mirror>
</mirrors>
<!-- profiles
| This is a list of profiles which can be activated in a variety of ways, and which can modify
| the build process. Profiles provided in the settings.xml are intended to provide local machine-
| specific paths and repository locations which allow the build to work in the local environment.
|
| For example, if you have an integration testing plugin - like cactus - that needs to know where
| your Tomcat instance is installed, you can provide a variable here such that the variable is
| dereferenced during the build process to configure the cactus plugin.
|
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
| section of this document (settings.xml) - will be discussed later. Another way essentially
| relies on the detection of a system property, either matching a particular value for the property,
| or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
| Finally, the list of active profiles can be specified directly from the command line.
|
| NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
| repositories, plugin repositories, and free-form properties to be used as configuration
| variables for plugins in the POM.
|
|-->
<profiles>
<profile>
<id>nexus</id>
<repositories>
<repository>
<id>nexus-aliyun</id>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>nexus-snapshots</id>
<url>http://maven.aliyun.com/nexus/content/snapshots/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>nexus-releases</id>
<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<!-- activeProfiles
| List of profiles that are active for all builds.
|
<activeProfiles>
<activeProfile>alwaysActiveProfile</activeProfile>
<activeProfile>anotherAlwaysActiveProfile</activeProfile>
</activeProfiles>
-->
</settings>
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