|
@@ -87,7 +87,7 @@ let counter = require('../../../public/counter/counter');
|
|
|
import SectionTreeDao from '../../complementary_ration_lib/models/sectionTreeModel';
|
|
|
let sectionTreeDao = new SectionTreeDao();
|
|
|
import CounterModel from "../../glj/models/counter_model";
|
|
|
-import moment from 'moment';
|
|
|
+import moment from 'moment-timezone';
|
|
|
import billsFlags from '../../common/const/bills_fixed';
|
|
|
const notDeleted = [{deleteInfo: null}, {'deleteInfo.deleted': false}];
|
|
|
import {
|
|
@@ -113,7 +113,7 @@ let qiniu_config = {
|
|
|
"AccessKey": "_gR1ed4vi1vT2G2YITGSf4_H0fJu_nRS9Tzk3T4z",
|
|
|
"SecretKey": "ty4zd0FHqgEDaiVzSLC8DfHlai99aS7bspLkw6s6",
|
|
|
"Bucket": "yun-update",
|
|
|
- "Domain": "https://serverupdate.smartcost.com.cn"
|
|
|
+ "Domain": "http://serverupdate.smartcost.com.cn"
|
|
|
};
|
|
|
let mac = new qiniu.auth.digest.Mac(qiniu_config.AccessKey, qiniu_config.SecretKey);
|
|
|
|
|
@@ -216,13 +216,13 @@ async function copyProject(userID, compilationID,data,newProjectID = null) {
|
|
|
//费率文件、单价文件重名检查
|
|
|
let feeRate = await feeRateFileModel.findOne({rootProjectID:originalProperty.rootProjectID,name:originalProperty.feeFile.name,deleteInfo:null});
|
|
|
if(feeRate){//存在重名的文件
|
|
|
- newFeeName = originalProperty.feeFile.name + '(' + moment(Date.now()).format('MM-DD HH:mm:ss') + '复制)';
|
|
|
+ newFeeName = originalProperty.feeFile.name + '(' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '复制)';
|
|
|
projectMap['copy'].document.property.feeFile.name = newFeeName;
|
|
|
}
|
|
|
|
|
|
let unitPriceFile = await unitPriceFileModel.findOne({root_project_id: originalProperty.rootProjectID,name:originalProperty.unitPriceFile.name,deleteInfo: null});
|
|
|
if(unitPriceFile){//存在重名的文件
|
|
|
- newUnitName = originalProperty.unitPriceFile.name + '(' + moment(Date.now()).format('MM-DD HH:mm:ss') + '复制)';
|
|
|
+ newUnitName = originalProperty.unitPriceFile.name + '(' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '复制)';
|
|
|
projectMap['copy'].document.property.unitPriceFile.name = newUnitName;
|
|
|
}
|
|
|
|
|
@@ -1757,7 +1757,7 @@ async function downLoadProjectFile(info) {
|
|
|
let publicBucketDomain = qiniu_config.Domain;// "http://serverupdate.smartcost.com.cn";//这里不支持https
|
|
|
let deadline = parseInt(Date.now() / 1000) + 3600; // 1小时过期
|
|
|
let privateDownloadUrl = bucketManager2.privateDownloadUrl(publicBucketDomain, info.key, deadline);
|
|
|
-
|
|
|
+ console.log(privateDownloadUrl);
|
|
|
let data = {
|
|
|
key:info.key,
|
|
|
userID:info.session.sessionUser.id,
|
|
@@ -1988,7 +1988,7 @@ async function handleMainProjectDatas(mainData,updateData,userID) {
|
|
|
}
|
|
|
//查看是否重名;
|
|
|
let temp = await projectModel.findOne({userID:userID,ParentID:p.ParentID,name:p.name});
|
|
|
- if(temp) p.name = p.name + '(' + moment(Date.now()).format('MM-DD HH:mm:ss') + '导入)';
|
|
|
+ if(temp) p.name = p.name + '(' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '导入)';
|
|
|
}else {
|
|
|
p.ParentID = projectIDMap[p.ParentID];
|
|
|
p.NextSiblingID = projectIDMap[p.NextSiblingID];
|