Merge branch 'feature-logininfo'

src/main/java/com/ljsd/controller/GetServerListController.java

@@ -195,6 +195,8 @@ public class GetServerListController extends HttpServlet {
         res.put("serverid", serverId);
         res.put("name", userRecentLoginInfo.getName());
         res.put("level", userRecentLoginInfo.getLevel());
+        res.put("head", userRecentLoginInfo.getHead());
+        res.put("headfream", userRecentLoginInfo.getHeadFream());
         return res;
     }
 

src/main/java/com/ljsd/listener/WebContextListener.java

@@ -26,8 +26,8 @@ public class WebContextListener implements ServletContextListener {
                 path = DEFAULT_CONFIG_PATH;
                 inputStream = getClass().getResourceAsStream(path);
             }else{
-                path += "/config/jl_loginserver/application.properties";
-                //path += "/config/tk/application.properties";
+               //path += "/config/jl_loginserver/application.properties";
+                path += "/config/tk/application.properties";
                 inputStream = new FileInputStream(path);
             }
             LOGGER.info("WebContextListener==>path={}",path);

src/main/java/com/ljsd/pojo/UserRecentLoginInfo.java

@@ -10,11 +10,16 @@ public class UserRecentLoginInfo {
 
     private String name;
 
-    public UserRecentLoginInfo(long loginTime, int level, int uid, String name) {
+    private int head;
+    private int headFream;
+
+    public UserRecentLoginInfo(long loginTime, int level, int uid, String name,int head,int headFream) {
         this.loginTime = loginTime;
         this.level = level;
         this.uid = uid;
         this.name = name;
+        this.head=head;
+        this.headFream=headFream;
     }
 
     public long getLoginTime() {
@@ -48,4 +53,20 @@ public class UserRecentLoginInfo {
     public void setName(String name) {
         this.name = name;
     }
+
+    public int getHead() {
+        return head;
+    }
+
+    public void setHead(int head) {
+        this.head = head;
+    }
+
+    public int getHeadFream() {
+        return headFream;
+    }
+
+    public void setHeadFream(int headFream) {
+        this.headFream = headFream;
+    }
 }