hotfix: 去除aliyun-oss的全局依赖，改为props调用 (#68)

lib/components/Editor/Upload.js

@@ -40,14 +40,6 @@ var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
-var _dayjs = require("dayjs");
-
-var _dayjs2 = _interopRequireDefault(_dayjs);
-
-var _shortid = require("shortid");
-
-var _shortid2 = _interopRequireDefault(_shortid);
-
 var _reactIntlUniversal = require("react-intl-universal");
 
 var _reactIntlUniversal2 = _interopRequireDefault(_reactIntlUniversal);
@@ -68,31 +60,6 @@ function _possibleConstructorReturn(self, call) { if (!self) { throw new Referen
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
 
-var client = function client(oss) {
-  return new window.OSS.Wrapper({
-    accessKeyId: oss.access_key_id,
-    accessKeySecret: oss.access_key_secret,
-    stsToken: oss.security_token,
-    endpoint: _constant.OSS_ENDPOINT, //常量,你可以自己定义
-    bucket: _constant.OSS_BUCKET
-  });
-};
-
-var uploadPath = function uploadPath(path, file) {
-  return path + "/" + (0, _dayjs2.default)().format("YYYYMMDD") + "/" + _shortid2.default.generate() + "." + file.type.split("/")[1];
-};
-
-var UploadToOss = function UploadToOss(oss, path, file) {
-  var url = uploadPath(path, file);
-  return new Promise(function (resolve, reject) {
-    client(oss).multipartUpload(url, file).then(function (data) {
-      resolve(data);
-    }).catch(function (error) {
-      reject(error);
-    });
-  });
-};
-
 var App = function (_React$Component) {
   _inherits(App, _React$Component);
 
@@ -163,7 +130,7 @@ var App = function (_React$Component) {
       reader.onloadend = function () {
         info.onProgress({ percent: 20 });
         // DRIVER_LICENSE_PATH oss 的存储路径位置
-        UploadToOss(_this2.props.app.oss, _constant.DRIVER_LICENSE_PATH, file).then(function (data) {
+        _this2.props.app.UploadToOss(_this2.props.app.oss, _constant.DRIVER_LICENSE_PATH, file).then(function (data) {
           info.onProgress({ percent: 100 });
           info.onSuccess(data);
           _this2.props.onUpload({ path: data.name, uid: file.uid });

lib/components/Editor/index.js

@@ -36,14 +36,6 @@ require("antd/es/message/style");
 
 require("antd/es/input/style");
 
-var _dayjs = require("dayjs");
-
-var _dayjs2 = _interopRequireDefault(_dayjs);
-
-var _shortid = require("shortid");
-
-var _shortid2 = _interopRequireDefault(_shortid);
-
 var _propTypes = require("prop-types");
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
@@ -90,32 +82,6 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 
 var TextArea = _input2.default.TextArea;
 
-
-var client = function client(oss) {
-  return new window.OSS.Wrapper({
-    accessKeyId: oss.access_key_id,
-    accessKeySecret: oss.access_key_secret,
-    stsToken: oss.security_token,
-    endpoint: _constant.OSS_ENDPOINT, //常量,你可以自己定义
-    bucket: _constant.OSS_BUCKET
-  });
-};
-
-var uploadPath = function uploadPath(path, file) {
-  return path + "/" + (0, _dayjs2.default)().format("YYYYMMDD") + "/" + _shortid2.default.generate() + "." + file.type.split("/")[1];
-};
-
-var UploadToOss = function UploadToOss(oss, path, file) {
-  var url = uploadPath(path, file);
-  return new Promise(function (resolve, reject) {
-    client(oss).multipartUpload(url, file).then(function (data) {
-      resolve(data);
-    }).catch(function (error) {
-      reject(error);
-    });
-  });
-};
-
 var Editor = function (_React$Component) {
   _inherits(Editor, _React$Component);
 
@@ -313,7 +279,7 @@ var Editor = function (_React$Component) {
       reader.readAsDataURL(file);
       reader.onloadend = function () {
         // DRIVER_LICENSE_PATH oss 的存储路径位置
-        UploadToOss(_this2.props.app.oss, _constant.DRIVER_LICENSE_PATH, file).then(function (data) {
+        _this2.props.app.UploadToOss(_this2.props.app.oss, _constant.DRIVER_LICENSE_PATH, file).then(function (data) {
           var fileList = _this2.state.fileList.concat({
             url: _constant.OSS_LINK + data.name,
             thumbUrl: _constant.OSS_LINK + data.name,

lib/constant.js

@@ -7,8 +7,6 @@ var ERROR_DEFAULT = exports.ERROR_DEFAULT = "出错了！";
 
 var LIMIT = exports.LIMIT = 10; // 默认 limit
 
-var OSS_ENDPOINT = exports.OSS_ENDPOINT = "oss-cn-beijing.aliyuncs.com";
-var OSS_BUCKET = exports.OSS_BUCKET = "links-comment";
 var DRIVER_LICENSE_PATH = exports.DRIVER_LICENSE_PATH = "/comment";
 
 var OSS_LINK = exports.OSS_LINK = "//links-comment.oss-cn-beijing.aliyuncs.com";

lib/constant.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/constant.js"],"names":["ERROR_DEFAULT","LIMIT","OSS_ENDPOINT","OSS_BUCKET","DRIVER_LICENSE_PATH","OSS_LINK","MAX_UPLOAD_NUMBER","URL_REGEXP","REGEXP","AVATAR","IMAGE_SPLIT","IMAGE_PROCESS","IMAGE_PROCESS_SMALL","IMAGE_PROCESS_LARGE","COMMENT_TYPE","COMMENT","REPLY","LANGUAGE_LINK","process","env","NODE_ENV"],"mappings":";;;;;AAAO,IAAMA,wCAAgB,MAAtB;;AAEA,IAAMC,wBAAQ,EAAd,C,CAAkB;;AAElB,IAAMC,sCAAe,6BAArB;AACA,IAAMC,kCAAa,eAAnB;AACA,IAAMC,oDAAsB,UAA5B;;AAEA,IAAMC,8BAAW,6CAAjB;;AAEA,IAAMC,gDAAoB,CAA1B;;AAEA,IAAMC,kCAAa,oGAAnB;;AAEA,IAAMC,0BAAS,eAAf;;AAEA,IAAMC,0BAAS,EAAf;;AAEA,IAAMC,oCAAc,aAApB;;AAEA,IAAMC,wCAAgB,mCAAtB;AACA,IAAMC,oDAAsB,mCAA5B;AACA,IAAMC,oDAAsB,mCAA5B;;AAEA,IAAMC,sCAAe;AAC1BC,WAAS,SADiB;AAE1BC,SAAO;AAFmB,CAArB;;AAKP;AACO,IAAMC,wCACXC,QAAQC,GAAR,CAAYC,QAAZ,KAAyB,YAAzB,GACI,sBADJ,GAEI,uBAHC","file":"constant.js","sourcesContent":["export const ERROR_DEFAULT = \"出错了！\";\n\nexport const LIMIT = 10; // 默认 limit\n\nexport const OSS_ENDPOINT = \"oss-cn-beijing.aliyuncs.com\";\nexport const OSS_BUCKET = \"links-comment\";\nexport const DRIVER_LICENSE_PATH = \"/comment\";\n\nexport const OSS_LINK = \"//links-comment.oss-cn-beijing.aliyuncs.com\";\n\nexport const MAX_UPLOAD_NUMBER = 4;\n\nexport const URL_REGEXP = /((http(s)?:)?\\/\\/)?(www\\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_+.~#?&//=]*)/g;\n\nexport const REGEXP = /\\[[^[\\]]+?\\]/g;\n\nexport const AVATAR = \"\";\n\nexport const IMAGE_SPLIT = \"IMAGE_SPLIT\";\n\nexport const IMAGE_PROCESS = \"?x-oss-process=image/resize,h_350\";\nexport const IMAGE_PROCESS_SMALL = \"?x-oss-process=image/resize,h_100\";\nexport const IMAGE_PROCESS_LARGE = \"?x-oss-process=image/resize,h_500\";\n\nexport const COMMENT_TYPE = {\n  COMMENT: \"comment\",\n  REPLY: \"reply\"\n};\n\n// 线上静态库地址\nexport const LANGUAGE_LINK =\n  process.env.NODE_ENV === \"production\"\n    ? \"//a.links123.cn/lang\"\n    : \"//a.links123.net/lang\";\n"]}
+{"version":3,"sources":["../src/constant.js"],"names":["ERROR_DEFAULT","LIMIT","DRIVER_LICENSE_PATH","OSS_LINK","MAX_UPLOAD_NUMBER","URL_REGEXP","REGEXP","AVATAR","IMAGE_SPLIT","IMAGE_PROCESS","IMAGE_PROCESS_SMALL","IMAGE_PROCESS_LARGE","COMMENT_TYPE","COMMENT","REPLY","LANGUAGE_LINK","process","env","NODE_ENV"],"mappings":";;;;;AAAO,IAAMA,wCAAgB,MAAtB;;AAEA,IAAMC,wBAAQ,EAAd,C,CAAkB;;AAElB,IAAMC,oDAAsB,UAA5B;;AAEA,IAAMC,8BAAW,6CAAjB;;AAEA,IAAMC,gDAAoB,CAA1B;;AAEA,IAAMC,kCAAa,oGAAnB;;AAEA,IAAMC,0BAAS,eAAf;;AAEA,IAAMC,0BAAS,EAAf;;AAEA,IAAMC,oCAAc,aAApB;;AAEA,IAAMC,wCAAgB,mCAAtB;AACA,IAAMC,oDAAsB,mCAA5B;AACA,IAAMC,oDAAsB,mCAA5B;;AAEA,IAAMC,sCAAe;AAC1BC,WAAS,SADiB;AAE1BC,SAAO;AAFmB,CAArB;;AAKP;AACO,IAAMC,wCACXC,QAAQC,GAAR,CAAYC,QAAZ,KAAyB,YAAzB,GACI,sBADJ,GAEI,uBAHC","file":"constant.js","sourcesContent":["export const ERROR_DEFAULT = \"出错了！\";\n\nexport const LIMIT = 10; // 默认 limit\n\nexport const DRIVER_LICENSE_PATH = \"/comment\";\n\nexport const OSS_LINK = \"//links-comment.oss-cn-beijing.aliyuncs.com\";\n\nexport const MAX_UPLOAD_NUMBER = 4;\n\nexport const URL_REGEXP = /((http(s)?:)?\\/\\/)?(www\\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_+.~#?&//=]*)/g;\n\nexport const REGEXP = /\\[[^[\\]]+?\\]/g;\n\nexport const AVATAR = \"\";\n\nexport const IMAGE_SPLIT = \"IMAGE_SPLIT\";\n\nexport const IMAGE_PROCESS = \"?x-oss-process=image/resize,h_350\";\nexport const IMAGE_PROCESS_SMALL = \"?x-oss-process=image/resize,h_100\";\nexport const IMAGE_PROCESS_LARGE = \"?x-oss-process=image/resize,h_500\";\n\nexport const COMMENT_TYPE = {\n  COMMENT: \"comment\",\n  REPLY: \"reply\"\n};\n\n// 线上静态库地址\nexport const LANGUAGE_LINK =\n  process.env.NODE_ENV === \"production\"\n    ? \"//a.links123.cn/lang\"\n    : \"//a.links123.net/lang\";\n"]}

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1588435719936,
+    "buildDate":  1594135597777,
     "version":    "1.0.4",
-    "numCommits": 215,
-    "hash":       "7d03c9b",
-    "dirty":      true
+    "numCommits": 217,
+    "hash":       "e6f4c20",
+    "dirty":      false
 }

package.json

@@ -23,7 +23,6 @@
     "react-dom": "^16.4.1",
     "react-intl-universal": "^1.15.2",
     "react-scripts": "1.1.4",
-    "shortid": "^2.2.11",
     "webpack-version-file-plugin": "^0.3.3"
   },
   "lint-staged": {
@@ -42,13 +41,13 @@
     "lib": "babel ./src --out-dir ./lib --source-maps --copy-files"
   },
   "devDependencies": {
-    "cross-env": "^5.2.0",
     "babel-cli": "^6.26.0",
     "babel-plugin-import": "^1.8.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
+    "cross-env": "^5.2.0",
     "husky": "^0.14.3",
     "lint-staged": "^7.2.0",
     "node-sass": "^4.9.4",

src/components/Editor/Upload.js

@@ -1,47 +1,10 @@
 import React from "react";
 import { Upload, Icon, Modal, message, Spin } from "antd";
-import dayjs from "dayjs";
-import shortid from "shortid";
 import intl from "react-intl-universal";
-import {
-  OSS_ENDPOINT,
-  OSS_BUCKET,
-  DRIVER_LICENSE_PATH,
-  ERROR_DEFAULT
-} from "../../constant";
+import { DRIVER_LICENSE_PATH, ERROR_DEFAULT } from "../../constant";
 import Comment from "../../Comment";
 import "./Upload.css";
 
-const client = oss => {
-  return new window.OSS.Wrapper({
-    accessKeyId: oss.access_key_id,
-    accessKeySecret: oss.access_key_secret,
-    stsToken: oss.security_token,
-    endpoint: OSS_ENDPOINT, //常量,你可以自己定义
-    bucket: OSS_BUCKET
-  });
-};
-
-const uploadPath = (path, file) => {
-  return `${path}/${dayjs().format("YYYYMMDD")}/${shortid.generate()}.${
-    file.type.split("/")[1]
-  }`;
-};
-
-const UploadToOss = (oss, path, file) => {
-  const url = uploadPath(path, file);
-  return new Promise((resolve, reject) => {
-    client(oss)
-      .multipartUpload(url, file)
-      .then(data => {
-        resolve(data);
-      })
-      .catch(error => {
-        reject(error);
-      });
-  });
-};
-
 class App extends React.Component {
   constructor(props) {
     super(props);
@@ -94,7 +57,8 @@ class App extends React.Component {
     reader.onloadend = () => {
       info.onProgress({ percent: 20 });
       // DRIVER_LICENSE_PATH oss 的存储路径位置
-      UploadToOss(this.props.app.oss, DRIVER_LICENSE_PATH, file)
+      this.props.app
+        .UploadToOss(this.props.app.oss, DRIVER_LICENSE_PATH, file)
         .then(data => {
           info.onProgress({ percent: 100 });
           info.onSuccess(data);

src/components/Editor/index.js

@@ -1,5 +1,3 @@
-import dayjs from "dayjs";
-import shortid from "shortid";
 import PropTypes from "prop-types";
 import classnames from "classnames";
 import React, { Fragment } from "react";
@@ -11,46 +9,11 @@ import Comment from "../../Comment";
 import { isMobile } from "./../../utils";
 import { OSS_LINK } from "../../constant";
 import { isFunction } from "../../helper";
-import {
-  OSS_ENDPOINT,
-  OSS_BUCKET,
-  DRIVER_LICENSE_PATH,
-  ERROR_DEFAULT
-} from "../../constant";
+import { DRIVER_LICENSE_PATH, ERROR_DEFAULT } from "../../constant";
 import "./index.css";
 
 const { TextArea } = Input;
 
-const client = oss => {
-  return new window.OSS.Wrapper({
-    accessKeyId: oss.access_key_id,
-    accessKeySecret: oss.access_key_secret,
-    stsToken: oss.security_token,
-    endpoint: OSS_ENDPOINT, //常量,你可以自己定义
-    bucket: OSS_BUCKET
-  });
-};
-
-const uploadPath = (path, file) => {
-  return `${path}/${dayjs().format("YYYYMMDD")}/${shortid.generate()}.${
-    file.type.split("/")[1]
-  }`;
-};
-
-const UploadToOss = (oss, path, file) => {
-  const url = uploadPath(path, file);
-  return new Promise((resolve, reject) => {
-    client(oss)
-      .multipartUpload(url, file)
-      .then(data => {
-        resolve(data);
-      })
-      .catch(error => {
-        reject(error);
-      });
-  });
-};
-
 class Editor extends React.Component {
   constructor(props) {
     super(props);
@@ -214,7 +177,8 @@ class Editor extends React.Component {
     reader.readAsDataURL(file);
     reader.onloadend = () => {
       // DRIVER_LICENSE_PATH oss 的存储路径位置
-      UploadToOss(this.props.app.oss, DRIVER_LICENSE_PATH, file)
+      this.props.app
+        .UploadToOss(this.props.app.oss, DRIVER_LICENSE_PATH, file)
         .then(data => {
           const fileList = this.state.fileList.concat({
             url: OSS_LINK + data.name,

src/constant.js

@@ -2,8 +2,6 @@ export const ERROR_DEFAULT = "出错了！";
 
 export const LIMIT = 10; // 默认 limit
 
-export const OSS_ENDPOINT = "oss-cn-beijing.aliyuncs.com";
-export const OSS_BUCKET = "links-comment";
 export const DRIVER_LICENSE_PATH = "/comment";
 
 export const OSS_LINK = "//links-comment.oss-cn-beijing.aliyuncs.com";