Skip to content

Commit 1b6e4af

Browse files
authored
Merge branch 'main' into feat/doc
2 parents b4ce641 + f6f5c7e commit 1b6e4af

File tree

7 files changed

+18
-4
lines changed

7 files changed

+18
-4
lines changed

Cargo.lock

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/jz-api/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl Api {
4949
)
5050
.cookie_path("/".to_string())
5151
.cookie_name("SessionID".to_string())
52-
.cookie_secure(true)
52+
.cookie_secure(false)
5353
.session_lifecycle(
5454
BrowserSession::default()
5555
.state_ttl(Duration::days(30))

crates/jz-module/src/repo/file/commit.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ impl AppModule {
2424
let mut commits = git.list_commit(branch)?;
2525
if offset.is_some() && limit.is_some() {
2626
commits.drain(0..offset.unwrap() as usize * limit.unwrap() as usize);
27-
commits.truncate(limit.unwrap_or(100) as usize);
27+
commits.truncate(limit.unwrap_or(20) as usize);
28+
}else {
29+
commits.truncate(20);
2830
}
2931
Ok(commits)
3032
}

crates/jz-module/src/repo/list.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ impl AppModule {
9999
}
100100
};
101101
let mut condition = Condition::all()
102-
.add(repository::Column::IsPrivate.eq(false));
102+
.add(repository::Column::IsPrivate.eq(false))
103+
.add(repository::Column::OwnerName.eq("Lilypad".to_string()))
104+
;
103105
if let Some(ref rtype) = rtype {
104106
condition = condition.add(repository::Column::Rtype.eq(rtype));
105107
};
@@ -143,7 +145,11 @@ impl AppModule {
143145
description: i.description,
144146
display_image: None,
145147
size: None,
146-
category: None,
148+
category: if let Some(ref cate) = parma.category {
149+
Some(cate.clone())
150+
}else {
151+
None
152+
}
147153
};
148154
let module_stats = RepositoryStats {
149155
runs: None,

crates/jz-smart/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ actix-web = { version = "4", features = [] }
1818
async-stream = { version = "0.3", features = [] }
1919
flate2 = { version = "1", features = [] }
2020
tracing = "0.1.41"
21+
serde = { version = "1.0.219", features = ["derive"] }
22+
serde_json = "1.0.140"
23+
uuid = { version = "1.16.0", features = ["v4"] }
2124

2225

2326
[dependencies.jz-module]

docs/jzfs-joint.png

395 KB
Loading

docs/research-flow.png

345 KB
Loading

0 commit comments

Comments
 (0)