From e517b1a99b6edfa24c8cc4e109a6a10488f23b6a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 28 八月 2023 11:51:55 +0800
Subject: [PATCH] merge

---
 config.yaml |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/config.yaml b/config.yaml
index 030fd5f..64e1c43 100644
--- a/config.yaml
+++ b/config.yaml
@@ -173,6 +173,7 @@
   singular: false
   log-zap: false
 system:
+<<<<<<< HEAD
   env: public
   db-type: mysql
   oss-type: local
@@ -184,6 +185,17 @@
   use-redis: false
   grpc-url: 192.168.20.119:9091
   grpc-admin-url: 192.168.20.119:50051
+=======
+    env: public
+    db-type: mysql
+    oss-type: local
+    router-prefix: "/api"
+    addr: 8004
+    iplimit-count: 15000
+    iplimit-time: 3600
+    use-multipoint: false
+    use-redis: false
+>>>>>>> zq
 tencent-cos:
   bucket: xxxxx-10005608
   region: ap-shanghai

--
Gitblit v1.8.0