Commit 313559a9 authored by muhong's avatar muhong

增加 注释

parent 8f975e21
......@@ -790,6 +790,7 @@ public class ItemServiceImpl implements ItemService {
public Result getAcode(String page, String scene, Integer loginType, HttpServletRequest request) {
try {
String url = "";
// 环境是微信小程序
if (loginType.equals(LoginTypeEnum.WECHAT.getCode())) {
// 判断是否存储过该请求路径的微信小程序码图片
String keyName = CommConsts.UPLOAD_PRE_WXACODE_DIRECTORY + page + "/" + scene + "." + MediaTypeEnum.IMAGE_JPG.getExt();
......@@ -805,12 +806,14 @@ public class ItemServiceImpl implements ItemService {
}
url = qiniuStorage.generateUrl(keyName);
}
// 环境是支付宝小程序
if (loginType.equals(LoginTypeEnum.ALIPAY.getCode())) {
url = alipayLoginManager.getAcode(page, scene);
if (StringUtils.isBlank(url)) {
return Result.failed("获取支付宝小程序码失败");
}
}
// 环境是抖音小程序
if (loginType.equals(LoginTypeEnum.TIKTOK.getCode())) {
String clientToken = tikTokLoginManager.getClientToken();
if (StringUtils.isBlank(clientToken)) {
......@@ -836,18 +839,21 @@ public class ItemServiceImpl implements ItemService {
public Result getLink(String pageUrl, Integer loginType, Integer shareType, HttpServletRequest request) {
try {
String link = "";
// 环境是微信小程序
if (loginType.equals(LoginTypeEnum.WECHAT.getCode())) {
link = wxLoginManager.getLink(pageUrl);
if (StringUtils.isBlank(link)) {
return Result.failed("获取微信小程序链接失败");
}
}
// 环境是支付宝小程序
if (loginType.equals(LoginTypeEnum.ALIPAY.getCode())) {
link = alipayLoginManager.getLink(pageUrl);
if (StringUtils.isBlank(link)) {
return Result.failed("获取支付宝小程序链接失败");
}
}
// 环境是抖音小程序
if (loginType.equals(LoginTypeEnum.TIKTOK.getCode())) {
String clientToken = tikTokLoginManager.getClientToken();
if (StringUtils.isBlank(clientToken)) {
......
......@@ -133,8 +133,9 @@ public class UserServiceImpl implements UserService {
if (!StringUtils.equals(dto.getSmsCode(), object.toString())) {
return Result.failed("验证码不正确");
}
// 获取登录结果
// 进行登录
Map<String, Object> result = getLoginResult(dto, request);
// 判断开关状态
Switch switchh = switchService.findOnly();
boolean isOpen = Objects.nonNull(switchh) && switchh.getState() == 1;
result.put("isInvited", inviteRecordService.isExisted(dto.getMobile()).getData());
......@@ -157,7 +158,9 @@ public class UserServiceImpl implements UserService {
public Result login(UserRequestDto dto, HttpServletRequest request) {
try {
String mobile = "";
// 根据小程序来源不同调用不同的处理逻辑获取手机号
try {
// 来源是微信
if (dto.getLoginType().equals(LoginTypeEnum.WECHAT.getCode())) {
mobile = wxLoginManager.getPhone(dto);
if (StringUtils.equals("false", mobile)) {
......@@ -174,6 +177,7 @@ public class UserServiceImpl implements UserService {
}
dto.setWxOpenId(wxLoginManager.getWxOpenId(dto.getLoginCode()));
}
// 来源是支付宝
if (dto.getLoginType().equals(LoginTypeEnum.ALIPAY.getCode())) {
mobile = alipayLoginManager.getPhone(dto.getEncryptedData());
if (StringUtils.equals("false", mobile)) {
......@@ -181,6 +185,7 @@ public class UserServiceImpl implements UserService {
}
dto.setAlipayUserId(alipayLoginManager.getAlipayUserId(dto.getLoginCode()));
}
// 来源是抖音
if (dto.getLoginType().equals(LoginTypeEnum.TIKTOK.getCode())) {
String sessionKey = tikTokLoginManager.getSessionKey(dto.getLoginCode());
if (StringUtils.isBlank(sessionKey)) {
......@@ -195,9 +200,10 @@ public class UserServiceImpl implements UserService {
logger.error("获取用户手机号异常", e);
return Result.failed("获取用户手机号失败");
}
// 获取登录结果
dto.setMobile(mobile);
// 进行登录
Map<String, Object> result = getLoginResult(dto, request);
// 判断开关状态
Switch switchh = switchService.findOnly();
boolean isOpen = Objects.nonNull(switchh) && switchh.getState() == 1;
result.put("isInvited", inviteRecordService.isExisted(mobile).getData());
......@@ -446,6 +452,7 @@ public class UserServiceImpl implements UserService {
Date now = new Date();
User user = userDao.queryByMobile(dto.getMobile());
// 判断该手机号是否已经在系统内部注册过,没有则新增
if (Objects.isNull(user)) {
user = new User();
user.setUsername(UUID.randomUUID().toString().replace("-", ""));
......@@ -477,6 +484,7 @@ public class UserServiceImpl implements UserService {
user.setShareUserId(0L);
userDao.insert(user);
} else {
// 注册过的用户修改最后登录的时间以及绑定微信openid和支付宝user_id
if (StringUtils.isNotBlank(dto.getWxOpenId())) {
user.setWeixinOpenid(dto.getWxOpenId());
}
......@@ -512,9 +520,9 @@ public class UserServiceImpl implements UserService {
String registerDate = simpleDateFormat.format(Objects.isNull(user.getAddTime()) ? new Date() : user.getAddTime());
userInfo.setRegisterDate(registerDate);
userInfo.setStatus(user.getStatus());
// 用户层级
// 用户层级(不知道有啥用,保留)
userInfo.setUserLevel(user.getUserLevel());
// 用户层级描述
// 用户层级描述(不知道有啥用,保留)
userInfo.setUserLevelDesc(UserTypeEnum.getInstance(user.getUserLevel()).getDesc());
result.put("userInfo", userInfo);
......
......@@ -93,6 +93,12 @@ public class AlipayLoginManager {
return JsonUtils.getValueByPath(plainData, "mobile");
}
/**
* 获取支付宝user_id
*
* @param loginCode
* @return
*/
public String getAlipayUserId(String loginCode) {
logger.info("开始解密获取支付宝小程序登录用户的access_token");
AlipayConfig alipayConfig = new AlipayConfig();
......
......@@ -28,9 +28,9 @@ public class TikTokLoginManager {
@Autowired
private ApplicationContext applicationContext;
// appid
// appid(需要替换)
private static final String appid = "ttc1fcb7415ec18f6f01";
// appSecret
// appSecret(需要替换)
private static final String appSecret = "1a248c43d69c4bcba48779efac2c6f3ade573ec7";
// 抖音小程序获取session_key的api正式环境
......
......@@ -24,10 +24,10 @@ import java.util.Map;
public class WxLoginManager {
private static final Logger logger = LoggerFactory.getLogger(WxLoginManager.class);
// 微信小程序appid
// 微信小程序appid(需要替换)
private static final String appid = "wx5b4409448bf2c72b";
// private static final String appid = "wxb2bc9d1be2d6345c";
// 微信小程序secret
// 微信小程序secret(需要替换)
private static final String secret = "6fee0d7b2197845fed0a3fe8f5a9bd66";
// private static final String secret = "fade0a145eea51cfc89a9e8808f28f04";
// 微信小程序获取access_token地址
......@@ -42,6 +42,12 @@ public class WxLoginManager {
@Autowired
private WxMaService wxMaService;
/**
* 获取微信openid
*
* @param loginCode
* @return
*/
public String getWxOpenId(String loginCode) {
logger.info("开始获取openId-----------------------");
String openId = "";
......@@ -55,6 +61,12 @@ public class WxLoginManager {
return openId;
}
/**
* 获取手机号
*
* @param dto
* @return
*/
public String getPhone(UserRequestDto dto) {
String phone = "";
if (dto.getType() == 1) {
......@@ -105,6 +117,11 @@ public class WxLoginManager {
return phone;
}
/**
* 获取调用凭证access_token
*
* @return
*/
public String getAccessToken() {
logger.info("开始获取access_token----------------");
try {
......@@ -123,6 +140,13 @@ public class WxLoginManager {
}
}
/**
* 获取小程序码二进制流
*
* @param page
* @param scene
* @return
*/
public InputStream getWxacodeStream(String page, String scene) {
try {
String accessToken = getAccessToken();
......@@ -139,6 +163,12 @@ public class WxLoginManager {
}
}
/**
* 获取小程序短链接
*
* @param pageUrl
* @return
*/
public String getLink(String pageUrl) {
try {
String accessToken = getAccessToken();
......
......@@ -75,7 +75,6 @@ public interface UserService {
/**
* 查询用户信息
*
* @param dto
* @param request
* @return
*/
......
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