Merge branch 'master' of http://103.249.252.28:90/YZJyzj/LuJin-Im

qiqiim-server.iml

@@ -49,7 +49,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_161/lib/jconsole.jar!/" />
+          <root url="jar://D:/Java/jdk1.8.0_171/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -58,7 +58,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_161/lib/tools.jar!/" />
+          <root url="jar://D:/Java/jdk1.8.0_171/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

src/main/java/com/qiqiim/webserver/user/controller/ImController.java

@@ -151,17 +151,17 @@ public class ImController extends BaseController{
 	@ResponseBody
 	public Object getAllUser(HttpServletResponse response,HttpServletRequest request,
 			RedirectAttributes redirectAttributes) throws Exception{
-		    // 数据格式请参考文档  http://www.layui.com/doc/modules/layim.html  
+		    // 数据格式请参考文档  http://www.layui.com/doc/modules/layim.html
 			if(getLoginUser()!=null){
-				
-				UserInfoEntity  user = getLoginUser().getUserInfo();	
+
+				UserInfoEntity  user = getLoginUser().getUserInfo();
 				ImFriendUserInfoData  my = new ImFriendUserInfoData();
 				my.setId(user.getUid());
 				my.setAvatar(user.getProfilephoto());
 				my.setSign(user.getSignature());
 				my.setUsername(user.getName());
 				my.setStatus("online");
-				
+
 				//模拟群信息
 				ImGroupUserData  group = new ImGroupUserData();
 				group.setAvatar("http://tva2.sinaimg.cn/crop.0.0.199.199.180/005Zseqhjw1eplix1brxxj305k05kjrf.jpg");
@@ -169,7 +169,7 @@ public class ImController extends BaseController{
 				group.setGroupname("公司群");
 				List<ImGroupUserData>  groups = new ArrayList<ImGroupUserData>();
 				groups.add(group);
-				
+
 				Map map = new HashMap();
 				ImUserData  us = new ImUserData();
 				us.setCode("0");