Commit 58e2ab36 authored by m1991's avatar m1991

资讯模块数据——数据展示功能修复

parent 1ecc72e4
...@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -112,15 +113,16 @@ public interface UsersMapper extends BaseMapper<User> { ...@@ -112,15 +113,16 @@ public interface UsersMapper extends BaseMapper<User> {
/** /**
* 用户注册 * 用户注册
*
* @param userId * @param userId
* @param inviteCode * @param inviteCode
* @param beInvitedCode * @param beInvitedCode
* @param userLevel * @param userLevel
* @param createTime
* @param updateTime
*/ */
Integer save(@Param("userId") String userId, @Param("inviteCode") String inviteCode, @Param("beInvitedCode") String beInvitedCode, @Param("userLevel") Integer userLevel); Integer insertbyint(@Param("userId") String userId, @Param("inviteCode") String inviteCode, @Param("beInvitedCode") String beInvitedCode, @Param("userLevel") Integer userLevel);
Integer insertbyint(@Param("userId") String userId, @Param("beInvitedCode") String beInvitedCode); Integer save(@Param("userId") String userId, @Param("beInvitedCode") String beInvitedCode);
User edit1(int userLevel, String intiveCode, String userId); User edit1(int userLevel, String intiveCode, String userId);
......
...@@ -184,11 +184,11 @@ ...@@ -184,11 +184,11 @@
</select> </select>
<!--用户注册--> <!--用户注册-->
<insert id="save">
insert into user(user_id,invite_code,be_invited_code,user_level,create_time,update_time) value
(#{userId},#{inviteCode},#{beInvitedCode},#{userLevel}#{now()},#{now()})
</insert>
<insert id="insertbyint"> <insert id="insertbyint">
insert into user_info(user_id,invite_code,be_invited_code,user_level) value
(#{userId},#{inviteCode},#{beInvitedCode},#{userLevel})
</insert>
<insert id="save">
insert into user_info(user_id,be_invited_code) value (#{userId},#{beInvitedCode}) insert into user_info(user_id,be_invited_code) value (#{userId},#{beInvitedCode})
</insert> </insert>
......
...@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; ...@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
...@@ -115,24 +116,49 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U ...@@ -115,24 +116,49 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
map.put("msg", "该用户已存在!请直接登录!"); map.put("msg", "该用户已存在!请直接登录!");
return map; return map;
} }
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-ddhh:mm:ss");
Timestamp date = java.sql.Timestamp.valueOf("2012-12-1201:12:11");
System.out.println(date);
} catch (Exception e) {
e.printStackTrace();
}
/** /**
* 判断用户推荐人的邀请码是否为空,空的话填写1 || "" == beInvitedCode * 判断用户推荐人的邀请码是否为空,空的话填写1 || "" == beInvitedCode
*/ */
if ("".equals(beInvitedCode) || null==beInvitedCode) { if ("".equals(beInvitedCode) || null==beInvitedCode) {
//插入用户手机号与推荐人邀请码user_id,invite_code,be_invited_code,user_level,create_time,update_time
String inviteCode="0";
beInvitedCode = "1"; beInvitedCode = "1";
int userLevel=0;
//插入用户手机号与推荐人邀请码 usersMapper.insertbyint(userId, inviteCode,beInvitedCode,userLevel);
usersMapper.insertbyint(userId, beInvitedCode); registUserMoudleInit(userId);
} else if ("1".equals(beInvitedCode)) { } else if ("1".equals(beInvitedCode)) {
//用户的被邀请码,查询到推荐人用户,根据推荐人用户的邀请码查询/修改 //用户的被邀请码,查询到推荐人用户,根据推荐人用户的邀请码查询/修改
User user = usersMapper.getByBeInvitedCode(beInvitedCode); User user = usersMapper.getByBeInvitedCode(beInvitedCode);
int ida = user.getId();
// 邀请人的被邀请码 // 邀请人的被邀请码
String byqm = user.getBeInvitedCode(); String byqm = user.getBeInvitedCode();
// 通过被邀请码,比对本人邀请码查询本人id // 通过被邀请码,比对本人邀请码查询本人id
int idb = usersMapper.beInvitedCode1(beInvitedCode);
String idb = String.valueOf(usersMapper.beInvitedCode1(beInvitedCode));
//判断是否存在被邀请人的用户
if(null==usersMapper.beInvitedCode1(beInvitedCode)){
Map map = new HashMap();
R.error(1, "邀请码填写无效!邀请人不存在,请重新填写!");
map.put("code:", 1);
map.put("msg:", "邀请码填写无效!邀请人不存在,请重新填写!");
return map;
}
int idbc=Integer.valueOf(idb);
int ida = user.getId();
//判断被邀请用户的创建时间是否比推荐人的用户时间晚 //判断被邀请用户的创建时间是否比推荐人的用户时间晚
if (idb < ida) { if (idbc > ida) {
Map map = new HashMap(); Map map = new HashMap();
R.error(1, "注册失败!邀请码无效,请重新填写!"); R.error(1, "注册失败!邀请码无效,请重新填写!");
map.put("code:", 1); map.put("code:", 1);
......
...@@ -81,6 +81,8 @@ public class LoginController { ...@@ -81,6 +81,8 @@ public class LoginController {
//根据手机号判断用户是否存在 //根据手机号判断用户是否存在
//不存在则保存用户信息--修改为提示用户注册 //不存在则保存用户信息--修改为提示用户注册
users = usersService.queryUsersByPhone(userId); users = usersService.queryUsersByPhone(userId);
register(userId,"1",sms);
if (null == users) { if (null == users) {
//throw new BaseException(ResultEnum.FAIL_ACCOUNT_NOT_EXIST); //throw new BaseException(ResultEnum.FAIL_ACCOUNT_NOT_EXIST);
map.put("code", "1005"); map.put("code", "1005");
...@@ -102,6 +104,8 @@ public class LoginController { ...@@ -102,6 +104,8 @@ public class LoginController {
return (Map) ResultUtils.returnFail(); return (Map) ResultUtils.returnFail();
} }
public String createToken(User users) throws Exception { public String createToken(User users) throws Exception {
String token = StringUtil.createToken(); String token = StringUtil.createToken();
//保存token //保存token
...@@ -119,9 +123,9 @@ public class LoginController { ...@@ -119,9 +123,9 @@ public class LoginController {
String tokenKey = StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX, Constants.RedisKey.TOKEN_PRIFIX, token); String tokenKey = StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX, Constants.RedisKey.TOKEN_PRIFIX, token);
String userDtoJson = redisUtils.getValue(tokenKey); String userDtoJson = redisUtils.getValue(tokenKey);
if (StringUtil.isBlank(userDtoJson)) { if (StringUtil.isBlank(userDtoJson)) {
// Map map = new HashMap(); Map map = new HashMap();
// map.put("code", "2001"); map.put("code", "2001");
// map.put("msg", "未登录"); map.put("msg", "未登录");
return ResultUtils.returnFail("未登录"); return ResultUtils.returnFail("未登录");
} }
UsersDto usersDto = JSONObject.parseObject(userDtoJson, UsersDto.class); UsersDto usersDto = JSONObject.parseObject(userDtoJson, UsersDto.class);
......
package cn.wisenergy.web.shiro.filter; package cn.wisenergy.web.shiro.filter;
import cn.wisenergy.common.enums.RespCodeEnum; import cn.wisenergy.common.enums.RespCodeEnum;
import cn.wisenergy.common.utils.HttpContextUtils;
import cn.wisenergy.common.utils.exception.Result; import cn.wisenergy.common.utils.exception.Result;
import cn.wisenergy.web.shiro.AuthToken; import cn.wisenergy.web.shiro.AuthToken;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter; import org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -42,7 +39,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { ...@@ -42,7 +39,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
@Override @Override
protected AuthenticationToken createToken(ServletRequest request, ServletResponse response) { protected AuthenticationToken createToken(ServletRequest request, ServletResponse response) {
//获取请求token //获取请求token
String token = ((HttpServletRequest) request).getHeader("Authorization"); String token = ((HttpServletRequest) request).getHeader("token");
if (StringUtils.isBlank(token)) { if (StringUtils.isBlank(token)) {
return null; return null;
} }
...@@ -73,7 +70,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { ...@@ -73,7 +70,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
@Override @Override
protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) { protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) {
HttpServletRequest req = (HttpServletRequest) request; HttpServletRequest req = (HttpServletRequest) request;
String authorization = req.getHeader("Authorization"); String authorization = req.getHeader("token");
return authorization != null; return authorization != null;
} }
...@@ -84,11 +81,11 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { ...@@ -84,11 +81,11 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
protected boolean executeLogin(ServletRequest servletRequest, ServletResponse servletResponse) { protected boolean executeLogin(ServletRequest servletRequest, ServletResponse servletResponse) {
HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletRequest request = (HttpServletRequest) servletRequest;
String authorization = getRequestToken(request); String authorization = getRequestToken(request);
if (StringUtils.isNotBlank(authorization)) { /* if (StringUtils.isNotBlank(authorization)) {
if (authorization.startsWith("Bearer ")) { if (authorization.startsWith("Bearer ")) {
authorization = authorization.substring(7); authorization = authorization.substring(7);
} }
} }*/
AuthToken token = new AuthToken(authorization); AuthToken token = new AuthToken(authorization);
// 提交给realm进行登入,如果错误他会抛出异常并被捕获 // 提交给realm进行登入,如果错误他会抛出异常并被捕获
...@@ -161,7 +158,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter { ...@@ -161,7 +158,7 @@ public class JwtFilter extends BasicHttpAuthenticationFilter {
*/ */
private String getRequestToken(HttpServletRequest httpRequest) { private String getRequestToken(HttpServletRequest httpRequest) {
//从header中获取token //从header中获取token
return httpRequest.getHeader("Authorization"); return httpRequest.getHeader("token");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment