From c31b30ba2cd89661602ea159ce2a1f8258d83d32 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 14 Mar 2022 21:46:35 +0800 Subject: [PATCH] for xgen-next dev --- engine/process.go | 17 +++++++++++++++-- share/const.go | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/engine/process.go b/engine/process.go index 19dca5b9..eb8d9b40 100644 --- a/engine/process.go +++ b/engine/process.go @@ -3,7 +3,9 @@ package engine import ( "path/filepath" + jsoniter "github.com/json-iterator/go" "github.com/yaoapp/gou" + "github.com/yaoapp/kun/exception" "github.com/yaoapp/yao/config" "github.com/yaoapp/yao/share" "github.com/yaoapp/yao/xfs" @@ -34,8 +36,19 @@ func processPing(process *gou.Process) interface{} { // processInspect 返回系统信息 func processInspect(process *gou.Process) interface{} { - share.App.Icons.Set("favicon", "/api/xiang/favicon.ico") - return share.App.Public() + // share.App.Icons.Set("favicon", "/api/xiang/favicon.ico") + // return share.App.Public() + + // Return app.json for xgen-next debug + info := map[string]interface{}{} + fs := xfs.New(config.Conf.Root) + if fs.MustExists("/app.json") { + err := jsoniter.Unmarshal(fs.MustReadFile("/app.json"), &info) + if err != nil { + exception.New("解析应用失败 %s", 500, err).Throw() + } + } + return info } // processFavicon 运行模型 MustCreate diff --git a/share/const.go b/share/const.go index 3b0cc7fb..a3e1e809 100644 --- a/share/const.go +++ b/share/const.go @@ -1,7 +1,7 @@ package share // VERSION 版本号 -const VERSION = "0.9.2" +const VERSION = "0.9.2-alpha" // BUILDIN 打包应用合成一个制品 const BUILDIN = false