From 167f51d3007f5af23d457c8713b1aae7418f1afd Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 08 八月 2023 11:39:31 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
conf/aps-crm.json | 2 +-
.gitignore | 3 +--
conf/config.go | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 483d99d..4b75bc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,5 @@
*.test
/logs/aps-admin.info.log
/logs/aps-admin.err.log
-/apsCrm
+apsCrm
.idea/*
-/.idea/modules.xml
\ No newline at end of file
diff --git a/conf/aps-admin.json b/conf/aps-crm.json
similarity index 97%
rename from conf/aps-admin.json
rename to conf/aps-crm.json
index d58aa21..a3d0ffd 100644
--- a/conf/aps-admin.json
+++ b/conf/aps-crm.json
@@ -1,7 +1,7 @@
{
"system": {
"env": "develop",
- "port": 8001,
+ "port": 8002,
"UseMultipoint": false,
"UseRedis": false,
"LimitCountIP": 15000,
diff --git a/conf/config.go b/conf/config.go
index 7cc2119..a998029 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -12,7 +12,7 @@
var (
// config file name
- configName = "aps-admin"
+ configName = "aps-crm"
// config file paths
configPaths = []string{
"./",
--
Gitblit v1.8.0