fix ports and dependencies
This commit is contained in:
parent
2cdec4bcda
commit
1be74769bf
15
build.gradle
15
build.gradle
@ -90,19 +90,12 @@ repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
configurations {
|
||||
compile.exclude module: "spring-boot-starter-tomcat"
|
||||
compile.exclude module: "bcmail-jdk14"
|
||||
compile.exclude module: "bcprov-jdk14"
|
||||
compile.exclude module: "bctsp-jdk14"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-security'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
|
||||
compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
|
||||
compile group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect'
|
||||
@ -126,11 +119,11 @@ dependencies {
|
||||
|
||||
compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.6.0'
|
||||
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
|
||||
compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
|
||||
//compile group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.35.0'
|
||||
|
||||
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
|
||||
compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
|
||||
testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.3.1'
|
||||
//compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
|
||||
//testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.3.1'
|
||||
//testCompile group: 'com.google.guava', name: 'guava', version: '21.0'
|
||||
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
|
||||
}
|
||||
|
@ -1,30 +0,0 @@
|
||||
package ru.ulstu.configuration;
|
||||
|
||||
import org.eclipse.jetty.server.ServerConnector;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer;
|
||||
import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
|
||||
import org.springframework.boot.web.server.ConfigurableWebServerFactory;
|
||||
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Configuration
|
||||
public class HttpListenerConfiguration implements WebServerFactoryCustomizer<ConfigurableWebServerFactory> {
|
||||
@Value("${server.http.port}")
|
||||
private int httpPort;
|
||||
|
||||
private void configureJetty(JettyServletWebServerFactory jettyFactory) {
|
||||
jettyFactory.addServerCustomizers((JettyServerCustomizer) server -> {
|
||||
ServerConnector serverConnector = new ServerConnector(server);
|
||||
serverConnector.setPort(httpPort);
|
||||
server.addConnector(serverConnector);
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void customize(ConfigurableWebServerFactory factory) {
|
||||
if (factory instanceof JettyServletWebServerFactory) {
|
||||
configureJetty((JettyServletWebServerFactory) factory);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,17 +1,12 @@
|
||||
package ru.ulstu.grant.page;
|
||||
|
||||
import com.gargoylesoftware.htmlunit.html.DomNode;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlElement;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
//import com.gargoylesoftware.htmlunit.html.DomNode;
|
||||
//import com.gargoylesoftware.htmlunit.html.HtmlElement;
|
||||
//import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
//import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
|
||||
|
||||
public class KiasPage {
|
||||
private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm";
|
||||
/* private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm";
|
||||
private final HtmlPage page;
|
||||
|
||||
public KiasPage(HtmlPage page) {
|
||||
@ -51,5 +46,5 @@ public class KiasPage {
|
||||
|
||||
public boolean isTableRowGrantLine(DomNode grantElement) {
|
||||
return !((HtmlTableRow) grantElement).getAttribute("class").contains("pagerSavedHeightSpacer");
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
@ -313,13 +313,13 @@ public class GrantService extends BaseService {
|
||||
|
||||
@Transactional
|
||||
public void createFromKias() throws IOException, ParseException {
|
||||
for (GrantDto grantDto : kiasService.getNewGrantsDto()) {
|
||||
/* for (GrantDto grantDto : kiasService.getNewGrantsDto()) {
|
||||
if (saveFromKias(grantDto)) {
|
||||
log.debug("GrantScheduler.loadGrantsFromKias new grant was loaded");
|
||||
} else {
|
||||
log.debug("GrantScheduler.loadGrantsFromKias grant wasn't loaded, cause it's already exists");
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
public List<GrantDto> findAllActiveDto() {
|
||||
|
@ -1,24 +1,14 @@
|
||||
package ru.ulstu.grant.service;
|
||||
|
||||
import com.gargoylesoftware.htmlunit.WebClient;
|
||||
import com.gargoylesoftware.htmlunit.html.DomNode;
|
||||
import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
import org.springframework.stereotype.Service;
|
||||
import ru.ulstu.configuration.ApplicationProperties;
|
||||
import ru.ulstu.grant.model.GrantDto;
|
||||
import ru.ulstu.grant.page.KiasPage;
|
||||
import ru.ulstu.user.service.UserService;
|
||||
//import com.gargoylesoftware.htmlunit.WebClient;
|
||||
//mport com.gargoylesoftware.htmlunit.html.DomNode;
|
||||
//import com.gargoylesoftware.htmlunit.html.HtmlPage;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.ParseException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Calendar;
|
||||
import java.util.List;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class KiasService {
|
||||
private final static String BASE_URL = "https://www.rfbr.ru/rffi/ru/contest_search?CONTEST_STATUS_ID=%s&CONTEST_TYPE=%s&CONTEST_YEAR=%s";
|
||||
/* private final static String BASE_URL = "https://www.rfbr.ru/rffi/ru/contest_search?CONTEST_STATUS_ID=%s&CONTEST_TYPE=%s&CONTEST_YEAR=%s";
|
||||
private final static String CONTEST_STATUS_ID = "1";
|
||||
private final static String CONTEST_TYPE = "-1";
|
||||
|
||||
@ -69,5 +59,5 @@ public class KiasService {
|
||||
private List<Integer> generateGrantYears() {
|
||||
return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR),
|
||||
Calendar.getInstance().get(Calendar.YEAR) + 1);
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
@ -9,7 +9,9 @@
|
||||
style="text-align:center">
|
||||
<p:panel id="pnl" header="#{section.title}" style="text-align:center;">
|
||||
<h:panelGrid columns="1" style="width:100%;">
|
||||
<p:graphicImage style="width:100%" name="img/main/#{section.image}"/>
|
||||
<h:outputLink value="/papers.xhtml">
|
||||
<p:graphicImage style="width:100%" name="img/main/#{section.image}"/>
|
||||
</h:outputLink>
|
||||
</h:panelGrid>
|
||||
</p:panel>
|
||||
</p:dataGrid>
|
||||
|
@ -1,7 +1,8 @@
|
||||
# Server Settings
|
||||
spring.main.banner-mode=off
|
||||
server.port=8443
|
||||
server.http.port=8080
|
||||
server.port=8080
|
||||
server.http.port=8443
|
||||
server.ssl.enabled=false
|
||||
multipart.maxFileSize=20MB
|
||||
multipart.maxRequestSize=20MB
|
||||
# Thymeleaf Settings
|
||||
|
Loading…
Reference in New Issue
Block a user