欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 5ce4291ef1e1436b8fcde190494e4eede52ca758 1 个父辈 d48475c5

若依 2.3

内嵌 并排对比
正在显示 22 个修改的文件 包含 19 行增加 和 80 行删除
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 * 权限认证使用Jwt，支持多终端认证系统。 5 * 权限认证使用Jwt，支持多终端认证系统。
6 * 支持加载动态权限菜单，多方式轻松权限控制。 6 * 支持加载动态权限菜单，多方式轻松权限控制。
7 * 高效率开发，使用代码生成器可以一键生成前后端代码。 7 * 高效率开发，使用代码生成器可以一键生成前后端代码。
  8 +* 提供了一个Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
8 * 感谢[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)。 9 * 感谢[Vue-Element-Admin](https://github.com/PanJiaChen/vue-element-admin)，[eladmin-web](https://gitee.com/elunez/eladmin-web?_from=gitee_search)。
9 * 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) 10 * 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
10 * 阿里云优惠券：[点我进入](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)   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)  
1 { 1 {
2 "name": "ruoyi", 2 "name": "ruoyi",
3 - "version": "2.2.0", 3 + "version": "2.3.0",
4 "description": "若依管理系统", 4 "description": "若依管理系统",
5 "author": "若依", 5 "author": "若依",
6 "license": "MIT", 6 "license": "MIT",
@@ -33,23 +33,23 @@ export const constantRoutes = [ @@ -33,23 +33,23 @@ export const constantRoutes = [
33 children: [ 33 children: [
34 { 34 {
35 path: '/redirect/:path(.*)', 35 path: '/redirect/:path(.*)',
36 - component: (resolve) => require(['@/views/redirect'], resolve) 36 + component: () => import('@/views/redirect')
37 } 37 }
38 ] 38 ]
39 }, 39 },
40 { 40 {
41 path: '/login', 41 path: '/login',
42 - component: (resolve) => require(['@/views/login'], resolve), 42 + component: () => import('@/views/login'),
43 hidden: true 43 hidden: true
44 }, 44 },
45 { 45 {
46 path: '/404', 46 path: '/404',
47 - component: (resolve) => require(['@/views/error/404'], resolve), 47 + component: () => import('@/views/error/404'),
48 hidden: true 48 hidden: true
49 }, 49 },
50 { 50 {
51 path: '/401', 51 path: '/401',
52 - component: (resolve) => require(['@/views/error/401'], resolve), 52 + component: () => import('@/views/error/401'),
53 hidden: true 53 hidden: true
54 }, 54 },
55 { 55 {
@@ -59,7 +59,7 @@ export const constantRoutes = [ @@ -59,7 +59,7 @@ export const constantRoutes = [
59 children: [ 59 children: [
60 { 60 {
61 path: 'index', 61 path: 'index',
62 - component: (resolve) => require(['@/views/index'], resolve), 62 + component: () => import('@/views/index'),
63 name: '首页', 63 name: '首页',
64 meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } 64 meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
65 } 65 }
@@ -73,7 +73,7 @@ export const constantRoutes = [ @@ -73,7 +73,7 @@ export const constantRoutes = [
73 children: [ 73 children: [
74 { 74 {
75 path: 'profile', 75 path: 'profile',
76 - component: (resolve) => require(['@/views/system/user/profile/index'], resolve), 76 + component: () => import('@/views/system/user/profile/index'),
77 name: 'Profile', 77 name: 'Profile',
78 meta: { title: '个人中心', icon: 'user' } 78 meta: { title: '个人中心', icon: 'user' }
79 } 79 }
@@ -86,7 +86,7 @@ export const constantRoutes = [ @@ -86,7 +86,7 @@ export const constantRoutes = [
86 children: [ 86 children: [
87 { 87 {
88 path: 'type/data/:dictId(\\d+)', 88 path: 'type/data/:dictId(\\d+)',
89 - component: (resolve) => require(['@/views/system/dict/data'], resolve), 89 + component: () => import('@/views/system/dict/data'),
90 name: 'Data', 90 name: 'Data',
91 meta: { title: '字典数据', icon: '' } 91 meta: { title: '字典数据', icon: '' }
92 } 92 }
@@ -99,7 +99,7 @@ export const constantRoutes = [ @@ -99,7 +99,7 @@ export const constantRoutes = [
99 children: [ 99 children: [
100 { 100 {
101 path: 'log', 101 path: 'log',
102 - component: (resolve) => require(['@/views/monitor/job/log'], resolve), 102 + component: () => import('@/views/monitor/job/log'),
103 name: 'JobLog', 103 name: 'JobLog',
104 meta: { title: '调度日志' } 104 meta: { title: '调度日志' }
105 } 105 }
@@ -112,7 +112,7 @@ export const constantRoutes = [ @@ -112,7 +112,7 @@ export const constantRoutes = [
112 children: [ 112 children: [
113 { 113 {
114 path: 'edit', 114 path: 'edit',
115 - component: (resolve) => require(['@/views/tool/gen/editTable'], resolve), 115 + component: () => import('@/views/tool/gen/editTable'),
116 name: 'GenEdit', 116 name: 'GenEdit',
117 meta: { title: '修改生成配置' } 117 meta: { title: '修改生成配置' }
118 } 118 }
@@ -48,7 +48,7 @@ function filterAsyncRouter(asyncRouterMap) { @@ -48,7 +48,7 @@ function filterAsyncRouter(asyncRouterMap) {
48 } 48 }
49 49
50 export const loadView = (view) => { // 路由懒加载 50 export const loadView = (view) => { // 路由懒加载
51 - return (resolve) => require([`@/views/${view}`], resolve) 51 + return () => import(`@/views/${view}`)
52 } 52 }
53 53
54 export default permission 54 export default permission
@@ -438,8 +438,6 @@ export default { @@ -438,8 +438,6 @@ export default {
438 this.msgSuccess("修改成功"); 438 this.msgSuccess("修改成功");
439 this.open = false; 439 this.open = false;
440 this.getList(); 440 this.getList();
441 - } else {  
442 - this.msgError(response.msg);  
443 } 441 }
444 }); 442 });
445 } else { 443 } else {
@@ -448,8 +446,6 @@ export default { @@ -448,8 +446,6 @@ export default {
448 this.msgSuccess("新增成功"); 446 this.msgSuccess("新增成功");
449 this.open = false; 447 this.open = false;
450 this.getList(); 448 this.getList();
451 - } else {  
452 - this.msgError(response.msg);  
453 } 449 }
454 }); 450 });
455 } 451 }
@@ -305,8 +305,6 @@ export default { @@ -305,8 +305,6 @@ export default {
305 this.msgSuccess("修改成功"); 305 this.msgSuccess("修改成功");
306 this.open = false; 306 this.open = false;
307 this.getList(); 307 this.getList();
308 - } else {  
309 - this.msgError(response.msg);  
310 } 308 }
311 }); 309 });
312 } else { 310 } else {
@@ -315,8 +313,6 @@ export default { @@ -315,8 +313,6 @@ export default {
315 this.msgSuccess("新增成功"); 313 this.msgSuccess("新增成功");
316 this.open = false; 314 this.open = false;
317 this.getList(); 315 this.getList();
318 - } else {  
319 - this.msgError(response.msg);  
320 } 316 }
321 }); 317 });
322 } 318 }
@@ -355,8 +351,6 @@ export default { @@ -355,8 +351,6 @@ export default {
355 clearCache().then(response => { 351 clearCache().then(response => {
356 if (response.code === 200) { 352 if (response.code === 200) {
357 this.msgSuccess("清理成功"); 353 this.msgSuccess("清理成功");
358 - } else {  
359 - this.msgError(response.msg);  
360 } 354 }
361 }); 355 });
362 } 356 }
@@ -281,8 +281,6 @@ export default { @@ -281,8 +281,6 @@ export default {
281 this.msgSuccess("修改成功"); 281 this.msgSuccess("修改成功");
282 this.open = false; 282 this.open = false;
283 this.getList(); 283 this.getList();
284 - } else {  
285 - this.msgError(response.msg);  
286 } 284 }
287 }); 285 });
288 } else { 286 } else {
@@ -291,8 +289,6 @@ export default { @@ -291,8 +289,6 @@ export default {
291 this.msgSuccess("新增成功"); 289 this.msgSuccess("新增成功");
292 this.open = false; 290 this.open = false;
293 this.getList(); 291 this.getList();
294 - } else {  
295 - this.msgError(response.msg);  
296 } 292 }
297 }); 293 });
298 } 294 }
@@ -305,8 +305,6 @@ export default { @@ -305,8 +305,6 @@ export default {
305 this.msgSuccess("修改成功"); 305 this.msgSuccess("修改成功");
306 this.open = false; 306 this.open = false;
307 this.getList(); 307 this.getList();
308 - } else {  
309 - this.msgError(response.msg);  
310 } 308 }
311 }); 309 });
312 } else { 310 } else {
@@ -315,8 +313,6 @@ export default { @@ -315,8 +313,6 @@ export default {
315 this.msgSuccess("新增成功"); 313 this.msgSuccess("新增成功");
316 this.open = false; 314 this.open = false;
317 this.getList(); 315 this.getList();
318 - } else {  
319 - this.msgError(response.msg);  
320 } 316 }
321 }); 317 });
322 } 318 }
@@ -309,8 +309,6 @@ export default { @@ -309,8 +309,6 @@ export default {
309 this.msgSuccess("修改成功"); 309 this.msgSuccess("修改成功");
310 this.open = false; 310 this.open = false;
311 this.getList(); 311 this.getList();
312 - } else {  
313 - this.msgError(response.msg);  
314 } 312 }
315 }); 313 });
316 } else { 314 } else {
@@ -319,8 +317,6 @@ export default { @@ -319,8 +317,6 @@ export default {
319 this.msgSuccess("新增成功"); 317 this.msgSuccess("新增成功");
320 this.open = false; 318 this.open = false;
321 this.getList(); 319 this.getList();
322 - } else {  
323 - this.msgError(response.msg);  
324 } 320 }
325 }); 321 });
326 } 322 }
@@ -359,8 +355,6 @@ export default { @@ -359,8 +355,6 @@ export default {
359 clearCache().then(response => { 355 clearCache().then(response => {
360 if (response.code === 200) { 356 if (response.code === 200) {
361 this.msgSuccess("清理成功"); 357 this.msgSuccess("清理成功");
362 - } else {  
363 - this.msgError(response.msg);  
364 } 358 }
365 }); 359 });
366 } 360 }
@@ -340,8 +340,6 @@ export default { @@ -340,8 +340,6 @@ export default {
340 this.msgSuccess("修改成功"); 340 this.msgSuccess("修改成功");
341 this.open = false; 341 this.open = false;
342 this.getList(); 342 this.getList();
343 - } else {  
344 - this.msgError(response.msg);  
345 } 343 }
346 }); 344 });
347 } else { 345 } else {
@@ -350,8 +348,6 @@ export default { @@ -350,8 +348,6 @@ export default {
350 this.msgSuccess("新增成功"); 348 this.msgSuccess("新增成功");
351 this.open = false; 349 this.open = false;
352 this.getList(); 350 this.getList();
353 - } else {  
354 - this.msgError(response.msg);  
355 } 351 }
356 }); 352 });
357 } 353 }
@@ -308,8 +308,6 @@ export default { @@ -308,8 +308,6 @@ export default {
308 this.msgSuccess("修改成功"); 308 this.msgSuccess("修改成功");
309 this.open = false; 309 this.open = false;
310 this.getList(); 310 this.getList();
311 - } else {  
312 - this.msgError(response.msg);  
313 } 311 }
314 }); 312 });
315 } else { 313 } else {
@@ -318,8 +316,6 @@ export default { @@ -318,8 +316,6 @@ export default {
318 this.msgSuccess("新增成功"); 316 this.msgSuccess("新增成功");
319 this.open = false; 317 this.open = false;
320 this.getList(); 318 this.getList();
321 - } else {  
322 - this.msgError(response.msg);  
323 } 319 }
324 }); 320 });
325 } 321 }
@@ -277,8 +277,6 @@ export default { @@ -277,8 +277,6 @@ export default {
277 this.msgSuccess("修改成功"); 277 this.msgSuccess("修改成功");
278 this.open = false; 278 this.open = false;
279 this.getList(); 279 this.getList();
280 - } else {  
281 - this.msgError(response.msg);  
282 } 280 }
283 }); 281 });
284 } else { 282 } else {
@@ -287,8 +285,6 @@ export default { @@ -287,8 +285,6 @@ export default {
287 this.msgSuccess("新增成功"); 285 this.msgSuccess("新增成功");
288 this.open = false; 286 this.open = false;
289 this.getList(); 287 this.getList();
290 - } else {  
291 - this.msgError(response.msg);  
292 } 288 }
293 }); 289 });
294 } 290 }
@@ -482,8 +482,6 @@ export default { @@ -482,8 +482,6 @@ export default {
482 this.msgSuccess("修改成功"); 482 this.msgSuccess("修改成功");
483 this.open = false; 483 this.open = false;
484 this.getList(); 484 this.getList();
485 - } else {  
486 - this.msgError(response.msg);  
487 } 485 }
488 }); 486 });
489 } else { 487 } else {
@@ -493,8 +491,6 @@ export default { @@ -493,8 +491,6 @@ export default {
493 this.msgSuccess("新增成功"); 491 this.msgSuccess("新增成功");
494 this.open = false; 492 this.open = false;
495 this.getList(); 493 this.getList();
496 - } else {  
497 - this.msgError(response.msg);  
498 } 494 }
499 }); 495 });
500 } 496 }
@@ -510,8 +506,6 @@ export default { @@ -510,8 +506,6 @@ export default {
510 this.msgSuccess("修改成功"); 506 this.msgSuccess("修改成功");
511 this.openDataScope = false; 507 this.openDataScope = false;
512 this.getList(); 508 this.getList();
513 - } else {  
514 - this.msgError(response.msg);  
515 } 509 }
516 }); 510 });
517 } 511 }
@@ -572,8 +572,6 @@ export default { @@ -572,8 +572,6 @@ export default {
572 resetUserPwd(row.userId, value).then(response => { 572 resetUserPwd(row.userId, value).then(response => {
573 if (response.code === 200) { 573 if (response.code === 200) {
574 this.msgSuccess("修改成功，新密码是：" + value); 574 this.msgSuccess("修改成功，新密码是：" + value);
575 - } else {  
576 - this.msgError(response.msg);  
577 } 575 }
578 }); 576 });
579 }).catch(() => {}); 577 }).catch(() => {});
@@ -588,8 +586,6 @@ export default { @@ -588,8 +586,6 @@ export default {
588 this.msgSuccess("修改成功"); 586 this.msgSuccess("修改成功");
589 this.open = false; 587 this.open = false;
590 this.getList(); 588 this.getList();
591 - } else {  
592 - this.msgError(response.msg);  
593 } 589 }
594 }); 590 });
595 } else { 591 } else {
@@ -598,8 +594,6 @@ export default { @@ -598,8 +594,6 @@ export default {
598 this.msgSuccess("新增成功"); 594 this.msgSuccess("新增成功");
599 this.open = false; 595 this.open = false;
600 this.getList(); 596 this.getList();
601 - } else {  
602 - this.msgError(response.msg);  
603 } 597 }
604 }); 598 });
605 } 599 }
@@ -59,8 +59,6 @@ export default { @@ -59,8 +59,6 @@ export default {
59 response => { 59 response => {
60 if (response.code === 200) { 60 if (response.code === 200) {
61 this.msgSuccess("修改成功"); 61 this.msgSuccess("修改成功");
62 - } else {  
63 - this.msgError(response.msg);  
64 } 62 }
65 } 63 }
66 ); 64 );
@@ -122,8 +122,6 @@ export default { @@ -122,8 +122,6 @@ export default {
122 this.open = false; 122 this.open = false;
123 this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; 123 this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
124 this.msgSuccess("修改成功"); 124 this.msgSuccess("修改成功");
125 - } else {  
126 - this.msgError(response.msg);  
127 } 125 }
128 this.$refs.cropper.clearCrop(); 126 this.$refs.cropper.clearCrop();
129 }); 127 });
@@ -64,8 +64,6 @@ export default { @@ -64,8 +64,6 @@ export default {
64 updateUserProfile(this.user).then(response => { 64 updateUserProfile(this.user).then(response => {
65 if (response.code === 200) { 65 if (response.code === 200) {
66 this.msgSuccess("修改成功"); 66 this.msgSuccess("修改成功");
67 - } else {  
68 - this.msgError(response.msg);  
69 } 67 }
70 }); 68 });
71 } 69 }
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 <groupId>com.ruoyi</groupId> 6 <groupId>com.ruoyi</groupId>
7 <artifactId>ruoyi</artifactId> 7 <artifactId>ruoyi</artifactId>
8 - <version>2.2.0</version> 8 + <version>2.3.0</version>
9 <packaging>jar</packaging> 9 <packaging>jar</packaging>
10 10
11 <name>ruoyi</name> 11 <name>ruoyi</name>
@@ -3,7 +3,7 @@ ruoyi: @@ -3,7 +3,7 @@ ruoyi:
3 # 名称 3 # 名称
4 name: RuoYi 4 name: RuoYi
5 # 版本 5 # 版本
6 - version: 2.2.0 6 + version: 2.3.0
7 # 版权年份 7 # 版权年份
8 copyrightYear: 2019 8 copyrightYear: 2019
9 # 实例演示开关 9 # 实例演示开关
@@ -6,17 +6,17 @@ values('${functionName}', '3', '1', '${businessName}', '${moduleName}/${business @@ -6,17 +6,17 @@ values('${functionName}', '3', '1', '${businessName}', '${moduleName}/${business
6 SELECT @parentId := LAST_INSERT_ID(); 6 SELECT @parentId := LAST_INSERT_ID();
7 7
8 -- 按钮 SQL 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 values('${functionName}查询', @parentId, '1', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 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 values('${functionName}新增', @parentId, '2', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 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 values('${functionName}修改', @parentId, '3', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 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 values('${functionName}删除', @parentId, '4', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 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 values('${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); 22 values('${functionName}导出', @parentId, '5', '#', '', 1, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');
@@ -375,8 +375,6 @@ export default { @@ -375,8 +375,6 @@ export default {
375 this.msgSuccess("修改成功"); 375 this.msgSuccess("修改成功");
376 this.open = false; 376 this.open = false;
377 this.getList(); 377 this.getList();
378 - } else {  
379 - this.msgError(response.msg);  
380 } 378 }
381 }); 379 });
382 } else { 380 } else {
@@ -385,8 +383,6 @@ export default { @@ -385,8 +383,6 @@ export default {
385 this.msgSuccess("新增成功"); 383 this.msgSuccess("新增成功");
386 this.open = false; 384 this.open = false;
387 this.getList(); 385 this.getList();
388 - } else {  
389 - this.msgError(response.msg);  
390 } 386 }
391 }); 387 });
392 } 388 }
@@ -392,8 +392,6 @@ export default { @@ -392,8 +392,6 @@ export default {
392 this.msgSuccess("修改成功"); 392 this.msgSuccess("修改成功");
393 this.open = false; 393 this.open = false;
394 this.getList(); 394 this.getList();
395 - } else {  
396 - this.msgError(response.msg);  
397 } 395 }
398 }); 396 });
399 } else { 397 } else {
@@ -402,8 +400,6 @@ export default { @@ -402,8 +400,6 @@ export default {
402 this.msgSuccess("新增成功"); 400 this.msgSuccess("新增成功");
403 this.open = false; 401 this.open = false;
404 this.getList(); 402 this.getList();
405 - } else {  
406 - this.msgError(response.msg);  
407 } 403 }
408 }); 404 });
409 } 405 }