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

---
 /dev/null   |    6 ------
 config.yaml |   14 +-------------
 2 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b8..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index bd5790d..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/srm.iml" filepath="$PROJECT_DIR$/.idea/srm.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/srm.iml b/.idea/srm.iml
deleted file mode 100644
index 7ee078d..0000000
--- a/.idea/srm.iml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="Go" enabled="true" />
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/config.yaml b/config.yaml
index 64e1c43..0cfd477 100644
--- a/config.yaml
+++ b/config.yaml
@@ -173,29 +173,17 @@
   singular: false
   log-zap: false
 system:
-<<<<<<< HEAD
   env: public
   db-type: mysql
   oss-type: local
   router-prefix: "/api"
-  addr: 8889
+  addr: 8004
   iplimit-count: 15000
   iplimit-time: 3600
   use-multipoint: false
   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