From d45951dbf4a19aa9d67d3d4c861fe9313447d4b2 Mon Sep 17 00:00:00 2001 From: songjun Date: Mon, 16 May 2022 16:45:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0wws=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/xzf.sql | 1 + .../java/com/ruoyi/tester/login/WwsLogin.java | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 tester/src/main/java/com/ruoyi/tester/login/WwsLogin.java diff --git a/sql/xzf.sql b/sql/xzf.sql index cbb2fd7..b0e08ba 100644 --- a/sql/xzf.sql +++ b/sql/xzf.sql @@ -147,6 +147,7 @@ INSERT INTO `sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value` INSERT INTO `sys_dict_type`(`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (12, '登录类型', 'login_type', '0', 'admin', sysdate(), '', NULL, '登录类型列表'); INSERT INTO `sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (36, 1, '小钻风登录', 'XZF', 'login_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', NULL, '小钻风用户登录'); +INSERT INTO `sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (37, 2, 'WWS登录', 'WWS', 'login_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', NULL, 'WWS用户登录'); -- 插入任务执行进度类型 diff --git a/tester/src/main/java/com/ruoyi/tester/login/WwsLogin.java b/tester/src/main/java/com/ruoyi/tester/login/WwsLogin.java new file mode 100644 index 0000000..1475f84 --- /dev/null +++ b/tester/src/main/java/com/ruoyi/tester/login/WwsLogin.java @@ -0,0 +1,52 @@ +package com.ruoyi.tester.login; + +import com.ruoyi.tester.domain.TesterLoginConfig; +import com.ruoyi.tester.domain.TesterLoginRst; +import com.ruoyi.tester.executor.InterfaceCallUtils; +import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +@Component +public class WwsLogin implements Login { + private Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Override + public String getLoginType() { + return "WWS"; + } + + @Override + public boolean doLogin(Long loginConfigId) { + TesterLoginConfig loginBaseInfo = LoginCache.getLoginBaseInfo(loginConfigId); + JSONObject loginParam = new JSONObject(loginBaseInfo.getLoginParam()); + logger.info("WWS登录,loginUrl={}, loginParam={}", loginBaseInfo.getLoginUrl(), loginParam); + String result = InterfaceCallUtils.post(loginBaseInfo.getLoginUrl(), loginParam.toString(), new HashMap()).getBody(); + logger.info("登录结果result={}", result); + JSONObject rstJson = new JSONObject(result); + if ("0".equals(rstJson.getString("code"))) { + String token = rstJson.getString("data"); + TesterLoginRst loginRst = new TesterLoginRst(token, System.currentTimeMillis(), loginBaseInfo); + LoginCache.setCache(loginConfigId, loginRst); + return true; + } + return false; + } + + @Override + public Map makeHeaders(Long loginConfigId) { + Map headers = new HashMap<>(); + if(loginConfigId != null){ + TesterLoginRst cache = LoginCache.getCache(loginConfigId); + if(cache != null){ + String token = (String)cache.getLoginResponse(); + headers.put("Cookie", "token=" + token); + } + } + return headers; + } +} -- Gitee From f1c8402b19eb30130159274d6bbfa5a472246da0 Mon Sep 17 00:00:00 2001 From: songjun Date: Wed, 1 Jun 2022 11:53:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4wws=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/tester/login/WwsLogin.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tester/src/main/java/com/ruoyi/tester/login/WwsLogin.java b/tester/src/main/java/com/ruoyi/tester/login/WwsLogin.java index 1475f84..cea14a9 100644 --- a/tester/src/main/java/com/ruoyi/tester/login/WwsLogin.java +++ b/tester/src/main/java/com/ruoyi/tester/login/WwsLogin.java @@ -2,7 +2,9 @@ package com.ruoyi.tester.login; import com.ruoyi.tester.domain.TesterLoginConfig; import com.ruoyi.tester.domain.TesterLoginRst; -import com.ruoyi.tester.executor.InterfaceCallUtils; +import com.ruoyi.tester.executor.http.HttpUtils; +import com.ruoyi.tester.executor.http.HttpUtilsFactory; +import com.ruoyi.tester.executor.http.XzfHttpResult; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,20 +23,19 @@ public class WwsLogin implements Login { } @Override - public boolean doLogin(Long loginConfigId) { + public TesterLoginRst doLogin(Long loginConfigId) { TesterLoginConfig loginBaseInfo = LoginCache.getLoginBaseInfo(loginConfigId); - JSONObject loginParam = new JSONObject(loginBaseInfo.getLoginParam()); - logger.info("WWS登录,loginUrl={}, loginParam={}", loginBaseInfo.getLoginUrl(), loginParam); - String result = InterfaceCallUtils.post(loginBaseInfo.getLoginUrl(), loginParam.toString(), new HashMap()).getBody(); - logger.info("登录结果result={}", result); - JSONObject rstJson = new JSONObject(result); + logger.info("WWS登录,loginUrl={}, loginParam={}", loginBaseInfo.getLoginUrl(), loginBaseInfo.getLoginParam()); + HttpUtils httpUtils = HttpUtilsFactory.getHttpUtils(); + XzfHttpResult xzfHttpResult = httpUtils.post(loginBaseInfo.getLoginUrl(), "application/x-www-form-urlencoded; charset=UTF-8", null, null, loginBaseInfo.getLoginParam(), null); + logger.info("登录结果result={}", xzfHttpResult.getBody()); + JSONObject rstJson = new JSONObject(xzfHttpResult.getBody()); if ("0".equals(rstJson.getString("code"))) { String token = rstJson.getString("data"); TesterLoginRst loginRst = new TesterLoginRst(token, System.currentTimeMillis(), loginBaseInfo); - LoginCache.setCache(loginConfigId, loginRst); - return true; + return loginRst; } - return false; + return null; } @Override -- Gitee From 63e03e54d8899e971d48122398a015aa4ca68ce1 Mon Sep 17 00:00:00 2001 From: songjun Date: Fri, 14 Apr 2023 10:33:32 +0800 Subject: [PATCH 3/4] modify --- ruoyi-admin/src/main/resources/application-druid.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index e47a9bd..db006f4 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,16 +6,16 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://172.10.62.97:3306/xzf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3306/xzf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: mysqlLan2vWfdstv8 + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 enabled: false url: jdbc:mysql://106.75.92.230:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: - password: + username: + password: # 初始连接数 initialSize: 1 # 最小连接池数量 @@ -35,7 +35,7 @@ spring: testWhileIdle: true testOnBorrow: false testOnReturn: false - webStatFilter: + webStatFilter: enabled: true statViewServlet: enabled: true @@ -54,4 +54,4 @@ spring: merge-sql: true wall: config: - multi-statement-allow: true \ No newline at end of file + multi-statement-allow: true -- Gitee From e1e4d4f07024cc183ee08738458bb8d7711fa701 Mon Sep 17 00:00:00 2001 From: songjun Date: Fri, 14 Apr 2023 14:40:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E5=8F=AA=E5=B1=95=E7=A4=BA=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E4=BF=A1=E6=81=AF,=20=E6=98=8E=E7=BB=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=86=8D=E8=AF=A6=E6=83=85=E4=B9=9F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task_interface_relation.html | 34 +------------------ 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/tester/src/main/resources/templates/tester/task_interface_relation/task_interface_relation.html b/tester/src/main/resources/templates/tester/task_interface_relation/task_interface_relation.html index 9d299be..dabdb70 100644 --- a/tester/src/main/resources/templates/tester/task_interface_relation/task_interface_relation.html +++ b/tester/src/main/resources/templates/tester/task_interface_relation/task_interface_relation.html @@ -88,26 +88,10 @@ title: '关系id', visible: true }, - { - field: 'taskId', - title: '任务id' - }, - { - field: 'interfaceId', - title: '接口id' - }, { field: 'description', title: '描述信息' }, - { - field: 'host', - title: '主机' - }, - { - field: 'port', - title: '端口' - }, { field: 'dependRelationIds', title: '依赖关系id' @@ -116,22 +100,6 @@ field: 'dependParam', title: '依赖参数' }, - { - field: 'queryParam', - title: 'query参数' - }, - { - field: 'bodyParam', - title: 'body参数' - }, - { - field: 'pathParam', - title: 'path参数' - }, - { - field: 'loginConfigId', - title: '登录配置id' - }, { field: 'status', title: '状态', @@ -154,4 +122,4 @@ }); - \ No newline at end of file + -- Gitee