|
@@ -327,7 +327,7 @@ public class FsUserCourseVideoController extends AppBaseController {
|
|
|
return handleWechatError(e);
|
|
return handleWechatError(e);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 统一处理微信错误
|
|
* 统一处理微信错误
|
|
|
*/
|
|
*/
|
|
@@ -339,13 +339,13 @@ public class FsUserCourseVideoController extends AppBaseController {
|
|
|
Integer errcode = wxError.getError().getErrorCode();
|
|
Integer errcode = wxError.getError().getErrorCode();
|
|
|
String errmsg = wxError.getError().getErrorMsg();
|
|
String errmsg = wxError.getError().getErrorMsg();
|
|
|
log.error("微信API异常,错误码:{},错误信息:{}", errcode, errmsg);
|
|
log.error("微信API异常,错误码:{},错误信息:{}", errcode, errmsg);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
String friendlyMsg = WechatErrorUtil.getFriendlyMessage(errcode);
|
|
String friendlyMsg = WechatErrorUtil.getFriendlyMessage(errcode);
|
|
|
Map<String, Object> extData = new HashMap<>();
|
|
Map<String, Object> extData = new HashMap<>();
|
|
|
extData.put("wechatErrorCode", errcode);
|
|
extData.put("wechatErrorCode", errcode);
|
|
|
return new ResponseResult<>(500, friendlyMsg, null, extData);
|
|
return new ResponseResult<>(500, friendlyMsg, null, extData);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 2. 检查是否是微信错误(格式:微信错误:errcode|errmsg)
|
|
// 2. 检查是否是微信错误(格式:微信错误:errcode|errmsg)
|
|
|
String errorMsg = e.getMessage();
|
|
String errorMsg = e.getMessage();
|
|
|
if (errorMsg != null && errorMsg.startsWith("微信错误:")) {
|
|
if (errorMsg != null && errorMsg.startsWith("微信错误:")) {
|
|
@@ -356,7 +356,7 @@ public class FsUserCourseVideoController extends AppBaseController {
|
|
|
Integer errcode = Integer.parseInt(parts[0]);
|
|
Integer errcode = Integer.parseInt(parts[0]);
|
|
|
String errmsg = parts[1];
|
|
String errmsg = parts[1];
|
|
|
log.error("微信返回错误,错误码:{},错误信息:{}", errcode, errmsg);
|
|
log.error("微信返回错误,错误码:{},错误信息:{}", errcode, errmsg);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
String friendlyMsg = WechatErrorUtil.getFriendlyMessage(errcode);
|
|
String friendlyMsg = WechatErrorUtil.getFriendlyMessage(errcode);
|
|
|
Map<String, Object> extData = new HashMap<>();
|
|
Map<String, Object> extData = new HashMap<>();
|
|
|
extData.put("wechatErrorCode", errcode);
|
|
extData.put("wechatErrorCode", errcode);
|
|
@@ -366,7 +366,7 @@ public class FsUserCourseVideoController extends AppBaseController {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// 3. 其他错误,返回通用错误信息
|
|
// 3. 其他错误,返回通用错误信息
|
|
|
return ResponseResult.fail(500, "获取微信小程序链接失败:" + errorMsg);
|
|
return ResponseResult.fail(500, "获取微信小程序链接失败:" + errorMsg);
|
|
|
}
|
|
}
|
|
@@ -458,10 +458,11 @@ public class FsUserCourseVideoController extends AppBaseController {
|
|
|
@ApiOperation("任务列表")
|
|
@ApiOperation("任务列表")
|
|
|
@GetMapping("/im/sendLog")
|
|
@GetMapping("/im/sendLog")
|
|
|
public ResponseResult<PageInfo<FsImSendLogVO>> imSendLog(@RequestParam(defaultValue = "1") Integer pageNum,
|
|
public ResponseResult<PageInfo<FsImSendLogVO>> imSendLog(@RequestParam(defaultValue = "1") Integer pageNum,
|
|
|
- @RequestParam(defaultValue = "10") Integer pageSize) {
|
|
|
|
|
|
|
+ @RequestParam(defaultValue = "10") Integer pageSize,@RequestParam String keyword) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
params.put("companyId", getCompanyId());
|
|
params.put("companyId", getCompanyId());
|
|
|
params.put("companyUserId", Long.parseLong(getUserId()));
|
|
params.put("companyUserId", Long.parseLong(getUserId()));
|
|
|
|
|
+ params.put("keyword", keyword);
|
|
|
|
|
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
List<FsImSendLogVO> list = imMsgSendLogService.selectFsImSendLogList(params);
|
|
List<FsImSendLogVO> list = imMsgSendLogService.selectFsImSendLogList(params);
|