im同步恢复线上配置

house365-hgs-web/src/main/java/com/house365/web/controller/UserController.java

@@ -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);
-//        }
+        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);
 

house365-hgs-ws/src/main/java/com/house365/ws/service/impl/StaffDuty.java

@@ -1107,10 +1107,10 @@ public class StaffDuty implements IStaffDuty {
     private void sendErrorMsg(int userId) {
         try {
             String city = "nj";
-            //todo 发送短信修改
-            String mobile = "18862152977";
+            //发送短信修改
+//            String mobile = "18862152977";
             UserEntity userEntity = usermapper.getById(userId);
-//            String mobile = userEntity.getMobile();
+            String mobile = userEntity.getMobile();
             String msg = "定时营销活动拉取失败";
             msg = URLEncoder.encode(msg, "GBK");
             String smUrl = "http://mysms.house365.com:81/index.php/Interface/apiSendMobil/jid/104/depart/1/city/";