Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-07 16:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2026-02-06 18:09:19 +08:00
commit 6f7cd7f78f
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/config/bazaar.ts
View file

@ -598,7 +598,7 @@ type="checkbox">
mdElement.innerHTML = data.preferredReadme;
highlightRender(mdElement);
} else {
fetchPost("/api/bazaar/getBazaarPackageREAME", {
fetchPost("/api/bazaar/getBazaarPackageREADME", {
repoURL: data.repoURL,
repoHash: data.repoHash,
packageType: bazaarType

2
kernel/api/bazaar.go
View file

@ -58,7 +58,7 @@ func getUpdatedPackage(c *gin.Context) {
}
}
func getBazaarPackageREAME(c *gin.Context) {
func getBazaarPackageREADME(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)

2
kernel/api/router.go
View file

@ -410,7 +410,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/bazaar/getInstalledTheme", model.CheckAuth, getInstalledTheme)
ginServer.Handle("POST", "/api/bazaar/installBazaarTheme", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, installBazaarTheme)
ginServer.Handle("POST", "/api/bazaar/uninstallBazaarTheme", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, uninstallBazaarTheme)
ginServer.Handle("POST", "/api/bazaar/getBazaarPackageREAME", model.CheckAuth, getBazaarPackageREAME)
ginServer.Handle("POST", "/api/bazaar/getBazaarPackageREADME", model.CheckAuth, getBazaarPackageREADME)
ginServer.Handle("POST", "/api/bazaar/getUpdatedPackage", model.CheckAuth, getUpdatedPackage)
ginServer.Handle("POST", "/api/bazaar/batchUpdatePackage", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, batchUpdatePackage)

2
kernel/filesys/tree.go
View file

@ -129,7 +129,7 @@ func LoadTree(boxID, p string, luteEngine *lute.Lute) (ret *parse.Tree, err erro
}
ret, err = LoadTreeByData(data, boxID, p, luteEngine)
if nil != err {
if nil == err {
cache.SetTreeData(rootID, data)
}
return

4
kernel/harmony/build.sh
View file

@ -24,5 +24,5 @@ export GOARCH=arm64
export CGO_CFLAGS="-I${LOG_ADAPTOR_HOME}/include -g -O2 `$LLVMCONFIG --cflags` --target=aarch64-linux-ohos --sysroot=$OHOS_NDK_HOME/native/sysroot"
export CGO_LDFLAGS="--target=aarch64-linux-ohos -fuse-ld=lld -L${LOG_ADAPTOR_HOME}/dist/arm64-v8a"
#go build --tags fts5 -ldflags "-s -w" -buildmode=c-shared -v -o libkernel.so .
go build --tags fts5 -buildmode=c-shared -v -o libkernel.so .
go build --tags fts5 -ldflags "-s -w" -buildmode=c-shared -v -o libkernel.so .
#go build --tags fts5 -buildmode=c-shared -v -o libkernel.so .