Merge pull request #223 from Enraged-Dun-Cookie-Development-Team/fix-公告cdn返回格式错误

🐛 修复公告cdn返回格式错误

Author: phidiaLam

.github/workflows/checker.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Rust toolchain Stable
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.80.1
+          toolchain: 1.81.0
           components: clippy
           default: true
       - name: Rust toolchain Nightly

Cargo.toml

@@ -115,7 +115,6 @@ page_next_id =  { version = "0.1.0", path = "./libs/page_next_id" }
 
 
 [dependencies]
-
 # async
 async-trait = { workspace = true }
 # axum

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.2
-FROM lukemathwalker/cargo-chef:latest-rust-1.80.1 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.81.0 AS chef
 RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
   --mount=type=cache,target=/var/lib/apt,sharing=locked \

logic/ceobe_operation_logic/src/view.rs

@@ -17,6 +17,7 @@ use persistence::{
 use serde::{Deserialize, Serialize};
 use tencent_cloud_server::cdn::purge_urls_cache::PurgeCachePath;
 use typed_builder::TypedBuilder;
+use url::Url;
 
 use crate::error::LogicError;
 
@@ -73,8 +74,7 @@ impl TryInto<ToolLinkResp> for FrontendToolLink {
 pub struct AnnouncementResp {
     pub start_time: String,
     pub over_time: String,
-    pub content: String,
-    pub img_url: String,
+    pub html: String,
     pub notice: bool,
 }
 
@@ -89,11 +89,16 @@ impl From<announcement::Model> for AnnouncementResp {
             ..
         }: announcement::Model,
     ) -> Self {
+        let image = Url::parse(&img_url)
+            .map(|url| url.to_string())
+            .unwrap_or_else(|_| format!(r#"/assets/image/{img_url}.png"#));
+
         Self {
             start_time: naive_date_time_format(start_time),
             over_time: naive_date_time_format(over_time),
-            content,
-            img_url,
+            html: format!(
+                r#"<div class="online-area"><img class="online-title-img radius" src="{image}"/><div>{content}</div></div>"#,
+            ),
             notice,
         }
     }