|
@@ -16,6 +16,7 @@ import com.txz.cif.model.Account;
|
|
|
import com.txz.cif.model.User;
|
|
import com.txz.cif.model.User;
|
|
|
import com.txz.cif.service.AccountService;
|
|
import com.txz.cif.service.AccountService;
|
|
|
import com.txz.cif.service.CSHuaGuService;
|
|
import com.txz.cif.service.CSHuaGuService;
|
|
|
|
|
+import com.txz.cif.service.JPushService;
|
|
|
import com.txz.cif.service.UserService;
|
|
import com.txz.cif.service.UserService;
|
|
|
import com.txz.cif.web.para.UserAddParam;
|
|
import com.txz.cif.web.para.UserAddParam;
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -60,6 +61,9 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|
|
@Resource
|
|
@Resource
|
|
|
private CSHuaGuService csHuaGuService;
|
|
private CSHuaGuService csHuaGuService;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private JPushService jPushService;
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public Boolean checkMail(String email) {
|
|
public Boolean checkMail(String email) {
|
|
|
User user = findBy("email", email);
|
|
User user = findBy("email", email);
|
|
@@ -85,7 +89,8 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
|
String code = RandomUtil.randomNumbers(6);
|
|
String code = RandomUtil.randomNumbers(6);
|
|
|
- if (csHuaGuService.sendSmsValidCode(phoneNo, String.format(SMS_MESSAGE, code))) {
|
|
|
|
|
|
|
+ // if (csHuaGuService.sendSmsValidCode(phoneNo, String.format(SMS_MESSAGE, code))) {
|
|
|
|
|
+ if (jPushService.sendSms(phoneNo, code)) {
|
|
|
redisClient.set(key, code, 60 * 5);
|
|
redisClient.set(key, code, 60 * 5);
|
|
|
return Result.fail();
|
|
return Result.fail();
|
|
|
}
|
|
}
|