Java: MultiDataSource 内 APIAuto：JSONResponse 新增 IGNORE_KEYS 忽略字段、UPGRADE_KEYS 警告升级字段、DOWNGRADE_KEYS 警告降级字段，把 null, 0, '' 单独判空而不用于范围泛化

Author: TommyLemon

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoController.java

@@ -95,7 +95,7 @@
  * 具体见 SpringBoot 文档
  * https://www.springcloud.cc/spring-boot.html#boot-features-spring-mvc
  * 以及 APIJSON 通用文档 3.设计规范 3.1 操作方法
- * https://github.com/Tencent/APIJSON/blob/master/Document.md#3.1
+ * https://github.com/APIJSON/APIJSON/blob/main/Document.md#3.1
  * <br > 建议全通过HTTP POST来请求:
  * <br > 1.减少代码 - 客户端无需写HTTP GET,PUT等各种方式的请求代码
  * <br > 2.提高性能 - 无需URL encode和decode

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoFunctionParser.java

@@ -37,7 +37,7 @@
 
 
 /**可远程调用的函数类，用于自定义业务逻辑处理
- * 具体见 https://github.com/Tencent/APIJSON/issues/101
+ * 具体见 https://github.com/APIJSON/APIJSON/issues/101
  * @author Lemon
  */
 public class DemoFunctionParser extends APIJSONFunctionParser<Long> {

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoParser.java

@@ -33,7 +33,7 @@
 
 
 /**请求解析器
- * 具体见 https://github.com/Tencent/APIJSON/issues/38
+ * 具体见 https://github.com/APIJSON/APIJSON/issues/38
  * @author Lemon
  */
 public class DemoParser extends APIJSONParser<Long> {

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLConfig.java

@@ -37,7 +37,7 @@
 /**SQL配置
  * TiDB 用法和 MySQL 一致
  * 具体见详细的说明文档 C.开发说明 C-1-1.修改数据库链接
- * https://github.com/Tencent/APIJSON/blob/master/%E8%AF%A6%E7%BB%86%E7%9A%84%E8%AF%B4%E6%98%8E%E6%96%87%E6%A1%A3.md#c-1-1%E4%BF%AE%E6%94%B9%E6%95%B0%E6%8D%AE%E5%BA%93%E9%93%BE%E6%8E%A5
+ * https://github.com/APIJSON/APIJSON/blob/main/%E8%AF%A6%E7%BB%86%E7%9A%84%E8%AF%B4%E6%98%8E%E6%96%87%E6%A1%A3.md#c-1-1%E4%BF%AE%E6%94%B9%E6%95%B0%E6%8D%AE%E5%BA%93%E9%93%BE%E6%8E%A5
  * @author Lemon
  */
 public class DemoSQLConfig extends APIJSONSQLConfig<Long> {

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLExecutor.java

@@ -52,7 +52,7 @@
 
 /**
  * SQL 执行器，支持连接池及多数据源
- * 具体见 https://github.com/Tencent/APIJSON/issues/151
+ * 具体见 https://github.com/APIJSON/APIJSON/issues/151
  *
  * @author Lemon
  */

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoVerifier.java

@@ -20,7 +20,7 @@
 
 
 /**安全校验器，校验请求参数、角色与权限等
- * 具体见 https://github.com/Tencent/APIJSON/issues/12
+ * 具体见 https://github.com/APIJSON/APIJSON/issues/12
  * @author Lemon
  */
 public class DemoVerifier extends APIJSONVerifier<Long> {

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

@@ -21,7 +21,7 @@
 集合 文档、测试、Mock、调试、管理 的一站式体验，还有 **AI 问答** 和一键 格式化、注释/取消注释 等高效快捷键。<br />
 在常用功能上远超 Postman, Swagger, YApi 等各种 开源、商业 的 API 文档/测试 工具，并能一键导入用例和文档。<br />
 支持 GET, POST, PUT, PATCH, DELETE, HEAD 等各种 HTTP Method 及 Content-Type, URL /{Path}/{Variable}。<br />
-不仅适用于 RESTful、类 RESTful、GRPC 的 API，还是腾讯 [APIJSON](https://github.com/Tencent/APIJSON) 官方建议的文档与测试工具。<br />
+不仅适用于 RESTful、类 RESTful、GRPC 的 API，还是腾讯 [APIJSON](https://github.com/APIJSON/APIJSON) 官方建议的文档与测试工具。<br />
 腾讯内部用户包括 IEG 互动娱乐事业群、TEG 技术工程事业群、CSIG 云与智慧事业群 的多个部门及团队， <br />
 外部用户包含 华为、工商银行某地分行、500 强上市公司传音、跨境电商巨头 SHEIN、行业领头羊社保科技 等。
 
@@ -248,7 +248,7 @@ https://github.com/TommyLemon/APIAuto/issues/9
 
 #### 2.没有生成文档
 右上角设置项与数据库实际配置不一致 等  <br />
-https://github.com/Tencent/APIJSON/issues/85
+https://github.com/APIJSON/APIJSON/issues/85
 
 #### 3.托管服务器访问不了
 不能代理接口、不能展示文档、不能对断言结果纠错 等 <br />
@@ -295,13 +295,13 @@ https://github.com/TommyLemon/APIAuto/issues
 ![image](https://github.com/user-attachments/assets/c4aa8573-f8b3-4973-8c37-29677c06ac3b)
 
 如果有什么问题或建议可以 [提 issue](https://github.com/TommyLemon/APIAuto/issues)，交流技术，分享经验。<br >
-如果你解决了某些 bug，或者新增了一些功能，欢迎 [提 PR 贡献代码](https://github.com/Tencent/APIJSON/blob/master/CONTRIBUTING.md)，感激不尽。
+如果你解决了某些 bug，或者新增了一些功能，欢迎 [提 PR 贡献代码](https://github.com/APIJSON/APIJSON/blob/main/CONTRIBUTING.md)，感激不尽。
 <br />
 <br />
 
 ### 生态项目
 
-[APIJSON](https://github.com/Tencent/APIJSON) 🏆 腾讯实时 零代码、全功能、强安全 ORM 库 🚀 后端接口和文档零代码，前端(客户端) 定制返回 JSON 的数据和结构
+[APIJSON](https://github.com/APIJSON/APIJSON) 🏆 腾讯实时 零代码、全功能、强安全 ORM 库 🚀 后端接口和文档零代码，前端(客户端) 定制返回 JSON 的数据和结构
 
 [CVAuto](https://github.com/TommyLemon/CVAuto) 👁 零代码零标注 CV AI 自动化测试平台 🚀 免除大量人工画框和打标签等，直接快速测试 CV 计算机视觉 AI 图像识别算法
 

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

@@ -185,6 +185,10 @@ var JSONResponse = {
   KEY_MSG: 'msg',
   KEY_THROW: 'throw',
   CODE_SUCCESS: 200,
+  IGNORE_KEYS: ['traceId', 'trace:stack', 'debug:info|help'],
+  UPGRADE_KEYS: ['price', 'amount', 'money', 'cash', 'spend', 'cost', 'income', 'outgoing', 'borrow', 'lend', 'gold', 'coin', 'diamond', 'credit', 'budget', 'quantity', 'balance'],
+  DOWNGRADE_KEYS: ['id', 'ID', 'traceId', 'trace_id', 'date', 'time', 'datetime', 'date_time', 'dateTime', 'timestamp', 'create_time', 'update_time', 'created_at', 'updated_at', 'createTime', 'updateTime', 'createdAt', 'updatedAt'],
+
   /**是否成功
    * @param code
    * @return
@@ -917,7 +921,9 @@ var JSONResponse = {
       };
     }
 
-    if (notEmpty == true && typeof real != 'boolean' && typeof real != 'number' && StringUtil.isEmpty(real, true)) { // 空
+    var realType = JSONResponse.getType(real);
+
+    if (notEmpty == true && (real === 0 || (typeof real != 'boolean' && CodeUtil.isTypeMatch('number', realType) && StringUtil.isEmpty(real, true)))) { // 空
       log('compareWithStandard  notEmpty == true && StringUtil.isEmpty(real, true) >> return COMPARE_VALUE_EMPTY');
       return {
         code: JSONResponse.COMPARE_VALUE_EMPTY,
@@ -934,7 +940,6 @@ var JSONResponse = {
       value: null //导致正确时也显示  real
     };
 
-    var realType = JSONResponse.getType(real);
     if (StringUtil.isEmpty(realType) || ['null', 'undefined'].indexOf(realType) >= 0) {
       realType = null;
     }
@@ -1067,13 +1072,31 @@ var JSONResponse = {
       var valueCompare = max.code >= JSONResponse.COMPARE_VALUE_CHANGE
           ? 0 : JSONResponse.compareValue(valueLevel, values, real, target.trend, target.repeat);
 
+      var isNum = CodeUtil.isTypeMatch('number', type)
+
+      if (isNum) {
+        if (JSONResponse.UPGRADE_KEYS.includes(folder)) {
+          valueCompare++;
+        } else if (JSONResponse.DOWNGRADE_KEYS.includes(folder)) {
+          valueCompare--;
+        } else if (folder.includes('/')) {
+          var keys = StringUtil.splitPath(folder);
+          var key = keys == null || keys.length <= 0 ? null : keys[keys.length - 1];
+          if (StringUtil.isNotEmpty(key) && !StringUtil.isNumber(key)) {
+            if (JSONResponse.UPGRADE_KEYS.includes(key)) {
+              valueCompare++;
+            } else if (JSONResponse.DOWNGRADE_KEYS.includes(key)) {
+              valueCompare--;
+            }
+          }
+        }
+      }
+
       if (valueCompare > 0) {
         max.code = valueCompare;
         max.path = folder;
         max.value = real;
 
-        var isNum = CodeUtil.isTypeMatch('number', type)
-
         if (isNum && valueCompare == JSONResponse.COMPARE_VALUE_REPEAT && (target.repeat == null || target.repeat <= 0)
             && values != null && values.indexOf(real) >= 0) {
           max.msg = '值与历史值重复：' + real;
@@ -1377,16 +1400,21 @@ var JSONResponse = {
 
     var notEmpty = target.notEmpty;
     log('updateStandard  notEmpty = target.notEmpty = ' + notEmpty + ' >>');
-    if (notEmpty !== false && real != null && typeof real != 'boolean' && typeof real != 'number') {
-      notEmpty = target.notEmpty = StringUtil.isNotEmpty(real, true);
+    var rtype = JSONResponse.getType(real);
+
+    if (notEmpty !== false) {
+      if (CodeUtil.isTypeMatch('number', rtype)) { // real === 0) {
+        notEmpty = target.notEmpty = real === 0 ? false : (real < -1 || real > 1 ? true : notEmpty);
+      } else if (real != null && typeof real != 'boolean') {
+        notEmpty = target.notEmpty = StringUtil.isNotEmpty(real, true);
+      }
     }
 
     var type = target.type;
     if (type == null || type == 'undefined') {
       target.type = type = null;
     }
 
-    var rtype = JSONResponse.getType(real);
     if ((rtype == null || real == null) && StringUtil.isEmpty(type, true) && StringUtil.isNotEmpty(key, true)) {
       target.guess = true;
       if (StringUtil.isBoolKey(key)) {
@@ -1490,7 +1518,6 @@ var JSONResponse = {
     }
     log('updateStandard  type = target.type = getType(real) = ' + type + ' >>');
 
-
     var lengthLevel = target.lengthLevel;
     var lengths = target.lengths;
     log('updateStandard  lengthLevel = target.lengthLevel = ' + lengthLevel + ' >>');
@@ -1629,16 +1656,18 @@ var JSONResponse = {
         }
       }
 
-      if (values == null) {
-        values = [];
-      }
-      if (valueLevel < 1 && type == 'number' && ! Number.isSafeInteger(real)) { //double 1.23
-        valueLevel = 1;
-      }
-      target.values = values;
+      if (! [null, 0, ''].includes(real)) {
+        if (values == null) {
+          values = [];
+        }
+        if (valueLevel < 1 && CodeUtil.isTypeMatch('number', type) && ! Number.isSafeInteger(real)) { //double 1.23
+          valueLevel = 1;
+        }
+        target.values = values;
 
-      target = JSONResponse.setValue(target, JSONResponse.getLength(real), lengthLevel == null ? 1 : lengthLevel, lengths, true, true);
-      target = JSONResponse.setValue(target, real, valueLevel, values, false, ignoreTrend);
+        target = JSONResponse.setValue(target, JSONResponse.getLength(real), lengthLevel == null ? 1 : lengthLevel, lengths, true, true);
+        target = JSONResponse.setValue(target, real, valueLevel, values, false, ignoreTrend);
+      }
     }
 
     log('\nupdateStandard >> return target = ' + JSON.stringify(target, null, '    ') + '\n >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> \n\n\n\n\n');

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

@@ -89,20 +89,19 @@
         </span>
         <a v-show="isDelayShow" >2s</a>
 
-
-        <iframe v-show="User.id == null || User.id <= 0" src="https://ghbtns.com/github-btn.html?user=Tencent&amp;repo=APIJSON&amp;type=star&amp;count=true&amp;size=small" frameborder="0" scrolling="0" width="160px" height="18px"></iframe>
+        <iframe v-show="User.id == null || User.id <= 0" src="https://ghbtns.com/github-btn.html?user=Tencent&amp;repo=APIJSON&amp;type=star&amp;count=true&amp;size=small" frameborder="0" scrolling="0" width="120px" height="18px"></iframe>
 
         <!--只用60%避免拦截左右两侧View的触摸事件-->
         <div style="width: 40%;height: 100%;left: 30%;display: inline-block;text-align: center;position: fixed;padding-top: 10px">
-            <a style="font-size: large;margin-left: 10px;margin-right: 10px;color: silver" href="https://github.com/Tencent/APIJSON/blob/master/Document.md" target="_blank" >文档</a>
+            <a style="font-size: large;margin-left: 10px;margin-right: 10px;color: silver" href="https://github.com/APIJSON/APIJSON/blob/main/Document.md" target="_blank" >文档</a>
             <a style="font-size: large;margin-left: 10px;margin-right: 10px;color: silver" href="https://search.bilibili.com/all?keyword=APIJSON" target="_blank" >视频</a>
             <a style="font-size: large;margin-left: 10px;margin-right: 10px;color: silver" href="https://github.com/search?o=desc&q=apijson&s=stars&type=Repositories" target="_blank" >生态</a>
         </div>
 
         <div class="top-right">
-            <a style="padding: 6px" v-show="User.id == null || User.id <= 0" href="https://git.code.tencent.com/Tencent_Open_Source/APIJSON" target="_blank" >
-                <img class="ui inline black image" height="24" src="http://apijson.cn/images/tencent_open_logo.png">
-            </a>
+<!--            <a style="padding: 6px" v-show="User.id == null || User.id <= 0" href="https://git.code.tencent.com/Tencent_Open_Source/APIJSON" target="_blank" >-->
+<!--                <img class="ui inline black image" height="24" src="http://apijson.cn/images/tencent_open_logo.png">-->
+<!--            </a>-->
 
             <a style="padding: 6px" v-show="User.id == null || User.id <= 0" href="https://gitee.com/Tencent/APIJSON" target="_blank">
                 <img class="ui inline black image" height="24" src="https://gitee.com/logo-black.svg?20171024" width="60">