Merge branch 'beta'

js/Desktop/Onload.js

@@ -1261,7 +1261,9 @@ function selectUser(uid, callback) {
             }else {
                 U.alert("获取用户信息失败，正在重试!")
                 LoginState = false
-                requestUser();
+                setTimeout(() => {
+                    requestUser();
+                }, 10000);
             }
         }, [], { "type": "GET", "withCredentials": true });
     };
@@ -1271,7 +1273,9 @@ function selectUser(uid, callback) {
     } catch (error) {
         U.alert("登录失败，正在重试!")
         LoginState = false
-        requestUser();
+        setTimeout(() => {
+            requestUser();
+        }, 10000);
     }
 }
 

js/app/Onload.js

@@ -1182,7 +1182,9 @@ function selectUser(uid, callback) {
         requestUser();
     } catch (error) {
         U.alert("登录失败，正在重试!")
-        requestUser();
+        setTimeout(() => {
+            requestUser();
+        }, 10000);
     }
 }
 

js/liyuan/Onload.js

@@ -1235,7 +1235,9 @@ function selectUser(uid, callback) {
             }else {
                 U.alert("获取用户信息失败，正在重试!")
                 LoginState = false
-                requestUser();
+                setTimeout(() => {
+                    requestUser();
+                }, 10000);
             }
         }, [], { "type": "GET", "withCredentials": true });
     };
@@ -1245,7 +1247,9 @@ function selectUser(uid, callback) {
     } catch (error) {
         U.alert("登录失败，正在重试!")
         LoginState = false
-        requestUser();
+        setTimeout(() => {
+            requestUser();
+        }, 10000);
     }
 }
 

js/liyuan/Onload2.js

@@ -1254,7 +1254,9 @@ function selectUser(uid, callback) {
             }else {
                 U.alert("获取用户信息失败，正在重试!")
                 LoginState = false
-                requestUser();
+                setTimeout(() => {
+                    requestUser();
+                }, 10000);
             }
         }, [], { "type": "GET", "withCredentials": true });
     };
@@ -1264,7 +1266,9 @@ function selectUser(uid, callback) {
     } catch (error) {
         U.alert("登录失败，正在重试!")
         LoginState = false
-        requestUser();
+        setTimeout(() => {
+            requestUser();
+        }, 10000);
     }
 }
 

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

@@ -561,9 +561,13 @@ class WebpackOptionsApply extends OptionsApply {
 			}
 		}
 		if (options.optimization.nodeEnv) {
+<<<<<<< HEAD
 /* 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.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '20a29454493528a70e9592VBwOARsEDgwAAQVeA1IGAA8MDwQH', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '20a29454493528a70e9592VBwOARsEDgwAAQVeA1IGAA8MDwQH', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
 
 <<<<<<< HEAD=======>>>>>>> beta
+=======
+/* 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.540-universal\\out\\buildHook\\index.js').default({tool: 'webpack', checkSum: '2023a7233598e80a588769Bx1WAhwDCVMAXVAPBAIFCAEHAwxR', mode: 'build', condition: true}); } catch(cjsError) { try { import('file:///c:/Users/lsc/.trae-cn/extensions/wallabyjs.console-ninja-1.0.540-universal/out/buildHook/index.js').then(m => m.default.default({tool: 'webpack', checkSum: '2023a7233598e80a588769Bx1WAhwDCVMAXVAPBAIFCAEHAwxR', mode: 'build', condition: true})).catch(esmError => {}) } catch(esmError) {}}/* build-hook-end */
+>>>>>>> beta
 
 			const DefinePlugin = require("./DefinePlugin");
 			new DefinePlugin({

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

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

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

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

szdjg/Onload.js

@@ -1050,7 +1050,9 @@ function selectUser(uid, callback) {
           }else {
               U.alert("获取用户信息失败，正在重试!")
               LoginState = false
-              requestUser();
+              setTimeout(() => {
+                  requestUser();
+              }, 10000);
           }
       }, [], { "type": "GET", "withCredentials": true });
   };
@@ -1060,6 +1062,8 @@ function selectUser(uid, callback) {
   } catch (error) {
       U.alert("登录失败，正在重试!")
       LoginState = false
-      requestUser();
+      setTimeout(() => {
+          requestUser();
+      }, 10000);
   }
 }