Skip to content

Commit 78152cb

Browse files
TommyLemonTommyLemon
committed
test: verify login for APIAuto, UnitAuto, SQLAuto, CVAuto, AutoUI; fix: APIAuto UI offset when cursor down to bottom of script panel
1 parent a3de5e3 commit 78152cb

2 files changed

Lines changed: 69 additions & 8 deletions

File tree

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

Lines changed: 68 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
import apijson.fastjson2.APIJSONController;
1818
import apijson.fastjson2.APIJSONParser;
1919
import apijson.fastjson2.JSONRequest;
20-
import apijson.framework.APIJSONApplication;
21-
import apijson.framework.APIJSONConstant;
22-
import apijson.framework.APIJSONCreator;
20+
import apijson.framework.*;
2321
import apijson.orm.exception.*;
2422
import com.alibaba.fastjson2.JSONArray;
2523
import com.alibaba.fastjson2.JSONObject;
@@ -68,7 +66,6 @@
6866
import apijson.demo.model.Privacy;
6967
import apijson.demo.model.User;
7068
import apijson.demo.model.Verify;
71-
import apijson.framework.BaseModel;
7269
import unitauto.MethodUtil;
7370

7471
import static apijson.JSON.getString;
@@ -3320,10 +3317,16 @@ public String au() {
33203317
//}
33213318

33223319
@PostMapping("method/list")
3323-
public Map<String, Object> listMethod(@RequestBody String request) {
3320+
public Map<String, Object> listMethod(@RequestBody String request, HttpSession session) {
33243321
if (Log.DEBUG == false) {
33253322
return MethodUtil.JSON_CALLBACK.newErrorResult(new IllegalAccessException("非 DEBUG 模式下不允许使用 UnitAuto 单元测试！"));
33263323
}
3324+
try {
3325+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3326+
} catch (Exception e) {
3327+
return MethodUtil.JSON_CALLBACK.newErrorResult(e);
3328+
}
3329+
33273330
return MethodUtil.listMethod(request);
33283331
}
33293332

@@ -3351,9 +3354,19 @@ public void complete(com.alibaba.fastjson.JSONObject data, Method method, Method
33513354
}
33523355
};
33533356

3354-
if (Log.DEBUG == false) {
3357+
Exception err = Log.DEBUG ? null : new IllegalAccessException("非 DEBUG 模式下不允许使用 UnitAuto 单元测试！");
3358+
if (err == null) {
33553359
try {
3356-
listener.complete(MethodUtil.JSON_CALLBACK.newErrorResult(new IllegalAccessException("非 DEBUG 模式下不允许使用 UnitAuto 单元测试！")));
3360+
HttpSession session = servletRequest.getSession();
3361+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3362+
} catch (Exception e) {
3363+
err = e;
3364+
}
3365+
}
3366+
3367+
if (err != null) {
3368+
try {
3369+
listener.complete(MethodUtil.JSON_CALLBACK.newErrorResult(err));
33573370
}
33583371
catch (Exception e1) {
33593372
e1.printStackTrace();
@@ -3384,51 +3397,99 @@ public void complete(com.alibaba.fastjson.JSONObject data, Method method, Method
33843397

33853398
@GetMapping("api/test/start")
33863399
public String startApiTest(HttpSession session) {
3400+
try {
3401+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3402+
} catch (Exception e) {
3403+
return JSON.toJSONString(COMMON_PARSER.newErrorResult(e));
3404+
}
3405+
33873406
//response.sendRedirect("http://localhost:3000/test/start");
33883407
long id = 100000 + Math.round(899999*Math.random());
33893408
DemoParser.KEY_MAP.put(String.valueOf(id), session); // 调这个接口一般是前端/CI/CD，调查询接口的是 Node，Session 不同 session.setAttribute("key", id);
33903409
return delegate("http://localhost:3000/test/start?key=" + id, session);
33913410
}
33923411
@GetMapping("api/test/status")
33933412
public String getApiTestStatus(@RequestParam(value = "key", required = false) String key, HttpSession session) {
3413+
try {
3414+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3415+
} catch (Exception e) {
3416+
return JSON.toJSONString(COMMON_PARSER.newErrorResult(e));
3417+
}
3418+
33943419
//response.sendRedirect("http://localhost:3000/test/status");
33953420
DemoParser.KEY_MAP.remove(key);
33963421
return delegate("http://localhost:3000/test/status", session);
33973422
}
33983423

33993424
@GetMapping("unit/test/start")
34003425
public String startUnitTest(HttpSession session) {
3426+
try {
3427+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3428+
} catch (Exception e) {
3429+
return JSON.toJSONString(COMMON_PARSER.newErrorResult(e));
3430+
}
3431+
34013432
long id = 100000 + Math.round(899999*Math.random());
34023433
DemoParser.KEY_MAP.put(String.valueOf(id), session); // 调这个接口一般是前端/CI/CD，调查询接口的是 Node，Session 不同 session.setAttribute("key", id);
34033434
return delegate("http://localhost:3001/test/start?key=" + id, session);
34043435
}
34053436
@GetMapping("unit/test/status")
34063437
public String getUnitTestStatus(@RequestParam(value = "key", required = false) String key, HttpSession session) {
3438+
try {
3439+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3440+
} catch (Exception e) {
3441+
return JSON.toJSONString(COMMON_PARSER.newErrorResult(e));
3442+
}
3443+
34073444
DemoParser.KEY_MAP.remove(key);
34083445
return delegate("http://localhost:3001/test/status", session);
34093446
}
34103447

34113448
@GetMapping("sql/test/start")
34123449
public String startSQLTest(HttpSession session) {
3450+
try {
3451+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3452+
} catch (Exception e) {
3453+
return JSON.toJSONString(COMMON_PARSER.newErrorResult(e));
3454+
}
3455+
34133456
long id = 100000 + Math.round(899999*Math.random());
34143457
DemoParser.KEY_MAP.put(String.valueOf(id), session); // 调这个接口一般是前端/CI/CD，调查询接口的是 Node，Session 不同 session.setAttribute("key", id);
34153458
return delegate("http://localhost:3002/test/start?key=" + id, session);
34163459
}
34173460
@GetMapping("sql/test/status")
34183461
public String getSQLTestStatus(@RequestParam("key") String key, HttpSession session) {
3462+
try {
3463+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3464+
} catch (Exception e) {
3465+
return JSON.toJSONString(COMMON_PARSER.newErrorResult(e));
3466+
}
3467+
34193468
DemoParser.KEY_MAP.remove(key);
34203469
return delegate("http://localhost:3002/test/status", session);
34213470
}
34223471

34233472
@GetMapping("cv/test/start")
34243473
public String startCvTest(HttpSession session) {
3474+
try {
3475+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3476+
} catch (Exception e) {
3477+
return JSON.toJSONString(COMMON_PARSER.newErrorResult(e));
3478+
}
3479+
34253480
//response.sendRedirect("http://localhost:3003/test/start");
34263481
long id = 100000 + Math.round(899999*Math.random());
34273482
DemoParser.KEY_MAP.put(String.valueOf(id), session); // 调这个接口一般是前端/CI/CD，调查询接口的是 Node，Session 不同 session.setAttribute("key", id);
34283483
return delegate("http://localhost:3003/test/start?key=" + id, session);
34293484
}
34303485
@GetMapping("cv/test/status")
34313486
public String getCvTestStatus(@RequestParam(value = "key", required = false) String key, HttpSession session) {
3487+
try {
3488+
COMMON_PARSER.getVerifier().setVisitor(APIJSONVerifier.getVisitor(session)).verifyLogin();
3489+
} catch (Exception e) {
3490+
return JSON.toJSONString(COMMON_PARSER.newErrorResult(e));
3491+
}
3492+
34323493
//response.sendRedirect("http://localhost:3003/test/status");
34333494
DemoParser.KEY_MAP.remove(key);
34343495
return delegate("http://localhost:3003/test/status", session);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@
640640

641641
<!-- v-model 不允许调用方法 -->
642642
<template v-if="scripts[scriptType][scriptBelongId]">
643-
<textarea id="vScript" style="width: 100%;height: 100%;" wrap="off"
643+
<textarea id="vScript" style="width: 100%;height: 100%; padding-bottom: 50px" wrap="off"
644644
v-model="scripts[scriptType][scriptBelongId][isPreScript ? 'pre' : 'post'].script"
645645
placeholder="// JavaScript 脚本
646646
// 逻辑代码 ..

0 commit comments

Comments
 (0)