Merge branch 'dev' into pre-production

blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

@@ -55,7 +55,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));

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
 

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
 

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")

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

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

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