授权提示问题
This commit is contained in:
parent
8458da333f
commit
83a08265c3
|
|
@ -28,7 +28,7 @@ public class CorsFilter implements Filter {
|
||||||
response.setHeader("Access-Control-Allow-Origin", curOrigin == null ? "true" : curOrigin);
|
response.setHeader("Access-Control-Allow-Origin", curOrigin == null ? "true" : curOrigin);
|
||||||
response.setHeader("Access-Control-Allow-Methods", "*");
|
response.setHeader("Access-Control-Allow-Methods", "*");
|
||||||
response.setHeader("Access-Control-Max-Age", "3600");
|
response.setHeader("Access-Control-Max-Age", "3600");
|
||||||
response.setHeader("Access-Control-Allow-Headers", "environment,type,version,token");
|
response.setHeader("Access-Control-Allow-Headers", "environment,openId,type,version,token");
|
||||||
response.setHeader("Access-Control-Allow-Credentials", "true");
|
response.setHeader("Access-Control-Allow-Credentials", "true");
|
||||||
chain.doFilter(req, resp);
|
chain.doFilter(req, resp);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,7 @@ import com.chaozhanggui.system.cashierservice.service.LoginService;
|
||||||
import com.chaozhanggui.system.cashierservice.service.OnlineUserService;
|
import com.chaozhanggui.system.cashierservice.service.OnlineUserService;
|
||||||
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
|
import com.chaozhanggui.system.cashierservice.sign.CodeEnum;
|
||||||
import com.chaozhanggui.system.cashierservice.sign.Result;
|
import com.chaozhanggui.system.cashierservice.sign.Result;
|
||||||
import com.chaozhanggui.system.cashierservice.util.IpUtil;
|
import com.chaozhanggui.system.cashierservice.util.*;
|
||||||
import com.chaozhanggui.system.cashierservice.util.MD5Utils;
|
|
||||||
import com.chaozhanggui.system.cashierservice.util.StringUtil;
|
|
||||||
import com.chaozhanggui.system.cashierservice.util.TokenUtil;
|
|
||||||
import com.chaozhanggui.system.cashierservice.wxUtil.WechatUtil;
|
import com.chaozhanggui.system.cashierservice.wxUtil.WechatUtil;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
|
|
@ -158,13 +155,14 @@ public class LoginContoller {
|
||||||
String encryptedData = map.get("encryptedData");
|
String encryptedData = map.get("encryptedData");
|
||||||
|
|
||||||
String ivStr = map.get("iv");
|
String ivStr = map.get("iv");
|
||||||
|
if (StringUtils.isBlank(encryptedData) || StringUtils.isBlank(ivStr)) {
|
||||||
|
return Result.fail("请授权后使用");
|
||||||
|
}
|
||||||
|
|
||||||
JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, customAppId, customSecrete);
|
JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, customAppId, customSecrete);
|
||||||
// 3.接收微信接口服务 获取返回的参数
|
// 3.接收微信接口服务 获取返回的参数
|
||||||
String openid = SessionKeyOpenId.getString("openid");
|
String openid = SessionKeyOpenId.getString("openid");
|
||||||
String sessionKey = SessionKeyOpenId.getString("session_key");
|
String sessionKey = SessionKeyOpenId.getString("session_key");
|
||||||
|
|
||||||
String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr);
|
String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr);
|
||||||
if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) {
|
if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) {
|
||||||
return Result.success(CodeEnum.SUCCESS, JSONObject.parseObject(data).get("phoneNumber"));
|
return Result.success(CodeEnum.SUCCESS, JSONObject.parseObject(data).get("phoneNumber"));
|
||||||
|
|
@ -256,6 +254,7 @@ public class LoginContoller {
|
||||||
* username 手机号
|
* username 手机号
|
||||||
* password 密码登录时使用
|
* password 密码登录时使用
|
||||||
* code 验证码登录时使用
|
* code 验证码登录时使用
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@PostMapping("/app/login")
|
@PostMapping("/app/login")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue