Просмотр исходного кода

[用户访问Log][新增]:用户访问Log重整理,及action Log查询接口

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
66db52e537
30 измененных файлов: 140 добавлений и 51 удалений
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java
  3. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java
  4. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java
  5. +12
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  6. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  7. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  8. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java
  9. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java
  10. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java
  11. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java
  12. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java
  13. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java
  14. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java
  15. +5
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  16. +23
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  17. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java
  18. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java
  19. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java
  20. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  21. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  22. +7
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  23. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  24. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  25. +38
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java
  26. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  27. +5
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
  28. +4
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
  29. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  30. +0
    -7
      mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java Просмотреть файл

@@ -2,8 +2,8 @@ package com.iformall.controller.app;

import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
import com.alibaba.druid.support.json.JSONUtils;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
@@ -25,7 +25,6 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.task.AsyncTaskExecutor;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -65,7 +64,7 @@ public class WxAppinfoController extends BaseController {

ExecutorService fixedThreadPool = Executors.newFixedThreadPool(150);

@ApiOperation("加载老数据二维码")
@ApiOperation("门店二维码--二维码数据刷数据库")
@GetMapping("/updateQrCode")
public void updateQrCode(String p)throws ServletException, IOException {
if("xlldxx".equals(p)) {
@@ -89,7 +88,7 @@ public class WxAppinfoController extends BaseController {
}
}

@ApiOperation("加载卷二维码")
@ApiOperation("券二维码--二维码数据刷数据库")
@GetMapping("/updateCouponQrCode")
public void updateCouponQrCode(String p)throws ServletException, IOException {
if("xlldxx".equals(p)){
@@ -115,6 +114,7 @@ public class WxAppinfoController extends BaseController {

@ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}")
@PostMapping("/downQrCode")
@SystemControllerLog(description = "营销物料--下载二维码")
public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) throws MallinkException {
logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode");
String name = (String) params.get("name");


+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMerchantShop;
@@ -27,6 +28,7 @@ public class WxMerchantShopController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "商户商铺--获取关联商铺信息")
public ResultData queryShopList(@ModelAttribute WxMerchantShop wxMerchantShop, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantShopController::queryShopList");
if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop();


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java Просмотреть файл

@@ -34,6 +34,7 @@ public class WxTagsController extends BaseController {

@GetMapping("getAllList")
@ApiOperation("标签弹窗接口")
@SystemControllerLog(description = "会员管理-标签获取")
public ResultData getAllList() {
logger.debug("[" + getIpAddr() + "] WxTagsController::getAllList");
return new ResultData(wxTagsService.listAllVo());


+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java Просмотреть файл

@@ -38,6 +38,7 @@ public class WxParkController extends BaseController {

@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "停车-新增停车场")
public ResultData add(@RequestBody WxPark wxPark) {
logger.debug("[" + getIpAddr() + "] WxParkController::add");
//Assert.notNull(wxPark.getName(), "角色名不能为空");
@@ -48,6 +49,7 @@ public class WxParkController extends BaseController {

@ApiOperation("根据id更新接口")
@PostMapping("update")
@SystemControllerLog(description = "停车-停车场信息更新")
public ResultData update(@RequestBody WxPark wxPark) {
logger.debug("[" + getIpAddr() + "] WxParkController::update");
wxParkService.saveOrUpdate(wxPark);
@@ -57,6 +59,7 @@ public class WxParkController extends BaseController {
@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "停车-停车场删除")
public ResultData delete(Long id) {
logger.debug("[" + getIpAddr() + "] WxParkController::delete");
wxParkService.deleteById(id);
@@ -66,6 +69,7 @@ public class WxParkController extends BaseController {
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "停车-查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxParkController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxParkService.getById(id));


+ 12
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Просмотреть файл

@@ -6,7 +6,6 @@ import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillProperty;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxPropertyContract;
import com.iformall.service.WxBillPropertyService;
import com.iformall.service.WxPropertyContractService;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Map;

/**
@@ -39,6 +37,7 @@ public class WxPropertyContractController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "物业合同-列表")
public ResultData list(@ModelAttribute WxPropertyContract wxPropertyContract, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::list");
if (null == wxPropertyContract) {
@@ -50,6 +49,7 @@ public class WxPropertyContractController extends BaseController {
}

@PostMapping("add")
@SystemControllerLog(description = "物业合同-新增")
public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add");
MallUserInfo user = getUser();
@@ -59,6 +59,7 @@ public class WxPropertyContractController extends BaseController {
}

@PostMapping("update")
@SystemControllerLog(description = "物业合同-修改")
public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update");
MallUserInfo user = getUser();
@@ -69,6 +70,7 @@ public class WxPropertyContractController extends BaseController {

@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "物业合同-删除")
public ResultData delete(Long id) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::delete");
wxPropertyContractService.deleteById(id);
@@ -77,6 +79,7 @@ public class WxPropertyContractController extends BaseController {

@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "物业合同-根据ID查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::findById");
WxBillProperty wxBillProperty = new WxBillProperty();
@@ -86,12 +89,14 @@ public class WxPropertyContractController extends BaseController {
}

@RequestMapping("/download")
@SystemControllerLog(description = "物业合同-下载")
public void download(HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::download");
wxPropertyContractService.download(request, response, getTenantId());
}

@GetMapping("/getPropertyContractStatusInfo")
@SystemControllerLog(description = "物业合同-状态信息")
public ResultData getPropertyContractStatusInfo(@ModelAttribute WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getPropertyContractStatusInfo");
wxPropertyContract.setTenantId(getTenantId());
@@ -100,12 +105,14 @@ public class WxPropertyContractController extends BaseController {

@GetMapping("/endPropertyContract")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "物业合同-终止")
public ResultData endRentContract(Long id) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::endRentContract");
return wxPropertyContractService.endRentContract(id);
}

@GetMapping("/getRentContractList")
@SystemControllerLog(description = "物业合同-查询列表")
public ResultData getRentContractList(@ModelAttribute WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::getRentContractList");
wxPropertyContract.setTenantId(getTenantId());
@@ -114,6 +121,7 @@ public class WxPropertyContractController extends BaseController {

@GetMapping("/endPropertyContractByRentContractId")
@ApiImplicitParam(name = "rentContractId", value = "rentContractId", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "物业合同-根据租赁合同终止")
public ResultData endPropertyContractByRentContractId(Long rentContractId) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::endPropertyContractByRentContractId");
return wxPropertyContractService.endPropertyContractByRentContractId(rentContractId);
@@ -121,6 +129,7 @@ public class WxPropertyContractController extends BaseController {

@GetMapping("/hasRentContract")
@ApiImplicitParam(name = "rentContractId", value = "rentContractId", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "物业合同-是否存在相关的租赁合同")
public ResultData hasRentContract(Long rentContractId) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::hasRentContract");
return wxPropertyContractService.hasRentContract(rentContractId);
@@ -128,6 +137,7 @@ public class WxPropertyContractController extends BaseController {

@GetMapping("updatePropertyContractStatus")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "物业合同-更新合同状态")
public ResultData updatePropertyContractStatus(Long id) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentContractStatus");
return wxPropertyContractService.updatePropertyContractStatus(id);


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -147,6 +147,7 @@ public class WxRentContractController extends BaseController {
}

@RequestMapping("/download")
@SystemControllerLog(description = "租赁合同-下载")
public void download(HttpServletRequest request, HttpServletResponse response){
logger.debug("[" + getIpAddr() + "] WxRentContractController::download");
wxRentContractService.download(request,response,getTenantId());


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java Просмотреть файл

@@ -37,6 +37,7 @@ public class WxMerchantTradeDailyController extends BaseController {

@ApiOperation("获得指定日期的解单,默认不传reportDate为当天")
@GetMapping("/getVolume")
@SystemControllerLog(description = "解单-获得指定日期的解单")
public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) {
wxMerchantTradeDaily.setTenantId(getTenantId());
return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId());


+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java Просмотреть файл

@@ -28,7 +28,7 @@ public class WxMerchantMicroPayController extends BaseController {

@ApiOperation("获得商场近30日刷卡")
@GetMapping("/listMonth")
@SystemControllerLog(description = "收银台-近30日")
@SystemControllerLog(description = "收银台-近30日刷卡列表")
public ResultData listMonth() {
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::listMonth");
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();
@@ -41,7 +41,7 @@ public class WxMerchantMicroPayController extends BaseController {

@ApiOperation("获商户得近30日刷卡")
@GetMapping("/detail")
@SystemControllerLog(description = "收银台-近30日刷卡")
@SystemControllerLog(description = "收银台-近30日刷卡列表详情")
public ResultData detail(@RequestParam Long merchantId) {
logger.debug("[" + getIpAddr() + "] WxMerchantMicroPayController::detail");
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java Просмотреть файл

@@ -138,6 +138,7 @@ public class WxOrderController extends BaseController {

@ApiOperation(value = "积分兑换订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}")
@PostMapping("save")
@SystemControllerLog(description = "订单管理-积分兑换订单")
public ResultData saveOrder(@RequestBody OrderSaveDto orderSaveDto) {
logger.info("OrderSave: " + orderSaveDto);
if (orderSaveDto.getCouponChannelId() == null) {


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java Просмотреть файл

@@ -90,6 +90,7 @@ public class WxPayOrderController extends BaseController {

@ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"orderId\":\"string\",\"status\":integer,\"reason\":\"string\"}")
@PostMapping("/updatePayOrder")
@SystemControllerLog(description = "支付订单-更新支付订单状态")
public ResultData updatePayOrder(@RequestBody Map<String, Object> paramMap) {
logger.info("/api/pay/updatePayOrder" + paramMap.toString());
String payOrderIdStr = (String) paramMap.get("payOrderId");


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java Просмотреть файл

@@ -61,6 +61,7 @@ public class WxProfitSharingOrderController extends BaseController {
@ApiOperation("分账详情")
@GetMapping("findOrderDetails")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "分账订单-分账详情")
public ResultData findOrderDetails(Long id) {
logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::findOrderDetails");
return wxProfitSharingOrderService.findOrderDetails(id);


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java Просмотреть файл

@@ -64,6 +64,7 @@ public class WxRefundOrderController extends BaseController {
@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "退款-根据id删除")
public ResultData delete(Long id) {
logger.debug("[" + getIpAddr() + "] WxRefundOrderController::delete");
wxRefundOrderService.deleteById(id);


+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java Просмотреть файл

@@ -39,6 +39,7 @@ public class WxSubsidyController extends BaseController {
@GetMapping("prePay")
@ApiImplicitParams({
@ApiImplicitParam(name = "amount", value = "金额", dataType = "String", paramType = "query", required = true)})
@SystemControllerLog(description = "商城补贴-补贴扫码支付发起")
public void subsidyPrepay(String amount, HttpServletResponse response) throws Exception {
String ipStr = getIpAddr();
logger.info("subsidyPrepay: " + ipStr + "-" + amount);
@@ -72,6 +73,7 @@ public class WxSubsidyController extends BaseController {

@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "商城补贴-新增接口")
public ResultData add(@RequestBody WxSubsidy wxSubsidy) {
//Assert.notNull(wxSubsidy.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
@@ -81,6 +83,7 @@ public class WxSubsidyController extends BaseController {

@ApiOperation("根据id更新接口")
@PostMapping("update")
@SystemControllerLog(description = "商城补贴-更新")
public ResultData update(@RequestBody WxSubsidy wxSubsidy) {
wxSubsidyService.saveOrUpdate(wxSubsidy);
return new ResultData();
@@ -89,6 +92,7 @@ public class WxSubsidyController extends BaseController {
@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "商城补贴-删除")
public ResultData delete(Long id) {
wxSubsidyService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
@@ -97,6 +101,7 @@ public class WxSubsidyController extends BaseController {
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "商城补贴-查询")
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS, "查询成功", wxSubsidyService.getById(id));
}


+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
@@ -27,6 +28,7 @@ public class WxTopicController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "专题-列表")
public ResultData list(WxTopic wxTopic, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxTopicController::list");
String tenantId = getTenantId();
@@ -47,6 +49,7 @@ public class WxTopicController extends BaseController {
}

@GetMapping("findById")
@SystemControllerLog(description = "专题-获取详情")
public ResultData findById(WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::findById");
String tenantId = getTenantId();
@@ -56,6 +59,7 @@ public class WxTopicController extends BaseController {
}

@PostMapping("saveOrUpdate")
@SystemControllerLog(description = "专题-保存更新")
public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate");
wxTopic.setTenantId(super.getTenantId());


+ 5
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java Просмотреть файл

@@ -460,7 +460,7 @@ public class WxCUserBasicInfoController extends BaseController {
@ApiOperation("根据手机号查询接口")
@GetMapping("/findByPhone")
@ApiImplicitParam(name = "phone", value = "phone", dataType = "String", paramType = "query", required = true)
@SystemControllerLog(description = "根据手机号查询接口")
@SystemControllerLog(description = "会员管理-根据手机号查询接口")
public ResultData findByPhone(String phone) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::findByPhone");
List<WxCUserBasicInfo> wxCUserBasicInfoList = wxCUserBasicInfoService.findByPhone(getTenantId(),phone);
@@ -473,14 +473,16 @@ public class WxCUserBasicInfoController extends BaseController {

@ApiOperation("获取会员过滤器")
@GetMapping("/listFilter")
@SystemControllerLog(description = "会员管理-获取会员过滤器")
public ResultData listFilter() {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter");
return new ResultData(wxCUserBasicInfoService.listFilters(getTenantId()));
}


@ApiOperation("获取会员过滤器")
@ApiOperation("会员过滤器获取数量")
@PostMapping("/countByFilter")
@SystemControllerLog(description = "会员管理-会员过滤器获取数量")
public ResultData countByFilter(@RequestBody List<WxCUserBasicInfoFilterDto> filterList) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter");
return new ResultData(wxCUserBasicInfoService.countByFilter(getTenantId(),filterList));
@@ -488,6 +490,7 @@ public class WxCUserBasicInfoController extends BaseController {

@ApiOperation("获取会员过滤器")
@PostMapping("/listByFilter")
@SystemControllerLog(description = "会员管理-会员过滤器获取")
public ResultData listByFilter(@RequestParam List<WxCUserBasicInfoFilterDto> filterList) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::listFilter");
return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantId(),filterList));


+ 23
- 18
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
@@ -19,18 +20,18 @@ import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("wxCreditHistory")
public class WxCreditHistoryController extends BaseController
{
@Autowired
public class WxCreditHistoryController extends BaseController {
@Autowired
private WxCreditHistoryService wxCreditHistoryService;

private final Logger logger = LoggerFactory.getLogger(this.getClass());
@ApiOperation("分页列表接口")
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "积分历史-列表")
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::list");
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory();
@@ -41,15 +42,17 @@ public class WxCreditHistoryController extends BaseController
@ApiOperation("根据商户ID和消费金额获取所增加积分 取data里credit的值")
@GetMapping("findByMerchantIdAndSpend")
@ApiImplicitParams({
@ApiImplicitParam(name="merchantId",value="商户ID",dataType="long", paramType = "query",required=true),
@ApiImplicitParam(name="spend",value="消费金额",dataType="int", paramType = "query",required=true)})
@ApiImplicitParam(name = "merchantId", value = "商户ID", dataType = "long", paramType = "query", required = true),
@ApiImplicitParam(name = "spend", value = "消费金额", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "积分历史-根据商户ID和消费金额获取所增加积分")
public ResultData findByMerchantIdAndSpend(@RequestParam Long merchantId, @RequestParam String spendStr) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend");
return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId,spendStr,getTenantId()));
return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, getTenantId()));
}

@ApiOperation("新增接口")
@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "积分历史-新增接口")
public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add");
MallUserInfo user = getUser();
@@ -64,19 +67,21 @@ public class WxCreditHistoryController extends BaseController
}
}

@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "积分历史-查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById");
return new ResultData(Result.SUCCESS,"查询成功",wxCreditHistoryService.getById(id));
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxCreditHistoryService.getById(id));
}

/**
* 根据A端设置的【每自然年末扣除前N年用户积分】规则,扣减用户积分
*
* @return
*/
public ResultData clearCreditByYear(){
public ResultData clearCreditByYear() {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::clearCreditByYear");
wxCreditHistoryService.clearCreditByYear();
return new ResultData(Result.SUCCESS);


+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.controller.mem;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.controller.base.BaseController;
import org.slf4j.Logger;
@@ -39,6 +40,7 @@ public class WxLevelConfigController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "会员等级权益-列表")
public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list");
if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig();
@@ -50,6 +52,7 @@ public class WxLevelConfigController extends BaseController {

@ApiOperation("新增接口")
@PostMapping("add")
@SystemControllerLog(description = "会员等级权益-新增")
public ResultData add(@RequestBody List<WxLevelConfig> levelConfigs) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add");
String tenantId = getTenantId();
@@ -64,6 +67,7 @@ public class WxLevelConfigController extends BaseController {

@ApiOperation("更改会员权益")
@PostMapping("updateCapabilities")
@SystemControllerLog(description = "会员等级权益-更改会员权益")
public ResultData updateCapabilities(@RequestBody List<WxLevelConfig> levelConfigs) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add");
String tenantId = getTenantId();
@@ -78,6 +82,7 @@ public class WxLevelConfigController extends BaseController {

@ApiOperation("根据id删除接口")
@PostMapping("/del")
@SystemControllerLog(description = "会员等级权益-删除")
public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete");
wxLevelConfigService.deleteById(wxLevelConfig.getId());
@@ -87,6 +92,7 @@ public class WxLevelConfigController extends BaseController {
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "会员等级权益-获取")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxLevelConfigController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxLevelConfigService.getById(id));


+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
@@ -26,6 +27,7 @@ public class WxUserChannelController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "会员等级权益-更改会员权益")
public ResultData list(@ModelAttribute WxUserChannel wxUserChannel, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxUserChannelController::list");
if (null == wxUserChannel) wxUserChannel = new WxUserChannel();


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java Просмотреть файл

@@ -84,6 +84,7 @@ public class WxMsgController extends BaseController {


@RequestMapping("/excleupload")
@SystemControllerLog(description = "标签短信-导出")
public ResultData excleupload(@RequestParam("file") MultipartFile file) {
logger.debug("[" + getIpAddr() + "] WxMsgController::excleupload");
if (file.isEmpty()) {


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -134,7 +134,7 @@ public class WxBillAllController extends BaseController {


@GetMapping("exportOweBill")
@SystemControllerLog(description = "生成催缴单")
@SystemControllerLog(description = "费用收缴数据-生成催缴单")
public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill");
if (null == wxBillAll) {


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java Просмотреть файл

@@ -121,7 +121,7 @@ public class WxBillDailyController extends BaseController {
}

@PostMapping(value = "/importTemplate", consumes = "multipart/*")
@SystemControllerLog(description = "会员管理-导入数据")
@SystemControllerLog(description = "日常账单-导入数据")
public ResultData importTemplate(@RequestParam("file") MultipartFile mFile) {
logger.debug("[" + getIpAddr() + "] wxBillDailyService::importTemplate");
if (mFile.isEmpty()) {


+ 7
- 7
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java Просмотреть файл

@@ -44,7 +44,7 @@ public class WxBillOtherDepositController extends BaseController {
}

@PostMapping("add")
@SystemControllerLog(description = "其它账单-新增")
@SystemControllerLog(description = "其它押金账单-新增")
public ResultData add(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::add");
MallUserInfo user = getUser();
@@ -54,7 +54,7 @@ public class WxBillOtherDepositController extends BaseController {
}

@PostMapping("update")
@SystemControllerLog(description = "其它账单-更新")
@SystemControllerLog(description = "其它押金账单-更新")
public ResultData update(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::update");
MallUserInfo user = getUser();
@@ -64,7 +64,7 @@ public class WxBillOtherDepositController extends BaseController {

@GetMapping("/del")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "其它账单-删除")
@SystemControllerLog(description = "其它押金账单-删除")
public ResultData delete(Long id) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::delete");
wxBillOtherDepositService.deleteById(id);
@@ -73,7 +73,7 @@ public class WxBillOtherDepositController extends BaseController {

@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "其它账单-查询")
@SystemControllerLog(description = "其它押金账单-查询")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::findById");
return new ResultData(Result.SUCCESS, "查询成功", wxBillOtherDepositService.getById(id));
@@ -81,14 +81,14 @@ public class WxBillOtherDepositController extends BaseController {

@GetMapping("/updatePaid")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
@SystemControllerLog(description = "其它账单-支付更新")
@SystemControllerLog(description = "其它押金账单-支付更新")
public ResultData updatePaid(Long id) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::updatePaid");
return wxBillOtherDepositService.updatePaid(id);
}

@PostMapping("returnDeposit")
@SystemControllerLog(description = "其它账单-退回押金")
@SystemControllerLog(description = "其它押金账单-退回押金")
public ResultData returnDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::returnDeposit");
return wxBillOtherDepositService.returnDeposit(wxBillDeposit, getUser());
@@ -96,7 +96,7 @@ public class WxBillOtherDepositController extends BaseController {
}

@PostMapping("adjustDeposit")
@SystemControllerLog(description = "其它账单-调整押金")
@SystemControllerLog(description = "其它押金账单-调整押金")
public ResultData adjustDeposit(@RequestBody WxBillOtherDeposit wxBillDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::adjustDeposit");
return wxBillOtherDepositService.adjustDeposit(wxBillDeposit);


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java Просмотреть файл

@@ -107,7 +107,7 @@ public class WxBillPropertyController extends BaseController {


@PostMapping("updateLatePayStatus")
@SystemControllerLog(description = "租赁账单-滞纳金结单")
@SystemControllerLog(description = "物业账单-滞纳金结单")
public ResultData updateLatePayStatus(@RequestBody WxBillProperty wxBillProperty) {
logger.debug("[" + getIpAddr() + "] WxBillPropertyController::updateLatePayStatus");
return wxBillPropertyService.updateLatePayStatus(wxBillProperty);


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java Просмотреть файл

@@ -112,7 +112,7 @@ public class WxBillRentController extends BaseController {


@PostMapping("updateLatePayStatus")
@SystemControllerLog(description = "租赁账单-滞纳金结单")
@SystemControllerLog(description = "租赁押金账单-滞纳金结单")
public ResultData updateLatePayStatus(@RequestBody WxBillRent wxBillRent) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::updateLatePayStatus");
return wxBillRentService.updateLatePayStatus(wxBillRent);


+ 38
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserActionController.java Просмотреть файл

@@ -0,0 +1,38 @@
package com.iformall.controller.sys;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserAction;
import com.iformall.service.MallUserActionService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("mallUserAction")
public class MallUserActionController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired
private MallUserActionService mallUserActionService;

@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "用户管理-用户访问Log列表")
public ResultData list(@ModelAttribute MallUserAction userAction, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] MallUserActionController::list");
if (null == userAction) userAction = new MallUserAction();
final PageInfo<MallUserAction> page = mallUserActionService.listAsPage(userAction, pageNum, pageSize);
return new ResultData(page);
}


}

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java Просмотреть файл

@@ -294,7 +294,7 @@ public class MallUserInfoController extends BaseController {
@ApiOperation(value = "用户权限检查")
@GetMapping("getUser")
//@RequiresPermissions("sys:user:info")
//@SystemControllerLog(description = "用户管理-用户信息")
@SystemControllerLog(description = "用户管理-获取用户信息")
public ResultData getUserInfo() {
///logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo");
MallUserInfo info = getUser();
@@ -337,6 +337,7 @@ public class MallUserInfoController extends BaseController {

@ApiOperation(value = "修改密码", notes = "{\"userName\",\"string\",\"code\",\"string\",\"pwd\",\"string\"}")
@PostMapping("/updatepwd")
@SystemControllerLog(description = "用户管理-修改密码")
public ResultData updatepwd(@RequestBody Map<String, String> params) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::updatepwd");
// String phone,String code,String pwd


+ 5
- 4
mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java Просмотреть файл

@@ -52,6 +52,7 @@ public class SysMenuController extends BaseController {

@ApiOperation("导航菜单")
@GetMapping("/nav")
@SystemControllerLog(description = "菜单-导航菜单")
public ResultData nav(){
logger.debug("[" + getIpAddr() + "] MallPermissionController::nav");
MallUserInfo user = getUser();
@@ -66,7 +67,7 @@ public class SysMenuController extends BaseController {
@ApiOperation("所有菜单列表")
@GetMapping("list")
//@RequiresPermissions("sys:menu:list")
@SystemControllerLog(description = "用户管理-权限")
@SystemControllerLog(description = "菜单-所有菜单列表")
public ResultData getList() {
logger.debug("[" + getIpAddr() + "] MallPermissionController::list");
MallUserInfo user = getUser();
@@ -81,7 +82,7 @@ public class SysMenuController extends BaseController {
@ApiOperation("菜单信息")
@GetMapping("/findById")
//@RequiresPermissions("sys:menu:info")
@SystemControllerLog(description = "用户管理-权限查找")
@SystemControllerLog(description = "菜单-权限查找")
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] MallPermissionController::findById");
return new ResultData(Result.SUCCESS, "成功", mallPermissionService.getById(id));
@@ -90,7 +91,7 @@ public class SysMenuController extends BaseController {
@ApiOperation("获取父子菜单ID信息")
@GetMapping("/getMenuIdsById")
//@RequiresPermissions("sys:menu:info")
@SystemControllerLog(description = "用户管理-父子菜单查找")
@SystemControllerLog(description = "菜单-父子菜单查找")
public ResultData getMenuIdsById(Long parentId) {
logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById");
MallUserInfo user = getUser();
@@ -100,7 +101,7 @@ public class SysMenuController extends BaseController {
@ApiOperation("获取父子菜单信息")
@GetMapping("/getMenusById")
//@RequiresPermissions("sys:menu:info")
@SystemControllerLog(description = "用户管理-父子菜单查找")
@SystemControllerLog(description = "菜单-父子菜单查找")
public ResultData getMenusById(Long parentId) {
logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById");
MallUserInfo user = getUser();


+ 4
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java Просмотреть файл

@@ -9,6 +9,7 @@ import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.model.*;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.config.AwsProperty;
import com.iformall.controller.base.BaseController;
@@ -125,6 +126,7 @@ public class UploadController extends BaseController {
*/
@PostMapping(value = "/awsFileUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
@ApiOperation("上传文件")
@SystemControllerLog(description = "文件上传")
public ResultData awsfileUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{
logger.info("[" + getIpAddr() + "] UploadController::awsfileUpload");

@@ -159,6 +161,7 @@ public class UploadController extends BaseController {
*/
@PostMapping(value = "/awsImgUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
@ApiOperation("上传图片")
@SystemControllerLog(description = "上传图片")
public ResultData awsImgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{
logger.info("[" + getIpAddr() + "] UploadController::awsImgUpload");

@@ -222,6 +225,7 @@ public class UploadController extends BaseController {
*/
@PostMapping(value = "/awsFilesUpload", consumes = "multipart/*", headers = "content-type=multipart/form-data")
@ApiOperation("多文件上传")
@SystemControllerLog(description = "多文件上传")
public ResultData awsFilesUpload(@RequestParam("files") MultipartFile[] files) throws Exception{
logger.info("[" + getIpAddr() + "] UploadController::awsFilesUpload");



+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller.sys;

import com.alibaba.fastjson.JSON;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
@@ -322,6 +323,7 @@ public class WechatLoginController extends BaseController {

@ApiOperation(value = "微信第三方登录绑定", notes = "请配置此callback到网页redirect_uri")
@GetMapping("bindWebOpenId")
@SystemControllerLog(description = "微信第三方登录绑定")
public void userBindWebOpenId(String code, String state, HttpServletRequest request, HttpServletResponse response) {
log.debug("[" + getIpAddr() + "] WechatLoginController::bindWebOpenId");
String host = request.getHeader("host");
@@ -368,6 +370,7 @@ public class WechatLoginController extends BaseController {

@ApiOperation(value = "微信第三方登录解绑", notes = "请配置此callback到网页redirect_uri")
@GetMapping("cleanWebOpenId")
@SystemControllerLog(description = "微信第三方登录解绑")
public ResultData cleanWebOpenId(@ModelAttribute MallUserInfo userInfo) {
log.debug("[" + getIpAddr() + "] WechatLoginController::cleanWebOpenId");
MallUserInfo user = getUser();


+ 0
- 7
mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java Просмотреть файл

@@ -12,13 +12,6 @@ import java.io.Serializable;
@Data
public class MallPermission implements Serializable {
private static final long serialVersionUID = 1L;

// left
// id, name, parentId, moduleColor, moduleColorNum, 标准版 class
// childs
// name, link, id, icon
//

@Id
protected Long id;


Загрузка…
Отмена
Сохранить