aps/crm.git - Gitblit

aps / crm

客户管理系统

parent: cdb47d41 | 补丁 | 提交 | ignore whitespace

wangpengfei

2023-08-08 167f51d3007f5af23d457c8713b1aae7418f1afd

Merge branch 'master' into fly

# Conflicts:
#	.gitignore

1 文件已重命名

2个文件已修改

	.gitignore	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	conf/aps-crm.json	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	conf/config.go	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .gitignore

@@ -18,6 +18,5 @@
*.test
/logs/aps-admin.info.log
/logs/aps-admin.err.log
/apsCrm
apsCrm
.idea/*
/.idea/modules.xml

 conf/aps-crm.json

File was renamed from conf/aps-admin.json
@@ -1,7 +1,7 @@
{
  "system": {
    "env": "develop",
    "port": 8001,
    "port": 8002,
    "UseMultipoint": false,
    "UseRedis": false,
    "LimitCountIP": 15000,

 conf/config.go

@@ -12,7 +12,7 @@

var (
    // config file name
    configName = "aps-admin"
    configName = "aps-crm"
    // config file paths
    configPaths = []string{
        "./",

			@@ -18,6 +18,5 @@
			*.test
			/logs/aps-admin.info.log
			/logs/aps-admin.err.log
			/apsCrm
			apsCrm
			.idea/*
			/.idea/modules.xml

File was renamed from conf/aps-admin.json
			@@ -1,7 +1,7 @@
			{
			"system": {
			"env": "develop",
			"port": 8001,
			"port": 8002,
			"UseMultipoint": false,
			"UseRedis": false,
			"LimitCountIP": 15000,

			@@ -12,7 +12,7 @@

			var (
			// config file name
			configName = "aps-admin"
			configName = "aps-crm"
			// config file paths
			configPaths = []string{
			"./",