BJ_ZTEITS-Developers / parking-cloud-yudao

Commit b4b3ff881318bd8d95e1d13539e80077a8723acd

Authored by RuoYi
1 parent 4cf3786f

若依 2.3

Inline Side-by-side
Showing 20 changed files with 9 additions and 70 deletions
README.md
  View file @b4b3ff8
... ... @@ -5,6 +5,7 @@
5 5 * 权限认证使用Jwt，支持多终端认证系统。
6 6 * 支持加载动态权限菜单，多方式轻松权限控制。
7 7 * 高效率开发，使用代码生成器可以一键生成前后端代码。
  8 +* 提供了一个Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
8 9 * 感谢[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)。
9 10 * 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
10 11 * 阿里云优惠券：[点我进入](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)  
... ...
ruoyi-ui/package.json
  View file @b4b3ff8
1 1 {
2 2 "name": "ruoyi",
3   - "version": "2.2.0",
  3 + "version": "2.3.0",
4 4 "description": "若依管理系统",
5 5 "author": "若依",
6 6 "license": "MIT",
... ...
ruoyi-ui/src/views/monitor/job/index.vue
  View file @b4b3ff8
... ... @@ -438,8 +438,6 @@ export default {
438 438 this.msgSuccess("修改成功");
439 439 this.open = false;
440 440 this.getList();
441   - } else {
442   - this.msgError(response.msg);
443 441 }
444 442 });
445 443 } else {
... ... @@ -448,8 +446,6 @@ export default {
448 446 this.msgSuccess("新增成功");
449 447 this.open = false;
450 448 this.getList();
451   - } else {
452   - this.msgError(response.msg);
453 449 }
454 450 });
455 451 }
... ...
ruoyi-ui/src/views/system/config/index.vue
  View file @b4b3ff8
... ... @@ -305,8 +305,6 @@ export default {
305 305 this.msgSuccess("修改成功");
306 306 this.open = false;
307 307 this.getList();
308   - } else {
309   - this.msgError(response.msg);
310 308 }
311 309 });
312 310 } else {
... ... @@ -315,8 +313,6 @@ export default {
315 313 this.msgSuccess("新增成功");
316 314 this.open = false;
317 315 this.getList();
318   - } else {
319   - this.msgError(response.msg);
320 316 }
321 317 });
322 318 }
... ... @@ -355,8 +351,6 @@ export default {
355 351 clearCache().then(response => {
356 352 if (response.code === 200) {
357 353 this.msgSuccess("清理成功");
358   - } else {
359   - this.msgError(response.msg);
360 354 }
361 355 });
362 356 }
... ...
ruoyi-ui/src/views/system/dept/index.vue
  View file @b4b3ff8
... ... @@ -281,8 +281,6 @@ export default {
281 281 this.msgSuccess("修改成功");
282 282 this.open = false;
283 283 this.getList();
284   - } else {
285   - this.msgError(response.msg);
286 284 }
287 285 });
288 286 } else {
... ... @@ -291,8 +289,6 @@ export default {
291 289 this.msgSuccess("新增成功");
292 290 this.open = false;
293 291 this.getList();
294   - } else {
295   - this.msgError(response.msg);
296 292 }
297 293 });
298 294 }
... ...
ruoyi-ui/src/views/system/dict/data.vue
  View file @b4b3ff8
... ... @@ -305,8 +305,6 @@ export default {
305 305 this.msgSuccess("修改成功");
306 306 this.open = false;
307 307 this.getList();
308   - } else {
309   - this.msgError(response.msg);
310 308 }
311 309 });
312 310 } else {
... ... @@ -315,8 +313,6 @@ export default {
315 313 this.msgSuccess("新增成功");
316 314 this.open = false;
317 315 this.getList();
318   - } else {
319   - this.msgError(response.msg);
320 316 }
321 317 });
322 318 }
... ...
ruoyi-ui/src/views/system/dict/index.vue
  View file @b4b3ff8
... ... @@ -309,8 +309,6 @@ export default {
309 309 this.msgSuccess("修改成功");
310 310 this.open = false;
311 311 this.getList();
312   - } else {
313   - this.msgError(response.msg);
314 312 }
315 313 });
316 314 } else {
... ... @@ -319,8 +317,6 @@ export default {
319 317 this.msgSuccess("新增成功");
320 318 this.open = false;
321 319 this.getList();
322   - } else {
323   - this.msgError(response.msg);
324 320 }
325 321 });
326 322 }
... ... @@ -359,8 +355,6 @@ export default {
359 355 clearCache().then(response => {
360 356 if (response.code === 200) {
361 357 this.msgSuccess("清理成功");
362   - } else {
363   - this.msgError(response.msg);
364 358 }
365 359 });
366 360 }
... ...
ruoyi-ui/src/views/system/menu/index.vue
  View file @b4b3ff8
... ... @@ -340,8 +340,6 @@ export default {
340 340 this.msgSuccess("修改成功");
341 341 this.open = false;
342 342 this.getList();
343   - } else {
344   - this.msgError(response.msg);
345 343 }
346 344 });
347 345 } else {
... ... @@ -350,8 +348,6 @@ export default {
350 348 this.msgSuccess("新增成功");
351 349 this.open = false;
352 350 this.getList();
353   - } else {
354   - this.msgError(response.msg);
355 351 }
356 352 });
357 353 }
... ...
ruoyi-ui/src/views/system/notice/index.vue
  View file @b4b3ff8
... ... @@ -308,8 +308,6 @@ export default {
308 308 this.msgSuccess("修改成功");
309 309 this.open = false;
310 310 this.getList();
311   - } else {
312   - this.msgError(response.msg);
313 311 }
314 312 });
315 313 } else {
... ... @@ -318,8 +316,6 @@ export default {
318 316 this.msgSuccess("新增成功");
319 317 this.open = false;
320 318 this.getList();
321   - } else {
322   - this.msgError(response.msg);
323 319 }
324 320 });
325 321 }
... ...
ruoyi-ui/src/views/system/post/index.vue
  View file @b4b3ff8
... ... @@ -277,8 +277,6 @@ export default {
277 277 this.msgSuccess("修改成功");
278 278 this.open = false;
279 279 this.getList();
280   - } else {
281   - this.msgError(response.msg);
282 280 }
283 281 });
284 282 } else {
... ... @@ -287,8 +285,6 @@ export default {
287 285 this.msgSuccess("新增成功");
288 286 this.open = false;
289 287 this.getList();
290   - } else {
291   - this.msgError(response.msg);
292 288 }
293 289 });
294 290 }
... ...
ruoyi-ui/src/views/system/role/index.vue
  View file @b4b3ff8
... ... @@ -482,8 +482,6 @@ export default {
482 482 this.msgSuccess("修改成功");
483 483 this.open = false;
484 484 this.getList();
485   - } else {
486   - this.msgError(response.msg);
487 485 }
488 486 });
489 487 } else {
... ... @@ -493,8 +491,6 @@ export default {
493 491 this.msgSuccess("新增成功");
494 492 this.open = false;
495 493 this.getList();
496   - } else {
497   - this.msgError(response.msg);
498 494 }
499 495 });
500 496 }
... ... @@ -510,8 +506,6 @@ export default {
510 506 this.msgSuccess("修改成功");
511 507 this.openDataScope = false;
512 508 this.getList();
513   - } else {
514   - this.msgError(response.msg);
515 509 }
516 510 });
517 511 }
... ...
ruoyi-ui/src/views/system/user/index.vue
  View file @b4b3ff8
... ... @@ -572,8 +572,6 @@ export default {
572 572 resetUserPwd(row.userId, value).then(response => {
573 573 if (response.code === 200) {
574 574 this.msgSuccess("修改成功，新密码是：" + value);
575   - } else {
576   - this.msgError(response.msg);
577 575 }
578 576 });
579 577 }).catch(() => {});
... ... @@ -588,8 +586,6 @@ export default {
588 586 this.msgSuccess("修改成功");
589 587 this.open = false;
590 588 this.getList();
591   - } else {
592   - this.msgError(response.msg);
593 589 }
594 590 });
595 591 } else {
... ... @@ -598,8 +594,6 @@ export default {
598 594 this.msgSuccess("新增成功");
599 595 this.open = false;
600 596 this.getList();
601   - } else {
602   - this.msgError(response.msg);
603 597 }
604 598 });
605 599 }
... ...
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
  View file @b4b3ff8
... ... @@ -59,8 +59,6 @@ export default {
59 59 response => {
60 60 if (response.code === 200) {
61 61 this.msgSuccess("修改成功");
62   - } else {
63   - this.msgError(response.msg);
64 62 }
65 63 }
66 64 );
... ...
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
  View file @b4b3ff8
... ... @@ -122,8 +122,6 @@ export default {
122 122 this.open = false;
123 123 this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
124 124 this.msgSuccess("修改成功");
125   - } else {
126   - this.msgError(response.msg);
127 125 }
128 126 this.$refs.cropper.clearCrop();
129 127 });
... ...
ruoyi-ui/src/views/system/user/profile/userInfo.vue
  View file @b4b3ff8
... ... @@ -64,8 +64,6 @@ export default {
64 64 updateUserProfile(this.user).then(response => {
65 65 if (response.code === 200) {
66 66 this.msgSuccess("修改成功");
67   - } else {
68   - this.msgError(response.msg);
69 67 }
70 68 });
71 69 }
... ...
ruoyi/pom.xml
  View file @b4b3ff8
... ... @@ -5,7 +5,7 @@
5 5  
6 6 <groupId>com.ruoyi</groupId>
7 7 <artifactId>ruoyi</artifactId>
8   - <version>2.2.0</version>
  8 + <version>2.3.0</version>
9 9 <packaging>jar</packaging>
10 10  
11 11 <name>ruoyi</name>
... ...
ruoyi/src/main/resources/application.yml
  View file @b4b3ff8
... ... @@ -3,7 +3,7 @@ ruoyi:
3 3 # 名称
4 4 name: RuoYi
5 5 # 版本
6   - version: 2.2.0
  6 + version: 2.3.0
7 7 # 版权年份
8 8 copyrightYear: 2019
9 9 # 实例演示开关
... ...
ruoyi/src/main/resources/vm/sql/sql.vm
  View file @b4b3ff8
... ... @@ -6,17 +6,17 @@ values(&#39;${functionName}&#39;, &#39;3&#39;, &#39;1&#39;, &#39;${businessName}&#39;, &#39;${moduleName}/${business
6 6 SELECT @parentId := LAST_INSERT_ID();
7 7  
8 8 -- 按钮 SQL
9   -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)
  9 +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)
10 10 values('${functionName}查询', @parentId, '1', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
11 11  
12   -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)
  12 +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)
13 13 values('${functionName}新增', @parentId, '2', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
14 14  
15   -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)
  15 +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)
16 16 values('${functionName}修改', @parentId, '3', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
17 17  
18   -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)
  18 +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)
19 19 values('${functionName}删除', @parentId, '4', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
20 20  
21   -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)
  21 +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)
22 22 values('${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
23 23 \ No newline at end of file
... ...
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
  View file @b4b3ff8
... ... @@ -375,8 +375,6 @@ export default {
375 375 this.msgSuccess("修改成功");
376 376 this.open = false;
377 377 this.getList();
378   - } else {
379   - this.msgError(response.msg);
380 378 }
381 379 });
382 380 } else {
... ... @@ -385,8 +383,6 @@ export default {
385 383 this.msgSuccess("新增成功");
386 384 this.open = false;
387 385 this.getList();
388   - } else {
389   - this.msgError(response.msg);
390 386 }
391 387 });
392 388 }
... ...
ruoyi/src/main/resources/vm/vue/index.vue.vm
  View file @b4b3ff8
... ... @@ -392,8 +392,6 @@ export default {
392 392 this.msgSuccess("修改成功");
393 393 this.open = false;
394 394 this.getList();
395   - } else {
396   - this.msgError(response.msg);
397 395 }
398 396 });
399 397 } else {
... ... @@ -402,8 +400,6 @@ export default {
402 400 this.msgSuccess("新增成功");
403 401 this.open = false;
404 402 this.getList();
405   - } else {
406   - this.msgError(response.msg);
407 403 }
408 404 });
409 405 }
... ...