Commit d19ab5f5 authored by 李超鹏's avatar 李超鹏

修复云函数问题

parent dde5b61d
...@@ -3,7 +3,8 @@ async function getUserId(token) { ...@@ -3,7 +3,8 @@ async function getUserId(token) {
"/myinfo/id", { "/myinfo/id", {
method: 'GET' method: 'GET'
}) })
return res ? res.data : "" console.log(res.data)
return res && res.status === '200' ? res.data : token
} }
module.exports = { module.exports = {
......
// 本文件中的json内容将在云函数【运行】时作为参数传给云函数。
// 配置教程参考:https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
{
"token": "",
"classify_id": "79550af260555cc20afb34146966a2c4",
"system_id": "79550af260555cc20afb34156c94b32c",
"brand_id": "79550af260555cc20afb3417731a827c"
}
...@@ -6,7 +6,7 @@ exports.main = async (event, context) => { ...@@ -6,7 +6,7 @@ exports.main = async (event, context) => {
const db = uniCloud.database(); const db = uniCloud.database();
const _ = db.command const _ = db.command
const $ = db.command.aggregate const $ = db.command.aggregate
const user_id = getUserId(event.token) const user_id = await getUserId(event.token)
let res = await db.collection("standardV2").aggregate().lookup({ let res = await db.collection("standardV2").aggregate().lookup({
from: 'user_upload_file', from: 'user_upload_file',
let: { let: {
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
// 配置教程参考:https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam // 配置教程参考:https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
{ {
"token": "" "token": "666666666666"
"system_id": "79550af260555cc20afb34156c94b32c" "system_id": "79550af260555cc20afb34156c94b32c"
} }
...@@ -4,7 +4,7 @@ const { ...@@ -4,7 +4,7 @@ const {
} = require('user-common') } = require('user-common')
exports.main = async (event, context) => { exports.main = async (event, context) => {
//event为客户端上传的参数 //event为客户端上传的参数
const user_id = getUserId(event.token) const user_id = await getUserId(event.token)
const collection = uniCloud.database().collection("user_watermark").field({ const collection = uniCloud.database().collection("user_watermark").field({
'_id': false '_id': false
}) })
......
...@@ -4,7 +4,7 @@ const { ...@@ -4,7 +4,7 @@ const {
} = require('user-common') } = require('user-common')
exports.main = async (event, context) => { exports.main = async (event, context) => {
//event为客户端上传的参数 //event为客户端上传的参数
let workerId = getUserId(event.token) let workerId = await getUserId(event.token)
if (workerId) { if (workerId) {
await uniCloud.database().collection("user_upload_file").add({ await uniCloud.database().collection("user_upload_file").add({
"user_id": workerId, "user_id": workerId,
......
...@@ -4,9 +4,9 @@ const { ...@@ -4,9 +4,9 @@ const {
} = require('user-common') } = require('user-common')
exports.main = async (event, context) => { exports.main = async (event, context) => {
let user_id = getUserId(event.token) let user_id = await getUserId(event.token)
console.log(user_id);
const watermark = event.watermark const watermark = event.watermark
user_id = '12312313'
if (user_id) { if (user_id) {
watermark.user_id = user_id watermark.user_id = user_id
const collection = uniCloud.database().collection("user_watermark"); const collection = uniCloud.database().collection("user_watermark");
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
// 配置教程参考:https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam // 配置教程参考:https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam
{ {
"token": "12312313", "token": "666666666666",
"watermark": { "watermark": {
"has_origin": true, "has_origin": true,
"lower_right": { "lower_right": {
......
...@@ -200,43 +200,51 @@ ...@@ -200,43 +200,51 @@
"has_origin": true, "has_origin": true,
"mid_text": "现场拍照", "mid_text": "现场拍照",
"lower_right": { "lower_right": {
"title_text": "",
"body": [{ "body": [{
"watemark_type": "时间", "watemark_type": "时间",
"watemark_text": "时间", "watemark_text": "时间",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "地址", "watemark_type": "地址",
"watemark_text": "地址", "watemark_text": "地址",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "经度", "watemark_type": "经度",
"watemark_text": "经度", "watemark_text": "经度",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "纬度", "watemark_type": "纬度",
"watemark_text": "纬度", "watemark_text": "纬度",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}] }]
} }
}, { }, {
...@@ -245,43 +253,51 @@ ...@@ -245,43 +253,51 @@
"has_origin": true, "has_origin": true,
"mid_text": "现场拍照", "mid_text": "现场拍照",
"lower_right": { "lower_right": {
"title_text": "",
"body": [{ "body": [{
"watemark_type": "时间", "watemark_type": "时间",
"watemark_text": "时间", "watemark_text": "时间",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "地址", "watemark_type": "地址",
"watemark_text": "地址", "watemark_text": "地址",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "经度", "watemark_type": "经度",
"watemark_text": "经度", "watemark_text": "经度",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "纬度", "watemark_type": "纬度",
"watemark_text": "纬度", "watemark_text": "纬度",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}] }]
} }
}, { }, {
...@@ -294,39 +310,48 @@ ...@@ -294,39 +310,48 @@
"body": [{ "body": [{
"watemark_type": "时间", "watemark_type": "时间",
"watemark_text": "时间", "watemark_text": "时间",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "地址", "watemark_type": "地址",
"watemark_text": "地址", "watemark_text": "地址",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "经度", "watemark_type": "经度",
"watemark_text": "经度", "watemark_text": "经度",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "纬度", "watemark_type": "纬度",
"watemark_text": "纬度", "watemark_text": "纬度",
"watemark_value": "" "watemark_value": "",
"enable": true
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}, { }, {
"watemark_type": "备注", "watemark_type": "备注",
"watemark_text": "", "watemark_text": "",
"watemark_value": "" "watemark_value": "",
"enable": false
}] }]
} }
} }
......
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