Java：MultiDataSource 同步 APIAuto 代码

Author: TommyLemon

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

@@ -115,20 +115,25 @@ var CodeUtil = {
  }
  };
 
- var cc = isRestful == true ? '//' : ' //'; // 对 APIJSON API 要求严格些，因为本来就有字段注释
- var ccLen = cc.length;
+// var cc = isRestful == true ? '//' : ' //'; // 对 APIJSON API 要求严格些，因为本来就有字段注释
+// var ccLen = cc.length;
 
  for (var i = 0; i < lines.length; i ++) {
  var line = lines[i].trim() || '';
 
  //每一种都要提取:左边的key
- var index = line.indexOf(': '); //可能是 ' 或 "，所以不好用 ': , ": 判断
+ var index = line.indexOf(':'); //可能是 ' 或 "，所以不好用 ': , ": 判断
  var key = index < 0 ? (depth <= 1 && startName != null ? startName : '') : line.substring(1, index - 1);
- var cIndex = line.lastIndexOf(cc);
+ var cIndex = line.lastIndexOf(' //');
+ var ccLen = cIndex < 0 ? 2 : 3;
+ if (cIndex < 0) {
+ cIndex = line.lastIndexOf('//');
+ }
 
  var comment = '';
  if (cIndex >= 0) {
- if (isExtract && standardObj != null && (depth != 1 || (key != 'code' && key != 'throw'))) {
+ if (isExtract && standardObj != null && (depth != 1
+ || (isReq != true && [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)
  }

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

@@ -68,6 +68,7 @@ var JSONResponse = {
 
  KEY_CODE: 'code',
  KEY_MSG: 'msg',
+ KEY_THROW: 'throw',
  CODE_SUCCESS: 200,
 
  /**是否成功

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

@@ -5477,7 +5477,7 @@ https://github.com/Tencent/APIJSON/issues
  }
  }
 
- if (req != null) { // 支持 URL 里有 Path Variable，例如 http://apijson.cn:8080/{method}/{table}
+ if (req != null && JSONResponse.getType(req) == 'object') { // 支持 URL 里有 Path Variable，例如 http://apijson.cn:8080/{method}/{table}
  var ind = url.indexOf('?')
  var uri = ind < 0 ? url : url.substring(0, ind)
 
@@ -5644,6 +5644,7 @@ https://github.com/Tencent/APIJSON/issues
 // eval(s)
 
  var isTest = false;
+ var isInject = false;
  var data = res == null ? null : res.data
  var result = eval(code)
  console.log = logger
@@ -7958,10 +7959,10 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
  else {
  if (show == true) {
  vInput.value = JSON.stringify(constJson, null, ' ');
- App.send(false, cb, caseScript, null, null, true);
+ App.send(false, cb, caseScript);
  }
  else {
- App.request(false, method, type, url, constJson, header, cb, caseScript, null, null, true);
+ App.request(false, method, type, url, constJson, header, cb, caseScript);
  }
  }
 
@@ -8543,12 +8544,20 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
 
  }
 
+ var isInject = true;
  var isPre = false; // 避免执行副作用代码 true;
  var isTest = false;
+ var method = null;
+ var type = null;
+ var url = null;
+ var req = null;
+ var header = null;
+// var callback = null;
+
  var res = {};
  var data = res.data;
  var err = null;
- invoke(eval(StringUtil.trim(preScript) + '\n(' + toEval + ')'), which, p_k, pathKeys, key, lastKeyInPath);
+ invoke(eval(StringUtil.trim(preScript) + '\n;\n(' + toEval + ')'), which, p_k, pathKeys, key, lastKeyInPath);
 
  // alert('> current = ' + JSON.stringify(current, null, ' '))
  }