diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/BaseController.java index 6a361559b..b49bb0d26 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/BaseController.java @@ -7,10 +7,15 @@ import java.util.Date; import com.iformall.domain.po.MallUserInfo; import com.iformall.shiro.UserSession; +import com.iformall.utils.IPUtil; import org.apache.shiro.SecurityUtils; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; @RestController public class BaseController { @@ -44,4 +49,10 @@ public class BaseController { String tenantId = (String)SecurityUtils.getSubject().getSession().getAttribute(UserSession.tenantId); return tenantId; } + + public String getIpAddr() { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String ipaddress = IPUtil.getIpAddr(request); + return ipaddress; + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java index 601b3454b..459606673 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java @@ -26,6 +26,7 @@ public class DataTowerController extends BaseController { @ApiOperation("查询运营") @PostMapping("/queryRunningPotal") public ResultData queryRunningPotal() { + logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunningPotal"); Map data = dataTowerService.queryRunningPotal(getTenantId()); @@ -35,6 +36,7 @@ public class DataTowerController extends BaseController { @ApiOperation("查询运营") @PostMapping("/queryRunningMobile") public ResultData queryRunningMobile() { + logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunningMobile"); Map data = dataTowerService.queryRunningMobile(getTenantId()); @@ -45,6 +47,7 @@ public class DataTowerController extends BaseController { @ApiOperation("查询运营") @PostMapping("/queryRunning") public ResultData queryRunning() { + logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunning"); Map data = dataTowerService.queryRunning(getTenantId()); @@ -55,6 +58,7 @@ public class DataTowerController extends BaseController { @ApiOperation("查询车流") @PostMapping("/queryCar") public ResultData queryCar() { + logger.debug("[" + getIpAddr() + "] DataTowerController::queryCar"); Map data = dataTowerService.queryCar(getTenantId()); @@ -64,6 +68,7 @@ public class DataTowerController extends BaseController { @ApiOperation("查询客流") @PostMapping("/queryCustomer") public ResultData queryCustomer() { + logger.debug("[" + getIpAddr() + "] DataTowerController::queryCustomer"); Map data = dataTowerService.queryCustomer(getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 70fb56ff2..cddfd9855 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -12,6 +12,7 @@ import com.iformall.exception.MallinkException; import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallUserRoleService; import com.iformall.shiro.UserSession; +import com.iformall.utils.IPUtil; import com.iformall.utils.ShiroUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,10 +26,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.imageio.ImageIO; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.awt.image.BufferedImage; import java.io.IOException; @@ -36,7 +40,7 @@ import java.io.IOException; @RestController @Api(description = "登录相关接口") -public class HomeController { +public class HomeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Value("${version}") @@ -53,6 +57,7 @@ public class HomeController { @GetMapping("/captcha.jpg") public void captcha(HttpServletResponse response)throws ServletException, IOException { + logger.debug("[" + getIpAddr() + "] HomeController::captcha"); response.setHeader("Cache-Control", "no-store, no-cache"); response.setContentType("image/jpeg"); @@ -71,6 +76,7 @@ public class HomeController { @ApiOperation("登录") @PostMapping("/doLogin") public ResultData login(@RequestBody MallUserInfo user) { + logger.debug("[" + getIpAddr() + "] HomeController::login"); try { String kaptcha = ShiroUtils.getKaptcha(Constants.KAPTCHA_SESSION_KEY); if(!user.getCaptcha().equalsIgnoreCase(kaptcha)){ @@ -129,6 +135,7 @@ public class HomeController { @ApiOperation("B端登录") @PostMapping("/bHidLogin") public ResultData bLogin(@RequestBody MallUserInfo user) { + logger.debug("[" + getIpAddr() + "] HomeController::bHidLogin"); ResultData data = new ResultData(); if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) { // throw new SystemException(ErrorCode.LOGIN_USER_OR_PWD_ERROR); @@ -175,7 +182,8 @@ public class HomeController { @ApiOperation("登出") @GetMapping("/logout") - public ResultData login() { + public ResultData logout() { + logger.debug("[" + getIpAddr() + "] HomeController::logout"); ResultData data = new ResultData(); SecurityUtils.getSubject().logout(); return data; @@ -184,6 +192,7 @@ public class HomeController { @ApiOperation("获取后端版本号") @GetMapping("/version") public ResultData version() { + logger.debug("[" + getIpAddr() + "] HomeController::version"); return new ResultData(version); } } \ No newline at end of file diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallPermissionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallPermissionController.java index aa79219c3..f979a4003 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallPermissionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallPermissionController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("permission") -public class MallPermissionController { +public class MallPermissionController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired @@ -29,6 +29,7 @@ public class MallPermissionController { @GetMapping("alllist") public ResultData alllist(String ava) { + logger.debug("[" + getIpAddr() + "] MallPermissionController::alllist"); MallPermission record = new MallPermission(); record.setAvailable(ava); PageInfo permissions = mallPermissionService.listAsPage(record, 1, 10000); @@ -37,6 +38,7 @@ public class MallPermissionController { @PostMapping("add") public ResultData createPermission(MallPermission mallPermission) { + logger.debug("[" + getIpAddr() + "] MallPermissionController::createPermission"); Assert.notNull(mallPermission.getName(), "用户名不能为空"); mallPermissionService.saveOrUpdate(mallPermission); return new ResultData(mallPermission.getId()); @@ -44,18 +46,21 @@ public class MallPermissionController { @PostMapping("update") public ResultData updatePermission(MallPermission sysPermission) { + logger.debug("[" + getIpAddr() + "] MallPermissionController::updatePermission"); mallPermissionService.saveOrUpdate(sysPermission); return new ResultData(); } @GetMapping("/del") public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] MallPermissionController::delete"); mallPermissionService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @GetMapping("/findById") public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] MallPermissionController::findById"); mallPermissionService.getById(id); return new ResultData(Result.SUCCESS, "成功", null); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java index c0a4be112..a909a7a10 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java @@ -46,6 +46,7 @@ public class MallRoleController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] MallRoleController::list"); String tenantId = getTenantId(); sysRole.setTenantId(tenantId); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); @@ -69,6 +70,7 @@ public class MallRoleController extends BaseController { @PostMapping("saveOrUpdate") public ResultData saveOrUpdate(@RequestBody MallRole sysRole) { + logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); MallUserInfo currentUser = getUser(); if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能保存角色"); @@ -94,6 +96,7 @@ public class MallRoleController extends BaseController { @PostMapping("add") public ResultData add(MallRole sysRole) { + logger.debug("[" + getIpAddr() + "] MallRoleController::add"); MallUserInfo currentUser = getUser(); if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加角色"); @@ -106,6 +109,7 @@ public class MallRoleController extends BaseController { @PostMapping("update") public ResultData update(MallRole sysRole) { + logger.debug("[" + getIpAddr() + "] MallRoleController::update"); MallUserInfo currentUser = getUser(); if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能更新角色"); @@ -121,6 +125,7 @@ public class MallRoleController extends BaseController { @PostMapping("/del") public ResultData delete(@RequestBody MallRole sysRole) { + logger.debug("[" + getIpAddr() + "] MallRoleController::delete"); MallUserInfo currentUser = getUser(); if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除角色"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java index 0fb6df842..e8d835861 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java @@ -63,6 +63,7 @@ public class MallUserInfoController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); userInfo.setTenantId(getTenantId()); userInfo.setSortColumns(MallUserInfo.Field.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); @@ -85,6 +86,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "用户详情接口", response = String.class) @GetMapping("detail") public ResultData detail(Long id) { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::detail"); final MallUserInfo user = userInfoService.getById(id); return new ResultData(user); } @@ -92,6 +94,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "创建用户接口", response = String.class) @PostMapping("add") public ResultData createUser(@RequestBody MallUserInfo userInfo) { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser"); MallUserInfo currentUser = getUser(); if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能添加用户"); @@ -122,6 +125,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "修改用户接口", response = String.class) @PostMapping("update") public ResultData updateUser(@RequestBody MallUserInfo userInfo) { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::updateUser"); MallUserInfo currentUser = getUser(); // 只有超管和自己能更新信息 if (!(currentUser.getId().equals(userInfo.getId()) || @@ -180,6 +184,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "删除用户接口", response = String.class) @PostMapping("/del") public ResultData deleteUser(@RequestBody MallUserInfo userInfo) { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser"); MallUserInfo currentUser = getUser(); if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除用户"); @@ -202,6 +207,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "起停用户接口", response = String.class) @GetMapping("status") public ResultData modifyStatus(Long userId, Integer status) { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::modifyStatus"); MallUserInfo currentUser = getUser(); if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有超级管理员才能删除用户"); @@ -230,6 +236,7 @@ public class MallUserInfoController extends BaseController { @GetMapping("hasButtonPermission") public ResultData hasButtonPermission(String permissions) { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::hasButtonPermission"); MallUserInfo info = getUser(); info.setPassword("保密"); Map map = new HashMap<>(); @@ -250,6 +257,7 @@ public class MallUserInfoController extends BaseController { @GetMapping("getUser") public ResultData getUserInfo() { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); MallUserInfo info = getUser(); info.setPassword("保密"); if (info.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { // isAdmin @@ -291,7 +299,7 @@ public class MallUserInfoController extends BaseController { @ApiImplicitParam(name = "userName", value = "手机号", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "type", value = "场景(1:登录)", dataType = "Integer", paramType = "query", required = true)}) public ResultData sendvalidationcode(String userName, Integer type) { - + logger.debug("[" + getIpAddr() + "] MallUserInfoController::sendvalidationcode"); MallUserInfo userQ = new MallUserInfo(); userQ.setUsername(userName); @@ -321,6 +329,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "修改密码", notes = "{\"userName\",\"string\",\"code\",\"string\",\"pwd\",\"string\"}") @PostMapping("/updatepwd") public ResultData updatepwd(@RequestBody Map params) { + logger.debug("[" + getIpAddr() + "] MallUserInfoController::updatepwd"); // String phone,String code,String pwd String userName = params.get("userName"); String code = params.get("code"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MarkingDataReportController.java b/mallinkAdmin/src/main/java/com/iformall/controller/MarkingDataReportController.java index b38ae0b10..b1d89bc30 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/MarkingDataReportController.java @@ -30,6 +30,7 @@ public class MarkingDataReportController extends BaseController { @ApiOperation("查询券数据") @GetMapping("/couponData") public ResultData findCouponData() { + logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findCouponData"); return new ResultData(markingDataReportService.getCouponData(getTenantId())); } @@ -39,12 +40,14 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findCouponDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findCouponDataList"); return new ResultData(markingDataReportService.getCouponDataList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("查询场景投放券数据") @GetMapping("/sceneData") public ResultData findSceneData() { + logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findSceneData"); return new ResultData(markingDataReportService.getSceneData(getTenantId())); } @@ -54,12 +57,14 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData findSceneDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] MarkingDataReportController::findSceneDataList"); return new ResultData(markingDataReportService.getSceneDataList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); } @ApiOperation("查询触达用户数数据") @GetMapping("/touchUsersData") public ResultData touchUsersData() { + logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersData"); return new ResultData(markingDataReportService.getTouchUsersReportData(getTenantId())); } @@ -69,6 +74,7 @@ public class MarkingDataReportController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData touchUsersDataList(@ModelAttribute MarkingCouponDataReportDto markingCouponDataReportDto, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] MarkingDataReportController::touchUsersDataList"); return new ResultData(markingDataReportService.getTouchUsersReportList(getTenantId(), markingCouponDataReportDto, pageNum, pageSize)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/PushLimitController.java b/mallinkAdmin/src/main/java/com/iformall/controller/PushLimitController.java index 2a6d4ba15..57a1e6ddc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/PushLimitController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/PushLimitController.java @@ -22,6 +22,7 @@ public class PushLimitController extends BaseController { @ApiOperation("疲劳度配置") @GetMapping("setting") public ResultData list() { + logger.debug("[" + getIpAddr() + "] PushLimitController::list"); PushLimit pushLimit = pushLimitService.getPushLimit(getTenantId()); return new ResultData(pushLimit); } @@ -29,6 +30,7 @@ public class PushLimitController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody PushLimit pushLimit) { + logger.debug("[" + getIpAddr() + "] PushLimitController::update"); pushLimit.setTenantId(getTenantId()); pushLimitService.saveOrUpdate(pushLimit); return new ResultData(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java index 8f73f31c9..5509f3fbb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java @@ -114,6 +114,7 @@ public class UploadController extends BaseController { @PostMapping(value = "/awsFileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data") @ApiOperation("上传文件") public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) { + logger.debug("[" + getIpAddr() + "] UploadController::awsfileUpload"); ResultData data = new ResultData(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxAdminLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxAdminLogController.java index 12d18656c..eff36752d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxAdminLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxAdminLogController.java @@ -27,6 +27,7 @@ public class WxAdminLogController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxAdminLog wxAdminLog, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxAdminLogController::list"); if (null == wxAdminLog) wxAdminLog = new WxAdminLog(); final PageInfo page = wxAdminLogService.listAsPage(wxAdminLog, pageNum, pageSize); return new ResultData(page); @@ -35,6 +36,7 @@ public class WxAdminLogController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxAdminLog wxAdminLog) { + logger.debug("[" + getIpAddr() + "] WxAdminLogController::add"); //Assert.notNull(wxAdminLog.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxAdminLogService.saveOrUpdate(wxAdminLog); @@ -44,6 +46,7 @@ public class WxAdminLogController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxAdminLog wxAdminLog) { + logger.debug("[" + getIpAddr() + "] WxAdminLogController::update"); String tenantId = getTenantId(); wxAdminLog.setTenantId(tenantId); wxAdminLogService.saveOrUpdate(wxAdminLog); @@ -54,6 +57,7 @@ public class WxAdminLogController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxAdminLogController::delete"); wxAdminLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -62,12 +66,14 @@ public class WxAdminLogController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxAdminLogController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxAdminLogService.getById(id)); } @ApiOperation("PV计数") @PostMapping("pvlog") public ResultData pvLog(@RequestBody WxAdminLog wxAdminLog) { + logger.debug("[" + getIpAddr() + "] WxAdminLogController::pvLog"); String tenantId = getTenantId(); wxAdminLog.setTenantId(tenantId); wxAdminLogService.saveLogCount(wxAdminLog); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java index c5a6d3e7c..d05366de0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java @@ -33,6 +33,7 @@ public class WxAppinfoController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData list(@ModelAttribute WxAppinfo wxAppinfo, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::list"); if (null == wxAppinfo) wxAppinfo = new WxAppinfo(); final PageInfo page = wxAppinfoService.listAsPage(wxAppinfo, pageNum, pageSize); return new ResultData(page); @@ -41,6 +42,7 @@ public class WxAppinfoController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxAppinfo wxAppinfo) { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::add"); //Assert.notNull(wxAppinfo.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); wxAppinfoService.saveOrUpdate(wxAppinfo); @@ -50,6 +52,7 @@ public class WxAppinfoController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxAppinfo wxAppinfo) { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::update"); wxAppinfoService.saveOrUpdate(wxAppinfo); return new ResultData(); } @@ -58,6 +61,7 @@ public class WxAppinfoController extends BaseController { @GetMapping("/del") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::delete"); wxAppinfoService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -66,6 +70,7 @@ public class WxAppinfoController extends BaseController { @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::findById"); return new ResultData(Result.SUCCESS, "查询成功", wxAppinfoService.getById(id)); } @@ -73,6 +78,7 @@ public class WxAppinfoController extends BaseController { @ApiOperation("更新AccessToken, 无限制二维码生成需要更新token") @GetMapping("/accessTokenUpdate") public ResultData tokenUpdate() { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::tokenUpdate"); try { wxAppinfoService.tokenUpdate(getTenantId()); } catch (Exception e) { @@ -85,6 +91,7 @@ public class WxAppinfoController extends BaseController { @ApiOperation(value = "下载二维码", notes = "参数{\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") @PostMapping("/downQrCode") public ResultData downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode"); String pageUrl = (String) params.get("pageUrl"); String sceneParam = (String) params.get("sceneParam"); int type = 0; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java index e6d8a590e..23e2dde61 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java @@ -34,6 +34,7 @@ public class WxBillAllController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); if (null == wxBillAll){ wxBillAll = new WxBillAll(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDailyController.java index 6bc77e3bf..85819f0d2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDailyController.java @@ -31,6 +31,7 @@ public class WxBillDailyController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxBillDaily wxBillDaily,Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillDailyController::list"); if (null == wxBillDaily) { wxBillDaily = new WxBillDaily(); } @@ -41,18 +42,21 @@ public class WxBillDailyController extends BaseController @PostMapping("add") public ResultData add(@RequestBody WxBillDaily wxBillDaily) { + logger.debug("[" + getIpAddr() + "] WxBillDailyController::add"); wxBillDaily.setTenantId(getTenantId()); return wxBillDailyService.saveOrUpdate(wxBillDaily); } @PostMapping("update") public ResultData update(@RequestBody WxBillDaily wxBillDaily) { + logger.debug("[" + getIpAddr() + "] WxBillDailyController::update"); return wxBillDailyService.saveOrUpdate(wxBillDaily); } @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillDailyController::delete"); wxBillDailyService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -60,12 +64,14 @@ public class WxBillDailyController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBillDailyService.getById(id)); + logger.debug("[" + getIpAddr() + "] WxBillDailyController::findById"); + return new ResultData(Result.SUCCESS,"查询成功",wxBillDailyService.getById(id)); } @GetMapping("/updatePaid") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData updatePaid(Long id) { + logger.debug("[" + getIpAddr() + "] WxBillDailyController::updatePaid"); return wxBillDailyService.updatePaid(id); }