|
@@ -72,197 +72,6 @@ define([], function () { |
|
@@ -72,197 +72,6 @@ define([], function () { |
|
72
|
});
|
72
|
});
|
|
73
|
|
73
|
|
|
74
|
});
|
74
|
});
|
|
75
|
-//修改上传的接口调用
|
|
|
|
76
|
-require(['upload'], function (Upload) {
|
|
|
|
77
|
-
|
|
|
|
78
|
- var _onInit = Upload.events.onInit;
|
|
|
|
79
|
- //初始化中完成判断
|
|
|
|
80
|
- Upload.events.onInit = function () {
|
|
|
|
81
|
- _onInit.apply(this, Array.prototype.slice.apply(arguments));
|
|
|
|
82
|
- //如果上传接口不是七牛云，则不处理
|
|
|
|
83
|
- if (this.options.url !== Config.upload.uploadurl) {
|
|
|
|
84
|
- return;
|
|
|
|
85
|
- }
|
|
|
|
86
|
- var _success = this.options.success;
|
|
|
|
87
|
-
|
|
|
|
88
|
- $.extend(this.options, {
|
|
|
|
89
|
- //关闭自动处理队列功能
|
|
|
|
90
|
- autoQueue: false,
|
|
|
|
91
|
- chunkSuccess: function (chunk, file, response) {
|
|
|
|
92
|
- this.contexts = this.contexts ? this.contexts : [];
|
|
|
|
93
|
- this.contexts.push(typeof response.ctx !== 'undefined' ? response.ctx : response.data.ctx);
|
|
|
|
94
|
- },
|
|
|
|
95
|
- chunksUploaded: function (file, done) {
|
|
|
|
96
|
- var that = this;
|
|
|
|
97
|
- var params = $(that.element).data("params") || {};
|
|
|
|
98
|
- var category = typeof params.category !== 'undefined' ? params.category : ($(that.element).data("category") || '');
|
|
|
|
99
|
- category = typeof category === 'function' ? category.call(this, file) : category;
|
|
|
|
100
|
- Fast.api.ajax({
|
|
|
|
101
|
- url: "/addons/qiniu/index/upload",
|
|
|
|
102
|
- data: {
|
|
|
|
103
|
- action: 'merge',
|
|
|
|
104
|
- filesize: file.size,
|
|
|
|
105
|
- filename: file.name,
|
|
|
|
106
|
- chunkid: file.upload.uuid,
|
|
|
|
107
|
- chunkcount: file.upload.totalChunkCount,
|
|
|
|
108
|
- width: file.width || 0,
|
|
|
|
109
|
- height: file.height || 0,
|
|
|
|
110
|
- type: file.type,
|
|
|
|
111
|
- category: category,
|
|
|
|
112
|
- qiniutoken: Config.upload.multipart.qiniutoken,
|
|
|
|
113
|
- contexts: this.contexts
|
|
|
|
114
|
- },
|
|
|
|
115
|
- }, function (data, ret) {
|
|
|
|
116
|
- done(JSON.stringify(ret));
|
|
|
|
117
|
- return false;
|
|
|
|
118
|
- }, function (data, ret) {
|
|
|
|
119
|
- file.accepted = false;
|
|
|
|
120
|
- that._errorProcessing([file], ret.msg);
|
|
|
|
121
|
- return false;
|
|
|
|
122
|
- });
|
|
|
|
123
|
-
|
|
|
|
124
|
- },
|
|
|
|
125
|
- });
|
|
|
|
126
|
-
|
|
|
|
127
|
- //先移除已有的事件
|
|
|
|
128
|
- this.off("success", _success).on("success", function (file, response) {
|
|
|
|
129
|
- var that = this;
|
|
|
|
130
|
- var ret = {code: 0, msg: response};
|
|
|
|
131
|
- try {
|
|
|
|
132
|
- ret = typeof response === 'string' ? JSON.parse(response) : response;
|
|
|
|
133
|
- if (file.xhr.status === 200) {
|
|
|
|
134
|
- if (Config.upload.uploadmode === 'client') {
|
|
|
|
135
|
- if (typeof ret.key !== 'undefined') {
|
|
|
|
136
|
- ret = {code: 1, msg: "", data: {url: '/' + ret.key, hash: ret.hash}};
|
|
|
|
137
|
- }
|
|
|
|
138
|
- }
|
|
|
|
139
|
-
|
|
|
|
140
|
- if (ret.code == 1) {
|
|
|
|
141
|
- var url = ret.data.url || '';
|
|
|
|
142
|
- var params = $(that.element).data("params") || {};
|
|
|
|
143
|
- var category = typeof params.category !== 'undefined' ? params.category : ($(that.element).data("category") || '');
|
|
|
|
144
|
- category = typeof category === 'function' ? category.call(that, file) : category;
|
|
|
|
145
|
- Fast.api.ajax({
|
|
|
|
146
|
- url: "/addons/qiniu/index/notify",
|
|
|
|
147
|
- data: {name: file.name, url: ret.data.url, hash: ret.data.hash, size: file.size, width: file.width || 0, height: file.height || 0, type: file.type, category: category, qiniutoken: Config.upload.multipart.qiniutoken}
|
|
|
|
148
|
- }, function () {
|
|
|
|
149
|
- return false;
|
|
|
|
150
|
- }, function () {
|
|
|
|
151
|
- return false;
|
|
|
|
152
|
- });
|
|
|
|
153
|
- } else {
|
|
|
|
154
|
- console.error(ret);
|
|
|
|
155
|
- }
|
|
|
|
156
|
- } else {
|
|
|
|
157
|
- console.error(file.xhr);
|
|
|
|
158
|
- }
|
|
|
|
159
|
- } catch (e) {
|
|
|
|
160
|
- console.error(e);
|
|
|
|
161
|
- }
|
|
|
|
162
|
- _success.call(this, file, ret);
|
|
|
|
163
|
- });
|
|
|
|
164
|
-
|
|
|
|
165
|
- this.on("addedfile", function (file) {
|
|
|
|
166
|
- var that = this;
|
|
|
|
167
|
- setTimeout(function () {
|
|
|
|
168
|
- if (file.status === 'error') {
|
|
|
|
169
|
- return;
|
|
|
|
170
|
- }
|
|
|
|
171
|
-
|
|
|
|
172
|
- var md5 = ''; //七牛云无需本地获取文件MD5
|
|
|
|
173
|
- var chunk = that.options.chunking && file.size > that.options.chunkSize ? 1 : 0;
|
|
|
|
174
|
- var params = $(that.element).data("params") || {};
|
|
|
|
175
|
- var category = typeof params.category !== 'undefined' ? params.category : ($(that.element).data("category") || '');
|
|
|
|
176
|
- category = typeof category === 'function' ? category.call(that, file) : category;
|
|
|
|
177
|
- Fast.api.ajax({
|
|
|
|
178
|
- url: "/addons/qiniu/index/params",
|
|
|
|
179
|
- data: {method: 'POST', category: category, md5: md5, name: file.name, type: file.type, size: file.size, chunk: chunk, chunksize: that.options.chunkSize, qiniutoken: Config.upload.multipart.qiniutoken},
|
|
|
|
180
|
- }, function (data) {
|
|
|
|
181
|
- file.qiniutoken = data.qiniutoken;
|
|
|
|
182
|
- file.params = data;
|
|
|
|
183
|
- file.category = category;
|
|
|
|
184
|
-
|
|
|
|
185
|
- if (file.status != 'error') {
|
|
|
|
186
|
- //开始上传
|
|
|
|
187
|
- that.enqueueFile(file);
|
|
|
|
188
|
- } else {
|
|
|
|
189
|
- that.removeFile(file);
|
|
|
|
190
|
- }
|
|
|
|
191
|
- return false;
|
|
|
|
192
|
- }, function () {
|
|
|
|
193
|
- that.removeFile(file);
|
|
|
|
194
|
- });
|
|
|
|
195
|
- }, 0);
|
|
|
|
196
|
- });
|
|
|
|
197
|
-
|
|
|
|
198
|
- //如果是直传模式
|
|
|
|
199
|
- if (Config.upload.uploadmode === 'client') {
|
|
|
|
200
|
- var _url = this.options.url;
|
|
|
|
201
|
-
|
|
|
|
202
|
- //分片上传时URL链接不同
|
|
|
|
203
|
- this.options.url = function (files) {
|
|
|
|
204
|
- this.options.headers = {"Authorization": "UpToken " + Config.upload.multipart.qiniutoken};
|
|
|
|
205
|
- if (files[0].upload.chunked) {
|
|
|
|
206
|
- var chunk = null;
|
|
|
|
207
|
- files[0].upload.chunks.forEach(function (item) {
|
|
|
|
208
|
- if (item.status === 'uploading') {
|
|
|
|
209
|
- chunk = item;
|
|
|
|
210
|
- }
|
|
|
|
211
|
- });
|
|
|
|
212
|
- if (!chunk) {
|
|
|
|
213
|
- return Config.upload.uploadurl + '/mkfile/' + files[0].size;
|
|
|
|
214
|
- } else {
|
|
|
|
215
|
- return Config.upload.uploadurl + '/mkblk/' + chunk.dataBlock.data.size;
|
|
|
|
216
|
- }
|
|
|
|
217
|
- }
|
|
|
|
218
|
- return _url;
|
|
|
|
219
|
- };
|
|
|
|
220
|
-
|
|
|
|
221
|
- this.options.params = function (files, xhr, chunk) {
|
|
|
|
222
|
- var params = Config.upload.multipart;
|
|
|
|
223
|
- if (chunk) {
|
|
|
|
224
|
- return $.extend({}, params, {
|
|
|
|
225
|
- filesize: chunk.file.size,
|
|
|
|
226
|
- filename: chunk.file.name,
|
|
|
|
227
|
- chunkid: chunk.file.upload.uuid,
|
|
|
|
228
|
- chunkindex: chunk.index,
|
|
|
|
229
|
- chunkcount: chunk.file.upload.totalChunkCount,
|
|
|
|
230
|
- chunkfilesize: chunk.dataBlock.data.size,
|
|
|
|
231
|
- width: chunk.file.width || 0,
|
|
|
|
232
|
- height: chunk.file.height || 0,
|
|
|
|
233
|
- type: chunk.file.type,
|
|
|
|
234
|
- });
|
|
|
|
235
|
- } else {
|
|
|
|
236
|
- var retParams = $.extend({}, params, files[0].params || {});
|
|
|
|
237
|
- //七牛云直传使用的是token参数
|
|
|
|
238
|
- retParams.token = retParams.qiniutoken;
|
|
|
|
239
|
- delete retParams.qiniutoken;
|
|
|
|
240
|
- return retParams;
|
|
|
|
241
|
- }
|
|
|
|
242
|
- };
|
|
|
|
243
|
-
|
|
|
|
244
|
- //分片上传时需要变更提交的内容
|
|
|
|
245
|
- this.on("sending", function (file, xhr, formData) {
|
|
|
|
246
|
- if (file.upload.chunked) {
|
|
|
|
247
|
- var _send = xhr.send;
|
|
|
|
248
|
- xhr.send = function () {
|
|
|
|
249
|
- var chunk = null;
|
|
|
|
250
|
- file.upload.chunks.forEach(function (item) {
|
|
|
|
251
|
- if (item.status == 'uploading') {
|
|
|
|
252
|
- chunk = item;
|
|
|
|
253
|
- }
|
|
|
|
254
|
- });
|
|
|
|
255
|
- if (chunk) {
|
|
|
|
256
|
- _send.call(xhr, chunk.dataBlock.data);
|
|
|
|
257
|
- }
|
|
|
|
258
|
- };
|
|
|
|
259
|
- }
|
|
|
|
260
|
- });
|
|
|
|
261
|
- }
|
|
|
|
262
|
- };
|
|
|
|
263
|
-
|
|
|
|
264
|
-});
|
|
|
|
265
|
-
|
|
|
|
266
|
if (Config.modulename === 'index' && Config.controllername === 'user' && ['login', 'register'].indexOf(Config.actionname) > -1 && $("#register-form,#login-form").length > 0 && $(".social-login").length == 0) {
|
75
|
if (Config.modulename === 'index' && Config.controllername === 'user' && ['login', 'register'].indexOf(Config.actionname) > -1 && $("#register-form,#login-form").length > 0 && $(".social-login").length == 0) {
|
|
267
|
$("#register-form,#login-form").append(Config.third.loginhtml || '');
|
76
|
$("#register-form,#login-form").append(Config.third.loginhtml || '');
|
|
268
|
}
|
77
|
}
|
