From a61a6429c4098db75daa5c898ab60be532ce260d Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 8 Aug 2024 15:56:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add:=E5=8C=BA=E5=9F=9F=E4=B8=8D=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blade-swagger/src/main/resources/application-dev.yml | 8 ++++---- .../springblade/system/feign/PdaversionManageClient.java | 2 ++ .../springblade/system/feign/PdaversionTenantClient.java | 3 +++ .../java/org/springblade/system/feign/RegionFeign.java | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/blade-ops/blade-swagger/src/main/resources/application-dev.yml b/blade-ops/blade-swagger/src/main/resources/application-dev.yml index 7c6ae131..fb1ff708 100644 --- a/blade-ops/blade-swagger/src/main/resources/application-dev.yml +++ b/blade-ops/blade-swagger/src/main/resources/application-dev.yml @@ -10,9 +10,9 @@ knife4j: # - name: 系统模块 # uri: 192.168.10.101:8888 # location: /blade-system/v2/api-docs -# - name: 配送模块 -# uri: 192.168.10.101:8888 -# location: /logpm-distribution/v2/api-docs + - name: 配送模块 + uri: 192.168.3.73:13000 + location: /logpm-distribution/v2/api-docs # - name: 工厂模块 # uri: 192.168.10.101:8888 # location: /logpm-factory/v2/api-docs @@ -23,6 +23,6 @@ knife4j: # uri: 192.168.10.101:8888 # location: /logpm-basicdata/v2/api-docs - name: 基础模块 - uri: 192.168.3.2:13000 + uri: 192.168.3.73:13000 location: /logpm-basic/v2/api-docs diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/PdaversionManageClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/PdaversionManageClient.java index d020ffb2..66bc12d0 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/PdaversionManageClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/PdaversionManageClient.java @@ -22,6 +22,7 @@ import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.tenant.annotation.NonDS; import org.springblade.system.entity.PdaversionManageEntity; import org.springblade.system.service.IPdaversionManageService; import org.springframework.web.bind.annotation.GetMapping; @@ -34,6 +35,7 @@ import springfox.documentation.annotations.ApiIgnore; * @author lmy * @since 2023-09-12 */ +@NonDS @ApiIgnore() @RestController @AllArgsConstructor diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/PdaversionTenantClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/PdaversionTenantClient.java index c351f9d4..1e8c1530 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/PdaversionTenantClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/PdaversionTenantClient.java @@ -22,6 +22,7 @@ import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.tenant.annotation.NonDS; import org.springblade.system.entity.PdaversionTenantEntity; import org.springblade.system.service.IPdaversionTenantService; import org.springframework.web.bind.annotation.GetMapping; @@ -34,6 +35,8 @@ import springfox.documentation.annotations.ApiIgnore; * @author lmy * @since 2023-09-12 */ + +@NonDS @ApiIgnore() @RestController @AllArgsConstructor diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/RegionFeign.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/RegionFeign.java index 1a28ebdd..94e8b4a5 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/RegionFeign.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/RegionFeign.java @@ -2,11 +2,12 @@ package org.springblade.system.feign; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; +import org.springblade.core.tenant.annotation.NonDS; import org.springblade.system.entity.Region; import org.springblade.system.service.IRegionService; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; - +@NonDS @ApiIgnore() @RestController @AllArgsConstructor From 04df0025b67a5ebc38039829cca1b79d092d1b7d Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 8 Aug 2024 15:56:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add:=E5=8C=BA=E5=9F=9F=E4=B8=8D=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/api/AppPdaversionController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/api/AppPdaversionController.java b/blade-service/blade-system/src/main/java/org/springblade/system/api/AppPdaversionController.java index 969e2ecd..39682546 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/api/AppPdaversionController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/api/AppPdaversionController.java @@ -24,6 +24,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.system.dto.AppPdaversionDTO; @@ -43,6 +44,7 @@ import javax.validation.Valid; * @author lmy * @since 2023-09-12 */ +@NonDS @RestController @AllArgsConstructor @RequestMapping("/AppPdaversion") From 6949c81e718d37423a87a6308aab73be27e3e4a4 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 8 Aug 2024 17:23:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E5=85=B3=E9=97=ADelk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/common/launch/LauncherServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java index c6962399..47ca68b5 100644 --- a/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java +++ b/blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java @@ -43,7 +43,7 @@ public class LauncherServiceImpl implements LauncherService { PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false"); // 开启elk日志 - PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile)); +// PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile)); // seata注册地址 // PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile)); From 4c38de2dcaf0bcfb840455758d401ffa60b41797 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 21 Sep 2024 15:04:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=BD=91=E7=9A=84docker=20images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-ops/blade-develop/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-ops/blade-develop/Dockerfile b/blade-ops/blade-develop/Dockerfile index fb8dc791..8166283e 100644 --- a/blade-ops/blade-develop/Dockerfile +++ b/blade-ops/blade-develop/Dockerfile @@ -1,4 +1,4 @@ -FROM bladex/alpine-java:8_server-jre_cn_unlimited +FROM 192.168.2.110:7777/hwy/hwy_base:v1.0 MAINTAINER bladejava@qq.com