| pom.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/common/core/text/Convert.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/java/domain.java.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/vue/index-tree.vue.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/vue/index.vue.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/vue/v3/index-tree.vue.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/vm/vue/v3/index.vue.vm | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pom.xml
@@ -36,7 +36,7 @@ <oshi.version>6.6.5</oshi.version> <velocity.version>2.3</velocity.version> <!-- override dependency version --> <tomcat.version>9.0.100</tomcat.version> <tomcat.version>9.0.98</tomcat.version> <logback.version>1.2.13</logback.version> <spring-security.version>5.7.12</spring-security.version> <spring-framework.version>5.3.39</spring-framework.version> src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -541,7 +541,7 @@ /** * 转换为boolean<br> * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br> * String支持的值为：true、false、yes、ok、no、1、0、是、否, 如果给定的值为空，或者转换失败，返回默认值<br> * 转换失败不会报错 * * @param value 被转换的值 @@ -570,10 +570,12 @@ case "yes": case "ok": case "1": case "是": return true; case "false": case "no": case "0": case "否": return false; default: return defaultValue; src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
@@ -1,5 +1,6 @@ package com.ruoyi.common.utils.spring; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -120,7 +121,12 @@ @SuppressWarnings("unchecked") public static <T> T getAopProxy(T invoker) { return (T) AopContext.currentProxy(); Object proxy = AopContext.currentProxy(); if (((Advised) proxy).getTargetSource().getTargetClass() == invoker.getClass()) { return (T) proxy; } return invoker; } /** src/main/resources/vm/java/domain.java.vm
@@ -71,9 +71,9 @@ { return $column.javaField; } #end #end #end #end #if($table.sub) public List<${subClassName}> get${subClassName}List() { src/main/resources/vm/vue/index-tree.vue.vm
@@ -75,7 +75,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']" v-hasPermi="['${permissionPrefix}:add']" >新增</el-button> </el-col> <el-col :span="1.5"> @@ -144,21 +144,21 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']" v-hasPermi="['${permissionPrefix}:edit']" >修改</el-button> <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)" v-hasPermi="['${moduleName}:${businessName}:add']" v-hasPermi="['${permissionPrefix}:add']" >新增</el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']" v-hasPermi="['${permissionPrefix}:remove']" >删除</el-button> </template> </el-table-column> src/main/resources/vm/vue/index.vue.vm
@@ -75,7 +75,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']" v-hasPermi="['${permissionPrefix}:add']" >新增</el-button> </el-col> <el-col :span="1.5"> @@ -86,7 +86,7 @@ size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['${moduleName}:${businessName}:edit']" v-hasPermi="['${permissionPrefix}:edit']" >修改</el-button> </el-col> <el-col :span="1.5"> @@ -97,7 +97,7 @@ size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['${moduleName}:${businessName}:remove']" v-hasPermi="['${permissionPrefix}:remove']" >删除</el-button> </el-col> <el-col :span="1.5"> @@ -107,7 +107,7 @@ icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['${moduleName}:${businessName}:export']" v-hasPermi="['${permissionPrefix}:export']" >导出</el-button> </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> @@ -158,14 +158,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']" v-hasPermi="['${permissionPrefix}:edit']" >修改</el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']" v-hasPermi="['${permissionPrefix}:remove']" >删除</el-button> </template> </el-table-column> src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -73,7 +73,7 @@ plain icon="Plus" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']" v-hasPermi="['${permissionPrefix}:add']" >新增</el-button> </el-col> <el-col :span="1.5"> @@ -136,9 +136,9 @@ #end <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template #default="scope"> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button> <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button> <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${permissionPrefix}:add']">新增</el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button> </template> </el-table-column> </el-table> src/main/resources/vm/vue/v3/index.vue.vm
@@ -73,7 +73,7 @@ plain icon="Plus" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']" v-hasPermi="['${permissionPrefix}:add']" >新增</el-button> </el-col> <el-col :span="1.5"> @@ -83,7 +83,7 @@ icon="Edit" :disabled="single" @click="handleUpdate" v-hasPermi="['${moduleName}:${businessName}:edit']" v-hasPermi="['${permissionPrefix}:edit']" >修改</el-button> </el-col> <el-col :span="1.5"> @@ -93,7 +93,7 @@ icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['${moduleName}:${businessName}:remove']" v-hasPermi="['${permissionPrefix}:remove']" >删除</el-button> </el-col> <el-col :span="1.5"> @@ -102,7 +102,7 @@ plain icon="Download" @click="handleExport" v-hasPermi="['${moduleName}:${businessName}:export']" v-hasPermi="['${permissionPrefix}:export']" >导出</el-button> </el-col> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> @@ -148,8 +148,8 @@ #end <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template #default="scope"> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button> <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button> <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button> </template> </el-table-column> </el-table>
