Commit aa96f0ca authored by jay's avatar jay

im同步暂时开放测试环境

parent f8d588b5
...@@ -245,9 +245,9 @@ public class UserController extends BaseController { ...@@ -245,9 +245,9 @@ public class UserController extends BaseController {
cornetInParam.add(new BasicNameValuePair("ex", JSONObject.fromObject(identity).toString())); cornetInParam.add(new BasicNameValuePair("ex", JSONObject.fromObject(identity).toString()));
String resultUrl = imUrl + "/api/5b8763053720d"; String resultUrl = imUrl + "/api/5b8763053720d";
String env = MemoryPropertyPlaceholderConfigurer.getContextProperty("system.env"); String env = MemoryPropertyPlaceholderConfigurer.getContextProperty("system.env");
if (!"production".equalsIgnoreCase(env)) { // if (!"production".equalsIgnoreCase(env)) {
return "redirect:/user"; // return "redirect:/user";
} // }
String accIdResult = HttpUtil.doPostWithHeader(resultUrl, cornetInParam, accessToken, ""); String accIdResult = HttpUtil.doPostWithHeader(resultUrl, cornetInParam, accessToken, "");
if (Strings.isNullOrEmpty(accIdResult)) { if (Strings.isNullOrEmpty(accIdResult)) {
...@@ -602,12 +602,12 @@ public class UserController extends BaseController { ...@@ -602,12 +602,12 @@ public class UserController extends BaseController {
} }
//添加权限,同步im只在线上展示 //添加权限,同步im只在线上展示
String env = MemoryPropertyPlaceholderConfigurer.getContextProperty("system.env"); String env = MemoryPropertyPlaceholderConfigurer.getContextProperty("system.env");
if ("production".equals(env)) { // if ("production".equals(env)) {
model.addAttribute("showIm", 1); // model.addAttribute("showIm", 1);
} else { // } else {
model.addAttribute("showIm", 0); // model.addAttribute("showIm", 0);
} // }
// model.addAttribute("showIm", 1); model.addAttribute("showIm", 1);
model.addAttribute("page", response.getPaging()); model.addAttribute("page", response.getPaging());
model.addAttribute("users", lstUserVo); model.addAttribute("users", lstUserVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment