diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index 9146b1fc..551a284c 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -9,7 +9,7 @@ "urls": "http://localhost:8888", //项目启动url,如果改动端口前端对应devServer也需要进行修改 "dbConfigs": [ { - "Conn": "Data Source=127.0.0.1;User ID=admin;Password=123456;Initial Catalog=ZrAdmin;", + "Conn": "Data Source=127.0.0.1;User ID=sa;Password=123456;Initial Catalog=ZrAdmin;", "DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true @@ -19,7 +19,7 @@ //代码生成数据库配置 "CodeGenDbConfig": { //代码生成连接字符串,注意{dbName}为固定格式,不要填写数据库名 - "Conn": "Data Source=127.0.0.1;User ID=admin;Password=123456;Initial Catalog={dbName};", + "Conn": "Data Source=127.0.0.1;User ID=sa;Password=123456;Initial Catalog={dbName};", "DbType": 1, "IsAutoCloseConnection": true, "DbName": "ZrAdmin" //代码生成默认连接数据库 @@ -52,9 +52,9 @@ }, //企业微信通知配置 "WxCorp": { - "AgentID": "", - "CorpID": "", - "CorpSecret": "", + "AgentID": "1", + "CorpID": "1", + "CorpSecret": "1", "SendUser": "@all" }, //代码生成配置 diff --git a/ZR.Model/System/SysNotice.cs b/ZR.Model/System/SysNotice.cs index ff00e342..0010e54d 100644 --- a/ZR.Model/System/SysNotice.cs +++ b/ZR.Model/System/SysNotice.cs @@ -26,7 +26,7 @@ namespace ZR.Model.System /// 公告类型 (1通知 2公告) /// [SugarColumn(ColumnName = "notice_type", ExtendedAttribute = ProteryConstant.NOTNULL)] - public int NoticeType { get; set; } + public char NoticeType { get; set; } /// /// 公告内容 /// @@ -36,6 +36,6 @@ namespace ZR.Model.System /// 公告状态 (0正常 1关闭) /// [SugarColumn(DefaultValue = "0", ExtendedAttribute = ProteryConstant.NOTNULL)] - public int Status { get; set; } + public char Status { get; set; } } } \ No newline at end of file diff --git a/ZR.Service/System/SysNoticeService.cs b/ZR.Service/System/SysNoticeService.cs index 7c938a01..9cd7048e 100644 --- a/ZR.Service/System/SysNoticeService.cs +++ b/ZR.Service/System/SysNoticeService.cs @@ -27,7 +27,7 @@ namespace ZR.Service.System { var predicate = Expressionable.Create(); - predicate = predicate.And(m => m.Status == 0); + predicate = predicate.And(m => m.Status == '0'); return Queryable() .Where(predicate.ToExpression()) .OrderByDescending(f => f.Create_time) diff --git a/ZR.Vue/src/assets/image/profile.jpg b/ZR.Vue/src/assets/image/profile.jpg index 997732a4..16fd7916 100644 Binary files a/ZR.Vue/src/assets/image/profile.jpg and b/ZR.Vue/src/assets/image/profile.jpg differ diff --git a/ZR.Vue/src/assets/image/reward.jpg b/ZR.Vue/src/assets/image/reward.jpg deleted file mode 100644 index 68fe0d33..00000000 Binary files a/ZR.Vue/src/assets/image/reward.jpg and /dev/null differ diff --git a/ZR.Vue/src/assets/logo/logo.png b/ZR.Vue/src/assets/logo/logo.png index 9838306b..18bce356 100644 Binary files a/ZR.Vue/src/assets/logo/logo.png and b/ZR.Vue/src/assets/logo/logo.png differ diff --git a/ZR.Vue/src/views/index.vue b/ZR.Vue/src/views/index.vue index f973df9d..5a646e08 100644 --- a/ZR.Vue/src/views/index.vue +++ b/ZR.Vue/src/views/index.vue @@ -1,234 +1,367 @@ - diff --git a/ZR.Vue/src/views/index_v1.vue b/ZR.Vue/src/views/index_v1.vue deleted file mode 100644 index 5a646e08..00000000 --- a/ZR.Vue/src/views/index_v1.vue +++ /dev/null @@ -1,367 +0,0 @@ - - - - - diff --git a/ZR.Vue/src/views/login.vue b/ZR.Vue/src/views/login.vue index ddb2e75a..4c8fcb25 100644 --- a/ZR.Vue/src/views/login.vue +++ b/ZR.Vue/src/views/login.vue @@ -1,43 +1,82 @@ +