@less-is-more/less-js 1.3.7 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@less-is-more/less-js",
-  "version": "1.3.7",
+  "version": "1.4.0",
   "description": "Fast develop kit for nodejs",
   "main": "src/index.js",
   "scripts": {
@@ -18,10 +18,12 @@
   "license": "MIT",
   "dependencies": {
     "@alicloud/pop-core": "^1.7.10",
+    "ali-oss": "^6.17.1",
     "axios": "^0.27.2",
     "body": "^5.1.0",
     "ejs": "^3.1.6",
     "fs-extra": "^10.0.0",
+    "images": "^3.2.4",
     "inquirer": "^8.2.0",
     "multiparty": "^4.2.2",
     "mysql2": "^2.3.3",
@@ -29,6 +31,7 @@
     "qs": "^6.11.0",
     "redis": "^4.0.1",
     "sequelize": "^6.13.0",
+    "uuid": "^9.0.0",
     "validator": "^13.7.0"
   },
   "devDependencies": {

package/src/oss.js

@@ -0,0 +1,51 @@
+const OSS = require("ali-oss");
+const uuid = require("uuid");
+const Ret = require("./ret");
+const images = require("images");
+
+module.exports = class Oss {
+  static async upload(
+    path,
+    reqFile,
+    prefix,
+    accessKeyId,
+    accessKeySecret,
+    stsToken,
+    region,
+    bucket,
+    toWidth
+  ) {
+    const client = new OSS({
+      region: "oss-" + region,
+      accessKeyId,
+      accessKeySecret,
+      stsToken,
+      bucket,
+      endpoint: "oss-" + region + ".aliyuncs.com",
+    });
+    let id = uuid.v4().replace(/-/g, "");
+
+    // 计算文件名
+    const fileName = reqFile.originalFilename;
+    let subfix = "";
+    if (fileName.includes(".")) {
+      subfix = fileName.split(".").pop();
+    }
+    let filePath = reqFile.path;
+    if (toWidth) {
+      let imageObject = images(filePath);
+      if (toWidth < imageObject.width()) {
+        imageObject.size(toWidth).save(filePath);
+      }
+    }
+    let result = await client.put(
+      path + "/" + prefix + "-" + id + "." + subfix,
+      filePath
+    );
+    if (result.res.status == 200) {
+      return new Ret(true).setData({ imgUrl: result.url });
+    } else {
+      return new Ret(false);
+    }
+  }
+};

package/src/router.js

@@ -72,9 +72,12 @@ module.exports = class Router {
     console.log("queries:", req.queries ? JSON.stringify(req.queries) : "");
     const isFile =
       req.headers &&
-      JSON.stringify(req.headers).includes("multipart/form-data");
+      req.headers["content-type"] &&
+      req.headers["content-type"].includes("multipart/form-data");
     const isJson =
-      req.headers && req.headers["content-type"].includes("application/json");
+      req.headers &&
+      req.headers["content-type"] &&
+      req.headers["content-type"].includes("application/json");
     console.log("multipart:", isFile);
     if (req.method == "POST") {
       if (isFile) {

package/test/test-oss.js

@@ -0,0 +1,44 @@
+const Oss = require("../src/oss.js");
+
+describe("oss.js", () => {
+  before(() => {});
+
+  describe("upload()", () => {
+    it("ok", async () => {
+      const file = {
+        path: "C:/Users/shang/Pictures/sheng-logo.png",
+        originalFilename: "aa.png",
+      };
+      const result = await Oss.upload(
+        "test",
+        file,
+        "pp",
+        "STS.NTUbtKE7Pg9PKUrLUcZSQz7hu",
+        "LzbHBAGXRmMupuiNZ2BQ9dJMExBeXmsPQVhy8tAS47F",
+        "CAIShgJ1q6Ft5B2yfSjIr5fgKc7/qOhx0Pu7SXPDqFU2Vtx9lfLDlzz2IH1MeXduBuAZsfk2nGpT7fgelqZdVplOWU3Da+B364xK7Q75kkZFRBntv9I+k5SANTW5KXyShb3/AYjQSNfaZY3eCTTtnTNyxr3XbCirW0ffX7SClZ9gaKZ8PGD6F00kYu1bPQx/ssQXGGLMPPK2SH7Qj3HXEVBjt3gX6wo9y9zmn5LGskWD3QWgkrRO/tmtGPX+MZkwZqUYesyuwel7epDG1CNt8BVQ/M909vcZoWqZ4I7NXAYMuk3caLGKrscfBQt4d7U8NYVgq/fRhfBzp/DSkILNzBJALV/Y0qNT2WHLGoABNL6fyhkkj9OpoxKO6i3P/FceZOAwkFqVtte+GZddNBOLhI9fayz8GhiImYJSXTbzITrLxHlSzgg8qErn8d2K+YXF5lhUcucWwsT9piYzfICMv/UsAOgp6d6o+WmjNzrwd5soMde8TC/yRbNkDmQTnjS8RvnEJK7lkUr3xYZHE48=",
+        "cn-shenzhen",
+        "shengapp-dev"
+      );
+      console.log(result);
+    });
+
+    it("set size", async () => {
+      const file = {
+        path: "C:/Users/shang/Pictures/sheng-logo.png",
+        originalFilename: "aa.png",
+      };
+      const result = await Oss.upload(
+        "test",
+        file,
+        "pp",
+        "STS.NTUbtKE7Pg9PKUrLUcZSQz7hu",
+        "LzbHBAGXRmMupuiNZ2BQ9dJMExBeXmsPQVhy8tAS47F",
+        "CAIShgJ1q6Ft5B2yfSjIr5fgKc7/qOhx0Pu7SXPDqFU2Vtx9lfLDlzz2IH1MeXduBuAZsfk2nGpT7fgelqZdVplOWU3Da+B364xK7Q75kkZFRBntv9I+k5SANTW5KXyShb3/AYjQSNfaZY3eCTTtnTNyxr3XbCirW0ffX7SClZ9gaKZ8PGD6F00kYu1bPQx/ssQXGGLMPPK2SH7Qj3HXEVBjt3gX6wo9y9zmn5LGskWD3QWgkrRO/tmtGPX+MZkwZqUYesyuwel7epDG1CNt8BVQ/M909vcZoWqZ4I7NXAYMuk3caLGKrscfBQt4d7U8NYVgq/fRhfBzp/DSkILNzBJALV/Y0qNT2WHLGoABNL6fyhkkj9OpoxKO6i3P/FceZOAwkFqVtte+GZddNBOLhI9fayz8GhiImYJSXTbzITrLxHlSzgg8qErn8d2K+YXF5lhUcucWwsT9piYzfICMv/UsAOgp6d6o+WmjNzrwd5soMde8TC/yRbNkDmQTnjS8RvnEJK7lkUr3xYZHE48=",
+        "cn-shenzhen",
+        "shengapp-dev",
+        50
+      );
+      console.log(result);
+    });
+  });
+});