From 5a2e210670b20f76372a3503867b6406e7729b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 19 Aug 2024 08:58:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86swagger=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/socketio/config/SocketIOConfig.java | 2 -- .../common/system/controller/AppUrlController.java | 1 - .../common/system/controller/AppUserController.java | 2 -- .../common/system/controller/CacheController.java | 2 -- .../system/controller/ChatConversationController.java | 1 - .../common/system/controller/ChatMessageController.java | 1 - .../common/system/controller/CompanyController.java | 3 --- .../common/system/controller/MenuController.java | 2 -- .../common/system/controller/NoticeController.java | 1 - .../system/controller/NotifyByBalancePayController.java | 7 ------- .../common/system/controller/PaymentController.java | 3 --- .../common/system/controller/RedisUtilController.java | 2 -- .../common/system/controller/SettingController.java | 1 - .../common/system/controller/TenantController.java | 2 -- .../system/controller/UserCollectionController.java | 1 - .../common/system/controller/UserController.java | 1 - .../common/system/controller/UserGradeController.java | 2 -- .../common/system/controller/UserOauthController.java | 1 - .../common/system/controller/UserRefereeController.java | 1 - .../common/system/controller/WhiteDomainController.java | 2 -- .../common/system/controller/WxLoginController.java | 2 +- .../common/system/service/impl/TenantServiceImpl.java | 8 -------- 22 files changed, 1 insertion(+), 47 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java b/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java index d79884f..1097481 100644 --- a/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java +++ b/src/main/java/com/gxwebsoft/common/core/socketio/config/SocketIOConfig.java @@ -1,10 +1,8 @@ package com.gxwebsoft.common.core.socketio.config; -import com.corundumstudio.socketio.SocketIOServer; import com.gxwebsoft.common.core.config.ConfigProperties; import com.gxwebsoft.common.core.security.JwtSubject; import com.gxwebsoft.common.core.security.JwtUtil; -import com.gxwebsoft.common.core.socketio.cache.ClientCache; import com.gxwebsoft.common.core.socketio.handler.SocketIOHandler; import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.service.UserService; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AppUrlController.java b/src/main/java/com/gxwebsoft/common/system/controller/AppUrlController.java index 6515965..c94dc85 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/AppUrlController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/AppUrlController.java @@ -1,7 +1,6 @@ package com.gxwebsoft.common.system.controller; import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.service.AppUrlService; import com.gxwebsoft.common.system.entity.AppUrl; import com.gxwebsoft.common.system.param.AppUrlParam; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AppUserController.java b/src/main/java/com/gxwebsoft/common/system/controller/AppUserController.java index 7f6ab8e..45e1422 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/AppUserController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/AppUserController.java @@ -2,13 +2,11 @@ package com.gxwebsoft.common.system.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.service.AppUserService; import com.gxwebsoft.common.system.entity.AppUser; import com.gxwebsoft.common.system.param.AppUserParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java b/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java index 7410ea7..2eb9952 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/CacheController.java @@ -3,13 +3,11 @@ package com.gxwebsoft.common.system.controller; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.utils.CacheClient; import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.Cache; import com.gxwebsoft.common.system.entity.User; -import com.gxwebsoft.common.system.service.SettingService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/ChatConversationController.java b/src/main/java/com/gxwebsoft/common/system/controller/ChatConversationController.java index ae5409d..d63a9ab 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/ChatConversationController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/ChatConversationController.java @@ -6,7 +6,6 @@ import com.gxwebsoft.common.system.entity.ChatConversation; import com.gxwebsoft.common.system.param.ChatConversationParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java b/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java index 3f8b86a..61b973e 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java @@ -7,7 +7,6 @@ import com.gxwebsoft.common.system.entity.ChatMessage; import com.gxwebsoft.common.system.param.ChatMessageParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java index de969e4..fcc06bb 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java @@ -1,6 +1,5 @@ package com.gxwebsoft.common.system.controller; -import cn.hutool.core.lang.Validator; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.core.exception.BusinessException; @@ -19,7 +18,6 @@ import com.gxwebsoft.common.system.service.TenantService; import com.gxwebsoft.common.system.service.UserCollectionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.ibatis.annotations.Param; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +25,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java index b8cc81e..b04d9c4 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MenuController.java @@ -1,7 +1,5 @@ package com.gxwebsoft.common.system.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.Company; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/NoticeController.java b/src/main/java/com/gxwebsoft/common/system/controller/NoticeController.java index e4a8570..ea51b98 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/NoticeController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/NoticeController.java @@ -2,7 +2,6 @@ package com.gxwebsoft.common.system.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.core.web.BatchParam; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/NotifyByBalancePayController.java b/src/main/java/com/gxwebsoft/common/system/controller/NotifyByBalancePayController.java index 91313fd..7e7ebc6 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/NotifyByBalancePayController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/NotifyByBalancePayController.java @@ -1,22 +1,15 @@ package com.gxwebsoft.common.system.controller; -import cn.hutool.core.util.StrUtil; import com.gxwebsoft.common.core.config.ConfigProperties; import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.utils.RequestUtil; import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.Payment; -import com.wechat.pay.java.core.notification.NotificationConfig; -import com.wechat.pay.java.core.notification.NotificationParser; -import com.wechat.pay.java.core.notification.RSANotificationConfig; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import javax.validation.GroupSequence; import java.util.Map; /** diff --git a/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java b/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java index 2f885ce..2dc6cbe 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/PaymentController.java @@ -3,7 +3,6 @@ package com.gxwebsoft.common.system.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.gxwebsoft.common.core.exception.BusinessException; import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.utils.RequestUtil; import com.gxwebsoft.common.core.web.BaseController; @@ -19,7 +18,6 @@ import com.gxwebsoft.common.system.service.UserBalanceLogService; import com.gxwebsoft.common.system.service.UserService; import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; import com.wechat.pay.java.service.partnerpayments.model.TransactionAmount; -import com.wechat.pay.java.service.payments.jsapi.model.Amount; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,7 +30,6 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; -import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_ADMIN; import static com.gxwebsoft.common.core.constants.BalanceConstants.BALANCE_USE; /** diff --git a/src/main/java/com/gxwebsoft/common/system/controller/RedisUtilController.java b/src/main/java/com/gxwebsoft/common/system/controller/RedisUtilController.java index 6b25f95..e7e2f47 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/RedisUtilController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/RedisUtilController.java @@ -1,6 +1,5 @@ package com.gxwebsoft.common.system.controller; -import com.gxwebsoft.common.core.utils.CacheClient; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.User; @@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/api/redis-util") @Api(tags = "Redis缓存") public class RedisUtilController extends BaseController { - private CacheClient cacheClient; private final StringRedisTemplate redisTemplate; private static final String SPLIT = ":"; private static final String PREFIX_ENTITY_LIKE = "focus:user"; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java index a893854..e9e3bea 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java @@ -1,6 +1,5 @@ package com.gxwebsoft.common.system.controller; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java index e2d5f00..22c62dd 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java @@ -7,7 +7,6 @@ import com.gxwebsoft.common.core.utils.JSONUtil; import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.*; -import com.gxwebsoft.common.system.param.PlugParam; import com.gxwebsoft.common.system.service.CompanyService; import com.gxwebsoft.common.system.service.MenuService; import com.gxwebsoft.common.system.service.RoleMenuService; @@ -15,7 +14,6 @@ import com.gxwebsoft.common.system.service.TenantService; import com.gxwebsoft.common.system.param.TenantParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserCollectionController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserCollectionController.java index 81ee6a8..e55dd26 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserCollectionController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserCollectionController.java @@ -8,7 +8,6 @@ import com.gxwebsoft.common.system.entity.UserCollection; import com.gxwebsoft.common.system.param.UserCollectionParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java index e17e47e..4f34583 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.gxwebsoft.common.core.annotation.OperationLog; -import com.gxwebsoft.common.core.exception.BusinessException; import com.gxwebsoft.common.core.utils.CommonUtil; import com.gxwebsoft.common.core.web.*; import com.gxwebsoft.common.system.entity.*; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java index a1db3a6..1561bf1 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserGradeController.java @@ -1,13 +1,11 @@ package com.gxwebsoft.common.system.controller; import com.gxwebsoft.common.core.web.BaseController; -import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.common.system.service.UserGradeService; import com.gxwebsoft.common.system.entity.UserGrade; import com.gxwebsoft.common.system.param.UserGradeParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserOauthController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserOauthController.java index 4652081..3ff9147 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserOauthController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserOauthController.java @@ -7,7 +7,6 @@ import com.gxwebsoft.common.system.entity.UserOauth; import com.gxwebsoft.common.system.param.UserOauthParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java index 962506c..f61b9a2 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserRefereeController.java @@ -7,7 +7,6 @@ import com.gxwebsoft.common.system.entity.UserReferee; import com.gxwebsoft.common.system.param.UserRefereeParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WhiteDomainController.java b/src/main/java/com/gxwebsoft/common/system/controller/WhiteDomainController.java index 0e1077d..99be57c 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WhiteDomainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WhiteDomainController.java @@ -1,6 +1,5 @@ package com.gxwebsoft.common.system.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.system.entity.User; @@ -9,7 +8,6 @@ import com.gxwebsoft.common.system.entity.WhiteDomain; import com.gxwebsoft.common.system.param.WhiteDomainParam; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import io.swagger.annotations.Api; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java index 8dda0f1..5e7ebde 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/WxLoginController.java @@ -222,7 +222,7 @@ public class WxLoginController extends BaseController { /** * 获取接口调用凭据AccessToken - * https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getAccessToken.html + * ... */ private String getAccessToken() { String key = ACCESS_TOKEN_KEY.concat(":").concat(getTenantId().toString()); diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java index 78ccd02..2a3a69c 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java @@ -1,10 +1,7 @@ package com.gxwebsoft.common.system.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gxwebsoft.common.core.utils.CommonUtil; import com.gxwebsoft.common.core.utils.DomainUtil; @@ -16,14 +13,9 @@ import com.gxwebsoft.common.system.param.TenantParam; import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.PageResult; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 租户Service实现