Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial

code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js

@@ -12,7 +12,7 @@ async function getCameraProject (ctx, next) {
       let findOption = {
          attributes: { exclude: ['delete', 'recycleTime',] },
          where: {
-            createUserId: userId,
+            // createUserId: userId,
             recycleTime: null,
             delete: false
          },

code/VideoAccess-VCMP/script/1.3.1/data/1_sync_camera_data/index.js

@@ -72,6 +72,7 @@ try {
                let beloneSecretId = null
                let serialUnlegal = false
                for (let s of secretRes) {
+                  let start = (new Date()).getTime();
                   console.log(`当前查询账号key ${s.key}`);
                   if (!s.newToken) {
                      const tokenRes = await request.post(`${yingshiHost}lapp/token/get`).query({
@@ -89,6 +90,10 @@ try {
                      }
                   }
 
+                  while (((new Date()).getTime() - start) < 3000) {//限制频率
+                     continue;
+                  }
+
                   // 检测设备所属
                   const cameraState = await request.post(`${yingshiHost}lapp/device/info`).query({
                      accessToken: s.newToken,