Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Conflicts: pom.xml ruoyi-admin/pom.xml ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-ui/src/layout/components/Navbar.vue ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/logininfor/index.vue ruoyi-ui/src/views/monitor/online/index.vue ruoyi-ui/src/views/monitor/operlog/index.vue ruoyi-ui/src/views/system/config/index.vue ruoyi-ui/src/views/system/dept/index.vue ruoyi-ui/src/views/system/dict/data.vue ruoyi-ui/src/views/system/dict/index.vue ruoyi-ui/src/views/system/menu/index.vue ruoyi-ui/src/views/system/notice/index.vue ruoyi-ui/src/views/system/post/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/tool/gen/index.vue ruoyi-ui/src/views/tool/swagger/index.vue
2025-11-04 16:23:42 +08:00 · 2021-06-10 09:44:56 +08:00
parent ceeac476ec 2ace3257f9
commit 2103731f10
23 changed files with 56 additions and 57 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
                <scope>import</scope>
            </dependency>

-            <!--阿里数据库连接池 -->
+            <!-- 阿里数据库连接池 -->
            <dependency>
                <groupId>com.alibaba</groupId>
                <artifactId>druid-spring-boot-starter</artifactId>
@@ -79,7 +79,7 @@
                <version>${poi.version}</version>
            </dependency>

-            <!--velocity代码生成使用模板 -->
+            <!-- velocity代码生成使用模板 -->
            <dependency>
                <groupId>org.apache.velocity</groupId>
                <artifactId>velocity</artifactId>
@@ -93,7 +93,7 @@
                <version>${fastjson.version}</version>
            </dependency>

-            <!--Token生成与解析-->
+            <!-- Token生成与解析-->
            <dependency>
                <groupId>io.jsonwebtoken</groupId>
                <artifactId>jjwt</artifactId>
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -17,7 +17,7 @@ import java.util.Map;

 /**
 * 角色表 sys_role
- * 
+ *
 * @author ruoyi
 */

@@ -51,8 +51,8 @@ public class SysRole implements Serializable
    @NotBlank(message = "显示顺序不能为空")
    private String roleSort;

-    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
-    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
+    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
    private String dataScope;

    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
@@ -15,7 +15,7 @@ import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;

 /**
 * 通用配置
- * 
+ *
 * @author ruoyi
 */
@Configuration
@@ -31,8 +31,7 @@ public class ResourcesConfig implements WebMvcConfigurer
        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");

        /** swagger配置 */
-        registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
-        registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+        registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
    }

    /**
@@ -63,4 +62,4 @@ public class ResourcesConfig implements WebMvcConfigurer
        source.registerCorsConfiguration("/**", config);
        return new CorsFilter(source);
    }
-}
+}
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -541,7 +541,7 @@ export default {
 		  this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -599,7 +599,7 @@ export default {
          this.loading = false;
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
 #if($table.sub)
 	/** ${subTable.functionName}序号 */
@@ -648,7 +648,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -75,7 +75,7 @@ export default {
            [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
            [{ align: [] }],                                 // 对齐方式
            ["clean"],                                       // 清除文本格式
-            ["link", "image"]                                // 链接、图片
+            ["link", "image", "video"]                       // 链接、图片、视频
          ],
        },
        placeholder: "请输入内容",
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -8,7 +8,7 @@
    <div class="right-menu">
      <template v-if="device!=='mobile'">
        <search id="header-search" class="right-menu-item" />
-        
+
        <el-tooltip content="源码地址" effect="dark" placement="bottom">
          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
        </el-tooltip>
@@ -104,7 +104,7 @@ export default {
        this.$store.dispatch('LogOut').then(() => {
          location.href = '/index';
        })
-      })
+      }).catch(() => {});
    }
  }
 }
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -63,7 +63,7 @@ service.interceptors.response.use(res => {
        store.dispatch('LogOut').then(() => {
          location.href = '/index';
        })
-      })
+      }).catch(() => {});
    } else if (code === 500) {
      Message({
        message: msg,
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -410,7 +410,7 @@ export default {
          return runJob(row.jobId, row.jobGroup);
        }).then(() => {
          this.msgSuccess("执行成功");
-        })
+        }).catch(() => {});
    },
    /** 任务详细信息 */
    handleView(row) {
@@ -471,7 +471,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -486,7 +486,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/monitor/job/log.vue
+++ b/ruoyi-ui/src/views/monitor/job/log.vue
@@ -269,7 +269,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 清空按钮操作 */
    handleClean() {
@@ -282,7 +282,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -297,7 +297,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/monitor/logininfor/index.vue
+++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue
@@ -202,7 +202,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 清空按钮操作 */
    handleClean() {
@@ -215,7 +215,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -230,7 +230,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/monitor/online/index.vue
+++ b/ruoyi-ui/src/views/monitor/online/index.vue
@@ -120,7 +120,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("强退成功");
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/monitor/operlog/index.vue
+++ b/ruoyi-ui/src/views/monitor/operlog/index.vue
@@ -290,7 +290,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 清空按钮操作 */
    handleClean() {
@@ -303,7 +303,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("清空成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -318,7 +318,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -338,7 +338,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -353,7 +353,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    },
    /** 刷新缓存按钮操作 */
    handleRefreshCache() {
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -57,17 +57,17 @@
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-edit" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:dept:edit']"
          >修改</el-button>
-          <el-button 
-            size="mini" 
-            type="text" 
-            icon="el-icon-plus" 
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
            @click="handleAdd(scope.row)"
            v-hasPermi="['system:dept:add']"
          >新增</el-button>
@@ -310,8 +310,8 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -337,7 +337,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -352,7 +352,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@@ -342,7 +342,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -357,7 +357,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    },
    /** 刷新缓存按钮操作 */
    handleRefreshCache() {
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -163,7 +163,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item v-if="form.menuType != 'M'" label="权限标识">
-              <el-input v-model="form.perms" placeholder="请权限标识" maxlength="100" />
+              <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -393,7 +393,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -336,7 +336,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@@ -309,7 +309,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -324,7 +324,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -593,7 +593,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -608,7 +608,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    }
  }
 };
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -631,7 +631,7 @@ export default {
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -646,7 +646,7 @@ export default {
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
-        })
+        }).catch(() => {});
    },
    /** 导入按钮操作 */
    handleImport() {
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -283,7 +283,7 @@ export default {
          return synchDb(tableName);
      }).then(() => {
          this.msgSuccess("同步成功");
-      })
+      }).catch(() => {});
    },
    /** 打开导入表弹窗 */
    openImportTable() {
@@ -333,7 +333,7 @@ export default {
      }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
-      })
+      }).catch(() => {});
    }
  }
 };