!1 生产配置文件修改

Merge pull request !1 from wenchaogong/develop

ruoyi-admin/src/main/resources/application-prod.yml

@@ -10,7 +10,7 @@ spring:
         # 主库数据源
         master:
           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
           password: root
         # 从库数据源
@@ -72,7 +72,7 @@ spring:
 spring:
   redis:
     # 地址
-    host: 172.30.0.48
+    host: 172.17.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -123,7 +123,7 @@ spring:
       # Spring Boot Admin Client 客户端的相关配置
       client:
         # 设置 Spring Boot Admin Server 地址
-        url: http://172.30.0.90:9090/admin
+        url: http://172.17.0.1:9090/admin
         instance:
           prefer-ip: true # 注册实例时，优先使用 IP
         username: ruoyi
@@ -147,7 +147,7 @@ management:
 cloud-storage:
   # minio配置
   minio:
-    endpoint: http://172.30.0.54:9000
+    endpoint: http://172.17.0.1:9000
     accessKey: ruoyi
     secretKey: ruoyi123
     bucketName: ruoyi

ruoyi-ui/src/views/login.vue

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

ruoyi-ui/src/views/system/role/index.vue

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

ruoyi-ui/src/views/system/user/index.vue

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