diff --git a/pom.xml b/pom.xml index ff34d01..6a1a497 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ yudao-module-system yudao-module-infra yudao-module-bpm + yudao-module-asset ${project.artifactId} diff --git a/yudao-module-asset/yudao-module-asset-server/pom.xml b/yudao-module-asset/yudao-module-asset-server/pom.xml index eb7e214..49228ad 100644 --- a/yudao-module-asset/yudao-module-asset-server/pom.xml +++ b/yudao-module-asset/yudao-module-asset-server/pom.xml @@ -16,6 +16,12 @@ https://github.com/YunaiV/yudao-cloud + + + cn.iocoder.cloud + yudao-spring-boot-starter-env + + cn.iocoder.cloud diff --git a/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/framework/security/config/SecurityConfiguration.java b/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/framework/security/config/SecurityConfiguration.java new file mode 100644 index 0000000..8aa8c40 --- /dev/null +++ b/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/framework/security/config/SecurityConfiguration.java @@ -0,0 +1,25 @@ +package cn.iocoder.yudao.module.asset.framework.security.config; + +import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; + +/** + * Asset 模块的 Security 配置 + */ +@Configuration("assetSecurityConfiguration") +public class SecurityConfiguration { + + @Bean("assetAuthorizeRequestsCustomizer") + public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { + return new AuthorizeRequestsCustomizer() { + @Override + public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { + // 可以在这里配置需要放行的 URL + } + }; + } + +} diff --git a/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/framework/web/config/AssetWebConfiguration.java b/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/framework/web/config/AssetWebConfiguration.java new file mode 100644 index 0000000..4ec903a --- /dev/null +++ b/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/framework/web/config/AssetWebConfiguration.java @@ -0,0 +1,22 @@ +package cn.iocoder.yudao.module.asset.framework.web.config; + +import cn.iocoder.yudao.framework.swagger.config.YudaoSwaggerAutoConfiguration; +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Asset 模块的 Web 配置 + */ +@Configuration(proxyBeanMethods = false) +public class AssetWebConfiguration { + + /** + * asset-server 模块的 API 分组 + */ + @Bean + public GroupedOpenApi assetGroupedOpenApi() { + return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("asset"); + } + +} diff --git a/yudao-module-asset/yudao-module-asset-server/src/main/resources/application.yaml b/yudao-module-asset/yudao-module-asset-server/src/main/resources/application.yaml index 9cae5ca..0d234fe 100644 --- a/yudao-module-asset/yudao-module-asset-server/src/main/resources/application.yaml +++ b/yudao-module-asset/yudao-module-asset-server/src/main/resources/application.yaml @@ -1,89 +1,27 @@ -server: - port: 48083 - spring: application: name: asset-server profiles: - active: local + active: dev + + # 允许 Bean 覆盖 + main: + allow-bean-definition-overriding: true + + config: + import: + - optional:nacos:common-dev.yaml + - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml cloud: nacos: + server-addr: ${NACOS_ADDR:localhost:8848} + namespace: ${NACOS_NAMESPACE:dev} + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} discovery: - server-addr: 127.0.0.1:8848 + namespace: ${NACOS_NAMESPACE:dev} config: - server-addr: ${spring.cloud.nacos.discovery.server-addr} + namespace: ${NACOS_NAMESPACE:dev} file-extension: yaml - shared-configs: - - application-${spring.profiles.active}.yaml - ---- #################### 数据库相关配置 #################### - -spring: - datasource: - druid: - url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true - username: root - password: 123456 - - # Redis 配置 - data: - redis: - host: 127.0.0.1 - port: 6379 - database: 0 - password: - ---- #################### 定时任务相关配置 #################### - -xxl: - job: - enabled: false - admin: - addresses: http://127.0.0.1:9090/xxl-job-admin - executor: - appname: ${spring.application.name} - logpath: ${user.home}/logs/xxl-job/${spring.application.name} - accessToken: default_token - ---- #################### 服务保障相关配置 #################### - -# Lock4j 配置项 -lock4j: - acquire-timeout: 3000 - expire: 30000 - ---- #################### 监控相关配置 #################### - -management: - endpoints: - web: - exposure: - include: '*' - endpoint: - health: - show-details: ALWAYS - ---- #################### 芋道相关配置 #################### - -yudao: - info: - version: 1.0.0 - base-package: cn.iocoder.yudao.module.asset - web: - admin-api: - prefix: /admin-api - controller: '**.controller.admin.**' - security: - permit-all_urls: - - /admin-api/asset/truck/page # 车辆分页查询,示例 - xss: - enable: false - exclude-urls: - - /admin-api/asset/truck/create # 车辆创建,示例 - access-log: - enable: false - error-code: - enable: false - demo: false