--no commit message

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/controller/permissions/PermissionsController.java

@@ -96,7 +96,7 @@ public class PermissionsController {
 					name, StringUtils.isBlank(errorCount) ? "1" : Integer.parseInt(errorCount)+1+"",60*60*24,TimeUnit.SECONDS);*/
 			throw new BusinessValidateException("账号或密码错误");
 		}
-		//stringRedisTemplate.delete(name);//临时关闭错误三次封停账号
+		stringRedisTemplate.delete(name);//临时关闭错误三次封停账号
 		user.setPassword(null);
 		user.setToken(UUIDUtil.getUUID());
 		stringRedisTemplate.opsForValue().set(user.getToken(), JsonUtil.bean2Json(user),60*60*24*7,TimeUnit.SECONDS);

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/diytype/DiyTypeMapper.java

+package com.zrqx.sysuser.bg.mapper.diytype;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.resource.diytype.DiyType;
+/**
+ * 自定义分类
+ */
+public interface DiyTypeMapper extends BaseMapper<DiyType> {
+	/**
+	 * 查询排序号最大值
+	 * @return
+	 */
+	@Select("select sort from res_Diy_Type where parentId = #{id} ")
+	Integer getMaxOrderNum(Integer id);
+	
+	/**
+	 * 修改排序号
+	 * @return
+	 */
+	@Update("update res_Diy_Type set sort = #{sort}  where parentId = #{id}")
+	Integer updateSortByPrimaryKey(@Param("sort")Integer sort,@Param("id")Integer id);
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/diytype/DiyTypeService.java

+package com.zrqx.sysuser.bg.service.diytype;
+
+import java.util.List;
+
+import com.zrqx.core.model.resource.diytype.DiyType;
+import com.zrqx.core.service.BaseService;
+/**
+ * 
+ * 自定义分类service
+ */
+public interface DiyTypeService extends BaseService<DiyType,Integer>{
+	/**
+	 * 查询当前最大排序号
+	 * @param id
+	 * @return
+	 */
+	Integer getMaxOrderNum(Integer id);
+	/**
+	 * 修改排序
+	 * @param ids
+	 */
+	void updateSortByPrimaryKey(List<Integer> ids);
+	/**
+	 * 修改排序
+	 * @param ids
+	 */
+	void updateSortByPrimaryKey(Integer sort,Integer id);
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/bg/service/diytype/DiyTypeServiceImpl.java

+package com.zrqx.sysuser.bg.service.diytype;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.github.pagehelper.PageHelper;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.resource.diytype.DiyType;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.sysuser.bg.mapper.diytype.DiyTypeMapper;
+
+/**
+ * 自定义分类
+ */
+@Service
+public class DiyTypeServiceImpl extends BaseServiceImpl<DiyType,Integer> implements DiyTypeService {
+
+	@Autowired
+	private DiyTypeMapper mapper;
+	@Override
+	public BaseMapper<DiyType> getMapper() {
+		return mapper;
+	}
+
+	@Override
+	public Integer getMaxOrderNum(Integer id) {
+		PageHelper.startPage(1, 1, "sort desc");
+		Integer maxOrderNum = mapper.getMaxOrderNum(id);
+		return maxOrderNum == null ? 0 : maxOrderNum;
+	}
+
+	@Override
+	public void updateSortByPrimaryKey(List<Integer> ids) {
+		for (int i = 0; i < ids.size(); i++) {
+			mapper.updateSortByPrimaryKey(i, ids.get(i));
+		}
+	}
+
+	@Override
+	public void updateSortByPrimaryKey(Integer sort, Integer id) {
+		mapper.updateSortByPrimaryKey(sort, id);
+	}
+
+
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/commons/redis/Redis.java

@@ -19,6 +19,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import com.alibaba.fastjson.JSON;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.sysuser.fg.user.LoginUserInfo;
 import com.zrqx.core.model.sysuser.user.User;
 import com.zrqx.core.util.JsonUtil.JsonUtil;
 
@@ -53,6 +54,14 @@ public class Redis {
 	public User getUser() {
 		return getInfoObjectRedis(getBgToken(), User.class);
 	}
+	/**
+	 * 获取前台登录用户信息
+	 * 
+	 * @return
+	 */
+	public LoginUserInfo getMember() {
+		return getInfoObjectRedis(getToken(FG_TOKEN), LoginUserInfo.class);
+	}
 	
 	public boolean isExistMember() {
 		try {

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/controller/permissions/FgPermissionsController.java

+package com.zrqx.sysuser.fg.controller.permissions;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.constant.sysuser.SysUserRequestPath;
+import com.zrqx.core.enums.StatusEnum;
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.sysuser.fg.user.LoginForm;
+import com.zrqx.core.form.sysuser.fg.user.LoginUserInfo;
+import com.zrqx.core.model.sysuser.user.User;
+import com.zrqx.core.util.JsonUtil.JsonUtil;
+import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.datatype.UUIDUtil;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.sysuser.commons.redis.Redis;
+import com.zrqx.sysuser.fg.service.user.FgUserService;
+
+/**
+ * 登录Controller
+ */
+@RestController
+@RequestMapping(SysUserRequestPath.FG+SysUserRequestPath.PERMISSIONS)
+@Api(description = "前台登陆")
+public class FgPermissionsController {
+	private final static Logger logger = LoggerFactory.getLogger(FgPermissionsController.class);
+	
+	@Autowired
+	private FgUserService userService;
+	
+	@Autowired
+	StringRedisTemplate stringRedisTemplate;
+	
+	@Autowired
+	private Redis redis;
+	
+	@ApiOperation(value = "前台用户登录" , notes = "0：登录成功；1：账号或密码不能为空；4：账号或密码错误；5：该账户已禁用;")
+	@GetMapping(value = SysUserRequestPath.LOGIN)
+	public CallBack<LoginUserInfo> login(@RequestBody LoginForm form, HttpServletRequest request) throws BaseException, Exception{
+		if (StringUtils.isBlank(form.getUserName()) || StringUtils.isBlank(form.getPassword())) {
+			throw new BaseException(1,"账号或密码不能为空");
+		}
+		
+		User user = userService.login(form.getUserName());
+		if(user == null){
+			throw new BaseException(4,"账号或密码错误");
+		}
+		if(user.getStatus() == StatusEnum.DISABLE.getCode()){
+			throw new BaseException(5,"账号已被禁用，请联系网站管理员！");
+		}
+		if(StringUtils.isBlank(form.getPassword()) || !form.getPassword().toLowerCase().equals(user.getPassword().toLowerCase())){
+			throw new BaseException(4,"账号或密码错误");
+		}
+		LoginUserInfo info = new LoginUserInfo();
+		BeanUtils.copyProperties(user, info);
+		info.setToken(UUIDUtil.getUUID());
+		stringRedisTemplate.opsForValue().set(info.getToken(), JsonUtil.bean2Json(info),60*60*24*7,TimeUnit.SECONDS);
+		
+		return CallBack.success(info);
+	}
+	
+	
+	@ApiOperation(value = "前台用户登出", notes = "前台用户登出")
+	@GetMapping(value = SysUserRequestPath.LOGOUT)
+	public CallBack<Boolean> logout() throws IOException {
+		redis.delete(Redis.getFgToken());
+		return CallBack.success(true);
+	}
+	
+
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/mapper/user/FgUserMapper.java

+package com.zrqx.sysuser.fg.mapper.user;
+
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.user.User;
+
+public interface FgUserMapper extends BaseMapper<User> {
+	/**
+	 * 登录接口
+	 * @param userName
+	 * @return
+	 */
+	@Select("select userId,userName,name,password,phone,email,img,isAdmin,status from sys_user where userName = #{userName}")
+	User login (String userName);
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/user/FgUserService.java

+package com.zrqx.sysuser.fg.service.user;
+
+import com.zrqx.core.model.sysuser.user.User;
+import com.zrqx.core.service.BaseService;
+
+public interface FgUserService extends BaseService<User,String> {
+
+	/**
+	 * 登录
+	 * @param userName
+	 * @return
+	 */
+	User login(String userName);
+}

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/user/FgUserServiceImpl.java

+package com.zrqx.sysuser.fg.service.user;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.user.User;
+import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.sysuser.fg.mapper.user.FgUserMapper;
+/**
+ * 用户
+ *
+ */
+@Service
+public class FgUserServiceImpl extends BaseServiceImpl<User,String> implements FgUserService {
+	private final static Logger logger = LoggerFactory.getLogger(FgUserServiceImpl.class);
+	
+	@Autowired
+	private FgUserMapper mapper;
+
+	@Override
+	public BaseMapper<User> getMapper() {
+		return mapper;
+	}
+
+	/**
+	 * 登录
+	 * @param userName
+	 * @return
+	 */
+	@Override
+	public User login(String userName) {
+		return mapper.login(userName);
+	}
+	
+}