diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/config/WebConfig.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/config/WebConfig.java index 8c7693c..81103d8 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/config/WebConfig.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/config/WebConfig.java @@ -3,21 +3,18 @@ import com.tokensTool.pandoraNext.interceptor.LoginCheckInterceptor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration public class WebConfig implements WebMvcConfigurer { - @Value("${server.servlet.context-path}") - private String profix; @Autowired private LoginCheckInterceptor loginCheckInterceptor; @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(loginCheckInterceptor).addPathPatterns(profix+"/api/**"); + registry.addInterceptor(loginCheckInterceptor).addPathPatterns("/api/**"); } } diff --git a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java index e5513ac..eefcdb3 100644 --- a/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java +++ b/rearServer/src/main/java/com/tokensTool/pandoraNext/controller/apiController.java @@ -29,10 +29,7 @@ public class apiController { * 重载接口 */ private final static String reloadUrl = "/api/setup/reload"; - /** - * 主机先前IP - */ - private static String previousIPAddress = ""; + public String deploy = "default"; private systemService systemService; @@ -47,8 +44,6 @@ public class apiController { @Value("${deployWay}") private String deployWay; - @Value("${pandoara_Ip}") - private String pandoara_Ip; private static boolean isContainerStopped(DockerClient dockerClient, String containerIdOrName) { try { diff --git a/rearServer/src/main/resources/application.properties b/rearServer/src/main/resources/application.properties index 43fc987..02c6c73 100644 --- a/rearServer/src/main/resources/application.properties +++ b/rearServer/src/main/resources/application.properties @@ -4,15 +4,12 @@ server.port=8081 deployWay=docker # default Or your absolute filePath deployPosition=default -# default Or your PandoraNext_Ip -pandoara_Ip="ip Or default" # hotReload hotReload=true # copilot interface copilot_interface=true - # SpringBoot 2.* prefix -server.servlet.context-path= +server.servlet.context-path=/ diff --git a/rearServer/target/classes/application.properties b/rearServer/target/classes/application.properties index 43fc987..02c6c73 100644 --- a/rearServer/target/classes/application.properties +++ b/rearServer/target/classes/application.properties @@ -4,15 +4,12 @@ server.port=8081 deployWay=docker # default Or your absolute filePath deployPosition=default -# default Or your PandoraNext_Ip -pandoara_Ip="ip Or default" # hotReload hotReload=true # copilot interface copilot_interface=true - # SpringBoot 2.* prefix -server.servlet.context-path= +server.servlet.context-path=/ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/config/WebConfig.class b/rearServer/target/classes/com/tokensTool/pandoraNext/config/WebConfig.class index 9f2a350..37b4d7a 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/config/WebConfig.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/config/WebConfig.class differ diff --git a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/apiController.class b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/apiController.class index 0f53298..14ae79d 100644 Binary files a/rearServer/target/classes/com/tokensTool/pandoraNext/controller/apiController.class and b/rearServer/target/classes/com/tokensTool/pandoraNext/controller/apiController.class differ diff --git a/rearServer/target/pandoraNext-0.6.0-SNAPSHOT.jar b/rearServer/target/pandoraNext-0.6.0-SNAPSHOT.jar index 96bf3c5..36d9a59 100644 Binary files a/rearServer/target/pandoraNext-0.6.0-SNAPSHOT.jar and b/rearServer/target/pandoraNext-0.6.0-SNAPSHOT.jar differ diff --git a/simplyDeploy/pandoraNext-0.6.0-SNAPSHOT.jar b/simplyDeploy/pandoraNext-0.6.0-SNAPSHOT.jar index 96bf3c5..36d9a59 100644 Binary files a/simplyDeploy/pandoraNext-0.6.0-SNAPSHOT.jar and b/simplyDeploy/pandoraNext-0.6.0-SNAPSHOT.jar differ