fix(config): 更新生产环境数据库配置和搜索功能
- 将生产环境数据库连接URL从远程地址改为本地地址 - 修改CMS内容搜索逻辑,支持标题和摘要同时搜索 - 修复用户手机号验证正则表达式语法错误
This commit is contained in:
parent
a401b05ad8
commit
8e00170ba1
|
|
@ -653,7 +653,7 @@ public class SysUserServiceImpl implements SysUserService {
|
||||||
Assert.notBlank(phone, "手机号不能为空");
|
Assert.notBlank(phone, "手机号不能为空");
|
||||||
|
|
||||||
// 验证手机号格式
|
// 验证手机号格式
|
||||||
String phoneRegex = "^1[3-9\\d{9}$";
|
String phoneRegex = "^1[3-9]\\d{9}$";
|
||||||
if (!phone.matches(phoneRegex)) {
|
if (!phone.matches(phoneRegex)) {
|
||||||
Assert.isTrue(false, "手机号格式不正确");
|
Assert.isTrue(false, "手机号格式不正确");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ spring:
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
username: agent_skills
|
username: agent_skills
|
||||||
password: agent_skills@xueai666
|
password: agent_skills@xueai666
|
||||||
url: jdbc:mysql://43.248.97.19:12306/agent_skills?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false&allowPublicKeyRetrieval=true
|
url: jdbc:mysql://127.0.0.1:12306/agent_skills?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&autoReconnect=true&maxReconnects=10&failOverReadOnly=false&allowPublicKeyRetrieval=true
|
||||||
hikari:
|
hikari:
|
||||||
pool-name: ProdHikariPool
|
pool-name: ProdHikariPool
|
||||||
maximum-pool-size: 30
|
maximum-pool-size: 30
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@
|
||||||
and content_id = #{contentId}
|
and content_id = #{contentId}
|
||||||
</if>
|
</if>
|
||||||
<if test="title != null and title != ''">
|
<if test="title != null and title != ''">
|
||||||
and title like concat('%', #{title}, '%')
|
and (title like concat('%', #{title}, '%') or summary like concat('%', #{title}, '%'))
|
||||||
</if>
|
</if>
|
||||||
<if test="contentType != null">
|
<if test="contentType != null">
|
||||||
and content_type = #{contentType}
|
and content_type = #{contentType}
|
||||||
|
|
@ -125,7 +125,7 @@
|
||||||
and content_id = #{contentId}
|
and content_id = #{contentId}
|
||||||
</if>
|
</if>
|
||||||
<if test="title != null and title != ''">
|
<if test="title != null and title != ''">
|
||||||
and title like concat('%', #{title}, '%')
|
and (title like concat('%', #{title}, '%') or summary like concat('%', #{title}, '%'))
|
||||||
</if>
|
</if>
|
||||||
<if test="contentType != null">
|
<if test="contentType != null">
|
||||||
and content_type = #{contentType}
|
and content_type = #{contentType}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue