Commit 7adab608 authored by 赵建伟's avatar 赵建伟

Merge branch 'zhaojianwei' into 'master'

add docs and update refer check codes

See merge request !6
parents 4ce0aa66 682c794c
...@@ -240,16 +240,24 @@ public class DqRuleServiceImpl implements DqRuleService { ...@@ -240,16 +240,24 @@ public class DqRuleServiceImpl implements DqRuleService {
if (null != filters) { if (null != filters) {
filters = filters.replaceAll("\\$", "RDS_CHAR_DOLLAR"); filters = filters.replaceAll("\\$", "RDS_CHAR_DOLLAR");
rs = rs.replaceAll("#filters", filters); rs = rs.replaceAll("#filters", filters);
}else{
rs = rs.replaceAll("#filters", "");
} }
String checkFilters = dqRuleVo.getCheckFilters(); String checkFilters = dqRuleVo.getCheckFilters();
if (null != checkFilters) { if (null != checkFilters) {
checkFilters = checkFilters.replaceAll("\\$", "RDS_CHAR_DOLLAR"); checkFilters = checkFilters.replaceAll("\\$", "RDS_CHAR_DOLLAR");
rs = rs.replaceAll("#check_filters", checkFilters); rs = rs.replaceAll("#check_filters", checkFilters);
}else{
rs = rs.replaceAll("#check_filters", "");
} }
String referFilters = dqRuleVo.getReferFilters(); String referFilters = dqRuleVo.getReferFilters();
if (null != referFilters) { if (null != referFilters) {
referFilters = referFilters.replaceAll("\\$", "RDS_CHAR_DOLLAR"); referFilters = referFilters.replaceAll("\\$", "RDS_CHAR_DOLLAR");
rs = rs.replaceAll("#refer_filters", referFilters); rs = rs.replaceAll("#refer_filters", referFilters);
}else{
rs = rs.replaceAll("#refer_filters", "");
} }
rs = rs.replaceAll("RDS_CHAR_DOLLAR", "\\$"); rs = rs.replaceAll("RDS_CHAR_DOLLAR", "\\$");
return rs; return rs;
......
...@@ -58,7 +58,7 @@ mail: ...@@ -58,7 +58,7 @@ mail:
#---dingding send config--- #---dingding send config---
dingding: dingding:
atMobile: 17639232521 atMobile: 15101546136
webhookToken: https://oapi.dingtalk.com/robot/send?access_token=68d7d6e9aaf81ebbf0f5228a3eadf769f1af0a7b0cb3dcb8fb8885dc5d93054f webhookToken: https://oapi.dingtalk.com/robot/send?access_token=68d7d6e9aaf81ebbf0f5228a3eadf769f1af0a7b0cb3dcb8fb8885dc5d93054f
#---mybatis config--- #---mybatis config---
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment