云托管展示发布前置条件和审核状态 #13
No files matched your search
@@ -142,6 +142,12 @@ public class HostingController {
|
|||||||
return hosting.subscription(who.id(), project);
|
return hosting.subscription(who.id(), project);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/projects/{project}/publication-status")
|
||||||
|
public Object publicationStatus(
|
||||||
|
@AuthenticationPrincipal SecurityConfig.Identity who, @PathVariable UUID project) {
|
||||||
|
return hosting.publicationStatus(who.id(), project);
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/projects/{project}/services")
|
@GetMapping("/projects/{project}/services")
|
||||||
public Object services(
|
public Object services(
|
||||||
@AuthenticationPrincipal SecurityConfig.Identity who, @PathVariable UUID project) {
|
@AuthenticationPrincipal SecurityConfig.Identity who, @PathVariable UUID project) {
|
||||||
|
|||||||
@@ -114,6 +114,15 @@ public class HostingService {
|
|||||||
return list.isEmpty() ? Map.of("status", "NONE") : list.getFirst();
|
return list.isEmpty() ? Map.of("status", "NONE") : list.getFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Map<String, Object> publicationStatus(UUID user, UUID project) {
|
||||||
|
var row = own(user, project);
|
||||||
|
return Map.of(
|
||||||
|
"reviewStatus",
|
||||||
|
operations.reviewStatus(project),
|
||||||
|
"archived",
|
||||||
|
"ARCHIVED".equals(row.get("status")));
|
||||||
|
}
|
||||||
|
|
||||||
void checkQuota(UUID project, Map<String, Object> plan) {
|
void checkQuota(UUID project, Map<String, Object> plan) {
|
||||||
var sums =
|
var sums =
|
||||||
db.queryForMap(
|
db.queryForMap(
|
||||||
|
|||||||
@@ -92,9 +92,19 @@ public class RuntimeOperationService {
|
|||||||
lease);
|
lease);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void checkAllowed(UUID project) {
|
public String reviewStatus(UUID project) {
|
||||||
var list = db.queryForList("SELECT status FROM project_moderation WHERE project_id=?", project);
|
var list = db.queryForList("SELECT status FROM project_moderation WHERE project_id=?", project);
|
||||||
if (list.isEmpty() || !"APPROVED".equals(list.getFirst().get("status")))
|
return list.isEmpty() ? "PENDING" : list.getFirst().get("status").toString();
|
||||||
throw new ApiError.Failure(403, "网站未审核通过或已被封禁,不能执行运行操作");
|
}
|
||||||
|
|
||||||
|
public void checkAllowed(UUID project) {
|
||||||
|
String message =
|
||||||
|
switch (reviewStatus(project)) {
|
||||||
|
case "APPROVED" -> null;
|
||||||
|
case "REJECTED" -> "网站审核未通过,请联系管理员核对";
|
||||||
|
case "BANNED" -> "网站已被封禁,请联系管理员";
|
||||||
|
default -> "网站正在等待管理员审核,通过后才能发布";
|
||||||
|
};
|
||||||
|
if (message != null) throw new ApiError.Failure(403, message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { onMounted, onUnmounted, reactive, ref } from "vue";
|
import { computed, onMounted, onUnmounted, reactive, ref } from "vue";
|
||||||
import { api, body } from "../api";
|
import { api, body } from "../api";
|
||||||
const projects = ref<any[]>([]),
|
const projects = ref<any[]>([]),
|
||||||
project = ref(""),
|
project = ref(""),
|
||||||
@@ -26,21 +26,61 @@ const form = reactive({
|
|||||||
});
|
});
|
||||||
const command = ref("[]"),
|
const command = ref("[]"),
|
||||||
environment = ref("");
|
environment = ref("");
|
||||||
|
const publication = ref<{ reviewStatus: string; archived: boolean }>();
|
||||||
|
const reviewLabels: Record<string, string> = {
|
||||||
|
PENDING: "待管理员审核",
|
||||||
|
APPROVED: "审核通过",
|
||||||
|
REJECTED: "审核未通过",
|
||||||
|
BANNED: "已封禁",
|
||||||
|
};
|
||||||
|
const subscriptionLabels: Record<string, string> = {
|
||||||
|
NONE: "未购买",
|
||||||
|
ACTIVE: "有效",
|
||||||
|
EXPIRED: "已过期",
|
||||||
|
SUSPENDED: "已暂停",
|
||||||
|
};
|
||||||
|
const subscriptionActive = computed(() =>
|
||||||
|
subscription.value.status === "ACTIVE" && new Date(subscription.value.paid_until).getTime() > Date.now(),
|
||||||
|
);
|
||||||
|
const hasService = computed(() => services.value.some(service => service.enabled));
|
||||||
|
const deploying = computed(() =>
|
||||||
|
deployments.value.some(deployment => ["QUEUED", "APPLYING", "HEALTH_CHECK"].includes(deployment.status)),
|
||||||
|
);
|
||||||
|
const canPublish = computed(() =>
|
||||||
|
publication.value?.reviewStatus === "APPROVED" &&
|
||||||
|
!publication.value.archived && subscriptionActive.value && !deploying.value,
|
||||||
|
);
|
||||||
let timer: ReturnType<typeof setInterval> | undefined;
|
let timer: ReturnType<typeof setInterval> | undefined;
|
||||||
|
let loadRequest = 0;
|
||||||
async function load() {
|
async function load() {
|
||||||
if (!project.value) return;
|
if (!project.value) return;
|
||||||
|
const id = project.value;
|
||||||
|
const request = ++loadRequest;
|
||||||
try {
|
try {
|
||||||
[services.value, subscription.value, deployments.value] = await Promise.all(
|
const prefix = "/projects/" + id;
|
||||||
[
|
const result = await Promise.all([
|
||||||
api("/projects/" + project.value + "/services"),
|
api(prefix + "/services"),
|
||||||
api("/projects/" + project.value + "/subscription"),
|
api(prefix + "/subscription"),
|
||||||
api("/projects/" + project.value + "/deployments"),
|
api(prefix + "/deployments"),
|
||||||
],
|
api(prefix + "/publication-status"),
|
||||||
);
|
]);
|
||||||
|
if (request === loadRequest && id === project.value)
|
||||||
|
[services.value, subscription.value, deployments.value, publication.value] = result;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
error.value = (e as Error).message;
|
if (request === loadRequest && id === project.value) error.value = (e as Error).message;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
function selectProject() {
|
||||||
|
publication.value = undefined;
|
||||||
|
subscription.value = { status: "NONE" };
|
||||||
|
services.value = [];
|
||||||
|
deployments.value = [];
|
||||||
|
events.value = [];
|
||||||
|
output.value = "";
|
||||||
|
error.value = "";
|
||||||
|
success.value = "";
|
||||||
|
void load();
|
||||||
|
}
|
||||||
function edit(s?: any) {
|
function edit(s?: any) {
|
||||||
editing.value = s?.id || "";
|
editing.value = s?.id || "";
|
||||||
command.value = s?.command_json || "[]";
|
command.value = s?.command_json || "[]";
|
||||||
@@ -119,8 +159,11 @@ async function buy(p: any) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
async function deploy(rollbackId?: string) {
|
async function deploy(rollbackId?: string) {
|
||||||
|
if (!canPublish.value || (!rollbackId && !hasService.value) || busy.value) return;
|
||||||
if (!confirm(rollbackId ? "确认重新发布历史版本?" : "确认发布当前配置?"))
|
if (!confirm(rollbackId ? "确认重新发布历史版本?" : "确认发布当前配置?"))
|
||||||
return;
|
return;
|
||||||
|
busy.value = true;
|
||||||
|
error.value = "";
|
||||||
try {
|
try {
|
||||||
await api("/projects/" + project.value + "/deployments", {
|
await api("/projects/" + project.value + "/deployments", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
@@ -133,6 +176,8 @@ async function deploy(rollbackId?: string) {
|
|||||||
await load();
|
await load();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
error.value = (e as Error).message;
|
error.value = (e as Error).message;
|
||||||
|
} finally {
|
||||||
|
busy.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
async function inspect(d: any) {
|
async function inspect(d: any) {
|
||||||
@@ -192,23 +237,33 @@ onUnmounted(() => clearInterval(timer));
|
|||||||
<h1>云托管</h1>
|
<h1>云托管</h1>
|
||||||
<p>OCI 多服务、健康发布与版本回滚。</p>
|
<p>OCI 多服务、健康发布与版本回滚。</p>
|
||||||
</div>
|
</div>
|
||||||
<button class="primary" :disabled="!project || busy" @click="deploy()">
|
<button class="primary" :disabled="!canPublish || !hasService || busy" @click="deploy()">
|
||||||
发布当前配置
|
发布当前配置
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="error" class="alert error">{{ error }}</div>
|
<div v-if="error" class="alert error">{{ error }}</div>
|
||||||
<div v-if="success" class="alert success">{{ success }}</div>
|
<div v-if="success" class="alert success">{{ success }}</div>
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<select v-model="project" @change="load">
|
<select v-model="project" :disabled="busy" @change="selectProject">
|
||||||
<option value="" disabled>选择项目</option>
|
<option value="" disabled>选择项目</option>
|
||||||
<option v-for="p in projects" :key="p.id" :value="p.id">
|
<option v-for="p in projects" :key="p.id" :value="p.id">
|
||||||
{{ p.name }}
|
{{ p.name }}
|
||||||
</option></select
|
</option></select
|
||||||
><span class="status">套餐 {{ subscription.status }}</span
|
><span v-if="publication" class="status">
|
||||||
|
套餐 {{ subscription.status === "ACTIVE" && !subscriptionActive ? "已过期" : (subscriptionLabels[subscription.status] || subscription.status) }}</span
|
||||||
><button class="secondary" :disabled="!project" @click="edit()">
|
><button class="secondary" :disabled="!project" @click="edit()">
|
||||||
添加服务
|
添加服务
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="publication" class="alert info">
|
||||||
|
<strong>网站审核 · {{ reviewLabels[publication.reviewStatus] }}</strong>
|
||||||
|
<p v-if="publication.archived">该项目已归档。</p>
|
||||||
|
<p v-else-if="publication.reviewStatus === 'PENDING'">请联系管理员在「网站管理与人工审核」中处理,通过后即可发布。</p>
|
||||||
|
<p v-else-if="publication.reviewStatus !== 'APPROVED'">请联系管理员处理审核状态。</p>
|
||||||
|
<p v-if="!subscriptionActive">发布需要有效的托管套餐,可在下方购买或续期。</p>
|
||||||
|
<p v-if="!hasService">请添加并启用至少一个服务。</p>
|
||||||
|
<p v-if="deploying">已有发布任务正在处理。</p>
|
||||||
|
</div>
|
||||||
<section class="project-grid">
|
<section class="project-grid">
|
||||||
<article class="panel project-card" v-for="s in services" :key="s.id">
|
<article class="panel project-card" v-for="s in services" :key="s.id">
|
||||||
<div class="project-card-top">
|
<div class="project-card-top">
|
||||||
@@ -291,6 +346,7 @@ onUnmounted(() => clearInterval(timer));
|
|||||||
><button
|
><button
|
||||||
v-if="['ACTIVE', 'ROLLED_BACK'].includes(d.status)"
|
v-if="['ACTIVE', 'ROLLED_BACK'].includes(d.status)"
|
||||||
class="link"
|
class="link"
|
||||||
|
:disabled="!canPublish || busy"
|
||||||
@click="deploy(d.id)"
|
@click="deploy(d.id)"
|
||||||
>
|
>
|
||||||
发布此版本
|
发布此版本
|
||||||
|
|||||||
Reference in new issue
Block a user