Skip to content

A
Afrishop refactored project
提交 5e66ece8 authored 作者: 吴德鹏's avatar 吴德鹏
浏览文件
操作

识别注册用户的国家

上级 c53e0533
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 336 行增加 和 239 行删除
src/main/java/com/example/afrishop_v3/controllers/AuthController.java
浏览文件 @ 5e66ece8
......@@ -15,10 +15,12 @@ import com.example.afrishop_v3.repository.UserRepository;
import com.example.afrishop_v3.security.jwt.JwtUtils;
import com.example.afrishop_v3.security.services.UserDetailsImpl;
import com.example.afrishop_v3.util.*;
import net.sf.json.JSONObject;
import org.apache.http.Consts;
import org.hashids.Hashids;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
......@@ -26,9 +28,12 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.Calendar;
import java.util.Date;
......@@ -46,7 +51,7 @@ public class AuthController extends Controller {
private final TbCfCouponRepository couponRepository;
private final TbCfToicouponRepository toicouponRepository;
private final NetworkRepository networkRepository;
// @PersistenceContext(unitName = "afrishop_v3")
// @PersistenceContext(unitName = "afrishop_v3")
private final EntityManager entityManager;
// private final TbCfOrderRepository cfOrderRepository;
// private final SecondOrderRepository secondOrderRepository;
......@@ -60,7 +65,7 @@ public class AuthController extends Controller {
private final JwtUtils jwtUtils;
private static Logger logger = LoggerFactory.getLogger(AuthController.class);
public AuthController(DomainProperties domainProperties,PasswordEncoder encoder,JwtUtils jwtUtils,AuthenticationManager authenticationManager, UserRepository userRepository, EmailHelper emailHelper, TbCfCouponRepository couponRepository, TbCfToicouponRepository toicouponRepository, NetworkRepository networkRepository, EntityManager entityManager) {
public AuthController(DomainProperties domainProperties, PasswordEncoder encoder, JwtUtils jwtUtils, AuthenticationManager authenticationManager, UserRepository userRepository, EmailHelper emailHelper, TbCfCouponRepository couponRepository, TbCfToicouponRepository toicouponRepository, NetworkRepository networkRepository, EntityManager entityManager) {
this.authenticationManager = authenticationManager;
this.userRepository = userRepository;
this.emailHelper = emailHelper;
......@@ -68,13 +73,14 @@ public class AuthController extends Controller {
this.toicouponRepository = toicouponRepository;
this.networkRepository = networkRepository;
//this.secondAddressRepository = secondAddressRepository;
this.entityManager = entityManager;
this.entityManager = entityManager;
this.encoder = encoder;
this.domainProperties = domainProperties;
this.jwtUtils = jwtUtils;
// this.cfOrderRepository = cfOrderRepository;
// this.secondOrderRepository = secondOrderRepository;
// this.secondUserRepository = secondUserRepository;
}
// @GetMapping("count")
......@@ -143,6 +149,12 @@ public class AuthController extends Controller {
// return notFound;
// }
@GetMapping("/getRealIp")
public Result getRealIp(HttpServletRequest request) {
String ip = this.getRealIpAddress(request);
return new Result().setData(ip);
}
//Sign in using email/phone and password
@PostMapping("/signin")
public Result authenticateUser(@RequestBody LoginRequest loginRequest) {
......@@ -234,13 +246,12 @@ public class AuthController extends Controller {
//Register new user with email
@PostMapping("/signup")
public Result<?> registerUser(@RequestBody TbCfUserInfo signUpRequest) {
public Result<?> registerUser(@RequestBody TbCfUserInfo signUpRequest, HttpServletRequest request) {
try {
// boolean byAccount = userRepository.existsByAccount(signUpRequest.getEmail());
// if ( byAccount ) {
// return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(),"Error: Username is already taken!");
// }
String email = signUpRequest.getEmail();
String password = signUpRequest.getPassword();
......@@ -276,7 +287,7 @@ public class AuthController extends Controller {
signUpRequest.setUserId(IdUtil.createIdbyUUID());
fillUserNecessayInfo(signUpRequest);
fillUserNecessayInfo(signUpRequest, request);
signUpRequest.setPassword(encoder.encode(password));
......@@ -332,7 +343,7 @@ public class AuthController extends Controller {
}
@PostMapping("/signup/phone")
public Result<?> registerUserPhone(@RequestBody TbCfUserInfo signUpRequest) {
public Result<?> registerUserPhone(@RequestBody TbCfUserInfo signUpRequest, HttpServletRequest request) {
try {
// boolean byAccount = userRepository.existsByAccount(signUpRequest.getEmail());
// if ( byAccount ) {
......@@ -374,7 +385,7 @@ public class AuthController extends Controller {
signUpRequest.setUserId(IdUtil.createIdbyUUID());
fillUserNecessayInfo(signUpRequest);
fillUserNecessayInfo(signUpRequest, request);
signUpRequest.setPassword(encoder.encode(password));
......@@ -402,7 +413,7 @@ public class AuthController extends Controller {
@PostMapping(value = "/register/user")
public Result checkFirebase(@RequestBody TbCfUserInfo user) {
public Result checkFirebase(@RequestBody TbCfUserInfo user, HttpServletRequest request) throws IOException {
//Data to be userInfoVo
// {
// "firebaseUid":"firebaseUid",
......@@ -441,7 +452,7 @@ public class AuthController extends Controller {
// user.setPassword(encoder.encode(firebaseUid));
user.setUserId(userid);
fillUserNecessayInfo(user);
fillUserNecessayInfo(user, request);
user = userRepository.save(user);
......@@ -614,8 +625,19 @@ public class AuthController extends Controller {
}
//fill basic information for new user
private void fillUserNecessayInfo(TbCfUserInfo tbCfUserInfoVo) {
private void fillUserNecessayInfo(TbCfUserInfo tbCfUserInfoVo, HttpServletRequest request) throws IOException {
RestTemplate restTemplate = new RestTemplate();
if (tbCfUserInfoVo.getAvatar() == null) tbCfUserInfoVo.setAvatar(domainProperties.getProperty("user.avatar"));
// ResponseEntity forEntity2 = restTemplate.getForEntity("http://admin.afrieshop.com/api/upload/getRealIp", String.class);
// System.err.println(forEntity2.getBody());
// String body = (String) forEntity2.getBody();
// String ip = JSONObject.fromObject(body).getString("ip");
// System.out.println(ip);
String ip = getIpAddr(request);
String country = HttpsUtil.useIpFindCountry(ip);
// String country = HttpsUtil.ipToAdress(ip);
tbCfUserInfoVo.setCountry(country);
tbCfUserInfoVo.setUserNo(IdUtil.createIdByDate());
tbCfUserInfoVo.setPhoneFlag(StateConstant.INVALID);
tbCfUserInfoVo.setLoginCount(0);
......
src/main/java/com/example/afrishop_v3/controllers/Controller.java
浏览文件 @ 5e66ece8
......@@ -260,4 +260,31 @@ abstract class Controller {
}
return ip;
}
/**
* 获取IP地址
* @param request
* @return
*/
protected String getIpAddr(HttpServletRequest request) {
String ip = request.getHeader("X-Real-IP");
if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) {
return ip;
}
ip = request.getHeader("X-Forwarded-For");
if (!StringUtils.isBlank(ip) && !"unknown".equalsIgnoreCase(ip)) {
// 多次反向代理后会有多个IP值，第一个为真实IP。
int index = ip.indexOf(',');
if (index != -1) {
return ip.substring(0, index);
}
else {
return ip;
}
}
else {
return request.getRemoteAddr();
}
}
}
src/main/java/com/example/afrishop_v3/controllers/FlutterWaveController.java
浏览文件 @ 5e66ece8
......@@ -81,7 +81,7 @@ public class FlutterWaveController extends Controller {
public ResponseEntity<String> payForOrderByCard(@RequestParam("orderId") String orderId, @RequestBody FlutterWaveCard flutterWaveCard) {
RaveConstant.PUBLIC_KEY = PUBLIC_KEY;
RaveConstant.SECRET_KEY = SECRET_KEY;
RaveConstant.ENVIRONMENT = Environment.LIVE; //or live
RaveConstant.ENVIRONMENT = Environment.STAGING; //or live
// Result result = new Result();
Optional<TbCfOrder> byId = repository.findById(orderId);
......
src/main/java/com/example/afrishop_v3/models/TbCfUserInfo.java
浏览文件 @ 5e66ece8
......@@ -187,6 +187,16 @@ public class TbCfUserInfo {
this.source = source;
}
private String country;
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public void setCodeSentTime(Date codeSentTime) {
this.codeSentTime = codeSentTime;
}
......
src/main/resources/application.properties
浏览文件 @ 5e66ece8
server.servlet.context-path=/zion
spring.jpa.hibernate.ddl-auto=update
server.port=8083
spring.profiles.active=prod
spring.profiles.active=test
#spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
#spring.datasource.username=root
#spring.datasource.password=Diaoyunnuli.8
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论