suzhou-jichuang-lanhai
/
tcZz-java
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
main
吴顺杰 1 month ago
parent 48516cae2d
commit b19eeac59c
5 changed files with 106 additions and 94 deletions
Show Stats Download Patch File Download Diff File

8
ruoyi-admin/src/main/resources/application-dev.yml
Unescape View File

@ -66,4 +66,10 @@ spring:
merge-sql: true
wall:
config:
multi-statement-allow: true
multi-statement-allow: true
# 日志配置
logging:
level:
com.ruoyi: debug
org.springframework: debug

152
ruoyi-admin/src/main/resources/application-druid.yml → ruoyi-admin/src/main/resources/application-prod.yml
Unescape View File

@ -1,73 +1,79 @@
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源 远程服务服务器
master:
url: jdbc:mysql://20.1.0.158:3306/tc_zz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Tczz@20240925
#公司远程
# url: jdbc:mysql://39.101.188.84:3307/tc_zz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Admin123@
##公司本地
# url: jdbc:mysql://localhost:3307/tc_zz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Admin123@
#本地
# url: jdbc:mysql://localhost:3306/tc_zz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: adminadmin
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 100
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置连接超时时间
connectTimeout: 30000
# 配置网络超时时间
socketTimeout: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username: ruoyi
login-password: 123456
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源 远程服务服务器
master:
url: jdbc:mysql://20.1.0.158:3306/tc_zz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: Tczz@20240925
#公司远程
# url: jdbc:mysql://39.101.188.84:3307/tc_zz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Admin123@
##公司本地
# url: jdbc:mysql://localhost:3307/tc_zz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Admin123@
#本地
# url: jdbc:mysql://localhost:3306/tc_zz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: adminadmin
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 100
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置连接超时时间
connectTimeout: 30000
# 配置网络超时时间
socketTimeout: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间，单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username: ruoyi
login-password: 123456
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
# 日志配置
logging:
level:
com.ruoyi: error
org.springframework: error

8
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -34,11 +34,7 @@ server:
# Tomcat启动初始化的线程数，默认值10
min-spare: 100
# 日志配置
logging:
level:
com.ruoyi: debug
org.springframework: warn
# 用户配置
user:
@ -55,7 +51,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: druid
active: prod
# 文件上传
servlet:
multipart:

7
ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml
Unescape View File

@ -39,10 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getScreenArticles" resultType="com.ruoyi.tcZz.domain.reponse.ScreenArticlesResponse">
SELECT *
FROM (SELECT COUNT(*) AS count FROM tc_wpwzlyqk where type =1 and isStatus=1) count,
(SELECT COUNT(*) AS count1 FROM tc_wpwzlyqk where type=2 and isStatus=1 ) count1,
(SELECT COUNT(*) AS count2 FROM tc_wpwzlyqk where type=3 and isStatus=1 ) count2;
FROM (SELECT COUNT(*) AS count FROM tc_wpwzlyqk where type = 1) count,
(SELECT COUNT(*) AS count1 FROM tc_wpwzlyqk where type = 2) count1,
(SELECT COUNT(*) AS count2 FROM tc_wpwzlyqk where type = 3) count2;
</select>
<!-- <select id="getScreenQinglang" resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeifanResponse">-->
<!-- select count1,date_time as dateTime from tc_qlzxxdsjtj-->

25
ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcFbqkMapper.xml
Unescape View File

@ -21,17 +21,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTcFbqkList" parameterType="TcFbqk" resultMap="TcFbqkResult">
<include refid="selectTcFbqkVo"/>
<where>
<if test="id != null "> and id = #{id}</if>
<if test="cityName != null and cityName != ''"> and city_name like concat('%', #{cityName}, '%')</if>
<if test="zb != null and zb != ''"> and zb = #{zb}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
<if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
<if test="remark != null and remark != ''"> and remark = #{remark}</if>
<where>
<if test="id != null ">and id = #{id}</if>
<if test="cityName != null and cityName != ''">and city_name like concat('%', #{cityName}, '%')</if>
<if test="zb != null and zb != ''">and zb = #{zb}</if>
<if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
</if>
<if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if>
<if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''">
and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}
</if>
<if test="remark != null and remark != ''">and remark = #{remark}</if>
</where>
order by create_time desc
ORDER BY
CAST(zb AS DECIMAL ( 10, 2 )) DESC
</select>
<select id="selectTcFbqkById" parameterType="Long" resultMap="TcFbqkResult">

Write Preview
Loading…
Cancel
Save