XA/xa-master-prod
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

兴安兼容老版本

Browse Source
This commit is contained in:
zc
2025-07-02 10:53:56 +08:00
parent f439594100
commit cf336c67e4
10 changed files with 131 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dcsoft-auth/src/main/java/com/dcsoft/auth/controller/TokenController.java
View File

@@ -57,8 +57,8 @@ public class TokenController
// 用户登录
if ("weixin".equals(form.getFlag())) {
//微信登录openid必传，phone必传
String s = RsaUiUtils.decryptByPrivateKey(form.getOpenid());
form.setOpenid(s);
// String s = RsaUiUtils.decryptByPrivateKey(form.getOpenid());
// form.setOpenid(s);
R<LoginUser> userInfos = sysLoginService.getWxUserInfo(form);
userInfo = userInfos.getData();
if (ObjectUtil.isEmpty(userInfo) || ObjectUtil.isEmpty(userInfo.getSysUser())) {
@@ -67,25 +67,26 @@ public class TokenController
userInfo = sysLoginService.appRegister(registerBody);
}
} else if ("app".equals(form.getFlag())) {
String str = RsaUiUtils.decryptByPrivateKey(form.getEncrypt());
JSONObject jsonObject = JSONObject.parseObject(str);
userInfo = sysLoginService.login(jsonObject.getString("username"), jsonObject.getString("password"));
// String str = RsaUiUtils.decryptByPrivateKey(form.getEncrypt());
// JSONObject jsonObject = JSONObject.parseObject(str);
// userInfo = sysLoginService.login(jsonObject.getString("username"), jsonObject.getString("password"));
userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
//保存用户openid
if (StringUtils.isNotEmpty(form.getOpenid())) {
String s = RsaUiUtils.decryptByPrivateKey(form.getOpenid());
form.setOpenid(s);
// String s = RsaUiUtils.decryptByPrivateKey(form.getOpenid());
// form.setOpenid(s);
sysLoginService.updateOpenId(userInfo, form);
}
} else if ("sms".equals(form.getFlag())) {
//短信登录openid，phone，smsCode必传(openid不能使用，存在他人手机号登录别人账号场景)
String s = RsaUiUtils.decryptByPrivateKey(form.getSmsCode());
form.setSmsCode(s);
// String s = RsaUiUtils.decryptByPrivateKey(form.getSmsCode());
// form.setSmsCode(s);
userInfo = sysLoginService.Smslogin(form);
} else {
String s = RsaUiUtils.decryptByPrivateKey(form.getEncrypt());
JSONObject jsonObject = JSONObject.parseObject(s);
userInfo = sysLoginService.login(jsonObject.getString("username"), jsonObject.getString("password"));
// userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
// String s = RsaUiUtils.decryptByPrivateKey(form.getEncrypt());
// JSONObject jsonObject = JSONObject.parseObject(s);
// userInfo = sysLoginService.login(jsonObject.getString("username"), jsonObject.getString("password"));
userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
}
// 获取登录token
return R.ok(tokenService.createToken(userInfo));

2
dcsoft-auth/src/main/resources/bootstrap.yml
View File

@@ -15,9 +15,11 @@ spring:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
# namespace: xa
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
# namespace: xa
# 配置文件格式
file-extension: yml
# 共享配置