Commit a89afd34 by Shadow

修复日志报错

parent a44631e4
......@@ -27,11 +27,6 @@
<dependency>
<groupId>com.wecloud</groupId>
<artifactId>can-common-log</artifactId>
</dependency>
<dependency>
<groupId>com.wecloud</groupId>
<artifactId>can-common-security</artifactId>
</dependency>
......
......@@ -10,8 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistPageParam;
import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistQueryVo;
import com.wecloud.im.biz.module.message.controller.param.add.ImClientBlacklistUpdate;
......@@ -60,7 +58,6 @@ public class BlacklistAction {
* @return
*/
@ActionMapping("/getPageList")
@OperationLog(name = "黑名单分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "黑名单分页列表")
public WsResponse<Paging<ImClientBlacklistQueryVo>> getImClientBlacklistPageList(ImClientBlacklistPageParam data) {
Paging<ImClientBlacklistQueryVo> blacklist =
......
package com.wecloud.im.biz.core.aop;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.AfterThrowing;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
import com.wecloud.can.log.aop.BaseLogAop;
import com.wecloud.can.log.bean.OperationLogInfo;
import com.wecloud.can.log.bean.RequestInfo;
/**
* <p>
* Controller Aop
* 获取响应结果信息
* </p>
*
* @author geekidea
* @date 2019-10-23
*/
@Slf4j
@Aspect
@Component
@ConditionalOnProperty(value = {"spring-boot-plus.aop.log.enable"}, matchIfMissing = true)
public class LogAop extends BaseLogAop {
/**
* 切点
*/
private static final String POINTCUT =
"execution(public * io.geekidea.springbootplus..*.controller..*.*(..)) || " +
"execution(public * com.jumeirah..*.controller..*.*(..))";
@Around(POINTCUT)
@Override
public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
return super.handle(joinPoint);
}
@AfterThrowing(pointcut = POINTCUT, throwing = "exception")
@Override
public void afterThrowing(JoinPoint joinPoint, Exception exception) {
super.handleAfterThrowing(exception);
}
@Override
protected void setRequestId(RequestInfo requestInfo) {
super.handleRequestId(requestInfo);
}
@Override
protected void getRequestInfo(RequestInfo requestInfo) {
// 处理请求参数日志
super.handleRequestInfo(requestInfo);
}
@Override
protected void getResponseResult(Object result) {
// 处理响应结果日志
super.handleResponseResult(result);
}
@Override
protected void finish(RequestInfo requestInfo, OperationLogInfo operationLogInfo, Object result, Exception exception) {
// 异步保存操作日志
super.saveSysOperationLog(requestInfo, operationLogInfo, result, exception);
// 异步保存登录日志
super.saveSysLoginLog(requestInfo, operationLogInfo, result, exception);
}
}
//package com.wecloud.im.controller;
//
//import com.wecloud.can.core.util.ApiResult;
//import com.wecloud.can.log.annotation.OperationLog;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import lombok.extern.slf4j.Slf4j;
//import org.apache.shiro.authz.annotation.RequiresRoles;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//
//import java.io.IOException;
//
///**
// * Hello World Controller
// **/
//@Slf4j
//@Api(value = "权限测试", tags = {"APP Hello World2"})
//@RestController
//@RequestMapping("/app")
//public class AppHelloWorldController {
//
// /**
// * Hello World
// *
// * @return
// * @throws IOException
// */
// @GetMapping(value = "/world")
// @OperationLog(name = "helloWorld")
// @ApiOperation(value = "helloWorld", response = String.class)
// public ApiResult<String> helloWorld() throws IOException {
// log.info("Hello World...app");
// return ApiResult.ok("Hello World app");
// }
//
//
// @GetMapping(value = "/needRole")
// @OperationLog(name = "needRole")
// @ApiOperation(value = "needRole", response = String.class)
// public ApiResult<String> needRole() throws IOException {
// log.info("Hello World...app");
// return ApiResult.ok("Hello World app");
// }
//
// @GetMapping(value = "/needRoleAdmin")
// @OperationLog(name = "needRoleAdmin")
// @ApiOperation(value = "needRoleAdmin", response = String.class)
// @RequiresRoles("app:admin")
// public ApiResult<String> needRoleAdmin() throws IOException {
// log.info("Hello World...app");
// return ApiResult.ok("Hello World needRoleAdmin");
// }
//
// @GetMapping(value = "/needRoleAll")
// @OperationLog(name = "needRoleAll")
// @ApiOperation(value = "needRoleAll", response = String.class)
// @RequiresRoles("app:all")
// public ApiResult<String> needRoleAll() throws IOException {
// log.info("Hello World...app");
// return ApiResult.ok("Hello World needRoleAll");
// }
//
// @GetMapping(value = "/noRole")
// @OperationLog(name = "noRole")
// @ApiOperation(value = "noRole", response = String.class)
// public ApiResult<String> noRole() throws IOException {
// log.info("Hello World...app");
// return ApiResult.ok("Hello World app noRole");
// }
//
//}
//package com.wecloud.im.controller;
//
//import com.wecloud.im.entity.ImApplication;
//import com.wecloud.im.param.ImApplicationPageParam;
//import com.wecloud.im.param.ImApplicationQueryVo;
//import com.wecloud.im.param.add.ImApplicationAdd;
//import com.wecloud.im.service.ImApplicationService;
//import com.wecloud.im.server.utils.RSAGenerator;
//import com.wecloud.can.core.util.ApiResult;
//import com.wecloud.can.core.base.controller.BaseController;
//import com.wecloud.can.core.core.pagination.Paging;
//import com.wecloud.can.core.core.validator.groups.Add;
//import com.wecloud.can.core.core.validator.groups.Update;
//import com.wecloud.can.log.annotation.OperationLog;
//import com.wecloud.can.log.enums.OperationLogType;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.BeanUtils;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestParam;
//import org.springframework.web.bind.annotation.RestController;
//
///**
// * 第三方应用表 控制器
// *
// * @author wei
// * @since 2021-04-27
// */
//@Slf4j
//@RestController
//@RequestMapping("/imApplication")
//@Api(value = "第三方应用表API", tags = {"第三方应用表"})
//public class ImApplicationController extends BaseController {
//
// public static final String ADMIN_PWD = "si0132g9ad4gd6xv8x888wd6g86aga731h6pzc1pzc68b7eln96s2360j0sjkh028sj131h0gjb";
//
// @Autowired
// private ImApplicationService imApplicationService;
//
// /**
// * 添加第三方应用表
// */
// @PostMapping("/add")
// @OperationLog(name = "添加第三方应用表", type = OperationLogType.ADD)
// @ApiOperation(value = "添加第三方应用表")
// public ApiResult<Boolean> addImApplication(@Validated(Add.class) @RequestBody ImApplicationAdd imApplicationAdd) throws Exception {
//
// if (!imApplicationAdd.getAdminPwd().equals(ADMIN_PWD)) {
// return ApiResult.fail();
// }
//
// ImApplication imApplication = new ImApplication();
// BeanUtils.copyProperties(imApplicationAdd, imApplication);
//
// // 生成AppKey
// String appKey = RSAGenerator.getAppKey(); //定义变量接收
// // 生成appSecret
// String appSecret = RSAGenerator.getAppSecret(appKey);
//
// imApplication.setAppKey(appKey);
// imApplication.setAppSecret(appSecret);
//
// boolean flag = imApplicationService.saveImApplication(imApplication);
// return ApiResult.result(flag);
// }
//
// /**
// * 修改第三方应用表
// */
// @PostMapping("/update")
// @OperationLog(name = "修改第三方应用表", type = OperationLogType.UPDATE)
// @ApiOperation(value = "修改第三方应用表")
// public ApiResult<Boolean> updateImApplication(@Validated(Update.class) @RequestBody ImApplicationAdd imApplicationAdd) throws Exception {
//
// if (!imApplicationAdd.getAdminPwd().equals(ADMIN_PWD)) {
// return ApiResult.fail();
// }
//
// ImApplication imApplication = new ImApplication();
// boolean flag = imApplicationService.updateImApplication(imApplication);
// return ApiResult.result(flag);
// }
//
// /**
// * 删除第三方应用表
// */
// @PostMapping("/delete")
// @OperationLog(name = "删除第三方应用表", type = OperationLogType.DELETE)
// @ApiOperation(value = "删除第三方应用表")
// public ApiResult<Boolean> deleteImApplication(@RequestParam("id") Long id, @RequestParam("pwd") String pwd) throws Exception {
//
// if (!pwd.equals(ADMIN_PWD)) {
// return ApiResult.fail();
// }
// boolean flag = imApplicationService.deleteImApplication(id);
// return ApiResult.result(flag);
// }
//
// /**
// * 获取第三方应用表详情
// */
// @GetMapping("/info/")
// @OperationLog(name = "第三方应用表详情", type = OperationLogType.INFO)
// @ApiOperation(value = "第三方应用表详情")
// public ApiResult<ImApplicationQueryVo> getImApplication(@RequestParam("id") Long id, @RequestParam("pwd") String pwd) throws Exception {
//
// if (!pwd.equals(ADMIN_PWD)) {
// return null;
// }
//
// ImApplicationQueryVo imApplicationQueryVo = imApplicationService.getImApplicationById(id);
// return ApiResult.ok(imApplicationQueryVo);
// }
//
// /**
// * 第三方应用表分页列表
// */
// @PostMapping("/getPageList")
// @OperationLog(name = "第三方应用表分页列表", type = OperationLogType.PAGE)
// @ApiOperation(value = "第三方应用表分页列表")
// public ApiResult<Paging<ImApplicationQueryVo>> getImApplicationPageList(@Validated @RequestBody ImApplicationPageParam imApplicationPageParam) throws Exception {
//
// if (!imApplicationPageParam.getPwd().equals(ADMIN_PWD)) {
// return null;
// }
// Paging<ImApplicationQueryVo> paging = imApplicationService.getImApplicationPageList(imApplicationPageParam);
// return ApiResult.ok(paging);
// }
//
//}
//
......@@ -15,8 +15,6 @@ import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.core.validator.groups.Add;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistPageParam;
import com.wecloud.im.biz.module.message.controller.param.ImClientBlacklistQueryVo;
import com.wecloud.im.biz.module.message.controller.param.add.ImClientBlacklistUpdate;
......@@ -62,7 +60,6 @@ public class ImClientBlacklistController extends BaseController {
* 黑名单分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "黑名单分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "黑名单分页列表")
public ApiResult<Paging<ImClientBlacklistQueryVo>> getImClientBlacklistPageList(@RequestBody ImClientBlacklistPageParam imClientBlacklistPageParam) throws Exception {
Paging<ImClientBlacklistQueryVo> blacklist =
......@@ -74,7 +71,6 @@ public class ImClientBlacklistController extends BaseController {
* 黑名单分页列表sdk用
*/
@PostMapping("/sdk/pageBlacklist")
@OperationLog(name = "黑名单分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "黑名单分页列表")
public ApiResult<Paging<ImClientBlacklistQueryVo>> getImClientBlacklistPageListSdk(@RequestBody ImClientBlacklistPageParam imClientBlacklistPageParam) throws Exception {
Paging<ImClientBlacklistQueryVo> blacklist =
......
......@@ -23,8 +23,6 @@ import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.exception.BusinessException;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.can.security.util.SecurityUtils;
import com.wecloud.im.biz.enums.FriendStateEnum;
import com.wecloud.im.biz.module.message.entity.ImClient;
......@@ -274,7 +272,6 @@ public class ImFriendController extends BaseController {
* 好友分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "好友分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "好友分页列表")
public ApiResult<Paging<ImFriendBaseDto>> getImFriendPageList(@RequestBody ImFriendPageParam pageParam) {
log.info("好友分页列表入参 {}", JSON.toJSONString(pageParam));
......@@ -291,7 +288,6 @@ public class ImFriendController extends BaseController {
* 批量创建好友推荐
*/
@PostMapping("/recommend/batchCreate")
@OperationLog(name = "批量创建好友推荐", type = OperationLogType.PAGE)
@ApiOperation(value = "批量创建好友推荐")
public ApiResult<Boolean> batchCreateRecommend(@RequestBody ImCreateRecommendParam param) {
log.info("批量创建好友推荐入参 {}", JSON.toJSONString(param));
......@@ -315,7 +311,6 @@ public class ImFriendController extends BaseController {
* 好友推荐分页列表
*/
@PostMapping("/recommend/getPageList")
@OperationLog(name = "好友推荐分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "好友推荐分页列表")
public ApiResult<Paging<ImFriendRecommendDto>> getImFriendRecommendPageList(@RequestBody ImFriendPageParam pageParam) {
log.info("好友推荐分页列表入参 {}", JSON.toJSONString(pageParam));
......
//package com.wecloud.im.controller;
//
//import com.wecloud.im.service.ImIosApnsService;
//import com.wecloud.can.core.base.controller.BaseController;
//import io.swagger.annotations.Api;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//
///**
// * apns配置表 控制器
// *
// * @author wei
// * @since 2021-09-18
// */
//@Slf4j
//@RestController
//@RequestMapping("/imIosApns")
//@Api(value = "apns配置表API", tags = {"apns配置表"})
//public class ImIosApnsController extends BaseController {
//
// @Autowired
// private ImIosApnsService imIosApnsService;
////
//// /**
//// * 添加apns配置表
//// */
//// @PostMapping("/add")
//// @OperationLog(name = "添加apns配置表", type = OperationLogType.ADD)
//// @ApiOperation(value = "添加apns配置表")
//// public ApiResult<Boolean> addImIosApns(@Validated(Add.class) @RequestBody ImIosApns imIosApns) throws Exception {
//// boolean flag = imIosApnsService.saveImIosApns(imIosApns);
//// return ApiResult.result(flag);
//// }
////
//// /**
//// * 修改apns配置表
//// */
//// @PostMapping("/update")
//// @OperationLog(name = "修改apns配置表", type = OperationLogType.UPDATE)
//// @ApiOperation(value = "修改apns配置表")
//// public ApiResult<Boolean> updateImIosApns(@Validated(Update.class) @RequestBody ImIosApns imIosApns) throws Exception {
//// boolean flag = imIosApnsService.updateImIosApns(imIosApns);
//// return ApiResult.result(flag);
//// }
////
//// /**
//// * 删除apns配置表
//// */
//// @PostMapping("/delete/{id}")
//// @OperationLog(name = "删除apns配置表", type = OperationLogType.DELETE)
//// @ApiOperation(value = "删除apns配置表")
//// public ApiResult<Boolean> deleteImIosApns(@PathVariable("id") Long id) throws Exception {
//// boolean flag = imIosApnsService.deleteImIosApns(id);
//// return ApiResult.result(flag);
//// }
////
//// /**
//// * 获取apns配置表详情
//// */
//// @GetMapping("/info/{id}")
//// @OperationLog(name = "apns配置表详情", type = OperationLogType.INFO)
//// @ApiOperation(value = "apns配置表详情")
//// public ApiResult<ImIosApnsQueryVo> getImIosApns(@PathVariable("id") Long id) throws Exception {
//// ImIosApnsQueryVo imIosApnsQueryVo = imIosApnsService.getImIosApnsById(id);
//// return ApiResult.ok(imIosApnsQueryVo);
//// }
//
//// /**
//// * apns配置表分页列表
//// */
//// @PostMapping("/getPageList")
//// @OperationLog(name = "apns配置表分页列表", type = OperationLogType.PAGE)
//// @ApiOperation(value = "apns配置表分页列表")
//// public ApiResult<Paging<ImIosApnsQueryVo>>getImIosApnsPageList(@Validated @RequestBody ImIosApnsPageParam imIosApnsPageParam)throws Exception{
//// Paging<ImIosApnsQueryVo> paging = imIosApnsService.getImIosApnsPageList(imIosApnsPageParam);
//// return ApiResult.ok(paging);
//// }
////
//}
//
......@@ -18,8 +18,6 @@ import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.datasource.mybatisplus.pagination.Paging;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.im.biz.module.message.controller.param.GetReadersParam;
import com.wecloud.im.biz.module.message.controller.param.GroupChatMessageParam;
import com.wecloud.im.biz.module.message.controller.param.GroupChatStatusMessageParam;
......@@ -97,7 +95,6 @@ public class ImMessageController extends BaseController {
* 查询某个会话历史消息分页列表
*/
@PostMapping("/getHistoryMsg")
@OperationLog(name = "查询某个会话历史消息分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "查询某个会话历史消息分页列表")
public ApiResult<Paging<OfflineMsgDto>> getHistoryMsg(@Validated @RequestBody ImHistoryMessagePageParam imHistoryMessagePageParam) {
Paging<OfflineMsgDto> paging = imMessageService.getHistoryMsgConversationId(imHistoryMessagePageParam);
......
......@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.wecloud.can.core.base.controller.BaseController;
import com.wecloud.can.core.enums.ApiCode;
import com.wecloud.can.core.util.ApiResult;
import com.wecloud.can.log.annotation.OperationLog;
import com.wecloud.can.log.enums.OperationLogType;
import com.wecloud.im.biz.module.message.controller.param.ApiImConversationMembersPageParam;
import com.wecloud.im.biz.module.message.controller.param.ApiImConversationMembersQueryVo;
import com.wecloud.im.biz.module.message.entity.ImApplication;
......@@ -47,7 +45,6 @@ public class ApiImConversationMembersController extends BaseController {
* 会话成员表分页列表
*/
@PostMapping("/findList")
@OperationLog(name = "rest-api-会话成员表分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "rest-api-会话成员表分页列表")
public ApiResult<List<ApiImConversationMembersQueryVo>> getApiImConversationMembersList(@Validated @RequestBody ApiImConversationMembersPageParam apiImConversationMembersPageParam, @RequestHeader String appkey, @RequestHeader String appSecret) throws Exception {
......@@ -66,51 +63,6 @@ public class ApiImConversationMembersController extends BaseController {
return imConversationMembersService.getRestApiImConversationMembersList(apiImConversationMembersPageParam, imApplication);
}
// /**
// * 添加会话成员表
// */
// @PostMapping("/add")
// @OperationLog(name = "添加会话成员表", type = OperationLogType.ADD)
// @ApiOperation(value = "添加会话成员表")
// public ApiResult<Boolean> addImConversationMembers(@Validated(Add.class) @RequestBody ImConversationMembers imConversationMembers) throws Exception {
// boolean flag = imConversationMembersService.saveImConversationMembers(imConversationMembers);
// return ApiResult.result(flag);
// }
//
// /**
// * 修改会话成员表
// */
// @PostMapping("/update")
// @OperationLog(name = "修改会话成员表", type = OperationLogType.UPDATE)
// @ApiOperation(value = "修改会话成员表")
// public ApiResult<Boolean> updateImConversationMembers(@Validated(Update.class) @RequestBody ImConversationMembers imConversationMembers) throws Exception {
// boolean flag = imConversationMembersService.updateImConversationMembers(imConversationMembers);
// return ApiResult.result(flag);
// }
//
// /**
// * 删除会话成员表
// */
// @PostMapping("/delete/{id}")
// @OperationLog(name = "删除会话成员表", type = OperationLogType.DELETE)
// @ApiOperation(value = "删除会话成员表")
// public ApiResult<Boolean> deleteImConversationMembers(@PathVariable("id") Long id) throws Exception {
// boolean flag = imConversationMembersService.deleteImConversationMembers(id);
// return ApiResult.result(flag);
// }
//
// /**
// * 获取会话成员表详情
// */
// @GetMapping("/info/{id}")
// @OperationLog(name = "会话成员表详情", type = OperationLogType.INFO)
// @ApiOperation(value = "会话成员表详情")
// public ApiResult<ImConversationMembersQueryVo> getImConversationMembers(@PathVariable("id") Long id) throws Exception {
// ImConversationMembersQueryVo imConversationMembersQueryVo = imConversationMembersService.getImConversationMembersById(id);
// return ApiResult.ok(imConversationMembersQueryVo);
// }
//
}
......@@ -38,6 +38,11 @@ spring:
password: temple123456
port: 6379
cloud:
nacos:
discovery:
server-addr: 127.0.0.1:8848
dubbo:
protocol:
port: 20882
......@@ -45,6 +50,7 @@ dubbo:
registry:
address: nacos://localhost:8848?username=nacos&password=nacos
# 打印SQL语句和结果集,本地开发环境可开启,线上注释掉
mybatis-plus:
configuration:
......
......@@ -58,6 +58,10 @@
<artifactId>dubbo-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
......
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