zouxuan 5 年之前
父节点
当前提交
bf442de67a

+ 2 - 1
mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
 
 import com.ym.mec.auth.api.dto.SysUserInfo;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "auth-server")
 public interface SysUserFeignService {
@@ -18,5 +19,5 @@ public interface SysUserFeignService {
 	public Object test();
 
 	@GetMapping(value = "queryUserInfo")
-	SysUser queryUserInfo(@PathVariable("access_token") String access_token);
+	SysUser queryUserInfo(@RequestHeader("Authorization") String access_token);
 }

+ 4 - 0
mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -1,5 +1,6 @@
 package com.ym.mec.auth.api.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.common.enums.UserGenderEnum;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -33,9 +34,11 @@ public class SysUser {
 	private Integer organId;
 
 	/** 创建时间 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private java.util.Date createTime;
 
 	/** 修改时间 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private java.util.Date updateTime;
 
 	/** 0-正常,9-锁定 */
@@ -57,6 +60,7 @@ public class SysUser {
 
 	private String nation;
 
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date birthdate;
 
 	private String email;

+ 0 - 4
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/provider/PhoneAuthenticationProvider.java

@@ -20,9 +20,6 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 	private UserDetailsService userDetailsService;
 
 	private SmsCodeService smsCodeService;
-
-	@Autowired
-	private RedisTemplate<String,String> redisTemplate;
 	@Override
 	protected void additionalAuthenticationChecks(UserDetails userDetails, Authentication authentication) throws AuthenticationException {
 		if (authentication.getCredentials() == null) {
@@ -59,7 +56,6 @@ public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider
 	protected Authentication createSuccessAuthentication(Object principal, Authentication authentication, UserDetails user) {
 		PhoneAuthenticationToken result = new PhoneAuthenticationToken(principal, authentication.getCredentials(), user.getAuthorities());
 		result.setDetails(authentication.getDetails());
-		redisTemplate.opsForValue().set(user.getUsername(),JSON.toJSONString(user));
 		return result;
 	}
 

+ 1 - 1
mec-common/common-core/src/main/java/com/ym/mec/common/security/SecurityUtils.java

@@ -50,6 +50,6 @@ public class SecurityUtils {
 	}
 
 	public static String getToken(){
-		return JSON.parseObject(JSON.toJSONString(getAuthentication().getDetails()), Map.class).get("tokenValue").toString();
+		return "bearer " + JSON.parseObject(JSON.toJSONString(getAuthentication().getDetails()), Map.class).get("tokenValue").toString();
 	}
 }