Ver Fonte

配置合并代码后的前端路径

sunyj há 8 anos atrás
pai
commit
da075d3995

+ 10 - 5
kanban-console/src/main/java/com/uas/kanban/WebAppConfiguration.java

@@ -41,12 +41,14 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter {
 		// 使用/src/main/webapp下资源均需在此添加
 		registry.addResourceHandler("/static/**").addResourceLocations("/resources/");
 		registry.addResourceHandler("/WEB-INF/**").addResourceLocations("/WEB-INF/");
+		registry.addResourceHandler("/html/**").addResourceLocations("/html/");
+		registry.addResourceHandler("/app/**").addResourceLocations("/app/");
 		super.addResourceHandlers(registry);
 	}
 
 	@Override
 	public void configureViewResolvers(ViewResolverRegistry registry) {
-		InternalResourceViewResolver viewResolver = new InternalResourceViewResolver("/WEB-INF/views/", ".html");
+		InternalResourceViewResolver viewResolver = new InternalResourceViewResolver("", ".html");
 		viewResolver.setContentType("text/html;charset=UTF-8");
 		registry.viewResolver(viewResolver);
 		super.configureViewResolvers(registry);
@@ -54,10 +56,13 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter {
 
 	@Override
 	public void addViewControllers(ViewControllerRegistry registry) {
-		registry.addViewController("/").setViewName("index");
-		registry.addViewController("/index").setViewName("index");
-		registry.addViewController("/console").setViewName("console");
-		registry.addViewController("/fileUpload").setViewName("fileUpload");
+		registry.addViewController("/").setViewName("/WEB-INF/views/index");
+		registry.addViewController("/index").setViewName("/WEB-INF/views/index");
+		registry.addViewController("/console").setViewName("/WEB-INF/views/console");
+		registry.addViewController("/fileUpload").setViewName("/WEB-INF/views/fileUpload");
+		registry.addViewController("/board").setViewName("/html/board");
+		registry.addViewController("/desktop").setViewName("/html/desktop");
+		registry.addViewController("/login").setViewName("/html/login");
 		super.addViewControllers(registry);
 	}
 

+ 1 - 1
kanban-console/src/main/webapp/app/view/login/Login.js

@@ -20,7 +20,7 @@ Ext.define('erp.view.login.Login',{
 				//titleAlign:'center',
 				cls:'login-form',
 				headerCls: 'login-header',
-				title:'<img src="../resource/images/login/uas.png" style="width:64px;height:24px;vertical-align:middle;">看板系统登录</img>',
+				title:'<img src="../static/images/login/uas.png" style="width:64px;height:24px;vertical-align:middle;">看板系统登录</img>',
 				layout: {
 			        type: 'vbox',
 			        pack: 'center',

+ 3 - 3
kanban-console/src/main/webapp/html/board.html

@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link href="../resource/ext/4.2/resources/ext-theme-neptune/ext-theme-neptune-all.css" rel="stylesheet" type="text/css" />
-<script src="../resource/ext/4.2/ext-all.js" type="text/javascript"></script>
-<script type="text/javascript" src="../resource/i18n/i18n.js"></script>
+<link href="../static/ext/4.2/resources/ext-theme-neptune/ext-theme-neptune-all.css" rel="stylesheet" type="text/css" />
+<script src="../static/ext/4.2/ext-all.js" type="text/javascript"></script>
+<script type="text/javascript" src="../static/i18n/i18n.js"></script>
 
 <script type="text/javascript">
 Ext.Loader.setConfig({

+ 4 - 4
kanban-console/src/main/webapp/html/desktop.html

@@ -3,12 +3,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" type="text/css"
-	href="../resource/css/desktop.css" />
+	href="../static/css/desktop.css" />
 <link
-	href="../resource/ext/4.2/resources/ext-theme-neptune/ext-theme-neptune-all.css"
+	href="../static/ext/4.2/resources/ext-theme-neptune/ext-theme-neptune-all.css"
 	rel="stylesheet" type="text/css" />
-<script src="../resource/ext/4.2/ext-all.js" type="text/javascript"></script>
-<script type="text/javascript" src="../resource/i18n/i18n.js"></script>
+<script src="../static/ext/4.2/ext-all.js" type="text/javascript"></script>
+<script type="text/javascript" src="../static/i18n/i18n.js"></script>
 
 <script type="text/javascript">
 	Ext.Loader.setConfig({

+ 6 - 6
kanban-console/src/main/webapp/html/login.html

@@ -2,9 +2,9 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link href="../resource/ext/4.2/resources/ext-theme-neptune/ext-theme-neptune-all.css" rel="stylesheet" type="text/css" />
-<script src="../resource/ext/4.2/ext-all.js" type="text/javascript"></script>
-<script type="text/javascript" src="../resource/i18n/i18n.js"></script>
+<link href="../static/ext/4.2/resources/ext-theme-neptune/ext-theme-neptune-all.css" rel="stylesheet" type="text/css" />
+<script src="../static/ext/4.2/ext-all.js" type="text/javascript"></script>
+<script type="text/javascript" src="../static/i18n/i18n.js"></script>
 
 <script type="text/javascript">
 Ext.Loader.setConfig({
@@ -24,7 +24,7 @@ Ext.application({
 </script>
 <style>
 .login-background{
-	background:url(../resource/images/wallpapers/desktop2.jpg) no-repeat 0px 0px;
+	background:url(../static/images/wallpapers/desktop2.jpg) no-repeat 0px 0px;
 }
 
 .login-form{
@@ -42,7 +42,7 @@ Ext.application({
 
 .login-user{
 	margin:0 0 10px 15px!important;
-	background:url(../resource/images/login/add_user_24px.png) no-repeat 0px 0px;
+	background:url(../static/images/login/add_user_24px.png) no-repeat 0px 0px;
 }
 
 .login-user .x-form-field{
@@ -52,7 +52,7 @@ Ext.application({
 
 .login-password{
 	margin:0 0 10px 15px!important;
-	background:url(../resource/images/login/key_24px.png) no-repeat 0px 0px;
+	background:url(../static/images/login/key_24px.png) no-repeat 0px 0px;
 }
 
 .login-password .x-form-field{