tomcat deploy support and context path

admin-console/pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.ibeetl</groupId>
 	<artifactId>admin-console</artifactId>
 	<version>1.0</version>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 	<parent>
 		<groupId>com.ibeetl</groupId>
 		<artifactId>admin</artifactId>

admin-console/src/main/resources/application.properties

@@ -5,7 +5,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url= jdbc:oracle:thin:@127.0.0.1:1521:orcl
 #spring.datasource.username=starter2
 #spring.datasource.password=starter2
-server.servlet.context-path=/admin-console
+#server.servlet.context-path=/admin-console
 # 1，1 是管理员密码，相当于启动后就登录，方便测试，系统需要取消这俩个配置
 user.id=1
 user.orgId=1

admin-core/src/main/resources/templates/common/layout.html

@@ -28,9 +28,9 @@
 
 	Common.ctxPath= '${ctxPath}';
 	Common.version= '${jsVer}';
-	//设定layui模块的版本
+	//设定layui模块的版本,1234
 	layui.config({
-		base : "${ctxPath}/${jsBase!}",
+		base : Common.ctxPath+"${jsBase!}",
 		version : Common.version
 	});
 	$(document).ready(function () { }).keydown(

admin-core/src/main/resources/templates/index.html

@@ -69,7 +69,7 @@
           <a href="javascript:;">${subSystem.data.name}</a>
           <dl class="layui-nav-child">
           	<!--#for(menu in subSystem.children){  -->
-          	<dd class="" ><a href="javascript:;" menuId="${menu.data.id}" dataUrl="${ctxPath}/${menu.data.accessUrl}"><i class="layui-icon">&#xe68e;</i> 
+          	<dd class="" ><a href="javascript:;" menuId="${menu.data.id}" dataUrl="${ctxPath=='/'?''}${menu.data.accessUrl}"><i class="layui-icon">&#xe68e;</i> 
           	${menu.data.name}
           	</a></dd>
             <!--#}  -->