From 4dee2e8b6ff73fbf61976de2c3813980dc17d118 Mon Sep 17 00:00:00 2001
From: yangwl <1726150332@qq.com>
Date: Fri, 19 Aug 2022 09:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 console/src/main/resources/application-local.yml | 16 +++++++++++++++-
 console/src/main/resources/application-prd.yml   |  9 +++++++++
 console/src/main/resources/application-qas.yml   | 12 ++++++++++--
 console/src/main/resources/application.yml       |  2 +-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/console/src/main/resources/application-local.yml b/console/src/main/resources/application-local.yml
index ca59f2d6..07af9e3b 100644
--- a/console/src/main/resources/application-local.yml
+++ b/console/src/main/resources/application-local.yml
@@ -54,6 +54,13 @@ activemq:
   pool:
     enabled: false
     max-connections: 10
+#activemq:
+#  brokerUrl: tcp://172.16.170.164:61616?wireFormat.maxInactivityDuration=0
+#  password: admin
+#  user: admin
+#  pool:
+#    enabled: true
+#    max-connections: 10
 
 #WebService
 ws:
@@ -118,7 +125,7 @@ exportDocument:
   outputPath: /Users/zhaojiawei/Desktop/
   template: SFC_SCRAP_TEMPLATE.ftl
 
-cappftp:
+drawingftp:
   server: 172.16.77.181
   port: 22
   username: root
@@ -132,6 +139,13 @@ cappftp:
 #  password: cappnew@123
 #  uploadDir:
 #  downloadDir:
+cappftp:
+  server: 172.16.251.187
+  port: 8091
+  username: Administrator
+  password: mes@123
+  uploadDir:
+  downloadDir:
 
 #exportLabel:
 #  qrPath: /exportpdf/QRCODE.jpg
diff --git a/console/src/main/resources/application-prd.yml b/console/src/main/resources/application-prd.yml
index 2b451e46..255b6fe8 100644
--- a/console/src/main/resources/application-prd.yml
+++ b/console/src/main/resources/application-prd.yml
@@ -56,6 +56,15 @@ exportDocument:
   outputPath: /usr/word/outputWord/
   template: SFC_SCRAP_TEMPLATE.ftl
 
+
+drawingftp:
+  server: 172.16.77.181
+  port: 22
+  username: root
+  password: Ystest0827##
+  uploadDir:
+  downloadDir: /home/DA02_Attachment/DA02/WF
+
 cappftp:
   server: 172.16.251.70
   port: 9003
diff --git a/console/src/main/resources/application-qas.yml b/console/src/main/resources/application-qas.yml
index 30b6bf54..0676f077 100644
--- a/console/src/main/resources/application-qas.yml
+++ b/console/src/main/resources/application-qas.yml
@@ -66,10 +66,18 @@ exportDocument:
   outputPath: /usr/word/outputWord/
   template: SFC_SCRAP_TEMPLATE.ftl
 
-cappftp:
+drawingftp:
   server: 172.16.77.181
   port: 22
   username: root
   password: Ystest0827##
   uploadDir:
-  downloadDir: /home/DA02_Attachment/DA02/WF
\ No newline at end of file
+  downloadDir: /home/DA02_Attachment/DA02/WF
+
+cappftp:
+  server: 172.16.251.187
+  port: 8091
+  username: Administrator
+  password: mes@123
+  uploadDir:
+  downloadDir:
\ No newline at end of file
diff --git a/console/src/main/resources/application.yml b/console/src/main/resources/application.yml
index 71d6f48a..ca55e201 100644
--- a/console/src/main/resources/application.yml
+++ b/console/src/main/resources/application.yml
@@ -10,7 +10,7 @@ server:
     uri-encoding: UTF-8
     # tomcat最大线程数，默认为200
     max-threads: 800
-    # Tomcat启动初始化的线程数，默认值25
+    # Tomcat启动初始化的线程数，默认值25spatch
     min-spare-threads: 30
 
 # 日志配置