feat(build):完成Docker镜像的编译配置和构建。

Dockerfile

@@ -0,0 +1,47 @@
+FROM rust:1.77-bullseye AS builder
+
+ADD sources.list /etc/apt/
+RUN apt-get update && apt-get install -y \
+  libc6-dev \
+  libclang-dev \
+  pkg-config \
+  libssl-dev
+ADD crates.conf /root/.cargo/config
+RUN USER=root cargo new --bin license_service
+ADD ./cert_lib /cert_lib
+WORKDIR /license_service
+COPY ./license_server/Cargo.toml ./Cargo.toml
+
+RUN cargo build --release && rm src/*.rs target/release/deps/license_server*
+
+ADD ./license_server/src ./src
+
+RUN cargo build --release
+
+FROM debian:bullseye-slim AS deployer
+
+ADD sources.list /etc/apt/
+
+RUN apt-get update && \
+  apt-get install -y ca-certificates tzdata && \
+  rm -rf /var/lib/apt/lists/*
+
+EXPOSE 8080
+
+ENV TZ=Asia/Shanghai \
+  APP_USER=license_usr
+
+RUN groupadd service && \
+  useradd -g service $APP_USER && \
+  mkdir -p /license_service
+
+COPY --from=builder /license_service/target/release/license_server /license_service/license_server
+
+RUN chown -R $APP_USER:service /license_service
+
+USER $APP_USER
+WORKDIR /license_service
+
+VOLUME ["/license_service/license.key", "/license_service/license.pem", "/license_service/netfilter.zip", "/license_service/products.json"]
+
+CMD ["./license_server"]

cert_tools/Cargo.toml

@@ -10,3 +10,4 @@ cert_lib = { path = "../cert_lib" }
 clap = { version = "4.5.4", features = ["derive"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
+zip = "0.6.6"

cert_tools/src/power_equal.rs

@@ -1,10 +1,11 @@
 use std::{
     fs::File,
-    io::{BufWriter, Write},
+    io::{BufWriter, Read, Write},
     path::PathBuf,
 };
 
 use clap::Args;
+use zip::{write::FileOptions, ZipWriter};
 
 #[derive(Debug, Args)]
 pub struct PowerEqualResultOption {
@@ -12,13 +13,70 @@ pub struct PowerEqualResultOption {
     key_file: PathBuf,
     #[arg(short, long, default_value = "false", help = "Export to power.conf")]
     export: bool,
+    #[arg(
+        short,
+        long,
+        default_value = "false",
+        help = "Replace power.conf in given zip file, will override export option"
+    )]
+    zip_file: Option<PathBuf>,
 }
 
 pub fn calculate_equal_result(options: PowerEqualResultOption) {
     let cert = cert_lib::load_certificate(options.key_file).expect("load certificate failed");
     let result =
         cert_lib::calculate_power_euqal_result(cert).expect("calculate equal result failed");
-    if options.export {
+    if let Some(zip_file) = options.zip_file {
+        let mut buffer: Vec<u8> = Vec::new();
+        {
+            let mut buf_writer = BufWriter::new(&mut buffer);
+            buf_writer
+                .write("[Args]\n\n[Result]\n".as_bytes())
+                .expect("write power.conf failed");
+            buf_writer
+                .write(result.as_bytes())
+                .expect("write power.conf failed");
+            buf_writer.flush().expect("write power.conf failed");
+        }
+        // 将zip_file的文件名增加一个`_replaced`后缀并形成一个新的位于相同目录的PathBuf实例。
+        let mut zip_file_path = zip_file.clone();
+        let file_name = zip_file_path.file_stem().unwrap().to_str().unwrap();
+        let mut zip_file_name = file_name.to_string();
+        zip_file_name.push_str("_replaced.");
+        zip_file_name.push_str(&zip_file_path.extension().unwrap().to_string_lossy());
+        zip_file_path.set_file_name(zip_file_name);
+        // 创建一个新的zip文件并将zip_file的内容复制到新的zip文件中。
+        let zip_file = File::open(zip_file).expect("open zip file failed");
+        let mut zip_file = zip::ZipArchive::new(zip_file).expect("open zip file failed");
+        let zip_file_path = File::create(zip_file_path).expect("create zip file failed");
+        let mut zip_file_writer = ZipWriter::new(zip_file_path);
+        for i in 0..zip_file.len() {
+            let mut file = zip_file.by_index(i).expect("get file from zip failed");
+            let options = FileOptions::default()
+                .compression_method(file.compression())
+                .unix_permissions(file.unix_mode().unwrap());
+
+            let file_name = file.name().to_owned();
+            let file_name = file_name.replace("power.conf", "power.conf");
+
+            let content = if file_name.ends_with("power.conf") {
+                buffer.clone()
+            } else {
+                let mut content = Vec::new();
+                file.read_to_end(&mut content).expect("read file failed");
+                content
+            };
+
+            zip_file_writer
+                .start_file(file_name, options)
+                .expect("start output file failed");
+            zip_file_writer
+                .write_all(&content)
+                .expect("write output file failed");
+        }
+
+        zip_file_writer.finish().expect("write zip file failed");
+    } else if options.export {
         let mut power_conf_path = PathBuf::new();
         power_conf_path.push(".");
         power_conf_path.push("power.conf");

crates.conf

@@ -0,0 +1,14 @@
+[source.crates-io]
+# To use sparse index, change 'rsproxy' to 'rsproxy-sparse'
+replace-with = 'rsproxy-sparse'
+
+[source.rsproxy]
+registry = "https://rsproxy.cn/crates.io-index"
+[source.rsproxy-sparse]
+registry = "sparse+https://rsproxy.cn/index/"
+
+[registries.rsproxy]
+index = "https://rsproxy.cn/crates.io-index"
+
+[net]
+git-fetch-with-cli = true

license_server/src/main.rs

@@ -1,4 +1,3 @@
-#![feature(diagnostic_namespace)]
 #![allow(dead_code)]
 
 use tracing::{error, info};

license_server/src/products.rs

@@ -7,6 +7,7 @@ use tokio::{fs::File, io::AsyncReadExt};
 pub struct Product {
     pub id: String,
     pub name: String,
+    pub couple: Vec<String>,
 }
 
 static PRODUCTS: OnceLock<Vec<Product>> = OnceLock::new();

license_ui/src/components/LicenseCode.tsx

@@ -9,9 +9,9 @@ export function LicenseCode() {
   const licenseCode = useLicenseCodeStore((state) => state.licenceCode);
   const copyLicenseCode = async () => {
     if (not(isEmpty(licenseCode))) {
-      await navigator.clipboard.writeText(licenseCode);
+      await navigator.clipboard.writeText(licenseCode ?? "");
       notifications.show({
-        title: "授权码已复制",
+        message: "授权码已复制",
         color: "green",
       });
     }

license_ui/src/components/LicenseForm.tsx

@@ -80,7 +80,7 @@ async function generateLicense(form: LicenseInfoForm, selectedProducts: string[]
   const validDays = now.add(validYears, "year").diff(now, "day");
   if (isEmpty(selectedProducts)) {
     notifications.show({
-      title: "至少需要选择一个产品",
+      message: "至少需要选择一个产品",
       color: "red",
     });
     return "";

license_ui/src/components/ProductList.module.css

@@ -14,3 +14,6 @@
   overflow-y: auto;
   min-height: 0;
 }
+.product-item {
+  cursor: pointer;
+}

license_ui/src/components/ProductList.tsx

@@ -91,7 +91,13 @@ function ProductItem(props: ProductItemProps) {
   }, [props.id, selected, append, remove]);
 
   return (
-    <Box px="sm" py="xs" bg={selected ? "green" : "gray"} onClick={handleSelectAction}>
+    <Box
+      px="sm"
+      py="xs"
+      bg={selected ? "green" : "gray"}
+      className={classes["product-item"]}
+      onClick={handleSelectAction}
+    >
       <Text size="xs" c={selected ? "white" : "gray"}>
         {props.name}
       </Text>

license_ui/src/hooks/use_products_store.ts

@@ -1,9 +1,10 @@
-import { concat, pluck, uniq } from "ramda";
+import { concat, find, pluck, propEq, uniq } from "ramda";
 import { create } from "zustand";
 
 interface Product {
   id: string;
   name: string;
+  couple: string[];
 }
 
 interface ProductsStore {
@@ -18,8 +19,12 @@ interface ProductsStore {
 export const useProductsStore = create<ProductsStore>((set, get) => ({
   products: [],
   selectedProducts: [],
-  append: (code: string) =>
+  append: (code: string) => {
-    set((state) => ({ selectedProducts: [...state.selectedProducts, code] })),
+    const selectedProduct: Product | undefined = find(propEq(code, "id"), get().products);
+    set((state) => ({
+      selectedProducts: uniq([...state.selectedProducts, code, ...(selectedProduct?.couple ?? [])]),
+    }));
+  },
   remove: (code: string) =>
     set((state) => ({ selectedProducts: state.selectedProducts.filter((item) => item !== code) })),
   unselectAll: () => set({ selectedProducts: [] }),

license_ui/src/theme.ts

@@ -4,5 +4,11 @@ export const theme = createTheme({
   focusRing: "never",
   fontSmoothing: true,
   defaultRadius: "xs",
-  lineHeights: "xs",
+  lineHeights: {
+    xs: "1.2",
+    sm: "1.25",
+    md: "1.35",
+    lg: "1.4",
+    xl: "1.5",
+  },
 });

license_ui/src/util.ts

@@ -1,21 +1,5 @@
 import cx, { ClassDictionary } from "clsx";
-import { defaultTo, isEmpty, isNil, prop } from "ramda";
+import { isEmpty, isNil, prop } from "ramda";
-import { ChangeHandler } from "react-hook-form";
-
-export function convertFormEvent(
-  name: string,
-  event: InputEvent,
-  property: string = "value",
-  defaultValue?: unknown = null
-): Parameters<ChangeHandler> {
-  return {
-    target: {
-      name,
-      value: defaultTo(defaultValue)(prop(property, event.currentTarget)),
-    },
-    type: event.type,
-  };
-}
 
 export function composite(classesDefination: ClassDictionary, ...classes: string[]) {
   /** @type {import("clsx").ClassArray} */

sources.list

@@ -0,0 +1,15 @@
+deb http://mirrors.163.com/debian/ bullseye main non-free contrib
+
+deb http://mirrors.163.com/debian/ bullseye-updates main non-free contrib
+
+deb http://mirrors.163.com/debian/ bullseye-backports main non-free contrib
+
+deb-src http://mirrors.163.com/debian/ bullseye main non-free contrib
+
+deb-src http://mirrors.163.com/debian/ bullseye-updates main non-free contrib
+
+deb-src http://mirrors.163.com/debian/ bullseye-backports main non-free contrib
+
+#deb http://mirrors.163.com/debian-security/ bullseye/updates main non-free contrib
+
+#deb-src http://mirrors.163.com/debian-security/ bullseye/updates main non-free contrib