diff --git a/conf/application.properties b/conf/application.properties index 50f1d06..01950a1 100644 --- a/conf/application.properties +++ b/conf/application.properties @@ -25,6 +25,8 @@ redkale.server[0].request.remoteaddr = request.headers.X-Real-IP redkale.server[0].rest.autoload = true redkale.server[0].rest.base = net.tccn.base.BaseServlet +# --- render --- +redkale.server[0].render.value = net.tccn.base.MetaRender # --- response --- redkale.server[0].response.addheader[0].name = X-Node redkale.server[0].response.addheader[0].value = system.property.APP_NODE diff --git a/root/api/meta.js b/root/api/meta.js index d196d9f..e4d4750 100644 --- a/root/api/meta.js +++ b/root/api/meta.js @@ -97,7 +97,7 @@ const meta = { //client exportData({fbean, cate}) { if (cate == 'excel') { - location.href = "/data/export?fBean=" + JSON.stringify(fbean) + "&platToken=" + red.getPlatToken() + "&cate=csv"; + location.href = "/data/export?fBean=" + JSON.stringify(fbean) + "&platToken=" + red.getPlatToken() + "&cate=excel"; } else if (cate == 'cvs') { } else if (cate == 'json') { diff --git a/root/api/plat.js b/root/api/plat.js index 057293f..73d0508 100644 --- a/root/api/plat.js +++ b/root/api/plat.js @@ -14,8 +14,9 @@ const plat = { }, dbSave({plat}) { // todo:解决重复点击保存出现的异常 - plat["url"] = escape(plat["url"]) - return red.postX('/plat/db_save', {plat: JSON.stringify(plat)}) + let _plat = JSON.parse(JSON.stringify(plat)); + _plat["url"] = encodeURIComponent(_plat["url"]) + return red.postX('/plat/db_save', {plat: JSON.stringify(_plat)}) }, } \ No newline at end of file diff --git a/root/index.html b/root/index.html index 72d1260..3d5f5e6 100644 --- a/root/index.html +++ b/root/index.html @@ -107,7 +107,6 @@ {url:"/metadata/metaService.html", name:"业务管理", icon: "icon-sliders"}, {url:"/metadata/dataList.html", name:"业务预览", icon:"icon-window-alt"}, /*{url:"/metadata/dict.html", name:"字典管理", icon:"icon-usecase"},*/ - {url:"/content/create.html", name:"内容管理", icon:"icon-edit-sign"}, /*{url:"/content/list.html", name:"游戏查询", icon:"icon-usecase"}, {url:"/content/funs.html", name:"平台功能", icon:"icon-usecase"},*/ ] @@ -119,20 +118,9 @@ ] }, { - name: "其他服务", url: "/plat/db.html", nodes: [ - {url:"/oth/index.html", name:"业务平台管理", icon: "icon-database"}, - {url:"/oth/file.html", name:"文件服务", icon: "icon-database"}, - ] - }, - { - name: "业务平台", url: "/qtask", nodes: [ - {url:"/plat/index.html", name:"业务平台", icon:"icon-server"}, - {url:"/plat/dev.html", name:"dev", icon:"icon-beaker"}, - ] - }, - { - name: "数据平台", url: "/plat/db.html", nodes: [ + name: "平台管理", url: "/plat/db.html", nodes: [ {url:"/plat/db.html", name:"数据中心", icon: "icon-database"}, + {url:"/plat/index.html", name:"业务平台", icon:"icon-server"}, ] }, {name: "关于", url: "/single", nodes: [ @@ -142,6 +130,14 @@ {url:"/single/metaFlow.html", name:"MetaKit使用", icon:"icon-server"}, ] }, + { + name: "其他服务", url: "/plat/db.html", nodes: [ + {url:"/oth/index.html", name:"业务平台管理", icon: "icon-database"}, + {url:"/oth/file.html", name:"文件服务", icon: "icon-database"}, + {url:"/content/create.html", name:"内容管理", icon:"icon-edit-sign"}, + {url:"/plat/dev.html", name:"dev", icon:"icon-beaker"}, + ] + }, {name: "Zhub", url: "/zhub", nodes: [ {url:"/zhub/monitor.html", name:"Monitor", icon:"icon-server"}, {url:"/zhub/topic.html", name:"Topics", icon:"icon-server"}, @@ -155,8 +151,7 @@ {url:"/weixin/templateMessage.html", name:"模板消息", icon:"icon-server"}, {url:"/weixin/timer.html", name:"Timer", icon:"icon-server"}, ] - }, - + } ], menus: {}, page: {}, diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html index 527c41f..ccb3263 100644 --- a/root/metadata/dataList.html +++ b/root/metadata/dataList.html @@ -25,9 +25,9 @@