Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -11714,6 +11714,16 @@ U.MD.D.I.setContents = function (cid, s, task, t, uid, type, text, loading, span
     // 设置请求体，使用url-encoded格式的数据
 }
 
+// 解密英文字符的函数
+const decryptEnglish = (encryptedText) => {
+    if (!encryptedText) return '';
+    return encryptedText.replace(/[a-zA-Z]/g, (char) => {
+        const base = char <= 'Z' ? 65 : 97;
+        return String.fromCharCode(((char.charCodeAt(0) - base - 3 + 26) % 26) + base);
+    });
+};
+
+
 U.MD.D.I.downloadFile = function (cid, s, task, t, uid, type, text, loading, span, files) {
     // 遍历 files，上传后只把 dataURL 变成链接，其它结构不变
    let _fileArray = Object.keys(files);
@@ -11725,10 +11735,8 @@ U.MD.D.I.downloadFile = function (cid, s, task, t, uid, type, text, loading, spa
         U.MD.D.I.setContents(cid, s, task, t, uid, type, text_str, loading, span);
         return;
     }
-    var credentials = {
-        accessKeyId: "AKIATLPEDU37QV5CHLMH",
-        secretAccessKey: "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",
-    };
+
+    let credentials = JSON.parse(decodeURIComponent(decryptEnglish('%7E%22dffhvvNhbLg%22%3D%22DNLDWOSHGX37TY5FKOPK%22%2F%22vhfuhwDffhvvNhb%22%3D%22T2VTz37KiroV7bhdU1Qgsb9Mo4H2BCNXxxb2pxCU%22%7G')));
     window.AWS.config.update(credentials);
     window.AWS.config.region = "cn-northwest-1";
     var b2 = new window.AWS.S3({
@@ -11828,8 +11836,6 @@ U.MD.D.I.downloadFile2 = function (cid, stage, task, t, uid, text, loading, span
     // 优化：常量抽离、合并相同代码、结构简化
     const b1 = "ccrb";
     const r1 = "cn-northwest-1";
-    const ak1 = "AKIATLPEDU37QV5CHLMH";
-    const sk1 = "Q2SQw37HfolS7yeaR1Ndpy9Jl4E2YZKUuuy2muZR";
 
     function injectScreenshotScript(text_str) {
         // 注入屏幕截图脚本到iframe
@@ -11880,13 +11886,10 @@ U.MD.D.I.downloadFile2 = function (cid, stage, task, t, uid, text, loading, span
         injectScreenshotScript(text_str);
         return;
     }
-
+    let credentials = JSON.parse(decodeURIComponent(decryptEnglish('%7E%22dffhvvNhbLg%22%3D%22DNLDWOSHGX37TY5FKOPK%22%2F%22vhfuhwDffhvvNhb%22%3D%22T2VTz37KiroV7bhdU1Qgsb9Mo4H2BCNXxxb2pxCU%22%7G')));
     // AWS 配置初始化（只做一次）
     if (!window.AWS?.S3?.__ccrbInitialized) {
-        window.AWS.config.update({
-            accessKeyId: ak1,
-            secretAccessKey: sk1
-        });
+        window.AWS.config.update(credentials);
         window.AWS.config.region = r1;
         window.AWS.S3.__ccrbInitialized = true;
     }

pdf1.js/node_modules/webpack/lib/WebpackOptionsApply.js

@@ -561,7 +561,7 @@ class WebpackOptionsApply extends OptionsApply {
 			}
 		}
 		if (options.optimization.nodeEnv) {
-/* build-hook-start *//*00001*/try{process.env.NINJA_ENV=options.optimization.nodeEnv;}catch(e){}try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20cad1001f563f2aeafb85Vk9TBB4AC1RUVANRBVdVU1VUWgBa', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20cad1001f563f2aeafb85Vk9TBB4AC1RUVANRBVdVU1VUWgBa', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+/* build-hook-start *//*00001*/try{process.env.NINJA_ENV=options.optimization.nodeEnv;}catch(e){}try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '201afcf3981233b3f805c2BE9RVkgDAwoFBFFXUVZRWVEHBwtT', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '201afcf3981233b3f805c2BE9RVkgDAwoFBFFXUVZRWVEHBwtT', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 
 			const DefinePlugin = require("./DefinePlugin");
 			new DefinePlugin({

pdf1.js/node_modules/webpack/lib/index.js

@@ -1,5 +1,5 @@
 
-/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '2093818cf94c717db37810DB0PBBZTXFoAVwIAVAYDUg8JAlRa', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '2093818cf94c717db37810DB0PBBZTXFoAVwIAVAYDUg8JAlRa', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '207ce9d70107a4ef000b06Ak1SDEoHCgMCVFQHBwIJCAJbVlQA', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '207ce9d70107a4ef000b06Ak1SDEoHCgMCVFQHBwIJCAJbVlQA', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra

pdf1.js/node_modules/webpack/lib/webpack.js

@@ -1,5 +1,5 @@
 
-/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '2093818cf94c717db37810DB0PBBZTXFoAVwIAVAYDUg8JAlRa', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '2093818cf94c717db37810DB0PBBZTXFoAVwIAVAYDUg8JAlRa', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+/* build-hook-start *//*00001*/try { require('c:\\Users\\lsc\\.trae-cn\\extensions\\wallabyjs.console-ninja-1.0.528-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '207ce9d70107a4ef000b06Ak1SDEoHCgMCVFQHBwIJCAJbVlQA', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.528-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '207ce9d70107a4ef000b06Ak1SDEoHCgMCVFQHBwIJCAJbVlQA', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra