Browse Source

解决前端轮询登录接口刷新token报错问题

home 2 years ago
parent
commit
6b3e669ffc

+ 2 - 1
bladex/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -67,7 +67,8 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
         // 获取租户ID
         // 获取租户ID
         String headerTenant = request.getHeader(TokenUtil.TENANT_HEADER_KEY);
         String headerTenant = request.getHeader(TokenUtil.TENANT_HEADER_KEY);
         String paramTenant = request.getParameter(TokenUtil.TENANT_PARAM_KEY);
         String paramTenant = request.getParameter(TokenUtil.TENANT_PARAM_KEY);
-        String password = request.getAttribute(TokenUtil.PASSWORD_KEY).toString();
+        Object passwordObj = request.getAttribute(TokenUtil.PASSWORD_KEY);
+        String password = passwordObj == null ? "" : passwordObj.toString();
         String grantType = request.getParameter(TokenUtil.GRANT_TYPE_KEY);
         String grantType = request.getParameter(TokenUtil.GRANT_TYPE_KEY);
         if (StringUtil.isAllBlank(headerTenant, paramTenant)) {
         if (StringUtil.isAllBlank(headerTenant, paramTenant)) {
             throw new UserDeniedAuthorizationException(TokenUtil.TENANT_NOT_FOUND);
             throw new UserDeniedAuthorizationException(TokenUtil.TENANT_NOT_FOUND);

+ 1 - 6
hx-service-api/storage-api/src/main/java/com/fjhx/entity/attachment/StockAttachment.java

@@ -1,16 +1,10 @@
 package com.fjhx.entity.attachment;
 package com.fjhx.entity.attachment;
 
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
 import com.fjhx.base.BasicEntity;
 import com.fjhx.base.BasicEntity;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 
 
-import java.util.Date;
-
 /**
 /**
  * <p>
  * <p>
  * 业务附件表
  * 业务附件表
@@ -62,4 +56,5 @@ public class StockAttachment extends BasicEntity {
      * 大小
      * 大小
      */
      */
     private Long size;
     private Long size;
+
 }
 }

+ 1 - 4
hx-service/storage/src/main/java/com/fjhx/applet/controller/FabricStatisticsController.java

@@ -3,10 +3,7 @@ package com.fjhx.applet.controller;
 import com.fjhx.applet.service.FabricStatisticsService;
 import com.fjhx.applet.service.FabricStatisticsService;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;