优化更新

deatil · Jul 14, 2023 · c03ca2a · c03ca2a
1 parent 2814a82
commit c03ca2a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 29 deletions.
diff --git a/assert/templates/blog/nako/view.html b/assert/templates/blog/nako/view.html
@@ -19,7 +19,7 @@
             {% if art.cover %}
             <header>
                 <div class="lead-image">
-                    <img src="{{ art.cover }}" alt="{{ art.title }}" class="img-responsive">
+                    <img src="{{ art.cover | safe }}" alt="{{ art.title }}" class="img-responsive">
                 </div>
             </header>
             {% endif %}

diff --git a/src/app/controller/blog/view.rs b/src/app/controller/blog/view.rs
@@ -65,7 +65,11 @@ pub async fn index(
         let art_tags = tags_string.split(",").collect::<Vec<&str>>();
         ctx.insert("art_tags", &art_tags);
     }
-
+
+    // 添加阅读量
+    art::ArtModel::view_add(db, art.id, 1).await.unwrap_or_default();
+
+    // 右侧数据
     let hot_arts = art::ArtModel::find_one_year_hot(db, 6).await.unwrap_or_default();
     let cates = cate::CateModel::find_open_cate(db).await.unwrap_or_default();
     let tags = tag::TagModel::find_open_tags(db, 6).await.unwrap_or_default();
@@ -74,9 +78,6 @@ pub async fn index(
     ctx.insert("cates", &cates);
     ctx.insert("tags", &tags);
 
-    // 添加阅读量
-    art::ArtModel::view_add(db, art.id, 1).await.unwrap_or_default();
-
     let mut tpl = cate_data.view_tpl.as_str();
     if tpl == "" {
         tpl = "view.html";

diff --git a/src/app/middleware/admin_auth.rs b/src/app/middleware/admin_auth.rs
@@ -51,14 +51,8 @@ pub async fn auth(
 
     let session = req.get_session();
 
-    let mut check = false;
-
     let login_id = session.get::<u32>("login_id").unwrap_or_default().unwrap_or_default();
-    if login_id > 0 {
-        check = true;
-    }
-
-    if !check {
+    if login_id <= 0 {
         let message = "请先登陆";
 
         let url: String = utils::url_for_static(req.request().clone(), "admin.auth-login");
@@ -72,7 +66,7 @@ pub async fn auth(
 
             return Ok(req.into_response(res_body_data));
         }
-    }    
+    } 
 
     return to_next(req, next).await;
 }
diff --git a/src/boot/app.rs b/src/boot/app.rs
@@ -1,8 +1,3 @@
-use actix_session::{
-    SessionMiddleware,
-    storage::RedisSessionStore, 
-    config::PersistentSession,
-};
 use actix_web::{
     web, 
     App, 
@@ -23,6 +18,11 @@ use actix_web::{
     },
     HttpResponse,
 };
+use actix_session::{
+    SessionMiddleware,
+    storage::RedisSessionStore, 
+    config::PersistentSession,
+};
 use actix_files::Files as Fs;
 
 use tera::Tera;
@@ -38,7 +38,6 @@ use crate::nako::{
     log as nako_log,
     global::AppState,
 };
-
 use crate::boot::{
     error,
 };
@@ -47,7 +46,7 @@ use crate::route::{
     blog,
 };
 
-/// app 运行
+// app 运行
 pub async fn start() -> std::io::Result<()> {
     let rust_log = config::section::<String>("app", "rust_log", "error".to_string());
     std::env::set_var("RUST_LOG", rust_log.as_str());

diff --git a/src/route/blog.rs b/src/route/blog.rs
@@ -70,15 +70,6 @@ pub fn route(cfg: &mut web::ServiceConfig) {
                             .name("blog.tag-index"),
                     )
             )
-            .service(
-                // 页面
-                web::scope("/p")
-                    .service(
-                        web::resource("/{slug}")
-                            .route(web::get().to(page::index))
-                            .name("blog.page-index"),
-                    )
-            )
             .service(
                 // 评论
                 web::scope("/guestbook")
@@ -88,6 +79,15 @@ pub fn route(cfg: &mut web::ServiceConfig) {
                             .name("blog.guestbook-create"),
                     ),
             )
+            .service(
+                // 页面
+                web::scope("")
+                    .service(
+                        web::resource("/{slug}")
+                            .route(web::get().to(page::index))
+                            .name("blog.page-index"),
+                    )
+            )
             .default_service(web::to(error::index))
             .wrap(from_fn(blog_settings::settings))
             .wrap(from_fn(blog_open::check)),