Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
H
Hgs
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
徐州
Hgs
Commits
aa96f0ca
Commit
aa96f0ca
authored
Jan 29, 2021
by
jay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
im同步暂时开放测试环境
parent
f8d588b5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
UserController.java
...main/java/com/house365/web/controller/UserController.java
+9
-9
No files found.
house365-hgs-web/src/main/java/com/house365/web/controller/UserController.java
View file @
aa96f0ca
...
...
@@ -245,9 +245,9 @@ public class UserController extends BaseController {
cornetInParam
.
add
(
new
BasicNameValuePair
(
"ex"
,
JSONObject
.
fromObject
(
identity
).
toString
()));
String
resultUrl
=
imUrl
+
"/api/5b8763053720d"
;
String
env
=
MemoryPropertyPlaceholderConfigurer
.
getContextProperty
(
"system.env"
);
if
(!
"production"
.
equalsIgnoreCase
(
env
))
{
return
"redirect:/user"
;
}
//
if (!"production".equalsIgnoreCase(env)) {
//
return "redirect:/user";
//
}
String
accIdResult
=
HttpUtil
.
doPostWithHeader
(
resultUrl
,
cornetInParam
,
accessToken
,
""
);
if
(
Strings
.
isNullOrEmpty
(
accIdResult
))
{
...
...
@@ -602,12 +602,12 @@ public class UserController extends BaseController {
}
//添加权限,同步im只在线上展示
String
env
=
MemoryPropertyPlaceholderConfigurer
.
getContextProperty
(
"system.env"
);
if
(
"production"
.
equals
(
env
))
{
model
.
addAttribute
(
"showIm"
,
1
);
}
else
{
model
.
addAttribute
(
"showIm"
,
0
);
}
//
model.addAttribute("showIm", 1);
//
if ("production".equals(env)) {
//
model.addAttribute("showIm", 1);
//
} else {
//
model.addAttribute("showIm", 0);
//
}
model
.
addAttribute
(
"showIm"
,
1
);
model
.
addAttribute
(
"page"
,
response
.
getPaging
());
model
.
addAttribute
(
"users"
,
lstUserVo
);
...
...
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