From ed0e61563cb13d08ac24559e93e11778b8943160 Mon Sep 17 00:00:00 2001 From: b2894lxlx <517289602@qq.com> Date: Fri, 7 Aug 2026 12:56:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dopenapi=E3=80=81file=E6=A8=A1?= =?UTF-8?q?=E5=9D=97docker=E9=83=A8=E7=BD=B2=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 6 ++++ .../src/main/resources/application-prod.yml | 6 ++++ .../src/main/resources/application-test.yml | 6 ++++ .../src/main/resources/bootstrap.yml | 29 ++++++----------- .../src/main/resources/application-dev.yml | 6 ++++ .../src/main/resources/application-prod.yml | 6 ++++ .../src/main/resources/application-test.yml | 6 ++++ .../src/main/resources/bootstrap.yml | 29 ++++++----------- .../impl/CustomerArchiveServiceImpl.java | 32 +++++++++++++------ 9 files changed, 77 insertions(+), 49 deletions(-) create mode 100644 blade-service/blade-file/src/main/resources/application-dev.yml create mode 100644 blade-service/blade-file/src/main/resources/application-prod.yml create mode 100644 blade-service/blade-file/src/main/resources/application-test.yml create mode 100644 blade-service/blade-openapi/src/main/resources/application-dev.yml create mode 100644 blade-service/blade-openapi/src/main/resources/application-prod.yml create mode 100644 blade-service/blade-openapi/src/main/resources/application-test.yml diff --git a/blade-service/blade-file/src/main/resources/application-dev.yml b/blade-service/blade-file/src/main/resources/application-dev.yml new file mode 100644 index 0000000..ee83599 --- /dev/null +++ b/blade-service/blade-file/src/main/resources/application-dev.yml @@ -0,0 +1,6 @@ +# 数据源配置 +spring: + datasource: + url: ${blade.datasource.dev.url} + username: ${blade.datasource.dev.username} + password: ${blade.datasource.dev.password} diff --git a/blade-service/blade-file/src/main/resources/application-prod.yml b/blade-service/blade-file/src/main/resources/application-prod.yml new file mode 100644 index 0000000..d6f9af7 --- /dev/null +++ b/blade-service/blade-file/src/main/resources/application-prod.yml @@ -0,0 +1,6 @@ +# 数据源配置 +spring: + datasource: + url: ${blade.datasource.prod.url} + username: ${blade.datasource.prod.username} + password: ${blade.datasource.prod.password} diff --git a/blade-service/blade-file/src/main/resources/application-test.yml b/blade-service/blade-file/src/main/resources/application-test.yml new file mode 100644 index 0000000..8f283d3 --- /dev/null +++ b/blade-service/blade-file/src/main/resources/application-test.yml @@ -0,0 +1,6 @@ +# 数据源配置 +spring: + datasource: + url: ${blade.datasource.test.url} + username: ${blade.datasource.test.username} + password: ${blade.datasource.test.password} diff --git a/blade-service/blade-file/src/main/resources/bootstrap.yml b/blade-service/blade-file/src/main/resources/bootstrap.yml index f2240b3..feb3dfb 100644 --- a/blade-service/blade-file/src/main/resources/bootstrap.yml +++ b/blade-service/blade-file/src/main/resources/bootstrap.yml @@ -1,32 +1,21 @@ server: port: 8107 -#数据源配置 spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} + application: + name: blade-file cloud: nacos: + discovery: + namespace: ${spring.profiles.active} config: + file-extension: yaml + namespace: ${spring.profiles.active} shared-configs: - - data-id: third-party-api.yaml + - data-id: blade.yaml + refresh: true + - data-id: blade-${spring.profiles.active}.yaml refresh: true - -#第三方接口本地默认配置，Nacos third-party-api.yaml 可覆盖 -thirdParty: - ocr: - baseUrl: ${OCR_BASE_URL:http://127.0.0.1:8080} - baseOtherUrl: ${OCR_BASE_OTHER_URL:http://127.0.0.1:8080} - wps: - baseUrl: ${WPS_BASE_URL:http://127.0.0.1:8080} - oa: - baseUrl: ${OA_BASE_URL:http://127.0.0.1:8080} - track: - baseUrl: ${TRACK_BASE_URL:http://127.0.0.1:8080} - mk: - baseUrl: ${MK_BASE_URL:http://127.0.0.1:8080} #spring: # application: diff --git a/blade-service/blade-openapi/src/main/resources/application-dev.yml b/blade-service/blade-openapi/src/main/resources/application-dev.yml new file mode 100644 index 0000000..ee83599 --- /dev/null +++ b/blade-service/blade-openapi/src/main/resources/application-dev.yml @@ -0,0 +1,6 @@ +# 数据源配置 +spring: + datasource: + url: ${blade.datasource.dev.url} + username: ${blade.datasource.dev.username} + password: ${blade.datasource.dev.password} diff --git a/blade-service/blade-openapi/src/main/resources/application-prod.yml b/blade-service/blade-openapi/src/main/resources/application-prod.yml new file mode 100644 index 0000000..d6f9af7 --- /dev/null +++ b/blade-service/blade-openapi/src/main/resources/application-prod.yml @@ -0,0 +1,6 @@ +# 数据源配置 +spring: + datasource: + url: ${blade.datasource.prod.url} + username: ${blade.datasource.prod.username} + password: ${blade.datasource.prod.password} diff --git a/blade-service/blade-openapi/src/main/resources/application-test.yml b/blade-service/blade-openapi/src/main/resources/application-test.yml new file mode 100644 index 0000000..8f283d3 --- /dev/null +++ b/blade-service/blade-openapi/src/main/resources/application-test.yml @@ -0,0 +1,6 @@ +# 数据源配置 +spring: + datasource: + url: ${blade.datasource.test.url} + username: ${blade.datasource.test.username} + password: ${blade.datasource.test.password} diff --git a/blade-service/blade-openapi/src/main/resources/bootstrap.yml b/blade-service/blade-openapi/src/main/resources/bootstrap.yml index e97a20a..4c5d14f 100644 --- a/blade-service/blade-openapi/src/main/resources/bootstrap.yml +++ b/blade-service/blade-openapi/src/main/resources/bootstrap.yml @@ -1,32 +1,21 @@ server: port: 8108 -#数据源配置 spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} + application: + name: blade-openapi cloud: nacos: + discovery: + namespace: ${spring.profiles.active} config: + file-extension: yaml + namespace: ${spring.profiles.active} shared-configs: - - data-id: third-party-api.yaml + - data-id: blade.yaml + refresh: true + - data-id: blade-${spring.profiles.active}.yaml refresh: true - -#第三方接口本地默认配置，Nacos third-party-api.yaml 可覆盖 -thirdParty: - ocr: - baseUrl: ${OCR_BASE_URL:http://127.0.0.1:8080} - baseOtherUrl: ${OCR_BASE_OTHER_URL:http://127.0.0.1:8080} - wps: - baseUrl: ${WPS_BASE_URL:http://127.0.0.1:8080} - oa: - baseUrl: ${OA_BASE_URL:http://127.0.0.1:8080} - track: - baseUrl: ${TRACK_BASE_URL:http://127.0.0.1:8080} - mk: - baseUrl: ${MK_BASE_URL:http://127.0.0.1:8080} #spring: # application: diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java index 2df82b0..752b4f2 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java @@ -23,6 +23,7 @@ package org.springblade.transport.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -379,17 +380,25 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpllambdaQuery() + LambdaQueryWrapper unifiedCreditCodeQuery = Wrappers.lambdaQuery() .eq(CustomerArchive::getUnifiedCreditCode, customer.getUnifiedCreditCode()) - .eq(CustomerArchive::getIsDeleted, 0) - .ne(Func.isNotEmpty(customer.getId()), CustomerArchive::getId, customer.getId())) > 0L) { + .eq(CustomerArchive::getIsDeleted, 0); + if (customer.getId() != null) { + unifiedCreditCodeQuery.ne(CustomerArchive::getId, customer.getId()); + } + if (count(unifiedCreditCodeQuery) > 0L) { throw new ServiceException("统一社会信用代码已存在"); } - if (Func.isNotEmpty(customer.getCustomerCode()) && count(Wrappers.lambdaQuery() - .eq(CustomerArchive::getCustomerCode, customer.getCustomerCode()) - .eq(CustomerArchive::getIsDeleted, 0) - .ne(Func.isNotEmpty(customer.getId()), CustomerArchive::getId, customer.getId())) > 0L) { - throw new ServiceException("客商编号已存在"); + if (Func.isNotEmpty(customer.getCustomerCode())) { + LambdaQueryWrapper customerCodeQuery = Wrappers.lambdaQuery() + .eq(CustomerArchive::getCustomerCode, customer.getCustomerCode()) + .eq(CustomerArchive::getIsDeleted, 0); + if (customer.getId() != null) { + customerCodeQuery.ne(CustomerArchive::getId, customer.getId()); + } + if (count(customerCodeQuery) > 0L) { + throw new ServiceException("客商编号已存在"); + } } } @@ -718,7 +727,12 @@ public class CustomerArchiveServiceImpl extends BaseServiceImpl { + List userIds = new ArrayList<>(baseMapper.selectIncludeNewCustomerUserIds(customer.getTenantId())); + Long currentUserId = AuthUtil.getUserId(); + if (Func.isNotEmpty(currentUserId) && !userIds.contains(currentUserId)) { + userIds.add(currentUserId); + } + userIds.forEach(userId -> { UserCustomerScope scope = new UserCustomerScope(); scope.setUserId(userId); scope.setCustomerId(customer.getId());