Commit 469fc2a08c8c890f8041a771d6cace36a3e0238b
1 parent
c5780b2a
路由网关的配置修改
Showing
3 changed files
with
17 additions
and
16 deletions
ant-design-vue-jeecg/src/views/user/Login.vue
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | size="large" | 11 | size="large" |
| 12 | v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]" | 12 | v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]" |
| 13 | type="text" | 13 | type="text" |
| 14 | - placeholder="请输入帐户名 / jeecg"> | 14 | + placeholder="请输入帐户名 / admin"> |
| 15 | <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/> | 15 | <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/> |
| 16 | </a-input> | 16 | </a-input> |
| 17 | </a-form-item> | 17 | </a-form-item> |
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 { | @@ -41,6 +41,7 @@ public class RedisConfiguration { | ||
| 41 | * @return | 41 | * @return |
| 42 | */ | 42 | */ |
| 43 | @Bean | 43 | @Bean |
| 44 | + @ConditionalOnMissingBean(RedisTemplate.class) | ||
| 44 | public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) { | 45 | public RedisTemplate<String, Object> redisTemplate(LettuceConnectionFactory lettuceConnectionFactory) { |
| 45 | log.info(" --- redis config init --- "); | 46 | log.info(" --- redis config init --- "); |
| 46 | // 设置序列化 | 47 | // 设置序列化 |
jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml
| @@ -33,21 +33,21 @@ spring: | @@ -33,21 +33,21 @@ spring: | ||
| 33 | uri: lb:ws://jeecg-demo | 33 | uri: lb:ws://jeecg-demo |
| 34 | predicates: | 34 | predicates: |
| 35 | - Path=/vxeSocket/** | 35 | - Path=/vxeSocket/** |
| 36 | -# 全局熔断降级配置 | ||
| 37 | -default-filters: | ||
| 38 | - - name: Hystrix | ||
| 39 | - args: | ||
| 40 | - name: default | ||
| 41 | - #转发地址 | ||
| 42 | - fallbackUri: 'forward:/fallback' | ||
| 43 | - - name: Retry | ||
| 44 | - args: | ||
| 45 | - #重试次数，默认值是 3 次 | ||
| 46 | - retries: 3 | ||
| 47 | - #HTTP 的状态返回码 | ||
| 48 | - statuses: BAD_GATEWAY,BAD_REQUEST | ||
| 49 | - #指定哪些方法的请求需要进行重试逻辑，默认值是 GET 方法 | ||
| 50 | - methods: GET,POST | 36 | + # 全局熔断降级配置 |
| 37 | + default-filters: | ||
| 38 | + - name: Hystrix | ||
| 39 | + args: | ||
| 40 | + name: default | ||
| 41 | + #转发地址 | ||
| 42 | + fallbackUri: 'forward:/fallback' | ||
| 43 | + - name: Retry | ||
| 44 | + args: | ||
| 45 | + #重试次数，默认值是 3 次 | ||
| 46 | + retries: 3 | ||
| 47 | + #HTTP 的状态返回码 | ||
| 48 | + statuses: BAD_GATEWAY,BAD_REQUEST | ||
| 49 | + #指定哪些方法的请求需要进行重试逻辑，默认值是 GET 方法 | ||
| 50 | + methods: GET,POST | ||
| 51 | # hystrix 信号量隔离，3秒后自动超时 | 51 | # hystrix 信号量隔离，3秒后自动超时 |
| 52 | hystrix: | 52 | hystrix: |
| 53 | enabled: true | 53 | enabled: true |