Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
廖旭伟
fill-system
Commits
0421bb2c
Commit
0421bb2c
authored
Sep 29, 2022
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改接口文档
parent
9c79304a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
236 additions
and
193 deletions
+236
-193
fill-manager/doc/api.md
fill-manager/doc/api.md
+230
-188
fill-manager/pom.xml
fill-manager/pom.xml
+1
-1
fill-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
...va/com/mortals/xhx/base/system/user/model/UserEntity.java
+1
-1
fill-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntityExt.java
...com/mortals/xhx/base/system/user/model/UserEntityExt.java
+1
-0
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
.../java/com/mortals/xhx/module/home/web/HomeController.java
+3
-3
No files found.
fill-manager/doc/api.md
View file @
0421bb2c
This diff is collapsed.
Click to expand it.
fill-manager/pom.xml
View file @
0421bb2c
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
</activation>
</activation>
<properties>
<properties>
<profiles.active>
develop
</profiles.active>
<profiles.active>
develop
</profiles.active>
<profiles.server.port>
17
001
</profiles.server.port>
<profiles.server.port>
17
215
</profiles.server.port>
<profiles.queue.type>
rabbitmq
</profiles.queue.type>
<profiles.queue.type>
rabbitmq
</profiles.queue.type>
<profiles.kafka.brokers>
192.168.0.251:9092
</profiles.kafka.brokers>
<profiles.kafka.brokers>
192.168.0.251:9092
</profiles.kafka.brokers>
<profiles.rabbitmq.host>
192.168.0.98
</profiles.rabbitmq.host>
<profiles.rabbitmq.host>
192.168.0.98
</profiles.rabbitmq.host>
...
...
fill-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @
0421bb2c
...
@@ -330,7 +330,7 @@ public class UserEntity extends UserEntityExt implements IUser {
...
@@ -330,7 +330,7 @@ public class UserEntity extends UserEntityExt implements IUser {
@Override
@Override
public
String
getSiteIds
()
{
public
String
getSiteIds
()
{
return
null
;
return
super
.
getSiteIds
()
;
}
}
/**
/**
...
...
fill-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntityExt.java
View file @
0421bb2c
...
@@ -35,4 +35,5 @@ public class UserEntityExt extends BaseEntityLong {
...
@@ -35,4 +35,5 @@ public class UserEntityExt extends BaseEntityLong {
private
String
oldPassword
;
private
String
oldPassword
;
private
String
newPassword
;
private
String
newPassword
;
private
String
siteIds
;
}
}
\ No newline at end of file
fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
View file @
0421bb2c
...
@@ -81,7 +81,7 @@ public class HomeController extends BaseJsonBodyController {
...
@@ -81,7 +81,7 @@ public class HomeController extends BaseJsonBodyController {
}
}
ret
.
setCode
(
code
);
ret
.
setCode
(
code
);
ret
.
setData
(
model
.
get
(
"data"
)
);
ret
.
setData
(
model
);
ret
.
setDict
(
model
.
get
(
"dict"
));
ret
.
setDict
(
model
.
get
(
"dict"
));
ret
.
setMsg
(
model
.
get
(
"message_info"
)
==
null
?
""
:
model
.
remove
(
"message_info"
).
toString
());
ret
.
setMsg
(
model
.
get
(
"message_info"
)
==
null
?
""
:
model
.
remove
(
"message_info"
).
toString
());
return
ret
;
return
ret
;
...
@@ -125,7 +125,7 @@ public class HomeController extends BaseJsonBodyController {
...
@@ -125,7 +125,7 @@ public class HomeController extends BaseJsonBodyController {
}
}
ret
.
setCode
(
code
);
ret
.
setCode
(
code
);
ret
.
setData
(
model
.
get
(
"data"
)
);
ret
.
setData
(
model
);
ret
.
setDict
(
model
.
get
(
"dict"
));
ret
.
setDict
(
model
.
get
(
"dict"
));
ret
.
setMsg
(
model
.
get
(
"message_info"
)
==
null
?
""
:
model
.
remove
(
"message_info"
).
toString
());
ret
.
setMsg
(
model
.
get
(
"message_info"
)
==
null
?
""
:
model
.
remove
(
"message_info"
).
toString
());
return
ret
;
return
ret
;
...
@@ -166,7 +166,7 @@ public class HomeController extends BaseJsonBodyController {
...
@@ -166,7 +166,7 @@ public class HomeController extends BaseJsonBodyController {
}
}
ret
.
setCode
(
code
);
ret
.
setCode
(
code
);
ret
.
setData
(
model
.
get
(
"data"
)
);
ret
.
setData
(
model
);
ret
.
setDict
(
model
.
get
(
"dict"
));
ret
.
setDict
(
model
.
get
(
"dict"
));
ret
.
setMsg
(
model
.
get
(
"message_info"
)
==
null
?
""
:
model
.
remove
(
"message_info"
).
toString
());
ret
.
setMsg
(
model
.
get
(
"message_info"
)
==
null
?
""
:
model
.
remove
(
"message_info"
).
toString
());
return
ret
;
return
ret
;
...
...
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