瀏覽代碼

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/CocoRoboDesktop

Signed-off-by: lcw <1324309909@qq.com>
lcw 2 年之前
父節點
當前提交
4454efe6f0
共有 100 個文件被更改,包括 633 次插入673 次删除
  1. 1 1
      Office/Excel/ExcelEditArea.htm
  2. 1 1
      Office/ExcelCanvas/ExcelEditArea.htm
  3. 0 1
      Office/U.OU.Excel.ascx
  4. 0 52
      Office/Word/Word.ascx
  5. 18 10
      index.html
  6. 2 2
      js/BLOG/BlogFriends.js
  7. 4 4
      js/BLOG/BlogHome.js
  8. 6 6
      js/BLOG/BlogPost.js
  9. 5 5
      js/BLOG/BlogReply.js
  10. 1 1
      js/BLOG/BlogUser.js
  11. 6 6
      js/BLOG/U.D.Blog.A.js
  12. 2 2
      js/BLOG/U.D.Blog.F.js
  13. 5 5
      js/BLOG/U.D.Blog.R.js
  14. 1 1
      js/BLOG/U.D.Blog.U.js
  15. 4 4
      js/BLOG/U.D.Blog.js
  16. 1 1
      js/Common/DataCrossdomain.js
  17. 1 1
      js/Common/Timer.js
  18. 3 3
      js/Common/Url.js
  19. 7 7
      js/Controls/Complex.js
  20. 0 0
      js/Controls/Complex.min.js
  21. 7 7
      js/Controls/Complex/Reply.js
  22. 7 7
      js/Controls/index.js
  23. 0 0
      js/Controls/index.min.js
  24. 2 2
      js/Desktop/Background.js
  25. 3 3
      js/Desktop/Disk/Disk.js
  26. 4 4
      js/Desktop/Disk/DiskCommon.js
  27. 1 1
      js/Desktop/Disk/DiskData.js
  28. 8 8
      js/Desktop/Disk/DiskView.js
  29. 2 2
      js/Desktop/Disk/LeftClick.js
  30. 7 7
      js/Desktop/Disk/RightClick.js
  31. 47 42
      js/Desktop/Onload.js
  32. 3 3
      js/Disk/Disk.js
  33. 4 4
      js/Disk/DiskCommon.js
  34. 1 1
      js/Disk/DiskData.js
  35. 10 10
      js/Disk/DiskView.js
  36. 2 2
      js/Disk/LeftClick.js
  37. 7 7
      js/Disk/RightClick.js
  38. 3 3
      js/DomanSystem/DomainSystem.js
  39. 11 11
      js/Forum/ForumHome.js
  40. 10 10
      js/Forum/ForumPlate.js
  41. 6 6
      js/Forum/ForumPost.js
  42. 4 4
      js/Forum/ForumReply.js
  43. 15 15
      js/Friend/Add.js
  44. 2 2
      js/Friend/FriendSearch.js
  45. 17 17
      js/Friend/FriendWindow.js
  46. 2 2
      js/Friend/HistroyMessage.js
  47. 5 5
      js/Friend/Manage.js
  48. 7 7
      js/Friend/Message.js
  49. 6 6
      js/NetworkPromotion/NULL/BLOG/U.D.Blog.A.js
  50. 2 2
      js/NetworkPromotion/NULL/BLOG/U.D.Blog.F.js
  51. 5 5
      js/NetworkPromotion/NULL/BLOG/U.D.Blog.R.js
  52. 1 1
      js/NetworkPromotion/NULL/BLOG/U.D.Blog.U.js
  53. 4 4
      js/NetworkPromotion/NULL/BLOG/U.D.Blog.js
  54. 2 2
      js/NetworkPromotion/NULL/NotUse.js
  55. 8 8
      js/NetworkPromotion/NULL/NotUse1.js
  56. 21 21
      js/NetworkPromotion/NULL/NotUse2.js
  57. 7 7
      js/NetworkPromotion/NULL/NotUse3.js
  58. 57 57
      js/NetworkPromotion/NULL/NotUse4.js
  59. 4 4
      js/NetworkPromotion/NULL/NotUse5.js
  60. 5 5
      js/NetworkPromotion/NetworkPromotion.js
  61. 5 5
      js/Office/Excel/Excel.js
  62. 8 8
      js/Office/Excel/ExcelPanel.js
  63. 3 3
      js/Office/Excel/SitePreview.js
  64. 1 1
      js/Office/Office.js
  65. 3 3
      js/Office/Poll.js
  66. 7 7
      js/Office/Word/SitePreview.js
  67. 9 9
      js/Office/Word/Template/Navigation/Nav.js
  68. 8 8
      js/Office/Word/Word.js
  69. 12 12
      js/Office/Word/WordPanel.js
  70. 6 6
      js/PB/U.D.PB.A.js
  71. 10 10
      js/PB/U.D.PB.Pa.js
  72. 4 4
      js/PB/U.D.PB.Re.js
  73. 11 11
      js/PB/U.D.PB.js
  74. 1 1
      js/Reply/Comment.js
  75. 6 6
      js/Reply/Reply.js
  76. 1 1
      js/UC/NotFunction.js
  77. 6 6
      js/UC/U.A.js
  78. 3 3
      js/UC/U.MDevelop.js
  79. 7 7
      js/UC/U.MPlayer.js
  80. 3 3
      js/UC/U.UI.js
  81. 3 3
      js/UC/U.UP.js
  82. 0 0
      js/UC/UC20.js
  83. 0 0
      js/UC/UC23.js
  84. 0 0
      js/UC/UD20.js
  85. 0 0
      js/UC/UD23.js
  86. 43 43
      js/UD.Disk/NotFun.js
  87. 3 3
      js/UD.Disk/U.DK.DI.js
  88. 3 3
      js/UD.Disk/U.DK.HP.js
  89. 10 10
      js/UD.Disk/U.DK.LE.js
  90. 6 6
      js/UD.Disk/U.DK.LL.js
  91. 20 20
      js/UD.Disk/U.DK.RE.js
  92. 1 1
      js/UD.Disk/U.DK.RM.js
  93. 4 4
      js/UD.Disk/U.DK.UP.js
  94. 4 4
      js/UD.Disk/U.DK.VW.js
  95. 9 9
      js/UD.Disk/U.DK.js
  96. 0 0
      js/UD.Disk/UM1.js
  97. 2 2
      js/UF/U.F.FM.js
  98. 12 12
      js/UF/U.F.J.js
  99. 3 3
      js/UF/U.F.M.js
  100. 9 9
      js/UF/U.F.N.js

+ 1 - 1
Office/Excel/ExcelEditArea.htm

@@ -31,7 +31,7 @@
                 </div>
                 <span style="font-size: 12px;">新建 </span>
             </button>
-            <button class="U_MD_O_E_Editor_head_features_ul_d" title="保存"  style="width:65px" onclick="U.MD.O.E.Save(top.US.disk.Disks[US.userInfo.UserId])">
+            <button class="U_MD_O_E_Editor_head_features_ul_d" title="保存"  style="width:65px" onclick="U.MD.O.E.Save(top.US.disk.Disks[US.userInfo.userid])">
                 <div class="U_MD_O_E_Editor_head_features_ul_i" style="background-position: -24px -3px;">
                 </div>
                 <span style="font-size: 12px;">保存 </span>

+ 1 - 1
Office/ExcelCanvas/ExcelEditArea.htm

@@ -25,7 +25,7 @@
                 </div>
                 <span style="font-size: 12px;">新建 </span>
             </button>
-            <button class="U_MD_O_E_Editor_head_features_ul_d" title="保存" onclick="U.MD.O.E.Save(top.US.disk.Disks[US.userInfo.UserId])">
+            <button class="U_MD_O_E_Editor_head_features_ul_d" title="保存" onclick="U.MD.O.E.Save(top.US.disk.Disks[US.userInfo.userid])">
                 <div class="U_MD_O_E_Editor_head_features_ul_i" style="background-position: -29px -3px;
                     width: 28px;">
                 </div>

+ 0 - 1
Office/U.OU.Excel.ascx

@@ -1 +0,0 @@
-<%@ Control Language="C#" %>

+ 0 - 52
Office/Word/Word.ascx

@@ -1,52 +0,0 @@
-<%@ Control Language="C#" %>
-<div id="UD_Word" class="U_MD_O_E">
-    <%-- 菜单栏 --%>
-    <div class="U_MD_O_E_S">
-        <div class='U_MD_O_H_head_logo'>
-            <img src="http://www.1473.cn/BoomYun/img/pc/logo.png" alt="" />
-            <input class="U_MD_O_H_head_navigation_Title" type="text" value="未命名文档(点击编辑)..."
-                onclick="U.UF.EV.stopBubble()" onmousedown="U.UF.EV.stopBubble()" onmouseup="U.UF.EV.stopBubble()"
-                onmouse="U.UF.EV.stopBubble()" onfocus="U.UF.MR.inputPlaceholder(this,'未命名文档(点击编辑)...',{color: '#fff', value : ''});"
-                onblur="U.UF.MR.inputPlaceholder(this,{color: '#fff', value : ''},'未命名文档(点击编辑)...'); " unselectable="on">
-        </div>
-        <div class="U_MD_O_H_head_navigation_one" onmousedown="U.UF.EV.stopBubble();" style='display: none'>
-            <div style="display: none" onclick="U.Word.Tools.ModeSwitch(this, 0); U.Word.Tools.XTemp(0);">
-                首页</div>
-            <div onclick="U.Word.Tools.ModeSwitch(this, 1); U.Word.Tools.XTemp(1);" class="U_MD_O_H_head_navigation_color_789CD5">
-                互联办公</div>
-            <div onclick="U.Word.Tools.ModeSwitch(this, 2); U.Word.Tools.XTemp(2);">
-                云企建站</div>
-            <div onclick="U.Word.Tools.ModeSwitch(this, 3); U.Word.Tools.XTemp(4);">
-                会议录</div>
-            <div onclick="U.Word.Tools.ModeSwitch(this, 4); U.Word.Tools.XTemp(5);">
-                目录模式</div>
-        </div>
-        <div class="U_MD_O_H_head_navigation_two" onmousedown="U.UF.EV.stopBubble();">
-            <div class="U_MD_O_H_head_navigation_two_l" title="导航建站" onclick="U.MD.D.I.openApplication('word', { UserDirectoryExtendType : 'un'});">
-                <div class="U_MD_O_H_img U_MD_O_H_head_navigation_two_i U_MD_O_H_head_navigation_two_io">
-                </div>
-                <span>导航建站</span>
-            </div>
-            <div style="display: none;" class="U_MD_O_H_head_navigation_two_l" title="视图切换" onclick="U.MD.O.W.T.ViewDisplay(this)">
-                <div class="U_MD_O_H_img U_MD_O_H_head_navigation_two_i U_MD_O_H_head_navigation_two_io">
-                </div>
-                <span>视图</span>
-            </div>
-            <div class="U_MD_O_H_head_navigation_two_l" title="建立团队协作" onclick='$("iframe")[$("iframe").length - 1].contentWindow.U.MD.O.W.Panel.displayInsertUser()'>
-                <div class="U_MD_O_H_img U_MD_O_H_head_navigation_two_i U_MD_O_H_head_navigation_two_it">
-                </div>
-                <span>建立团队协作</span>
-            </div>
-            <div class="U_MD_O_H_head_navigation_two_l" title="我的云盘" onclick='top.U.MD.D.I.openApplication("disk", { "userid": US.disk.UserDisk.userInfo.UserId, "directoryid": US.disk.UserDisk.directoryid ? US.disk.UserDisk.directoryid : US.MYFOLDERID })'>
-                <div class="U_MD_O_H_img U_MD_O_H_head_navigation_two_i U_MD_O_H_head_navigation_two_is">
-                </div>
-                <span>我的云盘</span>
-            </div>
-            <div class="U_MD_O_H_head_navigation_two_r">
-            </div>
-        </div>
-    </div>
-    <%-- Word编辑区 --%>
-    <div class="U_MD_O">
-    </div>
-</div>

+ 18 - 10
index.html

@@ -16,9 +16,11 @@
     <meta name="format-detection" content="telephone=no" />
     <meta name="viewport" content="width=1024, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi" />
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi" />
     <meta name="viewport" content="width=device-width, target-densityDpi=medium-dpi" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta content="yes" name="apple-mobile-web-app-capable" />
     <meta content="telephone=no" name="format-detection" />
@@ -54,7 +56,8 @@
                 </div>
                 <div class="U_MD_D_K" id="U_MD_D_K" __top__="false">
                 </div>
-                <div class="U_MD_D_RW" onmouseover="U.MD.D.I.displayTaskbar(this)" onmouseout="U.MD.D.I.hiddenTaskbarout(this)">
+                <div class="U_MD_D_RW" onmouseover="U.MD.D.I.displayTaskbar(this)"
+                    onmouseout="U.MD.D.I.hiddenTaskbarout(this)">
                     <div class="U_MD_D_RW_L">
                         <div class="U_MD_D_RW_I">
                             <div class="U_MD_D_RW_IO" title="点击隐藏" onclick="U.MD.D.I.hiddenTaskbar(this);">
@@ -85,8 +88,11 @@
                                 注册
                             </div>
                             <div class="avatar"><img src="./img/icon/avatar.png" alt=""></div>
-                            <div class="userName" style="max-width: 86px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"></div>
-                            <div class="exit" onclick="U.MD.U.LO.logoutSystem();" title="退出" style="display: none;margin-left: 5px;color: #888888;">
+                            <div class="userName"
+                                style="max-width: 86px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                            </div>
+                            <div class="exit" onclick="U.MD.U.LO.logoutSystem();" title="退出"
+                                style="display: none;margin-left: 5px;color: #888888;">
                                 退出
                             </div>
                         </div>
@@ -205,7 +211,7 @@
 如发生本网站服务条款与中华人民共和国法律相抵触时,则这些条款将完全按法律规定重新解释,而其它条款则依旧保持对用户的约束力。</pre>
             </div>
         </div>
-
+        <script src="./uform.js" type="text/javascript"></script>
         <!--通用函数区域 -->
         <!--注册命名空间 -->
         <script src="./js/UForm/Main.js" type="text/javascript"></script>
@@ -275,10 +281,12 @@
         <script src="./js/Desktop/Background.js" type="text/javascript"></script>
         <!--计时器 -->
         <script src="./js/Common/Timer.js" type="text/javascript"></script>
-        <!-- 按钮复制文本 -->
-        <script src="./js/Desktop/clipboard.min.js" type="text/javascript"></script>
-        
-        <script src="./uform.js" type="text/javascript"></script>
+        <script src="./js/Office/Office.js" type="text/javascript"></script>
+        <script src="./js/Office/Word/WordEditor.js" type="text/javascript"></script>
+        <!--txt使用 -->
+        <script src="./js/Text/Text.js" type="text/javascript"></script>
+        <!--轮训服务-->
+        <script src="./js/Office/Poll.js" type="text/javascript"></script>
     </div>
 </body>
 

+ 2 - 2
js/BLOG/BlogFriends.js

@@ -108,8 +108,8 @@ U.MD.D.Blog.F.KZPGBL = function (UDE, UDOD) {
 U.MD.D.Blog.F.SCPGBL = function (UDE, UDOD, UTF) {
     if (!U.MD.U.L.isLogin()) {
         U.Alert("正在删除...");
-        U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteArticleAllReply", US.userInfo.UserId, UDE.ArticleID || UDE]), U.MD.D.Blog.F.AsynSCPGBL, ["", UDOD, UDE, U.MD.D.H.ET["UL"]["HY"]["userid"], UTF];
-        //  U.A.Request(US.AUTH,"pb.DeleteArticleAndAllReply", [US.userInfo.UserId, UDE.ArticleID || UDE]), U.MD.D.Blog.F.AsynSCPGBL, ["", UDOD, UDE, U.MD.D.H.ET["UL"]["HY"]["userid"], UTF];
+        U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteArticleAllReply", US.userInfo.userid, UDE.ArticleID || UDE]), U.MD.D.Blog.F.AsynSCPGBL, ["", UDOD, UDE, U.MD.D.H.ET["UL"]["HY"]["userid"], UTF];
+        //  U.A.Request(US.AUTH,"pb.DeleteArticleAndAllReply", [US.userInfo.userid, UDE.ArticleID || UDE]), U.MD.D.Blog.F.AsynSCPGBL, ["", UDOD, UDE, U.MD.D.H.ET["UL"]["HY"]["userid"], UTF];
     }
 }
 

+ 4 - 4
js/BLOG/BlogHome.js

@@ -93,7 +93,7 @@ U.MD.D.Blog.QHCTBK = function (UTF, UDOD) {
 //滚动处理
 U.MD.D.Blog.GDQHCTBK = function (UTF) {
     var _UP = this.P == null ? 1 : this.P + 2;
-    UTF ? U.MD.D.Blog.GBL($("#UD_SYSXZBR")[0], _UP, US.userInfo.UserId) : U.MD.D.Blog.PFY(_UP);
+    UTF ? U.MD.D.Blog.GBL($("#UD_SYSXZBR")[0], _UP, US.userInfo.userid) : U.MD.D.Blog.PFY(_UP);
 }
 
 //#region 公共数据查看
@@ -245,7 +245,7 @@ U.MD.D.Blog.ZLNRPY = function (UDOD, UDE) {
             $$("div", { "className": "UD_SYSXZLRSRDTSRSL", "innerHTML": UDE[i].UserName }, _UDRD);
             $$("div", { "className": "UD_SYSXZLRSRDTSRSR", "innerHTML": "推荐了" }, _UDRD);
             $$("div", { "className": "UD_SYSXZLRSRDTSRX", "innerHTML": UDE[i].ArticleContentBrief }, _UDLD);
-            if (UDE[i].UserID == US.userInfo.UserId) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIO U_Boom_Img_ys2017", 
+            if (UDE[i].UserID == US.userInfo.userid) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIO U_Boom_Img_ys2017", 
             "onclick": function () { U.UF.EV.stopBubble(); U.UF.UI.Confirm("是否取消转发", function () { U.MD.D.Blog.F.SCPGBL(UDE[i], _UDTD); }); }, "title": "取消转发" }, _UDSD) } //
             else { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIT U_Boom_Img_ys2017", "title": "点击展开" }, _UDSD); }
             _UTF = !_UTF; if (_UCE == null) { _UCE = new U.MD.D.Blog.A.BLEI([UDE[i].ArticleID, 0, 0, UDE[i].ArticleAddTime, "很遗憾,动静已被作者删除了", "很遗憾,动静已被作者删除了", "", "", "", 0]) }; //原文被删除
@@ -269,8 +269,8 @@ U.MD.D.Blog.ZLNRPY = function (UDOD, UDE) {
         _UDYD = $$("div",{"className": "UD_SYSXZLRSRDTRZ UD_SYUPCCY"},_UDRD);
         _UDND = $$("div",{"className": "UD_SYSXZLRSRDTRZTC UD_SYUPCCT"},_UDYD);
         U.MD.D.Blog.TPGBL(_UDND, _UCE, true, true); //打印图片
-        if (_UTF && _UCE.UserID == US.userInfo.UserId) {
-            if (_UCE.UserID == US.userInfo.UserId) {
+        if (_UTF && _UCE.UserID == US.userInfo.userid) {
+            if (_UCE.UserID == US.userInfo.userid) {
                 $$("div",{
                 "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIM UD_SYSXZLRSRDTRZTIO U_Boom_Img_ys2017",
                 "onclick": function () {

+ 6 - 6
js/BLOG/BlogPost.js

@@ -68,10 +68,10 @@ U.MD.D.Blog.A.FBGBL = function (UCT, UTI, UIMG) {
 
 //发表文章异步
 U.MD.D.Blog.A.AsynFBGBL = function (r) {
-    var _UDE, _UKE, _UDTD, _UDOD = $("#UD_SYSXZBR")[0], _userid = US.userInfo.UserId, _context = r.context;
+    var _UDE, _UKE, _UDTD, _UDOD = $("#UD_SYSXZBR")[0], _userid = US.userInfo.userid, _context = r.context;
     r = r.value;
     if (r) {
-        _UDE = U.MD.D.Blog.A.BLEI([r, 0, 0, U.UF.D.toTimeStamp(new Date()), _context[1], _context[1].substr(0, 100), US.userInfo.UserId, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead, 0]);
+        _UDE = U.MD.D.Blog.A.BLEI([r, 0, 0, U.UF.D.toTimeStamp(new Date()), _context[1], _context[1].substr(0, 100), US.userInfo.userid, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead, 0]);
         //添加实体
         _UKE = U.MD.D.H.ET["UL"]["HY"][_userid];
         (_UKE && (_UKE = _UKE[1])) && ((!_UKE.length) && (_UDOD.innerText = ""),
@@ -181,24 +181,24 @@ U.MD.D.Blog.A.PAZFF = function (UDE, UDOD) {
     if (_UTH == "可添加内容...") { (_UTH = "") };
     U.Alert("转发中...");
 
-    U.A.Request(US.CD, ([US.DB, "UseStudio_Blog", "UB_P_A_AddZFLR", US.userInfo.UserId, Guid.newGuid(), UDE.ArticleID, US.FORUMROOTID,
+    U.A.Request(US.CD, ([US.DB, "UseStudio_Blog", "UB_P_A_AddZFLR", US.userInfo.userid, Guid.newGuid(), UDE.ArticleID, US.FORUMROOTID,
     _UTH, UDOD.innerText.substr(200) + (UDOD.innerText.length > 200 ? "..." : "") + $("img", UDOD)[0].outerHTML]), U.MD.D.Blog.A.AsynSPAZFF, ["", UDE, UDOD]);
 
-    //   U.A.Request(US.AUTH,"pb.ZFArticle", [US.userInfo.UserId, US.FORUMROOTID, UDE.ArticleID, _UTH], U.MD.D.Blog.A.AsynPAZFF, ["", _UTH, UDE]);
+    //   U.A.Request(US.AUTH,"pb.ZFArticle", [US.userInfo.userid, US.FORUMROOTID, UDE.ArticleID, _UTH], U.MD.D.Blog.A.AsynPAZFF, ["", _UTH, UDE]);
     //服务器同步中
 }
 
 //发送转发异步
 U.MD.D.Blog.A.AsynPAZFF = function (r) {
     var _UKE, _UDTD = $("#UD_SYSXZLLRTA").Child()[2];
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _UGE = U.MD.D.H.ET["UL"]["HY"],
     _context = r.context,
     _UTH = _context[1],
     _UDE = _context[2],
     _UDOD = $$("div", {"innerHTML": _UTH});
     r = r.value;
-    _UKE = U.MD.D.Blog.A.BLEI[r, 0, 0, U.UF.D.toTimeStamp(new Date()), _UTH, _UDOD.innerText.substr(0, 100), US.userInfo.UserId, US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead, 0];
+    _UKE = U.MD.D.Blog.A.BLEI[r, 0, 0, U.UF.D.toTimeStamp(new Date()), _UTH, _UDOD.innerText.substr(0, 100), US.userInfo.userid, US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead, 0];
     _UKE.Forward = _UDE["ArticleID"];
     _UKE.ZF = _UDE;
     if (_UGE = _UGE[_userid]) {

+ 5 - 5
js/BLOG/BlogReply.js

@@ -145,7 +145,7 @@ U.MD.D.Blog.R.PHFRGBL = function (UDE, UDPD, TF, UAE, UPE) {
 //样式使用
 U.MD.D.Blog.R.YSPHFRGBL = function (UDE, UDOD, UAE, UPE, UDMD, UME) {
     var _UDTD, _UDMD, _UDSD, _UDED, _UDGD, _UDJD,
-     _UTF = UDE.ReplyAddUserID == US.userInfo.UserId;
+     _UTF = UDE.ReplyAddUserID == US.userInfo.userid;
     _UDTD = $$("div",{"className": "UD_SYBFO"},UDOD);
     _UDSD = $$("div",{"className": "UD_SYBFOI"},_UDTD);
     $$("img",
@@ -230,8 +230,8 @@ U.MD.D.Blog.R.SCPHFRGBL = function (UPE, UDE, UAE, UDOD) {
             _URID = UDE.ReplyID;
             _UAID = UAE.ArticleID;
         } //移除评论 //移除元素 //评论数-1
-        U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteOneReplyAndAllChildReply", US.userInfo.UserId, _URID, _UAID || US.EMPTYGUID]), _UCB || function () { }, [""]; //服务器同步
-        // U.A.Request(US.AUTH,"pb.DeleteOneReplyAndChildReply", [US.userInfo.UserId, _URID, UAID || US.EMPTYGUID]), _UCB || U.UF.C.apply, [""]; //服务器同步
+        U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteOneReplyAndAllChildReply", US.userInfo.userid, _URID, _UAID || US.EMPTYGUID]), _UCB || function () { }, [""]; //服务器同步
+        // U.A.Request(US.AUTH,"pb.DeleteOneReplyAndChildReply", [US.userInfo.userid, _URID, UAID || US.EMPTYGUID]), _UCB || U.UF.C.apply, [""]; //服务器同步
     }
 }
 
@@ -282,7 +282,7 @@ U.MD.D.Blog.R.TJFBHFRG = function (UAID, UTH) {
         else {
             _UPID = _UDE[3]; _UUID = _UDE[4]; _UCB = _UDE[5];
         }
-        U.A.Request(US.AUTH, ["ReportReply", US.userInfo.UserId, UAID, UTH, _UPID, _UUID], U.MD.D.Blog.R.AsynTJFBHFRG, ["", _UCB]); //添加回复到后台
+        U.A.Request(US.AUTH, ["ReportReply", US.userInfo.userid, UAID, UTH, _UPID, _UUID], U.MD.D.Blog.R.AsynTJFBHFRG, ["", _UCB]); //添加回复到后台
     }
 }
 
@@ -304,7 +304,7 @@ U.MD.D.Blog.R.AsynFBHFRGBL = function (reuqest) {
     _UDOD = _context[4];
     _UDMD = _context[5];
     _UDPD = $("#UD_SYB" + _UAE.ArticleID).find("div")["UD_SYBF"];
-    (_UKE = (UPE ? UPE["RR"] : _UAE["Reply"][1])).unshift((_UME = new U.MD.D.Blog.R.FRGBLET[_UKE[0] ? (_UKE[0].AllCount + 1) : 1, UPE ? UPE.UserNickName : "", U.UF.D.toTimeStamp(new Date()), US.userInfo.UserId, _UTH, reuqest, UPE ? UPE.ReplyID : "", UPE ? UPE.ReplyAddUserID : "", US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead])); //添加新的类
+    (_UKE = (UPE ? UPE["RR"] : _UAE["Reply"][1])).unshift((_UME = new U.MD.D.Blog.R.FRGBLET[_UKE[0] ? (_UKE[0].AllCount + 1) : 1, UPE ? UPE.UserNickName : "", U.UF.D.toTimeStamp(new Date()), US.userInfo.userid, _UTH, reuqest, UPE ? UPE.ReplyID : "", UPE ? UPE.ReplyAddUserID : "", US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead])); //添加新的类
     if (!UPE) { _UME["RR"] = [] };
     U.MD.D.Blog.R.PHFRGBL([_UME], (UPE ? (_UDMD || _UDOD.parentNode) : _UDPD), true, _UAE, UPE);
     $("div", _UDPD.parentNode)[14].innerText = _UME.AllCount; //添加回复 

+ 1 - 1
js/BLOG/BlogUser.js

@@ -4,7 +4,7 @@
 U.MD.D.Blog.U.ZXBlog = function (UDOD, UDE, UTF, UIE, USID) {
     var i, _UVM, _UTI, _UAT, _UCE, _UDAD, _UDED, _UDBD, _UDTD, _UDSD, _UDID, _UDKD, _UDND, _UDED, _UDKD, _UDAC, _UDVD, _UDLD, _UDPD, _UIMG,
      _UDFD = $$("frag"),
-      _userid = US.userInfo.UserId,
+      _userid = US.userInfo.userid,
       _UTI = U.MD.D.Blog.ZXWZ(UDOD, UIE, null, true);
     for (i = 0; i < UDE.length; i++) {
         _UIMG = null; _UVM = true; _UCE = UDE[i];

+ 6 - 6
js/BLOG/U.D.Blog.A.js

@@ -64,10 +64,10 @@ U.MD.D.Blog.A.FBGBL = function (UCT, UTI, UIMG) {
 
 //发表文章异步
 U.MD.D.Blog.A.AsynFBGBL = function (r) {
-    var _UDE, _UKE, _UDTD, _UDOD = $("#UD_SYSXZBR")[0], _userid = US.userInfo.UserId, context = r.context;
+    var _UDE, _UKE, _UDTD, _UDOD = $("#UD_SYSXZBR")[0], _userid = US.userInfo.userid, context = r.context;
     r = r.value;
     if (r) {
-        _UDE = U.MD.D.Blog.A.BLEI[r, 0, 0, U.UF.D.toTimeStamp(new Date()), context[1], context[1].substr(0, 100), US.userInfo.UserId, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead, 0];
+        _UDE = U.MD.D.Blog.A.BLEI[r, 0, 0, U.UF.D.toTimeStamp(new Date()), context[1], context[1].substr(0, 100), US.userInfo.userid, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead, 0];
         //添加实体
         _UKE = U.MD.D.H.ET["UL"]["HY"][_userid];
         (_UKE && (_UKE = _UKE[1])) && ((!_UKE.length) && (_UDOD.innerText = ""),
@@ -178,17 +178,17 @@ U.MD.D.Blog.A.PAZFF = function (UDE, UDOD) {
     (_UTH == "可添加内容...") && (_UTH = "");
     U.Alert("转发中...");
 
-    U.UF.A.Request(US.CROSSDOMAIN, ([US.DB, "UseStudio_Blog", "UB_P_A_AddZFLR", US.userInfo.UserId, Guid.newGuid(), UDE.ArticleID, US.FORUMROOTID,
+    U.UF.A.Request(US.CROSSDOMAIN, ([US.DB, "UseStudio_Blog", "UB_P_A_AddZFLR", US.userInfo.userid, Guid.newGuid(), UDE.ArticleID, US.FORUMROOTID,
     _UTH, UDOD.innerText.substr(200) + (UDOD.innerText.length > 200 ? "..." : "") + $("img", UDOD)[0].outerHTML]), U.MD.D.Blog.A.AsynSPAZFF, ["", UDE, UDOD]);
 
-    //   U.UF.A.Request(US.AUTH,"pb.ZFArticle", [US.userInfo.UserId, US.FORUMROOTID, UDE.ArticleID, _UTH], U.MD.D.Blog.A.AsynPAZFF, ["", _UTH, UDE]);
+    //   U.UF.A.Request(US.AUTH,"pb.ZFArticle", [US.userInfo.userid, US.FORUMROOTID, UDE.ArticleID, _UTH], U.MD.D.Blog.A.AsynPAZFF, ["", _UTH, UDE]);
     //服务器同步中
 }
 
 //发送转发异步
 U.MD.D.Blog.A.AsynPAZFF = function (r) {
     var _UKE, _UDTD = $("#UD_SYSXZLLRTA").Child()[2];
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _UGE = U.MD.D.H.ET["UL"]["HY"],
     context = r.context,
     _UTH = context[1],
@@ -197,7 +197,7 @@ U.MD.D.Blog.A.AsynPAZFF = function (r) {
         "innerHTML": _UTH
     });
     r = r.value;
-    _UKE = U.MD.D.Blog.A.BLEI[r, 0, 0, U.UF.D.toTimeStamp(new Date()), _UTH, _UDOD.innerText.substr(0, 100), US.userInfo.UserId, US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead, 0];
+    _UKE = U.MD.D.Blog.A.BLEI[r, 0, 0, U.UF.D.toTimeStamp(new Date()), _UTH, _UDOD.innerText.substr(0, 100), US.userInfo.userid, US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead, 0];
     //添加实体
     U.UF.Ut.AddObj(_UKE, {
         "Forward": _UDE["ArticleID"],

+ 2 - 2
js/BLOG/U.D.Blog.F.js

@@ -80,8 +80,8 @@ U.MD.D.Blog.F.KZPGBL = function (UDE, UDOD) {
 U.MD.D.Blog.F.SCPGBL = function (UDE, UDOD, UTF) {
     if (!U.MD.U.L.isLogin(3)) {
         U.Alert("正在删除...");
-        U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteArticleAllReply", US.userInfo.UserId, UDE.ArticleID || UDE]), U.MD.D.Blog.F.AsynSCPGBL, ["", UDOD, UDE, U.MD.D.H.ET["UL"]["HY"]["userid"], UTF];
-        //  U.UF.A.Request(US.AUTH,"pb.DeleteArticleAndAllReply", [US.userInfo.UserId, UDE.ArticleID || UDE]), U.MD.D.Blog.F.AsynSCPGBL, ["", UDOD, UDE, U.MD.D.H.ET["UL"]["HY"]["userid"], UTF];
+        U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteArticleAllReply", US.userInfo.userid, UDE.ArticleID || UDE]), U.MD.D.Blog.F.AsynSCPGBL, ["", UDOD, UDE, U.MD.D.H.ET["UL"]["HY"]["userid"], UTF];
+        //  U.UF.A.Request(US.AUTH,"pb.DeleteArticleAndAllReply", [US.userInfo.userid, UDE.ArticleID || UDE]), U.MD.D.Blog.F.AsynSCPGBL, ["", UDOD, UDE, U.MD.D.H.ET["UL"]["HY"]["userid"], UTF];
     }
 }
 

+ 5 - 5
js/BLOG/U.D.Blog.R.js

@@ -86,7 +86,7 @@ U.MD.D.Blog.R.PHFRGBL = function (UDE, UDPD, TF, UAE, UPE) {
 
 //样式使用
 U.MD.D.Blog.R.YSPHFRGBL = function (UDE, UDOD, UAE, UPE, UDMD, UME) {
-    var _UDTD, _UDMD, _UDSD, _UDED, _UDGD, _UDJD, _UTF = UDE.ReplyAddUserID == US.userInfo.UserId;
+    var _UDTD, _UDMD, _UDSD, _UDED, _UDGD, _UDJD, _UTF = UDE.ReplyAddUserID == US.userInfo.userid;
     _UDTD = $$("div", { "className": "UD_SYBFO" }, UDOD);
     _UDSD = $$("div", { "className": "UD_SYBFOI" }, _UDTD);
     $$("img", { "onerror": U.UF.M.ImgError, "title": UDE.UserNickName, "src": U.UF.M.GetImgU(UDE.UserThumbnailImageHead), "onclick": [[U.UF.M.StopBubble], [U.MD.U.I.ViewOtherUserInfo, [UDE.ReplyAddUserID]]] }, _UDSD);
@@ -120,8 +120,8 @@ U.MD.D.Blog.R.SCPHFRGBL = function (UPE, UDE, UAE, UDOD) {
             _URID = UDE.ReplyID;
             _UAID = UAE.ArticleID;
         } //移除评论 //移除元素 //评论数-1
-        U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteOneReplyAndAllChildReply", US.userInfo.UserId, _URID, _UAID || US.EMPTYGUID]), _UCB || U.UF.M.apply, [""]; //服务器同步
-        // U.UF.A.Request(US.AUTH,"pb.DeleteOneReplyAndChildReply", [US.userInfo.UserId, _URID, UAID || US.EMPTYGUID]), _UCB || U.UF.M.apply, [""]; //服务器同步
+        U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteOneReplyAndAllChildReply", US.userInfo.userid, _URID, _UAID || US.EMPTYGUID]), _UCB || U.UF.M.apply, [""]; //服务器同步
+        // U.UF.A.Request(US.AUTH,"pb.DeleteOneReplyAndChildReply", [US.userInfo.userid, _URID, UAID || US.EMPTYGUID]), _UCB || U.UF.M.apply, [""]; //服务器同步
     }
 }
 
@@ -165,7 +165,7 @@ U.MD.D.Blog.R.TJFBHFRG = function (UAID, UTH) {
         else {
             _UPID = _UDE[3]; _UUID = _UDE[4]; _UCB = _UDE[5];
         }
-        U.UF.A.Request(US.AUTH, ["ReportReply", US.userInfo.UserId, UAID, UTH, _UPID, _UUID], U.MD.D.Blog.R.AsynTJFBHFRG, ["", _UCB]); //添加回复到后台
+        U.UF.A.Request(US.AUTH, ["ReportReply", US.userInfo.userid, UAID, UTH, _UPID, _UUID], U.MD.D.Blog.R.AsynTJFBHFRG, ["", _UCB]); //添加回复到后台
     }
 }
 
@@ -187,7 +187,7 @@ U.MD.D.Blog.R.AsynFBHFRGBL = function (reuqest) {
     _UDOD = context[4];
     _UDMD = context[5];
     _UDPD = $("#UD_SYB" + _UAE.ArticleID).find("div")["UD_SYBF"];
-    (_UKE = (UPE ? UPE["RR"] : _UAE["Reply"][1])).unshift((_UME = new U.MD.D.Blog.R.FRGBLET[_UKE[0] ? (_UKE[0].AllCount + 1) : 1, UPE ? UPE.UserNickName : "", U.UF.D.toTimeStamp(new Date()), US.userInfo.UserId, _UTH, reuqest, UPE ? UPE.ReplyID : "", UPE ? UPE.ReplyAddUserID : "", US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead])); //添加新的类
+    (_UKE = (UPE ? UPE["RR"] : _UAE["Reply"][1])).unshift((_UME = new U.MD.D.Blog.R.FRGBLET[_UKE[0] ? (_UKE[0].AllCount + 1) : 1, UPE ? UPE.UserNickName : "", U.UF.D.toTimeStamp(new Date()), US.userInfo.userid, _UTH, reuqest, UPE ? UPE.ReplyID : "", UPE ? UPE.ReplyAddUserID : "", US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead])); //添加新的类
     (!UPE) && (_UME["RR"] = []);
     U.MD.D.Blog.R.PHFRGBL([_UME], (UPE ? (_UDMD || _UDOD.parentNode) : _UDPD), true, _UAE, UPE);
     $("div", _UDPD.parentNode)[14].innerText = _UME.AllCount; //添加回复 

+ 1 - 1
js/BLOG/U.D.Blog.U.js

@@ -2,7 +2,7 @@
 
 //首页最新消息
 U.MD.D.Blog.U.ZXBlog = function (UDOD, UDE, UTF, UIE, USID) {
-    var i, _UVM, _UTI, _UAT, _UCE, _UDAD, _UDED, _UDBD, _UDTD, _UDSD, _UDID, _UDKD, _UDND, _UDED, _UDKD, _UDAC, _UDVD, _UDLD, _UDPD, _UIMG, _UDFD = $$("frag"), _userid = US.userInfo.UserId, _UTI = U.MD.D.Blog.ZXWZ(UDOD, UIE, null, true);
+    var i, _UVM, _UTI, _UAT, _UCE, _UDAD, _UDED, _UDBD, _UDTD, _UDSD, _UDID, _UDKD, _UDND, _UDED, _UDKD, _UDAC, _UDVD, _UDLD, _UDPD, _UIMG, _UDFD = $$("frag"), _userid = US.userInfo.userid, _UTI = U.MD.D.Blog.ZXWZ(UDOD, UIE, null, true);
     for (i = 0; i < UDE.length; i++) {
         _UIMG = null; _UVM = true; _UCE = UDE[i];
         _UDBD = $$("div", { "className": "UD_SYSXZBRA", "style": { "cssText": "left:" + _UTI[4] + "px;top:" + _UTI[5] + "px"} }, _UDFD);

+ 4 - 4
js/BLOG/U.D.Blog.js

@@ -63,7 +63,7 @@ U.MD.D.Blog.QHCTBK = function (UTF, UDOD) {
 //滚动处理
 U.MD.D.Blog.GDQHCTBK = function (UTF) {
     var _UP = this.P == null ? 1 : this.P + 2;
-    UTF ? U.MD.D.Blog.GBL($("#UD_SYSXZBR")[0], _UP, US.userInfo.UserId) : U.MD.D.Blog.PFY(_UP);
+    UTF ? U.MD.D.Blog.GBL($("#UD_SYSXZBR")[0], _UP, US.userInfo.userid) : U.MD.D.Blog.PFY(_UP);
 }
 
 //#region 公共数据查看
@@ -183,7 +183,7 @@ U.MD.D.Blog.ZLNRPY = function (UDOD, UDE) {
             $$("div", { "className": "UD_SYSXZLRSRDTSRSL", "innerHTML": UDE[i].UserName }, _UDRD);
             $$("div", { "className": "UD_SYSXZLRSRDTSRSR", "innerHTML": "推荐了" }, _UDRD);
             $$("div", { "className": "UD_SYSXZLRSRDTSRX", "innerHTML": UDE[i].ArticleContentBrief }, _UDLD);
-            if (UDE[i].UserID == US.userInfo.UserId) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIO UD_SYI", "onclick": [[U.UF.M.StopBubble], [U.UF.UI.Confirm, ["是否取消转发", [U.MD.D.Blog.F.SCPGBL, [UDE[i], _UDTD]]]]], "title": "取消转发" }, _UDSD) } //
+            if (UDE[i].UserID == US.userInfo.userid) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIO UD_SYI", "onclick": [[U.UF.M.StopBubble], [U.UF.UI.Confirm, ["是否取消转发", [U.MD.D.Blog.F.SCPGBL, [UDE[i], _UDTD]]]]], "title": "取消转发" }, _UDSD) } //
             else { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIT UD_SYI", "title": "点击展开" }, _UDSD); }
             _UTF = !_UTF; (_UCE == null) && (_UCE = new U.MD.D.Blog.A.BLEI([UDE[i].ArticleID, 0, 0, UDE[i].ArticleAddTime, "很遗憾,动静已被作者删除了", "很遗憾,动静已被作者删除了", "", "", "", 0])); //原文被删除
         }
@@ -196,8 +196,8 @@ U.MD.D.Blog.ZLNRPY = function (UDOD, UDE) {
         _UDYD = $$("div", { "className": "UD_SYSXZLRSRDTRZ UD_SYUPCCY" }, _UDRD);
         _UDND = $$("div", { "className": "UD_SYSXZLRSRDTRZTC UD_SYUPCCT" }, _UDYD);
         U.MD.D.Blog.TPGBL(_UDND, _UCE, true, true); //打印图片
-        if (_UTF && _UCE.UserID == US.userInfo.UserId) {
-            if (_UCE.UserID == US.userInfo.UserId) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIM UD_SYSXZLRSRDTRZTIO UD_SYI", "onclick": [[U.UF.M.StopBubble], [U.UF.UI.Confirm, ["是否删除该消息", [U.MD.D.Blog.F.SCPGBL, [UDE[i], _UDTD]]]]], "title": "移除消息" }, _UDHD); }
+        if (_UTF && _UCE.UserID == US.userInfo.userid) {
+            if (_UCE.UserID == US.userInfo.userid) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIM UD_SYSXZLRSRDTRZTIO UD_SYI", "onclick": [[U.UF.M.StopBubble], [U.UF.UI.Confirm, ["是否删除该消息", [U.MD.D.Blog.F.SCPGBL, [UDE[i], _UDTD]]]]], "title": "移除消息" }, _UDHD); }
             else if (!UDE[i].Forward) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIT UD_SYI", "title": "点击展开" }, _UDHD); }
         }
         if (_UCE.UserID) {

+ 1 - 1
js/Common/DataCrossdomain.js

@@ -42,7 +42,7 @@ if (!window.location.host.indexOf("www.1473.cn")) {
                 _params = _data[1]; //需要请求的参数
             try {
                 //做www.1473.cn的用户安全的。以后再扩展
-                US.userInfo = US.userInfo.UserId ? US.userInfo : {
+                US.userInfo = US.userInfo.userid ? US.userInfo : {
                     "LoginId": U.UF.Cookie.get("usestudiosso", "loginid")[0],
                     "UserId": U.UF.Cookie.get("usestudiosso", "userid")[0]
                 };

+ 1 - 1
js/Common/Timer.js

@@ -11,7 +11,7 @@ U.MD.C.T.onesetInterval = function () {
     clearInterval(U.MD.C.T.timer); //防止多次启动计时器,这里是清除可能的计时器
     //初始化计时器处理
     U.MD.C.T.timer = setInterval(function () {
-        var _userid = US.userInfo.UserId; //登录用户的id
+        var _userid = US.userInfo.userid; //登录用户的id
         if (!(_num % 60)) { //每一分钟计数清空,防止页面运行太久计数太大,导致超过了js最大数
             _num = 0;
         }

+ 3 - 3
js/Common/Url.js

@@ -140,10 +140,10 @@ U.MD.N.joinGuide = function (hash, type) {
                         U.MD.F.J.selectUserInfo.NeedUser = [US.userInfo]; //得到个人信息名并赋值NeeUser全局
                         US.friend.group.push(r.value[0]); //添加到用户的群    
                         top.U.MD.F.J.determineCreateGroupAndAddGroupUser(r.value[0].GroupManageID, null, null, false, "", "", function (groupid, groupdata) {  //添加群
-                            U.Json.del(groupdata[0], { UserId: US.userInfo.UserId });
+                            U.Json.del(groupdata[0], { UserId: US.userInfo.userid });
                             US.friend.groupusers.push.apply(US.friend.groupusers, groupdata[0]);
-                            //                                    US.disk.Disks[US.userInfo.UserId].directoryOrFiles.push.apply(US.disk.Disks[US.userInfo.UserId].directoryOrFiles, _groupuserinfo);
-                            U.MD.D.I.openApplication(type, U.Json.select(groupdata[1], { UserDirectoryID: _docId })[0], function (contentwindow) { contentwindow.U.MD.O.W.Panel.addUser(US.userInfo.UserId); }); //打开应用
+                            //                                    US.disk.Disks[US.userInfo.userid].directoryOrFiles.push.apply(US.disk.Disks[US.userInfo.userid].directoryOrFiles, _groupuserinfo);
+                            U.MD.D.I.openApplication(type, U.Json.select(groupdata[1], { UserDirectoryID: _docId })[0], function (contentwindow) { contentwindow.U.MD.O.W.Panel.addUser(US.userInfo.userid); }); //打开应用
                         });
                     }); //获取群资料
                 } else { //加入了群

+ 7 - 7
js/Controls/Complex.js

@@ -908,7 +908,7 @@ U.MD.R.initPrintHtml = function (el) {
     }, _operation);
 
     //判断是否登录
-    if (US.userInfo.UserId) {//已登录
+    if (US.userInfo.userid) {//已登录
         _username.innerHTML = US.userInfo.UserName; //设置用户名
         _headimg.src = 'http://fs.1473.cn/' + US.userInfo.UserThumbnailImageHead; //设置头像
     }
@@ -1050,7 +1050,7 @@ U.MD.R.printComment = function (el, type, data, appendtype, isreply, readmore) {
 * @param  {boolean} 是否需要查看更多,用于区分设置查看更多类型
 */
 U.MD.R.viewComment = function (rid, type) {
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var 
             _rid = rid, //父级id
             _form, //窗体变量
@@ -1256,7 +1256,7 @@ U.MD.R.printCommentHtml = function (el, type, data, appendtype, isreply, readmor
     _likeswarp = $$("div", { "className": "U_MD_R_content_box_content_bottom_likeswarp" }, _content_bottom); //评论右侧内容-底部区域-点赞最外层
 
     _likeswarp.onclick = function () {//设置点赞事件
-        U.MD.R.like(this, _rid, US.userInfo.UserId);
+        U.MD.R.like(this, _rid, US.userInfo.userid);
     }
 
     _likesimg = $$("img", { "src": "/img/reply/NOFabulous.png" }, _likeswarp); //评论右侧内容-底部区域-点赞图片
@@ -1269,7 +1269,7 @@ U.MD.R.printCommentHtml = function (el, type, data, appendtype, isreply, readmor
 
     if (_likesnumjson) {//如果有点赞数据,那么修改点赞数,并且修改图片。
         _likesnum.innerHTML = _likesnumjson.ReplyNum;
-        U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes_Moblie", _rid, US.userInfo.UserId], function (r) {
+        U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes_Moblie", _rid, US.userInfo.userid], function (r) {
             if (r.value[0].mode == 1) {
                 _likesimg.src = "/img/reply/NOFabulous.png";
             }else if (r.value[0].mode == 0) {
@@ -1452,14 +1452,14 @@ U.MD.R.subsetReply = function (el) {
 * 发表评论插入函数
 */
 U.MD.R.release = function (el, type, isreply, position) {//发表评论函数
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var _el = el,
             _type = type,
             _isreply = isreply,
             _position = position,
             _content = U.selectEl(_el).find(".U_MD_R_Reply_Content")[0],
             _imgwarp = U.selectEl(_el).find(".U_MD_R_Reply_Image"),
-            _uid = US.userInfo.UserId,
+            _uid = US.userInfo.userid,
             _un = US.userInfo.UserName,
             _utx = "http://fs.1473.cn/" + US.userInfo.UserImageHead,
             _box;
@@ -1580,7 +1580,7 @@ U.MD.R.release = function (el, type, isreply, position) {//发表评论函数
 * @param  {string} 用户id
 */
 U.MD.R.like = function (e, rid, uid) {
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var _el = e, _rid = rid, _uid = uid;
         U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes", _rid, _uid], function (r) {
             var _img = U.selectEl(_el).find("img")[0],

File diff suppressed because it is too large
+ 0 - 0
js/Controls/Complex.min.js


+ 7 - 7
js/Controls/Complex/Reply.js

@@ -151,7 +151,7 @@ U.MD.R.initPrintHtml = function (el) {
     }, _operation);
 
     //判断是否登录
-    if (US.userInfo.UserId) {//已登录
+    if (US.userInfo.userid) {//已登录
         _username.innerHTML = US.userInfo.UserName; //设置用户名
         _headimg.src = 'http://fs.1473.cn/' + US.userInfo.UserThumbnailImageHead; //设置头像
     }
@@ -293,7 +293,7 @@ U.MD.R.printComment = function (el, type, data, appendtype, isreply, readmore) {
 * @param  {boolean} 是否需要查看更多,用于区分设置查看更多类型
 */
 U.MD.R.viewComment = function (rid, type) {
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var 
             _rid = rid, //父级id
             _form, //窗体变量
@@ -499,7 +499,7 @@ U.MD.R.printCommentHtml = function (el, type, data, appendtype, isreply, readmor
     _likeswarp = $$("div", { "className": "U_MD_R_content_box_content_bottom_likeswarp" }, _content_bottom); //评论右侧内容-底部区域-点赞最外层
 
     _likeswarp.onclick = function () {//设置点赞事件
-        U.MD.R.like(this, _rid, US.userInfo.UserId);
+        U.MD.R.like(this, _rid, US.userInfo.userid);
     }
 
     _likesimg = $$("img", { "src": "/img/reply/NOFabulous.png" }, _likeswarp); //评论右侧内容-底部区域-点赞图片
@@ -512,7 +512,7 @@ U.MD.R.printCommentHtml = function (el, type, data, appendtype, isreply, readmor
 
     if (_likesnumjson) {//如果有点赞数据,那么修改点赞数,并且修改图片。
         _likesnum.innerHTML = _likesnumjson.ReplyNum;
-        U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes_Moblie", _rid, US.userInfo.UserId], function (r) {
+        U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes_Moblie", _rid, US.userInfo.userid], function (r) {
             if (r.value[0].mode == 1) {
                 _likesimg.src = "/img/reply/NOFabulous.png";
             }else if (r.value[0].mode == 0) {
@@ -695,14 +695,14 @@ U.MD.R.subsetReply = function (el) {
 * 发表评论插入函数
 */
 U.MD.R.release = function (el, type, isreply, position) {//发表评论函数
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var _el = el,
             _type = type,
             _isreply = isreply,
             _position = position,
             _content = U.selectEl(_el).find(".U_MD_R_Reply_Content")[0],
             _imgwarp = U.selectEl(_el).find(".U_MD_R_Reply_Image"),
-            _uid = US.userInfo.UserId,
+            _uid = US.userInfo.userid,
             _un = US.userInfo.UserName,
             _utx = "http://fs.1473.cn/" + US.userInfo.UserImageHead,
             _box;
@@ -823,7 +823,7 @@ U.MD.R.release = function (el, type, isreply, position) {//发表评论函数
 * @param  {string} 用户id
 */
 U.MD.R.like = function (e, rid, uid) {
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var _el = e, _rid = rid, _uid = uid;
         U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes", _rid, _uid], function (r) {
             var _img = U.selectEl(_el).find("img")[0],

+ 7 - 7
js/Controls/index.js

@@ -4716,7 +4716,7 @@ U.MD.R.initPrintHtml = function(el) {
     }, _operation);
 
     //判断是否登录
-    if (US.userInfo.UserId) { //已登录
+    if (US.userInfo.userid) { //已登录
         _username.innerHTML = US.userInfo.UserName; //设置用户名
         _headimg.src = 'http://fs.1473.cn/' + US.userInfo.UserThumbnailImageHead; //设置头像
     } else { //未登录
@@ -4854,7 +4854,7 @@ U.MD.R.printComment = function(el, type, data, appendtype, isreply, readmore) {
  * @param  {boolean} 是否需要查看更多,用于区分设置查看更多类型
  */
 U.MD.R.viewComment = function(rid, type) {
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var
             _rid = rid, //父级id
             _form, //窗体变量
@@ -5058,7 +5058,7 @@ U.MD.R.printCommentHtml = function(el, type, data, appendtype, isreply, readmore
     _likeswarp = $$("div", { "className": "U_MD_R_content_box_content_bottom_likeswarp" }, _content_bottom); //评论右侧内容-底部区域-点赞最外层
 
     _likeswarp.onclick = function() { //设置点赞事件
-        U.MD.R.like(this, _rid, US.userInfo.UserId);
+        U.MD.R.like(this, _rid, US.userInfo.userid);
     }
 
     _likesimg = $$("img", { "src": "/img/reply/NOFabulous.png" }, _likeswarp); //评论右侧内容-底部区域-点赞图片
@@ -5071,7 +5071,7 @@ U.MD.R.printCommentHtml = function(el, type, data, appendtype, isreply, readmore
 
     if (_likesnumjson) { //如果有点赞数据,那么修改点赞数,并且修改图片。
         _likesnum.innerHTML = _likesnumjson.ReplyNum;
-        U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes_Moblie", _rid, US.userInfo.UserId], function(r) {
+        U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes_Moblie", _rid, US.userInfo.userid], function(r) {
                 if (r.value[0].mode == 1) {
                     _likesimg.src = "/img/reply/NOFabulous.png";
                 } else if (r.value[0].mode == 0) {
@@ -5249,14 +5249,14 @@ U.MD.R.subsetReply = function(el) {
  * 发表评论插入函数
  */
 U.MD.R.release = function(el, type, isreply, position) { //发表评论函数
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var _el = el,
             _type = type,
             _isreply = isreply,
             _position = position,
             _content = U.selectEl(_el).find(".U_MD_R_Reply_Content")[0],
             _imgwarp = U.selectEl(_el).find(".U_MD_R_Reply_Image"),
-            _uid = US.userInfo.UserId,
+            _uid = US.userInfo.userid,
             _un = US.userInfo.UserName,
             _utx = "http://fs.1473.cn/" + US.userInfo.UserImageHead,
             _box;
@@ -5370,7 +5370,7 @@ U.MD.R.release = function(el, type, isreply, position) { //发表评论函数
  * @param  {string} 用户id
  */
 U.MD.R.like = function(e, rid, uid) {
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var _el = e,
             _rid = rid,
             _uid = uid;

File diff suppressed because it is too large
+ 0 - 0
js/Controls/index.min.js


+ 2 - 2
js/Desktop/Background.js

@@ -82,9 +82,9 @@ U.MD.D.B.asyn = function (url, str) {
         US.userInfo.UserBackGroundImage = url; //讲图片的地址传入服务器中
         U.alert("修改中.."); //弹出提示框
         //插入数据库,并且通过数据返回数据出来。
-        U.A.Request(US.CD, [US.DB, "UseStudio_Users", "UpdateUserDesktopInfo", US.userInfo.UserId, url + "/" + str, "", ""],
+        U.A.Request(US.CD, [US.DB, "UseStudio_Users", "UpdateUserDesktopInfo", US.userInfo.userid, url + "/" + str, "", ""],
                     function () { U.alert("设置成功"); }); //对调函数,弹出提示框
-        //        U.A.Request('UseStudioManage.SetUserBackgroudnImage', [US.userInfo.UserId, url, str], function(){U.alert("设置成功");}, []);
+        //        U.A.Request('UseStudioManage.SetUserBackgroudnImage', [US.userInfo.userid, url, str], function(){U.alert("设置成功");}, []);
     }
 }
 

+ 3 - 3
js/Desktop/Disk/Disk.js

@@ -20,7 +20,7 @@ U.MD.DK.initDisk = function (userid, dirid) {
         //如果网盘没有弹出的处理
         else {
             var _diskel = $("#U_MD_DK").clone(true)[0],
-            _loginuserid = US.userInfo.UserId || US.EMPTYGUID; //网盘内容元素
+            _loginuserid = US.userInfo.userid || US.EMPTYGUID; //网盘内容元素
             _diskel.id = "U_MD_DK__" + userid; //网盘内容的元素id设置为U_MD_DK__加上用户id
             _diskel.style.display = "block"; //显示
             //云盘拖拽
@@ -41,7 +41,7 @@ U.MD.DK.initDisk = function (userid, dirid) {
                                          }
                                      }).form;
             //数据库获取指定用户指定目录下的网盘数据
-            U.A.Request(US.AUTH, ["InitDisk", _loginuserid, userid, dirid], U.MD.DK.asynInitDisk, [_diskel, userid, dirid, US.userInfo.UserId || US.EMPTYGUID]); //服务器加载
+            U.A.Request(US.AUTH, ["InitDisk", _loginuserid, userid, dirid], U.MD.DK.asynInitDisk, [_diskel, userid, dirid, US.userInfo.userid || US.EMPTYGUID]); //服务器加载
         }
         return _formdiv;
     }
@@ -143,7 +143,7 @@ U.MD.DK.setUserGlobalVariable = function (userid, dirid, diskinfo) {
     US.disk.Disks[userid].formel = $("#U_D_" + userid)[0]; //对应的网盘窗体元素
     US.disk.Disks[userid].directoryid = dirid; //当前打开的目录id
     US.disk.Disks[userid].currentDirectoryFile = []; //当前目录下所有的文件
-    US.disk.Disks[userid].operator = US.userInfo.UserId; //操作用户id
+    US.disk.Disks[userid].operator = US.userInfo.userid; //操作用户id
     return US.disk.Disks[userid]; //返回用户网盘的信息
 }
 

+ 4 - 4
js/Desktop/Disk/DiskCommon.js

@@ -92,7 +92,7 @@ U.MD.DK.C.getDirectoryPermissions = function (fileordirid, diskinfo) {
         _readwrite = _permissioninfo.splice(1) //得到文件的读写权限和祖先元素
     ;
     //如果是群、最新文档,协同文档,则没有权限操作
-    if (!US.userInfo.UserId || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[0].UserDirectoryID || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[1].UserDirectoryID || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[2].UserDirectoryID) {
+    if (!US.userInfo.userid || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[0].UserDirectoryID || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[1].UserDirectoryID || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[2].UserDirectoryID) {
         _permissions = { //所有的权限
             "isopen": false, //是否允许打开, 现在所有的文件都有打开权限
             "isupadte": false, //是否允许修改, 只有自己的文件,他人添加文件或者文件夹到我的ftp中,或者是我作为群主的群文件
@@ -222,7 +222,7 @@ U.MD.DK.C.upload = function (diskinfo) {
         }
         //调用上传处理
         U.MD.UI.upload(
-                       "http://main.1473.cn/USUpfile.ashx?typename=UploadFlashfile&DirectoryId=" + _directoryid + "&Encrypt=" + _groupid + "&UserId=" + US.userInfo.UserId + "&IsF=true", //上传的地址
+                       "http://main.1473.cn/USUpfile.ashx?typename=UploadFlashfile&DirectoryId=" + _directoryid + "&Encrypt=" + _groupid + "&UserId=" + US.userInfo.userid + "&IsF=true", //上传的地址
         //上传成功的回调函数
                         function (r, fileinfo) {
                             var _data = r.data  //获取服务器返回值
@@ -248,10 +248,10 @@ U.MD.DK.C.upload = function (diskinfo) {
         //得到md5的回调函数
                         function (md5, fileinfo, cb) {
                             //根据用户的md5值判断用户是否需要上传,如果需要上传则需要执行上传处理,如果已经存在后台直接给用户生成文件路径等录入数据库
-                            U.A.Request(US.AUTH, ["IfFileExistInsertDB", US.userInfo.UserId, _directoryid, _groupid, fileinfo.size, md5, U.UF.UP.getFileNameAndExtension(fileinfo.name)[1], fileinfo.name],
+                            U.A.Request(US.AUTH, ["IfFileExistInsertDB", US.userInfo.userid, _directoryid, _groupid, fileinfo.size, md5, U.UF.UP.getFileNameAndExtension(fileinfo.name)[1], fileinfo.name],
                             //判断上传文件是否存在
                             function (r) {
-                                var _userid = US.userInfo.UserId; //当前登录用户的id 
+                                var _userid = US.userInfo.userid; //当前登录用户的id 
                                 r = r.value;
                                 //获取服务器返回的值,如果服务器响应出问题了,eval的时候就会报错。
                                 try {

+ 1 - 1
js/Desktop/Disk/DiskData.js

@@ -261,7 +261,7 @@ U.MD.DK.M.recursionUpdateDirectory = function (filesinfo, attribute) {
 *   @return {object} 用户在网盘的全局变量。
 */
 U.MD.DK.M.diskOperatingSwitch = function (userid, username) {
-    userid = userid || US.userInfo.UserId; //如果有用户id,则userid为用户id,否则为登录用户id。
+    userid = userid || US.userInfo.userid; //如果有用户id,则userid为用户id,否则为登录用户id。
     if (userid) {
         var i, _userinfo, //需要返回的用户网盘信息
             _diskinfo = US.disk.Disks; //_UCE为包含了所有用户硬盘信息的集合。

+ 8 - 8
js/Desktop/Disk/DiskView.js

@@ -358,7 +358,7 @@ U.MD.DK.VW.checkFile = function (el) {
 U.MD.DK.VW.chosenSaveFile = function (postfix, fileid, filename, callback, formtitle, extendtype) {
     if (!U.MD.U.L.isLogin()) {//是否登录
         extendtype = extendtype || "folder"; //默认只显示文件夹
-        var _diskinfo = US.disk.Disks[US.userInfo.UserId]; //获取当前登录用户的网盘信息
+        var _diskinfo = US.disk.Disks[US.userInfo.userid]; //获取当前登录用户的网盘信息
         var _formel = $('#U_MD_DK_VW_ChosenSaveFile')[0]; //获取窗体元素
         var _file; //定义变量
         if (_formel) { //判断窗体是否存在
@@ -529,7 +529,7 @@ U.MD.DK.VW.chosenSaveFile.forderClick = function (directoryinfo, el, topfilearea
             U.MD.DK.VW.chosenSaveFile.printFolder(directoryinfo.Child, $$('div', {}, el), _deviant, null, null, extendtype); //打印子级文件夹
         } else {
             //未获取则去数据库获取
-            U.MD.DK.LE.getChildsByDirectoryId(US.userInfo.UserId, directoryinfo, topfilearea, function () {
+            U.MD.DK.LE.getChildsByDirectoryId(US.userInfo.userid, directoryinfo, topfilearea, function () {
                 //打印文件夹
                 U.MD.DK.VW.chosenSaveFile.printFolder(directoryinfo.Child, $$('div', {}, el), _deviant, null, null, extendtype);
             });
@@ -556,7 +556,7 @@ U.MD.DK.VW.chosenSaveFile.ensure = function (formel, input, postfix, fileid, cal
             U.Alert('请选择文件夹新建的目录!'); //提示未选择文件
         } else {
             var _parentid = _nowfile.id.replace('CS', ''); //获取文件目录ID
-            var _userid = US.userInfo.UserId; //获取用户ID
+            var _userid = US.userInfo.userid; //获取用户ID
             var _diskinfo = US.disk.Disks[_userid]; //获取用户网盘信息
             var _dirinfo = U.Json.select(_diskinfo.directoryOrFiles, { UserDirectoryID: _parentid })[0]; //获取文件夹信息
             if (!U.MD.DK.C.getDirectoryPermissions(_dirinfo.UserDirectoryID, _diskinfo).isnew) {
@@ -601,7 +601,7 @@ U.MD.DK.VW.chosenSaveFile.newFolder = function () {
     if (!_nowfile) { //如果获取不到则为未选择
         return U.Alert('请选择文件夹新建的目录!');  //提示未选择文件
     }
-    var _userid = US.userInfo.UserId;  //获取用户ID 
+    var _userid = US.userInfo.userid;  //获取用户ID 
     var _parentid = _nowfile.id.replace('CS', '');   //获取文件目录ID
     var _diskinfo = US.disk.Disks[_userid]; //获取用户网盘信息
     if (_diskinfo.directoryOrFiles[0].UserDirectoryID == _parentid || _diskinfo.directoryOrFiles[1].UserDirectoryID == _parentid || _diskinfo.directoryOrFiles[2].UserDirectoryID == _parentid) {//新建文件权限
@@ -667,7 +667,7 @@ U.MD.DK.VW.chosenSaveFile.newFolder = function () {
 **/
 U.MD.DK.VW.saveSynergy = function (postfix, fileinfo, filename, type, callback) {
     if (!U.MD.U.L.isLogin()) {//是否登录
-        var _grouplistarr = US.disk.Disks[US.userInfo.UserId]; //获取当前登录用户的网盘信息
+        var _grouplistarr = US.disk.Disks[US.userInfo.userid]; //获取当前登录用户的网盘信息
         var _formel = $('#U_MD_O_SaveSynergy')[0]; //获取窗体元素
         var _grouplist; //定义变量
         if (_formel) { //判断窗体是否存在
@@ -743,7 +743,7 @@ U.MD.DK.VW.saveSynergy.ensure = function (formel, input, postfix, fileinfo, type
     //判断文件名是否符合规范
     if (U.UF.S.ZWFileName.test(_name)) {
         var _dirinfo;
-        var _userid = US.userInfo.UserId; //获取用户ID
+        var _userid = US.userInfo.userid; //获取用户ID
         var _diskinfo = US.disk.Disks[_userid]; //获取用户网盘信息
         if ($('#U_MD_O_SaveSynergy_GroupList').css('display') == 'none') {
             var _groupName = '协同文档群--' + new Date().getHours() + ":" + new Date().getMinutes(), //默认群名/也是文档名
@@ -793,7 +793,7 @@ U.MD.DK.VW.saveSynergy.ensure = function (formel, input, postfix, fileinfo, type
 **/
 U.MD.DK.VW.saveSynergy.ensure.operate = function (formel, dirinfo, fileinfo, parentid, groupid, type, postfix, name, callback) {
     var _fileid = fileinfo.UserDirectoryID;
-    var _userid = US.userInfo.UserId; //获取用户ID
+    var _userid = US.userInfo.userid; //获取用户ID
     var _diskinfo = US.disk.Disks[_userid]; //获取用户网盘信息
     if (type == "move") {
         var _pastecontent = US.disk.Disks[_userid].pasteDirOrFile = {
@@ -960,7 +960,7 @@ U.MD.DK.VW.choseFile
     
 */
 U.MD.DK.VW.choseFile = function (cb, type) {
-    var _diskinfo = US.disk.Disks[US.userInfo.UserId]; //获取当前登录用户的网盘信息
+    var _diskinfo = US.disk.Disks[US.userInfo.userid]; //获取当前登录用户的网盘信息
     var _formel = $('#U_MD_DK_VW_ChosenSaveFile')[0]; //获取窗体元素
     var _file; //定义变量
     type = type ? type : "*";       //默认为全部

+ 2 - 2
js/Desktop/Disk/LeftClick.js

@@ -182,9 +182,9 @@ U.MD.DK.LE.getChildsByDirectoryId = function (userid, fileinfo, loading, cb) {
 //
 U.MD.DK.LE.getNewDocument = function (userid, fileinfo, loading, cb) {
     //用户必须登录才能查看自己网盘的内容
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         //如果没有孩子节点,则去数据库取数据。
-        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.UserId, "00000000-0000-0000-0000-000000000000", "", 0, 0, 100], function (r) {
+        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.userid, "00000000-0000-0000-0000-000000000000", "", 0, 0, 100], function (r) {
             var i;
             for (i = 0; i < r.value.length; i++) {
                 r.value[i] = new U.MD.DK.M.entity(r.value[i].UserFilesID, r.value[i].UserFilesSize, r.value[i].UserDirectoryID, r.value[i].UserFilesName, r.value[i].UserFilesName, r.value[i].UserFilesExtendName, r.value[i].UserFilesServerName, r.value[i].UserFilesAddTime, "", "9999", r.value[i].UserFilesModifyTime, r.value[i].UserDirectoryEncrypt, 1, r.value[i].UserFilesDescript, r.value[i].UserDirectoryEncrypt, "", r.value[i].UserID, US.userInfo.UserNickName, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead);

+ 7 - 7
js/Desktop/Disk/RightClick.js

@@ -168,7 +168,7 @@ U.MD.DK.RE.newFolder.confirm = function (diskinfo, directoryid) {
         _groupid, //群id
         _newguid = Guid.newGuid(), //新建文件夹的id
         _dirinfo = U.Json.select(diskinfo.directoryOrFiles, { "UserDirectoryID": directoryid })[0], //目录网盘信息
-        _userid = US.userInfo.UserId, //新建用户id
+        _userid = US.userInfo.userid, //新建用户id
         _input = $$("input", { "placeholder": "请输入文件夹名字", "style": { "width": "180px", "height": "25px"} }) //输入的名字
     //弹出comfir
     U.MD.DK.RE.newconfirm(
@@ -226,7 +226,7 @@ U.MD.DK.RE.newText.confirm = function (diskinfo, directoryid, fun) {
         _groupid, //群id
         _newguid = Guid.newGuid(), //新建文件夹的id
         _dirinfo = U.Json.select(diskinfo.directoryOrFiles, { "UserDirectoryID": directoryid })[0], //目录网盘信息
-        _userid = US.userInfo.UserId, //新建用户id
+        _userid = US.userInfo.userid, //新建用户id
         _input = $$("input", { "placeholder": "请输入新文本文档的命名", "style": { "width": "180px", "height": "25px", "padding-left": "7px"} }); //输入的名字
     //弹出comfirm
     U.MD.DK.RE.newconfirm(_input,
@@ -284,7 +284,7 @@ U.MD.DK.RE.newDocument.confirm = function (diskinfo, directoryid, fun, fileid) {
         _groupid, //群id
         _newguid = fileid || Guid.newGuid(), //新建文件夹的id
         _dirinfo = U.Json.select(diskinfo.directoryOrFiles, { "UserDirectoryID": directoryid })[0], //目录网盘信息
-        _userid = US.userInfo.UserId, //新建用户id
+        _userid = US.userInfo.userid, //新建用户id
         _input = $$("input", { "placeholder": "请输入文档名字", "style": { "width": "180px", "height": "25px"} }); //输入的名字
 
     return U.MD.DK.RE.newconfirm(_input, //创建文档的框
@@ -344,7 +344,7 @@ U.MD.DK.RE.newExcel.confirm = function (diskinfo, directoryid) {
         _groupid, //群id
         _newguid = Guid.newGuid(), //新建文件夹的id
         _dirinfo = U.Json.select(diskinfo.directoryOrFiles, { "UserDirectoryID": directoryid })[0], //目录网盘信息
-        _userid = US.userInfo.UserId, //新建用户id
+        _userid = US.userInfo.userid, //新建用户id
         _input = $$("input", { "placeholder": "请输入表格名字", "style": { "width": "180px", "height": "25px"} }); //输入的名字    
     U.MD.DK.RE.newconfirm(_input, //创建文档的框
         function () {
@@ -782,13 +782,13 @@ U.MD.DK.RE.paste = function (diskinfo) {
         //剪切的处理
         if (_type == "shear") {
             //调用剪切的函数    用户ID  粘贴目录id  文件和目录的id集合 群元素
-            U.A.Request(US.AUTH, ["CutAndPasteFiles", US.userInfo.UserId, _dirid, _fileordirids, _groupid, _pastecontent.dirorfile.GroupID], U.MD.DK.RE.asynPaste, ["", _dirinfo, _groupid, _pastecontent, diskinfo]);
+            U.A.Request(US.AUTH, ["CutAndPasteFiles", US.userInfo.userid, _dirid, _fileordirids, _groupid, _pastecontent.dirorfile.GroupID], U.MD.DK.RE.asynPaste, ["", _dirinfo, _groupid, _pastecontent, diskinfo]);
             _pastecontent.type = "copy";
         }
         //复制的处理
         else {
             //调用复制的函数
-            U.A.Request(US.AUTH, ["CopyAndPasteFiles", US.userInfo.UserId, _dirid, _fileordirids, _groupid], U.MD.DK.RE.asynPaste, ["", _dirinfo, _groupid, _pastecontent, diskinfo]);
+            U.A.Request(US.AUTH, ["CopyAndPasteFiles", US.userInfo.userid, _dirid, _fileordirids, _groupid], U.MD.DK.RE.asynPaste, ["", _dirinfo, _groupid, _pastecontent, diskinfo]);
         }
     }
 }
@@ -815,7 +815,7 @@ U.MD.DK.RE.asynPaste = function (r) {
     }
     //循环设置粘贴文件的属性
     for (i = 0; i < _pasteinfo.length; i++) {
-        _pasteinfo[i] = new U.MD.DK.M.entity(_pasteinfo[i].UserDirectoryID, _pasteinfo[i].UserDirectorySize, _pasteinfo[i].UserDirectoryParentID, _pasteinfo[i].UserDirectoryName, _pasteinfo[i].UserDirectoryName, _pasteinfo[i].UserDirectoryExtendType, _pasteinfo[i].UserDirectoryUrl, _pasteinfo[i].UserDirectoryAddTime, _pasteinfo[i].UserDirectoryUrl, "9999", null, _pasteinfo[i].UserDirectoryEncrypt, 1, "", _pasteinfo[i].UserDirectoryEncrypt, "", US.userInfo.UserId, US.userInfo.UserNickName, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead)
+        _pasteinfo[i] = new U.MD.DK.M.entity(_pasteinfo[i].UserDirectoryID, _pasteinfo[i].UserDirectorySize, _pasteinfo[i].UserDirectoryParentID, _pasteinfo[i].UserDirectoryName, _pasteinfo[i].UserDirectoryName, _pasteinfo[i].UserDirectoryExtendType, _pasteinfo[i].UserDirectoryUrl, _pasteinfo[i].UserDirectoryAddTime, _pasteinfo[i].UserDirectoryUrl, "9999", null, _pasteinfo[i].UserDirectoryEncrypt, 1, "", _pasteinfo[i].UserDirectoryEncrypt, "", US.userInfo.userid, US.userInfo.UserNickName, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead)
     }
     //在粘贴网盘的数组目录中添加值
     U.MD.DK.RE.addFileOrFolder(_pasteinfo, _diskinfo, _dirinfo);

+ 47 - 42
js/Desktop/Onload.js

@@ -22,7 +22,7 @@ U.MD.D.IsUseStudio = true;
 //本地存储类
 U.MD.D.LocalStorage = null;
 
-US.userinfo = {};
+US.userInfo = {};
 //#endregion
 
 //#region onload处理
@@ -200,6 +200,9 @@ U.MD.D.asynCrossDomain = function (cb) {
         cb(); //回调处理
     }
     U.MD.D.getuser(); //用户登录
+    setInterval(() => {
+        U.MD.D.getuser(); //用户登录
+    }, 2000)
 }
 
 /**
@@ -241,7 +244,7 @@ U.MD.D.thirdPartyLoad = function () {
  * 写入访问用户信息
  */
 U.MD.D.visitLog = function () {
-    U.A.Request(US.USER, ["AddToLoginLog", US.userInfo.UserId || US.EMPTYGUID, US.city.userAllLocation || ""], function () { }); //访问日志添加消息
+    U.A.Request(US.USER, ["AddToLoginLog", US.userInfo.userid || US.EMPTYGUID, US.city.userAllLocation || ""], function () { }); //访问日志添加消息
 }
 
 //#endregion
@@ -278,52 +281,54 @@ U.MD.D.error = function (errorMessage, scripturi, linenumber, columnnumber, erro
     return true; //不让浏览器弹出错误报告,浏览器会弹出一个comfirm的错误。
 }
 
-U.MD.D.getuser = function () {
-    setInterval(() => {
-        var userInfo = US.userinfo;
-        if (Object.keys(userInfo).length === 0) {
-            var _cookie = U.UF.Cookie.get("cocorobo");
-            if (Object.keys(userInfo).length === 0 && _cookie) {
-                U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
-                    if (res.value && res.value[0] && res.value[0][0]) {
-                        // US.userInfo = res.value[0][0]; //记录用户数据
-                        US.user = res.value[0][0];
-                        U.A.Request(US.Config.edu + "admin/userinfo/userinfoById/" + US.user.userid, [], function (res) {
-                            if (res.value && res.value[0] && res.value[0][0]) {
-                                US.userinfo = res.value[0][0]; //记录用户数据
-                                if ($("#U_MD_HomeC_Pop")[0]) {
-                                    $("#U_MD_HomeC_Pop")[0].close(); //关闭登陆
-                                }
 
-                                U.A.Request(US.Config.pbl + "selectUser?userid=" + US.user.userid, [], function (res) {//US.user.userid
-                                    if (res.value == null || res.value[0].length == 0) {
-                                        U.MD.D.isLogin();
-                                        U.MD.D.I.openApplication("my")
-                                    } else {
-                                        US.userinfo = res.value[0][0];
-                                        $(".login")[0].style.display = "none";
-                                        $(".register")[0].style.display = "none";
-                                        $(".userName")[0].style.display = "block";
-                                        $(".userName")[0].innerHTML = US.userinfo.username;
-                                        $(".avatar")[0].style.display = "block";
-                                        $(".exit")[0].style.display = "block";
-                                    }
-                                }, [], { "type": "GET", "withCredentials": true });
+/**
+ * 用户登录处理
+ */
+U.MD.D.getuser = function () {
+    var userInfo = US.userInfo;
+    if (Object.keys(userInfo).length === 0) {
+        var _cookie = U.UF.Cookie.get("cocorobo");
+        if (Object.keys(userInfo).length === 0 && _cookie) {
+            U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
+                if (res.value && res.value[0] && res.value[0][0]) {
+                    US.userInfo = res.value[0][0];
+                    U.A.Request(US.Config.edu + "admin/userinfo/userinfoById/" + US.userInfo.userid, [], function (res) {
+                        if (res.value && res.value[0] && res.value[0][0]) {
+                            US.userInfo = res.value[0][0]; //记录用户数据
+                            U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
+                            if ($("#U_MD_HomeC_Pop")[0]) {
+                                $("#U_MD_HomeC_Pop")[0].close(); //关闭登陆
                             }
-                        }, [], { "type": "GET", "withCredentials": true });
-                    }
-                }, [], { "type": "GET", "withCredentials": true });
-            }
+                            U.A.Request(US.Config.pbl + "selectUser?userid=" + US.userInfo.userid, [], function (res) {//US.user.userid
+                                if (res.value == null || res.value[0].length == 0) {
+                                    U.MD.D.isLogin();
+                                    U.MD.D.I.openApplication("my")
+                                }
+                                else {
+                                    US.userInfo = res.value[0][0];
+                                    $(".login")[0].style.display = "none";
+                                    $(".register")[0].style.display = "none";
+                                    $(".userName")[0].style.display = "block";
+                                    $(".userName")[0].innerHTML = US.userInfo.username;
+                                    $(".avatar")[0].style.display = "block";
+                                    $(".exit")[0].style.display = "block";
+                                }
+                            }, [], { "type": "GET", "withCredentials": true });
+                        }
+                    }, [], { "type": "GET", "withCredentials": true });
+                }
+            }, [], { "type": "GET", "withCredentials": true });
         }
-    }, 2000)
-
-    // US.user = {"userid":"a77e9404-efec-11e9-96f9-028edca3b798","identity":2};
-    // US.userinfo = {"userid":"a77e9404-efec-11e9-96f9-028edca3b798","username":"xjw","userpassword":"123456","sessionid":"","type":1,"organizeid":"45facc0a-1211-11ec-80ad-005056b86db5","state":1,"create_at":"2022-04-26T08:26:09.000Z"};
-    // $(".userName")[0].innerHTML = US.userinfo.username;
+    }
 }
 
+
+/**
+ * 弹出登录判断
+ */
 U.MD.D.isLogin = function () {
-    var userInfo = US.userinfo;
+    var userInfo = US.userInfo;
     if (!userInfo || Object.keys(userInfo).length === 0) {
         $(".userName")[0].style.display = "none";
         setTimeout(() => {

+ 3 - 3
js/Disk/Disk.js

@@ -21,7 +21,7 @@ U.MD.DK.initDisk = function (userid, dirid) {
         //如果网盘没有弹出的处理
         else {
             var _diskel = $("#U_MD_DK").clone(true)[0],
-            _loginuserid = US.userInfo.UserId || US.EMPTYGUID; //网盘内容元素
+            _loginuserid = US.userInfo.userid || US.EMPTYGUID; //网盘内容元素
             _diskel.id = "U_MD_DK__" + userid; //网盘内容的元素id设置为U_MD_DK__加上用户id
             _diskel.style.display = "block"; //显示
 
@@ -43,7 +43,7 @@ U.MD.DK.initDisk = function (userid, dirid) {
                                          }
                                      }).form;
             //数据库获取指定用户指定目录下的网盘数据
-            U.A.Request(US.DISK, ["InitDisk", _loginuserid, userid, dirid], U.MD.DK.asynInitDisk, [_diskel, userid, dirid, US.userInfo.UserId || US.EMPTYGUID, _formdiv]); //服务器加载
+            U.A.Request(US.DISK, ["InitDisk", _loginuserid, userid, dirid], U.MD.DK.asynInitDisk, [_diskel, userid, dirid, US.userInfo.userid || US.EMPTYGUID, _formdiv]); //服务器加载
         }
 
         return _formdiv;
@@ -163,7 +163,7 @@ U.MD.DK.setUserGlobalVariable = function (userid, dirid, diskinfo) {
     US.disk.Disks[userid].formel = $("#U_D_" + userid)[0]; //对应的网盘窗体元素
     US.disk.Disks[userid].directoryid = dirid; //当前打开的目录id
     US.disk.Disks[userid].currentDirectoryFile = []; //当前目录下所有的文件
-    US.disk.Disks[userid].operator = US.userInfo.UserId; //操作用户id
+    US.disk.Disks[userid].operator = US.userInfo.userid; //操作用户id
     return US.disk.Disks[userid]; //返回用户网盘的信息
 }
 

+ 4 - 4
js/Disk/DiskCommon.js

@@ -92,7 +92,7 @@ U.MD.DK.C.getDirectoryPermissions = function (fileordirid, diskinfo) {
         _readwrite = _permissioninfo.splice(1) //得到文件的读写权限和祖先元素
     ;
     //如果是群、最新文档,协同文档,则没有权限操作
-    if (!US.userInfo.UserId || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[0].UserDirectoryID || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[1].UserDirectoryID || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[2].UserDirectoryID) {
+    if (!US.userInfo.userid || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[0].UserDirectoryID || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[1].UserDirectoryID || _currentfileordir.UserDirectoryID == diskinfo.directoryOrFiles[2].UserDirectoryID) {
         _permissions = { //所有的权限
             "isopen": false, //是否允许打开, 现在所有的文件都有打开权限
             "isupadte": false, //是否允许修改, 只有自己的文件,他人添加文件或者文件夹到我的ftp中,或者是我作为群主的群文件
@@ -226,7 +226,7 @@ U.MD.DK.C.upload = function (diskinfo) {
         }
         //调用上传处理
         U.MD.UI.upload(
-                       "http://main.1473.cn/USUpfile.ashx?typename=UploadFlashfile&DirectoryId=" + _directoryid + "&Encrypt=" + _groupid + "&UserId=" + US.userInfo.UserId + "&IsF=true", //上传的地址
+                       "http://main.1473.cn/USUpfile.ashx?typename=UploadFlashfile&DirectoryId=" + _directoryid + "&Encrypt=" + _groupid + "&UserId=" + US.userInfo.userid + "&IsF=true", //上传的地址
         //上传成功的回调函数
                         function (r, fileinfo) {
                             var _data = r.data  //获取服务器返回值
@@ -252,10 +252,10 @@ U.MD.DK.C.upload = function (diskinfo) {
         //得到md5的回调函数
                         function (md5, fileinfo, cb) {
                             //根据用户的md5值判断用户是否需要上传,如果需要上传则需要执行上传处理,如果已经存在后台直接给用户生成文件路径等录入数据库
-                            U.A.Request(US.DISK, ["IfFileExistInsertDB", US.userInfo.UserId, _directoryid, _groupid, fileinfo.size, md5, U.UF.UP.getFileNameAndExtension(fileinfo.name)[1], fileinfo.name],
+                            U.A.Request(US.DISK, ["IfFileExistInsertDB", US.userInfo.userid, _directoryid, _groupid, fileinfo.size, md5, U.UF.UP.getFileNameAndExtension(fileinfo.name)[1], fileinfo.name],
                             //判断上传文件是否存在
                             function (r) {
-                                var _userid = US.userInfo.UserId; //当前登录用户的id 
+                                var _userid = US.userInfo.userid; //当前登录用户的id 
                                 r = r.value;
                                 //获取服务器返回的值,如果服务器响应出问题了,eval的时候就会报错。
                                 try {

+ 1 - 1
js/Disk/DiskData.js

@@ -272,7 +272,7 @@ U.MD.DK.M.recursionUpdateDirectory = function (filesinfo, attribute) {
 *   @return {object} 用户在网盘的全局变量。
 */
 U.MD.DK.M.diskOperatingSwitch = function (userid, username) {
-    userid = userid || US.userInfo.UserId; //如果有用户id,则userid为用户id,否则为登录用户id。
+    userid = userid || US.userInfo.userid; //如果有用户id,则userid为用户id,否则为登录用户id。
     if (userid) {
         var i, _userinfo, //需要返回的用户网盘信息
             _diskinfo = US.disk.Disks; //_UCE为包含了所有用户硬盘信息的集合。

+ 10 - 10
js/Disk/DiskView.js

@@ -10,7 +10,7 @@
 U.MD.DK.VW.followState = function (diskel, userid) {
     var _followbutton = $(".U_MD_DK_LIRS", diskel);
     _followbutton.attr("user", userid);
-    if (userid == US.userInfo.UserId) {
+    if (userid == US.userInfo.userid) {
         _followbutton[0].innerHTML = "本人";
     }
     else if (US.friend.friends && U.Json.select(US.friend.friends, { UserId: userid })[0]) {
@@ -28,7 +28,7 @@ U.MD.DK.VW.followState = function (diskel, userid) {
 U.MD.DK.VW.followState.click = function (button) {
     var _userid = $(button).attr("user");
     var _userinfo;
-    if (_userid == US.userInfo.UserId) {
+    if (_userid == US.userInfo.userid) {
         return;
     } else if (US.friend.friends && (_userinfo = U.Json.select(US.friend.friends, { UserId: _userid })[0])) {
         U.MD.F.M.deleteFriend(_userinfo, function () {
@@ -425,7 +425,7 @@ U.MD.DK.VW.checkFile = function (el) {
 U.MD.DK.VW.chosenSaveFile = function (postfix, fileid, filename, callback, formtitle, extendtype) {
     if (!U.MD.U.L.isLogin()) {//是否登录
         extendtype = extendtype || "folder"; //默认只显示文件夹
-        var _diskinfo = US.disk.Disks[US.userInfo.UserId]; //获取当前登录用户的网盘信息
+        var _diskinfo = US.disk.Disks[US.userInfo.userid]; //获取当前登录用户的网盘信息
         var _formel = $('#U_MD_DK_VW_ChosenSaveFile')[0]; //获取窗体元素
         var _file; //定义变量
         if (_formel) { //判断窗体是否存在
@@ -600,7 +600,7 @@ U.MD.DK.VW.chosenSaveFile.forderClick = function (directoryinfo, el, topfilearea
             U.MD.DK.VW.chosenSaveFile.printFolder(directoryinfo.Child, $$('div', {}, el), _deviant, null, null, extendtype); //打印子级文件夹
         } else {
             //未获取则去数据库获取
-            U.MD.DK.LE.getChildsByDirectoryId(US.userInfo.UserId, directoryinfo, topfilearea, function () {
+            U.MD.DK.LE.getChildsByDirectoryId(US.userInfo.userid, directoryinfo, topfilearea, function () {
                 //打印文件夹
                 U.MD.DK.VW.chosenSaveFile.printFolder(directoryinfo.Child, $$('div', {}, el), _deviant, null, null, extendtype);
             });
@@ -627,7 +627,7 @@ U.MD.DK.VW.chosenSaveFile.ensure = function (formel, input, postfix, fileid, cal
             U.Alert('请选择文件夹新建的目录!'); //提示未选择文件
         } else {
             var _parentid = _nowfile.id.replace('CS', ''); //获取文件目录ID
-            var _userid = US.userInfo.UserId; //获取用户ID
+            var _userid = US.userInfo.userid; //获取用户ID
             var _diskinfo = US.disk.Disks[_userid]; //获取用户网盘信息
             var _dirinfo = U.Json.select(_diskinfo.directoryOrFiles, { UserDirectoryID: _parentid })[0]; //获取文件夹信息
             if (!U.MD.DK.C.getDirectoryPermissions(_dirinfo.UserDirectoryID, _diskinfo).isnew) {
@@ -672,7 +672,7 @@ U.MD.DK.VW.chosenSaveFile.newFolder = function () {
     if (!_nowfile) { //如果获取不到则为未选择
         return U.Alert('请选择文件夹新建的目录!');  //提示未选择文件
     }
-    var _userid = US.userInfo.UserId;  //获取用户ID 
+    var _userid = US.userInfo.userid;  //获取用户ID 
     var _parentid = _nowfile.id.replace('CS', '');   //获取文件目录ID
     var _diskinfo = US.disk.Disks[_userid]; //获取用户网盘信息
     if (_diskinfo.directoryOrFiles[0].UserDirectoryID == _parentid || _diskinfo.directoryOrFiles[1].UserDirectoryID == _parentid || _diskinfo.directoryOrFiles[2].UserDirectoryID == _parentid) {//新建文件权限
@@ -738,7 +738,7 @@ U.MD.DK.VW.chosenSaveFile.newFolder = function () {
 **/
 U.MD.DK.VW.saveSynergy = function (postfix, fileinfo, filename, type, callback) {
     if (!U.MD.U.L.isLogin()) {//是否登录
-        var _grouplistarr = US.disk.Disks[US.userInfo.UserId]; //获取当前登录用户的网盘信息
+        var _grouplistarr = US.disk.Disks[US.userInfo.userid]; //获取当前登录用户的网盘信息
         var _formel = $('#U_MD_O_SaveSynergy')[0]; //获取窗体元素
         var _grouplist; //定义变量
         if (_formel) { //判断窗体是否存在
@@ -817,7 +817,7 @@ U.MD.DK.VW.saveSynergy.ensure = function (formel, input, postfix, fileinfo, type
     //判断文件名是否符合规范
     if (U.UF.S.ZWFileName.test(_name)) {
         var _dirinfo;
-        var _userid = US.userInfo.UserId; //获取用户ID
+        var _userid = US.userInfo.userid; //获取用户ID
         var _diskinfo = US.disk.Disks[_userid]; //获取用户网盘信息
         if ($('#U_MD_O_SaveSynergy_GroupList').css('display') == 'none') {
             var _groupName = '协同文档群--' + new Date().getHours() + ":" + new Date().getMinutes(), //默认群名/也是文档名
@@ -867,7 +867,7 @@ U.MD.DK.VW.saveSynergy.ensure = function (formel, input, postfix, fileinfo, type
 **/
 U.MD.DK.VW.saveSynergy.ensure.operate = function (formel, dirinfo, fileinfo, parentid, groupid, type, postfix, name, callback) {
     var _fileid = fileinfo.UserDirectoryID;
-    var _userid = US.userInfo.UserId; //获取用户ID
+    var _userid = US.userInfo.userid; //获取用户ID
     var _diskinfo = US.disk.Disks[_userid]; //获取用户网盘信息
     if (type == "move") {
         var _pastecontent = US.disk.Disks[_userid].pasteDirOrFile = {
@@ -1034,7 +1034,7 @@ U.MD.DK.VW.choseFile
     
 */
 U.MD.DK.VW.choseFile = function (cb, type) {
-    var _diskinfo = US.disk.Disks[US.userInfo.UserId]; //获取当前登录用户的网盘信息
+    var _diskinfo = US.disk.Disks[US.userInfo.userid]; //获取当前登录用户的网盘信息
     var _formel = $('#U_MD_DK_VW_ChosenSaveFile')[0]; //获取窗体元素
     var _file; //定义变量
     type = type ? type : "*";       //默认为全部

+ 2 - 2
js/Disk/LeftClick.js

@@ -212,9 +212,9 @@ U.MD.DK.LE.getChildsByDirectoryId = function (userid, fileinfo, loading, cb) {
 //
 U.MD.DK.LE.getNewDocument = function (userid, fileinfo, loading, cb) {
     //用户必须登录才能查看自己网盘的内容
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         //如果没有孩子节点,则去数据库取数据。
-        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.UserId, "00000000-0000-0000-0000-000000000000", "", 0, 0, 100], function (r) {
+        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.userid, "00000000-0000-0000-0000-000000000000", "", 0, 0, 100], function (r) {
             var i;
             for (i = 0; i < r.value.length; i++) {
                 r.value[i] = new U.MD.DK.M.entity(r.value[i].UserFilesID, r.value[i].UserFilesSize, r.value[i].UserDirectoryID, r.value[i].UserFilesName, r.value[i].UserFilesName, r.value[i].UserFilesExtendName, r.value[i].UserFilesServerName, r.value[i].UserFilesAddTime, "", "9999", r.value[i].UserFilesModifyTime, r.value[i].UserDirectoryEncrypt, 1, r.value[i].UserFilesDescript, r.value[i].UserDirectoryEncrypt, "", r.value[i].UserID, US.userInfo.UserNickName, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead);

+ 7 - 7
js/Disk/RightClick.js

@@ -180,7 +180,7 @@ U.MD.DK.RE.newFolder.confirm = function (diskinfo, directoryid) {
         _groupid, //群id
         _newguid = Guid.newGuid(), //新建文件夹的id
         _dirinfo = U.Json.select(diskinfo.directoryOrFiles, { "UserDirectoryID": directoryid })[0], //目录网盘信息
-        _userid = US.userInfo.UserId, //新建用户id
+        _userid = US.userInfo.userid, //新建用户id
         _input = $$("input", { "placeholder": "请输入文件夹名字", "style": { "width": "180px", "height": "25px"} }) //输入的名字
     //弹出comfir
     U.MD.DK.RE.newconfirm(
@@ -238,7 +238,7 @@ U.MD.DK.RE.newText.confirm = function (diskinfo, directoryid, fun) {
         _groupid, //群id
         _newguid = Guid.newGuid(), //新建文件夹的id
         _dirinfo = U.Json.select(diskinfo.directoryOrFiles, { "UserDirectoryID": directoryid })[0], //目录网盘信息
-        _userid = US.userInfo.UserId, //新建用户id
+        _userid = US.userInfo.userid, //新建用户id
         _input = $$("input", { "placeholder": "请输入新文本文档的命名", "style": { "width": "180px", "height": "25px", "padding-left": "7px"} }); //输入的名字
     //弹出comfirm
     U.MD.DK.RE.newconfirm(_input,
@@ -296,7 +296,7 @@ U.MD.DK.RE.newDocument.confirm = function (diskinfo, directoryid, fun, fileid) {
         _groupid, //群id
         _newguid = fileid || Guid.newGuid(), //新建文件夹的id
         _dirinfo = U.Json.select(diskinfo.directoryOrFiles, { "UserDirectoryID": directoryid })[0], //目录网盘信息
-        _userid = US.userInfo.UserId, //新建用户id
+        _userid = US.userInfo.userid, //新建用户id
         _input = $$("input", { "placeholder": "请输入文档名字", "style": { "width": "180px", "height": "25px"} }); //输入的名字
 
     return U.MD.DK.RE.newconfirm(_input, //创建文档的框
@@ -356,7 +356,7 @@ U.MD.DK.RE.newExcel.confirm = function (diskinfo, directoryid) {
         _groupid, //群id
         _newguid = Guid.newGuid(), //新建文件夹的id
         _dirinfo = U.Json.select(diskinfo.directoryOrFiles, { "UserDirectoryID": directoryid })[0], //目录网盘信息
-        _userid = US.userInfo.UserId, //新建用户id
+        _userid = US.userInfo.userid, //新建用户id
         _input = $$("input", { "placeholder": "请输入表格名字", "style": { "width": "180px", "height": "25px"} }); //输入的名字    
     U.MD.DK.RE.newconfirm(_input, //创建文档的框
         function () {
@@ -797,13 +797,13 @@ U.MD.DK.RE.paste = function (diskinfo) {
         //剪切的处理
         if (_type == "shear") {
             //调用剪切的函数    用户ID  粘贴目录id  文件和目录的id集合 群元素
-            U.A.Request(US.DISK, ["CutAndPasteFiles", US.userInfo.UserId, _dirid, _fileordirids, _groupid, _dirorfile[0].GroupID], U.MD.DK.RE.asynPaste, ["", _dirinfo, _groupid, _pastecontent, diskinfo, _pastecontent.type]);
+            U.A.Request(US.DISK, ["CutAndPasteFiles", US.userInfo.userid, _dirid, _fileordirids, _groupid, _dirorfile[0].GroupID], U.MD.DK.RE.asynPaste, ["", _dirinfo, _groupid, _pastecontent, diskinfo, _pastecontent.type]);
             _pastecontent.type = "copy";
         }
         //复制的处理
         else {
             //调用复制的函数
-            U.A.Request(US.DISK, ["CopyAndPasteFiles", US.userInfo.UserId, _dirid, _fileordirids, _groupid], U.MD.DK.RE.asynPaste, ["", _dirinfo, _groupid, _pastecontent, diskinfo, _pastecontent.type]);
+            U.A.Request(US.DISK, ["CopyAndPasteFiles", US.userInfo.userid, _dirid, _fileordirids, _groupid], U.MD.DK.RE.asynPaste, ["", _dirinfo, _groupid, _pastecontent, diskinfo, _pastecontent.type]);
         }
     }
 }
@@ -831,7 +831,7 @@ U.MD.DK.RE.asynPaste = function (r) {
     }
     //循环设置粘贴文件的属性
     for (i = 0; i < _pasteinfo.length; i++) {
-        _pasteinfo[i] = new U.MD.DK.M.entity(_pasteinfo[i].UserDirectoryID, _pasteinfo[i].UserDirectorySize, _pasteinfo[i].UserDirectoryParentID, _pasteinfo[i].UserDirectoryName, _pasteinfo[i].UserDirectoryName, _pasteinfo[i].UserDirectoryExtendType, _pasteinfo[i].UserDirectoryUrl, _pasteinfo[i].UserDirectoryAddTime, _pasteinfo[i].UserDirectoryUrl, _pasteinfo[i].UserDirectoryDeep, null, _pasteinfo[i].UserDirectoryEncrypt, _pasteinfo[i].UserDirectoryExtendType == "folder" ? 0 : 1, "", _pasteinfo[i].UserDirectoryEncrypt, "", US.userInfo.UserId, US.userInfo.UserNickName, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead)
+        _pasteinfo[i] = new U.MD.DK.M.entity(_pasteinfo[i].UserDirectoryID, _pasteinfo[i].UserDirectorySize, _pasteinfo[i].UserDirectoryParentID, _pasteinfo[i].UserDirectoryName, _pasteinfo[i].UserDirectoryName, _pasteinfo[i].UserDirectoryExtendType, _pasteinfo[i].UserDirectoryUrl, _pasteinfo[i].UserDirectoryAddTime, _pasteinfo[i].UserDirectoryUrl, _pasteinfo[i].UserDirectoryDeep, null, _pasteinfo[i].UserDirectoryEncrypt, _pasteinfo[i].UserDirectoryExtendType == "folder" ? 0 : 1, "", _pasteinfo[i].UserDirectoryEncrypt, "", US.userInfo.userid, US.userInfo.UserNickName, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead)
     }
     //在粘贴网盘的数组目录中添加值
     U.MD.DK.RE.addFileOrFolder(_pasteinfo, _diskinfo, _dirinfo);

+ 3 - 3
js/DomanSystem/DomainSystem.js

@@ -76,7 +76,7 @@ U.MD.DS.createDefaultDomainInit = function (wordinfo, domaintype, callback) {
     var cbJson = [].slice.call(arguments, arguments.length - 1);
     typeof cbJson[0] === 'function' && (U.MD.DS.DnsInfo.CallBack = cbJson[0]);
     //未登录处理,弹出登录框,登录或者注册
-    if (US.userInfo.UserId == undefined) {
+    if (US.userInfo.userid == undefined) {
         U.MD.U.L.login(3); //弹出登录框,登录或者注册
     }
     //登录处理,弹出域名管理系统,添加域名区域
@@ -207,7 +207,7 @@ U.MD.DS.dnsInit = function (fileId, domaintype) {
             U.alert('没有此文件的信息');
         }
 
-        U.A.Request("http://cd.1473.cn/php", ["db.1473.cn", "UseStudio_DNS", "GetUserDns", US.userInfo.UserId], function (r) {
+        U.A.Request("http://cd.1473.cn/php", ["db.1473.cn", "UseStudio_DNS", "GetUserDns", US.userInfo.userid], function (r) {
             var _el = $("#U_MD_DM_B_Manage_Pop")[0],
             _userDomainData = r.value;
             for (var i = 0; i < _userDomainData.length; i++) {
@@ -555,7 +555,7 @@ U.MD.DS.CreateDnsSuccess = function (value) {
 */
 U.MD.DS.myDomainAdmin = function (value, pageindex, pagesize, el) {
     //获取数据
-    U.A.Request("http://cd.1473.cn/php", ["db.1473.cn", "UseStudio_DNS", "GetMyAdminByUidPage", US.userInfo.UserId, value, pageindex, pagesize], function (r) {
+    U.A.Request("http://cd.1473.cn/php", ["db.1473.cn", "UseStudio_DNS", "GetMyAdminByUidPage", US.userInfo.userid, value, pageindex, pagesize], function (r) {
         var data = r.value;
         el.innerHTML = "";
         U.MD.DS.myDomainAdmin.printHtml(data, el);

+ 11 - 11
js/Forum/ForumHome.js

@@ -158,7 +158,7 @@ U.MD.D.PB.CKWDFB = function (UP, UDE, userid) {
             _UDPD = _UDOD.Parent(3),
             _UDAD = _UDOD.Child(),
             _UDTD = $("#UD_SYSXZBYPL")[0];
-        userid = userid || US.userInfo.UserId;
+        userid = userid || US.userInfo.userid;
         $("#UD_SYSXZBYT")[0].innerHTML = "";
         if (!_UPE || !_UPE[0] || !_UPE[0].length) { $(_UDTD).Parent().style.display = "none" };
         _UGE["DBK"] = UDE;
@@ -203,10 +203,10 @@ U.MD.D.PB.YMHBK = U.MD.D.PB.DJPBCKMU = function (UDE, fun, UDOD, userid) {
     U.MD.D.PB.Pa.XSYCBK(_UDTD.Parent());
     _UGE["UHID"] = "";  //切换展示
     if (_UAE) {
-        if (!US.userInfo.UserId) { U.MD.U.L.loginCallBack = function () { U.MD.D.PB.DJPBCKMU(UDE, fun, UDOD, userid); }  }; //点击查看目录信息
+        if (!US.userInfo.userid) { U.MD.U.L.loginCallBack = function () { U.MD.D.PB.DJPBCKMU(UDE, fun, UDOD, userid); }  }; //点击查看目录信息
         if (_UAE[2] == 2 && userid) { //获取是否收藏了本模块
-            U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_S_IFPBCollect", UDE.UserDirectoryID, US.userInfo.UserId || US.EMPTYGUID]), U.MD.D.PB.CMHBK, ["", function () { U.MD.D.PB.DJPBCKMU(UDE, fun, UDOD, userid); } ];
-            //   U.A.Request(US.AUTH,"pb.IFCollect", [UDE.UserDirectoryID, US.userInfo.UserId || US.EMPTYGUID]), U.MD.D.PB.CMHBK, ["", function(){U.MD.D.PB.DJPBCKMU(UDE, fun, UDOD, userid);}];
+            U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_S_IFPBCollect", UDE.UserDirectoryID, US.userInfo.userid || US.EMPTYGUID]), U.MD.D.PB.CMHBK, ["", function () { U.MD.D.PB.DJPBCKMU(UDE, fun, UDOD, userid); } ];
+            //   U.A.Request(US.AUTH,"pb.IFCollect", [UDE.UserDirectoryID, US.userInfo.userid || US.EMPTYGUID]), U.MD.D.PB.CMHBK, ["", function(){U.MD.D.PB.DJPBCKMU(UDE, fun, UDOD, userid);}];
         }
         else { //打印目录信息
             U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_B_S_GetNexDiretory", UDE.UserDirectoryID || UDE.PublishedDirectoryID, US.EMPTYGUID]), U.MD.D.PB.AsynGetND, ["", UDE];
@@ -256,7 +256,7 @@ U.MD.D.PB.CLYMHBK = function (UGE, UDE, UKE, UDID) {
 
 //下级版块目录展示
 U.MD.D.PB.XJBKMU = function (UDOD, UDE, UBE) {
-    //     var _UCE, i = 0, _UGE = U.MD.D.H.ET["NT"]["PB"]["BK"], _USID = _UGE["USID"], _userid = US.userInfo.UserId, _UDFD = $$("div", { "className": "UD_SYSXZBYTC" }); UDOD.innerText = ""; (!UDE) && (UDE = []); (UBE.PublishedParentID != US.FORUMROOTID) && (i--);
+    //     var _UCE, i = 0, _UGE = U.MD.D.H.ET["NT"]["PB"]["BK"], _USID = _UGE["USID"], _userid = US.userInfo.userid, _UDFD = $$("div", { "className": "UD_SYSXZBYTC" }); UDOD.innerText = ""; (!UDE) && (UDE = []); (UBE.PublishedParentID != US.FORUMROOTID) && (i--);
     //    for (i; i < UDE.length; i++) { _UCE = i < 0 ? U.Json.select(_UGE,{ "UserDirectoryID": UBE.PublishedParentID })[0] : UDE[i];
     //     $$("div", { "className": "UD_SYSXZBYTO", "innerHTML": i < 0 ? "< 返回上一层" : UDE[i].UserDirectoryName, "onclick": (_userid && _USID == _userid) ? function(){U.MD.D.PB.CKWDFB, [1, _UCE, _userid]]] : [[U.MD.D.PB.DJPBCKMU(_UCE);} }, _UDFD); }
     //    (i || UBE.PublishedParentID != US.FORUMROOTID) ? (UDOD.style.display = "block", UDOD.appendChild(_UDFD)) : UDOD.style.display = "none";
@@ -281,7 +281,7 @@ U.MD.D.PB.CKBKTZCL = function (UDOD, UDE) {
 //设置版块功能切换
 U.MD.D.PB.CSYMHBK = function (UDOD, UDE) {
     var i,
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _UDAD = $(UDOD).Child(),
      _UKE = ["GX", "Img", "Rm", "Me", "Disk"];
     for (i = 0; i < 5; i++) {
@@ -334,7 +334,7 @@ U.MD.D.PB.FYYMHBK = function (UP, cb) {
     UP = UP || "";
     var _UTF,
     _UPE,
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _UGE = U.MD.D.H.ET["NT"]["PB"],
     _USID = _UGE["USID"],
     _UDE = _UGE["DBK"];
@@ -389,7 +389,7 @@ U.MD.D.PB.PBCK = function (UP, UDE) {
 U.MD.D.PB.GNXZCK = function (UTF, UDOD, UDE, UP) {
     var _UCE, _UKE, _UPE, _UFT, _UAID = US.EMPTYGUID,
     _UBE = US.userInfo.PB,
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _UDID = UDE.UserDirectoryID,
     _UDTD = $("#UD_SYSXZBYPR")[0],
     _UVT = (UDOD && UDOD.className == "UD_SYSXZBECTC UD_SYSXZBECTO"),
@@ -411,7 +411,7 @@ U.MD.D.PB.GNXZCK = function (UTF, UDOD, UDE, UP) {
         if (!_UPE[0] || _UVT) {//更新数据 或者获取数据
             _UCE[2] = [_UDID, (_UPE[1] - 1) * 100, _UPE[1] * 100];
             if (_UCE[0] == "Publicpage") { _UCE[2].push(1); }
-            else if (_UCE[0] == "GetMeA") { _UCE[2].unshift(US.userInfo.UserId); }; //获取数据前处理
+            else if (_UCE[0] == "GetMeA") { _UCE[2].unshift(US.userInfo.userid); }; //获取数据前处理
             if (_UVT && _UKE && _UKE[1] && _UKE[1][0]) { _UAID = _UKE[1][0].ArticleID };
             _UCE[2].push(_UAID); _UCE[2].push(_UFT ? _userid : US.EMPTYGUID); //是否更新数据
             _UCE[2].unshift(_UCE[0]);
@@ -553,7 +553,7 @@ U.MD.D.PB.NSYPBL = function (UDOD, UDE, UBE, UTF) {
 
 //文章打印
 U.MD.D.PB.PBSYWZ = function (UDE, UDOD, UBE) {
-    var _UTF, _UDTD, _UDPD, _UDSD, _UDID, _UDQD, _UDVD, _UDHD, _UDLD, _UDBD, _UDKD, _UDRD, _UDCD, _UDMD, _UDGD, _UDED, _UIMG, _userid = US.userInfo.UserId, _UN = UDE.UserNickName || UDE.UserName;
+    var _UTF, _UDTD, _UDPD, _UDSD, _UDID, _UDQD, _UDVD, _UDHD, _UDLD, _UDBD, _UDKD, _UDRD, _UDCD, _UDMD, _UDGD, _UDED, _UIMG, _userid = US.userInfo.userid, _UN = UDE.UserNickName || UDE.UserName;
     _UDTD = $$("div", { "onclick": function () { U.MD.D.PB.A.WAPMHBK(UDE, UBE, null, this); }, "className": "UD_SYSXZBPO" }, UDOD);
     _UDPD = $$("div", { "className": "UD_SYSXZBMCOS" }, _UDTD);
     _UDSD = $$("div", { "className": "UD_SYSXZBMCOT UD_SYSXZBMCOTB" }, _UDPD);
@@ -589,7 +589,7 @@ U.MD.D.PB.PBSYWZML = function (UDE, UBE) {
     var _UGE = U.MD.D.H.ET["NT"]["PB"],
      _UDID = UDE["PublishedDirectoryID"] || UDE["UserDirectoryID"];
     UBE = UBE || U.Json.select(_UGE["BK"], { "UserDirectoryID": _UDID })[0];
-    U.MD.D.PB.DJPBCKMU(UBE || { "UserDirectoryID": _UDID, "UserDirectoryName": UDE["UserDirectoryName"] }, null, null, _UGE["USID"] == US.userInfo.UserId ? _UGE["USID"] : null); //查看目录信息
+    U.MD.D.PB.DJPBCKMU(UBE || { "UserDirectoryID": _UDID, "UserDirectoryName": UDE["UserDirectoryName"] }, null, null, _UGE["USID"] == US.userInfo.userid ? _UGE["USID"] : null); //查看目录信息
 }
 
 //#endregion

+ 10 - 10
js/Forum/ForumPlate.js

@@ -209,7 +209,7 @@ U.MD.D.PB.Pa.QDSQPGHBK = function (UDOD, UDE, cb) {
         if ((_UDN = UDOD.value) && _UDN != UDOD.defaultValue) {//如果没有任何输入就不提示
             if ((_UTF = U.UF.S.FFZF.test(_UDN)) && _UDN.length) { //输入限制
                 U.MD.D.H.ET.PB.SQ = true;
-                U.A.Request(US.AUTH, ["IsDName", _UDN, US.userInfo.UserId, _UDE ? (_UDE["UserDirectoryID"] || _UDE["PublishedDirectoryID"]) : US.FORUMROOTID, "1", _UFT],
+                U.A.Request(US.AUTH, ["IsDName", _UDN, US.userInfo.userid, _UDE ? (_UDE["UserDirectoryID"] || _UDE["PublishedDirectoryID"]) : US.FORUMROOTID, "1", _UFT],
                 U.MD.D.PB.Pa.AsynQDSQPGHBK, ["", UDOD, UDE, _UDPD, _UDED, _UFT, cb]); _UTS = "检测中...";
             }
             U.MD.D.PB.Pa.SQPGHBKTS(_UDED, _UTS || (_UTF ? "输入内容长度不允许大于50" : "不允许输入特殊字符")); //提示
@@ -249,7 +249,7 @@ U.MD.D.PB.Pa.SSQPGHBK = function (UDOD, UDID, UDPD, UDE, cb) {
     _UDN = UDID.value;
     U.MD.D.H.ET.PB.SQ = true;
     U.MD.D.PB.Pa.SQPGHBKTS(_UDED, "等待服务器响应");
-    U.A.Request(US.AUTH, ["addRoot", _UDN, US.userInfo.UserId, UDE ? (UDE["UserDirectoryID"] || UDE["PublishedDirectoryID"]) : US.FORUMROOTID, "1"], U.MD.D.PB.Pa.AsynSSQPGHBK, ["", UDID, UDE, UDPD, _UDED, false, cb]);
+    U.A.Request(US.AUTH, ["addRoot", _UDN, US.userInfo.userid, UDE ? (UDE["UserDirectoryID"] || UDE["PublishedDirectoryID"]) : US.FORUMROOTID, "1"], U.MD.D.PB.Pa.AsynSSQPGHBK, ["", UDID, UDE, UDPD, _UDED, false, cb]);
 }
 
 //确定申请版块
@@ -295,8 +295,8 @@ U.MD.D.PB.Pa.AsynGetBKID = function (r) {
 //删除板块
 U.MD.D.PB.Pa.SCBK = function (UDID, UTF, cb) {
     if (!U.MD.U.L.isLogin()) {
-        U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteSubject", US.userInfo.UserId, UDID, UTF ? 1 : 0]), U.MD.D.PB.Pa.AsynSCBK, ["", UDID, cb];
-        //   U.A.Request(US.AUTH,"pb.DeleteSubject", [US.userInfo.UserId, UDID, UTF ? 1 : 0]), U.MD.D.PB.Pa.AsynSCBK, ["", UDID, cb]; 
+        U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteSubject", US.userInfo.userid, UDID, UTF ? 1 : 0]), U.MD.D.PB.Pa.AsynSCBK, ["", UDID, cb];
+        //   U.A.Request(US.AUTH,"pb.DeleteSubject", [US.userInfo.userid, UDID, UTF ? 1 : 0]), U.MD.D.PB.Pa.AsynSCBK, ["", UDID, cb]; 
     }
 }
 
@@ -320,10 +320,10 @@ U.MD.D.PB.Pa.AsynSCBK = function (r) {
 //修改板块信息
 U.MD.D.PB.Pa.XGBKX = function (UDID, USN, UPID, cb) {
     if (!U.MD.U.L.isLogin()) {
-        U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UU_P_U_ModifyDirectory", US.userInfo.UserId, UDID, USN, UPID || US.EMPTYGUID]), U.MD.D.PB.Pa.AsynXGBKX, ["", cb];
+        U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UU_P_U_ModifyDirectory", US.userInfo.userid, UDID, USN, UPID || US.EMPTYGUID]), U.MD.D.PB.Pa.AsynXGBKX, ["", cb];
     }
 
-    //  if (!U.MD.U.L.isLogin()) { U.A.Request(US.AUTH,"pb.ModifySubjectBG", [US.userInfo.UserId, UDID, USN, UPID || US.EMPTYGUID]), U.MD.D.PB.Pa.AsynXGBKX, ["", cb]; }
+    //  if (!U.MD.U.L.isLogin()) { U.A.Request(US.AUTH,"pb.ModifySubjectBG", [US.userInfo.userid, UDID, USN, UPID || US.EMPTYGUID]), U.MD.D.PB.Pa.AsynXGBKX, ["", cb]; }
 }
 
 //修改板块
@@ -338,7 +338,7 @@ U.MD.D.PB.Pa.AsynXGBKX = function (r) {
 //添加收藏版块
 U.MD.D.PB.Pa.SCYMHBK = function (UBE, UDOD, fun) {
     if (!U.MD.U.L.isLogin() && (!UBE["IF"] || UBE["IF"][2] != 2)) {//添加版块收藏
-        var _UDE = ["您确认要收藏该版块吗", "AddCollect", [US.userInfo.UserId, UBE.UserDirectoryID || UBE.PublishedDirectoryID]];
+        var _UDE = ["您确认要收藏该版块吗", "AddCollect", [US.userInfo.userid, UBE.UserDirectoryID || UBE.PublishedDirectoryID]];
         if (UBE["IF"] && UBE["IF"][2]) { _UDE[0] = "您取消版块收藏吗", _UDE[1] = "DCollect", _UDE[2].splice(1, 0, "") };
         U.Alert("服务器同步中...");
         U.A.Request(US.AUTH, "pb." + _UDE[1], _UDE[2], U.MD.D.PB.Pa.AsynSCYMHBK, ["", UBE, UDOD, fun]); //添加或者删除收藏
@@ -395,11 +395,11 @@ U.MD.D.PB.Pa.AsynSCYMHBK = function (r) {
 
 //获取用户所有的收藏
 U.MD.D.PB.Pa.ZSYMHBK = function (UP) {
-    if (US.userInfo.UserId) { //用户收藏版块
+    if (US.userInfo.userid) { //用户收藏版块
         var _UPE = 1, _UDE = US.userInfo["SC"]; (_UDE) && (_UPE = U.MD.D.D.FYGBL(_UDE, UP, [30, 300]), U.MD.D.H.PZSYMHBK((_UDE = _UPE[0])), _UPE = _UPE[1]); //打印搜藏
-        if (_UDE) { U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_S_GetUserPBCollect", US.userInfo.UserId, US.userInfo.UserId, _UPE * 50 - 50, _UPE * 50]), U.MD.D.PB.Pa.AsynZSYMHBK, ["", UP] }; //获取用户收藏的版块
+        if (_UDE) { U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UB_P_S_GetUserPBCollect", US.userInfo.userid, US.userInfo.userid, _UPE * 50 - 50, _UPE * 50]), U.MD.D.PB.Pa.AsynZSYMHBK, ["", UP] }; //获取用户收藏的版块
 
-        // (_UDE) && (U.A.Request(US.AUTH,"pb.GetCollect", [US.userInfo.UserId, _UPE * 50 - 50, _UPE * 50]), U.MD.D.PB.Pa.AsynZSYMHBK, ["", UP]); //获取用户收藏的版块
+        // (_UDE) && (U.A.Request(US.AUTH,"pb.GetCollect", [US.userInfo.userid, _UPE * 50 - 50, _UPE * 50]), U.MD.D.PB.Pa.AsynZSYMHBK, ["", UP]); //获取用户收藏的版块
     }
     else { parent.U.Alert("请登录"); } //未登录展示
 }

+ 6 - 6
js/Forum/ForumPost.js

@@ -55,7 +55,7 @@ U.MD.D.PB.A.WAPMHBK = function (UDE, UBE, URID, UDOD) {
             U.MD.N.UrlWrite["pbt", UDE["ArticleID"]], UDE["ArticleTitle"]; //设置url提示
         }
         else { //帖子打印
-            U.A.Request(US.AUTH, ["GetPND", _UDID || US.EMPTYGUID, (US.userInfo.UserId || US.EMPTYGUID), UDE.ArticleID]), U.MD.D.PB.A.AsynWAPMHBK, [[_UDTD, true], UDE, _UGE, UBE, URID, UDOD]; //获取后腰数据
+            U.A.Request(US.AUTH, ["GetPND", _UDID || US.EMPTYGUID, (US.userInfo.userid || US.EMPTYGUID), UDE.ArticleID]), U.MD.D.PB.A.AsynWAPMHBK, [[_UDTD, true], UDE, _UGE, UBE, URID, UDOD]; //获取后腰数据
         }
     }
     catch (e) { }
@@ -119,7 +119,7 @@ U.MD.D.PB.A.AsynAPMHBK = function (r) {
 */
 U.MD.D.PB.A.PAPMHBK = function (UDE, UBE, UDOD, UDTD) {
     var _UDCD, _UIMG = [], _UIF = UDE["IF"], //各个部分的元素,文章详细信息
-     _userid = US.userInfo.UserId, //用户id
+     _userid = US.userInfo.userid, //用户id
     _UDAD = $(UDOD).Child(); //内容
 
     //头部
@@ -218,8 +218,8 @@ U.MD.D.PB.A.PAPMHTJ = function (UDE, UDOD, cb) {
                 ArticleContentBrief: _UST,
                 ArticleTitle: _UIT, ArticleContent: _UST
             });
-            U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UU_P_U_ModifyArticle", US.userInfo.UserId, UDE.ArticleID, _UIT, _UST, U.UF.C.getBriefText(_UST)]), U.MD.D.PB.A.AsynPAPMHTJ, ["", cb];
-            //    U.A.Request(US.AUTH,"pb.modifyarticle", [US.userInfo.UserId, UDE.ArticleID, _UIT, _UST], U.MD.D.PB.A.AsynPAPMHTJ, ["", cb]);
+            U.A.Request(US.CD, [US.DB, "UseStudio_Blog", "UU_P_U_ModifyArticle", US.userInfo.userid, UDE.ArticleID, _UIT, _UST, U.UF.C.getBriefText(_UST)]), U.MD.D.PB.A.AsynPAPMHTJ, ["", cb];
+            //    U.A.Request(US.AUTH,"pb.modifyarticle", [US.userInfo.userid, UDE.ArticleID, _UIT, _UST], U.MD.D.PB.A.AsynPAPMHTJ, ["", cb]);
         }
         U.Alert(_UAT || "同步中"); return !_UAT;
     }
@@ -278,7 +278,7 @@ U.MD.D.PB.A.ModifyA = function (UDE, UDOD, UDTD, UDSD) {
 
 //搜索帖子
 U.MD.D.PB.A.TZSS = function (UDOD, UP, UDID) {
-    var _UGE = U.MD.D.H.ET["NT"]["PB"], _userid = US.userInfo.UserId,
+    var _UGE = U.MD.D.H.ET["NT"]["PB"], _userid = US.userInfo.userid,
     _UBE = _UGE["DBK"],
     _UDV = UDOD.value.trim().addEllipsis(50).valueOf();
     if (UDOD.value != UDOD.defaultValue && _UDV) {
@@ -392,7 +392,7 @@ U.MD.D.PB.A.AsynFBMSSBKG = function (r) {
      _UCB = _context[4],
       _UTF = "服务器繁忙";
     r = r.value;
-    _UCE = new U.MD.D.PB.A.BMSSBTI[0, U.UF.D.toTimeStamp(new Date()), _context[3], _context[3], r, 0, _context[2], US.userInfo.UserId, US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead]
+    _UCE = new U.MD.D.PB.A.BMSSBTI[0, U.UF.D.toTimeStamp(new Date()), _context[3], _context[3], r, 0, _context[2], US.userInfo.userid, US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead]
     if (r) {
         _UTF = "发表成功";
         if (_UDE["IF"] || US.userInfo.PB) {

+ 4 - 4
js/Forum/ForumReply.js

@@ -113,7 +113,7 @@ U.MD.D.PB.Re.PRPMHBK = function (UDE, UDOD, UAE, URID) {
                 U.MD.D.PB.Re.XPRPMHBK(_UDSD, UDE[i], UAE);
             }
         }, _UDID);
-        if (UDE[i].ReplyAddUserID == US.userInfo.UserId) {
+        if (UDE[i].ReplyAddUserID == US.userInfo.userid) {
             $$("div",
             {
                 "className": "UD_SYBFOZTK UD_SYBFOZTKO",
@@ -161,7 +161,7 @@ U.MD.D.PB.Re.PRPMHBK = function (UDE, UDOD, UAE, URID) {
                     U.MD.D.PB.Re.XPRPMHBK(_UDID, _UCE[j], UAE, UDE[i]);
                 }
             }, _UDKD);
-            if (_UCE[j].ReplyAddUserID == US.userInfo.UserId) {
+            if (_UCE[j].ReplyAddUserID == US.userInfo.userid) {
                 $$("div",
                 {
                     "className": "UD_SYBFOZTK UD_SYBFOZTKO",
@@ -205,7 +205,7 @@ U.MD.D.PB.Re.XPRPMHBK = function (UDOD, UDE, UAE, UPE) {
 //添加回复
 U.MD.D.PB.Re.APRPMHBK = function (UDE, UDOD, UAE, UPE) {
     var _UTH = UDOD.innerHTML, _UTF = "请先登录", _URID = UDE ? (UDE.ReplyParentID || UDE.ReplyID) : "";
-    if (US.userInfo.UserId) { //发表帖子
+    if (US.userInfo.userid) { //发表帖子
         _UTF = "回复的内容部能为空";
         if (UDOD.innerText.trim().length > 0 && _UTH != "发表评论...") {
             _UTF = "正在回帖请稍等";
@@ -225,7 +225,7 @@ U.MD.D.PB.Re.AsynAPRPMHBK = function (r) {
     _UAE = _context[4] || _context[2];
     r = r.value;
     if (r) {
-        (_UDE ? _UAE["RR"] : _UAE["Reply"][1]).unshift((_URE = new U.MD.D.PB.Re.TPRPMHBK[_UDE ? _UDE.UserNickName : "", U.UF.D.toTimeStamp(new Date()), US.userInfo.UserId, _UAID, r, _UDE ? (_UDE.ReplyParentID || _UDE.ReplyID) : "", _UDE ? _UDE.ReplyAddUserID : "", US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead]));
+        (_UDE ? _UAE["RR"] : _UAE["Reply"][1]).unshift((_URE = new U.MD.D.PB.Re.TPRPMHBK[_UDE ? _UDE.UserNickName : "", U.UF.D.toTimeStamp(new Date()), US.userInfo.userid, _UAID, r, _UDE ? (_UDE.ReplyParentID || _UDE.ReplyID) : "", _UDE ? _UDE.ReplyAddUserID : "", US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead]));
         $("#UD_SYPCLCD div")[4].innerHTML = (_UAE.ArticleReplayNumber++) + 1; U.MD.D.PB.Re.RPMHBK(_context[2], 1); _UST = "发表回复成功";
     }
     U.Alert(_UST);

+ 15 - 15
js/Friend/Add.js

@@ -47,7 +47,7 @@ U.MD.F.J.groupInfoForm = function (groupinfo, chatel) {
             $('.U_MD_F_Add_C')[0].style.display="block";
         }
         if (groupinfo) {
-            _isgroupmain = groupinfo.GroupManageCreateUserID == US.userInfo.UserId; //群主
+            _isgroupmain = groupinfo.GroupManageCreateUserID == US.userInfo.userid; //群主
         } else {
             _isgroupmain = !groupinfo; //新建群
         }
@@ -71,7 +71,7 @@ U.MD.F.J.groupInfoForm = function (groupinfo, chatel) {
         //点击退出按钮事件设置
         $(_groupinfochildsel[2]).addAttrArray({
             "onclick": function () {
-                U.MD.F.J.groupExit(groupinfo, U.Json.selectOne(_groupuserinfo, { "UserId": US.userInfo.UserId }), _groupinfoel);
+                U.MD.F.J.groupExit(groupinfo, U.Json.selectOne(_groupuserinfo, { "UserId": US.userInfo.userid }), _groupinfoel);
             },
             "innerHTML": _isdeletegroup
         });
@@ -157,7 +157,7 @@ U.MD.F.J.printGroupUserInfo = function (el, groupuserinfo, groupinfo) {
         _isgroupmain;
     //判断是否是群主
     if (groupinfo) {
-        _isgroupmain = groupinfo.GroupManageCreateUserID == US.userInfo.UserId;
+        _isgroupmain = groupinfo.GroupManageCreateUserID == US.userInfo.userid;
     } else {
         _isgroupmain = !groupuserinfo;
     }
@@ -187,7 +187,7 @@ U.MD.F.J.printGroupUserInfo = function (el, groupuserinfo, groupinfo) {
         //这有已经新建的群
         if (groupinfo) {
             //只有本人或者群主才能修改群名片
-            if (_isgroupmain || groupuserinfo[i].UserId == US.userInfo.UserId) {
+            if (_isgroupmain || groupuserinfo[i].UserId == US.userInfo.userid) {
                 $$("img",
                 {
                     "src": "/img/Edit1.png",
@@ -278,7 +278,7 @@ U.MD.F.J.upateGroupUserDescriptForm = function (groupuserinfo, el) {
 U.MD.F.J.determineUpateGroupUserDescript = function (groupuserinfo, inputel, el) {
     //判断用户是否输入正确的备注名
     if (inputel.value && U.UF.S.NickName.test(inputel.value)) {
-        U.A.Request(US.FRIEND, ["UpdateGroupMemberInfo", US.userInfo.UserId, groupuserinfo.GroupManageID, groupuserinfo.UserId, inputel.value],
+        U.A.Request(US.FRIEND, ["UpdateGroupMemberInfo", US.userInfo.userid, groupuserinfo.GroupManageID, groupuserinfo.UserId, inputel.value],
                    U.MD.F.J.asynDetermineUpateGroupUserDescript, [null, groupuserinfo, inputel.value, el]);
     }
     else {
@@ -309,7 +309,7 @@ U.MD.F.J.asynDetermineUpateGroupUserDescript = function (r) {
 * @param  {object} 好友信息
 */
 U.MD.F.J.groupExit = function (groupinfo, userinfo, el) {
-    var _userid = US.userInfo.UserId, //用户id
+    var _userid = US.userInfo.userid, //用户id
         _isgroupmain = groupinfo.GroupManageCreateUserID == _userid //判断用户是否是群主
     ;
     //如果推出群的是群主处理
@@ -344,10 +344,10 @@ U.MD.F.J.groupExit = function (groupinfo, userinfo, el) {
 U.MD.F.J.enterGroupExit = function (groupinfo, userinfo, isdelete, el) {
     if (isdelete === true) {
         U.A.Request(US.FRIEND,
-          ["DeleteGroup", US.userInfo.UserId, groupinfo.GroupManageID], U.MD.F.J.asynGroupExit, ["", groupinfo, userinfo, isdelete, el]); //解散群
+          ["DeleteGroup", US.userInfo.userid, groupinfo.GroupManageID], U.MD.F.J.asynGroupExit, ["", groupinfo, userinfo, isdelete, el]); //解散群
     }
     else {
-        U.A.Request(US.FRIEND, ["ExitGroup", US.userInfo.UserId, groupinfo.GroupManageID, userinfo.UserId], U.MD.F.J.asynGroupExit, ["", groupinfo, userinfo, isdelete, el]);
+        U.A.Request(US.FRIEND, ["ExitGroup", US.userInfo.userid, groupinfo.GroupManageID, userinfo.UserId], U.MD.F.J.asynGroupExit, ["", groupinfo, userinfo, isdelete, el]);
     }
 }
 
@@ -386,7 +386,7 @@ U.MD.F.J.asynGroupExit = function (r) {
         U.alert('解散群成功');
     }
     //群主删除好友处理
-    else if (_groupinfo.GroupManageUserID == US.userInfo.UserId && _isdelete == false) {
+    else if (_groupinfo.GroupManageUserID == US.userInfo.userid && _isdelete == false) {
         $(_el).remove(); //删除好友
         U.Json.del(US.friend.groupusers, { "GroupManageID": _friendinfo.GroupManageID, "UserId": _friendinfo.UserId }); //删除群指定的用户
         U.Json.del(U.MD.F.J.selectUserInfo.SelectUser, { "UserId": _friendinfo.UserId }); //删除群指定的用户
@@ -701,7 +701,7 @@ U.MD.F.J.determineCreateGroupAndAddGroupUser = function (groupid, el, chatel, up
         _groupinfo, //群信息
         _inputs = $("input,textarea", el), //输入的群信息
         _adduserinfo = U.MD.F.J.selectUserInfo.NeedUser, //需要添加用户的集合
-        _userid = US.userInfo.UserId, //用户的id
+        _userid = US.userInfo.userid, //用户的id
         _groupname = groupname == undefined ? _inputs[0].value : groupname, //创建的群名
         _groupdescript = groupdescript == undefined ? _inputs[1].value : groupdescript, //创建的群描述
         _groupuserids = U.Json.toKeyArray(_adduserinfo, "UserId").join(",") //添加进入群所有好友的id
@@ -923,7 +923,7 @@ U.MD.F.J.changeInfo = function (groupid, groupname, groupds, fileid, cb) {
     var i, _isgroup,
     // _UCB = U.MD.F.J.asynDetermineCreateGroupAndAddGroupUser, //创建群异步回调
     _groupsign = 1, //判断是否已经创建。如果没有创建,就把_UTF的值设置为0,0在存储过程的传参作用是创建群, 1是不创建直接修改群名
-    _userid = US.userInfo.UserId, //当前用户id 也是群主id
+    _userid = US.userInfo.userid, //当前用户id 也是群主id
     _groupinfo = [groupname, groupds], //群名和群描述的数组 [0]群名 [1]群描述
     _groupfriend = U.MD.F.J.selectUserInfo.NeedUser, //需要添加用户的集合(群用户)
     _grouparr = new Array(); //创建一个新的数组
@@ -932,7 +932,7 @@ U.MD.F.J.changeInfo = function (groupid, groupname, groupds, fileid, cb) {
         var pd = 0;
         //循环群数组里是否有内容
         for (var u = 0; u < _grouparr.length; u++) {
-            if (_grouparr[u].UserId == _groupfriend[i].UserId || _groupfriend[i].UserId == US.userInfo.UserId) {//判断群数组是否存有需要添加到群的用户
+            if (_grouparr[u].UserId == _groupfriend[i].UserId || _groupfriend[i].UserId == US.userInfo.userid) {//判断群数组是否存有需要添加到群的用户
                 pd++
             }
         }
@@ -961,7 +961,7 @@ U.MD.F.J.changeInfo = function (groupid, groupname, groupds, fileid, cb) {
 
     // U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "CreateGroupAndAddUser", _userid, _groupinfo[0], _groupinfo[1], groupid, _useridarr, _groupsign], U.MD.F.J.asynChangeInfo, ["", _isgroup, _grouparr.splice(0, _grouparr.length), groupid, _groupinfo[0], _groupinfo[1], cb, _frienduser, groupid, _groupinfo[0]]); //添加到数据库
     //给每个群成员发送一条有关于这个uw文件的消息
-    // U.A.Request(US.CD, ([US.DB, "UseStudio_Friends", "SentMessageToFriend", US.userInfo.UserId, _frienduser, US.userInfo.UserNickName || US.userInfo.UserName, '' + groupid + ',' + _groupinfo[0] + ',' + _isgroup.GroupManageCreateDate + ',' + fileid + ',' + _isgroup.GroupManageName + '.UW', 5, false]), function(){}, [""]);
+    // U.A.Request(US.CD, ([US.DB, "UseStudio_Friends", "SentMessageToFriend", US.userInfo.userid, _frienduser, US.userInfo.UserNickName || US.userInfo.UserName, '' + groupid + ',' + _groupinfo[0] + ',' + _isgroup.GroupManageCreateDate + ',' + fileid + ',' + _isgroup.GroupManageName + '.UW', 5, false]), function(){}, [""]);
     $("#U_MD_D_emp_CK").hide()//隐藏元素
 }
 
@@ -993,7 +993,7 @@ U.MD.F.J.addUsersToGroup = function (groupinfo, cb) {
         if (!_group) {
             U.alert("正在加入,请稍等..");
             //加入群组处理
-            U.A.Request(US.FRIEND, ["AddUsersToGroup", US.userInfo.UserId, groupinfo.GroupManageID, _userid], U.MD.F.J.asynAddUsersToGroup, ["", { MessageContent: groupinfo.GroupManageID, MessageDescript: groupinfo.GroupManageName, UserId: groupinfo.UserId }, ]);
+            U.A.Request(US.FRIEND, ["AddUsersToGroup", US.userInfo.userid, groupinfo.GroupManageID, _userid], U.MD.F.J.asynAddUsersToGroup, ["", { MessageContent: groupinfo.GroupManageID, MessageDescript: groupinfo.GroupManageName, UserId: groupinfo.UserId }, ]);
         }
         //否则直接查看群消息
         else {
@@ -1009,7 +1009,7 @@ U.MD.F.J.addUsersToGroup = function (groupinfo, cb) {
 U.MD.F.J.asynAddUsersToGroup = function (r) {
     var _context = r.context,
         _cb = _context[2], //回调函数
-        _userid = US.userInfo.UserId, //用户id
+        _userid = US.userInfo.userid, //用户id
         _diskinfo = US.disk.Disks[_userid], //网盘信息
         _groupinfo = U.MD.F.N.asynPulledIntoGroups(r); //添加群文件
     //回调函数处理

+ 2 - 2
js/Friend/FriendSearch.js

@@ -322,7 +322,7 @@ U.MD.F.S.searchGroupOrFriend = function (page, isgroupserch, contentel, inputel)
     //ftp搜索的ajax处理
     else {
         //后台搜索好友的ftp
-        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "SearchFriendInfo", US.userInfo.UserId || US.EMPTYGUID, _searchvalue, _start, _end],
+        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "SearchFriendInfo", US.userInfo.userid || US.EMPTYGUID, _searchvalue, _start, _end],
                     U.MD.F.S.ajaxSearchAjax, [_loadingel, page, _searchvalue, contentel, isgroupserch]);
     }
     //滚动加载设置
@@ -411,7 +411,7 @@ U.MD.F.S.ajaxSearchAjax = function (r) {
 */
 U.MD.F.S.printSearchContent = function (friendsinfo, el, isgroup) {
     var i, _el, _tempel, _tempela, _tempelb, _tempelc, _arr,
-        _userid = US.userInfo.UserId || "",
+        _userid = US.userInfo.userid || "",
         _frag = $$("frag");
 
     if (isgroup) {

+ 17 - 17
js/Friend/FriendWindow.js

@@ -19,7 +19,7 @@ U.MD.F.W.viewFriend = U.MD.F.W.SLHCK = function (friendinfo) {
         //如果有传入好友的信息,则查看指定的好友的信息,否则弹出默认的好友窗体
         if (friendinfo) {
             //如果用户是和自己聊天,那么直接提示不允许,否则弹出好友聊天框
-            if (friendinfo.UserId == US.userInfo.UserId) {
+            if (friendinfo.UserId == US.userInfo.userid) {
                 U.alert("无法与本人聊天!");
             }
             else {
@@ -526,20 +526,20 @@ U.MD.F.W.createFriendChat = function (friendandgroupinfo) {
                 onclick: function () {
                     var _groupid,
                         _ancestors,
-                        _directoryid = US.disk.Disks[US.userInfo.UserId].directoryid,
-                        _dirinfo = U.Json.select(US.disk.Disks[US.userInfo.UserId].directoryOrFiles, { "UserDirectoryID": _directoryid })[0];
+                        _directoryid = US.disk.Disks[US.userInfo.userid].directoryid,
+                        _dirinfo = U.Json.select(US.disk.Disks[US.userInfo.userid].directoryOrFiles, { "UserDirectoryID": _directoryid })[0];
                         //获取粘贴到制定目录的群id
-                        _ancestors = U.MD.DK.C.getAncestors(_dirinfo, US.disk.Disks[US.userInfo.UserId]); //获取所有的祖先
+                        _ancestors = U.MD.DK.C.getAncestors(_dirinfo, US.disk.Disks[US.userInfo.userid]); //获取所有的祖先
                         //如果是ftp目录,那么groupid就是用户id
                         if (_ancestors[_ancestors.length - 1].UserDirectoryID == US.FTPFOLDERID) {
-                            _groupid = US.disk.Disks[US.userInfo.UserId].userInfo.UserId;
+                            _groupid = US.disk.Disks[US.userInfo.userid].userInfo.UserId;
                         }
                         //否则就是对应的群id,如果不存在那么就是""
                         else {
                             _groupid = _ancestors[_ancestors.length - 1].GroupID || "";
                         }
                     U.MD.UI.upload(
-                       "http://main.1473.cn/USUpfile.ashx?typename=UploadFlashfile&DirectoryId=" + _directoryid + "&Encrypt=" + _groupid + "&UserId=" + US.userInfo.UserId + "&IsF=true", //上传的地址
+                       "http://main.1473.cn/USUpfile.ashx?typename=UploadFlashfile&DirectoryId=" + _directoryid + "&Encrypt=" + _groupid + "&UserId=" + US.userInfo.userid + "&IsF=true", //上传的地址
                     //上传成功的回调函数
                         function (r, fileinfo) {
                             var _data = r.data  //获取服务器返回值
@@ -561,10 +561,10 @@ U.MD.F.W.createFriendChat = function (friendandgroupinfo) {
                     //得到md5的回调函数
                         function (md5, fileinfo, cb) {
                             //根据用户的md5值判断用户是否需要上传,如果需要上传则需要执行上传处理,如果已经存在后台直接给用户生成文件路径等录入数据库
-                            U.A.Request(US.AUTH, ["IfFileExistInsertDB", US.userInfo.UserId, _directoryid, _groupid, fileinfo.size, md5, U.UF.UP.getFileNameAndExtension(fileinfo.name)[1], fileinfo.name],
+                            U.A.Request(US.AUTH, ["IfFileExistInsertDB", US.userInfo.userid, _directoryid, _groupid, fileinfo.size, md5, U.UF.UP.getFileNameAndExtension(fileinfo.name)[1], fileinfo.name],
                             //判断上传文件是否存在
                             function (r) {
-                                var _userid = US.userInfo.UserId; //当前登录用户的id 
+                                var _userid = US.userInfo.userid; //当前登录用户的id 
                                 r = r.value;
                                 //获取服务器返回的值,如果服务器响应出问题了,eval的时候就会报错。
                                 try {
@@ -652,7 +652,7 @@ U.MD.F.W.createFriendChat = function (friendandgroupinfo) {
             "onclick": function () {
                 U.MD.D.I.openApplication("disk",
                    {
-                       "userid": US.userInfo.UserId,
+                       "userid": US.userInfo.userid,
                        "directoryid": friendandgroupinfo.GroupManageID
                    });
 
@@ -1073,7 +1073,7 @@ U.MD.F.W.printMessageContent = function (type, data, parent, send, friend) {
     U.MD.F.W.printFileContent(_message, _folder);
     //生成消息数据
     var _newsinfo = [{
-        "UserId": US.userInfo.UserId,
+        "UserId": US.userInfo.userid,
         "Time": new Date().getHours() + ":" + new Date().getMinutes() + ":" + new Date().getSeconds(),
         "Content": _content,
         "IMG": US.userInfo.UserThumbnailImageHead,
@@ -1082,7 +1082,7 @@ U.MD.F.W.printMessageContent = function (type, data, parent, send, friend) {
     //是否发送消息
     if (send) {
         //发送记录到数据库
-        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "SentMessageToFriend", US.userInfo.UserId, friend.UserId, US.userInfo.UserNickName, JSON.stringify(_message), 6, false], function () { });
+        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "SentMessageToFriend", US.userInfo.userid, friend.UserId, US.userInfo.UserNickName, JSON.stringify(_message), 6, false], function () { });
     }
     //打印在好友聊天
     U.MD.F.W.printFriendChatMessage(parent, _newsinfo, true);
@@ -1119,7 +1119,7 @@ U.MD.F.W.printFileContent = function (data, parent) {
 
     //            } else {
     //                U.A.Request(US.CD, ([US.DB, "UseStudio_Disk", "GetFileById", filedata.fileID]), function (r) {
-    //                    U.MD.DK.LE.openFileDirectory(r.value[0], top.US.userInfo.UserId)
+    //                    U.MD.DK.LE.openFileDirectory(r.value[0], top.US.userInfo.userid)
     //                });
     //            }
 
@@ -1132,7 +1132,7 @@ U.MD.F.W.printFileContent = function (data, parent) {
     var _type = '';
     //获取文件
     U.A.Request(US.CD, ([US.DB, "UseStudio_Disk", "GetFileById", filedata.fileID]), function (r) {
-    U.MD.DK.LE.openFileDirectory(r.value[0], top.US.userInfo.UserId)
+    U.MD.DK.LE.openFileDirectory(r.value[0], top.US.userInfo.userid)
     });
     }, [data])
     })//绑定点击事件*/
@@ -1143,14 +1143,14 @@ U.MD.F.W.printFileContent = function (data, parent) {
             var _titile = $$("div", { "className": "", style: { "cssText": "display:inline-block;margin:0px 5px;width:155px;vertical-align:top;"} }, _content);
             var _titileContent = $$("div", { innerHTML: data.fileName, style: { "cssText": "color:#000"} }, _titile);
             var _titileSize = $$("div", { innerHTML: "(" + data.fileSize + "MB)", style: { "cssText": "color:#aaaaaa;font-size:10px;line-height:10px"} }, _titile);
-            var _open = $$("div", { onclick: function () { U.MD.DK.LE.openFileDirectory(data, US.userInfo.UserId) }, innerHTML: "打开", style: { "cssText":"color:#429bfe;margin-top:-20px;text-align: right;cursor: pointer;"} }, parent);
+            var _open = $$("div", { onclick: function () { U.MD.DK.LE.openFileDirectory(data, US.userInfo.userid) }, innerHTML: "打开", style: { "cssText":"color:#429bfe;margin-top:-20px;text-align: right;cursor: pointer;"} }, parent);
             break;
         case "UW": case "txt": case "html": case "uw":     //打印文本文件
             var _content = $$("div", { style: { "cssText": "width:100%"} }, parent);
             var _icon = $$("div", { "className": "U_MD_DK_RZOD U_MD_DK_RZOS", style: { "cssText": "float:none;display:inline-block;"} }, _content);
             var _titile = $$("div", { "className": "", style: { "cssText": "display:inline-block;margin:0px 5px;width:155px;vertical-align:top;"} }, _content);
             var _titileContent = $$("div", { innerHTML: data.fileName, style: { "cssText": "color:#000"} }, _titile);
-            var _titileSize = $$("div", { onclick: function(){U.MD.DK.LE.openFileDirectory(data, US.userInfo.UserId)}, innerHTML: "查看", style: { "cssText": "color:#429bfe;margin-top:-20px;text-align: right;cursor: pointer;"} }, parent);
+            var _titileSize = $$("div", { onclick: function(){U.MD.DK.LE.openFileDirectory(data, US.userInfo.userid)}, innerHTML: "查看", style: { "cssText": "color:#429bfe;margin-top:-20px;text-align: right;cursor: pointer;"} }, parent);
             break;
         case "jpg": case "png":         //打印图片文件
             _img = $$("img", { "onerror": U.MD.C.imgError, "src": "http://fs.1473.cn/" + data.fileUrl, "style": { "cssText": "width:100%;max-width:300px;min-width:30px;min-height:30px"} }, parent);
@@ -1161,7 +1161,7 @@ U.MD.F.W.printFileContent = function (data, parent) {
                 var _icon = $$("div", { "className": "U_MD_DK_RZOS U_MD_DK_VIDEO", style: { "cssText": "float:none;display:inline-block;width:40px;height:40px;background-image:url('/img/YS2017.png');background-repeat:no-repeat;background-position:-1081px -527px;"} }, _content);
                 var _titile = $$("div", { "className": "", style: { "cssText": "display:inline-block;margin:0px 5px;width:155px;vertical-align:top;"} }, _content);
                 var _titileContent = $$("div", { innerHTML: data.fileName, style: { "cssText": "color:#000"} }, _titile);
-                var _titileSize = $$("div", { onclick: function () { U.MD.DK.LE.openFileDirectory(data, US.userInfo.UserId) }, innerHTML: "查看", style: { "cssText": "color:#429bfe;margin-top:-20px;float:right"} }, parent);
+                var _titileSize = $$("div", { onclick: function () { U.MD.DK.LE.openFileDirectory(data, US.userInfo.userid) }, innerHTML: "查看", style: { "cssText": "color:#429bfe;margin-top:-20px;float:right"} }, parent);
             } else {
                 var _video = $$("img", { "onerror": U.MD.C.imgError, "src": "http://fs.1473.cn/" + data.fileUrl, "style": { "cssText": "width:100%;max-width:300px;"} }, parent),
                 _videoText = $$("div", {}, parent),
@@ -1180,7 +1180,7 @@ U.MD.F.W.printFileContent = function (data, parent) {
             var _titileSize = $$("div", { innerHTML: "(" + data.fileSize + "MB)", style: { "cssText": "color:#aaaaaa;font-size:10px;line-height:10px"} }, _titile);
             var _open = $$("div", { innerHTML: "打开", style: { "cssText": "color:#429bfe;margin-top:-20px;text-align: right;cursor: pointer;"} }, parent);
             _open.onclick = function () {
-                U.MD.DK.LE.openFileDirectory(data, US.userInfo.UserId);
+                U.MD.DK.LE.openFileDirectory(data, US.userInfo.userid);
             }
             break;
 

+ 2 - 2
js/Friend/HistroyMessage.js

@@ -46,7 +46,7 @@ U.MD.F.H.chatRecord = function (el, friendandgroupinfo, page, isgroup) {
     //好友的获取聊天记录
     else {
         U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "GetFriendChatHistory",
-                            US.userInfo.UserId, friendandgroupinfo.UserId, _start, _end], U.MD.F.H.asynChatRecord, ["", el, friendandgroupinfo, page, isgroup]);
+                            US.userInfo.userid, friendandgroupinfo.UserId, _start, _end], U.MD.F.H.asynChatRecord, ["", el, friendandgroupinfo, page, isgroup]);
     }
 }
 
@@ -171,7 +171,7 @@ U.MD.F.H.sendFriendOrGroupChatMessage = function (friendandgroupinfo, chateditel
         U.MD.F.H.sendChatMessageToDb(_friendid, _chatcontent, null, isgroup); //调用发送数据库的函数
         //发送消息的信息
         _newsinfo = [{
-            "UserId": US.userInfo.UserId,
+            "UserId": US.userInfo.userid,
             "Time": new Date().getHours() + ":" + new Date().getMinutes() + ":" + new Date().getSeconds(),
             "Content": _chatcontent,
             "IMG": US.userInfo.UserThumbnailImageHead,

+ 5 - 5
js/Friend/Manage.js

@@ -46,7 +46,7 @@ U.MD.F.M.createFriendGroup = function (inputel) {
     }
     //好友分组名字必须填写
     else if (!_value.isStrNull() && _value != inputel.defaultValue) {
-        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "CreateFriendClass", _groupid, US.userInfo.UserId, _value, ""], U.MD.F.M.asynCreateFriendGroup, ["", _value, _groupid]); //发送添加分组的请求
+        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "CreateFriendClass", _groupid, US.userInfo.userid, _value, ""], U.MD.F.M.asynCreateFriendGroup, ["", _value, _groupid]); //发送添加分组的请求
     }
     //没有输入的提示
     else {
@@ -79,7 +79,7 @@ U.MD.F.M.asynCreateFriendGroup = function (r) {
 */
 U.MD.F.M.deleteFriend = function (friendinfo, callback) {
     //数据库中删除好友
-    U.A.Request(US.FRIEND, ["DeleteFriend", US.userInfo.UserId, friendinfo.FriendsID, friendinfo.UserId], U.MD.F.M.asynDeleteFriend, ["", friendinfo, callback]); //ajax删除好友
+    U.A.Request(US.FRIEND, ["DeleteFriend", US.userInfo.userid, friendinfo.FriendsID, friendinfo.UserId], U.MD.F.M.asynDeleteFriend, ["", friendinfo, callback]); //ajax删除好友
 }
 
 /**
@@ -142,7 +142,7 @@ U.MD.F.M.addFriend = function (userinfo, cb, typename) {
     if (!U.MD.U.L.isLogin()) {
         typename = typename || "1"; //判断是添加直接对方为好友还是添加对方为好友需好友验证。
         //无法加本人为好友 同时不可与本人对话
-        if (userinfo.UserId != US.userInfo.UserId) {
+        if (userinfo.UserId != US.userInfo.userid) {
             //在好友里获取用户
             var _friendinfo = U.Json.select(US.friend.friends, { "UserId": userinfo.UserId })[0];
             //判断是否已经添加了用户
@@ -228,12 +228,12 @@ U.MD.F.M.addFriendToDb = function (userinfo, cb, selectel, loadingel, typename,
     //添加好友分组的ajax
     //对方发送添加好友信息给你,同意后把用户直接加到好友分组里
     if (typename == "0") {
-        U.A.Request(US.FRIEND, ["AgreeAddFriend", US.userInfo.UserId, userinfo.UserId, _friendid, _groupid, (userinfo.UserNickName || userinfo.UserName), userinfo.MessageContent.toUpperCase()],
+        U.A.Request(US.FRIEND, ["AgreeAddFriend", US.userInfo.userid, userinfo.UserId, _friendid, _groupid, (userinfo.UserNickName || userinfo.UserName), userinfo.MessageContent.toUpperCase()],
                  U.MD.F.M.asynAddFriendToDb, [loadingel, _groupid, userinfo, _friendgroupinfo, cb, _friendid]); //添加好友到默认分组
     }
     //添加用户为好友
     else {
-        U.A.Request(US.CD, ([US.DB, "UseStudio_Friends", "AddFriend", US.userInfo.UserId, _friendid, userinfo.UserId, _groupid, _messageid, (userinfo.UserNickName || userinfo.UserName), ("" || _descript)]), U.MD.F.M.asynAddFriendToDb, [loadingel, _groupid, userinfo, _friendgroupinfo, cb, _friendid]); //添加好友到默认分组
+        U.A.Request(US.CD, ([US.DB, "UseStudio_Friends", "AddFriend", US.userInfo.userid, _friendid, userinfo.UserId, _groupid, _messageid, (userinfo.UserNickName || userinfo.UserName), ("" || _descript)]), U.MD.F.M.asynAddFriendToDb, [loadingel, _groupid, userinfo, _friendgroupinfo, cb, _friendid]); //添加好友到默认分组
     }
     //提示
     //U.alert("正在添加中...");

+ 7 - 7
js/Friend/Message.js

@@ -52,7 +52,7 @@ U.MD.F.N.friendOnlineAndOffline = function (statenew) {
         _el,
         _idarr,
         _friendform = $("#U_MD_F_H_ZLZ")[0], //好友窗体
-        _userid = US.userInfo.UserId, //登录用户id
+        _userid = US.userInfo.userid, //登录用户id
         _friendinfo = US.friend; //好友信息数组
     //循环上下线通知 0是下线的用户,1是上线的用户
     for (i = 0; i < statenew.length; i++) {
@@ -421,7 +421,7 @@ U.MD.F.N.entryGroup = function (newsinfo, news, el) {
     }
     //添加用户进入群主
     else {
-        U.A.Request(US.FRIEND, ["AddUsrsToGroup", US.userInfo.UserId, news.MessageID, news.UserId, news.MessageContent.toUpperCase(), _groupuserid, news.MessageDescript], U.MD.F.N.asynEntryGroup, ["", news, _groupuserid]);
+        U.A.Request(US.FRIEND, ["AddUsrsToGroup", US.userInfo.userid, news.MessageID, news.UserId, news.MessageContent.toUpperCase(), _groupuserid, news.MessageDescript], U.MD.F.N.asynEntryGroup, ["", news, _groupuserid]);
     }
     U.MD.F.N.clearNews(newsinfo, news, el); //清除
 }
@@ -451,7 +451,7 @@ U.MD.F.N.pulledIntoGroups = function (newsinfo, news, el) {
     var _groupinfo = U.Json.select(US.friend.group, { "GroupManageID": newsinfo.MessageContent.toLowerCase() })[0];
     //判断群是否已经加载过,如果加载过那么就不重新加载
     if (!_groupinfo) {
-        U.A.Request(US.FRIEND, ["GetJoinGroupNews", US.userInfo.UserId, newsinfo.MessageID, newsinfo.MessageContent], U.MD.F.N.asynPulledIntoGroups, ["", newsinfo]); //拉用户进入群组
+        U.A.Request(US.FRIEND, ["GetJoinGroupNews", US.userInfo.userid, newsinfo.MessageID, newsinfo.MessageContent], U.MD.F.N.asynPulledIntoGroups, ["", newsinfo]); //拉用户进入群组
     }
     else {
         U.MD.F.W.viewFriend(_groupinfo); //查看消息
@@ -476,7 +476,7 @@ U.MD.F.N.asynPulledIntoGroups = function (r) {
             _groupdiskarr,
             _context = r.context,
             _newinfo = _context[1],
-            _userid = US.userInfo.UserId, //用户id
+            _userid = US.userInfo.userid, //用户id
             _diskinfo = US.disk.Disks[_userid], //用户群信息
             _groupinfo = new U.MD.F.T.groupEntity(_newinfo.MessageContent.toLocaleLowerCase(), _newinfo.MessageDescript, U.UF.D.toTimeStamp(new Date()), _newinfo.UserId, "", null) //群信息
         ;
@@ -517,7 +517,7 @@ U.MD.F.N.confirmAddFriend = function (newsinfo, news, el) {
     ;
     //如果好友没有添加处理
     if (!_friendinfo) {
-        U.A.Request(US.FRIEND, ["AddFriend", US.userInfo.UserId, news.UserId, _friendid, news.MessageContent, news.MessageDescript], U.MD.F.N.asynAddFriend, [null, news, news.MessageContent, _friendid]); //添加好友到默认分组
+        U.A.Request(US.FRIEND, ["AddFriend", US.userInfo.userid, news.UserId, _friendid, news.MessageContent, news.MessageDescript], U.MD.F.N.asynAddFriend, [null, news, news.MessageContent, _friendid]); //添加好友到默认分组
     }
     //如果用户在好友列表,那么直接弹出
     else {
@@ -561,7 +561,7 @@ U.MD.F.N.clearAllNews = function () {
     }
     _allids = _allids.substring(0, _allids.length - 1); //去除最后一位的,
     //数据库删除消息处理
-    U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", _allids, US.userInfo.UserId], function () { }, []);
+    U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", _allids, US.userInfo.userid], function () { }, []);
     $("#U_MD_D_MG_AFT")[0].innerText = "";
 }
 
@@ -585,7 +585,7 @@ U.MD.F.N.clearNews = function (newsinfo, news, el) {
         $("#U_MD_F_N_Message")[0].close(); //关闭的处理
     }
     //数据库删除消息处理
-    U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", _messageid, US.userInfo.UserId], function () { }, []);
+    U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", _messageid, US.userInfo.userid], function () { }, []);
 }
 
 /**

+ 6 - 6
js/NetworkPromotion/NULL/BLOG/U.D.Blog.A.js

@@ -64,10 +64,10 @@ U.D.Blog.A.FBGBL = function (UCT, UTI, UIMG) {
 
 //发表文章异步
 U.D.Blog.A.AsynFBGBL = function (request) {
-    var _UDE, _UKE, _UDTD, _UDOD = U.selectEl("#UD_SYSXZBR")[0], _UID = US.userinfo.UserId, context = request.context;
+    var _UDE, _UKE, _UDTD, _UDOD = U.selectEl("#UD_SYSXZBR")[0], _UID = US.userInfo.userid, context = request.context;
     request = request.value;
     if (request) {
-        _UDE = U.D.Blog.A.BLEI([request, 0, 0, U.MT.SetDT(new Date()), context[1], context[1].substr(0, 100), US.userinfo.UserId, US.userinfo.UserName, US.userinfo.UserThumbnailImageHead, 0]);
+        _UDE = U.D.Blog.A.BLEI([request, 0, 0, U.MT.SetDT(new Date()), context[1], context[1].substr(0, 100), US.userInfo.userid, US.userinfo.UserName, US.userinfo.UserThumbnailImageHead, 0]);
         //添加实体
         _UKE = U.D.SY.ET["UL"]["HY"][_UID];
         (_UKE && (_UKE = _UKE[1])) && ((!_UKE.length) && (_UDOD.innerText = ""),
@@ -178,17 +178,17 @@ U.D.Blog.A.PAZFF = function (UDE, UDOD) {
     (_UTH == "可添加内容...") && (_UTH = "");
     U.Alert("转发中...");
 
-    U.A.Request(US.CD, ([US.DB, "UseStudio_Blog", "UB_P_A_AddZFLR", US.userinfo.UserId, Guid.NewGuid(), UDE.ArticleID, US.PID,
+    U.A.Request(US.CD, ([US.DB, "UseStudio_Blog", "UB_P_A_AddZFLR", US.userInfo.userid, Guid.NewGuid(), UDE.ArticleID, US.PID,
     _UTH, UDOD.innerText.substr(200) + (UDOD.innerText.length > 200 ? "..." : "") + U.selectEl("img", UDOD)[0].outerHTML]), U.D.Blog.A.AsynSPAZFF, (["", UDE, UDOD]));
 
-    //   U.A.Request("pb.ZFArticle", ([US.userinfo.UserId, US.PID, UDE.ArticleID, _UTH]), U.D.Blog.A.AsynPAZFF, (["", _UTH, UDE]));
+    //   U.A.Request("pb.ZFArticle", ([US.userInfo.userid, US.PID, UDE.ArticleID, _UTH]), U.D.Blog.A.AsynPAZFF, (["", _UTH, UDE]));
     //服务器同步中
 }
 
 //发送转发异步
 U.D.Blog.A.AsynPAZFF = function (request) {
     var _UKE, _UDTD = U.selectEl("#UD_SYSXZLLRTA").Child()[2];
-    _UID = US.userinfo.UserId,
+    _UID = US.userInfo.userid,
     _UGE = U.D.SY.ET["UL"]["HY"],
     context = request.context,
     _UTH = context[1],
@@ -197,7 +197,7 @@ U.D.Blog.A.AsynPAZFF = function (request) {
         "innerHTML": _UTH
     });
     request = request.value;
-    _UKE = U.D.Blog.A.BLEI([request, 0, 0, U.MT.SetDT(new Date()), _UTH, _UDOD.innerText.substr(0, 100), US.userinfo.UserId, US.userinfo.UserNickName, US.userinfo.UserThumbnailImageHead, 0]);
+    _UKE = U.D.Blog.A.BLEI([request, 0, 0, U.MT.SetDT(new Date()), _UTH, _UDOD.innerText.substr(0, 100), US.userInfo.userid, US.userinfo.UserNickName, US.userinfo.UserThumbnailImageHead, 0]);
     //添加实体
     U.Ut.AddObj(_UKE, {
         "Forward": _UDE["ArticleID"],

+ 2 - 2
js/NetworkPromotion/NULL/BLOG/U.D.Blog.F.js

@@ -80,8 +80,8 @@ U.D.Blog.F.KZPGBL = function (UDE, UDOD) {
 U.D.Blog.F.SCPGBL = function (UDE, UDOD, UTF) {
     if (!U.U.L.DLTC(3)) {
         U.Alert("正在删除...");
-        U.A.Request(US.CD, ([US.DB, "UseStudio_Blog", "UB_P_D_DeleteArticleAllReply", US.userinfo.UserId, UDE.ArticleID || UDE]), U.D.Blog.F.AsynSCPGBL, (["", UDOD, UDE, U.D.SY.ET["UL"]["HY"]["UID"], UTF]));
-        //  U.A.Request("pb.DeleteArticleAndAllReply", ([US.userinfo.UserId, UDE.ArticleID || UDE]), U.D.Blog.F.AsynSCPGBL, (["", UDOD, UDE, U.D.SY.ET["UL"]["HY"]["UID"], UTF]));
+        U.A.Request(US.CD, ([US.DB, "UseStudio_Blog", "UB_P_D_DeleteArticleAllReply", US.userInfo.userid, UDE.ArticleID || UDE]), U.D.Blog.F.AsynSCPGBL, (["", UDOD, UDE, U.D.SY.ET["UL"]["HY"]["UID"], UTF]));
+        //  U.A.Request("pb.DeleteArticleAndAllReply", ([US.userInfo.userid, UDE.ArticleID || UDE]), U.D.Blog.F.AsynSCPGBL, (["", UDOD, UDE, U.D.SY.ET["UL"]["HY"]["UID"], UTF]));
     }
 }
 

+ 5 - 5
js/NetworkPromotion/NULL/BLOG/U.D.Blog.R.js

@@ -86,7 +86,7 @@ U.D.Blog.R.PHFRGBL = function (UDE, UDPD, TF, UAE, UPE) {
 
 //样式使用
 U.D.Blog.R.YSPHFRGBL = function (UDE, UDOD, UAE, UPE, UDMD, UME) {
-    var _UDTD, _UDMD, _UDSD, _UDED, _UDGD, _UDJD, _UTF = UDE.ReplyAddUserID == US.userinfo.UserId;
+    var _UDTD, _UDMD, _UDSD, _UDED, _UDGD, _UDJD, _UTF = UDE.ReplyAddUserID == US.userInfo.userid;
     _UDTD = $$("div", { "className": "UD_SYBFO" }, UDOD);
     _UDSD = $$("div", { "className": "UD_SYBFOI" }, _UDTD);
     $$("img", { "onerror": U.M.ImgError, "title": UDE.UserNickName, "src": U.M.GetImgU(UDE.UserThumbnailImageHead), "onclick": [[U.M.StopBubble], [U.U.I.UIFZX, ([UDE.ReplyAddUserID])]] }, _UDSD);
@@ -120,8 +120,8 @@ U.D.Blog.R.SCPHFRGBL = function (UPE, UDE, UAE, UDOD) {
             _URID = UDE.ReplyID;
             _UAID = UAE.ArticleID;
         } //移除评论 //移除元素 //评论数-1
-        U.A.Request(US.CD, ([US.DB, "UseStudio_Blog", "UB_P_D_DeleteOneReplyAndAllChildReply", US.userinfo.UserId, _URID, _UAID || US.NU]), _UCB || U.M.apply, ([""])); //服务器同步
-        // U.A.Request("pb.DeleteOneReplyAndChildReply", ([US.userinfo.UserId, _URID, UAID || US.NU]), _UCB || U.M.apply, ([""])); //服务器同步
+        U.A.Request(US.CD, ([US.DB, "UseStudio_Blog", "UB_P_D_DeleteOneReplyAndAllChildReply", US.userInfo.userid, _URID, _UAID || US.NU]), _UCB || U.M.apply, ([""])); //服务器同步
+        // U.A.Request("pb.DeleteOneReplyAndChildReply", ([US.userInfo.userid, _URID, UAID || US.NU]), _UCB || U.M.apply, ([""])); //服务器同步
     }
 }
 
@@ -165,7 +165,7 @@ U.D.Blog.R.TJFBHFRG = function (UAID, UTH) {
         else {
             _UPID = _UDE[3]; _UUID = _UDE[4]; _UCB = _UDE[5];
         }
-        U.A.Request("pb.ReportReply", ([US.userinfo.UserId, UAID, UTH, _UPID, _UUID]), U.D.Blog.R.AsynTJFBHFRG, (["", _UCB])); //添加回复到后台
+        U.A.Request("pb.ReportReply", ([US.userInfo.userid, UAID, UTH, _UPID, _UUID]), U.D.Blog.R.AsynTJFBHFRG, (["", _UCB])); //添加回复到后台
     }
 }
 
@@ -187,7 +187,7 @@ U.D.Blog.R.AsynFBHFRGBL = function (reuqest) {
     _UDOD = context[4];
     _UDMD = context[5];
     _UDPD = U.selectEl("#UD_SYB" + _UAE.ArticleID).find("div")["UD_SYBF"];
-    (_UKE = (UPE ? UPE["RR"] : _UAE["Reply"][1])).unshift((_UME = new U.D.Blog.R.FRGBLET([_UKE[0] ? (_UKE[0].AllCount + 1) : 1, UPE ? UPE.UserNickName : "", U.MT.SetDT(new Date()), US.userinfo.UserId, _UTH, reuqest, UPE ? UPE.ReplyID : "", UPE ? UPE.ReplyAddUserID : "", US.userinfo.UserNickName, US.userinfo.UserThumbnailImageHead]))); //添加新的类
+    (_UKE = (UPE ? UPE["RR"] : _UAE["Reply"][1])).unshift((_UME = new U.D.Blog.R.FRGBLET([_UKE[0] ? (_UKE[0].AllCount + 1) : 1, UPE ? UPE.UserNickName : "", U.MT.SetDT(new Date()), US.userInfo.userid, _UTH, reuqest, UPE ? UPE.ReplyID : "", UPE ? UPE.ReplyAddUserID : "", US.userinfo.UserNickName, US.userinfo.UserThumbnailImageHead]))); //添加新的类
     (!UPE) && (_UME["RR"] = []);
     U.D.Blog.R.PHFRGBL([_UME], (UPE ? (_UDMD || _UDOD.parentNode) : _UDPD), true, _UAE, UPE);
     U.selectEl("div", _UDPD.parentNode)[14].innerText = _UME.AllCount; //添加回复 

+ 1 - 1
js/NetworkPromotion/NULL/BLOG/U.D.Blog.U.js

@@ -2,7 +2,7 @@
 
 //首页最新消息
 U.D.Blog.U.ZXBlog = function (UDOD, UDE, UTF, UIE, USID) {
-    var i, _UVM, _UTI, _UAT, _UCE, _UDAD, _UDED, _UDBD, _UDTD, _UDSD, _UDID, _UDKD, _UDND, _UDED, _UDKD, _UDAC, _UDVD, _UDLD, _UDPD, _UIMG, _UDFD = $$("frag"), _UID = US.userinfo.UserId, _UTI = U.D.Blog.ZXWZ(UDOD, UIE, null, true);
+    var i, _UVM, _UTI, _UAT, _UCE, _UDAD, _UDED, _UDBD, _UDTD, _UDSD, _UDID, _UDKD, _UDND, _UDED, _UDKD, _UDAC, _UDVD, _UDLD, _UDPD, _UIMG, _UDFD = $$("frag"), _UID = US.userInfo.userid, _UTI = U.D.Blog.ZXWZ(UDOD, UIE, null, true);
     for (i = 0; i < UDE.length; i++) {
         _UIMG = null; _UVM = true; _UCE = UDE[i];
         _UDBD = $$("div", { "className": "UD_SYSXZBRA", "style": { "cssText": "left:" + _UTI[4] + "px;top:" + _UTI[5] + "px"} }, _UDFD);

+ 4 - 4
js/NetworkPromotion/NULL/BLOG/U.D.Blog.js

@@ -63,7 +63,7 @@ U.D.Blog.QHCTBK = function (UTF, UDOD) {
 //滚动处理
 U.D.Blog.GDQHCTBK = function (UTF) {
     var _UP = this.P == null ? 1 : this.P + 2;
-    UTF ? U.D.Blog.GBL($("#UD_SYSXZBR")[0], _UP, US.userinfo.UserId) : U.D.Blog.PFY(_UP);
+    UTF ? U.D.Blog.GBL($("#UD_SYSXZBR")[0], _UP, US.userInfo.userid) : U.D.Blog.PFY(_UP);
 }
 
 //#region 公共数据查看
@@ -182,7 +182,7 @@ U.D.Blog.ZLNRPY = function (UDOD, UDE) {
             $$("div", { "className": "UD_SYSXZLRSRDTSRSL", "innerHTML": UDE[i].UserName }, _UDRD);
             $$("div", { "className": "UD_SYSXZLRSRDTSRSR", "innerHTML": "推荐了" }, _UDRD);
             $$("div", { "className": "UD_SYSXZLRSRDTSRX", "innerHTML": UDE[i].ArticleContentBrief }, _UDLD);
-            if (UDE[i].UserID == US.userinfo.UserId) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIO UD_SYI", "onclick": [[U.M.StopBubble], [U.UI.Confirm, (["是否取消转发", [U.D.Blog.F.SCPGBL, ([UDE[i], _UDTD])]])]], "title": "取消转发" }, _UDSD) } //
+            if (UDE[i].UserID == US.userInfo.userid) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIO UD_SYI", "onclick": [[U.M.StopBubble], [U.UI.Confirm, (["是否取消转发", [U.D.Blog.F.SCPGBL, ([UDE[i], _UDTD])]])]], "title": "取消转发" }, _UDSD) } //
             else { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIT UD_SYI", "title": "点击展开" }, _UDSD); }
             _UTF = !_UTF; (_UCE == null) && (_UCE = new U.D.Blog.A.BLEI([UDE[i].ArticleID, 0, 0, UDE[i].ArticleAddTime, "很遗憾,动静已被作者删除了", "很遗憾,动静已被作者删除了", "", "", "", 0])); //原文被删除
         }
@@ -195,8 +195,8 @@ U.D.Blog.ZLNRPY = function (UDOD, UDE) {
         _UDYD = $$("div", { "className": "UD_SYSXZLRSRDTRZ UD_SYUPCCY" }, _UDRD);
         _UDND = $$("div", { "className": "UD_SYSXZLRSRDTRZTC UD_SYUPCCT" }, _UDYD);
         U.D.Blog.TPGBL(_UDND, _UCE, true, true); //打印图片
-        if (_UTF && _UCE.UserID == US.userinfo.UserId) {
-            if (_UCE.UserID == US.userinfo.UserId) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIM UD_SYSXZLRSRDTRZTIO UD_SYI", "onclick": [[U.M.StopBubble], [U.UI.Confirm, (["是否删除该消息", [U.D.Blog.F.SCPGBL, ([UDE[i], _UDTD])]])]], "title": "移除消息" }, _UDHD); }
+        if (_UTF && _UCE.UserID == US.userInfo.userid) {
+            if (_UCE.UserID == US.userInfo.userid) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIM UD_SYSXZLRSRDTRZTIO UD_SYI", "onclick": [[U.M.StopBubble], [U.UI.Confirm, (["是否删除该消息", [U.D.Blog.F.SCPGBL, ([UDE[i], _UDTD])]])]], "title": "移除消息" }, _UDHD); }
             else if (!UDE[i].Forward) { $$("div", { "className": "UD_SYSXZLRSRDTRZTI UD_SYSXZLRSRDTRZTIT UD_SYI", "title": "点击展开" }, _UDHD); }
         }
         if (_UCE.UserID) {

+ 2 - 2
js/NetworkPromotion/NULL/NotUse.js

@@ -140,7 +140,7 @@ U.UF.MPlayer.NBF = function (UDE, UIF, UTF, UAE) {
 
 //直接播放音乐
 U.UF.MPlayer.SYBFYY = function (UDE, UDMD, UTF, UIF, UAE) {
-    var _UGE = U.MD.D.H.ET["FL"], _UDOD = U.selectEl("#UD_MP"), _UDTD = _UDOD.find(".UD_MPRLSL").find("div"); UIF = UIF || (US.userInfo.UserId ? US.userInfo : UDE);
+    var _UGE = U.MD.D.H.ET["FL"], _UDOD = U.selectEl("#UD_MP"), _UDTD = _UDOD.find(".UD_MPRLSL").find("div"); UIF = UIF || (US.userInfo.userid ? US.userInfo : UDE);
     if (_UGE["Entity"] != UDE) { //切换歌曲
         U.selectEl(_UDTD.find("img", 0)[0] || $$("img", {}, _UDTD[0])).addAttrArray({ "onerror": U.MD.C.imgError, "title": _UDTD[4].innerText = UIF.UserNickName || UIF.UserName, "alt": _UDTD[4].innerText, "src": U.MD.C.getHeadImage(UIF.UserThumbnailImageHead) });
         _UDTD[1].style.display = "block"; _UDTD[5].innerText = UDE.UserallDirectoryName || UDE.UserFilesName;
@@ -172,7 +172,7 @@ U.UF.MPlayer.GDTCCKYY = function (UIE, UDOD, UP) {
     var _UDE, _UI;
     var _UGE = U.MD.D.H.ET;
     var _UIF = US.userInfo;
-    UIE ? (_UDE = U.Json(U.MD.DK.M.diskOperatingSwitch(US.userInfo.UserId)[0]).select({ "UserDirectoryExtendType": "mp3" })) : (_UDE = _UGE["UL"]["WS"][0]);
+    UIE ? (_UDE = U.Json(U.MD.DK.M.diskOperatingSwitch(US.userInfo.userid)[0]).select({ "UserDirectoryExtendType": "mp3" })) : (_UDE = _UGE["UL"]["WS"][0]);
     _UI = _UDE.length;
     if (_UDE) {
         _UDE = U.MD.D.D.FYGBL[null, _UDE], UP, [100, _UI];

+ 8 - 8
js/NetworkPromotion/NULL/NotUse1.js

@@ -325,7 +325,7 @@ U.MD.O.OLWordUP = function (UTF, UDE, UTE, UT, UWE) {
 //        U.MD.D.H.PSYTJN($("#UD_SYSXSSXOC")[0], UDE);
 //    }
 //    else {
-//        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "RecommendFriends", US.userInfo.UserId || US.EMPTYGUID, 0, 11]), U.MD.D.H.AsynSYTJ, [""];
+//        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "RecommendFriends", US.userInfo.userid || US.EMPTYGUID, 0, 11]), U.MD.D.H.AsynSYTJ, [""];
 //    }
 //}
 
@@ -1006,7 +1006,7 @@ U.UF.C.Simulation.init.prototype = {
 //* 这里为数据异步 使得各个页面 共享数据 一个浏览器允许多登 数据共享处理
 //*/
 //U.MD.D.Asynblur = function (errorobj) {
-//    var _userid = US.userInfo.UserId; //用户ID
+//    var _userid = US.userInfo.userid; //用户ID
 //    var _value = U.UF.C.strToJson(errorobj["newValue"]); //获取页面值
 //    if (U.MD.D.LocalStorage.get("ati") > 0) { //如果活动数大于0 停止这个页面活动
 //        U.MD.C.T.ClearInterval();
@@ -4039,7 +4039,7 @@ draw: false
 //    this.db = arg[1] || [];
 //    this.cb = arg[2] || ""; //回调函数  cb   
 //    this.cbparams = arg[3]; //回调参数  cbparams
-//    //调用方法:U.A.Request(US.AUTH,"UseStudioManage.AddToLoginLog", [US.userInfo.UserId || US.EMPTYGUID, US.city.userAllLocation || "", US.ITID], function(){}, [], { type: "Get", "setAsyn": false, "timeout": 1, "CONTENT-TYPE": "application/json" }); //访问日志添加消息
+//    //调用方法:U.A.Request(US.AUTH,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.EMPTYGUID, US.city.userAllLocation || "", US.ITID], function(){}, [], { type: "Get", "setAsyn": false, "timeout": 1, "CONTENT-TYPE": "application/json" }); //访问日志添加消息
 //    this.header = arg[4] || ""; //暂时没有用处。浏览器升级后对ajax的功能进行扩展,加入了"对head头部自定义修改"的功能。CONTENT-TYPE:application/x-www-form-urlencoded;charset=UTF-8.
 //    this.time = new Date(); //ajax生成时间..删除,时间保存在第二个参数ajax里面。
 //}
@@ -4109,7 +4109,7 @@ draw: false
 //        var _urlandparams = this.toAjaxFormat(); //生成请求参数 数据结构:
 //        _url = _urlandparams[0]; //连接的后台地址 形如"http://cd.1473.cn/php" 
 //        _db = _urlandparams[1]; //传参参数;  
-//        //如果不传递回调函数,则为同步请求,示例:U.A.Request(US.AUTH,"UseStudioManage.AddToLoginLog", [US.userInfo.UserId || US.EMPTYGUID, US.city.userAllLocation || "", US.ITID]);。返回json数据,一直等待服务器返回,如果服务器执行1分钟,页面停顿1分钟。
+//        //如果不传递回调函数,则为同步请求,示例:U.A.Request(US.AUTH,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.EMPTYGUID, US.city.userAllLocation || "", US.ITID]);。返回json数据,一直等待服务器返回,如果服务器执行1分钟,页面停顿1分钟。
 //        if (U.UF.C.isFunction(this.cb)) {
 //            _isasync = true; //函数是否异步
 //        }
@@ -4172,7 +4172,7 @@ draw: false
 //    //        var _params = this.toAjaxFormat(); //生成请求参数 数据结构:
 //    //        _url = _params[0]; //连接的后台地址 形如"http://cd.1473.cn/php" 
 //    //        _db = _params[1]; //传参参数;  
-//    //        //如果不传递回调函数,则为同步请求,示例:U.A.Request(US.AUTH,"UseStudioManage.AddToLoginLog", [US.userInfo.UserId || US.EMPTYGUID, US.city.userAllLocation || "", US.ITID]);。返回json数据,一直等待服务器返回,如果服务器执行1分钟,页面停顿1分钟。
+//    //        //如果不传递回调函数,则为同步请求,示例:U.A.Request(US.AUTH,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.EMPTYGUID, US.city.userAllLocation || "", US.ITID]);。返回json数据,一直等待服务器返回,如果服务器执行1分钟,页面停顿1分钟。
 //    //        if (U.UF.C.isFunction(this.cb)) {
 //    //            _isasync = true; //函数是否异步
 //    //        }
@@ -4236,15 +4236,15 @@ draw: false
 //        }
 //        //完全跨域判断非1473的域名, 
 //        else if (!_isdomain[1] && _url.indexOf("1473.cn") > -1 && U.selectEl("#U_Domain")[0]) { //其他域名跨域处理
-//            //其他站点,跨域形式访问:例如:http://a.com/ 在页面中调用U.A.Request(US.AUTH,"UseStudioManage.AddToLoginLog", [US.userInfo.UserId || US.EMPTYGUID, US.city.userAllLocation || "", US.ITID]);
+//            //其他站点,跨域形式访问:例如:http://a.com/ 在页面中调用U.A.Request(US.AUTH,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.EMPTYGUID, US.city.userAllLocation || "", US.ITID]);
 //            this.goDomain(); //外站跨域调用
 //            return false;
 //        }
 //        return true;
 //    },
 //    //把传参格式转换为Ajax请求格式
-//    //              刑如:US.AUTH,"AddToLoginLog", [US.userInfo.UserId , US.city.userAllLocation , US.ITID]  转换为下面的格式
-//    //              格式:"http://main.1473.cn/Uses.ashx",US.userInfo.UserId || US.EMPTYGUID +"&" + US.city.userAllLocation || ""+ "&" + US.ITID, "http://main.1473.cn/Uses.ashx"(默认请求地址,如果第一个参数不在U.A.backAddress中,则使用第三个)
+//    //              刑如:US.AUTH,"AddToLoginLog", [US.userInfo.userid , US.city.userAllLocation , US.ITID]  转换为下面的格式
+//    //              格式:"http://main.1473.cn/Uses.ashx",US.userInfo.userid || US.EMPTYGUID +"&" + US.city.userAllLocation || ""+ "&" + US.ITID, "http://main.1473.cn/Uses.ashx"(默认请求地址,如果第一个参数不在U.A.backAddress中,则使用第三个)
 //    /*
 //    * @return  {array} 域、 加密参数
 //    */

+ 21 - 21
js/NetworkPromotion/NULL/NotUse2.js

@@ -46,7 +46,7 @@ U.MD.DK.H.SYWPQHJ = function (UDOD, UP, UTF, UDID, UTP) {
         UDOD = UDOD || U.selectEl("#UD_SYSXZBJO")[0];
         var _UCE,
         _UDPD = U.selectEl(UDOD).Parent({ usbody: "true" }),
-        _userid = UTF ? US.EMPTYGUID : US.userInfo.UserId,
+        _userid = UTF ? US.EMPTYGUID : US.userInfo.userid,
         _UDAD = U.selectEl(_UDPD).Child(),
         _UGE = U.MD.D.H.ET["UL"]["WS"];
         //  _UGE[5] = UDID = UDID || US.EMPTYGUID;
@@ -57,7 +57,7 @@ U.MD.DK.H.SYWPQHJ = function (UDOD, UP, UTF, UDID, UTP) {
                 U.MD.DK.H.DiskSYN(UDOD, _UCE[0]); (UDOD.offsetHeight > 0 && _UDPD.offsetHeight >= _UDPD.scrollHeight) && (U.MD.DK.H.SYWPQHJ(UDOD, UP + 1, UTF, UDID));
             }
             else if (UP == 1) {
-                U.MD.DK.VW.printNullView(UDOD, { "className": "UD_SYWRZFO", "onclick": function () { U.MD.D.I.openApplication("Disk", { "userid": US.userInfo.UserId, "directoryid": US.FTPFOLDERID }); } });
+                U.MD.DK.VW.printNullView(UDOD, { "className": "UD_SYWRZFO", "onclick": function () { U.MD.D.I.openApplication("Disk", { "userid": US.userInfo.userid, "directoryid": US.FTPFOLDERID }); } });
             }
         } //打印网盘资料
         else {
@@ -98,7 +98,7 @@ U.MD.DK.H.DiskSYN = function (UDOD, UDE) {
     var i, j, _UTF, _UTP, _UDTD, _UDWD, _UDND, _UDSD, _UDMD, _UDKD, _UEN, _USN, _USIN,
     _USI = U.selectEl(UDOD).Child().length ? 0 : U.UF.Math.RandomRange(10, 25),
     _UAE = ["打开", "云盘", "评论", "下载"],
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _UDAD = U.selectEl(UDOD).Child(),
     _UW = U.selectEl(UDOD).Parent(2).offsetWidth,
     _UIF = Math.floor((_UW - 90) / 198) || 1,
@@ -431,7 +431,7 @@ U.UF.UI.EditorLoad.init.prototype = {
                 }, _UDTD);
 
                 _UDUD = $$("div", { "className": "UD_SYFDTZ U_Boom_Img_ys2017 UD_SYSXZBFCAHO", "style": { "position": "relative" }, "title": "本地添加文件" }, _UDSD);
-                if (US && US.userInfo && US.userInfo.UserId) {
+                if (US && US.userInfo && US.userInfo.userid) {
                     $$("div",
                     {
                         "className": "UD_SYFDTW U_Boom_Img_ys2017 UD_SYSXZBFCAHH",
@@ -818,7 +818,7 @@ U.UF.UI.EditorLoad.init.prototype = {
                 this.ufcp(r, _UFID);
             }
             else if ((!this.rt.fup) || (this.rt.fup(_UDE) !== false)) {
-                this.objfl.upload((this.url || "http://main.1473.cn/USUpfile.ashx?typename=UseStudioEditor&") + "UserId=" + (US.userInfo.UserId || US.EMPTYGUID) + "&IsF=true", _UFID, _UDE[1], _UDE[2]);
+                this.objfl.upload((this.url || "http://main.1473.cn/USUpfile.ashx?typename=UseStudioEditor&") + "UserId=" + (US.userInfo.userid || US.EMPTYGUID) + "&IsF=true", _UFID, _UDE[1], _UDE[2]);
             }
         },
         _ = function (UWE, UFID) {
@@ -1162,7 +1162,7 @@ U.MD.D.H.ZMQH = function () {
 * @param  {element} 图片元素
 */
 U.MD.D.H.CPTPCL = function (UDE, UDOD) {
-    U.A.Request(US.AUTH, ["ThirdPartyFilesDownloaded", US.userInfo.UserId, UDE.join(",")]), U.MD.D.H.AsynCPTPCL, ["", UDOD];  //获取用户资料
+    U.A.Request(US.AUTH, ["ThirdPartyFilesDownloaded", US.userInfo.userid, UDE.join(",")]), U.MD.D.H.AsynCPTPCL, ["", UDOD];  //获取用户资料
 }
 
 /*
@@ -1172,7 +1172,7 @@ U.MD.D.H.CPTPCL = function (UDE, UDOD) {
 */
 U.MD.D.H.AsynCPTPCL = function (r) {
     var i, _UCE, _UDE,
-    _UGE = US.disk.Disks[US.userInfo.UserId],
+    _UGE = US.disk.Disks[US.userInfo.userid],
     _UDOD = r.context[1];
     r = r.value;
     for (i = 0; i < r.length; i++) {
@@ -1289,7 +1289,7 @@ U.MD.D.H.KBJJQ = function (UDOD, UDE) {
     if (!U.MD.U.L.isLogin()) {
         U.UF.MR.InputTip(UDOD, [UDE[0], UDE[1] || ""]); //聚焦文字处理
         U.MD.D.H.BCWZTJQ(UDOD); //聚焦光标处理
-        U.MD.DK.UP.SCXWPOP(UDE[2], UDE[3], US.userInfo.UserId); ///聚焦上传设置
+        U.MD.DK.UP.SCXWPOP(UDE[2], UDE[3], US.userInfo.userid); ///聚焦上传设置
         U.MD.D.H.ET["KBJ"] = UDOD; //记录当前使用的
         return true;
     }
@@ -1406,7 +1406,7 @@ U.MD.D.H.DYWPTP = function (UDOD, UT, UDE, UTE) {
 U.MD.D.H.TYSZTX = function (USE) {
     var i, j, k, _UCE, _UDCD,
     _UGE = US.disk.UserDisk,
-    userid = US.userInfo.UserId,
+    userid = US.userInfo.userid,
     _UVE = {
         "Name": "innerText",
         "IT": "innerText",
@@ -1479,7 +1479,7 @@ U.MD.D.H.AsynCPTATGBL = function (UDOD, cb) {
 U.MD.UI.SCXWPOP = function (el, flashinfo, userid, ifload) {
     var _iscreate, //查看flash是否创建成功
         _uploadinfo = U.MD.UI.FTF, //flash上传使用的全局变量
-        _diskinfo = U.MD.DK.M.diskOperatingSwitch(userid || US.userInfo.UserId), //获取用户网盘的信息
+        _diskinfo = U.MD.DK.M.diskOperatingSwitch(userid || US.userInfo.userid), //获取用户网盘的信息
         _permis = U.MD.DK.C.getDirectoryPermissions(_diskinfo[1][1]); //获取上传的权限 包含ftp中有只允许上传的情况 只允许下载的情况 或者是在他人云盘中不允许上传等等具体看函数内部的注释
 
     //如果用户需要上传判断用户是否需要通登录后才能使用,如果第四个传参是允许加载那么就直接加载
@@ -1602,7 +1602,7 @@ U.MD.UI.UAXWP = function (uploadfiles) {
             for (i = 0; i < uploadfiles.lenth; i++) {
                 uploadfiles[i].UGE = _diskinfo; //上传到那个网盘
                 uploadfiles[i].fun = _flashinfo["FUN"]; //上传成功的回调
-                uploadfiles[i].userid = _diskinfo ? _diskinfo[1][2] : US.userInfo.UserId; //上传到那个用户
+                uploadfiles[i].userid = _diskinfo ? _diskinfo[1][2] : US.userInfo.userid; //上传到那个用户
                 uploadfiles[i].ID = _uploaddiv; //上传到那个目录的id
                 uploadfiles[i].URL = _flashinfo["FUN"]["URL"]; //上传的地址
                 uploadfiles[i].SO = U.UF.UP.FTF["EL"]; //上传对应的flash按钮
@@ -2133,7 +2133,7 @@ U.MD.UI.XWPOPX = function (allfilesnum, filesnum, uploadfiles) {
 //    if (!U.MD.U.L.isLogin()) {
 //        var _UFE = U.Json.select(US.friend.group, { "GroupManageID": UGID })[0];
 //        if (_UFE) {
-//            U.MD.D.I.openApplication("Disk", { "userid": US.userInfo.UserId, "directoryid": UGID });
+//            U.MD.D.I.openApplication("Disk", { "userid": US.userInfo.userid, "directoryid": UGID });
 //        }
 //        else {
 //            U.Alert("请申请加入群查看群信息!");
@@ -2160,7 +2160,7 @@ U.MD.UI.XWPOPX = function (allfilesnum, filesnum, uploadfiles) {
 //    _diskdiv, //disk整体元素
 //    _dirid = dirid, //目录id
 //    _isFirst, //导航到达时,判断是否为一级目录。如果为一级目录,则展开。
-//    _loginuserid = US.userInfo.UserId || US.EMPTYGUID, //当前使用用户id
+//    _loginuserid = US.userInfo.userid || US.EMPTYGUID, //当前使用用户id
 //    _arriveDir, //根据dirid算出要到达的目录信息。
 //    _diskinfo = U.MD.DK.M.diskOperatingSwitch(userid);    //获取个人网盘的全局变量信息,返回类型为例:US.disk.Disks["张三"]; //张三的网盘信息,张三需要用guid表示,US.disk.Disks["95f7bacc-0b3a-4265-a2ea-15e066b97bf7"]
 
@@ -2257,7 +2257,7 @@ U.MD.UI.XWPOPX = function (allfilesnum, filesnum, uploadfiles) {
 //初始化网盘资料
 U.MD.DK.getUserDisk = function (userid, dirid, diskdiv, diskcontentdiv) {
     // US.disk.Disks 用户网盘数据前台存储的全局变量 该全局变量为一个数组  0为网盘所有目录的信息以数组形式  1为用户数组信息(0为当前用户基本信息集合,1为当前打开目录的id ,2为用户id,3未知,4网盘展示文件的格式形式样式),2为未知,3为未知 ,4、数据与0的数据是一样的,但是这里是以object形式展示的,这里可以更快的通过id去找指定的文件或者目录 formel为当前网盘用户的弹框
-    var _loginuserid = US.userInfo.UserId || US.EMPTYGUID; //登录用户的id,未登录为全0的Guid
+    var _loginuserid = US.userInfo.userid || US.EMPTYGUID; //登录用户的id,未登录为全0的Guid
     US.disk.Disks[userid] = []; //定义用户网盘变量
     US.disk.Disks[userid].formel = diskdiv; //以用户id设置全局变量,写入用户的操作硬盘的元素
     //dirid = U.UF.C.isNumber(dirid) ? (dirid > -1 && dirid < 5 ? US.disk.InitTree[dirid + (obj ? 2 : 0)][0] : US.FTPFOLDERID) : dirid; //生成变量
@@ -2319,8 +2319,8 @@ U.MD.DK.GUserBL = function (userid, dirid, diskdiv, r) {
         _disktree[_diskdir[i].UserDirectoryID] = _diskdir[i];
     };
     _diskinfo.length = 0;
-    _diskinfo.unshift(_diskdir, [((!r[1].UserDirectoryID && r[1].UserId == US.userInfo.UserId) ? US.userInfo : r[1]), dirid, userid, diskdiv, "Normal"], null, null, _disktree);
-    if (userid == US.userInfo.UserId) {
+    _diskinfo.unshift(_diskdir, [((!r[1].UserDirectoryID && r[1].UserId == US.userInfo.userid) ? US.userInfo : r[1]), dirid, userid, diskdiv, "Normal"], null, null, _disktree);
+    if (userid == US.userInfo.userid) {
         U.MD.DK.SGBL(userid, _diskinfo);
     }
     return _diskinfo; //初始化目录添加
@@ -2332,7 +2332,7 @@ U.MD.DK.GUserBL = function (userid, dirid, diskdiv, r) {
 //    if ($("#UD_SYWRZ", UDE.formel)[0]) {
 //        var i, _UAE, _UCB,
 //        _UDTD,
-//        _userid = US.userInfo.UserId,
+//        _userid = US.userInfo.userid,
 //        _UDOD = UDE.formel,
 //        _UDSD = U.selectEl("#UD_SYWRZ", _UDOD)[0],
 //        _UIF = UDE[1][0],
@@ -2361,7 +2361,7 @@ U.MD.DK.GUserBL = function (userid, dirid, diskdiv, r) {
 
 
 //        _UDED[1].innerText = _UDCD[2].innerText = _UIF.UserNickName || _UIF.UserName; _UDCD[3].innerText = _UIF.UserIndividualitysignature || "暂无个人简介";
-//        if (_UIF.UserId != US.userInfo.UserId) {
+//        if (_UIF.UserId != US.userInfo.userid) {
 //            _UDCD.addAttrArray({ "onclick": function () {
 //                U.MD.F.M.AddFriend(_UIF);
 //            },
@@ -2397,7 +2397,7 @@ U.MD.DK.GUserBL = function (userid, dirid, diskdiv, r) {
 //        _UDCD[9].innerText = "所有文件:" + _UAE[1];
 //        _UDCD[10].innerText = "总大小:" + _UAE[0];
 //        //分享
-//        _UAE = [[(UDE[1][2] == US.userInfo.UserId ? "" : ("回到")) + "我的分享",
+//        _UAE = [[(UDE[1][2] == US.userInfo.userid ? "" : ("回到")) + "我的分享",
 //_UIF.FilesCount],
 //["好友查看", US.friend.friends ? (US.friend.friends.length > 999 ? "999+" : US.friend.friends.length) : 0],
 //["群/讨论组", US.friend.group ? (US.friend.group.length > 999 ? "999+" : US.friend.group.length) : 0]];
@@ -2568,7 +2568,7 @@ U.MD.DK.LTWP = function (UDID, UDE) {
     _diskcontentdiv, //disk操作内容区域的元素
     _diskdiv, //disk整体元素
     _dirid = dirid, //目录id
-    _loginuserid = US.userInfo.UserId || US.EMPTYGUID, //当前使用用户id
+    _loginuserid = US.userInfo.userid || US.EMPTYGUID, //当前使用用户id
     _diskinfo = U.MD.DK.M.diskOperatingSwitch(userid);    //获取网盘信息
 
     //获取网盘弹框
@@ -2793,7 +2793,7 @@ for (i in _UGE) {
 
 
 //    //用户已经登录的时候的处理,这个时候用户写入的信息为用户登录后信息数据
-//    if (US.userInfo.UserId) {
+//    if (US.userInfo.userid) {
 //        userinfo[0][5] = US.friend.onlinefirendinfo; //好友用户数组中添加一个在线好友的数组
 //        US.friend = userinfo[0]; //初始化好友的信息
 //        US.userInfo.TJF = userinfo[1]; //给用户推荐的好友

+ 7 - 7
js/NetworkPromotion/NULL/NotUse3.js

@@ -38,7 +38,7 @@ U.MD.DK.RE.newJurisdiction = function (disk) {
 //        _UDID = UDE.UserDirectoryID;
 //    var i, _UGE, _UDS,
 //        _UDID = UDE.UserDirectoryID,
-//        _UDE = U.MD.DK.M.diskOperatingSwitch((userid = userid || US.userInfo.UserId));
+//        _UDE = U.MD.DK.M.diskOperatingSwitch((userid = userid || US.userInfo.userid));
 
 //    if (_UDID == "22222222-2222-2222-2222-222222222222" || _UDID == "11111111-1111-1111-1111-111111111111") {
 //        U.MD.DK.LL.FCKDXWPDH(_UDID)
@@ -51,7 +51,7 @@ U.MD.DK.RE.newJurisdiction = function (disk) {
 //        _UDTD = _UDAD[1],
 //        _UAE = UDE.Child || U.Json.select(_UDE[0], { "UserDirectoryParentID": userid }),
 //        _UDS = " U_MD_DK_LTXOSIO", _UDSD = U.selectEl("div", _UDAD[0])[0];
-//        if (userid != US.userInfo.UserId) {
+//        if (userid != US.userInfo.userid) {
 //            if (UDE.UserDirectoryID == US.userInfo) {
 //                _UST = "他人群文件无法查看";
 //            }
@@ -73,7 +73,7 @@ U.MD.DK.RE.newJurisdiction = function (disk) {
 //            } //导航打印
 //            if (!UTF || !UTF[1]) {
 //                if (_UDID == userid) {
-//                    if (userid == US.userInfo.UserId) { _UDPD.innerHTML = "", U.MD.DK.VW.XWPDYH(US.friend.group) };
+//                    if (userid == US.userInfo.userid) { _UDPD.innerHTML = "", U.MD.DK.VW.XWPDYH(US.friend.group) };
 //                }
 //                else if (_UDID == US.EMPTYGUID) {
 //                    U.MD.DK.LL.ZJFWDJ(_UDE, userid, _UDPD);
@@ -88,7 +88,7 @@ U.MD.DK.RE.newJurisdiction = function (disk) {
 
 
 //    var i, _UCE, _el, _UDTD, _UDSD, _UDMD,
-//    _userid = US.userInfo.UserId,
+//    _userid = US.userInfo.userid,
 //     _USE = U.MD.DK.C.getIcon(UDE.UserDirectoryExtendType.toLowerCase()),
 //      _UTF = "文件" + (UDE.filetype ? "" : "夹"),
 //      _diskinfo = US.disk.UserDisk; UDE = UDE || U.Json.select(_diskinfo[0], { "UserDirectoryID": UDID }, null, 1)[0];
@@ -137,9 +137,9 @@ U.MD.DK.RE.newJurisdiction = function (disk) {
 
 
 U.MD.DK.RE.DMB = function (UDE, UAF, UDPD, userid) {
-    userid = userid || (UDE.UserId || UDE.GroupID) || ((UDE[0]) && (UDE[0].UserId || UDE[0].GroupID)) || US.userInfo.UserId; //选择删除文件的用户ID
+    userid = userid || (UDE.UserId || UDE.GroupID) || ((UDE[0]) && (UDE[0].UserId || UDE[0].GroupID)) || US.userInfo.userid; //选择删除文件的用户ID
     var i, _UH, _el,
-    _userid = US.userInfo.UserId;
+    _userid = US.userInfo.userid;
     UDE = UDE.length ? UDE : [UDE];
     if (U.MD.DK.C.getDirectoryPermissions()[4] || (UDE = U.Json.select(UDE, { "UserId": _userid })).length) { //权限设置 
         if (UDE.length > 1) {
@@ -1238,7 +1238,7 @@ U.MD.DK.RE.DMB = function (UDE, UAF, UDPD, userid) {
 ////})()
 
 
-//    var _dirid, _userid = US.userInfo.UserId;
+//    var _dirid, _userid = US.userInfo.userid;
 //    if (U.MD.DK.C.getDirectoryPermissions(null, null, UDE)[4]) {//本人才允许重命名
 //        UDOD.innerText = "";
 //        (_dirid = $$("input", {

+ 57 - 57
js/NetworkPromotion/NULL/NotUse4.js

@@ -25,7 +25,7 @@
 //导航点击 默认导航 (其实导航 没有树形分类的)
 //U.MD.DK.LL.MRHYHWP = function (UDOD, UIE, userid) {
 //    var _UDE = U.MD.DK.M.diskOperatingSwitch(userid)[1][0]; //转到个人使用网盘
-//    if (!UIE && US.userInfo.UserId != _UDE.UserId) {
+//    if (!UIE && US.userInfo.userid != _UDE.UserId) {
 //        U.alert("他人的私密空间无法查看");
 //        return;
 //    } //私密地方必须本人操作
@@ -54,7 +54,7 @@
 ////如果是我的协同或者是他人邀请的
 //U.MD.DK.LL.FCKDXWPDH = function (UDID) {
 //    if (UDID == "22222222-2222-2222-2222-222222222222") {
-//        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.UserId, US.EMPTYGUID, US.EMPTYGUID, 0, 0, 100], function (r) {
+//        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.userid, US.EMPTYGUID, US.EMPTYGUID, 0, 0, 100], function (r) {
 //            var _array = [];
 //            for (var i = 0; i < r.value.length; i++) {
 //                _array.push({
@@ -85,7 +85,7 @@
 //        });
 //    } else if (UDID == "11111111-1111-1111-1111-111111111111") {
 
-//        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.UserId, "00000000-0000-0000-0000-000000000000", "", 0, 0, 100], function (r) {
+//        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.userid, "00000000-0000-0000-0000-000000000000", "", 0, 0, 100], function (r) {
 //            var _array = [];
 //            for (var i = 0; i < r.value.length; i++) {
 //                _array.push({
@@ -283,7 +283,7 @@ r[2]为图片文件流。
 
 //检测当前用户输入的密码是否正确
 // U.MD.U.P.CNP = function (UDOD, UTF, cb) {
-//     U.A.Request(US.AUTH, ["Check" + (UTF ? "SecurityCode" : "Password"), US.userInfo.UserId, UDOD.value]), U.MD.U.P.AsynCNP, ["", UDOD, UTF, cb];
+//     U.A.Request(US.AUTH, ["Check" + (UTF ? "SecurityCode" : "Password"), US.userInfo.userid, UDOD.value]), U.MD.U.P.AsynCNP, ["", UDOD, UTF, cb];
 // }
 
 //异步判断密码是否正确
@@ -325,7 +325,7 @@ r[2]为图片文件流。
 //#region 检查资料完整度
 
 // U.MD.U.P.CheckDataIntegrity = function () {
-//     if (US.userInfo.UserId) {
+//     if (US.userInfo.userid) {
 //         var i, j = 0,
 //         _UDE = ["UserNickName", "UserEmail",
 //         "UserTelephoneNumber", "TrueName", "UserIDCard", "Country",
@@ -671,7 +671,7 @@ U.MD.DK.VW.XWPDYH = function (UDE, UDOD, userid) {
                     _UDTD = $$("div", {
                         "title": (_USN = UDE[i].UserNickName || UDE[i].GroupManageDescript || UDE[i].GroupManageName),
                         "className": "U_MD_DK_RZO " + (_UGID ? "U_MD_DK_RZOKO" : "U_MD_DK_RZOK")
-                        //  "onclick": _UGID ? function(){U.MD.DK.LL.RecordNav, [[[U.MD.DK.LE.openFileDirectory, [UDE[i], US.userInfo.UserId]]]]]] : [[U.MD.D.I.openApplication("Disk", { "userid": UDE[i].UserId, "directoryid": US.FTPFOLDERID});} 
+                        //  "onclick": _UGID ? function(){U.MD.DK.LL.RecordNav, [[[U.MD.DK.LE.openFileDirectory, [UDE[i], US.userInfo.userid]]]]]] : [[U.MD.D.I.openApplication("Disk", { "userid": UDE[i].UserId, "directoryid": US.FTPFOLDERID});} 
                     }, _UDFD);
                     _UDSD = $$("div", { "className": _UGID ? "U_MD_DK_RZOQI" : "U_MD_DK_RZOKI" }, _UDTD);
                     if (_UGID) { _UAE = U.MD.DK.VW.XWPDYHTX(_UDSD, _UGID); }
@@ -770,7 +770,7 @@ U.MD.DK.LE.ApplyDnsEnd = function (UDID) {
 //申请域名判断
 U.MD.DK.LE.aDomain = function (userid, UGE) {
     if (!U.MD.U.L.isLogin()) { //登录使用
-        var _UDID = UGE[1][1], _UUID = US.userInfo.UserId;
+        var _UDID = UGE[1][1], _UUID = US.userInfo.userid;
         if (UGE[4][_UDID].UserId == _UUID || userid == _UUID) { //本人ftp群文件夹允许
             var _UDE = U.MD.DK.M.diskOperatingSwitch(userid);
             if (_UDE[1][1]) { U.UF.UI.confirm("是否申请域名生成站点", function () { U.MD.DK.LE.aDnsF(_UDE[1][1]); }) }; //当前目录申请
@@ -781,8 +781,8 @@ U.MD.DK.LE.aDomain = function (userid, UGE) {
 
 //判断当前目录是否生成域名解析
 U.MD.DK.LE.GetDns = function (UDID, cb) {
-    //U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_S_CountDns", US.userInfo.UserId, UDID], U.MD.DK.LE.AsynGetDns, ["", UDID, cb]);
-    //  U.A.Request(US.AUTH,"UseStudioDisk.CountDns", [US.userInfo.UserId, UDID], U.MD.DK.LE.AsynGetDns, ["", UDID, cb]);
+    //U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_S_CountDns", US.userInfo.userid, UDID], U.MD.DK.LE.AsynGetDns, ["", UDID, cb]);
+    //  U.A.Request(US.AUTH,"UseStudioDisk.CountDns", [US.userInfo.userid, UDID], U.MD.DK.LE.AsynGetDns, ["", UDID, cb]);
 }
 
 ///获取dns解析次数异步
@@ -823,9 +823,9 @@ U.MD.DK.LE.aDnsF = function (UDID) {
 
 //确定申请域名
 U.MD.DK.LE.eaDomain = function (UDID, UDOD) {
-    //U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_I_AddDns", US.userInfo.UserId, UDID, 0], U.MD.DK.LE.AsyneaDomain, ["", UDID, UDOD]);
+    //U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_I_AddDns", US.userInfo.userid, UDID, 0], U.MD.DK.LE.AsyneaDomain, ["", UDID, UDOD]);
 
-    //U.A.Request(US.AUTH,"UseStudioDisk.AddDns", [US.userInfo.UserId, UDID], U.MD.DK.LE.AsyneaDomain, ["", UDID, UDOD]);
+    //U.A.Request(US.AUTH,"UseStudioDisk.AddDns", [US.userInfo.userid, UDID], U.MD.DK.LE.AsyneaDomain, ["", UDID, UDOD]);
 }
 
 //申请域名异步
@@ -943,7 +943,7 @@ U.MD.DK.LE.USOS = function (UDID, UTH, UFT, cb, UTF, UPID, UIN) {
     var _UDPD, _UTF,
     _userdisk = US.disk.UserDisk,
     _userid = _userdisk.userInfo.UserId, //用户ID
-    _UYID = US.userInfo.UserId,
+    _UYID = US.userInfo.userid,
     _UDE = U.UF.C.isString(UDID) ? (_userdisk[4][UDID] ? _userdisk[4][UDID] : UDID) : UDID;
     UDID = _UDE ? _UDE.UserDirectoryID : UDID;
     if (_UDE.UserFilesID != undefined) { UDID = _UDE.UserFilesID; _UDE.UserFilesServerName = "" }
@@ -963,7 +963,7 @@ U.MD.DK.LE.USOS = function (UDID, UTH, UFT, cb, UTF, UPID, UIN) {
             _userdisk[1][1] = UPID = (userid == _userid) ? US.MYFOLDERID : US.FTPFOLDERID;
         }; //选择目录
         if (UIN) {
-            return U.MD.DK.RE.AF(UFT, UIN, function () { cb(); }, US.userInfo.UserId, true);
+            return U.MD.DK.RE.AF(UFT, UIN, function () { cb(); }, US.userInfo.userid, true);
         } //直接新建
         else {
             _userdisk = US.disk.UserDisk;
@@ -1027,7 +1027,7 @@ U.MD.DK.LE.GM = function (UDE) {
 * @param  {object} ajax异步数据
 */
 U.MD.DK.LE.openDownloadPage = function (USN, UN, userid, UFID, UTF) {
-    var _UTF = US.userInfo.UserId == userid,
+    var _UTF = US.userInfo.userid == userid,
     _UMT = USN.split(".")[1],
     _el = event ? event.srcElement : null;
     U.alert("正在努力的打开中,请稍后");
@@ -1195,7 +1195,7 @@ U.MD.DK.C.WPTDSY = function (UDOD, cb) {
 //        dirid = diskinfo.directoryid;
 //    }
 //    var _diskuserid = diskinfo.userInfo.UserId, //网盘用户id
-//        _userid = US.userInfo.UserId, //用户id
+//        _userid = US.userInfo.userid, //用户id
 //        _permis = U.MD.DK.C.readWritePermission(dirid, diskinfo); //判断是否具有添加网盘的操作权限 判断是否有添加的权限 和 获取的权限
 
 //    //根据上面调用的函数返回的目录的信息,如果没有返回说明操作的不是目录
@@ -1228,9 +1228,9 @@ U.MD.DK.C.WPTDSY = function (UDOD, cb) {
 //文件置顶
 U.MD.DK.RE.DWJXZ = function (UFID, UV) {
     //#error 文件添加指定审核
-    U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_I_AddFileEX", US.userInfo.UserId, UFID, UV == "true" ? 1 : 0], function () { U.alert("成功添加置顶"); });
+    U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_I_AddFileEX", US.userInfo.userid, UFID, UV == "true" ? 1 : 0], function () { U.alert("成功添加置顶"); });
 
-    //  U.A.Request(US.AUTH,"UseStudioDisk.WJXG", [US.userInfo.UserId, UFID, UV], function(){U.alert("成功添加置顶");});
+    //  U.A.Request(US.AUTH,"UseStudioDisk.WJXG", [US.userInfo.userid, UFID, UV], function(){U.alert("成功添加置顶");});
 }
 
 //#endregion
@@ -1240,7 +1240,7 @@ U.MD.DK.RE.DWJXZ = function (UFID, UV) {
 U.MD.DK.RE.TSXXML = function () {
     var i, _dirid, _fileinfo, _UKE, _UCE,
     _UTF = 1,
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
      _diskinfo = US.disk.UserDisk; //获取文件权限
     if (_diskinfo[1][2] == _userid || _diskinfo[2]) {
         if (_diskinfo[2] || ((_fileinfo = U.Json.RecurD(_diskinfo[0], null, { "UserDirectoryID": _diskinfo[1][1] }, "UserDirectoryParentID"), _UCE = _fileinfo[_fileinfo.length - 1], _dirid = _UCE.UserDirectoryID) && _UCE.GroupID || _dirid == US.FTPFOLDERID)) { //判断是否群文件推送或者是目录推送
@@ -1274,7 +1274,7 @@ U.MD.DK.RE.TSXXML = function () {
 //    _UJE = [],
 //     _USE = [0, 11, 17],
 //     _UTP = event.type,
-//     _userid = US.userInfo.UserId,
+//     _userid = US.userInfo.userid,
 //     _UGE = !userid ? US.disk.UserDisk : U.MD.DK.M.diskOperatingSwitch(userid),
 //     _UIE = _UGE[1][4] == "Detailed",
 //     _UDTD = U.selectEl("#" + (_UGE[2] ? "U_MD_DK_MO" : "U_MD_DK_M"), _UGE.formel),
@@ -1792,7 +1792,7 @@ U.UF.E.unifiedFormat = function (allEle) {
 U.MD.DK.RE.MBC = function (UDID, UST, UTF, UTP) {
     var _UAL,
     _UFT = false,
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _diskinfo = US.disk.UserDisk,
     _fileinfo = U.Json.select(_diskinfo.directoryOrFiles, { "UserDirectoryParentID": UDID
     }),
@@ -1830,7 +1830,7 @@ U.MD.DK.RE.Prompt = function (UTS, UH, UW, UC, UCY, UDOD) {
 
 //修改文件名
 U.MD.DK.RE.MFN = function (UDE, UST, cb, userid) {
-    userid = userid || US.userInfo.UserId;
+    userid = userid || US.userInfo.userid;
     var _UEN = UDE.UserDirectoryExtendType,
      _diskinfo = U.MD.DK.M.diskOperatingSwitch(userid),
      _USN = UST.replaceHtmlSign();
@@ -2030,7 +2030,7 @@ U.MD.DK.RE.shear = function (UDE, TF) {
             break; //登录注册识别
         case "UD_DiskCon": //查看新文件
             US.disk.DiskDaren["SE"] = { UserFilesID: UDE[0] };
-            U.MD.U.L.setLoginCallBack(function () { U.MD.D.I.openApplication("Disk", { "userid": US.userInfo.UserId, "directoryid": UDE[1] }) });
+            U.MD.U.L.setLoginCallBack(function () { U.MD.D.I.openApplication("Disk", { "userid": US.userInfo.userid, "directoryid": UDE[1] }) });
             break;
         //case "ftp": U.MD.DK.H.SYWPQH(this, 1);                
         //break; //查看ftp共享                
@@ -2040,7 +2040,7 @@ U.MD.DK.RE.shear = function (UDE, TF) {
         case "1": //添加好友消息
             U.selectEl("#U_MD_D_MG_OA").Child()[0].onclick();
             break;
-        case "3": (US.userInfo.UserId && (_UCE = U.Json.select(US.friend.group, { "GroupManageID": UDE.MessageContent })[0])) && (U.MD.F.W.viewFriend(_UCE));
+        case "3": (US.userInfo.userid && (_UCE = U.Json.select(US.friend.group, { "GroupManageID": UDE.MessageContent })[0])) && (U.MD.F.W.viewFriend(_UCE));
             break; //给拉入群消息  
 
 
@@ -2062,23 +2062,23 @@ U.MD.DK.RE.shear = function (UDE, TF) {
         U.alert("不允许添加到选择目录");
     } //添加
     else if (_UTF[0]) {//目录允许粘贴
-        if (_fileinfo.length && (((_dirid = _UKE.UserDirectoryID) == US.FTPFOLDERID || _UKE.GroupID != null) || ((_dirid == _USID || _dirid == US.PRIVATEFOLDERID) && US.userInfo.UserId == userid)) || !UDID) { //相同目录类型的 获取添加到共享 我的私密
+        if (_fileinfo.length && (((_dirid = _UKE.UserDirectoryID) == US.FTPFOLDERID || _UKE.GroupID != null) || ((_dirid == _USID || _dirid == US.PRIVATEFOLDERID) && US.userInfo.userid == userid)) || !UDID) { //相同目录类型的 获取添加到共享 我的私密
             _UGID = U.MD.DK.RE.WPHQID(_UTF[2][0], _diskinfo); _UCE = U.MD.DK.C.MLWJSY(_fileinfo);
             if (_UTP == "Cut" || _diskinfo[1][0].FileSize + _UCE[1] <= U.UF.UP.maxUnitToByte(_diskinfo[1][0].UserDiskSpace + "M")) {
                 if (!UDID) {
                     U.alert("自动整理分配粘贴文件");
                     _UTP = _UTP == "Cut";
-                    U.A.Request(US.AUTH, ["CopyOrCutAndPasteFiles", US.userInfo.UserId, U.Json.toKeyArray(_fileinfo, "UserDirectoryID").join(","), _UTP, UDID]), U.MD.DK.RE.AsynTSStick, ["", UDID, _fileinfo, _UCE[1], cb, _diskinfo[1][2], _UGID, _UTP, _dirid];
+                    U.A.Request(US.AUTH, ["CopyOrCutAndPasteFiles", US.userInfo.userid, U.Json.toKeyArray(_fileinfo, "UserDirectoryID").join(","), _UTP, UDID]), U.MD.DK.RE.AsynTSStick, ["", UDID, _fileinfo, _UCE[1], cb, _diskinfo[1][2], _UGID, _UTP, _dirid];
                 } //所有文件需要分配目录
                 else {
                     if (_UTP == "Cut") {
-                        U.A.Request(US.AUTH, ["CutAndPasteFiles", US.userInfo.UserId, UDID, U.Json.toKeyArray(_fileinfo, "UserDirectoryID").join(","), _UGID, (_fileinfo[0].GroupID || "")]), U.MD.DK.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], cb, _diskinfo[1][2], _UGID, _UTP, _dirid];
+                        U.A.Request(US.AUTH, ["CutAndPasteFiles", US.userInfo.userid, UDID, U.Json.toKeyArray(_fileinfo, "UserDirectoryID").join(","), _UGID, (_fileinfo[0].GroupID || "")]), U.MD.DK.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], cb, _diskinfo[1][2], _UGID, _UTP, _dirid];
                     }
                     else {
-                        U.A.Request(US.AUTH, ["CopyAndPasteFiles", US.userInfo.UserId, UDID, U.Json.toKeyArray(_fileinfo, "UserDirectoryID").join(","), _UGID, (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), U.MD.DK.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], cb, _diskinfo[1][2], _UGID, _UTP, _dirid];
+                        U.A.Request(US.AUTH, ["CopyAndPasteFiles", US.userInfo.userid, UDID, U.Json.toKeyArray(_fileinfo, "UserDirectoryID").join(","), _UGID, (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), U.MD.DK.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], cb, _diskinfo[1][2], _UGID, _UTP, _dirid];
                     }
 
-                    //     U.A.Request(US.AUTH,"UseStudioDisk." + _UTP + (_UTP == "Cut" ? "File" : (_UCE[2].length ? "Folder" : "File")), [US.userInfo.UserId, UDID, U.Json.toKeyArray(_fileinfo,"UserDirectoryID").join(","), _UGID, _UTP == "Cut" ? (_fileinfo[0].GroupID || "") : (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), U.MD.DK.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], cb, _diskinfo[1][2], _UGID, _UTP, _dirid];
+                    //     U.A.Request(US.AUTH,"UseStudioDisk." + _UTP + (_UTP == "Cut" ? "File" : (_UCE[2].length ? "Folder" : "File")), [US.userInfo.userid, UDID, U.Json.toKeyArray(_fileinfo,"UserDirectoryID").join(","), _UGID, _UTP == "Cut" ? (_fileinfo[0].GroupID || "") : (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), U.MD.DK.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], cb, _diskinfo[1][2], _UGID, _UTP, _dirid];
                 } //普通目录粘贴
             }
             else {
@@ -2285,10 +2285,10 @@ U.MD.DK.RE.AF = function (UTF, fun, UAF, userid, UFT) {
         _UOID = _fileinfo[_fileinfo.length - 1].UserDirectoryID;
         _fileinfo = U.MD.DK.M.RUS(new U.MD.DK.M.entity(Guid.newGuid(), 0, _UPID, fun.addEllipsis(20), fun, UTF, null, U.UF.D.toTimeStamp(new Date()), "", _USC, null, _UOID == US.PRIVATEFOLDERID ? "true" : "", _ULX, "", (_UOID == US.FTPFOLDERID ? userid : (_UGID || "")), null, userid)); //生成文件实体 
         if (_fileinfo.filetype == "1") {
-            U.A.Request(US.AUTH, ["CreateFile", US.userInfo.UserId, _fileinfo["UserDirectoryID"], _fileinfo["UserDirectoryParentID"], fun.escapeQuotes() + (UTF == "txt" ? ".txt" : ""), _fileinfo["UserFilesServerName"] || "", "", "", UTF, _UGID]), U.MD.DK.RE.AsynAF, ["", _fileinfo, UAF, _diskinfo, U.MD.D.H.ET["Disk"]["SY"]["DJ"], userid, UTF, UFT]; //创建文件或者文件夹异步
+            U.A.Request(US.AUTH, ["CreateFile", US.userInfo.userid, _fileinfo["UserDirectoryID"], _fileinfo["UserDirectoryParentID"], fun.escapeQuotes() + (UTF == "txt" ? ".txt" : ""), _fileinfo["UserFilesServerName"] || "", "", "", UTF, _UGID]), U.MD.DK.RE.AsynAF, ["", _fileinfo, UAF, _diskinfo, U.MD.D.H.ET["Disk"]["SY"]["DJ"], userid, UTF, UFT]; //创建文件或者文件夹异步
         }
         else {
-            U.A.Request(US.AUTH, ["CreateDirectory", US.userInfo.UserId, _fileinfo["UserDirectoryID"], _USC, fun.escapeQuotes(), _fileinfo["UserDirectoryParentID"], _UGID, _fileinfo.filetype == "1" ? (_fileinfo["UserDirectoryEncrypt"] || _UGID) : _fileinfo["UserDirectoryEncrypt"]]), U.MD.DK.RE.AsynAF, ["", _fileinfo, UAF, _diskinfo, U.MD.D.H.ET["Disk"]["SY"]["DJ"], userid, UTF, UFT]; //创建文件或者文件夹异步
+            U.A.Request(US.AUTH, ["CreateDirectory", US.userInfo.userid, _fileinfo["UserDirectoryID"], _USC, fun.escapeQuotes(), _fileinfo["UserDirectoryParentID"], _UGID, _fileinfo.filetype == "1" ? (_fileinfo["UserDirectoryEncrypt"] || _UGID) : _fileinfo["UserDirectoryEncrypt"]]), U.MD.DK.RE.AsynAF, ["", _fileinfo, UAF, _diskinfo, U.MD.D.H.ET["Disk"]["SY"]["DJ"], userid, UTF, UFT]; //创建文件或者文件夹异步
         }
         return _fileinfo;
     }
@@ -2309,9 +2309,9 @@ U.MD.DK.RE.AsynAF = function (r) {
      _dirid = _diskinfo[1][1];
     r = r.value;
     if (r != null) {
-        if (_diskinfo[2] || _diskinfo[1][2] != US.userInfo.UserId) {
+        if (_diskinfo[2] || _diskinfo[1][2] != US.userInfo.userid) {
 
-            _fileinfo.UserId = US.userInfo.UserId;
+            _fileinfo.UserId = US.userInfo.userid;
             _fileinfo.UserNickName = US.userInfo.UserNickName;
             _fileinfo.UserName = US.userInfo.UserName;
             _fileinfo.UserThumbnailImageHead = US.userInfo.UserThumbnailImageHead;
@@ -2729,7 +2729,7 @@ U.MD.DK.RE.AsynWPXJWJ = function (UDOD, userid, UDE) {
 
         _formel = _form.form; //返回word的整个窗体。
 
-        //        U.A.Request("http://cd.1473.cn/php", ["db.1473.cn", "UseStudio_DNS", "GetDnsInfoByFidUid", US.userInfo.UserId, fileinfo.UserDirectoryID], function (r) {
+        //        U.A.Request("http://cd.1473.cn/php", ["db.1473.cn", "UseStudio_DNS", "GetDnsInfoByFidUid", US.userInfo.userid, fileinfo.UserDirectoryID], function (r) {
         U.A.Request("http://cd.1473.cn/php", ["db.1473.cn", "UseStudio_DNS", "GetDnsInfoByFileId", fileinfo.UserDirectoryID], function (r) {
             fileinfo.DnsInfo = r.value[0];
             U.MD.DS.DnsInfo[fileinfo.UserDirectoryID] = fileinfo;
@@ -2978,7 +2978,7 @@ U.MD.O.AsynWordO = function (r) {
 // U.MD.D.Txt.TxtClose = function (UDE, userid, UDID, UDOD) {
 //     UDOD = U.selectEl(UDOD);
 //     var _UCB,
-//         _userid = US.userInfo.UserId,
+//         _userid = US.userInfo.userid,
 //         _UDTD = UDOD.find("textarea")[0],
 //         _UDID = UDOD.find("input")[0],
 //         _UFN = _UDID.value,
@@ -2987,7 +2987,7 @@ U.MD.O.AsynWordO = function (r) {
 //         _UDN = UDE.UserallDirectoryName.replace("." + UDE.UserDirectoryExtendType, "");
 //     if (_userid && (!UDE || _userid == UDE.UserId)) {
 //         if (UDE && UDE.UserDirectoryID && _UDN != _UFN && U.UF.S.ZWFileName.test(_UFN)) {
-//             U.MD.DK.RE.MFN(UDE, _UFN, null, US.userInfo.UserId);
+//             U.MD.DK.RE.MFN(UDE, _UFN, null, US.userInfo.userid);
 //         } //保存文件同时修改文件名
 //         else if ((_UFN != _UDID.defaultValue || _UTH != _UDTD.defaultValue) && (_UFN != _UDN || _UTH != UDE.UsOffice)) { //内容更变处理
 //             if (_UTF) {
@@ -3067,7 +3067,7 @@ U.MD.O.AsynWordO = function (r) {
 //      _UDID = _el.find("input")[0],
 //      _UHT = _UDTD.value,
 //      _UIN = _UDID.value,
-//      _userid = US.userInfo.UserId;
+//      _userid = US.userInfo.userid;
 //     if (!U.MD.U.L.isLogin() && (_UTF || UDE.UserId == _userid)) { //登录保存使用
 //         if (!U.UF.S.ZWFileName.test(_UIN) && _UDID.defaultValue != _UIN) {
 //             U.alert("文件名不符合");
@@ -3437,7 +3437,7 @@ U.UF.EC.MD5 = function (str) {
 */
 U.MD.DK.VW.fileSwitchForm = function (UDID, UTF, UDE, UP) {
     var _UXY = U.UF.EL.getMousePosition(),
-    _UGE = U.MD.DK.M.diskOperatingSwitch(US.userInfo.UserId),
+    _UGE = U.MD.DK.M.diskOperatingSwitch(US.userInfo.userid),
     _UME = U.selectEl("body").getElementInfo(),
     _el = $$("div", { "className": "U_MD_O_E_ZOCC" }),
     _UDTD = $$("div", { "className": "U_MD_O_E_ZOCCL", "style": { "border": "0"} }, _el),
@@ -3488,7 +3488,7 @@ U.MD.DK.VW.fileSwitchForm = function (UDID, UTF, UDE, UP) {
 //弹出网盘选择框
 U.MD.DK.VW.CCWPXZK = function (UDID, UDE, UTP, UFID, cb) {
     if (!U.MD.U.L.isLogin()) {
-        if (U.MD.DK.M.diskOperatingSwitch(US.userInfo.UserId)) {
+        if (U.MD.DK.M.diskOperatingSwitch(US.userInfo.userid)) {
             var _UDSD, _UDTD = $$("div", {});
             $$("div", {
                 innerHTML: "◀",
@@ -3541,7 +3541,7 @@ U.MD.DK.VW.ZBPWPTP = function (UDID, UDOD, UDE, UTP) {
 
 //打印网盘图片准备
 U.MD.DK.VW.PWPTP = function (UDID, UDOD, UDE, UTP) {
-    var _userid = US.userInfo.UserId;
+    var _userid = US.userInfo.userid;
     UDOD.innerText = "";
 
     U.MD.DK.LE.getChildsByDirectoryId(_userid, _diskinfo[4][UDID], [UDOD, true], function () { U.MD.DK.VW.PCKBDBL(UDID, UDOD, UDE, UTP); });
@@ -3570,7 +3570,7 @@ U.MD.DK.VW.AsynAPWPTP = function (r) {
 U.MD.DK.VW.PCKBDBL = function (UDE, UDOD, UCE, UTP, UFID) {
     var i, _UDID, _UDTD, _UDSD, _UDND, _UTM, _UAE, _UTF, _UTP, _UNE,
     _UDFD = $$("div", { className: "U_MD_HomeSXZLRSITN" }),
-    _UGE = U.MD.DK.M.diskOperatingSwitch(US.userInfo.UserId); //获取用户的云盘资料
+    _UGE = U.MD.DK.M.diskOperatingSwitch(US.userInfo.userid); //获取用户的云盘资料
     //获取目录id
     if (U.UF.C.isString(UDE)) {
         _UDID = UDE;
@@ -4469,7 +4469,7 @@ cb 回调函数
 */
 //U.MD.O.W.BCWJ = function () {
 //    var _wordinfo = U.MD.O.W, //word对象处理
-//    _uid = US.userInfo.UserId, //用户id
+//    _uid = US.userInfo.userid, //用户id
 //    _fileinfo = _wordinfo["fileinfo"], //文件信息
 //    _contentdiv = $$("div", { "innerHTML": _fileinfo.UsOffice }), //默认的文档内容
 //    _editor = U.selectEl("#U_MD_O_W_E_body")[0]; //编辑div
@@ -4489,7 +4489,7 @@ cb 回调函数
 //    U.MD.O.W.fileinfo = _fileinfo; //设置word文件信息实体
 //    U.MD.O.W.parentid = _fileinfo.UserDirectoryParentID; //设置目录id
 //    U.MD.O.W.id = _fileinfo.UserDirectoryID; //设置文件的id
-//    U.MD.O.W.userid = _fileinfo.UserId || top.US.userInfo.UserId; //设置所属人信息
+//    U.MD.O.W.userid = _fileinfo.UserId || top.US.userInfo.userid; //设置所属人信息
 //    if (U.UF.C.isFunction(cb)) { cb(_fileinfo); } //回调函数
 //}
 
@@ -4512,12 +4512,12 @@ cb 回调函数
 
 //    if (_fileinfo) { //判断是否有文件信息
 
-//        _isuser = _fileinfo.UserId == US.userInfo.UserId; //判断是否是本人
-//        _isgroup = _fileinfo.UserDirectoryEncrypt && U.Json.select(US.friend.groupusers, { "GroupManageID": _fileinfo.UserDirectoryEncrypt, "UserId": US.userInfo.UserId })[0]; //判断是否为群成员备份
+//        _isuser = _fileinfo.UserId == US.userInfo.userid; //判断是否是本人
+//        _isgroup = _fileinfo.UserDirectoryEncrypt && U.Json.select(US.friend.groupusers, { "GroupManageID": _fileinfo.UserDirectoryEncrypt, "UserId": US.userInfo.userid })[0]; //判断是否为群成员备份
 
 //        if (_isuser || _isgroup) { //判断备份的文件是否为用户自己的文件
 
-//            U.MD.DK.M.diskOperatingSwitch(US.userInfo.UserId); //操作用户切换会当前登录用户
+//            U.MD.DK.M.diskOperatingSwitch(US.userInfo.userid); //操作用户切换会当前登录用户
 
 //            //弹出查看备份选择
 //            U.MD.DK.VW.CCWPXZK(UDE.UserDirectoryParentID, {
@@ -4662,7 +4662,7 @@ cb 回调函数
     //        //获取编辑区域的内容
     //            _editor = U.selectEl("#U_MD_O_W_E_body")[0],
     //            _html = _editor.innerHTML.escapeQuotes(), //获取编辑区域的html 这里保存的值包含了分页
-    //            _userdisk = top.U.MD.DK.M.diskOperatingSwitch(US.userInfo.UserId) //获取用户个人网盘的信息 _userdisk.formel 是用户的网盘窗体
+    //            _userdisk = top.U.MD.DK.M.diskOperatingSwitch(US.userInfo.userid) //获取用户个人网盘的信息 _userdisk.formel 是用户的网盘窗体
     //         ;
     //        //判断用户是否为ftp用户
     //        if (_uid == _wordinfo["userid"] || (_fileinfo && _fileinfo.GroupID == _uid)) {
@@ -4672,13 +4672,13 @@ cb 回调函数
     //        if (_fileinfo) {
     //            _isgroupuser = U.Json.select(US.friend.groupusers, {
     //                "GroupManageID": _fileinfo.UserDirectoryEncrypt,
-    //                "UserId": US.userInfo.UserId
+    //                "UserId": US.userInfo.userid
     //            })[0];
     //        }
     //        //判断文件是否是自己或者是ftp的文件或者是群文件
     //        if (_fileinfo && (_isftp || _isgroupuser)) {
     //            top.U.MD.DK.LE.USOS(_fileinfo, _html, null, cb); //保存到数据库 
-    //            U.MD.O.W.Panel.InsertOfficeHistory(_fileinfo.UserDirectoryID, US.userInfo.UserId, _html);  //插入历史记录
+    //            U.MD.O.W.Panel.InsertOfficeHistory(_fileinfo.UserDirectoryID, US.userInfo.userid, _html);  //插入历史记录
     //        }
     //        //文件不存在 或者文件不属于自己就创建一个新文件保存
     //        else {
@@ -5218,7 +5218,7 @@ U.UF.IMG.Create.init.prototype = {
     //}, fileinfo.UserId);
     //    var _needuser = top.U.MD.F.J.selectUserInfo.NeedUser;
     //        //用户id   群id   文件id   群id   判断
-    //        U.A.Request(US.AUTH,"UseStudioDisk.CopyAndPasteFiles", [US.userInfo.UserId, groupid.GroupManageID, fileinfo.UserFilesID || fileinfo.UserDirectoryID, groupid.GroupManageID, 1], function (r) {
+    //        U.A.Request(US.AUTH,"UseStudioDisk.CopyAndPasteFiles", [US.userInfo.userid, groupid.GroupManageID, fileinfo.UserFilesID || fileinfo.UserDirectoryID, groupid.GroupManageID, 1], function (r) {
 
     //        //重新打开
     //        U.MD.O.word();
@@ -5235,8 +5235,8 @@ U.UF.IMG.Create.init.prototype = {
     else { //如果不是群文件,把当前uw文件复制到群里
 
 
-    //   var _UME = top.U.MD.DK.RE, _UCE = top.U.MD.DK.C.MLWJSY(fileinfo), _UGE = top.U.MD.DK.M.diskOperatingSwitch(US.userInfo.UserId);
-    //   U.A.Request(US.AUTH,"UseStudioDisk.CopyFile", [US.userInfo.UserId, UGID, fileinfo[1]["UserDirectoryID"], US.userInfo.UserId, (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), top.U.MD.DK.RE.AsynUFStick, ["", UGID, [fileinfo[1]], _UCE[1], null, _UGE[1][2], UGID, "Copy", UGID];
+    //   var _UME = top.U.MD.DK.RE, _UCE = top.U.MD.DK.C.MLWJSY(fileinfo), _UGE = top.U.MD.DK.M.diskOperatingSwitch(US.userInfo.userid);
+    //   U.A.Request(US.AUTH,"UseStudioDisk.CopyFile", [US.userInfo.userid, UGID, fileinfo[1]["UserDirectoryID"], US.userInfo.userid, (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), top.U.MD.DK.RE.AsynUFStick, ["", UGID, [fileinfo[1]], _UCE[1], null, _UGE[1][2], UGID, "Copy", UGID];
     }
     */
 
@@ -5438,7 +5438,7 @@ U.UF.UI.EditorLoad.init.prototype = {
                 }, _UDTD);
 
                 _UDUD = $$("div", { "className": "U_MD_F_DTZ U_Img U_MD_HomeSXZBFCAHO", "style": { "position": "relative" }, "title": "本地添加文件" }, _UDSD);
-                if (US && US.userInfo && US.userInfo.UserId) {
+                if (US && US.userInfo && US.userInfo.userid) {
                     $$("div",
                     {
                         "className": "U_MD_F_DTW U_Img U_MD_HomeSXZBFCAHH",
@@ -5825,7 +5825,7 @@ U.UF.UI.EditorLoad.init.prototype = {
                 this.ufcp(r, _UFID);
             }
             else if ((!this.rt.fup) || (this.rt.fup(_UDE) !== false)) {
-                this.objfl.upload((this.url || "http://main.1473.cn/USUpfile.ashx?typename=UseStudioEditor&") + "UserId=" + (US.userInfo.UserId || US.EMPTYGUID) + "&IsF=true", _UFID, _UDE[1], _UDE[2]);
+                this.objfl.upload((this.url || "http://main.1473.cn/USUpfile.ashx?typename=UseStudioEditor&") + "UserId=" + (US.userInfo.userid || US.EMPTYGUID) + "&IsF=true", _UFID, _UDE[1], _UDE[2]);
             }
         },
         _ = function (UWE, UFID) {
@@ -6065,7 +6065,7 @@ U.UF.UI.EditorLoad.init.prototype = {
 
        
     //    var i, j, _ULE, _UTF, _UPE, _UCE, _UKE, _UME, _UNE, _friendform,
-    //    _userid = US.userInfo.UserId;
+    //    _userid = US.userInfo.userid;
     //    if ((news = news[3])) {
     //        for (i = 0; i < news.length; i++) {
     //            _UCE = news[i];
@@ -6083,7 +6083,7 @@ U.UF.UI.EditorLoad.init.prototype = {
     //                        U.MD.D.Blog.N.PNXX(); //打印学习系统和blog消息
     //                        break;
     //                    case "UD_DiskCon": case "DDisk": //Disk添加删除文件
-    //                        _UKE = U.MD.DK.M.diskOperatingSwitch(US.userInfo.UserId);
+    //                        _UKE = U.MD.DK.M.diskOperatingSwitch(US.userInfo.userid);
     //                        _UPE = [];
     //                        _ULE = _UKE[4][_UKE[1][1]].Child.length;
     //                        if (_UKE) {
@@ -6105,7 +6105,7 @@ U.UF.UI.EditorLoad.init.prototype = {
     //                                    _UTF = U.Json.del(_UKE[0], { "UserDirectoryID": _UNE[j] })[0];
     //                                    if (_UTF) { _UPE.push(_UTF) };
     //                                } //删除文件 
-    //                                if (_userid == _UKE[1][2] && _UPE[0].UserDirectoryParentID == _UKE[1][1]) { U.MD.DK.RE.delPageFileOrDir(_UPE, US.userInfo.UserId) }; //删除文件提示
+    //                                if (_userid == _UKE[1][2] && _UPE[0].UserDirectoryParentID == _UKE[1][1]) { U.MD.DK.RE.delPageFileOrDir(_UPE, US.userInfo.userid) }; //删除文件提示
     //                            }
     //                        }
     //                        break; //Disk更新目录
@@ -6281,7 +6281,7 @@ U.MD.F.N.XXHFXT = function (news) {
 //        U.MD.F.N.pulledIntoGroups(news);
 //    }
 //    else { //删除群消息
-//        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", US.userInfo.UserId, news.MessageID], function () { }, [""]);
+//        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", US.userInfo.userid, news.MessageID], function () { }, [""]);
 //    }
 //}
 

+ 4 - 4
js/NetworkPromotion/NULL/NotUse5.js

@@ -205,7 +205,7 @@ U.MD.O.W.AsynPaperSize = function (className) {
 //* 新建工作表处理
 //**/
 //U.MD.O.E.newExcel = function () {
-//    parent.U.MD.D.I.openApplication("excel", { "userid": US.userInfo.UserId, "directoryid": US.FTPFOLDERID }); //打开文档处理
+//    parent.U.MD.D.I.openApplication("excel", { "userid": US.userInfo.userid, "directoryid": US.FTPFOLDERID }); //打开文档处理
 
 //    //    if (!U.MD.U.L.isLogin()) {//是否登录
 //    //        var _directoryid = diskinfo.directoryid; //目录id
@@ -701,7 +701,7 @@ U.MD.O.W.AsynPaperSize = function (className) {
 ////--------------------------------------------------------------------------------保存--------------------------------------------------------------------------------
 ////关闭保存文件
 //U.MD.O.E.CSave = function (UFUN) {
-//    if (U.MD.O.E.SY["BC"] && parent.US.userInfo.UserId && U.MD.O.E.SY["userid"] == parent.US.userInfo.UserId) {
+//    if (U.MD.O.E.SY["BC"] && parent.US.userInfo.userid && U.MD.O.E.SY["userid"] == parent.US.userInfo.userid) {
 //        parent.U.UF.UI.confirm("是否更改保存文件", function () {
 //            U.MD.O.E.Save(UFUN);
 //        }, UFUN);
@@ -714,7 +714,7 @@ U.MD.O.W.AsynPaperSize = function (className) {
 //////保存
 ////U.MD.O.E.Save = function (UFUN) {
 ////    var _UGE = U.MD.O.E.SY;
-////    if (parent.US.userInfo.UserId && _UGE["userid"] == parent.US.userInfo.UserId) {
+////    if (parent.US.userInfo.userid && _UGE["userid"] == parent.US.userInfo.userid) {
 ////        return parent.U.MD.DK.LE.USOS(_UGE["ID"], U.UF.C.jsonToStr(U.MD.O.E.TF[_UGE["ID"]]), "UE", UFUN);
 ////    } //异步获取Excel
 ////    else {
@@ -2095,7 +2095,7 @@ U.MD.CD.me = new U.UF.EV.message({
 
 //            var _groupdiskarr = U.MD.DK.getGroupDirectory([_groupinfo], _diskinfo.directoryOrFiles, _userinfo.UserId);  //添加群信息到前端树中
 //            //新建一个群目录
-//            _directory = new U.MD.DK.M.entity(_groupinfo.GroupManageID, 0, US.userInfo.UserId, _groupinfo.GroupManageName, _groupinfo.GroupManageName,
+//            _directory = new U.MD.DK.M.entity(_groupinfo.GroupManageID, 0, US.userInfo.userid, _groupinfo.GroupManageName, _groupinfo.GroupManageName,
 //                            "folder", null, new Date(), U.MD.DK.C.getIcon("folder")[1], 1, null, null, 0, "", _groupinfo.GroupManageID);
 //            //调用添加文件到disk全局的方法
 //            _diskinfo = U.MD.DK.M.diskOperatingSwitch(_userinfo.UserId); //根据userid获取网盘的信息

+ 5 - 5
js/NetworkPromotion/NetworkPromotion.js

@@ -41,7 +41,7 @@ U.MD.U.NP.NTG = function (T) {
             U.MD.U.NP.GTGFW(0);
         }
         else {
-            U.A.Request("UseStudioPay.GetUserAllTG", [US.userInfo.UserId], U.MD.U.NP.AsynNTG, [$("#U_MD_U_NP_A")[0]]);
+            U.A.Request("UseStudioPay.GetUserAllTG", [US.userInfo.userid], U.MD.U.NP.AsynNTG, [$("#U_MD_U_NP_A")[0]]);
             // U.selectEl("#U_MD_U_NP_A")[0].onscroll = U.UF.EV.scrollLoad({ 'AF': U.MD.U.NP.GFWTG }).SCH();            
             U.UF.EV.scrollLoad($("#U_MD_U_NP_A")[0], function () {
                 U.MD.U.NP.GFWTG
@@ -162,7 +162,7 @@ U.MD.U.NP.GTGFW = function (P) {
     if (_UTL) { U.MD.U.NP.FWTG(_UTL); }
     else {
         var _FP = Math.floor(P / 5);
-        U.A.Request("UseStudioPay.GetTGYXSL", [US.userInfo.UserId, _FP * 50, (_FP + 1) * 50 - 1], U.MD.U.NP.AsynGTGFW, ["", P, this]);
+        U.A.Request("UseStudioPay.GetTGYXSL", [US.userInfo.userid, _FP * 50, (_FP + 1) * 50 - 1], U.MD.U.NP.AsynGTGFW, ["", P, this]);
         return [];
     }
     return _UTL;
@@ -278,7 +278,7 @@ U.MD.U.NP.GTGURL = function (TGID) {
             return false;
         } //查看地址
         U.alert("正在获取中..."); //提示用户等待
-        U.A.Request("UseStudioPay.SetUserTG", [US.userInfo.UserId, TGID], U.MD.U.NP.AsynGTGURL, ["", TGID]); //添加用户注册信息
+        U.A.Request("UseStudioPay.SetUserTG", [US.userInfo.userid, TGID], U.MD.U.NP.AsynGTGURL, ["", TGID]); //添加用户注册信息
     }
 }
 
@@ -310,7 +310,7 @@ U.MD.U.NP.GISTGURL = function (TGID) {
 
 //成功注册,添加推广信息,
 U.MD.U.NP.TGR = function () {
-    if (U.MD.U.NP.TF && US.userInfo.UserId) {//添加用户注册信息
+    if (U.MD.U.NP.TF && US.userInfo.userid) {//添加用户注册信息
         U.A.Request("UseStudioPay.UpAddR", [U.MD.U.NP.TF], function () { }, []);
         U.MD.U.NP.TF = false; //取消重复
     }
@@ -321,7 +321,7 @@ U.MD.U.NP.STG = function (TF, UTFD) {
     TF = TF + 1; //显示的div
     var _UTAD = U.UF.EL.getChildrenNoText(UTFD.childNodes); //获取所有的子元素
     for (var i = 1; i < _UTAD.length; i++) {
-        if (TF == 2 && US.userInfo.UserId == null) {
+        if (TF == 2 && US.userInfo.userid == null) {
             break;
         };
         if (TF == i) {

+ 5 - 5
js/Office/Excel/Excel.js

@@ -155,7 +155,7 @@ U.MD.O.E.permission = function () {
             "GroupManageID": U.MD.O.E.fileinfo.GroupID
         })[0]; //向后台发请求,判断用户是否再操作群文件中
     }
-    if (U.MD.O.E.fileinfo && (U.MD.O.E.fileinfo.GroupID == U.MD.O.E.userinfo.UserId || U.MD.O.E.fileinfo.UserId == US.userInfo.UserId)) {//判断是否是有编辑权限
+    if (U.MD.O.E.fileinfo && (U.MD.O.E.fileinfo.GroupID == U.MD.O.E.userinfo.UserId || U.MD.O.E.fileinfo.UserId == US.userInfo.userid)) {//判断是否是有编辑权限
         _iseditor = true; //如果有,就改变变量的值
     }
     if (_isgroup) {//是ftp用户就判断是不是群用户
@@ -312,7 +312,7 @@ U.MD.O.E.printTask = function (data) {
 *新建文档
 */
 U.MD.O.E.newExcel = function () {
-    parent.U.MD.D.I.openApplication("excel", { "userid": US.userInfo.UserId, "directoryid": US.FTPFOLDERID }); //打开文档处理
+    parent.U.MD.D.I.openApplication("excel", { "userid": US.userInfo.userid, "directoryid": US.FTPFOLDERID }); //打开文档处理
 }
 
 /*
@@ -2177,10 +2177,10 @@ U.MD.O.E.excelInfo = function (type, content) {
 U.MD.O.W.E.connect 链接后台,并发送请求
 */
 U.MD.O.E.connect = function () {
-    if (US.userInfo.UserId && U.MD.O.E.fileinfo.UserDirectoryID) {       //判断用户是否登录
+    if (US.userInfo.userid && U.MD.O.E.fileinfo.UserDirectoryID) {       //判断用户是否登录
         U.A.Request(US.SCOKET, ["login", JSON.stringify({     //发送登录请求
             pageId: US.pageId,  //页面id
-            userId: US.userInfo.UserId, //用户id  不会改变的
+            userId: US.userInfo.userid, //用户id  不会改变的
             userName: US.userInfo.UserName, //用户名
             type: US.systemId   //判断是PC 还是 移动
         })], U.MD.O.E.pollingAsyn);       //回调进   U.MD.O.W.E.pollingAsyn 函数
@@ -2205,7 +2205,7 @@ U.MD.O.E.addExcel = function () {  //添加文档
     var post = {
         excelId: U.MD.O.E.fileinfo.UserDirectoryID, //excel 的 id 
         pageId: US.pageId,  //页面id   唯一识别
-        userId: US.userInfo.UserId  //用户id
+        userId: US.userInfo.userid  //用户id
     };
     U.A.Request(US.SCOKET, ["addExcel", JSON.stringify(post)], function (v) {
         console.log(v.value);

+ 8 - 8
js/Office/Excel/ExcelPanel.js

@@ -9,7 +9,7 @@ U.MD.O.E.Panel.isSynergy = function (fun) {
     if (!top.U.MD.U.L.isLogin()) { //判断是登录
         var _fileinfo = U.MD.O.E.fileinfo; //获取文件类型
         var _filegroupid = _fileinfo.UserDirectoryEncrypt || _fileinfo.GroupID; //获取_filegroupid群id,判断是否是在自己的ftp下的文档
-        if (_filegroupid == US.userInfo.UserId) { //判断是本地文档还是互联文档
+        if (_filegroupid == US.userInfo.userid) { //判断是本地文档还是互联文档
             _filegroupid = false; //_filegroupid返回否
         }
         if (_filegroupid) {  //判断是_filegroupid
@@ -47,7 +47,7 @@ U.MD.O.E.Panel.isSynergy.async = function (fileinfo, fun) {
     U.MD.O.E.Panel.disPlayUser(_fileinfo); //获取协作人员
     var _jsondata = JSON.stringify(U.MD.O.E.data);  //需要保存的json数据
 
-    U.A.Request(US.SCOKET, ["newExcelSave", _fileinfo.UserDirectoryID, _jsondata, _fileinfo.UserDirectoryName, US.userInfo.UserId, US.pageId], function (r) {  //调用储存过程保存新建的Excel文件
+    U.A.Request(US.SCOKET, ["newExcelSave", _fileinfo.UserDirectoryID, _jsondata, _fileinfo.UserDirectoryName, US.userInfo.userid, US.pageId], function (r) {  //调用储存过程保存新建的Excel文件
         top.$('#UD_Excel' + _fileinfo.UserDirectoryID + ' .U_MD_O_H_head_navigation_Title')[0].value = _fileinfo.UserDirectoryName;  //同步文档名称修改
         U.Alert("保存成功");  //弹窗弹出保存成功
         U.MD.O.E.web = true;  //拥有互联权限
@@ -143,7 +143,7 @@ U.MD.O.E.Panel.loadLink = function (excelinfo) {
             if (_excelinfo.UserDirectoryID && _excelinfo.UserId && _excelinfo.UserallDirectoryName) {  //如果文件已保存
                 top.U.MD.DS.createDefaultDomainInit(_excelinfo, "excel");  //调用生成域名函数
             } else {  //如果没有
-                U.MD.O.E.Save(top.US.disk.Disks[US.userInfo.UserId]);  //保存该文件
+                U.MD.O.E.Save(top.US.disk.Disks[US.userInfo.userid]);  //保存该文件
             }
         }
         });
@@ -232,7 +232,7 @@ U.MD.O.E.Panel.disPlayInsertUser = function () {
     //        //判断是否是新建的文档 还是 已经保存的文档
     //        //        if (_fileinfo && _fileinfo.UserDirectoryID && _fileinfo.UserId && _fileinfo.UserallDirectoryName) { //已经保存的文档
     //        var _filegroupid = _fileinfo.UserDirectoryEncrypt || _fileinfo.GroupID; //获取_filegroupid群id,判断是否是在自己的ftp下的文档
-    //        if (_filegroupid == US.userInfo.UserId) {
+    //        if (_filegroupid == US.userInfo.userid) {
     //            _filegroupid = false;
     //        } //判断是否是在自己的网盘或者ftp下的文档
 
@@ -505,8 +505,8 @@ U.MD.O.E.Panel.viewEditHistory = function (udid, uoid, s, e, udod) {  //创始
 //    if (!fileinfo.UserId && !fileinfo.UserallDirectoryName) {
 //        fileinfo.GroupId = fileinfo.UserDirectoryEncrypt = groupid;
 //        var _groupuserid = U.Json.select(US.friend.group, { 'GroupManageID': groupid })[0].GroupManageUserID;
-//        var _dirinfo, _dirid, _diskinfo = US.disk.Disks[US.userInfo.UserId];
-//        if (_groupuserid == US.userInfo.UserId) {
+//        var _dirinfo, _dirid, _diskinfo = US.disk.Disks[US.userInfo.userid];
+//        if (_groupuserid == US.userInfo.userid) {
 //            _dirinfo = U.Json.select(_diskinfo.directoryOrFiles, { 'UserDirectoryName': "我的协同" })[0];
 //        } else {
 //            _dirinfo = U.Json.select(_diskinfo.directoryOrFiles, { 'UserDirectoryName': "他人邀请" })[0];
@@ -514,9 +514,9 @@ U.MD.O.E.Panel.viewEditHistory = function (udid, uoid, s, e, udod) {  //创始
 //        var _dirchild = top.$('#L' + _dirinfo.UserDirectoryID).Child();
 //        !_dirchild[1] && _dirchild[0].onclick()
 //        top.$('#L' + groupid).Child()[0].onclick();
-//    } else if ((fileinfo.UserDirectoryEncrypt || fileinfo.GroupID) == US.userInfo.UserId) { //如果是新创建的文件,同时文件不在群里 就把文件拷贝到群里进行处理
+//    } else if ((fileinfo.UserDirectoryEncrypt || fileinfo.GroupID) == US.userInfo.userid) { //如果是新创建的文件,同时文件不在群里 就把文件拷贝到群里进行处理
 //        var _userid = fileinfo.UserId,
-//            _diskinfo = US.disk.Disks[US.userInfo.UserId],
+//            _diskinfo = US.disk.Disks[US.userInfo.userid],
 //            _dirinfo = U.Json.select(_diskinfo.directoryOrFiles, { "UserDirectoryID": groupid }, 1)[0]; //当前目录的信息
 //        var _pastecontent = US.disk.Disks[_userid].pasteDirOrFile = {
 //            "type": "shear", //复制或者剪切 "copy" || "shear"

+ 3 - 3
js/Office/Excel/SitePreview.js

@@ -269,7 +269,7 @@ U.MD.O.W.SP.saveSpecifiedFolder = function () {
     var _loginChecked = U.MD.U.L.isLogin(); //拿到登录状态值
 
     if (!_loginChecked) { //判断是否登录
-        var _form = !Object.getOwnPropertynames(US.disk.Disks).length && U.MD.DK.initDisk(US.userInfo.UserId, 'f6d7a4b6-e34c-4964-beed-24187b2cb1ba'); //拿到网盘的窗体
+        var _form = !Object.getOwnPropertynames(US.disk.Disks).length && U.MD.DK.initDisk(US.userInfo.userid, 'f6d7a4b6-e34c-4964-beed-24187b2cb1ba'); //拿到网盘的窗体
         _form && (_form.style.display = 'none'); //隐藏窗体
         if (Object.getOwnPropertynames(US.disk.Disks).length) { //判断US.disk.Disks常量是否有值
             var _guid = Guid.newGuid(); //生成GUID
@@ -304,7 +304,7 @@ U.MD.O.W.SP.saveSpecifiedFolder = function () {
 //})
 
 U.MD.O.W.SP.eidtor = function (fileinfo) {
-    if (US.userInfo.UserId == fileinfo.UserID || (Guid.IsGuid(fileinfo.UserDirectoryEncrypt) && U.Json.select(US.friend.group, { GroupManageID: fileinfo.UserDirectoryEncrypt })[0])) {
+    if (US.userInfo.userid == fileinfo.UserID || (Guid.IsGuid(fileinfo.UserDirectoryEncrypt) && U.Json.select(US.friend.group, { GroupManageID: fileinfo.UserDirectoryEncrypt })[0])) {
         var fileinfo = {
             UserId: fileinfo.UserID,
             GroupID: fileinfo.UserDirectoryEncrypt,
@@ -320,7 +320,7 @@ U.MD.O.W.SP.eidtor = function (fileinfo) {
 }
 
 U.MD.O.W.SP.isLogin = function (fileinfo) {
-    if (!US.userInfo.UserId) {
+    if (!US.userInfo.userid) {
         U.MD.U.L.login(function () { U.MD.O.W.SP.eidtor(fileinfo) });
     } else {
         U.MD.O.W.SP.eidtor(fileinfo)

+ 1 - 1
js/Office/Office.js

@@ -51,7 +51,7 @@ U.MD.O.word = function (userinfo, fileinfo, cb) {
                 "onresize": function () { }
             },
             { closecallback: function () {
-                U.A.Request(US.SCOKET, ["quitOffice", JSON.stringify({ docId: fileinfo.UserDirectoryID, pageId: US.pageId, userId: top.US.userInfo.UserId, type: fileinfo.UserDirectoryExtendType == 'un' ? 'nav' : 'word' })], function (r) {
+                U.A.Request(US.SCOKET, ["quitOffice", JSON.stringify({ docId: fileinfo.UserDirectoryID, pageId: US.pageId, userId: top.US.userInfo.userid, type: fileinfo.UserDirectoryExtendType == 'un' ? 'nav' : 'word' })], function (r) {
                     //                    console.log('退出文档');
                 });
             }

+ 3 - 3
js/Office/Poll.js

@@ -5,10 +5,10 @@ Namespace.register("U.MD.O.P");
 * 链接后台,并发送请求
 */
 U.MD.O.P.connect = function () {
-    if (US.userInfo.UserId) {       //判断用户是否登录
+    if (US.userInfo.userid) {       //判断用户是否登录
         U.A.Request(US.SCOKET, ["login", JSON.stringify({     //发送登录请求
             pageId: US.pageId,
-            userId: US.userInfo.UserId,
+            userId: US.userInfo.userid,
             userName: US.userInfo.UserName,
             type: US.systemId
         })], U.MD.O.P.pollingAsyn);       //回调进   U.MD.O.P.pollingAsyn 函数
@@ -19,7 +19,7 @@ U.MD.O.P.connect = function () {
 * 发送请求进入轮训
 */
 U.MD.O.P.polling = function () {
-    U.A.Request(US.SCOKET, ["polling", US.userInfo.UserId, US.pageId, US.systemId], U.MD.O.P.pollingAsyn);
+    U.A.Request(US.SCOKET, ["polling", US.userInfo.userid, US.pageId, US.systemId], U.MD.O.P.pollingAsyn);
     //发送轮循  回调进  U.MD.O.P.pollingAsyn函数
 }
 

+ 7 - 7
js/Office/Word/SitePreview.js

@@ -34,7 +34,7 @@ U.MD.O.W.SP.sitePreviewInit = function () {
 
             //console.log(window.location.hash);
             //console.log(U.MD.O.W.SP.FILEINFO.UserID);
-            //console.log(US.userInfo.UserId);
+            //console.log(US.userInfo.userid);
             /*if (window.location.hash) {
                 $(".U_MD_O_W_SP_Fixed_dnReset")[0].style.display = "block";
             } else {
@@ -142,7 +142,7 @@ U.MD.O.W.SP.uwOpen.asyn = function (fileinfo) {
 }
 
 U.MD.O.W.SP.eidtor = function (fileinfo) {
-    if (US.userInfo.UserId == fileinfo.UserID || (Guid.IsGuid(fileinfo.UserDirectoryEncrypt) && U.Json.select(US.friend.group, { GroupManageID: fileinfo.UserDirectoryEncrypt })[0])) {
+    if (US.userInfo.userid == fileinfo.UserID || (Guid.IsGuid(fileinfo.UserDirectoryEncrypt) && U.Json.select(US.friend.group, { GroupManageID: fileinfo.UserDirectoryEncrypt })[0])) {
         var _fileinfo = {
             UserId: fileinfo.UserID,
             GroupID: fileinfo.UserDirectoryEncrypt,
@@ -157,7 +157,7 @@ U.MD.O.W.SP.eidtor = function (fileinfo) {
 }
 
 U.MD.O.W.SP.isLogin = function (fileinfo) {
-    if (!US.userInfo.UserId) {
+    if (!US.userInfo.userid) {
         U.MD.U.L.login(function () { U.MD.O.W.SP.eidtor(fileinfo) });
     } else {
         U.MD.O.W.SP.eidtor(fileinfo)
@@ -326,7 +326,7 @@ U.MD.O.W.SP.saveSpecifiedFolder = function () {
     var _loginChecked = U.MD.U.L.isLogin(); //拿到登录状态值
 
     if (!_loginChecked) { //判断是否登录
-        var _form = !Object.getOwnPropertyNames(US.disk.Disks).length && U.MD.DK.initDisk(US.userInfo.UserId, 'f6d7a4b6-e34c-4964-beed-24187b2cb1ba'); //拿到网盘的窗体
+        var _form = !Object.getOwnPropertyNames(US.disk.Disks).length && U.MD.DK.initDisk(US.userInfo.userid, 'f6d7a4b6-e34c-4964-beed-24187b2cb1ba'); //拿到网盘的窗体
         _form && (_form.style.display = 'none'); //隐藏窗体
         if (Object.getOwnPropertyNames(US.disk.Disks).length) { //判断US.disk.Disks常量是否有值
             var _guid = Guid.newGuid(); //生成GUID
@@ -399,7 +399,7 @@ U.MD.O.W.SP.dnReset = function (el) {
         if ($('#U_MD_DM_B_Manage_Pop')[0]) {
             $('#U_MD_DM_B_Manage_Pop')[0].style.display = "block";
         } else {
-            if (US.userInfo.UserId) {
+            if (US.userInfo.userid) {
                 top.U.MD.DS.dnsInit(_wordinfo, _type);
             } else {
                 U.MD.O.W.SP.LoadDiskDate();
@@ -417,11 +417,11 @@ U.MD.O.W.SP.dnReset = function (el) {
 U.MD.O.W.SP.LoadDiskDate = function () {
     if (JSON.stringify(US.disk.Disks) === '{}') {
         U.MD.U.L.login(function () {
-            var _form = U.MD.DK.initDisk(US.userInfo.UserId, "f6d7a4b6-e34c-4964-beed-24187b2cb1ba");
+            var _form = U.MD.DK.initDisk(US.userInfo.userid, "f6d7a4b6-e34c-4964-beed-24187b2cb1ba");
             setTimeout(function () {
                 _form.style.display = 'none';
             }, 0);
         });
     }
-    $('#U_D_' + US.userInfo.UserId).length && ($('#U_D_' + US.userInfo.UserId)[0].style.display = 'none');
+    $('#U_D_' + US.userInfo.userid).length && ($('#U_D_' + US.userInfo.userid)[0].style.display = 'none');
 }

+ 9 - 9
js/Office/Word/Template/Navigation/Nav.js

@@ -177,7 +177,7 @@ U.MD.O.W.T.N.saveNav = function (callback, param) {
 
 U.MD.O.W.T.N.saveNav.asyn = function (isgroup, fileinfo, el, html) {
     if (isgroup) {
-        U.A.Request(US.SCOKET, ["newNavSave", fileinfo.UserDirectoryID, JSON.stringify(U.MD.O.W.T.N.navInfo), fileinfo.UserDirectoryName, html ? U.MD.O.W.T.N.nowNavId : "", html || "", US.userInfo.UserId, US.pageId], function (r) {
+        U.A.Request(US.SCOKET, ["newNavSave", fileinfo.UserDirectoryID, JSON.stringify(U.MD.O.W.T.N.navInfo), fileinfo.UserDirectoryName, html ? U.MD.O.W.T.N.nowNavId : "", html || "", US.userInfo.userid, US.pageId], function (r) {
             //top.$('#UD_Word' + newfileid + ' .U_MD_O_H_head_navigation_Title')[0].value = fileinfo.UserDirectoryName;
             U.MD.O.W.fileinfo.UsOffice = el.innerHTML;
             $('#U_MD_O_H_wordEditor')[0].editor.operaNotice = U.MD.O.W.E.operationNotice;
@@ -186,7 +186,7 @@ U.MD.O.W.T.N.saveNav.asyn = function (isgroup, fileinfo, el, html) {
             U.Alert("保存成功");
         });
     } else {
-        top.U.A.Request(US.DISK, ["SaveFileContent", US.userInfo.UserId, fileinfo.UserDirectoryID, JSON.stringify(U.MD.O.W.T.N.navInfo), fileinfo.UserDirectoryName, "un"], function (r) {
+        top.U.A.Request(US.DISK, ["SaveFileContent", US.userInfo.userid, fileinfo.UserDirectoryID, JSON.stringify(U.MD.O.W.T.N.navInfo), fileinfo.UserDirectoryName, "un"], function (r) {
             U.MD.O.W.T.N.savePage(function () {
                 U.MD.O.W.permission.edit = true;
             }, true);
@@ -254,7 +254,7 @@ U.MD.O.W.T.N.changeLogo = function (fileinput, logoel) {
     if (!top.U.MD.U.L.isLogin(function (userinfo) { U.MD.O.W.userinfo = userinfo; })) {
         U.UF.UP.HTML.upload(
         [fileinput],
-        'http://disk.1473.cn/USUpfile.ashx?typename=UseStudioEditor&UserId=' + US.userInfo.UserId,
+        'http://disk.1473.cn/USUpfile.ashx?typename=UseStudioEditor&UserId=' + US.userInfo.userid,
         function (r) {
             //上传之后的处理  r.value[0]上传之后的图片服务器名字   全路径 http://fs.1473.cn/ + r.value[0] 
             U.MD.O.W.T.N.navInfo.logo = r.value[0];
@@ -557,18 +557,18 @@ U.MD.O.W.T.N.deleteNav = function (nav, data, top) {
         _child.every(function (object, index) { //循环找到对应的导航
             if (object.pageId == nav.pageId) { //如果导航id相等则为对应导航
                 if (U.MD.O.W.permission.web) {   //协同处理
-                    U.MD.O.W.T.N.deleteNavMessage(nav.pageId, _child.pageId || "", U.MD.O.W.T.N.deleteNav.asyn, [object, index, US.userInfo.UserId, _child]); //信息处理
+                    U.MD.O.W.T.N.deleteNavMessage(nav.pageId, _child.pageId || "", U.MD.O.W.T.N.deleteNav.asyn, [object, index, US.userInfo.userid, _child]); //信息处理
                 }
                 else if (U.MD.O.W.permission.edit) {
-                    //                    U.MD.O.W.T.N.deleteNav.asyn(object, index, US.userInfo.UserId, _child); //异步处理
+                    //                    U.MD.O.W.T.N.deleteNav.asyn(object, index, US.userInfo.userid, _child); //异步处理
                     U.MD.O.W.T.N.saveNav(function () { //直接保存页面
                         U.A.Request(US.CD, [US.DB, "UseStudio_Office", "DeletePage", nav.pageId], function (r) { //删除页面请求
-                            U.MD.O.W.T.N.deleteNav.asyn(object, index, US.userInfo.UserId, _child); //异步处理
+                            U.MD.O.W.T.N.deleteNav.asyn(object, index, US.userInfo.userid, _child); //异步处理
                         });
                     });
                 }
                 else {
-                    U.MD.O.W.T.N.deleteNav.asyn(object, index, US.userInfo.UserId, _child); //异步处理
+                    U.MD.O.W.T.N.deleteNav.asyn(object, index, US.userInfo.userid, _child); //异步处理
 
                 }
                 return false; //返回false终止循环
@@ -595,7 +595,7 @@ U.MD.O.W.T.N.deleteNav.asyn = function (object, index, userid, parent) {
         $($('#Word_Nav_' + object.pageId).Parent()).remove();
         //执行切换
         if (U.MD.O.W.T.N.nowNavId == object.pageId) {
-            if (userid != US.userInfo.UserId) {
+            if (userid != US.userInfo.userid) {
                 var _user = U.Json.select(US.friend.groupusers, { UserId: userid })[0];
                 U.Alert('该页面已被' + (_user ? _user.UserNickName || _user.UserName : "") + '删除');
             }
@@ -1286,7 +1286,7 @@ U.MD.O.W.T.N.addNavMessage = function (parentid, index, navinfo, content, cb, pa
 * parentid  {guid}   父级导航ID
 */
 U.MD.O.W.T.N.deleteNavMessage = function (navid, parentid, cb, param) {
-    var _message = U.MD.O.W.T.N.navMessage('deleteNav', { navId: navid, parentId: parentid, userId: US.userInfo.UserId }); //生成删除导航信息
+    var _message = U.MD.O.W.T.N.navMessage('deleteNav', { navId: navid, parentId: parentid, userId: US.userInfo.userid }); //生成删除导航信息
     U.A.Request(US.SCOKET, ["send", JSON.stringify({  //发送send请求
         "us.nav": [_message]
     })], function (r) {

+ 8 - 8
js/Office/Word/Word.js

@@ -66,7 +66,7 @@ U.MD.O.W.getuser = async function () {
         U.A.Request(US.Config.server + "getcookieuserid", [], function (res) {
             if (res.value && res.value[0] && res.value[0][0]) {
                 US.userinfo = res.value[0][0]; //记录用户数据
-                U.A.Request(US.Config.edu + "admin/userinfo/userinfoById/" + US.userinfo.userid, [], function (res) {
+                U.A.Request(US.Config.edu + "admin/userinfo/userinfoById/" + US.userInfo.userid, [], function (res) {
                     if (res.value && res.value[0] && res.value[0][0]) {
                         resolve(res.value[0][0]); //记录用户数据
                     }
@@ -127,9 +127,9 @@ U.MD.O.W.setPermission = function () {
     //     }
     // }
     // //如果是共享文档,那么谁都可以编辑,如果是自己的文档那么也可以编辑
-    // else if (((U.MD.O.W.fileinfo.GroupID && U.MD.O.W.fileinfo.GroupID == U.MD.O.W.userinfo.UserId) || U.MD.O.W.fileinfo.UserId == US.userInfo.UserId)) {//判断是否是有编辑权限
+    // else if (((U.MD.O.W.fileinfo.GroupID && U.MD.O.W.fileinfo.GroupID == U.MD.O.W.userinfo.UserId) || U.MD.O.W.fileinfo.UserId == US.userInfo.userid)) {//判断是否是有编辑权限
     //     U.MD.O.W.permission.edit = true;    //就给其编辑权限
-    //     if (U.MD.O.W.fileinfo.UserId == US.userInfo.UserId) {
+    //     if (U.MD.O.W.fileinfo.UserId == US.userInfo.userid) {
     //         U.MD.O.W.permission.web = true;//互联办公的权限
     //     }
     // }
@@ -333,7 +333,7 @@ U.MD.O.W.save = function () {
                 //保存到数据库
 
                 //保存到数据库
-                top.U.A.Request(US.DISK, ["SaveFileContent", US.userInfo.UserId, _fileid, _html, _name, "uw"], function (r) {
+                top.U.A.Request(US.DISK, ["SaveFileContent", US.userInfo.userid, _fileid, _html, _name, "uw"], function (r) {
                     U.MD.O.W.fileinfo.UsOffice = r.context[1].innerHTML;
                     U.Alert("保存成功");
                 }, (['', _el])); //保存到数据库
@@ -348,7 +348,7 @@ U.MD.O.W.save = function () {
                     U.MD.O.W.setPermission(); //新建的文件设置权限,根据新建的位置
                     //如果是互联办公文档的处理(第一次新建的文件需要从保存到redis全局变量中,第二次之后都是直接从redis初始化的)
                     if (U.MD.O.W.permission.web) {
-                        top.U.A.Request(US.SCOKET, ["newWordSave", _fileid, _html, fileinfo.UserDirectoryName, US.userInfo.UserId, US.pageId], function (r) {
+                        top.U.A.Request(US.SCOKET, ["newWordSave", _fileid, _html, fileinfo.UserDirectoryName, US.userInfo.userid, US.pageId], function (r) {
                             U.MD.O.W.Panel.loadPlayUser(fileinfo); //加载协助人员窗体
                             U.Alert("保存成功");
                             U.MD.O.W.fileinfo.UsOffice = _el.innerHTML;
@@ -359,7 +359,7 @@ U.MD.O.W.save = function () {
                     //如果是普通文档的处理
                     else {
                         //保存到数据库
-                        top.U.A.Request(US.DISK, ["SaveFileContent", US.userInfo.UserId, _fileid, _html, fileinfo.UserDirectoryName, "uw"], function (r) {
+                        top.U.A.Request(US.DISK, ["SaveFileContent", US.userInfo.userid, _fileid, _html, fileinfo.UserDirectoryName, "uw"], function (r) {
                             U.Alert("保存成功");
                             U.MD.O.W.fileinfo.UsOffice = r.context[1].innerHTML;
                         }, (['', _el])); //保存到数据库
@@ -390,7 +390,7 @@ U.MD.O.W.updateName = function () {
             if ((_fileid && _fileinfo.UserId && _fileinfo.UserallDirectoryName) && U.MD.O.W.permission.edit) { //如果是已经保存到数据库的文档,那么直接保存内容
                 //如果是互联办公文档的操作
                 if (U.MD.O.W.permission.web) {
-                    top.U.A.Request(US.SCOKET, ["updateName", _type, _fileid, _name, US.userInfo.UserId, US.pageId], function (r) {
+                    top.U.A.Request(US.SCOKET, ["updateName", _type, _fileid, _name, US.userInfo.userid, US.pageId], function (r) {
                         if (r.value == "updateNameSuccess") {
                             _fileinfo.UserallDirectoryName = _name; //文件全写的名字
                             _fileinfo.UserDirectoryName = _name.addEllipsis(20); //文件的缩略名
@@ -429,7 +429,7 @@ U.MD.O.W.newdocument = function () {
     $$("button", {
         "className": "U_MD_O_newDoc", "innerHTML": "普通word",
         "onclick": function () {
-            parent.U.MD.D.I.openApplication("word", { "userid": US.userInfo.UserId, "directoryid": US.FTPFOLDERID }); //打开文档处理
+            parent.U.MD.D.I.openApplication("word", { "userid": US.userInfo.userid, "directoryid": US.FTPFOLDERID }); //打开文档处理
             $('#U_MD_O_Set')[0].style.display = "none";
         }
     }, _divel);

+ 12 - 12
js/Office/Word/WordPanel.js

@@ -73,7 +73,7 @@ U.MD.O.W.Panel.isSynergy.async = function (fileinfo, fun) {
     }
     else {
         //保存文件到后台
-        U.A.Request(US.SCOKET, ["newWordSave", fileinfo.UserDirectoryID, _eidtorel.innerHTML.escapeQuotes(), fileinfo.UserDirectoryName, US.userInfo.UserId, top.US.pageId], U.MD.O.W.Panel.isSynergy.saveAsync, [null, fileinfo, _eidtorel]);
+        U.A.Request(US.SCOKET, ["newWordSave", fileinfo.UserDirectoryID, _eidtorel.innerHTML.escapeQuotes(), fileinfo.UserDirectoryName, US.userInfo.userid, top.US.pageId], U.MD.O.W.Panel.isSynergy.saveAsync, [null, fileinfo, _eidtorel]);
     }
     if (U.UF.C.isFunction(fun)) {//判断是否有点击事件的方法,如果有,运行它
         fun(fileinfo);
@@ -250,7 +250,7 @@ U.MD.O.W.Panel.displayInsertUser = function () {
 
 U.MD.O.W.Panel.addUser = function (userids) {
     var _type = U.MD.O.W["fileinfo"].UserDirectoryExtendType == "un" ? "nav" : "word";
-    top.U.A.Request(US.SCOKET, ["addUser", _type, U.MD.O.W["fileinfo"].UserDirectoryID, userids, US.userInfo.UserId, top.US.pageId], function () { });
+    top.U.A.Request(US.SCOKET, ["addUser", _type, U.MD.O.W["fileinfo"].UserDirectoryID, userids, US.userInfo.userid, top.US.pageId], function () { });
 }
 
 U.MD.O.W.Panel.syncAddUser = function (userids, senduserid) {
@@ -283,8 +283,8 @@ U.MD.O.W.Panel.syncAddUser = function (userids, senduserid) {
 //    //    if (!fileinfo.UserId && !fileinfo.UserallDirectoryName) {
 //    //        fileinfo.GroupId = fileinfo.UserDirectoryEncrypt = groupid;
 //    //        var _groupuserid = U.Json.select(US.friend.group, { 'GroupManageID': groupid })[0].GroupManageUserID;
-//    //        var _dirinfo, _dirid, _diskinfo = US.disk.Disks[US.userInfo.UserId];
-//    //        if (_groupuserid == US.userInfo.UserId) {
+//    //        var _dirinfo, _dirid, _diskinfo = US.disk.Disks[US.userInfo.userid];
+//    //        if (_groupuserid == US.userInfo.userid) {
 //    //            _dirinfo = U.Json.select(_diskinfo.directoryOrFiles, { 'UserDirectoryName': "我的协同" })[0];
 //    //        } else {
 //    //            _dirinfo = U.Json.select(_diskinfo.directoryOrFiles, { 'UserDirectoryName': "他人邀请" })[0];
@@ -292,9 +292,9 @@ U.MD.O.W.Panel.syncAddUser = function (userids, senduserid) {
 //    //        var _dirchild = top.$('#L' + _dirinfo.UserDirectoryID).Child();
 //    //        !_dirchild[1] && _dirchild[0].onclick()
 //    //        top.$('#L' + groupid).Child()[0].onclick();
-//    //    } else if ((fileinfo.UserDirectoryEncrypt || fileinfo.GroupID) == US.userInfo.UserId) { //如果是新创建的文件,同时文件不在群里 就把文件拷贝到群里进行处理
+//    //    } else if ((fileinfo.UserDirectoryEncrypt || fileinfo.GroupID) == US.userInfo.userid) { //如果是新创建的文件,同时文件不在群里 就把文件拷贝到群里进行处理
 //    //        var _userid = fileinfo.UserId,
-//    //            _diskinfo = US.disk.Disks[US.userInfo.UserId],
+//    //            _diskinfo = US.disk.Disks[US.userInfo.userid],
 //    //            _dirinfo = U.Json.select(_diskinfo.directoryOrFiles, { "UserDirectoryID": groupid }, 1)[0]; //当前目录的信息
 //    //        var _pastecontent = US.disk.Disks[_userid].pasteDirOrFile = {
 //    //            "type": "shear", //复制或者剪切 "copy" || "shear"
@@ -666,10 +666,10 @@ U.MD.O.W.Panel.InsertOfficeHistory = function (fileinfo, html, name, contentel)
     var _fileid = fileinfo.UserDirectoryID;             //文件ID
     if (U.MD.O.W.permission.web) {
         //html,
-        top.U.A.Request(US.SCOKET, ["insertModifyRecord", "word", _fileid, name, html, US.userInfo.UserId, US.pageId], function (r) {
+        top.U.A.Request(US.SCOKET, ["insertModifyRecord", "word", _fileid, name, html, US.userInfo.userid, US.pageId], function (r) {
             if (r.value) {
                 var _historyid = r.value;
-                U.MD.O.W.Panel.syncHistory(US.userInfo.UserId, _historyid);
+                U.MD.O.W.Panel.syncHistory(US.userInfo.userid, _historyid);
                 U.MD.O.W.fileinfo.UsOffice = contentel.innerHTML;
                 U.Alert("保存成功");
             } else {
@@ -678,9 +678,9 @@ U.MD.O.W.Panel.InsertOfficeHistory = function (fileinfo, html, name, contentel)
         });
     } else {
         //插入历史
-        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "InsertDocumentModifyRecord", US.userInfo.UserId, _fileid, html, name], function (r) {
+        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "InsertDocumentModifyRecord", US.userInfo.userid, _fileid, html, name], function (r) {
             if (r.value[0]) {
-                U.MD.O.W.Panel.syncHistory(US.userInfo.UserId, r.value[0].historyid);
+                U.MD.O.W.Panel.syncHistory(US.userInfo.userid, r.value[0].historyid);
                 U.MD.O.W.fileinfo.UsOffice = contentel.innerHTML;
                 U.Alert("保存成功");
             } else {
@@ -695,8 +695,8 @@ U.MD.O.W.Panel.syncHistory = function (userid, historyid, isbool) {
     if (!isbool) {
         var _data, _fileinfo = U.MD.O.W.fileinfo;
         _fileinfo.HistoryId = historyid; //记录历史ID
-        if (userid == US.userInfo.UserId) {
-            _data = U.MD.O.W.dataStructure(_fileinfo.UserDirectoryModifyTime, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead, historyid, US.userInfo.UserId);
+        if (userid == US.userInfo.userid) {
+            _data = U.MD.O.W.dataStructure(_fileinfo.UserDirectoryModifyTime, US.userInfo.UserName, US.userInfo.UserThumbnailImageHead, historyid, US.userInfo.userid);
         } else {
             var _userinfo = U.Json.select(US.friend.groupusers, { UserId: userid })[0];
             _data = U.MD.O.W.dataStructure(_fileinfo.UserDirectoryModifyTime, _userinfo.UserName, _userinfo.UserThumbnailImageHead, historyid, _userinfo);

+ 6 - 6
js/PB/U.D.PB.A.js

@@ -41,7 +41,7 @@ U.MD.D.PB.A.WAPMHBK = function (UDE, UBE, URID, UDOD) {
             U.MD.N.UrlWrite["pbt", UDE["ArticleID"]], UDE["ArticleTitle"]; //设置url提示
         }
         else { //帖子打印
-            U.UF.A.Request(US.AUTH, ["GetPND", _UDID || US.EMPTYGUID, (US.userInfo.UserId || US.EMPTYGUID), UDE.ArticleID]), U.MD.D.PB.A.AsynWAPMHBK, [[_UDTD, true], UDE, _UGE, UBE, URID, UDOD]; //获取后腰数据
+            U.UF.A.Request(US.AUTH, ["GetPND", _UDID || US.EMPTYGUID, (US.userInfo.userid || US.EMPTYGUID), UDE.ArticleID]), U.MD.D.PB.A.AsynWAPMHBK, [[_UDTD, true], UDE, _UGE, UBE, URID, UDOD]; //获取后腰数据
         }
     }
     catch (e) { }
@@ -105,7 +105,7 @@ U.MD.D.PB.A.AsynAPMHBK = function (r) {
 */
 U.MD.D.PB.A.PAPMHBK = function (UDE, UBE, UDOD, UDTD) {
     var _UDCD, _UIMG = [], _UIF = UDE["IF"], //各个部分的元素,文章详细信息
-     _userid = US.userInfo.UserId, //用户id
+     _userid = US.userInfo.userid, //用户id
     _UDAD = $(UDOD).Child(); //内容
 
     //头部
@@ -165,8 +165,8 @@ U.MD.D.PB.A.PAPMHTJ = function (UDE, UDOD, UCB) {
         var _UAT, _UIT = "", _UST = UDOD.innerHTML || UDOD; U.UF.Ut.isFunction(UCB) ? "" : ((_UIT = arguments[2] || ""), UCB = arguments[3]); (U.UF.Ut.isString(UDE)) && (UDE = { ArticleID: UDE, ArticleTitle: _UIT, ArticleContent: _UST });
         if (_UIT.length == 0 || _UIT.length > 40) { _UAT = "标题太长或者为空"; } else if (_UST.length < 1) { _UAT = "内容太长或者为空"; } else {
             U.UF.Ut.AddObj([UDE, UDE["IF"] || {}], { ArticleContentBrief: _UST, ArticleTitle: _UIT, ArticleContent: _UST });
-            U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UU_P_U_ModifyArticle", US.userInfo.UserId, UDE.ArticleID, _UIT, _UST, U.UF.M.Shorttext(_UST)]), U.MD.D.PB.A.AsynPAPMHTJ, ["", UCB];
-            //    U.UF.A.Request(US.AUTH,"pb.modifyarticle", [US.userInfo.UserId, UDE.ArticleID, _UIT, _UST], U.MD.D.PB.A.AsynPAPMHTJ, ["", UCB]);
+            U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UU_P_U_ModifyArticle", US.userInfo.userid, UDE.ArticleID, _UIT, _UST, U.UF.M.Shorttext(_UST)]), U.MD.D.PB.A.AsynPAPMHTJ, ["", UCB];
+            //    U.UF.A.Request(US.AUTH,"pb.modifyarticle", [US.userInfo.userid, UDE.ArticleID, _UIT, _UST], U.MD.D.PB.A.AsynPAPMHTJ, ["", UCB]);
         }
         U.Alert(_UAT || "同步中"); return !_UAT;
     }
@@ -193,7 +193,7 @@ U.MD.D.PB.A.ModifyA = function (UDE, UDOD, UDTD, UDSD) {
 
 //搜索帖子
 U.MD.D.PB.A.TZSS = function (UDOD, UP, UDID) {
-    var _UGE = U.MD.D.H.ET["NT"]["PB"], _userid = US.userInfo.UserId,
+    var _UGE = U.MD.D.H.ET["NT"]["PB"], _userid = US.userInfo.userid,
     _UBE = _UGE["DBK"],
     _UDV = UDOD.value.trim().addEllipsis(50).valueOf();
     if (UDOD.value != UDOD.defaultValue && _UDV) {
@@ -282,7 +282,7 @@ U.MD.D.PB.A.FBMSSBKG = function (UDE, UIT, UTH, UCB) {
 
 //发表帖子成功的异步
 U.MD.D.PB.A.AsynFBMSSBKG = function (r) {
-    var _UCE, _UBE, _UDOD = $("#UD_SYSXZBYPR")[0], context = r.context, _UDE = context[1], _UCB = context[4], _UTF = "服务器繁忙"; r = r.value; _UCE = new U.MD.D.PB.A.BMSSBTI[0, U.UF.D.toTimeStamp(new Date()), context[3], context[3], r, 0, context[2], US.userInfo.UserId, US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead]
+    var _UCE, _UBE, _UDOD = $("#UD_SYSXZBYPR")[0], context = r.context, _UDE = context[1], _UCB = context[4], _UTF = "服务器繁忙"; r = r.value; _UCE = new U.MD.D.PB.A.BMSSBTI[0, U.UF.D.toTimeStamp(new Date()), context[3], context[3], r, 0, context[2], US.userInfo.userid, US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead]
     if (r) {
         _UTF = "发表成功";
         if (_UDE["IF"] || US.userInfo.PB) {

+ 10 - 10
js/PB/U.D.PB.Pa.js

@@ -102,7 +102,7 @@ U.MD.D.PB.Pa.QDSQPGHBK = function (UDOD, UDE, UCB) {
         if ((_UDN = UDOD.value) && _UDN != UDOD.defaultValue) {//如果没有任何输入就不提示
             if ((_UTF = U.UF.S.FFZF.test(_UDN)) && _UDN.length) { //输入限制
                 U.MD.D.H.ET.PB.SQ = true;
-                U.UF.A.Request(US.AUTH, ["IsDName", _UDN, US.userInfo.UserId, _UDE ? (_UDE["UserDirectoryID"] || _UDE["PublishedDirectoryID"]) : US.FORUMROOTID, "1", _UFT],
+                U.UF.A.Request(US.AUTH, ["IsDName", _UDN, US.userInfo.userid, _UDE ? (_UDE["UserDirectoryID"] || _UDE["PublishedDirectoryID"]) : US.FORUMROOTID, "1", _UFT],
                 U.MD.D.PB.Pa.AsynQDSQPGHBK, ["", UDOD, UDE, _UDPD, _UDED, _UFT, UCB]); _UTS = "检测中...";
             }
             U.MD.D.PB.Pa.SQPGHBKTS(_UDED, _UTS || (_UTF ? "输入内容长度不允许大于50" : "不允许输入特殊字符")); //提示
@@ -131,7 +131,7 @@ U.MD.D.PB.Pa.SSQPGHBK = function (UDOD, UDID, UDPD, UDE, UCB) {
     _UDN = UDID.value;
     U.MD.D.H.ET.PB.SQ = true;
     U.MD.D.PB.Pa.SQPGHBKTS(_UDED, "等待服务器响应");
-    U.UF.A.Request(US.AUTH, ["addRoot", _UDN, US.userInfo.UserId, UDE ? (UDE["UserDirectoryID"] || UDE["PublishedDirectoryID"]) : US.FORUMROOTID, "1"], U.MD.D.PB.Pa.AsynSSQPGHBK, ["", UDID, UDE, UDPD, _UDED, false, UCB]);
+    U.UF.A.Request(US.AUTH, ["addRoot", _UDN, US.userInfo.userid, UDE ? (UDE["UserDirectoryID"] || UDE["PublishedDirectoryID"]) : US.FORUMROOTID, "1"], U.MD.D.PB.Pa.AsynSSQPGHBK, ["", UDID, UDE, UDPD, _UDED, false, UCB]);
 }
 
 //确定申请版块
@@ -164,8 +164,8 @@ U.MD.D.PB.Pa.AsynGetBKID = function (r) {
 //删除板块
 U.MD.D.PB.Pa.SCBK = function (UDID, UTF, UCB) {
     if (!U.MD.U.L.isLogin(3)) {
-        U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteSubject", US.userInfo.UserId, UDID, UTF ? 1 : 0]), U.MD.D.PB.Pa.AsynSCBK, ["", UDID, UCB];
-        //   U.UF.A.Request(US.AUTH,"pb.DeleteSubject", [US.userInfo.UserId, UDID, UTF ? 1 : 0]), U.MD.D.PB.Pa.AsynSCBK, ["", UDID, UCB]; 
+        U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_D_DeleteSubject", US.userInfo.userid, UDID, UTF ? 1 : 0]), U.MD.D.PB.Pa.AsynSCBK, ["", UDID, UCB];
+        //   U.UF.A.Request(US.AUTH,"pb.DeleteSubject", [US.userInfo.userid, UDID, UTF ? 1 : 0]), U.MD.D.PB.Pa.AsynSCBK, ["", UDID, UCB]; 
     }
 }
 
@@ -181,9 +181,9 @@ U.MD.D.PB.Pa.AsynSCBK = function (r) {
 
 //修改板块信息
 U.MD.D.PB.Pa.XGBKX = function (UDID, USN, UPID, UCB) {
-    if (!U.MD.U.L.isLogin(3)) { U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UU_P_U_ModifyDirectory", US.userInfo.UserId, UDID, USN, UPID || US.EMPTYGUID]), U.MD.D.PB.Pa.AsynXGBKX, ["", UCB]; }
+    if (!U.MD.U.L.isLogin(3)) { U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UU_P_U_ModifyDirectory", US.userInfo.userid, UDID, USN, UPID || US.EMPTYGUID]), U.MD.D.PB.Pa.AsynXGBKX, ["", UCB]; }
 
-    //  if (!U.MD.U.L.isLogin(3)) { U.UF.A.Request(US.AUTH,"pb.ModifySubjectBG", [US.userInfo.UserId, UDID, USN, UPID || US.EMPTYGUID]), U.MD.D.PB.Pa.AsynXGBKX, ["", UCB]; }
+    //  if (!U.MD.U.L.isLogin(3)) { U.UF.A.Request(US.AUTH,"pb.ModifySubjectBG", [US.userInfo.userid, UDID, USN, UPID || US.EMPTYGUID]), U.MD.D.PB.Pa.AsynXGBKX, ["", UCB]; }
 }
 
 //修改板块
@@ -198,7 +198,7 @@ U.MD.D.PB.Pa.AsynXGBKX = function (r) {
 //添加收藏版块
 U.MD.D.PB.Pa.SCYMHBK = function (UBE, UDOD, UFN) {
     if (!U.MD.U.L.isLogin(3) && (!UBE["IF"] || UBE["IF"][2] != 2)) {//添加版块收藏
-        var _UDE = ["您确认要收藏该版块吗", "AddCollect", [US.userInfo.UserId, UBE.UserDirectoryID || UBE.PublishedDirectoryID]]; (UBE["IF"] && UBE["IF"][2]) && (_UDE[0] = "您取消版块收藏吗", _UDE[1] = "DCollect", _UDE[2].splice(1, 0, ""));
+        var _UDE = ["您确认要收藏该版块吗", "AddCollect", [US.userInfo.userid, UBE.UserDirectoryID || UBE.PublishedDirectoryID]]; (UBE["IF"] && UBE["IF"][2]) && (_UDE[0] = "您取消版块收藏吗", _UDE[1] = "DCollect", _UDE[2].splice(1, 0, ""));
         U.Alert("服务器同步中..."); U.UF.A.Request(US.AUTH, "pb." + _UDE[1], _UDE[2], U.MD.D.PB.Pa.AsynSCYMHBK, ["", UBE, UDOD, UFN]); //添加或者删除收藏
     }
 }
@@ -225,11 +225,11 @@ U.MD.D.PB.Pa.AsynSCYMHBK = function (r) {
 
 //获取用户所有的收藏
 U.MD.D.PB.Pa.ZSYMHBK = function (UP) {
-    if (US.userInfo.UserId) { //用户收藏版块
+    if (US.userInfo.userid) { //用户收藏版块
         var _UPE = 1, _UDE = US.userInfo["SC"]; (_UDE) && (_UPE = U.MD.D.D.FYGBL(_UDE, UP, [30, 300]), U.MD.D.H.PZSYMHBK((_UDE = _UPE[0])), _UPE = _UPE[1]); //打印搜藏
-        (_UDE) && (U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_S_GetUserPBCollect", US.userInfo.UserId, US.userInfo.UserId, _UPE * 50 - 50, _UPE * 50]), U.MD.D.PB.Pa.AsynZSYMHBK, ["", UP]); //获取用户收藏的版块
+        (_UDE) && (U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_S_GetUserPBCollect", US.userInfo.userid, US.userInfo.userid, _UPE * 50 - 50, _UPE * 50]), U.MD.D.PB.Pa.AsynZSYMHBK, ["", UP]); //获取用户收藏的版块
 
-        // (_UDE) && (U.UF.A.Request(US.AUTH,"pb.GetCollect", [US.userInfo.UserId, _UPE * 50 - 50, _UPE * 50]), U.MD.D.PB.Pa.AsynZSYMHBK, ["", UP]); //获取用户收藏的版块
+        // (_UDE) && (U.UF.A.Request(US.AUTH,"pb.GetCollect", [US.userInfo.userid, _UPE * 50 - 50, _UPE * 50]), U.MD.D.PB.Pa.AsynZSYMHBK, ["", UP]); //获取用户收藏的版块
     }
     else { parent.U.Alert("请登录"); } //未登录展示
 }

+ 4 - 4
js/PB/U.D.PB.Re.js

@@ -86,7 +86,7 @@ U.MD.D.PB.Re.PRPMHBK = function (UDE, UDOD, UAE, URID) {
         _UDID = $$("div", { "className": "UD_SYPCLRROM" }, _UDND);
         _UDID = $$("div", { "className": "UD_SYPCLRROMO" }, _UDID);
         $$("div", { "className": "UD_SYPCLRROMA", "innerHTML": "回复" + (_UCE.length > 0 ? "(" + _UCE.length + ")" : ""), "onclick": [[U.MD.D.PB.Re.XPRPMHBK, [_UDSD, UDE[i], UAE]]] }, _UDID);
-        if (UDE[i].ReplyAddUserID == US.userInfo.UserId) {
+        if (UDE[i].ReplyAddUserID == US.userInfo.userid) {
             $$("div", { "className": "UD_SYBFOZTK UD_SYBFOZTKO", "style": { "margin": "0 0 0 5px" }, "title": "删除", "innerHTML": "删除",
                 "onclick": [[U.UF.UI.Confirm, ["是否撤销评论", [U.MD.D.Blog.R.SCPHFRGBL, [UDE, UDE[i], UAE, _UDTD]]]]]
             }, _UDID);
@@ -107,7 +107,7 @@ U.MD.D.PB.Re.PRPMHBK = function (UDE, UDOD, UAE, URID) {
             _UDKD = $$("div", { "className": "UD_SYPCLRROM" }, _UDID);
             _UDKD = $$("div", { "className": "UD_SYPCLRROMO" }, _UDKD);
             $$("div", { "className": "UD_SYPCLRROMA", "innerHTML": "回复", "onclick": [[U.MD.D.PB.Re.XPRPMHBK, [_UDID, _UCE[j], UAE, UDE[i]]]] }, _UDKD);
-            if (_UCE[j].ReplyAddUserID == US.userInfo.UserId) {
+            if (_UCE[j].ReplyAddUserID == US.userInfo.userid) {
                 $$("div", { "className": "UD_SYBFOZTK UD_SYBFOZTKO", "style": { "margin": "0 0 0 5px" }, "title": "删除", "innerHTML": "删除",
                     "onclick": [[U.UF.UI.Confirm, ["是否撤销评论", [U.MD.D.Blog.R.SCPHFRGBL, [_UCE, _UCE[j], UAE, _UDID]]]]]
                 }, _UDKD);
@@ -140,7 +140,7 @@ U.MD.D.PB.Re.XPRPMHBK = function (UDOD, UDE, UAE, UPE) {
 //添加回复
 U.MD.D.PB.Re.APRPMHBK = function (UDE, UDOD, UAE, UPE) {
     var _UTH = UDOD.innerHTML, _UTF = "请先登录", _URID = UDE ? (UDE.ReplyParentID || UDE.ReplyID) : "";
-    if (US.userInfo.UserId) { //发表帖子
+    if (US.userInfo.userid) { //发表帖子
         _UTF = "回复的内容部能为空";
         if (UDOD.innerText.trim().length > 0 && _UTH != "发表评论...") {
             _UTF = "正在回帖请稍等";
@@ -160,7 +160,7 @@ U.MD.D.PB.Re.AsynAPRPMHBK = function (r) {
     _UAE = context[4] || context[2];
     r = r.value;
     if (r) {
-        (_UDE ? _UAE["RR"] : _UAE["Reply"][1]).unshift((_URE = new U.MD.D.PB.Re.TPRPMHBK[_UDE ? _UDE.UserNickName : "", U.UF.D.toTimeStamp(new Date()), US.userInfo.UserId, _UAID, r, _UDE ? (_UDE.ReplyParentID || _UDE.ReplyID) : "", _UDE ? _UDE.ReplyAddUserID : "", US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead]));
+        (_UDE ? _UAE["RR"] : _UAE["Reply"][1]).unshift((_URE = new U.MD.D.PB.Re.TPRPMHBK[_UDE ? _UDE.UserNickName : "", U.UF.D.toTimeStamp(new Date()), US.userInfo.userid, _UAID, r, _UDE ? (_UDE.ReplyParentID || _UDE.ReplyID) : "", _UDE ? _UDE.ReplyAddUserID : "", US.userInfo.UserNickName, US.userInfo.UserThumbnailImageHead]));
         $("#UD_SYPCLCD&div")[4].innerHTML = (_UAE.ArticleReplayNumber++) + 1; U.MD.D.PB.Re.RPMHBK(context[2], 1); _UST = "发表回复成功";
     }
     U.Alert(_UST);

+ 11 - 11
js/PB/U.D.PB.js

@@ -137,7 +137,7 @@ U.MD.D.PB.CKWDFB = function (UP, UDE, userid) {
         _UDPD = _UDOD.Parent(3),
         _UDAD = _UDOD.Child(),
         _UDTD = $("#UD_SYSXZBYPL")[0];
-        userid = userid || US.userInfo.UserId;
+        userid = userid || US.userInfo.userid;
         $("#UD_SYSXZBYT")[0].innerHTML = "";
         (!_UPE || !_UPE[0] || !_UPE[0].length) && ($(_UDTD).Parent().style.display = "none");
         _UGE["DBK"] = UDE;
@@ -181,10 +181,10 @@ U.MD.D.PB.YMHBK = U.MD.D.PB.DJPBCKMU = function (UDE, UFN, UDOD, userid) {
     U.MD.D.PB.Pa.XSYCBK(_UDTD.Parent());
     _UGE["UHID"] = "";  //切换展示
     if (_UAE) {
-        (!US.userInfo.UserId) && (U.MD.D.H.ET.DLHD = [U.UF.M.apply(this, [[U.MD.D.PB.DJPBCKMU, [UDE, UFN, UDOD, userid]]])]); //点击查看目录信息
+        (!US.userInfo.userid) && (U.MD.D.H.ET.DLHD = [U.UF.M.apply(this, [[U.MD.D.PB.DJPBCKMU, [UDE, UFN, UDOD, userid]]])]); //点击查看目录信息
         if (_UAE[2] == 2 && userid) { //获取是否收藏了本模块
-            U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_S_IFPBCollect", UDE.UserDirectoryID, US.userInfo.UserId || US.EMPTYGUID]), U.MD.D.PB.CMHBK, ["", U.UF.M.apply(this, [[U.MD.D.PB.DJPBCKMU, [UDE, UFN, UDOD, userid]]])];
-            //   U.UF.A.Request(US.AUTH,"pb.IFCollect", [UDE.UserDirectoryID, US.userInfo.UserId || US.EMPTYGUID]), U.MD.D.PB.CMHBK, ["", U.UF.M.apply(this, [[U.MD.D.PB.DJPBCKMU, [UDE, UFN, UDOD, userid]]])];
+            U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_P_S_IFPBCollect", UDE.UserDirectoryID, US.userInfo.userid || US.EMPTYGUID]), U.MD.D.PB.CMHBK, ["", U.UF.M.apply(this, [[U.MD.D.PB.DJPBCKMU, [UDE, UFN, UDOD, userid]]])];
+            //   U.UF.A.Request(US.AUTH,"pb.IFCollect", [UDE.UserDirectoryID, US.userInfo.userid || US.EMPTYGUID]), U.MD.D.PB.CMHBK, ["", U.UF.M.apply(this, [[U.MD.D.PB.DJPBCKMU, [UDE, UFN, UDOD, userid]]])];
         }
         else { //打印目录信息
             U.UF.A.Request(US.CROSSDOMAIN, [US.DB, "UseStudio_Blog", "UB_B_S_GetNexDiretory", UDE.UserDirectoryID || UDE.PublishedDirectoryID, US.EMPTYGUID]), U.MD.D.PB.AsynGetND, ["", UDE];
@@ -223,7 +223,7 @@ U.MD.D.PB.CLYMHBK = function (UGE, UDE, UKE, UDID) {
 
 //下级版块目录展示
 U.MD.D.PB.XJBKMU = function (UDOD, UDE, UBE) {
-    var _UCE, i = 0, _UGE = U.MD.D.H.ET["NT"]["PB"]["BK"], _USID = _UGE["USID"], _userid = US.userInfo.UserId, _UDFD = $$("div", { "className": "UD_SYSXZBYTC" }); UDOD.innerText = ""; (!UDE) && (UDE = []); (UBE.PublishedParentID != US.FORUMROOTID) && (i--);
+    var _UCE, i = 0, _UGE = U.MD.D.H.ET["NT"]["PB"]["BK"], _USID = _UGE["USID"], _userid = US.userInfo.userid, _UDFD = $$("div", { "className": "UD_SYSXZBYTC" }); UDOD.innerText = ""; (!UDE) && (UDE = []); (UBE.PublishedParentID != US.FORUMROOTID) && (i--);
     for (i; i < UDE.length; i++) { _UCE = i < 0 ? _$(_UGE).Select({ "UserDirectoryID": UBE.PublishedParentID })[0] : UDE[i]; $$("div", { "className": "UD_SYSXZBYTO", "innerHTML": i < 0 ? "< 返回上一层" : UDE[i].UserDirectoryName, "onclick": (_userid && _USID == _userid) ? [[U.MD.D.PB.CKWDFB, [1, _UCE, _userid]]] : [[U.MD.D.PB.DJPBCKMU, [_UCE]]] }, _UDFD); }
     (i || UBE.PublishedParentID != US.FORUMROOTID) ? (UDOD.style.display = "block", UDOD.appendChild(_UDFD)) : UDOD.style.display = "none";
 }
@@ -239,7 +239,7 @@ U.MD.D.PB.CKBKTZCL = function (UDOD, UDE) {
 
 //设置版块功能切换
 U.MD.D.PB.CSYMHBK = function (UDOD, UDE) {
-    var i, _userid = US.userInfo.UserId, _UDAD = $(UDOD).Child(), _UKE = ["GX", "Img", "Rm", "Me", "Disk"];
+    var i, _userid = US.userInfo.userid, _UDAD = $(UDOD).Child(), _UKE = ["GX", "Img", "Rm", "Me", "Disk"];
     for (i = 0; i < 5; i++) { (_UDAD[i]) && (_UDAD[i].onclick = U.UF.M.apply(_UDAD[i], [[U.MD.D.PB.GNXZCK, [_UKE[i], _UDAD[i], UDE]]])); } //切换效果
 }
 
@@ -277,7 +277,7 @@ U.MD.D.PB.FYYMHBK = function (UP, UCB) {
     UP = UP || "";
     var _UTF,
     _UPE,
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _UGE = U.MD.D.H.ET["NT"]["PB"],
     _USID = _UGE["USID"],
     _UDE = _UGE["DBK"];
@@ -326,7 +326,7 @@ U.MD.D.PB.PBCK = function (UP, UDE) {
 U.MD.D.PB.GNXZCK = function (UTF, UDOD, UDE, UP) {
     var _UCE, _UKE, _UPE, _UFT, _UAID = US.EMPTYGUID,
     _UBE = US.userInfo.PB,
-    _userid = US.userInfo.UserId,
+    _userid = US.userInfo.userid,
     _UDID = UDE.UserDirectoryID,
     _UDTD = $("#UD_SYSXZBYPR")[0],
     _UVT = (UDOD && UDOD.className == "UD_SYSXZBECTC UD_SYSXZBECTO"),
@@ -348,7 +348,7 @@ U.MD.D.PB.GNXZCK = function (UTF, UDOD, UDE, UP) {
         if (!_UPE[0] || _UVT) {//更新数据 或者获取数据
             _UCE[2] = [_UDID, (_UPE[1] - 1) * 100, _UPE[1] * 100];
             if (_UCE[0] == "Publicpage") { _UCE[2].push(1); }
-            else if (_UCE[0] == "GetMeA") { _UCE[2].unshift(US.userInfo.UserId); }; //获取数据前处理
+            else if (_UCE[0] == "GetMeA") { _UCE[2].unshift(US.userInfo.userid); }; //获取数据前处理
             (_UVT && _UKE && _UKE[1] && _UKE[1][0]) && (_UAID = _UKE[1][0].ArticleID);
             _UCE[2].push(_UAID); _UCE[2].push(_UFT ? _userid : US.EMPTYGUID); //是否更新数据
             _UCE[2].unshift(_UCE[0]);
@@ -430,7 +430,7 @@ U.MD.D.PB.NSYPBL = function (UDOD, UDE, UBE, UTF) {
 
 //文章打印
 U.MD.D.PB.PBSYWZ = function (UDE, UDOD, UBE) {
-    var _UTF, _UDTD, _UDPD, _UDSD, _UDID, _UDQD, _UDVD, _UDHD, _UDLD, _UDBD, _UDKD, _UDRD, _UDCD, _UDMD, _UDGD, _UDED, _UIMG, _userid = US.userInfo.UserId, _UN = UDE.UserNickName || UDE.UserName;
+    var _UTF, _UDTD, _UDPD, _UDSD, _UDID, _UDQD, _UDVD, _UDHD, _UDLD, _UDBD, _UDKD, _UDRD, _UDCD, _UDMD, _UDGD, _UDED, _UIMG, _userid = US.userInfo.userid, _UN = UDE.UserNickName || UDE.UserName;
     _UDTD = $$("div", { "onclick": [[U.MD.D.PB.A.WAPMHBK, [UDE, UBE, null, "this"]]], "className": "UD_SYSXZBPO" }, UDOD);
     _UDPD = $$("div", { "className": "UD_SYSXZBMCOS" }, _UDTD);
     _UDSD = $$("div", { "className": "UD_SYSXZBMCOT UD_SYSXZBMCOTB" }, _UDPD);
@@ -464,7 +464,7 @@ U.MD.D.PB.PBSYWZ = function (UDE, UDOD, UBE) {
 //目录文章点击
 U.MD.D.PB.PBSYWZML = function (UDE, UBE) {
     var _UGE = U.MD.D.H.ET["NT"]["PB"], _UDID = UDE["PublishedDirectoryID"] || UDE["UserDirectoryID"]; UBE = UBE || _$(_UGE["BK"]).Select({ "UserDirectoryID": _UDID })[0];
-    U.MD.D.PB.DJPBCKMU(UBE || { "UserDirectoryID": _UDID, "UserDirectoryName": UDE["UserDirectoryName"] }, null, null, _UGE["USID"] == US.userInfo.UserId ? _UGE["USID"] : null); //查看目录信息
+    U.MD.D.PB.DJPBCKMU(UBE || { "UserDirectoryID": _UDID, "UserDirectoryName": UDE["UserDirectoryName"] }, null, null, _UGE["USID"] == US.userInfo.userid ? _UGE["USID"] : null); //查看目录信息
 }
 
 //#endregion

+ 1 - 1
js/Reply/Comment.js

@@ -266,7 +266,7 @@ U.MD.D.CM.MR = function (UFID, UDOD, UD, UPID, userid, UN, cb) {
         _UIH = UDOD.innerHTML; //回复的内容
         if (!UDOD.innerText) { U.Alert("请输入内容"); }
         else {
-            var _UDE = new U.MD.D.CM.TCM((_UCE = [UFID, US.userInfo.UserId, US.userInfo.UserNickName, Guid.newGuid(), _UIH, new Date(), US.userInfo.LoginIP || "", US.userInfo.LoginAddress || "", UD, US.userInfo.UserThumbnailImageHead || "", UPID || "", userid || "", UN || ""]));
+            var _UDE = new U.MD.D.CM.TCM((_UCE = [UFID, US.userInfo.userid, US.userInfo.UserNickName, Guid.newGuid(), _UIH, new Date(), US.userInfo.LoginIP || "", US.userInfo.LoginAddress || "", UD, US.userInfo.UserThumbnailImageHead || "", UPID || "", userid || "", UN || ""]));
             UDOD.innerText = "";
             UDOD.focus();
             UDOD.blur();

+ 6 - 6
js/Reply/Reply.js

@@ -149,7 +149,7 @@ U.MD.R.initPrintHtml = function (el) {
     }, _operation);
 
     //判断是否登录
-    if (US.userInfo.UserId) {//已登录
+    if (US.userInfo.userid) {//已登录
         _username.innerHTML = US.userInfo.UserName; //设置用户名
         _headimg.src = 'http://fs.1473.cn/' + US.userInfo.UserThumbnailImageHead; //设置头像
     }
@@ -290,7 +290,7 @@ U.MD.R.printComment = function (el, type, data, appendtype, isreply, readmore) {
 * @param  {boolean} 是否需要查看更多,用于区分设置查看更多类型
 */
 U.MD.R.viewComment = function (rid, type) {
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var 
             _rid = rid, //父级id
             _form, //窗体变量
@@ -496,7 +496,7 @@ U.MD.R.printCommentHtml = function (el, type, data, appendtype, isreply, readmor
     _likeswarp = $$("div", { "className": "U_MD_R_content_box_content_bottom_likeswarp" }, _content_bottom); //评论右侧内容-底部区域-点赞最外层
 
     _likeswarp.onclick = function () {//设置点赞事件
-        U.MD.R.like(this, _rid, US.userInfo.UserId);
+        U.MD.R.like(this, _rid, US.userInfo.userid);
     }
 
     _likesimg = $$("img", { "src": "/img/reply/NOFabulous.png" }, _likeswarp); //评论右侧内容-底部区域-点赞图片
@@ -682,14 +682,14 @@ U.MD.R.subsetReply = function (el) {
 * 发表评论插入函数
 */
 U.MD.R.release = function (el, type, isreply, position) {//发表评论函数
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var _el = el,
             _type = type,
             _isreply = isreply,
             _position = position,
             _content = U.selectEl(_el).find(".U_MD_R_Reply_Content")[0],
             _imgwarp = U.selectEl(_el).find(".U_MD_R_Reply_Image"),
-            _uid = US.userInfo.UserId,
+            _uid = US.userInfo.userid,
             _un = US.userInfo.UserName,
             _utx = "http://fs.1473.cn/" + US.userInfo.UserImageHead,
             _box;
@@ -810,7 +810,7 @@ U.MD.R.release = function (el, type, isreply, position) {//发表评论函数
 * @param  {string} 用户id
 */
 U.MD.R.like = function (e, rid, uid) {
-    if (US.userInfo.UserId) {
+    if (US.userInfo.userid) {
         var _el = e, _rid = rid, _uid = uid;
         U.A.Request("http://cd.1473.cn/net", ["db.1473.cn", "UseStudio_Reply", "Reply_SelectRepeatLikes", _rid, _uid], function (r) {
             var _img = U.selectEl(_el).find("img")[0],

+ 1 - 1
js/UC/NotFunction.js

@@ -1597,7 +1597,7 @@ U.M.GetJsUrl = function (UDID) {
 
 //U.UP.uploading = function () {
 //    var _ = function (UDE, UCB, UCT, UAC, UTF, UFID) {//执行上传
-//        this.contentWindow.name = UFID; UDE = U.Ut.isArray(UDE) ? UDE : Array.prototype.slice.apply(UDE); UAC = UAC + (UAC.indexOf("?") > -1 ? "" : "?") + ((US && US.userinfo && US.userinfo.UserId) || US.userinfo.UserId ? "&UserId=" + (US.userinfo.UserId || US.userinfo.UserId) : "");
+//        this.contentWindow.name = UFID; UDE = U.Ut.isArray(UDE) ? UDE : Array.prototype.slice.apply(UDE); UAC = UAC + (UAC.indexOf("?") > -1 ? "" : "?") + ((US && US.userinfo && US.userInfo.userid) || US.userInfo.userid ? "&UserId=" + (US.userInfo.userid || US.userInfo.userid) : "");
 //        var i = 0, _UL = UDE.length, _UCE = [], _UCB = UCB, _UDBD = document.body, _URE = { "UpObj": UDE, "context": UCT, "value": "" }, _UDFD = $$("form", { "action": UAC, "target": UFID, "encoding": "multipart/form-data", "enctype": "multipart/form-data", "method": "post", "name": "loading", "style": { "display": "none"} }, _UDBD);
 //        (UTF) && (_UL = 1, _URE["UpObj"] = UDE.splice(0, 1), _UCB = U.M.apply(this, [[UCB, [_URE]], [U.UP.uploading, [UDE, UCB, UCT, UAC, UTF]]])); UDE = _URE["UpObj"];
 //        for (i; i < _UL; i++) { UDE[i].name = UDE[i].name || UDE[i].id || Guid.newGuid(); _UCE.push($(UDE[i]).replaceC($$("div"))[0]); _UDFD.appendChild(UDE[i]); }

+ 6 - 6
js/UC/U.A.js

@@ -163,7 +163,7 @@ U.A.Request.init = function (arg) { //初始化Ajax对象
         db: arg[1] || [],
         cb: arg[2] || "", //回调函数  cb   
         cbParams: arg[3], //回调参数  cbparams
-        //调用方法:U.A.Request(US.Auth,"UseStudioManage.AddToLoginLog", [US.userinfo.UserId || US.NU, US.NLInfo.LogAddr || "", US.ITID], U.M.apply(), [], { type: "Get", "async": false, "timeout": 1, "CONTENT-TYPE": "application/json" }); //访问日志添加消息
+        //调用方法:U.A.Request(US.Auth,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.NU, US.NLInfo.LogAddr || "", US.ITID], U.M.apply(), [], { type: "Get", "async": false, "timeout": 1, "CONTENT-TYPE": "application/json" }); //访问日志添加消息
         header: arg[4] || "", //暂时没有用处。浏览器升级后对ajax的功能进行扩展,加入了"对head头部自定义修改"的功能。CONTENT-TYPE:application/x-www-form-urlencoded;charset=UTF-8.
         UTI: new Date() //ajax生成时间..删除,时间保存在第二个参数ajax里面。
     }); //使用参数区域
@@ -176,7 +176,7 @@ U.A.Request.init.prototype = {
         var _USE = this.toAjaxFormat(); //生成请求参数 数据结构:
         _url = _USE[0]; //连接的后台地址 形如"http://cd.1473.cn/php" 
         _db = _USE[1]; //传参参数;  
-        //如果不传递回调函数,则为同步请求,示例:U.A.Request(US.Auth,"UseStudioManage.AddToLoginLog", [US.userinfo.UserId || US.NU, US.NLInfo.LogAddr || "", US.ITID]);。返回json数据,一直等待服务器返回,如果服务器执行1分钟,页面停顿1分钟。
+        //如果不传递回调函数,则为同步请求,示例:U.A.Request(US.Auth,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.NU, US.NLInfo.LogAddr || "", US.ITID]);。返回json数据,一直等待服务器返回,如果服务器执行1分钟,页面停顿1分钟。
         if (U.Ut.isFunction(this.cb)) {
             isAsync = true; //函数是否异步
         }
@@ -233,7 +233,7 @@ U.A.Request.init.prototype = {
         var _params = this.toAjaxFormat(); //生成请求参数 数据结构:
         _url = _params[0]; //连接的后台地址 形如"http://cd.1473.cn/php" 
         _db = _params[1]; //传参参数;  
-        //如果不传递回调函数,则为同步请求,示例:U.A.Request(US.Auth,"UseStudioManage.AddToLoginLog", [US.userinfo.UserId || US.NU, US.NLInfo.LogAddr || "", US.ITID]);。返回json数据,一直等待服务器返回,如果服务器执行1分钟,页面停顿1分钟。
+        //如果不传递回调函数,则为同步请求,示例:U.A.Request(US.Auth,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.NU, US.NLInfo.LogAddr || "", US.ITID]);。返回json数据,一直等待服务器返回,如果服务器执行1分钟,页面停顿1分钟。
         if (U.Ut.isFunction(this.cb)) {
             isAsync = true; //函数是否异步
         }
@@ -300,15 +300,15 @@ U.A.Request.init.prototype = {
         }
         //完全跨域判断非1473的域名, 
         else if (!_isDomain[1] && _url.indexOf("1473.cn") > -1 && $("#U_Domain")[0]) { //其他域名跨域处理
-            //其他站点,跨域形式访问:例如:http://a.com/ 在页面中调用U.A.Request(US.Auth,"UseStudioManage.AddToLoginLog", [US.userinfo.UserId || US.NU, US.NLInfo.LogAddr || "", US.ITID]);
+            //其他站点,跨域形式访问:例如:http://a.com/ 在页面中调用U.A.Request(US.Auth,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.NU, US.NLInfo.LogAddr || "", US.ITID]);
             this.goDomain(); //外站跨域调用
             return false;
         }
         return true;
     },
     //把传参格式转换为Ajax请求格式
-    //              刑如:US.Auth,"UseStudioManage.AddToLoginLog", [US.userinfo.UserId || US.NU, US.NLInfo.LogAddr || "", US.ITID]  转换为下面的格式
-    //              格式:"http://main.1473.cn/Uses.ashx",US.userinfo.UserId || US.NU +"&" + US.NLInfo.LogAddr || ""+ "&" + US.ITID, "http://main.1473.cn/Uses.ashx"(默认请求地址,如果第一个参数不在U.A.backAddress中,则使用第三个)
+    //              刑如:US.Auth,"UseStudioManage.AddToLoginLog", [US.userInfo.userid || US.NU, US.NLInfo.LogAddr || "", US.ITID]  转换为下面的格式
+    //              格式:"http://main.1473.cn/Uses.ashx",US.userInfo.userid || US.NU +"&" + US.NLInfo.LogAddr || ""+ "&" + US.ITID, "http://main.1473.cn/Uses.ashx"(默认请求地址,如果第一个参数不在U.A.backAddress中,则使用第三个)
     /*
     * @return  {array} 域、 加密参数、 默认地址  例:
     */

+ 3 - 3
js/UC/U.MDevelop.js

@@ -11,13 +11,13 @@ U.CD.CL = function (obj) {
 }
 //从数据库获取用户开发代码
 U.CD.GC = function (obj) {
-    if (US.userinfo.UserId == null) {
+    if (US.userInfo.userid == null) {
         if (obj) {
             U.U.L.LAR();
         }
     }
     else {
-        U.A.Request(US.Auth, ["GetUserCode", US.userinfo.UserId], U.CD.PC, []);
+        U.A.Request(US.Auth, ["GetUserCode", US.userInfo.userid], U.CD.PC, []);
     }
 }
 //将代码赋到文本框中
@@ -35,7 +35,7 @@ U.CD.PC = function (_text) {
 U.CD.SC = function () {
     if (U.U.L.isLogin() == false) {
         var _cd = $("#UD_CD_TA")[0].innerHTML;
-        U.A.Request(US.Auth, ["SaveUserCode", US.userinfo.UserId, _cd], alert("保存成功"));
+        U.A.Request(US.Auth, ["SaveUserCode", US.userInfo.userid, _cd], alert("保存成功"));
     }
 }
 

+ 7 - 7
js/UC/U.MPlayer.js

@@ -67,7 +67,7 @@ U.MPlayer.YYOP = function (UDE, UDOD) {
         _UDSD = $$("div", { "className": "UD_SYMMLCVR" }, _UDTD);
         $$("div", { "className": "UD_SYMMLCVRS", "innerHTML": "这里当前还没有任何歌曲!!" }, _UDSD);
         _UDMD = $$("div", { "className": "UD_SYMMLCVRX", "innerHTML": "你可以:" }, _UDSD);
-        $$("span", { "innerHTML": "云分享添加", "onclick": [[U.D.DT.YYDK, ["Disk", { userid: US.userinfo.UserId, directoryid: US.MG}]]] }, _UDMD);
+        $$("span", { "innerHTML": "云分享添加", "onclick": [[U.D.DT.YYDK, ["Disk", { userid: US.userInfo.userid, directoryid: US.MG}]]] }, _UDMD);
     }
     UDOD.appendChild(_UDFD); (_UDJD) && (U.M.SCT(_UDJD)); return _UIF;
 }
@@ -130,13 +130,13 @@ U.MPlayer.BFYY = function (UDE, UDOD, UTF) {
 
 //点击直接播放
 U.MPlayer.TBFYY = function (UDE, UDOD, UTF) {
-    var _userid = US.userinfo.UserId, _UGE = U.D.SY.ET["FL"], _UDAD = $("#UD_SYMRTLC").Child(), _UDCD = $(_UDAD[1]).Child();
+    var _userid = US.userInfo.userid, _UGE = U.D.SY.ET["FL"], _UDAD = $("#UD_SYMRTLC").Child(), _UDCD = $(_UDAD[1]).Child();
     //设置样式播放样式
     $("#UD_SYMRTLTRX")[0].innerHTML = UDE.UserallDirectoryName || UDE.UserFilesName; $("#UD_SYMRTLTLO")[0].style.display = "block";
     _UDAD[0].innerText = _UDAD[2].innerText = "00:00"; _UDCD[1].style.width = _UDCD[2].style.left = "0px"; _UGE["Entity"] = UDE;
     U.MPlayer.DXBFYY(); U.MPlayer.ZPYY([$("#UD_SYMMLSK")[0], $("#UD_SYMRTLTLO")[0]], true); U.MPlayer.YSBFYY(UDOD, _UGE["PF"]["OB"]); //播放的位置样式
     //修改播放的时间
-    (_userid == US.userinfo.UserId) && (UDE.UserDirectoryModifyTime = U.MT.toTimeStamp(new Date()), U.A.Request(US.Auth, ["SaveFileContent", UDE.UserDirectoryID, ""], U.M.apply, [""]));
+    (_userid == US.userInfo.userid) && (UDE.UserDirectoryModifyTime = U.MT.toTimeStamp(new Date()), U.A.Request(US.Auth, ["SaveFileContent", UDE.UserDirectoryID, ""], U.M.apply, [""]));
     (!UTF) && (_UGE["MO"].loadAplay(US.fs + UDE.UserFilesServerName, 0.6)); //播放音乐
 }
 
@@ -198,7 +198,7 @@ U.MPlayer.SYYJY = function () {
 //直接听音乐 直接听了添加到我的音乐列表里
 U.MPlayer.TYY = function (UDE) {
     if (UDE) {
-        if (US.userinfo.UserId) { U.MPlayer.SCYYJY(UDE, U.M.apply(this, [[U.MPlayer.YYLoad, [US.MG, US.userinfo, null]]])); } //登录用户添加到自己的列表下
+        if (US.userInfo.userid) { U.MPlayer.SCYYJY(UDE, U.M.apply(this, [[U.MPlayer.YYLoad, [US.MG, US.userinfo, null]]])); } //登录用户添加到自己的列表下
         else { U.D.SY.ET["FL"]["Entity"] = UDE; U.MPlayer.YYLoad(null, {}, [[{ "UserallDirectoryName": "试听列表" }, [], [UDE]]]); } //游客用户
     }
 }
@@ -207,7 +207,7 @@ U.MPlayer.TYY = function (UDE) {
 U.MPlayer.SCYYJY = function (UDE, UCB) {
     if (!U.U.L.isLogin(3)) {
         UDE = UDE || U.D.SY.ET["FL"]["Entity"];
-        U.A.Request(US.Auth, ["CopyAndPasteFiles", US.userinfo.UserId, US.MG, UDE.UserFilesID || UDE.UserDirectoryID, ""]), U.MPlayer.AsynSCYYJY, ["", US.MG, [UDE], 0, UCB, US.userinfo.UserId, null, "Copy"]; //添加到用户列表
+        U.A.Request(US.Auth, ["CopyAndPasteFiles", US.userInfo.userid, US.MG, UDE.UserFilesID || UDE.UserDirectoryID, ""]), U.MPlayer.AsynSCYYJY, ["", US.MG, [UDE], 0, UCB, US.userInfo.userid, null, "Copy"]; //添加到用户列表
     }
 }
 
@@ -220,7 +220,7 @@ U.MPlayer.AsynSCYYJY = function (r) {
 
 //添加列表
 U.MPlayer.TJYYLB = function () {
-    U.D.DT.YYDK("Disk", { "userid": US.userinfo.UserId, "directoryid": US.MG }); //打开网盘
+    U.D.DT.YYDK("Disk", { "userid": US.userInfo.userid, "directoryid": US.MG }); //打开网盘
     U.Dk.RE.WPXJWJ("folder", $("#UD_SYW")[0]); //新建文件夹
 }
 
@@ -254,7 +254,7 @@ U.MPlayer.GD = function (ULD) {
 
 //错误处理
 U.MPlayer.Error = function (UE) {
-    var _UGE = U.D.SY.ET["FL"]; (US.userinfo.UserId) && (U.Alert("此音乐暂停服务。"));
+    var _UGE = U.D.SY.ET["FL"]; (US.userInfo.userid) && (U.Alert("此音乐暂停服务。"));
     if (_UGE.er++ < 10) { U.MPlayer.PNM(); } else { _UGE["MO"].pauseOstart(true); _UGE.er = 0; } //错误音乐太多 停止
 }
 

+ 3 - 3
js/UC/U.UI.js

@@ -468,12 +468,12 @@ U.UI.EditorLoad.init.prototype = {
                 // U.UP.uploading([UDOD], UDE[0], UDE[1], "http://main.1473.cn/USupfile.ashx?iframename=" + UDE[2]);
 
                 //                _UDKD = $$("div", { "className": "UD_SYFDTZ UD_SYI UD_SYSXZBFCAHO", "style": { "position": "relative" }, "title": "本地添加文件",
-                //                    "onmousedown": [[U.Dk.UP.SCXWPOP, (['this', { "width": "25px", "height": "22px", "GS": true, "FCP": U.M.apply(this, [[this.createFile]]), "URL": "http://disk.1473.cn/USupfile.ashx?iframename=UseStudioEditor", "ID": Guid.newGuid() }, US.userinfo.UserId, true])]]
+                //                    "onmousedown": [[U.Dk.UP.SCXWPOP, (['this', { "width": "25px", "height": "22px", "GS": true, "FCP": U.M.apply(this, [[this.createFile]]), "URL": "http://disk.1473.cn/USupfile.ashx?iframename=UseStudioEditor", "ID": Guid.newGuid() }, US.userInfo.userid, true])]]
                 //                }, _UDSD);
 
 
 
-                if (US && US.userinfo && US.userinfo.UserId) {
+                if (US && US.userinfo && US.userInfo.userid) {
                     $$("div", { "className": "UD_SYFDTW UD_SYI UD_SYSXZBFCAHH", "style": { "width": "28px" }, "title": "网盘添加文件",
                         "onclick": [[U.Dk.VW.CCWPXZK, ([US.NU, { "onclick": U.M.apply(this, [[this.createFile]]) }, null])]]
                     }, _UDSD);
@@ -816,7 +816,7 @@ U.UI.EditorLoad.init.prototype = {
                 this.ufcp(r, _UFID);
             }
             else if ((!this.rt.fup) || (this.rt.fup(_UDE) !== false)) {
-                this.objfl.URRUP((this.url || "http://main.1473.cn/USupfile.ashx?iframename=UseStudioEditor&") + "UserId=" + (US.userinfo.UserId || US.NU) + "&IsF=true", _UFID, _UDE[1], _UDE[2]);
+                this.objfl.URRUP((this.url || "http://main.1473.cn/USupfile.ashx?iframename=UseStudioEditor&") + "UserId=" + (US.userInfo.userid || US.NU) + "&IsF=true", _UFID, _UDE[1], _UDE[2]);
             }
         },
         _ = function (UWE, UFID) {

+ 3 - 3
js/UC/U.UP.js

@@ -61,7 +61,7 @@ U.UP.uploading = function (UDE, UCB, UCT, UAC, UTF, UTP) { //生成传输的ifra
 U.UP.uploadingA = function (UDE, UCB, UCT, UAC, UTF, UFID, UTP) {
     this.contentWindow.name = UFID; //跨域页面必须设置name
     UDE = U.Ut.isArray(UDE) ? UDE : Array.prototype.slice.apply(UDE); //上传input集
-    UAC = UAC + (UAC.indexOf("?") > -1 ? "" : "?") + ((US && US.userinfo && US.userinfo.UserId) || US.userinfo.UserId ? "&UserId=" + (US.userinfo.UserId || US.userinfo.UserId) : ""); //上传地址
+    UAC = UAC + (UAC.indexOf("?") > -1 ? "" : "?") + ((US && US.userinfo && US.userInfo.userid) || US.userInfo.userid ? "&UserId=" + (US.userInfo.userid || US.userInfo.userid) : ""); //上传地址
     var i = 0,
     _UL = UDE.length, //上传input长度
     _UCE = [],
@@ -285,10 +285,10 @@ U.UP.FLCP = function (data) {
 * @param  {function} 回调参数
 */
 U.UP.FileDL = function (UFN, USN, UTF) {
-    var _userid = US.userinfo.UserId,
+    var _userid = US.userInfo.userid,
     _UIE = _userid ? _userid : U.M.GetCookie("usestudiosso", "userid") || [];
     if (_userid || _UIE[0]) { //用户登录处理
-        (!_userid) && (US.userinfo.UserId = _UIE[0]);
+        (!_userid) && (US.userInfo.userid = _UIE[0]);
         U.UP.uploading([$$("input", { "type": "text", "value": UFN, "name": "filename" }), $$("input", { "type": "text", "value": USN, "name": "filepath" })], //调用访问传参接口
         null, null, "http://main.1473.cn/USupfile.ashx?iframename=" + (UTF || "UploadFile"), false);
     }

File diff suppressed because it is too large
+ 0 - 0
js/UC/UC20.js


File diff suppressed because it is too large
+ 0 - 0
js/UC/UC23.js


File diff suppressed because it is too large
+ 0 - 0
js/UC/UD20.js


File diff suppressed because it is too large
+ 0 - 0
js/UC/UD23.js


+ 43 - 43
js/UD.Disk/NotFun.js

@@ -12,7 +12,7 @@ US.Disk.Layer = { "step": 20, "LI": null }; //Disk位置变化
 //    if (UTF || (_UMT && _UTP.indexOf(_UMT) > -1)) { } //office打开 //window.open("http://disk.1473.cn?ID=" + UFID + "&TP=" + (UTF || "")); 
 //    else { U.Alert("等待文件的打开"); U.A.Request(US.Auth,"UseStudioDisk.IsTxt", [USN], U.Dk.LE.AsynOFT, ["", USN, UN, userid, UFID, _UDOD]); } //其余的文件用户下载
 
-//    var _UGE = U.Dk.DiskOperatingSwitch(US.userinfo.UserId), _UKE = (UAE) ? UAE.concat(UDE) : UDE; _UGE[1][1] = "";
+//    var _UGE = U.Dk.DiskOperatingSwitch(US.userInfo.userid), _UKE = (UAE) ? UAE.concat(UDE) : UDE; _UGE[1][1] = "";
 //    U.Dk.LL.SCDXWPDH([{ "UserallDirectoryName": "关键字\"" + UPW + "\"搜索结果"}], $("#UD_SYWRYB")[0]); //打印导航
 //    if (UDE.length) {
 //        (!UDOD.onscroll) && (UDOD.innerText = ""); U.Dk.VW.XWPDY((_UGE[1][5] = UDOD.onscroll ? UDE : _UKE), UDOD, null, UAE ? UAE.length : 0); //打印网盘资料
@@ -75,7 +75,7 @@ U.Dk.RightAuthority; //右键的权限判断,只有我的电脑可以新建TXT
 //        _UDCD = $$("div", { "className": "UD_SYMMLCVR" }, _UDKD);
 //        $$("div", { "className": "UD_SYMMLCVRS", "innerHTML": "这里当前还没有任何歌曲!!" }, _UDCD);
 //        _UDPD = $$("div", { "className": "UD_SYMMLCVRX", "innerHTML": "你可以:" }, _UDCD);
-//        $$("span", { "innerHTML": "云分享添加", "onclick": [[U.D.DT.YYDK, ["Disk", [US.userinfo.UserId, US.MG]]]] }, _UDPD);
+//        $$("span", { "innerHTML": "云分享添加", "onclick": [[U.D.DT.YYDK, ["Disk", [US.userInfo.userid, US.MG]]]] }, _UDPD);
 //    }
 //    (UDVD) && (UDVD.appendChild(_UDFD)); return _ITF; //所有的歌曲
 
@@ -177,7 +177,7 @@ U.Dk.VW.PD = function (UDE, UDOD, UFID) {
     var i, _UDTD, _UDSD, _UTF, _UFT, _UGE = US.Disk.UserDisk[1][0], _UDFD = $$("frag");
     if (UDE.length) {
         for (i = 0; i < UDE.length; i++) {
-            if (US.userinfo.UserId == _UGE.UserId || !UDE[i].UserDirectoryEncrypt) {
+            if (US.userInfo.userid == _UGE.UserId || !UDE[i].UserDirectoryEncrypt) {
                 _UTF = U.UP.IsDF(UDE[i].UserDirectoryExtendType)[0]; (!_UFT) && (_UFT = UFID == UDE[i].UserDirectoryID);
                 _UDTD = $$("div", { "id": "disk" + UDE[i].UserDirectoryID, "className": "UDK_RT_application" + (_UFT ? " UDK_RT_hover" : ""), "onclick": [[U.Dk.HP.DKDS, ["this"]], [U.Dk.LL.UDKURL, [UDE[i].UserDirectoryID]], [U.Dk.LE.DBC, [UDE[i].UserDirectoryID, _UGE.UserId]]], "onmousedown": [[U.M.StopBubble], [U.Dk.RM.DRC, ["this", UDE[i].UserDirectoryID, _UGE.UserId]]] }, _UDFD);
                 _UDSD = $$("div", { "className": "UDK_RT_UDD Radius5", "onmouseout": [[U.Dk.HP.DKDS, ["this"]]], "onmouseover": [U.Dk.HP.DKDS, ["this", UDE[i].Descript || UDE[i].UserallDirectoryName]] }, _UDTD); // [U.Dk.VW.CH, [_UDTD.childNodes]]
@@ -225,7 +225,7 @@ U.Dk.VW.PTD = function (UDE, UDOD) {
 //U.Dk.LE.DBC = function (UDID, userid) {//点击右边目录或者是文件的时候
 //    U.Dk.DiskOperatingSwitch(userid); var _UTF, _UGE = US.Disk.UserDisk, _UDE = _$(_UGE[0]).Select({ "UserDirectoryID": UDID }, null, 1)[0], _UTP = _UDE.UserDirectoryExtendType.toLowerCase();   //操作用户切换
 //    U.Dk.SBDD(_UGE[1][3], ["block", "none"]); //查看切换
-//    if (_UTP == "folder") { (US.userinfo.UserId == userid && (U.AFB.GoList["disk" + userid]["OL"] == 1)) && (U.D.ZYXB(0, false, "WZ")); U.AFB.AddEvent([[U.Dk.LE.OFO, [_UDE, UDID, userid]]], "disk" + userid); }
+//    if (_UTP == "folder") { (US.userInfo.userid == userid && (U.AFB.GoList["disk" + userid]["OL"] == 1)) && (U.D.ZYXB(0, false, "WZ")); U.AFB.AddEvent([[U.Dk.LE.OFO, [_UDE, UDID, userid]]], "disk" + userid); }
 //    else {
 //        U.M.StopBubble(); _UTF = U.UP.IsDF(_UTP)[0]; //阻止冒泡
 //        if (_UTF == "P") { U.Dk.LE.OIMG(UDID, _UDE); } //图片预览器
@@ -412,7 +412,7 @@ U.Dk.VW.PTD = function (UDE, UDOD) {
 //U.Dk.UP.AsynIsFUp = function (r) {
 //    var context = r.context, _UFL = context[1], _UDE = context[2], _UDT = U.Dk.UP.GetFWZ(_UFL.FID); r = r.value; try { r = eval(r)[0]; } catch (e) { }
 //    if (r) { U.Dk.UP.SUPF([r.UserFilesServerName, r.UserFilesID, r.UseFilesServerThumbnailName, _UFL.size], _UDE, _UFL); } //已有的文件自己拷贝
-//    else { U.UP.FTF["EL"].URRUP(_UFL["URL"] + "&UserId=" + US.userinfo.UserId + "&IsF=true", _UFL.FID, _UDT[0], _UDT[1]); } //上传到服务器
+//    else { U.UP.FTF["EL"].URRUP(_UFL["URL"] + "&UserId=" + US.userInfo.userid + "&IsF=true", _UFL.FID, _UDT[0], _UDT[1]); } //上传到服务器
 //}
 
 ////上传的进度条
@@ -454,10 +454,10 @@ U.Dk.UP.SCGUP = function (URE, UFE, UTE, TF) {
     //    var _UKE, _UGE = US.Disk.UserDisk, _UIF = US.userinfo, _UCE = UTE || _$(_UGE[0]).Select({ "UserDirectoryID": UFE["ID"] });
     //    URE[2] = (URE[2] == null ? U.UP.FFT(UFE["type"])[1] : US.fs + URE[2]); //文件缩略图
     //    _UKE = new U.Dk.M.Entity(([URE[1], URE[3], UFE["ID"], (UFE["name"].length > 10 ? UFE["name"].substr(0, 10) + "..." : UFE["name"]), UFE["name"], UFE["type"].toLowerCase(), URE[0], new Date(), URE[2], 9999.0000, null, UTE["GroupID"], 1, UFE["name"]])); //添加目录
-    //    (_UGE[2] || US.userinfo.UserId != _UGE[1][2]) && (_$(_UKE).Add({ "UserId": _UIF.UserId, "UserNickName": _UIF.UserNickName, "UserName": _UIF.UserName, "UserThumbnailImageHead": _UIF.UserThumbnailImageHead })); _UGE[0].push(_UKE); //修改文件目录
+    //    (_UGE[2] || US.userInfo.userid != _UGE[1][2]) && (_$(_UKE).Add({ "UserId": _UIF.UserId, "UserNickName": _UIF.UserNickName, "UserName": _UIF.UserName, "UserThumbnailImageHead": _UIF.UserThumbnailImageHead })); _UGE[0].push(_UKE); //修改文件目录
     //    if (_UGE[2]) { _UIF.FileSize = U.UP.FileSize((U.UP.GetSfileS(_UIF.FileSize) + UFE["size"])); U.Dk.M.AddUserHBImage(UFE["ID"], _UKE); } //上传头像或者背景图
-    //    if (!TF) { U.Dk.RE.ARFO(_UKE); U.Dk.LE.DBC(UFE["ID"], US.userinfo.UserId); U.Dk.onloadLeft(); } //添加文件
-    //    if (!UTE.GroupID) { U.D.BC.SetNews[new U.D.T.CII([URE[1], US.userinfo.UserId, US.userinfo.UserNickName, US.userinfo.UserThumbnailImageHead, "UD_DiskCon", UFE["ID"], UFE["name"], new Date(), _UKE]], true); } //公共信息提示
+    //    if (!TF) { U.Dk.RE.ARFO(_UKE); U.Dk.LE.DBC(UFE["ID"], US.userInfo.userid); U.Dk.onloadLeft(); } //添加文件
+    //    if (!UTE.GroupID) { U.D.BC.SetNews[new U.D.T.CII([URE[1], US.userInfo.userid, US.userinfo.UserNickName, US.userinfo.UserThumbnailImageHead, "UD_DiskCon", UFE["ID"], UFE["name"], new Date(), _UKE]], true); } //公共信息提示
     //    return _UKE;
 }
 
@@ -539,7 +539,7 @@ U.Dk.LL.TD = function (UDOD) {
 
 //切换到网盘首页
 U.Dk.LL.TDQH = function (UDOD) {
-    U.Dk.NologinDiskDown(US.userinfo.UserId || US.NU, US.DG);
+    U.Dk.NologinDiskDown(US.userInfo.userid || US.NU, US.DG);
     U.M.StopBubble();
 }
 
@@ -612,7 +612,7 @@ U.Dk.VW.LV = function (UDE, UDOD) {
 U.Dk.VW.CLV = function (UDE, UDOD) {
     var i, _UDID, _UDTD, _UDSD, _UDMD, _UKE = ["UDK_L_USTreeFolderIcon", ""], userid = US.Disk.UserDisk[1][0].UserId, _UDFD = $$("frag");
     for (i = 0; i < UDE.length; i++) {
-        if (US.userinfo.UserId == userid || !UDE[i].UserDirectoryEncrypt) {
+        if (US.userInfo.userid == userid || !UDE[i].UserDirectoryEncrypt) {
             _UDID = UDE[i].UserDirectoryID; (UDE[i].UserDirectoryEncrypt) && (_UKE[0] = "UDK_L_USTreeFolderEncryptIcon", _UKE[1] = "(已加密)");
             _UDTD = $$("div", { "classNmae": "UDK_L_USTreecontainA", "onclick": [[U.M.StopBubble], [U.Dk.LL.UDKURL, [_UDID]], [U.Dk.LE.DBC, [_UDID, userid]]] }, _UDFD);
             _UDSD = $$("div", { "className": "UDK_L_USTTitle", "onclick": [U.Dk.LL.SM, ["retElement", userid, _UDID]] }, _UDTD);
@@ -645,7 +645,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 ////是否具有上传权限
 //U.Dk.HP.AUD = function () {
 //    var _UGE = US.Disk.UserDisk[1], _UDOD = $("div#UDK_RS_directoryCommandArea", _UGE[3])[0]; _UDOD.innerText = "";
-//    if (US.userinfo.UserId == _UGE[0].UserId) {
+//    if (US.userInfo.userid == _UGE[0].UserId) {
 //        $$("div", { "className": "UDK_L_DiskGE UDK_B_C UDK_B_CreateDirButton", "onclick": [[U.M.StopBubble], [U.Dk.RE.CMB, ["folder"]]] }, _UDOD);
 //        $$("div", { "id": "UDK_HP_UpFile", "className": "UDK_L_DiskGE UDK_B_C UDK_B_UpFileButton", "onclick": [[U.M.StopBubble], [U.Dk.UP.FUW, ["UDK_UpFlie", _UGE[0].UserId]]] }, _UDOD);
 //    }
@@ -824,7 +824,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 ////最新动态切换
 //U.Dk.DI.SDFN = function (UDID, UDOD, UP, userid) {
 //    userid = userid || US.NU; UDID = UDID || US.NU; var _UDTD = U.Dk.DI.UDSD = $("div#UDK_LPINew", UDOD)[0], _UDPD = _UDTD.parentNode, _UDSD = $("span", _UDPD)[0], _UDMD = $("div", _UDPD)[0];
-//    _UDTD.innerText = ""; _UDSD.onclick = U.M.apply(_UDSD, [[U.Dk.NologinDiskDown, (['', UDID, ''])]]); _UDMD.onclick = U.M.apply(this, [[U.Dk.NologinDiskDown, ([US.userinfo.UserId || US.NU, UDID, ''])]]); //按钮事件赋值
+//    _UDTD.innerText = ""; _UDSD.onclick = U.M.apply(_UDSD, [[U.Dk.NologinDiskDown, (['', UDID, ''])]]); _UDMD.onclick = U.M.apply(this, [[U.Dk.NologinDiskDown, ([US.userInfo.userid || US.NU, UDID, ''])]]); //按钮事件赋值
 //    U.Dk.DI.DFN(UDID, UP, userid, _UDTD, UDOD); UDOD.onscroll = U.M.SSCH({ 'AF': U.M.apply(null, [[U.Dk.DI.SFND, [UDID, userid, _UDTD, UDOD]]]) }).SCH(); //设置数据加载
 //}
 
@@ -852,7 +852,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 
 ////添加网盘动态数据
 //U.Dk.DI.DTSJ = function (UDE) {
-//    var i, _UAE = [], userid = US.userinfo.UserId || US.NU;
+//    var i, _UAE = [], userid = US.userInfo.userid || US.NU;
 //    for (i = 0; i < UDE.length; i++) { if (UDE[i].NEWTYPE == "UD_DiskCon") { _UAE.push(UDE[i]); } }
 //    U.Dk.M.AddPND[userid, "", 1, _UAE];
 //}
@@ -909,7 +909,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 //    if (U.Dk.RE.MBC(DID, _UDI[0].value, _T, "Create") && U.MS.Website(_UDI[1].value.trim())) {//判断文件是否及格
 //        var _FSN = _UDI[0].value.length > 15 ? _UDI[0].value.substring(0, 10) + "..." : _UDI[0].value; //文件简写名
 //        var _DKE = new U.Dk.M.Entity[U.MS.produceGuid(), 0, DID, _UDI[0].value, _FSN, _T, _UDI[1].value, new Date(), U.UP.FFT(_T)[1], 9999.000, null, null, 1];
-//        U.A.Request(US.Auth,"UseStudioDisk.addDirectoryOrFile", [US.userinfo.UserId, DID, _DKE["UserDirectoryID"], _DKE["UserFilesServerName"], _UDI[0].value, _T, 9999, "", ""], U.Dk.RE.AsynAF, ["", _DKE]);
+//        U.A.Request(US.Auth,"UseStudioDisk.addDirectoryOrFile", [US.userInfo.userid, DID, _DKE["UserDirectoryID"], _DKE["UserFilesServerName"], _UDI[0].value, _T, 9999, "", ""], U.Dk.RE.AsynAF, ["", _DKE]);
 //    }
 //}
 
@@ -956,9 +956,9 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 //            if (_UTF == "ue" || _UTF == "uw") { //下载web word excel
 //                U.Alert("云office暂不提供下载");
 //                //if (browser.msie) { parent.U.A.Request(US.Auth,"UseStudioDisk.GetFileContent", [UDID], U.Dk.RE.AsynXZ, ["", UN]); U.Alert("正在加载下载页"); } //IE的下载方式
-//                //else { U.UP.uploading([$$("input", { "type": "text", "value": USN, "name": "filename" }), $$("input", { "type": "text", "value": UN + ".htm", "name": "filepath" }), $$("input", { "type": "text", "value": US.userinfo.UserId, "name": "UserId" })], null, null, "http://disk.1473.cn/UseStudiodisk.ashx?functionname=UseStudioDisk.UploadFile", false); } //调用上传的接口实现下载
+//                //else { U.UP.uploading([$$("input", { "type": "text", "value": USN, "name": "filename" }), $$("input", { "type": "text", "value": UN + ".htm", "name": "filepath" }), $$("input", { "type": "text", "value": US.userInfo.userid, "name": "UserId" })], null, null, "http://disk.1473.cn/UseStudiodisk.ashx?functionname=UseStudioDisk.UploadFile", false); } //调用上传的接口实现下载
 //            }
-//            else { window.open("/userpages/UD_XZ.aspx?fileservername=" + USN + "&filename=" + UN + "&UserId=" + US.userinfo.UserId + "&usrd=" + Math.random()); }
+//            else { window.open("/userpages/UD_XZ.aspx?fileservername=" + USN + "&filename=" + UN + "&UserId=" + US.userInfo.userid + "&usrd=" + Math.random()); }
 //        }
 //    }
 //}
@@ -1035,13 +1035,13 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 ////右键菜单的显示
 //U.Dk.RM.VHIDDEN = function (UAE) {
 //    var i, _UGE = US.Disk.UserDisk[1], _UDAD = $("p", _UGE[3]), _UDE = ["UDK_LR_CP", "UDK_R_openfolder", "UDK_R_openanddownload", "UDK_R_refreshDirectoryButton", "UDK_R_attribute", "UDK_LR_Normal", "UDK_LR_Details", "UDK_LR_TL", "UDK_R_divModifyButton", "UDK_R_divDeleteButton", "UDK_R_encryptwindow", "UDK_R_addFolderButton", "UDK_R_addWordButton", "UDK_R_addXlsButton", "UDK_R_addPPTButton", "UDK_LR_S", "UDK_LR_Cut"];
-//    for (i = 0; i < _UDE.length; i++) { if (US.userinfo.UserId == _UGE[0].UserId || i < 8) { _UDAD[_UDE[i]].parentNode.style.display = UAE[i]; } }
+//    for (i = 0; i < _UDE.length; i++) { if (US.userInfo.userid == _UGE[0].UserId || i < 8) { _UDAD[_UDE[i]].parentNode.style.display = UAE[i]; } }
 //}
 
 ////右键查单赋予事件
 //U.Dk.RM.SLM = function (UAE) {
 //    var i, _UGE = US.Disk.UserDisk[1], _UDAD = $("p", _UGE[3]), _UDE = ["UDK_R_openfolder", "UDK_LR_CP", "UDK_R_attribute", "UDK_R_openanddownload", "UDK_LR_TL", "UDK_R_encryptwindow", "UDK_R_divModifyButton", "UDK_R_divDeleteButton", "UDK_LR_Cut"];
-//    for (i = 0; i < _UDE.length; i++) { if (US.userinfo.UserId == _UGE[0].UserId || i < 5) { _UDAD[_UDE[i]].onclick = U.M.apply(this, [UAE[i]]); } }
+//    for (i = 0; i < _UDE.length; i++) { if (US.userInfo.userid == _UGE[0].UserId || i < 5) { _UDAD[_UDE[i]].onclick = U.M.apply(this, [UAE[i]]); } }
 //}
 
 //_$(U.Dk).Add({ "Ism": false, "CSH": [] });
@@ -1072,7 +1072,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 //    var _UDOD, _UDTD, _UDE = US.Disk.Disks[userid]; //获取用户Disk资料
 //    if (_UDE && _UDE[1]) { _UDOD = _UDE[1][3].parentNode; }
 //    else {
-//        if (userid == US.NU) { if ((_UDTD = $("#UseStudioUserDiskDiv" + (userid = (US.userinfo.UserId || US.NU)))[0])) { _UDOD = _UDTD; } } //首页的克隆方式
+//        if (userid == US.NU) { if ((_UDTD = $("#UseStudioUserDiskDiv" + (userid = (US.userInfo.userid || US.NU)))[0])) { _UDOD = _UDTD; } } //首页的克隆方式
 //        if (!_UDOD) {
 //            _UDOD = $("#UseStudioUserDiskDiv").addAttrArray({ "style": { "width": "95%", "height": "75%"} })[0]; //获取克隆的实体
 //            _UDOD = _UDOD.cloneNode(true); parent.$("body", document)[0].appendChild(_UDOD); //添加到桌面
@@ -1097,8 +1097,8 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 //-----------------------------------------------------------------------共享网络硬盘区域--------------------------------------------------------------
 ////网络硬盘数据共享区域
 //U.Dk.DiskTC = function (UDID, userid, TF) {
-//    var _UDOD = U.Dk.DiskDown(US.userinfo.UserId || US.NU, "", TF), _UDAD = $("div", _UDOD), _UDSD = $("span", _UDAD["UDK_LPIcon"].parentNode)[0];
-//    _UDSD.style.display = US.userinfo.UserId ? "block" : "none"; //是否显示陌生人查看
+//    var _UDOD = U.Dk.DiskDown(US.userInfo.userid || US.NU, "", TF), _UDAD = $("div", _UDOD), _UDSD = $("span", _UDAD["UDK_LPIcon"].parentNode)[0];
+//    _UDSD.style.display = US.userInfo.userid ? "block" : "none"; //是否显示陌生人查看
 //    U.Dk.HP.NCW(_UDOD); //位置调整
 //    U.Dk.DI.CM(UDID, _UDAD["UDK"], userid); //根据DID选择页面
 //    U.D.G.UrlWrite("disk", "有思硬盘"); //Url重写
@@ -1125,10 +1125,10 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 //    if (_UDE) {//正在获取或者存在数据
 //        if (_UDE.length) {//存在数据
 //            US.Disk.UserDisk = _UDE; _UDE[1][1] = UDID; U.Dk.HP.CW(); U.Dk.onloadfunction(); //生成Disk
-//            if (US.userinfo.UserId == _UDE[1][2]) { _UDE[1][0] = US.userinfo; U.Dk.M.refreshfile(); } //刷新网盘
+//            if (US.userInfo.userid == _UDE[1][2]) { _UDE[1][0] = US.userinfo; U.Dk.M.refreshfile(); } //刷新网盘
 //        }
 //    }
-//    else { U.Dk.HP.CW(UDOD); US.Disk.Disks[userid] = []; U.A.Request(US.Auth,"UseStudioDisk.Commonresource", [US.userinfo.UserId || US.NU, userid]), U.Dk.onloadup, [UDOD, userid, UDID]; } //获取用户资料
+//    else { U.Dk.HP.CW(UDOD); US.Disk.Disks[userid] = []; U.A.Request(US.Auth,"UseStudioDisk.Commonresource", [US.userInfo.userid || US.NU, userid]), U.Dk.onloadup, [UDOD, userid, UDID]; } //获取用户资料
 //}
 
 ////加载音乐文件
@@ -1146,7 +1146,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 //        U.Dk.M.refreshfile(); //更新资料
 //        U.Dk.onloadAjax(_UGE[1][1], _userid); //装载网络硬盘。
 //        U.Dk.onloadfunction(); //加载显示的文件
-//        if (US.userinfo.UserId == _UGE[1][0].UserId) { U.D.ZYXB(0); } //用户指引
+//        if (US.userInfo.userid == _UGE[1][0].UserId) { U.D.ZYXB(0); } //用户指引
 //        for (i = 0; i < U.Dk.CSH.length; i++) { U.Dk.CSH[i](_userid, _UDID); } //初始化
 //    }
 //}
@@ -1177,7 +1177,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 ////用户登录视图
 //U.Dk.onloadAjax = function (UDID, userid) {
 //    var _UDAD, _UGE = US.Disk.UserDisk[1]; U.Dk.onloadLeft(_UGE[1]); //用户视图展示
-//    if (US.userinfo.UserId == _UGE[2]) {
+//    if (US.userInfo.userid == _UGE[2]) {
 //        _UDAD = $("div", _UGE[3]);
 //        U.Dk.SetDF(US.Friend[1], _UDAD["UDK_LL_F"]); //用户好友
 //        U.Dk.SetDF(US.Friend[2], _UDAD["UDK_LL_Group"]); //群
@@ -1201,7 +1201,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 //U.Dk.SetDF = function (UDE, UDOD) {
 //    var i, _UDTD, _UDFD = $$("frag"); UDOD.innerHTML = "";
 //    for (i = 0; i < UDE.length; i++) {
-//        _UDTD = $$("div", { "className": "UDK_LL_HYXZ", "onclick": UDE[i].GroupManageID ? [[U.Dk.LE.DBC, [UDE[i].GroupManageID, US.userinfo.UserId]]] : [[U.M.StopBubble], [U.M.divdoubleClick, ["UseStudioUserDiskDiv", US.DG, UDE[i].UserId, null]]] }, _UDFD);
+//        _UDTD = $$("div", { "className": "UDK_LL_HYXZ", "onclick": UDE[i].GroupManageID ? [[U.Dk.LE.DBC, [UDE[i].GroupManageID, US.userInfo.userid]]] : [[U.M.StopBubble], [U.M.divdoubleClick, ["UseStudioUserDiskDiv", US.DG, UDE[i].UserId, null]]] }, _UDFD);
 //        if (UDE[i].GroupManageID) { _UDTD.appendChild(U.Dk.PGroup(UDE[i])); }
 //        else { $$("img", { "onerror": U.M.ImgError, "src": U.M.GetImgU(UDE[i].UserThumbnailImageHead), "title": "聊天", "className": "UDK_LL_HYImg", "onclick": [[U.M.StopBubble], [U.F.W.DMW, [UDE[i]]]] }, _UDTD); }
 //        $$("span", { "className": "UDK_LL_HYName", "innerHTML": UDE[i].FriendsDescript || UDE[i].GroupManageName, "title": "查看网盘" }, _UDTD);
@@ -1212,7 +1212,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 ////用户群
 //U.Dk.PGroup = function (UDE) {
 //    var i, j, k = 0, _UDOD, _UDTD, _UAE = _$(US.Friend[3]).Select({ "GroupManageID": UDE.GroupManageID }, null, 9), _UIF = _UAE.length == 1 ? 1 : _UAE.length < 5 ? 2 : 3;
-//    US.Disk.UserDisk[0].splice(6, 0, new U.Dk.M.Entity[UDE.GroupManageID, 0, US.userinfo.UserID, UDE.GroupManageName, UDE.GroupManageName, "folder", null, U.MT.formatDateToArray(new Date()), U.UP.FFT("folder")[1], 1, null, null, 0, "", UDE.GroupManageID]); //新建实体
+//    US.Disk.UserDisk[0].splice(6, 0, new U.Dk.M.Entity[UDE.GroupManageID, 0, US.userInfo.userid, UDE.GroupManageName, UDE.GroupManageName, "folder", null, U.MT.formatDateToArray(new Date()), U.UP.FFT("folder")[1], 1, null, null, 0, "", UDE.GroupManageID]); //新建实体
 //    _UDOD = $$("div", { "className": "UDK_LL_HYImg", "onclick": [[U.M.StopBubble], [U.F.W.DGMW, [UDE]]] }); //打开群
 //    for (i = 0; i < _UIF; i++) { _UDTD = $$("div", { "style": { "width": "100%", "height": Math.floor(40 / _UIF) + "px"} }, _UDOD); for (j = 0; j < _UIF; j++) { if (_UAE[k]) { $$("img", { "onerror": U.M.ImgError, "src": U.M.GetImgU(_UAE[k].UserThumbnailImageHead), "style": { "width": Math.floor(40 / _UIF) + "px", "height": Math.floor(40 / _UIF) + "px"} }, _UDTD); k++; } else { break; } } } //生成群头像
 //    return _UDOD;
@@ -1231,7 +1231,7 @@ U.Dk.VW.CLV = function (UDE, UDOD) {
 
 ////用户提示
 //U.Dk.UTS = function (UTS, UDOD) {
-//    if (US.Disk.UserDisk[1][0].UserId == US.userinfo.UserId || U.M.GTPN("UseStudioUserDiskDiv" + US.userinfo.UserId, UDOD)) { U.Dk.DiskOperatingSwitch(US.userinfo.UserId); if (UTS[2]) { U.F.M.FAW("fg"); U.Alert(UTS[0]); return false; } return true; }
+//    if (US.Disk.UserDisk[1][0].UserId == US.userInfo.userid || U.M.GTPN("UseStudioUserDiskDiv" + US.userInfo.userid, UDOD)) { U.Dk.DiskOperatingSwitch(US.userInfo.userid); if (UTS[2]) { U.F.M.FAW("fg"); U.Alert(UTS[0]); return false; } return true; }
 //    else { U.Alert(UTS[1]); return false; }
 //}
 
@@ -1323,7 +1323,7 @@ U.Dk.RE.SZQX = function () {
     if (_UDRD.length > 1 && _UDRD[0].UserDirectoryEncrypt != "true" && _UDRD[_UDRD.length - 1].GroupID != null) { _ITF = ["是否<span style='color:red;'>设置</span>文件夹权限", "encrypt", "true"]; } //设置文件夹权限
     else {
         if (_UDRD[0].UserDirectoryEncrypt == "true") { _ITF = ["是否<sapn style='color:red;'>解除</sapn>文件夹权限", "unencrypted", null]; } //解除文件夹权限
-        else if (_UGE[1][2] == US.userinfo.UserId && _UDRD.length > 1) { //用户设置权限
+        else if (_UGE[1][2] == US.userInfo.userid && _UDRD.length > 1) { //用户设置权限
             if (_UDRD[0].GroupID != US.NU) { _ITF = ["是否<span style='color:red;'>设置</span>文件夹共享", US.NU]; } //设置文件夹共享
             else { _ITF = ["是否<span style='color:red;'>解除</span>文件夹共享", US.NU]; } //取消文件共享
         }
@@ -2277,7 +2277,7 @@ U.Dk.RE.SZQX = function () {
 
 //获取到该用户端额同类型文件,传入用户ID,和要显示的类型,比如‘图像文件’、‘视频文件’,以数据库的UseStudioFileType表为标准
 //U.Dk.directorySameTypeAjax = function (userId, sort) {
-//    if (US.userinfo.UserId != U.Dk.UserGuid) return;
+//    if (US.userInfo.userid != U.Dk.UserGuid) return;
 //    var json = U.A.Request('UseStudioDisk.directorySameTypeTable', [userId, sort]).value;
 //    if (json != "" && json != null && json != undefined) return eval(json);
 //    return;
@@ -2328,7 +2328,7 @@ U.Dk.RE.SZQX = function () {
 U.Dk.popFileUplaodWindow = function (_type) {
     var filewindow = $("#UDK_RS_uploadFileDiv")[0];
     var loadFile = $("iframe", filewindow)[0];  //获取上传的iframe
-    var _address = "http://disk.1473.cn/USupfile.ashx?UserId=" + parent.US.userinfo.UserId + "&iframename="; //上传地址,统一定义,下面拼凑。
+    var _address = "http://disk.1473.cn/USupfile.ashx?UserId=" + parent.US.userInfo.userid + "&iframename="; //上传地址,统一定义,下面拼凑。
     switch (_type) {
         case US.DG:
             var _url = _address + "UploadFlashfile&DirectoryId=" + US.Disk.UserDisk[1][1];
@@ -2567,7 +2567,7 @@ U.Dk.AddNextM = function (ML, DK) {
 
 ////返回到我的首页
 //U.Dk.DI.MyDisk = function (T) {
-//    if (U.U.L.isLogin() == false) { U.M.divdoubleClick("UseStudioUserDiskDiv", T, US.userinfo.UserId); } //未登录弹出登录框,登录则返回到我的首页。
+//    if (U.U.L.isLogin() == false) { U.M.divdoubleClick("UseStudioUserDiskDiv", T, US.userInfo.userid); } //未登录弹出登录框,登录则返回到我的首页。
 //}
 
 ////--------------------------------------------------------------------------网盘数据---------------------------------------------------------------------------
@@ -2864,8 +2864,8 @@ U.Dk.M.ufinfoarray = function (name, term) {//term这个最终传过来是个集
     //            return U.Dk.M.PDQX(term);
     //            break;
     //    }
-    //    if (US.userinfo.UserId == null) { return; } //无权限操作下面的
-    //    U.Dk.DiskOperatingSwitch(US.userinfo.UserId); //修改的是用户本人的资料 这个换回自己的资料
+    //    if (US.userInfo.userid == null) { return; } //无权限操作下面的
+    //    U.Dk.DiskOperatingSwitch(US.userInfo.userid); //修改的是用户本人的资料 这个换回自己的资料
     //    switch (name) {
     //        case "add": //添加文件或者文件夹
     //            U.Dk.M.addfindfile(term);
@@ -3081,13 +3081,13 @@ U.Dk.M.ufinfoarray = function (name, term) {//term这个最终传过来是个集
 
 //首页网盘切换
 U.Dk.DI.SYWPQH = function (UDOD, ITF) {
-    return U.U.L.SYDLHD(U.M.apply(this, [[U.D.DT.YYDK, (["Disk", { "userid": US.userinfo.UserId, "directoryid": ITF == 1 ? 1 : 2}])]]));
+    return U.U.L.SYDLHD(U.M.apply(this, [[U.D.DT.YYDK, (["Disk", { "userid": US.userInfo.userid, "directoryid": ITF == 1 ? 1 : 2}])]]));
 }
 
 //个人网盘内容分页查看
 U.Dk.DI.GRWPQHJ = function (UDOD, UP) {
     var _UDE,
-    _userid = US.userinfo.UserId,
+    _userid = US.userInfo.userid,
      _UGE = U.Dk.DiskOperatingSwitch(_userid);
     (UP == 1) && (UDOD.innerText = "");
     if (_UGE) {//打印资料
@@ -3100,7 +3100,7 @@ U.Dk.DI.GRWPQHJ = function (UDOD, UP) {
             }
         }
         else if (UP == 1) {
-            U.Dk.VW.XWPDYXK(UDOD, { "className": "UD_SYWRZFO", "onclick": [[U.D.DT.YYDK, ["Disk", { "userid": US.userinfo.UserId, "directoryid": US.FG}]], [U.Dk.UP.XWPOP, [US.userinfo.UserId]]] });
+            U.Dk.VW.XWPDYXK(UDOD, { "className": "UD_SYWRZFO", "onclick": [[U.D.DT.YYDK, ["Disk", { "userid": US.userInfo.userid, "directoryid": US.FG}]], [U.Dk.UP.XWPOP, [US.userInfo.userid]]] });
         }; //打印数据
     }
     else {
@@ -3123,7 +3123,7 @@ U.Dk.LTWP = function (UDID, UDE) {
     _diskcontentdiv, //disk操作内容区域的元素
     _diskdiv, //disk整体元素
     _dirid = dirid, //目录id
-    _loginuserid = US.userinfo.UserId || US.NU, //当前使用用户id
+    _loginuserid = US.userInfo.userid || US.NU, //当前使用用户id
     _diskinfo = U.Dk.DiskOperatingSwitch(userid);    //获取网盘信息
 
     //获取网盘弹框
@@ -3304,7 +3304,7 @@ U.Dk.M.refreshfile = function () {
         _UDE[i].Parent = _UGE[4][_UDE[i].UserDirectoryParentID]; _UGE[3][_UDE[i].filetype ? "file" : "folder"].push(_UDE[i]);
     }
     _$(_UGE[1][0]).Change({ "FileSize": _UCZ, "FilesCount": _UWJ, "DHID": _UAE["HID"], "BHID": _UAE["BID"], "UserDiskND": _UAE["LID"], "DiskHeadImg": _UAE["BE"], "UserBImage": _UAE["UE"] });
-    (US.userinfo.UserId == _UGE[1][2]) && (US.userinfo.DHID = _UAE["HID"], US.userinfo.BHID = _UAE["BID"], US.userinfo.DiskHeadImg = _UAE["BE"], US.userinfo.UserBImage = _UAE["UE"]);
+    (US.userInfo.userid == _UGE[1][2]) && (US.userinfo.DHID = _UAE["HID"], US.userinfo.BHID = _UAE["BID"], US.userinfo.DiskHeadImg = _UAE["BE"], US.userinfo.UserBImage = _UAE["UE"]);
 }
 
 
@@ -3318,10 +3318,10 @@ U.Dk.DI.ZMCSHWP = function (UDE) {
     for (i = 0; i < _UAE.length; i++) {
         U.D.SY["ZMWPZX" + _UAE[i][0]](UDE, $("#" + _UAE[i][1])[0]);
     } //查看
-    _UDAD[1].onclick = U.M.apply(_UDAD[1], [[U.U.L.SYDLHD, [U.M.apply(_UDAD[1], [[U.Dk.UP.SCXWPOP, [_UDAD[1], { "ID": "UD_SYWRTSO", "DS": true }, US.userinfo.UserId])]])]]];
+    _UDAD[1].onclick = U.M.apply(_UDAD[1], [[U.U.L.SYDLHD, [U.M.apply(_UDAD[1], [[U.Dk.UP.SCXWPOP, [_UDAD[1], { "ID": "UD_SYWRTSO", "DS": true }, US.userInfo.userid])]])]]];
     _UDAD = $(_UDAD[0]).Child();
     for (i = 0; i < _UDAD.length; i++) {
-        _UDAD[i].onclick = U.M.apply(_UDAD[i], [[U.M.StopBubble], [U.U.L.SYDLHD, [U.M.apply(_UDAD[i], [[U.D.DT.YYDK, ["Disk", { "userid": US.userinfo.UserId, "directoryid": i}])]])]]];
+        _UDAD[i].onclick = U.M.apply(_UDAD[i], [[U.M.StopBubble], [U.U.L.SYDLHD, [U.M.apply(_UDAD[i], [[U.D.DT.YYDK, ["Disk", { "userid": US.userInfo.userid, "directoryid": i}])]])]]];
     } //添加点击事件
 }
 
@@ -3448,7 +3448,7 @@ U.Dk.DI.QHSPCK = function (UTF, UDOD) {
             _UDAD[_UTF]("UD_SYSXSZCVLOS", i);
             _UDCD[_UTF]("UD_SYSXSZCVLOI" + (i ? "O" : "") + "T");
         }
-        U.D.SY.ET["UL"]["WS"][5] = UTF ? US.userinfo.UserId : "";
+        U.D.SY.ET["UL"]["WS"][5] = UTF ? US.userInfo.userid : "";
         U.Dk.DI.SYWPQHFY(1, UDOD); //网盘滚动分页
     }
 }
@@ -3532,7 +3532,7 @@ U.Dk.VW.DBCK = function (UDOD, UTF) {
 //U.Dk.M.refreshfile = function (filesinfo, UAE, diskinfo) {
 //    diskinfo = diskinfo || US.Disk.UserDisk;
 //    var i, _UTP, _UDID, _UPID, _UMN, _UCE, _UTP,
-//    _UIF = US.userinfo.UserId == diskinfo[1][2] ? (diskinfo[1][0] = US.userinfo) : null, _UIE = diskinfo[1][0];
+//    _UIF = US.userInfo.userid == diskinfo[1][2] ? (diskinfo[1][0] = US.userinfo) : null, _UIE = diskinfo[1][0];
 //    if ((_UIE.DHID == null || (UAE[0] && UAE[0].length)) && UAE[2]) {
 //        _UCE = { FileSize: UAE[2].FileSize, FilesCount: UAE[2].FileCount, DHID: "", BHID: "", LID: [], UserDiskND: [], DiskHeadImg: [], UserBImage: [] }; U.Ut.AddObj(_UIE, _UCE); UAE = UAE[0];
 //    }  //(_UIF) && (_$(_UIF).Add(_UCE));

+ 3 - 3
js/UD.Disk/U.DK.DI.js

@@ -46,7 +46,7 @@ U.Dk.DI.SYWPQHJ = function (UDOD, UP, UTF, UDID, UTP) {
         UDOD = UDOD || $("#UD_SYSXZBJO")[0];
         var _UCE,
         _UDPD = $(UDOD).Parent({ usbody: "true" }),
-        _userid = UTF ? US.NU : US.userinfo.UserId,
+        _userid = UTF ? US.NU : US.userInfo.userid,
         _UDAD = $(_UDPD).Child(),
         _UGE = U.D.SY.ET["UL"]["WS"];
         //  _UGE[5] = UDID = UDID || US.NU;
@@ -57,7 +57,7 @@ U.Dk.DI.SYWPQHJ = function (UDOD, UP, UTF, UDID, UTP) {
                 U.Dk.DI.DiskSYN(UDOD, _UCE[0]); (UDOD.offsetHeight > 0 && _UDPD.offsetHeight >= _UDPD.scrollHeight) && (U.Dk.DI.SYWPQHJ(UDOD, UP + 1, UTF, UDID));
             }
             else if (UP == 1) {
-                U.Dk.VW.XWPDYXK(UDOD, { "className": "UD_SYWRZFO", "onclick": [[U.D.DT.YYDK, ["Disk", { "userid": US.userinfo.UserId, "directoryid": US.FG}]]] });
+                U.Dk.VW.XWPDYXK(UDOD, { "className": "UD_SYWRZFO", "onclick": [[U.D.DT.YYDK, ["Disk", { "userid": US.userInfo.userid, "directoryid": US.FG}]]] });
             }
         } //打印网盘资料
         else {
@@ -98,7 +98,7 @@ U.Dk.DI.DiskSYN = function (UDOD, UDE) {
     var i, j, _UTF, _UTP, _UDTD, _UDWD, _UDND, _UDSD, _UDMD, _UDKD, _UEN, _USN, _USIN,
     _USI = $(UDOD).Child().length ? 0 : U.P.RandomRange(10, 25),
     _UAE = ["打开", "云盘", "评论", "下载"],
-    _userid = US.userinfo.UserId,
+    _userid = US.userInfo.userid,
     _UDAD = $(UDOD).Child(),
     _UW = $(UDOD).Parent(2).offsetWidth,
     _UIF = Math.floor((_UW - 90) / 198) || 1,

+ 3 - 3
js/UD.Disk/U.DK.HP.js

@@ -171,7 +171,7 @@ U.Dk.HP.WPCZQXHQ = function (dirid, diskinfo, fileinfo) {
         dirid = diskinfo[1][1];
     }
 
-    var _userid = US.userinfo.UserId,
+    var _userid = US.userInfo.userid,
         _permis = U.Dk.HP.ZDQXWPHQ(dirid, diskinfo); //判断是否具有添加网盘的操作权限 判断是否有添加的权限 和 获取的权限
 
     //根据上面调用的函数返回的目录的信息,如果没有返回说明操作的不是目录
@@ -279,13 +279,13 @@ U.Dk.HP.WPTDSY = function (UDOD, UCB) {
 */
 U.Dk.HP.FileSwitch = function (UDID, UTF, UDE, UP) {
     var _UXY = U.M.GetMousep(),
-    _UGE = U.Dk.DiskOperatingSwitch(US.userinfo.UserId),
+    _UGE = U.Dk.DiskOperatingSwitch(US.userInfo.userid),
     _UME = $("body").GetElementInfo(),
     _UDOD = $$("div", { "className": "UD_SYQZOCC" }),
     _UDTD = $$("div", { "className": "UD_SYQZOCCL", "style": { "border": "0"} }, _UDOD),
     _UDSD = $$("div", { "className": "UD_SYQZOCCLH" }, _UDTD);
 
-    _UDSD.onmousedown = U.M.apply(_UDSD, [[U.Dk.UP.SCXWPOP, [_UDSD, { "GS": "UP", "FCP": UDE.FCP, "URL": "http://main.1473.cn/USupfile.ashx?iframename=UseStudioEditor", "ID": Guid.newGuid() }, US.userinfo.UserId, true]]]);
+    _UDSD.onmousedown = U.M.apply(_UDSD, [[U.Dk.UP.SCXWPOP, [_UDSD, { "GS": "UP", "FCP": UDE.FCP, "URL": "http://main.1473.cn/USupfile.ashx?iframename=UseStudioEditor", "ID": Guid.newGuid() }, US.userInfo.userid, true]]]);
 
     $$("span", { "innerHTML": "↑" }, _UDSD);
     $$("span", { "className": "UD_SYQZOCCLO", "innerHTML": "本地上传" }, _UDSD);

+ 10 - 10
js/UD.Disk/U.DK.LE.js

@@ -20,7 +20,7 @@ Namespace.register("U.Dk.LE"); //Disk左键事件命名空间
 U.Dk.LE.OpenFileDirectory = function (fileinfo, userid) {
     var i, _pictureinfo, _extension, _rightClick, _head, _navArea, _uploadel, _navarray;
     var _content;
-    var _userid = userid || US.userinfo.UserId; //得到用户id
+    var _userid = userid || US.userInfo.userid; //得到用户id
     var _diskinfo = U.Dk.DiskOperatingSwitch(_userid); //根据用户id找到其所有硬盘数据。
 
     //如果为文件,则直接打开文件,否则,是目录,打开目录
@@ -130,7 +130,7 @@ U.Dk.LE.ApplyDnsEnd = function (UDID) {
 //申请域名判断
 U.Dk.LE.aDomain = function (userid, UGE) {
     if (!U.U.L.isLogin(3)) { //登录使用
-        var _UDID = UGE[1][1], _UUID = US.userinfo.UserId;
+        var _UDID = UGE[1][1], _UUID = US.userInfo.userid;
         if (UGE[4][_UDID].UserId == _UUID || userid == _UUID) { //本人ftp群文件夹允许
             var _UDE = U.Dk.DiskOperatingSwitch(userid);
             (_UDE[1][1]) && (U.UI.Confirm("是否申请域名生成站点", [U.Dk.LE.aDnsF, [_UDE[1][1]]])); //当前目录申请
@@ -141,8 +141,8 @@ U.Dk.LE.aDomain = function (userid, UGE) {
 
 //判断当前目录是否生成域名解析
 U.Dk.LE.GetDns = function (UDID, UCB) {
-    //U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_S_CountDns", US.userinfo.UserId, UDID], U.Dk.LE.AsynGetDns, ["", UDID, UCB]);
-    //  U.A.Request(US.Auth,"UseStudioDisk.CountDns", [US.userinfo.UserId, UDID], U.Dk.LE.AsynGetDns, ["", UDID, UCB]);
+    //U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_S_CountDns", US.userInfo.userid, UDID], U.Dk.LE.AsynGetDns, ["", UDID, UCB]);
+    //  U.A.Request(US.Auth,"UseStudioDisk.CountDns", [US.userInfo.userid, UDID], U.Dk.LE.AsynGetDns, ["", UDID, UCB]);
 }
 
 ///获取dns解析次数异步
@@ -167,9 +167,9 @@ U.Dk.LE.aDnsF = function (UDID) {
 
 //确定申请域名
 U.Dk.LE.eaDomain = function (UDID, UDOD) {
-    //U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_I_AddDns", US.userinfo.UserId, UDID, 0], U.Dk.LE.AsyneaDomain, ["", UDID, UDOD]);
+    //U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_I_AddDns", US.userInfo.userid, UDID, 0], U.Dk.LE.AsyneaDomain, ["", UDID, UDOD]);
 
-    //U.A.Request(US.Auth,"UseStudioDisk.AddDns", [US.userinfo.UserId, UDID], U.Dk.LE.AsyneaDomain, ["", UDID, UDOD]);
+    //U.A.Request(US.Auth,"UseStudioDisk.AddDns", [US.userInfo.userid, UDID], U.Dk.LE.AsyneaDomain, ["", UDID, UDOD]);
 }
 
 //申请域名异步
@@ -261,11 +261,11 @@ U.Dk.LE.OV = function (UDE) {
 
 //点击文件打开处理
 U.Dk.LE.OFT = function (USN, UN, userid, UFID, UTF) {
-    var _UTF = US.userinfo.UserId == userid,
+    var _UTF = US.userInfo.userid == userid,
     _UMT = USN.split(".")[1],
     _UDOD = event ? event.srcElement : null;
     U.Alert("正在努力的打开中,请稍后"); window.open("/userpages/U_OF.aspx?FildID=" + UFID); //页面打开
-    //  window.open("/userpages/U_OF.aspx?fileservername=" + USN + "&filename=" + UN + "&UserId=" + US.userinfo.UserId + "&FildID=" + UFID + "&usrd=" + Math.random()); //window.open("http://disk.1473.cn/" + UFID + "/" + (UTF || ""));
+    //  window.open("/userpages/U_OF.aspx?fileservername=" + USN + "&filename=" + UN + "&UserId=" + US.userInfo.userid + "&FildID=" + UFID + "&usrd=" + Math.random()); //window.open("http://disk.1473.cn/" + UFID + "/" + (UTF || ""));
 }
 
 //异步查看
@@ -290,7 +290,7 @@ U.Dk.LE.USOS = function (UDID, UTH, UFT, UCB, UTF, UPID, UIN) {
     var _UDPD, _UTF,
     _UGE = US.Disk.UserDisk,
     _userid = _UGE[1][2],
-    _UYID = US.userinfo.UserId,
+    _UYID = US.userInfo.userid,
     _UDE = U.Ut.isString(UDID) ? (_UGE[4][UDID] ? _UGE[4][UDID] : UDID) : UDID;
     UDID = _UDE ? _UDE.UserDirectoryID : UDID;
     if (_UDE.UserFilesID != undefined) { UDID = _UDE.UserFilesID; _UDE.UserFilesServerName = "" }
@@ -310,7 +310,7 @@ U.Dk.LE.USOS = function (UDID, UTH, UFT, UCB, UTF, UPID, UIN) {
             _UGE[1][1] = UPID = (userid == _userid) ? US.DG : US.FG;
         }; //选择目录
         if (UIN) {
-            return U.Dk.RE.AF(UFT, UIN, U.M.apply(this, UCB), US.userinfo.UserId, true);
+            return U.Dk.RE.AF(UFT, UIN, U.M.apply(this, UCB), US.userInfo.userid, true);
         } //直接新建
         else {
             _UGE = US.Disk.UserDisk;

+ 6 - 6
js/UD.Disk/U.DK.LL.js

@@ -14,7 +14,7 @@ U.Dk.LL.SXWPDH = function (UDOD, TF) {
 //导航点击 默认导航 (其实导航 没有树形分类的)
 U.Dk.LL.MRHYHWP = function (UDOD, UIE, userid) {
     var _UDE = U.Dk.DiskOperatingSwitch(userid)[1][0]; //转到个人使用网盘
-    if (!UIE && US.userinfo.UserId != _UDE.UserId) {
+    if (!UIE && US.userInfo.userid != _UDE.UserId) {
         U.Alert("他人的私密空间无法查看");
         return;
     } //私密地方必须本人操作
@@ -135,7 +135,7 @@ U.Dk.LL.DXWPDH = function (UDE, UDOD, UTF, userid) {
     _UDID = UDE.UserDirectoryID;
     var i, _UGE, _UDS,
     _UDID = UDE.UserDirectoryID,
-    _UDE = U.Dk.DiskOperatingSwitch((userid = userid || US.userinfo.UserId));
+    _UDE = U.Dk.DiskOperatingSwitch((userid = userid || US.userInfo.userid));
 
     if (_UDID == "22222222-2222-2222-2222-222222222222" || _UDID == "11111111-1111-1111-1111-111111111111") {
         U.Dk.LL.FCKDXWPDH(_UDID)
@@ -148,7 +148,7 @@ U.Dk.LL.DXWPDH = function (UDE, UDOD, UTF, userid) {
     _UDTD = _UDAD[1],
     _UAE = UDE.Child || _$(_UDE[0]).Select({ "UserDirectoryParentID": userid }),
     _UDS = " UD_SYWLTXOSIO", _UDSD = $("div", _UDAD[0])[0];
-        if (userid != US.userinfo.UserId) {
+        if (userid != US.userInfo.userid) {
             if (UDE.UserDirectoryID == US.userinfo) { _UST = "他人群文件无法查看"; }
             else if (UDE.UserDirectoryID == US.SG) { _UST = "他人的私密空间无法查看"; }
             if (_UST) { U.Alert(_UST); return; }
@@ -164,7 +164,7 @@ U.Dk.LL.DXWPDH = function (UDE, UDOD, UTF, userid) {
             } //导航打印
             if (!UTF || !UTF[1]) {
                 if (_UDID == userid) {
-                    (userid == US.userinfo.UserId) && (_UDPD.innerHTML = "", U.Dk.VW.XWPDYH(US.Friend[2]));
+                    (userid == US.userInfo.userid) && (_UDPD.innerHTML = "", U.Dk.VW.XWPDYH(US.Friend[2]));
                 }
                 else if (_UDID == US.NU) {
                     U.Dk.LL.ZJFWDJ(_UDE, userid, _UDPD);
@@ -181,7 +181,7 @@ U.Dk.LL.DXWPDH = function (UDE, UDOD, UTF, userid) {
 //如果是我的协同或者是他人邀请的
 U.Dk.LL.FCKDXWPDH = function (UDID) {
     if (UDID == "22222222-2222-2222-2222-222222222222") {
-        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userinfo.UserId, US.NU, US.NU, 0, 0, 100], function (r) {
+        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.userid, US.NU, US.NU, 0, 0, 100], function (r) {
             var _array = [];
             for (var i = 0; i < r.value.length; i++) {
                 _array.push({
@@ -212,7 +212,7 @@ U.Dk.LL.FCKDXWPDH = function (UDID) {
         });
     } else if (UDID == "11111111-1111-1111-1111-111111111111") {
 
-        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userinfo.UserId, "00000000-0000-0000-0000-000000000000", "", 0, 0, 100], function (r) {
+        U.A.Request(US.CD, [US.DB, "UseStudio_Office", "GetCollaborativeDocument", US.userInfo.userid, "00000000-0000-0000-0000-000000000000", "", 0, 0, 100], function (r) {
             var _array = [];
             for (var i = 0; i < r.value.length; i++) {
                 _array.push({

+ 20 - 20
js/UD.Disk/U.DK.RE.js

@@ -11,7 +11,7 @@ U.Dk.RE.TF = "";
 U.Dk.RE.TSXXML = function () {
     var i, _dirid, _fileinfo, _UKE, _UCE,
     _UTF = 1,
-    _userid = US.userinfo.UserId,
+    _userid = US.userInfo.userid,
      _diskinfo = US.Disk.UserDisk; //获取文件权限
     if (_diskinfo[1][2] == _userid || _diskinfo[2]) {
         if (_diskinfo[2] || ((_fileinfo = _$(_diskinfo[0]).RecurD(null, { "UserDirectoryID": _diskinfo[1][1] }, "UserDirectoryParentID"), _UCE = _fileinfo[_fileinfo.length - 1], _dirid = _UCE.UserDirectoryID) && _UCE.GroupID || _dirid == US.FG)) { //判断是否群文件推送或者是目录推送
@@ -43,7 +43,7 @@ U.Dk.RE.TSXXML = function () {
 
 //新建文件夹权限
 U.Dk.RE.QXWJPD = function (userid, UTF, UDID) {
-    var _UUID = US.userinfo.UserId,
+    var _UUID = US.userInfo.userid,
      _diskinfo = U.Dk.DiskOperatingSwitch(userid),
      _UEM = U.Dk.HP.WPCZQXHQ(UDID),
      _UCE = _UEM[2][0],
@@ -92,10 +92,10 @@ U.Dk.RE.AF = function (UTF, UFN, UAF, userid, UFT) {
         _UGID = U.Dk.RE.WPHQID(_fileinfo, _diskinfo); ("folderencrypt".indexOf(UTF) > -1) && (_USC = _fileinfo[0].UserDirectoryDeep, _ULX = 0, _diskinfo[1][0].FilesCount += 1); _UOID = _fileinfo[_fileinfo.length - 1].UserDirectoryID;
         _fileinfo = U.Dk.M.RUS(new U.Dk.M.Entity(Guid.newGuid(), 0, _UPID, UFN.addEllipsis(20), UFN, UTF, null, U.MT.toTimeStamp(new Date()), "", _USC, null, _UOID == US.SG ? "true" : "", _ULX, "", (_UOID == US.FG ? userid : (_UGID || "")), null, userid)); //生成文件实体 
         if (_fileinfo.filetype == "1") {
-            U.A.Request(US.Auth, ["CreateFile", US.userinfo.UserId, _fileinfo["UserDirectoryID"], _fileinfo["UserDirectoryParentID"], UFN.escapeQuotes() + (UTF == "txt" ? ".txt" : ""), UTF, _fileinfo["UserFilesServerName"] || "", _UGID, _fileinfo.filetype == "1" ? (_fileinfo["UserDirectoryEncrypt"] || _UGID) : _fileinfo["UserDirectoryEncrypt"]]), U.Dk.RE.AsynAF, ["", _fileinfo, UAF, _diskinfo, U.D.SY.ET["Disk"]["SY"]["DJ"], userid, UTF, UFT]; //创建文件或者文件夹异步
+            U.A.Request(US.Auth, ["CreateFile", US.userInfo.userid, _fileinfo["UserDirectoryID"], _fileinfo["UserDirectoryParentID"], UFN.escapeQuotes() + (UTF == "txt" ? ".txt" : ""), UTF, _fileinfo["UserFilesServerName"] || "", _UGID, _fileinfo.filetype == "1" ? (_fileinfo["UserDirectoryEncrypt"] || _UGID) : _fileinfo["UserDirectoryEncrypt"]]), U.Dk.RE.AsynAF, ["", _fileinfo, UAF, _diskinfo, U.D.SY.ET["Disk"]["SY"]["DJ"], userid, UTF, UFT]; //创建文件或者文件夹异步
         }
         else {
-            U.A.Request(US.Auth, ["CreateDirectory", US.userinfo.UserId, _fileinfo["UserDirectoryID"], _fileinfo["UserDirectoryParentID"], _USC, UFN.escapeQuotes(), _UGID, _fileinfo.filetype == "1" ? (_fileinfo["UserDirectoryEncrypt"] || _UGID) : _fileinfo["UserDirectoryEncrypt"]]), U.Dk.RE.AsynAF, ["", _fileinfo, UAF, _diskinfo, U.D.SY.ET["Disk"]["SY"]["DJ"], userid, UTF, UFT]; //创建文件或者文件夹异步
+            U.A.Request(US.Auth, ["CreateDirectory", US.userInfo.userid, _fileinfo["UserDirectoryID"], _fileinfo["UserDirectoryParentID"], _USC, UFN.escapeQuotes(), _UGID, _fileinfo.filetype == "1" ? (_fileinfo["UserDirectoryEncrypt"] || _UGID) : _fileinfo["UserDirectoryEncrypt"]]), U.Dk.RE.AsynAF, ["", _fileinfo, UAF, _diskinfo, U.D.SY.ET["Disk"]["SY"]["DJ"], userid, UTF, UFT]; //创建文件或者文件夹异步
         }
         return _fileinfo;
     }
@@ -116,7 +116,7 @@ U.Dk.RE.AsynAF = function (r) {
      _dirid = _diskinfo[1][1];
     r = r.value;
     if (r != null) {
-        (_diskinfo[2] || _diskinfo[1][2] != US.userinfo.UserId) && (U.Ut.AddObj(_fileinfo, { "UserId": US.userinfo.UserId, "UserNickName": US.userinfo.UserNickName, "UserName": US.userinfo.UserName, "UserThumbnailImageHead": US.userinfo.UserThumbnailImageHead, "Parent": _diskinfo[4][_fileinfo.UserDirectoryParentID] }));
+        (_diskinfo[2] || _diskinfo[1][2] != US.userInfo.userid) && (U.Ut.AddObj(_fileinfo, { "UserId": US.userInfo.userid, "UserNickName": US.userinfo.UserNickName, "UserName": US.userinfo.UserName, "UserThumbnailImageHead": US.userinfo.UserThumbnailImageHead, "Parent": _diskinfo[4][_fileinfo.UserDirectoryParentID] }));
         var _diskinfo = U.Dk.DiskOperatingSwitch(_userid); //根据userid获取网盘的信息
         //调用添加文件到disk全局的方法
         U.Dk.M.Entity.Add([_fileinfo], _diskinfo);
@@ -165,9 +165,9 @@ U.Dk.RE.WPSCWJ = function (UDE, userid) {
 
 //删除文件
 U.Dk.RE.DMB = function (UDE, UAF, UDPD, userid) {
-    userid = userid || (UDE.UserId || UDE.GroupID) || (UDE[0] && (UDE[0].UserId || UDE[0].GroupID)) || US.userinfo.UserId; //选择删除文件的用户ID
+    userid = userid || (UDE.UserId || UDE.GroupID) || (UDE[0] && (UDE[0].UserId || UDE[0].GroupID)) || US.userInfo.userid; //选择删除文件的用户ID
     var i, _UH, _UDOD,
-    _userid = US.userinfo.UserId;
+    _userid = US.userInfo.userid;
     UDE = UDE.length ? UDE : [UDE];
     if (U.Dk.HP.WPCZQXHQ()[4] || (UDE = _$(UDE).Select({ "UserId": _userid })).length) { //权限设置 
         if (UDE.length > 1) {
@@ -186,7 +186,7 @@ U.Dk.RE.DMB = function (UDE, UAF, UDPD, userid) {
 U.Dk.RE.DF = function (UDE, UCB, userid) {
     UDE = UDE.length == null ? [UDE] : UDE;
     var i,
-     _userid = US.userinfo.UserId,
+     _userid = US.userInfo.userid,
      _UAID = _$(UDE).pluck("UserDirectoryID").join(",");
     U.A.Request(US.Auth, ["DeleteDirectoryOrFile", _UAID, UDE[0].GroupID || ""]), U.Dk.RE.AsynDF, ["", UDE, UCB, userid]; //文件夹和文件同时删除
 }
@@ -253,7 +253,7 @@ U.Dk.RE.AsynWPSCWJ = function (UDE, userid) {
 
 //重命名
 U.Dk.RE.WPCMM = function (UDOD, UDE) {
-    var _dirid, _userid = US.userinfo.UserId;
+    var _dirid, _userid = US.userInfo.userid;
     if (U.Dk.HP.WPCZQXHQ(null, null, UDE)[4]) {//本人才允许重命名
         UDOD.innerText = "";
         (_dirid = $$("input", { "ondblclick": U.M.StopBubble, "onblur": [[U.Dk.RE.TWPCMM, ["this", UDE, UDE.UserId || _userid]]], "onclick": U.M.StopBubble, "className": "UD_SYSXZTST", "value": UDE["UserallDirectoryName"].replace("." + UDE["UserDirectoryExtendType"], "") }, UDOD)).select();
@@ -277,7 +277,7 @@ U.Dk.RE.TWPCMM = function (UDOD, UDE, userid) {
 
 //修改文件名
 U.Dk.RE.MFN = function (UDE, UST, UCB, userid) {
-    userid = userid || US.userinfo.UserId;
+    userid = userid || US.userInfo.userid;
     var _UEN = UDE.UserDirectoryExtendType,
      _diskinfo = U.Dk.DiskOperatingSwitch(userid),
      _USN = UST.replaceHtmlSign();
@@ -378,23 +378,23 @@ U.Dk.RE.UFStick = function (userid, UCB, UDID) {
         U.Alert("不允许添加到选择目录");
     } //添加
     else if (_UTF[0]) {//目录允许粘贴
-        if (_fileinfo.length && (((_dirid = _UKE.UserDirectoryID) == US.FG || _UKE.GroupID != null) || ((_dirid == _USID || _dirid == US.SG) && US.userinfo.UserId == userid)) || !UDID) { //相同目录类型的 获取添加到共享 我的私密
+        if (_fileinfo.length && (((_dirid = _UKE.UserDirectoryID) == US.FG || _UKE.GroupID != null) || ((_dirid == _USID || _dirid == US.SG) && US.userInfo.userid == userid)) || !UDID) { //相同目录类型的 获取添加到共享 我的私密
             _UGID = U.Dk.RE.WPHQID(_UTF[2][0], _diskinfo); _UCE = U.Dk.HP.MLWJSY(_fileinfo);
             if (_UTP == "Cut" || _diskinfo[1][0].FileSize + _UCE[1] <= U.UP.GetSfileS(_diskinfo[1][0].UserDiskSpace + "M")) {
                 if (!UDID) {
                     U.Alert("自动整理分配粘贴文件");
                     _UTP = _UTP == "Cut";
-                    U.A.Request(US.Auth, ["CopyOrCutAndPasteFiles", US.userinfo.UserId, _$(_fileinfo).pluck("UserDirectoryID").join(","), _UTP, UDID]), U.Dk.RE.AsynTSStick, ["", UDID, _fileinfo, _UCE[1], UCB, _diskinfo[1][2], _UGID, _UTP, _dirid];
+                    U.A.Request(US.Auth, ["CopyOrCutAndPasteFiles", US.userInfo.userid, _$(_fileinfo).pluck("UserDirectoryID").join(","), _UTP, UDID]), U.Dk.RE.AsynTSStick, ["", UDID, _fileinfo, _UCE[1], UCB, _diskinfo[1][2], _UGID, _UTP, _dirid];
                 } //所有文件需要分配目录
                 else {
                     if (_UTP == "Cut") {
-                        U.A.Request(US.Auth, ["CutAndPasteFiles", US.userinfo.UserId, UDID, _$(_fileinfo).pluck("UserDirectoryID").join(","), _UGID, (_fileinfo[0].GroupID || "")]), U.Dk.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], UCB, _diskinfo[1][2], _UGID, _UTP, _dirid];
+                        U.A.Request(US.Auth, ["CutAndPasteFiles", US.userInfo.userid, UDID, _$(_fileinfo).pluck("UserDirectoryID").join(","), _UGID, (_fileinfo[0].GroupID || "")]), U.Dk.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], UCB, _diskinfo[1][2], _UGID, _UTP, _dirid];
                     }
                     else {
-                        U.A.Request(US.Auth, ["CopyAndPasteFiles", US.userinfo.UserId, UDID, _$(_fileinfo).pluck("UserDirectoryID").join(","), _UGID, (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), U.Dk.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], UCB, _diskinfo[1][2], _UGID, _UTP, _dirid];
+                        U.A.Request(US.Auth, ["CopyAndPasteFiles", US.userInfo.userid, UDID, _$(_fileinfo).pluck("UserDirectoryID").join(","), _UGID, (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), U.Dk.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], UCB, _diskinfo[1][2], _UGID, _UTP, _dirid];
                     }
 
-                    //     U.A.Request(US.Auth,"UseStudioDisk." + _UTP + (_UTP == "Cut" ? "File" : (_UCE[2].length ? "Folder" : "File")), [US.userinfo.UserId, UDID, _$(_fileinfo).pluck("UserDirectoryID").join(","), _UGID, _UTP == "Cut" ? (_fileinfo[0].GroupID || "") : (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), U.Dk.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], UCB, _diskinfo[1][2], _UGID, _UTP, _dirid];
+                    //     U.A.Request(US.Auth,"UseStudioDisk." + _UTP + (_UTP == "Cut" ? "File" : (_UCE[2].length ? "Folder" : "File")), [US.userInfo.userid, UDID, _$(_fileinfo).pluck("UserDirectoryID").join(","), _UGID, _UTP == "Cut" ? (_fileinfo[0].GroupID || "") : (_UCE[2].length ? _UME.UEI[0][0].UserDirectoryDeep : "")]), U.Dk.RE.AsynUFStick, ["", UDID, _fileinfo, _UCE[1], UCB, _diskinfo[1][2], _UGID, _UTP, _dirid];
                 } //普通目录粘贴
             }
             else {
@@ -525,9 +525,9 @@ U.Dk.RE.AsynWPJQ = function (userid, UDE, UPID, UTF) {
 //文件置顶
 U.Dk.RE.DWJXZ = function (UFID, UV) {
     //#error 文件添加指定审核
-    U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_I_AddFileEX", US.userinfo.UserId, UFID, UV == "true" ? 1 : 0], U.M.apply(null, [[U.Alert, ["成功添加置顶"]]]));
+    U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "UD_I_AddFileEX", US.userInfo.userid, UFID, UV == "true" ? 1 : 0], U.M.apply(null, [[U.Alert, ["成功添加置顶"]]]));
 
-    //  U.A.Request(US.Auth,"UseStudioDisk.WJXG", [US.userinfo.UserId, UFID, UV], U.M.apply(null, [[U.Alert, ["成功添加置顶"]]]));
+    //  U.A.Request(US.Auth,"UseStudioDisk.WJXG", [US.userInfo.userid, UFID, UV], U.M.apply(null, [[U.Alert, ["成功添加置顶"]]]));
 }
 
 //#endregion
@@ -558,7 +558,7 @@ U.Dk.RE.WPCKSX = function (UDOD, UDE, userid) {
 //用户属性框的样式
 U.Dk.RE.ABYS = function (UDID, UDE, UTF) {
     var i, _UCE, _UDOD, _UDTD, _UDSD, _UDMD,
-    _userid = US.userinfo.UserId,
+    _userid = US.userInfo.userid,
      _USE = U.UP.FFT(UDE.UserDirectoryExtendType.toLowerCase()),
       _UTF = "文件" + (UDE.filetype ? "" : "夹"),
       _diskinfo = US.Disk.UserDisk; UDE = UDE || _$(_diskinfo[0]).Select({ "UserDirectoryID": UDID }, null, 1)[0];
@@ -597,7 +597,7 @@ U.Dk.RE.SQX = function (UDID, UV) {
     U.A.Request(US.CD, [US.DB, "UseStudio_Disk", "SetFtpPriviledge", UDID, UV], U.Dk.RE.AsynETUE, ["", "SZ", UDID, UV]);
     U.Alert("和服务器同步中...");
 
-    //  U.A.Request(US.Auth,"UseStudioDisk.SetUserQX", [US.userinfo.UserId, UDID, UV], U.Dk.RE.AsynETUE, ["", "SZ", UDID, UV]); U.Alert("和服务器同步中...");
+    //  U.A.Request(US.Auth,"UseStudioDisk.SetUserQX", [US.userInfo.userid, UDID, UV], U.Dk.RE.AsynETUE, ["", "SZ", UDID, UV]); U.Alert("和服务器同步中...");
 }
 
 //#endregion
@@ -723,7 +723,7 @@ U.Dk.RE.WPCKPL = function (UDE) {
 U.Dk.RE.MBC = function (UDID, UST, UTF, UTP) {
     var _UAL,
     _UFT = false,
-    _userid = US.userinfo.UserId,
+    _userid = US.userInfo.userid,
     _diskinfo = US.Disk.UserDisk,
     _fileinfo = _diskinfo[4][UDID].Child || _$(_diskinfo[0]).Select({ "UserDirectoryParentID": UDID }),
     _UAE = _$(_fileinfo).Select({ "UserDirectoryExtendType": "folder" }); //_$(_diskinfo[0]).Select({ "UserDirectoryParentID": UDID });

+ 1 - 1
js/UD.Disk/U.DK.RM.js

@@ -22,7 +22,7 @@ U.Dk.RM.WPYJCD = function (UDOD, UDE, UAE, UFT, userid) {
     _UJE = [],
      _USE = [0, 11, 17],
      _UTP = event.type,
-     _userid = US.userinfo.UserId,
+     _userid = US.userInfo.userid,
      _UGE = !userid ? US.Disk.UserDisk : U.Dk.DiskOperatingSwitch(userid),
      _UIE = _UGE[1][4] == "Details",
      _UDTD = $("#" + (_UGE[2] ? "UD_SYWMO" : "UD_SYWM"), _UGE.pdiv),

+ 4 - 4
js/UD.Disk/U.DK.UP.js

@@ -16,7 +16,7 @@ U.Dk.UP.FTF = {
 U.Dk.UP.SCXWPOP = function (el, flashinfo, userid, ifload) {
     var _iscreate, //查看flash是否创建成功
     _uploadinfo = U.Dk.UP.FTF, //flash上传使用的全局变量
-    _diskinfo = U.Dk.DiskOperatingSwitch(userid || US.userinfo.UserId), //获取用户网盘的信息
+    _diskinfo = U.Dk.DiskOperatingSwitch(userid || US.userInfo.userid), //获取用户网盘的信息
     _permis = U.Dk.HP.WPCZQXHQ(_diskinfo[1][1]); //获取上传的权限 包含ftp中有只允许上传的情况 只允许下载的情况 或者是在他人云盘中不允许上传等等具体看函数内部的注释
 
     //如果用户需要上传判断用户是否需要通登录后才能使用,如果第四个传参是允许加载那么就直接加载
@@ -151,7 +151,7 @@ U.Dk.UP.UAXWP = function (uploadfiles) {
             U.Ut.AddArr(uploadfiles, {
                 "UGE": _diskinfo, //上传到那个网盘
                 "UFN": _flashinfo["FUN"], //上传成功的回调
-                "userid": _diskinfo ? _diskinfo[1][2] : US.userinfo.UserId, //上传到那个用户
+                "userid": _diskinfo ? _diskinfo[1][2] : US.userInfo.userid, //上传到那个用户
                 "ID": _uploaddiv, //上传到那个目录的id
                 "URL": _flashinfo["FUN"]["URL"], //上传的地址
                 "SO": U.UP.FTF["EL"] //上传对应的flash按钮
@@ -197,7 +197,7 @@ U.Dk.UP.PrintUploadFiles = function (uploadfiles) {
         $$("div", { "className": "UD_SYVCOTX", "innerHTML": "容量大小:" + U.UP.FileSize(uploadfiles[i]["size"]) }, _uploaddiv);
         _uploaddiv = $$("div", { "className": "UD_SYVCOF" }, _panel);
         _panel_one = $$("div", { "className": "UD_SYVCOFL" }, _uploaddiv);
-        $$("img", { "title": "点击查看", "onerror": U.M.ImgError, "src": U.M.GetImgU(US.userinfo.UserThumbnailImageHead), "onclick": [[U.M.StopBubble], [U.U.I.ViewOtherUserInfo, [US.userinfo.UserId]]] }, _panel_one);
+        $$("img", { "title": "点击查看", "onerror": U.M.ImgError, "src": U.M.GetImgU(US.userinfo.UserThumbnailImageHead), "onclick": [[U.M.StopBubble], [U.U.I.ViewOtherUserInfo, [US.userInfo.userid]]] }, _panel_one);
         $$("div", { "className": "UD_SYVCOFR", "innerHTML": US.userinfo.UserNickName }, _uploaddiv);
 
         _uploaddiv = $$("div", { "className": "UD_SYVCOS UTDF" }, _panel);
@@ -284,7 +284,7 @@ U.Dk.UP.XWPOPL = function (md5, fileid) {
 * @param  {object} 用md5去判断上传的文件是否需要上传
 */
 U.Dk.UP.AsynXWPOPL = function (r) {
-    var _userid = US.userinfo.UserId, //当前登录用户的id
+    var _userid = US.userInfo.userid, //当前登录用户的id
         context = r.context, //异步的传参
         _fileinfo = context[1], //上传文件的信息
         _filenum = U.Dk.UP.XWPSCWZC(_fileinfo.FID); //根据文件的id获取在U.Dk.UP.FTF["FL"]中的位置及在U.Dk.UP.FTF["FL"][i]中的位置

+ 4 - 4
js/UD.Disk/U.DK.VW.js

@@ -272,7 +272,7 @@ U.Dk.VW.XWPDYLXZ = function (UDOD, UDPD, userid) {
 //弹出网盘选择框
 U.Dk.VW.CCWPXZK = function (UDID, UDE, UTP, UFID, UCB) {
     if (!U.U.L.isLogin(3)) {
-        if (U.Dk.DiskOperatingSwitch(US.userinfo.UserId)) {
+        if (U.Dk.DiskOperatingSwitch(US.userInfo.userid)) {
             var _UDSD, _UDTD = $$("div", {});
             $$("div", { innerHTML: "◀", className: "UD_SYSXZLRSITQO", onclick: [[U.AFB.DrawBack, ["SWP"]]] }, _UDTD);
             $$("div", { innerHTML: "▶", className: "UD_SYSXZLRSITQO", onclick: [[U.AFB.GoForward, ["SWP"]]] }, _UDTD);
@@ -302,7 +302,7 @@ U.Dk.VW.ZBPWPTP = function (UDID, UDOD, UDE, UTP) {
 
 //打印网盘图片准备
 U.Dk.VW.PWPTP = function (UDID, UDOD, UDE, UTP) {
-    var _userid = US.userinfo.UserId;
+    var _userid = US.userInfo.userid;
     UDOD.innerText = "";
 
     U.Dk.RE.GXWPCKXS(_userid, _diskinfo[4][UDID], [UDOD, true], U.M.apply(this, [[U.Dk.VW.PCKBDBL, [UDID, UDOD, UDE, UTP]]]));
@@ -331,7 +331,7 @@ U.Dk.VW.AsynAPWPTP = function (r) {
 U.Dk.VW.PCKBDBL = function (UDE, UDOD, UCE, UTP, UFID) {
     var i, _UDID, _UDTD, _UDSD, _UDND, _UTM, _UAE, _UTF, _UTP, _UNE,
     _UDFD = $$("div", { className: "UD_SYSXZLRSITN" }),
-    _UGE = U.Dk.DiskOperatingSwitch(US.userinfo.UserId); //获取用户的云盘资料
+    _UGE = U.Dk.DiskOperatingSwitch(US.userInfo.userid); //获取用户的云盘资料
     //获取目录id
     if (U.Ut.isString(UDE)) {
         _UDID = UDE;
@@ -402,7 +402,7 @@ U.Dk.VW.XWPDYH = function (UDE, UDOD, userid) {
             setTimeout(function () {
                 for (i = 0; i < UDE.length; i++) {
                     _UGID = UDE[i].GroupManageID; (_UGID && UDE[i].DDC == null) && (UDE[i].DDC = _$(_UGE[0]).Select({ "UserDirectoryParentID": _UGID }).length);
-                    _UDTD = $$("div", { "title": (_USN = UDE[i].UserNickName || UDE[i].GroupManageDescript || UDE[i].GroupManageName), "className": "UD_SYWRZO " + (_UGID ? "UD_SYWRZOKO" : "UD_SYWRZOK"), "onclick": _UGID ? [[U.Dk.LE.RecordNav, [[[U.Dk.LE.OpenFileDirectory, [UDE[i], US.userinfo.UserId]]]]]] : [[U.D.DT.YYDK, ["Disk", { "userid": UDE[i].UserId, "directoryid": US.FG}]]] }, _UDFD);
+                    _UDTD = $$("div", { "title": (_USN = UDE[i].UserNickName || UDE[i].GroupManageDescript || UDE[i].GroupManageName), "className": "UD_SYWRZO " + (_UGID ? "UD_SYWRZOKO" : "UD_SYWRZOK"), "onclick": _UGID ? [[U.Dk.LE.RecordNav, [[[U.Dk.LE.OpenFileDirectory, [UDE[i], US.userInfo.userid]]]]]] : [[U.D.DT.YYDK, ["Disk", { "userid": UDE[i].UserId, "directoryid": US.FG}]]] }, _UDFD);
                     _UDSD = $$("div", { "className": _UGID ? "UD_SYWRZOQI" : "UD_SYWRZOKI" }, _UDTD);
                     if (_UGID) { _UAE = U.Dk.VW.XWPDYHTX(_UDSD, _UGID); } else { $$("img", { "onerror": U.M.ImgError, "title": "点击查看", "src": U.M.GetImgU(UDE[i].UserThumbnailImageHead) }, _UDSD); } //群头像打印  //好友头像打印
                     $$("div", { "className": "UD_SYWRZOKN UTDF", "innerHTML": _USN }, _UDTD);

+ 9 - 9
js/UD.Disk/U.DK.js

@@ -16,7 +16,7 @@ U.Dk.DiskLoad = function (userid, dirid) {
     _diskdiv, //disk整体元素
     _dirid = dirid, //目录id
     _isFirst, //导航到达时,判断是否为一级目录。如果为一级目录,则展开。
-    _loginuserid = US.userinfo.UserId || US.NU, //当前使用用户id
+    _loginuserid = US.userInfo.userid || US.NU, //当前使用用户id
     _arriveDir, //根据dirid算出要到达的目录信息。
     _diskinfo = U.Dk.DiskOperatingSwitch(userid);    //获取个人网盘的全局变量信息,返回类型为例:US.Disk.Disks["张三"]; //张三的网盘信息,张三需要用guid表示,US.Disk.Disks["95f7bacc-0b3a-4265-a2ea-15e066b97bf7"]
 
@@ -66,7 +66,7 @@ U.Dk.DiskLoad = function (userid, dirid) {
 //初始化网盘资料
 U.Dk.GetUserDisk = function (userid, dirid, diskdiv, diskcontentdiv) {
     // US.Disk.Disks 用户网盘数据前台存储的全局变量 该全局变量为一个数组  0为网盘所有目录的信息以数组形式  1为用户数组信息(0为当前用户基本信息集合,1为当前打开目录的id ,2为用户id,3未知,4网盘展示文件的格式形式样式),2为未知,3为未知 ,4、数据与0的数据是一样的,但是这里是以object形式展示的,这里可以更快的通过id去找指定的文件或者目录 pdiv为当前网盘用户的弹框
-    var _loginuserid = US.userinfo.UserId || US.NU; //登录用户的id,未登录为全0的Guid
+    var _loginuserid = US.userInfo.userid || US.NU; //登录用户的id,未登录为全0的Guid
     US.Disk.Disks[userid] = []; //定义用户网盘变量
     US.Disk.Disks[userid].pdiv = diskdiv; //以用户id设置全局变量,写入用户的操作硬盘的元素
     //dirid = U.Ut.isNumber(dirid) ? (dirid > -1 && dirid < 5 ? US.Disk.InitTree[dirid + (obj ? 2 : 0)][0] : US.FG) : dirid; //生成变量
@@ -160,8 +160,8 @@ U.Dk.GUserBL = function (userid, dirid, diskdiv, r) {
         _disktree[_diskdir[i].UserDirectoryID] = _diskdir[i];
     };
     _diskinfo.length = 0;
-    _diskinfo.unshift(_diskdir, [((!r[1].UserDirectoryID && r[1].UserId == US.userinfo.UserId) ? US.userinfo : r[1]), dirid, userid, diskdiv, "Normal"], null, null, _disktree);
-    if (userid == US.userinfo.UserId) {
+    _diskinfo.unshift(_diskdir, [((!r[1].UserDirectoryID && r[1].UserId == US.userInfo.userid) ? US.userinfo : r[1]), dirid, userid, diskdiv, "Normal"], null, null, _disktree);
+    if (userid == US.userInfo.userid) {
         U.Dk.SGBL(userid, _diskinfo);
     }
     return _diskinfo; //初始化目录添加
@@ -195,7 +195,7 @@ U.Dk.CSHYHWP = function (UDE) {//
     if ($("#UD_SYWRZ", UDE.pdiv)[0]) {
         var i, _UAE, _UCB,
         _UDTD,
-        _userid = US.userinfo.UserId,
+        _userid = US.userInfo.userid,
         _UDOD = UDE.pdiv,
         _UDSD = $("#UD_SYWRZ", _UDOD)[0],
         _UIF = UDE[1][0],
@@ -208,7 +208,7 @@ U.Dk.CSHYHWP = function (UDE) {//
 
 
         _UDED[1].innerText = _UDCD[2].innerText = _UIF.UserNickName || _UIF.UserName; _UDCD[3].innerText = _UIF.UserIndividualitysignature || "暂无个人简介";
-        if (_UIF.UserId != US.userinfo.UserId) {
+        if (_UIF.UserId != US.userInfo.userid) {
             _UDCD.addAttrArray({ "onclick": [[U.F.M.AddFriend, [_UIF]]], "style": { "display": "block"} }, 4);
         }
         else {
@@ -237,7 +237,7 @@ U.Dk.CSHYHWP = function (UDE) {//
         _UDCD[9].innerText = "所有文件:" + _UAE[1];
         _UDCD[10].innerText = "总大小:" + _UAE[0];
         //分享
-        _UAE = [[(UDE[1][2] == US.userinfo.UserId ? "" : ("回到")) + "我的分享", _UIF.FilesCount], ["好友查看", US.Friend[1] ? (US.Friend[1].length > 999 ? "999+" : US.Friend[1].length) : 0], ["群/讨论组", US.Friend[2] ? (US.Friend[2].length > 999 ? "999+" : US.Friend[2].length) : 0]];
+        _UAE = [[(UDE[1][2] == US.userInfo.userid ? "" : ("回到")) + "我的分享", _UIF.FilesCount], ["好友查看", US.Friend[1] ? (US.Friend[1].length > 999 ? "999+" : US.Friend[1].length) : 0], ["群/讨论组", US.Friend[2] ? (US.Friend[2].length > 999 ? "999+" : US.Friend[2].length) : 0]];
         _UDCD = $("#UD_SYWRTC", _UDOD).Child();
         for (i = 0; i < _UDCD.length - 3; i++) {
             $(_UDCD[i]).addAttrArray({ onclick: [(i ? [U.Dk.LE.RecordNav, ([[[U.Dk.VW.XWPDYH, ([US.Friend[i], _UDSD])]]])] : [U.D.DT.YYDK, (["Disk", { "userid": _userid, "directoryid": US.FG}])])], innerHTML: _UAE[i][0] + "<span>(" + (_UAE[i][1] < 0 ? 0 : _UAE[i][1]) + ")</span>" });
@@ -326,7 +326,7 @@ U.Dk.Size = function (UDOD, userid) {
 问题:在用户登录时至少调用了五次,为什么?
 */
 U.Dk.DiskOperatingSwitch = function (userid, username) {
-    userid = userid || US.userinfo.UserId; //如果有用户id,则userid为用户id,否则为登录用户id。
+    userid = userid || US.userInfo.userid; //如果有用户id,则userid为用户id,否则为登录用户id。
     if (userid) {
         var i, _userinfo, //需要返回的用户网盘信息
         _diskinfo = US.Disk.Disks; //_UCE为包含了所有用户硬盘信息的集合。
@@ -367,7 +367,7 @@ U.Dk.LTWP = function (UDID, UDE) {
     _diskcontentdiv, //disk操作内容区域的元素
     _diskdiv, //disk整体元素
     _dirid = dirid, //目录id
-    _loginuserid = US.userinfo.UserId || US.NU, //当前使用用户id
+    _loginuserid = US.userInfo.userid || US.NU, //当前使用用户id
     _diskinfo = U.Dk.DiskOperatingSwitch(userid);    //获取网盘信息
 
     //获取网盘弹框

File diff suppressed because it is too large
+ 0 - 0
js/UD.Disk/UM1.js


+ 2 - 2
js/UF/U.F.FM.js

@@ -45,7 +45,7 @@ U.F.FM.ChatRecord = function (el, friendandgroupinfo, page, isgroup) {
     //好友的获取聊天记录
     else {
         U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "GetFriendChatHistory",
-                            US.userinfo.UserId, friendandgroupinfo.UserId, _start, _end], U.F.FM.AsynChatRecord, ["", el, friendandgroupinfo, page, isgroup]);
+                            US.userInfo.userid, friendandgroupinfo.UserId, _start, _end], U.F.FM.AsynChatRecord, ["", el, friendandgroupinfo, page, isgroup]);
     }
 }
 
@@ -123,7 +123,7 @@ U.F.FM.SendFriendOrGroupChatMessage = function (friendandgroupinfo, chateditel,
         U.F.FM.SendChatMessageToDb(_friendid, _chatcontent, null, isgroup); //调用发送数据库的函数
         //发送消息的信息
         _newsinfo = [
-                     { "UserId": US.userinfo.UserId,
+                     { "UserId": US.userInfo.userid,
                          "Time": null,
                          "Content": _chatcontent,
                          "IMG": US.userinfo.UserThumbnailImageHead,

+ 12 - 12
js/UF/U.F.J.js

@@ -25,7 +25,7 @@ U.F.J.GroupInfoForm = function (groupinfo) {
         _addgroupuserel = $("#UD_SYTC")[0], //内容区域
         _groupinfochildsel = _groupinfoel.Child(), //群信息窗体子元素
         _inputel = $("input,textarea", _groupinfochildsel[0]), //内容输出
-        _isgroupmain = !groupinfo && groupinfo.GroupManageCreateUserID == US.userinfo.UserId //是否是新建群或者是群主,
+        _isgroupmain = !groupinfo && groupinfo.GroupManageCreateUserID == US.userInfo.userid //是否是新建群或者是群主,
     ;
     //清空群用户
     U.F.J.SelectUserInfo.NeedUser.splice(0, U.F.J.SelectUserInfo.NeedUser.length);
@@ -44,7 +44,7 @@ U.F.J.GroupInfoForm = function (groupinfo) {
         U.F.J.PrintGroupUserInfo(_groupinfochildsel[1], _groupuserinfo, groupinfo);
         //点击退出按钮事件设置
         $(_groupinfochildsel[2]).addAttrArray({
-            "onclick": [[U.F.J.GroupExit, [groupinfo, _$(groupinfo).FindOne({ "UserId": US.userinfo.UserId }), _groupinfoel]]],
+            "onclick": [[U.F.J.GroupExit, [groupinfo, _$(groupinfo).FindOne({ "UserId": US.userInfo.userid }), _groupinfoel]]],
             "innerHTML": _UTF ? "解散改群" : "退出该群"
         });
     }
@@ -97,7 +97,7 @@ U.F.J.PrintGroupUserInfo = function (el, groupuserinfo, groupinfo) {
         _frag = $$("frag"),
         _childsel = $(el).Child(),
     //判断是否是群主
-        _isgroupmain = !groupuserinfo || groupinfo.GroupManageCreateUserID == US.userinfo.UserId //判断是否是群主,或者是在新建群
+        _isgroupmain = !groupuserinfo || groupinfo.GroupManageCreateUserID == US.userInfo.userid //判断是否是群主,或者是在新建群
     ;
     //打印群用户显示的样式
     for (i = 0; i < groupuserinfo.length; i++) { //循环添加
@@ -111,7 +111,7 @@ U.F.J.PrintGroupUserInfo = function (el, groupuserinfo, groupinfo) {
         //这有已经新建的群
         if (groupinfo) {
             //只有本人或者群主才能修改群名片
-            if (_isgroupmain || groupuserinfo[i].UserId == US.userinfo.UserId) {
+            if (_isgroupmain || groupuserinfo[i].UserId == US.userInfo.userid) {
                 $$("img", { "src": "/img/Edit.png", "title": "修改群名片",
                     "onclick": [[U.F.J.UpateGroupUserDescriptForm, [groupuserinfo[i], _temponeel]]]
                 }, _temptwoel);
@@ -172,7 +172,7 @@ U.F.J.UpateGroupUserDescriptForm = function (groupuserinfo, el) {
 U.F.J.DetermineUpateGroupUserDescript = function (groupuserinfo, inputel, el) {
     //判断用户是否输入正确的备注名
     if (inputel.value && U.MS.NickName.test(inputel.value)) {
-        U.A.Request(US.Auth, ["UpdateGroupMemberInfo", groupuserinfo.GroupManageID, US.userinfo.UserId, inputel.value],
+        U.A.Request(US.Auth, ["UpdateGroupMemberInfo", groupuserinfo.GroupManageID, US.userInfo.userid, inputel.value],
                     U.F.J.AsynDetermineUpateGroupUserDescript, [null, groupuserinfo, inputel.value, el]);
     }
     else {
@@ -203,7 +203,7 @@ U.F.J.AsynDetermineUpateGroupUserDescript = function (r) {
 * @param  {object} 好友信息
 */
 U.F.J.GroupExit = function (groupinfo, userinfo, el) {
-    var _userid = US.userinfo.UserId, //用户id
+    var _userid = US.userInfo.userid, //用户id
         _isgroupmain = groupinfo.GroupManageCreateUserID == _userid //判断用户是否是群主
     ;
     //如果推出群的是群主处理
@@ -484,7 +484,7 @@ U.F.J.DetermineCreateGroupAndAddGroupUser = function (el, groupid) {
         _groupinfo, //群信息
         _inputs = $("input,textarea", el), //输入的群信息
         _adduserinfo = U.F.J.SelectUserInfo.NeedUser, //需要添加用户的集合
-        _userid = US.userinfo.UserId, //用户的id
+        _userid = US.userInfo.userid, //用户的id
         _groupname = _inputs[0].value, //创建的群名
         _groupdescript = _inputs[1].value, //创建的群描述
         _groupuserids = _$(_adduserinfo).pluck("UserId").join(",") //添加进入群所有好友的id
@@ -534,7 +534,7 @@ U.F.J.AsynDetermineCreateGroupAndAddGroupUser = function (r) {
         if (!_$(US.Friend[2]).Select({ "GroupManageID": _groupid })[0]) {
             US.Friend[2].unshift(_groupinfo); //把群插入全局变量中
             //新建一个群目录
-            _directory = new U.Dk.M.Entity(_groupinfo.GroupManageID, 0, US.userinfo.UserId, _groupinfo.GroupManageName, _groupinfo.GroupManageName,
+            _directory = new U.Dk.M.Entity(_groupinfo.GroupManageID, 0, US.userInfo.userid, _groupinfo.GroupManageName, _groupinfo.GroupManageName,
                             "folder", null, new Date(), U.UP.FFT("folder")[1], 1, null, null, 0, "", _groupinfo.GroupManageID);
             //调用添加文件到disk全局的方法
             _diskinfo = U.Dk.DiskOperatingSwitch(_userinfo.UserId); //根据userid获取网盘的信息
@@ -608,14 +608,14 @@ U.F.J.ChangeY = function (groupid, groupname, groupds, fileid, cb) {
     var i, _UGE, _UBY,
     // _UCB = U.F.J.AsynDetermineCreateGroupAndAddGroupUser, //创建群异步回调
     _UTF = 1, //判断是否已经创建。如果没有创建,就把_UTF的值设置为0,0在存储过程的传参作用是创建群, 1是不创建直接修改群名
-    _userid = US.userinfo.UserId, //当前用户id 也是群主id
+    _userid = US.userInfo.userid, //当前用户id 也是群主id
     _UGN = [groupname, groupds], //群名和群描述的数组 [0]群名 [1]群描述
     _UDE = U.D.SY.ET["UL"]["AD"], //需要添加用户的集合(群用户)
     _NAIDs = new Array();
     for (var i = 0; i < _UDE.length; i++) {
         var pd = 0;
         for (var u = 0; u < _NAIDs.length; u++) {
-            if (_NAIDs[u].UserId == _UDE[i].UserId || _UDE[i].UserId == US.userinfo.UserId) {//
+            if (_NAIDs[u].UserId == _UDE[i].UserId || _UDE[i].UserId == US.userInfo.userid) {//
                 pd++
             }
         }
@@ -640,7 +640,7 @@ U.F.J.ChangeY = function (groupid, groupname, groupds, fileid, cb) {
 
     // U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "CreateGroupAndAddUser", _userid, _UGN[0], _UGN[1], groupid, _UAID, _UTF], U.F.J.AsynCXNEWTJ, ["", _UGE, _NAIDs.splice(0, _NAIDs.length), groupid, _UGN[0], _UGN[1], cb, _FriendUser, groupid, _UGN[0]]); //添加到数据库
     //给每个群成员发送一条有关于这个uw文件的消息
-    // U.A.Request(US.CD, ([US.DB, "UseStudio_Friends", "SentMessageToFriend", US.userinfo.UserId, _FriendUser, US.userinfo.UserNickName || US.userinfo.UserName, '' + groupid + ',' + _UGN[0] + ',' + _UGE.GroupManageCreateDate + ',' + fileid + ',' + _UGE.GroupManageName + '.UW', 5, false]), U.M.apply(), [""]);
+    // U.A.Request(US.CD, ([US.DB, "UseStudio_Friends", "SentMessageToFriend", US.userInfo.userid, _FriendUser, US.userinfo.UserNickName || US.userinfo.UserName, '' + groupid + ',' + _UGN[0] + ',' + _UGE.GroupManageCreateDate + ',' + fileid + ',' + _UGE.GroupManageName + '.UW', 5, false]), U.M.apply(), [""]);
     $("#UD_Temp_CK").hide()
 }
 
@@ -686,7 +686,7 @@ U.F.J.AsynOAddGroup = function (r) {
     U.Alert("成功加入该群");
     var context = r.context,
     _UCB = context[2],
-    _userid = US.userinfo.UserId,
+    _userid = US.userInfo.userid,
     _UGE = US.Disk.Disks[_userid],
     _UDE = U.F.N.AsynLYHJQCL(r); //添加群文件
     _UGE[0].splice(6, 0, (_UGE[4][_UDE.GroupManageID] = new U.Dk.M.Entity(_UDE.GroupManageID, 0, _userid, _UDE.GroupManageName, _UDE.GroupManageName, "folder", null, new Date(), U.UP.FFT("folder")[1], 1, null, null, 0, "", _UDE.GroupManageID))); //添加群网盘资料

+ 3 - 3
js/UF/U.F.M.js

@@ -35,7 +35,7 @@ U.F.M.CreateFriendGroup = function (inputel) {
     }
     //好友分组名字必须填写
     else if (_value.isStrNull() && _value != inputel.defaultValue) {
-        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "CreateFriendClass", Guid.newGuid(), US.userinfo.UserId,
+        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "CreateFriendClass", Guid.newGuid(), US.userInfo.userid,
                             _value, ""]), U.F.M.AsynCreateFriendGroup, ["", _value, _groupid]; //发送添加分组的请求
     }
     //没有输入的提示
@@ -69,7 +69,7 @@ U.F.M.AsynCreateFriendGroup = function (r) {
 */
 U.F.M.DeleteFriend = function (friendinfo) {
     //数据库中删除好友
-    U.A.Request(US.Auth, ["DeleteFriend", US.userinfo.UserId, friendinfo.FriendsID, friendinfo.UserId],
+    U.A.Request(US.Auth, ["DeleteFriend", US.userInfo.userid, friendinfo.FriendsID, friendinfo.UserId],
                 U.F.M.AsynDeleteFriend, ["", friendinfo]); //ajax删除好友
 }
 
@@ -117,7 +117,7 @@ U.F.M.AddFriend = function (userinfo, cb, typename) {
     if (!U.U.L.isLogin(3)) {
         typename = typename || "1"; //判断是添加直接对方为好友还是添加对方为好友需好友验证。
         //无法加本人为好友 同时不可与本人对话
-        if (userinfo.UserId != US.userinfo.UserId) {
+        if (userinfo.UserId != US.userInfo.userid) {
             //在好友里获取用户
             var _friendinfo = _$(US.Friend[1]).Select({ "UserId": userinfo.UserId })[0];
             //判断是否已经添加了用户

+ 9 - 9
js/UF/U.F.N.js

@@ -187,7 +187,7 @@ U.F.N.CKHFXTQX = function (UDE) {
         U.F.N.LYHJQCL(UDE);
     }
     else { //删除群消息
-        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", US.userinfo.UserId, UDE.MessageID], U.M.apply(), [""]);
+        U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", US.userInfo.userid, UDE.MessageID], U.M.apply(), [""]);
     }
 }
 
@@ -361,7 +361,7 @@ U.F.N.CGAddGroup = function (UGE, UDE, UDOD) {
         U.Alert("添加成功");
     }
     else {
-        U.A.Request(US.Auth, ["AddUsrsToGroup", US.userinfo.UserId, UDE.MessageID, UDE.UserId, UDE.MessageContent.toUpperCase(), _UFID, UDE.MessageDescript]), U.F.N.AsynCGAddGroup, ["", UDE, _UFID];
+        U.A.Request(US.Auth, ["AddUsrsToGroup", US.userInfo.userid, UDE.MessageID, UDE.UserId, UDE.MessageContent.toUpperCase(), _UFID, UDE.MessageDescript]), U.F.N.AsynCGAddGroup, ["", UDE, _UFID];
     }
     U.F.N.QZSHFXT(UDE.MessageID, UGE, UDOD, true); //清除
 }
@@ -433,7 +433,7 @@ U.F.N.QZSHFXT = function (UMID, UDE, UDOD, UTF) {
     } //单个消息移除
     //消息清空 隐藏消息
     (!UTF) && (U.A.Request(US.CD, [US.DB, "UseStudio_Friends", "DeleteMessageById", UMID || _$(UDE).pluck("MessageID").join(",")]), U.M.apply(), []); //清除所有追随者添加的信息
-    // (!UTF) && (U.A.Request(US.Auth,"UseStudioManage.canceluseraddtogrouprequest", [US.userinfo.UserId, UMID || _$(UDE).pluck("MessageID").join(",")  ]), U.M.apply(), [""]); //清除所有追随者添加的信息
+    // (!UTF) && (U.A.Request(US.Auth,"UseStudioManage.canceluseraddtogrouprequest", [US.userInfo.userid, UMID || _$(UDE).pluck("MessageID").join(",")  ]), U.M.apply(), [""]); //清除所有追随者添加的信息
 }
 
 //#endregion
@@ -488,14 +488,14 @@ U.F.FM.AsynReceiveMessages = function (isgroup, chatform, r) {
 
 //拉用户进入群处理
 U.F.N.LYHJQCL = function (UDE) {
-    U.A.Request(US.Auth, ["GetJoinGroupNews", US.userinfo.UserId, UDE.MessageID, UDE.MessageContent], U.F.N.AsynLYHJQCL, ["", UDE]); //拉用户进入群组
+    U.A.Request(US.Auth, ["GetJoinGroupNews", US.userInfo.userid, UDE.MessageID, UDE.MessageContent], U.F.N.AsynLYHJQCL, ["", UDE]); //拉用户进入群组
 }
 
 //拉用户进入群组异步
 U.F.N.AsynLYHJQCL = function (r) {
     if (r.value != "") {
         var i, _UFE, _UAE,
-    _userid = US.userinfo.UserId,
+    _userid = US.userInfo.userid,
     context = r.context,
     UDE = context[1],
     _UGE = US.Disk.Disks[_userid];
@@ -520,7 +520,7 @@ U.F.N.AsynLYHJQCL = function (r) {
 //查看即时消息
 U.F.N.CKHFXTPB = function (UDE) {
     var i, j, _ULE, _UTF, _UPE, _UCE, _UKE, _UME, _UNE, _UDOD,
-    _userid = US.userinfo.UserId;
+    _userid = US.userInfo.userid;
     if ((UDE = UDE[4])) {
         for (i = 0; i < UDE.length; i++) {
             _UCE = UDE[i];
@@ -538,7 +538,7 @@ U.F.N.CKHFXTPB = function (UDE) {
                         U.D.Blog.N.PNXX(); //打印学习系统和blog消息
                         break;
                     case "UD_DiskCon": case "DDisk": //Disk添加删除文件
-                        _UKE = U.Dk.DiskOperatingSwitch(US.userinfo.UserId);
+                        _UKE = U.Dk.DiskOperatingSwitch(US.userInfo.userid);
                         _UPE = [];
                         _ULE = _UKE[4][_UKE[1][1]].Child.length;
                         if (_UKE) {
@@ -560,7 +560,7 @@ U.F.N.CKHFXTPB = function (UDE) {
                                     _UTF = _$(_UKE[0]).Delete({ "UserDirectoryID": _UNE[j] })[0];
                                     (_UTF) && (_UPE.push(_UTF));
                                 } //删除文件 
-                                (_userid == _UKE[1][2] && _UPE[0].UserDirectoryParentID == _UKE[1][1]) && (U.Dk.RE.AsynWPSCWJ(_UPE, US.userinfo.UserId)); //删除文件提示
+                                (_userid == _UKE[1][2] && _UPE[0].UserDirectoryParentID == _UKE[1][1]) && (U.Dk.RE.AsynWPSCWJ(_UPE, US.userInfo.userid)); //删除文件提示
                             }
                         }
                         break; //Disk更新目录
@@ -591,7 +591,7 @@ U.F.N.DL = function (UTF) {
 U.F.N.ST = function (UDE, UTF) {
     var i, j, _UAID, _UDTD,
     _UDOD = $("#UD_SYHZLZ")[0],
-    _userid = US.userinfo.UserId,
+    _userid = US.userInfo.userid,
     _UFE = US.Friend;
     for (i = 0; i < UDE.length; i++) {
         if (UDE[i].length) {

Some files were not shown because too many files changed in this diff