Merge branch 'pre-production'

blade-auth/pom.xml

@@ -122,6 +122,14 @@
 <!--            <artifactId>logpm-basicdata-api</artifactId>-->
 <!--            <version>3.2.0.RELEASE</version>-->
 <!--        </dependency>-->
+
+
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>blade-log</artifactId>-->
+<!--            <version>${bladex.project.version}</version>-->
+<!--        </dependency>-->
+
     </dependencies>
 
     <build>

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -16,12 +16,7 @@
  */
 package org.springblade.auth.service;
 
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.StringUtils;
-//import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
-//import com.logpm.basicdata.entity.WarehouseParcelListEntity;
-//import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
-
 import io.jsonwebtoken.Claims;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
@@ -36,10 +31,10 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
 import org.springblade.system.cache.ParamCache;
 import org.springblade.system.entity.Tenant;
-import org.springblade.system.feign.ISysClient;
 import org.springblade.system.entity.User;
 import org.springblade.system.entity.UserInfo;
 import org.springblade.system.enums.UserEnum;
+import org.springblade.system.feign.ISysClient;
 import org.springblade.system.feign.IUserClient;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -71,6 +66,8 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 	private final BladeRedis bladeRedis;
 	private final JwtProperties jwtProperties;
 
+//	private final ILogClient logClient;
+
 //	private final IBasicdataWarehouseClient basicdataWarehouseClient;
 
 	@Override
@@ -175,7 +172,9 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 
 			// 成功则清除登录错误次数
 			delFailCount(tenantId, username);
-
+//			LogUsual logUsual = new LogUsual();
+//			logUsual.setTenantId(tenantId);
+//			logClient.saveUsualLog(logUsual);// 记录登录日志
 			BladeUserDetails bladeUserDetails = new BladeUserDetails(user.getId(),
 				user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
 				username, AuthConstant.ENCRYPT + user.getPassword(), userInfo.getDetail(), true, true, true, true,

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