forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

🔖 Releasing / Version tags. 1.3.2

This commit is contained in:
冷冷 2019-01-24 14:55:41 +08:00
parent cbc9708726
commit 703ca65a8f
19 changed files with 58 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pig-auth/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-auth</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-auth</name>
@ -31,14 +31,14 @@
<parent>
<groupId>com.github</groupId>
<artifactId>pig</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>
<dependency>
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<!--oauth2.0-->
<dependency>

6
pig-auth/src/main/java/com/github/pig/auth/config/PigAuthorizationConfig.java
View File

@ -21,6 +21,7 @@ import com.github.pig.auth.util.UserDetailsImpl;
import com.github.pig.common.constant.CommonConstant;
import com.github.pig.common.constant.SecurityConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
@ -61,7 +62,8 @@ public class PigAuthorizationConfig extends AuthorizationServerConfigurerAdapter
private DataSource dataSource;
@Autowired
private AuthenticationManager authenticationManager;
@Qualifier("authenticationManagerBean")
private AuthenticationManager authenticationManagerBean;
@Autowired
private UserDetailsService userDetailsService;
@ -87,7 +89,7 @@ public class PigAuthorizationConfig extends AuthorizationServerConfigurerAdapter
endpoints
.tokenStore(redisTokenStore())
.tokenEnhancer(tokenEnhancerChain)
.authenticationManager(authenticationManager)
.authenticationManager(authenticationManagerBean)
.reuseRefreshTokens(false)
.userDetailsService(userDetailsService);
}

10
pig-auth/src/main/java/com/github/pig/auth/config/PigSecurityConfigurerAdapter.java
View File

@ -19,10 +19,13 @@ package com.github.pig.auth.config;
import com.github.pig.auth.component.mobile.MobileSecurityConfigurer;
import com.github.pig.common.bean.config.FilterIgnorePropertiesConfig;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@ -54,4 +57,11 @@ public class PigSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter {
.csrf().disable();
http.apply(mobileSecurityConfigurer);
}
@Bean
@Override
@SneakyThrows
public AuthenticationManager authenticationManagerBean() {
return super.authenticationManagerBean();
}
}

4
pig-common/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-common</name>
@ -31,7 +31,7 @@
<parent>
<groupId>com.github</groupId>
<artifactId>pig</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>

4
pig-config/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-config</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-config</name>
@ -31,7 +31,7 @@
<parent>
<groupId>com.github</groupId>
<artifactId>pig</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>

4
pig-eureka/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-eureka</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-eureka</name>
@ -31,7 +31,7 @@
<parent>
<groupId>com.github</groupId>
<artifactId>pig</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>

6
pig-gateway/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-gateway</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-gateway</name>
@ -31,14 +31,14 @@
<parent>
<groupId>com.github</groupId>
<artifactId>pig</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>
<dependency>
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<!--zuul网关-->
<dependency>

6
pig-modules/pig-daemon-service/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-daemon-service</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-daemon-service</name>
@ -31,7 +31,7 @@
<parent>
<groupId>com.github.pig</groupId>
<artifactId>pig-modules</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<properties>
@ -43,7 +43,7 @@
<dependency>
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>com.github.xjzrc.spring.boot</groupId>

6
pig-modules/pig-mc-service/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-mc-service</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-mc-service</name>
@ -31,14 +31,14 @@
<parent>
<groupId>com.github.pig</groupId>
<artifactId>pig-modules</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>
<dependency>
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<!--阿里大于-->
<dependency>

4
pig-modules/pig-sso-client-demo/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-sso-client-demo</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-sso-client-demo</name>
@ -31,7 +31,7 @@
<parent>
<groupId>com.github.pig</groupId>
<artifactId>pig-modules</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>

6
pig-modules/pig-upms-service/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-upms-service</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-upms-service</name>
@ -31,14 +31,14 @@
<parent>
<groupId>com.github.pig</groupId>
<artifactId>pig-modules</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>
<dependency>
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<!--MySQL-->
<dependency>

4
pig-modules/pom.xml
View File

@ -20,13 +20,13 @@
<parent>
<artifactId>pig</artifactId>
<groupId>com.github</groupId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.pig</groupId>
<artifactId>pig-modules</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>pom</packaging>
<name>pig-modules</name>

6
pig-visual/pig-monitor/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-monitor</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-monitor</name>
@ -31,14 +31,14 @@
<parent>
<groupId>com.github.pig</groupId>
<artifactId>pig-visual</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>
<dependency>
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<!--admin-->
<dependency>

26
pig-visual/pig-monitor/src/main/java/com/github/pig/monitor/PigMonitorApplication.java
View File

@ -47,30 +47,4 @@ public class PigMonitorApplication {
public static void main(String[] args) {
SpringApplication.run(PigMonitorApplication.class, args);
}
@Configuration
public static class NotifierConfig {
@Bean
@Primary
public RemindingNotifier remindingNotifier() {
RemindingNotifier notifier = new RemindingNotifier(filteringNotifier(loggerNotifier()));
notifier.setReminderPeriod(TimeUnit.SECONDS.toMillis(10));
return notifier;
}
@Scheduled(fixedRate = 1_000L)
public void remind() {
remindingNotifier().sendReminders();
}
@Bean
public FilteringNotifier filteringNotifier(Notifier delegate) {
return new FilteringNotifier(delegate);
}
@Bean
public LoggingNotifier loggerNotifier() {
return new LoggingNotifier();
}
}
}

10
pig-visual/pig-monitor/src/main/java/com/github/pig/monitor/config/PigNotifierConfiguration.java
View File

@ -24,6 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
@ -32,7 +34,7 @@ import java.util.concurrent.TimeUnit;
/**
* @author lengleng
* @date 2018/1/25
* 监控提醒配置
* 监控提醒配置
*/
@Configuration
@EnableScheduling
@ -41,6 +43,7 @@ public class PigNotifierConfiguration {
private RabbitTemplate rabbitTemplate;
@Autowired
private MonitorPropertiesConfig monitorPropertiesConfig;
@Bean
@Primary
public RemindingNotifier remindingNotifier() {
@ -50,8 +53,9 @@ public class PigNotifierConfiguration {
}
@Bean
public StatusChangeNotifier mobileNotifier(){
return new StatusChangeNotifier(monitorPropertiesConfig,rabbitTemplate);
@Order(Ordered.HIGHEST_PRECEDENCE)
public StatusChangeNotifier mobileNotifier() {
return new StatusChangeNotifier(monitorPropertiesConfig, rabbitTemplate);
}
@Scheduled(fixedRate = 60_000L)

6
pig-visual/pig-zipkin-db/pom.xml
View File

@ -23,7 +23,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-zipkin-db</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-zipkin-db</name>
@ -32,13 +32,13 @@
<parent>
<groupId>com.github.pig</groupId>
<artifactId>pig-visual</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>
<dependency>
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>

6
pig-visual/pig-zipkin-elk/pom.xml
View File

@ -22,7 +22,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-zipkin-elk</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>jar</packaging>
<name>pig-zipkin-elk</name>
@ -31,14 +31,14 @@
<parent>
<groupId>com.github.pig</groupId>
<artifactId>pig-visual</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<dependencies>
<dependency>
<groupId>com.github.pig</groupId>
<artifactId>pig-common</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<exclusions>
<exclusion>
<groupId>io.github.openfeign</groupId>

4
pig-visual/pom.xml
View File

@ -21,7 +21,7 @@
<groupId>com.github.pig</groupId>
<artifactId>pig-visual</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>pom</packaging>
<name>pig-visual</name>
@ -30,7 +30,7 @@
<parent>
<artifactId>pig</artifactId>
<groupId>com.github</groupId>
<version>1.3.1</version>
<version>1.3.2</version>
</parent>
<modules>

2
pom.xml
View File

@ -23,7 +23,7 @@
<groupId>com.github</groupId>
<artifactId>pig</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>pom</packaging>