diff --git a/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java
index afc3307b..5b2460e3 100644
--- a/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/security/service/impl/SysUserTokenServiceImpl.java
@@ -12,6 +12,7 @@ import io.renren.modules.security.entity.SysUserTokenEntity;
 import io.renren.modules.security.oauth2.TokenGenerator;
 import io.renren.modules.security.service.SysUserTokenService;
 import io.renren.modules.sys.entity.SysOnlineEntity;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -21,11 +22,17 @@ import java.util.Map;
 
 @Service
 public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, SysUserTokenEntity> implements SysUserTokenService {
+
+
     /**
      * 12小时后过期
      */
     private final static int EXPIRE = 3600 * 12;
 
+    @Value("${system.allowSimultaneousLogin}")
+    private int allowSimultaneousLogin;
+
+    /*
     @Override
     public Result createToken(Long userId) {
         //用户token
@@ -81,6 +88,56 @@ public class SysUserTokenServiceImpl extends BaseServiceImpl<SysUserTokenDao, Sy
         map.put("expire", EXPIRE);
         return new Result().ok(map);
     }
+*/
+
+
+    @Override
+    public Result createToken(Long userId) {
+        //用户token
+        String token;
+
+        //当前时间
+        Date now = new Date();
+        //过期时间
+        Date expireTime = new Date(now.getTime() + EXPIRE * 1000);
+
+        //判断是否生成过token
+        SysUserTokenEntity tokenEntity = baseDao.getByUserId(userId);
+        if(tokenEntity == null){
+            //生成一个token
+            token = TokenGenerator.generateValue();
+
+            tokenEntity = new SysUserTokenEntity();
+            tokenEntity.setUserId(userId);
+            tokenEntity.setToken(token);
+            tokenEntity.setUpdateDate(now);
+            tokenEntity.setExpireDate(expireTime);
+
+            //保存token
+            this.insert(tokenEntity);
+        }else{
+            //判断是否允许同时登录,0：不允许，1：允许
+            //允许同时在线时返回同一token且不校验过期时间
+            if (allowSimultaneousLogin == 0 && tokenEntity.getExpireDate().getTime() < System.currentTimeMillis()) {
+                //token过期，重新生成token
+                token = TokenGenerator.generateValue();
+                tokenEntity.setToken(token);
+                tokenEntity.setUpdateDate(now);
+                tokenEntity.setExpireDate(expireTime);
+                //更新token
+                this.updateById(tokenEntity);
+            } else {
+                token = tokenEntity.getToken();
+            }
+
+        }
+
+        Map<String, Object> map = new HashMap<>(2);
+        map.put(Constant.TOKEN_HEADER, token);
+        map.put("expire", EXPIRE);
+        return new Result().ok(map);
+    }
+
 
     @Override
     public void logout(Long userId) {