askbot-dragon 0.6.17 → 0.6.21

package/src/components/utils/AliyunIssUtil.js

@@ -1,72 +1,72 @@
-const OSS = require('ali-oss');
-
-let IDX = 256, HEX = [], SIZE = 256, BUFFER;
-while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
-
-function uid(len) {
-  let i = 0, tmp = (len || 11);
-  if (!BUFFER || ((IDX + tmp) > SIZE * 2)) {
-    for (BUFFER = '', IDX = 0; i < SIZE; i++) {
-      BUFFER += HEX[Math.random() * 256 | 0];
-    }
-  }
-
-  return BUFFER.substring(IDX, IDX++ + tmp);
-}
-
-function dataFormat(fmt, date = new Date()) {
-  const o = {
-    "M+": date.getMonth() + 1, //月份
-    "d+": date.getDate(), //日
-    "h+": date.getHours(), //小时
-    "m+": date.getMinutes(), //分
-    "s+": date.getSeconds(), //秒
-    "q+": Math.floor((date.getMonth() + 3) / 3), //季度
-    "S": date.getMilliseconds() //毫秒
-  };
-  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
-  for (const k in o)
-    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-  return fmt;
-}
-
-function pathGenerate(filename) {
-  return "front-oss/" + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + filename;
-}
-
-
- function upload(ossConfig, data) {
-  let ossClient = new OSS(ossConfig);
-  // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
-  let objectKey = pathGenerate(data.name);
-  let result =  ossClient.put(objectKey, data);
-  console.debug(result);
-  return result;
-}
-
- function multipartUpload(ossConfig, data, callback,extCallback) {
-  let ossClient = new OSS(ossConfig);
-  // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
-  let objectKey = pathGenerate(data.name);
-
-  let res =  ossClient.multipartUpload(objectKey, data, {
-    progress: function (p, checkpoint) {
-      console.debug('progress callback', p, checkpoint);
-      // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
-      if (callback && callback instanceof Function) {
-        callback(p, checkpoint,data,extCallback);
-      }
-    }
-  })
-   return res;
-}
-
-function ossFileUrl(ossConfig, path, cname) {
-  if (cname == null) {
-    return 'https://' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
-  } else {
-    return cname + '/' + path;
-  }
-}
-
-export {upload, multipartUpload, ossFileUrl}
+const OSS = require('ali-oss');
+
+let IDX = 256, HEX = [], SIZE = 256, BUFFER;
+while (IDX--) HEX[IDX] = (IDX + 256).toString(16).substring(1);
+
+function uid(len) {
+  let i = 0, tmp = (len || 11);
+  if (!BUFFER || ((IDX + tmp) > SIZE * 2)) {
+    for (BUFFER = '', IDX = 0; i < SIZE; i++) {
+      BUFFER += HEX[Math.random() * 256 | 0];
+    }
+  }
+
+  return BUFFER.substring(IDX, IDX++ + tmp);
+}
+
+function dataFormat(fmt, date = new Date()) {
+  const o = {
+    "M+": date.getMonth() + 1, //月份
+    "d+": date.getDate(), //日
+    "h+": date.getHours(), //小时
+    "m+": date.getMinutes(), //分
+    "s+": date.getSeconds(), //秒
+    "q+": Math.floor((date.getMonth() + 3) / 3), //季度
+    "S": date.getMilliseconds() //毫秒
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (const k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+  return fmt;
+}
+
+function pathGenerate(filename) {
+  return "front-oss/" + dataFormat("yyyy/MM/dd/hh/mm/") + uid(32) + "/" + filename;
+}
+
+
+ function upload(ossConfig, data) {
+  let ossClient = new OSS(ossConfig);
+  // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
+  let objectKey = pathGenerate(data.name);
+  let result =  ossClient.put(objectKey, data);
+  console.debug(result);
+  return result;
+}
+
+ function multipartUpload(ossConfig, data, callback,extCallback) {
+  let ossClient = new OSS(ossConfig);
+  // object-key可以自定义为文件名（例如file.txt）或目录（例如abc/test/file.txt）的形式，实现将文件上传至当前Bucket或Bucket下的指定目录。
+  let objectKey = pathGenerate(data.name);
+
+  let res =  ossClient.multipartUpload(objectKey, data, {
+    progress: function (p, checkpoint) {
+      console.debug('progress callback', p, checkpoint);
+      // 断点记录点。浏览器重启后无法直接继续上传，您需要手动触发上传操作。
+      if (callback && callback instanceof Function) {
+        callback(p, checkpoint,data,extCallback);
+      }
+    }
+  })
+   return res;
+}
+
+function ossFileUrl(ossConfig, path, cname) {
+  if (cname == null) {
+    return 'https://' + ossConfig.bucket + '.' + ossConfig.region + '.aliyuncs.com/' + path;
+  } else {
+    return cname + '/' + path;
+  }
+}
+
+export {upload, multipartUpload, ossFileUrl}

package/src/components/utils/ckeditor.js

@@ -0,0 +1,124 @@
+import {multipartUpload, ossFileUrl} from "./AliyunIssUtil";
+const ossConfig={
+        region: "oss-cn-zhangjiakou",
+        //云账号AccessKey有所有API访问权限，建议遵循阿里云安全最佳实践，创建并使用STS方式来进行API访问
+        accessKeyId: "LTAI4G3QtdEdwkEbihBngAsK",
+        accessKeySecret: "OwgdVfc5PeCkIgqIdug660xmiSPchn",
+        // stsToken: '<Your securityToken(STS)>',
+        bucket: "guoranopen-zjk",
+    }
+class MyUploadAdapter {
+    constructor( loader ) {
+        // 要在上载期间使用的文件加载器实例
+        this.loader = loader;
+    }
+
+    // 启动上载过程
+    upload() {
+        return this.loader.file
+            .then( file => new Promise( ( resolve ) => {
+               /* this._initRequest();
+                this._initListeners( resolve, reject, file );
+                this._sendRequest( file );*/
+                this.uploadFile(file,resolve)
+            } ) );
+    }
+
+    // 中止上载过程
+    abort() {
+        if ( this.xhr ) {
+            this.xhr.abort();
+        }
+    }
+    uploadFile(file,resolve){
+        let imgInfo = {
+            url:'',
+        }
+        let res = multipartUpload(
+            ossConfig,
+            file,
+            null,
+            imgInfo
+        );
+        res.then(resp=>{
+            imgInfo.url = ossFileUrl(ossConfig, resp.name)
+            console.log(imgInfo)
+            resolve({
+                default:imgInfo.url
+            })
+        })
+    }
+    // 使用传递给构造函数的URL初始化XMLHttpRequest对象.
+    _initRequest() {
+        const xhr = this.xhr = new XMLHttpRequest();
+        console.log(xhr)
+        xhr.open( 'POST', '/open-api/oss/public?token=8c98087dfd2d48f856d8c95c09115def', true );
+        xhr.responseType = '';
+    }
+
+    // 初始化 XMLHttpRequest 监听.
+    _initListeners( resolve, reject, file ) {
+        const xhr = this.xhr;
+        const loader = this.loader;
+        console.log(this.loader)
+        const genericErrorText = `无法上传文件: ${ file.name }.`;
+
+        xhr.addEventListener( 'error', () => reject( genericErrorText ) );
+        xhr.addEventListener( 'abort', () => reject() );
+        xhr.addEventListener( 'load', () => {
+            const response = xhr.response;
+            // 当code＝＝200说明上传成功，可以增加弹框提示；
+            // 当上传失败时，必须调用reject()函数。
+
+            console.log('response', xhr)
+
+            if ( !response || response.error ) {
+                return reject( response && response.error ? response.error.message : genericErrorText );
+            }
+            //上传成功，从后台获取图片的url地址
+            resolve( {
+                default: response
+            } );
+        } );
+
+        // 支持时上传进度。文件加载器有#uploadTotal和#upload属性，用于在编辑器用户界面中显示上载进度栏。
+        if ( xhr.upload ) {
+            xhr.upload.addEventListener( 'progress', evt => {
+                if ( evt.lengthComputable ) {
+                    loader.uploadTotal = evt.total;
+                    loader.uploaded = evt.loaded;
+                }
+            } );
+        }
+    }
+
+    // 准备数据并发送请求
+    _sendRequest( file ) {
+        //通过FormData构造函数创建一个空对象
+        const data = new FormData();
+        //通过append()方法在末尾追加key为files值为file的数据
+
+        console.log('file',file)
+        data.append( 'file', file );//上传的参数data
+        // data.append( 'memberId', "666" );
+        /**
+         * 重要提示:这是实现诸如身份验证和CSRF保护等安全机制的正确位置。
+         * 例如，可以使用XMLHttpRequest.setRequestHeader()设置包含应用程序先前生成的CSRF令牌的请求头。
+         */
+        this.xhr.send( data );
+    }
+}
+
+function MyCustomUploadAdapterPlugin( editor ) {
+    editor.plugins.get( 'FileRepository' ).createUploadAdapter = ( loader ) => {
+        console.log('loader',loader)
+
+        // 在这里将URL配置为后端上载脚本
+        return new MyUploadAdapter( loader );
+    };
+}
+
+export {
+    MyUploadAdapter,
+    MyCustomUploadAdapterPlugin
+}

package/src/components/utils/format_date.js

@@ -1,19 +1,19 @@
-const formatDate = (fmt) => { //author: meizz
-    var o = {
-        "M+": this.getMonth() + 1, //月份
-        "d+": this.getDate(), //日
-        "h+": this.getHours(), //小时
-        "m+": this.getMinutes(), //分
-        "s+": this.getSeconds(), //秒
-        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
-        "S": this.getMilliseconds() //毫秒
-    };
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-    for (var k in o)
-        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-    return fmt;
-}
-
-export { formatDate };
-
+const formatDate = (fmt) => { //author: meizz
+    var o = {
+        "M+": this.getMonth() + 1, //月份
+        "d+": this.getDate(), //日
+        "h+": this.getHours(), //小时
+        "m+": this.getMinutes(), //分
+        "s+": this.getSeconds(), //秒
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+        "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+}
+
+export { formatDate };
+
 // new Date("2019-12-14T00:09:16.000+0000").Format("yyyy-MM-dd hh:mm:ss")

package/src/components/utils/index.js

@@ -1,7 +1,7 @@
-import {formatDate}  from './format_date';
-
-let utils = {
-    formatDate
-}
-
+import {formatDate}  from './format_date';
+
+let utils = {
+    formatDate
+}
+
 export { utils }

package/src/components/utils/math_utils.js

@@ -1,15 +1,15 @@
-//生成从minNum到maxNum-1的随机数
-function randomNum(minNum,maxNum){
-    switch(arguments.length){
-        case 1:
-            return parseInt(Math.random()*minNum+1,10)-1;
-        case 2:
-            return parseInt(Math.random()*(maxNum-minNum+1)+minNum,10)-1;
-        default:
-            return 0;
-    }
-}
-
-export {
-    randomNum
-}
+//生成从minNum到maxNum-1的随机数
+function randomNum(minNum,maxNum){
+    switch(arguments.length){
+        case 1:
+            return parseInt(Math.random()*minNum+1,10)-1;
+        case 2:
+            return parseInt(Math.random()*(maxNum-minNum+1)+minNum,10)-1;
+        default:
+            return 0;
+    }
+}
+
+export {
+    randomNum
+}

package/src/main.js

@@ -1,43 +1,44 @@
-import Vue from 'vue'
-import App from './App.vue'
-import VueResource from  'vue-resource'
-import ElementUI from 'element-ui';
-import { requestUrl } from './api/index';
-import { utils } from '../src/components/utils/index';
-/*import 'element-ui/lib/theme-chalk/index.css';*/
-import './assets/theme/index.css'
-import 'video.js/dist/video-js.css'
-import Vant from 'vant';
-import 'vant/lib/index.css';
-
-
-/*import VConsole from 'vconsole'
-const vConsole = new VConsole();
-Vue.use(vConsole);*/
-import $ from 'jquery'
-Vue.prototype._$ = $;
-Vue.use(Vant);
-Date.prototype.Format = function (fmt) { //author: meizz
-  var o = {
-    "M+": this.getMonth() + 1, //月份
-    "d+": this.getDate(), //日
-    "h+": this.getHours(), //小时
-    "m+": this.getMinutes(), //分
-    "s+": this.getSeconds(), //秒
-    "q+": Math.floor((this.getMonth() + 3) / 3), //季度
-    "S": this.getMilliseconds() //毫秒
-  };
-  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
-  for (var k in o)
-    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
-  return fmt;
-}
-Vue.config.productionTip = false
-Vue.use(VueResource)
-Vue.use(ElementUI)
-Vue.prototype.requestUrl = requestUrl;
-Vue.prototype.utils = utils;
-
-new Vue({
-  render: h => h(App),
-}).$mount('#app')
+import Vue from 'vue'
+import App from './App.vue'
+import VueResource from  'vue-resource'
+import ElementUI from 'element-ui';
+import { requestUrl } from './api/index';
+import { utils } from '../src/components/utils/index';
+/*import 'element-ui/lib/theme-chalk/index.css';*/
+import './assets/theme/index.css'
+import 'video.js/dist/video-js.css'
+import Vant from 'vant';
+import 'vant/lib/index.css';
+
+import CKEditor from '@ckeditor/ckeditor5-vue';
+Vue.use(CKEditor);
+/*import VConsole from 'vconsole'
+const vConsole = new VConsole();
+Vue.use(vConsole);*/
+import $ from 'jquery'
+Vue.prototype._$ = $;
+Vue.use(Vant);
+Date.prototype.Format = function (fmt) { //author: meizz
+  var o = {
+    "M+": this.getMonth() + 1, //月份
+    "d+": this.getDate(), //日
+    "h+": this.getHours(), //小时
+    "m+": this.getMinutes(), //分
+    "s+": this.getSeconds(), //秒
+    "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+    "S": this.getMilliseconds() //毫秒
+  };
+  if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+  for (var k in o)
+    if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+  return fmt;
+}
+Vue.config.productionTip = false
+Vue.use(VueResource)
+Vue.use(ElementUI)
+Vue.prototype.requestUrl = requestUrl;
+Vue.prototype.utils = utils;
+
+new Vue({
+  render: h => h(App),
+}).$mount('#app')

package/vue.config.js

@@ -1,29 +1,35 @@
-const webpack = require('webpack')
-
-
-module.exports = {
-    // 修改的配置
-    // 将baseUrl: '/api',改为baseUrl: '/',
-    devServer: {
-        port: '8081',   // 指定打开浏览器的端口号
-        proxy: {
-            '/api/': {
-                // target: 'http://test.open.abitai.com:9001',
-                target: 'http://test.open.askbot.cn:32001',
-                changeOrigin: true,
-                ws: true,
-                pathRewrite: {
-                    '^/api': '/'
-                }
-            },
-            '/open/': {
-                target: 'http://new-test.guoranbot.com:32001',
-                changeOrigin: true,
-                pathRewrite: {
-                    '^/open': '/'
-                }
-            },
-        },
-    },
-
+const webpack = require('webpack')
+
+
+module.exports = {
+    // 修改的配置
+    // 将baseUrl: '/api',改为baseUrl: '/',
+    devServer: {
+        port: '8081',   // 指定打开浏览器的端口号
+        proxy: {
+            '/api/': {
+                // target: 'http://test.open.abitai.com:9001',
+                target: 'http://test.open.askbot.cn:32001',
+                changeOrigin: true,
+                ws: true,
+                pathRewrite: {
+                    '^/api': '/'
+                }
+            },
+            '/open/': {
+                target: 'http://new-test.guoranbot.com:32001',
+                changeOrigin: true,
+                pathRewrite: {
+                    '^/open': '/'
+                }
+            },
+        },
+    },
+    configureWebpack: {
+
+        externals: {
+            'ckeditor': 'CKEDITOR'
+        },
+    },
+
 };