diff --git a/neutrino-proxy-admin/config/docker.env.js b/neutrino-proxy-admin/config/docker.env.js index 33aca667..3793cee6 100644 --- a/neutrino-proxy-admin/config/docker.env.js +++ b/neutrino-proxy-admin/config/docker.env.js @@ -1,5 +1,5 @@ module.exports = { NODE_ENV: '"development"', ENV_CONFIG: '"docker"', - BASE_API: '"/"' + BASE_API: '"/neutrino-proxy-server"' } diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java index e1a66a03..7b96fda3 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java @@ -26,7 +26,6 @@ import org.dromara.neutrinoproxy.server.util.ParamCheckUtil; import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.dromara.neutrinoproxy.server.controller.res.proxy.*; -import org.jetbrains.annotations.Nullable; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Init; import org.noear.solon.annotation.Inject; @@ -90,7 +89,6 @@ public class LicenseService implements LifecycleBean { return licenseList; } - @Nullable private List assembleConvertLicenses(List list) { List licenseList = mapperFacade.mapAsList(list, LicenseListRes.class); if (!CollectionUtil.isEmpty(licenseList)) { diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml index 8da747a5..b11d0448 100644 --- a/neutrino-proxy-server/src/main/resources/app.yml +++ b/neutrino-proxy-server/src/main/resources/app.yml @@ -1,6 +1,7 @@ server: # 服务端web端口,用于支持HTTP接口,管理后台页面访问 port: ${WEB_PORT:8888} + context-path: /neutrino-proxy-server neutrino: proxy: diff --git a/pom.xml b/pom.xml index aa92a35b..b1ce1798 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.noear solon-parent - 2.2.8 + 2.3.6