Java：更新 APIAuto

Author: TommyLemon

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

@@ -43,56 +43,6 @@ var CodeUtil = {
   thirdParty: 'YAPI',
   thirdPartyApiMap: null,  // {}
 
-  parseUri: function (method, isReq) {
-    method = method || 'get';
-    var isRestful = true;
-
-    if (method.startsWith("/")) {
-      method = method.substring(1);
-    }
-
-    if (method.endsWith("/")) {
-      method = method.substring(0, method.length - 1);
-    }
-
-    var startName = null;
-    var tag = null;
-
-    var mIndex = method.lastIndexOf('/');
-    if (mIndex < 0) {
-      isRestful = APIJSON_METHODS.indexOf(method) < 0;
-    }
-    else if (APIJSON_METHODS.indexOf(method.substring(mIndex+1)) >= 0) {
-      isRestful = false;
-      method = method.substring(mIndex+1);
-    }
-    else {
-      var suffix = method.substring(mIndex + 1);
-      method = method.substring(0, mIndex);
-
-      mIndex = method.lastIndexOf("/");
-      if (mIndex >= 0) {
-        method = method.substring(mIndex+1);
-      }
-
-      isRestful = APIJSON_METHODS.indexOf(method) < 0;
-
-      if (isReq && ! isRestful) {
-        tag = suffix;
-        var tbl = tag.endsWith("[]") ? tag.substring(0, tag.length - 2) : tag;
-        if (JSONObject.isTableKey(tbl)) {
-          startName = method == 'put' || method == 'delete' ? tbl : tag;
-        }
-      }
-    }
-
-    return {
-      method,
-      isRestful,
-      tag,
-      table: startName
-    }
-  },
 
   /**生成JSON的注释  TODO 提取  // 单行注释，补充到 TestRecord 的 standard 中，文档也是有版本的
    * @param reqStr //已格式化的JSON String
@@ -109,7 +59,7 @@ var CodeUtil = {
 
     var reqObj = JSON5.parse(reqStr);
 
-    var methodInfo = CodeUtil.parseUri(method, isReq) || {};
+    var methodInfo = JSONObject.parseUri(method, isReq) || {};
     var method = methodInfo.method;
     var isRestful = methodInfo.isRestful;
     var tag = methodInfo.tag;

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

@@ -62,9 +62,13 @@ var JSONObject = {
   },
 
   isAPIJSONPath: function (method) {
-    if (method == null) {
-      return false;
-    }
+    var info = JSONObject.parseUri(method, true)
+    return info != null && info.isRestful != true;
+  },
+
+  parseUri: function (method, isReq) {
+    method = method || 'get';
+    var isRestful = true;
 
     if (method.startsWith("/")) {
       method = method.substring(1);
@@ -74,17 +78,43 @@ var JSONObject = {
       method = method.substring(0, method.length - 1);
     }
 
-    var mIndex = method.indexOf('/');
+    var startName = null;
+    var tag = null;
+
+    var mIndex = method.lastIndexOf('/');
     if (mIndex < 0) {
-      return true;
+      isRestful = APIJSON_METHODS.indexOf(method) < 0;
     }
-
-    if (APIJSON_METHODS.indexOf(method.substring(0, mIndex)) >= 0) {
-      mIndex = method.substring(mIndex + 1).indexOf("/");
-      return mIndex < 0;
+    else if (APIJSON_METHODS.indexOf(method.substring(mIndex+1)) >= 0) {
+      isRestful = false;
+      method = method.substring(mIndex+1);
+    }
+    else {
+      var suffix = method.substring(mIndex + 1);
+      method = method.substring(0, mIndex);
+
+      mIndex = method.lastIndexOf("/");
+      if (mIndex >= 0) {
+        method = method.substring(mIndex+1);
+      }
+
+      isRestful = APIJSON_METHODS.indexOf(method) < 0;
+
+      if (isReq && ! isRestful) {
+        tag = suffix;
+        var tbl = tag.endsWith("[]") ? tag.substring(0, tag.length - 2) : tag;
+        if (JSONObject.isTableKey(tbl)) {
+          startName = method == 'put' || method == 'delete' ? tbl : tag;
+        }
+      }
     }
 
-    return false;
+    return {
+      method,
+      isRestful,
+      tag,
+      table: startName
+    }
   }
 
 }

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

@@ -696,7 +696,7 @@
       host: '',
       database: 'MYSQL', // 查文档必须，除非后端提供默认配置接口  // 用后端默认的，避免用户总是没有配置就问为什么没有生成文档和注释  'MYSQL',// 'POSTGRESQL',
       schema: 'sys',  // 查文档必须，除非后端提供默认配置接口  // 用后端默认的，避免用户总是没有配置就问为什么没有生成文档和注释   'sys',
-      server: 'http://localhost:8080',  // 'http://apijson.cn:9090',  // Chrome 90+ 跨域问题非常难搞，开发模式启动都不行了 'http://apijson.org:9090',  //apijson.cn
+      server: 'http://apijson.cn:9090',  // Chrome 90+ 跨域问题非常难搞，开发模式启动都不行了 'http://apijson.org:9090',  //apijson.cn
       // server: 'http://47.74.39.68:9090',  // apijson.org
       thirdParty: 'SWAGGER /v2/api-docs',  //apijson.cn
       // thirdParty: 'RAP /repository/joined /repository/get',