diff --git a/README.md b/README.md index 6365feea9381b492e786cd1234c88596615b361b..b9eef10ad18d3315444a2819b71699099d951012 100644 --- 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) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index c5737545429bda74cbd18281d81823b9e7b3e4dd..b41c859ebfedd61fa38d2d75f4b958ff73a23470 100644 --- 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", diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index acebbd0ea2b9a74e49df2cc98ad22ddf05a0af18..ec7bc7c0f6761b5776e5c4174237e1d645333b6e 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -33,23 +33,23 @@ export const constantRoutes = [ children: [ { path: '/redirect/:path(.*)', - component: (resolve) => require(['@/views/redirect'], resolve) + component: () => import('@/views/redirect') } ] }, { path: '/login', - component: (resolve) => require(['@/views/login'], resolve), + component: () => import('@/views/login'), hidden: true }, { path: '/404', - component: (resolve) => require(['@/views/error/404'], resolve), + component: () => import('@/views/error/404'), hidden: true }, { path: '/401', - component: (resolve) => require(['@/views/error/401'], resolve), + component: () => import('@/views/error/401'), hidden: true }, { @@ -59,7 +59,7 @@ export const constantRoutes = [ children: [ { path: 'index', - component: (resolve) => require(['@/views/index'], resolve), + component: () => import('@/views/index'), name: '首页', meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } } @@ -73,7 +73,7 @@ export const constantRoutes = [ children: [ { path: 'profile', - component: (resolve) => require(['@/views/system/user/profile/index'], resolve), + component: () => import('@/views/system/user/profile/index'), name: 'Profile', meta: { title: '个人ä¸å¿ƒ', icon: 'user' } } @@ -86,7 +86,7 @@ export const constantRoutes = [ children: [ { path: 'type/data/:dictId(\\d+)', - component: (resolve) => require(['@/views/system/dict/data'], resolve), + component: () => import('@/views/system/dict/data'), name: 'Data', meta: { title: 'å—典数æ®', icon: '' } } @@ -99,7 +99,7 @@ export const constantRoutes = [ children: [ { path: 'log', - component: (resolve) => require(['@/views/monitor/job/log'], resolve), + component: () => import('@/views/monitor/job/log'), name: 'JobLog', meta: { title: '调度日志' } } @@ -112,7 +112,7 @@ export const constantRoutes = [ children: [ { path: 'edit', - component: (resolve) => require(['@/views/tool/gen/editTable'], resolve), + component: () => import('@/views/tool/gen/editTable'), name: 'GenEdit', meta: { title: '修改生æˆé…ç½®' } } diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js index deed451939fb4ccdadcd7e3469a4d0d1c4a8c14e..eb311642a2c812220ecbb7a2f2ee6a4faa242fdf 100644 --- a/ruoyi-ui/src/store/modules/permission.js +++ b/ruoyi-ui/src/store/modules/permission.js @@ -48,7 +48,7 @@ function filterAsyncRouter(asyncRouterMap) { } export const loadView = (view) => { // è·¯ç”±æ‡’åŠ è½½ - return (resolve) => require([`@/views/${view}`], resolve) + return () => import(`@/views/${view}`) } export default permission diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue index 499ab2600162c0cf61f41eea5d960ded87ea5ae8..6f6227107235a94f98fce56b285311b5f26b3b37 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue index 6f87aeacb6011d072fd61687b37ff943182b4f7c..83b77b93eb6f84b9ac5378cdaa97a69639cadfa3 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue index ac6d66319278c4efb2ea94cfecd23c98f6f99705..4d4d9788248924d64cb5527de502e87df5f1b6a2 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue index 49c4058d72f144828ae01bdd662a05e6dca1143d..f5eb63eabf18fa5dfcdcc75358d57965dd13c5b7 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/dict/index.vue b/ruoyi-ui/src/views/system/dict/index.vue index 295400816f286be11424042a6dfac3a9d9368385..779c173a16f7405a1fc26b46991f92ac40f22cc6 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index 74b43786cb67660329fd427994498f2ac94a2a1b..1e36780b54a5a3c464216d5bf8e70fb39b5d3e38 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index 50dcd3ebdffab52c2e0a40648f5e353c7d37a46f..828dd3e4c98c95ade6d8cb734da48d7ca2b729ab 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue index 42a66b43464d046c4b66da2ba426f530cfd39cb7..046ef220d692472306b38f32021fe4fed452125f 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 42e3d828a16d59e0e2e3cffca8498592a325938e..658efc617930acb12629289d36670b643a33849d 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue index 582e7464e4f4e52929776852c2e71cabd0d70022..94cd371705eaf07b1d3161f1de698dd7a0ee87ba 100644 --- 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); } }); } diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue index 380e1686509d5fa1ca666e6ca4f70dfdab28fc55..e39948e34757b960e4b19c7f95fbb0b4db685cf1 100644 --- 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); } } ); diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue index 5446ab5d97ed69a01b3d8808bd322bc6488f8f5e..8ffe25e311ff5ecc4bcd165d78c96424923e87f1 100644 --- 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(); }); diff --git a/ruoyi-ui/src/views/system/user/profile/userInfo.vue b/ruoyi-ui/src/views/system/user/profile/userInfo.vue index 2e8ef99d97db52f59cc2eec2eaaa02a67fc759fd..0b1780d9bab75a36f18fa07f6eb5508c52195a5e 100644 --- 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); } }); } diff --git a/ruoyi/pom.xml b/ruoyi/pom.xml index 2afc4193f770a11a3406b0622d585be42b01ed40..d77acf3ea39ccf4945bb6d6915fbf390a828b2e4 100644 --- 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> diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml index 89ea4a60acf3ca37af91e018cf7afd6795c92cee..4e17bf19326b8fc145459a94eeecb0c8d78d1cb7 100644 --- 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 # 实例演示开关 diff --git a/ruoyi/src/main/resources/vm/sql/sql.vm b/ruoyi/src/main/resources/vm/sql/sql.vm index c553476f4475889d1039fb52c836f530523ad815..ab17d1bee0f91ea64777945cc3fed2e38a2db4fb 100644 --- a/ruoyi/src/main/resources/vm/sql/sql.vm +++ b/ruoyi/src/main/resources/vm/sql/sql.vm @@ -6,17 +6,17 @@ values('${functionName}', '3', '1', '${businessName}', '${moduleName}/${business SELECT @parentId := LAST_INSERT_ID(); -- 按钮 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) values('${functionName}查询', @parentId, '1', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) values('${functionName}新增', @parentId, '2', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) values('${functionName}修改', @parentId, '3', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) values('${functionName}åˆ é™¤', @parentId, '4', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) values('${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); \ No newline at end of file diff --git a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm index 1a74fca67834f79b874f5b3597144707b1999c58..ffea7365030d567a7ea78f2ff0ea240ffb4df185 100644 --- 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); } }); } diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm index 7c19a3aabf2c6d597f81c00f792ed1dfe1718fb6..db471f44441a392215d8b27807042090888f93f0 100644 --- 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); } }); }