From 50304934a7a677800e94f15b0dd3f3b788a704ef Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Mon, 24 Jul 2023 09:29:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 0780eca..e1df3f3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -10,9 +10,9 @@
spring:
datasource:
one:
- url: jdbc:mysql://139.196.181.203:3306/hazad_investigation?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.52:3306/hazad_investigation?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: GKHY@root20201!
+ password: gkhymysql
type: com.alibaba.druid.pool.DruidDataSource
#redis
@@ -115,25 +115,3 @@
key:
url:
-rocketmq:
- name-server: 192.168.30.107:9876
- #name-server: localhost:9876
- producer:
- group: gkhy-safeplatform-dev-ZIS
- sendMessageTimeout: 300000
- consumers:
- #group: gkhy-safeplatform-dev-s
- CreateGroup: gkhy-safeplatform-CreateConsumer-ZIS
- NoticeGroup: gkhy-safeplatform-NoticeConsumer-ZIS
- TimeOutGroup: gkhy-safeplatform-TimeOutConsumer-ZIS
- WaitWorkGroup: gkhy-safeplatform-WaitWorkConsumer-ZIS
- applySpecialWorkGroup: gkhy-safeplatform-applySpecialWorkConsumer-ZIS
- approvalSpecialWorkGroup: gkhy-safeplatform-topic-approvalSpecialWorkConsumer-ZIS
- topic:
- #demoTopic: gkhy-safeplatform-topic-demo-s
- preventCreateTaskTopic: gkhy-safeplatform-topic-preventCreateTask-ZIS
- preventNoticeTaskTopic: gkhy-safeplatform-topic-preventNoticeTask-ZIS
- preventTimeOutTaskTopic: gkhy-safeplatform-topic-preventTimeOutTask-ZIS
- preventWaitWorkTopic: gkhy-safeplatform-topic-preventWaitWork-ZIS
- applySpecialWorkTopic: gkhy-safeplatform-topic-applySpecialWork-ZIS
- approvalSpecialWorkTopic: gkhy-safeplatform-topic-approvalSpecialWork-ZIS
--
Gitblit v1.9.2