Java: MultiDataSource 解决光标悬浮注释、静态检查、参数注入传参 等相关 bug

Author: TommyLemon

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/apijson/CodeUtil.js

@@ -540,8 +540,8 @@ var JSONResponse = {
       }
     }
     codeName = StringUtil.isEmpty(codeName, true) ? JSONResponse.KEY_CODE : codeName;
-    var tCode = (isMachineLearning != true && noBizCode) ? 0 : (target || {})[codeName];
-    var rCode = noBizCode ? tCode : (real || {})[codeName];
+    var tCode = (isMachineLearning != true && noBizCode) ? JSONResponse.CODE_SUCCESS : (target || {})[codeName];
+    var rCode = noBizCode ? tCode : (real || {})[codeName] || (real == null || real == {} ? null : JSONResponse.CODE_SUCCESS);
 
     //解决了弹窗提示机器学习更新标准异常，但导致所有项测试结果都变成状态码 code 改变
     // if (real == null) {
@@ -1924,7 +1924,7 @@ var JSONResponse = {
     var notEmpty = prefix.endsWith('!')
     var path = nullable || notEmpty ? prefix.substring(0, prefix.length - 1) : prefix
     // sys.User.id|apijson.Moment.userId
-    var names = StringUtil.split(path, '/', true) || []
+    var names = StringUtil.split(path, '|') || []
     for (var i = 0; i < names.length; i ++) {
       var name = names[i] || ''
 

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/apijson/JSONResponse.js

@@ -105,7 +105,9 @@ var StringUtil = {
 
   SYNTAX_NAMES: ['bool', 'boolean', 'int', 'integer', 'num', 'number', 'str', 'string', 'arr', 'array', 'obj', 'object'
     , 'type', 'class', 'fun', 'func', 'function', 'var', 'variable', 'val', 'value', 'const', 'is', 'as', 'id', 'index', 'unique'
+    , 'select', 'insert', 'update', 'delete', 'query', 'mutate', 'sleep', 'no', 'yes', 'and', 'or', 'not', 'cast', 'first', 'last'
     , 'from', 'join', 'on', 'at', 'in', 'out', 'where', 'by', 'having', 'limit', 'offset', 'find', 'list', 'get', 'set', 'put', 'remove'
+    , 'slice', 'splice', 'reduce', 'add', 'minus', 'push', 'pop', 'list', 'dict', 'map', 'trim', 'of'
   ],
   COLUMN_NAMES: ['page', 'count', 'size', 'pagesize', 'pagenum', 'pageno', 'col', 'column', 'name', 'age', 'sex', 'gender', 'amount'
     , 'email', 'phone', 'tel', 'telephone', 'detail', 'describe', 'description', 'total', 'index', 'position', 'key', 'row', 'len', 'length', 'data'

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/apijson/StringUtil.js

@@ -3780,7 +3780,7 @@ res_data = rep.json()
       delete reqObj.orderBy;
     }
 
-    // var columnStr = (StringUtil.isEmpty(colums, true) ? '' : StringUtil.trim(colums));
+    // var columnStr = (StringUtil.isEmpty(columns, true) ? '' : StringUtil.trim(columns));
     var quote = database == 'MYSQL' ? '`' : '"';
     var tablePath = (StringUtil.isEmpty(schema, true) ? '' : quote + schema + quote + '.') + quote + modelName + quote;
     if (isPost) {
@@ -3799,11 +3799,11 @@ res_data = rep.json()
         '    DELETE FROM ' + tablePath;
     }
     else {
-      var colums = Object.keys(reqObj);
+      var columns = Object.keys(reqObj);
       var cs = '';
-      if (colums != null && colums.length > 0) {
-        for (var i = 0; i < colums.length; i++) {
-          cs += (i <= 0 ? '' : ', ') + quote + colums[i] + quote; //需要尽可能保留原字段 [] 肯定不是字段名 JSONResponse.getVariableName(colums[i]) + quote;
+      if (columns != null && columns.length > 0) {
+        for (var i = 0; i < columns.length; i++) {
+          cs += (i <= 0 ? '' : ', ') + quote + columns[i] + quote; //需要尽可能保留原字段 [] 肯定不是字段名 JSONResponse.getVariableName(columns[i]) + quote;
         }
       }
 

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js/main.js

@@ -3472,7 +3472,7 @@ var CodeUtil = {
       delete reqObj.orderBy;
     }
 
-    // var columnStr = (StringUtil.isEmpty(colums, true) ? '' : StringUtil.trim(colums));
+    // var columnStr = (StringUtil.isEmpty(columns, true) ? '' : StringUtil.trim(columns));
     var quote = database == 'MYSQL' ? '`' : '"';
     var tablePath = (StringUtil.isEmpty(schema, true) ? '' : quote + schema + quote + '.') + quote + modelName + quote;
     if (isPost) {
@@ -3491,11 +3491,11 @@ var CodeUtil = {
         '    DELETE FROM ' + tablePath;
     }
     else {
-      var colums = Object.keys(reqObj);
+      var columns = Object.keys(reqObj);
       var cs = '';
-      if (colums != null && colums.length > 0) {
-        for (var i = 0; i < colums.length; i++) {
-          cs += (i <= 0 ? '' : ', ') + quote + colums[i] + quote; //需要尽可能保留原字段 [] 肯定不是字段名 JSONResponse.getVariableName(colums[i]) + quote;
+      if (columns != null && columns.length > 0) {
+        for (var i = 0; i < columns.length; i++) {
+          cs += (i <= 0 ? '' : ', ') + quote + columns[i] + quote; //需要尽可能保留原字段 [] 肯定不是字段名 JSONResponse.getVariableName(columns[i]) + quote;
         }
       }
 

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/cv/apijson/CodeUtil.js

@@ -3777,7 +3777,7 @@ res_data = rep.json()
       delete reqObj.orderBy;
     }
 
-    // var columnStr = (StringUtil.isEmpty(colums, true) ? '' : StringUtil.trim(colums));
+    // var columnStr = (StringUtil.isEmpty(columns, true) ? '' : StringUtil.trim(columns));
     var quote = database == 'MYSQL' ? '`' : '"';
     var tablePath = (StringUtil.isEmpty(schema, true) ? '' : quote + schema + quote + '.') + quote + modelName + quote;
     if (isPost) {
@@ -3796,11 +3796,11 @@ res_data = rep.json()
         '    DELETE FROM ' + tablePath;
     }
     else {
-      var colums = Object.keys(reqObj);
+      var columns = Object.keys(reqObj);
       var cs = '';
-      if (colums != null && colums.length > 0) {
-        for (var i = 0; i < colums.length; i++) {
-          cs += (i <= 0 ? '' : ', ') + quote + colums[i] + quote; //需要尽可能保留原字段 [] 肯定不是字段名 JSONResponse.getVariableName(colums[i]) + quote;
+      if (columns != null && columns.length > 0) {
+        for (var i = 0; i < columns.length; i++) {
+          cs += (i <= 0 ? '' : ', ') + quote + columns[i] + quote; //需要尽可能保留原字段 [] 肯定不是字段名 JSONResponse.getVariableName(columns[i]) + quote;
         }
       }