opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-20 02:08:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1 生产配置文件修改

Browse Source 
Merge pull request !1 from wenchaogong/develop
This commit is contained in:
wenchaogong 2021-08-19 13:05:08 +00:00 committed by Gitee
commit 6668c78bd7
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -10,7 +10,7 @@ spring:
# 主库数据源 # 主库数据源
master: master:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true url: jdbc:mysql://172.17.0.1:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&autoReconnect=true
username: root username: root
password: root password: root
# 从库数据源 # 从库数据源
@ -72,7 +72,7 @@ spring:
spring: spring:
redis: redis:
# 地址 # 地址
host: 172.30.0.48 host: 172.17.0.1
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
@ -123,7 +123,7 @@ spring:
# Spring Boot Admin Client 客户端的相关配置 # Spring Boot Admin Client 客户端的相关配置
client: client:
# 设置 Spring Boot Admin Server 地址 # 设置 Spring Boot Admin Server 地址
url: http://172.30.0.90:9090/admin url: http://172.17.0.1:9090/admin
instance: instance:
prefer-ip: true # 注册实例时，优先使用 IP prefer-ip: true # 注册实例时，优先使用 IP
username: ruoyi username: ruoyi
@ -147,7 +147,7 @@ management:
cloud-storage: cloud-storage:
# minio配置 # minio配置
minio: minio:
endpoint: http://172.30.0.54:9000 endpoint: http://172.17.0.1:9000
accessKey: ruoyi accessKey: ruoyi
secretKey: ruoyi123 secretKey: ruoyi123
bucketName: ruoyi bucketName: ruoyi

4
ruoyi-ui/src/views/login.vue
View File

@ -65,8 +65,8 @@ export default {
codeUrl: "", codeUrl: "",
cookiePassword: "", cookiePassword: "",
loginForm: { loginForm: {
username: "admin", username: "",
password: "admin123", password: "",
rememberMe: false, rememberMe: false,
code: "", code: "",
uuid: "" uuid: ""

1
ruoyi-ui/src/views/system/role/index.vue
View File

@ -112,6 +112,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.status" v-model="scope.row.status"
:disabled="scope.row.roleId === 1"
active-value="0" active-value="0"
inactive-value="1" inactive-value="1"
@change="handleStatusChange(scope.row)" @change="handleStatusChange(scope.row)"

1
ruoyi-ui/src/views/system/user/index.vue
View File

@ -150,6 +150,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.status" v-model="scope.row.status"
:disabled="scope.row.userId === 1"
active-value="0" active-value="0"
inactive-value="1" inactive-value="1"
@change="handleStatusChange(scope.row)" @change="handleStatusChange(scope.row)"