【修改】去除error500方法，全都替换为error

【修改】修改token过期，但是接口访问依然不返回登录页的bug

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/Result.java

@@ -107,13 +107,6 @@ public class Result<T> implements Serializable {
 		return r;
 	}
 
-	public static<T> Result<T> error500(String message) {
-		Result<T> r = new Result<T>();
-		r.message = message;
-		r.code = CommonConstant.SC_INTERNAL_SERVER_ERROR_500;
-		r.success = false;
-		return r;
-	}
 	/**
 	 * 无权限访问返回结果
 	 */

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java

@@ -82,7 +82,7 @@ public class OnlCgformAuthController {
             return Result.OK("添加成功！");
         } catch (Exception exception) {
             log.error(exception.getMessage(), exception);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }
 
@@ -146,7 +146,7 @@ public class OnlCgformAuthController {
             return Result.OK("操作成功！", paramOnlAuthPage);
         } catch (Exception exception) {
             log.error(exception.getMessage(), exception);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }
 
@@ -224,7 +224,7 @@ public class OnlCgformAuthController {
             return Result.OK("操作成功！");
         } catch (Exception exception) {
             log.error(exception.getMessage(), exception);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }
 
@@ -236,7 +236,7 @@ public class OnlCgformAuthController {
             return Result.OK("操作成功！");
         } catch (Exception exception) {
             log.error(exception.getMessage(), exception);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }
 

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java

@@ -54,7 +54,7 @@ public class OnlCgformButtonController {
             return Result.OK("添加成功！");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-              return Result.error500("操作失败");
+              return Result.error("操作失败");
         }
     }
 
@@ -69,7 +69,7 @@ public class OnlCgformButtonController {
             return Result.OK("添加成功！");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }
 
@@ -77,7 +77,7 @@ public class OnlCgformButtonController {
     public Result<Object> edit(@RequestBody OnlCgformButton cgformButton) {
         OnlCgformButton existCgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(cgformButton.getId());
         if (existCgformButton == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             boolean flag = this.onlCgformButtonService.updateById(cgformButton);
             if (flag) {
@@ -92,7 +92,7 @@ public class OnlCgformButtonController {
     public Result<Object> delete(@RequestParam(name = "id",required = true) String id) {
         OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id);
         if (cgformButton == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             boolean flag = this.onlCgformButtonService.removeById(id);
             if (flag) {
@@ -109,7 +109,7 @@ public class OnlCgformButtonController {
             this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(",")));
             return Result.OK("删除成功!");
         } else {
-            return Result.error500("参数不识别！");
+            return Result.error("参数不识别！");
         }
     }
 
@@ -117,7 +117,7 @@ public class OnlCgformButtonController {
     public Result<OnlCgformButton> queryById(@RequestParam(name = "id",required = true) String id) {
         OnlCgformButton cgformButton = (OnlCgformButton)this.onlCgformButtonService.getById(id);
         if (cgformButton == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             return Result.OK(cgformButton);
         }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java

@@ -72,7 +72,7 @@ public class OnlCgformFieldController {
             return Result.OK("添加成功！");
         } catch (Exception var4) {
             log.error(var4.getMessage(), var4);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }
 
@@ -80,7 +80,7 @@ public class OnlCgformFieldController {
     public Result<Object> edit(@RequestBody OnlCgformField var1) {
         OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1.getId());
         if (var3 == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             boolean var4 = this.onlCgformFieldService.updateById(var1);
             if (var4) {
@@ -94,7 +94,7 @@ public class OnlCgformFieldController {
     public Result<Object> delete(@RequestParam(name = "id",required = true) String var1) {
         OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1);
         if (var3 == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             boolean var4 = this.onlCgformFieldService.removeById(var1);
             if (var4) {
@@ -111,7 +111,7 @@ public class OnlCgformFieldController {
             this.onlCgformFieldService.removeByIds(Arrays.asList(var1.split(",")));
             return Result.OK("删除成功!");
         } else {
-            return Result.error500("参数不识别！");
+            return Result.error("参数不识别！");
         }
     }
 
@@ -119,7 +119,7 @@ public class OnlCgformFieldController {
     public Result<Object> queryById(@RequestParam(name = "id",required = true) String var1) {
         OnlCgformField var3 = (OnlCgformField)this.onlCgformFieldService.getById(var1);
         if (var3 == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             return Result.OK(var3);
         }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java

@@ -92,7 +92,7 @@ public class OnlCgformHeadController {
             return Result.OK("添加成功！");
         } catch (Exception var4) {
             log.error(var4.getMessage(), var4);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }
 
@@ -100,7 +100,7 @@ public class OnlCgformHeadController {
     public Result<Object> edit(@RequestBody OnlCgformHead var1) {
         OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1.getId());
         if (var3 == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             boolean var4 = this.onlCgformHeadService.updateById(var1);
             if (var4) {
@@ -142,7 +142,7 @@ public class OnlCgformHeadController {
             this.onlCgformHeadService.deleteBatch(var1, var2);
             return Result.OK("删除成功!");
         } else {
-            return Result.error500("参数不识别！");
+            return Result.error("参数不识别！");
         }
     }
 
@@ -150,7 +150,7 @@ public class OnlCgformHeadController {
     public Result<OnlCgformHead> queryById(@RequestParam(name = "id",required = true) String id) {
         OnlCgformHead cgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(id);
         if (cgformHead == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             return Result.OK(cgformHead);
         }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java

@@ -61,7 +61,7 @@ public class OnlCgformIndexController {
             return Result.OK("添加成功！");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }
 
@@ -69,7 +69,7 @@ public class OnlCgformIndexController {
     public Result<Object> edit(@RequestBody OnlCgformIndex cgformIndex) {
         OnlCgformIndex existCgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(cgformIndex.getId());
         if (existCgformIndex == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             boolean flag = this.onlCgformIndexService.updateById(cgformIndex);
             if (flag) {
@@ -84,7 +84,7 @@ public class OnlCgformIndexController {
     public Result<Object> delete(@RequestParam(name = "id",required = true) String id) {
         OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(id);
         if (cgformIndex == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             boolean flag = this.onlCgformIndexService.removeById(id);
             if (flag) {
@@ -101,7 +101,7 @@ public class OnlCgformIndexController {
             this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(",")));
             return Result.OK("删除成功!");
         } else {
-            return Result.error500("参数不识别！");
+            return Result.error("参数不识别！");
         }
     }
 
@@ -109,7 +109,7 @@ public class OnlCgformIndexController {
     public Result<OnlCgformIndex> queryById(@RequestParam(name = "id",required = true) String var1) {
         OnlCgformIndex cgformIndex = (OnlCgformIndex)this.onlCgformIndexService.getById(var1);
         if (cgformIndex == null) {
-            return Result.error500("未找到对应实体");
+            return Result.error("未找到对应实体");
         } else {
             return Result.OK(cgformIndex);
         }

jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java

@@ -167,7 +167,7 @@ public class OnlCgreportHeadController {
             return Result.OK("添加成功！");
         } catch (Exception var9) {
             log.error(var9.getMessage(), var9);
-            return Result.error500("操作失败");
+            return Result.error("操作失败");
         }
     }