Compare commits

...
8 Commits
Author SHA1 Message Date
xrain 44ed8dfd3c fix ci 2020-02-03 03:19:52 +08:00
xrain a7261fde58 fix ci 2020-02-03 03:14:39 +08:00
xrain 453a15b9ad Merge branch 'master' of https://github.com/YY-Tech/YYApi 2020-02-03 03:13:58 +08:00
xrainandGitHub 5a04f831a7 Update main.yml 2020-02-03 03:11:01 +08:00
xrainandGitHub fdfde570c7 Delete publish-nuget.yml 2020-02-03 03:05:58 +08:00
xrainandGitHub 874f5b6cef tag to nuget 2020-02-03 03:05:39 +08:00
xrain 86ec43f676 add idonly request 2020-02-03 02:54:02 +08:00
xrain 66334d6535 fix: Error without message return wrong message 2020-01-17 20:38:46 +08:00
6 changed files with 65 additions and 22 deletions
+34
View File
@@ -0,0 +1,34 @@
name: CI
on: [create]
jobs:
build:
name: Build Project
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.101'
- name: Build
run: dotnet build
publish:
needs: build
name: Publish Project to Nuget
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.101'
- name: Publish
run: |
version=`git describe --tags`
dotnet pack --configuration release -p:PackageVersion=$version
dotnet nuget push bin/release/YY-Tech.YYApi.$version.nupkg -k ${APIKEY} -s https://www.nuget.org/api/v2/package
env:
APIKEY: ${{ secrets.APPKEY }}
-16
View File
@@ -1,16 +0,0 @@
name: PublishToNuget
on: [push]
jobs:
build:
name: publish to nuget
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 2
- name: Publish NuGet
uses: rohith/publish-nuget@v1.0.3
with:
nuget_key: ${{ secrets.NugetKey }}
+20
View File
@@ -129,4 +129,24 @@ namespace YYApi.Communications
/// </summary> /// </summary>
public T Data { get; set; } public T Data { get; set; }
} }
//===========》请求《===============
/// <summary>
/// 只有ID的请求
/// </summary>
public class IdOnlyRequest
{
public int Id { get; set; }
}
/// <summary>
/// 基础分页请求
/// </summary>
public class BasePageRequest
{
public int Page { get; set; }
public int Count { get; set; }
}
} }
+3 -3
View File
@@ -46,7 +46,7 @@ namespace YYApi.Controllers
/// <param name="code">错误代码</param> /// <param name="code">错误代码</param>
/// <param name="message">错误描述(若是常规错误,代码可自动带取描述)</param> /// <param name="message">错误描述(若是常规错误,代码可自动带取描述)</param>
/// <returns></returns> /// <returns></returns>
protected static void Error(int code, string message = null) protected static void Error(int code, string message = "")
{ {
throw new ApiException(code, message); throw new ApiException(code, message);
} }
@@ -57,7 +57,7 @@ namespace YYApi.Controllers
/// <param name="condition">检测条件</param> /// <param name="condition">检测条件</param>
/// <param name="code">错误代码</param> /// <param name="code">错误代码</param>
/// <param name="message">错误描述</param> /// <param name="message">错误描述</param>
protected static void ErrorWhen(bool condition, int code, string message = null) protected static void ErrorWhen(bool condition, int code, string message = "")
{ {
if (condition) if (condition)
{ {
@@ -71,7 +71,7 @@ namespace YYApi.Controllers
/// <param name="condition">检测条件</param> /// <param name="condition">检测条件</param>
/// <param name="code">错误代码</param> /// <param name="code">错误代码</param>
/// <param name="message">错误描述</param> /// <param name="message">错误描述</param>
protected static void ErrorWhenNull(object condition, int code, string message = null) protected static void ErrorWhenNull(object condition, int code, string message = "")
{ {
ErrorWhen(condition == null, code, message); ErrorWhen(condition == null, code, message);
} }
+7 -2
View File
@@ -32,7 +32,7 @@ namespace YYApi
public static IServiceCollection AddYYApi(this IServiceCollection builder, string title, public static IServiceCollection AddYYApi(this IServiceCollection builder, string title,
string description = null) string description = null)
{ {
return builder.AddAuth().AddApiDoc(title, description); return builder.AddAuth().AddApiDoc(title, description).AddCors();
} }
/// <summary> /// <summary>
@@ -138,7 +138,12 @@ namespace YYApi
public static IApplicationBuilder UseYYApiMiddleware(this IApplicationBuilder builder, string title = "API文档", public static IApplicationBuilder UseYYApiMiddleware(this IApplicationBuilder builder, string title = "API文档",
params SubmitMethod[] submitMethods) params SubmitMethod[] submitMethods)
{ {
return builder.UseExceptionMiddleware().UseApiDoc(title, submitMethods).UseMiddleware<AuthMiddleware>(); return builder.UseExceptionMiddleware().UseApiDoc(title, submitMethods).UseMiddleware<AuthMiddleware>().UseCors(x =>
{
x.AllowAnyHeader();
x.AllowAnyMethod();
x.AllowAnyOrigin();
}); ;
} }
} }
} }
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<PackOnBuild>true</PackOnBuild> <PackOnBuild>true</PackOnBuild>
<Version>0.2.1</Version> <Version>0.2.3</Version>
<Authors>xRain@YYTech</Authors> <Authors>xRain@YYTech</Authors>
<Description>AspNetCore一个方便的API文档,捕获异常,统一输入输出的API类库</Description> <Description>AspNetCore一个方便的API文档,捕获异常,统一输入输出的API类库</Description>
<PackageId>YY-Tech.YYApi</PackageId> <PackageId>YY-Tech.YYApi</PackageId>