Skip to content

Z
zhichan
Commit debb2e57 by 王悦
Options

fix

parent 61a25578
Showing with 67 additions and 12 deletions
zhiquanquan/app/base/controller/impl/common/uploadCtl.js
......@@ -5,14 +5,42 @@ var fs=require("fs");
var accesskey='3KV9nIwW8qkTGlrPmAe3HnR3fzM6r5';
var accessKeyId='LTAI4GC5tSKvqsH2hMqj6pvd';
var url="https://gsb-zc.oss-cn-beijing.aliyuncs.com";
class UploadCtl extends CtlBase{
constructor(){
super("common",CtlBase.getServiceName(UploadCtl));
this.cmdPdf2HtmlPattern = "docker run -i --rm -v /tmp/:/pdf 0c pdf2htmlEX --zoom 1.3 '{fileName}'";
this.restS=system.getObject("util.execClient");
this.cmdInsertToFilePattern = "sed -i 's/id=\"page-container\"/id=\"page-container\" contenteditable=\"true\"/'";
//sed -i 's/1111/&BBB/' /tmp/input.txt
//sed 's/{position}/{content}/g' {path}
var RPCClient = require('@alicloud/pop-core').RPCClient;
getAliTMClient = () => {
return new RPCClient({
accessKeyId: 'LTAI4FmyipY1wuLHjLhMWiPa',
accessKeySecret: 'hp4FF18IDCSym1prqzxrAjnnhNH3ju',
endpoint: 'https://trademark.aliyuncs.com',
apiVersion: '2018-07-24'
}
);
}
reqbyget = async (obj) => {
var action = obj.action;
var reqbody = obj.reqbody;
var reqAliclient = getAliTMClient();
if (obj.apiVersion) {
reqAliclient.apiVersion = obj.apiVersion;
}
var res = await reqAliclient.request(action, reqbody, {
timeout: 10000, // default 3000 ms 2020 0916 lin修改3000为10000，原因ConfirmIcpIntention BizIds 超过5条会超时
formatAction: true, // default true, format the action to Action
formatParams: true, // default true, format the parameter name to first letter upper case
method: 'GET', // set the http method, default is GET
headers: {}, // set the http request headers
});
return res
}
class UploadCtl extends CtlBase {
constructor() {
super("common", CtlBase.getServiceName(UploadCtl));
this.redisClient = system.getObject("util.redisClient");
this.cmdPdf2HtmlPattern = "docker run -i --rm -v /tmp/:/pdf 0c pdf2htmlEX --zoom 1.3 '{fileName}'";
this.restS=system.getObject("util.execClient");
this.cmdInsertToFilePattern = "sed -i 's/id=\"page-container\"/id=\"page-container\" contenteditable=\"true\"/'";
//sed -i 's/1111/&BBB/' /tmp/input.txt
//sed 's/{position}/{content}/g' {path}
}
async getOssConfig(){
var policyText = {
......@@ -37,6 +65,29 @@ class UploadCtl extends CtlBase{
return data;
};
async getOssConfigAli(){
let res = await this.redisClient.ttl("zqq_alioss")
if (res>0) {
res = JSON.parse(await this.redisClient.get("zqq_alioss"))
}else {
res = await reqbyget({
action: "GenerateUploadFilePolicy",
reqbody: {
FileType: "ICON"
}
})
let exp = Math.ceil((res.ExpireTime-Date.now())/1000)
await this.redisClient.setWithEx("zqq_alioss", JSON.stringify(res),exp)
}
return {
OSSAccessKeyId:res.AccessId,
policy:res.EncodedPolicy,
Signature:res.Signature,
Bucket:'trade-mark-user-upload',
url: "https://trade-mark-user-upload.oss-cn-beijing.aliyuncs.com",
filedir: res.FileDir
};
};
async upfile(srckey,dest){
var oss=system.getObject("util.ossClient");
var result=await oss.upfile(srckey,"/tmp/"+dest);
......
zhiquanquan/app/base/utils/redisClient.js
......@@ -141,6 +141,10 @@ class RedisClient {
return this.client.getAsync(key);
}
async ttl(key) {
return this.client.ttlAsync(key);
}
async delete(key) {
return this.client.delAsync(key);
}
......
zhiquanquan/app/front/entry/public/css/chunk-3c2c5e1e.45b15920.css 0 → 100644
.demo-upload-list{display:inline-block;width:60px;height:60px;text-align:center;line-height:60px;border:1px solid transparent;border-radius:4px;overflow:hidden;background:#fff;position:relative;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.2);box-shadow:0 1px 1px rgba(0,0,0,.2);margin-right:4px}.demo-upload-list img{width:100%;height:100%}.demo-upload-list-cover{display:none;position:absolute;top:0;bottom:0;left:0;right:0;background:rgba(0,0,0,.6)}.demo-upload-list:hover .demo-upload-list-cover{display:block}.demo-upload-list-cover i{color:#fff;font-size:20px;cursor:pointer;margin:0 2px}.line[data-v-5bd79c23]{display:inline-block;width:3px;height:12px;margin-right:5px;background:#1966ff}.title[data-v-5bd79c23]{display:inline-block;margin-right:16px;font-size:13px;font-weight:700;color:#333;margin-bottom:10px}
\ No newline at end of file
zhiquanquan/app/front/entry/public/css/chunk-6493f994.005979a2.css deleted 100644 → 0
.line[data-v-468cb8c8]{display:inline-block;width:3px;height:12px;margin-right:5px;background:#1966ff}.title[data-v-468cb8c8]{display:inline-block;margin-right:16px;font-size:13px;font-weight:700;color:#333;margin-bottom:10px}
\ No newline at end of file
zhiquanquan/app/front/entry/public/index.html
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/ccc.png"><title></title><link href="/css/chunk-148cd3a8.0676f2ca.css" rel="prefetch"><link href="/css/chunk-14b9857b.0dc416de.css" rel="prefetch"><link href="/css/chunk-2c359864.0dc416de.css" rel="prefetch"><link href="/css/chunk-3385141a.0dc416de.css" rel="prefetch"><link href="/css/chunk-4a1e7798.535cbb8d.css" rel="prefetch"><link href="/css/chunk-605962ce.d38c164f.css" rel="prefetch"><link href="/css/chunk-635bdee9.1e75f0e2.css" rel="prefetch"><link href="/css/chunk-6493f994.005979a2.css" rel="prefetch"><link href="/css/chunk-6ab78853.938207ad.css" rel="prefetch"><link href="/css/chunk-a2c78c42.992e1c54.css" rel="prefetch"><link href="/css/chunk-d824370e.a35226dc.css" rel="prefetch"><link href="/js/chunk-148cd3a8.5faa4c66.js" rel="prefetch"><link href="/js/chunk-14b9857b.febb5572.js" rel="prefetch"><link href="/js/chunk-2c359864.db10b8d2.js" rel="prefetch"><link href="/js/chunk-3385141a.2c27d988.js" rel="prefetch"><link href="/js/chunk-4a1e7798.3c4e7d5f.js" rel="prefetch"><link href="/js/chunk-4fe8dd4f.e1485c58.js" rel="prefetch"><link href="/js/chunk-605962ce.c6ec96ad.js" rel="prefetch"><link href="/js/chunk-635bdee9.76cd79a8.js" rel="prefetch"><link href="/js/chunk-6493f994.f0af4da8.js" rel="prefetch"><link href="/js/chunk-6ab78853.9f72b840.js" rel="prefetch"><link href="/js/chunk-a2c78c42.c0ad1b19.js" rel="prefetch"><link href="/js/chunk-d824370e.d5274468.js" rel="prefetch"><link href="/css/app.11089a5f.css" rel="preload" as="style"><link href="/css/chunk-vendors.1d90d08d.css" rel="preload" as="style"><link href="/js/app.8dda5fbb.js" rel="preload" as="script"><link href="/js/chunk-vendors.f296b9ce.js" rel="preload" as="script"><link href="/css/chunk-vendors.1d90d08d.css" rel="stylesheet"><link href="/css/app.11089a5f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.f296b9ce.js"></script><script src="/js/app.8dda5fbb.js"></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/ccc.png"><title></title><link href="/css/chunk-148cd3a8.0676f2ca.css" rel="prefetch"><link href="/css/chunk-14b9857b.0dc416de.css" rel="prefetch"><link href="/css/chunk-2c359864.0dc416de.css" rel="prefetch"><link href="/css/chunk-3385141a.0dc416de.css" rel="prefetch"><link href="/css/chunk-356a65ce.a35226dc.css" rel="prefetch"><link href="/css/chunk-3c2c5e1e.45b15920.css" rel="prefetch"><link href="/css/chunk-4a1e7798.535cbb8d.css" rel="prefetch"><link href="/css/chunk-605962ce.d38c164f.css" rel="prefetch"><link href="/css/chunk-635bdee9.1e75f0e2.css" rel="prefetch"><link href="/css/chunk-6ab78853.938207ad.css" rel="prefetch"><link href="/css/chunk-a2c78c42.992e1c54.css" rel="prefetch"><link href="/js/chunk-148cd3a8.5faa4c66.js" rel="prefetch"><link href="/js/chunk-14b9857b.febb5572.js" rel="prefetch"><link href="/js/chunk-2c359864.db10b8d2.js" rel="prefetch"><link href="/js/chunk-3385141a.2c27d988.js" rel="prefetch"><link href="/js/chunk-356a65ce.1e39f945.js" rel="prefetch"><link href="/js/chunk-3c2c5e1e.2c04efbe.js" rel="prefetch"><link href="/js/chunk-4a1e7798.3c4e7d5f.js" rel="prefetch"><link href="/js/chunk-4fe8dd4f.e1485c58.js" rel="prefetch"><link href="/js/chunk-605962ce.c6ec96ad.js" rel="prefetch"><link href="/js/chunk-635bdee9.76cd79a8.js" rel="prefetch"><link href="/js/chunk-6ab78853.9f72b840.js" rel="prefetch"><link href="/js/chunk-a2c78c42.c0ad1b19.js" rel="prefetch"><link href="/css/app.11089a5f.css" rel="preload" as="style"><link href="/css/chunk-vendors.1d90d08d.css" rel="preload" as="style"><link href="/js/app.b45f74c6.js" rel="preload" as="script"><link href="/js/chunk-vendors.f296b9ce.js" rel="preload" as="script"><link href="/css/chunk-vendors.1d90d08d.css" rel="stylesheet"><link href="/css/app.11089a5f.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but iview-admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.f296b9ce.js"></script><script src="/js/app.b45f74c6.js"></script></body></html>
\ No newline at end of file
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