删除代码

ad-platform-common/pom.xml

@@ -113,21 +113,6 @@
             <artifactId>yauaa</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

ad-platform-common/src/main/java/com/baiye/annotation/EnableResourceServer.java

@@ -1,26 +0,0 @@
-
-package com.baiye.annotation;
-
-import com.baiye.feign.FeignClientConfiguration;
-import org.springframework.cloud.openfeign.FeignClientProperties;
-import org.springframework.context.annotation.Import;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-
-import java.lang.annotation.*;
-
-/**
- * @author lengleng
- * @date 2019/03/08
- * <p>
- * 资源服务注解
- */
-@Documented
-@Inherited
-@org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-@Import(FeignClientConfiguration.class)
-public @interface EnableResourceServer {
-
-}

ad-platform-common/src/main/java/com/baiye/feign/FeignClientConfiguration.java

@@ -1,30 +0,0 @@
-
-package com.baiye.feign;
-
-import feign.Feign;
-import feign.RequestInterceptor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.security.oauth2.client.AccessTokenContextRelay;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.oauth2.client.OAuth2ClientContext;
-import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
-
-/**
- * @author lengleng
- * @date 2019/2/1 feign 拦截器传递 header 中oauth token， 使用hystrix 的信号量模式
- */
-@Configuration
-@ConditionalOnClass(Feign.class)
-public class FeignClientConfiguration {
-
-    @Bean
-    @ConditionalOnProperty("security.oauth2.client.client-id")
-    public RequestInterceptor oauth2FeignRequestInterceptor(OAuth2ClientContext oAuth2ClientContext,
-                                                            OAuth2ProtectedResourceDetails resource,
-                                                            AccessTokenContextRelay accessTokenContextRelay) {
-        return new FeignClientInterceptor(oAuth2ClientContext, resource, accessTokenContextRelay);
-    }
-
-}

ad-platform-common/src/main/java/com/baiye/feign/FeignClientInterceptor.java

@@ -1,53 +0,0 @@
-
-package com.baiye.feign;
-
-import feign.RequestTemplate;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cloud.security.oauth2.client.AccessTokenContextRelay;
-import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
-import org.springframework.security.oauth2.client.OAuth2ClientContext;
-import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails;
-
-/**
- * @author lengleng
- * @date 2019/2/1 扩展OAuth2FeignRequestInterceptor
- */
-@Slf4j
-
-public class FeignClientInterceptor extends OAuth2FeignRequestInterceptor {
-
-	private final OAuth2ClientContext oAuth2ClientContext;
-	private final AccessTokenContextRelay accessTokenContextRelay;
-
-	/**
-	 * Default constructor which uses the provided OAuth2ClientContext and Bearer tokens
-	 * within Authorization header
-	 *
-	 * @param oAuth2ClientContext     provided context
-	 * @param resource                type of resource to be accessed
-	 * @param accessTokenContextRelay
-	 */
-	public FeignClientInterceptor(OAuth2ClientContext oAuth2ClientContext
-			, OAuth2ProtectedResourceDetails resource, AccessTokenContextRelay accessTokenContextRelay) {
-		super(oAuth2ClientContext, resource);
-		this.oAuth2ClientContext = oAuth2ClientContext;
-		this.accessTokenContextRelay = accessTokenContextRelay;
-	}
-
-
-	/**
-	 * Create a template with the header of provided name and extracted extract
-	 * 1. 如果使用 非web 请求，header 区别
-	 * 2. 根据authentication 还原请求token
-	 *
-	 * @param template
-	 */
-	@Override
-	public void apply(RequestTemplate template) {
-		accessTokenContextRelay.copyToken();
-		if (oAuth2ClientContext != null
-				&& oAuth2ClientContext.getAccessToken() != null) {
-			super.apply(template);
-		}
-	}
-}

ad-platform-gateway/pom.xml

@@ -32,10 +32,6 @@
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-webmvc</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-data-redis</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/OrganizeMemberDistributionDTO.java

@@ -1,12 +1,12 @@
 package com.baiye.modules.system.service.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sun.istack.internal.NotNull;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
 import java.sql.Timestamp;
 import java.util.List;
 

manage/ad-platform-task/src/main/java/com/baiye/AdPlatformTaskApplication.java

@@ -1,6 +1,5 @@
 package com.baiye;
 
-import com.baiye.annotation.EnableResourceServer;
 import com.spring4all.swagger.EnableSwagger2Doc;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -19,7 +18,6 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 @EnableFeignClients
 @EnableDiscoveryClient
 @SpringBootApplication
-@EnableResourceServer
 public class AdPlatformTaskApplication {
 
     public static void main(String[] args) {