diff --git a/pom.xml b/pom.xml index 206dedd..e6f980f 100644 --- a/pom.xml +++ b/pom.xml @@ -222,20 +222,6 @@ ${jakarta.version} - - - com.ruoyi - ruoyi-quartz - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-generator - ${ruoyi.version} - - com.ruoyi @@ -257,51 +243,38 @@ ${ruoyi.version} - + com.ruoyi ruoyi-oauth-starter ${ruoyi.version} - + com.ruoyi ruoyi-pay-starter ${ruoyi.version} - + + + com.ruoyi + ruoyi-plugins-starter + ${ruoyi.version} + + + com.ruoyi ruoyi-middleware-starter ${ruoyi.version} - + com.ruoyi - ruoyi-online - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-mybatis-jpa - ${ruoyi.version} - - - - - com.ruoyi - ruoyi-minio - ${ruoyi.version} - - - - com.ruoyi - ruoyi-websocket + ruoyi-models-starter ${ruoyi.version} @@ -311,15 +284,12 @@ ruoyi-admin ruoyi-framework ruoyi-system - ruoyi-quartz - ruoyi-generator ruoyi-common ruoyi-oauth ruoyi-pay - ruoyi-online - ruoyi-mybatis-jpa ruoyi-middleware - ruoyi-websocket + ruoyi-plugins + ruoyi-models pom diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index e58c1e1..9775bda 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -35,18 +35,6 @@ ruoyi-framework - - - com.ruoyi - ruoyi-quartz - - - - - com.ruoyi - ruoyi-generator - - com.ruoyi @@ -59,28 +47,22 @@ ruoyi-pay-starter - - - com.ruoyi - ruoyi-online - - - - - com.ruoyi - ruoyi-mybatis-jpa - - com.ruoyi ruoyi-middleware-starter - + com.ruoyi - ruoyi-websocket + ruoyi-plugins-starter + + + + + com.ruoyi + ruoyi-models-starter @@ -88,6 +70,7 @@ com.github.xiaoymin knife4j-openapi3-jakarta-spring-boot-starter + diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0740eda..8a2a28f 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -49,7 +49,7 @@ user: spring: cache: # 指定缓存类型 jcache 本地缓存 redis 缓存 - type: redis + type: jcache redis: # 指定存活时间（ms） time-to-live: 86400000 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 7ed8287..8a2f2e2 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -163,12 +163,6 @@ spring-boot-starter-cache - - - org.ehcache - ehcache - 3.10.8 - javax.cache cache-api diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/cache/CacheSpecialUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/cache/CacheSpecialUtils.java deleted file mode 100644 index 90ea1b9..0000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/cache/CacheSpecialUtils.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.ruoyi.common.core.cache; - -import java.util.Set; -import java.util.concurrent.TimeUnit; - -import org.springframework.cache.Cache; - -public interface CacheSpecialUtils { - public Set getKeys(Cache cache); - - default public void set(String string, T value, long timeout, TimeUnit unit){} - - default public void set(String string, T value){}; -} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheKeys.java b/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheKeys.java new file mode 100644 index 0000000..4348576 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheKeys.java @@ -0,0 +1,10 @@ +package com.ruoyi.common.interceptor.cache; + +import java.util.Set; + +import org.springframework.cache.Cache; + +public interface CacheKeys { + + public Set getCachekeys(final Cache cache); +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheNoTimeOut.java b/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheNoTimeOut.java new file mode 100644 index 0000000..ab4e5ec --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheNoTimeOut.java @@ -0,0 +1,7 @@ +package com.ruoyi.common.interceptor.cache; + +public interface CacheNoTimeOut { + + public void setCacheObject(final String cacheName,final String key, final T value); + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheTimeOut.java b/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheTimeOut.java new file mode 100644 index 0000000..3f1efaa --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/interceptor/cache/CacheTimeOut.java @@ -0,0 +1,10 @@ +package com.ruoyi.common.interceptor.cache; + +import java.util.concurrent.TimeUnit; + +public interface CacheTimeOut extends CacheNoTimeOut { + + public void setCacheObject(final String cacheName, final String key, final T value, final long timeout, + final TimeUnit timeUnit); + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java index 1d7eb25..eb5bb4e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/CacheUtils.java @@ -10,7 +10,8 @@ import org.springframework.cache.transaction.TransactionAwareCacheDecorator; import org.springframework.lang.Nullable; import org.springframework.util.ObjectUtils; -import com.ruoyi.common.core.cache.CacheSpecialUtils; +import com.ruoyi.common.interceptor.cache.CacheKeys; +import com.ruoyi.common.interceptor.cache.CacheTimeOut; import com.ruoyi.common.utils.spring.SpringUtils; public class CacheUtils { @@ -43,8 +44,8 @@ public class CacheUtils { @SuppressWarnings(value = { "unchecked", "rawtypes" }) public static Set getkeys(String cacheName) { Cache cache = getCacheManager().getCache(cacheName); - CacheSpecialUtils cacheGetKets = SpringUtils.getBean(CacheSpecialUtils.class); - return cacheGetKets.getKeys(cache); + CacheKeys cacheGetKets = SpringUtils.getBean(CacheKeys.class); + return cacheGetKets.getCachekeys(cache); } /** @@ -73,7 +74,7 @@ public class CacheUtils { } } - public static boolean hasKey(String cacheName, String key){ + public static boolean hasKey(String cacheName, String key) { return ObjectUtils.isEmpty(get(cacheName, key)); } @@ -93,11 +94,11 @@ public class CacheUtils { JCacheCache ehcache = (JCacheCache) cache; ehcache.put(key, value); } else if (cache instanceof TransactionAwareCacheDecorator) { - CacheSpecialUtils cacheSet = SpringUtils.getBean(CacheSpecialUtils.class); + CacheTimeOut cacheTimeOut = SpringUtils.getBean(CacheTimeOut.class); if (timeout != 0 && unit != null) { - cacheSet.set(cacheName + ":" + key, value, timeout, unit); + cacheTimeOut.setCacheObject(cacheName, key, value, timeout, unit); } else { - cacheSet.set(cacheName + ":" + key, value); + cacheTimeOut.setCacheObject(cacheName, key, value); } } else { cache.put(key, value); diff --git a/ruoyi-middleware/pom.xml b/ruoyi-middleware/pom.xml index 0a9cae9..15d8fef 100644 --- a/ruoyi-middleware/pom.xml +++ b/ruoyi-middleware/pom.xml @@ -17,8 +17,9 @@ - 支付模块 + 中间件 + diff --git a/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/RedisConfig.java b/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/RedisConfig.java index f4f92fa..1b96c16 100644 --- a/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/RedisConfig.java +++ b/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/RedisConfig.java @@ -1,12 +1,8 @@ package com.ruoyi.middleware.redis.config; import java.time.Duration; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.TimeUnit; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurer; import org.springframework.context.annotation.Bean; @@ -20,9 +16,6 @@ import org.springframework.data.redis.core.script.DefaultRedisScript; import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.StringRedisSerializer; -import com.ruoyi.common.core.cache.CacheSpecialUtils; -import com.ruoyi.common.utils.StringUtils; - /** * redis配置 * @@ -44,31 +37,6 @@ public class RedisConfig implements CachingConfigurer { return RedisCacheManager.builder(connectionFactory).cacheDefaults(config).transactionAware().build(); } - @Bean - public CacheSpecialUtils cacheGetKets(RedisTemplate redisTemplate) { - return new CacheSpecialUtils() { - @Override - public Set getKeys(Cache cache) { - Set keyset = new HashSet<>(); - Set keysets = redisTemplate.keys(cache.getName() + "*"); - for (Object s : keysets) { - keyset.add(StringUtils.replace(s.toString(), cache.getName() + ":", "")); - } - return keyset; - } - - @Override - public void set(String cacheName, T value, long timeout, TimeUnit unit){ - redisTemplate.opsForValue().set(cacheName, value, timeout, unit); - } - - public void set(String cacheName, T value){ - redisTemplate.opsForValue().set(cacheName, value); - }; - - }; - } - @SuppressWarnings(value = { "unchecked", "rawtypes" }) private RedisCacheConfiguration instanceConfig(Long ttl) { FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class); diff --git a/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java b/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java index d4c1050..89b6b4f 100644 --- a/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java +++ b/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/utils/RedisCache.java @@ -1,6 +1,7 @@ package com.ruoyi.middleware.redis.utils; import java.util.Collection; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -9,12 +10,17 @@ import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.cache.Cache; import org.springframework.data.redis.core.BoundSetOperations; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; +import com.ruoyi.common.interceptor.cache.CacheKeys; +import com.ruoyi.common.interceptor.cache.CacheTimeOut; +import com.ruoyi.common.utils.StringUtils; + /** * spring redis 工具类 * @@ -23,57 +29,75 @@ import org.springframework.stereotype.Component; @SuppressWarnings(value = { "unchecked", "rawtypes" }) @Component @ConditionalOnProperty(prefix = "spring.cache", name = { "type" }, havingValue = "redis", matchIfMissing = false) -public class RedisCache -{ +public class RedisCache implements CacheKeys, CacheTimeOut { @Autowired public RedisTemplate redisTemplate; /** * 缓存基本的对象，Integer、String、实体类等 * - * @param key 缓存的键值 + * @param key 缓存的键值 * @param value 缓存的值 */ - public void setCacheObject(final String key, final T value) - { + public void setCacheObject(final String cacheName, final String key, final T value) { + redisTemplate.opsForValue().set(cacheName + ":" + key, value); + } + + /** + * 缓存基本的对象，Integer、String、实体类等 + * + * @param key 缓存的键值 + * @param value 缓存的值 + */ + public void setCacheObject(final String key, final T value) { redisTemplate.opsForValue().set(key, value); } /** * 缓存基本的对象，Integer、String、实体类等 * - * @param key 缓存的键值 - * @param value 缓存的值 - * @param timeout 时间 + * @param key 缓存的键值 + * @param value 缓存的值 + * @param timeout 时间 * @param timeUnit 时间颗粒度 */ - public void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) - { + public void setCacheObject(final String cacheName, final String key, final T value, final long timeout, + final TimeUnit timeUnit) { + redisTemplate.opsForValue().set(cacheName + ":" + key, value, timeout, timeUnit); + } + + /** + * 缓存基本的对象，Integer、String、实体类等 + * + * @param key 缓存的键值 + * @param value 缓存的值 + * @param timeout 时间 + * @param timeUnit 时间颗粒度 + */ + public void setCacheObject(final String key, final T value, final long timeout, final TimeUnit timeUnit) { redisTemplate.opsForValue().set(key, value, timeout, timeUnit); } /** * 设置有效时间 * - * @param key Redis键 + * @param key Redis键 * @param timeout 超时时间 * @return true=设置成功；false=设置失败 */ - public boolean expire(final String key, final long timeout) - { + public boolean expire(final String key, final long timeout) { return expire(key, timeout, TimeUnit.SECONDS); } /** * 设置有效时间 * - * @param key Redis键 + * @param key Redis键 * @param timeout 超时时间 - * @param unit 时间单位 + * @param unit 时间单位 * @return true=设置成功；false=设置失败 */ - public boolean expire(final String key, final long timeout, final TimeUnit unit) - { + public boolean expire(final String key, final long timeout, final TimeUnit unit) { return redisTemplate.expire(key, timeout, unit); } @@ -83,8 +107,7 @@ public class RedisCache * @param key Redis键 * @return 有效时间 */ - public long getExpire(final String key) - { + public long getExpire(final String key) { return redisTemplate.getExpire(key); } @@ -94,8 +117,7 @@ public class RedisCache * @param key 键 * @return true 存在 false不存在 */ - public Boolean hasKey(String key) - { + public Boolean hasKey(String key) { return redisTemplate.hasKey(key); } @@ -105,8 +127,7 @@ public class RedisCache * @param key 缓存键值 * @return 缓存键值对应的数据 */ - public T getCacheObject(final String key) - { + public T getCacheObject(final String key) { ValueOperations operation = redisTemplate.opsForValue(); return operation.get(key); } @@ -116,8 +137,7 @@ public class RedisCache * * @param key */ - public boolean deleteObject(final String key) - { + public boolean deleteObject(final String key) { return redisTemplate.delete(key); } @@ -127,20 +147,18 @@ public class RedisCache * @param collection 多个对象 * @return */ - public boolean deleteObject(final Collection collection) - { + public boolean deleteObject(final Collection collection) { return redisTemplate.delete(collection) > 0; } /** * 缓存List数据 * - * @param key 缓存的键值 + * @param key 缓存的键值 * @param dataList 待缓存的List数据 * @return 缓存的对象 */ - public long setCacheList(final String key, final List dataList) - { + public long setCacheList(final String key, final List dataList) { Long count = redisTemplate.opsForList().rightPushAll(key, dataList); return count == null ? 0 : count; } @@ -151,24 +169,21 @@ public class RedisCache * @param key 缓存的键值 * @return 缓存键值对应的数据 */ - public List getCacheList(final String key) - { + public List getCacheList(final String key) { return redisTemplate.opsForList().range(key, 0, -1); } /** * 缓存Set * - * @param key 缓存键值 + * @param key 缓存键值 * @param dataSet 缓存的数据 * @return 缓存数据的对象 */ - public BoundSetOperations setCacheSet(final String key, final Set dataSet) - { + public BoundSetOperations setCacheSet(final String key, final Set dataSet) { BoundSetOperations setOperation = redisTemplate.boundSetOps(key); Iterator it = dataSet.iterator(); - while (it.hasNext()) - { + while (it.hasNext()) { setOperation.add(it.next()); } return setOperation; @@ -180,8 +195,7 @@ public class RedisCache * @param key * @return */ - public Set getCacheSet(final String key) - { + public Set getCacheSet(final String key) { return redisTemplate.opsForSet().members(key); } @@ -191,8 +205,7 @@ public class RedisCache * @param key * @param dataMap */ - public void setCacheMap(final String key, final Map dataMap) - { + public void setCacheMap(final String key, final Map dataMap) { if (dataMap != null) { redisTemplate.opsForHash().putAll(key, dataMap); } @@ -204,32 +217,29 @@ public class RedisCache * @param key * @return */ - public Map getCacheMap(final String key) - { + public Map getCacheMap(final String key) { return redisTemplate.opsForHash().entries(key); } /** * 往Hash中存入数据 * - * @param key Redis键 - * @param hKey Hash键 + * @param key Redis键 + * @param hKey Hash键 * @param value 值 */ - public void setCacheMapValue(final String key, final String hKey, final T value) - { + public void setCacheMapValue(final String key, final String hKey, final T value) { redisTemplate.opsForHash().put(key, hKey, value); } /** * 获取Hash中的数据 * - * @param key Redis键 + * @param key Redis键 * @param hKey Hash键 * @return Hash中的对象 */ - public T getCacheMapValue(final String key, final String hKey) - { + public T getCacheMapValue(final String key, final String hKey) { HashOperations opsForHash = redisTemplate.opsForHash(); return opsForHash.get(key, hKey); } @@ -237,24 +247,22 @@ public class RedisCache /** * 获取多个Hash中的数据 * - * @param key Redis键 + * @param key Redis键 * @param hKeys Hash键集合 * @return Hash对象集合 */ - public List getMultiCacheMapValue(final String key, final Collection hKeys) - { + public List getMultiCacheMapValue(final String key, final Collection hKeys) { return redisTemplate.opsForHash().multiGet(key, hKeys); } /** * 删除Hash中的某条数据 * - * @param key Redis键 + * @param key Redis键 * @param hKey Hash键 * @return 是否成功 */ - public boolean deleteCacheMapValue(final String key, final String hKey) - { + public boolean deleteCacheMapValue(final String key, final String hKey) { return redisTemplate.opsForHash().delete(key, hKey) > 0; } @@ -264,8 +272,17 @@ public class RedisCache * @param pattern 字符串前缀 * @return 对象列表 */ - public Collection keys(final String pattern) - { + public Collection keys(final String pattern) { return redisTemplate.keys(pattern); } + + @Override + public Set getCachekeys(Cache cache) { + Set keyset = new HashSet<>(); + Set keysets = redisTemplate.keys(cache.getName() + "*"); + for (Object s : keysets) { + keyset.add(StringUtils.replace(s.toString(), cache.getName() + ":", "")); + } + return keyset; + } } diff --git a/ruoyi-models/pom.xml b/ruoyi-models/pom.xml new file mode 100644 index 0000000..dbc2cc7 --- /dev/null +++ b/ruoyi-models/pom.xml @@ -0,0 +1,63 @@ + + + + ruoyi + com.ruoyi + 3.8.7.3.2 + + 4.0.0 + + ruoyi-models + + + 3.8.7.3.2 + + + + 中间件 + + + + + + + com.ruoyi + ruoyi-quartz + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-generator + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-online + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-models-starter + ${ruoyi.version} + + + + + + + + + ruoyi-models-starter + ruoyi-generator + ruoyi-quartz + ruoyi-online + + pom + \ No newline at end of file diff --git a/ruoyi-generator/pom.xml b/ruoyi-models/ruoyi-generator/pom.xml similarity index 96% rename from ruoyi-generator/pom.xml rename to ruoyi-models/ruoyi-generator/pom.xml index 231579e..133c4cb 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-models/ruoyi-generator/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi + ruoyi-models com.ruoyi 3.8.7.3.2 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-models/ruoyi-generator/src/main/resources/generator.yml similarity index 100% rename from ruoyi-generator/src/main/resources/generator.yml rename to ruoyi-models/ruoyi-generator/src/main/resources/generator.yml diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-models/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to ruoyi-models/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-models/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to ruoyi-models/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/java/controller.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/java/domain.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/uniapp/edit.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/edit.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/uniapp/edit.vue.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/edit.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/uniapp/list.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/list.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/uniapp/list.vue.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/list.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/uniapp/show.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/show.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/uniapp/show.vue.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/uniapp/show.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v2/index-tree.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v2/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v2/index-tree.vue.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v2/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v2/index.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v2/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v2/index.vue.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v2/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt b/ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to ruoyi-models/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-models/ruoyi-models-starter/pom.xml b/ruoyi-models/ruoyi-models-starter/pom.xml new file mode 100644 index 0000000..6fde107 --- /dev/null +++ b/ruoyi-models/ruoyi-models-starter/pom.xml @@ -0,0 +1,45 @@ + + + + ruoyi-models + com.ruoyi + 3.8.7.3.2 + + 4.0.0 + + ruoyi-models-starter + + + 中间件 + + + + + + + com.ruoyi + ruoyi-common + + + + + com.ruoyi + ruoyi-quartz + + + + + com.ruoyi + ruoyi-generator + + + + + com.ruoyi + ruoyi-online + + + + + diff --git a/ruoyi-online/pom.xml b/ruoyi-models/ruoyi-online/pom.xml similarity index 93% rename from ruoyi-online/pom.xml rename to ruoyi-models/ruoyi-online/pom.xml index dbc8286..d6fab20 100644 --- a/ruoyi-online/pom.xml +++ b/ruoyi-models/ruoyi-online/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi + ruoyi-models com.ruoyi 3.8.7.3.2 diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnlineDbController.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnlineDbController.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/controller/OnlineDbController.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnlineDbController.java diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnlineMbController.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnlineMbController.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/controller/OnlineMbController.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnlineMbController.java diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/domain/OnlineMb.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/domain/OnlineMb.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/domain/OnlineMb.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/domain/OnlineMb.java diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/mapper/OnlineDbMapper.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/mapper/OnlineDbMapper.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/mapper/OnlineDbMapper.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/mapper/OnlineDbMapper.java diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/mapper/OnlineMbMapper.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/mapper/OnlineMbMapper.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/mapper/OnlineMbMapper.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/mapper/OnlineMbMapper.java diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/service/IOnlineMbService.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/service/IOnlineMbService.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/service/IOnlineMbService.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/service/IOnlineMbService.java diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/service/impl/OnlineMbServiceImpl.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/service/impl/OnlineMbServiceImpl.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/service/impl/OnlineMbServiceImpl.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/service/impl/OnlineMbServiceImpl.java diff --git a/ruoyi-online/src/main/java/com/ruoyi/online/utils/SqlMapper.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/utils/SqlMapper.java similarity index 100% rename from ruoyi-online/src/main/java/com/ruoyi/online/utils/SqlMapper.java rename to ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/utils/SqlMapper.java diff --git a/ruoyi-online/src/main/resources/mapper/online/OnlineDbMapper.xml b/ruoyi-models/ruoyi-online/src/main/resources/mapper/online/OnlineDbMapper.xml similarity index 100% rename from ruoyi-online/src/main/resources/mapper/online/OnlineDbMapper.xml rename to ruoyi-models/ruoyi-online/src/main/resources/mapper/online/OnlineDbMapper.xml diff --git a/ruoyi-online/src/main/resources/mapper/online/OnlineMbMapper.xml b/ruoyi-models/ruoyi-online/src/main/resources/mapper/online/OnlineMbMapper.xml similarity index 100% rename from ruoyi-online/src/main/resources/mapper/online/OnlineMbMapper.xml rename to ruoyi-models/ruoyi-online/src/main/resources/mapper/online/OnlineMbMapper.xml diff --git a/ruoyi-quartz/pom.xml b/ruoyi-models/ruoyi-quartz/pom.xml similarity index 81% rename from ruoyi-quartz/pom.xml rename to ruoyi-models/ruoyi-quartz/pom.xml index 7559842..319b598 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-models/ruoyi-quartz/pom.xml @@ -1,9 +1,8 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi + ruoyi-models com.ruoyi 3.8.7.3.2 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to ruoyi-models/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-models/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml similarity index 100% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml rename to ruoyi-models/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-models/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml similarity index 100% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml rename to ruoyi-models/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml diff --git a/ruoyi-plugins/pom.xml b/ruoyi-plugins/pom.xml new file mode 100644 index 0000000..7f20481 --- /dev/null +++ b/ruoyi-plugins/pom.xml @@ -0,0 +1,75 @@ + + + + ruoyi + com.ruoyi + 3.8.7.3.2 + + 4.0.0 + + ruoyi-plugins + + + 3.8.7.3.2 + 3.10.8 + + + + + + + + + + org.ehcache + ehcache + ${ehcache.version} + + + + + com.ruoyi + ruoyi-ehcache + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-ehcache + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-mybatis-jpa + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-websocket + ${ruoyi.version} + + + + + com.ruoyi + ruoyi-plugins-starter + ${ruoyi.version} + + + + + + + ruoyi-ehcache + ruoyi-mybatis-jpa + ruoyi-websocket + ruoyi-plugins-starter + + pom + \ No newline at end of file diff --git a/ruoyi-plugins/ruoyi-ehcache/pom.xml b/ruoyi-plugins/ruoyi-ehcache/pom.xml new file mode 100644 index 0000000..731d727 --- /dev/null +++ b/ruoyi-plugins/ruoyi-ehcache/pom.xml @@ -0,0 +1,33 @@ + + + + ruoyi-plugins + com.ruoyi + 3.8.7.3.2 + + 4.0.0 + + ruoyi-ehcache + + + 中间件 + + + + + + + com.ruoyi + ruoyi-common + + + + + org.ehcache + ehcache + + + + + diff --git a/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java b/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java new file mode 100644 index 0000000..702a4ed --- /dev/null +++ b/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java @@ -0,0 +1,57 @@ +package com.ruoyi.ehcache.config; + +import java.lang.reflect.Field; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +import org.ehcache.core.EhcacheBase; +import org.ehcache.impl.internal.store.heap.OnHeapStore; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.Cache; +import org.springframework.cache.jcache.JCacheCache; +import org.springframework.cache.jcache.JCacheCacheManager; + +import com.ruoyi.common.interceptor.cache.CacheKeys; +import com.ruoyi.common.interceptor.cache.CacheNoTimeOut; + +public class Ehcache3Cache implements CacheNoTimeOut, CacheKeys { + + @Autowired + private JCacheCacheManager jCacheCacheManager; + + @Override + public Set getCachekeys(Cache cache) { + Set keyset = new HashSet<>(); + try { + JCacheCache jehcache = (JCacheCache) cache; + // org.ehcache.jsr107.Eh107Cache 不公开 + Object nativeCache = jehcache.getNativeCache(); + Class nativeCacheClass = nativeCache.getClass(); + Field ehCacheField = nativeCacheClass.getDeclaredField("ehCache"); + ehCacheField.setAccessible(true); + EhcacheBase ehcache = (EhcacheBase) ehCacheField.get(nativeCache); + Field storeField = EhcacheBase.class.getDeclaredField("store"); + storeField.setAccessible(true); + OnHeapStore store = (OnHeapStore) storeField.get(ehcache); + Field mapField = OnHeapStore.class.getDeclaredField("map"); + mapField.setAccessible(true); + // org.ehcache.impl.internal.store.heap.Backend 不公开 + Object map = mapField.get(store); + Class mapClass = map.getClass(); + Field realMapField = mapClass.getDeclaredField("realMap"); + realMapField.setAccessible(true); + ConcurrentHashMap realMap = (ConcurrentHashMap) realMapField.get(map); + keyset = realMap.keySet(); + } catch (Exception e) { + } + return keyset; + } + + @Override + public void setCacheObject(String cacheName, String key, T value) { + Cache cache = jCacheCacheManager.getCache(cacheName); + cache.put(cacheName, value); + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/Ehcache3Config.java b/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Config.java similarity index 60% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/Ehcache3Config.java rename to ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Config.java index 7e66346..c459c88 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/Ehcache3Config.java +++ b/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Config.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.ruoyi.ehcache.config; import java.lang.reflect.Field; import java.util.HashSet; @@ -23,47 +23,11 @@ import org.springframework.cache.jcache.JCacheCacheManager; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.core.cache.CacheSpecialUtils; - @Configuration @EnableCaching @ConditionalOnProperty(prefix = "spring.cache", name = { "type" }, havingValue = "jcache", matchIfMissing = false) public class Ehcache3Config { - @Bean - @SuppressWarnings(value = { "unchecked", "rawtypes" }) - public CacheSpecialUtils cacheGetKets() { - return new CacheSpecialUtils() { - @Override - public Set getKeys(Cache cache) { - Set keyset = new HashSet<>(); - try { - JCacheCache jehcache = (JCacheCache) cache; - // org.ehcache.jsr107.Eh107Cache 不公开 - Object nativeCache = jehcache.getNativeCache(); - Class nativeCacheClass = nativeCache.getClass(); - Field ehCacheField = nativeCacheClass.getDeclaredField("ehCache"); - ehCacheField.setAccessible(true); - EhcacheBase ehcache = (EhcacheBase) ehCacheField.get(nativeCache); - Field storeField = EhcacheBase.class.getDeclaredField("store"); - storeField.setAccessible(true); - OnHeapStore store = (OnHeapStore) storeField.get(ehcache); - Field mapField = OnHeapStore.class.getDeclaredField("map"); - mapField.setAccessible(true); - // org.ehcache.impl.internal.store.heap.Backend 不公开 - Object map = mapField.get(store); - Class mapClass = map.getClass(); - Field realMapField = mapClass.getDeclaredField("realMap"); - realMapField.setAccessible(true); - ConcurrentHashMap realMap = (ConcurrentHashMap) realMapField.get(map); - keyset = realMap.keySet(); - } catch (Exception e) { - } - return keyset; - } - }; - } - @Bean public JCacheCacheManager ehcacheManager() { EhcacheCachingProvider cachingProvider = (EhcacheCachingProvider) Caching.getCachingProvider(); diff --git a/ruoyi-mybatis-jpa/pom.xml b/ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml similarity index 100% rename from ruoyi-mybatis-jpa/pom.xml rename to ruoyi-plugins/ruoyi-mybatis-jpa/pom.xml diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Column.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Column.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Column.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Column.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/ColumnMap.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/ColumnMap.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/ColumnMap.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/ColumnMap.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/EnableTableMap.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Query.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Query.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Query.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Query.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Table.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Table.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Table.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/annotation/Table.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/ColumnInfo.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/ColumnInfo.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/ColumnInfo.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/ColumnInfo.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/MapColumnInfo.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/MapColumnInfo.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/MapColumnInfo.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/MapColumnInfo.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/domain/TableInfo.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/enums/QueryEnum.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/enums/QueryEnum.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/enums/QueryEnum.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/enums/QueryEnum.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/QueryWrapperUtil.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/QueryWrapperUtil.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/QueryWrapperUtil.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/QueryWrapperUtil.java diff --git a/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/SQLUtil.java b/ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/SQLUtil.java similarity index 100% rename from ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/SQLUtil.java rename to ruoyi-plugins/ruoyi-mybatis-jpa/src/main/java/com/ruoyi/mybatis/utils/SQLUtil.java diff --git a/ruoyi-plugins/ruoyi-plugins-starter/pom.xml b/ruoyi-plugins/ruoyi-plugins-starter/pom.xml new file mode 100644 index 0000000..8e9d0fa --- /dev/null +++ b/ruoyi-plugins/ruoyi-plugins-starter/pom.xml @@ -0,0 +1,44 @@ + + + + ruoyi-plugins + com.ruoyi + 3.8.7.3.2 + + 4.0.0 + + ruoyi-plugins-starter + + + 中间件 + + + + + + + com.ruoyi + ruoyi-common + + + + + com.ruoyi + ruoyi-ehcache + + + + + com.ruoyi + ruoyi-websocket + + + + + com.ruoyi + ruoyi-mybatis-jpa + + + + diff --git a/ruoyi-websocket/pom.xml b/ruoyi-plugins/ruoyi-websocket/pom.xml similarity index 95% rename from ruoyi-websocket/pom.xml rename to ruoyi-plugins/ruoyi-websocket/pom.xml index 46dcf9f..a697b29 100644 --- a/ruoyi-websocket/pom.xml +++ b/ruoyi-plugins/ruoyi-websocket/pom.xml @@ -2,7 +2,7 @@ - ruoyi + ruoyi-plugins com.ruoyi 3.8.7.3.2 diff --git a/ruoyi-websocket/src/main/java/com/ruoyi/websocket/SemaphoreUtils.java b/ruoyi-plugins/ruoyi-websocket/src/main/java/com/ruoyi/websocket/SemaphoreUtils.java similarity index 100% rename from ruoyi-websocket/src/main/java/com/ruoyi/websocket/SemaphoreUtils.java rename to ruoyi-plugins/ruoyi-websocket/src/main/java/com/ruoyi/websocket/SemaphoreUtils.java diff --git a/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketConfig.java b/ruoyi-plugins/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketConfig.java similarity index 100% rename from ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketConfig.java rename to ruoyi-plugins/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketConfig.java diff --git a/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketServer.java b/ruoyi-plugins/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketServer.java similarity index 100% rename from ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketServer.java rename to ruoyi-plugins/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketServer.java diff --git a/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketUsers.java b/ruoyi-plugins/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketUsers.java similarity index 100% rename from ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketUsers.java rename to ruoyi-plugins/ruoyi-websocket/src/main/java/com/ruoyi/websocket/WebSocketUsers.java