Skip to content

Commit 1f98258

Browse files
kami-poikami-poi
authored
Merge pull request #7 from RhythmCodec/dev
Merge updates to master
2 parents 1c42a0d + c705643 commit 1f98258

File tree

5 files changed

+41
-23
lines changed

5 files changed

+41
-23
lines changed

‎.github/workflows/release.yml‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ jobs:
2121
run: dotnet restore
2222

2323
- name: Publish Linux-x64-without-runtime
24-
run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime linux-x64 --framework net5.0 -o ./build/linux-x64-without-runtime
24+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime linux-x64 --framework net5.0 -o ./build/linux-x64-without-runtime
2525
- name: Publish Linux-x64
26-
run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime linux-x64 --framework net5.0 -o ./build/linux-x64
26+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime linux-x64 --framework net5.0 -o ./build/linux-x64
2727
- name: Publish Linux-arm-without-runtime
28-
run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime linux-arm --framework net5.0 -o ./build/linux-arm-without-runtime
28+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime linux-arm --framework net5.0 -o ./build/linux-arm-without-runtime
2929
- name: Publish Linux-arm
30-
run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime linux-arm --framework net5.0 -o ./build/linux-arm
30+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime linux-arm --framework net5.0 -o ./build/linux-arm
3131
- name: Publish Linux-arm64-without-runtime
32-
run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime linux-arm64 --framework net5.0 -o ./build/linux-arm64-without-runtime
32+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime linux-arm64 --framework net5.0 -o ./build/linux-arm64-without-runtime
3333
- name: Publish Linux-arm64
34-
run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime linux-arm64 --framework net5.0 -o ./build/linux-arm64
34+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime linux-arm64 --framework net5.0 -o ./build/linux-arm64
3535

3636
- name: Pack Linux-x64-without-runtime
3737
run: tar -czvf linux-x64-without-runtime.tar.gz -C ~/work/MorePracticeMalodyServer/MorePracticeMalodyServer/build linux-x64-without-runtime
@@ -75,25 +75,25 @@ jobs:
7575
run: dotnet restore
7676

7777
- name: Publish Win-x64-without-runtime
78-
run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win-x64 --framework net5.0 -o ./build/win-x64-without-runtime
78+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win-x64 --framework net5.0 -o ./build/win-x64-without-runtime
7979
- name: Publish Win-x64
80-
run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win-x64 --framework net5.0 -o ./build/win-x64
80+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win-x64 --framework net5.0 -o ./build/win-x64
8181
- name: Publish Win-x86-without-runtime
82-
run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win-x86 --framework net5.0 -o ./build/win-x86-without-runtime
82+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win-x86 --framework net5.0 -o ./build/win-x86-without-runtime
8383
- name: Publish Win-x86
84-
run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win-x86 --framework net5.0 -o ./build/win-x86
84+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win-x86 --framework net5.0 -o ./build/win-x86
8585
- name: Publish Win-arm-without-runtime
86-
run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win-arm --framework net5.0 -o ./build/win-arm-without-runtime
86+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win-arm --framework net5.0 -o ./build/win-arm-without-runtime
8787
- name: Publish Win-arm
88-
run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win-arm --framework net5.0 -o ./build/win-arm
88+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win-arm --framework net5.0 -o ./build/win-arm
8989
- name: Publish Win10-x64-without-runtime
90-
run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win10-x64 --framework net5.0 -o ./build/win10-x64-without-runtime
90+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win10-x64 --framework net5.0 -o ./build/win10-x64-without-runtime
9191
- name: Publish Win10-x64
92-
run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win10-x64 --framework net5.0 -o ./build/win10-x64
92+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win10-x64 --framework net5.0 -o ./build/win10-x64
9393
- name: Publish Win10-arm64-without-runtime
94-
run: dotnet publish -p:PublishReadyToRun=true --no-self-contained --runtime win10-arm64 --framework net5.0 -o ./build/win10-arm64-without-runtime
94+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --no-self-contained --runtime win10-arm64 --framework net5.0 -o ./build/win10-arm64-without-runtime
9595
- name: Publish Win10-arm64
96-
run: dotnet publish -p:PublishReadyToRun=true --self-contained true --runtime win10-arm64 --framework net5.0 -o ./build/win10-arm64
96+
run: dotnet publish -p:PublishReadyToRun=true --configuration Release --self-contained true --runtime win10-arm64 --framework net5.0 -o ./build/win10-arm64
9797

9898
- name: Pack Win-x64-without-runtime
9999
run: 7z a win-x64-without-runtime.7z D:\a\MorePracticeMalodyServer\MorePracticeMalodyServer\build\win-x64-without-runtime\
@@ -129,3 +129,18 @@ jobs:
129129
win10-arm64-without-runtime.7z
130130
win10-arm64.7z
131131
token: ${{ secrets.RELEASE_TOKEN }}
132+
133+
Changelog:
134+
135+
runs-on: ubuntu-latest
136+
137+
steps:
138+
- uses: actions/checkout@v2
139+
- name: Generate Changelog
140+
uses: glennawatson/ChangeLog@v1
141+
id: changelog
142+
- name: Write to release
143+
uses: softprops/action-gh-release@v1
144+
with:
145+
body: ${{ steps.Changelog.outputs.changelog }}
146+
token: ${{ secrets.RELEASE_TOKEN }}

‎MorePracticeMalodyServer/Controllers/StoreController.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,9 @@ public async Task<Response<EventInfo>> GetEvents(int uid, int api, int active, i
570570
Active = result[i].Active,
571571
Cover = result[i].Cover,
572572
Eid = result[i].EventId,
573-
End = result[i].End.ToString("yyyy-mm-dd"),
573+
End = result[i].End.ToString("yyyy-MM-dd"),
574574
Name = result[i].Name,
575-
Start = result[i].Start.ToString("yyyy-mm-dd")
575+
Start = result[i].Start.ToString("yyyy-MM-dd")
576576
});
577577

578578
return resp;
@@ -612,7 +612,8 @@ public async Task<Response<EventChartInfo>> GetEvent(int uid, int api, int eid,
612612
// Try to find event with eid.
613613
var @event = await context.Events
614614
.Include(e => e.EventCharts)
615-
.AsSplitQuery()
615+
.ThenInclude(c => c.Chart)
616+
.ThenInclude(c => c.Song)
616617
.FirstAsync(e => e.EventId == eid); // TODO: Save event to cache?
617618

618619
// success.

‎MorePracticeMalodyServer/MorePracticeMalodyServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<TargetFramework>net5.0</TargetFramework>
55
<UserSecretsId>37bf4e05-2836-4dd4-b7e4-01b6b356ce73</UserSecretsId>
66
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
7-
<AssemblyVersion>1.0.1.0</AssemblyVersion>
8-
<FileVersion>1.0.1.0</FileVersion>
7+
<AssemblyVersion>1.0.2.0</AssemblyVersion>
8+
<FileVersion>1.0.2.0</FileVersion>
99
</PropertyGroup>
1010

1111
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ State:
1717
## Basic
1818

1919
API version：**202103**
20-
Application version：**1.0.0**
20+
Application version：**1.0.3**
2121
Runtime：**ASP.NET Core**
2222

2323
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
4747
* Save on third-party device or website
4848
* Supports api version 202108
4949
* Supports docker
50+
* Frontend management page
5051

5152
## Installation
5253

‎README.zh.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
## 基本
1818

1919
API版本：**202103**
20-
程序版本：**1.0.0**
20+
程序版本：**1.0.3**
2121
程序运行时：**ASP.NET Core**
2222

2323
开源的 Malody V 谱面(Chart)服务器。~~低负载基本能用，高负载肯定完蛋~~。
@@ -46,6 +46,7 @@ API版本：**202103**
4646
* 第三方存储提供
4747
* 支持 202108 API版本
4848
* 支持 docker
49+
* 前端管理界面
4950

5051
## 安装
5152

0 commit comments

Comments
 (0)