Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -11727,7 +11727,7 @@ U.MD.D.I.downloadFile = function (cid, s, task, t, uid, type, text, loading, spa
     };
     window.AWS.config.update(credentials);
     window.AWS.config.region = "cn-northwest-1";
-    var bucket = new window.AWS.S3({
+    var b2 = new window.AWS.S3({
         params: { Bucket: "ccrb" }
     });
 
@@ -11790,7 +11790,7 @@ U.MD.D.I.downloadFile = function (cid, s, task, t, uid, type, text, loading, spa
                 queueSize: 2,
                 leavePartsOnError: true,
             };
-            bucket.upload(params, options)
+            b2.upload(params, options)
                 .on("httpUploadProgress", function (evt) {
                     // 进度处理
                 })
@@ -11822,10 +11822,10 @@ U.MD.D.I.downloadFile = function (cid, s, task, t, uid, type, text, loading, spa
 
 U.MD.D.I.downloadFile2 = function (cid, stage, task, t, uid, text, loading, span, files, _iframe, str) {
     // 优化：常量抽离、合并相同代码、结构简化
-    const BUCKET = "ccrb";
-    const REGION = "cn-northwest-1";
-    const ACCESS_KEY_ID = "AKIATLPEDU37QV5CHLMH";
-    const SECRET_ACCESS_KEY = "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";
+    const b1 = "ccrb";
+    const r1 = "cn-northwest-1";
+    const ak1 = "AKIATLPEDU37QV5CHLMH";
+    const sk1 = "Q2SQw37HfolS7yeaR1Ndpy9Jl4E2YZKUuuy2muZR";
 
     function injectScreenshotScript(text_str) {
         // 注入屏幕截图脚本到iframe
@@ -11880,14 +11880,14 @@ U.MD.D.I.downloadFile2 = function (cid, stage, task, t, uid, text, loading, span
     // AWS 配置初始化（只做一次）
     if (!window.AWS?.S3?.__ccrbInitialized) {
         window.AWS.config.update({
-            accessKeyId: ACCESS_KEY_ID,
-            secretAccessKey: SECRET_ACCESS_KEY
+            accessKeyId: ak1,
+            secretAccessKey: sk1
         });
-        window.AWS.config.region = REGION;
+        window.AWS.config.region = r1;
         window.AWS.S3.__ccrbInitialized = true;
     }
 
-    const bucket = new window.AWS.S3({ params: { Bucket: BUCKET } });
+    const b2 = new window.AWS.S3({ params: { Bucket: b1 } });
 
     let uploadedCount = 0;
     const total = _fileArray.length;
@@ -11951,7 +11951,7 @@ U.MD.D.I.downloadFile2 = function (cid, stage, task, t, uid, text, loading, span
             queueSize: 2,
             leavePartsOnError: true
         };
-        bucket.upload(params, options)
+        b2.upload(params, options)
             .on("httpUploadProgress", function (evt) {
                 // 进度处理可自定义
             })

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.525-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '200cf3f04b6888e439402bBU1RBkgADlVUWQsOVlECXw0ABVpV', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.525-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '200cf3f04b6888e439402bBU1RBkgADlVUWQsOVlECXw0ABVpV', 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: '20d7a50001a19066d91119URlWAB4ACghRCQsBDgICAFUDCA9V', 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: '20d7a50001a19066d91119URlWAB4ACghRCQsBDgICAFUDCA9V', 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.525-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20e1042bdb9d31eef4bb56UB8HARxSXgAJVAsCVVZRDFVSV1cB', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.525-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20e1042bdb9d31eef4bb56UB8HARxSXgAJVAsCVVZRDFVSV1cB', 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: '204bd8966afa56384d19d5AUxTDRcGDFVQBAACBw0DAlBaUQRS', 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: '204bd8966afa56384d19d5AUxTDRcGDFVQBAACBw0DAlBaUQRS', 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.525-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20e1042bdb9d31eef4bb56UB8HARxSXgAJVAsCVVZRDFVSV1cB', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.525-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20e1042bdb9d31eef4bb56UB8HARxSXgAJVAsCVVZRDFVSV1cB', 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: '204bd8966afa56384d19d5AUxTDRcGDFVQBAACBw0DAlBaUQRS', 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: '204bd8966afa56384d19d5AUxTDRcGDFVQBAACBw0DAlBaUQRS', 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