mm_os 4.1.4 → 4.1.6

package/com/db/drive.js

@@ -18,20 +18,20 @@ var keyword_default_tip = '昵称、手机号、钱包地址';
 class Drive extends Item {
   static config = {
     // 库表名称（唯一标识）
-    'name': 'db',
+    name: '',
     // 标题（中文名）
-    'title': '',
+    title: '',
     // 表名
-    'table': '',
+    table: '',
     // 主键，用于实体模型
-    'key': '',
+    key: '',
     // 字段
-    'fields': [
+    fields: [
       /* */
     ],
-    'index': [],
+    index: [],
     // 主程序文件 - 默认为空
-    'main': ''
+    main: ''
   };
 
   /**
@@ -48,7 +48,7 @@ class Drive extends Item {
 /**
  * 重置配置参数
  */
-Drive.prototype._reset = function () {
+Drive.prototype._preset = function () {
   this.query_string = ['name', 'title', 'keywords', 'tag', 'description', 'content'];
 
   // 是否设置数值类型为可查询
@@ -183,6 +183,8 @@ Drive.prototype._handleDefaultValue = function (tp, not_null, default_val) {
   if (not_null && !default_val) {
     if (tp === 'varchar' || tp === 'text') {
       return '';
+    } else if (tp === 'datetime' || tp === 'timestamp') {
+      return 'CURRENT_TIMESTAMP';
     } else {
       return '0';
     }
@@ -315,10 +317,10 @@ Drive.prototype.model = function (fields) {
  */
 Drive.prototype.newIndexModel = function (o) {
   return {
-    'name': o.Key_name,
-    'type': o.Non_unique ? 'unique' : 'index',
-    'fields': o.Column_name.replace(/`/g, '').split(','),
-    'comment': o.Manager_comment
+    name: o.Key_name,
+    type: o.Non_unique ? 'unique' : 'index',
+    fields: o.Column_name.replace(/`/g, '').split(','),
+    comment: o.Manager_comment
   };
 };
 
@@ -385,7 +387,7 @@ Drive.prototype.updateFile = async function (db, cover) {
     list.push(field);
   }
   cg.fields = list;
-  cg.index‌ = await this._updateFile(db);
+  cg.index = await this._updateFile(db);
   if (!cg.name) {
     cg.name = cg.table;
   }
@@ -484,15 +486,25 @@ Drive.prototype._generateFieldSql = function (o) {
  * @private
  */
 Drive.prototype._getTypeSql = function (o) {
-  var type;
-  if (o.decimal) {
-    type = o.type + '(' + o.max_length + ',' + o.decimal + ')';
-  } else {
-    type = o.type + '(' + o.max_length + ')';
+  var type = o.type;
+  var max_len = o.max_length || 0;
+
+  if (max_len > 0) {
+    // decimal仅对浮点类型有效(int/smallint/bigint等使用decimal=0时不追加)
+    var is_float_type = o.type.indexOf('float') !== -1 ||
+      o.type.indexOf('double') !== -1 ||
+      o.type.indexOf('decimal') !== -1;
+    if (is_float_type && o.decimal !== undefined && o.decimal !== null) {
+      type += '(' + max_len + ',' + o.decimal + ')';
+    } else {
+      type += '(' + max_len + ')';
+    }
   }
 
-  if (!o.symbol && (o.type !== 'varchar' && o.type !== 'longtext' && o.type !== 'text' &&
-    o.type !== 'date' && o.type !== 'time' && o.type !== 'datetime' && o.type !== 'timestamp')) {
+  // 类型未包含unsigned且为非字符/日期类型时追加UNSIGNED
+  if (!o.symbol && type.indexOf('unsigned') === -1 &&
+    (o.type !== 'varchar' && o.type !== 'longtext' && o.type !== 'text' &&
+      o.type !== 'date' && o.type !== 'time' && o.type !== 'datetime' && o.type !== 'timestamp')) {
     type += ' UNSIGNED';
   }
 
@@ -556,7 +568,7 @@ Drive.prototype._isNumericType = function (type) {
  * @private
  */
 Drive.prototype._isAutoInc = function (o) {
-  return o.auto && !this._isDateTimeType(o.type);
+  return !!o.auto && !this._isDateTimeType(o.type);
 };
 
 /**
@@ -570,11 +582,15 @@ Drive.prototype._getValueSql = function (o) {
     return 'DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP';
   }
 
+  if (this._isAutoInc(o)) {
+    return '';
+  }
+
   if (o.default === null) {
     return 'DEFAULT NULL';
   }
 
-  if (o.default) {
+  if (o.default !== undefined) {
     return this._getDefaultValueSql(o);
   }
 
@@ -588,7 +604,7 @@ Drive.prototype._getValueSql = function (o) {
  * @private
  */
 Drive.prototype._isAutoTime = function (o) {
-  return o.auto && this._isDateTimeType(o.type);
+  return !!o.auto && this._isDateTimeType(o.type);
 };
 
 /**
@@ -614,7 +630,7 @@ Drive.prototype._getDefaultValueSql = function (o) {
  * @private
  */
 Drive.prototype._isCurrentDefault = function (o) {
-  return this._isDateTimeType(o.type) && o.default.indexOf('CURR') !== -1;
+  return this._isDateTimeType(o.type) && o.default && o.default.indexOf('CURR') !== -1;
 };
 
 /**
@@ -649,23 +665,23 @@ Drive.prototype._getDefaultEmptySql = function (o) {
  * @private
  */
 Drive.prototype._getNoteSql = function (o) {
-  var note = o.title + '：';
+  var note = (o.title || '') + '：';
 
   if (o.type === 'varchar' || o.type === 'text' || o.type === 'longtext') {
     if (o.max_length) {
-      note += '[' + o.min_length + ',' + o.max_length + ']';
+      note += '[' + (o.min_length || '0') + ',' + o.max_length + ']';
     } else if (o.min_length) {
       note += '[' + o.min_length + ']';
     }
   } else {
     if (o.max) {
-      note += '[' + o.min + ',' + o.max + ']';
+      note += '[' + (o.min || '0') + ',' + o.max + ']';
     } else if (o.min) {
       note += '[' + o.min + ']';
     }
   }
 
-  note += o.description;
+  note += (o.description || '');
   if (o.map) {
     note += '(' + o.map + ')';
   }
@@ -697,8 +713,8 @@ Drive.prototype._buildFieldSql = function (name, type, notnull, value, note) {
  * @param {Array} fields 数据库字段列表
  */
 Drive.prototype._addOrUpdateField = async function (db, table, o, fields) {
-  var arr = fields.get({
-    name: o.name
+  var arr = fields.filter(function (f) {
+    return f.name === o.name;
   });
   var sql = this._generateFieldSql(o);
 
@@ -720,7 +736,7 @@ Drive.prototype.updateDb = async function (db) {
   var cg = this.config;
   var table = cg.table + '';
   var list = cg.fields;
-
+  db.table = table;
   var fields = await this._initTable(db, cg, list);
 
   if (fields.length > 0) {
@@ -816,7 +832,11 @@ Drive.prototype.updateApp = async function (cover) {
     f = dirs.config_file;
     dir_api = dirs.dir_api;
   } else {
-    f = this.config_file + '.db.json';
+    if (this.config_file.endsWith('.db.json')) {
+      f = this.config_file;
+    } else {
+      f = this.config_file + '.db.json';
+    }
   }
 
   if (f) {
@@ -824,7 +844,9 @@ Drive.prototype.updateApp = async function (cover) {
     if (!dir_api) {
       dir_api = f.dirname().dirname();
     }
+    // 处理db配置文件，生成xxx.db.json文件
     this._handleConfigFile(f, cover);
+    // 更新API及相关配置文件
     this.updateApi(dir_api, cover);
   }
 };
@@ -886,7 +908,7 @@ Drive.prototype.updateApi = async function (dir, cover) {
   var client = this._getApiDir(dir, app, 'client', name);
   var manage = this._getApiDir(dir, app, 'manage', name);
 
-  this.newSql(client, manage, cover);
+  await this.newSql(client, manage, cover);
   await this.newParam(client, manage, cover);
   this.newApi(client, manage, cover);
 };
@@ -1048,7 +1070,6 @@ Drive.prototype._procFieldSel = function (field_name, field_type) {
   if (this.isCan(field_name, this.get_obj_not)) {
     res.field_obj += ',`' + field_name + '`';
   }
-
   return res;
 };
 
@@ -1159,7 +1180,7 @@ Drive.prototype._procFieldType = function (
 
 /**
  * 处理单个字段
- * @param {object} field 字段对象
+ * @param {object} o 字段对象
  * @param {object} query 查询对象
  * @param {object} update_obj 更新对象
  * @param {string} uid 用户ID
@@ -1170,14 +1191,12 @@ Drive.prototype._procFieldType = function (
  * @private
  */
 Drive.prototype._procSingleField = async function (
-  field, query, update_obj, uid, query_default_user, orderby, keyword
+  o, query, update_obj, uid, query_default_user, orderby, keyword
 ) {
-  var o = field;
-  var p = o.type;
-  var n = o.name;
+  var { type, name } = o;
   var result = {
-    field: '',
-    field_obj: '',
+    field: '*',
+    field_obj: '*',
     keyword: keyword,
     orderby: orderby,
     update_obj: update_obj,
@@ -1185,12 +1204,12 @@ Drive.prototype._procSingleField = async function (
     format: []
   };
 
-  var field_sel = this._procFieldSel(n, p);
+  var field_sel = this._procFieldSel(name, type);
   result.field = field_sel.field;
   result.field_obj = field_sel.field_obj;
 
   var type_info = this._procFieldType(
-    p, n, query, update_obj, uid, query_default_user, orderby, keyword
+    type, name, query, update_obj, uid, query_default_user, orderby, keyword
   );
   result.keyword = type_info.keyword;
   result.orderby = type_info.orderby;
@@ -1249,8 +1268,8 @@ Drive.prototype._procFields = async function (fields, table) {
   return {
     query,
     update: update_obj,
-    field,
-    field_obj,
+    field: field.trim(','),
+    field_obj: field_obj.trim(','),
     query_default,
     format,
     orderby,
@@ -1287,15 +1306,15 @@ Drive.prototype._procKeyword = function (keyword, table) {
  * @returns {object} 基础模型
  * @private
  */
-Drive.prototype._createBaseModel = function (cg, processed, keyword_query) {
+Drive.prototype._createSqlConfig = function (cg, processed, keyword_query) {
   return {
     name: cg.table,
     title: cg.title,
     table: cg.table,
     key: cg.key,
     orderby_default: '`' + cg.key + '` desc',
-    field_obj: processed.field_obj.replace(',', ''),
-    field_default: processed.field.replace(',', ''),
+    field_obj: processed.field_obj,
+    field_default: processed.field,
     method: 'get get_obj avg sum count',
     query: { ...processed.query, ...keyword_query },
     query_default: processed.query_default,
@@ -1314,7 +1333,7 @@ Drive.prototype._createBaseModel = function (cg, processed, keyword_query) {
  * @param {boolean} cover 是否覆盖文件
  * @private
  */
-Drive.prototype._saveClientConfig = function (client, base_model, orderby, uid, table, cover) {
+Drive.prototype._saveClientConfig = function (client, base_model, cover, orderby, uid, table) {
   var oj = { ...base_model };
   if (orderby) {
     oj.orderby_default = orderby;
@@ -1364,10 +1383,10 @@ Drive.prototype.newSql = async function (client, manage, cover) {
 
   var processed = await this._procFields(cg.fields, cg.table);
   var keyword_query = this._procKeyword(processed.keyword, cg.table);
-  var base_model = this._createBaseModel(cg, processed, keyword_query);
+  var base_model = this._createSqlConfig(cg, processed, keyword_query);
 
   if (client) {
-    this._saveClientConfig(client, base_model, processed.orderby, uid, cg.table, cover);
+    this._saveClientConfig(client, base_model, cover, processed.orderby, uid, cg.table);
   }
 
   if (manage) {
@@ -1413,7 +1432,7 @@ Drive.prototype.newParam = async function (client, manage, cover) {
     var o = lt[i];
     var p = o.type;
     var n = o.name;
-    var m = this._createBaseModel(o, p, n);
+    var m = this._createParamModel(o, p, n);
 
     if (this._isStringType(p)) {
       keyword = this._processStringField(cm, m, o, n, keyword);
@@ -1465,14 +1484,14 @@ Drive.prototype._initParamConfig = function (cg) {
 };
 
 /**
- * 创建基础模型
+ * 创建参数模型
  * @param {object} field 字段对象
  * @param {string} type 字段类型
  * @param {string} name 字段名
- * @returns {object} 基础模型对象
+ * @returns {object} 参数模型对象
  * @private
  */
-Drive.prototype._createBaseModel = function (field, type, name) {
+Drive.prototype._createParamModel = function (field, type, name) {
   return {
     name: name,
     title: field.title,
@@ -1846,16 +1865,16 @@ Drive.prototype.isCan = function (name, arr, type) {
     return false;
   }
   if (!arr) {
-    return false;
+    return true;
   }
-  var bl = false;
+  var bl = true;
   for (var i = 0; i < arr.length; i++) {
     if (name.indexOf(arr[i]) !== -1) {
-      bl = true;
+      bl = false;
       break;
     }
   }
-  return !bl;
+  return bl;
 };
 
 
@@ -1880,10 +1899,10 @@ Drive.prototype._deteApiPath = function (cg) {
  * 创建基础API配置
  * @param {object} cg 配置对象
  * @param {string} path API路径
- * @returns {object} 基础API配置
+ * @returns {object} API配置
  * @private
  */
-Drive.prototype._createBaseApiConfig = function (cg, path) {
+Drive.prototype._createApiConfig = function (cg, path) {
   return {
     'name': cg.table,
     'title': cg.title,
@@ -1968,7 +1987,7 @@ Drive.prototype._saveManageApiConfig = function (manage, base_config, cover) {
 Drive.prototype.newApi = async function (client, manage, cover) {
   var cg = this.config;
   var path = this._deteApiPath(cg);
-  var base_config = this._createBaseApiConfig(cg, path);
+  var base_config = this._createApiConfig(cg, path);
 
   if (client) {
     this._saveClientApiConfig(client, base_config, cg, cover);

package/com/db/index.js

@@ -138,7 +138,7 @@ Db.prototype.getObj = function (table) {
  */
 Db.prototype.updateFile = async function (db, name, table, cover = true) {
   if (name) {
-    var o = this.get(name);
+    var o = this.getMod(name);
     if (o) {
       await o.call('updateFile', db, cover);
     } else {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "mm_os",
 	"description": "MM_OS服务端架构，用于快速构建应用程序，支持网站建设、小程序后台、AI应用、物联网(IOT/AIOT)、游戏服务端等多种场景。",
-	"version": "4.1.4",
+	"version": "4.1.6",
 	"main": "index.js",
 	"keywords": [
 		"AI",

package/common/handler/msg/handler.json

@@ -1,22 +0,0 @@
-{
-	// 名称
-	"name": "msg",
-	// 标题
-	"title": "消息处理器",
-	// 描述
-	"description": "负责处理消息",
-	// 主文件
-	"main": "index.js",
-	// 作用域，决定加载到什么区域
-	"scope": "server",
-	// 状态 0：禁用 1：启用
-	"state": 1,
-	// 排序，越小越靠前
-	"sort": 100,
-	// 依赖的领域服务
-	"services": [],
-	// 依赖的仓储
-	"stores": [],
-	// 依赖的富血模型
-	"models": ["msg"]
-}

package/common/handler/msg/index.js

@@ -1,23 +0,0 @@
-/**
- * 处理器（应用层）
- */
-module.exports = {
-  /**
-   * 初始化
-   * @param {object} app 应用实例
-   * @param {object} eventer 事件总线
-   */
-  async _init(app, eventer) {
-    // this.log('debug', `初始化！`, app.config.name);
-    // 可将监听写在这里
-    // eventer.on('');
-  },
-  /**
-   * 主要逻辑
-   * @param {...any} args 逻辑参数
-   */
-  async main(...args) {
-    this.log('debug', `主要逻辑`);
-    // 主要代码写在这
-  }
-};

package/common/handler/player/handler.json

@@ -1,22 +0,0 @@
-{
-	// 名称
-	"name": "player",
-	// 标题
-	"title": "玩家处理器",
-	// 描述
-	"description": "负责处理玩家相关的操作",
-	// 主文件
-	"main": "index.js",
-	// 作用域，决定加载到什么区域
-	"scope": "server",
-	// 状态 0：禁用 1：启用
-	"state": 1,
-	// 排序，越小越靠前
-	"sort": 100,
-	// 依赖的领域服务
-	"services": [],
-	// 依赖的仓储
-	"stores": [],
-	// 依赖的富血模型
-	"models": ["player"]
-}