Pārlūkot izejas kodu

1. 去除隐私协议
2. 批量上传

hank 1 gadu atpakaļ
vecāks
revīzija
9e2d0e2538

+ 66 - 6
config/config.js

@@ -100,7 +100,12 @@ const appInfoObj = {
         appid: 'wx3800bb2ed4a326c5',
         ghid: 'gh_7e70db53a149',
         appName: '蓝晶享看视界',
-        ads: {},
+        ads: {
+          insertAdId: 'adunit-b84544f2078afaea',
+          rewardAdId: 'adunit-e46d123c61e26dc3',
+          bookmarkAdId: 'adunit-adc28f71b145520a',
+          templateAdId: 'adunit-6b81fb8f0e662aa8'
+      },
     },
     // ------------------------2025-04-11 新增
     wxa721f4474e3d548a: {
@@ -272,16 +277,71 @@ const appInfoObj = {
         appName: '蓝晶影音视看',
         ads: {},
     },
-    wx7328fabfb0a5fb8d: {
-        appid: 'wx7328fabfb0a5fb8d',
-        ghid: 'gh_f52c6dafa59a',
-        appName: '蓝晶光轨映廊',
+    // -------------------------2025-04-22 新增
+    wxdf7e08f21084c8e2: {
+        appid: 'wxdf7e08f21084c8e2',
+        ghid: 'gh_5030bf66aef0',
+        appName: '蓝晶影迹视界',
+        ads: {},
+    },
+    wx092045bdfe26a5ee: {
+        appid: 'wx092045bdfe26a5ee',
+        ghid: 'gh_f68920763a81',
+        appName: '蓝晶映见星云',
+        ads: {},
+    },
+    wx6c4bb5ef1e6c1e70: {
+        appid: 'wx6c4bb5ef1e6c1e70',
+        ghid: 'gh_b6e8f03fc727',
+        appName: '蓝晶映画视野',
+        ads: {},
+    },
+    wx60db1bff60cd771c: {
+        appid: 'wx60db1bff60cd771c',
+        ghid: 'gh_01f93f7f5035',
+        appName: '蓝晶光影视野',
+        ads: {},
+    },
+    wx5a9dda0604c2ea67: {
+        appid: 'wx5a9dda0604c2ea67',
+        ghid: 'gh_a186898d8dcc',
+        appName: '蓝晶视语工场',
+        ads: {},
+    },
+    wxdecb83db79aa5bc0: {
+        appid: 'wxdecb83db79aa5bc0',
+        ghid: 'gh_ac31f1281a2e',
+        appName: '蓝晶视觉魔方',
+        ads: {},
+    },
+    wx616a7e327bd9574a: {
+        appid: 'wx616a7e327bd9574a',
+        ghid: 'gh_06dab34906a2',
+        appName: '蓝晶影构空间',
+        ads: {},
+    },
+    wxdcf60b8e89ff6fa0: {
+        appid: 'wxdcf60b8e89ff6fa0',
+        ghid: 'gh_0c04415d1aec',
+        appName: '蓝晶视能象限',
+        ads: {},
+    },
+    wx54c216ec4ad011fd: {
+        appid: 'wx54c216ec4ad011fd',
+        ghid: 'gh_27b2a85570df',
+        appName: '蓝晶映动视廊',
+        ads: {},
+    },
+    wxd40b677f35319eea: {
+        appid: 'wxd40b677f35319eea',
+        ghid: 'gh_303939d4a258',
+        appName: '蓝晶云映视界',
         ads: {},
     },
 };
 
 // @config 确定使用的小程序appid
-const current_appid = 'wx8a8aae7f462df482';
+const current_appid = 'wx3800bb2ed4a326c5';
 export const apple = {
     ...appInfoObj[current_appid],
     appKey: '49TBR8Z1rA7PyqD30FV0v48AU',

+ 44 - 3
destroy/config.json

@@ -1,6 +1,6 @@
 {
-  "version": "2.4.2",
-  "desc": "2.4.2 优化一些问题",
+  "version": "1.6.1",
+  "desc": "1.6.1 优化一些问题",
   "appIds": [
     {
       "name": "视读空间",
@@ -169,7 +169,48 @@
     {
       "name": "蓝晶光轨映廊",
       "appid": "wx7328fabfb0a5fb8d"
+    },
+    {
+      "name": "蓝晶影迹视界",
+      "appid": "wxdf7e08f21084c8e2"
+    },
+    {
+      "name": "蓝晶映见星云",
+      "appid": "wx092045bdfe26a5ee"
+    },
+    {
+      "name": "蓝晶映画视野",
+      "appid": "wx6c4bb5ef1e6c1e70"
+    },
+    {
+      "name": "蓝晶光影视野",
+      "appid": "wx60db1bff60cd771c"
+    },
+    {
+      "name": "蓝晶视语工场",
+      "appid": "wx5a9dda0604c2ea67"
+    },
+    {
+      "name": "蓝晶视觉魔方",
+      "appid": "wxdecb83db79aa5bc0"
+    },
+    {
+      "name": "蓝晶影构空间",
+      "appid": "wx616a7e327bd9574a"
+    },
+    {
+      "name": "蓝晶视能象限",
+      "appid": "wxdcf60b8e89ff6fa0"
+    },
+    {
+      "name": "蓝晶映动视廊",
+      "appid": "wx54c216ec4ad011fd"
+    },
+    {
+      "name": "蓝晶云映视界",
+      "appid": "wxd40b677f35319eea"
     }
   ],
-  "env": "正式环境"
+  "env": "正式环境",
+  "robot": "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=edad501e-8bce-430e-bc50-f897a9e45ed9"
 }

+ 27 - 0
destroy/keys/private.wxa7a33088566e1292.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAt+s4MoF1vg8IO/1wYxqACc8ebLAOFni3ha9rxYd7pc44JHfA
+eqy2nSFygFMejJe3/reUXBBRl1wfe7suojmSMBwjFaigHCZ19DGpUO1BdK3DPoqN
+rRDyyBXAH7o1JAzV243w8Sm6/f0u5N3v3fX7wyxVynagdVHJV3bry7e6NWvHE4Y5
+5AIbe5Dp08bhqdVV1wqq47OuaKY7oqXQ3LPev8re4zI+BJyPxNehw4kAqFr0M1EJ
+RYOsexXOyOjS91cnRLqPZj1lzdOxTwkk7i7KZj745JwOO0Ajum+kZMpVh004eoBM
+w4iOmzAAZDjISiofRQQmR+oAKx6MTARSMX6JUwIDAQABAoIBADsIuWUcwNpcoNwA
+oY5t9yMu5Ckm6Z606NN0Vzd0IXA7HTI3bgTyYztUfRhLlcay/FA6RNi4NDhNTZ29
+m15e9FmU7n4JPjtK7RmQxzQ+s3/sNntgpdEjW4p10NFeR6hmpk5u5SPDrU3Rcrfr
+tQ6d4k3ncTInmaGOuv3kIhOlyZNTlM3tRX+Fg6KVFdfCFs5DwdPeZI9fcX/58t/7
+ZauDv7T/c2VwUewagT0l25gkPH0vBahYrO/OkVukPVd8ankvqYhF4y4YHjBnyWE7
+f2+dyvyJMOnSLZa1rOmCe3+J8sD6VRMpeLO5rwqZeaqBBcdR6AGbb1xDTq+Twvw5
+7PeIlsECgYEA8n/PECx0kfqZ5tnssefWuCQSlXDOErOZwz4avR1pO8PTwYLq4k+u
+MlUUG5MeOubEjF2wEyXsoGh5/tdkGBwEo/z3p51KDHZuHtzA0D6EZdLihPGac24n
+Jt2aJSeSLCYKc2nTw8etWDmFWys6Vg+OD3mvNYmy2f6Xh1scg7y+HakCgYEAwiiA
+EOGfgn4uc4Kju5tQDc9lBV0KTRk8Vc67ZQ2x/ZDVkgwqc3Tp6z27ugHh7f76HPmG
+aoH5p9Ed3oBqwqypkMPZjCwd/OUG616bE3fEjNphf3MKqoN0wFEJbLd7aEkaY+71
+Hcd/d/KsZQQYrjJWjpuJToBcf4+n2JhZKgCidJsCgYEAyS7Vt6JaF53jvsz/fN1N
+mzl6HXcX0BYms/87KbhTzNx7OqkFezoF2AYTh4j3ZIB9gcJcSJaHCNGEnLNPfF0K
+UI6XW/y3KT27wGj+ogWry9o4SXkz3R3+51SkBL0enPf2ZaffoyZunqoiA/AKFsoS
+3q3ieTVDJ237grVJI9Ybl/kCgYEAolfW7UaaZzQ2huL/IMj2oPV+1IM9L8YgCud3
+DUHsR8aorRt7C1sAlG/j3d3hGW0PmNaTK89N/qH9xaO+oNRaW+9GocvpryGZLYjH
+Rfno4JVg3H5Gtth/8KZRqROqHkKxzElrruC2lobU2woX0N/KPCeVIYx2yzpE7/hC
+5bnuHG0CgYA4Yw5siITJ2cDzN7X9EusLyV4nTNxyKiyvFQO9c+NpjXpP7E8ia4Ws
++6hLB7jLsE9f1W5QJ1S95oZHYmGzdc+lMOoG9rXKcvbO60QJLYGLz+sr6NVPcLgt
+b/iWma6kSgXilBHsl8+DyO2hCANjW/iS3fz9nv4gHIa+vQap1bG8Tg==
+-----END RSA PRIVATE KEY-----

+ 27 - 0
destroy/keys/private.wxdabfa5e02785fe9b.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEApsFjhn2GYVi3OvOwOkyCEskji9ppjO6c/5cAhBHNV0CUJB5o
+xn0AwSRWel6+zsuTzebBSCFY7XlF/oT16fDXwP2vuRd1UGwrrNXe1pUsjniE+FqQ
+8Hi/Eag0eJLrOV64AkmpVkjSEtxxC+NdhpEGGJP6sCAG91+F0YmKo1DTh4kjfqPT
+OCaBwJVM2RfH6Lc3nnA1CWZcfHj+Bb+yxQMLtjN62i1GeP6vK0GjrvMu/+dLK4MK
+cKZeKFWMC9K798MH5VMsuN4m1+brYUZvn0fqHyy6wgztIWeIPH8oiakIUwjhSY0u
+x3wZeVmKv5dNVgK9KKcZP3wG//v2Te5+6AzRBQIDAQABAoIBAC0KDLyViMcgNBUr
+Ho0Qfw1d4Ej0zA9xn1v1SAFj4YdQfPKod/osZxjDnMvebUDjgV9alRfLUf6KA9qz
+xMvT7iJFIsImUNxQ6xb6iP6COg+dA6UkqQMaSdkWCl4KqJfNOnv7s04Hyx2nBq2E
+Uo12/COFTG9npxoHZdhrgtOLkCaJ9ybVM4POduzVYkpg43gNurWdxO3Dssbw6PMm
+ZISGoh6NTBLS8+P/qeIMVUDIYPzHAlqv4EY9uP44a8g2mgiSK8+Fx+oXcDtP71j9
+86Vx8SYb0loPyyoz+l8pKpSw39yI0en0h7gyZabO0FoZObo1YPT81PoLz6CKAIeb
+E8WQMcECgYEA1uGyTphN1meAbn/N4aK3mTikW6yOWdDvPkuwlakrzN7o0bkslI+q
+C7K+4CGIsBQw4/eT/OQzL7wIrARp9OcWjh+1C7BwakEA8cr5ZxoOlGcv6mbXfE2v
+6pyJTKyUuYHRMF9CuOT48fHPbeDiRvGcXyHW/vwYgw/kfnUSXBBk+PECgYEAxqoo
+MhKTzY/U+LtTvHaanckELCcMgFbv7YOaWT6tvkvEKkqYq63H2SUlY88q7BERsDME
+8xwMOD5vEHgQ+PGTlIvf/8zPLhgtBPwN8FVb8wplI7DPWNHDQ595sBotN/1VKLm4
+MR6o9iMesqFG1oeV43dn/ORJYu3xL13vR2iguVUCgYBvA1cdJ64+8GX3sGtrAKed
+rxeqjPFWEY0oP+5Qw39vblIV13bioX4WYRgfrvNxFF1VyRhZdIPFS32ncPhUn/aV
+ImhkS5koK8ETKevDikCyBsVIci0teO1DZe/A/wAu/pRWS0CrSRAb3vNtLtt4D2bb
+9x2dyhvXyiQf+NetXILt4QKBgEU95UiehPlumjIfSG41gGpiN5wT+B17L6C+77sP
+R4s96R88ZL3hkfgzJDcHa9RflqStA5qgOfoYeKlqz6+Us3Vg0y/a+JL+RiKon0sW
+1Td+dgXciEhSxBX7rXQdi4kqONY69OHZ59XyI67q2z/Gfg2L/qh8AMAEYr25pb5j
+zzEJAoGBAIXhOLwSauwknq849ZAFjNkbUMRCD3T5VqODgKaTKYaBM1ylHn0z3M6o
+ocqnpSZYaHsBoLuEHzK6G4o6RMgh13UpSvw4yGO5AGIvM/yOlE0UISNmEizU6JOl
+x1Ep2THcEgvZWOydljQRytPyuOewXD2Se+LG3+w3FQVmjL+K3hwr
+-----END RSA PRIVATE KEY-----

+ 38 - 6
destroy/upload.main.js

@@ -43,17 +43,25 @@ exports.start = async () => {
             version: fileJson.version,
             desc: fileJson.desc,
             env: fileJson.env || '正式环境',
+            robot: fileJson.robot
         };
-        console.log(`本次提交小程序: ${config.appIds.map(item => `${item.name} (${item.appid})`).join(', ')}`);
-        console.log(`版本: ${config.version}`);
+        let desc_one = `本次提交小程序: ${config.appIds.map(item => `${item.name} (${item.appid})`).join(', ')}`;
+        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(`描述: ${config.desc}`);
+        console.log(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()) {
             try {
-                console.log(`\n开始发布第 ${index + 1} 个小程序: ${item.name} (${item.appid})`);
+                console.log(`\n开始发布第 ${index + 1} 个小程序: ${item.name} (${item.appid})  版本:${config.version}`);
                 await publishMiniProgram({
                     appid: item.appid,
                     name: item.name,
@@ -62,12 +70,15 @@ exports.start = async () => {
                     env: config.env
                 });
                 successCount++;
-                console.log(`✅ 发布成功: ${item.name}`);
+                console.log(`✅ 发布成功: ${item.name} 版本:${config.version}`);
             } catch (err) {
                 failedCount++;
-                console.error(`❌ 发布失败: ${item.name}`, err.message);
+                console.error(`❌ 发布失败: ${item.name} 版本:${config.version}`, err.message);
+                failApp += `${item.name} (${item.appid})\n`;
             }
         }
+        resultMsg = '版本:' + config.version + `\n发布结果: ✅ ${successCount} 个小程序发布成功,❌ ${failedCount} 个小程序发布失败。` + '\n失败列表:' + failApp;
+        sendNotice(resultMsg);
         // 4. 返回统计结果
         return {
             success: successCount,
@@ -77,4 +88,25 @@ exports.start = async () => {
         console.error('❌ 启动发布流程失败:', e.message);
         throw e;
     }
+}
+
+function sendNotice(msg) {
+    console.log(msg)
+    url = config.robot
+    if (url) {
+        fetch(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                msgtype: 'text',
+                text: {
+                    content: msg
+                }
+            })
+        })
+    } else {
+        console.log('未配置机器人地址')
+    }
 }

+ 5 - 5
pages/mine/mine.wxml

@@ -17,11 +17,11 @@
     </view>
 
     <view class="bottom-info">
-        <view class="terms">
-            <text class="terms-text">用户协议</text>
-            <text class="divider">|</text>
-            <text class="terms-text">隐私政策</text>
-        </view>
+<!--        <view class="terms">-->
+<!--            <text class="terms-text">用户协议</text>-->
+<!--            <text class="divider">|</text>-->
+<!--            <text class="terms-text">隐私政策</text>-->
+<!--        </view>-->
         <text class="version-text">V 3.7.25</text>
     </view>
 </view>

+ 2 - 2
pages/video/detail.js

@@ -213,7 +213,7 @@ Page({
                 case 3: // OAS视频
                     // 获取真实播放地址
                     const tagId = videoDetail.tag_ids && videoDetail.tag_ids.length > 0 ? videoDetail.tag_ids[0] : 2072;
-                    let parseRes = await getRealVideoUrl(videoDetail.id, tagId);
+                    let parseRes = await getRealVideoUrl(videoDetail.id, this.data.tagId); // 此处需要使用传入的tag_id,否则视频有多个tag_id时,会无法获取到真实播放地址
 
                     console.log('parseRes', parseRes)
 
@@ -565,7 +565,7 @@ Page({
     async loadRelatedVideos(tagIds) {
         try {
             // 使用第一个标签ID获取相关视频
-            const tagId = tagIds && tagIds.length > 0 ? tagIds[0] : 2250;
+            const tagId = tagIds && tagIds.length > 0 ? tagIds[0] : 2072;
             console.log("原始ID:", apple.ghid)
             const relatedVideos = await getRelatedVideos({tag_id: tagId, gh_id: apple.ghid});
             // 需要播放激励视频的索引

+ 30 - 30
project.config.json

@@ -1,32 +1,32 @@
 {
-    "compileType": "miniprogram",
-    "packOptions": {
-        "ignore": [
-            {
-                "value": "/minitest",
-                "type": "folder"
-            }
-        ],
-        "include": []
-    },
-    "setting": {
-        "coverView": true,
-        "es6": true,
-        "postcss": true,
-        "minified": true,
-        "enhance": true,
-        "showShadowRootInWxmlPanel": true,
-        "packNpmRelationList": [],
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        }
-    },
-    "editorSetting": {
-        "tabIndent": "auto",
-        "tabSize": 2
-    },
-    "appid": "wx8a8aae7f462df482",
-    "testRoot": "minitest/"
+  "compileType": "miniprogram",
+  "packOptions": {
+    "ignore": [
+      {
+        "value": "/minitest",
+        "type": "folder"
+      }
+    ],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "editorSetting": {
+    "tabIndent": "auto",
+    "tabSize": 2
+  },
+  "appid": "wx3800bb2ed4a326c5",
+  "testRoot": "minitest/"
 }

+ 21 - 0
project.private.config.json

@@ -10,6 +10,27 @@
     "miniprogram": {
       "list": [
         {
+          "name": "内容库",
+          "pathName": "pages/video/video",
+          "query": "shared_video_id=411984&tag_id=2072&share_count=1&type=tuiguang&jump=1",
+          "launchMode": "default",
+          "scene": 1007
+        },
+        {
+          "name": "pages/video/video",
+          "pathName": "pages/video/video",
+          "query": "shared_video_id=411802&tag_id=2072&share_count=1&type=tuiguang&jump=1",
+          "launchMode": "default",
+          "scene": 1007
+        },
+        {
+          "name": "错误的tag",
+          "pathName": "pages/video/video",
+          "query": "shared_video_id=390300&tag_id=2245&share_count=1&type=tuiguang&jump=1",
+          "launchMode": "default",
+          "scene": 1007
+        },
+        {
           "name": "视频转阅读器再转播放",
           "pathName": "pages/video/video",
           "query": "shared_video_id=390300&tag_id=2245&share_count=1&type=tuiguang",