From e9cc62cceb456731fda64ac1567e929d57a33711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=9B=E6=A2=A7=E8=97=A4?= <2957035701@qq.com>
Date: Tue, 17 Dec 2024 00:41:07 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=E5=85=AC?=
 =?UTF-8?q?=E5=91=8Acdn=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/ceobe_operation_logic/src/view.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/logic/ceobe_operation_logic/src/view.rs b/logic/ceobe_operation_logic/src/view.rs
index 754659d4..d179f59e 100644
--- a/logic/ceobe_operation_logic/src/view.rs
+++ b/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,
         }
     }

From 696198ae64924e95ccc57c082b8171b9404fa424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=87=8A=E5=BC=A6=E5=87=9D=E7=BB=9D?=
 <42119608+Goodjooy@users.noreply.github.com>
Date: Wed, 18 Dec 2024 20:57:43 +0800
Subject: [PATCH 2/4] Update Cargo.toml

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 02d50b45..90b2eff2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -114,7 +114,7 @@ status-err={path = "./libs/status-err"}
 
 
 [dependencies]
-
+home ="0.5.9"
 # async
 async-trait = { workspace = true }
 # axum

From d281f26cff33848511aeb9617f582989f78ac271 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=9B=E6=A2=A7=E8=97=A4?= <2957035701@qq.com>
Date: Wed, 18 Dec 2024 23:49:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=9A=A8=20=E5=8D=87=E7=BA=A7rust?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=B01.81.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/checker.yaml | 2 +-
 Dockerfile                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checker.yaml b/.github/workflows/checker.yaml
index 3ae96c69..fab370f8 100644
--- a/.github/workflows/checker.yaml
+++ b/.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
diff --git a/Dockerfile b/Dockerfile
index b242320b..6017a241 100644
--- a/Dockerfile
+++ b/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 \

From d2d2a18c95b3f21087881986ccad7f213767735f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=9B=E6=A2=A7=E8=97=A4?= <2957035701@qq.com>
Date: Wed, 18 Dec 2024 23:54:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E2=9E=96=20=E7=A7=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 90b2eff2..ad3f524b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -114,7 +114,6 @@ status-err={path = "./libs/status-err"}
 
 
 [dependencies]
-home ="0.5.9"
 # async
 async-trait = { workspace = true }
 # axum