From 29d3d3b9f32f9ed1a9eedcfcbe19424477656635 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期二, 14 十一月 2023 14:01:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

---
 conf/config.yaml |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/conf/config.yaml b/conf/config.yaml
index 204b2ce..bb68479 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -1,13 +1,15 @@
 web:
   port: 8005
+  grpcPort: 8006
   host: 192.168.20.119
-  apport: 9091
-  alhost: 192.168.20.119
-  alport: 9090
   nodeId: wangpengfei
   ossType: local
+  #  fileServer: http://172.20.11.127:9333
+  fileServer: http://192.168.20.189:6333
+  serverId: wms
 db:
-  dsn: root:c++java123@tcp(192.168.20.119:3306)/wms?charset=utf8&parseTime=True&loc=Local
+  #  dsn: root:c++java123@tcp(192.168.20.119:3306)/wms?charset=utf8&parseTime=True&loc=Local
+  dsn: root:c++java123@tcp(192.168.20.119:3306)/aps_server2?charset=utf8&parseTime=True&loc=Local
   logMode: true
   maxIdleCon: 20
   maxOpenCon: 100
@@ -19,8 +21,8 @@
 log:
   path: ./logs/aps-server.log
   encoder: console
-nsq:
-  nsqdAddr: 121.31.232.83:4150
-  nsqlookupdAddr:
 local:
   storePath: uploads/file
+grpcServer:
+  apsAddr: 192.168.20.119:9091
+  crmAddr: 192.168.20.118:9092

--
Gitblit v1.8.0