From 61818816a41a2a11a80a9a3ed17a7d42de6656eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com> Date: Fri, 11 Aug 2023 11:59:00 +0800 Subject: [PATCH] =?UTF-8?q?demo=E6=A8=A1=E5=9D=97=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/.yarn-integrity | 10 ----- .../yunxi-module-demo-biz/pom.xml | 8 ++++ .../admin/material/MaterialController.java | 41 +++++++++---------- .../web/config/DemoWebConfiguration.java | 24 +++++++++++ .../demo/framework/web/package-info.java | 4 ++ .../src/main/resources/application.yaml | 4 +- 6 files changed, 58 insertions(+), 33 deletions(-) delete mode 100644 node_modules/.yarn-integrity create mode 100644 yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/framework/web/config/DemoWebConfiguration.java create mode 100644 yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/framework/web/package-info.java diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity deleted file mode 100644 index 6b67134..0000000 --- a/node_modules/.yarn-integrity +++ /dev/null @@ -1,10 +0,0 @@ -{ - "systemParams": "win32-x64-93", - "modulesFolders": [], - "flags": [], - "linkedModules": [], - "topLevelPatterns": [], - "lockfileEntries": {}, - "files": [], - "artifacts": {} -} \ No newline at end of file diff --git a/yunxi-module-demo/yunxi-module-demo-biz/pom.xml b/yunxi-module-demo/yunxi-module-demo-biz/pom.xml index 27cd565..a7d7480 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/pom.xml +++ b/yunxi-module-demo/yunxi-module-demo-biz/pom.xml @@ -37,11 +37,18 @@ yunxi-spring-boot-starter-web + com.yunxi.scm yunxi-spring-boot-starter-security + + + com.yunxi.scm + yunxi-spring-boot-starter-biz-data-permission + + com.yunxi.scm @@ -59,6 +66,7 @@ com.yunxi.scm yunxi-spring-boot-starter-excel + \ No newline at end of file diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/MaterialController.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/MaterialController.java index adedc2e..bf1dafd 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/MaterialController.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/MaterialController.java @@ -1,32 +1,30 @@ package com.yunxi.scm.module.demo.controller.admin.material; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.common.pojo.CommonResult; -import static com.yunxi.scm.framework.common.pojo.CommonResult.success; - +import com.yunxi.scm.framework.common.pojo.PageResult; +import com.yunxi.scm.framework.datapermission.core.annotation.DataPermission; import com.yunxi.scm.framework.excel.core.util.ExcelUtils; - import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; -import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.*; - import com.yunxi.scm.module.demo.controller.admin.material.vo.*; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO; import com.yunxi.scm.module.demo.convert.material.MaterialConvert; +import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO; import com.yunxi.scm.module.demo.service.material.MaterialService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.IOException; +import java.util.Collection; +import java.util.List; + +import static com.yunxi.scm.framework.common.pojo.CommonResult.success; +import static com.yunxi.scm.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 物料管理") @RestController @@ -82,6 +80,7 @@ public class MaterialController { @GetMapping("/page") @Operation(summary = "获得物料管理分页") @PreAuthorize("@ss.hasPermission('demo:material:query')") + @DataPermission // 数据权限功能，默认是开启的 public CommonResult> getMaterialPage(@Valid MaterialPageReqVO pageVO) { PageResult pageResult = materialService.getMaterialPage(pageVO); return success(MaterialConvert.INSTANCE.convertPage(pageResult)); diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/framework/web/config/DemoWebConfiguration.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/framework/web/config/DemoWebConfiguration.java new file mode 100644 index 0000000..44f2b08 --- /dev/null +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/framework/web/config/DemoWebConfiguration.java @@ -0,0 +1,24 @@ +package com.yunxi.scm.module.demo.framework.web.config; + +import com.yunxi.scm.framework.swagger.config.YunxiSwaggerAutoConfiguration; +import org.springdoc.core.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * system 模块的 web 组件的 Configuration + * + * @author 芋道源码 + */ +@Configuration(proxyBeanMethods = false) +public class DemoWebConfiguration { + + /** + * demo 模块的 API 分组 + */ + @Bean + public GroupedOpenApi dempGroupedOpenApi() { + return YunxiSwaggerAutoConfiguration.buildGroupedOpenApi("demo"); + } + +} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/framework/web/package-info.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/framework/web/package-info.java new file mode 100644 index 0000000..f71416f --- /dev/null +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * system 模块的 web 配置 + */ +package com.yunxi.scm.module.demo.framework.web; diff --git a/yunxi-server/src/main/resources/application.yaml b/yunxi-server/src/main/resources/application.yaml index a7fb9e9..c4fdadf 100644 --- a/yunxi-server/src/main/resources/application.yaml +++ b/yunxi-server/src/main/resources/application.yaml @@ -86,7 +86,7 @@ aj: cache-number: 1000 # local 缓存的阈值,达到这个值，清除缓存 timing-clear: 180 # local定时清除过期缓存(单位秒),设置为0代表不执行 type: blockPuzzle # 验证码类型 default两种都实例化。 blockPuzzle 滑块拼图 clickWord 文字点选 - water-mark: 芋道源码 # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode + water-mark: \u957f\u6c5f\u4e91\u606f # 右下角水印文字(我的水印)，可使用 https://tool.chinaz.com/tools/unicode.aspx 中文转 Unicode，Linux 可能需要转 unicode interference-options: 0 # 滑动干扰项(0/1/2) req-frequency-limit-enable: false # 接口请求次数一分钟限制是否开启 true|false req-get-lock-limit: 5 # 验证失败 5 次，get接口锁定 @@ -113,7 +113,7 @@ yunxi: maxOnlineCount: 0 # 最大连接人数 sessionMap: true # 保存sessionMap swagger: - title: 芋道快速开发平台 + title: 云息供应链管理平台接口文档 description: 提供管理后台、用户 App 的所有功能 version: ${yunxi.info.version} url: ${yunxi.web.admin-ui.url}