From 48c8df15e7b81e4d4e6440242da27c186934298c Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 26 Jun 2023 10:30:44 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8D=87=E7=BA=A7solon=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=BA2.3.6=202=E3=80=81=E7=AE=A1=E7=90=86=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E6=94=AF=E6=8C=81=E5=B8=A6context-path=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/config/docker.env.js                       | 2 +-
 .../dromara/neutrinoproxy/server/service/LicenseService.java    | 2 --
 neutrino-proxy-server/src/main/resources/app.yml                | 1 +
 pom.xml                                                         | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

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<LicenseListRes> assembleConvertLicenses(List<LicenseDO> list) {
 		List<LicenseListRes> 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 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.2.8</version>
+        <version>2.3.6</version>
         <relativePath />
     </parent>