hank 1 rok temu
rodzic
commit
1704937006

+ 55 - 10
config/config.js

@@ -14,7 +14,12 @@ const appInfoObj = {
         appid: 'wxa13166979d7011c4',
         ghid: 'gh_dd2c1a9b59d8',
         appName: '稻香悦读视界',
-        ads: {},
+        ads: {
+            insertAdId: 'adunit-6f652c983c83b94a',
+            rewardAdId: 'adunit-62327e73abec00ec',
+            bookmarkAdId: 'adunit-4abed888086e614e',
+            templateAdId: 'adunit-649273f8a7428d0c'
+        },
     },
     wx8a8aae7f462df482: {
         appid: 'wx8a8aae7f462df482',
@@ -31,7 +36,12 @@ const appInfoObj = {
         appid: 'wx1344c35820ac688e',
         ghid: 'gh_e6ca97959a69',
         appName: '稻香悠享视界',
-        ads: {},
+        ads: {
+            insertAdId: 'adunit-cd80b2eb24606ae1',
+            rewardAdId: 'adunit-9556014e024c3193',
+            bookmarkAdId: 'adunit-0da094052a6d4149',
+            templateAdId: 'adunit-4850c8e6d5c25efc'
+        },
     },
     wx8bd40e8ce9deb2b6: {
         appid: 'wx8bd40e8ce9deb2b6',
@@ -88,13 +98,23 @@ const appInfoObj = {
         appid: 'wx9d93825db1c7dcbe',
         ghid: 'gh_1042b9599e05',
         appName: '蓝晶看这视界',
-        ads: {},
+        ads: {
+          insertAdId: 'adunit-e034d1512362cc26',
+          rewardAdId: 'adunit-39bffc44f27f8d46',
+          bookmarkAdId: 'adunit-3097633e13d9d2c7',
+          templateAdId: 'adunit-7ac384f29d306c14'
+      },
     },
     wx3fe2e6c200ec7133: {
         appid: 'wx3fe2e6c200ec7133',
         ghid: 'gh_298cbd19ddcb',
         appName: '蓝晶畅看视界',
-        ads: {},
+        ads: {
+          insertAdId: 'adunit-a9b7bc395d3fd3f6',
+          rewardAdId: 'adunit-d05aadf553c7e1be',
+          bookmarkAdId: 'adunit-2dfb09a147900542',
+          templateAdId: 'adunit-d79320739b2741d3'
+      },
     },
     wx3800bb2ed4a326c5: {
         appid: 'wx3800bb2ed4a326c5',
@@ -112,13 +132,23 @@ const appInfoObj = {
         appid: 'wxa721f4474e3d548a',
         ghid: 'gh_63df1cb1521b',
         appName: '蓝晶创映空间',
-        ads: {},
+        ads: {
+          insertAdId: 'adunit-68b3d5c56e04e960',
+          rewardAdId: 'adunit-21a681a835b2c8b3',
+          bookmarkAdId: 'adunit-b02b93b1ec5f4c58',
+          templateAdId: 'adunit-84aaf08a02103ec2'
+      },
     },
     wxc5e6b24889027032: {
         appid: 'wxc5e6b24889027032', 
         ghid: 'gh_87e9da72ca79',
         appName: '蓝晶云瞰视界',
-        ads: {},
+        ads: {
+          insertAdId: 'adunit-4b6c744ac34086e7',
+          rewardAdId: 'adunit-b4dac0748889527e',
+          bookmarkAdId: 'adunit-724d975f3bf271d6',
+          templateAdId: 'adunit-6419d9748ccf8d08'
+      },
     },
     wxef68681d5044ca05: {
         appid: 'wxef68681d5044ca05', // 小说类目没过
@@ -130,19 +160,34 @@ const appInfoObj = {
         appid: 'wx706acdc696d025ad', 
         ghid: 'gh_e9351f804e32',
         appName: '蓝晶视界漫游',
-        ads: {},
+        ads: {
+          insertAdId: 'adunit-60aa9f77aa212dee',
+          rewardAdId: 'adunit-ee1380631c491575',
+          bookmarkAdId: 'adunit-1d61149bc2a69e8d',
+          templateAdId: 'adunit-52415537ff6eb87e'
+      },
     },
     wx8288d587b717897e: {
         appid: 'wx8288d587b717897e',
         ghid: 'gh_7d5b65ac29ee',
         appName: '蓝晶瞰影工坊',
-        ads: {},
+        ads: {
+          insertAdId: 'adunit-897cd1bac6818154',
+          rewardAdId: 'adunit-c686fbe741463800',
+          bookmarkAdId: 'adunit-9e9e06a14d110a81',
+          templateAdId: 'adunit-c59fe75d4b496cd9'
+      },
     },
     wx54a8d0e7b33c48c8: {
         appid: 'wx54a8d0e7b33c48c8', // 小说类目没过
         ghid: 'gh_cbbd0f0b8865',
         appName: '蓝晶帧探视界',
-        ads: {},
+        ads: {
+          insertAdId: 'adunit-83b5b14d08f7da00',
+          rewardAdId: 'adunit-cb9ddb2b7b42c17f',
+          bookmarkAdId: 'adunit-8fb3cee5580d91cc',
+          templateAdId: 'adunit-1ffde1b5de20cf4f'
+      },
     },
     wx0138dee6d680c705: {
         appid: 'wx0138dee6d680c705',
@@ -341,7 +386,7 @@ const appInfoObj = {
 };
 
 // @config 确定使用的小程序appid
-const current_appid = 'wx3800bb2ed4a326c5';
+const current_appid = 'wx54a8d0e7b33c48c8';
 export const apple = {
     ...appInfoObj[current_appid],
     appKey: '49TBR8Z1rA7PyqD30FV0v48AU',

+ 6 - 0
destroy/readme.md

@@ -5,6 +5,12 @@
 | 1.0.0 | 批量化同步提交代码 | 批量化代码提交功能 |
 
 ## 快速开始:
+```
+// 单个小程序执行
+npm run upload --  --t=2 --a=wx8bd40e8ce9deb2b6 --v=1.6.2 --d=测试
+// 批量化执行
+npm run upload --  --t=1  --v=1.6.2 --d=测试
+```
 1. 复制批量化功能代码文件到项目目录destroy(没有则创建)
    2. destroy/upload.wx.js 单个小程序上传
    ```

+ 55 - 14
destroy/upload.main.js

@@ -30,7 +30,7 @@ function publishMiniProgram(options) {
     })
 }
 
-exports.start = async () => {
+exports.start = async (args) => {
     try {
         const file = await fs.promises.readFile(
             path.join(__dirname, '../destroy/config.json'),
@@ -43,42 +43,83 @@ exports.start = async () => {
             version: fileJson.version,
             desc: fileJson.desc,
             env: fileJson.env || '正式环境',
-            robot: fileJson.robot
+            robot: fileJson.robot,
+            type: 1,
+            appName: '',
+            app: {}
         };
+        // console.log('args', args);
+        if (args) {
+            // console.log('入参args:', args)
+            config.type = parseInt(args['t']);
+            if (config.type === 2) {
+                config.appName = args['a'];
+                config.app = config.appIds.find(item => item.name === config.appName);
+                if (!config.app) {
+                    console.log(`未找到小程序[${config.appId}]`);
+                    return
+                }
+            }
+            config.desc = args['d']; // 描述
+            config.version = args['v']; // 版本
+        }
         let desc_one = `本次提交小程序: ${config.appIds.map(item => `${item.name} (${item.appid})`).join(', ')}`;
+        if (config.type === 2) {
+            desc_one = `本次提交小程序: ${config.app.name} (${config.app.appid})`;
+        }
         let desc_two = `版本: ${config.version}`;
         let desc_three = `描述: ${config.desc}` + '\n' + '▶️ 开始上传IAA小说代码';
         console.log(desc_one);
         console.log(desc_two);
         console.log(`环境: ${config.env}`);
         console.log(desc_three);
-        sendNotice(desc_one + '\n' + desc_two + '\n' +
-            '-----------------------------------'
-            + desc_three);
+        // sendNotice(desc_one + '\n' + desc_two + '\n' +
+        //     '-----------------------------------'
+        //     + desc_three);
         // 3. 顺序发布(避免并发资源竞争)
         let successCount = 0;
         let failedCount = 0;
         let failApp = '';
-        for (const [index, item] of config.appIds.entries()) {
+        if (config.type === 2) {
             try {
-                console.log(`\n开始发布第 ${index + 1} 个小程序: ${item.name} (${item.appid})  版本:${config.version}`);
+                console.log(`\n开始发布小程序: ${config.app.name} (${config.app.appid})  版本:${config.version}`);
                 await publishMiniProgram({
-                    appid: item.appid,
-                    name: item.name,
+                    appid: config.app.appid,
+                    name: config.app.name,
                     version: config.version,
                     desc: `${config.env}——${config.desc}`,
                     env: config.env
                 });
                 successCount++;
-                console.log(`✅ 发布成功: ${item.name} 版本:${config.version}`);
-            } catch (err) {
+                console.log(`✅ 发布成功: ${config.app.name} 版本:${config.version}`);
+            } catch (e) {
                 failedCount++;
-                console.error(`❌ 发布失败: ${item.name} 版本:${config.version}`, err.message);
-                failApp += `${item.name} (${item.appid})\n`;
+                console.error(`❌ 发布失败: ${config.app.name} (${config.app.appid}) 版本:${config.version}`, e.message);
+                failApp += `${config.app.name} (${config.app.appid})\n`;
+            }
+        } else {
+            for (const [index, item] of config.appIds.entries()) {
+                try {
+                    console.log(`\n开始发布第 ${index + 1} 个小程序: ${item.name} (${item.appid})  版本:${config.version}`);
+                    await publishMiniProgram({
+                        appid: item.appid,
+                        name: item.name,
+                        version: config.version,
+                        desc: `${config.env}——${config.desc}`,
+                        env: config.env
+                    });
+                    successCount++;
+                    console.log(`✅ 发布成功: ${item.name} 版本:${config.version}`);
+                } catch (err) {
+                    failedCount++;
+                    console.error(`❌ 发布失败: ${item.name} 版本:${config.version}`, err.message);
+                    failApp += `${item.name} (${item.appid})\n`;
+                }
             }
         }
+
         resultMsg = '版本:' + config.version + `\n发布结果: ✅ ${successCount} 个小程序发布成功,❌ ${failedCount} 个小程序发布失败。` + '\n失败列表:' + failApp;
-        sendNotice(resultMsg);
+        // sendNotice(resultMsg);
         // 4. 返回统计结果
         return {
             success: successCount,

+ 1 - 1
pages/video/detail.js

@@ -37,7 +37,7 @@ Page({
         this.setData({
             scene: wx.getStorageSync('scene') || 1001
         })
-        SendEvent('show_video', {
+        SendEvent('show_video',  {
             "video_id": videoId,
             "tag_id": tagId,
             "scene": this.data.scene,

+ 1 - 1
project.config.json

@@ -27,6 +27,6 @@
     "tabIndent": "auto",
     "tabSize": 2
   },
-  "appid": "wx3800bb2ed4a326c5",
+  "appid": "wx54a8d0e7b33c48c8",
   "testRoot": "minitest/"
 }

+ 1 - 1
project.private.config.json

@@ -12,7 +12,7 @@
         {
           "name": "内容库",
           "pathName": "pages/video/video",
-          "query": "shared_video_id=411984&tag_id=2072&share_count=1&type=tuiguang&jump=1",
+          "query": "shared_video_id=412355&tag_id=2317&share_count=1&type=tuiguang&jump=1",
           "launchMode": "default",
           "scene": 1007
         },

+ 11 - 1
upload_ci.js

@@ -4,7 +4,17 @@ const upload = require(path.join(__dirname, 'destroy/upload.main.js'))
 (
     async () => {
         try {
-            const result = await upload.start();
+            const args = process.argv.slice(2).reduce((acc, arg) => {
+                const [key, value] = arg.replace(/^--/, '').split('=');
+                return {...acc, [key]: value || true};
+            }, {});
+            // console.log(`\n开始发布版本: `,args);
+            // 参数t,v,d必传
+            if (!args.t || !args.v || !args.d) {
+                console.error('参数t-类型,v-版本,d-描述必传');
+                return;
+            }
+            const result = await upload.start(args);
             console.log(`\n发布完成: 成功 ${result.success} 个, 失败 ${result.failed} 个`);
         } catch (e) {
             console.error('全局捕获错误:', e);