Skip to content

Y
yd-cloud-core
Commit 6ee3c061 by zhangxingmin
Options

Merge remote-tracking branch 'origin/dev' into prod

parents 35a420a8 1b79dc34
Showing with 24 additions and 14 deletions
pom.xml
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <!-- <dependency>-->
<groupId>org.springframework.security</groupId> <!-- <groupId>org.springframework.security</groupId>-->
<artifactId>spring-security-oauth2-resource-server</artifactId> <!-- <artifactId>spring-security-oauth2-resource-server</artifactId>-->
<version>5.7.8</version> <!-- 与Spring Security版本匹配（2.7.x Boot对应5.7.x Security） --> <!-- <version>5.7.8</version> &lt;!&ndash; 与Spring Security版本匹配（2.7.x Boot对应5.7.x Security） &ndash;&gt;-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.springframework.security</groupId> <!-- <groupId>org.springframework.security</groupId>-->
<artifactId>spring-security-oauth2-jose</artifactId> <!-- <artifactId>spring-security-oauth2-jose</artifactId>-->
<version>5.7.8</version> <!-- 同上，版本需匹配 --> <!--&lt;!&ndash; <version>5.7.8</version> &lt;!&ndash; 同上，版本需匹配 &ndash;&gt;&ndash;&gt;-->
</dependency> <!-- </dependency>-->
<!-- JWT 依赖 --> <!-- JWT 依赖 -->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
......
yd-auth-core/pom.xml
...@@ -51,10 +51,12 @@ ...@@ -51,10 +51,12 @@
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-resource-server</artifactId> <artifactId>spring-security-oauth2-resource-server</artifactId>
<version>5.6.9</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId> <artifactId>spring-security-oauth2-jose</artifactId>
<version>5.6.9</version>
</dependency> </dependency>
<!-- JWT 依赖 --> <!-- JWT 依赖 -->
......
yd-auth-core/src/main/java/com/yd/auth/core/config/SecurityConfig.java
...@@ -73,6 +73,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -73,6 +73,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/clientUser/clientUserBizIdList", "/clientUser/clientUserBizIdList",
"/salary/condition/list", "/salary/condition/list",
"/salary/detail", "/salary/detail",
"/notificationTask/send",
"/userSaleExpand/list", "/userSaleExpand/list",
"/relProjectRole/page", "/relProjectRole/page",
"/relProjectRole/menu/list", "/relProjectRole/menu/list",
......
yd-auth-core/src/main/java/com/yd/auth/core/service/impl/AuthServiceImpl.java
package com.yd.auth.core.service.impl; package com.yd.auth.core.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.yd.auth.core.config.LoginConfig; import com.yd.auth.core.config.LoginConfig;
import com.yd.auth.core.dto.AuthUserDto; import com.yd.auth.core.dto.AuthUserDto;
import com.yd.auth.core.request.LoginRequest; import com.yd.auth.core.request.LoginRequest;
......
yd-auth-core/src/main/java/com/yd/auth/core/service/impl/AuthUserDetailsService.java
package com.yd.auth.core.service.impl; package com.yd.auth.core.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.yd.auth.core.dto.AuthUserDto; import com.yd.auth.core.dto.AuthUserDto;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.user.feign.client.sysuser.ApiSysUserFeignClient; import com.yd.user.feign.client.sysuser.ApiSysUserFeignClient;
......
yd-common/pom.xml
...@@ -30,9 +30,13 @@ ...@@ -30,9 +30,13 @@
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>com.alibaba</groupId>-->
<!-- <artifactId>fastjson</artifactId>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson</artifactId> <artifactId>fastjson2</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
yd-common/src/main/java/com/yd/common/enums/CommonEnum.java
...@@ -86,6 +86,8 @@ public enum CommonEnum { ...@@ -86,6 +86,8 @@ public enum CommonEnum {
UID_TYPE_CSF_CLIENT_USER("csf_client_user","CSF客户端用户表"), UID_TYPE_CSF_CLIENT_USER("csf_client_user","CSF客户端用户表"),
UID_TYPE_AGENT_TUTORING_RELATION("agent_tutoring_relation","辅导关系表"), UID_TYPE_AGENT_TUTORING_RELATION("agent_tutoring_relation","辅导关系表"),
UID_TYPE_AGENT_REFERRAL_RELATION("agent_referral_relation","推荐关系表"), UID_TYPE_AGENT_REFERRAL_RELATION("agent_referral_relation","推荐关系表"),
UID_TYPE_AGENT_MANAGE_RELATION("agent_manage_relation","管理关系表"),
UID_TYPE_TEAM("team","团队信息表"),
//作用域枚举 //作用域枚举
SCOPE_SYS("1","系统级（全局）"), SCOPE_SYS("1","系统级（全局）"),
......
yd-gateway/src/main/java/com/yd/gateway/config/GatewayJwtAuthFilterConfig.java
...@@ -121,6 +121,7 @@ public class GatewayJwtAuthFilterConfig { ...@@ -121,6 +121,7 @@ public class GatewayJwtAuthFilterConfig {
"/**/relProjectRole/page", "/**/relProjectRole/page",
"/**/salary/condition/list", "/**/salary/condition/list",
"/**/salary/detail", "/**/salary/detail",
"/**/notificationTask/send",
"/**/userSaleExpand/list", "/**/userSaleExpand/list",
"/**/api/relProjectRole/menu/list" "/**/api/relProjectRole/menu/list"
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment