Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-platform
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
赵啸非
device-platform
Commits
4b1e60f6
Commit
4b1e60f6
authored
Apr 28, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改设备管理 外部登录
parent
73bdd440
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
device-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
.../java/com/mortals/xhx/base/login/web/LoginController.java
+2
-0
device-manager/src/main/resources/spy.properties
device-manager/src/main/resources/spy.properties
+1
-1
No files found.
device-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @
4b1e60f6
...
@@ -154,6 +154,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
...
@@ -154,6 +154,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
currUserName
=
"管理员"
;
currUserName
=
"管理员"
;
}
}
saveCurrUser
(
request
,
response
,
user
);
saveCurrUser
(
request
,
response
,
user
);
log
.
info
(
"saveCurrUser"
);
JSONObject
data
=
new
JSONObject
();
JSONObject
data
=
new
JSONObject
();
data
.
put
(
"currUserName"
,
currUserName
);
data
.
put
(
"currUserName"
,
currUserName
);
data
.
put
(
"barList"
,
outlookBarList
);
data
.
put
(
"barList"
,
outlookBarList
);
...
@@ -161,6 +162,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
...
@@ -161,6 +162,7 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
data
.
put
(
"userType"
,
user
.
getUserType
());
data
.
put
(
"userType"
,
user
.
getUserType
());
ret
.
put
(
KEY_RESULT_DATA
,
data
);
ret
.
put
(
KEY_RESULT_DATA
,
data
);
this
.
generateBlackCookie
(
request
,
response
,
user
.
getLoginName
(),
urls
);
this
.
generateBlackCookie
(
request
,
response
,
user
.
getLoginName
(),
urls
);
log
.
info
(
"generateBlackCookie"
);
ret
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
ret
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_SUCCESS
);
ret
.
put
(
KEY_RESULT_MSG
,
"用户登录系统成功!"
);
ret
.
put
(
KEY_RESULT_MSG
,
"用户登录系统成功!"
);
ret
.
put
(
"resources"
,
urls
);
ret
.
put
(
"resources"
,
urls
);
...
...
device-manager/src/main/resources/spy.properties
View file @
4b1e60f6
...
@@ -20,4 +20,4 @@ outagedetection=true
...
@@ -20,4 +20,4 @@ outagedetection=true
outagedetectioninterval
=
2
outagedetectioninterval
=
2
filter
=
true
filter
=
true
exclude
=
mortals_xhx_task,mortals_xhx_param,mortals_xhx_device_log
exclude
=
mortals_xhx_task,mortals_xhx_param,mortals_xhx_device_log,mortals_xhx_user
\ No newline at end of file
\ No newline at end of file
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