diff --git a/Dockerfile b/Dockerfile index 9894f2a..e2b828b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -107,7 +107,7 @@ RUN mkdir /application/ COPY --from=build /tmp/back/out/maven/*.jar /application/application.jar # add front software: RUN mkdir /application/sso/ -COPY --from=build /tmp/sso/dist /application/sso/ +COPY --from=build /tmp/sso/dist /application/karso/ RUN mkdir /application/karauth/ COPY --from=build /tmp/front/dist /application/karauth/ diff --git a/back/src/org/kar/oauth/api/Front.java b/back/src/org/kar/oauth/api/Front.java index 888947e..7e03187 100644 --- a/back/src/org/kar/oauth/api/Front.java +++ b/back/src/org/kar/oauth/api/Front.java @@ -1,26 +1,15 @@ package org.kar.oauth.api; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.imageio.ImageIO; import javax.ws.rs.*; import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.SecurityContext; import org.kar.oauth.util.ConfigVariable; - @Path("/karauth") public class Front { private String getExtension(String filename) { @@ -30,7 +19,7 @@ public class Front { return ""; } private Response retrive(String fileName) throws Exception { - String filePathName = ConfigVariable.getSsoFolder() + File.separator + fileName; + String filePathName = ConfigVariable.getFrontFolder() + File.separator + fileName; String extention = getExtension(filePathName); String mineType = null; if (extention.equalsIgnoreCase("jpg") || extention.equalsIgnoreCase("jpeg")) { @@ -77,6 +66,14 @@ public class Front { return response.build(); } + + @GET + @PermitAll() + //@Produces(MediaType.APPLICATION_OCTET_STREAM) + //@CacheMaxAge(time = 10, unit = TimeUnit.DAYS) + public Response retrive0() throws Exception { + return retrive("index.html"); + } @GET @Path("{baseA}") @@ -86,12 +83,14 @@ public class Front { public Response retrive1(@PathParam("baseA") String baseA) throws Exception { return retrive(baseA); } + @GET @Path("{baseA}/assets/images/{baseB}") @PermitAll() public Response retrive2(@PathParam("baseA") String baseA, @PathParam("baseB") String baseB) throws Exception { return retrive(baseA + File.separator + "assets" + File.separator + "images" + File.separator + baseB); } + @GET @Path("{baseA}/assets/js_3rd_party/{baseB}") @PermitAll() diff --git a/back/src/org/kar/oauth/api/FrontSSO.java b/back/src/org/kar/oauth/api/FrontSSO.java index 86ffa9b..47e9483 100644 --- a/back/src/org/kar/oauth/api/FrontSSO.java +++ b/back/src/org/kar/oauth/api/FrontSSO.java @@ -1,22 +1,12 @@ package org.kar.oauth.api; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import javax.annotation.security.PermitAll; -import javax.annotation.security.RolesAllowed; -import javax.imageio.ImageIO; import javax.ws.rs.*; import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.SecurityContext; import org.kar.oauth.util.ConfigVariable; @@ -78,6 +68,14 @@ public class FrontSSO { return response.build(); } + @GET + @PermitAll() + //@Produces(MediaType.APPLICATION_OCTET_STREAM) + //@CacheMaxAge(time = 10, unit = TimeUnit.DAYS) + public Response retrive0() throws Exception { + return retrive("index.html"); + } + @GET @Path("{baseA}") @PermitAll() @@ -86,12 +84,14 @@ public class FrontSSO { public Response retrive1(@PathParam("baseA") String baseA) throws Exception { return retrive(baseA); } + @GET @Path("{baseA}/assets/images/{baseB}") @PermitAll() public Response retrive2(@PathParam("baseA") String baseA, @PathParam("baseB") String baseB) throws Exception { return retrive(baseA + File.separator + "assets" + File.separator + "images" + File.separator + baseB); } + @GET @Path("{baseA}/assets/js_3rd_party/{baseB}") @PermitAll()