From cec8c5738686bd16d17ae37455b85069e6babe29 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期一, 27 二月 2023 15:33:06 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/controller/data/DomainController.java | 26 src/main/java/com/lf/server/controller/data/upload/CheckController.java | 28 +- src/main/java/com/lf/server/controller/data/DictController.java | 24 src/main/java/com/lf/server/controller/all/FmeItController.java | 24 src/main/java/com/lf/server/controller/show/InquiryController.java | 2 src/main/java/com/lf/server/controller/sys/ArgsController.java | 22 src/main/java/com/lf/server/controller/sys/AuthController.java | 22 src/main/java/com/lf/server/controller/data/upload/UploadController.java | 16 src/main/java/com/lf/server/controller/sys/BlacklistController.java | 22 src/main/java/com/lf/server/controller/data/StyleController.java | 20 src/main/java/com/lf/server/controller/show/ComprehensiveController.java | 6 src/main/java/com/lf/server/controller/sys/DepController.java | 18 src/main/java/com/lf/server/controller/sys/ResController.java | 22 src/main/java/com/lf/server/controller/sys/ReportController.java | 12 src/main/java/com/lf/server/controller/sys/RoleUserController.java | 22 src/main/java/com/lf/server/controller/sys/RoleMenuAuthController.java | 24 src/main/java/com/lf/server/controller/data/ProjectController.java | 16 src/main/java/com/lf/server/controller/show/ApplyController.java | 16 src/main/java/com/lf/server/controller/show/MarkController.java | 16 src/main/java/com/lf/server/controller/sys/TokenController.java | 20 src/main/java/com/lf/server/controller/sys/UserController.java | 32 +- src/main/java/com/lf/server/controller/sys/RoleController.java | 20 src/main/java/com/lf/server/controller/data/MetaController.java | 30 +- src/main/java/com/lf/server/controller/sys/LoginController.java | 20 src/main/java/com/lf/server/controller/sys/MenuController.java | 18 src/main/java/com/lf/server/controller/all/BaseQueryController.java | 44 +- src/main/java/com/lf/server/controller/sys/OperateController.java | 20 src/main/java/com/lf/server/controller/data/DataCountController.java | 8 src/main/java/com/lf/server/controller/all/BaseController.java | 6 src/main/java/com/lf/server/controller/sys/DownlogController.java | 2 src/main/java/com/lf/server/controller/data/upload/QueryController.java | 22 src/main/java/com/lf/server/controller/show/PipelineController.java | 10 src/main/java/com/lf/server/controller/show/DataLibController.java | 12 src/main/java/com/lf/server/controller/sys/CtrlController.java | 10 src/main/java/com/lf/server/controller/all/PermsController.java | 16 src/main/java/com/lf/server/controller/data/DataQueryController.java | 2 src/main/java/com/lf/server/controller/all/SignController.java | 12 src/main/java/com/lf/server/controller/sys/MenuAuthController.java | 24 src/main/java/com/lf/server/controller/sys/RoleResController.java | 22 src/main/java/com/lf/server/controller/data/DirController.java | 16 src/main/java/com/lf/server/controller/show/LocateController.java | 4 src/main/java/com/lf/server/controller/all/CrdsController.java | 8 src/main/java/com/lf/server/controller/sys/ResOpController.java | 20 data/db_cx.sql | 21 + src/main/java/com/lf/server/controller/data/VerController.java | 16 src/main/java/com/lf/server/controller/show/ExportController.java | 4 src/main/java/com/lf/server/controller/sys/LayerController.java | 22 47 files changed, 423 insertions(+), 396 deletions(-) diff --git a/data/db_cx.sql b/data/db_cx.sql index 795803a..0dbe4b0 100644 --- a/data/db_cx.sql +++ b/data/db_cx.sql @@ -328,6 +328,27 @@ select * from lf.sys_meta order by id desc; select * from lf.sys_meta where metaid>0 or ismeta>0; +-- 鎸夌収澶х被缁熻 +select name, + (select count(b.id) from lf.sys_meta b where dircode similar to '(' || (select string_agg(code, '|') from lf.sys_dir c where c.name = a.name) || ')%') "count", + (select coalesce(sum(b.sizes), 0) from lf.sys_meta b where dircode similar to '(' || (select string_agg(code, '|') from lf.sys_dir c where c.name = a.name) || ')%') "sizes" +from lf.sys_dir a +where code like '01%' and name in ('鍩虹娴嬬粯', '鍩虹鍦扮伨', '鍩虹鍕樺療', '鍚堣鏁版嵁', '绠$悊鏁版嵁', '娴嬮噺锛圗SV锛�', '鍕樺療锛圗GE锛�', '鍦扮伨锛圗GD锛�', '娲炲簱锛圗GD锛�') +group by name +order by name; + +select name, code +from lf.sys_dir a +where pid = 0 order by code; + +select * from lf.sys_download where guid='a0eab5c60810301c6bc86a295be1435a' +select * from lf.sys_download order by id desc + + + + + + diff --git a/src/main/java/com/lf/server/controller/all/BaseController.java b/src/main/java/com/lf/server/controller/all/BaseController.java index f581ce0..a9c26d0 100644 --- a/src/main/java/com/lf/server/controller/all/BaseController.java +++ b/src/main/java/com/lf/server/controller/all/BaseController.java @@ -35,4 +35,10 @@ public <T> ResponseMsg<T> fail(String msg, T result) { return new ResponseMsg<T>(HttpStatus.ERROR, msg, result); } + + public <T> ResponseMsg<T> fail(Exception ex, T result) { + log.error(ex.getMessage(), ex); + + return new ResponseMsg<T>(HttpStatus.ERROR, ex.getMessage(), result); + } } diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java index b99a06e..4f82715 100644 --- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java +++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java @@ -89,7 +89,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -132,7 +132,7 @@ return success(paged.getTotal(), paged.getRecords()); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -163,7 +163,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -193,7 +193,7 @@ return success(wkt); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -228,7 +228,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -244,7 +244,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -260,7 +260,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -273,7 +273,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -314,7 +314,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -341,7 +341,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -362,7 +362,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -389,7 +389,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -410,7 +410,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -430,7 +430,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), 0); + return fail(ex, 0); } } @@ -456,7 +456,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -476,7 +476,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -512,7 +512,7 @@ return success(guid); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -544,7 +544,7 @@ return success(guid); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -575,7 +575,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -591,7 +591,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -607,7 +607,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -623,7 +623,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } \ No newline at end of file diff --git a/src/main/java/com/lf/server/controller/all/CrdsController.java b/src/main/java/com/lf/server/controller/all/CrdsController.java index bd07846..486b8ee 100644 --- a/src/main/java/com/lf/server/controller/all/CrdsController.java +++ b/src/main/java/com/lf/server/controller/all/CrdsController.java @@ -47,7 +47,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -60,7 +60,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -78,7 +78,7 @@ return fmeService.getTaskStatus(id, req); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -114,7 +114,7 @@ return success(id); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } diff --git a/src/main/java/com/lf/server/controller/all/FmeItController.java b/src/main/java/com/lf/server/controller/all/FmeItController.java index a495ba6..30fcd82 100644 --- a/src/main/java/com/lf/server/controller/all/FmeItController.java +++ b/src/main/java/com/lf/server/controller/all/FmeItController.java @@ -56,7 +56,7 @@ return success("鎴愬姛", rows > 0); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -72,7 +72,7 @@ return success(userEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -92,7 +92,7 @@ return success(userEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -117,7 +117,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -138,7 +138,7 @@ return success("鎴愬姛", rows > 0); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -158,7 +158,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -178,7 +178,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -198,7 +198,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -214,7 +214,7 @@ return success(roleEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -242,7 +242,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -255,7 +255,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -271,7 +271,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/all/PermsController.java b/src/main/java/com/lf/server/controller/all/PermsController.java index 3898e4f..ad25dec 100644 --- a/src/main/java/com/lf/server/controller/all/PermsController.java +++ b/src/main/java/com/lf/server/controller/all/PermsController.java @@ -56,7 +56,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -74,7 +74,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -92,7 +92,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -110,7 +110,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -123,7 +123,7 @@ return success(true); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -141,7 +141,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -162,7 +162,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -180,7 +180,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/all/SignController.java b/src/main/java/com/lf/server/controller/all/SignController.java index 181e4b6..3f2a3e1 100644 --- a/src/main/java/com/lf/server/controller/all/SignController.java +++ b/src/main/java/com/lf/server/controller/all/SignController.java @@ -162,7 +162,7 @@ return success(msg, te); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -180,7 +180,7 @@ return success(flag ? "鐧诲嚭鎴愬姛" : "鐧诲嚭澶辫触", flag); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -199,7 +199,7 @@ return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -215,7 +215,7 @@ return success(ue); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -228,7 +228,7 @@ return success(key); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -255,7 +255,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), 0); + return fail(ex, 0); } } } diff --git a/src/main/java/com/lf/server/controller/data/DataCountController.java b/src/main/java/com/lf/server/controller/data/DataCountController.java index 2de4bb1..b5e416b 100644 --- a/src/main/java/com/lf/server/controller/data/DataCountController.java +++ b/src/main/java/com/lf/server/controller/data/DataCountController.java @@ -63,7 +63,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -76,7 +76,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -89,7 +89,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -102,7 +102,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } diff --git a/src/main/java/com/lf/server/controller/data/DataQueryController.java b/src/main/java/com/lf/server/controller/data/DataQueryController.java index 407f80c..4b34a0c 100644 --- a/src/main/java/com/lf/server/controller/data/DataQueryController.java +++ b/src/main/java/com/lf/server/controller/data/DataQueryController.java @@ -53,7 +53,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), 0); + return fail(ex, 0); } } } diff --git a/src/main/java/com/lf/server/controller/data/DictController.java b/src/main/java/com/lf/server/controller/data/DictController.java index 29defa0..52f8328 100644 --- a/src/main/java/com/lf/server/controller/data/DictController.java +++ b/src/main/java/com/lf/server/controller/data/DictController.java @@ -45,7 +45,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -68,7 +68,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -96,7 +96,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -109,7 +109,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -125,7 +125,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -141,7 +141,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -162,7 +162,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -185,7 +185,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -201,7 +201,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -221,7 +221,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -243,7 +243,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -267,7 +267,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/data/DirController.java b/src/main/java/com/lf/server/controller/data/DirController.java index 7c30d02..e755baf 100644 --- a/src/main/java/com/lf/server/controller/data/DirController.java +++ b/src/main/java/com/lf/server/controller/data/DirController.java @@ -49,7 +49,7 @@ return success(entity.getId()); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -70,7 +70,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -86,7 +86,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -106,7 +106,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -128,7 +128,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -152,7 +152,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -168,7 +168,7 @@ return success(dirEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -180,7 +180,7 @@ List<DirEntity> list = dirService.selectDirAll(); return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/data/DomainController.java b/src/main/java/com/lf/server/controller/data/DomainController.java index b39e9e7..c71837e 100644 --- a/src/main/java/com/lf/server/controller/data/DomainController.java +++ b/src/main/java/com/lf/server/controller/data/DomainController.java @@ -51,7 +51,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -75,7 +75,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -104,7 +104,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -117,7 +117,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -130,7 +130,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -151,7 +151,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -167,7 +167,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -188,7 +188,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -211,7 +211,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -227,7 +227,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -247,7 +247,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -269,7 +269,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -293,7 +293,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java index bf263b1..6ee6e9a 100644 --- a/src/main/java/com/lf/server/controller/data/MetaController.java +++ b/src/main/java/com/lf/server/controller/data/MetaController.java @@ -89,7 +89,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -120,7 +120,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -143,7 +143,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -159,7 +159,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -198,7 +198,7 @@ return success(paged.getTotal(), paged.getRecords()); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -219,7 +219,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -241,7 +241,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -264,7 +264,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -280,7 +280,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -300,7 +300,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -322,7 +322,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -346,7 +346,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -377,7 +377,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -414,7 +414,7 @@ return success(guid); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -452,7 +452,7 @@ return success(file.exists()); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } diff --git a/src/main/java/com/lf/server/controller/data/ProjectController.java b/src/main/java/com/lf/server/controller/data/ProjectController.java index 3cfb630..8234443 100644 --- a/src/main/java/com/lf/server/controller/data/ProjectController.java +++ b/src/main/java/com/lf/server/controller/data/ProjectController.java @@ -61,7 +61,7 @@ List<DepEntity> list = depService.selectDepAll(); return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -77,7 +77,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -103,7 +103,7 @@ return success(paged.getTotal(), paged.getRecords()); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -122,7 +122,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -140,7 +140,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -156,7 +156,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -184,7 +184,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -213,7 +213,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/data/StyleController.java b/src/main/java/com/lf/server/controller/data/StyleController.java index 1db909f..7582490 100644 --- a/src/main/java/com/lf/server/controller/data/StyleController.java +++ b/src/main/java/com/lf/server/controller/data/StyleController.java @@ -52,7 +52,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -74,7 +74,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -102,7 +102,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -123,7 +123,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -146,7 +146,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -162,7 +162,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -182,7 +182,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -204,7 +204,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -220,7 +220,7 @@ return success(styleEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -233,7 +233,7 @@ List<StyleEntity> list = styleService.selectStyleAll(); return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } diff --git a/src/main/java/com/lf/server/controller/data/VerController.java b/src/main/java/com/lf/server/controller/data/VerController.java index 99e0dc1..89562a3 100644 --- a/src/main/java/com/lf/server/controller/data/VerController.java +++ b/src/main/java/com/lf/server/controller/data/VerController.java @@ -56,7 +56,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -77,7 +77,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -100,7 +100,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -116,7 +116,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -134,7 +134,7 @@ int count = versionService.deleteVersions(ids); return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -156,7 +156,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -172,7 +172,7 @@ return success(verEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -184,7 +184,7 @@ List<VerEntity> list = versionService.selectVersionAll(); return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/data/upload/CheckController.java b/src/main/java/com/lf/server/controller/data/upload/CheckController.java index f0837a5..953e83c 100644 --- a/src/main/java/com/lf/server/controller/data/upload/CheckController.java +++ b/src/main/java/com/lf/server/controller/data/upload/CheckController.java @@ -50,7 +50,7 @@ return fmeService.getTaskStatus(id, req); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -109,7 +109,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -183,7 +183,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -205,7 +205,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -227,7 +227,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -250,7 +250,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -272,7 +272,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -300,7 +300,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -322,7 +322,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -343,7 +343,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -367,7 +367,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -389,7 +389,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -411,7 +411,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -436,7 +436,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } }*/ } diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java index ebadbd9..09ca93e 100644 --- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java +++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java @@ -80,7 +80,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -93,7 +93,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -106,7 +106,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -129,7 +129,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -145,7 +145,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -158,7 +158,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -171,7 +171,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -192,7 +192,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -231,7 +231,7 @@ return success(paged.getTotal(), paged.getRecords()); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -260,7 +260,7 @@ return success(count, list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -276,7 +276,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/data/upload/UploadController.java b/src/main/java/com/lf/server/controller/data/upload/UploadController.java index 6a3253e..e3bf925 100644 --- a/src/main/java/com/lf/server/controller/data/upload/UploadController.java +++ b/src/main/java/com/lf/server/controller/data/upload/UploadController.java @@ -47,7 +47,7 @@ return success(pathName); } catch (Exception ex) { log.error(ex.getMessage(), ex); - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -69,7 +69,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -114,7 +114,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -130,7 +130,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -155,7 +155,7 @@ return success("鎴愬姛", rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -190,7 +190,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -215,7 +215,7 @@ return success("鎴愬姛", list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -235,7 +235,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/show/ApplyController.java b/src/main/java/com/lf/server/controller/show/ApplyController.java index a367481..745cd45 100644 --- a/src/main/java/com/lf/server/controller/show/ApplyController.java +++ b/src/main/java/com/lf/server/controller/show/ApplyController.java @@ -75,7 +75,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -106,7 +106,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -120,7 +120,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -136,7 +136,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -161,7 +161,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -186,7 +186,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -224,7 +224,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -257,7 +257,7 @@ return success(rows); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java index f9dcd67..9ca687f 100644 --- a/src/main/java/com/lf/server/controller/show/ComprehensiveController.java +++ b/src/main/java/com/lf/server/controller/show/ComprehensiveController.java @@ -71,7 +71,7 @@ return success(route); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -95,7 +95,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -123,7 +123,7 @@ return success(guid); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java index 17f4597..18aed6b 100644 --- a/src/main/java/com/lf/server/controller/show/DataLibController.java +++ b/src/main/java/com/lf/server/controller/show/DataLibController.java @@ -92,7 +92,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } }*/ @@ -115,7 +115,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -145,7 +145,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -184,7 +184,7 @@ return success(paged.getTotal(), paged.getRecords()); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -220,7 +220,7 @@ return success(guid); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -258,7 +258,7 @@ return success(file.exists()); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } diff --git a/src/main/java/com/lf/server/controller/show/ExportController.java b/src/main/java/com/lf/server/controller/show/ExportController.java index 38340bc..960f34a 100644 --- a/src/main/java/com/lf/server/controller/show/ExportController.java +++ b/src/main/java/com/lf/server/controller/show/ExportController.java @@ -71,7 +71,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -104,7 +104,7 @@ return success("鍑哄浘鎴愬姛", str); } catch (Exception ex) { - return fail(ex.getMessage()); + return fail(ex, null); } } diff --git a/src/main/java/com/lf/server/controller/show/InquiryController.java b/src/main/java/com/lf/server/controller/show/InquiryController.java index 5f4ea43..afc3605 100644 --- a/src/main/java/com/lf/server/controller/show/InquiryController.java +++ b/src/main/java/com/lf/server/controller/show/InquiryController.java @@ -61,7 +61,7 @@ return success(sr); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/show/LocateController.java b/src/main/java/com/lf/server/controller/show/LocateController.java index a458f75..aa70c9d 100644 --- a/src/main/java/com/lf/server/controller/show/LocateController.java +++ b/src/main/java/com/lf/server/controller/show/LocateController.java @@ -52,7 +52,7 @@ return success(paged.getTotal(), paged.getRecords()); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -68,7 +68,7 @@ return success(wkt); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/show/MarkController.java b/src/main/java/com/lf/server/controller/show/MarkController.java index 0267ba1..8d63273 100644 --- a/src/main/java/com/lf/server/controller/show/MarkController.java +++ b/src/main/java/com/lf/server/controller/show/MarkController.java @@ -69,7 +69,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -85,7 +85,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -106,7 +106,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -129,7 +129,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -145,7 +145,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -165,7 +165,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -187,7 +187,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -211,7 +211,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/show/PipelineController.java b/src/main/java/com/lf/server/controller/show/PipelineController.java index 0be2187..e716129 100644 --- a/src/main/java/com/lf/server/controller/show/PipelineController.java +++ b/src/main/java/com/lf/server/controller/show/PipelineController.java @@ -58,7 +58,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -89,7 +89,7 @@ return success(map); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -134,7 +134,7 @@ return success(guid); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -165,7 +165,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -203,7 +203,7 @@ return success(file.exists()); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } diff --git a/src/main/java/com/lf/server/controller/sys/ArgsController.java b/src/main/java/com/lf/server/controller/sys/ArgsController.java index b8e6e64..af3f642 100644 --- a/src/main/java/com/lf/server/controller/sys/ArgsController.java +++ b/src/main/java/com/lf/server/controller/sys/ArgsController.java @@ -43,7 +43,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -65,7 +65,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -90,7 +90,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -103,7 +103,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -119,7 +119,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -140,7 +140,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -163,7 +163,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -179,7 +179,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -199,7 +199,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } }*/ @@ -233,7 +233,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -257,7 +257,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } }*/ } diff --git a/src/main/java/com/lf/server/controller/sys/AuthController.java b/src/main/java/com/lf/server/controller/sys/AuthController.java index 342ef6a..07b13a7 100644 --- a/src/main/java/com/lf/server/controller/sys/AuthController.java +++ b/src/main/java/com/lf/server/controller/sys/AuthController.java @@ -48,7 +48,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -68,7 +68,7 @@ List<AuthEntity> rs = authService.selectByPage(name, pageSize, pageSize * (pageIndex - 1)); return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -95,7 +95,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -122,7 +122,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -146,7 +146,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -172,7 +172,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -191,7 +191,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -214,7 +214,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -239,7 +239,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -255,7 +255,7 @@ return success(authEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -268,7 +268,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/BlacklistController.java b/src/main/java/com/lf/server/controller/sys/BlacklistController.java index 3d069e7..c33692b 100644 --- a/src/main/java/com/lf/server/controller/sys/BlacklistController.java +++ b/src/main/java/com/lf/server/controller/sys/BlacklistController.java @@ -44,7 +44,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -67,7 +67,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -93,7 +93,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -106,7 +106,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -122,7 +122,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -143,7 +143,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -166,7 +166,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -182,7 +182,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -202,7 +202,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -224,7 +224,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -248,7 +248,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/sys/CtrlController.java b/src/main/java/com/lf/server/controller/sys/CtrlController.java index f1b832c..dea8a01 100644 --- a/src/main/java/com/lf/server/controller/sys/CtrlController.java +++ b/src/main/java/com/lf/server/controller/sys/CtrlController.java @@ -36,7 +36,7 @@ return success(jsonObject); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -49,7 +49,7 @@ return success(jsonObject); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -62,7 +62,7 @@ return success(jsonObject); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -75,7 +75,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -88,7 +88,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/DepController.java b/src/main/java/com/lf/server/controller/sys/DepController.java index 9edf95f..7e9f046 100644 --- a/src/main/java/com/lf/server/controller/sys/DepController.java +++ b/src/main/java/com/lf/server/controller/sys/DepController.java @@ -50,7 +50,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -73,7 +73,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -89,7 +89,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -109,7 +109,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -131,7 +131,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -155,7 +155,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -170,7 +170,7 @@ DepEntity de = depService.selectDep(id); return success(de); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -182,7 +182,7 @@ List<DepEntity> list = depService.selectDepAll(); return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -201,7 +201,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/DownlogController.java b/src/main/java/com/lf/server/controller/sys/DownlogController.java index 324d087..1cec9a3 100644 --- a/src/main/java/com/lf/server/controller/sys/DownlogController.java +++ b/src/main/java/com/lf/server/controller/sys/DownlogController.java @@ -56,7 +56,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/LayerController.java b/src/main/java/com/lf/server/controller/sys/LayerController.java index b271115..189f4e2 100644 --- a/src/main/java/com/lf/server/controller/sys/LayerController.java +++ b/src/main/java/com/lf/server/controller/sys/LayerController.java @@ -43,7 +43,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -65,7 +65,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -92,7 +92,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -105,7 +105,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -121,7 +121,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -142,7 +142,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -165,7 +165,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -181,7 +181,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -201,7 +201,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -223,7 +223,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -247,7 +247,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/sys/LoginController.java b/src/main/java/com/lf/server/controller/sys/LoginController.java index 5330bfb..b6498da 100644 --- a/src/main/java/com/lf/server/controller/sys/LoginController.java +++ b/src/main/java/com/lf/server/controller/sys/LoginController.java @@ -48,7 +48,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -72,7 +72,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -102,7 +102,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -123,7 +123,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -146,7 +146,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -162,7 +162,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -180,7 +180,7 @@ int count = loginService.deleteLogins(ids); return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -202,7 +202,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -218,7 +218,7 @@ return success(loginEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -231,7 +231,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/MenuAuthController.java b/src/main/java/com/lf/server/controller/sys/MenuAuthController.java index 41025d1..c76cca2 100644 --- a/src/main/java/com/lf/server/controller/sys/MenuAuthController.java +++ b/src/main/java/com/lf/server/controller/sys/MenuAuthController.java @@ -47,7 +47,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -69,7 +69,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -94,7 +94,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -122,7 +122,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -135,7 +135,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -151,7 +151,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -175,7 +175,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -201,7 +201,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -220,7 +220,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -243,7 +243,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -268,7 +268,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -295,7 +295,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/sys/MenuController.java b/src/main/java/com/lf/server/controller/sys/MenuController.java index 056263b..36fcc95 100644 --- a/src/main/java/com/lf/server/controller/sys/MenuController.java +++ b/src/main/java/com/lf/server/controller/sys/MenuController.java @@ -58,7 +58,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -84,7 +84,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -103,7 +103,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -126,7 +126,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -151,7 +151,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -178,7 +178,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -194,7 +194,7 @@ return success(menuEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -207,7 +207,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -226,7 +226,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/OperateController.java b/src/main/java/com/lf/server/controller/sys/OperateController.java index 22b0406..6a84756 100644 --- a/src/main/java/com/lf/server/controller/sys/OperateController.java +++ b/src/main/java/com/lf/server/controller/sys/OperateController.java @@ -48,7 +48,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -71,7 +71,7 @@ List<OperateEntity> rs = operateService.selectByPage(uname, type, start, end, pageSize, pageSize * (pageIndex - 1)); return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -101,7 +101,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -122,7 +122,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -145,7 +145,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -161,7 +161,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -179,7 +179,7 @@ int count = operateService.deleteOperates(ids); return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -201,7 +201,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -217,7 +217,7 @@ return success(operateEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -230,7 +230,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/ReportController.java b/src/main/java/com/lf/server/controller/sys/ReportController.java index 52cefed..f51c527 100644 --- a/src/main/java/com/lf/server/controller/sys/ReportController.java +++ b/src/main/java/com/lf/server/controller/sys/ReportController.java @@ -62,7 +62,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -78,7 +78,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -99,7 +99,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -115,7 +115,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -135,7 +135,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -157,7 +157,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } diff --git a/src/main/java/com/lf/server/controller/sys/ResController.java b/src/main/java/com/lf/server/controller/sys/ResController.java index 6d858e4..7d94667 100644 --- a/src/main/java/com/lf/server/controller/sys/ResController.java +++ b/src/main/java/com/lf/server/controller/sys/ResController.java @@ -56,7 +56,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -78,7 +78,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -103,7 +103,7 @@ List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1)); return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -130,7 +130,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -154,7 +154,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -180,7 +180,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -199,7 +199,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -222,7 +222,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -247,7 +247,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -263,7 +263,7 @@ return success(resEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -276,7 +276,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } diff --git a/src/main/java/com/lf/server/controller/sys/ResOpController.java b/src/main/java/com/lf/server/controller/sys/ResOpController.java index bd0ce62..19741f3 100644 --- a/src/main/java/com/lf/server/controller/sys/ResOpController.java +++ b/src/main/java/com/lf/server/controller/sys/ResOpController.java @@ -48,7 +48,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -71,7 +71,7 @@ List<ResOpEntity> rs = resOpService.selectByPage(name, type, start, end, pageSize, pageSize * (pageIndex - 1)); return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -101,7 +101,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -122,7 +122,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -145,7 +145,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -161,7 +161,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -179,7 +179,7 @@ int count = resOpService.deleteResOps(ids); return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -201,7 +201,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -217,7 +217,7 @@ return success(resOpEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -230,7 +230,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/RoleController.java b/src/main/java/com/lf/server/controller/sys/RoleController.java index 34f6e42..7bda6f4 100644 --- a/src/main/java/com/lf/server/controller/sys/RoleController.java +++ b/src/main/java/com/lf/server/controller/sys/RoleController.java @@ -49,7 +49,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -72,7 +72,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -100,7 +100,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -124,7 +124,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -150,7 +150,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -169,7 +169,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -192,7 +192,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -217,7 +217,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -233,7 +233,7 @@ return success(roleEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -246,7 +246,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/RoleMenuAuthController.java b/src/main/java/com/lf/server/controller/sys/RoleMenuAuthController.java index 622e7d9..9a3918c 100644 --- a/src/main/java/com/lf/server/controller/sys/RoleMenuAuthController.java +++ b/src/main/java/com/lf/server/controller/sys/RoleMenuAuthController.java @@ -47,7 +47,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -69,7 +69,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -94,7 +94,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -122,7 +122,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -135,7 +135,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -151,7 +151,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -175,7 +175,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -201,7 +201,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -220,7 +220,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -243,7 +243,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -268,7 +268,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -295,7 +295,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/sys/RoleResController.java b/src/main/java/com/lf/server/controller/sys/RoleResController.java index 67e5d10..e09b149 100644 --- a/src/main/java/com/lf/server/controller/sys/RoleResController.java +++ b/src/main/java/com/lf/server/controller/sys/RoleResController.java @@ -47,7 +47,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -69,7 +69,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -94,7 +94,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -107,7 +107,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -123,7 +123,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -147,7 +147,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -173,7 +173,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -192,7 +192,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -215,7 +215,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -240,7 +240,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -267,7 +267,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/sys/RoleUserController.java b/src/main/java/com/lf/server/controller/sys/RoleUserController.java index d9e6b9f..e438bbc 100644 --- a/src/main/java/com/lf/server/controller/sys/RoleUserController.java +++ b/src/main/java/com/lf/server/controller/sys/RoleUserController.java @@ -47,7 +47,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -69,7 +69,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -94,7 +94,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -107,7 +107,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -123,7 +123,7 @@ return success(entity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -147,7 +147,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -173,7 +173,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -192,7 +192,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -215,7 +215,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -240,7 +240,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -267,7 +267,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } } diff --git a/src/main/java/com/lf/server/controller/sys/TokenController.java b/src/main/java/com/lf/server/controller/sys/TokenController.java index 7ac35a5..da839dc 100644 --- a/src/main/java/com/lf/server/controller/sys/TokenController.java +++ b/src/main/java/com/lf/server/controller/sys/TokenController.java @@ -42,7 +42,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -63,7 +63,7 @@ List<TokenEntity> rs = tokenService.selectByPage(name,type, pageSize, pageSize * (pageIndex - 1)); return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -88,7 +88,7 @@ List<TokenEntity> rs = tokenService.selectByPage(name,type, pageSize, pageSize * (pageIndex - 1)); return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -109,7 +109,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -132,7 +132,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -148,7 +148,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -166,7 +166,7 @@ int count = tokenService.deleteTokens(ids); return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -188,7 +188,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -204,7 +204,7 @@ return success(tokenEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -216,7 +216,7 @@ List<TokenEntity> list = tokenService.selectTokenAll(); return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } } diff --git a/src/main/java/com/lf/server/controller/sys/UserController.java b/src/main/java/com/lf/server/controller/sys/UserController.java index ec0a7a7..9b415ca 100644 --- a/src/main/java/com/lf/server/controller/sys/UserController.java +++ b/src/main/java/com/lf/server/controller/sys/UserController.java @@ -58,7 +58,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -86,7 +86,7 @@ return success(count, rs); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -102,7 +102,7 @@ return success(userEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -122,7 +122,7 @@ return success(userEntity); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -135,7 +135,7 @@ return success(list); } catch (Exception ex) { - return fail(ex.getMessage(), null); + return fail(ex, null); } } @@ -153,7 +153,7 @@ return success("鎴愬姛", rows > 0); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -174,7 +174,7 @@ return success("鎴愬姛", rows > 0); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -194,7 +194,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -214,7 +214,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -234,7 +234,7 @@ return success(rs); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } @@ -260,7 +260,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -292,7 +292,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -308,7 +308,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -328,7 +328,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -356,7 +356,7 @@ return success(count); } catch (Exception ex) { - return fail(ex.getMessage(), -1); + return fail(ex, -1); } } @@ -394,7 +394,7 @@ return success(rows > 0 ? "鏇存柊鎴愬姛" : "鏇存柊澶辫触", rows > 0); } catch (Exception ex) { - return fail(ex.getMessage(), false); + return fail(ex, false); } } } -- Gitblit v1.9.3