yonge há 5 anos atrás
pai
commit
fa8484fcc5

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

@@ -18,8 +18,8 @@ public interface SysUserFeignService {
 	@GetMapping(value = "user/queryUserByPhone")
 	public SysUser getUserByMobile(@RequestParam("mobile") String mobile);
 
-	@RequestMapping(value = "user/add",method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public Object addUser(@RequestBody SysUser user);
+	@PostMapping(value = "user/add", consumes = MediaType.APPLICATION_JSON_VALUE)
+	public Object addUser(SysUser user);
 
 	@GetMapping(value = "task/test")
 	public Object test();

+ 1 - 1
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -61,7 +61,7 @@ public class UserController extends BaseController {
 	}
 
 	@ApiOperation(value = "新增用户")
-	@RequestMapping(value = "/add",method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Object add(@RequestBody SysUser sysUser) {
 //		sysUser.setPassword(new BCryptPasswordEncoder().encode(sysUser.getPassword()));
 		sysUserService.insert(sysUser);

+ 10 - 4
mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestHeaderConfiguration.java

@@ -1,9 +1,8 @@
 package com.ym.mec.common.config;
 
-import java.util.Enumeration;
-
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -19,7 +18,14 @@ public class RequestHeaderConfiguration implements RequestInterceptor {
 			return;
 		}
 		HttpServletRequest request = attributes.getRequest();
-		Enumeration<String> headerNames = request.getHeaderNames();
+		
+		String authorization = request.getHeader("Authorization");
+
+		if (StringUtils.isNotBlank(authorization)) {
+			template.header("Authorization", authorization);
+		}
+		
+		/*Enumeration<String> headerNames = request.getHeaderNames();
 		if (headerNames != null) {
 			while (headerNames.hasMoreElements()) {
 				String name = headerNames.nextElement();
@@ -27,7 +33,7 @@ public class RequestHeaderConfiguration implements RequestInterceptor {
 				template.header(name, values);
 
 			}
-		}
+		}*/
 	}
 
 }

+ 14 - 0
mec-web/src/main/java/com/ym/mec/web/WebApplication.java

@@ -1,17 +1,21 @@
 package com.ym.mec.web;
 
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.client.RestTemplate;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import com.ym.mec.common.redis.service.RedisCache;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -21,6 +25,10 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @Configuration
 @EnableSwagger2Doc
 public class WebApplication {
+
+	@Autowired
+	private RedisTemplate<String, Object> redisTemplate;
+	
 	public static void main(String[] args) {
 		SpringApplication.run(WebApplication.class, args);
 	}
@@ -30,4 +38,10 @@ public class WebApplication {
 	public RestTemplate restTemplate() {
 		return new RestTemplate();
 	}
+
+	@Bean
+	@ConditionalOnBean(RedisTemplate.class)
+	public RedisCache<String, Object> redisCache() {
+		return new RedisCache<String, Object>(redisTemplate);
+	}
 }