Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QA
holmes
Commits
b8b18a52
Commit
b8b18a52
authored
Nov 17, 2021
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qa-platform域名换到apollo配置
parent
41d98087
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
PipelineController.java
...va/cn/qg/holmes/controller/gitlab/PipelineController.java
+5
-1
AutoUtilsServiceImpl.java
.../cn/qg/holmes/service/auto/impl/AutoUtilsServiceImpl.java
+5
-1
No files found.
src/main/java/cn/qg/holmes/controller/gitlab/PipelineController.java
View file @
b8b18a52
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.jdbc.core.JdbcTemplate
;
import
org.springframework.jdbc.core.JdbcTemplate
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -60,6 +61,9 @@ public class PipelineController {
...
@@ -60,6 +61,9 @@ public class PipelineController {
@Autowired
@Autowired
JenkinsService
jenkinsService
;
JenkinsService
jenkinsService
;
@Value
(
"${qa-platform.https}"
)
private
String
qaPlatformHost
;
/**
/**
* gitlab webhook
* gitlab webhook
* @param request
* @param request
...
@@ -176,7 +180,7 @@ public class PipelineController {
...
@@ -176,7 +180,7 @@ public class PipelineController {
// 开始循环执行SQL
// 开始循环执行SQL
String
database
=
submitTestInstruction
.
getDatabase
();
String
database
=
submitTestInstruction
.
getDatabase
();
List
<
Map
>
databaseMapList
=
JSONArray
.
parseArray
(
database
,
Map
.
class
);
List
<
Map
>
databaseMapList
=
JSONArray
.
parseArray
(
database
,
Map
.
class
);
String
sqlExecUrl
=
"https://qa-platform.liangkebang.com
/sql/execute"
;
String
sqlExecUrl
=
qaPlatformHost
+
"
/sql/execute"
;
Map
<
String
,
String
>
sqlExecParams
=
new
HashMap
<>();
Map
<
String
,
String
>
sqlExecParams
=
new
HashMap
<>();
sqlExecParams
.
put
(
"namespace"
,
dingRobot
.
getNamespace
());
sqlExecParams
.
put
(
"namespace"
,
dingRobot
.
getNamespace
());
for
(
Map
map:
databaseMapList
)
{
for
(
Map
map:
databaseMapList
)
{
...
...
src/main/java/cn/qg/holmes/service/auto/impl/AutoUtilsServiceImpl.java
View file @
b8b18a52
...
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
...
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
import
com.jayway.jsonpath.JsonPath
;
import
com.jayway.jsonpath.JsonPath
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
@@ -27,6 +28,9 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
...
@@ -27,6 +28,9 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
@Autowired
@Autowired
RedisUtils
redisUtils
;
RedisUtils
redisUtils
;
@Value
(
"${qa-platform.https}"
)
private
String
qaPlatformHost
;
/**
/**
* 参数替换-新
* 参数替换-新
* @param parameters headers或者parameters
* @param parameters headers或者parameters
...
@@ -191,7 +195,7 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
...
@@ -191,7 +195,7 @@ public class AutoUtilsServiceImpl implements AutoUtilsService {
params
.
put
(
"sql"
,
sql
);
params
.
put
(
"sql"
,
sql
);
params
.
put
(
"type"
,
type
);
params
.
put
(
"type"
,
type
);
log
.
info
(
"开始执行SQL:{}"
,
sql
);
log
.
info
(
"开始执行SQL:{}"
,
sql
);
String
url
=
"https://qa-platform.liangkebang.com
/sql/execute"
;
String
url
=
qaPlatformHost
+
"
/sql/execute"
;
String
result
=
HttpClientUtils
.
doGet
(
url
,
params
);
String
result
=
HttpClientUtils
.
doGet
(
url
,
params
);
log
.
info
(
"SQL返回结果:{}"
,
result
);
log
.
info
(
"SQL返回结果:{}"
,
result
);
// 只有select才需要加入Map
// 只有select才需要加入Map
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment