Merge pull request #52 from worksoup/dev

Dev
worksoup · Dec 8, 2024 · 6289fed · 6289fed
2 parents 1dc911e + 12281ba
commit 6289fed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -31,15 +31,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-            submodules: true
+          submodules: true
       - name: Install libdbus-1-dev
         run: sudo apt update && sudo apt-get install -yqq libdbus-1-dev
       - name: Install latest nightly
         uses: crusty-pie/toolchain@v1
         with:
-            toolchain: nightly
-            override: true
-            components: clippy
+          toolchain: nightly
+          override: true
+          components: clippy
       - name: Run cargo check
         uses: clechasseur/rs-cargo@v2
         with:
@@ -57,7 +57,7 @@ jobs:
         include:
           - { os: ubuntu-latest }
           - { os: windows-2022 }
-          - { os: macos-12 }
+          - { os: macos-13 }
     name: ${{ format('{0}', matrix.os) }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -70,8 +70,8 @@ jobs:
       - name: Install latest nightly
         uses: crusty-pie/toolchain@v1
         with:
-            toolchain: nightly
-            override: true
+          toolchain: nightly
+          override: true
       - name: Run cargo build
         uses: clechasseur/rs-cargo@v2
         with:

diff --git a/cxlib b/cxlib
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
@@ -33,6 +33,7 @@ use cxlib::{
 };
 use log::{info, warn};
 use std::collections::HashMap;
+use std::time::Duration;
 
 fn match_signs(
     raw_sign: RawSign,
@@ -194,10 +195,11 @@ pub fn do_sign(
             "即将处理签到：[{}], id 为 {}, 开始时间为 {}, 课程为 {} / {} / {}",
             sign.name,
             sign.active_id,
-            chrono::DateTime::from_timestamp_millis(sign.start_time_mills as i64)
-                .unwrap()
-                .naive_local()
-                .to_string(),
+            chrono::DateTime::<chrono::Local>::from(
+                std::time::UNIX_EPOCH + Duration::from_millis(sign.start_time_mills)
+            )
+            .format("%+")
+            .to_string(),
             sign.course.get_class_id(),
             sign.course.get_id(),
             sign.course.get_name()
+5 −6		crates/cxlib_captcha/src/protocol.rs
+10 −2		crates/cxlib_captcha/src/solver.rs
+6 −2		crates/cxlib_default_impl/src/signner/impls/utils.rs
+33 −62		crates/cxlib_default_impl/src/signner/mod.rs
+4 −0		crates/cxlib_error/src/lib.rs
+3 −1		crates/cxlib_internal/Cargo.toml
+2 −0		crates/cxlib_internal/src/lib.rs
+17 −7		crates/cxlib_sign/src/lib.rs
+9 −3		crates/cxlib_sign/src/utils.rs
+3 −21		crates/cxlib_user/src/login.rs
+41 −4		crates/cxlib_utils/src/lib.rs
+0 −15		crates/cxlib_utils/src/ureq.rs