--no commit message

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

@@ -70,6 +70,7 @@ public class PermissionsController {
 			throw new ParameterValidateException(ResponseCodeEnum.MISS_EXCEPTION.getCode(), "验证码不能为空");
 		}
 		System.out.println(session.getId()+" login");
+		stringRedisTemplate.delete(name);
 		String errorCount = stringRedisTemplate.opsForValue().get(name);
 		if(StringUtils.isNotBlank(errorCount) && Integer.parseInt(errorCount) >=3){
 			throw new BusinessValidateException("密码错误次数过多");
@@ -95,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/fg/mapper/ad/FgAdspaceMapper.java

@@ -29,8 +29,8 @@ public interface FgAdspaceMapper extends BaseMapper<Adspace> {
 			+ " adspaceid AS id,adsignid,signvalue,url,picture,description,sysuserid,sysusername,"
 			+ " createtime,endtime,sort,STATUS,author,bookCover,issueTime,price,updatetime,linkType"
 			+ " FROM sys_adspace"
-			+ " WHERE status = 1 AND adsignid = (SELECT adsignid FROM sys_adsign WHERE signvalue = #{signValue}) "
-			+ " and STATUS=1 ")
+			+ " WHERE status = 1 AND adsignid = ifnull((SELECT adsignid FROM sys_adsign WHERE signvalue = #{signValue} and status = 1),0) "
+			+ " and (endtime is null or endtime >=  CURRENT_DATE) ")
 	List<Adspace> getAllBySignValue(String signValue);
 	
 	/**
@@ -40,11 +40,10 @@ public interface FgAdspaceMapper extends BaseMapper<Adspace> {
 	 * @author Conan
 	 * @date: 2018年8月15日 下午5:11:37
 	 */
-	@Select(" SELECT "
-			+ " adspaceid AS id,adsignid,signvalue,url,picture,description,sysuserid,sysusername,"
-			+ " createtime,endtime,sort,STATUS,author,bookCover,issueTime,price,updatetime,linkType"
-			+ " FROM sys_adspace"
-			+ " WHERE status = 1 AND adsignid = (SELECT adsignid FROM sys_adsign WHERE signvalue = #{form.signValue}) "
-			+ " and STATUS=1 ")
+	@Select(" SELECT adspaceid AS id,adsignid,signvalue,url,picture,description,sysuserid,sysusername,"
+			+ "createtime,endtime,sort,STATUS,author,bookCover,issueTime,price,updatetime,linkType "
+			+ "FROM sys_adspace "
+			+ "WHERE status = 1 AND adsignid = ifnull((SELECT adsignid FROM sys_adsign WHERE signvalue = #{form.signValue} and status = 1),0) "
+			+ "and (endtime is null or endtime >=  CURRENT_DATE) ")
 	List<Adspace> getBySignValue(@Param("form")FgQueryAdspaceForm form);
 }

com.zrqx.sysuser/src/main/java/com/zrqx/sysuser/fg/service/errorcorrect/FgErrorCorrectServiceImpl.java

@@ -30,7 +30,7 @@ public class FgErrorCorrectServiceImpl extends BaseServiceImpl<Correction, Integ
 		ec.setCreateTime(new Date());
 		ec.setCommitTime(new Date());
 		ec.setStatus(0);
-		ec.setName(fgRedisManage.getMember().getName());
+		ec.setName(fgRedisManage.getMember().getAccount());
 		if(insert(ec)){
 			return 1;
 		}