Merge branch 'javaweb' of http://222.76.244.118:3000/CPICXIM/car_deal_util into javaweb
This commit is contained in:
commit
60017b58aa
@ -2,7 +2,7 @@
|
||||
* @Author: Kane
|
||||
* @Date: 2022-09-28 15:47:02
|
||||
* @LastEditors: Kane
|
||||
* @LastEditTime: 2022-10-11 11:06:56
|
||||
* @LastEditTime: 2022-10-19 16:19:01
|
||||
* @FilePath: \car_dealer\src\main\java\com\cpic\xim\car_dealer\controllers\fileupload\FileUploadController.java
|
||||
* @Description: 用于实现跨域功能的过滤器对象。
|
||||
* Copyright (c) ${2022} by Kane, All Rights Reserved.
|
||||
@ -13,7 +13,6 @@ package com.cpic.xim.car_dealer.controllers.fileupload;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.channels.IllegalSelectorException;
|
||||
import javax.annotation.PostConstruct;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import org.springframework.context.annotation.Scope;
|
||||
@ -27,16 +26,16 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
@RequestMapping( path = "/upload")
|
||||
public class FileUploadController
|
||||
{
|
||||
@PostConstruct
|
||||
public void init()
|
||||
{
|
||||
// WebApplicationContext webApplicationContext =
|
||||
// ContextLoader.getCurrentWebApplicationContext();
|
||||
// ServletContext servletContext = webApplicationContext.getServletContext();
|
||||
// String realPath = servletContext.getRealPath( "" );
|
||||
// @PostConstruct
|
||||
// public void init()
|
||||
// {
|
||||
// // WebApplicationContext webApplicationContext =
|
||||
// // ContextLoader.getCurrentWebApplicationContext();
|
||||
// // ServletContext servletContext = webApplicationContext.getServletContext();
|
||||
// // String realPath = servletContext.getRealPath( "" );
|
||||
|
||||
// System.out.println( realPath );
|
||||
}
|
||||
// // System.out.println( realPath );
|
||||
// }
|
||||
|
||||
/*****************************************************
|
||||
* 接收上传文件,并保存到临时目录:
|
||||
|
17
code/java/car_dealer/src/main/webapp/css/test.css
Normal file
17
code/java/car_dealer/src/main/webapp/css/test.css
Normal file
@ -0,0 +1,17 @@
|
||||
a,
|
||||
p {
|
||||
padding: 5rem;
|
||||
border: 1px solid red;
|
||||
line-height: 2rem;
|
||||
margin: 2em;
|
||||
}
|
||||
|
||||
.warp_test {
|
||||
width: 5rem;
|
||||
border: 1px solid red;
|
||||
}
|
||||
|
||||
ol,
|
||||
li {
|
||||
background-color: cornflowerblue;
|
||||
}
|
37
code/java/car_dealer/src/main/webapp/test.html
Normal file
37
code/java/car_dealer/src/main/webapp/test.html
Normal file
@ -0,0 +1,37 @@
|
||||
<!--
|
||||
* @Author: Kane
|
||||
* @Date: 2022-10-19 09:59:34
|
||||
* @LastEditors: Kane
|
||||
* @LastEditTime: 2022-10-19 17:21:25
|
||||
* @FilePath: \car_dealer\src\main\webapp\test.html
|
||||
* @Description:
|
||||
*
|
||||
* Copyright (c) ${2022} by Kane, All Rights Reserved.
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Document</title>
|
||||
<link rel="stylesheet" href="css/root.css" />
|
||||
<link rel="stylesheet" href="css/normalize.css" />
|
||||
<link rel="stylesheet" href="css/kane.css" />
|
||||
<link rel="stylesheet" href="css/test.css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="root">
|
||||
<!-- <div><a>测试的文本!!!!</a> <a>第二行文本!!!</a></div>
|
||||
<div class="warp_test"></div> -->
|
||||
<ol>
|
||||
<li>测试</li>
|
||||
<li>测试</li>
|
||||
<li>测试</li>
|
||||
<li>测试</li>
|
||||
<li>测试</li>
|
||||
<li>测试</li>
|
||||
</ol>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
@ -107,7 +107,7 @@ body {
|
||||
}
|
||||
|
||||
.btn_login {
|
||||
display: block;
|
||||
/* display: inline; */
|
||||
width: 40%;
|
||||
height: 50px;
|
||||
border-radius: 25px;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: Kane
|
||||
* @Date: 2022-10-11 22:49:54
|
||||
* @LastEditors: Kane
|
||||
* @LastEditTime: 2022-10-11 23:00:06
|
||||
* @LastEditTime: 2022-10-14 17:24:05
|
||||
* @FilePath: \car_dealer\index.html
|
||||
* @Description:
|
||||
*
|
||||
@ -18,5 +18,21 @@
|
||||
<link rel="stylesheet" href="css/root.css" />
|
||||
<link rel="stylesheet" href="css/normalize.css" />
|
||||
</head>
|
||||
<body></body>
|
||||
<body>
|
||||
<div class="outter">
|
||||
<p class="inner">测试</p>
|
||||
</div>
|
||||
</body>
|
||||
<style>
|
||||
.outter {
|
||||
border: 1px solid red;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
.inner {
|
||||
display: inline;
|
||||
width: 150px;
|
||||
border: 1px solid green;
|
||||
}
|
||||
</style>
|
||||
</html>
|
||||
|
Loading…
x
Reference in New Issue
Block a user