Merge branch 'test6.9.3' into gray

@@ -107,7 +107,7 @@
             width: 171,
             width: 171,
             height: 120,
             height: 120,
             realInputName: "topicImageUrl",
             realInputName: "topicImageUrl",
-            url: serverContextPath + '/fileupload/uploadFile',
+            url: serverContextPath + '/fileupload/upload',
             queryParams: {
             queryParams: {
                 bucket: "grassImg"
                 bucket: "grassImg"
             },
             },
@@ -126,7 +126,7 @@
                     $.messager.alert("错误", data.message);
                     $.messager.alert("错误", data.message);
                     return "";
                     return "";
                 }
                 }
-                return data.data.url;
+                return data.data;
             },
             },
             onLoadSuccess: function (data) {
             onLoadSuccess: function (data) {
                 $.messager.progress("close");
                 $.messager.progress("close");