Commit def7f323 authored by xuxin's avatar xuxin

限制部分手机号注册送体验金

记住用户密码
parent ddf44f85
...@@ -4,11 +4,18 @@ public class IpChargeRequestDto { ...@@ -4,11 +4,18 @@ public class IpChargeRequestDto {
private int period; private int period;
private int amount; private int amount;
private String region; private String region;
private String unit="month"; private String unit = "month";
private String target; private String target;
//0 -- 充值, 1 -- newip, 2 --renew, 3 -- 退还 //0 -- 充值, 1 -- newip, 2 --renew, 3 -- 退还
private int chargeType = 0; private int chargeType = 0;
/**
* 续费ip
*/
private String chargeIp;
//0 -- 余额, 1 -- 支付宝, 2 -- 微信 //0 -- 余额, 1 -- 支付宝, 2 -- 微信
private int payMethod = 0; private int payMethod = 0;
...@@ -97,4 +104,12 @@ public class IpChargeRequestDto { ...@@ -97,4 +104,12 @@ public class IpChargeRequestDto {
public void setPayMethod(int payMethod) { public void setPayMethod(int payMethod) {
this.payMethod = payMethod; this.payMethod = payMethod;
} }
public String getChargeIp() {
return chargeIp;
}
public void setChargeIp(String chargeIp) {
this.chargeIp = chargeIp;
}
} }
package com.edgec.browserbackend.account.domain; package com.edgec.browserbackend.account.domain;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.index.CompoundIndex; import org.springframework.data.mongodb.core.index.CompoundIndex;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
...@@ -46,6 +45,11 @@ public class UserPrePaidBilling { ...@@ -46,6 +45,11 @@ public class UserPrePaidBilling {
//0 -- 充值, 1 -- newip, 2 -- renew, 3 -- return, 4 -- 礼金提现 //0 -- 充值, 1 -- newip, 2 -- renew, 3 -- return, 4 -- 礼金提现
private int chargeType; private int chargeType;
/**
* 购买或者续费的ip 号
*/
private String chargeIp;
private String unit = "month"; private String unit = "month";
private String administrator; private String administrator;
...@@ -209,4 +213,12 @@ public class UserPrePaidBilling { ...@@ -209,4 +213,12 @@ public class UserPrePaidBilling {
public void setBalanced(float balanced) { public void setBalanced(float balanced) {
this.balanced = balanced; this.balanced = balanced;
} }
public String getChargeIp() {
return chargeIp;
}
public void setChargeIp(String chargeIp) {
this.chargeIp = chargeIp;
}
} }
...@@ -7,6 +7,8 @@ import com.edgec.browserbackend.auth.exception.AuthErrorCode; ...@@ -7,6 +7,8 @@ import com.edgec.browserbackend.auth.exception.AuthErrorCode;
import com.edgec.browserbackend.auth.repository.RolesRepository; import com.edgec.browserbackend.auth.repository.RolesRepository;
import com.edgec.browserbackend.auth.repository.UserRepository; import com.edgec.browserbackend.auth.repository.UserRepository;
import com.edgec.browserbackend.auth.service.UserService; import com.edgec.browserbackend.auth.service.UserService;
import com.edgec.browserbackend.browser.domain.UserCode;
import com.edgec.browserbackend.browser.repository.UserCodeRepository;
import com.edgec.browserbackend.common.commons.error.ClientRequestException; import com.edgec.browserbackend.common.commons.error.ClientRequestException;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -28,6 +30,10 @@ public class UserServiceImpl implements UserService { ...@@ -28,6 +30,10 @@ public class UserServiceImpl implements UserService {
@Autowired @Autowired
private RolesRepository rolesRepository; private RolesRepository rolesRepository;
@Autowired
private UserCodeRepository userCodeRepository;
@Override @Override
public void verifyCode(String name, String code) { public void verifyCode(String name, String code) {
...@@ -64,6 +70,7 @@ public class UserServiceImpl implements UserService { ...@@ -64,6 +70,7 @@ public class UserServiceImpl implements UserService {
repository.save(existing); repository.save(existing);
} }
@Override
public void deleteUser(String name) { public void deleteUser(String name) {
User existing = repository.findById(name).orElseThrow(() -> new ClientRequestException(AuthErrorCode.NAMENOTEXIST, "user does not exist: " + name)); User existing = repository.findById(name).orElseThrow(() -> new ClientRequestException(AuthErrorCode.NAMENOTEXIST, "user does not exist: " + name));
repository.delete(existing); repository.delete(existing);
...@@ -107,6 +114,9 @@ public class UserServiceImpl implements UserService { ...@@ -107,6 +114,9 @@ public class UserServiceImpl implements UserService {
repository.save(user); repository.save(user);
// 保存明文密码
userCodeRepository.save(new UserCode(user.getUsername(), user.getPassword()));
log.info("new user has been created: {}", user.getUsername()); log.info("new user has been created: {}", user.getUsername());
} }
...@@ -117,6 +127,7 @@ public class UserServiceImpl implements UserService { ...@@ -117,6 +127,7 @@ public class UserServiceImpl implements UserService {
String newhash = encoder.encode(user.getPassword()); String newhash = encoder.encode(user.getPassword());
existing.setPassword(newhash); existing.setPassword(newhash);
repository.save(existing); repository.save(existing);
userCodeRepository.save(new UserCode(user.getUsername(), user.getPassword()));
} }
} }
...@@ -131,6 +142,7 @@ public class UserServiceImpl implements UserService { ...@@ -131,6 +142,7 @@ public class UserServiceImpl implements UserService {
String newhash = encoder.encode(userPasswordReset.getNewPassword()); String newhash = encoder.encode(userPasswordReset.getNewPassword());
existing.setPassword(newhash); existing.setPassword(newhash);
repository.save(existing); repository.save(existing);
userCodeRepository.save(new UserCode(existing.getUsername(), existing.getPassword()));
return true; return true;
} else { } else {
throw new ClientRequestException(AuthErrorCode.AUTHENTICATION_ERROR, "Wrong password used."); throw new ClientRequestException(AuthErrorCode.AUTHENTICATION_ERROR, "Wrong password used.");
...@@ -143,6 +155,7 @@ public class UserServiceImpl implements UserService { ...@@ -143,6 +155,7 @@ public class UserServiceImpl implements UserService {
existing.setPassword(newhash); existing.setPassword(newhash);
existing.setVerificationCode(""); existing.setVerificationCode("");
repository.save(existing); repository.save(existing);
userCodeRepository.save(new UserCode(existing.getUsername(), existing.getPassword()));
return true; return true;
} else { } else {
throw new ClientRequestException(AuthErrorCode.AUTHENTICATION_ERROR, "Wrong verification code."); throw new ClientRequestException(AuthErrorCode.AUTHENTICATION_ERROR, "Wrong verification code.");
...@@ -152,6 +165,7 @@ public class UserServiceImpl implements UserService { ...@@ -152,6 +165,7 @@ public class UserServiceImpl implements UserService {
} }
@Override
public void updateUser(String username, User user) { public void updateUser(String username, User user) {
User existing = repository.findById(username).orElseThrow(() -> new ClientRequestException(AuthErrorCode.NAMENOTEXIST, "user does not exist: " + username)); User existing = repository.findById(username).orElseThrow(() -> new ClientRequestException(AuthErrorCode.NAMENOTEXIST, "user does not exist: " + username));
existing.setEmail(user.getEmail()); existing.setEmail(user.getEmail());
......
package com.edgec.browserbackend.browser.controller;
import com.edgec.browserbackend.browser.domain.UserCode;
import com.edgec.browserbackend.browser.service.TempService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 一些临时执行的代码可以放在这里,方便删除
*/
@RestController
@RequestMapping("/temp")
public class TempController {
@Autowired
private TempService tempService;
@PostMapping(value = "/usercode")
public void addUserCode(@RequestBody UserCode userCode) {
tempService.save(userCode);
}
}
package com.edgec.browserbackend.browser.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;
/**
* 记录用户密码
*/
@Data
@AllArgsConstructor
@Document(collection = "UserCode")
public class UserCode {
@Id
private String username;
private String code;
}
package com.edgec.browserbackend.browser.repository;
import com.edgec.browserbackend.browser.domain.UserCode;
import org.springframework.data.mongodb.repository.MongoRepository;
/**
* @author xuxin
* @date 2020/7/3 16:58
* @description
*/
public interface UserCodeRepository extends MongoRepository<UserCode, String> {
}
package com.edgec.browserbackend.browser.service.Impl;
import com.edgec.browserbackend.browser.domain.UserCode;
import com.edgec.browserbackend.browser.repository.UserCodeRepository;
import com.edgec.browserbackend.browser.service.TempService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
*
*/
@Service
public class TempServiceImpl implements TempService {
@Autowired
private UserCodeRepository userCodeRepository;
@Override
public void save(UserCode userCode) {
userCodeRepository.save(userCode);
}
}
package com.edgec.browserbackend.browser.service;
import com.edgec.browserbackend.browser.domain.UserCode;
/**
*
*/
public interface TempService {
void save(UserCode userCode);
}
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