mirror of
				https://github.com/continew-org/continew-admin.git
				synced 2025-10-31 10:57:13 +08:00 
			
		
		
		
	chore: top.charles7c.continew => top.continew
1.groupId 及基础包名调整,更短的包名,优化品牌形象 2.全局代码格式化
This commit is contained in:
		| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin; | ||||
| package top.continew.admin; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaIgnore; | ||||
| import cn.hutool.core.util.URLUtil; | ||||
| @@ -52,7 +52,7 @@ import java.net.InetAddress; | ||||
| @RequiredArgsConstructor | ||||
| @EnableCrudRestController | ||||
| @EnableGlobalExceptionHandler | ||||
| @EnableMethodCache(basePackages = "top.charles7c.continew.admin") | ||||
| @EnableMethodCache(basePackages = "top.continew.admin") | ||||
| public class ContiNewAdminApplication implements ApplicationRunner { | ||||
| 
 | ||||
|     private final ProjectProperties projectProperties; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.auth; | ||||
| package top.continew.admin.webapi.auth; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaIgnore; | ||||
| import cn.dev33.satoken.stp.StpUtil; | ||||
| @@ -26,19 +26,19 @@ import io.swagger.v3.oas.annotations.tags.Tag; | ||||
| import lombok.RequiredArgsConstructor; | ||||
| import org.springframework.validation.annotation.Validated; | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| import top.charles7c.continew.admin.auth.model.req.AccountLoginReq; | ||||
| import top.charles7c.continew.admin.auth.model.req.EmailLoginReq; | ||||
| import top.charles7c.continew.admin.auth.model.req.PhoneLoginReq; | ||||
| import top.charles7c.continew.admin.auth.model.resp.LoginResp; | ||||
| import top.charles7c.continew.admin.auth.model.resp.RouteResp; | ||||
| import top.charles7c.continew.admin.auth.model.resp.UserInfoResp; | ||||
| import top.charles7c.continew.admin.auth.service.LoginService; | ||||
| import top.charles7c.continew.admin.common.constant.CacheConstants; | ||||
| import top.charles7c.continew.admin.common.model.dto.LoginUser; | ||||
| import top.charles7c.continew.admin.common.util.SecureUtils; | ||||
| import top.charles7c.continew.admin.common.util.helper.LoginHelper; | ||||
| import top.charles7c.continew.admin.system.model.resp.UserDetailResp; | ||||
| import top.charles7c.continew.admin.system.service.UserService; | ||||
| import top.continew.admin.auth.model.req.AccountLoginReq; | ||||
| import top.continew.admin.auth.model.req.EmailLoginReq; | ||||
| import top.continew.admin.auth.model.req.PhoneLoginReq; | ||||
| import top.continew.admin.auth.model.resp.LoginResp; | ||||
| import top.continew.admin.auth.model.resp.RouteResp; | ||||
| import top.continew.admin.auth.model.resp.UserInfoResp; | ||||
| import top.continew.admin.auth.service.LoginService; | ||||
| import top.continew.admin.common.constant.CacheConstants; | ||||
| import top.continew.admin.common.model.dto.LoginUser; | ||||
| import top.continew.admin.common.util.SecureUtils; | ||||
| import top.continew.admin.common.util.helper.LoginHelper; | ||||
| import top.continew.admin.system.model.resp.UserDetailResp; | ||||
| import top.continew.admin.system.service.UserService; | ||||
| import top.continew.starter.cache.redisson.util.RedisUtils; | ||||
| import top.continew.starter.core.util.ExceptionUtils; | ||||
| import top.continew.starter.core.util.validate.ValidationUtils; | ||||
| @@ -60,10 +60,10 @@ import java.util.List; | ||||
| @RequestMapping("/auth") | ||||
| public class AuthController { | ||||
| 
 | ||||
|     private final LoginService loginService; | ||||
|     private final UserService userService; | ||||
|     private static final String CAPTCHA_EXPIRED = "验证码已失效"; | ||||
|     private static final String CAPTCHA_ERROR = "验证码错误"; | ||||
|     private final LoginService loginService; | ||||
|     private final UserService userService; | ||||
| 
 | ||||
|     @SaIgnore | ||||
|     @Operation(summary = "账号登录", description = "根据账号和密码进行登录认证") | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.auth; | ||||
| package top.continew.admin.webapi.auth; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaIgnore; | ||||
| import cn.dev33.satoken.stp.StpUtil; | ||||
| @@ -30,9 +30,9 @@ import me.zhyd.oauth.model.AuthUser; | ||||
| import me.zhyd.oauth.request.AuthRequest; | ||||
| import me.zhyd.oauth.utils.AuthStateUtils; | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| import top.charles7c.continew.admin.auth.model.resp.LoginResp; | ||||
| import top.charles7c.continew.admin.auth.model.resp.SocialAuthAuthorizeResp; | ||||
| import top.charles7c.continew.admin.auth.service.LoginService; | ||||
| import top.continew.admin.auth.model.resp.LoginResp; | ||||
| import top.continew.admin.auth.model.resp.SocialAuthAuthorizeResp; | ||||
| import top.continew.admin.auth.service.LoginService; | ||||
| import top.continew.starter.core.exception.BadRequestException; | ||||
| import top.continew.starter.core.util.validate.ValidationUtils; | ||||
| import top.continew.starter.log.core.annotation.Log; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.common; | ||||
| package top.continew.admin.webapi.common; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaIgnore; | ||||
| import cn.hutool.core.lang.Dict; | ||||
| @@ -43,9 +43,9 @@ import org.redisson.api.RateType; | ||||
| import org.springframework.http.HttpHeaders; | ||||
| import org.springframework.validation.annotation.Validated; | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| import top.charles7c.continew.admin.common.config.properties.CaptchaProperties; | ||||
| import top.charles7c.continew.admin.common.constant.CacheConstants; | ||||
| import top.charles7c.continew.admin.common.model.resp.CaptchaResp; | ||||
| import top.continew.admin.common.config.properties.CaptchaProperties; | ||||
| import top.continew.admin.common.constant.CacheConstants; | ||||
| import top.continew.admin.common.model.resp.CaptchaResp; | ||||
| import top.continew.starter.cache.redisson.util.RedisUtils; | ||||
| import top.continew.starter.captcha.graphic.core.GraphicCaptchaService; | ||||
| import top.continew.starter.core.autoconfigure.project.ProjectProperties; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.common; | ||||
| package top.continew.admin.webapi.common; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaIgnore; | ||||
| import cn.hutool.core.lang.tree.Tree; | ||||
| @@ -31,14 +31,14 @@ import org.dromara.x.file.storage.core.FileInfo; | ||||
| import org.springframework.validation.annotation.Validated; | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| import org.springframework.web.multipart.MultipartFile; | ||||
| import top.charles7c.continew.admin.common.constant.CacheConstants; | ||||
| import top.charles7c.continew.admin.common.model.resp.LabelValueResp; | ||||
| import top.charles7c.continew.admin.system.model.query.DeptQuery; | ||||
| import top.charles7c.continew.admin.system.model.query.MenuQuery; | ||||
| import top.charles7c.continew.admin.system.model.query.OptionQuery; | ||||
| import top.charles7c.continew.admin.system.model.query.RoleQuery; | ||||
| import top.charles7c.continew.admin.system.model.resp.FileUploadResp; | ||||
| import top.charles7c.continew.admin.system.service.*; | ||||
| import top.continew.admin.common.constant.CacheConstants; | ||||
| import top.continew.admin.common.model.resp.LabelValueResp; | ||||
| import top.continew.admin.system.model.query.DeptQuery; | ||||
| import top.continew.admin.system.model.query.MenuQuery; | ||||
| import top.continew.admin.system.model.query.OptionQuery; | ||||
| import top.continew.admin.system.model.query.RoleQuery; | ||||
| import top.continew.admin.system.model.resp.FileUploadResp; | ||||
| import top.continew.admin.system.service.*; | ||||
| import top.continew.starter.core.autoconfigure.project.ProjectProperties; | ||||
| import top.continew.starter.core.util.validate.ValidationUtils; | ||||
| import top.continew.starter.data.mybatis.plus.base.IBaseEnum; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.common; | ||||
| package top.continew.admin.webapi.common; | ||||
| 
 | ||||
| import com.alicp.jetcache.anno.CachePenetrationProtect; | ||||
| import com.alicp.jetcache.anno.CacheRefresh; | ||||
| @@ -30,13 +30,13 @@ import org.springframework.web.bind.annotation.GetMapping; | ||||
| import org.springframework.web.bind.annotation.PathVariable; | ||||
| import org.springframework.web.bind.annotation.RequestMapping; | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| import top.charles7c.continew.admin.common.constant.CacheConstants; | ||||
| import top.charles7c.continew.admin.system.model.resp.DashboardAccessTrendResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.DashboardGeoDistributionResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.DashboardPopularModuleResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.DashboardTotalResp; | ||||
| import top.charles7c.continew.admin.system.service.DashboardService; | ||||
| import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; | ||||
| import top.continew.admin.common.constant.CacheConstants; | ||||
| import top.continew.admin.system.model.resp.DashboardAccessTrendResp; | ||||
| import top.continew.admin.system.model.resp.DashboardGeoDistributionResp; | ||||
| import top.continew.admin.system.model.resp.DashboardPopularModuleResp; | ||||
| import top.continew.admin.system.model.resp.DashboardTotalResp; | ||||
| import top.continew.admin.system.service.DashboardService; | ||||
| import top.continew.admin.system.model.resp.DashboardAnnouncementResp; | ||||
| import top.continew.starter.core.util.validate.ValidationUtils; | ||||
| import top.continew.starter.web.model.R; | ||||
| import top.continew.starter.log.core.annotation.Log; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.monitor; | ||||
| package top.continew.admin.webapi.monitor; | ||||
| 
 | ||||
| import lombok.RequiredArgsConstructor; | ||||
| 
 | ||||
| @@ -29,9 +29,9 @@ import org.springframework.web.bind.annotation.*; | ||||
| import cn.dev33.satoken.annotation.SaCheckPermission; | ||||
| import cn.dev33.satoken.stp.StpUtil; | ||||
| 
 | ||||
| import top.charles7c.continew.admin.auth.model.query.OnlineUserQuery; | ||||
| import top.charles7c.continew.admin.auth.model.resp.OnlineUserResp; | ||||
| import top.charles7c.continew.admin.auth.service.OnlineUserService; | ||||
| import top.continew.admin.auth.model.query.OnlineUserQuery; | ||||
| import top.continew.admin.auth.model.resp.OnlineUserResp; | ||||
| import top.continew.admin.auth.service.OnlineUserService; | ||||
| import top.continew.starter.core.util.validate.CheckUtils; | ||||
| import top.continew.starter.extension.crud.model.query.PageQuery; | ||||
| import top.continew.starter.extension.crud.model.resp.PageResp; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import java.time.LocalDateTime; | ||||
| 
 | ||||
| @@ -25,11 +25,11 @@ import org.springframework.web.bind.annotation.*; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaCheckPermission; | ||||
| 
 | ||||
| import top.charles7c.continew.admin.system.model.query.AnnouncementQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.AnnouncementReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.AnnouncementDetailResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.AnnouncementResp; | ||||
| import top.charles7c.continew.admin.system.service.AnnouncementService; | ||||
| import top.continew.admin.system.model.query.AnnouncementQuery; | ||||
| import top.continew.admin.system.model.req.AnnouncementReq; | ||||
| import top.continew.admin.system.model.resp.AnnouncementDetailResp; | ||||
| import top.continew.admin.system.model.resp.AnnouncementResp; | ||||
| import top.continew.admin.system.service.AnnouncementService; | ||||
| import top.continew.starter.core.util.validate.ValidationUtils; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| import top.continew.starter.extension.crud.controller.BaseController; | ||||
| @@ -65,8 +65,7 @@ public class AnnouncementController extends BaseController<AnnouncementService, | ||||
|     /** | ||||
|      * 检查时间 | ||||
|      * | ||||
|      * @param req | ||||
|      *            创建或修改信息 | ||||
|      * @param req 创建或修改信息 | ||||
|      */ | ||||
|     private void checkTime(AnnouncementReq req) { | ||||
|         LocalDateTime effectiveTime = req.getEffectiveTime(); | ||||
| @@ -14,14 +14,14 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| import top.charles7c.continew.admin.system.model.query.DeptQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.DeptReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.DeptResp; | ||||
| import top.charles7c.continew.admin.system.service.DeptService; | ||||
| import top.continew.admin.system.model.query.DeptQuery; | ||||
| import top.continew.admin.system.model.req.DeptReq; | ||||
| import top.continew.admin.system.model.resp.DeptResp; | ||||
| import top.continew.admin.system.service.DeptService; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| import top.continew.starter.extension.crud.controller.BaseController; | ||||
| import top.continew.starter.extension.crud.enums.Api; | ||||
| @@ -35,4 +35,5 @@ import top.continew.starter.extension.crud.enums.Api; | ||||
| @Tag(name = "部门管理 API") | ||||
| @RestController | ||||
| @CrudRequestMapping(value = "/system/dept", api = {Api.TREE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE, Api.EXPORT}) | ||||
| public class DeptController extends BaseController<DeptService, DeptResp, DeptResp, DeptQuery, DeptReq> {} | ||||
| public class DeptController extends BaseController<DeptService, DeptResp, DeptResp, DeptQuery, DeptReq> { | ||||
| } | ||||
| @@ -14,14 +14,14 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| import top.charles7c.continew.admin.system.model.query.DictQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.DictReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.DictResp; | ||||
| import top.charles7c.continew.admin.system.service.DictService; | ||||
| import top.continew.admin.system.model.query.DictQuery; | ||||
| import top.continew.admin.system.model.req.DictReq; | ||||
| import top.continew.admin.system.model.resp.DictResp; | ||||
| import top.continew.admin.system.service.DictService; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| import top.continew.starter.extension.crud.controller.BaseController; | ||||
| import top.continew.starter.extension.crud.enums.Api; | ||||
| @@ -35,4 +35,5 @@ import top.continew.starter.extension.crud.enums.Api; | ||||
| @Tag(name = "字典管理 API") | ||||
| @RestController | ||||
| @CrudRequestMapping(value = "/system/dict", api = {Api.PAGE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE}) | ||||
| public class DictController extends BaseController<DictService, DictResp, DictResp, DictQuery, DictReq> {} | ||||
| public class DictController extends BaseController<DictService, DictResp, DictResp, DictQuery, DictReq> { | ||||
| } | ||||
| @@ -14,14 +14,14 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| import top.charles7c.continew.admin.system.model.query.DictItemQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.DictItemReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.DictItemResp; | ||||
| import top.charles7c.continew.admin.system.service.DictItemService; | ||||
| import top.continew.admin.system.model.query.DictItemQuery; | ||||
| import top.continew.admin.system.model.req.DictItemReq; | ||||
| import top.continew.admin.system.model.resp.DictItemResp; | ||||
| import top.continew.admin.system.service.DictItemService; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| import top.continew.starter.extension.crud.controller.BaseController; | ||||
| import top.continew.starter.extension.crud.enums.Api; | ||||
| @@ -35,4 +35,5 @@ import top.continew.starter.extension.crud.enums.Api; | ||||
| @Tag(name = "字典项管理 API") | ||||
| @RestController | ||||
| @CrudRequestMapping(value = "/system/dict/item", api = {Api.PAGE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE}) | ||||
| public class DictItemController extends BaseController<DictItemService, DictItemResp, DictItemResp, DictItemQuery, DictItemReq> {} | ||||
| public class DictItemController extends BaseController<DictItemService, DictItemResp, DictItemResp, DictItemQuery, DictItemReq> { | ||||
| } | ||||
| @@ -14,16 +14,16 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||||
| 
 | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| 
 | ||||
| import top.charles7c.continew.admin.system.model.query.FileQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.FileReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.FileResp; | ||||
| import top.charles7c.continew.admin.system.service.FileService; | ||||
| import top.continew.admin.system.model.query.FileQuery; | ||||
| import top.continew.admin.system.model.req.FileReq; | ||||
| import top.continew.admin.system.model.resp.FileResp; | ||||
| import top.continew.admin.system.service.FileService; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| import top.continew.starter.extension.crud.controller.BaseController; | ||||
| import top.continew.starter.extension.crud.enums.Api; | ||||
| @@ -37,4 +37,5 @@ import top.continew.starter.extension.crud.enums.Api; | ||||
| @Tag(name = "文件管理 API") | ||||
| @RestController | ||||
| @CrudRequestMapping(value = "/system/file", api = {Api.PAGE, Api.UPDATE, Api.DELETE}) | ||||
| public class FileController extends BaseController<FileService, FileResp, FileResp, FileQuery, FileReq> {} | ||||
| public class FileController extends BaseController<FileService, FileResp, FileResp, FileQuery, FileReq> { | ||||
| } | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import io.swagger.v3.oas.annotations.Operation; | ||||
| import io.swagger.v3.oas.annotations.Parameter; | ||||
| @@ -27,10 +27,10 @@ import org.springframework.web.bind.annotation.GetMapping; | ||||
| import org.springframework.web.bind.annotation.PathVariable; | ||||
| import org.springframework.web.bind.annotation.RequestMapping; | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| import top.charles7c.continew.admin.system.model.query.LogQuery; | ||||
| import top.charles7c.continew.admin.system.model.resp.log.LogDetailResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.log.LogResp; | ||||
| import top.charles7c.continew.admin.system.service.LogService; | ||||
| import top.continew.admin.system.model.query.LogQuery; | ||||
| import top.continew.admin.system.model.resp.log.LogDetailResp; | ||||
| import top.continew.admin.system.model.resp.log.LogResp; | ||||
| import top.continew.admin.system.service.LogService; | ||||
| import top.continew.starter.extension.crud.model.query.PageQuery; | ||||
| import top.continew.starter.extension.crud.model.query.SortQuery; | ||||
| import top.continew.starter.extension.crud.model.resp.PageResp; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaCheckPermission; | ||||
| import cn.hutool.core.util.ObjectUtil; | ||||
| @@ -23,10 +23,10 @@ import org.springframework.validation.annotation.Validated; | ||||
| import org.springframework.web.bind.annotation.PathVariable; | ||||
| import org.springframework.web.bind.annotation.RequestBody; | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| import top.charles7c.continew.admin.system.model.query.MenuQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.MenuReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.MenuResp; | ||||
| import top.charles7c.continew.admin.system.service.MenuService; | ||||
| import top.continew.admin.system.model.query.MenuQuery; | ||||
| import top.continew.admin.system.model.req.MenuReq; | ||||
| import top.continew.admin.system.model.resp.MenuResp; | ||||
| import top.continew.admin.system.service.MenuService; | ||||
| import top.continew.starter.core.util.URLUtils; | ||||
| import top.continew.starter.core.util.validate.ValidationUtils; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| @@ -62,9 +62,8 @@ public class MenuController extends BaseController<MenuService, MenuResp, MenuRe | ||||
| 
 | ||||
|     /** | ||||
|      * 检查路由地址格式 | ||||
|      *  | ||||
|      * @param req | ||||
|      *            创建或修改信息 | ||||
|      * | ||||
|      * @param req 创建或修改信息 | ||||
|      */ | ||||
|     private void checkPath(MenuReq req) { | ||||
|         Boolean isExternal = ObjectUtil.defaultIfNull(req.getIsExternal(), false); | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import io.swagger.v3.oas.annotations.Operation; | ||||
| import io.swagger.v3.oas.annotations.Parameter; | ||||
| @@ -23,12 +23,12 @@ import io.swagger.v3.oas.annotations.tags.Tag; | ||||
| import lombok.RequiredArgsConstructor; | ||||
| import org.springframework.validation.annotation.Validated; | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| import top.charles7c.continew.admin.common.util.helper.LoginHelper; | ||||
| import top.charles7c.continew.admin.system.model.query.MessageQuery; | ||||
| import top.charles7c.continew.admin.system.model.resp.MessageResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.MessageUnreadResp; | ||||
| import top.charles7c.continew.admin.system.service.MessageService; | ||||
| import top.charles7c.continew.admin.system.service.MessageUserService; | ||||
| import top.continew.admin.common.util.helper.LoginHelper; | ||||
| import top.continew.admin.system.model.query.MessageQuery; | ||||
| import top.continew.admin.system.model.resp.MessageResp; | ||||
| import top.continew.admin.system.model.resp.MessageUnreadResp; | ||||
| import top.continew.admin.system.service.MessageService; | ||||
| import top.continew.admin.system.service.MessageUserService; | ||||
| import top.continew.starter.extension.crud.model.query.PageQuery; | ||||
| import top.continew.starter.extension.crud.model.resp.PageResp; | ||||
| import top.continew.starter.web.model.R; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import java.util.List; | ||||
| 
 | ||||
| @@ -28,11 +28,11 @@ import org.springframework.web.bind.annotation.*; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaCheckPermission; | ||||
| 
 | ||||
| import top.charles7c.continew.admin.system.model.query.OptionQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.OptionReq; | ||||
| import top.charles7c.continew.admin.system.model.req.OptionResetValueReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.OptionResp; | ||||
| import top.charles7c.continew.admin.system.service.OptionService; | ||||
| import top.continew.admin.system.model.query.OptionQuery; | ||||
| import top.continew.admin.system.model.req.OptionReq; | ||||
| import top.continew.admin.system.model.req.OptionResetValueReq; | ||||
| import top.continew.admin.system.model.resp.OptionResp; | ||||
| import top.continew.admin.system.service.OptionService; | ||||
| import top.continew.starter.web.model.R; | ||||
| 
 | ||||
| /** | ||||
| @@ -14,17 +14,17 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||||
| 
 | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| 
 | ||||
| import top.charles7c.continew.admin.system.model.query.RoleQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.RoleReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.RoleDetailResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.RoleResp; | ||||
| import top.charles7c.continew.admin.system.service.RoleService; | ||||
| import top.continew.admin.system.model.query.RoleQuery; | ||||
| import top.continew.admin.system.model.req.RoleReq; | ||||
| import top.continew.admin.system.model.resp.RoleDetailResp; | ||||
| import top.continew.admin.system.model.resp.RoleResp; | ||||
| import top.continew.admin.system.service.RoleService; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| import top.continew.starter.extension.crud.controller.BaseController; | ||||
| import top.continew.starter.extension.crud.enums.Api; | ||||
| @@ -38,4 +38,5 @@ import top.continew.starter.extension.crud.enums.Api; | ||||
| @Tag(name = "角色管理 API") | ||||
| @RestController | ||||
| @CrudRequestMapping(value = "/system/role", api = {Api.PAGE, Api.GET, Api.ADD, Api.UPDATE, Api.DELETE}) | ||||
| public class RoleController extends BaseController<RoleService, RoleResp, RoleDetailResp, RoleQuery, RoleReq> {} | ||||
| public class RoleController extends BaseController<RoleService, RoleResp, RoleDetailResp, RoleQuery, RoleReq> { | ||||
| } | ||||
| @@ -14,14 +14,14 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import io.swagger.v3.oas.annotations.tags.Tag; | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| import top.charles7c.continew.admin.system.model.query.StorageQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.StorageReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.StorageResp; | ||||
| import top.charles7c.continew.admin.system.service.StorageService; | ||||
| import top.continew.admin.system.model.query.StorageQuery; | ||||
| import top.continew.admin.system.model.req.StorageReq; | ||||
| import top.continew.admin.system.model.resp.StorageResp; | ||||
| import top.continew.admin.system.service.StorageService; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| import top.continew.starter.extension.crud.controller.BaseController; | ||||
| import top.continew.starter.extension.crud.enums.Api; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import cn.hutool.core.util.ReUtil; | ||||
| import com.xkcoding.justauth.AuthRequestFactory; | ||||
| @@ -31,20 +31,20 @@ import me.zhyd.oauth.request.AuthRequest; | ||||
| import org.springframework.validation.annotation.Validated; | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| import org.springframework.web.multipart.MultipartFile; | ||||
| import top.charles7c.continew.admin.common.constant.CacheConstants; | ||||
| import top.charles7c.continew.admin.common.constant.RegexConstants; | ||||
| import top.charles7c.continew.admin.common.enums.SocialSourceEnum; | ||||
| import top.charles7c.continew.admin.common.util.SecureUtils; | ||||
| import top.charles7c.continew.admin.common.util.helper.LoginHelper; | ||||
| import top.charles7c.continew.admin.system.model.entity.UserSocialDO; | ||||
| import top.charles7c.continew.admin.system.model.req.UserBasicInfoUpdateReq; | ||||
| import top.charles7c.continew.admin.system.model.req.UserEmailUpdateRequest; | ||||
| import top.charles7c.continew.admin.system.model.req.UserPasswordUpdateReq; | ||||
| import top.charles7c.continew.admin.system.model.req.UserPhoneUpdateReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.AvatarResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.UserSocialBindResp; | ||||
| import top.charles7c.continew.admin.system.service.UserService; | ||||
| import top.charles7c.continew.admin.system.service.UserSocialService; | ||||
| import top.continew.admin.common.constant.CacheConstants; | ||||
| import top.continew.admin.common.constant.RegexConstants; | ||||
| import top.continew.admin.common.enums.SocialSourceEnum; | ||||
| import top.continew.admin.common.util.SecureUtils; | ||||
| import top.continew.admin.common.util.helper.LoginHelper; | ||||
| import top.continew.admin.system.model.entity.UserSocialDO; | ||||
| import top.continew.admin.system.model.req.UserBasicInfoUpdateReq; | ||||
| import top.continew.admin.system.model.req.UserEmailUpdateRequest; | ||||
| import top.continew.admin.system.model.req.UserPasswordUpdateReq; | ||||
| import top.continew.admin.system.model.req.UserPhoneUpdateReq; | ||||
| import top.continew.admin.system.model.resp.AvatarResp; | ||||
| import top.continew.admin.system.model.resp.UserSocialBindResp; | ||||
| import top.continew.admin.system.service.UserService; | ||||
| import top.continew.admin.system.service.UserSocialService; | ||||
| import top.continew.starter.cache.redisson.util.RedisUtils; | ||||
| import top.continew.starter.core.util.ExceptionUtils; | ||||
| import top.continew.starter.core.util.validate.ValidationUtils; | ||||
| @@ -65,11 +65,11 @@ import java.util.List; | ||||
| @RequestMapping("/system/user") | ||||
| public class UserCenterController { | ||||
| 
 | ||||
|     private static final String DECRYPT_FAILED = "当前密码解密失败"; | ||||
|     private static final String CAPTCHA_EXPIRED = "验证码已失效"; | ||||
|     private final UserService userService; | ||||
|     private final UserSocialService userSocialService; | ||||
|     private final AuthRequestFactory authRequestFactory; | ||||
|     private static final String DECRYPT_FAILED = "当前密码解密失败"; | ||||
|     private static final String CAPTCHA_EXPIRED = "验证码已失效"; | ||||
| 
 | ||||
|     @Operation(summary = "上传头像", description = "用户上传个人头像") | ||||
|     @PostMapping("/avatar") | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.system; | ||||
| package top.continew.admin.webapi.system; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaCheckPermission; | ||||
| import cn.hutool.core.util.ReUtil; | ||||
| @@ -27,15 +27,15 @@ import org.springframework.web.bind.annotation.PatchMapping; | ||||
| import org.springframework.web.bind.annotation.PathVariable; | ||||
| import org.springframework.web.bind.annotation.RequestBody; | ||||
| import org.springframework.web.bind.annotation.RestController; | ||||
| import top.charles7c.continew.admin.common.constant.RegexConstants; | ||||
| import top.charles7c.continew.admin.common.util.SecureUtils; | ||||
| import top.charles7c.continew.admin.system.model.query.UserQuery; | ||||
| import top.charles7c.continew.admin.system.model.req.UserPasswordResetReq; | ||||
| import top.charles7c.continew.admin.system.model.req.UserReq; | ||||
| import top.charles7c.continew.admin.system.model.req.UserRoleUpdateReq; | ||||
| import top.charles7c.continew.admin.system.model.resp.UserDetailResp; | ||||
| import top.charles7c.continew.admin.system.model.resp.UserResp; | ||||
| import top.charles7c.continew.admin.system.service.UserService; | ||||
| import top.continew.admin.common.constant.RegexConstants; | ||||
| import top.continew.admin.common.util.SecureUtils; | ||||
| import top.continew.admin.system.model.query.UserQuery; | ||||
| import top.continew.admin.system.model.req.UserPasswordResetReq; | ||||
| import top.continew.admin.system.model.req.UserReq; | ||||
| import top.continew.admin.system.model.req.UserRoleUpdateReq; | ||||
| import top.continew.admin.system.model.resp.UserDetailResp; | ||||
| import top.continew.admin.system.model.resp.UserResp; | ||||
| import top.continew.admin.system.service.UserService; | ||||
| import top.continew.starter.core.util.ExceptionUtils; | ||||
| import top.continew.starter.core.util.validate.ValidationUtils; | ||||
| import top.continew.starter.extension.crud.annotation.CrudRequestMapping; | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c.continew.admin.webapi.tool; | ||||
| package top.continew.admin.webapi.tool; | ||||
| 
 | ||||
| import cn.dev33.satoken.annotation.SaCheckPermission; | ||||
| import io.swagger.v3.oas.annotations.Operation; | ||||
| @@ -26,13 +26,13 @@ import jakarta.servlet.http.HttpServletResponse; | ||||
| import lombok.RequiredArgsConstructor; | ||||
| import org.springframework.validation.annotation.Validated; | ||||
| import org.springframework.web.bind.annotation.*; | ||||
| import top.charles7c.continew.admin.generator.model.entity.FieldConfigDO; | ||||
| import top.charles7c.continew.admin.generator.model.entity.GenConfigDO; | ||||
| import top.charles7c.continew.admin.generator.model.query.TableQuery; | ||||
| import top.charles7c.continew.admin.generator.model.req.GenConfigReq; | ||||
| import top.charles7c.continew.admin.generator.model.resp.GeneratePreviewResp; | ||||
| import top.charles7c.continew.admin.generator.model.resp.TableResp; | ||||
| import top.charles7c.continew.admin.generator.service.GeneratorService; | ||||
| import top.continew.admin.generator.model.entity.FieldConfigDO; | ||||
| import top.continew.admin.generator.model.entity.GenConfigDO; | ||||
| import top.continew.admin.generator.model.query.TableQuery; | ||||
| import top.continew.admin.generator.model.req.GenConfigReq; | ||||
| import top.continew.admin.generator.model.resp.GeneratePreviewResp; | ||||
| import top.continew.admin.generator.model.resp.TableResp; | ||||
| import top.continew.admin.generator.service.GeneratorService; | ||||
| import top.continew.starter.core.autoconfigure.project.ProjectProperties; | ||||
| import top.continew.starter.extension.crud.model.query.PageQuery; | ||||
| import top.continew.starter.extension.crud.model.resp.PageResp; | ||||
| @@ -157,7 +157,7 @@ continew-starter.log: | ||||
| ## 项目日志配置(配置重叠部分,优先级高于 logback-spring.xml 中的配置) | ||||
| logging: | ||||
|   level: | ||||
|     top.charles7c: DEBUG | ||||
|     top.continew: DEBUG | ||||
|   file: | ||||
|     path: ./logs | ||||
|  | ||||
|   | ||||
| @@ -159,7 +159,7 @@ continew-starter.log: | ||||
| ## 项目日志配置(配置重叠部分,优先级高于 logback-spring.xml 中的配置) | ||||
| logging: | ||||
|   level: | ||||
|     top.charles7c: INFO | ||||
|     top.continew: INFO | ||||
|   file: | ||||
|     path: ../logs | ||||
|  | ||||
|   | ||||
| @@ -9,7 +9,7 @@ project: | ||||
|   # 描述 | ||||
|   description: 持续迭代优化的前后端分离中后台管理系统框架,开箱即用,持续提供舒适的开发体验。 | ||||
|   # 基本包 | ||||
|   base-package: top.charles7c.continew.admin | ||||
|   base-package: top.continew.admin | ||||
|   ## 作者信息配置 | ||||
|   contact: | ||||
|     name: Charles7c | ||||
|   | ||||
| @@ -14,7 +14,7 @@ | ||||
|  * limitations under the License. | ||||
|  */ | ||||
| 
 | ||||
| package top.charles7c; | ||||
| package top.continew.admin; | ||||
| 
 | ||||
| import org.junit.jupiter.api.Test; | ||||
| import org.springframework.boot.test.context.SpringBootTest; | ||||
		Reference in New Issue
	
	Block a user