From 16ed4e3bc2ac18fe88f305ebb35bd910fd47981f Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Wed, 12 Aug 2020 22:42:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=20Result=E9=87=8D=E5=90=8D=E4=B8=BA?= =?UTF-8?q?R=20websocket=E5=BF=BD=E7=95=A5=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toesbieya/jxc/api/system/ResourceApi.java | 7 +- .../common/enumeration/ResourceTypeEnum.java | 15 ++ .../jxc/common/model/entity/SysResource.java | 8 +- .../cn/toesbieya/jxc/common/model/vo/R.java | 83 +++++++++ .../toesbieya/jxc/common/model/vo/Result.java | 83 --------- java/cloud/gateway/pom.xml | 13 +- .../jxc/gateway/config/ResourceConfig.java | 87 +++------- .../controller/FallbackController.java | 6 +- .../jxc/gateway/filter/SecurityFilter.java | 8 +- .../jxc/gateway/filter/SentinelFilter.java | 2 +- .../gateway/src/main/resources/bootstrap.yml | 9 +- .../jxc/file/controller/FileController.java | 10 +- .../jxc/web/common/aspect/LockAspect.java | 6 +- .../common/aspect/RestExceptionAspect.java | 26 +-- .../web/common/aspect/UserActionAspect.java | 6 +- .../jxc/web/common/util/ExcelUtil.java | 6 +- .../jxc/web/common/util/WebUtil.java | 4 +- .../account/controller/AccountController.java | 28 +-- .../jxc/account/service/AccountService.java | 65 +++---- .../doc/controller/DocHistoryController.java | 6 +- .../controller/PurchaseInboundController.java | 42 ++--- .../controller/PurchaseOrderController.java | 42 ++--- .../doc/controller/SellOrderController.java | 42 ++--- .../controller/SellOutboundController.java | 42 ++--- .../doc/service/PurchaseInboundService.java | 50 +++--- .../jxc/doc/service/PurchaseOrderService.java | 46 ++--- .../jxc/doc/service/SellOrderService.java | 48 +++--- .../jxc/doc/service/SellOutboundService.java | 50 +++--- .../message/controller/ManageController.java | 24 +-- .../message/controller/UserController.java | 10 +- .../jxc/message/service/ManageService.java | 22 +-- .../jxc/message/service/UserService.java | 12 +- .../record/controller/RecordController.java | 10 +- .../controller/StatisticController.java | 18 +- .../jxc/stock/controller/StockController.java | 18 +- .../system/controller/CategoryController.java | 22 +-- .../system/controller/CustomerController.java | 22 +-- .../controller/DepartmentController.java | 18 +- .../system/controller/ResourceController.java | 25 +-- .../jxc/system/controller/RoleController.java | 22 +-- .../system/controller/SupplierController.java | 22 +-- .../jxc/system/controller/UserController.java | 26 +-- .../jxc/system/mapper/SysResourceMapper.java | 4 + .../jxc/system/service/CategoryService.java | 22 +-- .../jxc/system/service/CustomerService.java | 18 +- .../jxc/system/service/DepartmentService.java | 18 +- .../jxc/system/service/ResourceService.java | 160 +++++++++++++----- .../jxc/system/service/RoleService.java | 18 +- .../jxc/system/service/SupplierService.java | 18 +- .../jxc/system/service/UserService.java | 26 +-- .../src/main/resources/mapper/SysResource.xml | 37 ++++ .../jxc/socket/config/SocketConfig.java | 26 +++ java/db/my.rar | Bin 604711 -> 608282 bytes .../cn/toesbieya/jxc/aspect/LockAspect.java | 6 +- .../jxc/aspect/RestExceptionAspect.java | 26 +-- .../jxc/aspect/UserActionAspect.java | 6 +- .../cn/toesbieya/jxc/config/SocketConfig.java | 26 +++ .../jxc/controller/AccountController.java | 28 +-- .../jxc/controller/BizStockController.java | 18 +- .../jxc/controller/FileController.java | 10 +- .../jxc/controller/RecController.java | 10 +- .../jxc/controller/StatisticController.java | 18 +- .../jxc/controller/TestController.java | 10 +- .../jxc/controller/doc/HistoryController.java | 6 +- .../doc/PurchaseInboundController.java | 42 ++--- .../doc/PurchaseOrderController.java | 42 ++--- .../controller/doc/SellOrderController.java | 42 ++--- .../doc/SellOutboundController.java | 42 ++--- .../jxc/controller/msg/ManageController.java | 24 +-- .../jxc/controller/msg/UserController.java | 10 +- .../controller/sys/CategoryController.java | 22 +-- .../controller/sys/CustomerController.java | 23 +-- .../controller/sys/DepartmentController.java | 18 +- .../controller/sys/ResourceController.java | 26 ++- .../jxc/controller/sys/RoleController.java | 22 +-- .../controller/sys/SupplierController.java | 22 +-- .../jxc/controller/sys/UserController.java | 26 +-- .../jxc/enumeration/ResourceTypeEnum.java | 15 ++ .../jxc/interceptor/SecurityInterceptor.java | 6 +- .../jxc/mapper/SysResourceMapper.java | 4 + .../jxc/model/entity/SysResource.java | 8 +- .../java/cn/toesbieya/jxc/model/vo/R.java | 81 +++++++++ .../cn/toesbieya/jxc/model/vo/ResourceVo.java | 20 --- .../cn/toesbieya/jxc/model/vo/Result.java | 81 --------- .../jxc/module/PermissionModule.java | 54 +++--- .../toesbieya/jxc/service/AccountService.java | 62 ++++--- .../doc/BizPurchaseInboundService.java | 50 +++--- .../service/doc/BizPurchaseOrderService.java | 46 ++--- .../jxc/service/doc/BizSellOrderService.java | 48 +++--- .../service/doc/BizSellOutboundService.java | 50 +++--- .../toesbieya/jxc/service/msg/MsgService.java | 22 +-- .../jxc/service/msg/MsgUserService.java | 12 +- .../jxc/service/sys/SysCategoryService.java | 22 +-- .../jxc/service/sys/SysCustomerService.java | 18 +- .../jxc/service/sys/SysDepartmentService.java | 18 +- .../jxc/service/sys/SysResourceService.java | 156 ++++++++++++----- .../jxc/service/sys/SysRoleService.java | 18 +- .../jxc/service/sys/SysSupplierService.java | 18 +- .../jxc/service/sys/SysUserService.java | 26 +-- .../java/cn/toesbieya/jxc/util/ExcelUtil.java | 6 +- .../java/cn/toesbieya/jxc/util/WebUtil.java | 4 +- .../src/main/resources/mapper/SysResource.xml | 37 ++++ 102 files changed, 1585 insertions(+), 1280 deletions(-) create mode 100644 java/cloud/common/src/main/java/cn/toesbieya/jxc/common/enumeration/ResourceTypeEnum.java create mode 100644 java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/R.java delete mode 100644 java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/Result.java create mode 100644 java/cloud/web/web-modules/system/src/main/resources/mapper/SysResource.xml create mode 100644 java/local/src/main/java/cn/toesbieya/jxc/enumeration/ResourceTypeEnum.java create mode 100644 java/local/src/main/java/cn/toesbieya/jxc/model/vo/R.java delete mode 100644 java/local/src/main/java/cn/toesbieya/jxc/model/vo/ResourceVo.java delete mode 100644 java/local/src/main/java/cn/toesbieya/jxc/model/vo/Result.java create mode 100644 java/local/src/main/resources/mapper/SysResource.xml diff --git a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/ResourceApi.java b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/ResourceApi.java index 75d1ad0..15a6719 100644 --- a/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/ResourceApi.java +++ b/java/cloud/api/src/main/java/cn/toesbieya/jxc/api/system/ResourceApi.java @@ -1,11 +1,14 @@ package cn.toesbieya.jxc.api.system; +import cn.toesbieya.jxc.common.model.entity.SysResource; import cn.toesbieya.jxc.common.model.entity.SysRole; -import cn.toesbieya.jxc.common.model.vo.ResourceVo; import java.util.List; public interface ResourceApi { + //获取已启用的数据接口列表 + List getEnableApi(); + //获取角色的权限列表,包含admin权限 - List getResourceByRole(SysRole role); + List getResourceByRole(SysRole role); } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/enumeration/ResourceTypeEnum.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/enumeration/ResourceTypeEnum.java new file mode 100644 index 0000000..8e63c76 --- /dev/null +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/enumeration/ResourceTypeEnum.java @@ -0,0 +1,15 @@ +package cn.toesbieya.jxc.common.enumeration; + +public enum ResourceTypeEnum { + FOLDER(1), LEAF(2), API(3); + + private final int code; + + ResourceTypeEnum(int code) { + this.code = code; + } + + public int getCode() { + return code; + } +} diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysResource.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysResource.java index 232837f..7463f94 100644 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysResource.java +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/entity/SysResource.java @@ -9,9 +9,11 @@ public class SysResource implements Serializable { private static final long serialVersionUID = 1L; private Integer id; private Integer pid; + private Integer type; private String name; - private String url; + private String path; + private String component; + private String meta; private boolean admin = false; - private Long totalRate; - private Long ipRate; + private boolean enable = true; } diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/R.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/R.java new file mode 100644 index 0000000..730783a --- /dev/null +++ b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/R.java @@ -0,0 +1,83 @@ +package cn.toesbieya.jxc.common.model.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class R implements Serializable { + private static final long serialVersionUID = 1L; + + //返回码,200表示成功,其他表示失败 + private int status; + + //返回的信息 + private String msg; + + //返回的数据 + private Object data; + + public R(int status) { + this.status = status; + } + + public R(int status, String msg) { + this.status = status; + this.msg = msg; + } + + public R(int status, Object data) { + this.status = status; + this.data = data; + } + + public static R success() { + return new R(200); + } + + public static R success(String msg) { + return new R(200, msg); + } + + public static R success(Object data) { + return new R(200, data); + } + + public static R success(String msg, Object data) { + return new R(200, msg, data); + } + + public static R fail(String msg) { + return new R(500, msg); + } + + public static R notfound() { + return new R(404, "请求地址不存在"); + } + + public static R requireLogin() { + return new R(401, "请登录后重试"); + } + + public static R noPermission() { + return new R(403, "没有权限进行该操作"); + } + + public static R overload() { + return new R(503, "当前请求的人数过多,请稍后重试"); + } + + public static R tooManyRequest() { + return new R(429, "操作过于频繁,请稍后重试"); + } + + public boolean isSuccess() { + return this.status == 200; + } +} diff --git a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/Result.java b/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/Result.java deleted file mode 100644 index abf3c50..0000000 --- a/java/cloud/common/src/main/java/cn/toesbieya/jxc/common/model/vo/Result.java +++ /dev/null @@ -1,83 +0,0 @@ -package cn.toesbieya.jxc.common.model.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class Result implements Serializable { - private static final long serialVersionUID = 1L; - - //返回码,200表示成功,其他表示失败 - private int status; - - //返回的信息 - private String msg; - - //返回的数据 - private Object data; - - public Result(int status) { - this.status = status; - } - - public Result(int status, String msg) { - this.status = status; - this.msg = msg; - } - - public Result(int status, Object data) { - this.status = status; - this.data = data; - } - - public static Result success() { - return new Result(200); - } - - public static Result success(String msg) { - return new Result(200, msg); - } - - public static Result success(Object data) { - return new Result(200, data); - } - - public static Result success(String msg, Object data) { - return new Result(200, msg, data); - } - - public static Result fail(String msg) { - return new Result(500, msg); - } - - public static Result notfound() { - return new Result(404, "请求地址不存在"); - } - - public static Result requireLogin() { - return new Result(401, "请登录后重试"); - } - - public static Result noPermission() { - return new Result(403, "没有权限进行该操作"); - } - - public static Result overload() { - return new Result(503, "当前请求的人数过多,请稍后重试"); - } - - public static Result tooManyRequest() { - return new Result(429, "操作过于频繁,请稍后重试"); - } - - public boolean isSuccess() { - return this.status == 200; - } -} diff --git a/java/cloud/gateway/pom.xml b/java/cloud/gateway/pom.xml index 4925fe1..269c3c0 100644 --- a/java/cloud/gateway/pom.xml +++ b/java/cloud/gateway/pom.xml @@ -16,6 +16,10 @@ cn.toesbieya common + + cn.toesbieya + api + org.springframework.boot @@ -25,14 +29,9 @@ org.springframework.cloud spring-cloud-starter-gateway - - mysql - mysql-connector-java - - - org.springframework.boot - spring-boot-starter-jdbc + com.alibaba.cloud + spring-cloud-starter-dubbo