dev(environment): 切换到本地环境并更新数据库配置
-将 spring.profiles.active 从 saas 改为 local - 更新本地数据库配置,包括 URL、用户名和密码 - 在 PartApplyAppMapper 和 PartApplyMapper 中添加 status 参数的条件判断
This commit is contained in:
parent
5909d5f358
commit
9b9fa60a92
|
|
@ -11,9 +11,9 @@ spring:
|
||||||
# url: jdbc:mysql://192.168.0.14:1109/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
|
# url: jdbc:mysql://192.168.0.14:1109/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
|
||||||
# username: root
|
# username: root
|
||||||
# password: zhzadmin@gzimtcs14!
|
# password: zhzadmin@gzimtcs14!
|
||||||
url: jdbc:mysql://127.0.0.1:3306/gzimt250319?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
|
url: jdbc:mysql://14.103.246.124/gz_imt0703?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
|
||||||
username: ruanliang
|
username: root
|
||||||
password: ruanliang@MYSQL
|
password: mysql_CXzwWd
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
redis:
|
redis:
|
||||||
host: localhost
|
host: localhost
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# 环境配置
|
# 环境配置
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: saas
|
active: local
|
||||||
|
|
@ -188,6 +188,9 @@
|
||||||
END as typeName
|
END as typeName
|
||||||
FROM t_part_apply tpa
|
FROM t_part_apply tpa
|
||||||
<where>
|
<where>
|
||||||
|
<if test="status != null and status !='' ">
|
||||||
|
tpa.status = #{status}
|
||||||
|
</if>
|
||||||
<if test="keyWord!=null and keyWord!=''">
|
<if test="keyWord!=null and keyWord!=''">
|
||||||
and (
|
and (
|
||||||
tpa.code like concat('%',#{keyWord},'%') or
|
tpa.code like concat('%',#{keyWord},'%') or
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,9 @@
|
||||||
FROM t_part_apply tpa
|
FROM t_part_apply tpa
|
||||||
left join pm_user pu on tpa.creator=pu.id
|
left join pm_user pu on tpa.creator=pu.id
|
||||||
<where>
|
<where>
|
||||||
|
<if test="status != null and status != ''">
|
||||||
|
and tpa.status = #{status}
|
||||||
|
</if>
|
||||||
<if test="keyWord!=null and keyWord!=''">
|
<if test="keyWord!=null and keyWord!=''">
|
||||||
and (
|
and (
|
||||||
tpa.code like concat('%',#{keyWord},'%') or
|
tpa.code like concat('%',#{keyWord},'%') or
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue