diff --git a/mdp-lcode-bootstrap/pom.xml b/mdp-lcode-bootstrap/pom.xml
index 2249779..0ce5c13 100644
--- a/mdp-lcode-bootstrap/pom.xml
+++ b/mdp-lcode-bootstrap/pom.xml
@@ -26,10 +26,6 @@
com.mdp
mdp-lcode
-
- com.mdp
- mdp-sys
-
diff --git a/mdp-lcode-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java b/mdp-lcode-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java
index 38fc8cf..7f330d3 100644
--- a/mdp-lcode-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java
+++ b/mdp-lcode-bootstrap/src/main/java/com/mdp/WebSecurityConfig.java
@@ -1,29 +1,22 @@
package com.mdp;
+
import com.mdp.safe.client.jwt.JwtAuthenticationConverter;
import org.springframework.beans.factory.annotation.Autowired;
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.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.oauth2.jwt.JwtDecoder;
-/**
- * com.qqkj.WebSecurityConfig
- *
- * @author chenyc
- * @date 2019/10/10
- */
@EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
- @Autowired
- JwtDecoder jwtDecoder;
-
@Autowired
JwtAuthenticationConverter jwtConverter;
+ @Autowired
+ JwtDecoder jwtDecoder;
@Override
public void configure(WebSecurity web) throws Exception {
@@ -37,13 +30,37 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
*/
@Override
protected void configure(HttpSecurity http) throws Exception {
- http.authorizeRequests().anyRequest().authenticated().and().oauth2Client().and().logout().disable();
- http.formLogin().usernameParameter("userloginid");
+ http.authorizeRequests().antMatchers("/actuator/**","/**/safe/app/auth**",
+ "/**/sys/userTpaInvite/checkInviteId",
+ "/**/sys/user/addUserNoAuth",
+ "/**/sys/user/noauth/detail",
+ "/**/sys/userFans/fansCpd",
+ "/**/sys/userSvr/list",
+ "/**/sys/user/crowd/list",
+ "/**/sys/branch/add",
+ "/**/sys/branch/list",
+ "/**/sys/branch/listBranchNoAuth",
+ "/**/sys/branch/addBranchNoAuth",
+ "/**/sys/dept/listDeptAndChidlDeptByBranchIdNoAuth",
+ "/**/sys/dept/addDeptNoAuth",
+ "/**/sys/userDept/batchEditNoauth",
+ "/**/list/byItemCode",
+ "/**/list/byItemIds",
+ "/**/sys/userTpa/list",
+ "/app/appTpAuth/list",
+ "/**/menuModuleBranch/list",
+ "/**/item/dicts",
+ "/**/list/sysParam",
+ "/swagger-ui.html",
+ "/webjars/**",
+ "/swagger-ui/**",
+ "/swagger-resources/**",
+ "/v2/*",
+ "/csrf",
+ "/").permitAll().anyRequest().authenticated();
+ http.oauth2Client().and().logout().disable();
http.oauth2Login();
- http.oauth2ResourceServer().jwt().jwtAuthenticationConverter(jwtConverter);
- http.csrf().disable();
http.oauth2ResourceServer().jwt().decoder(jwtDecoder).jwtAuthenticationConverter(jwtConverter);
- http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.NEVER);//禁用session
+ http.csrf().disable();
}
-
-}
+}
\ No newline at end of file
diff --git a/mdp-lcode-bootstrap/src/main/resources/application-prod.yml b/mdp-lcode-bootstrap/src/main/resources/application-prod.yml
index e6da316..3f7adaf 100644
--- a/mdp-lcode-bootstrap/src/main/resources/application-prod.yml
+++ b/mdp-lcode-bootstrap/src/main/resources/application-prod.yml
@@ -205,7 +205,7 @@ spring:
#password: zchcgl123!@#
#driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://123.207.117.5:3306/lcode?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
password: 1qaz@WSX
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -218,12 +218,12 @@ spring:
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
mem-ds:
- url: jdbc:mysql://123.207.117.5:3306/lcode?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
password: 1qaz@WSX
driver-class-name: com.mysql.cj.jdbc.Driver
mall-ds:
- url: jdbc:mysql://123.207.117.5:3306/lcode?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
password: 1qaz@WSX
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/mdp-lcode/pom.xml b/mdp-lcode/pom.xml
index 1bbf0b3..de810ed 100644
--- a/mdp-lcode/pom.xml
+++ b/mdp-lcode/pom.xml
@@ -13,5 +13,10 @@
2.0.0-RELEASE
+
+ com.mdp
+ mdp-sys
+ 2.0.0-RELEASE
+
\ No newline at end of file
diff --git a/mdp-lcode/src/main/resources/application-dev.yml b/mdp-lcode/src/main/resources/application-dev.yml
index ed48b75..c87221a 100644
--- a/mdp-lcode/src/main/resources/application-dev.yml
+++ b/mdp-lcode/src/main/resources/application-dev.yml
@@ -202,7 +202,7 @@ spring:
#password: zchcgl123!@#
#driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://123.207.117.5:3306/lcode?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
password: 1qaz@WSX
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -215,12 +215,12 @@ spring:
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
mem-ds:
- url: jdbc:mysql://123.207.117.5:3306/lcode?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
password: 1qaz@WSX
driver-class-name: com.mysql.cj.jdbc.Driver
mall-ds:
- url: jdbc:mysql://123.207.117.5:3306/lcode?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
password: 1qaz@WSX
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/mdp-lcode/src/test/java/com/mdp/WebSecurityConfig.java b/mdp-lcode/src/test/java/com/mdp/WebSecurityConfig.java
index 2bf7c3b..5175a55 100644
--- a/mdp-lcode/src/test/java/com/mdp/WebSecurityConfig.java
+++ b/mdp-lcode/src/test/java/com/mdp/WebSecurityConfig.java
@@ -1,5 +1,6 @@
package com.mdp;
+
import com.mdp.safe.client.jwt.JwtAuthenticationConverter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -9,18 +10,11 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.oauth2.jwt.JwtDecoder;
-/**
- * com.qqkj.WebSecurityConfig
- *
- * @author chenyc
- * @date 2019/10/10
- */
@EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Autowired
JwtAuthenticationConverter jwtConverter;
-
@Autowired
JwtDecoder jwtDecoder;
@@ -36,12 +30,37 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
*/
@Override
protected void configure(HttpSecurity http) throws Exception {
- http.authorizeRequests().anyRequest().authenticated().and().oauth2Client().and().logout().disable();
- http.formLogin().usernameParameter("userloginid");
- //http.oauth2Login();
+ http.authorizeRequests().antMatchers("/actuator/**","/**/safe/app/auth**",
+ "/**/sys/userTpaInvite/checkInviteId",
+ "/**/sys/user/noauth/detail",
+ "/**/sys/userFans/fansCpd",
+ "/**/sys/userSvr/list",
+ "/**/sys/user/crowd/list",
+ "/**/sys/branch/listBranchNoAuth",
+ "/**/sys/branch/add",
+ "/**/sys/branch/list",
+ "/**/sys/branch/listBranchNoAuth",
+ "/**/sys/branch/addBranchNoAuth",
+ "/**/sys/dept/listDeptAndChidlDeptByBranchIdNoAuth",
+ "/**/sys/dept/addDeptNoAuth",
+ "/**/sys/userDept/batchEditNoauth",
+ "/**/list/byItemCode",
+ "/**/list/byItemIds",
+ "/**/item/dicts",
+ "/**/list/sysParam","/druid/**",
+ "/swagger-ui.html",
+ "/webjars/**",
+ "/swagger-ui/**",
+ "/swagger-resources/**",
+ "/v2/*",
+ "/csrf",
+ "/"
+ ).permitAll();
+
+ //http.oauth2Client().and().logout().disable();
+ // http.oauth2Login();
http.oauth2ResourceServer().jwt().decoder(jwtDecoder).jwtAuthenticationConverter(jwtConverter);
http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.NEVER);//禁用session
http.csrf().disable();
}
-
-}
+}
\ No newline at end of file