nyne/nysoure
1
0
Fork 0
mirror of https://github.com/wgh136/nysoure.git synced 2025-09-27 20:27:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

add domain parameter to createS3Storage and update related components

Browse Source
This commit is contained in:
nyne
2025-05-16 14:57:54 +08:00
parent 1b31af411d
commit a827b67c41
4 changed files with 103 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
frontend/src/network/network.ts
View File

@@ -448,8 +448,14 @@ class Network {
}
}
async createS3Storage(name: string, endPoint: string, accessKeyID: string,
secretAccessKey: string, bucketName: string, maxSizeInMB: number): Promise<Response<any>> {
async createS3Storage(
name: string,
endPoint: string,
accessKeyID: string,
secretAccessKey: string,
bucketName: string,
maxSizeInMB: number,
domain: string): Promise<Response<any>> {
try {
const response = await axios.post(`${this.apiBaseUrl}/storage/s3`, {
name,
@@ -457,7 +463,8 @@ class Network {
accessKeyID,
secretAccessKey,
bucketName,
maxSizeInMB
maxSizeInMB,
domain
});
return response.data;
} catch (e: any) {

62
frontend/src/pages/manage_storage_page.tsx
View File

@@ -1,10 +1,10 @@
import {useEffect, useState} from "react";
import {Storage} from "../network/models.ts";
import {network} from "../network/network.ts";
import { useEffect, useState } from "react";
import { Storage } from "../network/models.ts";
import { network } from "../network/network.ts";
import showToast from "../components/toast.ts";
import Loading from "../components/loading.tsx";
import {MdAdd, MdDelete} from "react-icons/md";
import {ErrorAlert} from "../components/alert.tsx";
import { MdAdd, MdDelete } from "react-icons/md";
import { ErrorAlert } from "../components/alert.tsx";
import { useTranslation } from "react-i18next";
import { app } from "../app.ts";
@@ -30,15 +30,15 @@ export default function StorageView() {
}, []);
if (!app.user) {
return <ErrorAlert className={"m-4"} message={t("You are not logged in. Please log in to access this page.")}/>
return <ErrorAlert className={"m-4"} message={t("You are not logged in. Please log in to access this page.")} />
}
if (!app.user?.is_admin) {
return <ErrorAlert className={"m-4"} message={t("You are not authorized to access this page.")}/>
return <ErrorAlert className={"m-4"} message={t("You are not authorized to access this page.")} />
}
if (storages == null) {
return <Loading/>
return <Loading />
}
const updateStorages = async () => {
@@ -106,14 +106,14 @@ export default function StorageView() {
{(new Date(s.createdAt)).toLocaleString()}
</td>
<td>
{(s.currentSize/1024/1024).toFixed(2)} / {s.maxSize/1024/1024} MB
{(s.currentSize / 1024 / 1024).toFixed(2)} / {s.maxSize / 1024 / 1024} MB
</td>
<td>
<button className={"btn btn-square"} type={"button"} onClick={() => {
const dialog = document.getElementById(`confirm_delete_dialog_${s.id}`) as HTMLDialogElement;
dialog.showModal();
}}>
{loadingId === s.id ? <span className={"loading loading-spinner loading-sm"}></span> : <MdDelete size={24}/>}
{loadingId === s.id ? <span className={"loading loading-spinner loading-sm"}></span> : <MdDelete size={24} />}
</button>
<dialog id={`confirm_delete_dialog_${s.id}`} className="modal">
<div className="modal-box">
@@ -141,7 +141,7 @@ export default function StorageView() {
</table>
</div>
<div className={"flex flex-row-reverse px-4"}>
<NewStorageDialog onAdded={updateStorages}/>
<NewStorageDialog onAdded={updateStorages} />
</div>
</>
}
@@ -151,7 +151,7 @@ enum StorageType {
s3,
}
function NewStorageDialog({onAdded}: { onAdded: () => void }) {
function NewStorageDialog({ onAdded }: { onAdded: () => void }) {
const { t } = useTranslation();
const [storageType, setStorageType] = useState<StorageType | null>(null);
@@ -163,6 +163,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
secretAccessKey: "",
bucketName: "",
maxSizeInMB: 0,
domain: "",
});
const [isLoading, setIsLoading] = useState(false);
@@ -189,7 +190,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
setIsLoading(false);
return;
}
response = await network.createS3Storage(params.name, params.endPoint, params.accessKeyID, params.secretAccessKey, params.bucketName, params.maxSizeInMB);
response = await network.createS3Storage(params.name, params.endPoint, params.accessKeyID, params.secretAccessKey, params.bucketName, params.maxSizeInMB, params.domain);
}
if (response!.success) {
@@ -206,11 +207,11 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
}
return <>
<button className="btn" onClick={()=> {
<button className="btn" onClick={() => {
const dialog = document.getElementById("new_storage_dialog") as HTMLDialogElement;
dialog.showModal();
}}>
<MdAdd/>
<MdAdd />
{t("New Storage")}
</button>
<dialog id="new_storage_dialog" className="modal">
@@ -221,13 +222,13 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
<form className="filter mb-2">
<input className="btn btn-square" type="reset" value="×" onClick={() => {
setStorageType(null);
}}/>
}} />
<input className="btn" type="radio" name="type" aria-label={t("Local")} onInput={() => {
setStorageType(StorageType.local);
}}/>
}} />
<input className="btn" type="radio" name="type" aria-label={t("S3")} onInput={() => {
setStorageType(StorageType.s3);
}}/>
}} />
</form>
{
@@ -239,7 +240,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
...params,
name: e.target.value,
})
}}/>
}} />
</label>
<label className="input w-full my-2">
{t("Path")}
@@ -248,7 +249,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
...params,
path: e.target.value,
})
}}/>
}} />
</label>
<label className="input w-full my-2">
{t("Max Size (MB)")}
@@ -278,7 +279,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
...params,
name: e.target.value,
})
}}/>
}} />
</label>
<label className="input w-full my-2">
{t("Endpoint")}
@@ -287,7 +288,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
...params,
endPoint: e.target.value,
})
}}/>
}} />
</label>
<label className="input w-full my-2">
{t("Access Key ID")}
@@ -296,7 +297,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
...params,
accessKeyID: e.target.value,
})
}}/>
}} />
</label>
<label className="input w-full my-2">
{t("Secret Access Key")}
@@ -305,7 +306,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
...params,
secretAccessKey: e.target.value,
})
}}/>
}} />
</label>
<label className="input w-full my-2">
{t("Bucket Name")}
@@ -314,7 +315,16 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
...params,
bucketName: e.target.value,
})
}}/>
}} />
</label>
<label className="input w-full my-2">
{t("Domain")}
<input type="text" placeholder={t("Optional")} className="w-full" value={params.domain} onChange={(e) => {
setParams({
...params,
domain: e.target.value,
})
}} />
</label>
<label className="input w-full my-2">
{t("Max Size (MB)")}
@@ -335,7 +345,7 @@ function NewStorageDialog({onAdded}: { onAdded: () => void }) {
</>
}
{error !== "" && <ErrorAlert message={error} className={"my-2"}/>}
{error !== "" && <ErrorAlert message={error} className={"my-2"} />}
<div className="modal-action">
<form method="dialog">

2
server/service/storage.go
View File

@@ -14,6 +14,7 @@ type CreateS3StorageParams struct {
EndPoint string `json:"endPoint"`
AccessKeyID string `json:"accessKeyID"`
SecretAccessKey string `json:"secretAccessKey"`
Domain string `json:"domain"`
BucketName string `json:"bucketName"`
MaxSizeInMB uint `json:"maxSizeInMB"`
}
@@ -32,6 +33,7 @@ func CreateS3Storage(uid uint, params CreateS3StorageParams) error {
AccessKeyID: params.AccessKeyID,
SecretAccessKey: params.SecretAccessKey,
BucketName: params.BucketName,
Domain: params.Domain,
}
s := model.Storage{
Name: params.Name,

11
server/storage/s3.go
View File

@@ -5,12 +5,13 @@ import (
"encoding/json"
"errors"
"fmt"
"net/url"
"time"
"github.com/gofiber/fiber/v3/log"
"github.com/google/uuid"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"net/url"
"time"
)
type S3Storage struct {
@@ -18,6 +19,7 @@ type S3Storage struct {
AccessKeyID string
SecretAccessKey string
BucketName string
Domain string
}
func (s *S3Storage) Upload(filePath string, fileName string) (string, error) {
@@ -43,6 +45,10 @@ func (s *S3Storage) Upload(filePath string, fileName string) (string, error) {
}
func (s *S3Storage) Download(storageKey string, fileName string) (string, error) {
if s.Domain != "" {
return s.Domain + "/" + storageKey, nil
}
minioClient, err := minio.New(s.EndPoint, &minio.Options{
Creds: credentials.NewStaticV4(s.AccessKeyID, s.SecretAccessKey, ""),
Secure: true,
@@ -80,6 +86,7 @@ func (s *S3Storage) FromString(config string) error {
s.AccessKeyID = s3Config.AccessKeyID
s.SecretAccessKey = s3Config.SecretAccessKey
s.BucketName = s3Config.BucketName
s.Domain = s3Config.Domain
if s.EndPoint == "" || s.AccessKeyID == "" || s.SecretAccessKey == "" || s.BucketName == "" {
return errors.New("invalid S3 configuration")
}