sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pro 数据库

Browse Source
This commit is contained in:
小久哥
2022-06-09 10:34:34 +08:00
parent 71bc4b45dc
commit 6d9be42340
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yudao-server/src/main/resources/application-prod.yaml
+9 -9
View File
@@ -45,23 +45,23 @@ spring:
primary: master primary: master
datasource: datasource:
master: master:
name: ruoyi-vue-pro name: ruoyi_pro
url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: root username: vue_pro
password: 4730da9b password: CrnPu&g8HqbBikrA&DH-llRgtvpIrG#-
slave: # 模拟从库，可根据自己需要修改 slave: # 模拟从库，可根据自己需要修改
name: ruoyi-vue-pro name: ruoyi_pro
url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: root username: vue_pro
password: 4730da9b password: CrnPu&g8HqbBikrA&DH-llRgtvpIrG#-
bxg: # 农场数据源 bxg: # 农场数据源
name: bxg name: ruoyi_pro_bxg
url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.bxg.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.bxg.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: root username: vue_pro
password: 4730da9b password: CrnPu&g8HqbBikrA&DH-llRgtvpIrG#-
# farm: # 农场数据源 # farm: # 农场数据源
# name: zsw-farm # name: zsw-farm
# url: jdbc:p6spy:mysql://192.168.10.129:3306/${spring.datasource.dynamic.datasource.farm.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true # url: jdbc:p6spy:mysql://192.168.10.129:3306/${spring.datasource.dynamic.datasource.farm.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java
+3 -2
View File
@@ -144,9 +144,10 @@ public class ProjectServiceImpl implements ProjectService {
queryWrapperX.between(ProjectDO::getCreateTime, startTime, nowTime); queryWrapperX.between(ProjectDO::getCreateTime, startTime, nowTime);
} }
if (ObjectUtil.isNotEmpty(pageDTO.getDraft()) && pageDTO.getDraft()){ queryWrapperX.eqIfPresent(ProjectDO::getDraft, pageDTO.getDraft());
if (pageDTO.getDraft()){
//查看自己的草稿 //查看自己的草稿
queryWrapperX.eqIfPresent(ProjectDO::getDraft, pageDTO.getDraft());
queryWrapperX.eqIfPresent(ProjectDO::getCreator, getLoginUserId()); queryWrapperX.eqIfPresent(ProjectDO::getCreator, getLoginUserId());
} }