iidi
/
bocloud.sms
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

develop
admin 2024-11-18 16:26:34 +08:00
parent cc22b774e5 11bcf0b6b6
commit a0eb69d689
3 changed files with 70 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bocloud.sms.booter/src/main/java/com/bocloud/sms/booter/controller/LoginController.java
View File

@ -63,6 +63,7 @@ public class LoginController {
@PostMapping("/users/login")
public GeneralResult<Map<String, Object>> userLogin(@RequestBody LoginModel loginModel,
HttpServletRequest request) {
try {
log.info("开始执行登录请求");
long start;
String account = loginModel.getAccount();
@ -122,6 +123,10 @@ public class LoginController {
log.info("删除Redis耗时{}ms", System.currentTimeMillis() - start);
log.info("登录请求处理完成");
return loginResult;
}catch (Exception e){
log.error("登录异常",e);
return new GeneralResult<>(false,"登录异常:" + e.getMessage());
}
}
/**

14
bocloud.sms.booter/src/main/resources/logback-spring.xml
View File

@ -55,21 +55,29 @@
</filter>
</appender>
<!-- 异步 Syslog 配置 -->
<appender name="ASYNC_SYSLOG" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="SYSLOG"/>
<queueSize>5000</queueSize> <!-- 设置队列大小，取决于应用负载 -->
<discardingThreshold>0</discardingThreshold> <!-- 设置丢弃策略 -->
<includeCallerData>true</includeCallerData>
</appender>
<root level="${logging.level.root}">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="LOG_FILE"/>
<appender-ref ref="SYSLOG"/>
<appender-ref ref="ASYNC_SYSLOG"/>
</root>
<logger name="com.bocloud" level="${logging.level.com.bocloud}" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="LOG_FILE"/>
<appender-ref ref="SYSLOG"/>
<appender-ref ref="ASYNC_SYSLOG"/>
</logger>
<logger name="com.alibaba.druid.pool.DruidAbstractDataSource" level="error" additivity="false">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="LOG_FILE"/>
<appender-ref ref="SYSLOG"/>
<appender-ref ref="ASYNC_SYSLOG"/>
</logger>
</configuration>

3
bocloud.sms.service/src/main/java/com/bocloud/sms/service/IndexServiceImpl.java
View File

@ -94,7 +94,8 @@ public class IndexServiceImpl implements IndexService {
log.info("user:{}", JSON.toJSONString(user));
param.put("userId", user.getUserId() == null ? ykUtil.getReqUserId() : user.getUserId());
param.put("page", 1);
param.put("limit", Integer.MAX_VALUE);
param.put("limit", 15); //理想要求 固定值15
log.info("get task list params:{}", JSON.toJSONString(param));
String result = ykUtil.call(YkInfo.getTaskList, param, JSONArray.class);
log.info("result:{}",result);
JSONObject jsonObject = JSONArray.parseObject(result, JSONObject.class);