diff --git a/like-admin/src/main/resources/application.yml b/like-admin/src/main/resources/application.yml deleted file mode 100644 index a5ff125c..00000000 --- a/like-admin/src/main/resources/application.yml +++ /dev/null @@ -1,58 +0,0 @@ -# 项目配置 -like: - upload-directory: D:\www\frame\ - -# 服务配置 -server: - port: 8082 - -# 框架配置 -spring: - profiles: - active: test - # 数据源配置 - datasource: - url: jdbc:mysql://localhost:3306/local_frame?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false - type: com.zaxxer.hikari.HikariDataSource # 数据源类型 - driver-class-name: com.mysql.jdbc.Driver # MySql的驱动 - username: root # 数据库账号 - password: root # 数据库密码 - hikari: - connection-timeout: 30000 # 等待连接分配连接的最大时长(毫秒),超出时长还没可用连接则发送SQLException,默认30秒 - minimum-idle: 5 # 最小连接数 - maximum-pool-size: 20 # 最大连接数 - auto-commit: true # 自动提交 - idle-timeout: 600000 # 连接超时的最大时长(毫秒),超时则被释放(retired),默认10分钟 - pool-name: DateSourceHikariCP # 连接池名称 - max-lifetime: 1800000 # 连接的生命时长(毫秒),超时而且没被使用则被释放,默认30分钟(1800000ms) - connection-init-sql: SELECT 1 # 连接时发起SQL测试脚本 - # 限制配置 - servlet: - multipart: - max-file-size: 100MB # 文件上传大小限制 - max-request-size: 100MB # 文件最大请求限制 - enabled: true - # Redis配置 - redis: - host: localhost # Redis服务地址 - port: 6379 # Redis端口 - password: # Redis密码 - database: 0 # 数据库索引 - timeout: 5000 # 连接超时 - lettuce: - pool: - max-wait: 30000 # 连接池最大阻塞等待时间(使用负数表示没有限制,默认-1) - max-active: 100 # 连接池最大连接数(使用负数表示没有限制,默认8) - max-idle: 20 # 连接池中的最大空闲连接(默认8) - min-idle: 0 # 连接池中的最小空闲连接(默认0) - -# Mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath*:/mapper/**Mapper.xml # 映射文件路径 - typeAliasesPackage: com.hxkj.**.mapper -# configuration: -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - global-config: - banner: false - db-config: - table-prefix: ls_ # 设置表前缀 \ No newline at end of file diff --git a/.gitignore b/like-framework/.gitignore similarity index 100% rename from .gitignore rename to like-framework/.gitignore diff --git a/like-admin/.gitignore b/like-framework/like-admin/.gitignore similarity index 100% rename from like-admin/.gitignore rename to like-framework/like-admin/.gitignore diff --git a/like-admin/pom.xml b/like-framework/like-admin/pom.xml similarity index 100% rename from like-admin/pom.xml rename to like-framework/like-admin/pom.xml diff --git a/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminApplication.java diff --git a/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminInterceptor.java diff --git a/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/LikeAdminThreadLocal.java diff --git a/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/config/AdminConfig.java diff --git a/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/config/MybatisPlusConfig.java diff --git a/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/config/WebMvcConfig.java diff --git a/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/config/aop/Log.java diff --git a/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/config/aop/LogAspect.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/AlbumController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/ArticleController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/IndexController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/UploadController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/CacheController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/monitor/ServerController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/setting/BasicsController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemAdminController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLogController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemLoginController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemMenuController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/controller/system/SystemRoleController.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/IAlbumService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/IArticleService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/IBasicsService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/IIndexService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemAdminService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemLogServer.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemLoginService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemMenuService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleMenuService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/ISystemRoleService.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/AlbumServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/ArticleServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/BasicsServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/IndexServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemAdminServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLogServerImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemLoginServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemMenuServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleMenuServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/service/impl/SystemRoleServiceImpl.java diff --git a/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/validate/AlbumParam.java diff --git a/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/validate/PageParam.java diff --git a/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/validate/article/ArticleParam.java diff --git a/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/validate/article/CategoryParam.java diff --git a/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemAdminParam.java diff --git a/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemLoginParam.java diff --git a/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemMenuParam.java diff --git a/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/validate/system/SystemRoleParam.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumCateVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/album/AlbumVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleDetailVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/article/ArticleListVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/article/CategoryVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/LogLoginVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/LogOperateVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemAdminVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemMenuVo.java diff --git a/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java b/like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java similarity index 100% rename from like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java rename to like-framework/like-admin/src/main/java/com/hxkj/admin/vo/system/SystemRoleVo.java diff --git a/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/like-framework/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to like-framework/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/like-admin/src/main/resources/banner.txt b/like-framework/like-admin/src/main/resources/banner.txt similarity index 100% rename from like-admin/src/main/resources/banner.txt rename to like-framework/like-admin/src/main/resources/banner.txt diff --git a/like-admin/src/main/resources/log4j2-spring.xml b/like-framework/like-admin/src/main/resources/log4j2-spring.xml similarity index 100% rename from like-admin/src/main/resources/log4j2-spring.xml rename to like-framework/like-admin/src/main/resources/log4j2-spring.xml diff --git a/like-common/.gitignore b/like-framework/like-common/.gitignore similarity index 100% rename from like-common/.gitignore rename to like-framework/like-common/.gitignore diff --git a/like-common/pom.xml b/like-framework/like-common/pom.xml similarity index 100% rename from like-common/pom.xml rename to like-framework/like-common/pom.xml diff --git a/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java b/like-framework/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java rename to like-framework/like-common/src/main/java/com/hxkj/common/config/GlobalConfig.java diff --git a/like-common/src/main/java/com/hxkj/common/config/RedisConfig.java b/like-framework/like-common/src/main/java/com/hxkj/common/config/RedisConfig.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/config/RedisConfig.java rename to like-framework/like-common/src/main/java/com/hxkj/common/config/RedisConfig.java diff --git a/like-common/src/main/java/com/hxkj/common/config/ThreadPoolConfig.java b/like-framework/like-common/src/main/java/com/hxkj/common/config/ThreadPoolConfig.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/config/ThreadPoolConfig.java rename to like-framework/like-common/src/main/java/com/hxkj/common/config/ThreadPoolConfig.java diff --git a/like-common/src/main/java/com/hxkj/common/core/AjaxResult.java b/like-framework/like-common/src/main/java/com/hxkj/common/core/AjaxResult.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/core/AjaxResult.java rename to like-framework/like-common/src/main/java/com/hxkj/common/core/AjaxResult.java diff --git a/like-common/src/main/java/com/hxkj/common/core/PageResult.java b/like-framework/like-common/src/main/java/com/hxkj/common/core/PageResult.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/core/PageResult.java rename to like-framework/like-common/src/main/java/com/hxkj/common/core/PageResult.java diff --git a/like-common/src/main/java/com/hxkj/common/core/ServerResult.java b/like-framework/like-common/src/main/java/com/hxkj/common/core/ServerResult.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/core/ServerResult.java rename to like-framework/like-common/src/main/java/com/hxkj/common/core/ServerResult.java diff --git a/like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/core/basics/IBaseMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/Album.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/Album.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/Album.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/Album.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/AlbumCate.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/AlbumCate.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/AlbumCate.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/AlbumCate.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/Article.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/Article.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/Article.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/Article.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/ArticleCategory.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/ArticleCategory.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/ArticleCategory.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/ArticleCategory.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/server/Cpu.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Cpu.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/server/Cpu.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Cpu.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/server/Disk.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Disk.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/server/Disk.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Disk.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/server/Jvm.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Jvm.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/server/Jvm.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Jvm.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/server/Mem.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Mem.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/server/Mem.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Mem.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/server/Sys.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Sys.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/server/Sys.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/server/Sys.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemAdmin.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SystemConfig.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemConfig.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/system/SystemConfig.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemConfig.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SystemLogLogin.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemLogLogin.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/system/SystemLogLogin.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemLogLogin.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SystemLogOperate.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemLogOperate.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/system/SystemLogOperate.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemLogOperate.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemMenu.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SystemRole.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemRole.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/system/SystemRole.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemRole.java diff --git a/like-common/src/main/java/com/hxkj/common/entity/system/SystemRoleMenu.java b/like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemRoleMenu.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/entity/system/SystemRoleMenu.java rename to like-framework/like-common/src/main/java/com/hxkj/common/entity/system/SystemRoleMenu.java diff --git a/like-common/src/main/java/com/hxkj/common/enums/AlbumEnum.java b/like-framework/like-common/src/main/java/com/hxkj/common/enums/AlbumEnum.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/enums/AlbumEnum.java rename to like-framework/like-common/src/main/java/com/hxkj/common/enums/AlbumEnum.java diff --git a/like-common/src/main/java/com/hxkj/common/enums/HttpEnum.java b/like-framework/like-common/src/main/java/com/hxkj/common/enums/HttpEnum.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/enums/HttpEnum.java rename to like-framework/like-common/src/main/java/com/hxkj/common/enums/HttpEnum.java diff --git a/like-common/src/main/java/com/hxkj/common/exception/BaseException.java b/like-framework/like-common/src/main/java/com/hxkj/common/exception/BaseException.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/exception/BaseException.java rename to like-framework/like-common/src/main/java/com/hxkj/common/exception/BaseException.java diff --git a/like-common/src/main/java/com/hxkj/common/exception/GlobalException.java b/like-framework/like-common/src/main/java/com/hxkj/common/exception/GlobalException.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/exception/GlobalException.java rename to like-framework/like-common/src/main/java/com/hxkj/common/exception/GlobalException.java diff --git a/like-common/src/main/java/com/hxkj/common/exception/LoginException.java b/like-framework/like-common/src/main/java/com/hxkj/common/exception/LoginException.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/exception/LoginException.java rename to like-framework/like-common/src/main/java/com/hxkj/common/exception/LoginException.java diff --git a/like-common/src/main/java/com/hxkj/common/exception/OperateException.java b/like-framework/like-common/src/main/java/com/hxkj/common/exception/OperateException.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/exception/OperateException.java rename to like-framework/like-common/src/main/java/com/hxkj/common/exception/OperateException.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/AlbumCateMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/AlbumCateMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/AlbumCateMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/AlbumCateMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/AlbumMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/AlbumMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/AlbumMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/AlbumMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/ArticleCategoryMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/ArticleCategoryMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/ArticleCategoryMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/ArticleCategoryMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/ArticleMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/ArticleMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/ArticleMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/ArticleMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAdminMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAdminMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/system/SystemAdminMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemAdminMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/system/SystemConfigMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemConfigMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/system/SystemConfigMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemConfigMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/system/SystemLogLoginMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemLogLoginMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/system/SystemLogLoginMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemLogLoginMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/system/SystemLogOperateMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemLogOperateMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/system/SystemLogOperateMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemLogOperateMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/system/SystemMenuMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemMenuMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/system/SystemMenuMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemMenuMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMenuMapper.java b/like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMenuMapper.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMenuMapper.java rename to like-framework/like-common/src/main/java/com/hxkj/common/mapper/system/SystemRoleMenuMapper.java diff --git a/like-common/src/main/java/com/hxkj/common/plugin/sms/SmsDriver.java b/like-framework/like-common/src/main/java/com/hxkj/common/plugin/sms/SmsDriver.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/plugin/sms/SmsDriver.java rename to like-framework/like-common/src/main/java/com/hxkj/common/plugin/sms/SmsDriver.java diff --git a/like-common/src/main/java/com/hxkj/common/plugin/sms/engine/AliSms.java b/like-framework/like-common/src/main/java/com/hxkj/common/plugin/sms/engine/AliSms.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/plugin/sms/engine/AliSms.java rename to like-framework/like-common/src/main/java/com/hxkj/common/plugin/sms/engine/AliSms.java diff --git a/like-common/src/main/java/com/hxkj/common/plugin/sms/engine/TencentSms.java b/like-framework/like-common/src/main/java/com/hxkj/common/plugin/sms/engine/TencentSms.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/plugin/sms/engine/TencentSms.java rename to like-framework/like-common/src/main/java/com/hxkj/common/plugin/sms/engine/TencentSms.java diff --git a/like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java b/like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java rename to like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/StorageDriver.java diff --git a/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/AliyunStorage.java b/like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/AliyunStorage.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/plugin/storage/engine/AliyunStorage.java rename to like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/AliyunStorage.java diff --git a/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/LocalStorage.java b/like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/LocalStorage.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/plugin/storage/engine/LocalStorage.java rename to like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/LocalStorage.java diff --git a/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QcloudStorage.java b/like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QcloudStorage.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QcloudStorage.java rename to like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QcloudStorage.java diff --git a/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java b/like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java rename to like-framework/like-common/src/main/java/com/hxkj/common/plugin/storage/engine/QiniuStorage.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/ArithUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/ArithUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/ArithUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/ArithUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/ArrayUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/ArrayUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/ArrayUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/ArrayUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/ConfigUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/HttpUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/HttpUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/HttpUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/HttpUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/IpUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/IpUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/IpUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/IpUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/RedisUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/RedisUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/RedisUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/RedisUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/SpringUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/SpringUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/SpringUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/SpringUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/StringUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/StringUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/TimeUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/TimeUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/TimeUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/TimeUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java similarity index 99% rename from like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java index abe9ff80..67acf7de 100644 --- a/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java +++ b/like-framework/like-common/src/main/java/com/hxkj/common/utils/ToolsUtil.java @@ -43,7 +43,7 @@ public class ToolsUtil { byte [] array = md5.digest(data.getBytes(StandardCharsets.UTF_8)); StringBuilder sb = new StringBuilder(); for (byte item : array) { - sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3)); + sb.append(Integer.toHexString((item & 0xFF) | 0x100), 1, 3); } return sb.toString(); } catch (Exception e) { diff --git a/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/UrlUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/utils/YmlUtil.java b/like-framework/like-common/src/main/java/com/hxkj/common/utils/YmlUtil.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/utils/YmlUtil.java rename to like-framework/like-common/src/main/java/com/hxkj/common/utils/YmlUtil.java diff --git a/like-common/src/main/java/com/hxkj/common/validator/IDMustValidator.java b/like-framework/like-common/src/main/java/com/hxkj/common/validator/IDMustValidator.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/validator/IDMustValidator.java rename to like-framework/like-common/src/main/java/com/hxkj/common/validator/IDMustValidator.java diff --git a/like-common/src/main/java/com/hxkj/common/validator/IntegerContainsValidator.java b/like-framework/like-common/src/main/java/com/hxkj/common/validator/IntegerContainsValidator.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/validator/IntegerContainsValidator.java rename to like-framework/like-common/src/main/java/com/hxkj/common/validator/IntegerContainsValidator.java diff --git a/like-common/src/main/java/com/hxkj/common/validator/StringContainsValidator.java b/like-framework/like-common/src/main/java/com/hxkj/common/validator/StringContainsValidator.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/validator/StringContainsValidator.java rename to like-framework/like-common/src/main/java/com/hxkj/common/validator/StringContainsValidator.java diff --git a/like-common/src/main/java/com/hxkj/common/validator/annotation/IDMust.java b/like-framework/like-common/src/main/java/com/hxkj/common/validator/annotation/IDMust.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/validator/annotation/IDMust.java rename to like-framework/like-common/src/main/java/com/hxkj/common/validator/annotation/IDMust.java diff --git a/like-common/src/main/java/com/hxkj/common/validator/annotation/IntegerContains.java b/like-framework/like-common/src/main/java/com/hxkj/common/validator/annotation/IntegerContains.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/validator/annotation/IntegerContains.java rename to like-framework/like-common/src/main/java/com/hxkj/common/validator/annotation/IntegerContains.java diff --git a/like-common/src/main/java/com/hxkj/common/validator/annotation/StringContains.java b/like-framework/like-common/src/main/java/com/hxkj/common/validator/annotation/StringContains.java similarity index 100% rename from like-common/src/main/java/com/hxkj/common/validator/annotation/StringContains.java rename to like-framework/like-common/src/main/java/com/hxkj/common/validator/annotation/StringContains.java diff --git a/like-front/.gitignore b/like-framework/like-front/.gitignore similarity index 100% rename from like-front/.gitignore rename to like-framework/like-front/.gitignore diff --git a/like-front/pom.xml b/like-framework/like-front/pom.xml similarity index 100% rename from like-front/pom.xml rename to like-framework/like-front/pom.xml diff --git a/like-front/src/main/java/com/hxkj/front/LikeFrontApplication.java b/like-framework/like-front/src/main/java/com/hxkj/front/LikeFrontApplication.java similarity index 100% rename from like-front/src/main/java/com/hxkj/front/LikeFrontApplication.java rename to like-framework/like-front/src/main/java/com/hxkj/front/LikeFrontApplication.java diff --git a/like-front/src/main/java/com/hxkj/front/LikeFrontInterceptor.java b/like-framework/like-front/src/main/java/com/hxkj/front/LikeFrontInterceptor.java similarity index 100% rename from like-front/src/main/java/com/hxkj/front/LikeFrontInterceptor.java rename to like-framework/like-front/src/main/java/com/hxkj/front/LikeFrontInterceptor.java diff --git a/like-front/src/main/java/com/hxkj/front/LikeFrontThreadLocal.java b/like-framework/like-front/src/main/java/com/hxkj/front/LikeFrontThreadLocal.java similarity index 100% rename from like-front/src/main/java/com/hxkj/front/LikeFrontThreadLocal.java rename to like-framework/like-front/src/main/java/com/hxkj/front/LikeFrontThreadLocal.java diff --git a/like-front/src/main/java/com/hxkj/front/config/FrontConfig.java b/like-framework/like-front/src/main/java/com/hxkj/front/config/FrontConfig.java similarity index 100% rename from like-front/src/main/java/com/hxkj/front/config/FrontConfig.java rename to like-framework/like-front/src/main/java/com/hxkj/front/config/FrontConfig.java diff --git a/like-front/src/main/java/com/hxkj/front/config/MybatisPlusConfig.java b/like-framework/like-front/src/main/java/com/hxkj/front/config/MybatisPlusConfig.java similarity index 100% rename from like-front/src/main/java/com/hxkj/front/config/MybatisPlusConfig.java rename to like-framework/like-front/src/main/java/com/hxkj/front/config/MybatisPlusConfig.java diff --git a/like-front/src/main/java/com/hxkj/front/config/WebMvcConfig.java b/like-framework/like-front/src/main/java/com/hxkj/front/config/WebMvcConfig.java similarity index 100% rename from like-front/src/main/java/com/hxkj/front/config/WebMvcConfig.java rename to like-framework/like-front/src/main/java/com/hxkj/front/config/WebMvcConfig.java diff --git a/like-front/src/main/java/com/hxkj/front/controller/IndexController.java b/like-framework/like-front/src/main/java/com/hxkj/front/controller/IndexController.java similarity index 100% rename from like-front/src/main/java/com/hxkj/front/controller/IndexController.java rename to like-framework/like-front/src/main/java/com/hxkj/front/controller/IndexController.java diff --git a/like-front/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/like-framework/like-front/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from like-front/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to like-framework/like-front/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/like-front/src/main/resources/banner.txt b/like-framework/like-front/src/main/resources/banner.txt similarity index 100% rename from like-front/src/main/resources/banner.txt rename to like-framework/like-front/src/main/resources/banner.txt diff --git a/like-front/src/main/resources/log4j2-spring.xml b/like-framework/like-front/src/main/resources/log4j2-spring.xml similarity index 100% rename from like-front/src/main/resources/log4j2-spring.xml rename to like-framework/like-front/src/main/resources/log4j2-spring.xml diff --git a/pom.xml b/like-framework/pom.xml similarity index 100% rename from pom.xml rename to like-framework/pom.xml