tangweijie/xlcp-backend
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Browse Source
This commit is contained in:
YunaiV 2025-09-01 13:14:02 +08:00
commit a303e09ae9
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-dependencies/pom.xml
View File

@ -27,7 +27,7 @@
<!-- DB 相关 --> <!-- DB 相关 -->
<druid.version>1.2.27</druid.version> <druid.version>1.2.27</druid.version>
<mybatis.version>3.5.19</mybatis.version> <mybatis.version>3.5.19</mybatis.version>
<mybatis-plus.version>3.5.12</mybatis-plus.version> <mybatis-plus.version>3.5.14</mybatis-plus.version>
<mybatis-plus-join.version>1.5.4</mybatis-plus-join.version> <mybatis-plus-join.version>1.5.4</mybatis-plus-join.version>
<dynamic-datasource.version>4.3.1</dynamic-datasource.version> <dynamic-datasource.version>4.3.1</dynamic-datasource.version>
<easy-trans.version>3.0.6</easy-trans.version> <easy-trans.version>3.0.6</easy-trans.version>

5
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java
View File

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fhs.core.trans.vo.TransPojo; import com.fhs.core.trans.vo.TransPojo;
import lombok.Data; import lombok.Data;
import org.apache.ibatis.type.JdbcType;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -38,14 +37,14 @@ public abstract class BaseDO implements Serializable, TransPojo {
* *
* 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。 * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。
*/ */
@TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR) @TableField(fill = FieldFill.INSERT)
private String creator; private String creator;
/** /**
* 更新者，目前使用 SysUser 的 id 编号 * 更新者，目前使用 SysUser 的 id 编号
* *
* 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。 * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。
*/ */
@TableField(fill = FieldFill.INSERT_UPDATE, jdbcType = JdbcType.VARCHAR) @TableField(fill = FieldFill.INSERT_UPDATE)
private String updater; private String updater;
/** /**
* 是否删除 * 是否删除

10
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/security/config/SecurityConfiguration.java
View File

@ -8,6 +8,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer;
import java.util.Optional;
/** /**
* AI 模块的 Security 配置 * AI 模块的 Security 配置
*/ */
@ -15,7 +17,7 @@ import org.springframework.security.config.annotation.web.configurers.AuthorizeH
public class SecurityConfiguration { public class SecurityConfiguration {
@Resource @Resource
private McpServerProperties serverProperties; private Optional<McpServerProperties> serverProperties;
@Bean("aiAuthorizeRequestsCustomizer") @Bean("aiAuthorizeRequestsCustomizer")
public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() {
@ -24,8 +26,10 @@ public class SecurityConfiguration {
@Override @Override
public void customize(AuthorizeHttpRequestsConfigurer<HttpSecurity>.AuthorizationManagerRequestMatcherRegistry registry) { public void customize(AuthorizeHttpRequestsConfigurer<HttpSecurity>.AuthorizationManagerRequestMatcherRegistry registry) {
// MCP Server // MCP Server
registry.requestMatchers(serverProperties.getSseEndpoint()).permitAll(); serverProperties.ifPresent(properties -> {
registry.requestMatchers(serverProperties.getSseMessageEndpoint()).permitAll(); registry.requestMatchers(properties.getSseEndpoint()).permitAll();
registry.requestMatchers(properties.getSseMessageEndpoint()).permitAll();
});
} }
}; };