Skip to content

X
xyqb-user2
Commit b3e2d471 authored by 技术部—现金贷—曾丽宾's avatar 技术部—现金贷—曾丽宾
Browse files
Options

Merge remote-tracking branch 'origin/master' into master-queryLog 

# Conflicts:
#	src/main/resources/config/dev/xyqb.properties
parents 14ee8a1d 0f43bf91
Show whitespace changes
Inline Side-by-side
Showing with 169 additions and 181 deletions
src/main/java/cn/quantgroup/xyqb/aspect/logcaller/LogCallHttpAspect.java
View file @ b3e2d471
...@@ -52,7 +52,6 @@ public class LogCallHttpAspect { ...@@ -52,7 +52,6 @@ public class LogCallHttpAspect {
return result; return result;
} }
@Async
public void asyncRecordIt(ProceedingJoinPoint pjp, Object result, String remoteIP){ public void asyncRecordIt(ProceedingJoinPoint pjp, Object result, String remoteIP){
Object[] args = pjp.getArgs(); Object[] args = pjp.getArgs();
String methodName = pjp.getSignature().getName(); String methodName = pjp.getSignature().getName();
......
src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java
View file @ b3e2d471
...@@ -296,7 +296,7 @@ public class MotanUserServiceImpl implements UserMotanService { ...@@ -296,7 +296,7 @@ public class MotanUserServiceImpl implements UserMotanService {
SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties); SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
LoginInfo loginInfo = new LoginInfo(); LoginInfo loginInfo = new LoginInfo();
loginInfo.setUser(UserRet.getUserRet(user)); loginInfo.setUser(new UserRet(user));
loginInfo.setToken(sessionStruct.getSid()); loginInfo.setToken(sessionStruct.getSid());
LoginInfo.LoginContext context = new LoginInfo.LoginContext(); LoginInfo.LoginContext context = new LoginInfo.LoginContext();
context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId()); context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());
......
src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java
View file @ b3e2d471
...@@ -148,7 +148,7 @@ public class AppController implements IBaseController { ...@@ -148,7 +148,7 @@ public class AppController implements IBaseController {
SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties); SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
LoginInfo loginInfo = new LoginInfo(); LoginInfo loginInfo = new LoginInfo();
loginInfo.setUser(UserRet.getUserRet(user)); loginInfo.setUser(new UserRet(user));
loginInfo.setToken(sessionStruct.getSid()); loginInfo.setToken(sessionStruct.getSid());
LoginInfo.LoginContext context = new LoginInfo.LoginContext(); LoginInfo.LoginContext context = new LoginInfo.LoginContext();
context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId()); context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());
......
src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
View file @ b3e2d471
package cn.quantgroup.xyqb.controller.external.user; package cn.quantgroup.xyqb.controller.external.user;
import cn.quantgroup.user.enums.*;
import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller; import cn.quantgroup.xyqb.aspect.logcaller.LogHttpCaller;
import cn.quantgroup.xyqb.controller.IBaseController; import cn.quantgroup.xyqb.controller.IBaseController;
import cn.quantgroup.xyqb.entity.*;
import cn.quantgroup.xyqb.entity.enumerate.*;
import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
import cn.quantgroup.xyqb.entity.enumerate.Relation;
import cn.quantgroup.xyqb.model.*;
import cn.quantgroup.user.enums.*;
import cn.quantgroup.xyqb.model.*;
import cn.quantgroup.xyqb.model.IdType;
import cn.quantgroup.xyqb.entity.Address; import cn.quantgroup.xyqb.entity.Address;
import cn.quantgroup.xyqb.entity.Contact; import cn.quantgroup.xyqb.entity.Contact;
import cn.quantgroup.xyqb.entity.User; import cn.quantgroup.xyqb.entity.User;
...@@ -22,12 +9,11 @@ import cn.quantgroup.xyqb.entity.UserDetail; ...@@ -22,12 +9,11 @@ import cn.quantgroup.xyqb.entity.UserDetail;
import cn.quantgroup.xyqb.entity.UserExtInfo; import cn.quantgroup.xyqb.entity.UserExtInfo;
import cn.quantgroup.xyqb.entity.UserSpouse; import cn.quantgroup.xyqb.entity.UserSpouse;
import cn.quantgroup.xyqb.entity.WechatUserInfo; import cn.quantgroup.xyqb.entity.WechatUserInfo;
//import cn.quantgroup.xyqb.entity.enumerate.EducationEnum; import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
//import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum; import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
//import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum; import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
//import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus; import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
//import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum; import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
//import cn.quantgroup.xyqb.entity.enumerate.Relation;
import cn.quantgroup.xyqb.model.AddressRet; import cn.quantgroup.xyqb.model.AddressRet;
import cn.quantgroup.xyqb.model.ContactRet; import cn.quantgroup.xyqb.model.ContactRet;
import cn.quantgroup.xyqb.model.IdType; import cn.quantgroup.xyqb.model.IdType;
...@@ -39,13 +25,18 @@ import cn.quantgroup.xyqb.model.UserSpouseRet; ...@@ -39,13 +25,18 @@ import cn.quantgroup.xyqb.model.UserSpouseRet;
import cn.quantgroup.xyqb.service.auth.IIdCardService; import cn.quantgroup.xyqb.service.auth.IIdCardService;
import cn.quantgroup.xyqb.service.http.IHttpService; import cn.quantgroup.xyqb.service.http.IHttpService;
import cn.quantgroup.xyqb.service.session.ISessionService; import cn.quantgroup.xyqb.service.session.ISessionService;
import cn.quantgroup.xyqb.service.user.*; import cn.quantgroup.xyqb.service.user.IAddressService;
import cn.quantgroup.xyqb.service.user.IContactService;
import cn.quantgroup.xyqb.service.user.ILkbUserService;
import cn.quantgroup.xyqb.service.user.IUserDetailService;
import cn.quantgroup.xyqb.service.user.IUserExtInfoService;
import cn.quantgroup.xyqb.service.user.IUserService;
import cn.quantgroup.xyqb.service.user.IUserSpouseService;
import cn.quantgroup.xyqb.service.wechat.IWechatService; import cn.quantgroup.xyqb.service.wechat.IWechatService;
import cn.quantgroup.xyqb.util.ValidationUtil; import cn.quantgroup.xyqb.util.ValidationUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.google.common.base.MoreObjects;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
...@@ -56,6 +47,7 @@ import java.text.ParseException; ...@@ -56,6 +47,7 @@ import java.text.ParseException;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.lang3.math.NumberUtils;
...@@ -68,13 +60,12 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -68,13 +60,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.sql.Timestamp; //import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
import java.text.ParseException; //import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
import java.util.Collections; //import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
import java.util.List; //import cn.quantgroup.xyqb.entity.enumerate.MaritalStatus;
import java.util.Map; //import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
import java.util.Random; //import cn.quantgroup.xyqb.entity.enumerate.Relation;
import java.util.stream.Collectors;
/** /**
* Created by Miraculous on 2016/12/19. * Created by Miraculous on 2016/12/19.
...@@ -133,7 +124,9 @@ public class InnerController implements IBaseController { ...@@ -133,7 +124,9 @@ public class InnerController implements IBaseController {
if (user == null) { if (user == null) {
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("", null);
} }
UserRet userRet = UserRet.getUserRet(user); UserRet userRet = new UserRet(user);
return JsonResult.buildSuccessResult("", userRet); return JsonResult.buildSuccessResult("", userRet);
} }
...@@ -144,7 +137,7 @@ public class InnerController implements IBaseController { ...@@ -144,7 +137,7 @@ public class InnerController implements IBaseController {
if (user == null) { if (user == null) {
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("", null);
} }
UserRet userRet = UserRet.getUserRet(user); UserRet userRet = new UserRet(user);
return JsonResult.buildSuccessResult("", userRet); return JsonResult.buildSuccessResult("", userRet);
} }
...@@ -157,11 +150,11 @@ public class InnerController implements IBaseController { ...@@ -157,11 +150,11 @@ public class InnerController implements IBaseController {
} }
List<Long> userIds = JSONObject.parseObject(userIdsString, new TypeReference<List<Long>>() { List<Long> userIds = JSONObject.parseObject(userIdsString, new TypeReference<List<Long>>() {
}); });
if(!CollectionUtils.isEmpty(userIds) && userIds.size()<=500) { if (!CollectionUtils.isEmpty(userIds) && userIds.size() <= 500) {
Map<Long, String> userIdAndPhoneMap = userService.findPhoneByIdsInDb(userIds); Map<Long, String> userIdAndPhoneMap = userService.findPhoneByIdsInDb(userIds);
return JsonResult.buildSuccessResult("", userIdAndPhoneMap); return JsonResult.buildSuccessResult("", userIdAndPhoneMap);
}else { } else {
return JsonResult.buildErrorStateResult("批量查询每次最多进行500条用户信息的查询",null); return JsonResult.buildErrorStateResult("批量查询每次最多进行500条用户信息的查询", null);
} }
} }
...@@ -189,7 +182,7 @@ public class InnerController implements IBaseController { ...@@ -189,7 +182,7 @@ public class InnerController implements IBaseController {
User user = userService.findByPhoneWithCache(phoneNo); User user = userService.findByPhoneWithCache(phoneNo);
if (user == null) { if (user == null) {
user = new User(); user = new User();
}else if(!user.getEnable()){ } else if (!user.getEnable()) {
return JsonResult.buildErrorStateResult("用户已经注销", null); return JsonResult.buildErrorStateResult("用户已经注销", null);
} }
if (org.apache.commons.lang.StringUtils.isEmpty(user.getUuid())) { if (org.apache.commons.lang.StringUtils.isEmpty(user.getUuid())) {
...@@ -205,20 +198,13 @@ public class InnerController implements IBaseController { ...@@ -205,20 +198,13 @@ public class InnerController implements IBaseController {
user = userService.saveUser(user); user = userService.saveUser(user);
UserRet userRet = null; UserRet userRet = null;
if (user != null) { if (user != null) {
userRet = UserRet.getUserRet(user); userRet = new UserRet(user);
} }
return JsonResult.buildSuccessResult(null, userRet); return JsonResult.buildSuccessResult(null, userRet);
} }
/** /**
* 保存用户详细信息 * 保存用户详细信息
*
* @param userId
* @param phoneNo
* @param name
* @param idNo
* @param email
* @return
*/ */
@RequestMapping("/user_detail/save") @RequestMapping("/user_detail/save")
public JsonResult saveUserDetail(Long userId, String phoneNo, String name, String idNo, public JsonResult saveUserDetail(Long userId, String phoneNo, String name, String idNo,
...@@ -264,9 +250,6 @@ public class InnerController implements IBaseController { ...@@ -264,9 +250,6 @@ public class InnerController implements IBaseController {
/** /**
* 根据用户id查询用户的详细信息 * 根据用户id查询用户的详细信息
*
* @param userId
* @return
*/ */
@RequestMapping("/user_detail/search/userId") @RequestMapping("/user_detail/search/userId")
@LogHttpCaller @LogHttpCaller
...@@ -283,7 +266,7 @@ public class InnerController implements IBaseController { ...@@ -283,7 +266,7 @@ public class InnerController implements IBaseController {
public JsonResult findUserByUserId(Long userId) { public JsonResult findUserByUserId(Long userId) {
User user = userService.findById(userId); User user = userService.findById(userId);
if (user != null) { if (user != null) {
return JsonResult.buildSuccessResult(null, UserRet.getUserRet(user)); return JsonResult.buildSuccessResult(null, new UserRet(user));
} }
return JsonResult.buildErrorStateResult("", null); return JsonResult.buildErrorStateResult("", null);
} }
...@@ -348,14 +331,12 @@ public class InnerController implements IBaseController { ...@@ -348,14 +331,12 @@ public class InnerController implements IBaseController {
for (Contact c : contacts) { for (Contact c : contacts) {
c.setId(null); c.setId(null);
c.setUserId(userId); c.setUserId(userId);
c.setRelation(c.getRelation() == null ? cn.quantgroup.user.enums.Relation.OTHER: c.getRelation()); c.setRelation(c.getRelation() == null ? cn.quantgroup.user.enums.Relation.OTHER : c.getRelation());
c.setCreatedAt(now); c.setCreatedAt(now);
c.setUpdateAt(now); c.setUpdateAt(now);
} }
} }
@RequestMapping("/address/search/user_id") @RequestMapping("/address/search/user_id")
public JsonResult findAddressByUserId(Long userId) { public JsonResult findAddressByUserId(Long userId) {
if (userId == null) { if (userId == null) {
...@@ -395,7 +376,6 @@ public class InnerController implements IBaseController { ...@@ -395,7 +376,6 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(addressObj)); return JsonResult.buildSuccessResult(null, AddressRet.address2AddressRet(addressObj));
} }
@RequestMapping("/user_ext_info/update") @RequestMapping("/user_ext_info/update")
public JsonResult updateMarryStatus( public JsonResult updateMarryStatus(
Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum, Long userId, IncomeEnum incomeEnum, IncomeRangeEnum incomeRangeEnum,
...@@ -444,7 +424,7 @@ public class InnerController implements IBaseController { ...@@ -444,7 +424,7 @@ public class InnerController implements IBaseController {
@LogHttpCaller @LogHttpCaller
public JsonResult searchUserDetailList(String name, String phoneNo, String idNo) { public JsonResult searchUserDetailList(String name, String phoneNo, String idNo) {
LOGGER.info("searchUserDetailList ,param.name:{},phone:{},idNo:{},ip:{}",name,phoneNo,idNo,getIp()); LOGGER.info("searchUserDetailList ,param.name:{},phone:{},idNo:{},ip:{}", name, phoneNo, idNo, getIp());
if (StringUtils.isBlank(name) && StringUtils.isBlank(phoneNo) && StringUtils.isBlank(idNo)) { if (StringUtils.isBlank(name) && StringUtils.isBlank(phoneNo) && StringUtils.isBlank(idNo)) {
return JsonResult.buildErrorStateResult("至少必须满足一个条件不为空", null); return JsonResult.buildErrorStateResult("至少必须满足一个条件不为空", null);
} }
...@@ -453,16 +433,16 @@ public class InnerController implements IBaseController { ...@@ -453,16 +433,16 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult("success", userDetails);*/ return JsonResult.buildSuccessResult("success", userDetails);*/
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
if(StringUtils.isNotBlank(name)){ if (StringUtils.isNotBlank(name)) {
builder.put("name",name); builder.put("name", name);
} }
if(StringUtils.isNotBlank(phoneNo)){ if (StringUtils.isNotBlank(phoneNo)) {
builder.put("phoneNo",phoneNo); builder.put("phoneNo", phoneNo);
} }
if(StringUtils.isNotBlank(idNo)){ if (StringUtils.isNotBlank(idNo)) {
builder.put("idNo",idNo); builder.put("idNo", idNo);
} }
Map<String, String> param =builder.build(); Map<String, String> param = builder.build();
String s = httpService.get(queryUrl.concat("/innerapi/user_detail/search_list"), param); String s = httpService.get(queryUrl.concat("/innerapi/user_detail/search_list"), param);
return JSON.parseObject(s, JsonResult.class); return JSON.parseObject(s, JsonResult.class);
} }
...@@ -522,7 +502,7 @@ public class InnerController implements IBaseController { ...@@ -522,7 +502,7 @@ public class InnerController implements IBaseController {
sessionService.deleteByUserId(userId); sessionService.deleteByUserId(userId);
} }
LOGGER.info("去清除函谷关的缓存"); LOGGER.info("去清除函谷关的缓存");
httpService.get(hanguguanUrl.concat("/innerapi/disableUserCache"),ImmutableMap.of("phone",user.getPhoneNo())); httpService.get(hanguguanUrl.concat("/innerapi/disableUserCache"), ImmutableMap.of("phone", user.getPhoneNo()));
return JsonResult.buildSuccessResult("用户已禁用.", user.getEnable() == false); return JsonResult.buildSuccessResult("用户已禁用.", user.getEnable() == false);
} }
...@@ -567,69 +547,51 @@ public class InnerController implements IBaseController { ...@@ -567,69 +547,51 @@ public class InnerController implements IBaseController {
return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse)); return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
} }
@RequestMapping("/user/findByPhones") @RequestMapping("/user/findByPhones")
public JsonResult getUserIdByPhones(@RequestParam("userPhones")String userPhones){ public JsonResult getUserIdByPhones(@RequestParam("userPhones") String userPhones) {
if(StringUtils.isBlank(userPhones)){ if (StringUtils.isBlank(userPhones)) {
return JsonResult.buildErrorStateResult("传入用户手机号不可为空",null); return JsonResult.buildErrorStateResult("传入用户手机号不可为空", null);
} }
List<String> phones = JSONObject.parseObject(userPhones, new TypeReference<List<String>>() { List<String> phones = JSONObject.parseObject(userPhones, new TypeReference<List<String>>() {
}); });
if(org.apache.commons.collections.CollectionUtils.isNotEmpty(phones)) { if (org.apache.commons.collections.CollectionUtils.isNotEmpty(phones)) {
if(!(phones.size()>500)) { if (!(phones.size() > 500)) {
List<User> users = userService.findByPhones(phones); List<User> users = userService.findByPhones(phones);
if(org.apache.commons.collections.CollectionUtils.isNotEmpty(users)) { if (org.apache.commons.collections.CollectionUtils.isNotEmpty(users)) {
return JsonResult.buildSuccessResult(null, users.stream().collect(Collectors.toMap(User::getPhoneNo,User::getId))); return JsonResult.buildSuccessResult(null, users.stream().collect(Collectors.toMap(User::getPhoneNo, User::getId)));
}else { } else {
return JsonResult.buildSuccessResult(null, null); return JsonResult.buildSuccessResult(null, null);
} }
} }
return JsonResult.buildErrorStateResult("单次批量查询不可超过500个手机号",null); return JsonResult.buildErrorStateResult("单次批量查询不可超过500个手机号", null);
} }
return JsonResult.buildErrorStateResult("传入用户手机号不可为空", null); return JsonResult.buildErrorStateResult("传入用户手机号不可为空", null);
} }
/** /**
* 重置密码接口，供内部人员使用（例如绝影） * 重置密码接口，供内部人员使用（例如绝影）
* @param key
* @param phone
* @return
*/ */
@RequestMapping("/user/password/reset/{key}/{phone}") @RequestMapping("/user/password/reset/{key}/{phone}")
public JsonResult resetPassword(@PathVariable("key")String key,@PathVariable("phone")String phone) { public JsonResult resetPassword(@PathVariable("key") String key, @PathVariable("phone") String phone) {
LOGGER.info("密码重置请求,phone:[{}]",phone); LOGGER.info("密码重置请求,phone:[{}]", phone);
if(StringUtils.isBlank(key)){ if (StringUtils.isBlank(key)) {
return JsonResult.buildErrorStateResult("用户密码重置失败.", null); return JsonResult.buildErrorStateResult("用户密码重置失败.", null);
} }
if(!"ecf75c1f-2ccb-4661-8e4b-2874c0f45a2b".equalsIgnoreCase(key)){ if (!"ecf75c1f-2ccb-4661-8e4b-2874c0f45a2b".equalsIgnoreCase(key)) {
LOGGER.error("密码重置失败,key错误!@!,phone:[{}]", phone); LOGGER.error("密码重置失败,key错误!@!,phone:[{}]", phone);
return JsonResult.buildErrorStateResult("用户密码重置失败.", null); return JsonResult.buildErrorStateResult("用户密码重置失败.", null);
} }
try { try {
userService.resetPassword(phone, "123456"); //默认重置的密码是123456 userService.resetPassword(phone, "123456"); //默认重置的密码是123456
return JsonResult.buildSuccessResult("用户密码已重置.", "null"); return JsonResult.buildSuccessResult("用户密码已重置.", "null");
}catch (Exception e){ } catch (Exception e) {
LOGGER.error("密码重置失败,phone[{}],err:[{}]",phone, e); LOGGER.error("密码重置失败,phone[{}],err:[{}]", phone, e);
} }
return JsonResult.buildErrorStateResult("用户密码重置失败.", null); return JsonResult.buildErrorStateResult("用户密码重置失败.", null);
} }
/** /**
* 保存用户信息，地址信息，联系人信息 * 保存用户信息，地址信息，联系人信息
* @param registeredFrom
* @param channelId
* @param phoneNo
* @param name
* @param idNo
* @param provinceCode
* @param cityCode
* @param districtCode
* @param address
* @param contacts
* @return
*/ */
@RequestMapping("/user/save_multi") @RequestMapping("/user/save_multi")
public JsonResult saveMulti( public JsonResult saveMulti(
...@@ -647,56 +609,54 @@ public class InnerController implements IBaseController { ...@@ -647,56 +609,54 @@ public class InnerController implements IBaseController {
String address, String address,
String contacts) { String contacts) {
LOGGER.info("保存用户、联系人、地址信息:registeredFrom:[{}], phoneNo[{}]，name[{}]，idNo[{}]，provinceCode[{}]，cityCode[{}]，districtCode[{}]，" + LOGGER.info("保存用户、联系人、地址信息:registeredFrom:[{}], phoneNo[{}]，name[{}]，idNo[{}]，provinceCode[{}]，cityCode[{}]，districtCode[{}]，" +
"address[{}]，contacts[{}]",registeredFrom,phoneNo,name,idNo,provinceCode,cityCode,districtCode,address,contacts); "address[{}]，contacts[{}]", registeredFrom, phoneNo, name, idNo, provinceCode, cityCode, districtCode, address, contacts);
if(!NumberUtils.isDigits(registeredFrom)){ if (!NumberUtils.isDigits(registeredFrom)) {
return JsonResult.buildErrorStateResult("注册渠道异常.", null); return JsonResult.buildErrorStateResult("注册渠道异常.", null);
} }
if(!NumberUtils.isDigits(phoneNo)){ if (!NumberUtils.isDigits(phoneNo)) {
return JsonResult.buildErrorStateResult("手机号异常.", null); return JsonResult.buildErrorStateResult("手机号异常.", null);
} }
if(StringUtils.isBlank(name)){ if (StringUtils.isBlank(name)) {
return JsonResult.buildErrorStateResult("用户名异常.", null); return JsonResult.buildErrorStateResult("用户名异常.", null);
} }
if(!NumberUtils.isDigits(idNo)){ if (!NumberUtils.isDigits(idNo)) {
return JsonResult.buildErrorStateResult("用户身份证号异常.", null); return JsonResult.buildErrorStateResult("用户身份证号异常.", null);
} }
if(!NumberUtils.isDigits(provinceCode)){ if (!NumberUtils.isDigits(provinceCode)) {
return JsonResult.buildErrorStateResult("省份编号异常.", null); return JsonResult.buildErrorStateResult("省份编号异常.", null);
} }
if(StringUtils.isBlank(province)){ if (StringUtils.isBlank(province)) {
return JsonResult.buildErrorStateResult("省份异常.", null); return JsonResult.buildErrorStateResult("省份异常.", null);
} }
if(!NumberUtils.isDigits(cityCode)){ if (!NumberUtils.isDigits(cityCode)) {
return JsonResult.buildErrorStateResult("城市编号异常.", null); return JsonResult.buildErrorStateResult("城市编号异常.", null);
} }
if(StringUtils.isBlank(city)){ if (StringUtils.isBlank(city)) {
return JsonResult.buildErrorStateResult("城市异常.", null); return JsonResult.buildErrorStateResult("城市异常.", null);
} }
if(!NumberUtils.isDigits(districtCode)){ if (!NumberUtils.isDigits(districtCode)) {
return JsonResult.buildErrorStateResult("区县编号异常.", null); return JsonResult.buildErrorStateResult("区县编号异常.", null);
} }
if(StringUtils.isBlank(district)){ if (StringUtils.isBlank(district)) {
return JsonResult.buildErrorStateResult("区县异常.", null); return JsonResult.buildErrorStateResult("区县异常.", null);
} }
if (StringUtils.isBlank(address)) { if (StringUtils.isBlank(address)) {
return JsonResult.buildErrorStateResult("详细地址异常.", null); return JsonResult.buildErrorStateResult("详细地址异常.", null);
} }
channelId = MoreObjects.firstNonNull(channelId, "-1"); channelId = MoreObjects.firstNonNull(channelId, "-1");
// 验证用户是否已存在 // 验证用户是否已存在
User user = userService.findByPhoneInDb(phoneNo); User user = userService.findByPhoneInDb(phoneNo);
if(null != user){ if (null != user) {
return JsonResult.buildErrorStateResult("用户已存在，手机号被占用", null); return JsonResult.buildErrorStateResult("用户已存在，手机号被占用", null);
} }
user = userService.registerAndReturn(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts); user = userService.registerAndReturn(Long.valueOf(registeredFrom), Long.valueOf(channelId), phoneNo, name, idNo, provinceCode, province, cityCode, city, districtCode, district, address, contacts);
UserRet userRet = UserRet.getUserRet(user); UserRet userRet = new UserRet(user);
return JsonResult.buildSuccessResult(null, userRet); return JsonResult.buildSuccessResult(null, userRet);
} }
@RequestMapping("/user/register") @RequestMapping("/user/register")
...@@ -711,7 +671,6 @@ public class InnerController implements IBaseController { ...@@ -711,7 +671,6 @@ public class InnerController implements IBaseController {
if (user == null) { if (user == null) {
return JsonResult.buildErrorStateResult("注册失败", null); return JsonResult.buildErrorStateResult("注册失败", null);
} }
return JsonResult.buildSuccessResult(null, UserRet.getUserRet(user)); return JsonResult.buildSuccessResult(null, new UserRet(user));
} }
} }
\ No newline at end of file
src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java
View file @ b3e2d471
...@@ -79,6 +79,10 @@ public class WeChatController implements IBaseController { ...@@ -79,6 +79,10 @@ public class WeChatController implements IBaseController {
@Autowired @Autowired
private IHttpService httpService; private IHttpService httpService;
//加https地址
@Value("${xyqb-user.ui-s}")
private String userUIAddrS;
/** /**
* 开发者资质认证,有必要吗? * 开发者资质认证,有必要吗?
* *
...@@ -177,6 +181,8 @@ public class WeChatController implements IBaseController { ...@@ -177,6 +181,8 @@ public class WeChatController implements IBaseController {
extData = ""; extData = "";
} }
String protocol="http:";
LOGGER.info("从微信extdata版本接口进入：{}, extData:{}", schema, extData); LOGGER.info("从微信extdata版本接口进入：{}, extData:{}", schema, extData);
if (StringUtils.isEmpty(extData)) { if (StringUtils.isEmpty(extData)) {
// 从code获取token // 从code获取token
...@@ -185,7 +191,7 @@ public class WeChatController implements IBaseController { ...@@ -185,7 +191,7 @@ public class WeChatController implements IBaseController {
AccessTokenResponse token = wechatService.getToken(code); AccessTokenResponse token = wechatService.getToken(code);
if (token == null) { if (token == null) {
// 让用户登录，不关联微信, 构造不关联微信的url // 让用户登录，不关联微信, 构造不关联微信的url
redirectNormalUrl(response, merchant, Constants.Channel.WECHAT); redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
return; return;
} }
WechatUserInfo userInfo = WechatUserInfo userInfo =
...@@ -193,7 +199,7 @@ public class WeChatController implements IBaseController { ...@@ -193,7 +199,7 @@ public class WeChatController implements IBaseController {
token.getOpenId()); token.getOpenId());
if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) { if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
// 让用户登录，不关联微信, 构造不关联微信的url // 让用户登录，不关联微信, 构造不关联微信的url
redirectNormalUrl(response, merchant, Constants.Channel.WECHAT); redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
return; return;
} }
WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId()); WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
...@@ -206,19 +212,19 @@ public class WeChatController implements IBaseController { ...@@ -206,19 +212,19 @@ public class WeChatController implements IBaseController {
} }
userInfo = wechatService.saveWechatUserInfo(userInfo); userInfo = wechatService.saveWechatUserInfo(userInfo);
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo,
Constants.Channel.WECHAT); Constants.Channel.WECHAT,protocol);
return; return;
} }
if (userInfoInDb.getUserId() == null) { if (userInfoInDb.getUserId() == null) {
// 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面 // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
Constants.Channel.WECHAT); Constants.Channel.WECHAT,protocol);
return; return;
} }
User user = userService.findById(userInfoInDb.getUserId()); User user = userService.findById(userInfoInDb.getUserId());
if (user == null) { if (user == null) {
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
Constants.Channel.WECHAT); Constants.Channel.WECHAT,protocol);
return; return;
} }
// 已经关联了用户 // 已经关联了用户
...@@ -241,7 +247,7 @@ public class WeChatController implements IBaseController { ...@@ -241,7 +247,7 @@ public class WeChatController implements IBaseController {
AccessTokenResponse token = wechatService.getToken(code); AccessTokenResponse token = wechatService.getToken(code);
if (token == null) { if (token == null) {
// 让用户登录，不关联微信, 构造不关联微信的url // 让用户登录，不关联微信, 构造不关联微信的url
redirectNormalUrl(response, merchant, Constants.Channel.WECHAT); redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
return; return;
} }
WechatUserInfo userInfo = WechatUserInfo userInfo =
...@@ -249,7 +255,7 @@ public class WeChatController implements IBaseController { ...@@ -249,7 +255,7 @@ public class WeChatController implements IBaseController {
token.getOpenId()); token.getOpenId());
if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) { if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
// 让用户登录，不关联微信, 构造不关联微信的url // 让用户登录，不关联微信, 构造不关联微信的url
redirectNormalUrl(response, merchant, Constants.Channel.WECHAT); redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
return; return;
} }
WechatUserInfo userInfoInDb = WechatUserInfo userInfoInDb =
...@@ -263,19 +269,19 @@ public class WeChatController implements IBaseController { ...@@ -263,19 +269,19 @@ public class WeChatController implements IBaseController {
} }
userInfo = wechatService.saveWechatUserInfo(userInfo); userInfo = wechatService.saveWechatUserInfo(userInfo);
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo,
Constants.Channel.WECHAT); Constants.Channel.WECHAT,protocol);
return; return;
} }
if (userInfoInDb.getUserId() == null) { if (userInfoInDb.getUserId() == null) {
// 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面 // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
Constants.Channel.WECHAT); Constants.Channel.WECHAT,protocol);
return; return;
} }
User user = userService.findById(userInfoInDb.getUserId()); User user = userService.findById(userInfoInDb.getUserId());
if (user == null) { if (user == null) {
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb,
Constants.Channel.WECHAT); Constants.Channel.WECHAT,protocol);
return; return;
} }
// 已经关联了用户 // 已经关联了用户
...@@ -286,6 +292,9 @@ public class WeChatController implements IBaseController { ...@@ -286,6 +292,9 @@ public class WeChatController implements IBaseController {
response.setStatus(301); response.setStatus(301);
return; return;
} }
protocol = extDataObj.getOrDefault("protocol", "http:").toString();
LOGGER.info("从微信登录extData中获得协议信息,protocol:{}", protocol);
Long registerFrom = Long.valueOf(extDataObj.getOrDefault("registerFrom", "1").toString()); Long registerFrom = Long.valueOf(extDataObj.getOrDefault("registerFrom", "1").toString());
String redirect = (String) extDataObj.getOrDefault("redirect", "redirect"); String redirect = (String) extDataObj.getOrDefault("redirect", "redirect");
LOGGER.info("从微信登录,registerFrom:{}, redirect:{}", registerFrom, redirect); LOGGER.info("从微信登录,registerFrom:{}, redirect:{}", registerFrom, redirect);
...@@ -293,7 +302,7 @@ public class WeChatController implements IBaseController { ...@@ -293,7 +302,7 @@ public class WeChatController implements IBaseController {
AccessTokenResponse token = wechatService.getToken(code); AccessTokenResponse token = wechatService.getToken(code);
if (token == null) { if (token == null) {
// 让用户登录，不关联微信, 构造不关联微信的url // 让用户登录，不关联微信, 构造不关联微信的url
redirectNormalUrl(response, merchant, registerFrom); redirectNormalUrl(response, merchant, registerFrom,protocol);
return; return;
} }
WechatUserInfo userInfo = WechatUserInfo userInfo =
...@@ -301,7 +310,7 @@ public class WeChatController implements IBaseController { ...@@ -301,7 +310,7 @@ public class WeChatController implements IBaseController {
token.getOpenId()); token.getOpenId());
if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) { if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
// 让用户登录，不关联微信, 构造不关联微信的url // 让用户登录，不关联微信, 构造不关联微信的url
redirectNormalUrl(response, merchant, registerFrom); redirectNormalUrl(response, merchant, registerFrom,protocol);
return; return;
} }
WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId()); WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
...@@ -313,17 +322,17 @@ public class WeChatController implements IBaseController { ...@@ -313,17 +322,17 @@ public class WeChatController implements IBaseController {
userInfo.setNickName(nickName); userInfo.setNickName(nickName);
} }
userInfo = wechatService.saveWechatUserInfo(userInfo); userInfo = wechatService.saveWechatUserInfo(userInfo);
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom); redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, registerFrom,protocol);
return; return;
} }
if (userInfoInDb.getUserId() == null) { if (userInfoInDb.getUserId() == null) {
// 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面 // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom); redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom,protocol);
return; return;
} }
User user = userService.findById(userInfoInDb.getUserId()); User user = userService.findById(userInfoInDb.getUserId());
if (user == null) { if (user == null) {
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom); redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, registerFrom,protocol);
return; return;
} }
// 已经关联了用户 // 已经关联了用户
...@@ -348,6 +357,7 @@ public class WeChatController implements IBaseController { ...@@ -348,6 +357,7 @@ public class WeChatController implements IBaseController {
@RequestMapping("/receiveCode/{key}") @RequestMapping("/receiveCode/{key}")
public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) { public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) {
String schema = request.getScheme(); String schema = request.getScheme();
String protocol="http:";
LOGGER.info("HTTP协议no redirect:" + schema); LOGGER.info("HTTP协议no redirect:" + schema);
// 从code获取token // 从code获取token
Merchant merchant = merchantService.findMerchantByName(systemKey); Merchant merchant = merchantService.findMerchantByName(systemKey);
...@@ -355,13 +365,13 @@ public class WeChatController implements IBaseController { ...@@ -355,13 +365,13 @@ public class WeChatController implements IBaseController {
AccessTokenResponse token = wechatService.getToken(code); AccessTokenResponse token = wechatService.getToken(code);
if (token == null) { if (token == null) {
// 让用户登录，不关联微信, 构造不关联微信的url // 让用户登录，不关联微信, 构造不关联微信的url
redirectNormalUrl(response, merchant, Constants.Channel.WECHAT); redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
return; return;
} }
WechatUserInfo userInfo = wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(), token.getOpenId()); WechatUserInfo userInfo = wechatService.getWechatUserInfoFromWechatServer(token.getAccessToken(), token.getOpenId());
if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) { if (userInfo == null || StringUtils.isEmpty(userInfo.getOpenId())) {
// 让用户登录，不关联微信, 构造不关联微信的url // 让用户登录，不关联微信, 构造不关联微信的url
redirectNormalUrl(response, merchant, Constants.Channel.WECHAT); redirectNormalUrl(response, merchant, Constants.Channel.WECHAT,protocol);
return; return;
} }
WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId()); WechatUserInfo userInfoInDb = wechatService.findWechatUserInfoFromDb(userInfo.getOpenId());
...@@ -373,17 +383,17 @@ public class WeChatController implements IBaseController { ...@@ -373,17 +383,17 @@ public class WeChatController implements IBaseController {
userInfo.setNickName(nickName); userInfo.setNickName(nickName);
} }
userInfo = wechatService.saveWechatUserInfo(userInfo); userInfo = wechatService.saveWechatUserInfo(userInfo);
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, Constants.Channel.WECHAT); redirectWechatLoginUrlWithoutLogin(response, merchant, userInfo, Constants.Channel.WECHAT,protocol);
return; return;
} }
if (userInfoInDb.getUserId() == null) { if (userInfoInDb.getUserId() == null) {
// 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面 // 用户已经微信登录了，但是没有关联信用钱包，跳转到注册页面
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, Constants.Channel.WECHAT); redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, Constants.Channel.WECHAT,protocol);
return; return;
} }
User user = userService.findById(userInfoInDb.getUserId()); User user = userService.findById(userInfoInDb.getUserId());
if (user == null) { if (user == null) {
redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, Constants.Channel.WECHAT); redirectWechatLoginUrlWithoutLogin(response, merchant, userInfoInDb, Constants.Channel.WECHAT,protocol);
return; return;
} }
// 已经关联了用户 // 已经关联了用户
...@@ -428,37 +438,58 @@ public class WeChatController implements IBaseController { ...@@ -428,37 +438,58 @@ public class WeChatController implements IBaseController {
return url + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom + "&channelId=" + channelId + "&key=" + merchant.getName() + "&target=" + target; return url + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom + "&channelId=" + channelId + "&key=" + merchant.getName() + "&target=" + target;
} }
private void redirectWechatLoginUrlWithoutLogin(HttpServletResponse response, Merchant merchant, WechatUserInfo userInfo, Long registerFrom) { private void redirectWechatLoginUrlWithoutLogin(HttpServletResponse response, Merchant merchant, WechatUserInfo userInfo, Long registerFrom,String protocol) {
String redirectUrl = assembleWechatRedirectUrl(merchant, userInfo, registerFrom); String redirectUrl = assembleWechatRedirectUrl(merchant, userInfo, registerFrom,protocol);
LOGGER.info("redirectWechatLoginUrlWithoutLogin redirectUrl:[{}]",redirectUrl); LOGGER.info("redirectWechatLoginUrlWithoutLogin redirectUrl:[{}]",redirectUrl);
response.setHeader("Location", redirectUrl); response.setHeader("Location", redirectUrl);
response.setStatus(301); response.setStatus(301);
} }
private void redirectNormalUrl(HttpServletResponse response, Merchant merchant, Long registerFrom) { private void redirectNormalUrl(HttpServletResponse response, Merchant merchant, Long registerFrom,String protocol) {
String redirectUrl = assembleNormalRedirectUrl(merchant, registerFrom); String redirectUrl = assembleNormalRedirectUrl(merchant, registerFrom,protocol);
LOGGER.info("redirectNormalUrl redirectUrl:[{}]",redirectUrl); LOGGER.info("redirectNormalUrl redirectUrl:[{}]",redirectUrl);
response.setHeader("Location", redirectUrl); response.setHeader("Location", redirectUrl);
response.setStatus(301); response.setStatus(301);
} }
private String assembleNormalRedirectUrl(Merchant merchant, Long registerFrom) { private String assembleNormalRedirectUrl(Merchant merchant, Long registerFrom,String protocol) {
String domains=userUIAddr;
if(protocol!=null&&protocol.equals("https:")){
domains=userUIAddrS;
}
if ("baitiao".equals(merchant.getName())) { if ("baitiao".equals(merchant.getName())) {
return userUIAddr + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom=198"; if(registerFrom==58l||registerFrom==198l){
return domains + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom="+registerFrom;
}else{
return domains + "/landing?key=baitiao&target=cashTarget5&channelId=222&registerFrom=198";
}
} else if ("wechat-pay".equals(merchant.getName())) { } else if ("wechat-pay".equals(merchant.getName())) {
return userUIAddr + "/landing?key=wechat-pay&target=cashTarget5&channelId=1&page=landing/4&registerFrom" + registerFrom; return domains + "/landing?key=wechat-pay&target=cashTarget5&channelId=1&page=landing/4&registerFrom" + registerFrom;
} else { } else {
return userUIAddr + "/landing?key=xyqb&target=cashTarget4&channelId=1&registerFrom=" + registerFrom; return domains + "/landing?key=xyqb&target=cashTarget4&channelId=1&registerFrom=" + registerFrom;
} }
} }
private String assembleWechatRedirectUrl(Merchant merchant, WechatUserInfo userInfo, Long registerFrom) { private String assembleWechatRedirectUrl(Merchant merchant, WechatUserInfo userInfo, Long registerFrom,String protocol) {
String domains=userUIAddr;
if(protocol!=null&&protocol.equals("https:")){
domains=userUIAddrS;
}
if ("baitiao".equals(merchant.getName())) { if ("baitiao".equals(merchant.getName())) {
return userUIAddr + "/landing?key=baitiao&target=cashTarget5&registerFrom=198&channelId=222&isWechat=true&openId=" + userInfo.getOpenId(); if(registerFrom==58l||registerFrom==198l){
return domains + "/landing?key=baitiao&target=cashTarget5&registerFrom=" + registerFrom + "&channelId=222&isWechat=true&openId=" + userInfo.getOpenId();
}else{
return domains + "/landing?key=baitiao&target=cashTarget5&registerFrom=198&channelId=222&isWechat=true&openId=" + userInfo.getOpenId();
}
} else if ("wechat-pay".equals(merchant.getName())) { } else if ("wechat-pay".equals(merchant.getName())) {
return userUIAddr + "/landing?key=wechat-pay&target=cashTarget5&page=landing/4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId(); return domains + "/landing?key=wechat-pay&target=cashTarget5&page=landing/4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
} else { } else {
return userUIAddr + "/landing?key=xyqb&target=cashTarget4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId(); return domains + "/landing?key=xyqb&target=cashTarget4&registerFrom= " + registerFrom + "&channelId=1&isWechat=true&openId=" + userInfo.getOpenId();
} }
} }
......
src/main/java/cn/quantgroup/xyqb/controller/internal/login/AuthInfoController.java
View file @ b3e2d471
...@@ -54,7 +54,7 @@ public class AuthInfoController implements IBaseController { ...@@ -54,7 +54,7 @@ public class AuthInfoController implements IBaseController {
if(null != sessionStruct) { if(null != sessionStruct) {
log.info("从用户中心获取到了用户登录信息:phone:[{}]", sessionStruct.getValues().getUser().getPhoneNo()); log.info("从用户中心获取到了用户登录信息:phone:[{}]", sessionStruct.getValues().getUser().getPhoneNo());
LoginInfo loginInfo = new LoginInfo(); LoginInfo loginInfo = new LoginInfo();
loginInfo.setUser(UserRet.getUserRet(sessionStruct.getValues().getUser())); loginInfo.setUser(new UserRet(sessionStruct.getValues().getUser()));
loginInfo.setToken(sessionStruct.getSid()); loginInfo.setToken(sessionStruct.getSid());
LoginInfo.LoginContext context = new LoginInfo.LoginContext(); LoginInfo.LoginContext context = new LoginInfo.LoginContext();
context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId()); context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());
...@@ -82,7 +82,7 @@ public class AuthInfoController implements IBaseController { ...@@ -82,7 +82,7 @@ public class AuthInfoController implements IBaseController {
String phoneNo = ((Map<String, String>) result.getData()).get("phoneNo"); String phoneNo = ((Map<String, String>) result.getData()).get("phoneNo");
User user = userService.findByPhoneWithCache(phoneNo); User user = userService.findByPhoneWithCache(phoneNo);
LoginInfo loginInfo = new LoginInfo(); LoginInfo loginInfo = new LoginInfo();
loginInfo.setUser(UserRet.getUserRet(user)); loginInfo.setUser(new UserRet(user));
loginInfo.setToken(token); loginInfo.setToken(token);
LoginInfo.LoginContext context = new LoginInfo.LoginContext(); LoginInfo.LoginContext context = new LoginInfo.LoginContext();
context.setChannelId(null); context.setChannelId(null);
......
src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
View file @ b3e2d471
...@@ -129,6 +129,9 @@ public class UserController implements IBaseController { ...@@ -129,6 +129,9 @@ public class UserController implements IBaseController {
if (null == registerFrom) { if (null == registerFrom) {
registerFrom = 1L; registerFrom = 1L;
} }
if (channelId == 222L) {
registerFrom=222L;
}
LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo); LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
return userService.registerAndReturn(phoneNo, password, registerFrom,btRegisterChannelId); return userService.registerAndReturn(phoneNo, password, registerFrom,btRegisterChannelId);
......
src/main/java/cn/quantgroup/xyqb/model/UserRet.java
View file @ b3e2d471
...@@ -35,18 +35,17 @@ public class UserRet implements Serializable { ...@@ -35,18 +35,17 @@ public class UserRet implements Serializable {
//上一次修改时间 //上一次修改时间
private Long updatedAt; private Long updatedAt;
public static UserRet getUserRet(User user) { public UserRet(User user) {
Long createTimeStamp = user.getCreatedAt().getTime(); Long createTimeStamp = user.getCreatedAt().getTime();
Long updateTimeStamp = user.getUpdatedAt().getTime(); Long updateTimeStamp = user.getUpdatedAt().getTime();
UserRet userRet = new UserRet(); this.setId(user.getId());
userRet.setId(user.getId()); this.setPhoneNo(user.getPhoneNo());
userRet.setPhoneNo(user.getPhoneNo()); this.setEnable(user.getEnable());
userRet.setEnable(user.getEnable()); this.setPassword(StringUtils.defaultIfEmpty(user.getPassword(), ""));
userRet.setPassword(StringUtils.defaultIfEmpty(user.getPassword(), "")); this.setRegisteredFrom(user.getRegisteredFrom());
userRet.setRegisteredFrom(user.getRegisteredFrom()); this.setUuid(user.getUuid());
userRet.setUuid(user.getUuid()); this.setCreatedAt(createTimeStamp);
userRet.setCreatedAt(createTimeStamp); this.setUpdatedAt(updateTimeStamp);
userRet.setUpdatedAt(updateTimeStamp);
return userRet;
} }
} }
src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
View file @ b3e2d471
...@@ -81,6 +81,7 @@ public class UserServiceImpl implements IUserService { ...@@ -81,6 +81,7 @@ public class UserServiceImpl implements IUserService {
private final static Random random = new Random(); private final static Random random = new Random();
@Override @Override
@Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
public User findByPhoneInDb(String phone) { public User findByPhoneInDb(String phone) {
return userRepository.findByPhoneNo(phone); return userRepository.findByPhoneNo(phone);
} }
......
src/main/resources/config/dev/xyqb.properties
View file @ b3e2d471
...@@ -3,7 +3,7 @@ configserver.disable=1 ...@@ -3,7 +3,7 @@ configserver.disable=1
configserver.system=xyqb-user configserver.system=xyqb-user
#xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.22:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8 #xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.22:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.26:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8 xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.23:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
xyqb.data.mysql.password=qatest xyqb.data.mysql.password=qatest
...@@ -71,6 +71,7 @@ xyqb.auth.url=http://192.168.192.206:9001 ...@@ -71,6 +71,7 @@ xyqb.auth.url=http://192.168.192.206:9001
usersys.url=http://localhost:9001 usersys.url=http://localhost:9001
xyqb-user.ui=http://192.168.100.36:7043 xyqb-user.ui=http://192.168.100.36:7043
xyqb-user.ui-s=https://192.168.100.36:7043
wechat.appid=wxcdf6077af8127559 wechat.appid=wxcdf6077af8127559
wechat.secret=16eaec16084d0d9c52d4114f359cc72c wechat.secret=16eaec16084d0d9c52d4114f359cc72c
...@@ -90,9 +91,3 @@ motan.application=xyqbUserMotan ...@@ -90,9 +91,3 @@ motan.application=xyqbUserMotan
xyqb.user.domain=passport.xyqb.com xyqb.user.domain=passport.xyqb.com
xyqb.user.query.url=http://192.168.11.40:8081 xyqb.user.query.url=http://192.168.11.40:8081
xyqb.domain = http://192.168.4.153:7003 xyqb.domain = http://192.168.4.153:7003
\ No newline at end of file
xyqb.paycenter.url=http://192.168.4.26:7006
xyqb.paycenter.id=3
#运营系统认证地址
xyqb.yunying.url=http://192.168.4.50:7047
\ No newline at end of file
src/main/resources/config/release01/xyqb.properties
View file @ b3e2d471
...@@ -36,6 +36,7 @@ jr58.notify.userinfo=http://dk.58.com/customer/quantgroup_user_info ...@@ -36,6 +36,7 @@ jr58.notify.userinfo=http://dk.58.com/customer/quantgroup_user_info
model.quantgroup.url=http://model.quantgroup.cn model.quantgroup.url=http://model.quantgroup.cn
xyqb.auth.url=http://auth.xyqb.com xyqb.auth.url=http://auth.xyqb.com
xyqb-user.ui=http://passport.xyqb.com xyqb-user.ui=http://passport.xyqb.com
xyqb-user.ui-s=https://passport.xyqb.com
#motan protocol #motan protocol
protocol.name=motan protocol.name=motan
protocol.contentLength=1048576 protocol.contentLength=1048576
......
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