diff --git a/Aurora.Microservices/Aurora.Core/Aurora.Core.Api/Controllers/SubjectController.cs b/Aurora.Microservices/Aurora.Core/Aurora.Core.Api/Controllers/SubjectController.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b1f5119ebf379ff5f2797028696db1592522aa35
--- /dev/null
+++ b/Aurora.Microservices/Aurora.Core/Aurora.Core.Api/Controllers/SubjectController.cs
@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Aurora.Core.IService;
+using Aurora.Core.IService.Dto;
+using Aurora.Infrastructure.Response;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+
+namespace Aurora.Core.Api.Controllers
+{
+    [ApiController]
+    [Route("[controller]/[action]")]
+    public class SubjectController : ControllerBase
+    {
+        private readonly ILogger<SubjectController> _logger;
+        private readonly ICategoryService _categoryService;
+
+        public SubjectController(ILogger<SubjectController> logger,
+        ICategoryService categoryService)
+        {
+            _logger = logger;
+            _categoryService = categoryService;
+        }
+
+        [HttpGet]
+        /// <summary>
+        /// get subjects list
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IActionResult> GetList()
+        {
+            var res = await _categoryService.GetList();
+            return Ok(res);
+        }
+
+        // [HttpGet]
+        // /// <summary>
+        // /// get subject by id
+        // /// </summary>
+        // /// <returns></returns>
+        // public async Task<ResponseModel<SubjectDto>> GetById(int id)
+        // {
+        //     var res = await _categoryService.GetById(id);
+        //     return res;
+        // }
+
+        // [HttpPost]
+        // /// <summary>
+        // /// add subject
+        // /// </summary>
+        // /// <returns></returns>
+        // public async Task<ResponseModel<SubjectDto>> Add(SubjectDto model)
+        // {
+        //     var res = await _categoryService.Add(model);
+        //     return res;
+        // }
+    }
+}
diff --git a/Aurora.Microservices/Aurora.Core/Aurora.Core.Domain/Entities/User.cs b/Aurora.Microservices/Aurora.Core/Aurora.Core.Domain/Entities/User.cs
index 7d3e7a6bc50722346aa1364c3795cce82b98aca9..e7cb3b22d4f278071eb00497c05fa8449c3a3389 100644
--- a/Aurora.Microservices/Aurora.Core/Aurora.Core.Domain/Entities/User.cs
+++ b/Aurora.Microservices/Aurora.Core/Aurora.Core.Domain/Entities/User.cs
@@ -5,6 +5,7 @@ namespace Aurora.Core.Domain.Entities
     /// </summary>
     public class User : TenantEntityBase
     {
+        
 
     }
 }
\ No newline at end of file
diff --git a/Aurora.Microservices/Aurora.Core/Aurora.Core.EntityFramework/ApplicationReadonlyDbContext.cs b/Aurora.Microservices/Aurora.Core/Aurora.Core.EntityFramework/ApplicationReadonlyDbContext.cs
index d24396ba286f2e8f27fcd6a791a7ac26265d63b6..5f6fa78eba8c77695d76856a44e11115ceef4642 100644
--- a/Aurora.Microservices/Aurora.Core/Aurora.Core.EntityFramework/ApplicationReadonlyDbContext.cs
+++ b/Aurora.Microservices/Aurora.Core/Aurora.Core.EntityFramework/ApplicationReadonlyDbContext.cs
@@ -34,6 +34,11 @@ namespace Aurora.Core.EntityFramework
         }
 
         public DbSet<Category> Categories { get; set; }
+        public DbSet<Subject> Subjects { get; set; }
+        public DbSet<Exampaper> Exampapers { get; set; }
+        public DbSet<Question> Question { get; set; }
+        public DbSet<Answer> Answers { get; set; }
+        public DbSet<User> Users { get; set; }
 
         protected override void OnModelCreating(ModelBuilder builder)
         {
diff --git a/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/BaseDto.cs b/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/BaseDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..330e04ac568dac4962b7530b0de43850a6df3114
--- /dev/null
+++ b/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/BaseDto.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Aurora.Core.IService.Dto
+{
+    public class BaseDto
+    { 
+        public int Id { get; set; } 
+        public string TenantCode { get; set; } 
+        public DateTimeOffset CreateTime { get; set; }
+        public string CreateUserName { get; set; }
+        public DateTimeOffset ModifyTime { get; set; }
+        public string ModifyUserName { get; set; }
+    }
+}
diff --git a/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/CategoryDto.cs b/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/CategoryDto.cs
index 988bb1bae605a577dcae4c4df8047eed164e5e83..926d0e2e4ba03bb265b3a7c78fd173b59378af85 100644
--- a/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/CategoryDto.cs
+++ b/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/CategoryDto.cs
@@ -2,17 +2,12 @@ using System;
 
 namespace Aurora.Core.IService.Dto
 {
-    public class CategoryDto
+    public class CategoryDto:BaseDto
     {
         public string Name { get; set; }
         public string Remark { get; set; }
-        public string TenantCode { get; set; }
-        public int Id { get; set; }
+ 
         public int ParentId { get; set; }
-        
-        public DateTimeOffset CreateTime { get; set; }
-        public string CreateUserName { get; set; }
-        public DateTimeOffset ModifyTime { get; set; }
-        public string ModifyUserName { get; set; }
+         
     }
 }
diff --git a/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/SubjectDto.cs b/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/SubjectDto.cs
new file mode 100644
index 0000000000000000000000000000000000000000..19b867e6b047b0ee004c40c8899271c0b48283df
--- /dev/null
+++ b/Aurora.Microservices/Aurora.Core/Aurora.Core.IService/Dto/SubjectDto.cs
@@ -0,0 +1,19 @@
+using System;
+
+namespace Aurora.Core.IService.Dto
+{
+    public class SubjectDto : BaseDto
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        /// <value></value>
+        public string Description { get; set; }
+
+    }
+}
diff --git a/batch_rename.py b/batch_rename.py
index 0705a07e622a77b071f26f9d8a0eec49a617e2bc..a9d5c490720c9fff64d22c8b6f37cc7326319dce 100644
--- a/batch_rename.py
+++ b/batch_rename.py
@@ -7,6 +7,7 @@ class BatchRename():
     '''
     def __init__(self):
         self.path = 'E:/Workspace/aurora'  #表示需要命名处理的文件夹
+        self.path= os.getcwd()
         self.srcName='Aurora.Micorservices'
         self.destName='Aurora.Microservices'