Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 544645b73b | |||
| 76be6dc8e7 |
@@ -38,7 +38,7 @@ EXPOSE 8080
|
|||||||
EXPOSE 8081
|
EXPOSE 8081
|
||||||
|
|
||||||
# This stage is used to build the service project
|
# This stage is used to build the service project
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build
|
||||||
ARG BUILD_CONFIGURATION=Release
|
ARG BUILD_CONFIGURATION=Release
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
COPY ["AobaServer/AobaServer.csproj", "AobaServer/"]
|
COPY ["AobaServer/AobaServer.csproj", "AobaServer/"]
|
||||||
@@ -47,7 +47,7 @@ COPY . .
|
|||||||
# Copy Built bundle from client builder
|
# Copy Built bundle from client builder
|
||||||
COPY --from=client-builder /app/AobaClient/target/dx/aoba-client/release/web/public /src/AobaServer/wwwroot
|
COPY --from=client-builder /app/AobaClient/target/dx/aoba-client/release/web/public /src/AobaServer/wwwroot
|
||||||
WORKDIR "/src/AobaServer"
|
WORKDIR "/src/AobaServer"
|
||||||
RUN dotnet build "./AobaServer.csproj" -c $BUILD_CONFIGURATION -o /app/build
|
# RUN dotnet build "./AobaServer.csproj" -c $BUILD_CONFIGURATION #-o /app/build
|
||||||
|
|
||||||
# This stage is used to publish the service project to be copied to the final stage
|
# This stage is used to publish the service project to be copied to the final stage
|
||||||
FROM build AS publish
|
FROM build AS publish
|
||||||
@@ -57,8 +57,9 @@ RUN dotnet publish "./AobaServer.csproj" -c $BUILD_CONFIGURATION -o /app/publish
|
|||||||
# This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
|
# This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
|
||||||
FROM base AS final
|
FROM base AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
USER root
|
||||||
|
RUN apt-get update && apt-get install -y ffmpeg
|
||||||
COPY --from=publish /app/publish .
|
COPY --from=publish /app/publish .
|
||||||
COPY --from=client-builder /bin/ffmpeg /bin/ffprobe /bin/ffplay /usr/bin/
|
ARG VERSION
|
||||||
ENV APP_VERSION=$VERSION
|
ENV APP_VERSION=$VERSION
|
||||||
ENTRYPOINT ["dotnet", "AobaServer.dll"]
|
ENTRYPOINT ["dotnet", "AobaServer.dll"]
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ using System.Text.Json.Serialization;
|
|||||||
|
|
||||||
namespace AobaServer.Services;
|
namespace AobaServer.Services;
|
||||||
|
|
||||||
public class AobaRpcService(AobaService aobaService, AccountsService accountsService, AuthInfo authInfo) : AobaRpc.AobaRpcBase
|
public class AobaRpcService(AobaService aobaService, AccountsService accountsService, AuthConfigService authConfig) : AobaRpc.AobaRpcBase
|
||||||
{
|
{
|
||||||
public override async Task<MediaResponse> GetMedia(Id request, ServerCallContext context)
|
public override async Task<MediaResponse> GetMedia(Id request, ServerCallContext context)
|
||||||
{
|
{
|
||||||
@@ -37,6 +37,7 @@ public class AobaRpcService(AobaService aobaService, AccountsService accountsSer
|
|||||||
var user = await accountsService.GetUserAsync(userId, context.CancellationToken);
|
var user = await accountsService.GetUserAsync(userId, context.CancellationToken);
|
||||||
if (user == null)
|
if (user == null)
|
||||||
return new ShareXResponse { Error = "User does not exist" };
|
return new ShareXResponse { Error = "User does not exist" };
|
||||||
|
var authInfo = await authConfig.GetDefaultAuthInfoAsync();
|
||||||
var token = user.GetToken(authInfo);
|
var token = user.GetToken(authInfo);
|
||||||
var dest = new ShareXDestination
|
var dest = new ShareXDestination
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user