1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminGroupCategroyController.cs

@@ -13,32 +13,32 @@ namespace GxPress.Api.AdminControllers
     [Route("api/admin/group-categroy")]
     [ApiController]
     [Authorize]
-    public class AdminGroupCategroyController : Controller
+    public class AdminGroupCategoryController : Controller
     {
-        private readonly IGroupCategroyRepository groupCategroyRepository;
-        public AdminGroupCategroyController(IGroupCategroyRepository groupCategroyRepository)
+        private readonly IGroupCategoryRepository groupCategoryRepository;
+        public AdminGroupCategoryController(IGroupCategoryRepository GroupCategoryRepository)
         {
-            this.groupCategroyRepository = groupCategroyRepository;
+            this.groupCategoryRepository = GroupCategoryRepository;
         }
         /// <summary>
         /// 添加小组广场
         /// </summary>
-        /// <param name="groupCategroy"></param>
+        /// <param name="GroupCategory"></param>
         /// <returns></returns>
         [HttpPost("add")]
-        public async Task<bool> InsertAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
+        public async Task<bool> InsertAsync(Entity.tede2.Group.GroupCategory GroupCategory)
         {
-            return await groupCategroyRepository.InsertAsync(groupCategroy) > 0;
+            return await groupCategoryRepository.InsertAsync(GroupCategory) > 0;
         }
         /// <summary>
         /// 修改
         /// </summary>
-        /// <param name="groupCategroy"></param>
+        /// <param name="GroupCategory"></param>
         /// <returns></returns>
         [HttpPut]
-        public async Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
+        public async Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategory GroupCategory)
         {
-            return await groupCategroyRepository.UpdateAsync(groupCategroy);
+            return await groupCategoryRepository.UpdateAsync(GroupCategory);
         }
         /// <summary>
         /// 根据ID查询详情
@@ -46,9 +46,9 @@ namespace GxPress.Api.AdminControllers
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpGet("{id}")]
-        public async Task<Entity.tede2.Group.GroupCategroy> GetAsync(int id)
+        public async Task<Entity.tede2.Group.GroupCategory> GetAsync(int id)
         {
-            return await groupCategroyRepository.GetAsync(id);
+            return await groupCategoryRepository.GetAsync(id);
         }
         /// <summary>
         /// 删除
@@ -58,7 +58,7 @@ namespace GxPress.Api.AdminControllers
         [HttpDelete("{id}")]
         public async Task<bool> DeleteAsync(int id)
         {
-            return await groupCategroyRepository.DeleteAsync(id);
+            return await groupCategoryRepository.DeleteAsync(id);
         }
         /// <summary>
         /// 根据parendId获取
@@ -68,7 +68,7 @@ namespace GxPress.Api.AdminControllers
         [HttpGet("list/{parentId}")]
         public async Task<IEnumerable<GroupCategoryResult>> GetAllAsync(int parentId)
         {
-            return await groupCategroyRepository.GetAllAsync(parentId);
+            return await groupCategoryRepository.GetAllAsync(parentId);
         }
     }
 }

gx_api/GxPress/Api/GxPress.Api/AppControllers/GroupController.cs

@@ -35,10 +35,10 @@ namespace GxPress.Api.AppControllers
         private readonly ILoginContext _loginContext;
         private readonly ITopicRepository _topicRepository;
         private readonly ITopicService _topicService;
-        private readonly IGroupCategroyRepository groupCategroyRepository;
+        private readonly IGroupCategoryRepository groupCategoryRepository;
         public GroupController(ILogger<GroupController> logger, IGroupRepository groupRepository,
             IGroupFolderRepository groupFolderRepository, IGroupUserRepository groupUserRepository,
-            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, ITopicService topicService, IGroupCategroyRepository groupCategroyRepository)
+            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, ITopicService topicService, IGroupCategoryRepository groupCategoryRepository)
         {
             _logger = logger;
             _groupFolderRepository = groupFolderRepository;
@@ -48,7 +48,7 @@ namespace GxPress.Api.AppControllers
             _groupService = groupService;
             _topicRepository = topicRepository;
             _topicService = topicService;
-            this.groupCategroyRepository = groupCategroyRepository;
+            this.groupCategoryRepository = groupCategoryRepository;
         }
 
         /// <summary>
@@ -242,7 +242,7 @@ namespace GxPress.Api.AppControllers
         [AllowAnonymous]
         public async Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId)
         {
-            return await groupCategroyRepository.GetAllAsync(parentId);
+            return await groupCategoryRepository.GetAllAsync(parentId);
         }
         /// <summary>
         /// 或者最近使用的小组

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebGroupController.cs

@@ -12,7 +12,7 @@ using GxPress.Result.App.GroupUser;
 using GxPress.Result.App.Topic;
 using GxPress.Result.Web;
 using GxPress.Service.Interface.Group;
-using GxPress.Service.Interface.GroupCategroy;
+using GxPress.Service.Interface.GroupCategory;
 using GxPress.Service.Interface.Topic;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -34,12 +34,12 @@ namespace GxPress.Api.WebControllers
         private readonly ILoginContext _loginContext;
         private readonly ITopicRepository _topicRepository;
         private readonly ITopicService _topicService;
-        private readonly IGroupCategroyRepository groupCategroyRepository;
+        private readonly IGroupCategoryRepository groupCategoryRepository;
         private readonly IUserGroupCategoryRepository userGroupCategoryRepository;
-        private readonly IGroupCategroyService groupCategroyService;
+        private readonly IGroupCategoryService groupCategoryService;
         public WebGroupController(IGroupRepository groupRepository,
             IGroupFolderRepository groupFolderRepository, IGroupUserRepository groupUserRepository,
-            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, ITopicService topicService, IGroupCategroyRepository groupCategroyRepository, IUserGroupCategoryRepository userGroupCategoryRepository, IGroupCategroyService groupCategroyService)
+            ILoginContext loginContext, IGroupService groupService, ITopicRepository topicRepository, ITopicService topicService, IGroupCategoryRepository groupCategoryRepository, IUserGroupCategoryRepository userGroupCategoryRepository, IGroupCategoryService groupCategoryService)
         {
             _groupFolderRepository = groupFolderRepository;
             _groupRepository = groupRepository;
@@ -48,9 +48,9 @@ namespace GxPress.Api.WebControllers
             _groupService = groupService;
             _topicRepository = topicRepository;
             _topicService = topicService;
-            this.groupCategroyRepository = groupCategroyRepository;
+            this.groupCategoryRepository = groupCategoryRepository;
             this.userGroupCategoryRepository = userGroupCategoryRepository;
-            this.groupCategroyService = groupCategroyService;
+            this.groupCategoryService = groupCategoryService;
         }
         /// <summary>
         /// 新建小组
@@ -94,7 +94,7 @@ namespace GxPress.Api.WebControllers
         [AllowAnonymous]
         public async Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId)
         {
-            return await groupCategroyService.GetGroupCategoryAsync(parentId, _loginContext.AccountId);
+            return await groupCategoryService.GetGroupCategoryAsync(parentId, _loginContext.AccountId);
         }
 
         /// <summary>

gx_api/GxPress/Model/GxPress.Entity/tede2/Group/GroupCategroy.cs

@@ -6,7 +6,7 @@ namespace GxPress.Entity.tede2.Group
     /// 小组广场
     /// </summary>
     [DataTable("tede_group_piazza")]
-    public class GroupCategroy : Datory.Entity
+    public class GroupCategory : Datory.Entity
     {
         /// <summary>
         /// 广场名称

gx_api/GxPress/Model/GxPress.Mappings/GroupCategroyMapping.cs

@@ -7,7 +7,7 @@ namespace GxPress.Mappings
     {
         public GroupCategroyMapping()
         {
-            CreateMap<Entity.tede2.Group.GroupCategroy, GroupCategoryResult>();
+            CreateMap<Entity.tede2.Group.GroupCategory, GroupCategoryResult>();
         }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/Group/GroupCategroyRepository.cs

@@ -4,27 +4,27 @@ using AutoMapper;
 using Datory;
 using GxPress.Common.AppOptions;
 using GxPress.Common.Tools;
-using GxPress.Repository.Interface.Group;
 using GxPress.Result.Web;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Options;
 using System.Transactions;
 using Dapper;
+using GxPress.Repository.Interface.Group;
 
 namespace GxPress.Repository.Implement.Group
 {
     /// <summary>
     /// 小组广场
     /// </summary>
-    public class GroupCategroyRepository : IGroupCategroyRepository
+    public class GroupCategoryRepository : IGroupCategoryRepository
     {
-        private readonly Repository<Entity.tede2.Group.GroupCategroy> _repository;
+        private readonly Repository<Entity.tede2.Group.GroupCategory> _repository;
         private readonly Repository<Entity.tede2.Group.UserGroupCategory> userGroupCategoryRepository;
         private readonly IMapper _mapper;
         private readonly IDistributedCache _cache;
         private readonly string _connectionString;
         private readonly string _databaseTypestr;
-        public GroupCategroyRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper, IDistributedCache cache)
+        public GroupCategoryRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper, IDistributedCache cache)
         {
             _databaseTypestr = dbOptionsAccessor.CurrentValue.DatabaseType;
             _connectionString = dbOptionsAccessor.CurrentValue.ConnectionString;
@@ -32,7 +32,7 @@ namespace GxPress.Repository.Implement.Group
             var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
             _mapper = mapper;
             _cache = cache;
-            _repository = new Repository<Entity.tede2.Group.GroupCategroy>(database);
+            _repository = new Repository<Entity.tede2.Group.GroupCategory>(database);
             userGroupCategoryRepository = new Repository<Entity.tede2.Group.UserGroupCategory>(database);
         }
 
@@ -43,32 +43,32 @@ namespace GxPress.Repository.Implement.Group
         /// <summary>
         /// 添加小组广场
         /// </summary>
-        /// <param name="groupCategroy"></param>
+        /// <param name="GroupCategory"></param>
         /// <returns></returns>
-        public async Task<int> InsertAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
+        public async Task<int> InsertAsync(Entity.tede2.Group.GroupCategory groupCategory)
         {
-            groupCategroy.ImageUrls = StringUtils.RemoveDomain(groupCategroy.ImageUrls);
-            return await _repository.InsertAsync(groupCategroy);
+            groupCategory.ImageUrls = StringUtils.RemoveDomain(groupCategory.ImageUrls);
+            return await _repository.InsertAsync(groupCategory);
         }
 
 
-        public async Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategroy groupCategroy)
+        public async Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategory groupCategory)
         {
-            if (groupCategroy.Id > 0)
+            if (groupCategory.Id > 0)
             {
-                var model = await GetAsync(groupCategroy.Id);
-                if (!string.IsNullOrEmpty(groupCategroy.PiazzaName))
-                    model.PiazzaName = groupCategroy.PiazzaName;
-                if (groupCategroy.ParentId > 0)
-                    model.ParentId = groupCategroy.ParentId;
-                if (string.IsNullOrEmpty(groupCategroy.ImageUrls))
-                    model.ImageUrls = StringUtils.RemoveDomain(groupCategroy.ImageUrls);
-                return await _repository.UpdateAsync(groupCategroy);
+                var model = await GetAsync(groupCategory.Id);
+                if (!string.IsNullOrEmpty(groupCategory.PiazzaName))
+                    model.PiazzaName = groupCategory.PiazzaName;
+                if (groupCategory.ParentId > 0)
+                    model.ParentId = groupCategory.ParentId;
+                if (string.IsNullOrEmpty(groupCategory.ImageUrls))
+                    model.ImageUrls = StringUtils.RemoveDomain(groupCategory.ImageUrls);
+                return await _repository.UpdateAsync(groupCategory);
             }
             return false;
         }
 
-        public async Task<Entity.tede2.Group.GroupCategroy> GetAsync(int id)
+        public async Task<Entity.tede2.Group.GroupCategory> GetAsync(int id)
         {
             return await _repository.GetAsync(id);
         }
@@ -96,23 +96,22 @@ namespace GxPress.Repository.Implement.Group
         /// <returns></returns>
         public async Task<IEnumerable<GroupCategoryResult>> GetAllAsync(int parentId)
         {
-            var result = await _repository.GetAllAsync<GroupCategoryResult>(Q.Where(nameof(Entity.tede2.Group.GroupCategroy.ParentId), parentId));
+            var result = await _repository.GetAllAsync<GroupCategoryResult>(Q.Where(nameof(Entity.tede2.Group.GroupCategory.ParentId), parentId));
             foreach (var item in result)
             {
-                item.IsChildren = await _repository.ExistsAsync(Q.Where(nameof(Entity.tede2.Group.GroupCategroy.ParentId), item.Id));
+                item.IsChildren = await _repository.ExistsAsync(Q.Where(nameof(Entity.tede2.Group.GroupCategory.ParentId), item.Id));
                 item.ImageUrls = StringUtils.AddDomain(item.ImageUrls);
             }
             return result;
         }
-
-        public async Task<IEnumerable<GroupCategoryResult>> GetUserGroupCategroyResult(int userId)
+        public async Task<IEnumerable<GroupCategoryResult>> GetUsergroupCategoryResult(int userId)
         {
             string sql = $@"SELECT 
                                 a.*
                             FROM
                                 tede_group_piazza a
                                     INNER JOIN
-                                tede_user_group_category b ON a.id = b.GroupCategroyId
+                                tede_user_group_category b ON a.id = b.GroupCategoryId
                             WHERE
                                 b.UserId = {userId}
                             ORDER BY b.CreatedDate";
@@ -123,9 +122,10 @@ namespace GxPress.Repository.Implement.Group
             foreach (var item in result)
             {
                 item.ImageUrls = StringUtils.AddDomainMin(item.ImageUrls);
-                item.IsChildren = await _repository.ExistsAsync(Q.Where(nameof(Entity.tede2.Group.GroupCategroy.ParentId), item.Id));
+                item.IsChildren = await _repository.ExistsAsync(Q.Where(nameof(Entity.tede2.Group.GroupCategory.ParentId), item.Id));
             }
             return result;
         }
+
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/Group/IGroupCategroyRepository.cs

@@ -5,18 +5,18 @@ using GxPress.Result.Web;
 
 namespace GxPress.Repository.Interface.Group
 {
-    public interface IGroupCategroyRepository : IRepository
+    public interface IGroupCategoryRepository : IRepository
     {
         /// <summary>
         /// 添加小组广场
         /// </summary>
-        /// <param name="groupCategroy"></param>
+        /// <param name="groupCategory"></param>
         /// <returns></returns>
-        Task<int> InsertAsync(Entity.tede2.Group.GroupCategroy groupCategroy);
+        Task<int> InsertAsync(Entity.tede2.Group.GroupCategory groupCategory);
 
-        Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategroy groupCategroy);
+        Task<bool> UpdateAsync(Entity.tede2.Group.GroupCategory groupCategory);
 
-        Task<Entity.tede2.Group.GroupCategroy> GetAsync(int id);
+        Task<Entity.tede2.Group.GroupCategory> GetAsync(int id);
 
         Task<bool> DeleteAsync(int id);
         /// <summary>
@@ -25,6 +25,6 @@ namespace GxPress.Repository.Interface.Group
         /// <param name="parentId"></param>
         /// <returns></returns>
         Task<IEnumerable<GroupCategoryResult>> GetAllAsync(int parentId);
-        Task<IEnumerable<GroupCategoryResult>> GetUserGroupCategroyResult(int userId);
+        Task<IEnumerable<GroupCategoryResult>> GetUsergroupCategoryResult(int userId);
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/GroupCategroy/GroupCategroyService.cs

@@ -2,17 +2,17 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.Repository.Interface.Group;
 using GxPress.Result.Web;
-using GxPress.Service.Interface.GroupCategroy;
+using GxPress.Service.Interface.GroupCategory;
 
-namespace GxPress.Service.Implement.GroupCategroy
+namespace GxPress.Service.Implement.GroupCategory
 {
-    public class GroupCategroyService : IGroupCategroyService
+    public class GroupCategoryService : IGroupCategoryService
     {
-        private readonly IGroupCategroyRepository groupCategroyRepository;
+        private readonly IGroupCategoryRepository GroupCategoryRepository;
         private readonly IUserGroupCategoryRepository userGroupCategoryRepository;
-        public GroupCategroyService(IGroupCategroyRepository groupCategroyRepository, IUserGroupCategoryRepository userGroupCategoryRepository)
+        public GroupCategoryService(IGroupCategoryRepository GroupCategoryRepository, IUserGroupCategoryRepository userGroupCategoryRepository)
         {
-            this.groupCategroyRepository = groupCategroyRepository;
+            this.GroupCategoryRepository = GroupCategoryRepository;
             this.userGroupCategoryRepository = userGroupCategoryRepository;
         }
         public async Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId, int userId)
@@ -21,10 +21,10 @@ namespace GxPress.Service.Implement.GroupCategroy
             {
                 if (await userGroupCategoryRepository.IsExistsAsync(userId))
                 {
-                    return await groupCategroyRepository.GetUserGroupCategroyResult(userId);
+                    return await GroupCategoryRepository.GetUsergroupCategoryResult(userId);
                 }
             }
-            return await groupCategroyRepository.GetAllAsync(parentId);
+            return await GroupCategoryRepository.GetAllAsync(parentId);
         }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/GroupCategroy/IGroupCategroyService.cs

@@ -2,9 +2,9 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.Result.Web;
 
-namespace GxPress.Service.Interface.GroupCategroy
+namespace GxPress.Service.Interface.GroupCategory
 {
-    public interface IGroupCategroyService:IService
+    public interface IGroupCategoryService:IService
     {
           Task<IEnumerable<GroupCategoryResult>> GetGroupCategoryAsync(int parentId, int userId);
     }