add usertoken alone login

src/main/java/com/xc/controller/UserApiController.java

@@ -59,7 +59,7 @@ public class UserApiController {
     @ResponseBody
     public ServerResponse reg(@RequestParam("agentCode") String agentCode, @RequestParam("phone") String phone, @RequestParam(value = "yzmCode", defaultValue = "") String yzmCode, @RequestParam("userPwd") String userPwd, HttpServletRequest httpServletRequest) {
         return this.iUserService.reg(yzmCode, agentCode, phone, userPwd, httpServletRequest);
-}
+    }
 
     //登录
     @RequestMapping(value = {"login.do"}, method = {RequestMethod.POST})
@@ -67,21 +67,21 @@ public class UserApiController {
     public ServerResponse login(@RequestParam("phone") String phone, @RequestParam("userPwd") String userPwd, HttpServletRequest request, HttpServletResponse response) throws Exception {
 //        String pc_cookie_name = PropertiesUtil.getProperty("user.cookie.name");
         ServerResponse serverResponse = this.iUserService.login(phone, userPwd, request);
-        if (serverResponse.isSuccess()) {
+//        if (serverResponse.isSuccess()) {
 //            CookieUtils.writeLoginToken(response, token, pc_cookie_name);
 //            String redisSetExResult = RedisShardedPoolUtils.setEx(token, JsonUtil.obj2String(serverResponse.getData()), 5400);
 //            Long a = RedisShardedPoolUtils.expire(token,10);
-//            System.out.println(a+"u1s1");
-//            log.info("redis setex user result : {}", redisSetExResult);
-            User user = (User) serverResponse.getData();
-//            String tokenKey = RedisConst.getTokenRedisKey(user.getId());
-            String token = TokenUtils.token(user.getPhone(), user.getUserPwd());
-            UserLoginResultVO resultVO = new UserLoginResultVO();
 //            resultVO.setKey(pc_cookie_name);
-            resultVO.setToken(token);
-            RedisShardedPoolUtils.setEx(token, JsonUtil.obj2String(serverResponse.getData()), 5400);
-            return ServerResponse.createBySuccess("登陆成功", resultVO);
-        }
+//            log.info("redis setex user result : {}", redisSetExResult);
+//            User user = (User) serverResponse.getData();
+////            String tokenKey = RedisConst.getTokenRedisKey(user.getId());
+//            String token = TokenUtils.token(user.getPhone(), user.getUserPwd());
+//            UserLoginResultVO resultVO = new UserLoginResultVO();
+//
+//            resultVO.setToken(token);
+//            RedisShardedPoolUtils.setEx(token, JsonUtil.obj2String(serverResponse.getData()), 5400);
+//            return ServerResponse.createBySuccess("登陆成功", resultVO);
+//        }
         return serverResponse;
     }
 

src/main/java/com/xc/dao/SiteSettingMapper.java

@@ -5,16 +5,19 @@ import java.util.List;
 
 public interface SiteSettingMapper {
   int deleteByPrimaryKey(Integer paramInteger);
-  
+
   int insert(SiteSetting paramSiteSetting);
-  
+
   int insertSelective(SiteSetting paramSiteSetting);
-  
+
   SiteSetting selectByPrimaryKey(Integer paramInteger);
-  
+
   int updateByPrimaryKeySelective(SiteSetting paramSiteSetting);
-  
+
   int updateByPrimaryKey(SiteSetting paramSiteSetting);
-  
+
   List findAllSiteSetting();
+
+  int findIsAloneLogin();
+
 }

src/main/java/com/xc/dao/UserTokenMapper.java

@@ -0,0 +1,20 @@
+package com.xc.dao;
+
+import com.xc.pojo.UserToken;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface UserTokenMapper {
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(UserToken record);
+
+    UserToken selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(UserToken record);
+
+    List<UserToken> findTokenByUserId(@Param("userId") Integer userId);
+
+}

src/main/java/com/xc/pojo/UserToken.java

@@ -0,0 +1,38 @@
+package com.xc.pojo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class UserToken {
+    private Integer id;
+
+    private Integer userId;
+
+    private String token;
+
+    private Integer status;
+
+    private String eqType;
+
+    private Date addTime;
+
+    private Date updateTime;
+
+    public UserToken(Integer id, Integer userId, String token, Integer status, String eqType, Date addTime, Date updateTime) {
+        this.id = id;
+        this.userId = userId;
+        this.token = token;
+        this.status = status;
+        this.eqType = eqType;
+        this.addTime = addTime;
+        this.updateTime = updateTime;
+    }
+
+    public UserToken() {
+
+    }
+
+
+}

src/main/java/com/xc/service/impl/SiteLoginLogServiceImpl.java

@@ -36,13 +36,11 @@ public class SiteLoginLogServiceImpl
         siteLoginLog.setUserId(user.getId());
         siteLoginLog.setUserName(user.getRealName());
         String ips = IpUtils.getIp(request);
-
         siteLoginLog.setLoginIp(ips);
-        String ip_address = JuheIpApi.ip2Add(ips);
-        siteLoginLog.setLoginAddress(ip_address);
+//        String ip_address = JuheIpApi.ip2Add(ips);
+        siteLoginLog.setLoginAddress("地址不详");
         siteLoginLog.setAddTime(new Date());
         this.siteLoginLogMapper.insert(siteLoginLog);
-
         return ServerResponse.createBySuccess();
     }
 

src/main/java/com/xc/service/impl/UserServiceImpl.java

@@ -9,6 +9,7 @@ import com.xc.pojo.*;
 import com.xc.service.*;
 import com.xc.utils.IndexDbCreatedUtil;
 import com.xc.utils.PropertiesUtil;
+import com.xc.utils.TokenUtils;
 import com.xc.utils.ip.IpUtils;
 import com.xc.utils.ip.JuheIpApi;
 import com.xc.utils.redis.CookieUtils;
@@ -28,6 +29,8 @@ import java.math.RoundingMode;
 import java.util.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+
+import com.xc.vo.user.UserLoginResultVO;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -97,6 +100,12 @@ public class UserServiceImpl implements IUserService {
     @Autowired
     private IUserPositionService userPositionService;
 
+    @Autowired
+    SiteSettingMapper siteSettingMapper;
+
+    @Autowired
+    UserTokenMapper userTokenMapper;
+
     public ServerResponse reg(String yzmCode, String agentCode, String phone, String userPwd, HttpServletRequest request) {
         if (StringUtils.isBlank(agentCode) || StringUtils.isBlank(phone) ||
                 StringUtils.isBlank(userPwd) || StringUtils.isBlank(yzmCode))
@@ -125,15 +134,15 @@ public class UserServiceImpl implements IUserService {
         user.setAgentName(agentUser.getAgentName());
         user.setPhone(phone);
         user.setUserPwd(userPwd);
-        user.setAccountType(Integer.valueOf(0));
-        user.setIsLock(Integer.valueOf(1));
-        user.setIsActive(Integer.valueOf(0));
+        user.setAccountType(0);
+        user.setIsLock(1);
+        user.setIsActive(0);
         user.setRegTime(new Date());
         String uip = IpUtils.getIp(request);
         user.setRegIp(uip);
-        String uadd = JuheIpApi.ip2Add(uip);
-        user.setRegAddress(uadd);
-        user.setIsLogin(Integer.valueOf(0));
+//        String uadd = JuheIpApi.ip2Add(uip);
+        user.setRegAddress("地址不详");
+        user.setIsLogin(0);
         user.setUserAmt(new BigDecimal("0"));
         user.setEnableAmt(new BigDecimal("0"));
         user.setUserIndexAmt(new BigDecimal("0"));
@@ -144,7 +153,7 @@ public class UserServiceImpl implements IUserService {
         user.setSumChargeAmt(new BigDecimal("0"));
         int insertCount = this.userMapper.insert(user);
         if (insertCount > 0) {
-            log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[] { phone, uip, uadd });
+            log.info("用户注册成功 手机 {} , ip = {}", new Object[] { phone, uip });
 //            if (user.getAccountType() !=1){
 //                //            addSimulatedAccount();
 ////            user.setUserPwd("123456");
@@ -175,27 +184,50 @@ public class UserServiceImpl implements IUserService {
         return ServerResponse.createBySuccessMsg("注册出错, 请重试");
     }
 
-
-
+    /**
+     * 登录
+     * @param phone
+     * @param userPwd
+     * @param request
+     * @return
+     */
     public ServerResponse login(String phone, String userPwd, HttpServletRequest request) {
         if (StringUtils.isBlank(phone) || StringUtils.isBlank(userPwd)) {
             return ServerResponse.createByErrorMsg("手机号和密码不能为空");
         }
-
         User user = this.userMapper.login(phone, userPwd);
         if (user != null) {
-            if (user.getIsLogin().intValue() == 1) {
+            if (user.getIsLogin() == 1) {
                 return ServerResponse.createByErrorMsg("登陆失败, 账户被锁定");
             }
-
-            log.info("用户{}登陆成功, 登陆状态{} ,交易状态{}", new Object[] { user.getId(), user.getIsLogin(), user.getIsLock() });
-
+            int isAloneLogin = siteSettingMapper.findIsAloneLogin();
+            if(isAloneLogin != 0){
+                //清除该用户的token
+                List<UserToken> list = userTokenMapper.findTokenByUserId(user.getId());
+                log.info("单设备登录, 删除用户旧token{}条", list.size());
+                for (UserToken userToken : list){
+                    RedisShardedPoolUtils.del(userToken.getToken());
+                    userTokenMapper.deleteByPrimaryKey(userToken.getId());
+                }
+            }
+            log.info("用户{}登陆成功, 登陆状态{} ,交易状态{}", user.getId(), user.getIsLogin(), user.getIsLock());
+            String token = TokenUtils.token(user.getPhone(), user.getUserPwd());
+            UserLoginResultVO resultVO = new UserLoginResultVO();
+            resultVO.setToken(token);
+            RedisShardedPoolUtils.setEx(token, JsonUtil.obj2String(user), 5400);
             this.iSiteLoginLogService.saveLog(user, request);
-            return ServerResponse.createBySuccess(user);
+            UserToken userToken = new UserToken();
+            userToken.setUserId(user.getId());
+            userToken.setToken(token);
+            userToken.setStatus(1);
+            userTokenMapper.insert(userToken);
+            return ServerResponse.createBySuccess("登陆成功", resultVO);
         }
         return ServerResponse.createByErrorMsg("登陆失败，用户名密码错误");
     }
 
+
+
     public User getCurrentUser(HttpServletRequest request) {
 //        String loginToken = CookieUtils.readLoginToken(request, PropertiesUtil.getProperty("user.cookie.name"));
         String token = request.getHeader("token");

src/main/java/mappers/SiteSettingMapper.xml

@@ -37,20 +37,20 @@
       <arg column="kc_crease_max_percent" jdbcType="DECIMAL" javaType="java.math.BigDecimal" />
       <arg column="stock_days" jdbcType="INTEGER" javaType="java.lang.Integer" />
       <arg column="stock_rate" jdbcType="DECIMAL" javaType="java.math.BigDecimal" />
-
+      <arg column="is_alone_login" jdbcType="INTEGER" javaType="java.lang.Integer" />
     </constructor>
   </resultMap>
 
   <sql id="Base_Column_List" >
-    id, buy_fee, sell_fee, stay_fee, duty_fee, stay_max_days, buy_min_amt, charge_min_amt, 
-    buy_min_num, force_stop_fee, buy_max_amt_percent, force_stop_percent, hight_and_low, 
-    with_min_amt, crease_max_percent, buy_max_num, with_time_begin, with_time_end, trans_am_begin, 
+    id, buy_fee, sell_fee, stay_fee, duty_fee, stay_max_days, buy_min_amt, charge_min_amt,
+    buy_min_num, force_stop_fee, buy_max_amt_percent, force_stop_percent, hight_and_low,
+    with_min_amt, crease_max_percent, buy_max_num, with_time_begin, with_time_end, trans_am_begin,
     trans_am_end, trans_pm_begin, trans_pm_end, with_fee_single, with_fee_percent, site_lever,
     buy_same_times,buy_same_nums,buy_num_times,buy_num_lots,cant_sell_times,
-    kc_crease_max_percent,stock_days,stock_rate
+    kc_crease_max_percent,stock_days,stock_rate ,is_alone_login
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from site_setting
     where id = #{id,jdbcType=INTEGER}
@@ -60,28 +60,29 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.xc.pojo.SiteSetting" >
-    insert into site_setting (id, buy_fee, sell_fee, 
-      stay_fee, duty_fee, stay_max_days, 
-      buy_min_amt, charge_min_amt, buy_min_num, 
-      force_stop_fee, buy_max_amt_percent, force_stop_percent, 
-      hight_and_low, with_min_amt, crease_max_percent, 
-      buy_max_num, with_time_begin, with_time_end, 
-      trans_am_begin, trans_am_end, trans_pm_begin, 
+    insert into site_setting (id, buy_fee, sell_fee,
+      stay_fee, duty_fee, stay_max_days,
+      buy_min_amt, charge_min_amt, buy_min_num,
+      force_stop_fee, buy_max_amt_percent, force_stop_percent,
+      hight_and_low, with_min_amt, crease_max_percent,
+      buy_max_num, with_time_begin, with_time_end,
+      trans_am_begin, trans_am_end, trans_pm_begin,
       trans_pm_end, with_fee_single, with_fee_percent,
       site_lever,buy_same_times,buy_same_nums,buy_num_times,buy_num_lots,cant_sell_times,
-      kc_crease_max_percent,stock_days,stock_rate
+      kc_crease_max_percent,stock_days,stock_rate ,is_alone_login
       )
-    values (#{id,jdbcType=INTEGER}, #{buyFee,jdbcType=DECIMAL}, #{sellFee,jdbcType=DECIMAL}, 
-      #{stayFee,jdbcType=DECIMAL}, #{dutyFee,jdbcType=DECIMAL}, #{stayMaxDays,jdbcType=INTEGER}, 
-      #{buyMinAmt,jdbcType=INTEGER}, #{chargeMinAmt,jdbcType=INTEGER}, #{buyMinNum,jdbcType=INTEGER}, 
-      #{forceStopFee,jdbcType=DECIMAL}, #{buyMaxAmtPercent,jdbcType=DECIMAL}, #{forceStopPercent,jdbcType=DECIMAL}, 
-      #{hightAndLow,jdbcType=DECIMAL}, #{withMinAmt,jdbcType=INTEGER}, #{creaseMaxPercent,jdbcType=DECIMAL}, 
-      #{buyMaxNum,jdbcType=INTEGER}, #{withTimeBegin,jdbcType=INTEGER}, #{withTimeEnd,jdbcType=INTEGER}, 
-      #{transAmBegin,jdbcType=VARCHAR}, #{transAmEnd,jdbcType=VARCHAR}, #{transPmBegin,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{buyFee,jdbcType=DECIMAL}, #{sellFee,jdbcType=DECIMAL},
+      #{stayFee,jdbcType=DECIMAL}, #{dutyFee,jdbcType=DECIMAL}, #{stayMaxDays,jdbcType=INTEGER},
+      #{buyMinAmt,jdbcType=INTEGER}, #{chargeMinAmt,jdbcType=INTEGER}, #{buyMinNum,jdbcType=INTEGER},
+      #{forceStopFee,jdbcType=DECIMAL}, #{buyMaxAmtPercent,jdbcType=DECIMAL}, #{forceStopPercent,jdbcType=DECIMAL},
+      #{hightAndLow,jdbcType=DECIMAL}, #{withMinAmt,jdbcType=INTEGER}, #{creaseMaxPercent,jdbcType=DECIMAL},
+      #{buyMaxNum,jdbcType=INTEGER}, #{withTimeBegin,jdbcType=INTEGER}, #{withTimeEnd,jdbcType=INTEGER},
+      #{transAmBegin,jdbcType=VARCHAR}, #{transAmEnd,jdbcType=VARCHAR}, #{transPmBegin,jdbcType=VARCHAR},
       #{transPmEnd,jdbcType=VARCHAR}, #{withFeeSingle,jdbcType=INTEGER}, #{withFeePercent,jdbcType=DECIMAL},
       #{siteLever,jdbcType=INTEGER},#{buySameTimes,jdbcType=INTEGER},#{buySameNums,jdbcType=INTEGER},
       #{buyNumTimes,jdbcType=INTEGER},#{buyNumLots,jdbcType=INTEGER},#{cantSellTimes,jdbcType=INTEGER},
-      #{kcCreaseMaxPercent,jdbcType=DECIMAL},#{stockDays,jdbcType=INTEGER},#{stockRate,jdbcType=DECIMAL}
+      #{kcCreaseMaxPercent,jdbcType=DECIMAL},#{stockDays,jdbcType=INTEGER},#{stockRate,jdbcType=DECIMAL},
+      #{isAloneLogin,jdbcType=INTEGER}
       )
   </insert>
 
@@ -394,6 +395,9 @@
       <if test="stockRate != null" >
         stock_rate = #{stockRate,jdbcType=DECIMAL},
       </if>
+      <if test="isAloneLogin != null" >
+        is_alone_login = #{isAloneLogin,jdbcType=INTEGER},
+      </if>
 
     </set>
 
@@ -440,16 +444,17 @@
   </update>
 
 
-
-
-
   <select id="findAllSiteSetting" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
     FROM site_setting
   </select>
 
+  <select id="findIsAloneLogin" resultType="INTEGER">
+    SELECT
+    is_alone_login
+    FROM site_setting
+  </select>
 
 
-
-</mapper>
+</mapper>

src/main/java/mappers/UserTokenMapper.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xc.dao.UserTokenMapper" >
+  <resultMap id="BaseResultMap" type="com.xc.pojo.UserToken" >
+    <constructor >
+      <idArg column="id" jdbcType="INTEGER" javaType="java.lang.Integer" />
+      <arg column="userId" jdbcType="INTEGER" javaType="java.lang.Integer" />
+      <arg column="token" jdbcType="VARCHAR" javaType="java.lang.String" />
+      <arg column="status" jdbcType="INTEGER" javaType="java.lang.Integer" />
+      <arg column="eq_type" jdbcType="VARCHAR" javaType="java.lang.String" />
+      <arg column="add_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
+      <arg column="update_time" jdbcType="TIMESTAMP" javaType="java.util.Date" />
+    </constructor>
+  </resultMap>
+
+  <sql id="Base_Column_List" >
+    id, userId, token, status, eq_type, add_time, update_time
+  </sql>
+
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from user_token
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+
+  <select id="findTokenByUserId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from user_token
+    where userId = #{userId,jdbcType=INTEGER}
+  </select>
+
+
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from user_token
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+
+  <insert id="insert" parameterType="com.xc.pojo.UserToken" >
+    insert into user_token (id, userId, token,
+      status, eq_type, add_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{token,jdbcType=VARCHAR},
+      #{status,jdbcType=BIT}, #{eqType,jdbcType=VARCHAR}, now()
+    )
+  </insert>
+
+
+  <update id="updateByPrimaryKeySelective" parameterType="com.xc.pojo.UserToken" >
+    update user_token
+    <set >
+      <if test="userId != null" >
+        userId = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="token != null" >
+        token = #{token,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="eqType != null" >
+        eq_type = #{eqType,jdbcType=VARCHAR},
+      </if>
+      <if test="addTime != null" >
+        add_time = #{addTime,jdbcType=TIMESTAMP},
+      </if>
+        update_time = now()
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+
+
+</mapper>

src/main/resources/datasource.properties

@@ -1,12 +1,12 @@
-#db.driverLocation=/Users/xiongcan/Desktop/mysql-connector-java-5.1.6.jar
+db.driverLocation=E:/bitcoin/stock_zs/target/stock2c1/WEB-INF/lib/mysql-connector-java-5.1.6.jar
 db.driverClassName=com.mysql.jdbc.Driver
 
 #新
 #db.url=jdbc:mysql://127.0.0.1:3306/zhishu?characterEncoding=utf-8
 #db.username=zhishu
 #db.password=stock2chen
-db.url=jdbc:mysql://127.0.0.1:3306/stock2coin?characterEncoding=utf-8
-#db.url=jdbc:mysql://101.32.39.134:3306/stock2coin?characterEncoding=utf-8
+#db.url=jdbc:mysql://127.0.0.1:3306/stock2coin?characterEncoding=utf-8
+db.url=jdbc:mysql://101.32.39.134:3306/stock2coin?characterEncoding=utf-8
 db.username=root
 db.password=S5Y2M8MtsRx5RcJG
 

src/main/resources/generatorConfig.xml

@@ -211,4 +211,4 @@
 
 
     </context>
-</generatorConfiguration>
+</generatorConfiguration>

src/main/resources/logback.xml

@@ -57,24 +57,23 @@
     </logger>
 
     <!-- geelynote mybatis log 日志 -->
-    <logger name="com.xc.dao" level="DEBUG"/>
 
-
-    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG" >
-        <appender-ref ref="console"/>
-    </logger>
-    <logger name="java.sql.Connection" level="DEBUG">
-        <appender-ref ref="console"/>
-    </logger>
-    <logger name="java.sql.Statement" level="DEBUG">
-        <appender-ref ref="console"/>
-    </logger>
-    <logger name="java.sql.PreparedStatement" level="DEBUG">
-        <appender-ref ref="console"/>
-    </logger>
+<!--    <logger name="com.xc.dao" level="DEBUG"/>-->
+<!--    <logger name="com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate" level="DEBUG" >-->
+<!--        <appender-ref ref="console"/>-->
+<!--    </logger>-->
+<!--    <logger name="java.sql.Connection" level="DEBUG">-->
+<!--        <appender-ref ref="console"/>-->
+<!--    </logger>-->
+<!--    <logger name="java.sql.Statement" level="DEBUG">-->
+<!--        <appender-ref ref="console"/>-->
+<!--    </logger>-->
+<!--    <logger name="java.sql.PreparedStatement" level="DEBUG">-->
+<!--        <appender-ref ref="console"/>-->
+<!--    </logger>-->
 
     <!--这里设置成DEBUG显示日志-->
-    <root level="DEBUG">
+    <root level="INFO">
         <appender-ref ref="console"/>
         <appender-ref ref="error"/>
     </root>