添加了不知道什么

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.2.61'
+        kotlin_version = '1.3.10'
         springBootVersion = '2.0.1.RELEASE'
         springCloudVersion = 'Finchley.SR1'
         junit_version = '4.12'
@@ -8,7 +8,14 @@ buildscript {
         commons_lang3_version = '3.5'
         commons_codec_version = '1.10'
         commons_fileupload_version = '1.3.2'
+        mysql_connector_version = '5.1.45'
+        mybatisPlusVersion = '3.0.3'
         slf4j_api_version = '1.7.25'
+        rxJavaVersion='2.2.3'
+        jwtVersion = '1.4.0'
+        authVersion='1.2'
+        shiro_version = '1.4.0'
+        swagger_version = '2.7.0'
     }
     repositories {
         mavenCentral()
@@ -45,6 +52,13 @@ subprojects {
     repositories {
         mavenCentral()
         jcenter()
+        maven {
+            url("https://repo.rdc.aliyun.com/repository/37165-release-a3lssL")
+            credentials {
+                username 'Dz38pq'
+                password 'U1oB2RJOJa'
+            }
+        }
     }
 
     dependencyManagement {
@@ -55,7 +69,6 @@ subprojects {
 
     configurations{
         all*.exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
-        all*.exclude group: 'org.hibernate.validator'
     }
 
 
@@ -66,24 +79,49 @@ subprojects {
 
         kapt("org.springframework.boot:spring-boot-configuration-processor")
         // SpringBoot Starter
-
+        compile 'org.springframework.cloud:spring-cloud-starter-bus-amqp'
+        compile('org.springframework.boot:spring-boot-starter-web')
+        compile('org.springframework.boot:spring-boot-starter-actuator')
         compile('org.springframework.cloud:spring-cloud-config-server')
         compile('org.springframework.boot:spring-boot-starter-jetty')
-        compile('org.springframework.boot:spring-boot-starter-security')
+        compile('org.springframework.boot:spring-boot-starter-jdbc')
+        compile('org.springframework.boot:spring-boot-starter-cache')
+        compile("org.springframework.session:spring-session-data-redis")
+        compile('org.springframework.boot:spring-boot-starter-data-redis')
+        compile('redis.clients:jedis:2.9.0')
 
         compile('org.springframework.cloud:spring-cloud-starter-netflix-eureka-server')
-//        compile('org.springframework.cloud:spring-cloud-starter-openfeign')
+        compile('org.springframework.cloud:spring-cloud-starter-openfeign')
+
 //
         // commons
         compile("commons-io:commons-io:$commons_io_version")
         compile("org.apache.commons:commons-lang3:$commons_lang3_version")
         compile("commons-codec:commons-codec:$commons_codec_version")
 
+        compile("cn.gygxzc.cloud:jwt-session:$jwtVersion")
+        compile("cn.gygxzc.cloud:tina-auth:$authVersion")
+        compile("io.reactivex.rxjava2:rxjava:$rxJavaVersion")
+        compile("org.apache.shiro:shiro-spring:$shiro_version")
+
         // logger
         compile("org.slf4j:slf4j-api:$slf4j_api_version")
         compile("javax.servlet:javax.servlet-api:3.1.0")
         compile("javax.servlet:servlet-api:2.5")
-
+        
+        compile("mysql:mysql-connector-java:$mysql_connector_version")
+        compile("org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.1")
+        compile("com.baomidou:mybatis-plus-boot-starter:$mybatisPlusVersion")
+
+        // swagger
+        compile("io.springfox:springfox-swagger2:$swagger_version")
+        compile("io.springfox:springfox-swagger-ui:$swagger_version")
+
+        compile 'io.jsonwebtoken:jjwt-api:0.10.5'
+        runtime 'io.jsonwebtoken:jjwt-impl:0.10.5',
+                'io.jsonwebtoken:jjwt-jackson:0.10.5'
+        
+        
         ext.jarTree = fileTree(dir: 'libs', include: '**/*.jar')
         compile jarTree
     }

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/bus/RabbitConfiguration.kt

@@ -0,0 +1,21 @@
+package cn.gygxzc.cloud.config.bus
+
+import org.springframework.amqp.core.Queue
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+/**
+ * @author tuonina
+ * @createTime 2019/4/12
+ *
+ */
+@Configuration
+class RabbitConfiguration {
+
+
+    @Bean
+    fun configQueue(): Queue {
+        return Queue("config")
+    }
+
+}

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/controller/PropertyMgrController.kt

@@ -0,0 +1,52 @@
+package cn.gygxzc.cloud.config.controller
+
+import cn.gygxzc.cloud.config.model.ConfigProperty
+import cn.gygxzc.cloud.config.service.IConfigPropService
+import com.baomidou.mybatisplus.core.metadata.IPage
+import io.swagger.annotations.Api
+import io.swagger.annotations.ApiOperation
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.web.bind.annotation.*
+
+/**
+ * @author tuonina
+ * @createTime 2019/4/12
+ * 后去新增或者修改配置之后需要通过bus 通知服务，并且修改配置应该需要审核
+ * 前期没有这个需求，不需要去做这些东西
+ */
+@RestController
+@Api("管理系统的属性")
+@RequestMapping("/v1/mgr/config/property")
+class PropertyMgrController {
+
+    @Autowired
+    private lateinit var propService: IConfigPropService
+
+    @PostMapping
+    @ApiOperation("添加系统的属性")
+    fun addProp(@RequestBody prop: ConfigProperty) {
+        propService.addProp(prop)
+    }
+
+    @PutMapping("/{id}")
+    @ApiOperation("更新系统配置信息")
+    fun updateProps(@RequestBody prop: ConfigProperty,
+                    @PathVariable("id") id: Int) {
+        prop.id = id
+        propService.updateById(prop)
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation("删除系统配置信息")
+    fun delete(@PathVariable("id") id: Int) {
+        propService.deleteById(id)
+    }
+
+    @GetMapping
+    @ApiOperation("条件查询系统配置信息")
+    fun query(cond: ConfigProperty,
+              @RequestParam("current") page: Long,
+              @RequestParam("pageSize") pageSize: Long): IPage<ConfigProperty> {
+        return propService.query(cond, page, pageSize)
+    }
+}

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/dao/IPropertyDao.kt

@@ -0,0 +1,14 @@
+package cn.gygxzc.cloud.config.dao
+
+import cn.gygxzc.cloud.config.model.ConfigProperty
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.springframework.stereotype.Repository
+
+/**
+ * @author tuonina
+ * @createTime 2019/4/12
+ *
+ */
+@Repository
+interface IPropertyDao : BaseMapper<ConfigProperty> {
+}

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/model/ConfigProperty.kt

@@ -0,0 +1,30 @@
+package cn.gygxzc.cloud.config.model
+
+import com.baomidou.mybatisplus.annotation.IdType
+import com.baomidou.mybatisplus.annotation.TableField
+import com.baomidou.mybatisplus.annotation.TableId
+import com.baomidou.mybatisplus.annotation.TableName
+import java.util.*
+
+/**
+ * @author tuonina
+ * @createTime 2019/4/12
+ * 系统配置表
+ */
+@TableName("properties")
+data class ConfigProperty(@TableId(type = IdType.AUTO)
+                          var id: Int? = null,
+                          @TableField("`key`")
+                          var key: String? = null,
+                          @TableField("`value`")
+                          var value: String? = null,
+                          var application: String? = null,
+                          var profile: String? = null,
+                          var label: String? = null,
+                          var createBy: String? = null,
+                          var createTime: Date? = null,
+                          var updateTime: Date? = null,
+                          var updateBy: String? = null,
+                          var desc: String? = null,
+                          var remark: String? = null) {
+}

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/IConfigPropService.kt

@@ -0,0 +1,23 @@
+package cn.gygxzc.cloud.config.service
+
+import cn.gygxzc.cloud.config.model.ConfigProperty
+import com.baomidou.mybatisplus.core.metadata.IPage
+
+/**
+ * @author tuonina
+ * @createTime 2019/4/12
+ *
+ */
+interface IConfigPropService {
+
+
+    fun addProp(prop: ConfigProperty)
+
+    fun deleteById(id: Int)
+
+
+    fun updateById(prop: ConfigProperty)
+
+    fun query(prop: ConfigProperty, page: Long, pageSize: Long): IPage<ConfigProperty>
+
+}

envir-config/src/main/kotlin/cn/gygxzc/cloud/config/service/impl/ConfigPropService.kt

@@ -0,0 +1,48 @@
+package cn.gygxzc.cloud.config.service.impl
+
+import cn.gygxzc.cloud.config.dao.IPropertyDao
+import cn.gygxzc.cloud.config.model.ConfigProperty
+import cn.gygxzc.cloud.config.service.IConfigPropService
+import cn.gygxzc.tina.cloud.jwt.session.utils.SessionUtils
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
+import com.baomidou.mybatisplus.core.metadata.IPage
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Service
+import java.util.*
+
+/**
+ * @author tuonina
+ * @createTime 2019/4/12
+ *
+ */
+@Service
+class ConfigPropService : IConfigPropService {
+
+    @Autowired
+    private lateinit var propDao: IPropertyDao
+
+    override fun addProp(prop: ConfigProperty) {
+        prop.createBy = SessionUtils.getAccount()
+        prop.createTime = Date()
+        propDao.insert(prop)
+    }
+
+    override fun deleteById(id: Int) {
+        propDao.deleteById(id)
+    }
+
+    override fun updateById(prop: ConfigProperty) {
+        prop.updateBy = SessionUtils.getAccount()
+        prop.updateTime = Date()
+        propDao.updateById(prop)
+    }
+
+    override fun query(prop: ConfigProperty,
+                       page: Long, pageSize: Long): IPage<ConfigProperty> {
+        val queryWrapper = QueryWrapper<ConfigProperty>(prop)
+        return propDao.selectPage(Page(page, pageSize), queryWrapper)
+    }
+
+
+}

eureka-web/build.gradle

@@ -13,6 +13,10 @@ apply plugin: 'docker'
 apply plugin: 'application'
 
 
+dependencies{
+    compile project(':envir-config')
+}
+
 //复制jar到指定的文件夹中
 task copyJar() {
     print('copy  jar ')

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/MainApplication.java

@@ -1,18 +1,28 @@
 package cn.gygxzc.cloud.tina.eureka;
 
+import cn.gygxzc.cloud.tina.auth.EnableTinaAuth;
+import cn.gygxzc.tina.cloud.jwt.session.EnableJwtRedisSession;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.amqp.rabbit.annotation.EnableRabbit;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.cloud.config.server.EnableConfigServer;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * Created by niantuo on 2018/10/19.
  * 注册中心服务
  */
-
+@EnableRabbit
+@EnableTinaAuth
 @EnableEurekaServer
 @EnableConfigServer
-@SpringBootApplication(scanBasePackages = {"cn.gygxzc"})
+@EnableFeignClients
+@EnableJwtRedisSession
+@MapperScan("cn.gygxzc.**.dao")
+@SpringBootApplication(scanBasePackages = {"cn.gygxzc.cloud"}, exclude = {RedisAutoConfiguration.class})
 public class MainApplication {
 
     public static void main(String[] args) {

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/config/MybatisPlusConfig.java

@@ -0,0 +1,45 @@
+package cn.gygxzc.cloud.tina.eureka.config;
+
+import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
+import com.baomidou.mybatisplus.core.injector.ISqlInjector;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * @author tuonina
+ * @createTime 2019/4/12
+ */
+@Configuration
+@EnableTransactionManagement
+public class MybatisPlusConfig {
+
+    @Bean
+    public ISqlInjector sqlInjector() {
+        return new DefaultSqlInjector();
+    }
+
+    /**
+     * 性能分析插件
+     * // 开发环境开启
+     */
+    @Bean
+    @Profile("dev")
+    public PerformanceInterceptor performanceInterceptor() {
+        return new PerformanceInterceptor()
+                .setFormat(true);
+    }
+
+    /**
+     * 分页插件
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+
+
+}

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/config/RedisAutoConfiguration.java

@@ -0,0 +1,68 @@
+package cn.gygxzc.cloud.tina.eureka.config;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cache.CacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.text.SimpleDateFormat;
+
+/**
+ * Created by niantuo on 2018/11/1.
+ * redis 缓存配置
+ */
+@Configuration
+@ConditionalOnClass(RedisOperations.class)
+@EnableConfigurationProperties(RedisProperties.class)
+public class RedisAutoConfiguration {
+
+
+    @Primary
+    @Bean("redisCacheManager")
+    public CacheManager cacheManager(RedisConnectionFactory connectionFactory) {
+        return RedisCacheManager.create(connectionFactory);
+
+    }
+
+    @Primary
+    @Bean("redisTemplate")
+    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        RedisTemplate<Object, Object> template = new RedisTemplate<>();
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+        template.setKeySerializer(stringRedisSerializer);
+        template.setHashKeySerializer(stringRedisSerializer);
+
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
+        objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
+
+        GenericJackson2JsonRedisSerializer jsonRedisSerializer = new GenericJackson2JsonRedisSerializer(objectMapper);
+        template.setValueSerializer(jsonRedisSerializer);
+        template.setHashValueSerializer(jsonRedisSerializer);
+        template.setConnectionFactory(redisConnectionFactory);
+        return template;
+    }
+
+    @Bean
+    @Primary
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        StringRedisTemplate template = new StringRedisTemplate();
+        template.setConnectionFactory(redisConnectionFactory);
+        return template;
+    }
+
+
+}

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/config/WebSecurityConfig.java

@@ -1,18 +0,0 @@
-package cn.gygxzc.cloud.tina.eureka.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-/**
- * Created by niantuo on 2018/12/12.
- */
-@Configuration
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable(); //关闭csrf
-        http.authorizeRequests().anyRequest().authenticated().and().httpBasic(); //开启认证
-    }
-}

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/config/redis/JedisConnectionConfiguration.java

@@ -0,0 +1,126 @@
+package cn.gygxzc.cloud.tina.eureka.config.redis;
+
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.data.redis.JedisClientConfigurationBuilderCustomizer;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.connection.RedisClusterConfiguration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisSentinelConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisConnection;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.util.StringUtils;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPoolConfig;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Created by niantuo on 2018/11/1.
+ * Jedis 配置
+ */
+
+@Configuration
+@EnableConfigurationProperties(RedisProperties.class)
+@ConditionalOnClass({GenericObjectPool.class, JedisConnection.class, Jedis.class})
+public class JedisConnectionConfiguration extends RedisConnectionConfiguration {
+
+    private final RedisProperties properties;
+
+    private final List<JedisClientConfigurationBuilderCustomizer> builderCustomizers;
+
+    JedisConnectionConfiguration(RedisProperties properties,
+                                 ObjectProvider<RedisSentinelConfiguration> sentinelConfiguration,
+                                 ObjectProvider<RedisClusterConfiguration> clusterConfiguration,
+                                 ObjectProvider<List<JedisClientConfigurationBuilderCustomizer>> builderCustomizers) {
+        super(properties, sentinelConfiguration, clusterConfiguration);
+        this.properties = properties;
+        this.builderCustomizers = builderCustomizers
+                .getIfAvailable(Collections::emptyList);
+    }
+
+    @Bean
+    @Primary
+    public RedisConnectionFactory redisConnectionFactory() {
+        return createJedisConnectionFactory();
+    }
+
+    private JedisConnectionFactory createJedisConnectionFactory() {
+        JedisClientConfiguration clientConfiguration = getJedisClientConfiguration();
+        if (getSentinelConfig() != null) {
+            return new JedisConnectionFactory(getSentinelConfig(), clientConfiguration);
+        }
+        if (getClusterConfiguration() != null) {
+            return new JedisConnectionFactory(getClusterConfiguration(),
+                    clientConfiguration);
+        }
+        return new JedisConnectionFactory(getStandaloneConfig(), clientConfiguration);
+    }
+
+    private JedisClientConfiguration getJedisClientConfiguration() {
+        JedisClientConfiguration.JedisClientConfigurationBuilder builder = applyProperties(
+                JedisClientConfiguration.builder());
+        RedisProperties.Pool pool = this.properties.getJedis().getPool();
+        if (pool != null) {
+            applyPooling(pool, builder);
+        }
+        if (StringUtils.hasText(this.properties.getUrl())) {
+            customizeConfigurationFromUrl(builder);
+        }
+        customize(builder);
+        return builder.build();
+    }
+
+    private JedisClientConfiguration.JedisClientConfigurationBuilder applyProperties(
+            JedisClientConfiguration.JedisClientConfigurationBuilder builder) {
+        if (this.properties.isSsl()) {
+            builder.useSsl();
+        }
+        if (this.properties.getTimeout() != null) {
+            Duration timeout = this.properties.getTimeout();
+            builder.readTimeout(timeout).connectTimeout(timeout);
+        }
+        return builder;
+    }
+
+    private void applyPooling(RedisProperties.Pool pool,
+                              JedisClientConfiguration.JedisClientConfigurationBuilder builder) {
+        builder.usePooling().poolConfig(jedisPoolConfig(pool));
+    }
+
+    private JedisPoolConfig jedisPoolConfig(RedisProperties.Pool pool) {
+        JedisPoolConfig config = new JedisPoolConfig();
+        config.setMaxTotal(pool.getMaxActive());
+        config.setMaxIdle(pool.getMaxIdle());
+        config.setMinIdle(pool.getMinIdle());
+        if (pool.getMaxWait() != null) {
+            config.setMaxWaitMillis(pool.getMaxWait().toMillis());
+        }
+        return config;
+    }
+
+    private void customizeConfigurationFromUrl(
+            JedisClientConfiguration.JedisClientConfigurationBuilder builder) {
+        RedisConnectionConfiguration.ConnectionInfo connectionInfo = parseUrl(this.properties.getUrl());
+        if (connectionInfo.isUseSsl()) {
+            builder.useSsl();
+        }
+    }
+
+    private void customize(
+            JedisClientConfiguration.JedisClientConfigurationBuilder builder) {
+        for (JedisClientConfigurationBuilderCustomizer customizer : this.builderCustomizers) {
+            customizer.customize(builder);
+        }
+    }
+
+
+}

eureka-web/src/main/java/cn/gygxzc/cloud/tina/eureka/config/redis/RedisConnectionConfiguration.java

@@ -0,0 +1,157 @@
+package cn.gygxzc.cloud.tina.eureka.config.redis;
+
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.data.redis.connection.*;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by niantuo on 2018/11/1.
+ * 完全的抄袭源代码
+ */
+
+public class RedisConnectionConfiguration {
+
+    private final RedisProperties properties;
+
+    private final RedisSentinelConfiguration sentinelConfiguration;
+
+    private final RedisClusterConfiguration clusterConfiguration;
+
+    protected RedisConnectionConfiguration(RedisProperties properties,
+                                           ObjectProvider<RedisSentinelConfiguration> sentinelConfigurationProvider,
+                                           ObjectProvider<RedisClusterConfiguration> clusterConfigurationProvider) {
+        this.properties = properties;
+        this.sentinelConfiguration = sentinelConfigurationProvider.getIfAvailable();
+        this.clusterConfiguration = clusterConfigurationProvider.getIfAvailable();
+    }
+
+    protected final RedisStandaloneConfiguration getStandaloneConfig() {
+        RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
+        if (StringUtils.hasText(this.properties.getUrl())) {
+            ConnectionInfo connectionInfo = parseUrl(this.properties.getUrl());
+            config.setHostName(connectionInfo.getHostName());
+            config.setPort(connectionInfo.getPort());
+            config.setPassword(RedisPassword.of(connectionInfo.getPassword()));
+        } else {
+            config.setHostName(this.properties.getHost());
+            config.setPort(this.properties.getPort());
+            config.setPassword(RedisPassword.of(this.properties.getPassword()));
+        }
+        config.setDatabase(this.properties.getDatabase());
+        return config;
+    }
+
+    protected final RedisSentinelConfiguration getSentinelConfig() {
+        if (this.sentinelConfiguration != null) {
+            return this.sentinelConfiguration;
+        }
+        RedisProperties.Sentinel sentinelProperties = this.properties.getSentinel();
+        if (sentinelProperties != null) {
+            RedisSentinelConfiguration config = new RedisSentinelConfiguration();
+            config.master(sentinelProperties.getMaster());
+            config.setSentinels(createSentinels(sentinelProperties));
+            if (this.properties.getPassword() != null) {
+                config.setPassword(RedisPassword.of(this.properties.getPassword()));
+            }
+            config.setDatabase(this.properties.getDatabase());
+            return config;
+        }
+        return null;
+    }
+
+    /**
+     * Create a {@link RedisClusterConfiguration} if necessary.
+     *
+     * @return {@literal null} if no cluster settings are set.
+     */
+    protected final RedisClusterConfiguration getClusterConfiguration() {
+        if (this.clusterConfiguration != null) {
+            return this.clusterConfiguration;
+        }
+        if (this.properties.getCluster() == null) {
+            return null;
+        }
+        RedisProperties.Cluster clusterProperties = this.properties.getCluster();
+        RedisClusterConfiguration config = new RedisClusterConfiguration(
+                clusterProperties.getNodes());
+        if (clusterProperties.getMaxRedirects() != null) {
+            config.setMaxRedirects(clusterProperties.getMaxRedirects());
+        }
+        if (this.properties.getPassword() != null) {
+            config.setPassword(RedisPassword.of(this.properties.getPassword()));
+        }
+        return config;
+    }
+
+    private List<RedisNode> createSentinels(RedisProperties.Sentinel sentinel) {
+        List<RedisNode> nodes = new ArrayList<>();
+        for (String node : sentinel.getNodes()) {
+            try {
+                String[] parts = StringUtils.split(node, ":");
+                Assert.state(parts.length == 2, "Must be defined as 'host:port'");
+                nodes.add(new RedisNode(parts[0], Integer.valueOf(parts[1])));
+            } catch (RuntimeException ex) {
+                throw new IllegalStateException(
+                        "Invalid redis sentinel " + "property '" + node + "'", ex);
+            }
+        }
+        return nodes;
+    }
+
+    protected ConnectionInfo parseUrl(String url) {
+        try {
+            URI uri = new URI(url);
+            boolean useSsl = (url.startsWith("rediss://"));
+            String password = null;
+            if (uri.getUserInfo() != null) {
+                password = uri.getUserInfo();
+                int index = password.indexOf(':');
+                if (index >= 0) {
+                    password = password.substring(index + 1);
+                }
+            }
+            return new ConnectionInfo(uri, useSsl, password);
+        } catch (URISyntaxException ex) {
+            throw new IllegalArgumentException("Malformed url '" + url + "'", ex);
+        }
+    }
+
+    protected static class ConnectionInfo {
+
+        private final URI uri;
+
+        private final boolean useSsl;
+
+        private final String password;
+
+        public ConnectionInfo(URI uri, boolean useSsl, String password) {
+            this.uri = uri;
+            this.useSsl = useSsl;
+            this.password = password;
+        }
+
+        public boolean isUseSsl() {
+            return this.useSsl;
+        }
+
+        public String getHostName() {
+            return this.uri.getHost();
+        }
+
+        public int getPort() {
+            return this.uri.getPort();
+        }
+
+        public String getPassword() {
+            return this.password;
+        }
+
+    }
+}

eureka-web/src/main/resources/application-dev.yml

@@ -1,28 +1,38 @@
 spring:
-  security:
-    user:
-      name: envir
-      password: envir
+  datasource:
+    password: envir
+    username: envir
+    url: jdbc:mysql://192.168.1.202:3307/sys_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
 
-#服务注册于发现配置
-eureka:
-  instance:
-    hostname: localhost
-    prefer-ip-address: true
-    ip-address: 192.168.1.134
-    lease-renewal-interval-in-seconds: 15
-    lease-expiration-duration-in-seconds: 32
+  session:
+    store-type: redis
+    redis:
+      host: 192.168.1.202
+      port: 6379
+      database: 0
+      password:
+
+  rabbitmq:
+    username: client
+    password: client
+    host: 192.168.1.202
+    port: 5672
+
+auth:
   client:
-    register-with-eureka: true
-    fetch-registry: false
-    service-url:
-      defaultZone: http://envir:envir@${eureka.instance.ip-address}:${server.port}/eureka/
-    registry-fetch-interval-seconds: 60
-    instance-info-replication-interval-seconds: 20
-    initial-instance-info-replication-interval-seconds: 45
-    eureka-server-read-timeout-seconds: 10
-    eureka-server-connect-timeout-seconds: 8
-  server:
-    enable-self-preservation: false
-    eviction-interval-timer-in-ms: 60000
+    key: b3fe84b1ddbf4c3c9b064882de9bed56
+    secret: 545f586c61a640f18c6feb9839f8b121
+
+
+
 
+security:
+  cros: true
+  shiro: false
+  scan: true
+  redis:
+    database: 1 # redis数据库索引
+    hostName: 192.168.1.202
+    port: 6379
+    password:
+    timeout: 5000 # 连接超时时间（毫秒）

eureka-web/src/main/resources/application-prod.yml

@@ -1,30 +1,36 @@
-
 spring:
-  security:
-    user:
-      name: envir
-      password: envir
+  datasource:
+    password: envir
+    username: envir
+    url: jdbc:mysql://120.77.170.119:3307/sys_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
+
+  session:
+    store-type: redis
+    redis:
+      host: 120.77.44.234
+      port: 6379
+      database: 0
+      password: gxzcredis6379
 
-#服务注册于发现配置
-#服务注册于发现配置
-eureka:
-  instance:
-    hostname: localhost
-    prefer-ip-address: true
-    ip-address: 192.168.1.202
-    lease-renewal-interval-in-seconds: 15
-    lease-expiration-duration-in-seconds: 32
+  rabbitmq:
+    username: client
+    password: client
+    host: 120.77.44.234
+    port: 5672
+
+auth:
   client:
-    register-with-eureka: true
-    fetch-registry: false
-    service-url:
-      defaultZone: http://envir:envir@${eureka.instance.ip-address}:${server.port}/eureka/
-    registry-fetch-interval-seconds: 60
-    instance-info-replication-interval-seconds: 20
-    initial-instance-info-replication-interval-seconds: 45
-    eureka-server-read-timeout-seconds: 10
-    eureka-server-connect-timeout-seconds: 8
-  server:
-    enable-self-preservation: false
-    eviction-interval-timer-in-ms: 60000
+    key: 5ae40c929c9148e9a6570ecb1666e2f8
+    secret: 1640587797a74b35a1a95adac554ac6f
+
 
+security:
+  cros: true
+  shiro: false
+  scan: true
+  redis:
+    database: 1 # redis数据库索引
+    hostName: 120.77.44.234
+    port: 6379
+    password: gxzcredis6379
+    timeout: 5000 # 连接超时时间（毫秒）

eureka-web/src/main/resources/application.yml

@@ -0,0 +1,45 @@
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+    hikari:
+      minimum-idle: 0
+      maximum-pool-size: 6
+      auto-commit: true
+      idle-timeout: 60000
+      pool-name: DatebookHikariCP
+      max-lifetime: 1800000
+      connection-timeout: 30000
+      connection-test-query: select 1
+
+
+
+
+
+
+#服务注册于发现配置
+eureka:
+  instance:
+    hostname: localhost
+    prefer-ip-address: true
+    lease-renewal-interval-in-seconds: 15
+    lease-expiration-duration-in-seconds: 32
+    ip-address: 127.0.0.1
+  client:
+    register-with-eureka: true
+    fetch-registry: false
+    service-url:
+      defaultZone: http://envir:envir@${eureka.instance.ip-address}:${server.port}/eureka/
+    registry-fetch-interval-seconds: 60
+    instance-info-replication-interval-seconds: 20
+    initial-instance-info-replication-interval-seconds: 45
+    eureka-server-read-timeout-seconds: 10
+    eureka-server-connect-timeout-seconds: 8
+  server:
+    enable-self-preservation: false
+    eviction-interval-timer-in-ms: 60000
+management:
+  endpoints:
+    web:
+      exposure:
+        include: hearth,info,bus-refresh

eureka-web/src/main/resources/bootstrap.yml

@@ -6,16 +6,14 @@ spring:
   application:
     name: registry
   profiles:
-    active: dev
+    active: dev,jdbc
   cloud:
+    refresh:
+      refreshable: none
     config:
       server:
         bootstrap: false
-        git:
-          username: tn
-          password: 123456
-          uri: https://git.gygxzc.cn/Envir_Group/Config_Resp
-          search-paths: /**
-          basedir: ./config
         prefix: /config
+        jdbc:
+          sql: SELECT `key`, `value` from properties where (application=? or ISNULL(application)) and profile=? and label=?
       label: master

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip