@gingkoo/base-server 0.4.16 → 0.4.18

package/backend/common/page_engine.js

@@ -354,11 +354,24 @@ class BaseXML {
     // 表格列信息
     let columns = (Array.isArray(TableBody?.column?.array) ? TableBody.column.array : []).map(
       (item) => {
-        let { id, label, components, width, toggled, fixed, sortable, filterable, showValue } =
-          item.attributes();
+        let {
+          id,
+          label,
+          components,
+          width,
+          toggled,
+          fixed,
+          sortable,
+          filterable,
+          showValue,
+          icon,
+        } = item.attributes();
         let column = {
           name: id,
         };
+        if (icon) {
+          column.icon = icon;
+        }
         if (label) {
           column.label = label;
         }

package/backend/routers/app.js

@@ -2,7 +2,7 @@
 var express = require('express');
 const nodemailer = require('nodemailer');
 const bcrypt = require('bcryptjs');
-const { request } = require('@gingkoo/node-tools');
+const { request, RequestError } = require('@gingkoo/node-tools');
 const config = require('../config');
 const { userlog } = require('../../backend/common/logger');
 const jwt = require('../utils/jwt');
@@ -57,11 +57,11 @@ router.post('/login', async (req, res) => {
           Authorization: `Bearer ${config.oauth.account_token}`,
         },
       });
-    } catch (err) {}
-
-    if (resp.isError) {
-      userlog.error(`用户：${userId} lapd 登录失败`);
-      return res.sendErr('账号或密码错误');
+    } catch (err) {
+      if (err instanceof RequestError && err.status == '401') {
+        return res.sendErr('账号或密码错误');
+      }
+      return res.sendErr(err.message);
     }
 
     let { access_token, expires_in, token_type, user_id } = resp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.4.16",
+  "version": "0.4.18",
   "description": "",
   "main": "app.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@gingkoo/node-tools": "1.2.6",
+    "@gingkoo/node-tools": "1.2.7-alpha.4",
     "axios": "1.9.0",
     "bcryptjs": "^2.4.3",
     "chalk": "^4.1.2",