elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,622 Commits
1 Branch
0 Tags
173 MiB
Commit Graph

606 Commits (0b2eb4a45b0f7ee4e6d0ecbb1abba4c17015996e)

Author SHA1 Message Date
liuweiwen 6ca5b80d18 Merge remote-tracking branch 'origin/dev' into dev_lww
zhengyongxing 064d4c021a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 831c728cda Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
yulingwei 7a767466ef 锁号优化
zhengyongxing 1881d11d09 绑币收回修改
ELF 5737c714b1 修改
ELF 5c7cb2f945 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 728f78db09 OA关联切换正式
“用lww 2eadac6b53 后台-》统计-》流失分析优化
ELF d5b5e6162e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 793c1501ba 修改
chenzhi bcf0864a25 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8f36f7204f 优化首页显示
chenxiaojun bcb71c25cb 根据时间统计玩家充值脚本--更新
chenxiaojun 6c1f9b4a73 根据时间统计玩家充值脚本--更新
chenzhi 31fa9fe1f1 123
chenzhi dccfb64957 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengyongxing 1caece3034 充值汇总修改，用户导出修改
chenzhi af593e4326 优化首页折线统计统计方式
chenzhi 76b561810d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi dfff8b6240 优化推广员选择
zhanglingsheng f595a3346d Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 3f8168c11a 添加新短信
yulingwei 0965c480a3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei e8ed8f808b 修改修复脚本
zhengyongxing 7d70f856ce 用户玩家列表优化
zhanglingsheng 864e2e5de1 OA
chenzhi cd9363f9fe 优化游戏及推广员统计
“用lww 68b75f258c 后台-》统计-》流失分析优化
zhanglingsheng 473fd31be1 OA
zhanglingsheng 86f05872d2 OA
yulingwei 82556627f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 4e56f9e325 更新
zhanglingsheng a900e5ed66 OA关联
chenzhi 4f1bd88dc2 取消首页速度测试
ELF b720644b02 修改
chenzhi b610845d20 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 4af962e5a6 首页测试
zhengyongxing 6dee3f5939 平台币统计导出
zhengyongxing 93043b3abe 平台统计导出
zhengyongxing 96df83ebfb Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx
chenzhi 44e5ca356a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev-cz
zhengyongxing 9198c17d5f 平台统计游戏注册导出修改
zhanglingsheng a6d0bfc2d9 OA关联-修改为全部重新获取
chenxiaojun 25e9750882 推广平台->数据管理->角色查询--检索bug修复
zhengyongxing 4e78370f14 推广员充值统计
chenxiaojun f53449ed52 推广平台->数据管理->角色查询--检索bug修复
zhengyongxing 5a80070b97 推广后台导出修改
zhengyongxing 2ae543ad7e 用户导出修改
zhanglingsheng 3e8cfab9d0 OA-关联-导出
chenzhi 476ea0c889 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi ceb50f20b6 优化用户列表数据
zhanglingsheng 13b303ec8b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng de3f6196e6 oa关联
chenzhi 00702fcd79 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 507e579755 用户列表统计
chenxiaojun 063d00ac1d 玩家角色数据统计脚本--更新
chenxiaojun d80febf3ac 玩家角色数据统计脚本--更新
zhengyongxing 248b0c0ac5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 086c95b826 用户导出修改
zhengyongxing 8f1d59aa39 平台币充值bug
yulingwei d8a59b5670 更新
chenzhi 63c27e62ca 123
chenxiaojun e451a933aa 玩家角色数据统计脚本--更新
chenxiaojun e6c2779ee1 玩家角色数据统计脚本--更新
yulingwei c3955dceb8 更新脚本
yulingwei d95540c92c 登录日志修复脚本
yulingwei bf9d52ba15 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 3ee50bcfc0 upt
ELF 390f22894a 修改运维脚本
ELF 2bf23b5d81 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 80b7142317 修改运维脚本
chenzhi 9e171f2ce2 优化统计
zhanglingsheng 9e44b04586 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng ce21545360 oa-关联
yulingwei 12fb156306 优化脚本
chenzhi e27cdc8a38 优化所有统计
yulingwei 079417b576 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei bcc0b964b0 upt
zhanglingsheng e9e66fa8a0 oa关联
zhanglingsheng 0a9efe02ca oa关联
zhanglingsheng 6b675aa345 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 4590988f95 oa
yulingwei 9e1f74480b Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei b9bc2a7162 更新
zhengyongxing 6fcdfd2f31 用户导出
yulingwei e622b0a81e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 1966e0a2e8 更新
zhengyongxing fc126c0bbf 平台币充值bug
zhengchanglong 965ad46dce 充值汇总导出BUG修复
zhengyongxing c1c4fbd0fa Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing 7a873a9d98 平台币发放bug修正
zhanglingsheng 668e4d097c 推广员oa关联
zhanglingsheng 4915ebc70c 推广员oa关联
zhanglingsheng afbd1b6bd5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng dcd9791f79 推广员oa关联
zhengyongxing ee65c37cb1 用户筛选条件修正
zhanglingsheng 9c89f1bcd3 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng e59352edbf 推广员oa关联
chenxiaojun 774196dde5 推广平台->游戏管理->充值玩家--调整 自动脚本->玩家角色充值数据统计--调整
chenxiaojun 46f1ac0807 推广平台->游戏管理->充值玩家--调整 
自动脚本->玩家角色充值数据统计--调整
zhanglingsheng 3002dc113a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng 988bf99086 ss
zhengyongxing 6e151dd8a4 用户导出修改
zhengyongxing 30b5e6ed46 用户玩家列表导出优化
zhanglingsheng 391eed0b78 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhanglingsheng c4e2d0a245 推广员OA关联
yulingwei 9a3bb4e170 修复排序问题
yulingwei b1902e5592 更新
yulingwei 2e97dff779 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 466dd6cc93 upt
zhengyongxing c73ce833f4 用户导出修正
sunke 1d2ce27736 登陆日志排除下线日志
zhengyongxing cc4a071194 用户信息大数据量导出错误
chenxiaojun b835f96024 自动脚本->玩家角色充值数据统计
chenxiaojun 3a867f60e3 自动脚本->玩家角色充值数据统计
chenxiaojun c05f962a43 自动脚本->玩家角色充值数据统计
chenxiaojun 30d9c30522 自动脚本->玩家角色充值数据统计
chenxiaojun 7f796a3e3a 自动脚本->玩家角色充值数据统计
chenxiaojun 3d3bfce947 自动脚本->玩家角色充值数据统计
“用lww af130fd638 Merge remote-tracking branch 'origin/dev' into dev
“用lww f75188f952 后台导出功能增加内存限制到512M
chenxiaojun 70ee46ab2b 自动脚本->玩家角色充值数据统计
chenxiaojun 855e943ccb 自动脚本->玩家角色充值数据统计
chenxiaojun 05d006d533 自动脚本->玩家角色充值数据统计
chenxiaojun f2c8986cd7 自动脚本->玩家角色充值数据统计
“用lww e1b93a987b 导出数据过大，配置加大内存限制范围
yulingwei 4071341458 更新
yulingwei 090d1e2f69 更新bug
tpingzhang a0ab440e1a 后台防沉迷配置
tpingzhang e8f6e310d1 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
tpingzhang f9307ee710 后台防沉迷配置
chenzhi d8fcaf59c5 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 8bb10aea61 [bug]玩家列表累计充值
tpingzhang 704dd789eb 后台防沉迷配置
tpingzhang da794baa96 配置写到数据库
tpingzhang d176d51c5c 配置写到数据库
elf@home dc6790b404 修改
chenzhi b93b2c59ce Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi c76e0620b7 [优化 ]新增历史累计充值记录
ELF 2f885bcf3e Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF 200d9e8667 修改bug
zhengyongxing abdf68a91c 收回绑币玩家账号select框改为input框
yulingwei 485e3930f9 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei 12362190e6 upt
chenzhi 86b53d375c [新增]玩家列表汇总统计
zhengyongxing 12a729444a Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
zhengyongxing ae18f1fb24 推广员统计修改
chenzhi 0b0984d266 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi b7dd9edaa9 [优化]玩家列表累记充值统计
zhengyongxing 8e18e8faac 推广员统计官方渠道添加
chenxiaojun 5fcad13fce 根据时间统计玩家充值
chenxiaojun 2123b29479 根据时间统计玩家充值
chenzhi df9d1415df [修复]推广员充值统计无promote_id问题
chenzhi 8007d9954f Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
chenzhi 849fd77ac6 优化推广员统计的方法
chenxiaojun 0571347aeb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
chenxiaojun d9659ea975 推广平台->数据汇总->充值玩家--更新
chenxiaojun a53970efcf 推广平台->数据汇总->充值玩家--更新
yulingwei 0e1abdfa94 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
yulingwei feecf9199d 电子邮箱改为选填
ELF 809191e0f2 Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev
ELF e2a2a07f03 修改bug
chenzhi 8af46f08c2 优化推广员统计1
zhengchanglong 387be649de Merge branch 'dev-cz' into dev
chenzhi 256545a59a 123
zhengyongxing 5c97bb7610 数据分析bug修正
zhengyongxing db40381bb1 定时器接口时间区间修正
zhengyongxing 4f27c2fb29 统计bug修正
zhengchanglong b7fdcf38f6 Merge branch 'dev_zcl' into dev
zhengchanglong d230f0e047 Merge branch 'dev_zyx' into dev_zcl
zhengyongxing 08b2ba432a 统计数据修正
chenxiaojun 925d80ac66 管理后台->用户->玩家组->角色查询--更新
yulingwei 26d0d0d6cb merge
chenxiaojun 0875ed5a9a 管理后台->用户->玩家组->角色查询--更新
yulingwei a9f06b1d57 修改批量锁定问题
zhengchanglong 36c4e476ea Merge branch 'dev_zcl' into dev 
# Conflicts:
#	Data/update.sql
chenzhi df03c05651 修正统计bug
zhengyongxing 118f706440 脚本去除部分输出
zhengchanglong 15695d5b5d Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Application/Mobile/Controller/SsgController.class.php
zhengyongxing 0edc4452e3 Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Application/Mobile/Controller/SsgController.class.php
chenzhi 2a417c2746 123
ELF 2254610041 修改bug
zhanglingsheng fb85d32c87 合并分支
yulingwei 38680ddb05 更新
zhengyongxing 1626123074 数据统计7日平均时长修正
zhengchanglong f8008a4b5e Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengyongxing 64c059cccc Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx 
 Conflicts:
	Data/update.sql
yulingwei 24d3e6ab07 修改bug
yulingwei 046beee6be 修改bug
zhengchanglong a4dc55f4e3 Merge branch 'dev_zyx' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengchanglong 974a9d93e4 Merge branch 'dev-cz' into dev_zcl 
# Conflicts:
#	Data/update.sql
zhengyongxing f4cb9a98c8 数据管理启动机型代码优化
zhengyongxing 2fb1effdcd 后台数据分析应用概况优化
chenzhi a6f52ccdb8 优化注册管理员提示信息
chenzhi 360cf3f3ba 优化前端展示
chenzhi 04c5f17790 优化脚本
chenzhi 37d8f72c6d 优化首页展示
sunke 0b8f3450c6 审核后台
chenzhi e1739209e3 1