+
  1. 首页
    2. diff --git a/src/admin/Bootstrap.Admin/appsettings.Development.json b/src/admin/Bootstrap.Admin/appsettings.Development.json index db12e2cc..0ebdc609 100644 --- a/src/admin/Bootstrap.Admin/appsettings.Development.json +++ b/src/admin/Bootstrap.Admin/appsettings.Development.json @@ -66,8 +66,13 @@ "ClientSecret": "3427f2d901ba9afc76c1842a7303b2d67f8e098e71acc15051f89fe6f3d265db", "CallbackPath": "/signin-gitee", "HomePath": "/Admin/Profiles", - "Scope": [ "user_info", "projects" ], - "Roles": [ "Administrators" ], + "Scope": [ + "user_info", + "projects" + ], + "Roles": [ + "Administrators" + ], "App": "0", "StarredUrl": "https://gitee.com/api/v5/user/starred/LongbowEnterprise/BootstrapAdmin" }, @@ -77,28 +82,49 @@ "ClientSecret": "ffa759ca599df941b869efecb5e750bc1b27334e", "CallbackPath": "/signin-github", "HomePath": "/Admin/Profiles", - "Scope": [ "user_info", "repo" ], - "Roles": [ "Administrators" ], + "Scope": [ + "user_info", + "repo" + ], + "Roles": [ + "Administrators" + ], "App": "0", "StarredUrl": "https://api.github.com/user/starred/ArgoZhang/BootstrapAdmin" }, "WeChatOptions": { "Enabled": true, - "ClientId": "wxe2944ebb9e66551c", - "ClientSecret": "a4e36ddb18af218818e44bb7b8744fe6", + "ClientId": "", + "ClientSecret": "", "CallbackPath": "/signin-weixin", "HomePath": "/Admin/Profiles", - "Scope": [ "snsapi_login" ], - "Roles": [ "Administrators" ], + "Scope": [ + "snsapi_login" + ], + "Roles": [ + "Administrators" + ], "App": "0" }, "SMSOptions": { "CompanyCode": "", "MD5Key": "MD5Key", - "Roles": [ "Administrators" ], + "Roles": [ + "Administrators" + ], "HomePath": "/Admin/Profiles", "App": "0" }, + "AppMenus": [ + "首页", + "测试页面", + "关于", + "返回码云", + "多级菜单", + "第二层", + "第三层", + "第四层" + ], "LongbowCache": { "Enabled": true, "CorsItems": [ diff --git a/src/admin/Bootstrap.Admin/appsettings.json b/src/admin/Bootstrap.Admin/appsettings.json index 605fc91e..ca1faca0 100644 --- a/src/admin/Bootstrap.Admin/appsettings.json +++ b/src/admin/Bootstrap.Admin/appsettings.json @@ -15,6 +15,7 @@ "ConnectionStrings": { "ba": "Data Source=.;Initial Catalog=BootstrapAdmin;User ID=sa;Password=sa" }, + "SupportQQBrowser": false, "DB": [ { "Enabled": false, @@ -55,6 +56,7 @@ ], "SwaggerPathBase": "", "AllowOrigins": "http://localhost,http://ba.sdgxgz.cn", + "GiteeHealthChecks": false, "Sentry": { "Dsn": "https://70bdfff562e84fa7b9a43d65924ab9ad@sentry.io/1469396" }, diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/lock.css b/src/admin/Bootstrap.Admin/wwwroot/css/lock.css index 27bec307..53de5bed 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/lock.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/lock.css @@ -134,3 +134,10 @@ div.input-group .input-group-text { .form-group:last-child input { width: 80px; } + +@media (min-width: 576px) { + .form-inline .form-group { + flex: 0 1 auto; + margin-bottom: 1rem; + } +} \ No newline at end of file diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/login-responsive.css b/src/admin/Bootstrap.Admin/wwwroot/css/login-responsive.css index ce8a7c13..dd7353e6 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/login-responsive.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/login-responsive.css @@ -30,39 +30,22 @@ } .login-wrap { - padding: 0; - margin: 18px 0 0 370px; - width: 280px; + width: 300px; + height: 274px; + position: relative; + left: 346px; + justify-content: center; } .slidercaptcha { - top: -278px; - left: -15px; + width: 300px; } - .slidercaptcha.card .card-body { - padding: 15px 15px 0 15px; - } - - .slidercaptcha, .slidercaptcha.forgot { - width: 310px; + .slidercaptcha, .slidercaptcha.oauth { height: 280px; } - .login-wrap[data-auth="True"] { - margin: 20px 0 0 370px; - } - - .login-wrap[data-auth="True"] .slidercaptcha { - top: -264px; - } - - .login-wrap[data-auth="True"] .slidercaptcha, .slidercaptcha.forgot { - width: 310px; - height: 280px; - } - - .login-wrap[data-auth="True"] .form-group { - margin-bottom: 0.75rem; - } + .slidercaptcha.card .card-body { + padding: 15px 15px 0 15px; + } } diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/login.css b/src/admin/Bootstrap.Admin/wwwroot/css/login.css index 09ceae2b..52fa3e82 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/login.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/login.css @@ -13,8 +13,9 @@ } .login-wrap { - padding: 20px; - height: 300px; + display: flex; + flex-direction: column; + margin: 1rem; } .login-wrap .rememberPwd { @@ -27,14 +28,10 @@ width: 13px; } - .login-wrap .card { - border-top-width: 1px; + .login-wrap .card, .login-wrap .card:hover, .modal .card, .modal .card:hover { + border: 1px solid #84bbe2; } -.login-footer a:last-child { - float: right; -} - .btn-login { background: #f67a6e; color: #fff; @@ -42,7 +39,7 @@ font-weight: 300; font-family: 'Open Sans', sans-serif; box-shadow: 0 4px #e56b60; - margin-bottom: 0.625rem; + margin-bottom: 0.75rem; outline: none !important; margin-top: -0.25rem; line-height: 1; @@ -66,11 +63,10 @@ background-color: #00adec; border-radius: 4px; box-shadow: 0 0 10px #fff; - left: 0; - right: 0; - top: -270px; - height: 226px; - z-index: 1080 + height: 274px; + width: 286px; + z-index: 1080; + position: absolute; } .slidercaptcha canvas:first-child { @@ -83,8 +79,12 @@ margin-top: -2px; } + .slidercaptcha.oauth { + height: 210px; + } + .slidercaptcha.card .card-body { - padding: 0.625rem 0 0 0; + padding: 0.75rem 0 0 0; } .slidercaptcha.card .card-header { @@ -97,18 +97,8 @@ color: #fff; } - .slidercaptcha.forgot { - position: absolute; - left: auto; - right: 14px; - bottom: 14px; - top: auto; - margin: 0; - width: 274px; - } - - .slidercaptcha.reg { - bottom: 60px; + .slidercaptcha.forgot, .slidercaptcha.reg { + bottom: 52px; } .login-other { diff --git a/src/admin/Bootstrap.Admin/wwwroot/css/lte.css b/src/admin/Bootstrap.Admin/wwwroot/css/lte.css index c2103ea9..a9cc8dfc 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/css/lte.css +++ b/src/admin/Bootstrap.Admin/wwwroot/css/lte.css @@ -293,7 +293,7 @@ footer { } aside .sidebar, .sidebar-open aside:hover .sidebar { - top: 136px; + top: 121px; transition: top .3s linear; } @@ -315,8 +315,8 @@ footer { } aside .nav-header img, .sidebar-open aside:hover .nav-header img { - width: 3.75rem; - height: 3.75rem; + width: 2.8125rem; + height: 2.8125rem; border-radius: 50%; } diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js index af03f1f3..503dfdac 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js @@ -167,6 +167,32 @@ })(jQuery); $(function () { + // 自动锁屏功能 + var mousePosition = { screenX: 0, screenY: 0 }; + var count = 1; + var lockScreenPeriod = parseInt($('#lockScreenPeriod').val()); + if (typeof lockScreenPeriod === 'number' && !isNaN(lockScreenPeriod)) { + var traceMouseOrKey = window.setInterval(function () { + $(document).off('mousemove').one('mousemove', function (e) { + if (mousePosition.screenX !== e.screenX || mousePosition.screenY !== e.screenY) { + mousePosition.screenX = e.screenX; + mousePosition.screenY = e.screenY; + + // 计数器归零 + count = 1; + return; + } + }); + }, 2000); + var lockHandler = window.setInterval(function () { + if (count++ * 5 > lockScreenPeriod) { + window.clearInterval(lockHandler); + window.clearInterval(traceMouseOrKey); + this.location.href = $.formatUrl("Account/Lock"); + } + }, 5000); + } + var $sideMenu = $(".sidebar ul"); // breadcrumb diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/log.js b/src/admin/Bootstrap.Admin/wwwroot/js/log.js index 35f36167..e13e34a8 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/log.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/log.js @@ -57,6 +57,12 @@ }, 'button[data-method="css"]': function () { this.log({ crud: '设置网站样式' }); + }, + 'button[data-method="UISettings"]': function () { + this.log({ crud: '保存网站设置' }); + }, + 'button[data-method="LoginSettings"]': function () { + this.log({ crud: '保存登录设置' }); } } }; diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/login.js b/src/admin/Bootstrap.Admin/wwwroot/js/login.js index a8225ec3..37db41d7 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/login.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/login.js @@ -1,5 +1,6 @@ $(function () { var $imgUrl = $('#imgUrl'); + $('[data-oauth="False"]').attr("data-original-title", "点击登录系统"); $(".container").autoCenter(); $("a[data-method]").on('click', function () { @@ -20,16 +21,20 @@ url: "api/OnlineUsers", method: "put", callback: function (result) { + // 返回真时表示三次验证需要滑块验证码 if (result) captcha.addClass('d-block'); else success(); } }); }, capWidth: function () { - return $(window).width() < 768 ? 256 : 280; + return $(window).width() < 768 ? 256 : 272; }, capHeight: function () { - return $(window).width() < 768 ? 106 : 150; + // 如果关闭 oAuth 认证 高度要缩小 + var height = 150; + if ($(window).width() < 768) height = $('.slidercaptcha:first').hasClass('oauth') ? 96 : 150; + return height; }, capRegSuccess: function () { $.bc({ @@ -126,10 +131,10 @@ var $loginPwd = $('#loginPwd'); var $loginSMS = $('#loginSMS'); if ($login.attr('data-demo') === 'True') { + $login.find('[name="userName"], [name="password"]').attr('data-valid', 'false'); $login.on('submit', function (e) { var model = $loginType.attr('data-value'); if (model === 'username') { - $login.find('[data-valid="true"]').attr('data-valid', 'false'); if ($username.val() === '' && $password.val() === '') { e.preventDefault(); location.href = "Gitee"; diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/menus.js b/src/admin/Bootstrap.Admin/wwwroot/js/menus.js index 68719283..07b5c727 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/menus.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/menus.js @@ -163,6 +163,12 @@ $(function () { } }); + // clear parentID value + // bug https://gitee.com/LongbowEnterprise/dashboard/issues?id=I12E3S + $parentMenuName.next().find('button[data-method="clear"]').on('click', function () { + $parentMenuID.val(''); + }); + $btnPickIcon.on('click', function () { $dialogNew.find('[data-toggle="LgbValidate"] [aria-describedby]').tooltip('hide'); $dialogNew.hide(); diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/roles.js b/src/admin/Bootstrap.Admin/wwwroot/js/roles.js index 82939cdd..62fc46e4 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/roles.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/roles.js @@ -145,6 +145,14 @@ $(function () { if (child.hasClass('dd-list')) { child.find(':checkbox').prop('checked', val); } + + // 子节点全部取消时父级菜单也取消 + $(this).parents('ol.dd-list').each(function (index, p) { + if (val === false) { + val = $(p).prev().next().find(':checked').length > 0; + } + $(p).prev().find(':checkbox').prop('checked', val); + }); }).children('.radio').hide(); }); }); \ No newline at end of file diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/settings.js b/src/admin/Bootstrap.Admin/wwwroot/js/settings.js index 7b953590..af739de1 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/js/settings.js +++ b/src/admin/Bootstrap.Admin/wwwroot/js/settings.js @@ -52,6 +52,30 @@ $(function () { } }); break; + case 'loginSettings': + var mobile = $('#mobile').prop('checked') ? "1" : "0"; + $.bc({ + url: Settings.url, data: { name: '短信验证码登录', code: mobile, category: '网站设置' }, method: "post" + }); + var oauth = $('#oauth').prop('checked') ? "1" : "0"; + $.bc({ + url: Settings.url, data: { name: 'OAuth 认证登录', code: oauth, category: '网站设置' }, title: '登录设置', method: "post" + }); + break; + case 'saveAutoLock': + var autoLock = $('#lockScreen').prop('checked') ? "1" : "0"; + $.bc({ + url: Settings.url, data: { name: '自动锁屏', code: autoLock, category: '网站设置' }, method: "post" + }); + $.bc({ + url: Settings.url, data: { name: '自动锁屏时长', code: $('#lockPeriod').val(), category: '网站设置' }, title: '保存自动锁屏设置', method: "post", + callback: function (result) { + if (result) { + window.setTimeout(function () { window.location.reload(true); }, 1000); + } + } + }); + break; } }); diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/sql.js b/src/admin/Bootstrap.Admin/wwwroot/js/sql.js new file mode 100644 index 00000000..5e0ab2ba --- /dev/null +++ b/src/admin/Bootstrap.Admin/wwwroot/js/sql.js @@ -0,0 +1,18 @@ +$(function () { + var url = 'api/SQL'; + + $('.card-body table').smartTable({ + url: url, + sortName: 'LogTime', + sortOrder: 'desc', + queryParams: function (params) { return $.extend(params, { UserName: $("#txt_username").val(), OperateTimeStart: $("#txt_operate_start").val(), OperateTimeEnd: $("#txt_operate_end").val() }); }, + columns: [ + { title: "所属用户", field: "UserName", sortable: true }, + { title: "执行时间", field: "LogTime", sortable: true }, + { title: "脚本内容", field: "SQL", sortable: false } + ], + exportOptions: { + fileName: "SQL日志数据" + } + }); +}); diff --git a/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/longbow.slidercaptcha.js b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/longbow.slidercaptcha.js index f42f2f07..49bcaa78 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/longbow.slidercaptcha.js +++ b/src/admin/Bootstrap.Admin/wwwroot/lib/captcha/longbow.slidercaptcha.js @@ -240,7 +240,6 @@ }; var handleDragMove = function (e) { - e.preventDefault(); if (!isMouseDown) return false; var eventX = e.clientX || e.touches[0].clientX; var eventY = e.clientY || e.touches[0].clientY; diff --git a/src/admin/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.css b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.css index c64b2a6a..726f7350 100644 --- a/src/admin/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.css +++ b/src/admin/Bootstrap.Admin/wwwroot/lib/longbow-checkbox/longbow-checkbox.css @@ -2,6 +2,8 @@ font-weight: 500; cursor: pointer; display: inline-block; + text-overflow: ellipsis; + overflow: hidden; user-select: none; white-space: nowrap; margin: 0; diff --git a/src/admin/Bootstrap.DataAccess.MongoDB/DBLog.cs b/src/admin/Bootstrap.DataAccess.MongoDB/DBLog.cs new file mode 100644 index 00000000..02c4ccb5 --- /dev/null +++ b/src/admin/Bootstrap.DataAccess.MongoDB/DBLog.cs @@ -0,0 +1,15 @@ +namespace Bootstrap.DataAccess.MongoDB +{ + /// + /// DBLog 实体类 + /// + public class DBLog : DataAccess.DBLog + { + /// + /// 保存数据库脚本日志方法 MongoDB 无脚本 + /// + /// + /// + public override bool Save(DataAccess.DBLog p) => true; + } +} diff --git a/src/admin/Bootstrap.DataAccess.MongoDB/Log.cs b/src/admin/Bootstrap.DataAccess.MongoDB/Log.cs index 92f89d9a..d85c9300 100644 --- a/src/admin/Bootstrap.DataAccess.MongoDB/Log.cs +++ b/src/admin/Bootstrap.DataAccess.MongoDB/Log.cs @@ -8,12 +8,12 @@ using System.Linq; namespace Bootstrap.DataAccess.MongoDB { /// - /// + /// 操作日志实体类 /// public class Log : DataAccess.Log { /// - /// + /// 分页查询操作日志 /// /// /// @@ -64,7 +64,7 @@ namespace Bootstrap.DataAccess.MongoDB } /// - /// + /// 查询所有操作日志 /// /// /// @@ -89,7 +89,7 @@ namespace Bootstrap.DataAccess.MongoDB private static void DeleteLogAsync() => System.Threading.Tasks.Task.Run(() => DbManager.Logs.DeleteMany(log => log.LogTime < DateTime.Now.AddDays(-7))); /// - /// + /// 保存操作日志 /// /// /// diff --git a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj index a5b9b2ad..09b03c94 100644 --- a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj +++ b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj @@ -10,9 +10,11 @@ + + diff --git a/src/admin/Bootstrap.DataAccess/DBLog.cs b/src/admin/Bootstrap.DataAccess/DBLog.cs new file mode 100644 index 00000000..a7b6a393 --- /dev/null +++ b/src/admin/Bootstrap.DataAccess/DBLog.cs @@ -0,0 +1,79 @@ +using Longbow.Web.Mvc; +using PetaPoco; +using System; + +namespace Bootstrap.DataAccess +{ + /// + /// 后台数据库脚本执行日志实体类 + /// + [TableName("DBLogs")] + public class DBLog + { + /// + /// 获得/设置 主键ID + /// + public string Id { get; set; } + + /// + /// 获得/设置 当前登陆名 + /// + public string UserName { get; set; } + + /// + /// 获得/设置 数据库执行脚本 + /// + public string SQL { get; set; } + + /// + /// 获取/设置 用户角色关联状态 checked 标示已经关联 '' 标示未关联 + /// + public DateTime LogTime { get; set; } + + /// + /// 查询所有SQL日志信息 + /// + /// + /// + /// + /// + /// + public virtual Page RetrievePages(PaginationOption po, DateTime? startTime, DateTime? endTime, string userName) + { + var sql = new Sql("select * from DBLogs"); + if (startTime.HasValue) sql.Where("LogTime >= @0", startTime.Value); + if (endTime.HasValue) sql.Where("LogTime < @0", endTime.Value.AddDays(1).AddSeconds(-1)); + if (startTime == null && endTime == null) sql.Where("LogTime > @0", DateTime.Today.AddMonths(0 - DictHelper.RetrieveExceptionsLogPeriod())); + if (!string.IsNullOrEmpty(userName)) sql.Where("UserName = @0", userName); + sql.OrderBy($"{po.Sort} {po.Order}"); + + return DbManager.Create().Page(po.PageIndex, po.Limit, sql); + } + + /// + /// 删除日志信息 + /// + /// + private static void DeleteLogAsync() + { + System.Threading.Tasks.Task.Run(() => + { + var dtm = DateTime.Now.AddMonths(0 - DictHelper.RetrieveLogsPeriod()); + DbManager.Create().Execute("delete from DBLogs where LogTime < @0", dtm); + }); + } + + /// + /// 保存新增的日志信息 + /// + /// + /// + public virtual bool Save(DBLog p) + { + if (p == null) throw new ArgumentNullException(nameof(p)); + DeleteLogAsync(); + DbManager.Create(enableLog: false).Save(p); + return true; + } + } +} diff --git a/src/admin/Bootstrap.DataAccess/DbManager.cs b/src/admin/Bootstrap.DataAccess/DbManager.cs index 4e065669..de5d18f9 100644 --- a/src/admin/Bootstrap.DataAccess/DbManager.cs +++ b/src/admin/Bootstrap.DataAccess/DbManager.cs @@ -1,4 +1,8 @@ -using PetaPoco; +using Longbow.Data; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using PetaPoco; using System; using System.Collections.Specialized; @@ -14,12 +18,28 @@ namespace Bootstrap.DataAccess ///