code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge branch "master"

Browse Source
This commit is contained in:
paulGao
2021-12-11 17:45:25 +08:00
parent d9d19f8cbd 036ad6defb
commit 90e550934d
345 changed files with 3529 additions and 2779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common-api/src/main/java/cn/lili/controller/common/FileController.java
View File

@@ -2,11 +2,11 @@ package cn.lili.controller.common;
import cn.lili.cache.Cache;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.AuthUser;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
@@ -78,9 +78,7 @@ public class FileController {
}
throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
case MANAGER:
if (file.getUserEnums().equals(authUser.getRole().name())) {
break;
}
break;
default:
throw new ServiceException(ResultCode.USER_AUTHORITY_ERROR);
}

34
common-api/src/main/java/cn/lili/controller/common/IpInfoManagerController.java Normal file
View File

@@ -0,0 +1,34 @@
package cn.lili.controller.common;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.utils.IpHelper;
import cn.lili.common.vo.ResultMessage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
/**
* 管理端,IP接口
*
* @author Chopper
* @since 2020-02-25 14:10:16
*/
@RestController
@Api(tags = "获取IP信息以及天气")
@RequestMapping("/common/ip")
public class IpInfoManagerController {
@Autowired
private IpHelper ipHelper;
@RequestMapping(value = "/info", method = RequestMethod.GET)
@ApiOperation(value = "IP及天气相关信息")
public ResultMessage<Object> upload(HttpServletRequest request) {
String result = ipHelper.getIpCity(request);
return ResultUtil.data(result);
}
}

2
common-api/src/main/java/cn/lili/controller/common/SliderImageController.java
View File

@@ -3,7 +3,7 @@ package cn.lili.controller.common;
import cn.lili.cache.limit.annotation.LimitPoint;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.verification.entity.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

4
common-api/src/main/java/cn/lili/controller/common/SmsController.java
View File

@@ -4,8 +4,8 @@ import cn.lili.cache.limit.annotation.LimitPoint;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.sms.SmsUtil;
import cn.lili.modules.verification.enums.VerificationEnums;
import cn.lili.modules.sms.SmsUtil;
import cn.lili.modules.verification.entity.enums.VerificationEnums;
import cn.lili.modules.verification.service.VerificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;