update gitigore

.gitignore

@@ -4,7 +4,6 @@
 upload
 /data/log
 /data/images
-/conf
 /scripts/crontab/push/nohup.out
 /lib
 

conf/application.ini

+[common]
+; 通用配置
+http://domain/Api/Member/index
+; 支持PHP中的已定义常量, Windows 平台需要注意目录分割符的问题
+application.directory = APPLICATION_PATH "/application/"
+; 是否使用默认的异常捕获Controller
+application.dispatcher.catchException = true
+
+; 配置多模块
+; Index默认的模块
+; Api模块用于手机应用的数据接口
+; Admin模块用于后台管理
+application.modules = Index,Api,Admin
+
+
+
+
+//生产环境
+[product : common]
+; 数据库配置
+resources.database.params.driver   = "pdo_mysql"
+resources.database.params.hostname = "127.0.0.1"
+resources.database.params.port     = 3306
+resources.database.params.database = "qmcs"
+resources.database.params.username = "qmcs"
+resources.database.params.password = "qmcs$#$%%^&^&^"
+resources.database.params.charset  = "UTF8"
+resources.database.params.driver_options.1002 = "SET NAMES utf8"
+
+; 从库配置
+resources.database.slave.params.driver   = "pdo_mysql"
+resources.database.slave.params.hostname = "127.0.0.1"
+resources.database.slave.params.port     = 3306
+resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.username = "qmcs"
+resources.database.slave.params.password = "qmcs$#$%%^&^&^"
+resources.database.slave.params.charset  = "UTF8"
+resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+; redis配置
+out.config="/data/config"
+;redis.database.params.password = "test"
+;推送配置
+push.clientHost="wss://apiceshi.shenbd.com/wss"
+push.host="127.0.0.1"
+push.port="9503"
+push.open=1
+
+
+; 生 产环境配置
+[pre : common]
+; 数据库配置
+resources.database.params.driver   = "pdo_mysql"
+resources.database.params.hostname = "127.0.0.1"
+resources.database.params.port     = 3306
+resources.database.params.database = "qmcs"
+resources.database.params.username = "root"
+resources.database.params.password = "!@#$%12345werty"
+resources.database.params.charset  = "UTF8"
+resources.database.params.driver_options.1002 = "SET NAMES utf8"
+
+; 从库配置
+resources.database.slave.params.driver   = "pdo_mysql"
+resources.database.slave.params.hostname = "127.0.0.1"
+resources.database.slave.params.port     = 3306
+resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.username = "root"
+resources.database.slave.params.password = "!@#$%12345werty"
+resources.database.slave.params.charset  = "UTF8"
+resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+
+redis.database.params.host = "127.0.0.1"
+redis.database.params.port = "6379"
+redis.database.params.prefix = "qm_"
+redis.database.params.password = "23456ertyu"
+out.config="/data/config"
+
+;锁文件
+out.locks="/data/locks";
+; redis配置
+
+;redis.database.params.password = "test"
+;推送配置
+push.clientHost="wss://apiceshi.shenbd.com/wss"
+push.host="127.0.0.1"
+push.port="9503"
+push.open=1
+
+elastic.master.host="127.0.0.1"
+elastic.master.port="9200"
+elastic.master.scheme="http";
+
+;pre环境配置
+[test : common]
+; 数据库配置
+resources.database.params.driver   = "pdo_mysql"
+resources.database.params.hostname = "127.0.0.1"
+resources.database.params.port     = 3306
+resources.database.params.database = "qmcs"
+resources.database.params.username = "root"
+resources.database.params.password = "!@#$%12345werty"
+resources.database.params.charset  = "UTF8"
+resources.database.params.driver_options.1002 = "SET NAMES utf8"
+
+; 从库配置
+resources.database.slave.params.driver   = "pdo_mysql"
+resources.database.slave.params.hostname = "127.0.0.1"
+resources.database.slave.params.port     = 3306
+resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.username = "root"
+resources.database.slave.params.password = "!@#$%12345werty"
+resources.database.slave.params.charset  = "UTF8"
+resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+
+redis.database.params.host = "127.0.0.1"
+redis.database.params.port = "6379"
+redis.database.params.prefix = "qm_"
+redis.database.params.password = "23456ertyu"
+out.config="/data/config"
+
+;锁文件
+out.locks="/data/locks";
+; redis配置
+
+;redis.database.params.password = "test"
+;推送配置
+push.clientHost="ws://192.168.80.18:9502"
+push.host="127.0.0.1"
+push.port="9503"
+push.open=1
+
+[develop : common]
+; 数据库配置
+resources.database.params.driver   = "pdo_mysql"
+resources.database.params.hostname = "192.168.1.201"
+resources.database.params.port     = 3306
+resources.database.params.database = "qmcs"
+resources.database.params.username = "root"
+resources.database.params.password = "123456"
+resources.database.params.charset  = "UTF8"
+resources.database.params.driver_options.1002 = "SET NAMES utf8"
+
+; 从库配置
+resources.database.slave.params.driver   = "pdo_mysql"
+resources.database.slave.params.hostname = "192.168.1.201"
+resources.database.slave.params.port     = 3306
+resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.username = "root"
+resources.database.slave.params.password = "123456"
+resources.database.slave.params.charset  = "UTF8"
+resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+
+push.clientHost="ws://192.168.80.18:9502"
+redis.database.params.host = "127.0.0.1"
+redis.database.params.port = "6379"
+redis.database.params.prefix = "qm_"
+out.config="/data/config"
+; redis配置
+
+;redis.database.params.password = "test"
+;推送配置
+push.clientHost="ws://192.168.80.18:9502"
+push.host="192.168.80.18"
+push.port="9503"
+push.open=1
+
+[ccwdevelop : common]
+; 数据库配置
+resources.database.params.driver   = "pdo_mysql"
+resources.database.params.hostname = "192.168.1.201"
+resources.database.params.port     = 3306
+resources.database.params.database = "qmcs"
+resources.database.params.username = "root"
+resources.database.params.password = "123456"
+resources.database.params.charset  = "UTF8"
+resources.database.params.driver_options.1002 = "SET NAMES utf8"
+
+; 从库配置
+resources.database.slave.params.driver   = "pdo_mysql"
+resources.database.slave.params.hostname = "192.168.1.201"
+resources.database.slave.params.port     = 3306
+resources.database.slave.params.database = "qmcs"
+resources.database.slave.params.username = "root"
+resources.database.slave.params.password = "123456"
+resources.database.slave.params.charset  = "UTF8"
+resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
+
+push.clientHost="ws://192.168.80.18:9502"
+redis.database.params.host = "127.0.0.1"
+redis.database.params.port = "6379"
+redis.database.params.prefix = "qm_"
+redis.database.params.password = "23456ertyu"
+
+; redis配置
+out.config="/data/config"
+;redis.database.params.password = "test"
+;推送配置
+push.clientHost="ws://192.168.80.18:9502"
+push.host="192.168.80.18"
+push.port="9503"
+push.open=1
+;resources.database.params.hostname = "127.0.0.1"
+;resources.database.params.database = "database"
+;resources.database.params.username = "username"
+;resources.database.params.password = "password"

conf/route.ini

+[common]
+
+[product : common]
+[develop : product]
\ No newline at end of file

conf/url.ini

+[common]
+; 通用配置
+
+[product : common]
+; 生产环境配置
+
+; url相关配置
+; 开发环境配置
+
+; url相关配置
+config.url.resourcesHost = "http://local.qm.com"
+; 用户中心host
+config.url.userHost = ""
+
+; oss 域名
+config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+
+;推送域名
+config.url.pushHost="127.0.0.1:9503";
+[pre : common]
+; 测试环境配置
+
+; url相关配置
+; 开发环境配置
+config.url.convert=/usr/local/bin/wkhtmltoimage
+; url相关配置
+config.url.resourcesHost = "http://apitest.shenbd.com"
+; 用户中心host
+config.url.userHost = ""
+
+; oss 域名
+config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+
+;推送域名
+config.url.pushHost="127.0.0.1:9503";
+config.url.indexUrl="/www/web/apitest_shenbd_com/public_html/application/library/React"
+config.url.libary="/www/web/apitest_shenbd_com/public_html/application/library"
+[test : common]
+; 测试环境配置
+
+; url相关配置
+; 开发环境配置
+
+; url相关配置
+config.url.resourcesHost = "http://apitest.qm.com"
+; 用户中心host
+config.url.userHost = ""
+
+; oss 域名
+config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+
+;推送域名
+config.url.pushHost="127.0.0.1:9503";
+
+[develop : common]
+; 开发环境配置
+
+; url相关配置
+config.url.resourcesHost = "http://test.qm.com"
+; 用户中心host
+config.url.userHost = ""
+
+; oss 域名
+config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+
+;推送域名
+config.url.pushHost="127.0.0.1:9503";
+; 文件目录
+;店铺图片报错目录
+;config.url.storePath = '/data/upload/mall/store';
+;店铺商品图片保存目录
+;config.url.storeGoodsPath = '/data/upload/mall/store/goods';
+;默认图片文件
+;config.url.defaultGoodsImage = '/data/upload/mall/common/default_goods_image.gif';
+;默认店铺logo文件
+;config.url.defaultStoreImage = '/data/upload/mall/common/default_store_avatar.png';
+;默认用户头像文件
+;config.url.defaultUserImage = '/data/upload/mall/common/default_user_portrait.gif';
+
+
+[ccwdevelop : common]
+; url相关配置
+config.url.resourcesHost = "http://test.qm.com"
+; 用户中心host
+config.url.userHost = ""
+
+; oss 域名
+config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
+
+;推送域名
+config.url.pushHost="127.0.0.1:9503";
+; 文件目录