redisTemplate;
-
- /**
- * 获取锁
- */
- public RLock getLock(String lockKey) {
- return redissonClient.getLock(lockKey);
- }
-
- /**
- * 加锁操作
- *
- * @return boolean
- */
- public boolean tryLock(String lockName, long expireSeconds) {
- return tryLock(lockName, 0, expireSeconds);
- }
-
-
- /**
- * 加锁操作
- *
- * @return boolean
- */
- public boolean tryLock(String lockName, long waitTime, long expireSeconds) {
- RLock rLock = getLock(lockName);
- boolean getLock = false;
- try {
- getLock = rLock.tryLock(waitTime, expireSeconds, TimeUnit.SECONDS);
- if (getLock) {
- log.info("获取锁成功,lockName={}", lockName);
- } else {
- log.info("获取锁失败,lockName={}", lockName);
- }
- } catch (InterruptedException e) {
- log.error("获取式锁异常，lockName=" + lockName, e);
- getLock = false;
- }
- return getLock;
- }
-
-
- public boolean fairLock(String lockKey, TimeUnit unit, int leaseTime) {
- RLock fairLock = redissonClient.getFairLock(lockKey);
- try {
- boolean existKey = existKey(lockKey);
- // 已经存在了，就直接返回
- if (existKey) {
- return false;
- }
- return fairLock.tryLock(3, leaseTime, unit);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return false;
- }
-
- public boolean existKey(String key) {
- return redisTemplate.hasKey(key);
- }
- /**
- * 锁lockKey
- *
- * @param lockKey
- * @return
- */
- public RLock lock(String lockKey) {
- RLock lock = getLock(lockKey);
- lock.lock();
- return lock;
- }
-
- /**
- * 锁lockKey
- *
- * @param lockKey
- * @param leaseTime
- * @return
- */
- public RLock lock(String lockKey, long leaseTime) {
- RLock lock = getLock(lockKey);
- lock.lock(leaseTime, TimeUnit.SECONDS);
- return lock;
- }
-
-
- /**
- * 解锁
- *
- * @param lockName 锁名称
- */
- public void unlock(String lockName) {
- try {
- redissonClient.getLock(lockName).unlock();
- } catch (Exception e) {
- log.error("解锁异常，lockName=" + lockName, e);
- }
- }
-
-
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/config/RedissonConfiguration.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/config/RedissonConfiguration.java
deleted file mode 100644
index 5608055d..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/config/RedissonConfiguration.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.jeecg.boot.starter.lock.config;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.boot.starter.lock.core.RedissonManager;
-import org.jeecg.boot.starter.lock.prop.RedissonProperties;
-import org.redisson.api.RedissonClient;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-
-/**
- * Redisson自动化配置
- *
- * @author zyf
- * @date 2020-11-11
- */
-@Slf4j
-@Configuration
-@ConditionalOnClass(RedissonProperties.class)
-@EnableConfigurationProperties(RedissonProperties.class)
-public class RedissonConfiguration {
-
-
-
- @Bean
- @ConditionalOnMissingBean(RedissonClient.class)
- public RedissonClient redissonClient(RedissonProperties redissonProperties) {
- RedissonManager redissonManager = new RedissonManager(redissonProperties);
- log.info("RedissonManager初始化完成,当前连接方式:" + redissonProperties.getType() + ",连接地址:" + redissonProperties.getAddress());
- return redissonManager.getRedisson();
- }
-
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/RedissonManager.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/RedissonManager.java
deleted file mode 100644
index d67bd631..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/RedissonManager.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.jeecg.boot.starter.lock.core;
-
-
-import com.google.common.base.Preconditions;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.boot.starter.lock.core.strategy.RedissonConfigStrategy;
-import org.jeecg.boot.starter.lock.prop.RedissonProperties;
-import org.jeecg.boot.starter.lock.core.strategy.impl.ClusterRedissonConfigStrategyImpl;
-import org.jeecg.boot.starter.lock.core.strategy.impl.MasterslaveRedissonConfigStrategyImpl;
-import org.jeecg.boot.starter.lock.core.strategy.impl.SentinelRedissonConfigStrategyImpl;
-import org.jeecg.boot.starter.lock.core.strategy.impl.StandaloneRedissonConfigStrategyImpl;
-import org.jeecg.boot.starter.lock.enums.RedisConnectionType;
-import org.redisson.Redisson;
-import org.redisson.config.Config;
-
-
-/**
- * Redisson配置管理器，用于初始化的redisson实例
- *
- * @author zyf
- * @date 2020-11-12
- */
-@Slf4j
-public class RedissonManager {
-
- private Config config = new Config();
-
- private Redisson redisson = null;
-
- public RedissonManager() {
- }
-
- public RedissonManager(RedissonProperties redissonProperties) {
- //装配开关
- Boolean enabled = redissonProperties.getEnabled();
- if (enabled) {
- try {
- config = RedissonConfigFactory.getInstance().createConfig(redissonProperties);
- redisson = (Redisson) Redisson.create(config);
- } catch (Exception e) {
- log.error("Redisson初始化错误", e);
- }
- }
- }
-
- public Redisson getRedisson() {
- return redisson;
- }
-
- /**
- * Redisson连接方式配置工厂
- * 双重检查锁
- */
- static class RedissonConfigFactory {
-
- private RedissonConfigFactory() {
- }
-
- private static volatile RedissonConfigFactory factory = null;
-
- public static RedissonConfigFactory getInstance() {
- if (factory == null) {
- synchronized (Object.class) {
- if (factory == null) {
- factory = new RedissonConfigFactory();
- }
- }
- }
- return factory;
- }
-
- /**
- * 根据连接类型創建连接方式的配置
- *
- * @param redissonProperties
- * @return Config
- */
- Config createConfig(RedissonProperties redissonProperties) {
- Preconditions.checkNotNull(redissonProperties);
- Preconditions.checkNotNull(redissonProperties.getAddress(), "redis地址未配置");
- RedisConnectionType connectionType = redissonProperties.getType();
- // 声明连接方式
- RedissonConfigStrategy redissonConfigStrategy;
- if (connectionType.equals(RedisConnectionType.SENTINEL)) {
- redissonConfigStrategy = new SentinelRedissonConfigStrategyImpl();
- } else if (connectionType.equals(RedisConnectionType.CLUSTER)) {
- redissonConfigStrategy = new ClusterRedissonConfigStrategyImpl();
- } else if (connectionType.equals(RedisConnectionType.MASTERSLAVE)) {
- redissonConfigStrategy = new MasterslaveRedissonConfigStrategyImpl();
- } else {
- redissonConfigStrategy = new StandaloneRedissonConfigStrategyImpl();
- }
- Preconditions.checkNotNull(redissonConfigStrategy, "连接方式创建异常");
-
- return redissonConfigStrategy.createRedissonConfig(redissonProperties);
- }
- }
-
-
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/RedissonConfigStrategy.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/RedissonConfigStrategy.java
deleted file mode 100644
index 04d260e9..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/RedissonConfigStrategy.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jeecg.boot.starter.lock.core.strategy;
-
-import org.jeecg.boot.starter.lock.prop.RedissonProperties;
-import org.redisson.config.Config;
-
-/**
- * Redisson配置构建接口
- *
- * @author zyf
- * @date 2020-11-11
- */
-public interface RedissonConfigStrategy {
-
- /**
- * 根据不同的Redis配置策略创建对应的Config
- *
- * @param redissonProperties
- * @return Config
- */
- Config createRedissonConfig(RedissonProperties redissonProperties);
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/ClusterRedissonConfigStrategyImpl.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/ClusterRedissonConfigStrategyImpl.java
deleted file mode 100644
index ffccf64e..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/ClusterRedissonConfigStrategyImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.jeecg.boot.starter.lock.core.strategy.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.boot.starter.lock.core.strategy.RedissonConfigStrategy;
-import org.jeecg.boot.starter.lock.prop.RedissonProperties;
-import org.jeecg.boot.starter.lock.enums.GlobalConstant;
-import org.redisson.config.Config;
-
-
-/**
- * 集群方式Redisson配置
- * cluster方式至少6个节点(3主3从)
- * 配置方式:127.0.0.1:6379,127.0.0.1:6380,127.0.0.1:6381,127.0.0.1:6382,127.0.0.1:6383,127.0.0.1:6384
- *
- * @author zyf
- * @date 2020-11-11
- */
-@Slf4j
-public class ClusterRedissonConfigStrategyImpl implements RedissonConfigStrategy {
-
- @Override
- public Config createRedissonConfig(RedissonProperties redissonProperties) {
- Config config = new Config();
- try {
- String address = redissonProperties.getAddress();
- String password = redissonProperties.getPassword();
- String[] addrTokens = address.split(",");
- // 设置集群(cluster)节点的服务IP和端口
- for (int i = 0; i < addrTokens.length; i++) {
- config.useClusterServers().addNodeAddress(GlobalConstant.REDIS_CONNECTION_PREFIX + addrTokens[i]);
- if (StringUtils.isNotBlank(password)) {
- config.useClusterServers().setPassword(password);
- }
- }
- log.info("初始化集群方式Config,连接地址:" + address);
- } catch (Exception e) {
- log.error("集群Redisson初始化错误", e);
- e.printStackTrace();
- }
- return config;
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/MasterslaveRedissonConfigStrategyImpl.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/MasterslaveRedissonConfigStrategyImpl.java
deleted file mode 100644
index 59cc7456..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/MasterslaveRedissonConfigStrategyImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.jeecg.boot.starter.lock.core.strategy.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.boot.starter.lock.core.strategy.RedissonConfigStrategy;
-import org.jeecg.boot.starter.lock.prop.RedissonProperties;
-import org.jeecg.boot.starter.lock.enums.GlobalConstant;
-import org.redisson.config.Config;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 主从方式Redisson配置
- * 配置方式: 127.0.0.1:6379(主),127.0.0.1:6380(子),127.0.0.1:6381(子)
- *
- * @author zyf
- * @date 2020-11-11
- */
-@Slf4j
-public class MasterslaveRedissonConfigStrategyImpl implements RedissonConfigStrategy {
-
- @Override
- public Config createRedissonConfig(RedissonProperties redissonProperties) {
- Config config = new Config();
- try {
- String address = redissonProperties.getAddress();
- String password = redissonProperties.getPassword();
- int database = redissonProperties.getDatabase();
- String[] addrTokens = address.split(",");
- String masterNodeAddr = addrTokens[0];
- // 设置主节点ip
- config.useMasterSlaveServers().setMasterAddress(masterNodeAddr);
- if (StringUtils.isNotBlank(password)) {
- config.useMasterSlaveServers().setPassword(password);
- }
- config.useMasterSlaveServers().setDatabase(database);
- // 设置从节点，移除第一个节点，默认第一个为主节点
- List slaveList = new ArrayList<>();
- for (String addrToken : addrTokens) {
- slaveList.add(GlobalConstant.REDIS_CONNECTION_PREFIX + addrToken);
- }
- slaveList.remove(0);
-
- config.useMasterSlaveServers().addSlaveAddress((String[]) slaveList.toArray());
- log.info("初始化主从方式Config,redisAddress:" + address);
- } catch (Exception e) {
- log.error("主从Redisson初始化错误", e);
- e.printStackTrace();
- }
- return config;
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/SentinelRedissonConfigStrategyImpl.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/SentinelRedissonConfigStrategyImpl.java
deleted file mode 100644
index a900d83a..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/SentinelRedissonConfigStrategyImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.jeecg.boot.starter.lock.core.strategy.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.boot.starter.lock.core.strategy.RedissonConfigStrategy;
-import org.jeecg.boot.starter.lock.prop.RedissonProperties;
-import org.jeecg.boot.starter.lock.enums.GlobalConstant;
-import org.redisson.config.Config;
-
-
-/**
- * 哨兵方式Redis连接配置
- * 比如sentinel.conf里配置为sentinel monitor my-sentinel-name 127.0.0.1 6379 2,那么这里就配置my-sentinel-name
- * 配置方式:my-sentinel-name,127.0.0.1:26379,127.0.0.1:26389,127.0.0.1:26399
- * @author zyf
- * @date 2020-11-11
- */
-@Slf4j
-public class SentinelRedissonConfigStrategyImpl implements RedissonConfigStrategy {
-
- @Override
- public Config createRedissonConfig(RedissonProperties redissonProperties) {
- Config config = new Config();
- try {
- String address = redissonProperties.getAddress();
- String password = redissonProperties.getPassword();
- int database = redissonProperties.getDatabase();
- String[] addrTokens = address.split(",");
- String sentinelAliasName = addrTokens[0];
- // 设置redis配置文件sentinel.conf配置的sentinel别名
- config.useSentinelServers().setMasterName(sentinelAliasName);
- config.useSentinelServers().setDatabase(database);
- if (StringUtils.isNotBlank(password)) {
- config.useSentinelServers().setPassword(password);
- }
- // 设置哨兵节点的服务IP和端口
- for (int i = 1; i < addrTokens.length; i++) {
- config.useSentinelServers().addSentinelAddress(GlobalConstant.REDIS_CONNECTION_PREFIX+ addrTokens[i]);
- }
- log.info("初始化哨兵方式Config,redisAddress:" + address);
- } catch (Exception e) {
- log.error("哨兵Redisson初始化错误", e);
- e.printStackTrace();
- }
- return config;
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/StandaloneRedissonConfigStrategyImpl.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/StandaloneRedissonConfigStrategyImpl.java
deleted file mode 100644
index 3d96217d..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/core/strategy/impl/StandaloneRedissonConfigStrategyImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.jeecg.boot.starter.lock.core.strategy.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.boot.starter.lock.core.strategy.RedissonConfigStrategy;
-import org.jeecg.boot.starter.lock.prop.RedissonProperties;
-import org.jeecg.boot.starter.lock.enums.GlobalConstant;
-import org.redisson.config.Config;
-
-
-/**
- * 单机方式Redisson配置
- *
- * @author zyf
- * @date 2020-11-11
- */
-@Slf4j
-public class StandaloneRedissonConfigStrategyImpl implements RedissonConfigStrategy {
-
- @Override
- public Config createRedissonConfig(RedissonProperties redissonProperties) {
- Config config = new Config();
- try {
- String address = redissonProperties.getAddress();
- String password = redissonProperties.getPassword();
- int database = redissonProperties.getDatabase();
- String redisAddr = GlobalConstant.REDIS_CONNECTION_PREFIX + address;
- config.useSingleServer().setAddress(redisAddr);
- config.useSingleServer().setDatabase(database);
- if (StringUtils.isNotBlank(password)) {
- config.useSingleServer().setPassword(password);
- }
- log.info("初始化Redisson单机配置,连接地址:" + address);
- } catch (Exception e) {
- log.error("单机Redisson初始化错误", e);
- e.printStackTrace();
- }
- return config;
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/GlobalConstant.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/GlobalConstant.java
deleted file mode 100644
index 5c7b2c93..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/GlobalConstant.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.jeecg.boot.starter.lock.enums;
-
-/**
- * 全局常量枚举
- *
- * @author zyf
- * @date 2020-11-11
- */
-
-public interface GlobalConstant {
-
- /**
- * Redis地址连接前缀
- */
- String REDIS_CONNECTION_PREFIX = "redis://";
-
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/LockModel.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/LockModel.java
deleted file mode 100644
index 3cef7ad5..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/LockModel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.jeecg.boot.starter.lock.enums;
-
-/**
- * 锁的模式
- * @author jeecg
- */
-public enum LockModel {
- //可重入锁
- REENTRANT,
- //公平锁
- FAIR,
- //联锁(可以把一组锁当作一个锁来加锁和释放)
- MULTIPLE,
- //红锁
- REDLOCK,
- //读锁
- READ,
- //写锁
- WRITE,
- //自动模式,当参数只有一个.使用 REENTRANT 参数多个 REDLOCK
- AUTO
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/RedisConnectionType.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/RedisConnectionType.java
deleted file mode 100644
index c41bad68..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/enums/RedisConnectionType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.jeecg.boot.starter.lock.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * Redis连接方式
- * @author zyf
- * @date 2020-11-11
- */
-@Getter
-@AllArgsConstructor
-public enum RedisConnectionType {
- /**
- * 单机部署方式(默认)
- */
- STANDALONE("standalone", "单机部署方式"),
- /**
- * 哨兵部署方式
- */
- SENTINEL("sentinel", "哨兵部署方式"),
- /**
- * 集群部署方式
- */
- CLUSTER("cluster", "集群方式"),
- /**
- * 主从部署方式
- */
- MASTERSLAVE("masterslave", "主从部署方式");
-
- /**
- * 编码
- */
- private final String code;
- /**
- * 名称
- */
- private final String name;
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/prop/RedissonProperties.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/prop/RedissonProperties.java
deleted file mode 100644
index 99676794..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/java/org/jeecg/boot/starter/lock/prop/RedissonProperties.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.jeecg.boot.starter.lock.prop;
-
-import lombok.Data;
-import org.jeecg.boot.starter.lock.enums.RedisConnectionType;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Redisson配置映射类
- *
- * @author zyf
- * @date 2020-11-11
- */
-@Data
-@ConfigurationProperties(prefix = "jeecg.redisson")
-public class RedissonProperties {
-
- /**
- * redis主机地址，ip：port，多个用逗号(,)分隔
- */
- private String address;
- /**
- * 连接类型
- */
- private RedisConnectionType type;
- /**
- * 密码
- */
- private String password;
- /**
- * 数据库(默认0)
- */
- private int database;
-
- /**
- * 是否装配redisson配置
- */
- private Boolean enabled = true;
-
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/resources/META-INF/spring.factories b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 4d782849..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.jeecg.boot.starter.lock.config.RedissonConfiguration
-
-
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockService.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockService.java
deleted file mode 100644
index 97b8dc19..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.jeecg.boot.starter.lock.test;
-
-import org.jeecg.boot.starter.lock.annotation.JLock;
-import org.jeecg.boot.starter.lock.annotation.JRepeat;
-import org.jeecg.boot.starter.lock.annotation.LockConstant;
-import org.jeecg.boot.starter.lock.client.RedissonLockClient;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service
-public class LockService {
-
- @Resource
- private RedissonLockClient redissonLockClient;
-
- int n = 10;
-
- /**
- * 模拟秒杀(注解方式)
- */
- @JLock(lockKey = "#productId", expireSeconds = 5000)
- public void seckill(String productId) {
- if (n <= 0) {
- System.out.println("活动已结束,请下次再来");
- return;
- }
- System.out.println(Thread.currentThread().getName() + ":秒杀到了商品");
- System.out.println(--n);
- }
-
- /**
- * 模拟秒杀(编程方式)
- */
- public void seckill2(String productId) {
- redissonLockClient.tryLock(productId, 5000);
- if (n <= 0) {
- System.out.println("活动已结束,请下次再来");
- return;
- }
- System.out.println(Thread.currentThread().getName() + ":秒杀到了商品");
- System.out.println(--n);
- redissonLockClient.unlock(productId);
- }
-
-
- /**
- * 测试重复提交
- */
- @JRepeat(lockKey = "#name", lockTime = 5)
- public void reSubmit(String name) {
- try {
- Thread.sleep(1500);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- System.out.println("提交成功" + name);
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTest.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTest.java
deleted file mode 100644
index cd0cc350..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.jeecg.boot.starter.lock.test;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.IntStream;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = LockTestApplication.class)
-public class LockTest {
- @Autowired
- LockService lockService;
-
- /**
- * 测试分布式锁(模拟秒杀)
- */
- @Test
- public void test1() throws Exception {
- ExecutorService executorService = Executors.newFixedThreadPool(6);
- IntStream.range(0, 30).forEach(i -> executorService.submit(() -> {
- try {
- lockService.seckill("20120508784");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }));
- executorService.awaitTermination(30, TimeUnit.SECONDS);
- }
-
- /**
- * 测试分布式锁(模拟秒杀)
- */
- @Test
- public void test2() throws Exception {
- ExecutorService executorService = Executors.newFixedThreadPool(6);
- IntStream.range(0, 30).forEach(i -> executorService.submit(() -> {
- try {
- lockService.seckill2("20120508784");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }));
- executorService.awaitTermination(30, TimeUnit.SECONDS);
- }
-
- /**
- * 测试分布式锁(模拟重复提交)
- */
- @Test
- public void test3() throws Exception {
- ExecutorService executorService = Executors.newFixedThreadPool(6);
- IntStream.range(0, 20).forEach(i -> executorService.submit(() -> {
- try {
- lockService.reSubmit("test");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }));
- executorService.awaitTermination(30, TimeUnit.SECONDS);
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTestApplication.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTestApplication.java
deleted file mode 100644
index 2696677f..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockTestApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.jeecg.boot.starter.lock.test;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-
-@SpringBootApplication(scanBasePackages = "org.jeecg")
-@EnableAspectJAutoProxy
-public class LockTestApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(LockTestApplication.class, args);
- }
-
-}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/TestUser.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/TestUser.java
deleted file mode 100644
index 71ed30c9..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/TestUser.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.jeecg.boot.starter.lock.test;
-
-import lombok.Data;
-
-@Data
-public class TestUser {
- private String userId;
- private String userName;
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/resources/application.yml b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/resources/application.yml
deleted file mode 100644
index d66a1619..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-lock/src/test/resources/application.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-spring:
- redis:
- database: 0
- host: 127.0.0.1
- lettuce:
- pool:
- max-active: 8 #最大连接数据库连接数,设 0 为没有限制
- max-idle: 8 #最大等待连接中的数量,设 0 为没有限制
- max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
- min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
- shutdown-timeout: 100ms
- password: jeecg
- port: 6379
-jeecg :
- redisson:
- address: 127.0.0.1:6379
- password: jeecg
- type: STANDALONE
- enabled: true
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/pom.xml b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/pom.xml
deleted file mode 100644
index 3292f14a..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- jeecg-boot-starter
- org.jeecgframework.boot
- 3.3.0
-
- 4.0.0
- jeecg-boot-starter-rabbitmq
- jeecg-boot-starter-消息队列
-
-
-
- org.springframework.cloud
- spring-cloud-starter-bus-amqp
-
-
-
-
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/client/RabbitMqClient.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/client/RabbitMqClient.java
deleted file mode 100644
index 388f7498..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/client/RabbitMqClient.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.client;
-
-
-import cn.hutool.core.util.ObjectUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.boot.starter.rabbitmq.event.EventObj;
-import org.jeecg.boot.starter.rabbitmq.event.JeecgRemoteApplicationEvent;
-import org.jeecg.boot.starter.rabbitmq.exchange.DelayExchangeBuilder;
-import org.jeecg.common.annotation.RabbitComponent;
-import org.jeecg.common.base.BaseMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.bus.BusProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.annotation.Resource;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * 消息队列客户端
- */
-@Slf4j
-@Configuration
-public class RabbitMqClient {
-
- private static final Logger logger = LoggerFactory.getLogger(RabbitMqClient.class);
-
- private final RabbitAdmin rabbitAdmin;
-
- private final RabbitTemplate rabbitTemplate;
-
-
- @Resource
- private SimpleMessageListenerContainer messageListenerContainer;
-
- @Resource
- BusProperties busProperties;
- @Resource
- private ApplicationEventPublisher publisher;
-
-
- @Resource
- private ApplicationContext applicationContext;
-
-
- @Bean
- public void initQueue() {
- Map beansWithRqbbitComponentMap = this.applicationContext.getBeansWithAnnotation(RabbitComponent.class);
- Class clazz = null;
- for (Map.Entry entry : beansWithRqbbitComponentMap.entrySet()) {
- log.info("初始化队列............");
- //获取到实例对象的class信息
- clazz = entry.getValue().getClass();
- Method[] methods = clazz.getMethods();
- RabbitListener rabbitListener = clazz.getAnnotation(RabbitListener.class);
- if (ObjectUtil.isNotEmpty(rabbitListener)) {
- createQueue(rabbitListener);
- }
- for (Method method : methods) {
- RabbitListener methodRabbitListener = method.getAnnotation(RabbitListener.class);
- if (ObjectUtil.isNotEmpty(methodRabbitListener)) {
- createQueue(methodRabbitListener);
- }
- }
-
- }
- }
-
- /**
- * 初始化队列
- *
- * @param rabbitListener
- */
- private void createQueue(RabbitListener rabbitListener) {
- String[] queues = rabbitListener.queues();
- DirectExchange directExchange = createExchange(DelayExchangeBuilder.DELAY_EXCHANGE);
- //创建交换机
- rabbitAdmin.declareExchange(directExchange);
- if (ObjectUtil.isNotEmpty(queues)) {
- for (String queueName : queues) {
- Properties result = rabbitAdmin.getQueueProperties(queueName);
- if (ObjectUtil.isEmpty(result)) {
- Queue queue = new Queue(queueName);
- addQueue(queue);
- Binding binding = BindingBuilder.bind(queue).to(directExchange).with(queueName);
- rabbitAdmin.declareBinding(binding);
- log.info("创建队列:" + queueName);
- }else{
- log.info("已有队列:" + queueName);
- }
- }
- }
- }
-
-
- private Map sentObj = new HashMap<>();
-
-
- @Autowired
- public RabbitMqClient(RabbitAdmin rabbitAdmin, RabbitTemplate rabbitTemplate) {
- this.rabbitAdmin = rabbitAdmin;
- this.rabbitTemplate = rabbitTemplate;
- }
-
-
- /**
- * 发送远程事件
- *
- * @param handlerName
- * @param baseMap
- */
- public void publishEvent(String handlerName, BaseMap baseMap) {
- EventObj eventObj = new EventObj();
- eventObj.setHandlerName(handlerName);
- eventObj.setBaseMap(baseMap);
- publisher.publishEvent(new JeecgRemoteApplicationEvent(eventObj, busProperties.getId()));
- }
-
- /**
- * 转换Message对象
- *
- * @param messageType 返回消息类型 MessageProperties类中常量
- * @param msg
- * @return
- */
- public Message getMessage(String messageType, Object msg) {
- MessageProperties messageProperties = new MessageProperties();
- messageProperties.setContentType(messageType);
- Message message = new Message(msg.toString().getBytes(), messageProperties);
- return message;
- }
-
- /**
- * 有绑定Key的Exchange发送
- *
- * @param routingKey
- * @param msg
- */
- public void sendMessageToExchange(TopicExchange topicExchange, String routingKey, Object msg) {
- Message message = getMessage(MessageProperties.CONTENT_TYPE_JSON, msg);
- rabbitTemplate.send(topicExchange.getName(), routingKey, message);
- }
-
- /**
- * 没有绑定KEY的Exchange发送
- *
- * @param exchange
- * @param msg
- */
- public void sendMessageToExchange(TopicExchange topicExchange, AbstractExchange exchange, String msg) {
- addExchange(exchange);
- logger.info("RabbitMQ send " + exchange.getName() + "->" + msg);
- rabbitTemplate.convertAndSend(topicExchange.getName(), msg);
- }
-
-
- /**
- * 发送消息
- *
- * @param queueName 队列名称
- * @param params 消息内容map
- */
- public void sendMessage(String queueName, Object params) {
- log.info("发送消息到mq");
- try {
- rabbitTemplate.convertAndSend(DelayExchangeBuilder.DELAY_EXCHANGE, queueName, params, message -> {
- return message;
- });
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 发送消息
- *
- * @param queueName 队列名称
- */
- public void sendMessage(String queueName) {
- this.send(queueName, this.sentObj, 0);
- this.sentObj.clear();
- }
-
-
- public RabbitMqClient put(String key, Object value) {
- this.sentObj.put(key, value);
- return this;
- }
-
- /**
- * 延迟发送消息
- *
- * @param queueName 队列名称
- * @param params 消息内容params
- * @param expiration 延迟时间 单位毫秒
- */
- public void sendMessage(String queueName, Object params, Integer expiration) {
- this.send(queueName, params, expiration);
- }
-
- private void send(String queueName, Object params, Integer expiration) {
- Queue queue = new Queue(queueName);
- addQueue(queue);
- CustomExchange customExchange = DelayExchangeBuilder.buildExchange();
- rabbitAdmin.declareExchange(customExchange);
- Binding binding = BindingBuilder.bind(queue).to(customExchange).with(queueName).noargs();
- rabbitAdmin.declareBinding(binding);
- SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- log.debug("发送时间：" + sf.format(new Date()));
- rabbitTemplate.convertAndSend(DelayExchangeBuilder.DEFAULT_DELAY_EXCHANGE, queueName, params, message -> {
- if (expiration != null && expiration > 0) {
- message.getMessageProperties().setHeader("x-delay", expiration);
- }
- return message;
- });
- }
-
-
- /**
- * 给queue发送消息
- *
- * @param queueName
- */
- public String receiveFromQueue(String queueName) {
- return receiveFromQueue(DirectExchange.DEFAULT, queueName);
- }
-
- /**
- * 给direct交换机指定queue发送消息
- *
- * @param directExchange
- * @param queueName
- */
- public String receiveFromQueue(DirectExchange directExchange, String queueName) {
- Queue queue = new Queue(queueName);
- addQueue(queue);
- Binding binding = BindingBuilder.bind(queue).to(directExchange).withQueueName();
- rabbitAdmin.declareBinding(binding);
- String messages = (String) rabbitTemplate.receiveAndConvert(queueName);
- System.out.println("Receive:" + messages);
- return messages;
- }
-
- /**
- * 创建Exchange
- *
- * @param exchange
- */
- public void addExchange(AbstractExchange exchange) {
- rabbitAdmin.declareExchange(exchange);
- }
-
- /**
- * 删除一个Exchange
- *
- * @param exchangeName
- */
- public boolean deleteExchange(String exchangeName) {
- return rabbitAdmin.deleteExchange(exchangeName);
- }
-
-
- /**
- * 声明其名称自动命名的队列。它是用exclusive=true、autoDelete=true和 durable = false
- *
- * @return Queue
- */
- public Queue addQueue() {
- return rabbitAdmin.declareQueue();
- }
-
- /**
- * 创建一个指定的Queue
- *
- * @param queue
- * @return queueName
- */
- public String addQueue(Queue queue) {
- return rabbitAdmin.declareQueue(queue);
- }
-
- /**
- * 删除一个队列
- *
- * @param queueName the name of the queue.
- * @param unused true if the queue should be deleted only if not in use.
- * @param empty true if the queue should be deleted only if empty.
- */
- public void deleteQueue(String queueName, boolean unused, boolean empty) {
- rabbitAdmin.deleteQueue(queueName, unused, empty);
- }
-
- /**
- * 删除一个队列
- *
- * @param queueName
- * @return true if the queue existed and was deleted.
- */
- public boolean deleteQueue(String queueName) {
- return rabbitAdmin.deleteQueue(queueName);
- }
-
- /**
- * 绑定一个队列到一个匹配型交换器使用一个routingKey
- *
- * @param queue
- * @param exchange
- * @param routingKey
- */
- public void addBinding(Queue queue, TopicExchange exchange, String routingKey) {
- Binding binding = BindingBuilder.bind(queue).to(exchange).with(routingKey);
- rabbitAdmin.declareBinding(binding);
- }
-
- /**
- * 绑定一个Exchange到一个匹配型Exchange 使用一个routingKey
- *
- * @param exchange
- * @param topicExchange
- * @param routingKey
- */
- public void addBinding(Exchange exchange, TopicExchange topicExchange, String routingKey) {
- Binding binding = BindingBuilder.bind(exchange).to(topicExchange).with(routingKey);
- rabbitAdmin.declareBinding(binding);
- }
-
- /**
- * 去掉一个binding
- *
- * @param binding
- */
- public void removeBinding(Binding binding) {
- rabbitAdmin.removeBinding(binding);
- }
-
- /**
- * 创建交换器
- *
- * @param exchangeName
- * @return
- */
- public DirectExchange createExchange(String exchangeName) {
- return new DirectExchange(exchangeName, true, false);
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/config/RabbitMqConfig.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/config/RabbitMqConfig.java
deleted file mode 100644
index 9644dc9a..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/config/RabbitMqConfig.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.config;
-
-
-import java.util.UUID;
-
-import org.jeecg.boot.starter.rabbitmq.event.JeecgRemoteApplicationEvent;
-import org.jeecg.common.config.mqtoken.TransmitUserTokenFilter;
-import org.springframework.amqp.core.AcknowledgeMode;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
-import org.springframework.amqp.support.ConsumerTagStrategy;
-import org.springframework.cloud.bus.jackson.RemoteApplicationEventScan;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 消息队列配置类
- *
- * @author zyf
- */
-@Configuration
-@RemoteApplicationEventScan(basePackageClasses = JeecgRemoteApplicationEvent.class)
-public class RabbitMqConfig {
-
-
- @Bean
- public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) {
- RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory);
- //设置忽略声明异常
- rabbitAdmin.setIgnoreDeclarationExceptions(true);
- return rabbitAdmin;
- }
-
- /**
- * 注入获取token过滤器
- * @return
- */
- @Bean
- public TransmitUserTokenFilter transmitUserInfoFromHttpHeader(){
- return new TransmitUserTokenFilter();
- }
-
- @Bean
- public SimpleMessageListenerContainer messageListenerContainer(ConnectionFactory connectionFactory) {
- SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
- container.setConnectionFactory(connectionFactory);
- //手动确认
- container.setAcknowledgeMode(AcknowledgeMode.MANUAL);
- //当前的消费者数量
- container.setConcurrentConsumers(1);
- //最大的消费者数量
- container.setMaxConcurrentConsumers(1);
- //是否重回队列
- container.setDefaultRequeueRejected(true);
-
- //消费端的标签策略
- container.setConsumerTagStrategy(new ConsumerTagStrategy() {
- @Override
- public String createConsumerTag(String queue) {
- return queue + "_" + UUID.randomUUID().toString();
- }
- });
- return container;
- }
-
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/core/BaseRabbiMqHandler.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/core/BaseRabbiMqHandler.java
deleted file mode 100644
index 2c0c2fdd..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/core/BaseRabbiMqHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.core;
-
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
-import org.jeecg.common.config.mqtoken.UserTokenContext;
-
-import java.io.IOException;
-
-/**
- *
- * @author zyf
- */
-@Slf4j
-public class BaseRabbiMqHandler {
-
- private String token= UserTokenContext.getToken();
-
- public void onMessage(T t, Long deliveryTag, Channel channel, MqListener mqListener) {
- try {
- UserTokenContext.setToken(token);
- mqListener.handler(t, channel);
- channel.basicAck(deliveryTag, false);
- } catch (Exception e) {
- log.info("接收消息失败,重新放回队列");
- try {
- /**
- * deliveryTag:该消息的index
- * multiple：是否批量.true:将一次性拒绝所有小于deliveryTag的消息。
- * requeue：被拒绝的是否重新入队列
- */
- channel.basicNack(deliveryTag, false, true);
- } catch (IOException ex) {
- ex.printStackTrace();
- }
- }
-
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/core/MapMessageConverter.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/core/MapMessageConverter.java
deleted file mode 100644
index b5f0a0b4..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/core/MapMessageConverter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.core;
-
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageProperties;
-import org.springframework.amqp.support.converter.MessageConversionException;
-import org.springframework.amqp.support.converter.MessageConverter;
-
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-public class MapMessageConverter implements MessageConverter {
- @Override
- public Message toMessage(Object object, MessageProperties messageProperties) throws MessageConversionException {
- return new Message(object.toString().getBytes(), messageProperties);
- }
-
- @Override
- public Object fromMessage(Message message) throws MessageConversionException {
- String contentType = message.getMessageProperties().getContentType();
- if (null != contentType && contentType.contains("text")) {
- return new String(message.getBody());
- } else {
- ObjectInputStream objInt = null;
- try {
- ByteArrayInputStream byteInt = new ByteArrayInputStream(message.getBody());
- objInt = new ObjectInputStream(byteInt);
- //byte[]转map
- Map map = (HashMap) objInt.readObject();
- return map;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return null;
-
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/BaseApplicationEvent.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/BaseApplicationEvent.java
deleted file mode 100644
index 9a996a31..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/BaseApplicationEvent.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.event;
-
-import cn.hutool.core.util.ObjectUtil;
-
-import org.jeecg.common.util.SpringContextHolder;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-
-/**
- * 监听远程事件,并分发消息到业务模块消息处理器
- */
-@Component
-public class BaseApplicationEvent implements ApplicationListener {
-
- @Override
- public void onApplicationEvent(JeecgRemoteApplicationEvent jeecgRemoteApplicationEvent) {
- EventObj eventObj = jeecgRemoteApplicationEvent.getEventObj();
- if (ObjectUtil.isNotEmpty(eventObj)) {
- //获取业务模块消息处理器
- JeecgBusEventHandler busEventHandler = SpringContextHolder.getHandler(eventObj.getHandlerName(), JeecgBusEventHandler.class);
- if (ObjectUtil.isNotEmpty(busEventHandler)) {
- //通知业务模块
- busEventHandler.onMessage(eventObj);
- }
- }
- }
-
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/EventObj.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/EventObj.java
deleted file mode 100644
index 295597b6..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/EventObj.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.event;
-
-import lombok.Data;
-import org.jeecg.common.base.BaseMap;
-
-import java.io.Serializable;
-
-/**
- * 远程事件数据对象
- */
-@Data
-public class EventObj implements Serializable {
- /**
- * 数据对象
- */
- private BaseMap baseMap;
- /**
- * 自定义业务模块消息处理器beanName
- */
- private String handlerName;
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/JeecgBusEventHandler.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/JeecgBusEventHandler.java
deleted file mode 100644
index 9153054b..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/JeecgBusEventHandler.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.event;
-
-/**
- * 业务模块消息处理器接口
- */
-public interface JeecgBusEventHandler {
- void onMessage(EventObj map);
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/JeecgRemoteApplicationEvent.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/JeecgRemoteApplicationEvent.java
deleted file mode 100644
index 036f97b6..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/event/JeecgRemoteApplicationEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.event;
-
-import lombok.Data;
-import org.springframework.cloud.bus.event.RemoteApplicationEvent;
-
-/**
- * 自定义网关刷新远程事件
- *
- * @author : zyf
- * @date :2020-11-10
- */
-@Data
-public class JeecgRemoteApplicationEvent extends RemoteApplicationEvent {
-
- private JeecgRemoteApplicationEvent() {
- }
-
- private EventObj eventObj;
-
- public JeecgRemoteApplicationEvent(EventObj source, String originService, String destinationService) {
- super(source, originService, destinationService);
- this.eventObj = source;
- }
-
- public JeecgRemoteApplicationEvent(EventObj source, String originService) {
- super(source, originService, "");
- this.eventObj = source;
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/exchange/DelayExchangeBuilder.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/exchange/DelayExchangeBuilder.java
deleted file mode 100644
index 3a0f5169..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/exchange/DelayExchangeBuilder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.exchange;
-
-import org.springframework.amqp.core.CustomExchange;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 延迟交换器构造器
- * @author: zyf
- * @date: 2019/3/8 13:31
- * @description:
- */
-public class DelayExchangeBuilder {
- /**
- * 默认延迟消息交换器
- */
- public final static String DEFAULT_DELAY_EXCHANGE = "jeecg.delayed.exchange";
- /**
- * 普通交换器
- */
- public final static String DELAY_EXCHANGE = "jeecg.direct.exchange";
-
- /**
- * 构建延迟消息交换器
- * @return
- */
- public static CustomExchange buildExchange() {
- Map args = new HashMap();
- args.put("x-delayed-type", "direct");
- return new CustomExchange(DEFAULT_DELAY_EXCHANGE, "x-delayed-message", true, false, args);
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/listenter/MqListener.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/listenter/MqListener.java
deleted file mode 100644
index 6bc46a29..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/listenter/MqListener.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.jeecg.boot.starter.rabbitmq.listenter;
-
-import com.rabbitmq.client.Channel;
-
-public interface MqListener {
-
- default void handler(T map, Channel channel) {
- }
-
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-seata/pom.xml b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-seata/pom.xml
deleted file mode 100644
index 60573841..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-seata/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- jeecg-boot-starter
- org.jeecgframework.boot
- 3.3.0
-
- 4.0.0
- jeecg-boot-starter-seata
- 分布式事务
-
-
-
- io.seata
- seata-spring-boot-starter
- 1.4.2
-
-
- com.alibaba.nacos
- nacos-client
- 1.3.3
-
-
-
-
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/pom.xml b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/pom.xml
deleted file mode 100644
index bb8f3324..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
- jeecg-boot-starter
- org.jeecgframework.boot
- 3.3.0
-
- 4.0.0
- jeecg-boot-starter-shardingsphere
- 分库分表
-
-
-
- com.baomidou
- dynamic-datasource-spring-boot-starter
- ${dynamic-datasource-spring-boot-starter.version}
-
-
-
- org.apache.shardingsphere
- shardingsphere-jdbc-core-spring-boot-starter
- 5.0.0
-
-
-
-
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/src/main/java/org/jeecg/boot/shardingsphere/config/DataSourceConfiguration.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/src/main/java/org/jeecg/boot/shardingsphere/config/DataSourceConfiguration.java
deleted file mode 100644
index 8d87329b..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/src/main/java/org/jeecg/boot/shardingsphere/config/DataSourceConfiguration.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.jeecg.boot.shardingsphere.config;
-
-import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
-import com.baomidou.dynamic.datasource.provider.AbstractDataSourceProvider;
-import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider;
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Primary;
-
-import javax.annotation.Resource;
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * 分库分表数据源配置
- * @author zyf
- */
-@Configuration
-@AutoConfigureBefore({DynamicDataSourceAutoConfiguration.class, SpringBootConfiguration.class})
-public class DataSourceConfiguration {
- /**
- * 分表数据源名称
- */
- public static final String SHARDING_DATA_SOURCE_NAME = "sharding";
- /**
- * 动态数据源配置项
- */
- @Resource
- private DynamicDataSourceProperties dynamicDataSourceProperties;
-
- @Lazy
- @Resource
- DataSource shardingDataSource;
-
- /**
- * 将shardingDataSource放到了多数据源（dataSourceMap）中
- * 注意有个版本的bug，3.1.1版本 不会进入loadDataSources 方法，这样就一直造成数据源注册失败
- */
- @Bean
- public DynamicDataSourceProvider dynamicDataSourceProvider() {
- Map datasourceMap = dynamicDataSourceProperties.getDatasource();
- return new AbstractDataSourceProvider() {
- @Override
- public Map loadDataSources() {
- Map dataSourceMap = createDataSourceMap(datasourceMap);
- // 将 shardingjdbc 管理的数据源也交给动态数据源管理
- dataSourceMap.put(SHARDING_DATA_SOURCE_NAME, shardingDataSource);
- return dataSourceMap;
- }
- };
- }
-
- /**
- * 将动态数据源设置为首选的
- * 当spring存在多个数据源时, 自动注入的是首选的对象
- * 设置为主要的数据源之后，就可以支持shardingjdbc原生的配置方式了
- *
- * @return
- */
- @Primary
- @Bean
- public DataSource dataSource(DynamicDataSourceProvider dynamicDataSourceProvider) {
- DynamicRoutingDataSource dataSource = new DynamicRoutingDataSource();
- dataSource.setPrimary(dynamicDataSourceProperties.getPrimary());
- dataSource.setStrict(dynamicDataSourceProperties.getStrict());
- dataSource.setStrategy(dynamicDataSourceProperties.getStrategy());
- dataSource.setProvider(dynamicDataSourceProvider);
- dataSource.setP6spy(dynamicDataSourceProperties.getP6spy());
- dataSource.setSeata(dynamicDataSourceProperties.getSeata());
- return dataSource;
- }
-}
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/src/main/resources/application.yml b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/src/main/resources/application.yml
deleted file mode 100644
index c3437522..00000000
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-shardingsphere/src/main/resources/application.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-spring:
- profiles:
- active: sharding
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-starter/pom.xml b/jeecg-boot/jeecg-boot-starter/pom.xml
deleted file mode 100644
index 1d24580d..00000000
--- a/jeecg-boot/jeecg-boot-starter/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
- org.jeecgframework.boot
- jeecg-boot-parent
- 3.3.0
-
- 4.0.0
- jeecg-boot-starter
- pom
-
-
- 1.8
- UTF-8
-
-
-
- jeecg-boot-starter-cloud
- jeecg-boot-starter-job
- jeecg-boot-starter-lock
- jeecg-boot-starter-rabbitmq
- jeecg-boot-starter-shardingsphere
- jeecg-boot-starter-seata
-
-
-
-
- org.jeecgframework.boot
- jeecg-boot-base-tools
-
-
-
- org.springframework.boot
- spring-boot-autoconfigure
-
-
- org.springframework.boot
- spring-boot-configuration-processor
- true
-
-
-
-
-
-
-
- maven-compiler-plugin
-
- 1.8
- 1.8
- UTF-8
-
-
-
-
-
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/docker-compose-base.yml b/jeecg-boot/jeecg-cloud-module/docker-compose-base.yml
index b2682017..6d44c4d8 100644
--- a/jeecg-boot/jeecg-cloud-module/docker-compose-base.yml
+++ b/jeecg-boot/jeecg-cloud-module/docker-compose-base.yml
@@ -27,12 +27,14 @@ services:
container_name: jeecg-boot-redis
hostname: jeecg-boot-redis
-# jeecg-boot-rabbitmq:
-# # image: rabbitmq:3-management
-# image: rabbitmq:3
-# ports:
-# - 5672:5672
-# # - 15672:15672
-# restart: always
-# container_name: jeecg-boot-rabbitmq
-# hostname: jeecg-boot-rabbitmq
+ jeecg-boot-rabbitmq:
+ image: rabbitmq:3.7.7-management
+ ports:
+ - 5672:5672
+ - 15672:15672
+ restart: always
+ container_name: jeecg-boot-rabbitmq
+ hostname: jeecg-boot-rabbitmq
+ environment:
+ RABBITMQ_DEFAULT_USER: guest
+ RABBITMQ_DEFAULT_PASS: guest
diff --git a/jeecg-boot/jeecg-cloud-module/docker-compose.yml b/jeecg-boot/jeecg-cloud-module/docker-compose.yml
index 2e7c0516..2ae58403 100644
--- a/jeecg-boot/jeecg-cloud-module/docker-compose.yml
+++ b/jeecg-boot/jeecg-cloud-module/docker-compose.yml
@@ -13,8 +13,8 @@ services:
depends_on:
- jeecg-boot-nacos
build:
- context: ./jeecg-cloud-system-start
- container_name: jeecg-boot-system
+ context: ./jeecg-system-cloud-start
+ container_name: jeecg-system-start
hostname: jeecg-boot-system
restart: on-failure
environment:
@@ -24,8 +24,8 @@ services:
depends_on:
- jeecg-boot-nacos
build:
- context: ../jeecg-boot-module-demo
- container_name: jeecg-boot-demo
+ context: ./jeecg-demo-cloud-start
+ container_name: jeecg-demo-start
hostname: jeecg-boot-demo
restart: on-failure
environment:
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/Dockerfile b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/Dockerfile
index 504ba08b..364a1b62 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/Dockerfile
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-gateway
EXPOSE 9999
-ADD ./target/jeecg-cloud-gateway-3.3.0.jar ./
+ADD ./target/jeecg-cloud-gateway-3.4.0.jar ./
-CMD sleep 50;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.3.0.jar
\ No newline at end of file
+CMD sleep 50;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-gateway-3.4.0.jar
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/README.md b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/README.md
index b10d2a7e..78813e6e 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/README.md
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/README.md
@@ -1,7 +1,3 @@
-# 服务化改造手册
+http://localhost:9999
-~~~
-注意 ：启动服务跨域问题处理
-1、需要将common 模块的 WebMvcConfiguration corsFilter 注掉 后面做成注解切换
-2、org.jeecg.config.shiro.filters.JwtFilter类的 65行，跨域代码注释掉
-~~~
\ No newline at end of file
+提示：在未启动服务实例情况下，看的接口文档为空
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml
index f56fd899..107dac56 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-module
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
jeecg-cloud-gateway
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java
index 35dc7028..3da36d24 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java
@@ -31,8 +31,8 @@ public class JeecgGatewayApplication implements CommandLineRunner {
public static void main(String[] args) {
ConfigurableApplicationContext applicationContext = SpringApplication.run(JeecgGatewayApplication.class, args);
- String userName = applicationContext.getEnvironment().getProperty("jeecg.test");
- System.err.println("user name :" +userName);
+ //String userName = applicationContext.getEnvironment().getProperty("jeecg.test");
+ //System.err.println("user name :" +userName);
}
/**
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java
index 1d9a5da0..fc6ae189 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java
@@ -28,7 +28,7 @@ public class GatewayRoutersConfig {
this.serverAddr = serverAddr;
}
- @Value("${spring.cloud.nacos.discovery.namespace}")
+ @Value("${spring.cloud.nacos.discovery.namespace:#{null}}")
public void setNamespace(String namespace) {
this.namespace = namespace;
}
@@ -48,12 +48,12 @@ public class GatewayRoutersConfig {
this.dataType = dataType;
}
- @Value("${spring.cloud.nacos.config.username}")
+ @Value("${spring.cloud.nacos.config.username:#{null}}")
public void setUsername(String username) {
this.username = username;
}
- @Value("${spring.cloud.nacos.config.password}")
+ @Value("${spring.cloud.nacos.config.password:#{null}}")
public void setPassword(String password) {
this.password = password;
}
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java
index ee525723..6101029f 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/loader/DynamicRouteLoader.java
@@ -339,9 +339,15 @@ public class DynamicRouteLoader implements ApplicationEventPublisherAware {
try {
Properties properties = new Properties();
properties.setProperty("serverAddr", gatewayRoutersConfig.getServerAddr());
- properties.setProperty("namespace", gatewayRoutersConfig.getNamespace());
- properties.setProperty("username", gatewayRoutersConfig.getUsername());
- properties.setProperty("password", gatewayRoutersConfig.getPassword());
+ if(StringUtils.isNotBlank(gatewayRoutersConfig.getNamespace())){
+ properties.setProperty("namespace", gatewayRoutersConfig.getNamespace());
+ }
+ if(StringUtils.isNotBlank( gatewayRoutersConfig.getUsername())){
+ properties.setProperty("username", gatewayRoutersConfig.getUsername());
+ }
+ if(StringUtils.isNotBlank(gatewayRoutersConfig.getPassword())){
+ properties.setProperty("password", gatewayRoutersConfig.getPassword());
+ }
return configService = NacosFactory.createConfigService(properties);
} catch (Exception e) {
log.error("创建ConfigService异常", e);
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml
index b4484340..987f7a44 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml
@@ -1,13 +1,32 @@
server:
port: 9999
+
spring:
application:
name: jeecg-gateway
main:
- #循环依赖默认情况下已经被禁止了
allow-circular-references: true
- allow-bean-definition-overriding: true
+ config:
+ import:
+ - optional:nacos:${spring.application.name}-@profile.name@.yaml
cloud:
+ nacos:
+ config:
+ server-addr: @config.server-addr@
+ discovery:
+ server-addr: ${spring.cloud.nacos.config.server-addr}
+ gateway:
+ discovery:
+ locator:
+ enabled: true
+ globalcors:
+ cors-configurations:
+ '[/**]':
+ allowCredentials: true
+ #springboot2.4后需用allowedOriginPatterns
+ allowedOriginPatterns: "*"
+ allowedMethods: "*"
+ allowedHeaders: "*"
#Sentinel配置
sentinel:
transport:
@@ -79,36 +98,4 @@ spring:
dataId: ${spring.application.name}-api-rules
groupId: SENTINEL_GROUP
rule-type: gw-api-group
- data-type: json
- gateway:
- discovery:
- locator:
- enabled: true
- globalcors:
- cors-configurations:
- '[/**]':
- allowCredentials: true
- #springboot2.4后需用allowedOriginPatterns
- allowedOriginPatterns: "*"
- allowedMethods: "*"
- allowedHeaders: "*"
-# httpclient:
-# connect-timeout: 1000
-# response-timeout: 5s
-# # Nacos的yml方式路由配置(默认注释掉，采用数据库加载)
-# - id: jeecg-demo
-# uri: lb://jeecg-demo
-# predicates:
-# - Path=/mock/**,/test/**,/bigscreen/template1/**,/bigscreen/template2/**
-# - id: jeecg-system
-# uri: lb://jeecg-system
-# predicates:
-# - Path=/sys/**,/eoa/**,/v1/**,/joa/**,/online/**,/bigscreen/**,/jmreport/**,/desform/**,/act/**,/plug-in/**,/generic/**
-# - id: jeecg-system-websocket
-# uri: lb:ws://jeecg-system
-# predicates:
-# - Path=/websocket/**,/eoaSocket/**,/newsWebsocket/**
-# - id: jeecg-demo-websocket
-# uri: lb:ws://jeecg-demo
-# predicates:
-# - Path=/vxeSocket/**
\ No newline at end of file
+ data-type: json
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/README.md b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/README.md
new file mode 100644
index 00000000..2ed8dfd9
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/README.md
@@ -0,0 +1,2 @@
+http://localhost:9111
+账号密码：admin/admin
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/pom.xml
index 7e961c69..8dd02cf1 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-monitor/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-module
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
jeecg-cloud-monitor
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/Dockerfile b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/Dockerfile
index 0ed7e579..f1e0b844 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/Dockerfile
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-nacos
EXPOSE 8848
-ADD ./target/jeecg-cloud-nacos-3.3.0.jar ./
+ADD ./target/jeecg-cloud-nacos-3.4.0.jar ./
-CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.3.0.jar
\ No newline at end of file
+CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-nacos-3.4.0.jar
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/README.md b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/README.md
new file mode 100644
index 00000000..50023da0
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/README.md
@@ -0,0 +1,11 @@
+访问地址: http://localhost:8848/nacos
+账号密码：nacos/nacos
+
+
+# 使用方法
+
+- 1、目前只做了关闭鉴权模式
+- 2、此项目与官方同步，只是为了简化微服务部署
+- 3、如何不用此模块，使用自己的naocs，请创建下面目录中的配置文件
+ 目录：jeecg-cloud-nacos/docs/config
+ 配置文件： YAML
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml
new file mode 100644
index 00000000..99a0f12f
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-dev.yaml
@@ -0,0 +1,146 @@
+spring:
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: true
+ loginUsername: admin
+ loginPassword: 123456
+ allow:
+ web-stat-filter:
+ enabled: true
+ dynamic:
+ druid:
+ initial-size: 5
+ min-idle: 5
+ maxActive: 20
+ maxWait: 60000
+ timeBetweenEvictionRunsMillis: 60000
+ minEvictableIdleTimeMillis: 300000
+ validationQuery: SELECT 1 FROM DUAL
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ poolPreparedStatements: true
+ maxPoolPreparedStatementPerConnectionSize: 20
+ filters: stat,wall,slf4j
+ connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
+ datasource:
+ master:
+ url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ username: root
+ password: root
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ redis:
+ database: 0
+ host: jeecg-boot-redis
+ password:
+ port: 6379
+ rabbitmq:
+ host: jeecg-boot-rabbitmq
+ username: guest
+ password: guest
+ port: 5672
+ publisher-confirms: true
+ publisher-returns: true
+ virtual-host: /
+ listener:
+ simple:
+ acknowledge-mode: manual
+ concurrency: 1
+ max-concurrency: 1
+ retry:
+ enabled: true
+minidao:
+ base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*
+jeecg:
+ signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
+ signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
+ uploadType: local
+ domainUrl:
+ pc: http://localhost:3100
+ app: http://localhost:8051
+ path:
+ upload: /opt/upFiles
+ webapp: /opt/webapp
+ shiro:
+ excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
+ oss:
+ endpoint: oss-cn-beijing.aliyuncs.com
+ accessKey: ??
+ secretKey: ??
+ bucketName: jeecgdev
+ staticDomain: ??
+ elasticsearch:
+ cluster-name: jeecg-ES
+ cluster-nodes: jeecg-boot-es:9200
+ check-enabled: false
+ file-view-domain: 127.0.0.1:8012
+ minio:
+ minio_url: http://minio.jeecg.com
+ minio_name: ??
+ minio_pass: ??
+ bucketName: otatest
+ jmreport:
+ mode: dev
+ is_verify_token: false
+ verify_methods: remove,delete,save,add,update
+ wps:
+ domain: https://wwo.wps.cn/office/
+ appid: ??
+ appsecret: ??
+ xxljob:
+ enabled: false
+ adminAddresses: http://jeecg-boot-xxljob:9080/xxl-job-admin
+ appname: ${spring.application.name}
+ accessToken: ''
+ logPath: logs/jeecg/job/jobhandler/
+ logRetentionDays: 30
+ redisson:
+ address: jeecg-boot-redis:6379
+ password:
+ type: STANDALONE
+ enabled: true
+logging:
+ level:
+ org.jeecg.modules.system.mapper : info
+cas:
+ prefixUrl: http://localhost:8888/cas
+knife4j:
+ production: false
+ basic:
+ enable: false
+ username: jeecg
+ password: jeecg1314
+justauth:
+ enabled: true
+ type:
+ GITHUB:
+ client-id: ??
+ client-secret: ??
+ redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/github/callback
+ WECHAT_ENTERPRISE:
+ client-id: ??
+ client-secret: ??
+ redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/wechat_enterprise/callback
+ agent-id: ??
+ DINGTALK:
+ client-id: ??
+ client-secret: ??
+ redirect-uri: http://sso.test.com:8080/jeecg-boot/thirdLogin/dingtalk/callback
+ cache:
+ type: default
+ prefix: 'demo::'
+ timeout: 1h
+third-app:
+ enabled: false
+ type:
+ WECHAT_ENTERPRISE:
+ enabled: false
+ client-id: ??
+ client-secret: ??
+ agent-id: ??
+ DINGTALK:
+ enabled: false
+ client-id: ??
+ client-secret: ??
+ agent-id: ??
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml
new file mode 100644
index 00000000..0ac5bed7
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-dev.yaml
@@ -0,0 +1,13 @@
+jeecg:
+ route:
+ config:
+ #type:database nacos yml
+ data-type: database
+ group: DEFAULT_GROUP
+ data-id: jeecg-gateway-router
+spring:
+ redis:
+ database: 0
+ host: jeecg-boot-redis
+ port: 6379
+ password:
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-gateway-router.json b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json
similarity index 68%
rename from jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-gateway-router.json
rename to jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json
index a9120ced..58f70cfb 100644
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-gateway-router.json
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json
@@ -5,16 +5,9 @@
"name": "Path",
"args": {
"_genkey_0": "/sys/**",
- "_genkey_1": "/eoa/**",
- "_genkey_2": "/joa/**",
- "_genkey_3": "/jmreport/**",
- "_genkey_4": "/bigscreen/**",
- "_genkey_5": "/desform/**",
- "_genkey_6": "/online/**",
- "_genkey_8": "/act/**",
- "_genkey_9": "/plug-in/**",
- "_genkey_10": "/generic/**",
- "_genkey_11": "/v1/**"
+ "_genkey_1": "/jmreport/**",
+ "_genkey_3": "/online/**",
+ "_genkey_4": "/generic/**"
}
}],
"filters": [],
@@ -40,8 +33,7 @@
"name": "Path",
"args": {
"_genkey_0": "/websocket/**",
- "_genkey_1": "/eoaSocket/**",
- "_genkey_2": "/newsWebsocket/**"
+ "_genkey_1": "/newsWebsocket/**"
}
}],
"filters": [],
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg.yaml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg.yaml
similarity index 64%
rename from jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg.yaml
rename to jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg.yaml
index 99ab1cca..5178eba9 100644
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg.yaml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/docs/config/jeecg.yaml
@@ -16,12 +16,12 @@ management:
endpoints:
web:
exposure:
- include: "*" #暴露所有节点
+ include: "*"
health:
- sensitive: true #关闭过滤敏感信息
+ sensitive: true
endpoint:
health:
- show-details: ALWAYS #显示详细信息
+ show-details: ALWAYS
spring:
servlet:
multipart:
@@ -38,15 +38,11 @@ spring:
starttls:
enable: true
required: true
- ## quartz定时任务,采用数据库方式
quartz:
job-store-type: jdbc
initialize-schema: embedded
- #设置自动启动，默认为 true
- auto-startup: true
- #延迟1秒启动定时任务
+ auto-startup: false
startup-delay: 1s
- #启动时更新己存在的Job
overwrite-existing-jobs: true
properties:
org:
@@ -55,18 +51,17 @@ spring:
instanceName: MyScheduler
instanceId: AUTO
jobStore:
- class: org.quartz.impl.jdbcjobstore.JobStoreTX
+ class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
tablePrefix: QRTZ_
isClustered: true
- misfireThreshold: 60000
- clusterCheckinInterval: 10000
+ misfireThreshold: 12000
+ clusterCheckinInterval: 15000
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 10
threadPriority: 5
threadsInheritContextClassLoaderOfInitializingThread: true
- #json 时间戳统一转换
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
@@ -74,46 +69,32 @@ spring:
proxy-target-class: true
activiti:
check-process-definitions: false
- #启用作业执行器
async-executor-activate: false
- #启用异步执行器
job-executor-activate: false
jpa:
open-in-view: false
- #配置freemarker
freemarker:
- # 设置模板后缀名
suffix: .ftl
- # 设置文档类型
content-type: text/html
- # 设置页面编码格式
charset: UTF-8
- # 设置页面缓存
cache: false
prefer-file-system-access: false
- # 设置ftl文件路径
template-loader-path:
- classpath:/templates
- # 设置静态文件路径，js,css等
mvc:
static-path-pattern: /**
+ pathmatch:
+ matching-strategy: ant_path_matcher
resource:
static-locations: classpath:/static/,classpath:/public/
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
global-config:
- # 关闭MP3.0自带的banner
banner: false
db-config:
- #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
id-type: ASSIGN_ID
- # 默认数据库表下划线命名
table-underline: true
configuration:
- # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
- #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
- # 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml
index a82925f1..2377f3bb 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-nacos
jeecg-cloud-nacos
nacos启动模块
- 3.3.0
+ 3.4.0
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java
index 91881b21..fbc7dc59 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/java/com/alibaba/nacos/JeecgNacosApplication.java
@@ -19,14 +19,9 @@ import javax.servlet.http.HttpServletResponse;
@EnableScheduling
public class JeecgNacosApplication {
- /**
- * 是否单机模式启动
- */
+ /** 是否单机模式启动 */
private static String standalone = "true";
-
- /**
- * 是否开启鉴权
- */
+ /** 是否开启鉴权 */
private static String enabled = "false";
public static void main(String[] args) {
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/Dockerfile b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/Dockerfile
index f2323079..1b89f6ac 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/Dockerfile
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/Dockerfile
@@ -10,6 +10,6 @@ WORKDIR /jeecg-cloud-sentinel
EXPOSE 8848
-ADD ./target/jeecg-cloud-sentinel-3.3.0.jar ./
+ADD ./target/jeecg-cloud-sentinel-3.4.0.jar ./
-CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.3.0.jar
+CMD sleep 5;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-sentinel-3.4.0.jar
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/README.md b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/README.md
index 1db789a8..b3f2b778 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/README.md
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/README.md
@@ -4,6 +4,6 @@
# 使用方法
-- 1、第一次登录sentinel内容是空的，必须访问了微服务实例才有配置
+- 1、第一次登录sentinel内容是空的，必须访问了微服务实例的请求才会出现配置
- 2、sentinel做了深度改造，支持持久化到nacos中
- 3、目前只针对gateway做的控制，其他服务不需要
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/pom.xml
index fd113378..5e33f1e8 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/pom.xml
@@ -5,31 +5,12 @@
jeecg-cloud-module
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
jeecg-cloud-sentinel
jeecg-cloud-sentinel
sentinel启动模块
-
-
- aliyun
- aliyun Repository
- https://maven.aliyun.com/repository/public
-
- false
-
-
-
- jeecg
- jeecg Repository
- https://maven.jeecg.org/nexus/content/repositories/jeecg
-
- false
-
-
-
-
org.jeecgframework.cloud
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java
index f82a592a..8326ae99 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/nacos/SentinelConfig.java
@@ -24,6 +24,7 @@ import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.*;
import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.AuthorityRuleCorrectEntity;
import com.alibaba.csp.sentinel.dashboard.rule.nacos.entity.ParamFlowRuleCorrectEntity;
import com.alibaba.nacos.api.PropertyKeyConst;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -150,8 +151,12 @@ public class SentinelConfig {
public ConfigService nacosConfigService() throws Exception {
Properties properties=new Properties();
properties.put(PropertyKeyConst.SERVER_ADDR,nacosConfigProperties.getServerAddr());
- properties.put(PropertyKeyConst.USERNAME,nacosConfigProperties.getUsername());
- properties.put(PropertyKeyConst.PASSWORD,nacosConfigProperties.getPassword());
+ if(StringUtils.isNotBlank(nacosConfigProperties.getUsername())){
+ properties.put(PropertyKeyConst.USERNAME,nacosConfigProperties.getUsername());
+ }
+ if(StringUtils.isNotBlank(nacosConfigProperties.getPassword())){
+ properties.put(PropertyKeyConst.PASSWORD,nacosConfigProperties.getPassword());
+ }
return ConfigFactory.createConfigService(properties);
}
}
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/resources/application.yml
index 98d0c3d8..551dd725 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/resources/application.yml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-sentinel/src/main/resources/application.yml
@@ -32,8 +32,6 @@ logging:
nacos:
server:
ip: @config.server-addr@
- password: @config.password@
- username: @config.username@
sentinel:
dashboard:
version: 1.8.2
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-dev.yml
deleted file mode 100644
index e69de29b..00000000
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application.yml
deleted file mode 100644
index ac7e96ff..00000000
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-server:
- #微服务端口
- port: 7001
-spring:
- application:
- name: jeecg-system
-# cloud:
-# #Sentinel持久化配置
-# sentinel:
-# transport:
-# dashboard: jeecg-boot-sentinel:9000
-# datasource:
-# #流控规则
-# flow: # 指定数据源名称
-# # 指定nacos数据源
-# nacos:
-# server-addr: @config.server-addr@
-# # 指定配置文件
-# dataId: ${spring.application.name}-flow-rules
-# # 指定分组
-# groupId: SENTINEL_GROUP
-# # 指定配置文件规则类型
-# rule-type: flow
-# # 指定配置文件数据格式
-# data-type: json
-# #降级规则
-# degrade:
-# nacos:
-# server-addr: @config.server-addr@
-# dataId: ${spring.application.name}-degrade-rules
-# groupId: SENTINEL_GROUP
-# rule-type: degrade
-# data-type: json
-# #系统规则
-# system:
-# nacos:
-# server-addr: @config.server-addr@
-# dataId: ${spring.application.name}-system-rules
-# groupId: SENTINEL_GROUP
-# rule-type: system
-# data-type: json
-# #授权规则
-# authority:
-# nacos:
-# server-addr: @config.server-addr@
-# dataId: ${spring.application.name}-authority-rules
-# groupId: SENTINEL_GROUP
-# rule-type: authority
-# data-type: json
-# #热点参数
-# param-flow:
-# nacos:
-# server-addr: @config.server-addr@
-# dataId: ${spring.application.name}-param-rules
-# groupId: SENTINEL_GROUP
-# rule-type: param-flow
-# data-type: json
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml
index ed2d4cc8..4784603d 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-more/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-test
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
公共测试模块
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml
index 57ec276c..40c9eead 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-rabbitmq/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-test
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
消息队列测试模块
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml
index 562bee64..c765ab47 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-test-seata
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
分布式事务测试模块
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml
index 4b359731..1b260f1c 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-test-seata
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
分布式事务测试模块
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml
index 979c2a2c..fd02b7ec 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-test-seata
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
分布式事务测试模块
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
index 53cb8246..9bc4d694 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-test
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
jeecg-cloud-test-seata
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml
index 0825150f..1f1db90b 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-test
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/pom.xml
index 3f1b10cf..af40a4c7 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-test/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-module
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/Dockerfile b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/Dockerfile
index 4f0c1916..b688644a 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/Dockerfile
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/Dockerfile
@@ -10,7 +10,7 @@ WORKDIR /jeecg-cloud-xxljob
EXPOSE 9080
-ADD ./target/jeecg-cloud-xxljob-3.3.0.jar ./
+ADD ./target/jeecg-cloud-xxljob-3.4.0.jar ./
-CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.3.0.jar
+CMD java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-xxljob-3.4.0.jar
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/README.md b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/README.md
index 68e6f81d..ddef2ad8 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/README.md
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/README.md
@@ -1,6 +1,6 @@
-- 初始化数据库(mysql)
+- 初始化脚本(mysql)
- jeecg-cloud-xxljob\doc\db\tables_xxl_job.sql
+ db\tables_xxl_job.sql
- 修改数据库连接
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/pom.xml
index b431a90c..a6c02c3f 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/pom.xml
@@ -5,7 +5,7 @@
jeecg-cloud-module
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/src/main/resources/application.yml
index e6226d54..b64afae4 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/src/main/resources/application.yml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-xxljob/src/main/resources/application.yml
@@ -6,8 +6,8 @@ server:
spring:
datasource:
url: jdbc:mysql://jeecg-boot-mysql:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- username: root
- password: root
+ username: ${MYSQL-USER:root}
+ password: ${MYSQL-PWD:root}
driver-class-name: com.mysql.jdbc.Driver
type: com.zaxxer.hikari.HikariDataSource
hikari:
diff --git a/jeecg-boot/jeecg-boot-module-demo/Dockerfile b/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/Dockerfile
similarity index 57%
rename from jeecg-boot/jeecg-boot-module-demo/Dockerfile
rename to jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/Dockerfile
index 5e55c39b..19db8414 100644
--- a/jeecg-boot/jeecg-boot-module-demo/Dockerfile
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/Dockerfile
@@ -4,12 +4,12 @@ MAINTAINER jeecgos@163.com
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-RUN mkdir -p /jeecg-cloud-demo
+RUN mkdir -p /jeecg-demo-cloud
-WORKDIR /jeecg-cloud-demo
+WORKDIR /jeecg-demo-cloud
EXPOSE 7002
-ADD ./target/jeecg-boot-module-demo-3.3.0.jar ./
+ADD ./target/jeecg-demo-cloud-start-3.4.0.jar ./
-CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-boot-module-demo-3.3.0.jar
\ No newline at end of file
+CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-demo-cloud-start-3.4.0.jar
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/pom.xml
new file mode 100644
index 00000000..79b421e1
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/pom.xml
@@ -0,0 +1,41 @@
+
+
+
+ jeecg-cloud-module
+ org.jeecgframework.boot
+ 3.4.0
+
+ 4.0.0
+
+ jeecg-demo-cloud-start
+ Demo微服务启动
+
+
+
+
+ org.jeecgframework.boot
+ jeecg-boot-starter-cloud
+
+
+ org.jeecgframework.boot
+ jeecg-boot-starter-job
+
+
+
+ org.jeecgframework.boot
+ jeecg-boot-module-demo
+ ${jeecgboot.version}
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/src/main/java/JeecgDemoCloudApplication.java b/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/src/main/java/JeecgDemoCloudApplication.java
new file mode 100644
index 00000000..650ec4ff
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/src/main/java/JeecgDemoCloudApplication.java
@@ -0,0 +1,35 @@
+package org.jeecg;
+
+import org.jeecg.common.base.BaseMap;
+import org.jeecg.common.constant.GlobalConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.redis.core.RedisTemplate;
+
+@SpringBootApplication
+@EnableFeignClients
+public class JeecgDemoCloudApplication implements CommandLineRunner {
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ public static void main(String[] args) {
+ SpringApplication.run(JeecgDemoCloudApplication.class, args);
+ }
+
+ /**
+ * 启动的时候，触发下gateway网关刷新
+ *
+ * 解决： 先启动gateway后启动服务，Swagger接口文档访问不通的问题
+ * @param args
+ */
+ @Override
+ public void run(String... args) {
+ BaseMap params = new BaseMap();
+ params.put(GlobalConstants.HANDLER_NAME, GlobalConstants.LODER_ROUDER_HANDLER);
+ //刷新网关
+ redisTemplate.convertAndSend(GlobalConstants.REDIS_TOPIC_NAME, params);
+ }
+}
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/src/main/resources/application.yml
new file mode 100644
index 00000000..9632ac27
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-demo-cloud-start/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+server:
+ port: 7002
+
+spring:
+ application:
+ name: jeecg-demo
+ cloud:
+ nacos:
+ config:
+ server-addr: @config.server-addr@
+ discovery:
+ server-addr: ${spring.cloud.nacos.config.server-addr}
+ config:
+ import:
+ - optional:nacos:jeecg.yaml
+ - optional:nacos:jeecg-@profile.name@.yaml
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/Dockerfile b/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/Dockerfile
similarity index 56%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/Dockerfile
rename to jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/Dockerfile
index 34017834..14b42360 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/Dockerfile
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/Dockerfile
@@ -4,12 +4,12 @@ MAINTAINER jeecgos@163.com
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-RUN mkdir -p /jeecg-cloud-system
+RUN mkdir -p /jeecg-system-cloud
-WORKDIR /jeecg-cloud-system
+WORKDIR /jeecg-system-cloud
EXPOSE 7001
-ADD ./target/jeecg-cloud-system-start-3.3.0.jar ./
+ADD ./target/jeecg-system-cloud-start-3.4.0.jar ./
-CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-cloud-system-start-3.3.0.jar
\ No newline at end of file
+CMD sleep 10;java -Dfile.encoding=utf-8 -Djava.security.egd=file:/dev/./urandom -jar jeecg-system-cloud-start-3.4.0.jar
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/pom.xml
similarity index 90%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
rename to jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/pom.xml
index f28da18c..d8a4db06 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/pom.xml
@@ -5,11 +5,11 @@
jeecg-cloud-module
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
- jeecg-cloud-system-start
- System项目微服务启动
+ jeecg-system-cloud-start
+ System微服务启动
@@ -37,12 +37,12 @@
-
+
-
+
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java b/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
similarity index 100%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
rename to jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/src/main/java/org/jeecg/JeecgSystemCloudApplication.java
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/src/main/resources/application.yml
new file mode 100644
index 00000000..8db4d80f
--- /dev/null
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+server:
+ #微服务端口
+ port: 7001
+spring:
+ application:
+ name: jeecg-system
+ cloud:
+ nacos:
+ config:
+ server-addr: @config.server-addr@
+ discovery:
+ server-addr: ${spring.cloud.nacos.config.server-addr}
+ config:
+ import:
+ - optional:nacos:jeecg.yaml
+ - optional:nacos:jeecg-@profile.name@.yaml
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/logback-spring.xml b/jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/src/main/resources/logback-spring.xml
similarity index 100%
rename from jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/logback-spring.xml
rename to jeecg-boot/jeecg-cloud-module/jeecg-system-cloud-start/src/main/resources/logback-spring.xml
diff --git a/jeecg-boot/jeecg-cloud-module/pom.xml b/jeecg-boot/jeecg-cloud-module/pom.xml
index db9867d8..8f60438e 100644
--- a/jeecg-boot/jeecg-cloud-module/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/pom.xml
@@ -5,20 +5,24 @@
jeecg-boot-parent
org.jeecgframework.boot
- 3.3.0
+ 3.4.0
4.0.0
jeecg-cloud-module
pom
+ jeecg-system-cloud-start
+ jeecg-demo-cloud-start
jeecg-cloud-gateway
+
+
jeecg-cloud-nacos
jeecg-cloud-sentinel
jeecg-cloud-monitor
- jeecg-cloud-system-start
jeecg-cloud-xxljob
- jeecg-cloud-test
+
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 8ecee4c0..3c671eaa 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -2,7 +2,7 @@
4.0.0
org.jeecgframework.boot
jeecg-boot-parent
- 3.3.0
+ 3.4.0
pom
JEECG BOOT ${project.version}
@@ -14,14 +14,14 @@
- 3.3.0
+ 3.4.0
1.8
UTF-8
-
+
false
2021.0.3
- 2021.1
+ 2021.0.1.0
2.0.4
2.2.0
@@ -70,18 +70,6 @@
jeecg-boot-module-system
-
-
- jeecg
- jeecg Repository
- http://maven.jeecg.com:8090/nexus/content/repositories/jeecg
-
-
- jeecg-snapshots
- jeecg Snapshot Repository
- http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/
-
-
aliyun
@@ -99,6 +87,17 @@
false
+
+ jeecg-snapshots
+ jeecg-snapshots Repository
+ https://oss.sonatype.org/content/repositories/snapshots
+
+ false
+
+
+ true
+
+
@@ -154,7 +153,7 @@
org.jeecgframework.boot
- jeecg-boot-base-tools
+ jeecg-boot-common
${jeecgboot.version}
@@ -241,39 +240,7 @@
dom4j
${dom4j.version}