Skip to content

Y
yd-cloud-core
Commit 6216ed7f by zhangxingmin
Options

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

parents fa3afc51 7319adb4
Showing with 25 additions and 0 deletions
yd-auth-core/src/main/java/com/yd/auth/core/config/SecurityConfig.java
...@@ -69,6 +69,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -69,6 +69,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/v3/api-docs/**", "/v3/api-docs/**",
"/sysUser/body/detail", "/sysUser/body/detail",
"/ossFile/list", "/ossFile/list",
"/convert/file",
"/sysDict/type/item/list/**", "/sysDict/type/item/list/**",
"/clientUser/clientUserBizIdList", "/clientUser/clientUserBizIdList",
"/salary/condition/list", "/salary/condition/list",
...@@ -76,8 +77,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -76,8 +77,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/coSession/create", "/coSession/create",
"/coSession/join", "/coSession/join",
"/coSession/status", "/coSession/status",
"/coSession/detail/roomIdAndPwd",
"/coSession/isMy",
"/coSession/link/status",
"/coSession/set/link/failure",
"/oss/upload/body/json", "/oss/upload/body/json",
"/notificationTask/send", "/notificationTask/send",
"/subscribe/record/batch",
"/subscribe/remaining",
"/userSaleExpand/list", "/userSaleExpand/list",
"/relProjectRole/page", "/relProjectRole/page",
"/relProjectRole/menu/list", "/relProjectRole/menu/list",
......
yd-common/src/main/java/com/yd/common/result/Result.java
...@@ -61,6 +61,17 @@ public class Result<T> implements Serializable { ...@@ -61,6 +61,17 @@ public class Result<T> implements Serializable {
/** /**
* 失败返回 * 失败返回
*/ */
public static <T> Result<T> fail(int code, String msg,T data) {
Result<T> result = new Result<T>();
result.setCode(code);
result.setMsg(msg);
result.setData(data);
return result;
}
/**
* 失败返回
*/
public static <T> Result<T> fail(String msg) { public static <T> Result<T> fail(String msg) {
return fail(500, msg); return fail(500, msg);
} }
......
yd-gateway/src/main/java/com/yd/gateway/config/GatewayJwtAuthFilterConfig.java
...@@ -116,6 +116,7 @@ public class GatewayJwtAuthFilterConfig { ...@@ -116,6 +116,7 @@ public class GatewayJwtAuthFilterConfig {
"/ai/api/v3/api-docs/**", "/ai/api/v3/api-docs/**",
// 关键：匹配任意层级下的 ossFile/list // 关键：匹配任意层级下的 ossFile/list
"/**/ossFile/list", "/**/ossFile/list",
"/**/convert/file",
// 如果路径固定，也可以直接加完整路径 // 如果路径固定，也可以直接加完整路径
// "/api/oss/api/ossFile/list" // "/api/oss/api/ossFile/list"
"/**/relProjectRole/page", "/**/relProjectRole/page",
...@@ -124,8 +125,14 @@ public class GatewayJwtAuthFilterConfig { ...@@ -124,8 +125,14 @@ public class GatewayJwtAuthFilterConfig {
"/**/coSession/create", "/**/coSession/create",
"/**/coSession/join", "/**/coSession/join",
"/**/coSession/status", "/**/coSession/status",
"/**/coSession/detail/roomIdAndPwd",
"/**/coSession/isMy",
"/**/coSession/link/status",
"/**/coSession/set/link/failure",
"/**/oss/upload/body/json", "/**/oss/upload/body/json",
"/**/notificationTask/send", "/**/notificationTask/send",
"/**/subscribe/record/batch",
"/**/subscribe/remaining",
"/**/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