From 932ae3495259ea9794fb8c063b6a5ec416bdc646 Mon Sep 17 00:00:00 2001
From: royye62 <royye62@gmail.com>
Date: Tue, 11 Feb 2020 22:36:08 +0800
Subject: [PATCH] mini program: remove secret key

---
 .../cloudfunctions/iothub-publish/index.js    | 22 ++++++++++---------
 .../iothub-shadow-query/index.js              | 22 +++++++++----------
 .../miniprogram/app.js                        |  3 +++
 .../miniprogram/pages/index/index.js          | 10 ++++++---
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/cloudfunctions/iothub-publish/index.js b/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/cloudfunctions/iothub-publish/index.js
index 8ca1c66d..51393eeb 100644
--- a/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/cloudfunctions/iothub-publish/index.js
+++ b/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/cloudfunctions/iothub-publish/index.js
@@ -7,19 +7,21 @@ const Credential = tencentcloud.common.Credential;
 const ClientProfile = tencentcloud.common.ClientProfile;
 const HttpProfile = tencentcloud.common.HttpProfile;
 
-let cred = new Credential("AKIDDDzjIeENdhosOg9T0LRXabO0B7pHhzQe", "f6IqCUirpeF1gLn3f0IWosjOqjOyTq2r");
-let httpProfile = new HttpProfile();
-httpProfile.endpoint = "iotcloud.tencentcloudapi.com";
-let clientProfile = new ClientProfile();
-clientProfile.httpProfile = httpProfile;
-let client = new IotcloudClient(cred, "ap-guangzhou", clientProfile);
-
 // 云函数入口函数
 exports.main = async (event, context) => {
+  let cred = new Credential(event.SecretId, event.SecretKey);
+  let httpProfile = new HttpProfile();
+  httpProfile.endpoint = "iotcloud.tencentcloudapi.com";
+  let clientProfile = new ClientProfile();
+  clientProfile.httpProfile = httpProfile;
+  let client = new IotcloudClient(cred, "ap-guangzhou", clientProfile);
   let req = new models.PublishMessageRequest();
-  req.Topic = "U1BZWHF7F9/dev_01/data";
-  req.DeviceName = "dev_01";
-  req.ProductId = "U1BZWHF7F9";
+  // req.Topic = "U1BZWHF7F9/dev_01/data";
+  // req.DeviceName = "dev_01";
+  // req.ProductId = "U1BZWHF7F9";
+  req.Topic = event.Topic
+  req.DeviceName = event.DeviceName;
+  req.ProductId = event.ProductId;
   req.Payload = event.Payload;
 
   return new Promise((resolve, reject)=>{
diff --git a/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/cloudfunctions/iothub-shadow-query/index.js b/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/cloudfunctions/iothub-shadow-query/index.js
index 33a93865..1d9921b2 100644
--- a/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/cloudfunctions/iothub-shadow-query/index.js
+++ b/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/cloudfunctions/iothub-shadow-query/index.js
@@ -7,19 +7,17 @@ const Credential = tencentcloud.common.Credential;
 const ClientProfile = tencentcloud.common.ClientProfile;
 const HttpProfile = tencentcloud.common.HttpProfile;
 
-let cred = new Credential("AKIDDDzjIeENdhosOg9T0LRXabO0B7pHhzQe", "f6IqCUirpeF1gLn3f0IWosjOqjOyTq2r");
-let httpProfile = new HttpProfile();
-httpProfile.endpoint = "iotcloud.tencentcloudapi.com";
-let clientProfile = new ClientProfile();
-clientProfile.httpProfile = httpProfile;
-let client = new IotcloudClient(cred, "ap-guangzhou", clientProfile);
-
-let req = new models.DescribeDeviceShadowRequest();
-
-let params = '{"ProductId":"U1BZWHF7F9","DeviceName":"dev_01"}'
-req.from_json_string(params);
-
 exports.main = async (event, context) => {
+  let cred = new Credential(event.SecretId, event.SecretKey);
+  let httpProfile = new HttpProfile();
+  httpProfile.endpoint = "iotcloud.tencentcloudapi.com";
+  let clientProfile = new ClientProfile();
+  clientProfile.httpProfile = httpProfile;
+  let client = new IotcloudClient(cred, "ap-guangzhou", clientProfile);
+  let req = new models.DescribeDeviceShadowRequest();
+  req.DeviceName = event.DeviceName;
+  req.ProductId = event.ProductId;
+
   return new Promise((resolve, reject)=>{
     client.DescribeDeviceShadow(req, function (errMsg, response) {
 
diff --git a/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/miniprogram/app.js b/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/miniprogram/app.js
index 0e2f6c14..ea82cb78 100644
--- a/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/miniprogram/app.js
+++ b/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/miniprogram/app.js
@@ -4,6 +4,9 @@ App({
     // 腾讯云物联网通信平台中获取 产品ID和设备名称
     productId: "U1BZWHF7F9", // 产品ID
     deviceName: "dev_01", // 设备名称
+    // 腾讯云控制台-访问管理-访问密钥-API密钥管理中获取 SecretId, SecretKey
+    secretId: "xxx",
+    secretKey: "xxx",
   },
   onLaunch: function () {
     if (!wx.cloud) {
diff --git a/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/miniprogram/pages/index/index.js b/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/miniprogram/pages/index/index.js
index d4c48f78..c55b8cca 100644
--- a/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/miniprogram/pages/index/index.js
+++ b/tools/Mini_Program/qcloud_iothub_mp_cloudfunctions_farmai/miniprogram/pages/index/index.js
@@ -30,8 +30,10 @@ Page({
     wx.cloud.callFunction({
       name: 'iothub-shadow-query',
       data: {
-        productId: app.globalData.productId,
-        deviceName: app.globalData.deviceName,
+        ProductId: app.globalData.productId,
+        DeviceName: app.globalData.deviceName,
+        SecretId: app.globalData.secretId,
+        SecretKey: app.globalData.secretKey,
       },
       success: res => {
         wx.showToast({
@@ -67,9 +69,11 @@ Page({
     wx.cloud.callFunction({
       name: 'iothub-publish',
       data: {
+        SecretId: app.globalData.secretId,
+        SecretKey: app.globalData.secretKey,
         ProductId: app.globalData.productId,
         DeviceName: app.globalData.deviceName,
-        Topic: "",
+        Topic: app.globalData.productId + "/" + app.globalData.deviceName + "/data",
         Payload: payload,
       },
       success: res => {