From df6cf7137c9956636a20033ee3f68fe28ed8d591 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 30 Nov 2020 12:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ant-design-vue-jeecg/src/views/user/Login.vue |  2 +-
 .../redis/config/RedisConfiguration.java      |  1 +
 .../src/main/resources/application.yml        | 30 +++++++++----------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/user/Login.vue b/ant-design-vue-jeecg/src/views/user/Login.vue
index 808fa4c..1f74de8 100644
--- a/ant-design-vue-jeecg/src/views/user/Login.vue
+++ b/ant-design-vue-jeecg/src/views/user/Login.vue
@@ -11,7 +11,7 @@
               size="large"
               v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
               type="text"
-              placeholder="请输入帐户名 / jeecg">
+              placeholder="请输入帐户名 / admin">
               <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
             </a-input>
           </a-form-item>
diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-redis/src/main/java/org/jeecg/boot/starter/redis/config/RedisConfiguration.java b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-redis/src/main/java/org/jeecg/boot/starter/redis/config/RedisConfiguration.java
index f70a4c1..d4c1d37 100644
--- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-redis/src/main/java/org/jeecg/boot/starter/redis/config/RedisConfiguration.java
+++ b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-redis/src/main/java/org/jeecg/boot/starter/redis/config/RedisConfiguration.java
@@ -41,6 +41,7 @@ public class RedisConfiguration {
      * @return
      */
     @Bean
+    @ConditionalOnMissingBean(RedisTemplate.class)
     public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) {
         log.info(" --- redis config init --- ");
         // 设置序列化
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 395337b..01b41ff 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
@@ -33,21 +33,21 @@ spring:
           uri: lb:ws://jeecg-demo
           predicates:
             - Path=/vxeSocket/**
-# 全局熔断降级配置
-default-filters:
-  - name: Hystrix
-    args:
-      name: default
-      #转发地址
-      fallbackUri: 'forward:/fallback'
-  - name: Retry
-    args:
-      #重试次数，默认值是 3 次
-      retries: 3
-      #HTTP 的状态返回码
-      statuses: BAD_GATEWAY,BAD_REQUEST
-      #指定哪些方法的请求需要进行重试逻辑，默认值是 GET 方法
-      methods: GET,POST
+      # 全局熔断降级配置
+      default-filters:
+        - name: Hystrix
+          args:
+            name: default
+            #转发地址
+            fallbackUri: 'forward:/fallback'
+        - name: Retry
+          args:
+            #重试次数，默认值是 3 次
+            retries: 3
+            #HTTP 的状态返回码
+            statuses: BAD_GATEWAY,BAD_REQUEST
+            #指定哪些方法的请求需要进行重试逻辑，默认值是 GET 方法
+            methods: GET,POST
 # hystrix 信号量隔离，3秒后自动超时
 hystrix:
   enabled: true
-- 
GitLab