Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj
This commit is contained in:
-3
@@ -573,9 +573,6 @@ public class SaleLeadsController {
|
|||||||
System.out.println(mobile + " 验证码 【"+ code+"】");
|
System.out.println(mobile + " 验证码 【"+ code+"】");
|
||||||
//测试先去掉发短信
|
//测试先去掉发短信
|
||||||
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
||||||
if(FangjiaConfig.getConfig().isTestEnvironment()){
|
|
||||||
DingDingMessageUtil.sendTextMessage("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
|
||||||
}
|
|
||||||
resultModel.setResult(Message.RESULT_SUCCESS);
|
resultModel.setResult(Message.RESULT_SUCCESS);
|
||||||
CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code);
|
CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code);
|
||||||
CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime());
|
CacheUtils.putValue(CacheUtils.CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime());
|
||||||
|
|||||||
-6
@@ -168,9 +168,6 @@ public class UserController {
|
|||||||
String code = fangJiaUserService.randomCode();
|
String code = fangJiaUserService.randomCode();
|
||||||
try {
|
try {
|
||||||
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
||||||
if(FangjiaConfig.getConfig().isTestEnvironment()){
|
|
||||||
DingDingMessageUtil.sendTextMessage("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
|
||||||
}
|
|
||||||
smsSendLog = new SmsSendLog();
|
smsSendLog = new SmsSendLog();
|
||||||
smsSendLog.setContent("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
smsSendLog.setContent("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
||||||
smsSendLog.setMobile(model.getMobile());
|
smsSendLog.setMobile(model.getMobile());
|
||||||
@@ -520,9 +517,6 @@ public class UserController {
|
|||||||
|
|
||||||
CacheUtils.putValue(CachePolicyEnum.TODAY, FangJiaUserService.class, ip, ipVisitCount+1);
|
CacheUtils.putValue(CachePolicyEnum.TODAY, FangJiaUserService.class, ip, ipVisitCount+1);
|
||||||
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
smsService.send(model.getMobile(), "【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
||||||
if(FangjiaConfig.getConfig().isTestEnvironment()){
|
|
||||||
DingDingMessageUtil.sendTextMessage("【房价网】你的验证码是" + code + ",验证码5分钟内有效,请立即验证。");
|
|
||||||
}
|
|
||||||
resultModel.setResult(Message.RESULT_SUCCESS);
|
resultModel.setResult(Message.RESULT_SUCCESS);
|
||||||
CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code);
|
CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile + "_" + type, code);
|
||||||
CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime());
|
CacheUtils.putValue(CachePolicyEnum.TINY, FangJiaUserService.class, mobile, new Date().getTime());
|
||||||
|
|||||||
+1
-1
@@ -132,7 +132,7 @@ public class CitySellStatServiceImpl implements CitySellStatService {
|
|||||||
q.add(new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate));
|
q.add(new QueryParam("date", QueryParam.GREATER_THAN_EQUAL_OPERATOR, startDate));
|
||||||
|
|
||||||
List<SortParam> s = new ArrayList<SortParam>();
|
List<SortParam> s = new ArrayList<SortParam>();
|
||||||
s.add(new SortParam("date", false));
|
s.add(new SortParam("date", true));
|
||||||
return citySellStatDao.findAllByParams(q, s, count);
|
return citySellStatDao.findAllByParams(q, s, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user