Merge branch 'abroad' into abroad_pre

netflix-web/src/main/java/com/cyksj/config/SaTokenConfigure.java

@@ -41,7 +41,8 @@ public class SaTokenConfigure implements WebMvcConfigurer {
 						"/manage/account/put/account",
 						"/manage/coupon/get/classificationList",
 						"/manage/coupon/get/couponList",
-						"manage/order/wx/refund/notify"));
+						"manage/order/wx/refund/notify",
+						"/manage/user/get/abroad/token"));
 		//注解权限校验
 		registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
 	}

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -88,7 +88,6 @@ public class CmsOrderController {
 
 
 	@GetMapping("/get")
-	@SaCheckPermission("order:view")
 	public Result<SearchResult<OrderDonBackView>> get(Long channelId, String account, String showId) {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (channelId != null) {
@@ -158,7 +157,6 @@ public class CmsOrderController {
 	 * 订单导出
 	 */
 	@GetMapping("/export")
-	@SaCheckPermission("order:export")
 	@Log(module = "订单管理/导出订单", businessType = BusinessType.EXPORT, isSaveRequestData = true)
 	public void exportOrders(HttpServletResponse response) {
 		List<ExcelOrderDonData> list = beanSearcher.searchAll(ExcelOrderDonData.class, MapUtils.flatBuilder(request.getParameterMap()).build());
@@ -250,7 +248,6 @@ public class CmsOrderController {
 	 * 用户购买实物商品意愿列表
 	 */
 	@GetMapping("/get/realGooods/interest/users")
-	@SaCheckPermission("interest:view")
 	public Result<SearchResult> getInterestUserList(RealGoodsInterestUser.Status interestStatus, HttpServletRequest request) {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		SearchResult<RealGoodsInterestUserView> search;

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsUserController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.Constant;
@@ -63,7 +62,6 @@ public class CmsUserController{
     private final OrderDonMapper orderDonMapper;
 
     @GetMapping("/get")
-    @SaCheckPermission("user:view")
     public Result<SearchResult<UserView>> get(String otherPhone, Long sharedId, String userid, Long businessId, String sort, String order) {
         MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
         String otherSql = StrUtil.EMPTY;
@@ -102,7 +100,6 @@ public class CmsUserController{
      * 修改用户的拉黑状态
      */
     @PutMapping("/put/black/status/{id}")
-    @SaCheckPermission("user:black")
     public Result<String> putBlackStatus(@PathVariable Long id) {
         User user = userMapper.selectById(id);
         Optional.ofNullable(user).ifPresent(u -> {

netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.account;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
@@ -106,7 +105,6 @@ public class CmsAccountController {
 	private final SysEmailMapper sysEmailMapper;
 
 	@GetMapping("/get")
-	@SaCheckPermission("account:view")
 	public Result<SearchResult<AccountView>> get(Long userId, String showId, String nickName, String submitAccount, String expiryStartTime, String expiryEndTime, Boolean expiredAll, Boolean existsExpired, Boolean existsExpiredToday, Integer noChangeMonths) {
 		MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
 		if (StrUtil.isNotEmpty(expiryStartTime) || StrUtil.isNotEmpty(expiryEndTime)) {
@@ -189,7 +187,6 @@ public class CmsAccountController {
      * 导出账号
      */
     @GetMapping("/export/account")
-    @SaCheckPermission("account:export")
     @Log(module = "平台管理/导出账号", businessType = BusinessType.EXPORT, isSaveRequestData = true)
     public void exportAccount(Long userId, String showId, String nickName, String submitAccount, String expiryStartTime, String expiryEndTime, Boolean expiredAll, Boolean existsExpired, Boolean existsExpiredToday, Integer noChangeMonths, HttpServletResponse response) {
         MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
@@ -249,7 +246,6 @@ public class CmsAccountController {
      * 下载批量修改密码模板
      */
     @GetMapping("/get/account/template")
-    @SaCheckPermission("account:batchUpdatePwd")
     public void getAccountTemplate(HttpServletResponse response) {
         EasyExcelUtils.createTemplateExcel(response, ExcelImportAccountData.class, "账号批量修改密码模板", "账号批量修改密码模板", ExcelTypeEnum.XLSX, null);
     }
@@ -345,7 +341,6 @@ public class CmsAccountController {
     @PostMapping("/post")
     @NoSubmit
     @Transactional(rollbackFor = Throwable.class)
-    @SaCheckPermission("account:add")
     @Log(module = "平台管理/新增账号", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<String> add(@RequestBody Account account){
 		account.setAccount(account.getAccount().trim());
@@ -431,7 +426,6 @@ public class CmsAccountController {
 	}
 
     @PutMapping("/update")
-    @SaCheckPermission("account:update")
     @Log(module = "平台管理/编辑账号", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> update(@RequestBody Account account){
 	    Account db = accountService.getById(account.getId());
@@ -591,7 +585,6 @@ public class CmsAccountController {
 
 
 	@DeleteMapping("/delete/{id}")
-	@SaCheckPermission("account:delete")
 	@Log(module = "平台管理/删除账号", businessType = BusinessType.DELETE, isSaveRequestData = true)
 	public Result<String> update(@PathVariable Long id){
 	    //是否关联了车队
@@ -604,7 +597,6 @@ public class CmsAccountController {
     }
 
     @PutMapping("/update/expiryTime")
-    @SaCheckPermission("account:addExpiryTime")
     public Result<String> updateExpiryTime(@RequestBody ReqAccountIncrExpiryTime incrExpiryTime){
         incrExpiryTime.getAccounts().forEach((accountId)->{
             Account account = accountService.getById(accountId);

netflix-web/src/main/java/com/cyksj/web/controller/manage/channel/CmsChannelPopularizeController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.channel;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.constant.Constant;
@@ -50,7 +49,6 @@ public class CmsChannelPopularizeController {
     private final ChannelPopularizeVisitMapper visitMapper;
 
     @GetMapping
-    @SaCheckPermission("promotion:view")
     public Result<SearchResult<ChannelPopularizeView>> get(String startTime, String endTime) {
         SearchResult<ChannelPopularizeView> searchResult = beanSearcher.search(ChannelPopularizeView.class,
                 MapUtils.flatBuilder(request.getParameterMap())

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.distribute;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
@@ -97,7 +96,6 @@ public class DistributeController {
 	 * 添加固定推广者
 	 */
 	@PostMapping
-	@SaCheckPermission("distribute:add")
 	@Log(module = "分销管理/增加推广者", businessType = BusinessType.POST, isSaveRequestData = true)
 	@Transactional(rollbackFor = Throwable.class)
 	public Result<String> saveDistributes(@RequestBody @NotNull UserDistributeReq userDistributeReq) {
@@ -116,7 +114,6 @@ public class DistributeController {
 	 * 删除固定推广者
 	 */
 	@DeleteMapping("/del/{id}")
-	@SaCheckPermission("distribute:delete")
 	@Log(module = "分销管理/删除推广者", businessType = BusinessType.DELETE, isSaveRequestData = true)
 	public Result<String> deleteDistributesById(@PathVariable Long id) {
 		if (id == null || id < 1) {
@@ -130,7 +127,6 @@ public class DistributeController {
 	 * 推广者编辑
 	 */
 	@PutMapping
-	@SaCheckPermission("distribute:update")
 	@Log(module = "分销管理/编辑推广者", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> editDistribute(@RequestBody UserDistributeReq userDistributeReq) {
 		distributeService.editDistribute(userDistributeReq);
@@ -313,7 +309,6 @@ public class DistributeController {
 	 * 提现列表
 	 */
 	@GetMapping("/get/applyMoney/list")
-	@SaCheckPermission("distribute:applyView")
 	public Result<SearchResult<DistributeMoneyApplyView>> applyMoneyList() {
 		SearchResult<DistributeMoneyApplyView> search = beanSearcher.search(DistributeMoneyApplyView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
@@ -651,7 +646,6 @@ public class DistributeController {
 	 * 商务人员数据表
 	 */
 	@GetMapping("/get/business/data")
-	@SaCheckPermission("business:dataView")
 	public Result<SearchResult<BusinessDistributesDataView>> getBusinessDistributesData(String startTime, String endTime) {
 		long adminId = StpUtil.getLoginIdAsLong();
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());

netflix-web/src/main/java/com/cyksj/web/controller/manage/exchange/ExchangeCodeController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.exchange;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.cyksj.common.annotation.Log;
@@ -46,7 +45,6 @@ public class ExchangeCodeController {
 	 * 生成兑换码 并导出
 	 */
 	@GetMapping("/createAndExport")
-	@SaCheckPermission("exchangeCode:add")
 	@Log(module = "兑换码/生成兑换码", businessType = BusinessType.POST, isSaveRequestData = true)
 	public void createAndExportCode(ExchangeCodeReq exchangeCodeReq, HttpServletResponse response) {
 		if (ObjectUtil.hasEmpty(exchangeCodeReq.getGoodsId(), exchangeCodeReq.getSkuId(), exchangeCodeReq.getNumber())) {
@@ -60,7 +58,6 @@ public class ExchangeCodeController {
 	 * 兑换码列表
 	 */
 	@GetMapping("/get")
-	@SaCheckPermission("exchangeCode:view")
 	public Result<SearchResult<ExchangeCodeView>> getExchangeCodeView() {
 		return GatewayResponse.SUCCESS.newBuilder().toResult(beanSearcher.search(ExchangeCodeView.class, MapUtils.flat(request.getParameterMap())));
 	}
@@ -69,7 +66,6 @@ public class ExchangeCodeController {
 	 * 导出兑换码
 	 */
 	@GetMapping("/export")
-	@SaCheckPermission("exchangeCode:export")
 	public void exportExchangeCode(HttpServletResponse response) {
 		List<ExcelExchangeCodeData> data = beanSearcher.searchAll(ExcelExchangeCodeData.class, MapUtils.flat(request.getParameterMap()));
 		EasyExcelUtils.createExcelStreamMutilByEasyExcel(response, ExcelExchangeCodeData.class, data, "银河兑换码","银河兑换码", ExcelTypeEnum.XLSX, null);

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.goods;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -93,7 +92,6 @@ public class CmsGoodsDonController {
      * 新增 商品spu
      */
     @PostMapping(value = "/post")
-    @SaCheckPermission("platform:add")
     @Log(module = "平台管理/新增平台", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<Long> spuInsert(@Validated @RequestBody ReqGoodsSpuInsert spu) throws Exception {
         // 新增商品
@@ -114,7 +112,6 @@ public class CmsGoodsDonController {
      * 修改 商品spu
      */
     @PutMapping(value = "/update")
-    @SaCheckPermission("platform:update")
     @Log(module = "平台管理/编辑平台", businessType = BusinessType.PUT, isSaveRequestData = true)
     public Result<String> spuUpdate(@Validated @RequestBody ReqGoodsSpuInsert spu) throws Exception{
         GoodsDon goods = new GoodsDon();
@@ -153,7 +150,6 @@ public class CmsGoodsDonController {
 
 
     @PutMapping("/put/status/{id}")
-    @SaCheckPermission("platform:updateStatus")
     @Log(module = "平台管理/平台上下架", businessType = BusinessType.PUT, isSaveRequestData = true, isSaveResponseData = true)
     public Result<Boolean> updateStatus(@PathVariable Long id) {
         GoodsDon goods = goodsDonService.getById(id);
@@ -168,7 +164,6 @@ public class CmsGoodsDonController {
     }
 
     @DeleteMapping("/delete/{id}")
-    @SaCheckPermission("platform:delete")
     @Log(module = "平台管理/删除平台", businessType = BusinessType.DELETE, isSaveRequestData = true, isSaveResponseData = true)
     public Result<Long> deleteById(@PathVariable Long id) {
         GoodsDon goods = goodsDonService.getById(id);

netflix-web/src/main/java/com/cyksj/web/controller/manage/group/CmsGroupController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.group;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
@@ -65,7 +64,6 @@ public class CmsGroupController {
     private final UserMapper userMapper;
 
     @GetMapping("/get")
-    @SaCheckPermission("group:view")
     public Result<SearchResult<GroupsTrips>> get(String account, Long userId, String showId, String nickName, String submitAccount, Boolean isEmpty) {
         MapBuilder mapBuilder = MapUtils.flatBuilder(request.getParameterMap());
         if (StrUtil.isNotBlank(showId)) {
@@ -100,7 +98,6 @@ public class CmsGroupController {
 
     @PostMapping("/post")
     @NoSubmit
-    @SaCheckPermission("group:add")
     @Log(module = "发布车票/新增车队", businessType = BusinessType.POST, isSaveRequestData = true)
     public Result<GroupsTrips> add(@RequestBody GroupsTrips groups){
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/market/LuckyDrawController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.market;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
@@ -92,7 +91,6 @@ public class LuckyDrawController {
 	 * 奖品列表
 	 */
 	@GetMapping("/get")
-	@SaCheckPermission("raffle:view")
 	public Result<SearchResult<LuckyDrawView>> get(HttpServletRequest request) {
 		SearchResult<LuckyDrawView> search = beanSearcher.search(LuckyDrawView.class, MapUtils.flatBuilder(request.getParameterMap())
 				.build());

netflix-web/src/main/java/com/cyksj/web/controller/manage/market/TaskController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.market;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -111,7 +110,6 @@ public class TaskController {
 	 * 任务列表
 	 */
 	@GetMapping("/get")
-	@SaCheckPermission("sign:view")
 	public Result<SearchResult<TaskView>> getTask(HttpServletRequest request) {
 		DateTime now = DateTime.now();
 		DateTime beginOfDay = DateUtil.beginOfDay(now);

netflix-web/src/main/java/com/cyksj/web/controller/manage/register/CmsRegisterController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.register;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.EasyExcel;
@@ -64,7 +63,6 @@ public class CmsRegisterController {
     private final SpotifySendMsgService spotifySendMsgService;
 
     @GetMapping("/get")
-    @SaCheckPermission("sign:view")
     public Result<SearchResult<RegisterOrderDon>> get(Boolean appleIsAutoType) {
         MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
         if (appleIsAutoType != null) {
@@ -137,7 +135,6 @@ public class CmsRegisterController {
      * 微信订单退款
      */
     @PostMapping("/wx/refund")
-    @SaCheckPermission("sign:refund")
     public Result<String> wxRefund(@RequestBody @Validated OrderRefundReq refundReq) throws Exception {
         RegisterOrderDon registerOrderDon = registerOrderDonService.getById(refundReq.getOrderId());
         if (registerOrderDon==null) throw BusinessRuntimeException.getInstance("");

netflix-web/src/main/java/com/cyksj/web/controller/manage/shop/ShopConfigController.java

@@ -36,7 +36,6 @@ public class ShopConfigController {
     private final ChannelService channelService;
 
     @GetMapping
-    @SaCheckPermission("merchant:view")
     public Result<SearchResult<ShopConfig>> get(){
         SearchResult<ShopConfig> searchResult = beanSearcher.search(ShopConfig.class, MapUtils.flatBuilder(request.getParameterMap()).build());
         searchResult.getDataList().forEach((shopConfig)->{

netflix-web/src/main/java/com/cyksj/web/controller/manage/statistics/StatisticsDataController.java

@@ -91,7 +91,6 @@ public class StatisticsDataController {
 	 * 查询统计数据
 	 */
 	@GetMapping
-	@SaCheckPermission("statics:view")
 	public Result<BackgroundDataView> getStatisticsByCondition(Long startTime, Long endTime) throws InterruptedException {
 		return statisticsDataService.getStatisticsByCondition(startTime, endTime);
 	}
@@ -100,7 +99,6 @@ public class StatisticsDataController {
 	 * 导出订单统计数据
 	 */
 	@GetMapping("/export")
-	@SaCheckPermission("statics:export")
 	public void exportStatisticsData(Integer type, Long startTime, Long endTime, HttpServletResponse response) {
 		if (startTime == null || endTime == null) {
 			throw BusinessRuntimeException.getInstance("请选择导出的时间");
@@ -127,7 +125,6 @@ public class StatisticsDataController {
 	 * 有效子账号数列表
 	 */
 	@GetMapping("/expired/account")
-	@SaCheckPermission("validAccount:view")
 	public Result<IPage<ExpiredAccountDataView>> getExpiredAccountView(Boolean isCorpWx, String customerService, Long goodsId, Long skuId, String account, Boolean renewStatus, Boolean handleStatus, String cnAccount, String usAccount, Integer userId, Long startTime, Long endTime, @RequestParam(required = false, defaultValue = "1") Long start, @RequestParam(required = false, defaultValue = "10") Long limit) {
 		return GatewayResponse.SUCCESS.newBuilder().toResult(statisticsDataService.getExpiredAccountView(isCorpWx, customerService, goodsId, skuId, account, renewStatus, handleStatus, cnAccount, usAccount, userId, startTime, endTime, start, limit));
 	}
@@ -169,7 +166,6 @@ public class StatisticsDataController {
 	 */
 	@PutMapping("/renewTime/up")
 	@Transactional(rollbackFor = Throwable.class)
-	@SaCheckPermission("validAccount:addTime")
 	@Log(module = "有效子账号管理/增加时长", businessType = BusinessType.PUT, isSaveRequestData = true)
 	public Result<String> addRenewTime(@RequestBody @Validated RenewTimeUpReq renewTimeUpReq) {
 		GroupsRelation relation = groupsRelationMapper.selectById(renewTimeUpReq.getRelationId());
@@ -409,7 +405,6 @@ public class StatisticsDataController {
 	 * 批量分配客服
 	 */
 	@PostMapping("/batch/service")
-	@SaCheckPermission("validAccount:distributeServices")
 	public Result<String> batchService(@RequestBody List<BatchServiceReq> batchServices) {
 		batchServices.forEach(service -> {
 			if (StrUtil.isEmpty(service.getCustomerService())) {

netflix-web/src/main/java/com/cyksj/web/controller/manage/sys/WorkOrderController.java

@@ -1,6 +1,5 @@
 package com.cyksj.web.controller.manage.sys;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.excel.support.ExcelTypeEnum;
@@ -61,7 +60,6 @@ public class WorkOrderController {
 	private final UserMapper userMapper;
 
 	@GetMapping("/get")
-	@SaCheckPermission("workOrder:view")
 	public Result<SearchResult<WorkOrderView>> getWorkOrderList(String nickname, Integer feedbackNum, Long customerServiceId) {
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (feedbackNum != null) {
@@ -97,7 +95,6 @@ public class WorkOrderController {
 	 * 修改工单状态
 	 */
 	@PutMapping("/put")
-	@SaCheckPermission("workOrder:updateStatus")
 	public Result<String> putWorkOrderStatus(@RequestBody WorkOrder dto) {
 		long adminId = StpUtil.getLoginIdAsLong();
 		Long id = dto.getId();
@@ -124,7 +121,6 @@ public class WorkOrderController {
 	 * 查看聊天
 	 */
 	@GetMapping("/get/chat/history")
-	@SaCheckPermission("workOrder:detail")
 	public Result<SearchResult<WorkOrderChatHistoryView>> getChatHistoryById() {
 		SearchResult<WorkOrderChatHistoryView> search = beanSearcher.search(WorkOrderChatHistoryView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		search.getDataList().forEach(data->{
@@ -138,7 +134,6 @@ public class WorkOrderController {
 	 * 客服回复用户工单
 	 */
 	@PostMapping("/customer/reply")
-	@SaCheckPermission("workOrder:reply")
 	@Transactional(rollbackFor = Throwable.class)
 	public Result<String> customerReplyWorkOrder(@RequestBody @Validated WorkOrderChatHistory history) {
 		long adminId = StpUtil.getLoginIdAsLong();