Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 使用 spring-javaformat 改进代码的结构/格式 #4625

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Commits on Mar 1, 2023

  1. 🎨 使用 spring-javaformat 改进代码的结构/格式

    .springjavaformatconfig 可使高版本的 spring-javaformat 在 JDK 8 环境下使用
    jeecgboot#4623
    xuxiaowei-com-cn committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    8b8581d View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Merge branch 'master' of https://github.com/jeecgboot/jeecg-boot into…

    … master-spring-javaformat
    
    # Conflicts:
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/TenantConstant.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/desensitization/util/SensitiveInfoUtil.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsEnum.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgBaseConfig.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
    #	jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java
    #	jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
    #	jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorRedisController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/service/impl/OssFileServiceImpl.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDictMapper.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepartModel.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/rule/OrgCodeRule.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserDepartService.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysTenantServiceImpl.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserDepartServiceImpl.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/ThirdAppDingtalkServiceImpl.java
    #	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/UserAvatar.java
    xuxiaowei-com-cn committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    3b96ed9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    85ff8c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Configuration menu
    Copy the full SHA
    664ce91 View commit details
    Browse the repository at this point in the history