diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index c758dcd6..2c9d00c9 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -122,6 +122,14 @@ + + + + + + + + diff --git a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java index 02d06f99..a834c21b 100644 --- a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java +++ b/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, 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 f0e952cd..46b0c8df 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 @@ -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)); diff --git a/blade-ops/blade-develop/Dockerfile b/blade-ops/blade-develop/Dockerfile index 4217d010..768b14cd 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 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/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") 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