Skip to content

E
education
Commit 3fec4f2f authored by 李丛阳's avatar 李丛阳
Browse files
Options

office

parent 5d89b3df
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 43 deletions
src/main/java/org/rcisoft/business/bcode/service/impl/BCodeServiceImpl.java
View file @ 3fec4f2f
......@@ -623,7 +623,7 @@ public class BCodeServiceImpl implements BCodeService {
return new CommandResult(ResultCode.FAIL,"未开启实验",null);
else {
/*延长*/
if(lxc.getShutdownDate().before(new Date(new Date().getTime() + global.getLxcEndlineTime() * 60 * 1000)))
if(lxc.getShutdownDate().after(new Date(new Date().getTime() + global.getLxcEndlineTime() * 60 * 1000)))
return new CommandResult(ResultCode.FAIL,"距实验结束时间结束大于" + global.getLxcEndlineTime() + "分钟,无需延长",null);
/*可以延长*/
/*1.延长时间*/
......
src/main/java/org/rcisoft/business/bsl/task/SlTask.java 0 → 100644
View file @ 3fec4f2f
package org.rcisoft.business.bsl.task;
import lombok.extern.slf4j.Slf4j;
import org.rcisoft.core.util.OfficeToPdf;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
/**
* Created by lcy on 18/1/25.
*/
@Component
@Slf4j
public class SlTask {
@Autowired
private OfficeToPdf officeToPdf;
@Async
public void officeToPdf(String sourceFile, String destFile){
officeToPdf.transformToPdf(sourceFile,destFile);
}
}
src/main/java/org/rcisoft/config/ExecutorConfig.java 0 → 100644
View file @ 3fec4f2f
package org.rcisoft.config;
import lombok.extern.slf4j.Slf4j;
import org.rcisoft.core.handler.RcAsyncExceptionHandler;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.Executor;
import java.util.concurrent.ThreadPoolExecutor;
/**
* Created by lcy on 18/1/25.
*
*
*
* spring-scheduling 线程池
*
*/
@Configuration
@EnableAsync
@Slf4j
public class ExecutorConfig implements AsyncConfigurer {
/** Set the ThreadPoolExecutor's core pool size. */
private int corePoolSize = 10;
/** Set the ThreadPoolExecutor's maximum pool size. */
private int maxPoolSize = 200;
/** Set the capacity for the ThreadPoolExecutor's BlockingQueue. */
private int queueCapacity = 10;
@Override
public Executor getAsyncExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(corePoolSize);
executor.setMaxPoolSize(maxPoolSize);
executor.setQueueCapacity(queueCapacity);
executor.setThreadNamePrefix("RcExecutor-");
// rejection-policy：当pool已经达到max size的时候，如何处理新任务
// CALLER_RUNS：不在新线程中执行任务，而是有调用者所在的线程来执行
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
executor.initialize();
return executor;
}
@Override
public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
return new RcAsyncExceptionHandler();
}
}
src/main/java/org/rcisoft/config/MvcConfig.java
View file @ 3fec4f2f
......@@ -7,7 +7,6 @@ import org.apache.commons.lang3.StringUtils;
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.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
......@@ -81,8 +80,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
if (handler instanceof HandlerMethod) {
HandlerMethod handlerMethod = (HandlerMethod) handler;
if (e instanceof ServiceException) {//业务失败的异常，如“账号或密码错误”
result = ResultGenerator.genFailResult(e.getMessage());
log.info(e.getMessage());
result.setCode(ResultCode.FAIL).setMessage(e.getMessage());
} else if (e instanceof AuthenticationException) {
if (e instanceof BadCredentialsException)
//密码错误
......@@ -93,22 +91,21 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
//无权限 @PreAuthorize("hasRole('ROLE_1001')")
result.setCode(ResultCode.UNAUTHORIZED).setMessage("无访问权限");
} else {
result.setCode(ResultCode.INTERNAL_SERVER_ERROR).setMessage("接口 [" + request.getRequestURI() + "] 内部错误，请联系管理员");
String message = String.format("接口 [%s] 出现异常，方法：%s.%s，异常摘要：%s",
request.getRequestURI(),
handlerMethod.getBean().getClass().getName(),
handlerMethod.getMethod().getName(),
e.getMessage());
log.error(message, e);
result.setCode(ResultCode.INTERNAL_SERVER_ERROR).setMessage(message);
}
} else {
if (e instanceof NoHandlerFoundException) {
result.setCode(ResultCode.NOT_FOUND).setMessage("接口 [" + request.getRequestURI() + "] 不存在");
} else {
result.setCode(ResultCode.INTERNAL_SERVER_ERROR).setMessage(e.getMessage());
log.error(e.getMessage(), e);
}
}
log.error(e.getMessage());
responseResult(response, result);
return new ModelAndView();
}
......
src/main/java/org/rcisoft/core/controller/AuthenticationController.java
View file @ 3fec4f2f
......@@ -5,7 +5,6 @@ import org.rcisoft.core.model.PersistModel;
import org.rcisoft.core.model.UserAuthDTO;
import org.rcisoft.core.result.Result;
import org.rcisoft.core.service.AuthenticationService;
import org.rcisoft.core.util.ResultGenerator;
import org.rcisoft.sys.user.entity.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -53,7 +52,10 @@ public class AuthenticationController {
@PostMapping(value = "${jwt.route.authentication.register}")
public Result register(SysUser addedUser){
authenticationServiceImpl.register(addedUser);
return ResultGenerator.genSuccessResult();
return Result.builder(new PersistModel(1),
MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant.MESSAGE_ALERT_ERROR,
null);
}
@GetMapping(value = "${jwt.route.authentication.refresh}")
......
src/main/java/org/rcisoft/core/handler/RcAsyncExceptionHandler.java 0 → 100644
View file @ 3fec4f2f
package org.rcisoft.core.handler;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
import java.lang.reflect.Method;
/**
* Created by lcy on 18/1/25.
*/
@Slf4j
public class RcAsyncExceptionHandler implements AsyncUncaughtExceptionHandler {
@Override
public void handleUncaughtException(Throwable ex, Method method, Object... params) {
log.info("Async method: {} has caught exception,params:{}", method.getName(), JSON.toJSONString(params));
log.error("executor exception --> " + ex.getMessage());
}
}
src/main/java/org/rcisoft/core/util/OfficeToPdf.java
View file @ 3fec4f2f
......@@ -72,7 +72,7 @@ public class OfficeToPdf {
public static void main(String[] args) throws Exception {
String path = "C:/Users/Administrator/Desktop/";
OfficeToPdf opc = new OfficeToPdf();
opc.office2PDF(path+"abc.pptx", path+"1.pdf");
opc.transformToPdf(path+"abc.pptx", path+"1.pdf");
}
/**
......@@ -81,7 +81,7 @@ public class OfficeToPdf {
* @param destFile
* @return 1 成功 0 失败 -1 错误
*/
public synchronized int office2PDF(String sourceFile, String destFile){
public synchronized int transformToPdf(String sourceFile, String destFile){
OpenOfficeConnection connection = null;
try {
File inputFile = new File(sourceFile);
......
src/main/java/org/rcisoft/core/util/ResultGenerator.java deleted 100644 → 0
View file @ 5d89b3df
package org.rcisoft.core.util;
import org.rcisoft.core.result.Result;
import org.rcisoft.core.result.ResultCode;
/**
* Created by lcy on 17/11/24.
*/
public class ResultGenerator {
private static final String DEFAULT_SUCCESS_MESSAGE = "SUCCESS";
public static Result genSuccessResult() {
return new Result()
.setCode(ResultCode.SUCCESS)
.setMessage(DEFAULT_SUCCESS_MESSAGE);
}
public static Result genSuccessResult(Object data) {
return new Result()
.setCode(ResultCode.SUCCESS)
.setMessage(DEFAULT_SUCCESS_MESSAGE)
.setData(data);
}
public static Result genFailResult(String message) {
return new Result()
.setCode(ResultCode.FAIL)
.setMessage(message);
}
}
src/main/resources/templates/lxc/java.ftl
View file @ 3fec4f2f
version: '2'
services:
java:
image: maven:3.5-ibmjava-8
#image: maven:3.5-ibmjava-8
build: ./maven
container_name: 'java_${lxcName}'
restart: always
ports:
- '${lxcPort?c}:80'
volumes:
- ${lxcPath}:/working/code
- /working/dockervolume/edu2_data_ubuntu/eduMaven/:/working/resource/eduMaven/
command: tail -f /dev/null
\ No newline at end of file
src/main/resources/templates/lxc/maven/Dockerfile 0 → 100644
View file @ 3fec4f2f
FROM ibmjava:8-sdk
COPY settings.xml /usr/share/maven/conf/settings.xml
expose 8080
ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
CMD ["mvn"]
\ No newline at end of file
src/main/resources/templates/lxc/maven/settings.xml 0 → 100755
View file @ 3fec4f2f
<?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/dockervolume/edu2_data_ubuntu/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