diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminApplication.java b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminApplication.java index 6a628048b71603dd46443eeb4b2cbf103fccde20..0fd0c4c8461fff4bc202885554a97020b41ded26 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminApplication.java +++ b/server/like-admin/src/main/java/com/mdd/admin/LikeAdminApplication.java @@ -11,7 +11,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; /** * 启动器 */ -@Configuration @ComponentScan(basePackages = {"com.mdd"}) @MapperScan(basePackages = {"com.mdd.*.mapper"}) @EnableTransactionManagement diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/AdminConfig.java b/server/like-admin/src/main/java/com/mdd/admin/config/AdminConfig.java index 39856136a5faffa7138597308e6f4397522a4b9a..db4107098f6905610f7a5f00a22d3ee670a24427 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/AdminConfig.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/AdminConfig.java @@ -16,7 +16,7 @@ public class AdminConfig { // 免登录验证 public static String[] notLoginUri = new String[]{ - "system:login", // 登录接口 + "system:login",// 登录接口 "common:index:config" // 配置接口 }; diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java b/server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java index 3804660e21b181e09f3b97d75c210baff09da30b..61424f27f2b11d7860baefe16836017c930f5a1c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/WebMvcConfig.java @@ -1,8 +1,10 @@ package com.mdd.admin.config; -import com.mdd.admin.LikeAdminInterceptor; +import com.mdd.admin.interceptor.LikeAdminInterceptor; import com.mdd.common.config.GlobalConfig; -import com.mdd.common.utils.YmlUtil; +import com.mdd.common.properties.BaseProperties; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -20,6 +22,9 @@ public class WebMvcConfig implements WebMvcConfigurer { @Resource LikeAdminInterceptor likeAdminInterceptor; + @Autowired + private BaseProperties baseProperties; + /** * 配置允许跨域 */ @@ -45,8 +50,8 @@ public class WebMvcConfig implements WebMvcConfigurer { */ @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - String directory = YmlUtil.get("like.upload-directory"); - if (directory == null || directory.equals("")) { + String directory = baseProperties.getUpdate().getPath(); + if (StringUtils.isNotBlank(directory)) { directory = GlobalConfig.uploadDirectory; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java b/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java index ffbf11ba07d48f97d6f919d8a55db495857ecb1f..4a71ccdfbf321317fd232d3a7fd382b76d2a19c9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java @@ -1,7 +1,7 @@ package com.mdd.admin.config.aop; import com.alibaba.fastjson.JSON; -import com.mdd.admin.LikeAdminThreadLocal; +import com.mdd.admin.thread.LikeAdminThreadLocal; import com.mdd.common.entity.system.SystemLogOperate; import com.mdd.common.mapper.system.SystemLogOperateMapper; import com.mdd.common.utils.IpUtil; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java index a4444391ef0897daf4555d4710fcd62ca0d51a96..016febd4e74495f33cfd511675e3210346d4c755 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java @@ -1,6 +1,6 @@ package com.mdd.admin.controller.common; -import com.mdd.admin.LikeAdminThreadLocal; +import com.mdd.admin.thread.LikeAdminThreadLocal; import com.mdd.admin.config.aop.Log; import com.mdd.admin.service.common.IAlbumService; import com.mdd.common.core.AjaxResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthAdminController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthAdminController.java index 33dcef34cb8ea6c81cefc5d59d3c4428af37b6b6..c0c090cd5dcf27191c2a846cc75a1b2de9a5eda2 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthAdminController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthAdminController.java @@ -1,6 +1,6 @@ package com.mdd.admin.controller.system; -import com.mdd.admin.LikeAdminThreadLocal; +import com.mdd.admin.thread.LikeAdminThreadLocal; import com.mdd.admin.config.aop.Log; import com.mdd.admin.service.system.ISystemAuthAdminService; import com.mdd.admin.validate.common.PageParam; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthMenuController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthMenuController.java index 9fa4a120a8e3a715c6bff6755438bf386a1b6691..ed6bc418d46567754af292ec7df06a3bf6bbceee 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthMenuController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/system/AuthMenuController.java @@ -1,7 +1,7 @@ package com.mdd.admin.controller.system; import com.alibaba.fastjson.JSONArray; -import com.mdd.admin.LikeAdminThreadLocal; +import com.mdd.admin.thread.LikeAdminThreadLocal; import com.mdd.admin.config.aop.Log; import com.mdd.admin.service.system.ISystemAuthMenuService; import com.mdd.admin.validate.system.SystemAuthMenuParam; diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java b/server/like-admin/src/main/java/com/mdd/admin/interceptor/LikeAdminInterceptor.java similarity index 98% rename from server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java rename to server/like-admin/src/main/java/com/mdd/admin/interceptor/LikeAdminInterceptor.java index a0fa7134aaec02bbda44f4f9e2bbab369efd4c23..2afe8dbb4c1e0e20e1df6c53f93343d2ab37e30d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminInterceptor.java +++ b/server/like-admin/src/main/java/com/mdd/admin/interceptor/LikeAdminInterceptor.java @@ -1,7 +1,8 @@ -package com.mdd.admin; +package com.mdd.admin.interceptor; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.mdd.admin.thread.LikeAdminThreadLocal; import com.mdd.admin.config.AdminConfig; import com.mdd.admin.service.system.ISystemAuthAdminService; import com.mdd.admin.service.system.ISystemAuthPermService; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java index 6f0bef7ed05244da66e5bd3ecd469de93b53021b..554f505ada63eb76fc587a5b819db4fb2f0b6bf1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthAdminServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.query.MPJQueryWrapper; -import com.mdd.admin.LikeAdminThreadLocal; +import com.mdd.admin.thread.LikeAdminThreadLocal; import com.mdd.admin.config.AdminConfig; import com.mdd.admin.service.system.ISystemAuthAdminService; import com.mdd.admin.service.system.ISystemAuthPermService; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java index 3d5c6dd48ae1adc889711120c1756a5afeee75b5..fb57038d2861050fd416518c0cb257d5deff31f0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/system/impl/SystemAuthMenuServiceImpl.java @@ -3,7 +3,7 @@ package com.mdd.admin.service.system.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.mdd.admin.LikeAdminThreadLocal; +import com.mdd.admin.thread.LikeAdminThreadLocal; import com.mdd.admin.config.AdminConfig; import com.mdd.admin.service.system.ISystemAuthMenuService; import com.mdd.admin.service.system.ISystemAuthPermService; diff --git a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminThreadLocal.java b/server/like-admin/src/main/java/com/mdd/admin/thread/LikeAdminThreadLocal.java similarity index 97% rename from server/like-admin/src/main/java/com/mdd/admin/LikeAdminThreadLocal.java rename to server/like-admin/src/main/java/com/mdd/admin/thread/LikeAdminThreadLocal.java index a483966ed0965b6d252fbb1ba755225ae5e2d621..4d50a0a6ac5787a090a9a1c6509e18ca17babf2b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/LikeAdminThreadLocal.java +++ b/server/like-admin/src/main/java/com/mdd/admin/thread/LikeAdminThreadLocal.java @@ -1,4 +1,4 @@ -package com.mdd.admin; +package com.mdd.admin.thread; import java.util.LinkedHashMap; diff --git a/server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 379bbd725493cb3af3c3209d2fb38fa3155f1906..8dc0e1db7ca682732fb332746f1da0887338603c 100644 --- a/server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/server/like-admin/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -8,7 +8,12 @@ { "name": "like.production", "type": "java.lang.String", - "description": "Description for like.production." + "description": "Description for like.production11111." + }, + { + "name": "like.update.path", + "type": "java.lang.String", + "description": "系统文件上传文件路径." } ] } \ No newline at end of file diff --git a/server/like-admin/src/main/resources/application-example-pro.yml b/server/like-admin/src/main/resources/application-example-pro.yml index 90a35f74db3afe9f13f992c948e8abcd9bef182f..beda1d9f7f4c32ea36d7022dafd1a030e2430271 100644 --- a/server/like-admin/src/main/resources/application-example-pro.yml +++ b/server/like-admin/src/main/resources/application-example-pro.yml @@ -1,16 +1,17 @@ # 项目配置 like: - upload-directory: /www/uploads/ # 上传目录 + update: + file: /www/uploads/ # 上传目录 # 框架配置 spring: # 数据源配置 datasource: - url: jdbc:mysql://localhost:3306/【库名称】?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false + url: jdbc:mysql://localhost:3306/local_admin_java?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 # 数据库密码 + password: root5520127 # 数据库密码 # Redis配置 redis: host: localhost # Redis服务地址 diff --git a/server/like-admin/src/main/resources/redission/redisson-dev.yml b/server/like-admin/src/main/resources/redission/redisson-dev.yml new file mode 100644 index 0000000000000000000000000000000000000000..07d02953a05be6f92313085cdce749ad9bbe43f8 --- /dev/null +++ b/server/like-admin/src/main/resources/redission/redisson-dev.yml @@ -0,0 +1,14 @@ +singleServerConfig: + address: "redis://127.0.0.1:6379" + # password: zhs@8003 + #连接超时,单位:毫秒 + connectTimeout: 10000 + #命令等待超时,单位:毫秒 + timeout: 3000 +codec: ! {} + +#################### 具体配置请见org.redisson.config源码进行配置可以单体、主从、集群、哨兵模式 以上为单体类型 +#### 使用方式 引用like-redission依赖 配置redission地址 +#like: +# redission: +# path: classpth:redission/redission-dev.yml \ No newline at end of file diff --git a/server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java b/server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java index 607cc8548b1f12efb8354a95e8c96f9a3410f5b4..314dc470e060c00bea8f22c4a6bb8204efa32006 100644 --- a/server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/core/basics/IBaseMapper.java @@ -17,7 +17,7 @@ import java.util.Map; * 基类Mapper * @param */ -@Mapper + public interface IBaseMapper extends MPJBaseMapper { /** diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/album/AlbumCateMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/album/AlbumCateMapper.java index 57553dc5b83131db005753cebbeba715502f68ab..5277f675f25c43329c5b98d391e83297ab045d96 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/album/AlbumCateMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/album/AlbumCateMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 相册分类 */ -@Mapper + public interface AlbumCateMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/album/AlbumMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/album/AlbumMapper.java index e22c262c89645e255a489807aa692b64fb556357..25a4e64a604c166e49bb3c19a3fa1ab2400c9ca2 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/album/AlbumMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/album/AlbumMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 相册 */ -@Mapper + public interface AlbumMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleCategoryMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleCategoryMapper.java index 78cf5768455a890870a87e1adf72b9332ab0abad..e623209971af0d7acb811d111ec96e6a9fe663e0 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleCategoryMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleCategoryMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 文章分类 */ -@Mapper + public interface ArticleCategoryMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleCollectMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleCollectMapper.java index e5036f53c81b0c973aab715265cf2f0a42b3a589..28c1d07c50f01f0de5b03314e23d89865529eec5 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleCollectMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleCollectMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 文章收藏Mapper */ -@Mapper + public interface ArticleCollectMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleMapper.java index a84c37318f47c9e62524306e6447d683c0834f26..effab9832594d456bd8c886eeceb62accd3b147a 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/article/ArticleMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 文章 */ -@Mapper + public interface ArticleMapper extends IBaseMapper
{ } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java index 9f10593201a8d28939a7742acf839636959248cb..3c4bf20c1364d7aceb7fa37825df215ae8f2cc1f 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecoratePageMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 页面装修Mapper */ -@Mapper + public interface DecoratePageMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java index 454701f93c021f68217c3f809cf568caacc3719c..670a9d08e64c60a3d1df8489afe32b3c836e6112 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/decorate/DecorateTabbarMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 底部导航Mapper */ -@Mapper + public interface DecorateTabbarMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/notice/NoticeSettingMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/notice/NoticeSettingMapper.java index dde8692cdcb6f0b27d68cf9bb07161483aadb12f..3d3f25ffaac617d80e5f6dc58fb0c7ea0edc9193 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/notice/NoticeSettingMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/notice/NoticeSettingMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 通知设置Mapper */ -@Mapper + public interface NoticeSettingMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/setting/DictDataMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/setting/DictDataMapper.java index 3113254b522fe92eb168ffb4747a295cfea0852e..938f2a4fbdde810e7c95a71b628a6f70b886ce0d 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/setting/DictDataMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/setting/DictDataMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 字典数据Mapper */ -@Mapper + public interface DictDataMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/setting/DictTypeMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/setting/DictTypeMapper.java index c128221c82a462d15674c4f50d8fcaf41ed4b629..01e934abc749767bee2667631400a08897dd77bc 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/setting/DictTypeMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/setting/DictTypeMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 字典类型Mapper */ -@Mapper + public interface DictTypeMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/setting/HotSearchMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/setting/HotSearchMapper.java index 7bc6350247ae0736fecdf5ea11365f9639ece709..7b3ffa7ec4a599e4ffba766317d0b6cd24d6d40c 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/setting/HotSearchMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/setting/HotSearchMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 热门搜索Mapper */ -@Mapper + public interface HotSearchMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthAdminMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthAdminMapper.java index f509865849e198c3688326381f45a503d2924cb7..bfd638493da8e879418d47640c9f85a9ac2e3b26 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthAdminMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthAdminMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统管理员Mapper */ -@Mapper + public interface SystemAuthAdminMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthDeptMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthDeptMapper.java index 68e8dcc433f2b920052a874d435afd47ec3d6fd6..eb165d58ce969564d3c6c6e1a30d2a5febb061d9 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthDeptMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthDeptMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统岗位Mapper */ -@Mapper + public interface SystemAuthDeptMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthMenuMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthMenuMapper.java index 61b7bd7b5199166969e89bedb945c22a361bf5d4..6fdc5efc95a7fc981cf6141d4b422a03b3b984fe 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthMenuMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthMenuMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统菜单Mapper */ -@Mapper + public interface SystemAuthMenuMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPermMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPermMapper.java index 5f809b592f34fb80a005cf9421a23ac99e447b8e..2d2165176b659073b508ed622bd04f190a69611f 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPermMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPermMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 角色菜单Mapper */ -@Mapper + public interface SystemAuthPermMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPostMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPostMapper.java index c52afd7a6202a5810de4d2bd75dbbffd38653528..fc6e05fd34461cae30c5a0970e213d5c492d573b 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPostMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthPostMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统岗位Mapper */ -@Mapper + public interface SystemAuthPostMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthRoleMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthRoleMapper.java index 0010f676ce10f22a8457322c345856e008f79ecd..9d37ae2a98759bcf21f0a9ba3a7e68de283c8c29 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthRoleMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemAuthRoleMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统角色Mapper */ -@Mapper + public interface SystemAuthRoleMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemConfigMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemConfigMapper.java index 8c7746cb046de4b221bb0e9d8f08cbcc4133139c..23c03a7b5ed7af533787093a913acbd350fe968e 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemConfigMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemConfigMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统配置 */ -@Mapper + public interface SystemConfigMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogLoginMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogLoginMapper.java index 8b81e56f427f8e0e368843671d80752c3715e9e9..21b02a1cc8f11e1c9c98a10fbb450602e53d6c63 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogLoginMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogLoginMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统登录日志 */ -@Mapper + public interface SystemLogLoginMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogOperateMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogOperateMapper.java index 91b5b4eba34497bdbe60764421be674ab0de4b56..b8b04fca390f4589494a57fd1b53d7c19de86960 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogOperateMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogOperateMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统操作日志 */ -@Mapper + public interface SystemLogOperateMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogSmsMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogSmsMapper.java index 21d7da4b22208fbdc01c822355a891ff1eb5ab6f..7f11f16056bb983ae7ba92f35a4b1d8fcb64bdb3 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogSmsMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/system/SystemLogSmsMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 系统短信日志Mapper */ -@Mapper + public interface SystemLogSmsMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/user/UserAuthMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/user/UserAuthMapper.java index 49b4511cff5f6147aaf082744fe60bb3118ce0c6..f7ca07642d5e765923846f0625c25e413fe23d32 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/user/UserAuthMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/user/UserAuthMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 用户授权Mapper */ -@Mapper + public interface UserAuthMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/user/UserMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/user/UserMapper.java index aae977d3c0dc168f96f3b571b86388baf0012f40..f3047b33f16c370ab0dc52ba3c51de38102801b7 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/user/UserMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/user/UserMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 用户Mapper */ -@Mapper + public interface UserMapper extends IBaseMapper { } diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java index 20c259ca755119b7673f7c9f9b1249f9a558e8e9..115eb2c1d0cb956a7b9a482a4c703c0c200a6282 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java @@ -2,7 +2,11 @@ package com.mdd.common.plugin.storage.engine; import com.mdd.common.config.GlobalConfig; import com.mdd.common.exception.OperateException; +import com.mdd.common.properties.BaseProperties; +import com.mdd.common.utils.SpringUtil; import com.mdd.common.utils.YmlUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.core.env.Environment; import org.springframework.web.multipart.MultipartFile; import java.io.File; @@ -22,8 +26,9 @@ public class LocalStorage { */ public void upload(MultipartFile multipartFile, String key, String folder) { // 映射目录 - String directory = YmlUtil.get("like.upload-directory"); - if (directory == null || directory.equals("")) { + BaseProperties properties = SpringUtil.getBean(BaseProperties.class); + String directory = properties.getUpdate().getPath(); + if (StringUtils.isNotBlank(directory)) { directory = GlobalConfig.uploadDirectory; } diff --git a/server/like-common/src/main/java/com/mdd/common/properties/BaseProperties.java b/server/like-common/src/main/java/com/mdd/common/properties/BaseProperties.java new file mode 100644 index 0000000000000000000000000000000000000000..efea865d8d8997267bdbd4668a524d7663033880 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/properties/BaseProperties.java @@ -0,0 +1,26 @@ +package com.mdd.common.properties; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +/** + * yml基础配置 + * + * @author jetlag + * @date 2022/9/12 + */ +@Data +@Configuration +@EnableConfigurationProperties +@ConfigurationProperties(prefix = BaseProperties.LIKE_ADMIN_PREFIX) +public class BaseProperties { + + static final String LIKE_ADMIN_PREFIX = "like"; + + /** + * 系统文件上传配置 + */ + private FileProperties update = new FileProperties(); +} diff --git a/server/like-common/src/main/java/com/mdd/common/properties/FileProperties.java b/server/like-common/src/main/java/com/mdd/common/properties/FileProperties.java new file mode 100644 index 0000000000000000000000000000000000000000..d878fd32409b6d2eac5be939d0f8c9c707366fb1 --- /dev/null +++ b/server/like-common/src/main/java/com/mdd/common/properties/FileProperties.java @@ -0,0 +1,17 @@ +package com.mdd.common.properties; + +import lombok.Data; + +/** + * 文件配置 + * @author jetlag + * @date 2022/9/12 + */ +@Data +public class FileProperties { + + /** + * 文件上传绝对路径 + */ + private String path; +} diff --git a/server/like-common/src/main/java/com/mdd/common/utils/YmlUtil.java b/server/like-common/src/main/java/com/mdd/common/utils/YmlUtil.java index f1d24d61728b2d6807a84b10e54ff2c7a2fbb054..89ab23e7227ebae8c732b738dfae7d655f6855b3 100644 --- a/server/like-common/src/main/java/com/mdd/common/utils/YmlUtil.java +++ b/server/like-common/src/main/java/com/mdd/common/utils/YmlUtil.java @@ -1,6 +1,5 @@ package com.mdd.common.utils; -import org.springframework.context.EnvironmentAware; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; @@ -8,20 +7,7 @@ import org.springframework.stereotype.Component; * 系统文件配置操作工具 */ @Component -public class YmlUtil implements EnvironmentAware { - - private static Environment env; - - /** - * 设置环境变量 - * - * @author fzr - * @param environment 环境变量 - */ - @Override - public void setEnvironment(Environment environment) { - YmlUtil.env = environment; - } +public class YmlUtil { /** * 根据Key获取值 @@ -31,7 +17,7 @@ public class YmlUtil implements EnvironmentAware { * @return String */ public static String get(String key) { - return env.getProperty(key); + return SpringUtil.getBean(Environment.class).getProperty(key, ""); } } diff --git a/server/like-front/src/main/java/com/mdd/front/config/WebMvcConfig.java b/server/like-front/src/main/java/com/mdd/front/config/WebMvcConfig.java index 22b3c8baf0b76ee8b4e8e3b7be652e9d911a23d7..1eb47e353d0919c1061eb3ff929ac2a00e209a20 100644 --- a/server/like-front/src/main/java/com/mdd/front/config/WebMvcConfig.java +++ b/server/like-front/src/main/java/com/mdd/front/config/WebMvcConfig.java @@ -1,8 +1,11 @@ package com.mdd.front.config; import com.mdd.common.config.GlobalConfig; +import com.mdd.common.properties.BaseProperties; import com.mdd.common.utils.YmlUtil; import com.mdd.front.LikeFrontInterceptor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.lang.NonNull; import org.springframework.web.servlet.config.annotation.CorsRegistry; @@ -18,6 +21,9 @@ public class WebMvcConfig implements WebMvcConfigurer { @Resource LikeFrontInterceptor likeFrontInterceptor; + @Autowired + private BaseProperties baseProperties; + /** * 配置允许跨域 */ @@ -43,8 +49,8 @@ public class WebMvcConfig implements WebMvcConfigurer { */ @Override public void addResourceHandlers(@NonNull ResourceHandlerRegistry registry) { - String directory = YmlUtil.get("like.upload-directory"); - if (directory == null || directory.equals("")) { + String directory = baseProperties.getUpdate().getPath(); + if (StringUtils.isNotBlank(directory)) { directory = GlobalConfig.uploadDirectory; } diff --git a/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java b/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java index e4ab0d4cd7683d6451807b54c6ca39e9298e4959..0281139bb576c01a49c4319831fecd74f5d0fd11 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.core.AjaxResult; import com.mdd.common.core.PageResult; import com.mdd.common.exception.OperateException; +import com.mdd.common.properties.BaseProperties; import com.mdd.common.utils.StringUtil; import com.mdd.common.utils.YmlUtil; import com.mdd.common.validator.annotation.IDMust; @@ -13,6 +14,7 @@ import com.mdd.generator.validate.PageParam; import com.mdd.generator.vo.DbTableVo; import com.mdd.generator.vo.GenTableVo; import org.apache.commons.io.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,6 +30,9 @@ public class GenController { @Resource IGenerateService iGenerateService; + @Autowired + private BaseProperties baseProperties; + /** * 库列表 * diff --git a/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableColumnMapper.java b/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableColumnMapper.java index bfb867f8af34b48a9e795c8333f4d03b79240079..a735b135eb245f998379dc0e7ec25010deea2ae1 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableColumnMapper.java +++ b/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableColumnMapper.java @@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 代码生成表列 */ -@Mapper + public interface GenTableColumnMapper extends IBaseMapper { } diff --git a/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableMapper.java b/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableMapper.java index 367464262965449f61287c648caa57215da1cca9..4b5f8915952a42f8704ad0419659d9fb3f239fe6 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableMapper.java +++ b/server/like-generator/src/main/java/com/mdd/generator/mapper/GenTableMapper.java @@ -13,7 +13,7 @@ import java.util.Map; /** * 代码生成表 */ -@Mapper + public interface GenTableMapper extends IBaseMapper { /** diff --git a/server/like-generator/src/main/resources/java/mapper.java.vm b/server/like-generator/src/main/resources/java/mapper.java.vm index 44e1701d735e715f34cee5406acdfd5efdb9cb7e..772ed52ae3da98f52441f93a7054928bb364bcff 100644 --- a/server/like-generator/src/main/resources/java/mapper.java.vm +++ b/server/like-generator/src/main/resources/java/mapper.java.vm @@ -6,6 +6,6 @@ import com.mdd.common.entity.${moduleName}.${EntityName}; /** * ${functionName}Mapper */ -@Mapper + public interface ${EntityName}Mapper extends IBaseMapper<${EntityName}> { } diff --git a/server/like-redission/pom.xml b/server/like-redission/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..7e91f093d23c02a17b2180ba7682992ba1475706 --- /dev/null +++ b/server/like-redission/pom.xml @@ -0,0 +1,39 @@ + + + + likeadmin-java + org.mdd + 1.0.0 + + 4.0.0 + + like-redission + redisson基础模块 + + + 8 + 8 + + + + + org.redisson + redisson + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.boot + spring-boot-starter + true + + + + \ No newline at end of file diff --git a/server/like-redission/src/main/java/com/mdd/redisson/RedissonAutoConfiguration.java b/server/like-redission/src/main/java/com/mdd/redisson/RedissonAutoConfiguration.java new file mode 100644 index 0000000000000000000000000000000000000000..9167c940bc921644d54fedc9e91e6984fce72f17 --- /dev/null +++ b/server/like-redission/src/main/java/com/mdd/redisson/RedissonAutoConfiguration.java @@ -0,0 +1,56 @@ +package com.mdd.redisson; + +import org.redisson.Redisson; +import org.redisson.api.RedissonClient; +import org.redisson.codec.JsonJacksonCodec; +import org.redisson.config.Config; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.Resource; + +import java.io.IOException; + +/** + * @author jetlag + * @date 2022/9/12 + **/ +@Configuration +@ConditionalOnClass(RedissonClient.class) +@AutoConfigureBefore(RedisAutoConfiguration.class) +@EnableConfigurationProperties(RedissonProperties.class) +public class RedissonAutoConfiguration { + + private RedissonProperties redissonProperties; + + private ApplicationContext applicationContext; + + public RedissonAutoConfiguration(RedissonProperties redissonProperties, + ApplicationContext applicationContext) { + this.redissonProperties = redissonProperties; + this.applicationContext = applicationContext; + } + + /** + * 加载redisson配置 + * + * @return + * @throws IOException + */ + @ConditionalOnMissingBean + @Bean(destroyMethod = "shutdown") + public RedissonClient redissonClient() throws IOException { + Resource resource = applicationContext.getResource(redissonProperties.getPath()); + Config config = Config.fromYAML(resource.getInputStream()); + if (config.getCodec() == null) { + config.setCodec(new JsonJacksonCodec()); + } + return Redisson.create(config); + } +} + diff --git a/server/like-redission/src/main/java/com/mdd/redisson/RedissonProperties.java b/server/like-redission/src/main/java/com/mdd/redisson/RedissonProperties.java new file mode 100644 index 0000000000000000000000000000000000000000..1d9b863a3a0860c572ef8d34805f40052771e71e --- /dev/null +++ b/server/like-redission/src/main/java/com/mdd/redisson/RedissonProperties.java @@ -0,0 +1,24 @@ +package com.mdd.redisson; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * @author jetlag + * @date 2022/9/12 + **/ +@ConfigurationProperties(prefix = "like.redisson") +public class RedissonProperties { + + /** + * redission 配置路径 + */ + private String path; + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } +} diff --git a/server/like-redission/src/main/resources/META-INF/spring.factories b/server/like-redission/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000000000000000000000000000000000000..6941e5d7487b977a370b5c8e098953c79b251f16 --- /dev/null +++ b/server/like-redission/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +com.mdd.redisson.RedissonAutoConfiguration \ No newline at end of file diff --git a/server/pom.xml b/server/pom.xml index 41a30e5dddb4b9372c93c3cb829bb3819557bf54..49ddc26b5dcbb4d3ab330e4c750642bc77a22465 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -14,6 +14,7 @@ like-front like-common like-generator + like-redission @@ -42,6 +43,7 @@ 3.10.2 4.5.16 6.1.2 + 3.12.0 @@ -163,6 +165,12 @@ like-common ${like.version} + + + org.redisson + redisson + ${redission.version} +