Merge pull request #7 from RhythmCodec/dev

Merge updates to master
RhythmCodec · Aug 25, 2021 · 1f98258 · 1f98258
2 parents 1c42a0d + c705643
commit 1f98258
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 23 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,17 +21,17 @@ jobs:
       run: dotnet restore
 
     - name: Publish Linux-x64-without-runtime
-      run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime linux-x64 --framework net5.0 -o ./build/linux-x64-without-runtime
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime linux-x64 --framework net5.0 -o ./build/linux-x64-without-runtime
     - name: Publish Linux-x64
-      run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime linux-x64 --framework net5.0 -o ./build/linux-x64
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime linux-x64 --framework net5.0 -o ./build/linux-x64
     - name: Publish Linux-arm-without-runtime
-      run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime linux-arm --framework net5.0 -o ./build/linux-arm-without-runtime
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime linux-arm --framework net5.0 -o ./build/linux-arm-without-runtime
     - name: Publish Linux-arm
-      run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime linux-arm --framework net5.0 -o ./build/linux-arm
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime linux-arm --framework net5.0 -o ./build/linux-arm
     - name: Publish Linux-arm64-without-runtime
-      run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime linux-arm64 --framework net5.0 -o ./build/linux-arm64-without-runtime
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime linux-arm64 --framework net5.0 -o ./build/linux-arm64-without-runtime
     - name: Publish Linux-arm64
-      run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime linux-arm64 --framework net5.0 -o ./build/linux-arm64
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime linux-arm64 --framework net5.0 -o ./build/linux-arm64
 
     - name: Pack Linux-x64-without-runtime
       run: tar -czvf linux-x64-without-runtime.tar.gz  -C ~/work/MorePracticeMalodyServer/MorePracticeMalodyServer/build linux-x64-without-runtime
@@ -75,25 +75,25 @@ jobs:
       run: dotnet restore
 
     - name: Publish Win-x64-without-runtime
-      run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win-x64 --framework net5.0 -o ./build/win-x64-without-runtime
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win-x64 --framework net5.0 -o ./build/win-x64-without-runtime
     - name: Publish Win-x64
-      run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win-x64 --framework net5.0 -o ./build/win-x64
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win-x64 --framework net5.0 -o ./build/win-x64
     - name: Publish Win-x86-without-runtime
-      run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win-x86 --framework net5.0 -o ./build/win-x86-without-runtime
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win-x86 --framework net5.0 -o ./build/win-x86-without-runtime
     - name: Publish Win-x86
-      run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win-x86 --framework net5.0 -o ./build/win-x86
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win-x86 --framework net5.0 -o ./build/win-x86
     - name: Publish Win-arm-without-runtime
-      run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win-arm --framework net5.0 -o ./build/win-arm-without-runtime
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win-arm --framework net5.0 -o ./build/win-arm-without-runtime
     - name: Publish Win-arm
-      run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win-arm --framework net5.0 -o ./build/win-arm
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win-arm --framework net5.0 -o ./build/win-arm
     - name: Publish Win10-x64-without-runtime
-      run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win10-x64 --framework net5.0 -o ./build/win10-x64-without-runtime
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win10-x64 --framework net5.0 -o ./build/win10-x64-without-runtime
     - name: Publish Win10-x64
-      run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win10-x64 --framework net5.0 -o ./build/win10-x64
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win10-x64 --framework net5.0 -o ./build/win10-x64
     - name: Publish Win10-arm64-without-runtime
-      run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win10-arm64 --framework net5.0 -o ./build/win10-arm64-without-runtime
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win10-arm64 --framework net5.0 -o ./build/win10-arm64-without-runtime
     - name: Publish Win10-arm64
-      run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win10-arm64 --framework net5.0 -o ./build/win10-arm64
+      run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win10-arm64 --framework net5.0 -o ./build/win10-arm64
 
     - name: Pack Win-x64-without-runtime
       run: 7z a win-x64-without-runtime.7z D:\a\MorePracticeMalodyServer\MorePracticeMalodyServer\build\win-x64-without-runtime\
@@ -129,3 +129,18 @@ jobs:
           win10-arm64-without-runtime.7z
           win10-arm64.7z
         token: ${{ secrets.RELEASE_TOKEN }}
+
+  Changelog: 
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Generate Changelog
+      uses: glennawatson/ChangeLog@v1
+      id: changelog
+    - name: Write to release
+      uses: softprops/action-gh-release@v1
+      with: 
+        body: ${{ steps.Changelog.outputs.changelog }}
+        token: ${{ secrets.RELEASE_TOKEN }}
diff --git a/MorePracticeMalodyServer/Controllers/StoreController.cs b/MorePracticeMalodyServer/Controllers/StoreController.cs
@@ -570,9 +570,9 @@ public async Task<Response<EventInfo>> GetEvents(int uid, int api, int active, i
                         Active = result[i].Active,
                         Cover = result[i].Cover,
                         Eid = result[i].EventId,
-                        End = result[i].End.ToString("yyyy-mm-dd"),
+                        End = result[i].End.ToString("yyyy-MM-dd"),
                         Name = result[i].Name,
-                        Start = result[i].Start.ToString("yyyy-mm-dd")
+                        Start = result[i].Start.ToString("yyyy-MM-dd")
                     });
 
                 return resp;
@@ -612,7 +612,8 @@ public async Task<Response<EventChartInfo>> GetEvent(int uid, int api, int eid,
                 // Try to find event with eid.
                 var @event = await context.Events
                     .Include(e => e.EventCharts)
-                    .AsSplitQuery()
+                    .ThenInclude(c => c.Chart)
+                    .ThenInclude(c => c.Song)
                     .FirstAsync(e => e.EventId == eid); // TODO: Save event to cache?
 
                 // success.

diff --git a/MorePracticeMalodyServer/MorePracticeMalodyServer.csproj b/MorePracticeMalodyServer/MorePracticeMalodyServer.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>net5.0</TargetFramework>
     <UserSecretsId>37bf4e05-2836-4dd4-b7e4-01b6b356ce73</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.0.1.0</FileVersion>
+    <AssemblyVersion>1.0.2.0</AssemblyVersion>
+    <FileVersion>1.0.2.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ State:
 ## Basic
 
 API version：**202103**  
-Application version：**1.0.0**  
+Application version：**1.0.3**  
 Runtime：**ASP.NET Core**
 
 An open-source Malody V Chart Server. ~Can be run on low loads, but surely booms at high loads.~  
@@ -47,6 +47,7 @@ You can use it as you download, no need configuration, and it can run the server
 * Save on third-party device or website
 * Supports api version 202108
 * Supports docker
+* Frontend management page
 
 ## Installation
 

diff --git a/README.zh.md b/README.zh.md
@@ -17,7 +17,7 @@
 ## 基本
 
 API版本：**202103**  
-程序版本：**1.0.0**
+程序版本：**1.0.3**
 程序运行时：**ASP.NET Core**
 
 开源的 Malody V 谱面(Chart)服务器。~~低负载基本能用，高负载肯定完蛋~~。  
@@ -46,6 +46,7 @@ API版本：**202103**
 * 第三方存储提供
 * 支持 202108 API版本
 * 支持 docker
+* 前端管理界面
 
 ## 安装