Commit 05fedb7c authored by 贺超's avatar 贺超

Merge branch 'feature/KA-20' into 'master'

Feature/ka 20

See merge request !8
parents 4d173fee f94bbd1a
##KA-20/2021-09-29
###极光登陆返回用户是否已注册
```
package cn.quantgroup.xyqb.controller.internal.user;
function authLoginV1
loginInfo.setRegister(isRegister);
Boolean isRegister = true; // 新注册
Boolean isRegister = false; // 非新注册
```
##KA-4/2021-06-30 ##KA-4/2021-06-30
###apollo新增配置 ###apollo新增配置
``` ```
......
...@@ -76,7 +76,11 @@ public class AppController implements IBaseController { ...@@ -76,7 +76,11 @@ public class AppController implements IBaseController {
result = JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null); result = JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
}else{ }else{
User user = userService.findByPhoneInDb(phoneNumber); User user = userService.findByPhoneInDb(phoneNumber);
// 默认为已注册
Boolean isRegister = false;
if (user == null) { if (user == null) {
// 未注册过
isRegister = true;
user = userRegisterService.register(registerFrom, phoneNumber, idNo, name, channelId, createdFrom); user = userRegisterService.register(registerFrom, phoneNumber, idNo, name, channelId, createdFrom);
} }
if (user == null) { if (user == null) {
...@@ -99,6 +103,7 @@ public class AppController implements IBaseController { ...@@ -99,6 +103,7 @@ public class AppController implements IBaseController {
loginInfo.setHasPassword(user.getHasPassword()); loginInfo.setHasPassword(user.getHasPassword());
loginInfo.setToken(bean.getToken()); loginInfo.setToken(bean.getToken());
loginInfo.setLoginContext(context); loginInfo.setLoginContext(context);
loginInfo.setRegister(isRegister);
result = JsonResult.buildSuccessResult("登陆成功", loginInfo); result = JsonResult.buildSuccessResult("登陆成功", loginInfo);
} }
} }
......
...@@ -8,7 +8,10 @@ ...@@ -8,7 +8,10 @@
<file>/home/quant_group/logs/${spring.application.name:-application}.log</file> <file>/home/quant_group/logs/${spring.application.name:-application}.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>/home/quant_group/logs/${spring.application.name:-application}.log.%d{yyyy-MM-dd}</fileNamePattern> <fileNamePattern>/home/quant_group/logs/${spring.application.name:-application}.log.%d{yyyy-MM-dd}</fileNamePattern>
<maxHistory>30</maxHistory> <maxHistory>90</maxHistory>
<maxFileSize>512MB</maxFileSize>
<totalSizeCap>40GB</totalSizeCap>
<cleanHistoryOnStart>true</cleanHistoryOnStart>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>${FILE_LOG_PATTERN}</pattern> <pattern>${FILE_LOG_PATTERN}</pattern>
......
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