diff --git a/GDZZ.Application/Entity/InviteUserPos.cs b/GDZZ.Application/Entity/InviteUserPos.cs index dbb8624..db92fec 100644 --- a/GDZZ.Application/Entity/InviteUserPos.cs +++ b/GDZZ.Application/Entity/InviteUserPos.cs @@ -23,5 +23,9 @@ namespace GDZZ.Application.Entity /// 邀请人ID /// public long InviteUserID { get; set; } + /// + /// 创建时间 + /// + public DateTime CreatedTime { get; set; } } } \ No newline at end of file diff --git a/GDZZ.Application/Entity/MiniRecharge.cs b/GDZZ.Application/Entity/MiniRecharge.cs index adff3f0..48e16bf 100644 --- a/GDZZ.Application/Entity/MiniRecharge.cs +++ b/GDZZ.Application/Entity/MiniRecharge.cs @@ -23,5 +23,9 @@ namespace GDZZ.Application.Entity /// 充值状态 /// public int Status { get; set; } + /// + /// 充值类型 + /// + public int Type { get; set; } } } \ No newline at end of file diff --git a/GDZZ.Application/Enum/RechargeTypeEnum.cs b/GDZZ.Application/Enum/RechargeTypeEnum.cs new file mode 100644 index 0000000..bf4023b --- /dev/null +++ b/GDZZ.Application/Enum/RechargeTypeEnum.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GDZZ.Application.Enum +{ + public enum RechargeTypeEnum + { + /// + /// 奖励 + /// + [Description("奖励")] Reward = 10, + /// + /// 储值 + /// + [Description("储值")] StoredValue = 20, + + } +} diff --git a/GDZZ.Application/GDZZ.Application.xml b/GDZZ.Application/GDZZ.Application.xml index cea7f17..b251a8a 100644 --- a/GDZZ.Application/GDZZ.Application.xml +++ b/GDZZ.Application/GDZZ.Application.xml @@ -234,6 +234,11 @@ 邀请人ID + + + 创建时间 + + 聊天历史任务列表 @@ -409,6 +414,11 @@ 充值状态 + + + 充值类型 + + 小程序招聘列表 @@ -574,6 +584,16 @@ 联系费用 + + + 奖励 + + + + + 储值 + + 已发布 @@ -1662,16 +1682,6 @@ 主键Id - - - 企业ID - - - - - 邀请码 - - 邀请码表服务 @@ -1705,6 +1715,13 @@ + + + 获取邀请码 + + + + 聊天历史任务列表输出参数 diff --git a/GDZZ.Application/Service/InvitationCode/Dto/InvitationCodeOutput.cs b/GDZZ.Application/Service/InvitationCode/Dto/InvitationCodeOutput.cs index c0cb08c..9d8df12 100644 --- a/GDZZ.Application/Service/InvitationCode/Dto/InvitationCodeOutput.cs +++ b/GDZZ.Application/Service/InvitationCode/Dto/InvitationCodeOutput.cs @@ -12,15 +12,11 @@ namespace GDZZ.Application /// public long Id { get; set; } - /// - /// 企业ID - /// - public long EnterpriseID { get; set; } - - /// - /// 邀请码 - /// - public long Code { get; set; } + public string Name { get; set; } + + public string Avatar { get; set; } + + public DateTime dateTime { get; set; } } } diff --git a/GDZZ.Application/Service/InvitationCode/InvitationCodeService.cs b/GDZZ.Application/Service/InvitationCode/InvitationCodeService.cs index 68a663a..9bafc60 100644 --- a/GDZZ.Application/Service/InvitationCode/InvitationCodeService.cs +++ b/GDZZ.Application/Service/InvitationCode/InvitationCodeService.cs @@ -11,6 +11,8 @@ using GDZZ.Application.Help; using Furion.DistributedIDGenerator; using Furion.FriendlyException; using System; +using GDZZ.Core.Entity; +using System.Collections.Generic; namespace GDZZ.Application { @@ -24,9 +26,16 @@ namespace GDZZ.Application private readonly SqlSugarRepository inviteUserPosrep; - public InvitationCodeService(SqlSugarRepository rep, SqlSugarRepository inviteUserPosrep) + private readonly SqlSugarRepository sysUserrep; //用户仓储 + private readonly SqlSugarRepository rechargeRep; //充值仓储 + public InvitationCodeService(SqlSugarRepository rep, + SqlSugarRepository rechargeRep, + SqlSugarRepository sysUserrep, + SqlSugarRepository inviteUserPosrep) { _rep = rep; + this.sysUserrep = sysUserrep; + this.rechargeRep = rechargeRep; this.inviteUserPosrep = inviteUserPosrep; } @@ -81,12 +90,28 @@ namespace GDZZ.Application /// /// [HttpGet("/InvitationCode/GetPNumber")] - public async Task GetPNumber() + public async Task> GetPNumber() { + List invitationCodes = new List(); var invitation = await this.inviteUserPosrep.Where(u => u.InviteUserID == UserManager.UserId).ToArrayAsync(); if (invitation.IsNullOrZero()) throw Oops.Oh("暂无邀请人"); - return invitation.Count(); + + + foreach (var item in invitation) + { + var sysUser =await this.sysUserrep.FirstOrDefaultAsync(x => x.Id == item.UserID); + invitationCodes.Add(new InvitationCodeOutput() + { + Id = item.Id, + Name = sysUser.Name, + Avatar = sysUser.Avatar, + dateTime = item.CreatedTime, + + }); + } + + return invitationCodes; } @@ -101,6 +126,10 @@ namespace GDZZ.Application var incode = await this._rep.FirstOrDefaultAsync(x => x.InviteCode == input.InviteCode); if (incode.IsNullOrZero()) throw Oops.Oh("无此邀请码!"); + + //奖励 + + this.inviteUserPosrep.Insert(new InviteUserPos() { InviteID = incode.Id, diff --git a/GDZZ.Application/Service/LiveHistoryContacts/LiveHistoryContactsService.cs b/GDZZ.Application/Service/LiveHistoryContacts/LiveHistoryContactsService.cs index a16d361..43430c0 100644 --- a/GDZZ.Application/Service/LiveHistoryContacts/LiveHistoryContactsService.cs +++ b/GDZZ.Application/Service/LiveHistoryContacts/LiveHistoryContactsService.cs @@ -271,6 +271,10 @@ namespace GDZZ.Application } + + //设置消息支付状态 --存入reids + + /// /// 上传文件 /// diff --git a/GDZZ.Application/Service/MiniResume/MiniResumeService.cs b/GDZZ.Application/Service/MiniResume/MiniResumeService.cs index 8f538c8..ed8b5e6 100644 --- a/GDZZ.Application/Service/MiniResume/MiniResumeService.cs +++ b/GDZZ.Application/Service/MiniResume/MiniResumeService.cs @@ -13,6 +13,7 @@ using System; using System.Collections.Generic; using GDZZ.Core.Entity; using Furion.FriendlyException; +using Senparc.CO2NET.Extensions; namespace GDZZ.Application { @@ -55,12 +56,14 @@ namespace GDZZ.Application [AllowAnonymous] public async Task GetResumeList([FromQuery] MiniResumeInput input) { - var entities =await _rep.AsQueryable() + var companys = await this.CompanyRep.AsQueryable().WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.Name.Contains(input.SearchValue)).FirstAsync(); + + var entities =await _rep.AsQueryable() .WhereIF(!string.IsNullOrWhiteSpace(input.RegionName), u => u.RegionName.Contains(input.RegionName.Trim())) - .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.Title.Contains(input.SearchValue)) + .WhereIF(!companys.IsNullOrZero(),u => u.Title.Contains(input.SearchValue)|| u.CompanyID == companys.Id) .WhereIF(!string.IsNullOrWhiteSpace(input.Record), u => u.Record.Contains(input.Record.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Level), u => u.Record.Contains(input.Level.Trim())) - .LeftJoin((u, y) => u.CompanyID == y.Id) //关联公司信息 + .LeftJoin((u, y) => u.CompanyID == y.Id ) //关联公司信息 .Select((u, y) => new MiniResumeOutput { CompanyID =y.Id,CompanyName = y.Name, diff --git a/GDZZ.Application/Service/WXPay/WXPayService.cs b/GDZZ.Application/Service/WXPay/WXPayService.cs index 6d511ed..9996654 100644 --- a/GDZZ.Application/Service/WXPay/WXPayService.cs +++ b/GDZZ.Application/Service/WXPay/WXPayService.cs @@ -94,7 +94,6 @@ namespace GDZZ.Application.Service.WXPay var balan = await this.balance.AsQueryable().Filter("TenantId", true).SingleAsync(x => x.UserID == UserManager.UserId); if (balan == null) return null; - return new BalanceOut() { Amount = balan.Amount, @@ -126,7 +125,7 @@ namespace GDZZ.Application.Service.WXPay var comrep = await this.ComsumeRep.Where(x=>x.ResumeID== ResumeID).FirstAsync(); if(!comrep.IsNullOrZero()) //已经消费过了 - return true; + throw Oops.Oh("已经消费过了"); var ban = await this.balance.Where(x => x.UserID == UserManager.UserId).FirstAsync(); if (ban == null) @@ -146,7 +145,6 @@ namespace GDZZ.Application.Service.WXPay return await this.balance.AsUpdateable(ban).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync()>0; } - /// /// 查询消费记录 /// @@ -160,7 +158,6 @@ namespace GDZZ.Application.Service.WXPay } - /// ///微信小程序支付 /// @@ -171,11 +168,11 @@ namespace GDZZ.Application.Service.WXPay public async Task WxPay(AuthUserInput authUserInput) { - var recharge = await this.rechargeRep.InsertReturnEntityAsync(new MiniRecharge() { PaymentMoney = authUserInput.Money, Status = (int)RechargeEnum.NoFinis, + Type = (int)RechargeTypeEnum.StoredValue, TotalPrice = authUserInput.Money }); diff --git a/GDZZ.CodeFirst/Program.cs b/GDZZ.CodeFirst/Program.cs index 2a0e766..d45d599 100644 --- a/GDZZ.CodeFirst/Program.cs +++ b/GDZZ.CodeFirst/Program.cs @@ -1,8 +1,4 @@ // See https://aka.ms/new-console-template for more information - - - - using GDZZ.CodeFirst; using GDZZ.Core; using GDZZ.Core.Entity; @@ -13,9 +9,7 @@ using System.Reflection; using System.Text; - - -var assembles = new string[] { "GDZZ.FlowCenter.dll", "GDZZ.Core.dll" }; +var assembles = new string[] { "GDZZ.FlowCenter.dll", "GDZZ.Core.dll" , "GDZZ.Application.dll" }; //首先创建数据库 CreateDatabase(); //初始化表结构 @@ -41,10 +35,10 @@ static void InitDatabase(string[] assembles) { var conn = SqlSugarHelper.GetSetting(); var configIds = new List(); configIds.Add(conn.DefaultDbNumber); - foreach (var item in conn.DbConfigs) - { - configIds.Add(item.DbNumber); - } + //foreach (var item in conn.DefaultDbString) + //{ + // configIds.Add(conn.DefaultDbNumber); + //} foreach (var item in assembles) { diff --git a/GDZZ.CodeFirst/SeedData/SysUserSeedData.cs b/GDZZ.CodeFirst/SeedData/SysUserSeedData.cs index c091d82..f218e85 100644 --- a/GDZZ.CodeFirst/SeedData/SysUserSeedData.cs +++ b/GDZZ.CodeFirst/SeedData/SysUserSeedData.cs @@ -3,11 +3,25 @@ using GDZZ.Core.Entity; namespace GDZZ.CodeFirst; -public class SysUserSeedData : ISeedData , ISqlSugarEntitySeedData -{ public IEnumerable HasData() - { string json = @"[{""Account"":""superAdmin"",""Password"":""e10adc3949ba59abbe56e057f20f883e"",""NickName"":""superAdmin"",""Name"":""超级管理员"",""Avatar"":""188632919339077"",""Birthday"":""1753-01-01T00:00:00"",""Sex"":1,""Email"":null,""Phone"":""18020030720"",""Tel"":null,""LastLoginIp"":""127.0.0.1"",""LastLoginTime"":""2022-05-25T09:12:40.45"",""AdminType"":1,""Status"":0,""TenantId"":142307070918780,""CreatedTime"":null,""UpdatedTime"":""2021-08-06T10:49:21.047"",""CreatedUserId"":null,""CreatedUserName"":null,""UpdatedUserId"":142307070910551,""UpdatedUserName"":""superAdmin"",""IsDeleted"":false,""Id"":142307070910551},{""Account"":""toudou@qq.com"",""Password"":""e10adc3949ba59abbe56e057f20f883e"",""NickName"":""tdadmin"",""Name"":""tdadmin"",""Avatar"":null,""Birthday"":""1753-01-01T00:00:00"",""Sex"":0,""Email"":""toudou@qq.com"",""Phone"":null,""Tel"":null,""LastLoginIp"":""127.0.0.1"",""LastLoginTime"":""2022-04-16T00:42:43.103"",""AdminType"":2,""Status"":0,""TenantId"":175624014975045,""CreatedTime"":""2021-06-30T16:35:58.873"",""UpdatedTime"":null,""CreatedUserId"":142307070910551,""CreatedUserName"":""superAdmin"",""UpdatedUserId"":null,""UpdatedUserName"":null,""IsDeleted"":false,""Id"":175624015269957},{""Account"":""admin"",""Password"":""e10adc3949ba59abbe56e057f20f883e"",""NickName"":""admin"",""Name"":""管理员"",""Avatar"":null,""Birthday"":""1753-01-01T00:00:00"",""Sex"":1,""Email"":null,""Phone"":""15959110752"",""Tel"":null,""LastLoginIp"":""0.0.0.1"",""LastLoginTime"":""2021-08-19T23:55:06.2"",""AdminType"":0,""Status"":0,""TenantId"":142307070918780,""CreatedTime"":""2021-07-05T11:59:16.617"",""UpdatedTime"":""2021-08-19T23:10:52.907"",""CreatedUserId"":142307070910551,""CreatedUserName"":""superAdmin"",""UpdatedUserId"":142307070910551,""UpdatedUserName"":""superAdmin"",""IsDeleted"":false,""Id"":177325484421189},{""Account"":""zhangsan"",""Password"":""e10adc3949ba59abbe56e057f20f883e"",""NickName"":""张三"",""Name"":""张三"",""Avatar"":null,""Birthday"":""1753-01-01T00:00:00"",""Sex"":1,""Email"":null,""Phone"":""15959110751"",""Tel"":null,""LastLoginIp"":""127.0.0.1"",""LastLoginTime"":""2021-07-19T15:13:27.183"",""AdminType"":0,""Status"":0,""TenantId"":142307070918780,""CreatedTime"":""2021-07-19T14:18:44.05"",""UpdatedTime"":null,""CreatedUserId"":142307070910551,""CreatedUserName"":""superAdmin"",""UpdatedUserId"":null,""UpdatedUserName"":null,""IsDeleted"":false,""Id"":182314279026757},{""Account"":""zuhutest"",""Password"":""e10adc3949ba59abbe56e057f20f883e"",""NickName"":""租户1管理员"",""Name"":""租户1管理员"",""Avatar"":null,""Birthday"":""1753-01-01T00:00:00"",""Sex"":0,""Email"":""zuhutest"",""Phone"":null,""Tel"":null,""LastLoginIp"":""127.0.0.1"",""LastLoginTime"":""2022-04-16T01:06:31.343"",""AdminType"":2,""Status"":0,""TenantId"":278024843046981,""CreatedTime"":""2022-04-16T01:06:00.993"",""UpdatedTime"":null,""CreatedUserId"":142307070910551,""CreatedUserName"":""superAdmin"",""UpdatedUserId"":null,""UpdatedUserName"":null,""IsDeleted"":false,""Id"":278024843153477}] +public class SysUserSeedData : ISeedData, ISqlSugarEntitySeedData +{ + public IEnumerable HasData() + { + string json = @"[ +{""Account"":""superAdmin"",""Password"":""e10adc3949ba59abbe56e057f20f883e"", +""NickName"":""superAdmin"",""Name"":""超级管理员"",""Avatar"":""188632919339077"",""Birthday"":""1753-01-01T00:00:00"", +""Sex"":1,""Email"":""zongzhi@zz.com"",""Phone"":""18020030720"",""Tel"":null,""LastLoginIp"":""127.0.0.1"",""LastLoginTime"":""2022-05-25T09:12:40.45"", +""AdminType"":1,""Status"":0,""TenantId"":142307070918780,""CreatedTime"":null,""UpdatedTime"":""2021-08-06T10:49:21.047"" +,""CreatedUserId"":null,""CreatedUserName"":null,""UpdatedUserId"":142307070910551,""UpdatedUserName"":""superAdmin"", +""IsDeleted"":false,""Id"":142307070910551},{""Account"":""toudou@qq.com"",""Password"":""e10adc3949ba59abbe56e057f20f883e"", +""NickName"":""tdadmin"",""Name"":""tdadmin"",""Avatar"":null,""Birthday"":""1753-01-01T00:00:00"",""Sex"":0,""Email"":""toudou@qq.com"", +""Phone"":null,""Tel"":null,""LastLoginIp"":""127.0.0.1"",""LastLoginTime"":""2022-04-16T00:42:43.103"",""AdminType"":2,""Status"":0, +""TenantId"":175624014975045,""CreatedTime"":""2021-06-30T16:35:58.873"",""UpdatedTime"":null,""CreatedUserId"":142307070910551, +""CreatedUserName"":""superAdmin"",""UpdatedUserId"":null,""UpdatedUserName"":null,""IsDeleted"":false,""Id"":175624015269957}, +{""Account"":""admin"",""Password"":""e10adc3949ba59abbe56e057f20f883e"",""NickName"":""admin"",""Name"":""管理员"",""Avatar"":null,""Birthday"":""1753-01-01T00:00:00"",""Sex"":1,""Email"":null,""Phone"":""15959110752"",""Tel"":null,""LastLoginIp"":""0.0.0.1"",""LastLoginTime"":""2021-08-19T23:55:06.2"",""AdminType"":0,""Status"":0,""TenantId"":142307070918780,""CreatedTime"":""2021-07-05T11:59:16.617"",""UpdatedTime"":""2021-08-19T23:10:52.907"",""CreatedUserId"":142307070910551,""CreatedUserName"":""superAdmin"",""UpdatedUserId"":142307070910551,""UpdatedUserName"":""superAdmin"",""IsDeleted"":false,""Id"":177325484421189},{""Account"":""zhangsan"",""Password"":""e10adc3949ba59abbe56e057f20f883e"",""NickName"":""张三"",""Name"":""张三"",""Avatar"":null,""Birthday"":""1753-01-01T00:00:00"",""Sex"":1,""Email"":null,""Phone"":""15959110751"",""Tel"":null,""LastLoginIp"":""127.0.0.1"",""LastLoginTime"":""2021-07-19T15:13:27.183"",""AdminType"":0,""Status"":0,""TenantId"":142307070918780,""CreatedTime"":""2021-07-19T14:18:44.05"",""UpdatedTime"":null,""CreatedUserId"":142307070910551,""CreatedUserName"":""superAdmin"",""UpdatedUserId"":null,""UpdatedUserName"":null,""IsDeleted"":false,""Id"":182314279026757},{""Account"":""zuhutest"",""Password"":""e10adc3949ba59abbe56e057f20f883e"",""NickName"":""租户1管理员"",""Name"":""租户1管理员"",""Avatar"":null,""Birthday"":""1753-01-01T00:00:00"",""Sex"":0,""Email"":""zuhutest"",""Phone"":null,""Tel"":null,""LastLoginIp"":""127.0.0.1"",""LastLoginTime"":""2022-04-16T01:06:31.343"",""AdminType"":2,""Status"":0,""TenantId"":278024843046981,""CreatedTime"":""2022-04-16T01:06:00.993"",""UpdatedTime"":null,""CreatedUserId"":142307070910551,""CreatedUserName"":""superAdmin"",""UpdatedUserId"":null,""UpdatedUserName"":null,""IsDeleted"":false,""Id"":278024843153477}] "; - List list = JsonUtil.ToObject>(json); + List list = JsonUtil.ToObject>(json); return list; -}} + } +} diff --git a/GDZZ.Core/Entity/SysUser.cs b/GDZZ.Core/Entity/SysUser.cs index b26d208..ded16ac 100644 --- a/GDZZ.Core/Entity/SysUser.cs +++ b/GDZZ.Core/Entity/SysUser.cs @@ -2,6 +2,8 @@ using SqlSugar; using System.ComponentModel; using GDZZ.Core.Entity; +using System.ComponentModel.DataAnnotations; + namespace GDZZ.Core.Entity { /// @@ -11,65 +13,103 @@ namespace GDZZ.Core.Entity [Description("用户表")] public class SysUser : DBEntityTenant { - /// - /// 账号 - /// - public string Account { get; set; } - /// - /// 密码 - /// - public string Password { get; set; } - /// - /// 昵称 - /// - public string NickName { get; set; } - /// - /// 姓名 - /// - public string Name { get; set; } - /// - /// 头像 - /// - public string Avatar { get; set; } - /// - /// 生日 - /// - public DateTime Birthday { get; set; } - /// - /// 性别-男_1、女_2 - /// - public Gender Sex { get; set; } - /// - /// 邮箱 - /// - public string Email { get; set; } - /// - /// 手机 - /// - public string Phone { get; set; } - /// - /// 电话 - /// - public string Tel { get; set; } - /// - /// 最后登录IP - /// - public string LastLoginIp { get; set; } - /// - /// 最后登录时间 - /// - public DateTime LastLoginTime { get; set; } - /// - /// 管理员类型-超级管理员_1、非管理员_2 - /// - public AdminType AdminType { get; set; } - /// - /// 状态-正常_0、停用_1、删除_2 - /// - public CommonStatus Status { get; set; } - /// - /// 简介 - /// - public string Profile { get; set; } + /// + /// 账号 + /// + [Required, MaxLength(20)] + [SugarColumn(ColumnDescription = "账号")] + public string Account { get; set; } + + /// + /// 密码（默认MD5加密） + /// + [Required, MaxLength(50)] + [SugarColumn(ColumnDescription = "密码（默认MD5加密）")] + public string Password { get; set; } + + /// + /// 昵称 + /// + [MaxLength(20)] + [SugarColumn(ColumnDescription = "昵称", IsNullable = true)] + public string NickName { get; set; } + + /// + /// 姓名 + /// + [MaxLength(20)] + [SugarColumn(ColumnDescription = "姓名", IsNullable = true)] + public string Name { get; set; } + + /// + /// 头像 + /// + [SugarColumn(ColumnDescription = "头像", IsNullable = true)] + public string Avatar { get; set; } + + /// + /// 生日 + /// + [SugarColumn(ColumnDescription = "生日", IsNullable = true)] + public DateTime Birthday { get; set; } + + /// + /// 性别-男_1、女_2 + /// + [SugarColumn(ColumnDescription = "性别-男_1、女_2")] + public Gender Sex { get; set; } + + /// + /// 邮箱 + /// + [MaxLength(20)] + [SugarColumn(ColumnDescription = "邮箱", IsNullable = true)] + public string Email { get; set; } + + /// + /// 手机 + /// + [MaxLength(20)] + [SugarColumn(ColumnDescription = "手机", IsNullable = true)] + public string Phone { get; set; } + + /// + /// 电话 + /// + [MaxLength(20)] + [SugarColumn(ColumnDescription = "电话", IsNullable = true)] + public string Tel { get; set; } + + /// + /// 最后登录IP + /// + [MaxLength(20)] + [SugarColumn(ColumnDescription = "最后登录IP", IsNullable = true)] + public string LastLoginIp { get; set; } + + /// + /// 最后登录时间 + /// + [SugarColumn(ColumnDescription = "最后登录时间", IsNullable = true)] + public DateTime LastLoginTime { get; set; } + + /// + /// 管理员类型-超级管理员_1、非管理员_2 + /// + [SugarColumn(ColumnDescription = "管理员类型-超级管理员_1、非管理员_2")] + public AdminType? AdminType { get; set; } + + /// + /// 状态-正常_0、停用_1、删除_2 + /// + [SugarColumn(ColumnDescription = "状态-正常_0、停用_1、删除_2")] + public CommonStatus Status { get; set; } = CommonStatus.ENABLE; + + + /// + /// 简介 + /// + [SugarColumn(ColumnDescription = "简介", IsNullable = true)] + public string Profile { get; set; } } } \ No newline at end of file diff --git a/GDZZ.Core/GDZZ.Core.xml b/GDZZ.Core/GDZZ.Core.xml index 101f44d..bfdc3cb 100644 --- a/GDZZ.Core/GDZZ.Core.xml +++ b/GDZZ.Core/GDZZ.Core.xml @@ -1912,7 +1912,7 @@ - 密码 + 密码（默认MD5加密） diff --git a/GDZZ.Web.Core/dbsettings.json b/GDZZ.Web.Core/dbsettings.json index 28c8817..1f5e9c7 100644 --- a/GDZZ.Web.Core/dbsettings.json +++ b/GDZZ.Web.Core/dbsettings.json @@ -7,6 +7,7 @@ //"DefaultDbString": "Server=.;Database=GDZZCodeFirst;User=sa;Password=123456;MultipleActiveResultSets=True;", "DefaultDbType": "MySql", "DefaultDbString": "Data Source=106.55.234.178;Database=magic;User ID=root;Password=zongzhi2022;pooling=true;port=3306;sslmode=none;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;", + //"DefaultDbString": "Data Source=127.0.0.1;Database=magic;User ID=root;Password=zhongzhi2022;pooling=true;port=3306;sslmode=none;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;", "DbConfigs": [ { "DbNumber": "1", @@ -15,6 +16,8 @@ } ] } + + //数据库示例连接串 //"Sqlite": "Data Source=./GDZZ.db" //"SqlServer": "Server=.;Database=GDZZ;User=sa;Password=123456;MultipleActiveResultSets=True;", //"MySql": "Data Source=localhost;Database=GDZZ;User ID=root;Password=123456;pooling=true;port=3306;sslmode=none;CharSet=utf8;Convert Zero Datetime=True;Allow Zero Datetime=True;" diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/414513762791494.jpg b/GDZZ.Web.Entry/wwwroot/Upload/Default/414513762791494.jpg new file mode 100644 index 0000000..87c5c50 Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/414513762791494.jpg differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/415609498693702.jpg b/GDZZ.Web.Entry/wwwroot/Upload/Default/415609498693702.jpg new file mode 100644 index 0000000..87c5c50 Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/415609498693702.jpg differ diff --git a/GDZZ.Web.Entry/wwwroot/Upload/Default/416248312922182.png b/GDZZ.Web.Entry/wwwroot/Upload/Default/416248312922182.png new file mode 100644 index 0000000..ca9323e Binary files /dev/null and b/GDZZ.Web.Entry/wwwroot/Upload/Default/416248312922182.png differ