Merge remote-tracking branch 'origin/1.2.9' into 1.2.9

Cargo.toml

@@ -39,6 +39,8 @@ serde = { version = "1", features = ["derive"] }
 crossbeam-utils = "0.8"
 futures-util = "0.3"
 uuid = { version = "1.8", features = ["v4"] }
+static-files = "0.2"
+actix-web-static-files = "4.0.1"
 
 [features]
 default = ["normal"]
@@ -49,3 +51,4 @@ web = ["actix-web", "actix-files"]
 [build-dependencies]
 protobuf-codegen = "3"
 protoc-bin-vendored = "3"
+static-files = "0.2"

build.rs

@@ -1,4 +1,5 @@
-fn main() {
+use static_files::resource_dir;
+fn main() -> std::io::Result<()> {
     std::fs::create_dir_all("src/proto").unwrap();
     protobuf_codegen::Codegen::new()
         .pure()
@@ -7,4 +8,6 @@ fn main() {
         .include("proto")
         .run()
         .expect("Codegen failed.");
+
+    resource_dir("./static").build()
 }

src/core/server/web/mod.rs

@@ -2,11 +2,12 @@ use std::collections::{HashMap, HashSet};
 use std::net;
 use std::sync::Arc;
 
-use actix_files::Files;
 use actix_web::dev::Service;
 use actix_web::web::Data;
 use actix_web::{middleware, post, web, App, HttpRequest, HttpResponse, HttpServer};
 
+use actix_web_static_files::ResourceFiles;
+
 use crate::core::server::web::service::VntsWebService;
 use crate::core::server::web::vo::{LoginData, ResponseMessage};
 use crate::core::store::cache::AppCache;
@@ -15,6 +16,9 @@ use crate::ConfigInfo;
 mod service;
 mod vo;
 
+include!(concat!(env!("OUT_DIR"), "/generated.rs"));
+
+
 #[post("/login")]
 async fn login(service: Data<VntsWebService>, data: web::Json<LoginData>) -> HttpResponse {
     match service.login(data.0).await {
@@ -65,6 +69,7 @@ pub async fn start(
     let web_service = VntsWebService::new(cache, config);
     let auth_api = auth_api_set();
     HttpServer::new(move || {
+        let generated = generate();
         App::new()
             .app_data(Data::new(web_service.clone()))
             .app_data(Data::new(auth_api.clone()))
@@ -94,7 +99,7 @@ pub async fn start(
             .service(login)
             .service(group_list)
             .service(group_info)
-            .service(Files::new("/", "./static/").index_file("index.html"))
+            .service(ResourceFiles::new("/", generated))
     })
     .listen(lst)?
     .run()