diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/RegisterDto.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/RegisterDto.cs index 40fa0561..484f4ec7 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/RegisterDto.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/Dtos/Account/RegisterDto.cs @@ -8,12 +8,12 @@ /// /// 账号 /// - public string UserName { get; set; } = string.Empty; + public string UserName { get; set; } /// /// 密码 /// - public string Password { get; set; } = string.Empty; + public string Password { get; set; } /// /// 唯一标识码 @@ -29,5 +29,11 @@ /// 验证码 /// public string? Code { get; set; } + + /// + /// 昵称 + /// + public string? Nick{ get; set; } + } } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs index 0882a965..07600dab 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/AccountService.cs @@ -245,7 +245,7 @@ namespace Yi.Framework.Rbac.Application.Services } //注册领域逻辑 - await _accountManager.RegisterAsync(input.UserName, input.Password, input.Phone); + await _accountManager.RegisterAsync(input.UserName, input.Password, input.Phone,input.Nick); } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserAggregateRoot.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserAggregateRoot.cs index 3f992a59..67713772 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserAggregateRoot.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Entities/UserAggregateRoot.cs @@ -19,12 +19,12 @@ namespace Yi.Framework.Rbac.Domain.Entities { } - public UserAggregateRoot(string userName, string password, long phone, string nick = "萌新") + public UserAggregateRoot(string userName, string password, long phone, string? nick = null) { UserName = userName; EncryPassword.Password = password; Phone = phone; - Nick = nick+"-"+userName; + Nick =string.IsNullOrWhiteSpace(nick)?"萌新-"+userName:nick.Trim(); BuildPassword(); } diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs index 233518dd..7aa1068c 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/AccountManager.cs @@ -271,9 +271,9 @@ namespace Yi.Framework.Rbac.Domain.Managers /// /// /// - public async Task RegisterAsync(string userName, string password, long phone) + public async Task RegisterAsync(string userName, string password, long phone,string? nick) { - var user = new UserAggregateRoot(userName, password, phone); + var user = new UserAggregateRoot(userName, password, phone,nick); await _userManager.CreateAsync(user); await _userManager.SetDefautRoleAsync(user.Id); diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/IAccountManager.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/IAccountManager.cs index cbbf5eb9..d0493759 100644 --- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/IAccountManager.cs +++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/IAccountManager.cs @@ -14,7 +14,7 @@ namespace Yi.Framework.Rbac.Domain.Managers string CreateRefreshToken(Guid userId); Task GetTokenByUserIdAsync(Guid userId,Action? getUserInfo=null); Task LoginValidationAsync(string userName, string password, Action? userAction = null); - Task RegisterAsync(string userName, string password, long phone); + Task RegisterAsync(string userName, string password, long phone,string? nick); Task RestPasswordAsync(Guid userId, string password); Task UpdatePasswordAsync(Guid userId, string newPassword, string oldPassword); } diff --git a/Yi.Bbs.Vue3/src/assets/styles/login.css b/Yi.Bbs.Vue3/src/assets/styles/login.css index 7753253e..6bdfa288 100644 --- a/Yi.Bbs.Vue3/src/assets/styles/login.css +++ b/Yi.Bbs.Vue3/src/assets/styles/login.css @@ -142,8 +142,8 @@ align-items: flex-end; { margin-left: 20px; border: 0.8px solid #000; - width: 100px; - height: 30px; + width: 150px; + height: 40px; text-align: center; } .div-bottom diff --git a/Yi.Bbs.Vue3/src/assets/wechat/share.png b/Yi.Bbs.Vue3/src/assets/wechat/share.png new file mode 100644 index 00000000..2b23e44e Binary files /dev/null and b/Yi.Bbs.Vue3/src/assets/wechat/share.png differ diff --git a/Yi.Bbs.Vue3/src/layout/AppHeader.vue b/Yi.Bbs.Vue3/src/layout/AppHeader.vue index 69620de2..f315273b 100644 --- a/Yi.Bbs.Vue3/src/layout/AppHeader.vue +++ b/Yi.Bbs.Vue3/src/layout/AppHeader.vue @@ -154,7 +154,12 @@ const noticeForNoReadCount = computed(() => { }) //加载初始化离线消息 onMounted(async () => { - await fetchNoticeData(); + //登录了才去判断消息通知 + if (isLogin.value) + { + await fetchNoticeData(); + } + }) const fetchNoticeData = async () => { const { data } = await getNoticeList({ maxResultCount: 20 }); diff --git a/Yi.Bbs.Vue3/src/views/Auth/index.vue b/Yi.Bbs.Vue3/src/views/Auth/index.vue index 808ea014..dde0ffc7 100644 --- a/Yi.Bbs.Vue3/src/views/Auth/index.vue +++ b/Yi.Bbs.Vue3/src/views/Auth/index.vue @@ -37,10 +37,13 @@ watch( break; } try { + //state 0 代表使用第三方登录 if (type.value === "0") { const { data } = await authOtherLogin({ code: val }, scheme.value); authData.value = data; - } else if (type.value === "1") { + } + //state 0 代表进行第三方绑定 + else if (type.value === "1") { const { data } = await authOtherBind({ code: val }, scheme.value); authData.value = data; } diff --git a/Yi.Bbs.Vue3/src/views/EditArticle.vue b/Yi.Bbs.Vue3/src/views/EditArticle.vue index af153c7a..ffe60fb8 100644 --- a/Yi.Bbs.Vue3/src/views/EditArticle.vue +++ b/Yi.Bbs.Vue3/src/views/EditArticle.vue @@ -62,6 +62,7 @@ 404 - \ No newline at end of file diff --git a/Yi.Bbs.Vue3/src/views/home/Index.vue b/Yi.Bbs.Vue3/src/views/home/Index.vue index 92bf7039..04fec20b 100644 --- a/Yi.Bbs.Vue3/src/views/home/Index.vue +++ b/Yi.Bbs.Vue3/src/views/home/Index.vue @@ -3,8 +3,8 @@
-

点击前往-最新上线《聊天室》 ，现已支持Ai助手，希望能帮助大家 -

+ +

点击关注-最新上线《意.Net官方微信公众号》 ，分享有深度的.Net知识，希望能帮助大家

@@ -188,6 +188,25 @@ + + + +
+ +
+ + +
@@ -402,6 +421,7 @@ const onClickAccessLog = async () => { } +const wechatDialogVisible=ref(false) //切换统计开关 const onClickWeekSwitch = async () => { if (weekQuery.accessLogType === "HomeClick") { @@ -413,6 +433,11 @@ const onClickWeekSwitch = async () => { const {data: weekData} = await getWeek(weekQuery); weekList.value = weekData; } + +//打开微信公众号弹窗 +const onClickToWeChat=()=>{ + wechatDialogVisible.value=true; +};