Skip to content

Z
zhichan
Commit 12c7f449 by 蒋勇
Options

d

parent a597bf9f
Showing with 312 additions and 14 deletions
scratch-web/app/base/api/impl/imghandle.js
......@@ -2,10 +2,11 @@ const system = require("../../system")
const uuidv4 = require('uuid/v4');
const ApiBase = require("../api.base");
const fs = require("fs");
import { rename } from 'fs/promises';
const mime = require("mime");
const gm = require("gm");
const imageMagick = gm.subClass({ imageMagick: true });
const im = require('imagemagick');
const child_process = require("child_process")
const puppeteer = require('puppeteer');
class ImageHandleApi extends ApiBase {
......@@ -65,7 +66,9 @@ class ImageHandleApi extends ApiBase {
//判断是否是png
async isPng (srcImg) {
console.log(srcImg,">>>>>>>>>>>>>>>>>>>")
let p = new Promise((res, rej) => {
console.log(srcImg, ">>>>>>>>>>>>>>>>>>>")
im.identify(srcImg, function (err, metadata) {
if (err) {
console.log(err)
......@@ -84,7 +87,7 @@ class ImageHandleApi extends ApiBase {
return p;
}
async function png2jpg (srcPng, dstJpg) {
async png2jpg (srcPng, dstJpg) {
let p = new Promise((res, rej) => {
child_process.exec(`convert ${srcPng} ${dstJpg}`, function (err, std, ste) {
if (err) {
......@@ -102,11 +105,11 @@ async function png2jpg (srcPng, dstJpg) {
//商标营业执照处理，大小小于2M，宽高10-50cm
//身份证同营业执照处理(调整上传至oss的执照文件，通过文件名称下载至本地调整)
async bzLicenseForTM(obj) {
console.log(obj);
var data = await this.checkKey(obj.appKey);
if (data && data.status == -1) {
return data;
}
// console.log(obj);
// var data = await this.checkKey(obj.appKey);
// if (data && data.status == -1) {
// return data;
// }
//命令行
//按照jpg路径参数下载jpg到临时目录，然后再转换
var jpgpath = obj.jpgpath;
......@@ -116,17 +119,16 @@ async function png2jpg (srcPng, dstJpg) {
var pdfpathKey = basename + ".pdf";
var pdfpath = "/tmp/" + basename + ".pdf";
var result = await this.ossClient.downfile(jpgpath);
console.log(result)
//检查是否是png
if (this.isPng(jpgpathtmp)){
if (await this.isPng(jpgpathtmp)){
let pngPath = "/tmp/" + basename + ".png"
//修改jpgpathtmp文件名为*.png
await rename(jpgpathtmp, pngPath)
await fs.promises.rename(jpgpathtmp, pngPath)
//转换
await png2jpg(pngPath, jpgpathtmp)
await this.png2jpg(pngPath, jpgpathtmp)
fs.unlink(pngPath, function (err) { });
}
......@@ -658,7 +660,11 @@ async function png2jpg (srcPng, dstJpg) {
}
}
module.exports = ImageHandleApi;
// var t=new ImageHandleApi();
var t=new ImageHandleApi();
t.bzLicenseForTM({ jpgpath:"zc_yyzz814216269429171972021622.jpg"}).then(d=>{
console.log(d);
});
//
// t.makeDeleForTM({"url":"http://192.168.18.40:3000/mobile#/products/createwts/10711536633793138"}).then(d=>{
// console.log(d);
......
scratch-web/node_modules/_imagemagick@0.1.3@imagemagick/README.md 0 → 100644
# node-imagemagick
[Imagemagick](http://www.imagemagick.org/) module for [Node](http://nodejs.org/).
You can install this module using [npm](http://github.com/isaacs/npm):
npm install imagemagick
Requires imagemagick CLI tools to be installed. There are numerous ways to install them. For instance, if you're on OS X you can use [Homebrew](http://mxcl.github.com/homebrew/): `brew install imagemagick`.
## Example
```javascript
var im = require('imagemagick');
im.readMetadata('kittens.jpg', function(err, metadata){
if (err) throw err;
console.log('Shot at '+metadata.exif.dateTimeOriginal);
})
// -> Shot at Tue, 06 Feb 2007 21:13:54 GMT
```
## API
### convert.path
Path to the `convert` program. Defaults to `"convert"`.
### identify.path
Path to the `identify` program. Defaults to `"identify"`.
### identify(path, callback(err, features))
Identify file at `path` and return an object `features`.
Example:
```javascript
im.identify('kittens.jpg', function(err, features){
if (err) throw err;
console.log(features);
// { format: 'JPEG', width: 3904, height: 2622, depth: 8 }
});
```
### identify(args, callback(err, output))
Custom identification where `args` is an array of arguments. The result is returned as a raw string to `output`.
Example:
```javascript
im.identify(['-format', '%wx%h', 'kittens.jpg'], function(err, output){
if (err) throw err;
console.log('dimension: '+output);
// dimension: 3904x2622
});
```
### readMetadata(path, callback(err, metadata))
Read metadata (i.e. exif) in `path` and return an object `metadata`. Modelled on top of `identify`.
Example:
```javascript
im.readMetadata('kittens.jpg', function(err, metadata){
if (err) throw err;
console.log('Shot at '+metadata.exif.dateTimeOriginal);
// -> Shot at Tue, 06 Feb 2007 21:13:54 GMT
});
```
### convert(args, callback(err, stdout, stderr))
Raw interface to `convert` passing arguments in the array `args`.
Example:
```javascript
im.convert(['kittens.jpg', '-resize', '25x120', 'kittens-small.jpg'],
function(err, stdout){
if (err) throw err;
console.log('stdout:', stdout);
});
```
### resize(options, callback(err, stdout, stderr))
Convenience function for resizing an image, modelled on top of `convert`.
The `options` argument have the following default values:
```javascript
{
srcPath: undefined,
srcData: null,
srcFormat: null,
dstPath: undefined,
quality: 0.8,
format: 'jpg',
progressive: false,
width: 0,
height: 0,
strip: true,
filter: 'Lagrange',
sharpening: 0.2,
customArgs: []
}
```
srcPath, dstPath and (at least one of) width and height are required. The rest is optional.
Example:
```javascript
im.resize({
srcPath: 'kittens.jpg',
dstPath: 'kittens-small.jpg',
width: 256
}, function(err, stdout, stderr){
if (err) throw err;
console.log('resized kittens.jpg to fit within 256x256px');
});
```
Example with stdin/stdout:
```javascript
var fs = require('fs');
im.resize({
srcData: fs.readFileSync('kittens.jpg', 'binary'),
width: 256
}, function(err, stdout, stderr){
if (err) throw err
fs.writeFileSync('kittens-resized.jpg', stdout, 'binary');
console.log('resized kittens.jpg to fit within 256x256px')
});
```
### crop(options, callback) ###
Convenience function for resizing and cropping an image. _crop_ uses the resize method, so _options_ and _callback_ are the same. _crop_ uses _options.srcPath_, so make sure you set it :) Using only _options.width_ or _options.height_ will create a square dimensioned image. Gravity can also be specified, it defaults to Center. Available gravity options are [NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast]
Example:
```javascript
im.crop({
srcPath: path,
dstPath: 'cropped.jpg',
width: 800,
height: 600,
quality: 1,
gravity: "North"
}, function(err, stdout, stderr){
// foo
});
```
## License (MIT)
Copyright (c) 2010-2012 Rasmus Andersson <http://hunch.se/>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
scratch-web/node_modules/_imagemagick@0.1.3@imagemagick/package.json 0 → 100644
{
"name": "imagemagick",
"description": "A wrapper around the imagemagick cli",
"version": "0.1.3",
"author": "Rasmus Andersson <http://rsms.me/>",
"licenses": [
"MIT"
],
"repository": {
"type": "git",
"url": "http://github.com/rsms/node-imagemagick.git"
},
"engine": [
"node >=0.6"
],
"main": "imagemagick",
"__npminstall_done": "Mon Aug 09 2021 17:05:59 GMT+0800 (GMT+08:00)",
"_from": "imagemagick@0.1.3",
"_resolved": "https://registry.nlark.com/imagemagick/download/imagemagick-0.1.3.tgz"
}
\ No newline at end of file
scratch-web/node_modules/_imagemagick@0.1.3@imagemagick/test-crop.js 0 → 100644
var fs = require('fs'),
im = require('./imagemagick');
var path = __dirname+'/sample-images/blue-bottle-coffee.jpg';
(function () {
var opt, timeStarted = new Date;
im.crop(opt = {
srcPath: path,
dstPath: 'cropped.jpg',
width: 200,
height: 90,
quality: 1
}, function (err, stdout, stderr){
if (err) return console.error(err.stack || err);
console.log('crop(',opt,') ->', stdout);
console.log('Real time spent: '+(new Date() - timeStarted) + ' ms');
});
})();
(function () {
var opt, timeStarted = new Date;
im.crop(opt = {
srcPath: path,
dstPath: 'cropped2.jpg',
width: 200,
height: 90,
gravity: "North",
quality: 1
}, function (err, stdout, stderr){
if (err) return console.error(err.stack || err);
console.log('crop(',opt,') ->', stdout);
console.log('Real time spent: '+(new Date() - timeStarted) + ' ms');
});
})();
scratch-web/node_modules/_imagemagick@0.1.3@imagemagick/test.js 0 → 100644
var fs = require('fs'),
im = require('./imagemagick');
var path = __dirname+'/sample-images/blue-bottle-coffee.jpg';
var imdata = fs.readFileSync(path, 'binary');
im.identify(path, function (err, features){
if (err) return console.error(err.stack || err);
console.log('identify(path) ->', features);
})
im.identify({data:imdata}, function (err, features){
if (err) return console.error(err.stack || err);
console.log('identify({data:imdata}) ->', features);
})
im.readMetadata(path, function (err, metadata){
if (err) return console.error(err.stack || err);
console.log('readMetadata(path) ->', metadata);
})
im.readMetadata({data:imdata}, function (err, metadata){
if (err) return console.error(err.stack || err);
console.log('readMetadata({data:imdata} ->', metadata);
})
var timeStarted = new Date;
im.resize({
srcPath: path,
dstPath: 'test-resized.jpg',
width: 256
}, function (err, stdout, stderr){
if (err) return console.error(err.stack || err);
console.log('resize(...) wrote "test-resized.jpg"');
console.log('real time taken for convert: '+((new Date)-timeStarted)+' ms');
im.identify(['-format', '%b', 'test-resized.jpg'], function (err, r){
if (err) throw err;
console.log("identify(['-format', '%b', 'test-resized.jpg']) ->", r);
})
})
timeStarted = new Date;
im.resize({
srcData: imdata,
width: 256
}, function (err, stdout, stderr){
if (err) return console.error(err.stack || err);
console.log('real time taken for convert (with buffers): '+
((new Date)-timeStarted)+' ms');
fs.writeFileSync('test-resized-io.jpg', stdout, 'binary');
console.log('resize(...) wrote "test-resized.jpg" ('+stdout.length+' Bytes)');
})
scratch-web/node_modules/imagemagick 0 → 120000
_imagemagick@0.1.3@imagemagick
\ No newline at end of file
scratch-web/package.json
......@@ -31,6 +31,7 @@
"express": "^4.16.2",
"express-session": "^1.15.6",
"gm": "^1.23.1",
"imagemagick": "^0.1.3",
"log4js": "^2.10.0",
"method-override": "^2.3.10",
"mime": "^2.4.4",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment