From 63c69e8613a5973753efd541c8771f4388913487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E9=B1=BC=28iFish=29?= Date: Wed, 15 Jul 2015 20:55:09 +0800 Subject: [PATCH 1/2] sync --- ChatRoomServer.Db/ChatDb.cs | 21 + ChatRoomServer.Db/ChatRoomServer.Db.csproj | 1 + ChatRoomServer.Db/Entities/PagedData.cs | 16 + ChatRoomServer.Db/Entities/Room.cs | 2 - ChatRoomServer.Main/ChatServer.cs | 14 +- .../Areas/Api/Controllers/MsgsController.cs | 26 + .../Areas/Api/Controllers/UsersController.cs | 108 +- ChatRoomServer.Www/ChatRoomServer.Www.csproj | 4 + ChatRoomServer.Www/Content/site.css | 12 + .../Controllers/msgsController.cs | 17 + ChatRoomServer.Www/Global.asax.cs | 33 +- ChatRoomServer.Www/Scripts/_references.js | Bin 444 -> 524 bytes .../Scripts/bootstrap-notify.js | 78 +- ChatRoomServer.Www/Scripts/controller.js | 142 +- ChatRoomServer.Www/Scripts/underscore.js | 1548 +++++++++++++++++ ChatRoomServer.Www/Views/Msgs/LogList.cshtml | 78 + .../Views/Shared/_Layout.cshtml | 12 +- .../Views/Users/AbuseList.cshtml | 104 +- RwTicketAssistantV3/app/background.js | 4 +- .../TrainInfo/WebDataProvider.cs | 6 +- Web12306/js/ui/chat/chatframe.js | 4 +- 21 files changed, 2141 insertions(+), 89 deletions(-) create mode 100644 ChatRoomServer.Db/Entities/PagedData.cs create mode 100644 ChatRoomServer.Www/Areas/Api/Controllers/MsgsController.cs create mode 100644 ChatRoomServer.Www/Controllers/msgsController.cs create mode 100644 ChatRoomServer.Www/Scripts/underscore.js create mode 100644 ChatRoomServer.Www/Views/Msgs/LogList.cshtml diff --git a/ChatRoomServer.Db/ChatDb.cs b/ChatRoomServer.Db/ChatDb.cs index 8ef04d7..3cec84d 100644 --- a/ChatRoomServer.Db/ChatDb.cs +++ b/ChatRoomServer.Db/ChatDb.cs @@ -6,7 +6,9 @@ using System.Threading.Tasks; namespace ChatRoomServer.Db { + using System.Data; using System.Data.Entity; + using System.Data.SqlClient; using ChatRoomServer.Db.Entities; public class ChatDb : DbContext @@ -94,5 +96,24 @@ namespace ChatRoomServer.Db { return Database.SqlQuery("exec usp_BlockUser_GetUserReportCount {0}, {1}", username, minutes).First(); } + + public async Task> GetAbuseReportPagedList(int filter, int pageindex, int pagesize) + { + var totalCountParameter = new SqlParameter("totalCount", SqlDbType.BigInt) { Direction = ParameterDirection.Output, Value = 0 }; + + var list = await Database.SqlQuery( + "exec usp_AbuseReport_GetList @filter,@pagesize,@pageindex,@totalcount out", + new SqlParameter("filter", SqlDbType.Int) { Value = filter }, + new SqlParameter("pagesize", SqlDbType.Int) { Value = pagesize }, + new SqlParameter("pageindex", SqlDbType.Int) { Value = pageindex }, + totalCountParameter + ).ToListAsync(); + + return new PagedData() + { + Data = list, + TotalCount = (long)totalCountParameter.Value + }; + } } } diff --git a/ChatRoomServer.Db/ChatRoomServer.Db.csproj b/ChatRoomServer.Db/ChatRoomServer.Db.csproj index 00e969b..ccaefe5 100644 --- a/ChatRoomServer.Db/ChatRoomServer.Db.csproj +++ b/ChatRoomServer.Db/ChatRoomServer.Db.csproj @@ -56,6 +56,7 @@ + diff --git a/ChatRoomServer.Db/Entities/PagedData.cs b/ChatRoomServer.Db/Entities/PagedData.cs new file mode 100644 index 0000000..845cd4f --- /dev/null +++ b/ChatRoomServer.Db/Entities/PagedData.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ChatRoomServer.Db.Entities +{ + public class PagedData + { + public long TotalCount { get; set; } + + + public List Data { get; set; } + } +} diff --git a/ChatRoomServer.Db/Entities/Room.cs b/ChatRoomServer.Db/Entities/Room.cs index 236925e..65dd97c 100644 --- a/ChatRoomServer.Db/Entities/Room.cs +++ b/ChatRoomServer.Db/Entities/Room.cs @@ -61,8 +61,6 @@ namespace ChatRoomServer.Db.Entities HasKey(m => m.ID); Property(s => s.ID).HasMaxLength(50).IsRequired().HasDatabaseGeneratedOption(DatabaseGeneratedOption.None); Property(s => s.Name).HasMaxLength(200).IsRequired(); - - Ignore(s => s.OnlineCount); } } } diff --git a/ChatRoomServer.Main/ChatServer.cs b/ChatRoomServer.Main/ChatServer.cs index 50adc91..7833515 100644 --- a/ChatRoomServer.Main/ChatServer.cs +++ b/ChatRoomServer.Main/ChatServer.cs @@ -53,7 +53,7 @@ namespace ChatRoomServer.Main { _blockUsers.Clear(); - blockUsers.ForEach(s => + blockUsers.ForEach(s => { if (!_blockUsers.ContainsKey(s.UserName)) _blockUsers.Add(s.UserName, s.UnblockTime); @@ -67,6 +67,7 @@ namespace ChatRoomServer.Main } }); } + _log.Info("已刷新屏蔽列表。"); //处理连接 GetAllSessions().ForEach(s => @@ -115,13 +116,20 @@ namespace ChatRoomServer.Main InitOnlineCountSync(); //黑名单 - _blockUserReloadTimer = new Timer(1000 * 60 * 5) { AutoReset = false }; + _blockUserReloadTimer = new Timer(1000 * 60 * 1) { AutoReset = false }; _blockUserReloadTimer.Elapsed += (s, e) => { - ReloadBlockUsers(); + try + { + ReloadBlockUsers(); + } + catch (Exception) + { + } _blockUserReloadTimer.Start(); }; ReloadBlockUsers(); + _blockUserReloadTimer.Start(); } #region 在线人数上报 diff --git a/ChatRoomServer.Www/Areas/Api/Controllers/MsgsController.cs b/ChatRoomServer.Www/Areas/Api/Controllers/MsgsController.cs new file mode 100644 index 0000000..acab26b --- /dev/null +++ b/ChatRoomServer.Www/Areas/Api/Controllers/MsgsController.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Web.Http; + +namespace ChatRoomServer.Www.Areas.Api.Controllers +{ + using System.Threading.Tasks; + using ChatRoomServer.Db; + + [Authorize] + public class MsgsController : ApiController + { + public async Task List([FromBody] Dictionary query) + { + var searchUser = query.GetValue("searchUser") ?? ""; + var pageIndex = query.GetValue("pageIndex").ToInt32(1); + var pagesize = query.GetValue("pagesize").ToInt32(20); + var db = new ChatDb(); + + + } + } +} diff --git a/ChatRoomServer.Www/Areas/Api/Controllers/UsersController.cs b/ChatRoomServer.Www/Areas/Api/Controllers/UsersController.cs index 3186b75..dde0333 100644 --- a/ChatRoomServer.Www/Areas/Api/Controllers/UsersController.cs +++ b/ChatRoomServer.Www/Areas/Api/Controllers/UsersController.cs @@ -7,33 +7,123 @@ using System.Web.Http; namespace ChatRoomServer.Www.Areas.Api.Controllers { + using System.Data.Entity; using System.Net.Http.Headers; + using System.Threading.Tasks; using System.Web.Http.Cors; using System.Web.Http.Results; using ChatRoomServer.Db; using ChatRoomServer.Db.Entities; - [RoutePrefix("api/users")] + [RoutePrefix("api/users"), Authorize] public class UsersController : ApiController { [Route("abuseList")] - public bool AbuseList([FromBody]Dictionary query) + public async Task AbuseList([FromBody]Dictionary query) { var pageindex = query.GetValue("pageIndex").ToInt32(1); var pageSize = query.GetValue("pageSize").ToInt32(20); var filter = query.GetValue("filter").ToInt32(-1); - var db=new ChatDb(); - var dbquery = db.AbuseReports.AsNoTracking().AsQueryable(); - if (filter != -1) - dbquery = dbquery.Where(s => s.Status == (ReportState)filter); - var totalCount = dbquery.Count(); - var items = dbquery.Skip(pageSize*(pageindex - 1)).Take(); + var db = new ChatDb(); + var data = await db.GetAbuseReportPagedList(filter, pageindex, pageSize); + //rooms + var msgids = (from p in data.Data select p.TargetId).Distinct().ToArray(); + var msgs = await db.MsgLogs.Where(s => msgids.Contains(s.Id)).ToDictionaryAsync(s => s.Id); + var roomids = (from p in msgs select p.Value.RoomId).Distinct().ToArray(); + var rooms = await db.Rooms.Where(s => roomids.Contains(s.ID)).ToDictionaryAsync(s => s.ID); + + return new + { + itemsCount = data.TotalCount, + items = data.Data.Select(s => + new + { + id = s.Id, + msg = msgs[s.TargetId], + room = rooms[msgs[s.TargetId].RoomId], + info = s + }) + }; + } + + [Route("updateAbuseReport")] + public async Task UpdateAbuseState([FromBody] Dictionary query) + { + var db = new ChatDb(); + var item = await db.AbuseReports.FindAsync(query["id"]); + if (item == null || item.Status != ReportState.Submited) + return new { success = false, message = "report not found or has been processed." }; + + var newStatus = query["status"]; + var msg = (string)null; + var result = true; + if (newStatus == 3) + { + //忽略 + item.Status = ReportState.Invalid; + } + else if (newStatus == 1 || newStatus == 2) + { + var username = newStatus == 1 ? item.TargetUser : item.ReportUser; + DateTime? expiresTime; + result = BanUser(username, query["bantime"], out expiresTime); + + item.Status = ReportState.Processed; + + if (result) + msg = $"已屏蔽指定用户。用户名：{username}，解封时间：" + (expiresTime.HasValue ? expiresTime.Value.ToString() : "永久") + "。"; + else msg = "操作失败。"; + } + + await db.SaveChangesAsync(); + + return new { success = result, message = msg ?? "更新成功。" }; + } + + bool BanUser(string username, int banTime, out DateTime? expiresTime) + { + var db = new ChatDb(); + //是否已经有屏蔽记录了？ + var currentRule = db.GetBlockRuleForUser(username).LastOrDefault(); + if (currentRule != null) + { + if (currentRule.UnblockTime != null) + { + //如果是隔期解开的，那么将会延长 + if (banTime == 0) + { + expiresTime = null; + currentRule.UnblockTime = null; + } + else + { + currentRule.UnblockTime = currentRule.UnblockTime.Value.AddMinutes(banTime); + expiresTime = currentRule.UnblockTime; + } + } + else + { + expiresTime = null; + } + } + else + { + currentRule = new BlockUser() + { + BlockTime = DateTime.Now, + UserName = username, + UnblockTime = banTime == 0 ? null : (DateTime?)DateTime.Now.AddMinutes(300) + }; + db.BlockUsers.Add(currentRule); + expiresTime = currentRule.UnblockTime; + } + + db.SaveChanges(); return true; - } } } diff --git a/ChatRoomServer.Www/ChatRoomServer.Www.csproj b/ChatRoomServer.Www/ChatRoomServer.Www.csproj index d30831a..c1ebb96 100644 --- a/ChatRoomServer.Www/ChatRoomServer.Www.csproj +++ b/ChatRoomServer.Www/ChatRoomServer.Www.csproj @@ -141,6 +141,7 @@ + @@ -149,6 +150,7 @@ + @@ -165,6 +167,7 @@ + @@ -190,6 +193,7 @@ + diff --git a/ChatRoomServer.Www/Content/site.css b/ChatRoomServer.Www/Content/site.css index 0a52059..c545031 100644 --- a/ChatRoomServer.Www/Content/site.css +++ b/ChatRoomServer.Www/Content/site.css @@ -2,9 +2,21 @@ padding-top: 70px; } +table.table-topspace { + margin-top: 15px; +} + h1.divider, h2.divider, h3.divider, h4.divider, h5.divider, h6.divider { border-bottom: 1px solid #eee; padding-top: 15px; padding-bottom: 15px; margin-bottom: 15px; } +.pagination select.form-control { + height: 18px; + padding: 0; + vertical-align: middle; + font-size: 12px; + display: inline-block; + width: auto; +} \ No newline at end of file diff --git a/ChatRoomServer.Www/Controllers/msgsController.cs b/ChatRoomServer.Www/Controllers/msgsController.cs new file mode 100644 index 0000000..f751500 --- /dev/null +++ b/ChatRoomServer.Www/Controllers/msgsController.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; + +namespace ChatRoomServer.Www.Controllers +{ + public class MsgsController : Controller + { + // GET: msgs + public ActionResult LogList() + { + return View(); + } + } +} \ No newline at end of file diff --git a/ChatRoomServer.Www/Global.asax.cs b/ChatRoomServer.Www/Global.asax.cs index 07a400d..da2c821 100644 --- a/ChatRoomServer.Www/Global.asax.cs +++ b/ChatRoomServer.Www/Global.asax.cs @@ -9,15 +9,26 @@ using System.Web.Routing; namespace ChatRoomServer.Www { - public class MvcApplication : System.Web.HttpApplication - { - protected void Application_Start() - { - AreaRegistration.RegisterAllAreas(); - GlobalConfiguration.Configure(WebApiConfig.Register); - FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); - RouteConfig.RegisterRoutes(RouteTable.Routes); - BundleConfig.RegisterBundles(BundleTable.Bundles); - } - } + using Newtonsoft.Json; + using Newtonsoft.Json.Serialization; + + public class MvcApplication : System.Web.HttpApplication + { + protected void Application_Start() + { + AreaRegistration.RegisterAllAreas(); + GlobalConfiguration.Configure(WebApiConfig.Register); + FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); + RouteConfig.RegisterRoutes(RouteTable.Routes); + BundleConfig.RegisterBundles(BundleTable.Bundles); + + //set json naming method + var cfg = GlobalConfiguration.Configuration.Formatters.JsonFormatter.SerializerSettings; + cfg.Formatting = Formatting.None; + cfg.ContractResolver = new CamelCasePropertyNamesContractResolver(); + RouteTable.Routes.RouteExistingFiles = false; + RouteTable.Routes.AppendTrailingSlash = true; + RouteTable.Routes.LowercaseUrls = true; + } + } } diff --git a/ChatRoomServer.Www/Scripts/_references.js b/ChatRoomServer.Www/Scripts/_references.js index 424836154f11be348c5e61318a85eabe20c585ba..8c1d0c17d831e0615f623bd5a2898cbba605eca1 100644 GIT binary patch delta 49 zcmdnP+{3bA597ptT56>Xc?>BGsSHI7#SF;|`9M0AL60E|$WvlaV9;l div').attr('aria-valuenow', commands[command]).css('width', commands[command] + '%'); + var newDelay = self.settings.delay - (self.settings.delay * (commands[command] / 100)); + this.$ele.data('notify-delay', newDelay); + this.$ele.find('[data-notify="progressbar"] > div').attr('aria-valuenow', commands[command]).css('width', commands[command] + '%'); + } + break; + case "showProgressbar": + if (commands[command] === true) { + this.$ele.find('[data-notify="progressbar"]').show(); + } else { + this.$ele.find('[data-notify="progressbar"]').hide(); + } break; case "url": this.$ele.find('[data-notify="url"]').attr('href', commands[command]); @@ -162,12 +168,70 @@ }, close: function () { self.close(); + return self; + }, + delayClose: function (timeout) { + timeout = timeout || 2000; + setTimeout(function () { + self.close(); + }, timeout); + return self; + }, + hideProgress: function () { + self.notify.update('showProgressbar', false); + return self.notify; + }, + showProgress: function () { + self.notify.update('showProgressbar', true); + return self.notify; + }, + setProgress: function (progress) { + progress = progress || -1; + self.notify.update('progress', progress); + return self.notify; + }, + setMessage: function (text) { + self.notify.update('message', text); + return self.notify; + }, + setTitle: function (text) { + self.notify.update('title', text); + return self.notify; + }, + setIcon: function (icon) { + self.notify.update('icon', icon); + return self.notify; + }, + setType: function (type) { + self.notify.update('type', type); + return self.notify; + }, + changeStatus:function(type, icon, title, message, progress) { + var notify = self.notify; + if (type) + notify.setType(type); + if (icon) + notify.setIcon(icon); + if (title) + notify.setTitle(title); + if (message) + notify.setMessage(message); + if (typeof (progress) !== 'undefined') { + if (progress === -2) + notify.hideProgress(); + else { + notify.showProgress(); + notify.setProgress(progress); + } + } + + return notify; } }; }, buildNotify: function () { var content = this.settings.content; - this.$ele = $(String.format(this.settings.template, this.settings.type, content.title, content.message, content.url, content.target, this.settings.size)); + this.$ele = $(String.format(this.settings.template, this.settings.type, content.title || "", content.message || "", content.url, content.target, this.settings.size)); this.$ele.attr('data-notify-position', this.settings.placement.from + '-' + this.settings.placement.align); if (!this.settings.allow_dismiss) { this.$ele.find('[data-notify="dismiss"]').css('display', 'none'); diff --git a/ChatRoomServer.Www/Scripts/controller.js b/ChatRoomServer.Www/Scripts/controller.js index 8bcfc50..e60d77a 100644 --- a/ChatRoomServer.Www/Scripts/controller.js +++ b/ChatRoomServer.Www/Scripts/controller.js @@ -10,6 +10,17 @@ var app = angular.module('chat12306', ['ngCookies']); return input; }; }); + app.filter('jsonDate', function () { + return function (input) { + var data = /^(\d{4}-\d{2}-\d{2})T([\d\:]+)/i.exec(input || ""); + return data && String.format("{0} {1}", data[1], data[2]) || input; + }; + }); + app.filter('abuseStatusDesc', function () { + return function (input) { + return ["未处理", "已处理", "已忽略", "已自动处理"][parseInt(input)]; + }; + }); app.filter('pagelist', function () { return function (current, max, pagePerSide) { max = parseInt(max); @@ -17,9 +28,8 @@ var app = angular.module('chat12306', ['ngCookies']); pagePerSide = parseInt(pagePerSide) || 4; var result = []; - for (var i = 1; i <= pagePerSide + 1; i++) { - if (i < max) - result.push(i); + for (var i = 1; i <= pagePerSide + 1 && i <= max; i++) { + result.push(i); } if (current - pagePerSide > pagePerSide + 1 + 1) { result.push(-1); @@ -31,7 +41,7 @@ var app = angular.module('chat12306', ['ngCookies']); } if (max - pagePerSide > current + pagePerSide + 1) result.push(-2); - for (var k = max - pagePerSide; k <= max; k++) { + for (var k = max - pagePerSide; k >= 1 && k <= max; k++) { result.push(k); } @@ -110,10 +120,12 @@ var app = angular.module('chat12306', ['ngCookies']); function abuseListController($scope, $http) { abuseListController.$inject = ['$scope', '$http']; + var controlApi = "/api/users/updateAbuseReport"; + $scope.filters = [{ typeid: -1, title: "所有" }, { typeid: 0, title: "未处理" }, { typeid: 1, title: "已处理" }, { typeid: 2, title: "已忽略" }, { typeid: 3, title: "已自动处理" }]; $scope.filterid = -1; $scope.items = [{ title: "test" }]; - $scope.pages = 20; + $scope.pages = 0; $scope.pageSize = 50; $scope.itemsCount = 0; $scope.pageIndex = 1; @@ -137,7 +149,7 @@ var app = angular.module('chat12306', ['ngCookies']); }, { delay: 0, progress: -1, - showProgressbar: false, + showProgressbar: true, allow_dismiss: false, placement: { from: "top", @@ -152,7 +164,7 @@ var app = angular.module('chat12306', ['ngCookies']); icon: "fa fa-check", showProgressbar: false }); - setTimeout(notify.close, 2000); + notify.close(); $scope.items = data.items; $scope.itemsCount = data.itemsCount || 0; @@ -161,9 +173,8 @@ var app = angular.module('chat12306', ['ngCookies']); notify.update({ "title": "加载失败，请重试。服务器错误啦....", type: "danger", - icon:"fa fa-ban", - showProgressbar: false, - placement: "" + icon: "fa fa-ban", + showProgressbar: false }); setTimeout(notify.close, 2000); $scope.items = []; @@ -184,9 +195,120 @@ var app = angular.module('chat12306', ['ngCookies']); $scope.go = function (pageOffset) { $scope.pageIndex = Math.max(1, Math.min($scope.pageIndex + pageOffset, $scope.pages)); }; + $scope.reload = function () { + load(); + }; + + //操作 + $scope.op = function (index, status) { + var item = $scope.items[index]; + if (!confirm("确认操作？")) + return; + + var notify = $.notify({ + title: "操作中，请稍等...", + "icon": "fa-spin fa fa-spinner", + type: "info" + }, { + delay: 0, + progress: -1, + showProgressbar: true, + allow_dismiss: false, + placement: { + from: "top", + align: "center" + } + }); + $http.post(controlApi, { id: item.id, status: status, bantime: item.bantime || "0" }) + .success(function (data) { + if (data.success) { + notify.update({ + "title": "操作成功...", + type: "success", + icon: "fa fa-check", + showProgressbar: false + }); + } else { + notify.changeStatus("danger", "fa fa-ban", "操作失败：" + data.message, null, -2); + } + setTimeout(notify.close, 2000); + + $("tr[data-id=" + item.id + "] button.btn").remove(); + }).error(function () { + notify.setTitle("操作失败，请重试。服务器错误啦....").setType("danger").setIcon("fa fa-ban").hideProgress().delayClose(); + }); + + }; $scope.$watch("filterid+pageIndex", function () { load(); }); } })(); +(function chatMessageListControllerContainer() { + function chatMessageListController($scope, $http) { + var listApi = "/api/msgs/list"; + + $scope.filter = { + searchUser: "", + pageIndex: 1, + pagesize : "20" + }; + $scope.pages = 0; + $scope.itemsCount = 0; + $scope.items = []; + + //加载 + $scope.reload = function () { + var notify = $.notify({ + title: "数据加载中...", + "icon": "fa-spin fa fa-spinner", + type: "info" + }, { + delay: 0, + progress: -1, + showProgressbar: true, + allow_dismiss: false, + placement: { + from: "top", + align: "center" + } + }); + $http.post(listApi, $scope.filter) + .success(function (data) { + if (data.success) { + notify.update({ + "title": "操作成功...", + type: "success", + icon: "fa fa-check", + showProgressbar: false + }); + $scope.items = data.items; + $scope.itemsCount = data.count; + } else { + notify.changeStatus("danger", "fa fa-ban", "加载失败：" + data.message, null, -2); + } + setTimeout(notify.close, 2000); + + $("tr[data-id=" + item.id + "] button.btn").remove(); + }).error(function () { + notify.setTitle("加载失败，请重试。服务器错误啦....").setType("danger").setIcon("fa fa-ban").hideProgress().delayClose(); + }); + }; + $scope.goPage = function (page) { + if (page <= 0) + return; + $scope.filter.pageIndex = page; + }; + $scope.go = function (pageOffset) { + $scope.filter.pageIndex = Math.max(1, Math.min($scope.filter.pageIndex + pageOffset, $scope.pages)); + }; + + + $scope.$watch("filter", function (newvalue, oldvalue) { + $scope.reload(); + }, true); + } + + app.controller("ChatMessageListController", ['$scope', '$http', chatMessageListController]); +})(); \ No newline at end of file diff --git a/ChatRoomServer.Www/Scripts/underscore.js b/ChatRoomServer.Www/Scripts/underscore.js new file mode 100644 index 0000000..b29332f --- /dev/null +++ b/ChatRoomServer.Www/Scripts/underscore.js @@ -0,0 +1,1548 @@ +// Underscore.js 1.8.3 +// http://underscorejs.org +// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors +// Underscore may be freely distributed under the MIT license. + +(function() { + + // Baseline setup + // -------------- + + // Establish the root object, `window` in the browser, or `exports` on the server. + var root = this; + + // Save the previous value of the `_` variable. + var previousUnderscore = root._; + + // Save bytes in the minified (but not gzipped) version: + var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype; + + // Create quick reference variables for speed access to core prototypes. + var + push = ArrayProto.push, + slice = ArrayProto.slice, + toString = ObjProto.toString, + hasOwnProperty = ObjProto.hasOwnProperty; + + // All **ECMAScript 5** native function implementations that we hope to use + // are declared here. + var + nativeIsArray = Array.isArray, + nativeKeys = Object.keys, + nativeBind = FuncProto.bind, + nativeCreate = Object.create; + + // Naked function reference for surrogate-prototype-swapping. + var Ctor = function(){}; + + // Create a safe reference to the Underscore object for use below. + var _ = function(obj) { + if (obj instanceof _) return obj; + if (!(this instanceof _)) return new _(obj); + this._wrapped = obj; + }; + + // Export the Underscore object for **Node.js**, with + // backwards-compatibility for the old `require()` API. If we're in + // the browser, add `_` as a global object. + if (typeof exports !== 'undefined') { + if (typeof module !== 'undefined' && module.exports) { + exports = module.exports = _; + } + exports._ = _; + } else { + root._ = _; + } + + // Current version. + _.VERSION = '1.8.3'; + + // Internal function that returns an efficient (for current engines) version + // of the passed-in callback, to be repeatedly applied in other Underscore + // functions. + var optimizeCb = function(func, context, argCount) { + if (context === void 0) return func; + switch (argCount == null ? 3 : argCount) { + case 1: return function(value) { + return func.call(context, value); + }; + case 2: return function(value, other) { + return func.call(context, value, other); + }; + case 3: return function(value, index, collection) { + return func.call(context, value, index, collection); + }; + case 4: return function(accumulator, value, index, collection) { + return func.call(context, accumulator, value, index, collection); + }; + } + return function() { + return func.apply(context, arguments); + }; + }; + + // A mostly-internal function to generate callbacks that can be applied + // to each element in a collection, returning the desired result — either + // identity, an arbitrary callback, a property matcher, or a property accessor. + var cb = function(value, context, argCount) { + if (value == null) return _.identity; + if (_.isFunction(value)) return optimizeCb(value, context, argCount); + if (_.isObject(value)) return _.matcher(value); + return _.property(value); + }; + _.iteratee = function(value, context) { + return cb(value, context, Infinity); + }; + + // An internal function for creating assigner functions. + var createAssigner = function(keysFunc, undefinedOnly) { + return function(obj) { + var length = arguments.length; + if (length < 2 || obj == null) return obj; + for (var index = 1; index < length; index++) { + var source = arguments[index], + keys = keysFunc(source), + l = keys.length; + for (var i = 0; i < l; i++) { + var key = keys[i]; + if (!undefinedOnly || obj[key] === void 0) obj[key] = source[key]; + } + } + return obj; + }; + }; + + // An internal function for creating a new object that inherits from another. + var baseCreate = function(prototype) { + if (!_.isObject(prototype)) return {}; + if (nativeCreate) return nativeCreate(prototype); + Ctor.prototype = prototype; + var result = new Ctor; + Ctor.prototype = null; + return result; + }; + + var property = function(key) { + return function(obj) { + return obj == null ? void 0 : obj[key]; + }; + }; + + // Helper for collection methods to determine whether a collection + // should be iterated as an array or as an object + // Related: http://people.mozilla.org/~jorendorff/es6-draft.html#sec-tolength + // Avoids a very nasty iOS 8 JIT bug on ARM-64. #2094 + var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1; + var getLength = property('length'); + var isArrayLike = function(collection) { + var length = getLength(collection); + return typeof length == 'number' && length >= 0 && length <= MAX_ARRAY_INDEX; + }; + + // Collection Functions + // -------------------- + + // The cornerstone, an `each` implementation, aka `forEach`. + // Handles raw objects in addition to array-likes. Treats all + // sparse array-likes as if they were dense. + _.each = _.forEach = function(obj, iteratee, context) { + iteratee = optimizeCb(iteratee, context); + var i, length; + if (isArrayLike(obj)) { + for (i = 0, length = obj.length; i < length; i++) { + iteratee(obj[i], i, obj); + } + } else { + var keys = _.keys(obj); + for (i = 0, length = keys.length; i < length; i++) { + iteratee(obj[keys[i]], keys[i], obj); + } + } + return obj; + }; + + // Return the results of applying the iteratee to each element. + _.map = _.collect = function(obj, iteratee, context) { + iteratee = cb(iteratee, context); + var keys = !isArrayLike(obj) && _.keys(obj), + length = (keys || obj).length, + results = Array(length); + for (var index = 0; index < length; index++) { + var currentKey = keys ? keys[index] : index; + results[index] = iteratee(obj[currentKey], currentKey, obj); + } + return results; + }; + + // Create a reducing function iterating left or right. + function createReduce(dir) { + // Optimized iterator function as using arguments.length + // in the main function will deoptimize the, see #1991. + function iterator(obj, iteratee, memo, keys, index, length) { + for (; index >= 0 && index < length; index += dir) { + var currentKey = keys ? keys[index] : index; + memo = iteratee(memo, obj[currentKey], currentKey, obj); + } + return memo; + } + + return function(obj, iteratee, memo, context) { + iteratee = optimizeCb(iteratee, context, 4); + var keys = !isArrayLike(obj) && _.keys(obj), + length = (keys || obj).length, + index = dir > 0 ? 0 : length - 1; + // Determine the initial value if none is provided. + if (arguments.length < 3) { + memo = obj[keys ? keys[index] : index]; + index += dir; + } + return iterator(obj, iteratee, memo, keys, index, length); + }; + } + + // **Reduce** builds up a single result from a list of values, aka `inject`, + // or `foldl`. + _.reduce = _.foldl = _.inject = createReduce(1); + + // The right-associative version of reduce, also known as `foldr`. + _.reduceRight = _.foldr = createReduce(-1); + + // Return the first value which passes a truth test. Aliased as `detect`. + _.find = _.detect = function(obj, predicate, context) { + var key; + if (isArrayLike(obj)) { + key = _.findIndex(obj, predicate, context); + } else { + key = _.findKey(obj, predicate, context); + } + if (key !== void 0 && key !== -1) return obj[key]; + }; + + // Return all the elements that pass a truth test. + // Aliased as `select`. + _.filter = _.select = function(obj, predicate, context) { + var results = []; + predicate = cb(predicate, context); + _.each(obj, function(value, index, list) { + if (predicate(value, index, list)) results.push(value); + }); + return results; + }; + + // Return all the elements for which a truth test fails. + _.reject = function(obj, predicate, context) { + return _.filter(obj, _.negate(cb(predicate)), context); + }; + + // Determine whether all of the elements match a truth test. + // Aliased as `all`. + _.every = _.all = function(obj, predicate, context) { + predicate = cb(predicate, context); + var keys = !isArrayLike(obj) && _.keys(obj), + length = (keys || obj).length; + for (var index = 0; index < length; index++) { + var currentKey = keys ? keys[index] : index; + if (!predicate(obj[currentKey], currentKey, obj)) return false; + } + return true; + }; + + // Determine if at least one element in the object matches a truth test. + // Aliased as `any`. + _.some = _.any = function(obj, predicate, context) { + predicate = cb(predicate, context); + var keys = !isArrayLike(obj) && _.keys(obj), + length = (keys || obj).length; + for (var index = 0; index < length; index++) { + var currentKey = keys ? keys[index] : index; + if (predicate(obj[currentKey], currentKey, obj)) return true; + } + return false; + }; + + // Determine if the array or object contains a given item (using `===`). + // Aliased as `includes` and `include`. + _.contains = _.includes = _.include = function(obj, item, fromIndex, guard) { + if (!isArrayLike(obj)) obj = _.values(obj); + if (typeof fromIndex != 'number' || guard) fromIndex = 0; + return _.indexOf(obj, item, fromIndex) >= 0; + }; + + // Invoke a method (with arguments) on every item in a collection. + _.invoke = function(obj, method) { + var args = slice.call(arguments, 2); + var isFunc = _.isFunction(method); + return _.map(obj, function(value) { + var func = isFunc ? method : value[method]; + return func == null ? func : func.apply(value, args); + }); + }; + + // Convenience version of a common use case of `map`: fetching a property. + _.pluck = function(obj, key) { + return _.map(obj, _.property(key)); + }; + + // Convenience version of a common use case of `filter`: selecting only objects + // containing specific `key:value` pairs. + _.where = function(obj, attrs) { + return _.filter(obj, _.matcher(attrs)); + }; + + // Convenience version of a common use case of `find`: getting the first object + // containing specific `key:value` pairs. + _.findWhere = function(obj, attrs) { + return _.find(obj, _.matcher(attrs)); + }; + + // Return the maximum element (or element-based computation). + _.max = function(obj, iteratee, context) { + var result = -Infinity, lastComputed = -Infinity, + value, computed; + if (iteratee == null && obj != null) { + obj = isArrayLike(obj) ? obj : _.values(obj); + for (var i = 0, length = obj.length; i < length; i++) { + value = obj[i]; + if (value > result) { + result = value; + } + } + } else { + iteratee = cb(iteratee, context); + _.each(obj, function(value, index, list) { + computed = iteratee(value, index, list); + if (computed > lastComputed || computed === -Infinity && result === -Infinity) { + result = value; + lastComputed = computed; + } + }); + } + return result; + }; + + // Return the minimum element (or element-based computation). + _.min = function(obj, iteratee, context) { + var result = Infinity, lastComputed = Infinity, + value, computed; + if (iteratee == null && obj != null) { + obj = isArrayLike(obj) ? obj : _.values(obj); + for (var i = 0, length = obj.length; i < length; i++) { + value = obj[i]; + if (value < result) { + result = value; + } + } + } else { + iteratee = cb(iteratee, context); + _.each(obj, function(value, index, list) { + computed = iteratee(value, index, list); + if (computed < lastComputed || computed === Infinity && result === Infinity) { + result = value; + lastComputed = computed; + } + }); + } + return result; + }; + + // Shuffle a collection, using the modern version of the + // [Fisher-Yates shuffle](http://en.wikipedia.org/wiki/Fisher–Yates_shuffle). + _.shuffle = function(obj) { + var set = isArrayLike(obj) ? obj : _.values(obj); + var length = set.length; + var shuffled = Array(length); + for (var index = 0, rand; index < length; index++) { + rand = _.random(0, index); + if (rand !== index) shuffled[index] = shuffled[rand]; + shuffled[rand] = set[index]; + } + return shuffled; + }; + + // Sample **n** random values from a collection. + // If **n** is not specified, returns a single random element. + // The internal `guard` argument allows it to work with `map`. + _.sample = function(obj, n, guard) { + if (n == null || guard) { + if (!isArrayLike(obj)) obj = _.values(obj); + return obj[_.random(obj.length - 1)]; + } + return _.shuffle(obj).slice(0, Math.max(0, n)); + }; + + // Sort the object's values by a criterion produced by an iteratee. + _.sortBy = function(obj, iteratee, context) { + iteratee = cb(iteratee, context); + return _.pluck(_.map(obj, function(value, index, list) { + return { + value: value, + index: index, + criteria: iteratee(value, index, list) + }; + }).sort(function(left, right) { + var a = left.criteria; + var b = right.criteria; + if (a !== b) { + if (a > b || a === void 0) return 1; + if (a < b || b === void 0) return -1; + } + return left.index - right.index; + }), 'value'); + }; + + // An internal function used for aggregate "group by" operations. + var group = function(behavior) { + return function(obj, iteratee, context) { + var result = {}; + iteratee = cb(iteratee, context); + _.each(obj, function(value, index) { + var key = iteratee(value, index, obj); + behavior(result, value, key); + }); + return result; + }; + }; + + // Groups the object's values by a criterion. Pass either a string attribute + // to group by, or a function that returns the criterion. + _.groupBy = group(function(result, value, key) { + if (_.has(result, key)) result[key].push(value); else result[key] = [value]; + }); + + // Indexes the object's values by a criterion, similar to `groupBy`, but for + // when you know that your index values will be unique. + _.indexBy = group(function(result, value, key) { + result[key] = value; + }); + + // Counts instances of an object that group by a certain criterion. Pass + // either a string attribute to count by, or a function that returns the + // criterion. + _.countBy = group(function(result, value, key) { + if (_.has(result, key)) result[key]++; else result[key] = 1; + }); + + // Safely create a real, live array from anything iterable. + _.toArray = function(obj) { + if (!obj) return []; + if (_.isArray(obj)) return slice.call(obj); + if (isArrayLike(obj)) return _.map(obj, _.identity); + return _.values(obj); + }; + + // Return the number of elements in an object. + _.size = function(obj) { + if (obj == null) return 0; + return isArrayLike(obj) ? obj.length : _.keys(obj).length; + }; + + // Split a collection into two arrays: one whose elements all satisfy the given + // predicate, and one whose elements all do not satisfy the predicate. + _.partition = function(obj, predicate, context) { + predicate = cb(predicate, context); + var pass = [], fail = []; + _.each(obj, function(value, key, obj) { + (predicate(value, key, obj) ? pass : fail).push(value); + }); + return [pass, fail]; + }; + + // Array Functions + // --------------- + + // Get the first element of an array. Passing **n** will return the first N + // values in the array. Aliased as `head` and `take`. The **guard** check + // allows it to work with `_.map`. + _.first = _.head = _.take = function(array, n, guard) { + if (array == null) return void 0; + if (n == null || guard) return array[0]; + return _.initial(array, array.length - n); + }; + + // Returns everything but the last entry of the array. Especially useful on + // the arguments object. Passing **n** will return all the values in + // the array, excluding the last N. + _.initial = function(array, n, guard) { + return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n))); + }; + + // Get the last element of an array. Passing **n** will return the last N + // values in the array. + _.last = function(array, n, guard) { + if (array == null) return void 0; + if (n == null || guard) return array[array.length - 1]; + return _.rest(array, Math.max(0, array.length - n)); + }; + + // Returns everything but the first entry of the array. Aliased as `tail` and `drop`. + // Especially useful on the arguments object. Passing an **n** will return + // the rest N values in the array. + _.rest = _.tail = _.drop = function(array, n, guard) { + return slice.call(array, n == null || guard ? 1 : n); + }; + + // Trim out all falsy values from an array. + _.compact = function(array) { + return _.filter(array, _.identity); + }; + + // Internal implementation of a recursive `flatten` function. + var flatten = function(input, shallow, strict, startIndex) { + var output = [], idx = 0; + for (var i = startIndex || 0, length = getLength(input); i < length; i++) { + var value = input[i]; + if (isArrayLike(value) && (_.isArray(value) || _.isArguments(value))) { + //flatten current level of array or arguments object + if (!shallow) value = flatten(value, shallow, strict); + var j = 0, len = value.length; + output.length += len; + while (j < len) { + output[idx++] = value[j++]; + } + } else if (!strict) { + output[idx++] = value; + } + } + return output; + }; + + // Flatten out an array, either recursively (by default), or just one level. + _.flatten = function(array, shallow) { + return flatten(array, shallow, false); + }; + + // Return a version of the array that does not contain the specified value(s). + _.without = function(array) { + return _.difference(array, slice.call(arguments, 1)); + }; + + // Produce a duplicate-free version of the array. If the array has already + // been sorted, you have the option of using a faster algorithm. + // Aliased as `unique`. + _.uniq = _.unique = function(array, isSorted, iteratee, context) { + if (!_.isBoolean(isSorted)) { + context = iteratee; + iteratee = isSorted; + isSorted = false; + } + if (iteratee != null) iteratee = cb(iteratee, context); + var result = []; + var seen = []; + for (var i = 0, length = getLength(array); i < length; i++) { + var value = array[i], + computed = iteratee ? iteratee(value, i, array) : value; + if (isSorted) { + if (!i || seen !== computed) result.push(value); + seen = computed; + } else if (iteratee) { + if (!_.contains(seen, computed)) { + seen.push(computed); + result.push(value); + } + } else if (!_.contains(result, value)) { + result.push(value); + } + } + return result; + }; + + // Produce an array that contains the union: each distinct element from all of + // the passed-in arrays. + _.union = function() { + return _.uniq(flatten(arguments, true, true)); + }; + + // Produce an array that contains every item shared between all the + // passed-in arrays. + _.intersection = function(array) { + var result = []; + var argsLength = arguments.length; + for (var i = 0, length = getLength(array); i < length; i++) { + var item = array[i]; + if (_.contains(result, item)) continue; + for (var j = 1; j < argsLength; j++) { + if (!_.contains(arguments[j], item)) break; + } + if (j === argsLength) result.push(item); + } + return result; + }; + + // Take the difference between one array and a number of other arrays. + // Only the elements present in just the first array will remain. + _.difference = function(array) { + var rest = flatten(arguments, true, true, 1); + return _.filter(array, function(value){ + return !_.contains(rest, value); + }); + }; + + // Zip together multiple lists into a single array -- elements that share + // an index go together. + _.zip = function() { + return _.unzip(arguments); + }; + + // Complement of _.zip. Unzip accepts an array of arrays and groups + // each array's elements on shared indices + _.unzip = function(array) { + var length = array && _.max(array, getLength).length || 0; + var result = Array(length); + + for (var index = 0; index < length; index++) { + result[index] = _.pluck(array, index); + } + return result; + }; + + // Converts lists into objects. Pass either a single array of `[key, value]` + // pairs, or two parallel arrays of the same length -- one of keys, and one of + // the corresponding values. + _.object = function(list, values) { + var result = {}; + for (var i = 0, length = getLength(list); i < length; i++) { + if (values) { + result[list[i]] = values[i]; + } else { + result[list[i][0]] = list[i][1]; + } + } + return result; + }; + + // Generator function to create the findIndex and findLastIndex functions + function createPredicateIndexFinder(dir) { + return function(array, predicate, context) { + predicate = cb(predicate, context); + var length = getLength(array); + var index = dir > 0 ? 0 : length - 1; + for (; index >= 0 && index < length; index += dir) { + if (predicate(array[index], index, array)) return index; + } + return -1; + }; + } + + // Returns the first index on an array-like that passes a predicate test + _.findIndex = createPredicateIndexFinder(1); + _.findLastIndex = createPredicateIndexFinder(-1); + + // Use a comparator function to figure out the smallest index at which + // an object should be inserted so as to maintain order. Uses binary search. + _.sortedIndex = function(array, obj, iteratee, context) { + iteratee = cb(iteratee, context, 1); + var value = iteratee(obj); + var low = 0, high = getLength(array); + while (low < high) { + var mid = Math.floor((low + high) / 2); + if (iteratee(array[mid]) < value) low = mid + 1; else high = mid; + } + return low; + }; + + // Generator function to create the indexOf and lastIndexOf functions + function createIndexFinder(dir, predicateFind, sortedIndex) { + return function(array, item, idx) { + var i = 0, length = getLength(array); + if (typeof idx == 'number') { + if (dir > 0) { + i = idx >= 0 ? idx : Math.max(idx + length, i); + } else { + length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1; + } + } else if (sortedIndex && idx && length) { + idx = sortedIndex(array, item); + return array[idx] === item ? idx : -1; + } + if (item !== item) { + idx = predicateFind(slice.call(array, i, length), _.isNaN); + return idx >= 0 ? idx + i : -1; + } + for (idx = dir > 0 ? i : length - 1; idx >= 0 && idx < length; idx += dir) { + if (array[idx] === item) return idx; + } + return -1; + }; + } + + // Return the position of the first occurrence of an item in an array, + // or -1 if the item is not included in the array. + // If the array is large and already in sort order, pass `true` + // for **isSorted** to use binary search. + _.indexOf = createIndexFinder(1, _.findIndex, _.sortedIndex); + _.lastIndexOf = createIndexFinder(-1, _.findLastIndex); + + // Generate an integer Array containing an arithmetic progression. A port of + // the native Python `range()` function. See + // [the Python documentation](http://docs.python.org/library/functions.html#range). + _.range = function(start, stop, step) { + if (stop == null) { + stop = start || 0; + start = 0; + } + step = step || 1; + + var length = Math.max(Math.ceil((stop - start) / step), 0); + var range = Array(length); + + for (var idx = 0; idx < length; idx++, start += step) { + range[idx] = start; + } + + return range; + }; + + // Function (ahem) Functions + // ------------------ + + // Determines whether to execute a function as a constructor + // or a normal function with the provided arguments + var executeBound = function(sourceFunc, boundFunc, context, callingContext, args) { + if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args); + var self = baseCreate(sourceFunc.prototype); + var result = sourceFunc.apply(self, args); + if (_.isObject(result)) return result; + return self; + }; + + // Create a function bound to a given object (assigning `this`, and arguments, + // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if + // available. + _.bind = function(func, context) { + if (nativeBind && func.bind === nativeBind) return nativeBind.apply(func, slice.call(arguments, 1)); + if (!_.isFunction(func)) throw new TypeError('Bind must be called on a function'); + var args = slice.call(arguments, 2); + var bound = function() { + return executeBound(func, bound, context, this, args.concat(slice.call(arguments))); + }; + return bound; + }; + + // Partially apply a function by creating a version that has had some of its + // arguments pre-filled, without changing its dynamic `this` context. _ acts + // as a placeholder, allowing any combination of arguments to be pre-filled. + _.partial = function(func) { + var boundArgs = slice.call(arguments, 1); + var bound = function() { + var position = 0, length = boundArgs.length; + var args = Array(length); + for (var i = 0; i < length; i++) { + args[i] = boundArgs[i] === _ ? arguments[position++] : boundArgs[i]; + } + while (position < arguments.length) args.push(arguments[position++]); + return executeBound(func, bound, this, this, args); + }; + return bound; + }; + + // Bind a number of an object's methods to that object. Remaining arguments + // are the method names to be bound. Useful for ensuring that all callbacks + // defined on an object belong to it. + _.bindAll = function(obj) { + var i, length = arguments.length, key; + if (length <= 1) throw new Error('bindAll must be passed function names'); + for (i = 1; i < length; i++) { + key = arguments[i]; + obj[key] = _.bind(obj[key], obj); + } + return obj; + }; + + // Memoize an expensive function by storing its results. + _.memoize = function(func, hasher) { + var memoize = function(key) { + var cache = memoize.cache; + var address = '' + (hasher ? hasher.apply(this, arguments) : key); + if (!_.has(cache, address)) cache[address] = func.apply(this, arguments); + return cache[address]; + }; + memoize.cache = {}; + return memoize; + }; + + // Delays a function for the given number of milliseconds, and then calls + // it with the arguments supplied. + _.delay = function(func, wait) { + var args = slice.call(arguments, 2); + return setTimeout(function(){ + return func.apply(null, args); + }, wait); + }; + + // Defers a function, scheduling it to run after the current call stack has + // cleared. + _.defer = _.partial(_.delay, _, 1); + + // Returns a function, that, when invoked, will only be triggered at most once + // during a given window of time. Normally, the throttled function will run + // as much as it can, without ever going more than once per `wait` duration; + // but if you'd like to disable the execution on the leading edge, pass + // `{leading: false}`. To disable execution on the trailing edge, ditto. + _.throttle = function(func, wait, options) { + var context, args, result; + var timeout = null; + var previous = 0; + if (!options) options = {}; + var later = function() { + previous = options.leading === false ? 0 : _.now(); + timeout = null; + result = func.apply(context, args); + if (!timeout) context = args = null; + }; + return function() { + var now = _.now(); + if (!previous && options.leading === false) previous = now; + var remaining = wait - (now - previous); + context = this; + args = arguments; + if (remaining <= 0 || remaining > wait) { + if (timeout) { + clearTimeout(timeout); + timeout = null; + } + previous = now; + result = func.apply(context, args); + if (!timeout) context = args = null; + } else if (!timeout && options.trailing !== false) { + timeout = setTimeout(later, remaining); + } + return result; + }; + }; + + // Returns a function, that, as long as it continues to be invoked, will not + // be triggered. The function will be called after it stops being called for + // N milliseconds. If `immediate` is passed, trigger the function on the + // leading edge, instead of the trailing. + _.debounce = function(func, wait, immediate) { + var timeout, args, context, timestamp, result; + + var later = function() { + var last = _.now() - timestamp; + + if (last < wait && last >= 0) { + timeout = setTimeout(later, wait - last); + } else { + timeout = null; + if (!immediate) { + result = func.apply(context, args); + if (!timeout) context = args = null; + } + } + }; + + return function() { + context = this; + args = arguments; + timestamp = _.now(); + var callNow = immediate && !timeout; + if (!timeout) timeout = setTimeout(later, wait); + if (callNow) { + result = func.apply(context, args); + context = args = null; + } + + return result; + }; + }; + + // Returns the first function passed as an argument to the second, + // allowing you to adjust arguments, run code before and after, and + // conditionally execute the original function. + _.wrap = function(func, wrapper) { + return _.partial(wrapper, func); + }; + + // Returns a negated version of the passed-in predicate. + _.negate = function(predicate) { + return function() { + return !predicate.apply(this, arguments); + }; + }; + + // Returns a function that is the composition of a list of functions, each + // consuming the return value of the function that follows. + _.compose = function() { + var args = arguments; + var start = args.length - 1; + return function() { + var i = start; + var result = args[start].apply(this, arguments); + while (i--) result = args[i].call(this, result); + return result; + }; + }; + + // Returns a function that will only be executed on and after the Nth call. + _.after = function(times, func) { + return function() { + if (--times < 1) { + return func.apply(this, arguments); + } + }; + }; + + // Returns a function that will only be executed up to (but not including) the Nth call. + _.before = function(times, func) { + var memo; + return function() { + if (--times > 0) { + memo = func.apply(this, arguments); + } + if (times <= 1) func = null; + return memo; + }; + }; + + // Returns a function that will be executed at most one time, no matter how + // often you call it. Useful for lazy initialization. + _.once = _.partial(_.before, 2); + + // Object Functions + // ---------------- + + // Keys in IE < 9 that won't be iterated by `for key in ...` and thus missed. + var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString'); + var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString', + 'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString']; + + function collectNonEnumProps(obj, keys) { + var nonEnumIdx = nonEnumerableProps.length; + var constructor = obj.constructor; + var proto = (_.isFunction(constructor) && constructor.prototype) || ObjProto; + + // Constructor is a special case. + var prop = 'constructor'; + if (_.has(obj, prop) && !_.contains(keys, prop)) keys.push(prop); + + while (nonEnumIdx--) { + prop = nonEnumerableProps[nonEnumIdx]; + if (prop in obj && obj[prop] !== proto[prop] && !_.contains(keys, prop)) { + keys.push(prop); + } + } + } + + // Retrieve the names of an object's own properties. + // Delegates to **ECMAScript 5**'s native `Object.keys` + _.keys = function(obj) { + if (!_.isObject(obj)) return []; + if (nativeKeys) return nativeKeys(obj); + var keys = []; + for (var key in obj) if (_.has(obj, key)) keys.push(key); + // Ahem, IE < 9. + if (hasEnumBug) collectNonEnumProps(obj, keys); + return keys; + }; + + // Retrieve all the property names of an object. + _.allKeys = function(obj) { + if (!_.isObject(obj)) return []; + var keys = []; + for (var key in obj) keys.push(key); + // Ahem, IE < 9. + if (hasEnumBug) collectNonEnumProps(obj, keys); + return keys; + }; + + // Retrieve the values of an object's properties. + _.values = function(obj) { + var keys = _.keys(obj); + var length = keys.length; + var values = Array(length); + for (var i = 0; i < length; i++) { + values[i] = obj[keys[i]]; + } + return values; + }; + + // Returns the results of applying the iteratee to each element of the object + // In contrast to _.map it returns an object + _.mapObject = function(obj, iteratee, context) { + iteratee = cb(iteratee, context); + var keys = _.keys(obj), + length = keys.length, + results = {}, + currentKey; + for (var index = 0; index < length; index++) { + currentKey = keys[index]; + results[currentKey] = iteratee(obj[currentKey], currentKey, obj); + } + return results; + }; + + // Convert an object into a list of `[key, value]` pairs. + _.pairs = function(obj) { + var keys = _.keys(obj); + var length = keys.length; + var pairs = Array(length); + for (var i = 0; i < length; i++) { + pairs[i] = [keys[i], obj[keys[i]]]; + } + return pairs; + }; + + // Invert the keys and values of an object. The values must be serializable. + _.invert = function(obj) { + var result = {}; + var keys = _.keys(obj); + for (var i = 0, length = keys.length; i < length; i++) { + result[obj[keys[i]]] = keys[i]; + } + return result; + }; + + // Return a sorted list of the function names available on the object. + // Aliased as `methods` + _.functions = _.methods = function(obj) { + var names = []; + for (var key in obj) { + if (_.isFunction(obj[key])) names.push(key); + } + return names.sort(); + }; + + // Extend a given object with all the properties in passed-in object(s). + _.extend = createAssigner(_.allKeys); + + // Assigns a given object with all the own properties in the passed-in object(s) + // (https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/assign) + _.extendOwn = _.assign = createAssigner(_.keys); + + // Returns the first key on an object that passes a predicate test + _.findKey = function(obj, predicate, context) { + predicate = cb(predicate, context); + var keys = _.keys(obj), key; + for (var i = 0, length = keys.length; i < length; i++) { + key = keys[i]; + if (predicate(obj[key], key, obj)) return key; + } + }; + + // Return a copy of the object only containing the whitelisted properties. + _.pick = function(object, oiteratee, context) { + var result = {}, obj = object, iteratee, keys; + if (obj == null) return result; + if (_.isFunction(oiteratee)) { + keys = _.allKeys(obj); + iteratee = optimizeCb(oiteratee, context); + } else { + keys = flatten(arguments, false, false, 1); + iteratee = function(value, key, obj) { return key in obj; }; + obj = Object(obj); + } + for (var i = 0, length = keys.length; i < length; i++) { + var key = keys[i]; + var value = obj[key]; + if (iteratee(value, key, obj)) result[key] = value; + } + return result; + }; + + // Return a copy of the object without the blacklisted properties. + _.omit = function(obj, iteratee, context) { + if (_.isFunction(iteratee)) { + iteratee = _.negate(iteratee); + } else { + var keys = _.map(flatten(arguments, false, false, 1), String); + iteratee = function(value, key) { + return !_.contains(keys, key); + }; + } + return _.pick(obj, iteratee, context); + }; + + // Fill in a given object with default properties. + _.defaults = createAssigner(_.allKeys, true); + + // Creates an object that inherits from the given prototype object. + // If additional properties are provided then they will be added to the + // created object. + _.create = function(prototype, props) { + var result = baseCreate(prototype); + if (props) _.extendOwn(result, props); + return result; + }; + + // Create a (shallow-cloned) duplicate of an object. + _.clone = function(obj) { + if (!_.isObject(obj)) return obj; + return _.isArray(obj) ? obj.slice() : _.extend({}, obj); + }; + + // Invokes interceptor with the obj, and then returns obj. + // The primary purpose of this method is to "tap into" a method chain, in + // order to perform operations on intermediate results within the chain. + _.tap = function(obj, interceptor) { + interceptor(obj); + return obj; + }; + + // Returns whether an object has a given set of `key:value` pairs. + _.isMatch = function(object, attrs) { + var keys = _.keys(attrs), length = keys.length; + if (object == null) return !length; + var obj = Object(object); + for (var i = 0; i < length; i++) { + var key = keys[i]; + if (attrs[key] !== obj[key] || !(key in obj)) return false; + } + return true; + }; + + + // Internal recursive comparison function for `isEqual`. + var eq = function(a, b, aStack, bStack) { + // Identical objects are equal. `0 === -0`, but they aren't identical. + // See the [Harmony `egal` proposal](http://wiki.ecmascript.org/doku.php?id=harmony:egal). + if (a === b) return a !== 0 || 1 / a === 1 / b; + // A strict comparison is necessary because `null == undefined`. + if (a == null || b == null) return a === b; + // Unwrap any wrapped objects. + if (a instanceof _) a = a._wrapped; + if (b instanceof _) b = b._wrapped; + // Compare `[[Class]]` names. + var className = toString.call(a); + if (className !== toString.call(b)) return false; + switch (className) { + // Strings, numbers, regular expressions, dates, and booleans are compared by value. + case '[object RegExp]': + // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i') + case '[object String]': + // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is + // equivalent to `new String("5")`. + return '' + a === '' + b; + case '[object Number]': + // `NaN`s are equivalent, but non-reflexive. + // Object(NaN) is equivalent to NaN + if (+a !== +a) return +b !== +b; + // An `egal` comparison is performed for other numeric values. + return +a === 0 ? 1 / +a === 1 / b : +a === +b; + case '[object Date]': + case '[object Boolean]': + // Coerce dates and booleans to numeric primitive values. Dates are compared by their + // millisecond representations. Note that invalid dates with millisecond representations + // of `NaN` are not equivalent. + return +a === +b; + } + + var areArrays = className === '[object Array]'; + if (!areArrays) { + if (typeof a != 'object' || typeof b != 'object') return false; + + // Objects with different constructors are not equivalent, but `Object`s or `Array`s + // from different frames are. + var aCtor = a.constructor, bCtor = b.constructor; + if (aCtor !== bCtor && !(_.isFunction(aCtor) && aCtor instanceof aCtor && + _.isFunction(bCtor) && bCtor instanceof bCtor) + && ('constructor' in a && 'constructor' in b)) { + return false; + } + } + // Assume equality for cyclic structures. The algorithm for detecting cyclic + // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`. + + // Initializing stack of traversed objects. + // It's done here since we only need them for objects and arrays comparison. + aStack = aStack || []; + bStack = bStack || []; + var length = aStack.length; + while (length--) { + // Linear search. Performance is inversely proportional to the number of + // unique nested structures. + if (aStack[length] === a) return bStack[length] === b; + } + + // Add the first object to the stack of traversed objects. + aStack.push(a); + bStack.push(b); + + // Recursively compare objects and arrays. + if (areArrays) { + // Compare array lengths to determine if a deep comparison is necessary. + length = a.length; + if (length !== b.length) return false; + // Deep compare the contents, ignoring non-numeric properties. + while (length--) { + if (!eq(a[length], b[length], aStack, bStack)) return false; + } + } else { + // Deep compare objects. + var keys = _.keys(a), key; + length = keys.length; + // Ensure that both objects contain the same number of properties before comparing deep equality. + if (_.keys(b).length !== length) return false; + while (length--) { + // Deep compare each member + key = keys[length]; + if (!(_.has(b, key) && eq(a[key], b[key], aStack, bStack))) return false; + } + } + // Remove the first object from the stack of traversed objects. + aStack.pop(); + bStack.pop(); + return true; + }; + + // Perform a deep comparison to check if two objects are equal. + _.isEqual = function(a, b) { + return eq(a, b); + }; + + // Is a given array, string, or object empty? + // An "empty" object has no enumerable own-properties. + _.isEmpty = function(obj) { + if (obj == null) return true; + if (isArrayLike(obj) && (_.isArray(obj) || _.isString(obj) || _.isArguments(obj))) return obj.length === 0; + return _.keys(obj).length === 0; + }; + + // Is a given value a DOM element? + _.isElement = function(obj) { + return !!(obj && obj.nodeType === 1); + }; + + // Is a given value an array? + // Delegates to ECMA5's native Array.isArray + _.isArray = nativeIsArray || function(obj) { + return toString.call(obj) === '[object Array]'; + }; + + // Is a given variable an object? + _.isObject = function(obj) { + var type = typeof obj; + return type === 'function' || type === 'object' && !!obj; + }; + + // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp, isError. + _.each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp', 'Error'], function(name) { + _['is' + name] = function(obj) { + return toString.call(obj) === '[object ' + name + ']'; + }; + }); + + // Define a fallback version of the method in browsers (ahem, IE < 9), where + // there isn't any inspectable "Arguments" type. + if (!_.isArguments(arguments)) { + _.isArguments = function(obj) { + return _.has(obj, 'callee'); + }; + } + + // Optimize `isFunction` if appropriate. Work around some typeof bugs in old v8, + // IE 11 (#1621), and in Safari 8 (#1929). + if (typeof /./ != 'function' && typeof Int8Array != 'object') { + _.isFunction = function(obj) { + return typeof obj == 'function' || false; + }; + } + + // Is a given object a finite number? + _.isFinite = function(obj) { + return isFinite(obj) && !isNaN(parseFloat(obj)); + }; + + // Is the given value `NaN`? (NaN is the only number which does not equal itself). + _.isNaN = function(obj) { + return _.isNumber(obj) && obj !== +obj; + }; + + // Is a given value a boolean? + _.isBoolean = function(obj) { + return obj === true || obj === false || toString.call(obj) === '[object Boolean]'; + }; + + // Is a given value equal to null? + _.isNull = function(obj) { + return obj === null; + }; + + // Is a given variable undefined? + _.isUndefined = function(obj) { + return obj === void 0; + }; + + // Shortcut function for checking if an object has a given property directly + // on itself (in other words, not on a prototype). + _.has = function(obj, key) { + return obj != null && hasOwnProperty.call(obj, key); + }; + + // Utility Functions + // ----------------- + + // Run Underscore.js in *noConflict* mode, returning the `_` variable to its + // previous owner. Returns a reference to the Underscore object. + _.noConflict = function() { + root._ = previousUnderscore; + return this; + }; + + // Keep the identity function around for default iteratees. + _.identity = function(value) { + return value; + }; + + // Predicate-generating functions. Often useful outside of Underscore. + _.constant = function(value) { + return function() { + return value; + }; + }; + + _.noop = function(){}; + + _.property = property; + + // Generates a function for a given object that returns a given property. + _.propertyOf = function(obj) { + return obj == null ? function(){} : function(key) { + return obj[key]; + }; + }; + + // Returns a predicate for checking whether an object has a given set of + // `key:value` pairs. + _.matcher = _.matches = function(attrs) { + attrs = _.extendOwn({}, attrs); + return function(obj) { + return _.isMatch(obj, attrs); + }; + }; + + // Run a function **n** times. + _.times = function(n, iteratee, context) { + var accum = Array(Math.max(0, n)); + iteratee = optimizeCb(iteratee, context, 1); + for (var i = 0; i < n; i++) accum[i] = iteratee(i); + return accum; + }; + + // Return a random integer between min and max (inclusive). + _.random = function(min, max) { + if (max == null) { + max = min; + min = 0; + } + return min + Math.floor(Math.random() * (max - min + 1)); + }; + + // A (possibly faster) way to get the current timestamp as an integer. + _.now = Date.now || function() { + return new Date().getTime(); + }; + + // List of HTML entities for escaping. + var escapeMap = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '`': '`' + }; + var unescapeMap = _.invert(escapeMap); + + // Functions for escaping and unescaping strings to/from HTML interpolation. + var createEscaper = function(map) { + var escaper = function(match) { + return map[match]; + }; + // Regexes for identifying a key that needs to be escaped + var source = '(?:' + _.keys(map).join('|') + ')'; + var testRegexp = RegExp(source); + var replaceRegexp = RegExp(source, 'g'); + return function(string) { + string = string == null ? '' : '' + string; + return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string; + }; + }; + _.escape = createEscaper(escapeMap); + _.unescape = createEscaper(unescapeMap); + + // If the value of the named `property` is a function then invoke it with the + // `object` as context; otherwise, return it. + _.result = function(object, property, fallback) { + var value = object == null ? void 0 : object[property]; + if (value === void 0) { + value = fallback; + } + return _.isFunction(value) ? value.call(object) : value; + }; + + // Generate a unique integer id (unique within the entire client session). + // Useful for temporary DOM ids. + var idCounter = 0; + _.uniqueId = function(prefix) { + var id = ++idCounter + ''; + return prefix ? prefix + id : id; + }; + + // By default, Underscore uses ERB-style template delimiters, change the + // following template settings to use alternative delimiters. + _.templateSettings = { + evaluate : /<%([\s\S]+?)%>/g, + interpolate : /<%=([\s\S]+?)%>/g, + escape : /<%-([\s\S]+?)%>/g + }; + + // When customizing `templateSettings`, if you don't want to define an + // interpolation, evaluation or escaping regex, we need one that is + // guaranteed not to match. + var noMatch = /(.)^/; + + // Certain characters need to be escaped so that they can be put into a + // string literal. + var escapes = { + "'": "'", + '\\': '\\', + '\r': 'r', + '\n': 'n', + '\u2028': 'u2028', + '\u2029': 'u2029' + }; + + var escaper = /\\|'|\r|\n|\u2028|\u2029/g; + + var escapeChar = function(match) { + return '\\' + escapes[match]; + }; + + // JavaScript micro-templating, similar to John Resig's implementation. + // Underscore templating handles arbitrary delimiters, preserves whitespace, + // and correctly escapes quotes within interpolated code. + // NB: `oldSettings` only exists for backwards compatibility. + _.template = function(text, settings, oldSettings) { + if (!settings && oldSettings) settings = oldSettings; + settings = _.defaults({}, settings, _.templateSettings); + + // Combine delimiters into one regular expression via alternation. + var matcher = RegExp([ + (settings.escape || noMatch).source, + (settings.interpolate || noMatch).source, + (settings.evaluate || noMatch).source + ].join('|') + '|$', 'g'); + + // Compile the template source, escaping string literals appropriately. + var index = 0; + var source = "__p+='"; + text.replace(matcher, function(match, escape, interpolate, evaluate, offset) { + source += text.slice(index, offset).replace(escaper, escapeChar); + index = offset + match.length; + + if (escape) { + source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'"; + } else if (interpolate) { + source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'"; + } else if (evaluate) { + source += "';\n" + evaluate + "\n__p+='"; + } + + // Adobe VMs need the match returned to produce the correct offest. + return match; + }); + source += "';\n"; + + // If a variable is not specified, place data values in local scope. + if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n'; + + source = "var __t,__p='',__j=Array.prototype.join," + + "print=function(){__p+=__j.call(arguments,'');};\n" + + source + 'return __p;\n'; + + try { + var render = new Function(settings.variable || 'obj', '_', source); + } catch (e) { + e.source = source; + throw e; + } + + var template = function(data) { + return render.call(this, data, _); + }; + + // Provide the compiled source as a convenience for precompilation. + var argument = settings.variable || 'obj'; + template.source = 'function(' + argument + '){\n' + source + '}'; + + return template; + }; + + // Add a "chain" function. Start chaining a wrapped Underscore object. + _.chain = function(obj) { + var instance = _(obj); + instance._chain = true; + return instance; + }; + + // OOP + // --------------- + // If Underscore is called as a function, it returns a wrapped object that + // can be used OO-style. This wrapper holds altered versions of all the + // underscore functions. Wrapped objects may be chained. + + // Helper function to continue chaining intermediate results. + var result = function(instance, obj) { + return instance._chain ? _(obj).chain() : obj; + }; + + // Add your own custom functions to the Underscore object. + _.mixin = function(obj) { + _.each(_.functions(obj), function(name) { + var func = _[name] = obj[name]; + _.prototype[name] = function() { + var args = [this._wrapped]; + push.apply(args, arguments); + return result(this, func.apply(_, args)); + }; + }); + }; + + // Add all of the Underscore functions to the wrapper object. + _.mixin(_); + + // Add all mutator Array functions to the wrapper. + _.each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) { + var method = ArrayProto[name]; + _.prototype[name] = function() { + var obj = this._wrapped; + method.apply(obj, arguments); + if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0]; + return result(this, obj); + }; + }); + + // Add all accessor Array functions to the wrapper. + _.each(['concat', 'join', 'slice'], function(name) { + var method = ArrayProto[name]; + _.prototype[name] = function() { + return result(this, method.apply(this._wrapped, arguments)); + }; + }); + + // Extracts the result from a wrapped and chained object. + _.prototype.value = function() { + return this._wrapped; + }; + + // Provide unwrapping proxy for some methods used in engine operations + // such as arithmetic and JSON stringification. + _.prototype.valueOf = _.prototype.toJSON = _.prototype.value; + + _.prototype.toString = function() { + return '' + this._wrapped; + }; + + // AMD registration happens at the end for compatibility with AMD loaders + // that may not enforce next-turn semantics on modules. Even though general + // practice for AMD registration is to be anonymous, underscore registers + // as a named module because, like jQuery, it is a base library that is + // popular enough to be bundled in a third party lib, but not be part of + // an AMD load request. Those cases could generate an error when an + // anonymous define() is called outside of a loader request. + if (typeof define === 'function' && define.amd) { + define('underscore', [], function() { + return _; + }); + } +}.call(this)); diff --git a/ChatRoomServer.Www/Views/Msgs/LogList.cshtml b/ChatRoomServer.Www/Views/Msgs/LogList.cshtml new file mode 100644 index 0000000..6440cf3 --- /dev/null +++ b/ChatRoomServer.Www/Views/Msgs/LogList.cshtml @@ -0,0 +1,78 @@ +@{ + ViewBag.Title = "聊天记录列表"; +} + +
+
+
+
+
+
+
搜索
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
ID房间发送人发送时间发送IP发送给
{{item.msg.id}}{{item.room.name}}{{item.msg.userName}}{{item.msg.sendTime|jsonDate}}{{item.msg.ip}}{{item.msg.atUser}}
+

{{item.msg.content}}

+

+ +

+
+ +
+ diff --git a/ChatRoomServer.Www/Views/Shared/_Layout.cshtml b/ChatRoomServer.Www/Views/Shared/_Layout.cshtml index 9e40619..46d269f 100644 --- a/ChatRoomServer.Www/Views/Shared/_Layout.cshtml +++ b/ChatRoomServer.Www/Views/Shared/_Layout.cshtml @@ -19,7 +19,7 @@ - @Html.ActionLink("12306聊天室管理", "Index", "Index", new { area = "" }, new { @class = "navbar-brand" }) + @Html.ActionLink("12306聊天室管理", "Index", "Index", new {area = ""}, new {@class = "navbar-brand"})
    @@ -27,6 +27,15 @@ 用户管理
    • @Html.ActionLink("举报管理", "AbuseList", "Users")
      • +
    • @Html.ActionLink("举报管理", "BlockList", "Users")
      • +
    + +
  • + 聊天记录 +
      +
    • + @Html.ActionLink("记录列表", "LogList", "Msgs") +
@@ -41,6 +50,7 @@ @Scripts.Render("~/scripts/bootstrap-notify.js") @Scripts.Render("~/scripts/angularjs/angular.js") @Scripts.Render("~/scripts/angularjs/angular-cookies.js") + @Scripts.Render("~/scripts/underscore.js") @Scripts.Render("~/scripts/controller.js") @RenderSection("scripts", required: false) diff --git a/ChatRoomServer.Www/Views/Users/AbuseList.cshtml b/ChatRoomServer.Www/Views/Users/AbuseList.cshtml index 25191e8..c8102a0 100644 --- a/ChatRoomServer.Www/Views/Users/AbuseList.cshtml +++ b/ChatRoomServer.Www/Views/Users/AbuseList.cshtml @@ -3,46 +3,64 @@ }
- - - - - - - - - - - - - - - - - - - - - - -
ID房间举报人被举报人举报时间
{{item.id}}{{item.room}}{{item.username}}{{item.targetuser}}{{item.time}}
- {{item.content}} -
- - - -
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
ID房间举报人举报时间被举报人消息时间消息IP
{{item.info.id}}{{item.room.name}}{{item.info.reportUser}}{{item.msg.sendTime|jsonDate}}{{item.info.targetUser}}{{item.info.reportTime|jsonDate}}{{item.msg.ip}}
+

{{item.msg.content}}

+

+ +

+
+ + + + + + +
+
\ No newline at end of file diff --git a/RwTicketAssistantV3/app/background.js b/RwTicketAssistantV3/app/background.js index 14987e9..5646d15 100644 --- a/RwTicketAssistantV3/app/background.js +++ b/RwTicketAssistantV3/app/background.js @@ -1460,7 +1460,7 @@ var CFG_MANGER = (function () { if (!callback) return; - if (isServerLoaded && (!lastLoad || (new Date() - lastLoad) < 1000 * 60 * 10)) + if (isServerLoaded && lastLoad && (new Date() - lastLoad) < 1000 * 60 * 10) callback(servers); else { callbackQueue.push(callback); @@ -1476,6 +1476,8 @@ var CFG_MANGER = (function () { servers = null; isInServerLoading = false; execCallback(); + }).always(function () { + lastLoad = new Date(); }); } } diff --git a/TrainInfomationProviderService/TrainInfo/WebDataProvider.cs b/TrainInfomationProviderService/TrainInfo/WebDataProvider.cs index 62698b9..443351a 100644 --- a/TrainInfomationProviderService/TrainInfo/WebDataProvider.cs +++ b/TrainInfomationProviderService/TrainInfo/WebDataProvider.cs @@ -171,9 +171,8 @@ namespace TrainInfomationProviderService.TrainInfo } //加载车次停靠站信息 - LoadTrainStopInfo(++index, alltrains.Length, date, train); - if (curStorage.HashStore.Contains(train.TrainHash)) + if (!LoadTrainStopInfo(++index, alltrains.Length, date, train) || curStorage.HashStore.Contains(train.TrainHash)) continue; train.Init(); @@ -224,7 +223,7 @@ namespace TrainInfomationProviderService.TrainInfo return null; } - internal void LoadTrainStopInfo(int index, int totalcount, string date, Train train) + internal bool LoadTrainStopInfo(int index, int totalcount, string date, Train train) { Trace.TraceInformation("[TRAIN_STOP_INFO_LOAER] [{2:#0}/{3:#0}] 正在加载车次 {1}/{0} 信息", train.Code, date, index, totalcount); @@ -255,6 +254,7 @@ namespace TrainInfomationProviderService.TrainInfo } Trace.TraceInformation("[TRAIN_STOP_INFO_LOAER] 车次 {1}/{0} 信息加载过程结束", train.Code, date); + return train.TrainStops != null && train.TrainStops.Count > 0; } } diff --git a/Web12306/js/ui/chat/chatframe.js b/Web12306/js/ui/chat/chatframe.js index c4a2be6..a1056af 100644 --- a/Web12306/js/ui/chat/chatframe.js +++ b/Web12306/js/ui/chat/chatframe.js @@ -63,9 +63,9 @@ //加载服务器节点列表 servernode.loadServers(); - setTimeout(function() { + setInterval(function() { servernode.loadServers(); - }, 1000 * 60 * 11); + }, 1000 * 60 * 10); servernode.on("roomSelectHide", function () { hideChatFrameUI(); From 11e68fab1491fc2f764688eae85011943b4ff3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=A8=E9=B1=BC=28iFish=29?= Date: Thu, 16 Jul 2015 21:00:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=84=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChatRoomServer.Db/ChatDb.cs | 76 +++++++ ChatRoomServer.Db/Entities/UserConnectLog.cs | 3 + ChatRoomServer.Main/ChatSession.cs | 3 +- .../Areas/Api/Controllers/MsgsController.cs | 22 +- .../Areas/Api/Controllers/UsersController.cs | 55 +++++ ChatRoomServer.Www/ChatRoomServer.Www.csproj | 3 + .../Controllers/UsersController.cs | 15 ++ ChatRoomServer.Www/Scripts/controller.js | 215 ++++++++++++++++-- ChatRoomServer.Www/Views/Msgs/LogList.cshtml | 27 ++- .../Views/Shared/_Layout.cshtml | 4 +- .../Views/Users/BlockList.cshtml | 70 ++++++ .../Views/Users/ConnectionLog.cshtml | 76 +++++++ .../Views/Users/UserList.cshtml | 78 +++++++ .../StationInfo/SameStationManager.cs | 4 +- .../StationInfo/StationManager.cs | 6 +- .../TrainInfo/TrainInfoManager.cs | 4 +- .../TrainInfo/WebDataProvider.cs | 5 +- .../TrainInfomationProviderService.csproj | 1 + .../Web/WebClient.cs | 53 +++++ Web12306/Web.config | 5 + 20 files changed, 688 insertions(+), 37 deletions(-) create mode 100644 ChatRoomServer.Www/Views/Users/BlockList.cshtml create mode 100644 ChatRoomServer.Www/Views/Users/ConnectionLog.cshtml create mode 100644 ChatRoomServer.Www/Views/Users/UserList.cshtml create mode 100644 TrainInfomationProviderService/Web/WebClient.cs diff --git a/ChatRoomServer.Db/ChatDb.cs b/ChatRoomServer.Db/ChatDb.cs index 3cec84d..a1fcb3c 100644 --- a/ChatRoomServer.Db/ChatDb.cs +++ b/ChatRoomServer.Db/ChatDb.cs @@ -115,5 +115,81 @@ namespace ChatRoomServer.Db TotalCount = (long)totalCountParameter.Value }; } + + public async Task> GetMsgLogList(string username, int pagesize, int pageindex) + { + var sp = "exec usp_MsgLog_GetList @pageindex, @pagesize, @user, @count output"; + var totalCountParameter = new SqlParameter("count", SqlDbType.BigInt) { Direction = ParameterDirection.Output, Value = 0 }; + var list = await Database.SqlQuery( + sp, + new SqlParameter("pageindex", SqlDbType.Int) { Value = pageindex }, + new SqlParameter("pagesize", SqlDbType.Int) { Value = pagesize }, + new SqlParameter("user", SqlDbType.VarChar, 100) { Value = username }, + totalCountParameter + ).ToListAsync(); + + return new PagedData() + { + Data = list, + TotalCount = (long)totalCountParameter.Value + }; + } + + public async Task> GetBlockUserList(string username, int pagesize, int pageindex) + { + var sp = "exec usp_Block_GetList @pageindex, @pagesize, @user, @count output"; + var totalCountParameter = new SqlParameter("count", SqlDbType.BigInt) { Direction = ParameterDirection.Output, Value = 0 }; + var list = await Database.SqlQuery( + sp, + new SqlParameter("pageindex", SqlDbType.Int) { Value = pageindex }, + new SqlParameter("pagesize", SqlDbType.Int) { Value = pagesize }, + new SqlParameter("user", SqlDbType.VarChar, 100) { Value = username }, + totalCountParameter + ).ToListAsync(); + + return new PagedData() + { + Data = list, + TotalCount = (long)totalCountParameter.Value + }; + } + + public async Task> GetUserList(string username, int pagesize, int pageindex) + { + var sp = "exec usp_User_GetList @pageindex, @pagesize, @user, @count output"; + var totalCountParameter = new SqlParameter("count", SqlDbType.BigInt) { Direction = ParameterDirection.Output, Value = 0 }; + var list = await Database.SqlQuery( + sp, + new SqlParameter("pageindex", SqlDbType.Int) { Value = pageindex }, + new SqlParameter("pagesize", SqlDbType.Int) { Value = pagesize }, + new SqlParameter("user", SqlDbType.VarChar, 100) { Value = username ?? "" }, + totalCountParameter + ).ToListAsync(); + + return new PagedData() + { + Data = list, + TotalCount = (long)totalCountParameter.Value + }; + } + + public async Task> GetConnectionLogList(string username, int pagesize, int pageindex) + { + var sp = "exec usp_ConnectionLog_GetList @pageindex, @pagesize, @user, @count output"; + var totalCountParameter = new SqlParameter("count", SqlDbType.BigInt) { Direction = ParameterDirection.Output, Value = 0 }; + var list = await Database.SqlQuery( + sp, + new SqlParameter("pageindex", SqlDbType.Int) { Value = pageindex }, + new SqlParameter("pagesize", SqlDbType.Int) { Value = pagesize }, + new SqlParameter("user", SqlDbType.VarChar, 100) { Value = username }, + totalCountParameter + ).ToListAsync(); + + return new PagedData() + { + Data = list, + TotalCount = (long)totalCountParameter.Value + }; + } } } diff --git a/ChatRoomServer.Db/Entities/UserConnectLog.cs b/ChatRoomServer.Db/Entities/UserConnectLog.cs index 45cd9be..d38563d 100644 --- a/ChatRoomServer.Db/Entities/UserConnectLog.cs +++ b/ChatRoomServer.Db/Entities/UserConnectLog.cs @@ -43,6 +43,8 @@ namespace ChatRoomServer.Db.Entities /// public int? ElapsedTime { get; set; } + public string Ip { get; set; } + } /// @@ -57,6 +59,7 @@ namespace ChatRoomServer.Db.Entities Property(s => s.Id).HasDatabaseGeneratedOption(DatabaseGeneratedOption.Identity); Property(s => s.UserName).HasMaxLength(100).IsRequired(); Property(s => s.RoomID).HasMaxLength(100).IsRequired(); + Property(s => s.Ip).IsRequired(); } } } diff --git a/ChatRoomServer.Main/ChatSession.cs b/ChatRoomServer.Main/ChatSession.cs index db5fbf7..ecedca1 100644 --- a/ChatRoomServer.Main/ChatSession.cs +++ b/ChatRoomServer.Main/ChatSession.cs @@ -94,7 +94,8 @@ namespace ChatRoomServer.Main { UserName = UserName, ConnectTime = DateTime.Now, - RoomID = Id + RoomID = Id, + Ip = RemoteEndPoint.ToString() }; db.UserConnectLogs.Add(ucl); db.SaveChanges(); diff --git a/ChatRoomServer.Www/Areas/Api/Controllers/MsgsController.cs b/ChatRoomServer.Www/Areas/Api/Controllers/MsgsController.cs index acab26b..7506eea 100644 --- a/ChatRoomServer.Www/Areas/Api/Controllers/MsgsController.cs +++ b/ChatRoomServer.Www/Areas/Api/Controllers/MsgsController.cs @@ -7,12 +7,15 @@ using System.Web.Http; namespace ChatRoomServer.Www.Areas.Api.Controllers { + using System.Data.Entity; using System.Threading.Tasks; using ChatRoomServer.Db; [Authorize] - public class MsgsController : ApiController - { + [RoutePrefix("api/msgs")] + public class MsgsController : ApiController + { + [Route("list")] public async Task List([FromBody] Dictionary query) { var searchUser = query.GetValue("searchUser") ?? ""; @@ -20,7 +23,20 @@ namespace ChatRoomServer.Www.Areas.Api.Controllers var pagesize = query.GetValue("pagesize").ToInt32(20); var db = new ChatDb(); + var data = await db.GetMsgLogList(searchUser, pagesize, pageIndex); + var rooms = data.Data.Select(s => s.RoomId).Distinct().ToArray(); + var roomdata = await db.Rooms.Where(s => rooms.Contains(s.ID)).ToDictionaryAsync(s => s.ID); + + return new + { + count = data.TotalCount, + list = data.Data.Select(s => new + { + msg = s, + room = roomdata.GetValue(s.RoomId) + }) + }; } - } + } } diff --git a/ChatRoomServer.Www/Areas/Api/Controllers/UsersController.cs b/ChatRoomServer.Www/Areas/Api/Controllers/UsersController.cs index dde0333..f45f110 100644 --- a/ChatRoomServer.Www/Areas/Api/Controllers/UsersController.cs +++ b/ChatRoomServer.Www/Areas/Api/Controllers/UsersController.cs @@ -18,6 +18,61 @@ namespace ChatRoomServer.Www.Areas.Api.Controllers [RoutePrefix("api/users"), Authorize] public class UsersController : ApiController { + [Route("blockList")] + public async Task BlockUsersList([FromBody] Dictionary query) + { + var searchUser = query.GetValue("searchUser") ?? ""; + var pageIndex = query.GetValue("pageIndex").ToInt32(1); + var pagesize = query.GetValue("pagesize").ToInt32(20); + var db = new ChatDb(); + + var data = await db.GetBlockUserList(searchUser, pagesize, pageIndex); + + return new + { + count = data.TotalCount, + list = data.Data + }; + } + + [Route("connectionLog")] + public async Task ConnectionLog([FromBody] Dictionary query) + { + var searchUser = query.GetValue("searchUser") ?? ""; + var pageIndex = query.GetValue("pageIndex").ToInt32(1); + var pagesize = query.GetValue("pagesize").ToInt32(20); + var db = new ChatDb(); + + var data = await db.GetConnectionLogList(searchUser, pagesize, pageIndex); + var rooms = data.Data.Select(s => s.RoomID).Distinct().ToArray(); + var roomdata = await db.Rooms.Where(s => rooms.Contains(s.ID)).ToDictionaryAsync(s => s.ID); + + + return new + { + count = data.TotalCount, + list = data.Data.Select(s => new + { + msg = s, + room = roomdata.GetValue(s.RoomID) + }) + }; + } + + [Route("list"), HttpGet] + public async Task UserList(int pageindex, int pagesize, string user) + { + var db = new ChatDb(); + + var data = await db.GetUserList(user, pagesize, pageindex); + + return new + { + count = data.TotalCount, + list = data.Data + }; + } + [Route("abuseList")] public async Task AbuseList([FromBody]Dictionary query) diff --git a/ChatRoomServer.Www/ChatRoomServer.Www.csproj b/ChatRoomServer.Www/ChatRoomServer.Www.csproj index c1ebb96..8626e8c 100644 --- a/ChatRoomServer.Www/ChatRoomServer.Www.csproj +++ b/ChatRoomServer.Www/ChatRoomServer.Www.csproj @@ -194,6 +194,9 @@ + + + diff --git a/ChatRoomServer.Www/Controllers/UsersController.cs b/ChatRoomServer.Www/Controllers/UsersController.cs index a435642..8e262eb 100644 --- a/ChatRoomServer.Www/Controllers/UsersController.cs +++ b/ChatRoomServer.Www/Controllers/UsersController.cs @@ -13,5 +13,20 @@ namespace ChatRoomServer.Www.Controllers { return View(); } + + public ActionResult ConnectionLog() + { + return View(); + } + + public ActionResult UserList() + { + return View(); + } + + public ActionResult BlockList() + { + return View(); + } } } \ No newline at end of file diff --git a/ChatRoomServer.Www/Scripts/controller.js b/ChatRoomServer.Www/Scripts/controller.js index e60d77a..1195e7f 100644 --- a/ChatRoomServer.Www/Scripts/controller.js +++ b/ChatRoomServer.Www/Scripts/controller.js @@ -252,7 +252,7 @@ var app = angular.module('chat12306', ['ngCookies']); $scope.filter = { searchUser: "", pageIndex: 1, - pagesize : "20" + pagesize: "20" }; $scope.pages = 0; $scope.itemsCount = 0; @@ -276,21 +276,16 @@ var app = angular.module('chat12306', ['ngCookies']); }); $http.post(listApi, $scope.filter) .success(function (data) { - if (data.success) { - notify.update({ - "title": "操作成功...", - type: "success", - icon: "fa fa-check", - showProgressbar: false - }); - $scope.items = data.items; - $scope.itemsCount = data.count; - } else { - notify.changeStatus("danger", "fa fa-ban", "加载失败：" + data.message, null, -2); - } + notify.update({ + "title": "加载成功...", + type: "success", + icon: "fa fa-check", + showProgressbar: false + }); + $scope.items = data.list; + $scope.itemsCount = data.count; + $scope.pages = Math.ceil($scope.itemsCount / parseInt($scope.filter.pagesize, 10)); setTimeout(notify.close, 2000); - - $("tr[data-id=" + item.id + "] button.btn").remove(); }).error(function () { notify.setTitle("加载失败，请重试。服务器错误啦....").setType("danger").setIcon("fa fa-ban").hideProgress().delayClose(); }); @@ -311,4 +306,194 @@ var app = angular.module('chat12306', ['ngCookies']); } app.controller("ChatMessageListController", ['$scope', '$http', chatMessageListController]); +})(); +(function ConnectionLogControllerContainer() { + function connectionLogController($scope, $http) { + var listApi = "/api/users/connectionlog"; + + $scope.filter = { + searchUser: "", + pageIndex: 1, + pagesize: "20" + }; + $scope.pages = 0; + $scope.itemsCount = 0; + $scope.items = []; + + //加载 + $scope.reload = function () { + var notify = $.notify({ + title: "数据加载中...", + "icon": "fa-spin fa fa-spinner", + type: "info" + }, { + delay: 0, + progress: -1, + showProgressbar: true, + allow_dismiss: false, + placement: { + from: "top", + align: "center" + } + }); + $http.post(listApi, $scope.filter) + .success(function (data) { + notify.update({ + "title": "加载成功...", + type: "success", + icon: "fa fa-check", + showProgressbar: false + }); + $scope.items = data.list; + $scope.itemsCount = data.count; + $scope.pages = Math.ceil($scope.itemsCount / parseInt($scope.filter.pagesize, 10)); + setTimeout(notify.close, 2000); + }).error(function () { + notify.setTitle("加载失败，请重试。服务器错误啦....").setType("danger").setIcon("fa fa-ban").hideProgress().delayClose(); + }); + }; + $scope.goPage = function (page) { + if (page <= 0) + return; + $scope.filter.pageIndex = page; + }; + $scope.go = function (pageOffset) { + $scope.filter.pageIndex = Math.max(1, Math.min($scope.filter.pageIndex + pageOffset, $scope.pages)); + }; + + + $scope.$watch("filter", function (newvalue, oldvalue) { + $scope.reload(); + }, true); + } + + app.controller("ConnectionLogController", ['$scope', '$http', connectionLogController]); +})(); +//------------------------------------------------------------- +(function blockUserListControllerContainer() { + function blockUserListController($scope, $http) { + var listApi = "/api/users/blockList"; + + $scope.filter = { + searchUser: "", + pageIndex: 1, + pagesize: "20" + }; + $scope.pages = 0; + $scope.itemsCount = 0; + $scope.items = []; + + //加载 + $scope.reload = function () { + var notify = $.notify({ + title: "数据加载中...", + "icon": "fa-spin fa fa-spinner", + type: "info" + }, { + delay: 0, + progress: -1, + showProgressbar: true, + allow_dismiss: false, + placement: { + from: "top", + align: "center" + } + }); + $http.post(listApi, $scope.filter) + .success(function (data) { + notify.update({ + "title": "加载成功...", + type: "success", + icon: "fa fa-check", + showProgressbar: false + }); + $scope.items = data.list; + $scope.itemsCount = data.count; + $scope.pages = Math.ceil($scope.itemsCount / parseInt($scope.filter.pagesize, 10)); + setTimeout(notify.close, 2000); + }).error(function () { + notify.setTitle("加载失败，请重试。服务器错误啦....").setType("danger").setIcon("fa fa-ban").hideProgress().delayClose(); + }); + }; + $scope.goPage = function (page) { + if (page <= 0) + return; + $scope.filter.pageIndex = page; + }; + $scope.go = function (pageOffset) { + $scope.filter.pageIndex = Math.max(1, Math.min($scope.filter.pageIndex + pageOffset, $scope.pages)); + }; + + + $scope.$watch("filter", function (newvalue, oldvalue) { + $scope.reload(); + }, true); + } + + app.controller("BlockUserListController", ['$scope', '$http', blockUserListController]); +})(); +//------------------------------------------------------------- +(function userListControllerContainer() { + function userListController($scope, $http) { + var listApi = "/api/users/list"; + + $scope.filter = { + user: "", + pageIndex: 1, + pagesize: "20" + }; + $scope.pages = 0; + $scope.itemsCount = 0; + $scope.items = []; + + //加载 + $scope.reload = function () { + var notify = $.notify({ + title: "数据加载中...", + "icon": "fa-spin fa fa-spinner", + type: "info" + }, { + delay: 0, + progress: -1, + showProgressbar: true, + allow_dismiss: false, + placement: { + from: "top", + align: "center" + } + }); + $http.get(listApi, { + params: $scope.filter + }) + .success(function (data) { + notify.update({ + "title": "加载成功...", + type: "success", + icon: "fa fa-check", + showProgressbar: false + }); + $scope.items = data.list; + $scope.itemsCount = data.count; + $scope.pages = Math.ceil($scope.itemsCount / parseInt($scope.filter.pagesize, 10)); + setTimeout(notify.close, 2000); + }).error(function () { + notify.setTitle("加载失败，请重试。服务器错误啦....").setType("danger").setIcon("fa fa-ban").hideProgress().delayClose(); + }); + }; + $scope.goPage = function (page) { + if (page <= 0) + return; + $scope.filter.pageIndex = page; + }; + $scope.go = function (pageOffset) { + $scope.filter.pageIndex = Math.max(1, Math.min($scope.filter.pageIndex + pageOffset, $scope.pages)); + }; + + + $scope.$watch("filter", function (newvalue, oldvalue) { + $scope.reload(); + }, true); + } + + app.controller("UserListController", ['$scope', '$http', userListController]); })(); \ No newline at end of file diff --git a/ChatRoomServer.Www/Views/Msgs/LogList.cshtml b/ChatRoomServer.Www/Views/Msgs/LogList.cshtml index 6440cf3..63a0655 100644 --- a/ChatRoomServer.Www/Views/Msgs/LogList.cshtml +++ b/ChatRoomServer.Www/Views/Msgs/LogList.cshtml @@ -10,6 +10,11 @@
搜索
+ + +
@@ -25,12 +30,12 @@ 发送给 - {{item.msg.id}} - {{item.room.name}} - {{item.msg.userName}} - {{item.msg.sendTime|jsonDate}} - {{item.msg.ip}} - {{item.msg.atUser}} + {{item.msg.id}} + {{item.room.name}} + {{item.msg.userName}} + {{item.msg.sendTime|jsonDate}} + {{item.msg.ip}} + {{item.msg.atUser}} @@ -47,11 +52,6 @@
  • 共 {{itemsCount}} 条记录，每页 {{filter.pagesize}} 条，共 {{ pages }} 页
    • -
  • - - - -
  • 每页记录数 @@ -60,6 +60,11 @@
    • +
  • + + + +
  • diff --git a/ChatRoomServer.Www/Views/Shared/_Layout.cshtml b/ChatRoomServer.Www/Views/Shared/_Layout.cshtml index 46d269f..3949303 100644 --- a/ChatRoomServer.Www/Views/Shared/_Layout.cshtml +++ b/ChatRoomServer.Www/Views/Shared/_Layout.cshtml @@ -27,7 +27,9 @@ 用户管理
    • @Html.ActionLink("举报管理", "AbuseList", "Users")
      • -
    • @Html.ActionLink("举报管理", "BlockList", "Users")
      • +
    • @Html.ActionLink("屏蔽列表", "BlockList", "Users")
      • +
    • @Html.ActionLink("连接日志", "ConnectionLog", "Users")
      • +
    • @Html.ActionLink("用户列表", "UserList", "Users")
  • diff --git a/ChatRoomServer.Www/Views/Users/BlockList.cshtml b/ChatRoomServer.Www/Views/Users/BlockList.cshtml new file mode 100644 index 0000000..4c108c8 --- /dev/null +++ b/ChatRoomServer.Www/Views/Users/BlockList.cshtml @@ -0,0 +1,70 @@ +@{ + ViewBag.Title = "用户连接日志"; +} + +
    +
    +
    +
    +
    +
    +
    搜索
    + + + + +
    +
    +
    +
    +
    + + + + + + + + + + + + + +
    ID用户名屏蔽时间解除时间
    {{item.id}}{{item.userName}}{{item.blockTime|jsonDate}}{{item.unblockTime||'永久' | jsonDate}}
    + +
    + diff --git a/ChatRoomServer.Www/Views/Users/ConnectionLog.cshtml b/ChatRoomServer.Www/Views/Users/ConnectionLog.cshtml new file mode 100644 index 0000000..bdf3ed2 --- /dev/null +++ b/ChatRoomServer.Www/Views/Users/ConnectionLog.cshtml @@ -0,0 +1,76 @@ +@{ + ViewBag.Title = "用户连接日志"; +} + +
    +
    +
    +
    +
    +
    +
    搜索
    + + + + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + +
    ID用户名房间连接时间断开时间持续时间IP
    {{item.msg.id}}{{item.msg.userName}}{{item.room.name}}{{item.msg.connectTime|jsonDate}}{{item.msg.disconnectTime|jsonDate}}{{item.msg.elapsedTime/60|number:0}}分钟/{{item.msg.elapsedTime/3600 | number:2}}小时{{item.msg.ip}}
    + +
    + diff --git a/ChatRoomServer.Www/Views/Users/UserList.cshtml b/ChatRoomServer.Www/Views/Users/UserList.cshtml new file mode 100644 index 0000000..b74cd5b --- /dev/null +++ b/ChatRoomServer.Www/Views/Users/UserList.cshtml @@ -0,0 +1,78 @@ +@{ + ViewBag.Title = "用户列表"; +} + +
    +
    +
    +
    +
    +
    +
    搜索
    + + + + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    用户名显示名称首次连接时间最后连接时间首次发言时间最后发言时间发言次数在线时间
    {{item.userName}}{{item.nickName}}{{item.firstConnect|jsonDate}}{{item.lastConnect|jsonDate}}{{item.firstSend||'永久' | jsonDate}}{{item.lastSend||'永久' | jsonDate}}{{item.sendTimes}}{{item.onlineTime/60|number:0}}分钟/{{item.onlineTime/3600 | number:2}}小时
    + +
    + diff --git a/TrainInfomationProviderService/StationInfo/SameStationManager.cs b/TrainInfomationProviderService/StationInfo/SameStationManager.cs index dfef2c5..0a79931 100644 --- a/TrainInfomationProviderService/StationInfo/SameStationManager.cs +++ b/TrainInfomationProviderService/StationInfo/SameStationManager.cs @@ -13,6 +13,8 @@ using Newtonsoft.Json; namespace TrainInfomationProviderService.StationInfo { + using TrainInfomationProviderService.Web; + class SameStationManager { public static Dictionary> SameStationMap { get; private set; } @@ -117,7 +119,7 @@ namespace TrainInfomationProviderService.StationInfo static bool GrabberFromWeb() { - var ctx = new HttpClient().Create(HttpMethod.Get, _url).Send(); + var ctx = new HttpWebClient().Create(HttpMethod.Get, _url).Send(); if (!ctx.IsValid()) return false; diff --git a/TrainInfomationProviderService/StationInfo/StationManager.cs b/TrainInfomationProviderService/StationInfo/StationManager.cs index 4422de2..9ec438f 100644 --- a/TrainInfomationProviderService/StationInfo/StationManager.cs +++ b/TrainInfomationProviderService/StationInfo/StationManager.cs @@ -16,6 +16,8 @@ using TrainInfomationProviderService.StationInfo.Entities; namespace TrainInfomationProviderService.StationInfo { + using TrainInfomationProviderService.Web; + /// /// public class StationManager @@ -156,7 +158,7 @@ namespace TrainInfomationProviderService.StationInfo void RefreshStationInfo(int version) { Trace.TraceInformation("[STATION] 正在获得最新车站信息"); - var html = new HttpClient().Create(HttpMethod.Get, "https://kyfw.12306.cn/otn/resources/js/framework/station_name.js", null, null, "").Send(); + var html = new HttpWebClient().Create(HttpMethod.Get, "https://kyfw.12306.cn/otn/resources/js/framework/station_name.js", null, null, "").Send(); if (!html.IsValid()) { Trace.TraceError("[STATION] 车站信息获得失败。错误：{0}", html.Exception); @@ -203,7 +205,7 @@ namespace TrainInfomationProviderService.StationInfo /// public int GetLatestVersionFromWeb() { - var ctx = new HttpClient().Create(HttpMethod.Get, "https://kyfw.12306.cn/otn/leftTicket/init", "https://kyfw.12306.cn/otn/leftTicket/init").Send(); + var ctx = new HttpWebClient().Create(HttpMethod.Get, "https://kyfw.12306.cn/otn/leftTicket/init", "https://kyfw.12306.cn/otn/leftTicket/init").Send(); if (!ctx.IsValid()) return 0; diff --git a/TrainInfomationProviderService/TrainInfo/TrainInfoManager.cs b/TrainInfomationProviderService/TrainInfo/TrainInfoManager.cs index d5a029b..3307cae 100644 --- a/TrainInfomationProviderService/TrainInfo/TrainInfoManager.cs +++ b/TrainInfomationProviderService/TrainInfo/TrainInfoManager.cs @@ -16,6 +16,8 @@ using TrainInfomationProviderService.TrainInfo.Entities; namespace TrainInfomationProviderService.TrainInfo { + using TrainInfomationProviderService.Web; + public class TrainInfoManager { private static readonly object _lockObject = new object(); @@ -229,7 +231,7 @@ namespace TrainInfomationProviderService.TrainInfo /// public int GetLatestVersionFromWeb() { - var ctx = new HttpClient().Create(HttpMethod.Get, "https://kyfw.12306.cn/otn/queryTrainInfo/init", "https://kyfw.12306.cn/otn/queryTrainInfo/init").Send(); + var ctx = new HttpWebClient().Create(HttpMethod.Get, "https://kyfw.12306.cn/otn/queryTrainInfo/init", "https://kyfw.12306.cn/otn/queryTrainInfo/init").Send(); if (!ctx.IsValid()) return 0; diff --git a/TrainInfomationProviderService/TrainInfo/WebDataProvider.cs b/TrainInfomationProviderService/TrainInfo/WebDataProvider.cs index 443351a..6ccec2d 100644 --- a/TrainInfomationProviderService/TrainInfo/WebDataProvider.cs +++ b/TrainInfomationProviderService/TrainInfo/WebDataProvider.cs @@ -16,6 +16,7 @@ using TrainInfomationProviderService.TrainInfo.Entities; namespace TrainInfomationProviderService.TrainInfo { using System.Runtime.Serialization; + using TrainInfomationProviderService.Web; class WebDataProvider { @@ -101,7 +102,7 @@ namespace TrainInfomationProviderService.TrainInfo public void LoadTrainInfo(IndexStorage indexStorage, Action saveCallback) { Trace.TraceInformation("[TRAIN_DATA_WEB_PROVIDER] 正在获得最新车次信息"); - var html = new HttpClient().Create(HttpMethod.Get, "https://kyfw.12306.cn/otn/resources/js/query/train_list.js?scriptVersion=" + (new Random().NextDouble() + 1).ToString("#0.00000"), null, null, "").Send(); + var html = new HttpWebClient().Create(HttpMethod.Get, "https://kyfw.12306.cn/otn/resources/js/query/train_list.js?scriptVersion=" + (new Random().NextDouble() + 1).ToString("#0.00000"), null, null, "").Send(); if (!html.IsValid()) { Trace.TraceError("[TRAIN_DATA_WEB_PROVIDER] 车次信息获得失败。错误：{0}", html.Exception); @@ -230,7 +231,7 @@ namespace TrainInfomationProviderService.TrainInfo var tryCount = 0; while (tryCount++ < 50) { - var ctx = new HttpClient().Create( + var ctx = new HttpWebClient().Create( HttpMethod.Get, string.Format("https://kyfw.12306.cn/otn/czxx/queryByTrainNo?train_no={0}&from_station_telecode={1}&to_station_telecode={2}&depart_date={3}", train.Id, train.From, train.To, date), null, diff --git a/TrainInfomationProviderService/TrainInfomationProviderService.csproj b/TrainInfomationProviderService/TrainInfomationProviderService.csproj index 2e57c36..8e0d1ea 100644 --- a/TrainInfomationProviderService/TrainInfomationProviderService.csproj +++ b/TrainInfomationProviderService/TrainInfomationProviderService.csproj @@ -112,6 +112,7 @@ + diff --git a/TrainInfomationProviderService/Web/WebClient.cs b/TrainInfomationProviderService/Web/WebClient.cs new file mode 100644 index 0000000..890f7ab --- /dev/null +++ b/TrainInfomationProviderService/Web/WebClient.cs @@ -0,0 +1,53 @@ +namespace TrainInfomationProviderService.Web +{ + using System; + using System.Net; + using FSLib.Network.Http; + + class HttpWebClient : HttpClient + { + public HttpWebClient() + : base(null, new WebHandler()) + { + + } + + + + } + + class WebHandler : HttpHandler + { + public WebHandler() + { + var proxy = System.Configuration.ConfigurationManager.AppSettings["web_proxy"]; + if (!proxy.IsNullOrEmpty()) + { + _proxy = new WebProxy(new Uri(proxy)); + var username = System.Configuration.ConfigurationManager.AppSettings["web_proxy_username"]; + if (!proxy.IsNullOrEmpty()) + { + _proxy.UseDefaultCredentials = false; + _proxy.Credentials = new NetworkCredential(username, System.Configuration.ConfigurationManager.AppSettings["web_proxy_password"]); + } + } + } + + WebProxy _proxy; + + /// + /// 获得用于发送请求的Request对象 + /// + /// + /// + /// + public override HttpWebRequest GetRequest(Uri uri, HttpMethod method, HttpContext context) + { + var request = base.GetRequest(uri, method, context); + if (_proxy != null) + request.Proxy = _proxy; + + return request; + } + } +} diff --git a/Web12306/Web.config b/Web12306/Web.config index e197bd1..043a3cc 100644 --- a/Web12306/Web.config +++ b/Web12306/Web.config @@ -37,6 +37,11 @@ + + + + +