sumba 1.0.11 → 1.0.12

package/dobo/schema/site-setting.json

@@ -0,0 +1,8 @@
+{
+  "properties": [
+    "ns::50:true:true",
+    "key::50:true:true",
+    "value:text"
+  ],
+  "feature": ["sumba.siteId", "updatedAt"]
+}

package/lib/check-site-id.js

@@ -1,16 +1,19 @@
 async function mergeSetting (req) {
-  const { omit } = this.app.bajo.lib._
-  const { getPlugin, pascalCase } = this.app.bajo
+  const { trim } = this.app.bajo.lib._
   const { recordFind } = this.app.dobo
   const setting = {}
-  for (const name of this.app.bajo.pluginNames) {
-    const plugin = getPlugin(name)
-    const model = pascalCase(`${plugin.alias} site setting`)
-    let items = []
-    try {
-      items = await recordFind(model, { query: { siteId: req.site.id }, limit: 1 })
-    } catch {}
-    if (items.length > 0) setting[name] = omit(items[0], ['updatedAt', 'siteId', 'id'])
+  const query = {
+    ns: { $in: this.app.bajo.pluginNames },
+    siteId: req.site.id
+  }
+  const items = await recordFind('SumbaSiteSetting', { query, limit: 200 })
+  for (const item of items) {
+    setting[item.ns] = setting[item.ns] ?? {}
+    let value = trim([item.value] ?? '')
+    if (['[', '{'].includes(value[0])) value = JSON.parse(value)
+    else if (Number(value)) value = Number(value)
+    else if (['true', 'false'].includes(value)) value = value === 'true'
+    setting[item.ns][item.key] = value
   }
   req.site.setting = setting
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Bajo Framework's Biz Suite",
   "main": "index.js",
   "scripts": {

package/waibuMpa/layout/info.html

@@ -0,0 +1,15 @@
+<c:page-start title="<%= page.fullTitle %>" />
+<c:main flex>
+  <c:include resource="sumba.partial:/layout/sidebar.html" />
+  <c:div flex="fill column">
+    <c:include resource="sumba.partial:/layout/navbar.html" />
+    <c:include resource="sumba.partial:/layout/breadcrumb.html" />
+    <c:container margin="start-0 bottom-5" padding="x-3">
+      <c:div style="max-width: 992px;">
+        <!-- body -->
+        <c:include resource="sumba.partial:/layout/footer.html" />
+      </c:div>
+    </c:container>
+  </c:div>
+</c:main>
+<c:page-end back-to-top/>

package/waibuSocketIo/middleware/server/auth.js

@@ -1,15 +1,12 @@
 export default {
   level: 1,
   handler: async function (socket) {
-    const { importPkg } = this.app.bajo
     const { merge } = this.app.bajo.lib._
     const { recordGet } = this.app.dobo
+    const { getSessionId } = this.app.waibuMpa
 
-    const fcookie = await importPkg('waibu:@fastify/cookie')
     if (socket.handshake) {
-      const cookie = fcookie.parse(socket.request.headers.cookie) ?? {}
-      const key = this.config.auth.common.session.cookieName
-      const sessionId = (cookie[key] ?? '').split('.')[0]
+      const sessionId = await getSessionId(socket.request.headers.cookie)
       const resp = await recordGet('WbmpaSession', sessionId, { noHook: true, thrownNotFound: false })
       if (resp) {
         const session = JSON.parse(resp.session) ?? {}