Java: MultiDataSource 更新内置 APIAuto

Author: TommyLemon

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

@@ -86,7 +86,7 @@ var CodeUtil = {
    */
   parseComment: function (reqStr, tableList, method, database, language, isReq, standardObj, isExtract, isWarning, isAPIJSONRouter) { //怎么都获取不到真正的长度，cols不行，默认20不变，maxLineLength不行，默认undefined不变 , maxLineLength) {
     if (StringUtil.isEmpty(reqStr)) {
-      return;
+      return '';
     }
 
     var reqObj = JSON5.parse(reqStr);
@@ -132,8 +132,8 @@ var CodeUtil = {
 
       var comment = '';
       if (cIndex >= 0) {
-        if (isExtract && standardObj != null && (depth != 1
-          || (isReq != true && [JSONResponse.KEY_CODE, JSONResponse.KEY_MSG, JSONResponse.KEY_THROW].indexOf(key) < 0))) {
+        if (isExtract && standardObj != null && (isReq || depth != 1
+          || [JSONResponse.KEY_CODE, JSONResponse.KEY_MSG, JSONResponse.KEY_THROW].indexOf(key) < 0)) {
           comment = line.substring(cIndex + ccLen).trim();
           // standardObj = CodeUtil.updateStandardPart(standardObj, names, key, value, comment)
         }
@@ -295,7 +295,7 @@ var CodeUtil = {
 
   getOperation: function (method, json) {
         var ind = method == null ? -1 : method.indexOf('?');
-        var method = StringUtil.toLowerCase(ind < 0 ? method : method.substring(0, ind));
+        method = StringUtil.toLowerCase(ind < 0 ? method : method.substring(0, ind));
         if (method.startsWith('insert') || method.startsWith('post') || method.startsWith('add')
           || method.startsWith('pub') || method.startsWith('write')) {
           return 'INSERT'

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

@@ -518,15 +518,15 @@ var JSONResponse = {
       if (real != null && real.throw != null) {
         return {
           code: JSONResponse.COMPARE_CODE_CHANGE, //未上传对比标准
-          msg: '没有校验标准，且 throw 不是 null，而是 ' + real.throw,
+          msg: '没有校验标准，且 throw 是 ' + real.throw,
           path: folder == null ? '' : folder
         };
       }
 
       if (real == null || real.data == null) {
         return {
           code: JSONResponse.COMPARE_KEY_LESS, //未上传对比标准
-          msg: '没有校验标准，且缺少非 null 值的 data 字段',
+          msg: '没有校验标准，且缺少有效 data 值',
           path: folder == null ? '' : folder
         };
       }

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

@@ -490,6 +490,9 @@ var StringUtil = {
   isCountKey: function (key) {
      return StringUtil.isKeyOfCategory(key, 'Count');
   },
+  isPageKey: function (key) {
+    return StringUtil.isKeyOfCategory(key, 'Page');
+  },
   isTotalKey: function (key) {
      return StringUtil.isKeyOfCategory(key, 'Total');
   },

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

@@ -387,7 +387,7 @@ textarea {
   padding-bottom: 12px;
   padding-left: 10px;
   padding-right: 10px;
-  z-index: 100;
+  z-index: 300;
   border: #bbbbbb  1px solid;
   border-radius: 6px;
 }