应用管理-图片上传

fad3a7a6 · 季圣华 · 558a8b26 · fad3a7a6 · fad3a7a6 · fad3a7a6
Commit fad3a7a6 authored Jun 14, 2017 by 季圣华
--- a/src/main/java/com/jsh/action/basic/AppAction.java
+++ b/src/main/java/com/jsh/action/basic/AppAction.java
@@ -35,32 +35,19 @@ public class AppAction extends BaseAction<AppModel>
    private UserBusinessIService userBusinessService;
    private AppModel model = new AppModel();
 	/**
-	 * 增加应用
+	 * 上传图片
-	 * @return
 	 */
-	public void create()
+	public void uploadImg()
-	{
-	    Log.infoFileSync("==================开始调用增加应用方法create()===================");
-	    Boolean flag = false;
-		try
 	{
-			App app = new App();
+		Log.infoFileSync("==================开始调用上传图片方法uploadImg()===================");
-			app.setNumber(model.getNumber());
+		File fileInfo = model.getFileInfo();
-			app.setName(model.getName());
+		String fileName = model.getFileInfoName();  //获取文件名
-			app.setType(model.getType());
 		try {
-				if(model.getIcon()!=null)
+			if(fileInfo != null ){
-				{
 				String path = ServletActionContext.getServletContext().getRealPath("/upload/images/deskIcon");
-					String iconName=model.getIcon();
+				InputStream is = new FileInputStream(fileInfo);
-					File file1 = new File(iconName);  //文件
+				File file = new File(path, fileName);
-					String FileName = file1.getName();  //获取文件名
-					app.setIcon(FileName); //设置图片ICON
-					InputStream is = new FileInputStream(iconName);
-					File file = new File(path, FileName);
 				OutputStream os = new FileOutputStream(file);
 				byte[] b = new byte[1024];
 				int bs = 0;
@@ -70,15 +57,33 @@ public class AppAction extends BaseAction<AppModel>
 				is.close();
 				os.close();
 			}
+		}
-			} catch (FileNotFoundException e) {
+		catch (FileNotFoundException e) {
 			// TODO Auto-generated catch block
-				e.printStackTrace();
+			//			e.printStackTrace();
-			} catch (IOException e) {
+		}
+		catch (IOException e) {
 			// TODO Auto-generated catch block
-				e.printStackTrace();
+			//			e.printStackTrace();
+		}
+		Log.infoFileSync("==================结束调用上传图片方法uploadImg()===================");
 	}
+	/**
+	 * 增加应用
+	 * @return
+	 */
+	public void create()
+	{
+	    Log.infoFileSync("==================开始调用增加应用方法create()===================");
+	    Boolean flag = false;
+		try
+		{
+			App app = new App();
+			app.setNumber(model.getNumber());
+			app.setName(model.getName());
+			app.setType(model.getType());
+			app.setIcon(model.getIcon()); //设置图片Icon
 			app.setURL(model.getURL());
 			app.setWidth(model.getWidth());
 			app.setHeight(model.getHeight());

--- a/src/main/java/com/jsh/model/vo/basic/AppModel.java
+++ b/src/main/java/com/jsh/model/vo/basic/AppModel.java
 package com.jsh.model.vo.basic;
+import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.io.Serializable;
@@ -29,6 +31,8 @@ public class AppModel implements Serializable
     */
    private String Icon = "";
+	private File fileInfo;
+	private String fileInfoName; //图片名称
    /**
     * 链接
     */
@@ -139,6 +143,22 @@ public class AppModel implements Serializable
 		Name = name;
 	}
+	public File getFileInfo() {
+		return fileInfo;
+	}
+	public void setFileInfo(File fileInfo) {
+		this.fileInfo = fileInfo;
+	}
+	public String getFileInfoName() {
+		return fileInfoName;
+	}
+	public void setFileInfoName(String fileInfoName) {
+		this.fileInfoName = fileInfoName;
+	}
 	public String getType() {
 		return Type;
 	}

--- a/src/main/webapp/js/fileUploadQT/css/fileUpload.css
+++ b/src/main/webapp/js/fileUploadQT/css/fileUpload.css
+.fileUploadContent .box{
+    border: solid thin #DDDDDD;
+    min-height: 200px;
+    min-width: 200px;
+    margin-top: 0px;
+}
+.fileUploadContent .fileItem{
+    border: solid thin #DDDDDD;
+    width: 150px;
+    height: 215px;
+    display: inline-block;
+    margin: 10px;
+    text-align: center;
+    border-radius: 5px;
+    vertical-align:top;
+}
+.fileUploadContent .fileItem .imgShow{
+    width: 140px;
+    height: 140px;
+    margin: 5px auto;
+    text-align: center;
+}
+.fileUploadContent .fileItem .imgShow i{
+    font-size: 120px;
+    position: relative;
+    top:-30px;
+    z-index: 2;
+}
+.fileUploadContent .fileItem .imgShow img{
+    width: 100%;
+    height: 100%;
+}
+.fileUploadContent .fileItem .imgShow .fileType{
+    color: #FFFFFF;
+    font-size: 20px;;
+    position: relative;
+    top:63px;
+    z-index: 3;
+    left: -18px;
+}
+.fileUploadContent .fileItem .progress{
+    height: 10px;
+    width: 100%;
+}
+.fileUploadContent .fileItem .progress>.progress_inner{
+    background-color: #0099FF;
+    width: 0%;
+    height: 10px;
+    border-radius: 10px;
+}
+.fileUploadContent .fileItem .progress .error{
+    background-color: red;
+}
+.fileUploadContent .fileItem .status{
+    font-size: 15px;
+    text-align: center;
+}
+.fileUploadContent .fileItem .status i{
+    display: block;
+    float: left;
+    padding: 2px 5px;
+    color: red;
+    margin-left: 3px;
+    border-radius: 5px;;
+    font-size: 15px;
+    cursor: pointer;
+}
+.fileUploadContent .fileItem .fileName{
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    -ms-text-overflow: ellipsis;
+    overflow: hidden;
+    clear: both;
+    padding: 2px 2px;
+}
+.fileUploadContent .uploadBts {
+    text-align: left;
+    height: 40px
+}
+.fileUploadContent .uploadBts>div{
+    float: left;
+    margin-right: 15px;
+}
+.fileUploadContent .uploadBts>div .selectFileBt{
+    border: none;
+    background-color: #0099FF;
+    color: #FFFFFF;
+    padding: 6px;
+    font-size: 15px;
+    border-radius: 5px;
+    cursor: pointer;
+}
+.fileUploadContent .uploadBts>div .selectFileBt:hover{
+    color: #DDDDDD;
+}
+.fileUploadContent .uploadBts>div i{
+    font-size: 30px;
+    color: #0099FF;
+    cursor: pointer;
+}
+.fileUploadContent .subberProgress{
+    padding: 5px;
+    display: none;
+}
+.fileUploadContent .subberProgress .progress{
+    border:solid thin #0099FF;
+    height: 20px;
+    width: 100%;
+    border-radius: 20px;
+    overflow: hidden;
+}
+.fileUploadContent .subberProgress .progress>div{
+    background-color: #0099FF;
+    width: 0%;
+    height: 20px;
+    border-bottom-left-radius: 20px;
+    border-top-left-radius: 20px;
+    text-align: center;
+    color: #FFFFFF;
+    transition: width 0.5s;
+    -moz-transition: width 0.5s;	/* Firefox 4 */
+    -webkit-transition: width 0.5s;	/* Safari 和 Chrome */
+    -o-transition: width 0.5s;	/* Opera */
+    transition-timing-function: linear;
+    -moz-transition-timing-function: linear;
+    -webkit-transition-timing-function: linear;
+    -o-transition-timing-function: linear;
+}
\ No newline at end of file
--- a/src/main/webapp/js/fileUploadQT/css/iconfont.css
+++ b/src/main/webapp/js/fileUploadQT/css/iconfont.css
+@font-face {font-family: "iconfont";
+  src: url('../fonts/iconfont.eot?t=1489192348890'); /* IE9*/
+  src: url('../fonts/iconfont.eot?t=1489192348890#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  url('../fonts/iconfont.woff?t=1489192348890') format('woff'), /* chrome, firefox */
+  url('../fonts/iconfont.ttf?t=1489192348890') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  url('../fonts/iconfont.svg?t=1489192348890#iconfont') format('svg'); /* iOS 4.1- */
+}
+.iconfont {
+  font-family:"iconfont" !important;
+  font-size:16px;
+  font-style:normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.icon-shanchu:before { content: "\e636"; }
+.icon-gou:before { content: "\e666"; }
+.icon-wenjian:before { content: "\e634"; }
+.icon-wenjian1:before { content: "\e614"; }
+.icon-qingchu:before { content: "\e60a"; }
+.icon-shangchuan:before { content: "\e6f7"; }
+.icon-cha:before { content: "\e602"; }
+.icon-wenjian2:before { content: "\e615"; }
--- a/src/main/webapp/js/fileUploadQT/demo.html
+++ b/src/main/webapp/js/fileUploadQT/demo.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>文件上传</title>
+    <link href="css/iconfont.css" rel="stylesheet" type="text/css"/>
+    <link href="css/fileUpload.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+    <div id="fileUploadContent" class="fileUploadContent">
+        <!--<div class="uploadBts">
+            <div>
+                <div class="selectFileBt">选择文件</div>
+            </div>
+            <div>
+            <i class="iconfont icon-shangchuan"></i>
+            </div>
+        </div>
+        <div class="subberProgress">
+            <div class="progress">
+                <div>30%</div>
+            </div>
+        </div>
+        <div class="box">
+            <div class="fileItem">
+                <div class="imgShow">
+                    <div class="fileType">txt</div>
+                    <i class="iconfont icon-wenjian"></i>
+                </div>
+                <div class="progress">
+                    <div class="progress_inner error"></div>
+                </div>
+                <div class="status">
+                    <i class="iconfont icon-shanchu"></i>
+                </div>
+                <div class="fileName">
+                   qwertyuiopasdfghjklzxcvbnm.jpg
+                </div>
+            </div>
+            <div class="fileItem">
+                <div class="imgShow">
+                    <div class="fileType">jpg</div>
+                    <i class="iconfont icon-wenjian"></i>
+                </div>
+                <div class="progress">
+                    <div class="progress_inner error"></div>
+                </div>
+                <div class="status">
+                    <i class="iconfont icon-shanchu"></i>
+                </div>
+                <div class="fileName">
+                    qwertyuiopasdfghjklzxcvbnm.jpg
+                </div>
+            </div>
+            <div class="fileItem">
+                <div class="imgShow">
+                    <img src="404bg.jpg"/>
+                </div>
+                <div class="progress">
+                    <div class="progress_inner error"></div>
+                </div>
+                <div class="status">
+                    <i class="iconfont icon-shanchu"></i>
+                </div>
+                <div class="fileName">
+                    qwertyuiopasdfghjklzxcvbnm.jpg
+                </div>
+            </div>
+        </div>-->
+    </div>
+</body>
+</html>
+<script src="http://www.jq22.com/jquery/jquery-1.10.2.js"></script>
+<script type="text/javascript" src="js/fileUpload.js"></script>
+<script type="text/javascript">
+    $("#fileUploadContent").initUpload({
+        "uploadUrl":"#",//上传文件信息地址
+        "progressUrl":"#",//获取进度信息地址，可选，注意需要返回的data格式如下（{bytesRead: 102516060, contentLength: 102516060, items: 1, percent: 100, startTime: 1489223136317, useTime: 2767}）
+        //"showSummerProgress":false,//总进度条，默认限制
+        //"size":350,//文件大小限制，单位kb,默认不限制
+        //"maxFileNumber":3,//文件个数限制，为整数
+        //"filelSavePath":"",//文件上传地址，后台设置的根目录
+        //"beforeUpload":beforeUploadFun,//在上传前执行的函数
+        //"onUpload":onUploadFun，//在上传后执行的函数
+        autoCommit:false,//文件是否自动上传
+        //"fileType":['png','jpg','docx','doc']，//文件类型限制，默认不限制，注意写的是文件后缀
+    })
+    function beforeUploadFun(opt){
+        opt.otherData =[{"name":"你要上传的参数","value":"你要上传的值"}];
+    }
+    function onUploadFun(opt,data){
+        alert(data);
+        uploadTools.uploadError(opt);//显示上传错误
+    }
+</script>
\ No newline at end of file
--- a/src/main/webapp/js/fileUploadQT/fonts/iconfont.eot
+++ b/src/main/webapp/js/fileUploadQT/fonts/iconfont.eot
--- a/src/main/webapp/js/fileUploadQT/fonts/iconfont.svg
+++ b/src/main/webapp/js/fileUploadQT/fonts/iconfont.svg
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+Created by FontForge 20120731 at Sat Mar 11 08:32:28 2017
+ By admin
+</metadata>
+<defs>
+<font id="iconfont" horiz-adv-x="1024" >
+  <font-face 
+    font-family="iconfont"
+    font-weight="500"
+    font-stretch="normal"
+    units-per-em="1024"
+    panose-1="2 0 6 3 0 0 0 0 0 0"
+    ascent="896"
+    descent="-128"
+    x-height="792"
+    bbox="0 -212 1024 876"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0078-E6F7"
+  />
+<missing-glyph 
+ />
+    <glyph glyph-name=".notdef" 
+ />
+    <glyph glyph-name=".notdef" 
+ />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="341" 
+ />
+    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001" 
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+    <glyph glyph-name="shanchu" unicode="&#xe636;" 
+d="M641 596v76h-259v-76h-171v-74h602v74h-172zM239 472l44 -537h458l44 537h-546zM426 37h-70v342h70v-342zM546 37h-69v342h69v-342zM670 37h-72v342h72v-342z" />
+    <glyph glyph-name="gou" unicode="&#xe666;" 
+d="M800 567l-413 -413l-163 163q-18 18 -44 18t-44.5 -18t-18.5 -44t19 -44l195 -196q20 -20 56 -18q36 -2 56 18l445 445q19 19 19 44.5t-18.5 44t-44.5 18.5t-44 -18z" />
+    <glyph glyph-name="wenjian" unicode="&#xe634;" 
+d="M877 646l-29 29l-29 29q-59 60 -90 84t-59 24h-316q-65 0 -111 -46t-46 -112v-275h-118q-16 0 -28 -11.5t-12 -28.5v-236q0 -16 12 -27.5t28 -11.5h118v-118q0 -66 46 -112t111 -46h473q65 0 111.5 46t46.5 112v551q0 29 -24 60t-84 89zM906 -54q0 -33 -23 -56t-56 -23
+h-473q-32 0 -55 23t-23 56v118h394q16 0 27.5 11.5t11.5 27.5v236q0 17 -11.5 28.5t-27.5 11.5h-394v275q0 33 23 56t55 23h288q10 -2 16 -9t8.5 -20t3 -21.5t0.5 -26.5v-120q0 -16 11.5 -27.5t27.5 -11.5h118q20 0 30 -1t23.5 -4t19.5 -11.5t6 -22.5v-512z" />
+    <glyph glyph-name="wenjian1" unicode="&#xe614;" 
+d="M992 684h-499l-118 119q-10 9 -23 9h-320q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h352q13 0 22.5 9.5t9.5 22.5t-9.5 22.5t-22.5 9.5h-320v640h275l118 -119q10 -9 23 -9h480v-512h-320q-13 0 -22.5 -9.5t-9.5 -22.5t9.5 -22.5t22.5 -9.5h352
+q13 0 22.5 9.5t9.5 22.5v576q0 13 -9.5 22.5t-22.5 9.5zM640 172q13 0 22.5 9.5t9.5 22.5t-9 23l-128 128q-10 9 -23 9t-23 -9l-128 -128q-9 -10 -9 -23t9.5 -22.5t22.5 -9.5t23 9l73 74v-435q0 -13 9.5 -22.5t22.5 -9.5t22.5 9.5t9.5 22.5v435l73 -74q10 -9 23 -9z" />
+    <glyph glyph-name="qingchu" unicode="&#xe60a;" 
+d="M31 796v0v0zM740 -108q-37 0 -123.5 -30t-120.5 -30q-37 0 -123.5 30t-117.5 30q-18 0 -40 -6t-35.5 -11.5t-35.5 -14.5q-12 -6 -18 -8.5t-15 -5.5t-13 -3q-4 1 -7 3q-4 2 -4.5 8.5t1.5 16t6 24.5l11 32q6 17 12 38q15 42 28 80t24 73t18 56l8 20h726q36 -201 52 -304
+q2 -14 2 -23q0 -5 -0.5 -8.5t-1 -6.5t-2.5 -5.5t-4 -3.5q-6 -2 -10 -3q-2 -1 -5.5 -0.5t-8 2t-8.5 3t-8 2.5q-7 3 -21 8q-28 12 -47 17q-6 2 -13.5 4t-17.5 4t-21 5q-5 1 -10 1.5t-10 1.5t-9 1l-10 2h-9h-10l-9 1v0zM861 254h-606q-24 0 -42 18t-18 44q25 33 81 121
+q46 61 100 61h90l31 242l14 18q9 9 32.5 25.5t44 16.5t43.5 -14q6 -4 11 -8t9.5 -8t8 -7t6.5 -7l13 -16l-30 -242h89q25 0 54 -17t50 -48q56 -86 79 -117q0 -28 -18 -45t-42 -17v0z" />
+    <glyph glyph-name="shangchuan" unicode="&#xe6f7;" horiz-adv-x="1040" 
+d="M375 552q-3 3 -7.5 7t-19.5 12t-31 11t-40 -0.5t-48 -17.5q-21 -14 -35 -33t-19.5 -36.5t-7 -33t-1 -25l0.5 -9.5q-7 -1 -18 -4.5t-40 -19t-51 -36.5t-40 -61t-18 -90q3 -127 118 -167q35 -12 64 -12h266v189h-128l192 190l192 -190h-128v-189h259q3 0 9 0.5t23.5 3.5
+t34 9t37.5 18.5t37 29.5t29 45t18 62q3 52 -13 94t-37.5 64t-50.5 38t-40.5 19.5t-18.5 5.5v0q1 3 1 9t-1 25t-3.5 37.5t-9 44.5t-16.5 48.5t-27 46.5t-39 42t-54 32t-71 19q-58 6 -106.5 -10.5t-77 -43t-49 -56t-28 -47.5t-7.5 -21z" />
+    <glyph glyph-name="cha" unicode="&#xe602;" 
+d="M511.5 798q-112.5 0 -207.5 -55.5t-150.5 -150.5t-55.5 -207.5t55.5 -208t150.5 -151t207.5 -55.5t208 55.5t151 151t55.5 208t-55.5 207.5t-151 150.5t-208 55.5zM720 215q9 -9 9 -21t-9 -21t-21 -8.5t-21 8.5l-166 168l-168 -166q-8 -9 -20.5 -9t-21 8.5t-8.5 21
+t9 21.5l168 166l-167 168q-9 9 -9 21t9 21t21 9t21 -9l167 -168l168 166q8 9 20.5 8.5t21 -9t8.5 -20.5t-9 -21l-168 -166z" />
+    <glyph glyph-name="wenjian2" unicode="&#xe615;" 
+d="M924 620v2q0 16 -11 27l-217 217q-11 10 -26 10h-4h-475q-30 0 -51.5 -21.5t-21.5 -51.5v-843q0 -30 21.5 -51.5t51.5 -21.5h660q31 0 52.5 21.5t21.5 51.5v660h-1zM668 785l166 -165h-166v165zM851 -40h-660v843h404v-220q0 -15 10.5 -26t25.5 -11h220v-586v0z" />
+  </font>
+</defs></svg>
--- a/src/main/webapp/js/fileUploadQT/fonts/iconfont.ttf
+++ b/src/main/webapp/js/fileUploadQT/fonts/iconfont.ttf
--- a/src/main/webapp/js/fileUploadQT/fonts/iconfont.woff
+++ b/src/main/webapp/js/fileUploadQT/fonts/iconfont.woff
--- a/src/main/webapp/js/fileUploadQT/js/fileUpload.js
+++ b/src/main/webapp/js/fileUploadQT/js/fileUpload.js
--- a/src/main/webapp/js/fileUploadQT/js/iconfont.js
+++ b/src/main/webapp/js/fileUploadQT/js/iconfont.js
+;(function(window) {
+  var svgSprite = '<svg>' +
+    '' +
+    '<symbol id="icon-shanchu" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M640.512 216.44288l0-76.8-258.048 0 0 76.8-171.008 0 0 73.728 601.088 0 0-73.728L640.512 216.44288zM239.104 340.34688l44.032 536.576 457.728 0 44.032-536.576L239.104 340.34688zM426.496 774.52288l-70.656 0 0-342.016 70.656 0L426.496 774.52288zM546.304 774.52288l-69.632 0 0-342.016 69.632 0L546.304 774.52288zM670.208 774.52288l-72.704 0 0-342.016 72.704 0L670.208 774.52288z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-gou" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M800.06837 245.25068 387.101897 658.217153 223.927537 495.043816c-24.418133-24.416086-64.004733-24.416086-88.422865 0-24.414039 24.415063-24.414039 64.003709 0 88.419795l195.480136 195.48116c13.023618 13.020548 36.738739 18.950607 56.342216 18.022469 19.475564 0.924045 42.872436-5.006014 55.889915-18.024515l445.271226-445.271226c24.418133-24.418133 24.418133-64.004733 0-88.420819C864.072079 220.832548 824.486502 220.832548 800.06837 245.25068z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-wenjian" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M877.095385 165.809231l-29.144615-29.144615L818.806154 107.52C751.458462 38.990769 711.325538 0 669.538462 0L354.461538 0C267.421538 0 196.923077 70.498462 196.923077 157.538462l0 275.692308L78.769231 433.230769c-21.661538 0-39.384615 17.723077-39.384615 39.384615l0 236.307692c0 21.661538 17.723077 39.384615 39.384615 39.384615l118.153846 0 0 118.153846c0 87.04 70.498462 157.538462 157.538462 157.538462l472.615385 0c87.04 0 157.538462-70.498462 157.538462-157.538462L984.615385 315.076923C984.615385 273.329231 945.624615 233.156923 877.095385 165.809231zM905.846154 866.461538c0 43.323077-35.446154 78.769231-78.769231 78.769231L354.461538 945.230769c-43.323077 0-78.769231-35.446154-78.769231-78.769231l0-118.153846 393.846154 0c21.661538 0 39.384615-17.723077 39.384615-39.384615l0-236.307692c0-21.661538-17.723077-39.384615-39.384615-39.384615L275.692308 433.230769 275.692308 157.538462c0-43.323077 35.446154-78.769231 78.769231-78.769231l287.113846 0C669.932308 85.858462 669.538462 120.910769 669.538462 155.569231L669.538462 275.692308c0 21.661538 17.723077 39.384615 39.384615 39.384615l118.153846 0c39.384615 0 78.769231 0 78.769231 39.384615L905.846154 866.461538z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-wenjian1" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M992 128 493.248 128 374.656 9.344C368.64 3.392 360.512 0 352 0l-320 0C14.336 0 0 14.336 0 32l0 704C0 753.664 14.336 768 32 768L384 768c17.664 0 32-14.336 32-32S401.664 704 384 704L64 704 64 64l274.752 0 118.656 118.656C463.36 188.608 471.488 192 480 192L960 192l0 512-320 0c-17.664 0-32 14.336-32 32S622.336 768 640 768l352 0c17.664 0 32-14.336 32-32l0-576C1024 142.336 1009.664 128 992 128zM640 640c8.192 0 16.384-3.136 22.656-9.344 12.48-12.48 12.48-32.768 0-45.248l-127.936-128c-12.544-12.48-32.832-12.48-45.248 0l-128 128c-12.48 12.48-12.48 32.768 0 45.248 12.48 12.48 32.768 12.48 45.248 0L480 557.248 480 992C480 1009.664 494.4 1024 512 1024s32-14.336 32-32L544 557.248l73.344 73.344C623.616 636.864 631.808 640 640 640z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-qingchu" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M31.030303 15.515152 31.030303 15.515152 31.030303 15.515152ZM739.886545 920.234667q-36.864 0-123.159273 30.068364t-120.242424 30.068364q-37.825939 0-124.121212-30.068364t-117.325576-30.068364q-18.432 0-40.246303 5.833697t-35.405576 11.139879-34.909091 15.018667q-12.598303 5.833697-18.432 8.254061t-15.018667 5.337212-13.094788 2.916848q-3.878788-0.961939-6.795636-2.916848-3.878788-1.954909-4.375273-8.254061t1.458424-16.011636 5.833697-24.234667l10.674424-31.992242q5.833697-17.470061 12.598303-38.787879 14.553212-41.704727 27.648-79.530667t23.769212-72.73503q11.636364-34.909091 18.432-56.257939l7.757576-20.355879 726.295273 0q35.87103 201.69697 51.386182 304.500364 1.954909 13.591273 1.954909 23.272727 0 4.840727-0.496485 8.254061t-0.961939 6.299152-2.420364 5.337212-3.878788 3.382303q-5.833697 1.954909-9.712485 2.916848-1.954909 0.961939-5.337212 0.496485t-8.254061-1.954909-8.719515-2.916848-7.757576-2.420364q-6.795636-2.916848-21.348848-7.757576-28.113455-11.636364-46.545455-17.470061-5.833697-1.954909-13.591273-3.878788t-17.470061-3.878788-21.348848-4.840727q-4.840727-0.961939-9.712485-1.458424t-9.712485-1.458424-9.712485-0.961939l-9.712485-1.954909-9.216 0t-9.216-0.496485-9.712485-0.496485zM861.090909 557.583515l-606.052848 0q-24.234667 0-42.170182-17.935515t-17.935515-43.163152q25.227636-33.947152 81.454545-121.204364 45.583515-61.098667 99.886545-61.098667l90.174061 0 30.068364-242.439758 14.553212-17.470061q8.719515-9.712485 32.488727-26.189576t44.125091-16.477091 43.628606 14.553212q5.833697 3.878788 10.674424 7.757576t9.216 7.757576 8.254061 7.261091 6.795636 7.261091l12.598303 15.515152-30.068364 242.439758 89.212121 0q25.227636 0 54.30303 16.973576t49.462303 48.003879q56.257939 86.295273 79.530667 117.325576 0 27.151515-17.935515 44.125091t-42.170182 16.973576z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-shangchuan" viewBox="0 0 1040 1024">' +
+    '' +
+    '<path d="M374.978277 343.568916c0 0-61.903885-62.009286-145.889695-11.366885-75.143421 48.349171-61.854766 136.832412-61.854766 136.832412S0.325411 502.828107 0.325411 680.117952c3.721765 177.001273 181.261297 178.816618 181.261297 178.816618l266.50475 0.285502L448.091458 669.715021 320.298933 669.715021 512.024559 480.224296l191.697997 189.490725L575.907519 669.715021l0 189.504028 258.773671-0.285502c0 0 165.217902 0.14224 188.43672-168.250982 11.041474-184.189999-159.709445-220.490763-159.709445-220.490763s19.425422-272.650727-220.35671-303.734676C437.509449 144.596236 374.978277 343.568916 374.978277 343.568916z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-cha" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M511.728 97.943c-228.547 0-413.821 185.274-413.821 413.821s185.274 413.821 413.821 413.821c228.548 0 413.821-185.274 413.821-413.821s-185.274-413.821-413.821-413.821zM720.272 681.129c11.492 11.598 11.402 30.313-0.196 41.8s-30.313 11.401-41.802-0.197l-166.086-167.652-167.985 166.418c-11.598 11.489-30.313 11.4-41.8-0.198s-11.4-30.312 0.197-41.8l167.985-166.418-166.76-168.332c-11.489-11.597-11.4-30.313 0.198-41.8s30.312-11.4 41.8 0.198l166.76 168.332 167.997-166.429c11.6-11.489 30.314-11.4 41.801 0.198 11.49 11.597 11.4 30.313-0.197 41.8l-167.998 166.429 166.087 167.652z"  ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '<symbol id="icon-wenjian2" viewBox="0 0 1024 1024">' +
+    '' +
+    '<path d="M923.84 276.288a37.952 37.952 0 0 0-10.752-29.312L696.192 30.4a37.888 37.888 0 0 0-30.272-10.624H191.104c-40.576 0-73.408 32.832-73.408 73.28v842.816c0 40.512 32.832 73.344 73.408 73.344h660.288c40.512 0 73.344-32.832 73.344-73.344V276.288h-0.896z m-255.808-165.696l165.888 165.696h-165.888V110.592z m183.424 825.344H191.104V93.12h403.52v219.904c0 20.224 16.448 36.672 36.608 36.672h220.16v586.24z" fill="" ></path>' +
+    '' +
+    '</symbol>' +
+    '' +
+    '</svg>'
+  var script = function() {
+    var scripts = document.getElementsByTagName('script')
+    return scripts[scripts.length - 1]
+  }()
+  var shouldInjectCss = script.getAttribute("data-injectcss")
+  /**
+   * document ready
+   */
+  var ready = function(fn) {
+    if (document.addEventListener) {
+      if (~["complete", "loaded", "interactive"].indexOf(document.readyState)) {
+        setTimeout(fn, 0)
+      } else {
+        var loadFn = function() {
+          document.removeEventListener("DOMContentLoaded", loadFn, false)
+          fn()
+        }
+        document.addEventListener("DOMContentLoaded", loadFn, false)
+      }
+    } else if (document.attachEvent) {
+      IEContentLoaded(window, fn)
+    }
+    function IEContentLoaded(w, fn) {
+      var d = w.document,
+        done = false,
+        // only fire once
+        init = function() {
+          if (!done) {
+            done = true
+            fn()
+          }
+        }
+        // polling for no errors
+      var polling = function() {
+        try {
+          // throws errors until after ondocumentready
+          d.documentElement.doScroll('left')
+        } catch (e) {
+          setTimeout(polling, 50)
+          return
+        }
+        // no errors, fire
+        init()
+      };
+      polling()
+        // trying to always fire before onload
+      d.onreadystatechange = function() {
+        if (d.readyState == 'complete') {
+          d.onreadystatechange = null
+          init()
+        }
+      }
+    }
+  }
+  /**
+   * Insert el before target
+   *
+   * @param {Element} el
+   * @param {Element} target
+   */
+  var before = function(el, target) {
+    target.parentNode.insertBefore(el, target)
+  }
+  /**
+   * Prepend el to target
+   *
+   * @param {Element} el
+   * @param {Element} target
+   */
+  var prepend = function(el, target) {
+    if (target.firstChild) {
+      before(el, target.firstChild)
+    } else {
+      target.appendChild(el)
+    }
+  }
+  function appendSvg() {
+    var div, svg
+    div = document.createElement('div')
+    div.innerHTML = svgSprite
+    svgSprite = null
+    svg = div.getElementsByTagName('svg')[0]
+    if (svg) {
+      svg.setAttribute('aria-hidden', 'true')
+      svg.style.position = 'absolute'
+      svg.style.width = 0
+      svg.style.height = 0
+      svg.style.overflow = 'hidden'
+      prepend(svg, document.body)
+    }
+  }
+  if (shouldInjectCss && !window.__iconfont__svg__cssinject__) {
+    window.__iconfont__svg__cssinject__ = true
+    try {
+      document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>");
+    } catch (e) {
+      console && console.log(e)
+    }
+  }
+  ready(appendSvg)
+})(window)
\ No newline at end of file
--- a/src/main/webapp/js/fileUploadQT/js/jquery-2.1.3.min.js
+++ b/src/main/webapp/js/fileUploadQT/js/jquery-2.1.3.min.js
--- a/src/main/webapp/logs/jsh-info.log
+++ b/src/main/webapp/logs/jsh-info.log
--- a/src/main/webapp/pages/manage/app.jsp
+++ b/src/main/webapp/pages/manage/app.jsp
@@ -16,9 +16,12 @@
 		<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
 		<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
 		<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
+		<link href="<%=path %>/js/fileUploadQT/css/iconfont.css" rel="stylesheet" type="text/css" />
+		<link href="<%=path %>/js/fileUploadQT/css/fileUpload.css" rel="stylesheet" type="text/css" />
 		<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/fileUploadQT/js/fileUpload.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
  	</head>
  	<body>
@@ -52,65 +55,49 @@
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
-	    <div id="appDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+	    <div id="appDlg" class="easyui-dialog" style="width:600px;padding:10px 20px;top:20px"
 	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
 	        <form id="appFM" method="post" enctype="multipart/form-data">
 	            <table>
 	            <tr>
-	            <td>代号</td>
+	            	<td style="width: 50px;height: 20px">代号</td>
-	            <td style="padding:1px"><input name="Number" id="Number" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+	            	<td style="padding:1px"><input name="Number" id="Number" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
-	            </tr>
+	            	<td style="width: 50px;height: 20px">名称</td>
-	            <tr>
+	            	<td style="padding:1px"><input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 150px;height: 20px"/></td>
-	            <td>名称</td>
+					<td style="width: 50px;height: 20px">拉伸</td>
-	            <td style="padding:1px"><input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
+					<td style="padding:1px"><input name="ReSize" id="ReSize" type="checkbox" style="width: 50px;height: 20px"/></td>
 	             </tr>
 	            <tr>
 	            	<td>类型</td>
-	            <td style="padding:1px"><input name="Type" id="Type" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+	            	<td style="padding:1px"><input name="Type" id="Type" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>图标</td>
-	            <td style="padding:1px"><input name="Icon" id="Icon" type="file" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
 	            	<td>链接</td>
-	            <td style="padding:1px"><input name="URL" id="URL" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+	            	<td style="padding:1px"><input name="URL" id="URL" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
+					<td>最大化</td>
+					<td style="padding:1px"><input name="OpenMax" id="OpenMax" type="checkbox" style="width: 50px;height: 20px"/></td>
 	            </tr>
 	            <tr>
 	            	<td>宽度</td>
-	            <td style="padding:1px"><input name="Width" id="Width" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+	           		<td style="padding:1px"><input name="Width" id="Width" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
-	            </tr>
-	            <tr>
 	            	<td>高度</td>
-	            <td style="padding:1px"><input name="Height" id="Height" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+	           		<td style="padding:1px"><input name="Height" id="Height" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>拉伸</td>
-	            <td style="padding:1px"><input name="ReSize" id="ReSize" type="checkbox" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>最大化</td>
-	            <td style="padding:1px"><input name="OpenMax" id="OpenMax" type="checkbox" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
 					<td>Flash</td>
-	            <td style="padding:1px"><input name="Flash" id="Flash" type="checkbox" style="width: 230px;height: 20px"/></td>
+					<td style="padding:1px"><input name="Flash" id="Flash" type="checkbox" style="width: 50px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>种类</td>
-	            <td style="padding:1px"><input name="ZL" id="ZL" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
 	            </tr>
 				<tr>
 					<td>排序号</td>
-	            <td style="padding:1px"><input name="Sort" id="Sort" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+					<td style="padding:1px"><input name="Sort" id="Sort" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
+					<td>种类</td>
+					<td style="padding:1px"><input name="ZL" id="ZL" class="easyui-textbox" style="width: 150px;height: 20px"/></td>
+					<td>启用</td>
+					<td style="padding:1px"><input name="Enabled" id="Enabled" type="checkbox" style="width: 50px;height: 20px"/></td>
 				</tr>
 	            <tr>
 				<td>备注</td>
-	            <td style="padding:1px"><input name="Remark" id="Remark" class="easyui-textbox" style="width: 230px;height: 20px"/></td>
+				<td style="padding:1px" colspan="5"><input name="Remark" id="Remark" class="easyui-textbox" style="width: 480px;height: 20px"/></td>
 				</tr>
 				<tr>
-	            <td>启用</td>
+				<td>图标</td>
-	            <td style="padding:1px"><input name="Enabled" id="Enabled" type="checkbox" style="width: 230px;height: 20px"/></td>
+				<td style="padding:1px" colspan="5"><div id="Icon" class="fileUploadContent"></div></td>
 	            </tr>
 	            </table>
 	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
@@ -402,6 +389,19 @@
 	            orgApp = "";
 	            appID = 0;
 	            url = '<%=path %>/app/create.action';
+				$("#Icon").empty();//清除上传控件数据
+				$(".fileUploadContent").initUpload({
+					"uploadUrl": "<%=path %>/app/uploadImg.action",//上传文件信息地址
+					"progressUrl":"#",//获取进度信息地址，可选，注意需要返回的data格式如下（{bytesRead: 102516060, contentLength: 102516060, items: 1, percent: 100, startTime: 1489223136317, useTime: 2767}）
+					//"showSummerProgress":false,//总进度条，默认限制
+					//"size":350,//文件大小限制，单位kb,默认不限制
+					"maxFileNumber":1,//文件个数限制，为整数
+					//"filelSavePath":"",//文件上传地址，后台设置的根目录
+					//"beforeUpload":beforeUploadFun,//在上传前执行的函数
+					//"onUpload":onUploadFun, //在上传后执行的函数
+					autoCommit:true, //文件是否自动上传
+					"fileType":['png','jpg']//文件类型限制，默认不限制，注意写的是文件后缀
+				});
 			}
 			//保存信息
@@ -424,7 +424,7 @@
 								Number : $.trim($("#Number").val()),
 								Name : $.trim($("#Name").val()),
 								Type : $.trim($("#Type").val()),
-								Icon : $("#Icon").val(),
+								Icon :  $.trim($("#Icon .fileItem .fileName").text()),
 								URL : $.trim($("#URL").val()),
 								Width : $.trim($("#Width").val()),
 								Height : $.trim($("#Height").val()),