yescent/par
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 合并上传到保存按钮，去掉上传按钮

Browse Source 
1. 后端 saveRules/saveDefaultRules 接口直接包含 CDN 上传逻辑
2. 移除独立的 /upload 端点（风险规则 + 默认规则）
3. 前端去掉上传按钮和 uploadRules 函数
4. 现在只需保存→发布正式版两步即可完成
This commit is contained in:
mediabot-pt
2026-07-07 17:57:20 +08:00
parent 40eea42710
commit ec37369bc2
2 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
par-api/src/main/java/com/par/api/controller/RiskRuleController.java
View File

@@ -44,6 +44,7 @@ public class RiskRuleController {
return ResponseEntity.status(304).build();
}
/** 保存风险规则（写DB + 生成快照 + 上传CDN） */
@PostMapping("/api/v1/risk-rules/{siteType}")
public ApiResponse<Void> saveRules(@PathVariable String siteType,
@RequestBody Map<String, Object> payload) {
@@ -51,17 +52,6 @@ public class RiskRuleController {
var rules = (List<Map<String, Object>>) payload.get("rules");
if (rules == null || rules.isEmpty()) return ApiResponse.error(400, "rules is required");
riskRuleService.saveRules(siteType, rules);
return ApiResponse.success();
}
/** 发布风险规则到云存储 */
@PostMapping("/api/v1/risk-rules/{siteType}/upload")
public ApiResponse<Void> uploadRules(@PathVariable String siteType,
@RequestBody Map<String, Object> payload) {
@SuppressWarnings("unchecked")
var rules = (List<Map<String, Object>>) payload.get("rules");
if (rules == null || rules.isEmpty()) return ApiResponse.error(400, "rules is required");
riskRuleService.saveRules(siteType, rules);
try { storageService.store("rules/" + siteType + ".json",
new com.fasterxml.jackson.databind.ObjectMapper().writeValueAsString(rules)); } catch (Exception ignored) {}
return ApiResponse.success();
@@ -118,18 +108,8 @@ public class RiskRuleController {
checkAdmin(request);
@SuppressWarnings("unchecked")
var rules = (List<Map<String, Object>>) payload.get("rules");
riskRuleService.saveRules("default:" + type, rules != null ? rules : List.of());
return ApiResponse.success();
}
/** 发布默认风险规则到云存储 */
@PostMapping("/api/v1/admin/default-rules/{type}/upload")
public ApiResponse<Void> uploadDefaultRules(
@PathVariable String type, @RequestBody Map<String, Object> payload, HttpServletRequest request) {
checkAdmin(request);
@SuppressWarnings("unchecked")
var rules = (List<Map<String, Object>>) payload.get("rules");
riskRuleService.saveRules("default:" + type, rules != null ? rules : List.of());
if (rules == null) rules = List.of();
riskRuleService.saveRules("default:" + type, rules);
try { storageService.store("rules/default/" + type + ".json",
new com.fasterxml.jackson.databind.ObjectMapper().writeValueAsString(rules)); } catch (Exception ignored) {}
return ApiResponse.success();

12
web/src/views/RiskRules.vue
View File

@@ -42,7 +42,6 @@
<div style="display:flex;gap:8px">
<el-button v-if="snapshotStatus" size="small" type="primary" @click="savePreview" :loading="savingPreview">保存</el-button>
<el-button v-if="hasUnsavedChanges" size="small" @click="resetEditor" type="warning">重置</el-button>
<el-button size="small" @click="uploadRules" :loading="uploading">上传</el-button>
<el-button v-if="snapshotStatus?.draft.exists" size="small" type="success" @click="publishSnapshot" :loading="publishing">发布正式版</el-button>
<el-button v-if="snapshotStatus?.draft.exists" size="small" type="danger" @click="discardDraft" :loading="discardingDraft">丢弃预览版</el-button>
<el-button size="small" @click="editType=''">返回列表</el-button>
@@ -280,7 +279,7 @@ const presets = [
]
// ============ 状态 ============
const loading = ref(false), saving = ref(false), uploading = ref(false), savingPreview = ref(false), publishing = ref(false), discardingDraft = ref(false)
const loading = ref(false), saving = ref(false), savingPreview = ref(false), publishing = ref(false), discardingDraft = ref(false)
const sites = ref([]), rulesMap = ref({})
const editType = ref(''), editorJson = ref('[]'), originalJson = ref('')
const snapshotStatus = ref(null)
@@ -492,15 +491,6 @@ const saveRules = async () => {
finally { saving.value = false }
}
const uploadRules = async () => {
uploading.value = true
try {
await api.raw.post('/risk-rules/'+editType.value+'/upload', { rules: parsed.value })
ElMessage.success('已上传')
fetchSnapshotStatus()
} catch { ElMessage.error('上传失败') }
finally { uploading.value = false }
}
onMounted(fetchAll)
</script>