Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
zhaowei
dlink
Commits
50316a0c
Unverified
Commit
50316a0c
authored
Apr 09, 2022
by
aiwenmo
Committed by
GitHub
Apr 09, 2022
Browse files
Options
Browse Files
Download
Plain Diff
[Fix-98][admin,web] Fix to show exception
[Fix-98][admin,web] Fix to show exception
parents
f0692faf
e3b5b231
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
3 deletions
+36
-3
StudioController.java
.../src/main/java/com/dlink/controller/StudioController.java
+7
-1
WebExceptionHandler.java
...rc/main/java/com/dlink/exception/WebExceptionHandler.java
+3
-1
FlinkInterceptorTest.java
...rc/test/java/com.dlink.executor/FlinkInterceptorTest.java
+24
-0
index.tsx
dlink-web/src/components/Studio/StudioMenu/index.tsx
+2
-1
No files found.
dlink-admin/src/main/java/com/dlink/controller/StudioController.java
View file @
50316a0c
...
@@ -9,7 +9,9 @@ import com.dlink.job.JobResult;
...
@@ -9,7 +9,9 @@ import com.dlink.job.JobResult;
import
com.dlink.result.IResult
;
import
com.dlink.result.IResult
;
import
com.dlink.service.StudioService
;
import
com.dlink.service.StudioService
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.JsonNode
;
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.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -60,7 +62,11 @@ public class StudioController {
...
@@ -60,7 +62,11 @@ public class StudioController {
*/
*/
@PostMapping
(
"/getJobPlan"
)
@PostMapping
(
"/getJobPlan"
)
public
Result
getJobPlan
(
@RequestBody
StudioExecuteDTO
studioExecuteDTO
)
{
public
Result
getJobPlan
(
@RequestBody
StudioExecuteDTO
studioExecuteDTO
)
{
try
{
return
Result
.
succeed
(
studioService
.
getJobPlan
(
studioExecuteDTO
),
"获取作业计划成功"
);
return
Result
.
succeed
(
studioService
.
getJobPlan
(
studioExecuteDTO
),
"获取作业计划成功"
);
}
catch
(
Exception
e
)
{
return
Result
.
failed
(
"目前只支持获取 INSERT 语句的作业计划"
);
}
}
}
/**
/**
...
...
dlink-admin/src/main/java/com/dlink/exception/WebExceptionHandler.java
View file @
50316a0c
package
com
.
dlink
.
exception
;
package
com
.
dlink
.
exception
;
import
cn.dev33.satoken.exception.NotLoginException
;
import
cn.dev33.satoken.exception.NotLoginException
;
import
com.dlink.common.result.Result
;
import
com.dlink.common.result.Result
;
import
com.dlink.model.CodeEnum
;
import
com.dlink.model.CodeEnum
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.web.bind.annotation.ControllerAdvice
;
import
org.springframework.web.bind.annotation.ControllerAdvice
;
...
@@ -41,6 +43,6 @@ public class WebExceptionHandler {
...
@@ -41,6 +43,6 @@ public class WebExceptionHandler {
@ExceptionHandler
@ExceptionHandler
public
Result
unknownException
(
Exception
e
)
{
public
Result
unknownException
(
Exception
e
)
{
logger
.
error
(
"ERROR:"
,
e
);
logger
.
error
(
"ERROR:"
,
e
);
return
Result
.
failed
(
"系统出现错误, 请联系平台管理员!"
);
return
Result
.
failed
(
e
.
getMessage
()
);
}
}
}
}
dlink-executor/src/test/java/com.dlink.executor/FlinkInterceptorTest.java
0 → 100644
View file @
50316a0c
package
com
.
dlink
.
core
;
import
com.dlink.executor.Executor
;
import
com.dlink.interceptor.FlinkInterceptor
;
import
org.junit.Assert
;
import
org.junit.Test
;
/**
* FlinkInterceptorTest
*
* @author wenmo
* @since 2022/4/9 17:48
**/
public
class
FlinkInterceptorTest
{
@Test
public
void
replaceFragmentTest
(){
String
statement
=
"nullif1:=NULLIF(1, 0) as val;"
+
"nullif2:=NULLIF(0, 0) as val$null;"
+
"select ${nullif1},${nullif2}"
;
String
pretreatStatement
=
FlinkInterceptor
.
pretreatStatement
(
Executor
.
build
(),
statement
);
Assert
.
assertEquals
(
"select NULLIF(1, 0) as val,NULLIF(0, 0) as val$null"
,
pretreatStatement
);
}
}
dlink-web/src/components/Studio/StudioMenu/index.tsx
View file @
50316a0c
...
@@ -198,9 +198,10 @@ const StudioMenu = (props: any) => {
...
@@ -198,9 +198,10 @@ const StudioMenu = (props: any) => {
const
res
=
getJobPlan
(
param
);
const
res
=
getJobPlan
(
param
);
handleGraphModalVisible
(
true
);
handleGraphModalVisible
(
true
);
res
.
then
((
result
)
=>
{
res
.
then
((
result
)
=>
{
if
(
result
.
code
==
0
)
{
if
(
result
.
code
==
CODE
.
SUCCESS
)
{
setGraphData
(
buildGraphData
(
result
.
datas
));
setGraphData
(
buildGraphData
(
result
.
datas
));
}
else
{
}
else
{
message
.
error
(
`获取作业执行计划失败,原因:\n
${
result
.
msg
}
`
);
setGraphData
(
undefined
);
setGraphData
(
undefined
);
}
}
})
})
...
...
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