若依 2.3

5 years ago · b4b3ff8813
parent 4cf3786f48
commit b4b3ff8813
20 changed files with 9 additions and 70 deletions
--- a/README.md
+++ b/README.md
@ -5,6 +5,7 @@
 * 权限认证使用Jwt，支持多终端认证系统。
 * 支持加载动态权限菜单，多方式轻松权限控制。
 * 高效率开发，使用代码生成器可以一键生成前后端代码。
+* 提供了一个Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
 * 感谢[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)。
 * 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
 * 阿里云优惠券：[点我进入](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -1,6 +1,6 @@
 {
  "name": "ruoyi",
-  "version": "2.2.0",
+  "version": "2.3.0",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
--- 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);
              }
            });
          }
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.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);
              }
            });
          }
@ -355,8 +351,6 @@ export default {
      clearCache().then(response => {
        if (response.code === 200) {
          this.msgSuccess("清理成功");
-        } else {
-          this.msgError(response.msg);
        }
      });
    }
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@ -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);
              }
            });
          }
--- 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);
              }
            });
          }
--- a/ruoyi-ui/src/views/system/dict/index.vue
+++ b/ruoyi-ui/src/views/system/dict/index.vue
@ -309,8 +309,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -319,8 +317,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
@ -359,8 +355,6 @@ export default {
      clearCache().then(response => {
        if (response.code === 200) {
          this.msgSuccess("清理成功");
-        } else {
-          this.msgError(response.msg);
        }
      });
    }
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@ -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);
              }
            });
          }
--- 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);
              }
            });
          }
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@ -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);
              }
            });
          }
--- 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);
          }
        });
      }
--- 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();
        });
--- a/ruoyi-ui/src/views/system/user/profile/userInfo.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userInfo.vue
@ -64,8 +64,6 @@ export default {
          updateUserProfile(this.user).then(response => {
            if (response.code === 200) {
              this.msgSuccess("修改成功");
-            } else {
-              this.msgError(response.msg);
            }
          });
        }
--- a/ruoyi/pom.xml
+++ b/ruoyi/pom.xml
@ -5,7 +5,7 @@

 	<groupId>com.ruoyi</groupId>
 	<artifactId>ruoyi</artifactId>
-	<version>2.2.0</version>
+	<version>2.3.0</version>
 	<packaging>jar</packaging>

 	<name>ruoyi</name>
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@ -3,7 +3,7 @@ ruoyi:
  # 名称
  name: RuoYi
  # 版本
-  version: 2.2.0
+  version: 2.3.0
  # 版权年份
  copyrightYear: 2019
  # 实例演示开关
--- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
@ -375,8 +375,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -385,8 +383,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }
--- a/ruoyi/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm
@ -392,8 +392,6 @@ export default {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          } else {
@ -402,8 +400,6 @@ export default {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
-              } else {
-                this.msgError(response.msg);
              }
            });
          }