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

Conflicts: ruoyi-ui/package.json ruoyi-ui/src/api/system/config.js ruoyi-ui/src/api/system/dict/data.js ruoyi-ui/src/api/system/dict/type.js ruoyi-ui/src/assets/styles/element-variables.scss ruoyi-ui/src/components/SvgIcon/index.vue ruoyi-ui/src/layout/components/Sidebar/Link.vue ruoyi-ui/src/layout/components/Sidebar/index.vue ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue ruoyi-ui/src/layout/components/TagsView/index.vue ruoyi-ui/src/views/monitor/job/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/system/user/profile/resetPwd.vue ruoyi-ui/src/views/system/user/profile/userAvatar.vue ruoyi-ui/src/views/system/user/profile/userInfo.vue ruoyi-ui/vue.config.js ruoyi/pom.xml ruoyi/src/main/java/com/ruoyi/common/constant/Constants.java ruoyi/src/main/java/com/ruoyi/common/utils/StringUtils.java ruoyi/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java ruoyi/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java ruoyi/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java ruoyi/src/main/resources/application.yml ruoyi/src/main/resources/vm/sql/sql.vm ruoyi/src/main/resources/vm/vue/index.vue.vm
2025-09-24 07:19:46 +08:00 · 2020-06-01 13:34:08 +08:00
parent 35e940f0b5 b4b3ff8813
commit 5f866906d1
43 changed files with 715 additions and 508 deletions
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@ -438,8 +438,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -448,8 +446,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -485,4 +481,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@ -88,6 +88,15 @@
          v-hasPermi="['system:config:export']"
        >导出</el-button>
      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-refresh"
+          size="mini"
+          @click="handleClearCache"
+          v-hasPermi="['system:config:remove']"
+        >清理缓存</el-button>
+      </el-col>
    </el-row>

    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
@ -165,7 +174,7 @@
 </template>

 <script>
-import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig } from "@/api/system/config";
+import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";

 export default {
  name: "Config",
@ -296,8 +305,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -306,8 +313,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -340,7 +345,15 @@ export default {
        }).then(response => {
          this.download(response.msg);
        }).catch(function() {});
+    },
+    /** 清理缓存按钮操作 */
+    handleClearCache() {
+      clearCache().then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("清理成功");
+        }
+      });
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@ -56,17 +56,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>
@ -281,8 +281,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -291,8 +289,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -314,4 +310,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@ -305,8 +305,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -315,8 +313,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -352,4 +348,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@ -94,6 +94,15 @@
          v-hasPermi="['system:dict:export']"
        >导出</el-button>
      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-refresh"
+          size="mini"
+          @click="handleClearCache"
+          v-hasPermi="['system:dict:remove']"
+        >清理缓存</el-button>
+      </el-col>
    </el-row>

    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
@ -173,7 +182,7 @@
 </template>

 <script>
-import { listType, getType, delType, addType, updateType, exportType } from "@/api/system/dict/type";
+import { listType, getType, delType, addType, updateType, exportType, clearCache } from "@/api/system/dict/type";

 export default {
  name: "Dict",
@ -300,8 +309,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -310,8 +317,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -344,7 +349,15 @@ export default {
        }).then(response => {
          this.download(response.msg);
        }).catch(function() {});
+    },
+    /** 清理缓存按钮操作 */
+    handleClearCache() {
+      clearCache().then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("清理成功");
+        }
+      });
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@ -49,16 +49,16 @@
      </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:menu: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:menu:add']"
          >新增</el-button>
@ -340,8 +340,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -350,8 +348,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -373,4 +369,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@ -308,8 +308,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -318,8 +316,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -342,4 +338,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@ -107,7 +107,7 @@
        </template>
      </el-table-column>
    </el-table>
-    
+
    <pagination
      v-show="total>0"
      :total="total"
@ -277,8 +277,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -287,8 +285,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -324,4 +320,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@ -482,8 +482,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -493,8 +491,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -510,8 +506,6 @@ export default {
            this.msgSuccess("修改成功");
            this.openDataScope = false;
            this.getList();
-          } else {
-            this.msgError(response.msg);
          }
        });
      }
@ -545,4 +539,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@ -572,8 +572,6 @@ export default {
          resetUserPwd(row.userId, value).then(response => {
            if (response.code === 200) {
              this.msgSuccess("修改成功，新密码是：" + value);
-            } else {
-              this.msgError(response.msg);
            }
          });
        }).catch(() => {});
@ -588,8 +586,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -598,8 +594,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
--- a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
+++ b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
@ -59,8 +59,6 @@ export default {
            response => {
              if (response.code === 200) {
                this.msgSuccess("修改成功");
-              } else {
-                this.msgError(response.msg);
              }
            }
          );
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@ -122,8 +122,6 @@ export default {
            this.open = false;
            this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
            this.msgSuccess("修改成功");
-          } else {
-            this.msgError(response.msg);
          }
          this.$refs.cropper.clearCrop();
        });
@ -135,4 +133,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
@ -2,7 +2,7 @@
  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
    <el-form-item label="用户昵称" prop="nickName">
      <el-input v-model="user.nickName" />
-    </el-form-item> 
+    </el-form-item>
    <el-form-item label="手机号码" prop="phonenumber">
      <el-input v-model="user.phonenumber" maxlength="11" />
    </el-form-item>
@ -64,8 +64,6 @@ export default {
          updateUserProfile(this.user).then(response => {
            if (response.code === 200) {
              this.msgSuccess("修改成功");
-            } else {
-              this.msgError(response.msg);
            }
          });
        }