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

🔖 Releasing / Version tags. 2.6.3 support sso

This commit is contained in:
冷冷 2020-01-13 19:56:35 +08:00
parent b41c6fdb2a
commit b8a4543b8e
17 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pig-auth/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-auth</artifactId>
@ -44,13 +44,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--security-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--JDBC相关-->
<dependency>

6
pig-auth/src/main/java/com/pig4cloud/pig/auth/config/WebSecurityConfigurer.java
View File

@ -24,6 +24,7 @@ import org.springframework.context.annotation.Primary;
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.builders.WebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.PasswordEncoder;
@ -57,6 +58,11 @@ public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
.and().csrf().disable();
}
@Override
public void configure(WebSecurity web) {
web.ignoring().antMatchers("/css/**");
}
@Bean
@Override
@SneakyThrows

4
pig-auth/src/main/resources/templates/ftl/confirm.ftl
View File

@ -6,8 +6,8 @@
<meta name="viewport"
content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
<title>PigX第三方授权</title>
<link rel="stylesheet" type="text/css" href="/static/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="/static/css/signin.css"/>
<link rel="stylesheet" type="text/css" href="/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="/css/signin.css"/>
</head>
<body>

4
pig-auth/src/main/resources/templates/ftl/login.ftl
View File

@ -10,8 +10,8 @@
<title>PigX微服务统一认证</title>
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/signin.css" rel="stylesheet">
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/signin.css" rel="stylesheet">
</head>
<body class="sign_body">

8
pig-codegen/pom.xml
View File

@ -22,7 +22,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-codegen</artifactId>
@ -35,7 +35,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-swagger</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--注册中心客户端-->
<dependency>
@ -61,13 +61,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--安全模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--代码生成模板引擎-->
<dependency>

2
pig-common/pig-common-core/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-common-core</artifactId>

6
pig-common/pig-common-log/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-common-log</artifactId>
@ -35,13 +35,13 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--UPMS接口模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--安全依赖获取上下文信息-->
<dependency>

6
pig-common/pig-common-security/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-common-security</artifactId>
@ -35,7 +35,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--安全模块-->
<dependency>
@ -50,7 +50,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
</dependencies>
</project>

2
pig-common/pig-common-swagger/pom.xml
View File

@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-common-swagger</artifactId>

2
pig-common/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-common</artifactId>

6
pig-gateway/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-gateway</artifactId>
@ -59,7 +59,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--接口文档-->
<dependency>
@ -70,7 +70,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-swagger</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
</dependencies>

2
pig-monitor/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-monitor</artifactId>

2
pig-register/pom.xml
View File

@ -18,7 +18,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-register</artifactId>

4
pig-upms/pig-upms-api/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-upms-api</artifactId>
@ -35,7 +35,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
</dependencies>
</project>

10
pig-upms/pig-upms-biz/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-upms-biz</artifactId>
@ -34,25 +34,25 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--安全模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--日志处理-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-log</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--接口文档-->
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pig-common-swagger</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</dependency>
<!--注册中心客户端-->
<dependency>

2
pig-upms/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
</parent>
<artifactId>pig-upms</artifactId>

2
pom.xml
View File

@ -27,7 +27,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<url>https://www.pig4cloud.com</url>