Merge pull request #3 from thu-info-community/announcement_version

Updated SDK & deps; Added fields to control announcement shown version
thu-info-community · Jul 20, 2024 · 32a7b05 · 32a7b05
2 parents d1b3e0f + 1991369
commit 32a7b05
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -362,3 +362,6 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /ThuInfoWeb/test.db
+
+# Rider .idea
+.idea/
diff --git a/README.md b/README.md
@@ -2,10 +2,10 @@
 The web server application of [THUInfo](https://github.com/UNIDY2002/THUInfo)
 # Build Instruction
 ## Step 1
-Install dotnet sdk 6.0.
+Install dotnet sdk 8.0.
 If you are running RHEL or CentOS, just use
 ```
-$ sudo dnf install dotnet-sdk-6.0
+$ sudo dnf install dotnet-sdk-8.0
 ```
 Others should follow this [installation instruction](https://docs.microsoft.com/zh-cn/dotnet/core/install/linux)
 ## Step 2

diff --git a/ThuInfoWeb/Controllers/HomeController.cs b/ThuInfoWeb/Controllers/HomeController.cs
@@ -15,10 +15,10 @@ public class HomeController : Controller
 
         public HomeController(ILogger<HomeController> logger, Data data, UserManager userManager, VersionManager versionManager)
         {
-            this._logger = logger;
-            this._data = data;
-            this._userManager = userManager;
-            this._versionManager = versionManager;
+            _logger = logger;
+            _data = data;
+            _userManager = userManager;
+            _versionManager = versionManager;
         }
         public IActionResult Register()
         {
@@ -33,29 +33,29 @@ public async Task<IActionResult> Register(RegisterViewModel vm)
             ModelState.AddModelError(nameof(vm.Name), "禁止注册新用户");
             return View(vm);
 
-            if (await _data.CheckUserAsync(vm.Name))
-            {
-                ModelState.AddModelError(nameof(vm.Name), "用户名已被注册");
-                return View(vm);
-            }
-            var user = new User()
-            {
-                Name = vm.Name,
-                PasswordHash = vm.Password.ToSHA256Hex(),
-                CreatedTime = DateTime.Now,
-                IsAdmin = false
-            };
-            var result = await _data.CreateUserAsync(user);
-            if (result == 1)
-            {
-                await _userManager.DoLoginAsync(vm.Name, false);
-                return RedirectToAction("Index");
-            }
-            else
-            {
-                ModelState.AddModelError(nameof(vm.Name), "发生未知错误");
-                return View(vm);
-            }
+            // if (await _data.CheckUserAsync(vm.Name))
+            // {
+            //     ModelState.AddModelError(nameof(vm.Name), "用户名已被注册");
+            //     return View(vm);
+            // }
+            // var user = new User()
+            // {
+            //     Name = vm.Name,
+            //     PasswordHash = vm.Password.ToSHA256Hex(),
+            //     CreatedTime = DateTime.Now,
+            //     IsAdmin = false
+            // };
+            // var result = await _data.CreateUserAsync(user);
+            // if (result == 1)
+            // {
+            //     await _userManager.DoLoginAsync(vm.Name, false);
+            //     return RedirectToAction("Index");
+            // }
+            // else
+            // {
+            //     ModelState.AddModelError(nameof(vm.Name), "发生未知错误");
+            //     return View(vm);
+            // }
         }
         public IActionResult Login()
         {
@@ -133,22 +133,28 @@ public async Task<IActionResult> Announce([FromQuery] int page = 1)
                 Title = a.Title,
                 Author = a.Author,
                 CreatedTime = a.CreatedTime,
-                IsActive = a.IsActive
+                IsActive = a.IsActive,
+                VisibleNotAfter = a.VisibleNotAfter,
+                VisibleExact = a.VisibleExact
             }).ToList());
         }
 
         [HttpPost, Authorize(Roles = "admin")]
         public async Task<IActionResult> CreateAnnounce(AnnounceViewModel vm)
         {
             if (vm.Title is null || vm.Content is null) return BadRequest("标题或内容为空");
-            var user = HttpContext.User.Identity.Name;
-            var a = new Announce()
+            vm.VisibleNotAfter ??= "9.9.9";
+            vm.VisibleExact ??= "";
+            var user = HttpContext.User.Identity?.Name;
+            var a = new Announce
             {
                 Title = vm.Title,
                 Content = vm.Content,
-                Author = user,
+                Author = user ?? "",
                 CreatedTime = DateTime.Now,
-                IsActive = vm.IsActive
+                IsActive = vm.IsActive,
+                VisibleNotAfter = vm.VisibleNotAfter,
+                VisibleExact = vm.VisibleExact
             };
             var result = await _data.CreateAnnounceAsync(a);
             if (result != 1) return BadRequest(ModelState);

diff --git a/ThuInfoWeb/DBModels/Announce.cs b/ThuInfoWeb/DBModels/Announce.cs
@@ -7,12 +7,23 @@ public class Announce
     {
         [Column(IsIdentity = true, IsPrimary = true)]
         public int Id { get; set; }
+
         public string Title { get; set; }
+
         [Column(StringLength = -1)]
         public string Content { get; set; }
+
         public string Author { get; set; }
+
         public DateTime CreatedTime { get; set; }
+
         [JsonIgnore]
         public bool IsActive { get; set; }
+
+        [Column(StringLength = 10, IsNullable = false)]
+        public string VisibleNotAfter { get; set; }
+
+        [Column(StringLength = 30, IsNullable = false)]
+        public string VisibleExact { get; set; }
     }
-}
+}
diff --git a/ThuInfoWeb/Models/AnnounceViewModel.cs b/ThuInfoWeb/Models/AnnounceViewModel.cs
@@ -5,12 +5,23 @@ namespace ThuInfoWeb.Models
     public class AnnounceViewModel
     {
         [Required, Display(Name = "标题")]
-        public string Title { get; set; }
+        public string? Title { get; set; }
+
         [Required, Display(Name = "内容")]
-        public string Content { get; set; }
+        public string? Content { get; set; }
+
         public int Id { get; set; }
-        public string Author { get; set; }
+
+        public string? Author { get; set; }
+
         public DateTime CreatedTime { get; set; }
+
         public bool IsActive { get; set; } = true;
+
+        [Display(Name = "对此版本及之前版本可见")]
+        public string? VisibleNotAfter { get; set; }
+
+        [Display(Name = "对这些版本可见 (使用逗号分隔)")]
+        public string? VisibleExact { get; set; }
     }
 }
diff --git a/ThuInfoWeb/ThuInfoWeb.csproj b/ThuInfoWeb/ThuInfoWeb.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -11,10 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.682" />
-    <PackageReference Include="FreeSql.Provider.SqliteCore" Version="3.2.682" />
-    <PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.2" />
+    <PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.833" />
+    <PackageReference Include="FreeSql.Provider.SqliteCore" Version="3.2.833" />
+    <PackageReference Include="NLog.Web.AspNetCore" Version="5.3.11" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.8" />
   </ItemGroup>
 
 </Project>
diff --git a/ThuInfoWeb/Views/Home/Announce.cshtml b/ThuInfoWeb/Views/Home/Announce.cshtml
@@ -23,6 +23,7 @@
           <th scope="col">ID</th>
           <th scope="col">标题</th>
           <th scope="col">内容</th>
+          <th scope="col">生效版本</th>
           <th scope="col">作者</th>
           <th scope="col">创建时间</th>
           <th scope="col">是否生效</th>
@@ -36,6 +37,15 @@
                     <th scope="row">@item.Id</th>
                     <td>@item.Title</td>
                     <td>@item.Content</td>
+                    <td>
+                        <span>&lt;=</span>
+                        <span>@item.VisibleNotAfter</span>
+                        @if (item.VisibleExact != "")
+                        {
+                            <span>,</span>
+                            <span>@item.VisibleExact</span>
+                        }
+                    </td>
                     <td>@item.Author</td>
                     <td>@item.CreatedTime</td>
                     <td>@item.IsActive</td>

diff --git a/dockerfile b/dockerfile
@@ -1,9 +1,9 @@
-FROM bitnami/dotnet-sdk:6 AS build-env
+FROM bitnami/dotnet-sdk:8 AS build-env
 WORKDIR /build
 COPY . ./
 RUN dotnet publish -c Release -o out
 
-FROM bitnami/aspnet-core:6
+FROM bitnami/aspnet-core:8
 WORKDIR /app
 COPY --from=build-env /build/out .
 ENTRYPOINT [ "dotnet", "ThuInfoWeb.dll"]