treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test-api-clearing http://10.200.200.183:8701/ последние улучшение тестового модуля

Browse source
This commit is contained in:
AKurakin 2023-10-11 11:22:39 +03:00
parent 3eaa2a9ac6
commit 894408354b
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/controller/Controller.java
View file

@ -35,9 +35,9 @@ public class Controller extends HttpServerSimpleFramework {
@Override @Override
protected void createContextPages(HttpServer server, String baseUrl) throws IOException { protected void createContextPages(HttpServer server, String baseUrl) throws IOException {
//server.createContext(baseUrl, new RedirectPage(baseUrl+"index.html")); server.createContext(baseUrl, new RedirectPage(baseUrl, baseUrl+"index.html"));
//server.createContext(baseUrl + "/favicon.ico", staticPageFromResource("pages/favicon.ico", null).contentType="image/icon"); //server.createContext(baseUrl + "/favicon.ico", staticPageFromResource("pages/favicon.ico", null).contentType="image/icon");
server.createContext(baseUrl + "", staticPageFromResource("pages/index.html", null)); server.createContext(baseUrl + "index.html", staticPageFromResource("pages/index.html", null));
// Database // Database
server.createContext(baseUrl + "imdg/reload", new ImdgHandler()); server.createContext(baseUrl + "imdg/reload", new ImdgHandler());

19
clearing-parent/test-api-clearing/src/main/java/ru/spcex/clearing/test/controller/HttpServerSimpleFramework.java
View file

@ -37,7 +37,7 @@ public abstract class HttpServerSimpleFramework implements InitializingBean, Dis
} }
protected void createContextPages(HttpServer server, String baseUrl) throws IOException { protected void createContextPages(HttpServer server, String baseUrl) throws IOException {
server.createContext(baseUrl, new RedirectPage(baseUrl + "index.html")); server.createContext(baseUrl, new RedirectPage(baseUrl, baseUrl + "index.html"));
server.createContext(baseUrl + "index.html", staticPageFromResource("pages/index.html", null)); server.createContext(baseUrl + "index.html", staticPageFromResource("pages/index.html", null));
} }
@ -58,7 +58,7 @@ public abstract class HttpServerSimpleFramework implements InitializingBean, Dis
@Override @Override
public void destroy() throws Exception { public void destroy() throws Exception {
if (server != null) { if (server != null) {
server.stop(100); server.stop(6);
log.info("HTTP test controller stop."); log.info("HTTP test controller stop.");
} }
} }
@ -121,14 +121,27 @@ public abstract class HttpServerSimpleFramework implements InitializingBean, Dis
public static class RedirectPage implements HttpHandler { public static class RedirectPage implements HttpHandler {
protected final Logger log = LoggerFactory.getLogger(getClass()); protected final Logger log = LoggerFactory.getLogger(getClass());
protected String myUrl; // для редиректа с корня /
protected String toUrl; protected String toUrl;
public RedirectPage(String toUrl) { public RedirectPage(String myUrl, String toUrl) {
this.myUrl = Objects.requireNonNull(myUrl);
this.toUrl = Objects.requireNonNull(toUrl); this.toUrl = Objects.requireNonNull(toUrl);
} }
@Override @Override
public void handle(HttpExchange he) throws IOException { public void handle(HttpExchange he) throws IOException {
if (!myUrl.equalsIgnoreCase(he.getRequestURI().getPath()) &&
!myUrl.equalsIgnoreCase(he.getRequestURI().getPath() + "/") &&
!(myUrl + "/").equalsIgnoreCase(he.getRequestURI().getPath())) {
log.info("Access {} url \"{}\" IP {}; 404", he.getRequestMethod(),
he.getRequestURI(), he.getRemoteAddress().getAddress().getHostAddress());
he.sendResponseHeaders(404, 0);
try (OutputStream os = he.getResponseBody()) {
os.write("404 Page not found".getBytes("windows-1251"));
}
he.close();
}
log.info("Access {} url \"{}\" IP {}; redirect to \"{}\"", he.getRequestMethod(), log.info("Access {} url \"{}\" IP {}; redirect to \"{}\"", he.getRequestMethod(),
he.getRequestURI(), he.getRemoteAddress().getAddress().getHostAddress(), toUrl); he.getRequestURI(), he.getRemoteAddress().getAddress().getHostAddress(), toUrl);
Headers responseHeaders = he.getResponseHeaders(); Headers responseHeaders = he.getResponseHeaders();