diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 6eec92c..a894fbc 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -49,15 +49,15 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://192.168.124.52:3308/ry-vue-flowable-xg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://49.233.157.185:3306/fad_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: root - password: 123456 + password: WANGyu11! # 从库数据源 slave: lazy: true type: ${spring.datasource.type} driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/qhaoda-flowable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + url: jdbc:mysql://49.233.157.185:3306/fad_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true username: password: # oracle: @@ -102,13 +102,13 @@ spring: spring: redis: # 地址 - host: 127.0.0.1 + host: 49.233.157.185 # 端口,默认为6379 port: 6379 # 数据库索引 database: 0 # 密码(如没有密码请注释掉) - # password: + password: WANGyu11! # 连接超时时间 timeout: 10s # 是否开启ssl diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaArticleServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaArticleServiceImpl.java index 42777a9..b5ab34d 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaArticleServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaArticleServiceImpl.java @@ -69,7 +69,6 @@ public class SysOaArticleServiceImpl implements ISysOaArticleService { public TableDataInfo selectArticlePageList(SysOaArticleBo bo, PageQuery pageQuery){ LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page articlePageList = baseMapper.selectArticlePageList(pageQuery.build(), lqw); - System.out.println(articlePageList); return TableDataInfo.build(articlePageList); }