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
731bda76
Commit
731bda76
authored
Apr 15, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Fix-402 [admin] MybatisPlus PO boolean default false
parent
b91d42b7
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
16 deletions
+16
-16
ClusterConfigurationController.java
.../com/dlink/controller/ClusterConfigurationController.java
+1
-1
Cluster.java
dlink-admin/src/main/java/com/dlink/model/Cluster.java
+1
-1
ClusterConfiguration.java
...n/src/main/java/com/dlink/model/ClusterConfiguration.java
+1
-1
DataBase.java
dlink-admin/src/main/java/com/dlink/model/DataBase.java
+1
-1
Task.java
dlink-admin/src/main/java/com/dlink/model/Task.java
+3
-3
User.java
dlink-admin/src/main/java/com/dlink/model/User.java
+3
-3
TaskServiceImpl.java
...src/main/java/com/dlink/service/impl/TaskServiceImpl.java
+1
-1
UserServiceImpl.java
...src/main/java/com/dlink/service/impl/UserServiceImpl.java
+5
-5
No files found.
dlink-admin/src/main/java/com/dlink/controller/ClusterConfigurationController.java
View file @
731bda76
...
@@ -39,7 +39,7 @@ public class ClusterConfigurationController {
...
@@ -39,7 +39,7 @@ public class ClusterConfigurationController {
@PutMapping
@PutMapping
public
Result
saveOrUpdate
(
@RequestBody
ClusterConfiguration
clusterConfiguration
)
{
public
Result
saveOrUpdate
(
@RequestBody
ClusterConfiguration
clusterConfiguration
)
{
TestResult
testResult
=
clusterConfigurationService
.
testGateway
(
clusterConfiguration
);
TestResult
testResult
=
clusterConfigurationService
.
testGateway
(
clusterConfiguration
);
clusterConfiguration
.
setAvailable
(
testResult
.
isAvailable
());
clusterConfiguration
.
set
Is
Available
(
testResult
.
isAvailable
());
if
(
clusterConfigurationService
.
saveOrUpdate
(
clusterConfiguration
))
{
if
(
clusterConfigurationService
.
saveOrUpdate
(
clusterConfiguration
))
{
return
Result
.
succeed
(
Asserts
.
isNotNull
(
clusterConfiguration
.
getId
())
?
"修改成功"
:
"新增成功"
);
return
Result
.
succeed
(
Asserts
.
isNotNull
(
clusterConfiguration
.
getId
())
?
"修改成功"
:
"新增成功"
);
}
else
{
}
else
{
...
...
dlink-admin/src/main/java/com/dlink/model/Cluster.java
View file @
731bda76
...
@@ -35,7 +35,7 @@ public class Cluster extends SuperEntity {
...
@@ -35,7 +35,7 @@ public class Cluster extends SuperEntity {
private
String
note
;
private
String
note
;
private
b
oolean
autoRegisters
;
private
B
oolean
autoRegisters
;
private
Integer
clusterConfigurationId
;
private
Integer
clusterConfigurationId
;
...
...
dlink-admin/src/main/java/com/dlink/model/ClusterConfiguration.java
View file @
731bda76
...
@@ -33,7 +33,7 @@ public class ClusterConfiguration extends SuperEntity {
...
@@ -33,7 +33,7 @@ public class ClusterConfiguration extends SuperEntity {
private
String
configJson
;
private
String
configJson
;
private
b
oolean
isAvailable
;
private
B
oolean
isAvailable
;
private
String
note
;
private
String
note
;
...
...
dlink-admin/src/main/java/com/dlink/model/DataBase.java
View file @
731bda76
...
@@ -44,7 +44,7 @@ public class DataBase extends SuperEntity {
...
@@ -44,7 +44,7 @@ public class DataBase extends SuperEntity {
private
String
dbVersion
;
private
String
dbVersion
;
private
b
oolean
status
;
private
B
oolean
status
;
private
LocalDateTime
healthTime
;
private
LocalDateTime
healthTime
;
...
...
dlink-admin/src/main/java/com/dlink/model/Task.java
View file @
731bda76
...
@@ -44,11 +44,11 @@ public class Task extends SuperEntity {
...
@@ -44,11 +44,11 @@ public class Task extends SuperEntity {
private
Integer
parallelism
;
private
Integer
parallelism
;
private
b
oolean
fragment
;
private
B
oolean
fragment
;
private
b
oolean
statementSet
;
private
B
oolean
statementSet
;
private
b
oolean
batchModel
;
private
B
oolean
batchModel
;
private
Integer
clusterId
;
private
Integer
clusterId
;
...
...
dlink-admin/src/main/java/com/dlink/model/User.java
View file @
731bda76
...
@@ -38,9 +38,9 @@ public class User implements Serializable {
...
@@ -38,9 +38,9 @@ public class User implements Serializable {
private
String
mobile
;
private
String
mobile
;
private
b
oolean
enabled
;
private
B
oolean
enabled
;
private
b
oolean
isDelete
;
private
B
oolean
isDelete
;
@TableField
(
fill
=
FieldFill
.
INSERT
)
@TableField
(
fill
=
FieldFill
.
INSERT
)
private
LocalDateTime
createTime
;
private
LocalDateTime
createTime
;
...
@@ -49,5 +49,5 @@ public class User implements Serializable {
...
@@ -49,5 +49,5 @@ public class User implements Serializable {
private
LocalDateTime
updateTime
;
private
LocalDateTime
updateTime
;
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
b
oolean
isAdmin
;
private
B
oolean
isAdmin
;
}
}
dlink-admin/src/main/java/com/dlink/service/impl/TaskServiceImpl.java
View file @
731bda76
...
@@ -487,7 +487,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
...
@@ -487,7 +487,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TaskMapper, Task> implemen
private
JobConfig
buildJobConfig
(
Task
task
)
{
private
JobConfig
buildJobConfig
(
Task
task
)
{
boolean
isJarTask
=
Dialect
.
FLINKJAR
.
equalsVal
(
task
.
getDialect
());
boolean
isJarTask
=
Dialect
.
FLINKJAR
.
equalsVal
(
task
.
getDialect
());
if
(!
isJarTask
&&
task
.
is
Fragment
())
{
if
(!
isJarTask
&&
task
.
get
Fragment
())
{
String
flinkWithSql
=
dataBaseService
.
getEnabledFlinkWithSql
();
String
flinkWithSql
=
dataBaseService
.
getEnabledFlinkWithSql
();
if
(
Asserts
.
isNotNullString
(
flinkWithSql
))
{
if
(
Asserts
.
isNotNullString
(
flinkWithSql
))
{
task
.
setStatement
(
flinkWithSql
+
"\r\n"
+
task
.
getStatement
());
task
.
setStatement
(
flinkWithSql
+
"\r\n"
+
task
.
getStatement
());
...
...
dlink-admin/src/main/java/com/dlink/service/impl/UserServiceImpl.java
View file @
731bda76
...
@@ -33,7 +33,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
...
@@ -33,7 +33,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
}
}
user
.
setPassword
(
SaSecureUtil
.
md5
(
user
.
getPassword
()));
user
.
setPassword
(
SaSecureUtil
.
md5
(
user
.
getPassword
()));
user
.
setEnabled
(
true
);
user
.
setEnabled
(
true
);
user
.
setDelete
(
false
);
user
.
set
Is
Delete
(
false
);
if
(
save
(
user
))
{
if
(
save
(
user
))
{
return
Result
.
succeed
(
"注册成功"
);
return
Result
.
succeed
(
"注册成功"
);
}
else
{
}
else
{
...
@@ -69,7 +69,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
...
@@ -69,7 +69,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
public
boolean
removeUser
(
Integer
id
)
{
public
boolean
removeUser
(
Integer
id
)
{
User
user
=
new
User
();
User
user
=
new
User
();
user
.
setId
(
id
);
user
.
setId
(
id
);
user
.
setDelete
(
true
);
user
.
set
Is
Delete
(
true
);
return
updateById
(
user
);
return
updateById
(
user
);
}
}
...
@@ -84,10 +84,10 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
...
@@ -84,10 +84,10 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
return
Result
.
failed
(
"密码不能为空"
);
return
Result
.
failed
(
"密码不能为空"
);
}
}
if
(
Asserts
.
isEquals
(
SaSecureUtil
.
md5
(
password
),
userPassword
))
{
if
(
Asserts
.
isEquals
(
SaSecureUtil
.
md5
(
password
),
userPassword
))
{
if
(
user
.
i
sDelete
())
{
if
(
user
.
getI
sDelete
())
{
return
Result
.
failed
(
"账号不存在"
);
return
Result
.
failed
(
"账号不存在"
);
}
}
if
(!
user
.
is
Enabled
())
{
if
(!
user
.
get
Enabled
())
{
return
Result
.
failed
(
"账号已被禁用"
);
return
Result
.
failed
(
"账号已被禁用"
);
}
}
StpUtil
.
login
(
user
.
getId
(),
isRemember
);
StpUtil
.
login
(
user
.
getId
(),
isRemember
);
...
@@ -102,7 +102,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
...
@@ -102,7 +102,7 @@ public class UserServiceImpl extends SuperServiceImpl<UserMapper, User> implemen
public
User
getUserByUsername
(
String
username
)
{
public
User
getUserByUsername
(
String
username
)
{
User
user
=
getOne
(
new
QueryWrapper
<
User
>().
eq
(
"username"
,
username
).
eq
(
"is_delete"
,
0
));
User
user
=
getOne
(
new
QueryWrapper
<
User
>().
eq
(
"username"
,
username
).
eq
(
"is_delete"
,
0
));
if
(
Asserts
.
isNotNull
(
user
))
{
if
(
Asserts
.
isNotNull
(
user
))
{
user
.
setAdmin
(
Asserts
.
isEqualsIgnoreCase
(
username
,
"admin"
));
user
.
set
Is
Admin
(
Asserts
.
isEqualsIgnoreCase
(
username
,
"admin"
));
}
}
return
user
;
return
user
;
}
}
...
...
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