commit ae263c0df6eb8e50d6bdeb2e747f8423793ab795 (HEAD -> dev-ad-v3-20200618, origin/dev-ad-v3-20200618) Author: wangfei Date: Fri Jul 10 13:27:02 2020 +0800 simpleAD.channelId commit 5f52281eaaea4058cb6e1a08cebd632c780c0f49 Author: wangfei Date: Fri Jul 10 12:06:03 2020 +0800 testlink_url commit cf4f5f58f44421f31c70a04450a5077dc8693d14 Author: wangfei Date: Fri Jul 10 12:02:19 2020 +0800 user_id or channel_id commit aadddc8d665616411a9b05c88668acd5630c646b Merge: 88b2e50b9 6488f4e91 Author: wangfei Date: Fri Jul 10 11:44:39 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 88b2e50b904045d05b7bb9c9e981d9d8d6b59076 Author: wangfei Date: Fri Jul 10 11:44:33 2020 +0800 后台配置5次问题与打印用户渠道的id commit 6488f4e918840ae59504042ef7897064f5f703ff Author: wanggb Date: Fri Jul 10 11:41:58 2020 +0800 修改广告下发数据接口，筛选福利广告 commit f43528f20d0e805b0264f2d1ebc5bbb3bbce4f08 Merge: ac6a1165e ea0f43bc2 Author: wanggb Date: Fri Jul 10 11:29:22 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit ac6a1165eeb679ecfc501daee7793397f9124295 Author: wanggb Date: Fri Jul 10 11:28:58 2020 +0800 修改广告后台编辑 commit ea0f43bc269ec9ec3e51223fc63d159318c9d7b3 Merge: ac8b0aeee d3b49a294 Author: wangfei Date: Fri Jul 10 11:16:44 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit ac8b0aeeed7c5880c928fb90472d236d6f7d390f Author: wangfei Date: Fri Jul 10 11:16:39 2020 +0800 最后一章温馨提示问题 commit d3b49a294dd5652de45d353f1ca0ecd8a3e4e211 Merge: ede201b61 27f3fffa5 Author: wanggb Date: Fri Jul 10 10:49:13 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit ede201b612ea35d026e1853e82d033c573a29a9e Author: wanggb Date: Fri Jul 10 10:48:49 2020 +0800 修改广告后台编辑 commit 27f3fffa5315534bf7a7f633663eb5a66801558d Author: wangfei Date: Fri Jul 10 10:26:36 2020 +0800 广告计划为空兼容处理 commit 6c71cca789dbe4564d0e8aea640b1d6833b7c1c9 Author: wangfei Date: Fri Jul 10 10:03:35 2020 +0800 签到页有时渲染不出来问题 commit b02c7547e2d88ba749430ee82e2152007e39e0c8 Author: wangfei Date: Thu Jul 9 21:14:33 2020 +0800 广告计划空位数组 commit d9f71758002cb61584ebe2f97908db748147f73a Author: wangfei Date: Thu Jul 9 21:04:31 2020 +0800 广告计划为空 commit 15106437793b2b144d105fb3bac1a9f7732fa852 Author: wangfei Date: Thu Jul 9 20:13:09 2020 +0800 .ad-image-small z-index commit 2705dd979aeb2e5fd37ddde16124be7df7cd9403 Merge: 710af282c 93f44548a Author: wangfei Date: Thu Jul 9 19:36:09 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 710af282c85cd9b1dec33728fa96c847f8bccbae Author: wangfei Date: Thu Jul 9 19:36:04 2020 +0800 location.href commit 93f44548a3cb1f739d5feba4470fd33318434d6f Merge: 2358af356 2d012303f Author: wanggb Date: Thu Jul 9 19:08:59 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit 2358af3566a45a1bf2f7c57a537df34a6b812fad Author: wanggb Date: Thu Jul 9 19:08:34 2020 +0800 修改广告下发数据接口，筛选福利广告 commit 2d012303f5cb7f7264526320c81a9ce444d33c04 Author: wangfei Date: Thu Jul 9 19:02:41 2020 +0800 个人中心vip与广告同时出现 commit f70c8a13b375332b2d489f1c3dbbe011e158d84e Author: wangfei Date: Thu Jul 9 18:52:45 2020 +0800 阅读器导航栏z-index commit 39c220cfa09f8c0d1efe4bbe96161d307fcb5014 Merge: 8d971cefe 1e42ff3a0 Author: wangfei Date: Thu Jul 9 18:29:03 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 8d971cefef396d6983a349db32ca50aa77a41812 Author: wangfei Date: Thu Jul 9 18:28:56 2020 +0800 福利广告position commit 1e42ff3a0b85b1d1c4d59ba04092a1cfcec8ef1c Author: wanggb Date: Thu Jul 9 18:04:17 2020 +0800 编辑 用户组 commit 658765f84b6bbc27494820b5a131ca8063117531 Merge: 4902e4503 eeb2d11cd Author: wanggb Date: Thu Jul 9 17:17:33 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit 4902e4503895ee75a0e4e8574df9a72811e4fc55 Author: wanggb Date: Thu Jul 9 17:17:05 2020 +0800 日志打点话术 commit eeb2d11cdc1efe714696a69df19cd6347a27dbf1 Author: wangfei Date: Thu Jul 9 17:15:07 2020 +0800 17<4==>true问题 commit 37b13ec7e9988fd04c37a1e6f0bf089154c84962 Author: wangfei Date: Thu Jul 9 16:36:28 2020 +0800 plans_id commit 5a371a393cf2b0ddbf8b408a357d059afba61b7f Author: wangfei Date: Thu Jul 9 16:27:25 2020 +0800 href commit 036aa68c866e093d208a3d7ca6424dc77e01b1a1 Author: wangfei Date: Thu Jul 9 16:18:57 2020 +0800 plans_id commit a8737aef7a3fc2346bde0cd36ee240f228f2dc9b Merge: 9e348e78d 5d396a55a Author: wangfei Date: Thu Jul 9 16:14:46 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 9e348e78dd90dbde14af0ef7c429782a37dc7254 Author: wangfei Date: Thu Jul 9 16:14:40 2020 +0800 bannertime commit 5d396a55ae4aa56d396902ef4d164e77b521a555 Merge: a4fa3dfcb 442c82ead Author: wanggb Date: Thu Jul 9 15:50:18 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit a4fa3dfcb82b1201e86e1dc59151336cfb876f93 Author: wanggb Date: Thu Jul 9 15:49:54 2020 +0800 修改三方接口日志 commit 442c82ead421eee44ee820103144f0a85d9185af Author: wangfei Date: Thu Jul 9 15:43:56 2020 +0800 起始章节对于第二本书无用的处理 commit aea5f769fe6b8ad879ad38899e6a07ac74b32a63 Author: wangfei Date: Thu Jul 9 15:29:33 2020 +0800 bannertime commit 333cebd3729d1c349ec8f611ea2d72e493bb4aba Author: wangfei Date: Thu Jul 9 15:11:08 2020 +0800 bannerTime2 commit abf4b9e3496dcf5c9f9f684e0005270ef1c91cea Author: wangfei Date: Thu Jul 9 15:04:24 2020 +0800 bannerTime commit 7b2be153b562e784655e3c761575afc12423f7df Author: wangfei Date: Thu Jul 9 14:54:16 2020 +0800 ).show(); commit fc452eb60b3104e41150b2f0cd8d925ca88ae9aa Author: wangfei Date: Thu Jul 9 14:36:33 2020 +0800 toast commit 7f97d0beb927e1c6efe86eaa3a6f234dec783390 Author: wangfei Date: Thu Jul 9 14:32:59 2020 +0800 15minTo5min commit 3716763e7706d4c3f2a23489f2a59c8b81b835d5 Author: wangfei Date: Thu Jul 9 14:28:44 2020 +0800 css commit ed9fa75f20fd471f24eed95842617d080ef6fa9c Author: wangfei Date: Thu Jul 9 14:26:05 2020 +0800 css commit fd7a336749930b9ece4d6d9f61322aec02b2c5b0 Author: wangfei Date: Thu Jul 9 14:22:57 2020 +0800 toastCSS commit a9a548674d86dc8f9718ba3bedf55a3e571aa1e8 Author: wangfei Date: Thu Jul 9 13:53:29 2020 +0800 充值页弹窗福利广告关闭按钮样式 commit 4d4bbde374fd0d682c441bf6655da1b27b63c23f Author: wangfei Date: Thu Jul 9 13:45:34 2020 +0800 福利广告充值页弹窗关闭图标更换 commit d79f21669e7640006cb9f7f695ed1a7c2b0cfbbf Author: wangfei Date: Thu Jul 9 12:01:00 2020 +0800 toast commit 6d1833767221eaf193985423fd4308550865ac5f Author: wangfei Date: Thu Jul 9 11:23:58 2020 +0800 book_float_position commit 16120bfc82151482f3f315b680b9ffc8a1418b17 Merge: 13413fbbe f3d82f34b Author: wangfei Date: Thu Jul 9 11:13:59 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 13413fbbe1465622d0f52c201b3304533f0f42c4 Author: wangfei Date: Thu Jul 9 11:13:54 2020 +0800 15分钟改为5分钟测试与book_float_position commit f3d82f34bedaee1abac11fcac9f3d1fe3eaf6b96 Merge: a4b21e714 cf0caa8e8 Author: wanggb Date: Thu Jul 9 11:11:24 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit a4b21e71421d1cebcbc47624b2592a48bdf2e272 Author: wanggb Date: Thu Jul 9 11:11:03 2020 +0800 解决后台广告管理问题 commit cf0caa8e8af95ad98b654c7b8a7d109f24a148be Merge: 958c56ab7 e580614cf Author: wangfei Date: Thu Jul 9 11:02:09 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 958c56ab767f0f18eccb17638bce2ae5fe20c157 Author: wangfei Date: Thu Jul 9 11:02:00 2020 +0800 update book_chapter_welfare_float_btn commit e580614cf187a14476ca971d939203b85d3ed101 Author: wanggb Date: Thu Jul 9 10:52:59 2020 +0800 解决后台广告管理问题 commit be159f6027b3ad6ac9e863c8f12770acd2d0aefe Author: wangfei Date: Wed Jul 8 21:32:29 2020 +0800 修复 commit 03d944a9077f73ac0d093559a6d6b733484ddc16 Merge: f6884b8c5 d6d7170f6 Author: wangfei Date: Wed Jul 8 21:29:39 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit f6884b8c50c701299a9cfb776389a11d4781dee7 Author: wangfei Date: Wed Jul 8 21:29:18 2020 +0800 修复下发次数 commit d6d7170f61a07f99ed2f86135b04e5fa36e1f5d2 Merge: 68e584764 6c6daffa7 Author: 赵学亮 Date: Wed Jul 8 21:09:25 2020 +0800 Merge branch 'dev-ad-v3-20200618' of 192.168.0.31:fe/cps into dev-ad-v3-20200618 commit 68e5847649dcb63f288104267f79b10bfec5f3b7 Author: 赵学亮 Date: Wed Jul 8 21:09:00 2020 +0800 部署到其他主题 commit 6c6daffa7bba83e90df2ff22858dd00ceb7e4a23 Author: wangfei Date: Wed Jul 8 21:05:01 2020 +0800 素材个数小于每天点击次数清缓存后再展示达到点击次数问题 commit cdce2b6f991f9d74b2a5b2fc4641e8086302da75 Merge: d99a8e56a 06f692d3e Author: 赵学亮 Date: Wed Jul 8 18:59:37 2020 +0800 Merge branch 'dev-ad-v3-20200618' of 192.168.0.31:fe/cps into dev-ad-v3-20200618 commit d99a8e56a4dd04037d2b8d700e462983c3f26423 Author: 赵学亮 Date: Wed Jul 8 18:59:31 2020 +0800 优化阅读页整屏插屏广告逻辑 commit 06f692d3eb328704c80a97e2d1614346701d85ce Merge: 790a8bb28 1d6c204e5 Author: wangfei Date: Wed Jul 8 17:52:14 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 790a8bb286d44e6695f85ee2d3d8f40e0d9ab60c Author: wangfei Date: Wed Jul 8 17:52:05 2020 +0800 粘贴复制问题与产品需求更新的章节显示问题 commit 1d6c204e529f8b6fd0a0509ed6c686b568e64545 Author: wanggb Date: Wed Jul 8 15:28:05 2020 +0800 解决后台表单微小问题 commit a813d18251d946c796488065564d67a701cf0ebe Author: 赵学亮 Date: Tue Jul 7 19:44:55 2020 +0800 修复剪切板问题 commit 87bf35aa7be392b5bddd4b9ff9f4f09d3dcd4bab Merge: ed361cbc0 661a43ebd Author: wanggb Date: Tue Jul 7 17:59:09 2020 +0800 Merge branch 'master' into dev-ad-v3-20200618 commit 661a43ebdad9868be5a8db568c636a0858cad192 (tag: cps_20200707_143416) Author: wudongdong Date: Tue Jul 7 14:27:39 2020 +0800 被关注回复添加推广链接 commit 3204c85fd10d3921153b4d931e74ef86823a72dd (tag: cps_20200707_112425, tag: cps_20200707_112001) Author: xuehuiwen Date: Tue Jul 7 11:10:29 2020 +0800 subscribe kandian value commit 60f17e0c656aa4b160548a10e702e06f71c20690 (tag: cps_20200706_203736) Author: xuehuiwen Date: Mon Jul 6 20:36:54 2020 +0800 a commit f3aca731d5fbfc2ea885690aaa8511bb14f68be9 Author: xuehuiwen Date: Mon Jul 6 19:51:04 2020 +0800 a commit b87d15837e1277739e35218459d4060b66d1ab87 Author: xuehuiwen Date: Mon Jul 6 18:28:27 2020 +0800 custom js commit 11fa68e784595a8c6c908028900115cb4372e4a8 Author: xuehuiwen Date: Mon Jul 6 18:17:25 2020 +0800 custom js commit fc95cb6b1b66ccb87c98056b2454332bc4c52df8 Author: xuehuiwen Date: Mon Jul 6 17:41:50 2020 +0800 fix commit ed361cbc0576c586d4a5bf9acead6cb0a31e20fd Author: wangfei Date: Mon Jul 6 17:16:49 2020 +0800 s commit a9a3b25cdd5ebf76a086206e195bb3548ab2d87b Author: wangfei Date: Mon Jul 6 17:10:22 2020 +0800 测试：一键清缓存 commit a584c6bad63b6d7ebaf954a4b8464fac0d97e9a4 Merge: 7d5047a5f 20e0fda15 Author: wangfei Date: Mon Jul 6 16:18:55 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 7d5047a5fdd5aadec58f89c7846be31bc44c9b09 Author: wangfei Date: Mon Jul 6 16:18:49 2020 +0800 章节显示 commit 20e0fda15574402c382c93b7e64fbc16aabb2b14 Author: wanggb Date: Mon Jul 6 16:16:14 2020 +0800 校验接口参数 commit 1265ef64fbdb67ed617961649fd6c94cb47b03ed Author: zhenglh Date: Mon Jul 6 15:14:02 2020 +0800 沙发查询用户错误日志降级 commit 22e78bf95b0ba3cf28cf0df98089f8ab2496c269 (tag: cps_20200706_145237) Merge: 08badef22 dcd443e69 Author: wanggb Date: Mon Jul 6 14:30:53 2020 +0800 Merge branch 'dev-270channel-20200628' commit dcd443e698c6b62632f7924d67654ae806e372c5 (origin/dev-270channel-20200628) Author: wanggb Date: Mon Jul 6 14:12:56 2020 +0800 修改合同内容 commit 08badef222db07b60e3d06a1e0284ce0429d27cf (tag: cps_20200706_134837) Author: wudongdong Date: Mon Jul 6 11:58:10 2020 +0800 渠道订单接口增加推广链接ID commit 90fc35b189893e10cdc0dfcf6b8f7fcef09227fd Author: xuehuiwen Date: Mon Jul 6 10:16:30 2020 +0800 activity pop style commit b8f49edf972390731cde2e3c9ee08679ce86fc91 Author: xuehuiwen Date: Mon Jul 6 10:11:53 2020 +0800 activity pop style commit 58bbc18119bcaffa3cad39e65049550330d49575 (tag: cps_20200704_172735) Merge: 2d130a494 5f6e0ad1e Author: wudongdong Date: Sat Jul 4 16:52:27 2020 +0800 Merge branch 'master-270' of 192.168.0.31:fe/cps into master-270 commit 2d130a494c2c14f306befc942828317999c849ec Merge: 8b7af194f d6eb1d930 Author: wudongdong Date: Sat Jul 4 16:50:34 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 8b7af194fa8ea41427eec5225ae74c404c72e7c9 Author: wudongdong Date: Sat Jul 4 16:50:26 2020 +0800 vip充值模板调整 commit 5f6e0ad1e7d0e421ef68e9ae711438213e28ce7a Author: zhenglihao Date: Sat Jul 4 16:18:27 2020 +0800 清除java用户缓存 commit a6d222c144c152374cfe4be2a6984a757a4fc0ab Merge: 1ac2d1cb2 d6eb1d930 Author: xuehuiwen Date: Sat Jul 4 14:38:59 2020 +0800 Merge branch 'dev-270channel-20200628' into master-270 commit d6eb1d930db25172ec749c49c9aae7cbf3a21871 Author: xuehuiwen Date: Sat Jul 4 14:30:13 2020 +0800 activity commit f21ccfab6db8b779182d2a902f290df718f7eb18 Author: xuehuiwen Date: Sat Jul 4 14:23:51 2020 +0800 activity commit 1ac2d1cb20ba98491b08586f7ec58b1b7532cb15 (tag: cps_20200703_175655) Merge: 54c95d82f 572b328ad Author: wudongdong Date: Fri Jul 3 17:03:01 2020 +0800 Merge branch 'master-270' into dev-270channel-20200628 commit 8db9d515aeb3baddc9734c70b4c7247b21aff1ba Author: wangfei Date: Fri Jul 3 15:58:08 2020 +0800 广告素材封装 commit 553fce639cccca43c09ccbe3d1fc4aaf2abcc038 Author: wangfei Date: Fri Jul 3 14:52:16 2020 +0800 修复一天以后数据清空 commit 1f4511558b0f389e165ceed47d39cd5f9aecd595 Author: wangfei Date: Fri Jul 3 11:52:40 2020 +0800 封装有效广告素材按权重值建字典数组 commit 54c95d82f3f2a8e2e1e2fdb65eb596a0f47bd1c9 Merge: 0d4a20e4b 659a6a14c Author: wudongdong Date: Fri Jul 3 11:37:18 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 0d4a20e4bdf18d3ed609004fe02f2caf16aed1a9 Author: wudongdong Date: Fri Jul 3 11:37:10 2020 +0800 vip修改密密码+token commit 659a6a14c3e477a1164572f8351a62e241ca92eb Author: xuehuiwen Date: Fri Jul 3 10:08:41 2020 +0800 pop commit 5c22b0e239c28ec3c30ca73df7627d4efd01bb81 Author: xuehuiwen Date: Fri Jul 3 09:59:54 2020 +0800 pop commit ec4bd4ddd40fdf4e1b3b4edb19c6b6a5fd9bd6e3 Author: xuehuiwen Date: Thu Jul 2 21:17:12 2020 +0800 pop commit 801a9262fc55b382f6996674de28b073ab85b884 Author: wangfei Date: Thu Jul 2 20:06:29 2020 +0800 float_pop_chapter_num and welfareicon hide commit dfd3f8a41ee6b1fa628a0c72f12fae779bca0905 Merge: 5f13f613f 6612541e7 Author: wudongdong Date: Thu Jul 2 19:31:37 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 5f13f613f2b6c07d0e74e7ee7658a1dd27213991 Author: wudongdong Date: Thu Jul 2 19:31:29 2020 +0800 延迟消息默认文案 commit 6612541e7e5398b034b279bdafd0d9aa9348227e Merge: dd940c803 1b06782e1 Author: zhenglh Date: Thu Jul 2 17:54:56 2020 +0800 Merge branch 'dev-270channel-20200628' of http://192.168.0.31/fe/cps into dev-270channel-20200628 commit dd940c8035209aa157f9d3f02e4ba2d210b3b7dc Author: zhenglh Date: Thu Jul 2 17:54:30 2020 +0800 最近阅读路径处理 commit 1b06782e19cd5fe78fd6d65ad09ec17199b62f4d Author: wudongdong Date: Thu Jul 2 17:22:21 2020 +0800 vip同步文本类型小程序问题 commit fddcad8bf90465c4e3a6824652df143945343760 Author: wudongdong Date: Thu Jul 2 16:49:05 2020 +0800 vip删除消息 commit 5790d03835205c241ceb9821c7d18665ea436702 Merge: 9bab76a4e 1f62aed99 Author: wudongdong Date: Thu Jul 2 16:40:41 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 9bab76a4e08b015de502806aa3f7139eea33b927 Author: wudongdong Date: Thu Jul 2 16:40:31 2020 +0800 vip消息保存 commit 1f62aed99c6951ec71b7292fe04e96796622cc39 Author: xuehuiwen Date: Thu Jul 2 16:30:21 2020 +0800 pop commit b5064f657a251043cd2c3e2cd089192d3069e769 Merge: 415213a55 6c9c6a54a Author: wudongdong Date: Thu Jul 2 15:29:26 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 415213a55f542633baf89de53c295a96615116ff Author: wudongdong Date: Thu Jul 2 15:29:18 2020 +0800 vip同步延迟客服消息日志 commit 024a6a94cc4d7c3671081c4deab04d8403b058c5 Merge: 112e65ffe 34e3b4bd2 Author: wangfei Date: Thu Jul 2 15:21:21 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 112e65ffe9d70bde1df9fc8875431f47548c9262 Author: wangfei Date: Thu Jul 2 15:21:13 2020 +0800 提交代码 commit 6c9c6a54a892fc4bc9d3f7c4852fad1e0df36aa6 Merge: ef96cf607 b9c539cda Author: zhenglh Date: Thu Jul 2 14:36:42 2020 +0800 Merge branch 'dev-270channel-20200628' of http://192.168.0.31/fe/cps into dev-270channel-20200628 commit ef96cf607b8bbaf5a5bcd9b44b6413871343da9f Author: zhenglh Date: Thu Jul 2 14:36:37 2020 +0800 黑名单修改时用户缓存清除 commit 34e3b4bd21e42a37f07b603de1443d4a5b66e2db Author: wanggb Date: Thu Jul 2 13:44:09 2020 +0800 还原误删除的$idx commit b2e37cb88a856bc14604491852401e05b39edbc1 Author: wudongdong Date: Thu Jul 2 13:32:42 2020 +0800 上传图片的验证 commit 7c010d6ab6a111f3d67325f906b8a98886df51ab Author: wanggb Date: Thu Jul 2 11:59:08 2020 +0800 福利广告素材不展示位置 commit b9c539cdad399931c52274ccadc9a9f1ea63d784 Author: xuehuiwen Date: Thu Jul 2 11:43:33 2020 +0800 custom commit 35b4918df99245730308e3278589ee538a9687ff Merge: 7cbf46562 aecf21b97 Author: wanggb Date: Thu Jul 2 11:23:59 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit 7cbf465625c8886b91b3991d0eb24bcc8769c857 Author: wanggb Date: Thu Jul 2 11:23:49 2020 +0800 广告用户组筛选增加用户尾号的筛选条件 commit 723a501298b6986248552ecc42cd0622f25486b3 Author: xuehuiwen Date: Thu Jul 2 11:22:52 2020 +0800 custom commit aecf21b97ce4135f2d20732f8d94ff566f485bd4 Author: wangfei Date: Thu Jul 2 11:21:57 2020 +0800 福利广告每天下发时间校验 commit 1b45ff9d1d932397a5e323cfc74676b4b9596c36 Merge: 9560da1db 524f97a83 Author: wanggb Date: Thu Jul 2 11:19:32 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit 9560da1db4cbb60cc99582e78e449333dc079bc6 Author: wanggb Date: Thu Jul 2 11:19:18 2020 +0800 广告用户组筛选增加用户尾号的筛选条件 commit 09d52b95f91a8880c016650c954f24df92a09edf Merge: 00defe423 ca2f9ca0f Author: wudongdong Date: Thu Jul 2 10:57:34 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 00defe423a90159eaaf0e5ee6d2f02802f915c29 Author: wudongdong Date: Thu Jul 2 10:57:26 2020 +0800 延迟客服消息-表单验证 commit ca2f9ca0f1b65624cc695ac53b278f1d1a5fe30d Merge: 3db990182 f0e13e31d Author: xuehuiwen Date: Wed Jul 1 21:37:31 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 3db990182cd91feb377675dd7df0e70667327781 Author: xuehuiwen Date: Wed Jul 1 21:36:32 2020 +0800 vip commit 524f97a8398937b7b933dd74149dd8ebdfc73714 Merge: 2bf4a0d21 fa29fe4a9 Author: wangfei Date: Wed Jul 1 21:27:26 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 2bf4a0d21c27eec32e0aededee860576e49353d2 Author: wangfei Date: Wed Jul 1 21:00:23 2020 +0800 福利数据渲染完成 commit f0e13e31de84e18c31f4690f763727b55356a9ee Merge: b5c880314 626951686 Author: wudongdong Date: Wed Jul 1 20:27:49 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit b5c880314633f059832d007cd453287727b39fae Author: wudongdong Date: Wed Jul 1 20:27:06 2020 +0800 调整卡片样式 commit 62695168634dea90d959661390863065ac843be6 Author: xuehuiwen Date: Wed Jul 1 20:16:36 2020 +0800 vip 客服消息 commit 572b328ad7d14db9fb616bec04e08e5177463501 Merge: 56df32d28 998f8d760 Author: zhenglh Date: Wed Jul 1 20:15:01 2020 +0800 Merge branch 'dev-java-service-20200605' commit 998f8d76096164aec7ef7d2f35bb0a8b09112905 (origin/dev-java-service-20200605) Author: zhenglh Date: Wed Jul 1 20:14:25 2020 +0800 微信菜单显示问题处理 commit 872a7a867fa61d065856c3e794289c1e38a71e5d Author: xuehuiwen Date: Wed Jul 1 19:33:50 2020 +0800 模板消息 commit 4379bb947692b4475f399750432fb28c2bc160d5 Author: wangfei Date: Wed Jul 1 17:22:46 2020 +0800 imagecss commit 89ff5285f0b1052ef872ee8d87bf82089d50be78 Merge: 572c6c6a1 d3ab0145b Author: xuehuiwen Date: Wed Jul 1 17:14:26 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 572c6c6a15ade6a7ee7c96a52a845f001325b4f6 Author: xuehuiwen Date: Wed Jul 1 17:13:40 2020 +0800 pop activity commit d3ab0145b3ce236e052af3835d68bc6deaa632a5 Merge: 84d433c2e 7c34055bb Author: wudongdong Date: Wed Jul 1 16:48:35 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 84d433c2ec77d78c2f09512a6b6689334c7e1fa0 Merge: 927d48a45 19db956c7 Author: wudongdong Date: Wed Jul 1 16:48:07 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 7c34055bb169c628b7e39997cdcf1594341d6d4f Author: xuehuiwen Date: Wed Jul 1 16:48:03 2020 +0800 pop activity commit 927d48a45461e9eccec6a3dc1354a1f1e2656203 Author: wudongdong Date: Wed Jul 1 16:47:58 2020 +0800 导出调整 commit fa29fe4a91893cbbb7c1a8d637b4c7855b5bf010 Author: 赵学亮 Date: Wed Jul 1 16:39:54 2020 +0800 替换参数 commit 19db956c7761d113a44836b5184877e290c16c61 Author: xuehuiwen Date: Wed Jul 1 15:59:13 2020 +0800 pop activity commit d3594f25aeb8451da8b25f32701946a1dc108f50 Merge: 0aa28ff49 56df32d28 Author: wanggb Date: Wed Jul 1 15:39:08 2020 +0800 Merge branch 'master' into dev-ad-v3-20200618 commit 0aa28ff4949aeece771627febb3749c6b4208f21 Author: wanggb Date: Wed Jul 1 15:31:38 2020 +0800 修改多余代码 commit 842d2c05bc4cf0c47669df17ab3b8f03f1f09949 Author: wanggb Date: Wed Jul 1 15:18:39 2020 +0800 修改插屏广告页面模板 commit 8c491d858917b7ca64497f0e9920975db5ee4181 Author: wanggb Date: Wed Jul 1 15:04:16 2020 +0800 修改接口 commit 53dfef99972896a597003caf5d4d64929bf520bb Merge: 8f18e2d5f ab7ec1d50 Author: wudongdong Date: Wed Jul 1 14:46:07 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 8f18e2d5fa01a29170136713dab7d0a0df6a3743 Author: wudongdong Date: Wed Jul 1 14:45:57 2020 +0800 调整文本类型小程序样式 commit 56df32d28c5144fb3b5b2f820f648dee8e9f8b0f (tag: cps_20200701_144412) Merge: dd8940bd6 8fbf697c1 Author: zhenglh Date: Wed Jul 1 14:41:34 2020 +0800 Merge branch 'dev-java-service-20200605' commit 8fbf697c1ac8e362b1c3cd4377c75efcb950e3b5 Author: zhenglh Date: Wed Jul 1 14:38:54 2020 +0800 其他书籍，热门书籍打点 commit ab7ec1d50063a5e0dc36c9fc9382106cf8c6f120 Author: xuehuiwen Date: Wed Jul 1 14:38:36 2020 +0800 activity pop commit 5e538ae3d18ffb3cd70874d727e5bc03b862510a Author: zhenglh Date: Wed Jul 1 14:35:52 2020 +0800 其他书籍，热门书籍打点 commit dd8940bd67d8672b323993ae2dc50a984fb69c7f (tag: cps_20200701_134846) Merge: 91bb75953 530a2da39 Author: zhenglh Date: Wed Jul 1 12:00:38 2020 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 91bb7595313397138880a1bee088c616f11c749c Author: zhenglh Date: Fri Jun 5 19:06:03 2020 +0800 用户维护切换到java服务 commit 77a99eb79c50fcbde0d33bd9621542bba48ad2ff Merge: c142f8296 18e1b389c Author: xuehuiwen Date: Wed Jul 1 11:14:00 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit c142f8296c97dc9d96ef4c7a5f92462140faf9b3 Author: xuehuiwen Date: Wed Jul 1 11:13:51 2020 +0800 pop ispay commit e9b193537b52c80b1032c0f749d8c901b86cd32a Merge: 33e535983 530a2da39 Author: wanggb Date: Wed Jul 1 10:51:40 2020 +0800 Merge branch 'master' into dev-ad-v3-20200618 commit 33e535983937408bc66d6cc28dc6c5c435eb0a2a Merge: b890546bc 382a56b6a Author: wanggb Date: Wed Jul 1 10:30:09 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit 530a2da39b7ed64337c9d481b388091a50909f43 Author: wudongdong Date: Wed Jul 1 10:21:14 2020 +0800 去掉渠道增加的字段 commit 382a56b6a42ba8b298f7d162a20d132384c7969f Author: wangfei Date: Wed Jul 1 10:19:24 2020 +0800 重新引入 commit b890546bc8b4b2592680ffc6d26d60e6081ddb0e Merge: 48376c985 63c040113 Author: wanggb Date: Wed Jul 1 10:11:50 2020 +0800 Merge branch 'master' into dev-ad-v3-20200618 # Conflicts: # public/assets/js/require-backend.min.js commit 48376c9855161892ba34958147641dc9f26d58cd Merge: aee9164bb 252e7182d Author: 赵学亮 Date: Wed Jul 1 10:00:40 2020 +0800 合并代码 commit aee9164bb6431dbf8faa6509e2075fba56b05cfe Author: 赵学亮 Date: Wed Jul 1 09:56:23 2020 +0800 提交迁阅代码 commit 252e7182dc88b7894771a571dee17fe85948055c Merge: aa2d3b9db 288a38a23 Author: wangfei Date: Wed Jul 1 09:54:26 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit aa2d3b9db089c6e946977759e92b12f7c5395468 Author: wangfei Date: Wed Jul 1 09:54:12 2020 +0800 提交代码 commit 18e1b389cea8c61faf40e1ae73744079b5561191 Author: wudongdong Date: Tue Jun 30 22:08:07 2020 +0800 延迟客服消息联调 commit 288a38a2324f904198b6e3cfd4f12485353faf13 Author: wanggb Date: Tue Jun 30 20:54:15 2020 +0800 Modify 提供接口给JOB，获取需要push的内容 commit 9800e0bb42083a90995f0f7854522625153cbc03 Merge: dfb6e91ac 614fbbed1 Author: 赵学亮 Date: Tue Jun 30 20:41:58 2020 +0800 Merge branch 'dev-ad-v3-20200618' of 192.168.0.31:fe/cps into dev-ad-v3-20200618 commit dfb6e91ac05b83ff9401a69d8313a4b9e806eb1f Author: 赵学亮 Date: Tue Jun 30 20:41:48 2020 +0800 增加阅读页插屏广告 commit 7741da7f0360c5101998b35d2b8c70d5aff9f627 Author: 赵学亮 Date: Tue Jun 30 20:40:55 2020 +0800 增加插屏广告 commit 898ad717a05cd1afb5916adedb0d5e1f4f9f4670 Merge: f857bd7d2 8204ad6ea Author: wudongdong Date: Tue Jun 30 19:59:27 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit f857bd7d26e163be4e3ab7a113cc0069abdda6d6 Author: wudongdong Date: Tue Jun 30 19:59:15 2020 +0800 延迟客服消息更改发送类型为json commit 614fbbed191a01dd94000581157b1c8026f00c26 Merge: 931da1ab4 c8fc6438c Author: wanggb Date: Tue Jun 30 19:03:47 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-v3-20200618' into dev-ad-v3-20200618 commit 931da1ab46a9660e6e4f6629045cedaf72d0c774 Author: wanggb Date: Tue Jun 30 19:03:38 2020 +0800 提供接口给JOB，获取需要push的内容 commit c8fc6438c5fd5ce092322a4eb252ab0f8949525a Author: wangfei Date: Tue Jun 30 17:05:27 2020 +0800 rading commit 8204ad6eaf417d6bd973c24b2eebe2226e0b496f Author: zhenglh Date: Tue Jun 30 16:12:49 2020 +0800 推广书单处理 commit 7105a6de9eeb04521ffd76fb83baa9983c8e09f4 Author: wanggb Date: Tue Jun 30 15:43:23 2020 +0800 增加控制器，阅读页插屏广告 commit b9a4a1bb488c589b3b177cb5af22ec44b9637b69 Merge: 94d39f860 6e107833f Author: 赵学亮 Date: Tue Jun 30 15:24:29 2020 +0800 Merge branch 'dev-ad-v3-20200618' of 192.168.0.31:fe/cps into dev-ad-v3-20200618 commit 94d39f8600b61f4784f25fc2eeee863ed5fe7887 Author: 赵学亮 Date: Tue Jun 30 15:24:22 2020 +0800 代码修改 commit 6e107833f13086e05a5c726449dd4a228e845301 Author: wanggb Date: Tue Jun 30 15:16:41 2020 +0800 增加控制器，阅读页插屏广告 commit df51f38e9770ad5583a284bb198e418699d96437 Merge: 9e9e3bd17 606570c70 Author: wangfei Date: Tue Jun 30 14:43:20 2020 +0800 Merge branch 'dev-ad-v3-20200618' of http://192.168.0.31/fe/cps into dev-ad-v3-20200618 commit 9e9e3bd1759c20ebd45771fe974bc8eb360ed11b Author: wangfei Date: Tue Jun 30 14:42:38 2020 +0800 福利数据 commit e3dfc92b3e87e541fde7b48e0458b6126f75f90e Merge: a0e4b9cc0 8930dd886 Author: zhenglh Date: Tue Jun 30 14:34:14 2020 +0800 Merge branch 'dev-270channel-20200628' of http://192.168.0.31/fe/cps into dev-270channel-20200628 commit a0e4b9cc0f76e277c5e41ea64b45171e5da1f024 Author: zhenglh Date: Tue Jun 30 14:33:40 2020 +0800 清除黑名单用户使用数据表方式 commit 606570c7049786717cf3bc5b1eae407e96d89b56 Merge: 36f9490ec b7cf81d8e Author: 赵学亮 Date: Tue Jun 30 14:32:45 2020 +0800 Merge branch 'dev-ad-v3-20200618' of 192.168.0.31:fe/cps into dev-ad-v3-20200618 commit 36f9490ecb3614e88e29edfd23a4113f89591b57 Author: 赵学亮 Date: Tue Jun 30 14:32:39 2020 +0800 增加广告阅读页 commit 8930dd8862c00dfc3ceafc31d0fb6f6ab7c94b5e Merge: 53f1c1b10 c4e7d1709 Author: xuehuiwen Date: Tue Jun 30 14:09:04 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit b7cf81d8ed98b6aa9c82bb61a995b3adedddb826 Author: wanggb Date: Tue Jun 30 14:07:14 2020 +0800 增加控制器，阅读页插屏广告 commit 53f1c1b106ab5c7303701e58b6abf8183de4c4dd Author: xuehuiwen Date: Tue Jun 30 14:06:36 2020 +0800 270mixed commit c4e7d1709d21be0e41999878bcf3832f8cd47be0 Merge: 48fd162c5 58657fe84 Author: wudongdong Date: Tue Jun 30 13:52:59 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 48fd162c562a05ace23afafe4c61b08919e978bb Author: wudongdong Date: Tue Jun 30 13:52:48 2020 +0800 图片消息 commit 63c0401135f7e7356b76ed6ce573b8189c3120a1 (origin/dev-280mixed-20200630) Author: wanggb Date: Tue Jun 30 11:46:25 2020 +0800 高级群发-解决封面图片会合并到内容 commit 58657fe844f2bfaf67a022bad751e3fc790beb25 Author: machao Date: Tue Jun 30 10:32:13 2020 +0800 修改时间div commit b01706aa2e808fabdcaa29e22b0212efac326db4 Author: wanggb Date: Tue Jun 30 10:31:38 2020 +0800 高级群发消息使用摘要 commit 0fb8a700b21aad1f16b06fb3172e290097e3521e Merge: a7ce2c6d2 debbba2ff Author: wudongdong Date: Tue Jun 30 10:16:51 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit a7ce2c6d279d69056002460209c2719d4c52e5c4 Author: wudongdong Date: Tue Jun 30 10:16:41 2020 +0800 小程序权限 commit debbba2ffb9940e6974344538fb2bf5c24a7ee3f Author: xuehw Date: Mon Jun 29 20:17:30 2020 +0800 merge 270mixed commit 4cea6cdb0b9295162756fef470c6fff7579d36ce Merge: 51276a9d7 e727abebe Author: wudongdong Date: Mon Jun 29 20:05:30 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit 51276a9d70ddf42fc0c91855af61a32ab503c973 Author: wudongdong Date: Mon Jun 29 20:04:15 2020 +0800 vip充值信息增加筛选 commit 556f88a43dcd14c8ae8beeb54869ee668dca38bb Author: wanggb Date: Mon Jun 29 18:55:50 2020 +0800 计算广告用户集合差集，命令执行，备用 commit e727abebe9e95a9a89b541a4946c40970f8354c0 Author: zhenglh Date: Mon Jun 29 18:35:02 2020 +0800 黑名单处理 commit f60ef7438ca4586facced0b1de0bea890268db9f Merge: ec2210abf 658b7b410 Author: zhenglh Date: Mon Jun 29 18:22:09 2020 +0800 Merge branch 'dev-270channel-20200628' of http://192.168.0.31/fe/cps into dev-270channel-20200628 commit ec2210abf2558e21c5fed4d767bc413be7e14fd4 Author: zhenglh Date: Mon Jun 29 18:22:02 2020 +0800 渠道清除黑名单用户 commit 658b7b410cc1a50b0cbed093b382f1880a17aba2 Author: wudongdong Date: Mon Jun 29 14:14:47 2020 +0800 原始消息增加默认值 commit 4a7f9d1db98f34d1220fb5c976cb6d847d6bea7a Author: zhenglh Date: Mon Jun 29 11:21:08 2020 +0800 章节书币添加80,90,100 commit 1292eb783ea2619e97da601ec81f2cd0ea5b522c Merge: b17364d86 f1bed4760 Author: wudongdong Date: Mon Jun 29 10:37:58 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit b17364d8691b934b3540c4d5a54366482093aca6 Author: wudongdong Date: Mon Jun 29 10:37:47 2020 +0800 构建js commit f1bed4760e131246743df6f251abf8b308bcdfb0 Merge: 00066ebd3 ac423eb77 Author: zhenglh Date: Mon Jun 29 10:19:07 2020 +0800 Merge branch 'dev-270channel-20200628' of http://192.168.0.31/fe/cps into dev-270channel-20200628 commit 00066ebd3f1d507f7c58d2c20f0152aeba43a095 Merge: 515607cf1 5562e2288 Author: zhenglh Date: Mon Jun 29 10:18:47 2020 +0800 Merge branch 'dev-270-kl-20200615' into dev-270channel-20200628 commit bd987451a32b64d7db014127f496c9eb815800d3 Author: wanggb Date: Mon Jun 29 10:18:41 2020 +0800 记录用户点击福利广告的redis ,过期时间 commit 5562e22886ba5c762d94f951909db9ac229781ee (origin/dev-270-kl-20200615) Author: zhenglh Date: Tue Jun 16 11:50:38 2020 +0800 用户查询处理是 commit a26aaa3322765d29cae48291d17852fcad412220 Author: zhenglh Date: Tue Jun 16 10:52:26 2020 +0800 渠道配置添加 commit e205dcdbef58ae743d91c021c012cd7248d0f05f Author: wanggb Date: Sun Jun 28 21:21:36 2020 +0800 福利广告新增、编辑时不展示位置属性 commit 7e7f3063b728e6c76696a0cdd08787777aa24145 Merge: bc8358dbe a60228618 Author: wudongdong Date: Sun Jun 28 20:57:49 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit bc8358dbe7155268837414e86a97cc99814f1f9b Author: wudongdong Date: Sun Jun 28 20:57:34 2020 +0800 渠道接口增加字段 commit ac423eb7779039186cd31110d5661a8cd9a8195c Merge: a430faafe 71b1d641e Author: wudongdong Date: Sun Jun 28 19:33:28 2020 +0800 Merge branch 'dev-270channel-20200628' of 192.168.0.31:fe/cps into dev-270channel-20200628 commit a430faafe0c805151098f3c94b0938604824c3b0 Author: wudongdong Date: Sun Jun 28 19:33:18 2020 +0800 渠道同步充值模板+充值模板权限判断 commit 71b1d641e531e6fe488474caebcb0796d2ebc5ef Author: xuehw Date: Sun Jun 28 19:13:57 2020 +0800 merge 270mixed commit a60228618f65d0d5468d3cf821e22739923ed389 (tag: cps_20200628_191245) Author: zhenglh Date: Sun Jun 28 18:12:28 2020 +0800 性别打点添加user_collect属性 commit 515607cf19eee8d6631144d5b338f3a9377b0b5b Author: zhenglh Date: Sun Jun 28 15:12:49 2020 +0800 扣量规则添加边界值 commit 1816df46a25065469e8cca79ea14977ada535811 Author: wanggb Date: Sun Jun 28 17:44:26 2020 +0800 广告素材增加按位置检索，同时支持 FIND_IN_SET commit ef1b0cf1911be160e52fd20ba6f35936445f2db2 Author: xuehw Date: Sun Jun 28 17:41:09 2020 +0800 merge 270mixed commit 4fd1e8a05dc0fba730398439c2fa1cb167477124 Merge: cf39453c6 5000283d5 Author: xuehw Date: Sun Jun 28 17:39:51 2020 +0800 merge 270mixed commit 5000283d5e7eba9cfe10db6f62e168870b86abe0 (origin/dev-270-mixed-20200615) Author: xuehw Date: Sun Jun 28 15:29:49 2020 +0800 subscribe commit cf39453c6318be5810b174859bd6daa70cfb2a47 Author: machao Date: Sun Jun 28 10:54:47 2020 +0800 修改按钮 commit 9509fe3ba8f3b14840fa7b95c55cc8ca4d894b6f Author: wudongdong Date: Sun Jun 28 12:37:11 2020 +0800 vip增加手机系统筛选项 commit 8d16cc62deecd07b13f12e6c714131ba2da993fb Author: wudongdong Date: Sat Jun 27 16:28:57 2020 +0800 vip延迟客服消息 commit 34eca004aa52bbecb7b2c8c18731f859a09fd2a0 Author: wudongdong Date: Sat Jun 27 01:38:00 2020 +0800 vip延迟客服消息 commit 6b2d335cf119fc7630580bb7783df234e2c88b40 Author: wudongdong Date: Thu Jun 25 23:00:28 2020 +0800 延迟客服消息 commit 96b401da20b8d6cc1e677409016f81c021b9bfe9 Author: wudongdong Date: Thu Jun 25 17:40:04 2020 +0800 延迟客服消息前后端联调 commit 42f959d4bf0c32650f4175a0ea32ec2823009917 Author: machao Date: Wed Jun 24 19:07:55 2020 +0800 文本类型 commit d42e6dad6556410dd465f52f2518fb444fe4f4ff Author: machao Date: Wed Jun 24 18:29:16 2020 +0800 文本类型 commit 8e2524ec0fe12bacb6182bf602a9e8ba7cbdc5b2 Author: machao Date: Wed Jun 24 18:20:52 2020 +0800 修改页面 commit a86fcad0521d1011944e57ed72727086c4195a21 Author: machao Date: Wed Jun 24 16:27:07 2020 +0800 修改编辑错误 commit d847172df57552bb47e3dc6120176cf1f17dfee2 Author: machao Date: Wed Jun 24 15:15:11 2020 +0800 修改页面 commit e57c2429d7a1abba0287e4ee3d0cc84730d187f2 Author: machao Date: Wed Jun 24 14:23:20 2020 +0800 联调接口 commit 5e3995ec1b372aae102329104830edb48c2f6387 Author: machao Date: Wed Jun 24 14:12:33 2020 +0800 联调接口 commit d6abf332a5b6d6b30d4df31a1c54309eb031536d Author: machao Date: Wed Jun 24 13:54:30 2020 +0800 联调接口 commit a2e96590a5af04a7601d066572cb6e7342001573 Author: wudongdong Date: Wed Jun 24 18:35:35 2020 +0800 延迟客服消息 commit 885f2b370885c4c18c9a643dd100d8a6e9762c5f Author: wudongdong Date: Wed Jun 24 13:33:25 2020 +0800 延迟客服消息vue commit 00ba2471962b13688913a0184ac1468fe5d2b81e Author: wudongdong Date: Mon Jun 22 17:43:09 2020 +0800 延迟客服消息后台逻辑 commit 77dce89d06cbf491457c197b48f7247f35b8257b Author: wudongdong Date: Sun Jun 21 23:52:08 2020 +0800 vip商品模板 commit d3f50c70ea312829ff2b0cb47fab490ec90cd221 Author: machao Date: Sun Jun 28 14:53:41 2020 +0800 修改时间 commit aea82865a25a988d54ff96b03bf09472838c17d6 Author: xuehw Date: Sun Jun 28 14:47:47 2020 +0800 subscribe commit 406db1f544313f0b4c6bde882e00da1db3821d88 Author: machao Date: Sun Jun 28 14:15:53 2020 +0800 修改时间 commit 75008b5773d4bcba4d857abb0c5b79c34ead01f8 Author: xuehw Date: Sun Jun 28 14:05:49 2020 +0800 subscribe commit 48ad434a4e031125b311b38356182b62200c9869 Author: xuehw Date: Sun Jun 28 11:52:45 2020 +0800 subscribe commit 5041e074ad5f8da0abc6af9442fe5793ab9b0364 Author: wanggb Date: Sun Jun 28 11:32:32 2020 +0800 用户参加福利游戏后的回调接口 commit 19be5d068d0317e1356fe01dec4b1f3e934b64c8 Author: wanggb Date: Sun Jun 28 11:27:14 2020 +0800 用户点击福利游戏，保存用户信息到Redis commit a3865467a65717ee5692561f0cf04cbe980693c1 (tag: cps_20200624_192249, origin/dev-remenshuangwen-20200624) Merge: 0988ea028 2af19c8a9 Author: 李天时 Date: Wed Jun 24 19:16:25 2020 +0800 Merge branch 'master' into dev-remenshuangwen-20200624 commit 2af19c8a9c2ee410c9c51b22556bca1dba40fec7 Author: guyuexuan <2651919937@qq.com> Date: Wed Jun 24 19:06:21 2020 +0800 去除版本号 commit 9c7a7613b1f2c3b12fd6459f60f41c0e7d20588c Author: zhenglh Date: Wed Jun 24 19:03:39 2020 +0800 推广链接过滤方法修改 commit 0988ea028570715bbb28c4261077f47991b097af Author: 李天时 Date: Wed Jun 24 18:55:54 2020 +0800 竖四不展示作者 commit 5cc682c079480902ea745554f7aa16ff520ee461 Author: wanggb Date: Wed Jun 24 18:39:35 2020 +0800 用户参加福利游戏后的回调接口 commit 932de60228a32605328f0309b4fa47807a0ba9d7 Author: 李天时 Date: Wed Jun 24 18:37:49 2020 +0800 竖四不展示作者 commit d0a6211ab57f81e5dd2cf9a2725571c48852a443 Author: xuehw Date: Wed Jun 24 17:28:26 2020 +0800 subscribe commit 9aa4bce22e828c3569ce3d34fc8edfc21e986749 Author: zhenglh Date: Wed Jun 24 16:53:53 2020 +0800 书籍列表页显示不全问题处理 commit 23879a1613ddc6111d1f0b8c0999f0a07cf60aa3 Author: machao Date: Wed Jun 24 16:38:10 2020 +0800 修改sub_type 值news 1 text 2 commit 7dd9e3a65ab8cfc4c694992c77aec3a9ebb3cf81 Author: machao Date: Wed Jun 24 15:25:00 2020 +0800 修改编辑错误 commit bd66734630f4f6afb979f9035656c2613be59894 Author: xuehw Date: Wed Jun 24 15:12:32 2020 +0800 subscribe commit 2f240ceba907245a33bdaed82d252595ac95f4cc Author: zhenglh Date: Wed Jun 24 14:36:38 2020 +0800 推广链接兼容处理 commit 9b4291190d639cf731b68ae932ecd84ad947b754 Author: machao Date: Wed Jun 24 14:25:18 2020 +0800 联调接口修改swich、type参数为1和2 commit 78b9f5860aa99f11a4c6e8286d90c717e12b6285 Author: machao Date: Wed Jun 24 14:19:41 2020 +0800 联调接口 commit fb8958d90b4eb5a29e3d1a4a13bf589a5d189efa Merge: 672e10abb f42aa9e62 Author: zhenglh Date: Wed Jun 24 14:12:50 2020 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 672e10abb8b10465938b7c92ae1f762e8948ef80 Author: zhenglh Date: Wed Jun 24 14:12:41 2020 +0800 js打包 commit 7a32edeafe8d9c3b2107be5d476f85b4a6af9bee Author: machao Date: Wed Jun 24 14:04:12 2020 +0800 联调接口 commit 9073154a03f9040a9373e9ea37fa6892cc3611c5 Author: wanggb Date: Wed Jun 24 12:00:01 2020 +0800 维护缓存数据 commit f42aa9e62b5c4dfa07333d583ee4022787bfa1b2 (tag: cps_20200624_114439) Author: guyuexuan <2651919937@qq.com> Date: Wed Jun 24 11:43:32 2020 +0800 强制修改三方平台 http base_uri commit 3aa68b1703a9d10d6424d8b45eba6d79607e407e Author: wanggb Date: Wed Jun 24 10:31:39 2020 +0800 新增 编辑 素材（福利广告素材）不维护位置属性 commit 77aa9a92ce0b8eb2ea7a352bccb1c117e8015abc Author: machao Date: Wed Jun 24 09:54:02 2020 +0800 联调接口 commit 949233d65a213e0b48ad396bab4b1b518df7b1f1 Author: xuehw Date: Tue Jun 23 19:17:49 2020 +0800 subscribe commit 617b31d7fa9206806df9fbb5acd77fa2474165b0 (tag: cps_20200624_102256, tag: cps_20200623_180947) Author: zhenglh Date: Tue Jun 23 17:19:25 2020 +0800 独家书籍获取章节问题处理 commit 0f1c445f260627ab37b74f11c37305d5db898326 Author: xuehw Date: Tue Jun 23 16:09:21 2020 +0800 subscribe commit aa72bc66d4ceb447dda4323063a96bf73ccc31b5 Author: machao Date: Tue Jun 23 15:16:26 2020 +0800 联调接口 commit 7f51ccbd2d54aacedb5236779de1b3b2d6290181 Author: machao Date: Tue Jun 23 12:05:17 2020 +0800 文本弹窗刷新列表 commit e14979b3a0f965456b5b1c4fecc65297b1404619 Author: machao Date: Tue Jun 23 12:01:24 2020 +0800 文本弹窗 commit 76ef17d1f915fa461c845f98b9daa29860f1998e Author: wanggb Date: Tue Jun 23 10:57:37 2020 +0800 编辑广告计划，福利广告维护JSON存储 commit 9eb95a015bc8ee2f20c9970879c27bc1a034eca1 Merge: bc7929028 194ca11ac Author: machao Date: Mon Jun 22 21:13:21 2020 +0800 Merge remote-tracking branch 'origin/dev-270-mixed-20200615' into dev-270-mixed-20200615 commit bc79290282269473ef76fb01ab0b5884baf1eca7 Author: machao Date: Mon Jun 22 21:13:06 2020 +0800 渲染页面 commit 194ca11ac8cb0f83ac43e21e11fa1e8fb2ecb172 Author: xuehw Date: Mon Jun 22 21:10:21 2020 +0800 subscribe commit 6bb903e15fe9bbcea4bcb0a99e6dbfeef3b708b2 Author: machao Date: Mon Jun 22 21:09:50 2020 +0800 渲染页面 commit e3d562eb7869905f6cff164642e13e233fac0a64 Author: machao Date: Mon Jun 22 20:03:33 2020 +0800 注释代码 commit 7d492c30ee58a7aeae1e572ecf7e0159df5218bb Author: machao Date: Mon Jun 22 19:49:55 2020 +0800 恢复页面 commit 46dc267bc2e44d57ba936ce722a0dd35ffe71fca (tag: cps_20200623_133219, tag: cps_20200623_115033, origin/dev-260_one_collect_api) Merge: d87bc237d 4d4f0b76b Author: zhenglh Date: Mon Jun 22 19:34:17 2020 +0800 Merge branch 'dev-collect-api-20200618' into dev-260_one_collect_api commit 4d4f0b76b4724b5ce272420888433a0f7c772279 Author: zhenglh Date: Mon Jun 22 16:46:27 2020 +0800 书单接口处理 commit d87bc237d8df9ce0bfa28cf84e4ce99f3a5173a2 Author: 李天时 Date: Mon Jun 22 19:14:48 2020 +0800 后台书籍主编推荐语限定为150字 commit 4a47947189561329f8a4ec0fadfce96c0c74be3f Merge: d26cc1fb2 8c0fd8365 Author: xuehw Date: Mon Jun 22 19:09:27 2020 +0800 Merge branch 'dev-270-mixed-20200615' of 192.168.0.31:fe/cps into dev-270-mixed-20200615 commit d26cc1fb21cb998e5ba355a756db694b5541a086 Author: xuehw Date: Mon Jun 22 19:09:16 2020 +0800 subscribe commit df874d187d2d9d8aa9b015f197b97d6e9c015ae3 Author: 李天时 Date: Mon Jun 22 19:03:41 2020 +0800 后台书籍主编推荐语限定为150字 commit 8c0fd8365522238f134daee0520aa73a51ca4689 Merge: daa27e9fd 2dc4d4668 Author: machao Date: Mon Jun 22 18:58:37 2020 +0800 Merge remote-tracking branch 'origin/dev-270-mixed-20200615' into dev-270-mixed-20200615 commit daa27e9fd75751de788a8fa2847a33e121131893 Author: machao Date: Mon Jun 22 18:58:19 2020 +0800 恢复页面 commit 2dc4d4668848b95de02e521c2f47d8c31faecabb Author: xuehw Date: Mon Jun 22 18:34:49 2020 +0800 subscribe commit af0383aa8fd9325b5004d9c254a81b6e3a999fb8 Author: machao Date: Mon Jun 22 18:25:50 2020 +0800 恢复页面 commit 67fa3bb6d45642239432e34782da331ca2b56002 Author: 李天时 Date: Mon Jun 22 17:42:41 2020 +0800 后台书籍主编推荐语限定为150字 commit 0b69190190147d157882469e9f4846424de0d896 Author: xuehw Date: Mon Jun 22 16:19:17 2020 +0800 subscribe commit 5ed7b25dc18334e92d7ea91cd0fd5fdbed379c34 Merge: 8d410b3b7 8e2ef5001 Author: 李天时 Date: Mon Jun 22 16:13:29 2020 +0800 Merge branch 'dev-collect-api-20200618' into dev-260_one_collect_api commit 8d410b3b7c28ea5d7e05398e3ce83242b48eb7c3 (origin/dev-260-stage-one-20200527) Merge: eb8635953 758439c63 Author: wanggb Date: Mon Jun 22 15:36:39 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit eb86359534fd1b683d6e06c847d8dab08d555b91 Author: wanggb Date: Mon Jun 22 15:36:28 2020 +0800 修改弹窗逻辑，按自然日 commit 758439c6378763d11106e05f4edf1df0ff031e03 Author: 李天时 Date: Mon Jun 22 15:20:55 2020 +0800 前台UI,修改icon commit 47a00dbd348f0666a60fa25e7ebfbc421487356a Author: 李天时 Date: Mon Jun 22 10:58:09 2020 +0800 前台UI适配大字体 commit 210badaf7df4fd49124240ddef42b0b587a9871b Author: 李天时 Date: Mon Jun 22 10:41:58 2020 +0800 前台UI适配大字体 commit 2e4ceb242b29a56e32df805382e1e736c7ae1d6b Author: 李天时 Date: Mon Jun 22 10:35:08 2020 +0800 前台UI适配大字体 commit 520731492beb0ec73181c4f6f7f483f313b6bd9d Author: 李天时 Date: Mon Jun 22 10:28:29 2020 +0800 前台UI适配大字体 commit 7e7512ce8380c6a711ce84567611e1ed2b3ec1c9 Author: wanggb Date: Mon Jun 22 10:18:45 2020 +0800 添加 编辑 素材 校验数据正确 commit 7ce5de0d653d857619633134615ad885e7b95c22 Author: xuehuiwen Date: Mon Jun 22 08:26:23 2020 +0800 被关注回复优化 commit ef12d4f4a37c4659f8abaa0490ba35046e41bc78 Author: wanggb Date: Sat Jun 20 19:21:26 2020 +0800 添加 编辑 素材 校验数据正确 commit 9d0ccc3d44f8a17ec5f8612d904510d3785de236 Author: 李天时 Date: Sat Jun 20 19:13:53 2020 +0800 前台UI适配大字体 commit 8e2ef500103b1f2dc176454cf7c4e2f9af9bd9db Author: zhenglh Date: Sat Jun 20 19:02:12 2020 +0800 高级群发 commit 5d6c9e1612f1655a95d7b0ea8b0bbcfd0fce6cf1 Author: zhenglh Date: Sat Jun 20 18:42:33 2020 +0800 空渠道过滤 commit 1165c80d88a96be03524406274c6fba60e280e74 Author: wanggb Date: Sat Jun 20 17:01:37 2020 +0800 添加 编辑 素材 commit ad8df0758d12004751da4270aa2df0d9dda13c5e Author: 李天时 Date: Sat Jun 20 16:22:29 2020 +0800 前台UI适配大字体 commit 65cbc57229b05bfd6d8dea934fcae5985d93c136 Author: zhenglh Date: Sat Jun 20 15:53:10 2020 +0800 超管管理员推广链接排序 commit 76f53cd2d450b65f5ceed19c906f2d62bf151877 Author: 李天时 Date: Sat Jun 20 14:59:16 2020 +0800 前台UI适配大字体 commit 487d16b3134c509b9b9fffd0accc1ac43b9c89cd Author: 李天时 Date: Sat Jun 20 14:40:25 2020 +0800 前台UI适配大字体 commit 3f5b6bf8cbbf82821c8624c75fc448fb0a334b29 Author: wanggb Date: Sat Jun 20 13:47:41 2020 +0800 增加素材类型 commit 2c4f77fbb3f4a823cf5fc48557e7a2e466fe62b2 Merge: 9340984c0 ce8fa8060 Author: 李天时 Date: Sat Jun 20 11:53:10 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit 9340984c0945a3b48eb8ed129899311981dec6ca Author: 李天时 Date: Sat Jun 20 11:53:05 2020 +0800 前台UI适配大字体 commit ce8fa806079f8d040886efefc535bcc47f57cb8a Merge: 7fd7b87a8 a5a8a0387 Author: wanggb Date: Sat Jun 20 11:45:03 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit 7fd7b87a809f0265cc7c8778c4a25b2c967e8127 Author: wanggb Date: Sat Jun 20 11:44:46 2020 +0800 临时清除缓存 commit a5a8a0387f952f7a8ef6c19b4fdfa1b559ec5d3c Author: 李天时 Date: Sat Jun 20 11:44:41 2020 +0800 前台UI适配大字体 commit fbe19d2dc26f252f333dddc8fa22b7333c7c990d Author: 李天时 Date: Sat Jun 20 11:06:00 2020 +0800 前台UI适配大字体 commit 9eeade2d3aa4150a4f2cccebbc3040b367f49bfa Author: zhenglh Date: Fri Jun 19 20:42:07 2020 +0800 api调用超时时间 commit 1f69cc64eff0a381900401b0471709ac3c1aec9c Author: zhenglh Date: Fri Jun 19 16:22:28 2020 +0800 打点添加 commit 1540dfdcd03fef4dc7acc7fccc50c3c91b254cff Author: zhenglh Date: Thu Jun 18 14:53:01 2020 +0800 书单统计逻辑修改 高级群发兼容 用户统计兼容 关键字回复兼容处理 推广链接日统计兼容 commit 8467bd13b333c664bfc8adcfd9582eb89ba791ac Author: guyuexuan <2651919937@qq.com> Date: Tue Jun 16 16:16:14 2020 +0800 bootstarp table common search 支持 selectpage ajax 搜索 commit fed0c65c2454d5318f1f407c7c384d52349d2dc0 Author: wanggb Date: Fri Jun 19 19:29:35 2020 +0800 编辑广告位，维护数据 commit ade0f223a580bd7541b20f2f0fdb286b3a8eac99 Author: wanggb Date: Fri Jun 19 19:14:22 2020 +0800 弹窗样式修改 commit e50f5e10f4b9cde670c151ece7ac6c7ca83bc076 Merge: bd4c9b0ea de59c4794 Author: 李天时 Date: Fri Jun 19 18:18:31 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit bd4c9b0eaa5490f6c909985edb683a4a0bf1fcdb Author: 李天时 Date: Fri Jun 19 18:18:22 2020 +0800 前台UI适配大字体 commit de59c4794790b6363c567c55944f8e956fc18533 Author: wanggb Date: Fri Jun 19 17:27:35 2020 +0800 临时清除缓存 commit f77795bc7e4d2b6e2146d15f8d670fa2abf319d3 Author: wanggb Date: Fri Jun 19 17:16:55 2020 +0800 弹窗样式修改 commit d1331ea3fee4ed2742682dcf42ac6f6fab62b328 Author: 李天时 Date: Fri Jun 19 16:42:50 2020 +0800 前台UI适配大字体 commit d092b6228e9d96fbc47164611c484b4b7358e79b Merge: dbd1d8475 364b064a1 Author: wanggb Date: Fri Jun 19 15:38:10 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit dbd1d8475fca70bbfa5521f9848c8d6a77b43d54 Author: wanggb Date: Fri Jun 19 15:37:59 2020 +0800 修改浮动弹窗样式 commit 364b064a12476eb70041a789af0ad7966fd683bb Merge: d064f071b 71e5fb65e Author: 李天时 Date: Fri Jun 19 14:56:39 2020 +0800 Merge branch 'master' into dev-260-stage-one-20200527 commit d064f071bca4825f256cfa92a028de8fa96f1f8a Merge: 8936ebf14 9766b8f0d Author: 李天时 Date: Fri Jun 19 14:49:08 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit 8936ebf146dbc652539600926316752454d6451c Author: 李天时 Date: Fri Jun 19 14:49:02 2020 +0800 前台UI适配大字体 commit 9766b8f0d796cc30ccdd52a89be2a7c605bf0d3c Merge: e2e265dd3 1a520f7b7 Author: wanggb Date: Fri Jun 19 11:38:37 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit e2e265dd3e7902bf0c053e84c91c95a9539cafea Author: wanggb Date: Fri Jun 19 11:38:26 2020 +0800 修改浮动弹窗样式 commit 1a520f7b7786c4dad921ee1032f243d01f365551 Merge: 0bcd3c4b3 68000a2d6 Author: 李天时 Date: Fri Jun 19 11:36:16 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit 0bcd3c4b34a9ec4c764d79fd928e625f82e54074 Author: 李天时 Date: Fri Jun 19 11:36:06 2020 +0800 充值加购，每个小说显示2个标签 commit 68000a2d67f9a755a1c5ab0b90aebb0be75b7f23 Merge: 28d56a7b8 0c2453ab6 Author: wanggb Date: Fri Jun 19 11:35:36 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 commit 28d56a7b800ddeca3189ba6efb399fb030bb48ee Author: wanggb Date: Fri Jun 19 11:34:44 2020 +0800 修改浮动弹窗样式 commit 0c2453ab66b9ff43aaed2df08e4ad1fa87a823df Author: 李天时 Date: Fri Jun 19 10:43:49 2020 +0800 充值加购，每个小说显示2个标签 commit 0b0a785cfbfb44dfc212c43a3f9c4d6f98244546 Author: 李天时 Date: Fri Jun 19 10:11:27 2020 +0800 充值加购，每个小说显示2个标签 commit 68de342c6b04fa28b83f1092ac506904d901f747 Author: wanggb Date: Fri Jun 19 10:03:17 2020 +0800 新增广告位 commit 71e5fb65e920225692d36c19bfb0ea8924ced38a (tag: cps_20200619_100138) Author: guyuexuan <2651919937@qq.com> Date: Thu Jun 18 21:19:26 2020 +0800 command 动态读取 config site commit 671e40c4c90d146c8222e0f038b747bd4ae9031e Author: 李天时 Date: Thu Jun 18 19:34:27 2020 +0800 充值加购，选中的图片移动到阳光文件夹下 commit 0e67b52ca7aeab575413fab1aaef8047d0b1416b (origin/master_xhw_20200618) Author: wanggb Date: Thu Jun 18 12:05:06 2020 +0800 校验广告下发数据是否有值 commit e30827be44625e7a395262f1d07f7145fa855b71 Merge: 6458c189c 9d109af34 Author: 李天时 Date: Thu Jun 18 10:07:51 2020 +0800 Merge remote-tracking branch 'origin/master' into dev-260-stage-one-20200527 # Conflicts: # .gitignore commit 48dbda902682de8ff81aa0fc63434386ef17430c Author: xuehuiwen Date: Wed Jun 17 16:39:09 2020 +0800 270 mixed commit 9d109af3440128d2c80b8841de993ed2a736fecb (tag: cps_20200617_164558, origin/dev-error-level-down-20200606) Author: xuehuiwen Date: Wed Jun 17 16:12:17 2020 +0800 高级群发 vip 测试用户消息优化 commit 6835e33bb52405ed9c0f4452a70d36a8c871905f (tag: cps_20200617_151002) Merge: d223fd8cc c26a67ce1 Author: wanggb Date: Wed Jun 17 14:55:24 2020 +0800 Merge branch 'dev-ad-20200604' commit c26a67ce1143eedd9d85ce3f239aa942b481870f (origin/dev-ad-20200604) Author: wanggb Date: Wed Jun 17 14:54:54 2020 +0800 修改听书过程中打点 commit d223fd8cc0344b4b22ddca77f01bc6a881805125 (tag: cps_20200617_141402) Merge: a25d5f3e5 cdb42c483 Author: zhenglh Date: Wed Jun 17 11:12:20 2020 +0800 Merge remote-tracking branch 'origin/master' commit a25d5f3e5de997940982d903f90ac119951736ea Author: zhenglh Date: Wed Jun 17 11:12:01 2020 +0800 客服消息导出批次改为100 commit cdb42c4838f804aed00e95798fbff7a38603a080 (tag: cps_20200616_195242) Merge: 4b5e1395d aa2bf9d11 Author: wanggb Date: Tue Jun 16 19:51:14 2020 +0800 Merge branch 'dev-ad-20200604' commit aa2bf9d11f78745265debd323e26ed2c16ec0a20 Author: wanggb Date: Tue Jun 16 19:50:41 2020 +0800 修改模板文件 commit 2e37fcbf570d34f6de916b0815b99017d935c8e4 Merge: 6df1ca7b4 60b27e6c0 Author: 赵学亮 Date: Tue Jun 16 18:59:08 2020 +0800 Merge branch 'dev-ad-20200604' of 192.168.0.31:fe/cps into dev-ad-20200604 commit 6df1ca7b406952066fbd1de667dbf2fce5a96151 Author: 赵学亮 Date: Tue Jun 16 18:58:58 2020 +0800 逻辑优化 commit 4b5e1395d463e93007ab1bde3206d2ffca142691 (tag: cps_20200616_175035) Merge: 48e979ee4 60b27e6c0 Author: zhenglh Date: Tue Jun 16 17:28:35 2020 +0800 Merge remote-tracking branch 'origin/master' commit 48e979ee47def5cf8f7287c2a0c7e97eb3a61d8f Author: zhenglh Date: Tue Jun 16 17:28:24 2020 +0800 客服消息模板消息系统版本提示 commit 6458c189c8f0bea17cb23d4670f3fefcd742d589 Author: 李天时 Date: Tue Jun 16 15:34:50 2020 +0800 优化榜单页面ui,兼容老版本没有tags的情况 commit 60b27e6c0e38351d416b852f2457578884af7fe4 Author: wanggb Date: Tue Jun 16 14:50:35 2020 +0800 校验广告位置是否存在 commit 790648e1adb718fb8070af36f00473bee73685e2 Author: wanggb Date: Tue Jun 16 14:46:30 2020 +0800 chapter_num 正整数和0 commit 69f590969102f6357f374bc671af8de8b2370bb8 Author: wanggb Date: Tue Jun 16 14:20:51 2020 +0800 高级群发用户组，兼容mobile_system旧数据 commit 13176dc269d039cb4bcce5f4dfd13b784fefc31a Author: 李天时 Date: Tue Jun 16 11:18:31 2020 +0800 优化榜单页面ui,兼容老版本没有tags的情况 commit 7ac4081e618d99ace2af9e5894e3bf955e0277da (tag: cps_20200616_114905) Author: zhenglh Date: Mon Jun 8 10:04:18 2020 +0800 1.签到accessToken错误；2.获取accessToken接口返回值格式统一；3.创建用户时获取用户失败报错降级；关键字回复有反斜线报错处理 授权时，更新微信菜单失败1，错误降级 DateHelper报错 活动链接错误处理 用户信息添加失败错误降级 签到，渠道解绑错误降级 延迟客服消息错误降级 url参数 删除引用 mkdir报错屏蔽 token接口修改 账号被封处理 关键字为空不进行查询 签到报错信息提示 commit e8c5c8bf0de453dbb28eb1afd981730cf50f6b00 Author: 赵学亮 Date: Tue Jun 16 10:36:29 2020 +0800 样式优化 commit b1dce3d2068a8a8b665c139af863d8b89c2e3945 Author: 赵学亮 Date: Tue Jun 16 10:26:30 2020 +0800 优化样式 commit c1e012f0224284152a2e17c4ee163240817c2a9d Merge: 1a2317b43 f0efb63c0 Author: 赵学亮 Date: Tue Jun 16 09:59:24 2020 +0800 Merge branch 'dev-ad-20200604' of 192.168.0.31:fe/cps into dev-ad-20200604 commit 1a2317b43c3b14d58e3f7435db85fee7aec43c7b Author: 赵学亮 Date: Tue Jun 16 09:59:01 2020 +0800 充值弹窗和签到弹窗 commit f0efb63c0bc82e4142d29f9356d499e48bf6c3a0 Merge: dc862e876 ce3ad7a55 Author: wanggb Date: Mon Jun 15 21:26:56 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-20200604' into dev-ad-20200604 commit dc862e87680c13ce798413e2f4816226c836e559 Author: wanggb Date: Mon Jun 15 21:26:45 2020 +0800 听书过程中加入打点信息 commit ce3ad7a557093303e7d9d274b90f9fb8b4528525 Author: 赵学亮 Date: Mon Jun 15 21:05:28 2020 +0800 细节调整 commit de9dd354c6b2212f52e58020649e0413e11d4e53 Author: 赵学亮 Date: Mon Jun 15 21:01:00 2020 +0800 样式优化 commit 663018f31946c4e087aa01858ae40dbaf5194ea9 Merge: 6dcc7b088 dc861b078 Author: 赵学亮 Date: Mon Jun 15 20:55:54 2020 +0800 Merge branch 'dev-ad-20200604' of 192.168.0.31:fe/cps into dev-ad-20200604 commit 6dcc7b088a168e0f0e9c26d6089bb405be493004 Author: 赵学亮 Date: Mon Jun 15 20:55:42 2020 +0800 签到弹窗样式优化 commit dc861b07866720605a9f6200204be6c7307680c2 Author: wanggb Date: Mon Jun 15 20:44:07 2020 +0800 听书过程中加入打点信息 commit bc907d69c2d7648df5cbef0f915b15ac21fc2859 Author: 赵学亮 Date: Mon Jun 15 20:36:10 2020 +0800 恢复代码 commit d3dabad9dd52fde93158a57f7e5e014783aa2338 Author: 赵学亮 Date: Mon Jun 15 20:31:57 2020 +0800 修复自动听书问题 commit 845246975984fa214c13294da973c532844808c3 Author: 赵学亮 Date: Mon Jun 15 20:25:13 2020 +0800 优化代码 commit 9cd9862795d4951605531c46b2d60cc869294f8a Author: 赵学亮 Date: Mon Jun 15 20:03:23 2020 +0800 回复代码 commit 601da8b3477652b96a1a1dda89861cf65df6ced6 Author: 赵学亮 Date: Mon Jun 15 19:56:21 2020 +0800 修复听书问题 commit d1addc6b6bbd1deeacab720cba02eda5c32a2d67 Author: 赵学亮 Date: Mon Jun 15 19:51:04 2020 +0800 优化数据格式 commit 85abb6d21795dea79db36b94a2df3a1b8c8a78cf Author: 赵学亮 Date: Mon Jun 15 19:20:10 2020 +0800 临时修改 commit a1c653aa5ff1c332ad3fcd1d15fe2c2c5d476c29 Author: 赵学亮 Date: Mon Jun 15 19:10:55 2020 +0800 暂时取消注释 commit 7819e4fde1e31db51c8428de6faf4c1c35229ed5 Author: 赵学亮 Date: Mon Jun 15 19:02:59 2020 +0800 优化样式 commit 2229dde6fed985adb6115a8b3015c38db2c4f38b Author: 赵学亮 Date: Mon Jun 15 17:42:19 2020 +0800 修复问题 commit 74aa79f65aae8e66ccd0d09e98c1335ad08d1606 Merge: 8ceabc188 8446de9a6 Author: 赵学亮 Date: Mon Jun 15 17:35:28 2020 +0800 Merge branch 'dev-ad-20200604' of 192.168.0.31:fe/cps into dev-ad-20200604 commit 8ceabc1880bdd641642d70cf64e1879c1faaf4f4 Author: 赵学亮 Date: Mon Jun 15 17:35:01 2020 +0800 支付成功弹窗,下一章无反应问题 commit 8446de9a6fcf700adda1df5343e9979affb5d542 Merge: c2052c421 c395485fa Author: wanggb Date: Mon Jun 15 15:21:06 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-20200604' into dev-ad-20200604 commit c2052c421fd7ed3900d3fe90b3f347d0e5ca2fae Author: wanggb Date: Mon Jun 15 15:20:56 2020 +0800 间隔章节数必须正整数 commit c395485fad78847c61b34149d77de66f5d34cf1e Merge: d88e8cb28 d46544d81 Author: zhenglh Date: Mon Jun 15 14:58:38 2020 +0800 Merge branch 'dev-ad-20200604' of http://192.168.0.31/fe/cps into dev-ad-20200604 commit d88e8cb2887ec5c32b1f16d35d4706f579c6b3da Author: zhenglh Date: Mon Jun 15 14:58:25 2020 +0800 推广链接添加技术支持 commit d46544d817a95c4e618897efba4d0f4cf4867ca6 Author: 赵学亮 Date: Mon Jun 15 14:55:53 2020 +0800 优化样式 commit bd1544276c0c5b398023340d0a45397be849f57e Author: 赵学亮 Date: Mon Jun 15 14:41:29 2020 +0800 优化样式 commit bb25f7bf2a1ffbe445edcb4a3a050bba813a13da Author: 赵学亮 Date: Mon Jun 15 14:32:45 2020 +0800 优化弹窗样式 commit 7aea6e77210115907544bae8aef5e7de4e21f88f Merge: 462169196 be15aebfe Author: 赵学亮 Date: Mon Jun 15 14:16:30 2020 +0800 Merge branch 'dev-ad-20200604' of 192.168.0.31:fe/cps into dev-ad-20200604 commit be15aebfeaf6fa4ff60b53897ad6adae8807869c Merge: fdd736f28 490b6da21 Author: wanggb Date: Mon Jun 15 14:13:15 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-20200604' into dev-ad-20200604 commit fdd736f28723d372a30679ccd42e9f3f687467d2 Author: wanggb Date: Mon Jun 15 14:13:05 2020 +0800 Tabbar兼容遮挡文字 commit 462169196f0bf7722e3d68a81abf4a7e459bea36 Author: 赵学亮 Date: Mon Jun 15 14:04:36 2020 +0800 修复自动听书问题 commit 490b6da213c7141a15c2a45f979b7d7576f118e5 Merge: e2d59ec1e 0e17bfd76 Author: 赵学亮 Date: Mon Jun 15 13:52:17 2020 +0800 Merge branch 'dev-ad-20200604' of 192.168.0.31:fe/cps into dev-ad-20200604 commit e2d59ec1e1321dd3371e75eea960424262697fb8 Author: 赵学亮 Date: Mon Jun 15 13:52:10 2020 +0800 去掉圆角 commit 0e17bfd76ff388af008adcdcb1348fb03d3aaa38 Merge: f9af3c6b1 b5225f496 Author: wanggb Date: Mon Jun 15 11:35:41 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-20200604' into dev-ad-20200604 commit f9af3c6b168d0343aec75711a7d48a2c3e1a9a38 Author: wanggb Date: Mon Jun 15 11:35:31 2020 +0800 Tabbar兼容遮挡文字 commit b5225f496be20508882744e0bbe597bdf7e78660 Author: 赵学亮 Date: Mon Jun 15 11:08:14 2020 +0800 优化下一章弹窗样式 commit e8206c3ff69ee31fa33dd6e0e41bec025f4af71d Author: 赵学亮 Date: Mon Jun 15 10:23:54 2020 +0800 修复非广告用户充值页跳出逻辑问题 commit ec50e06623b1f0fb920f0052d22d99b10ec03838 Author: 赵学亮 Date: Fri Jun 12 20:20:11 2020 +0800 修复问题 commit 348df70bf253347ff992e86c4cc6bf2a85665e0a Author: 赵学亮 Date: Fri Jun 12 20:16:41 2020 +0800 修复逻辑问题 commit fe52347b4001fde49d1aa1a0ee5b764a196275fc Author: 赵学亮 Date: Fri Jun 12 20:00:38 2020 +0800 异常情况处理 commit 5d26e07cddf5f6d6bba037158d42085ccdf6bb34 Author: 李天时 Date: Fri Jun 12 19:27:26 2020 +0800 优化榜单页面ui commit e16664e7343413ab73289b04596a82482d3121c7 Author: 赵学亮 Date: Fri Jun 12 19:10:03 2020 +0800 优化样式 commit dee81863d58d539d1849c24fa8cac4020b5b96c8 Author: 赵学亮 Date: Fri Jun 12 18:36:10 2020 +0800 随机 commit 99b66a963f0e09bb80fef48f38a16f1db1816521 Author: 赵学亮 Date: Fri Jun 12 18:29:22 2020 +0800 样式优化 commit 48200f90fe0ac285dfa171bec66307e5cc98cf15 Author: 赵学亮 Date: Fri Jun 12 17:33:01 2020 +0800 下一章弹窗样式优化 commit 3178ba7bb8e3af2ae3866ecbca3b4b98c10b16f7 Author: 赵学亮 Date: Fri Jun 12 16:40:15 2020 +0800 优化广告数据筛选逻辑 commit 309bae6d2252c9b8ccf766472cbb9b6c18f10d50 Author: 赵学亮 Date: Fri Jun 12 16:33:47 2020 +0800 优化广告数据筛选 commit fdd025628d995374eb35ec9a664d84894b82fce0 Author: 赵学亮 Date: Fri Jun 12 15:59:35 2020 +0800 供测试清楚缓存用 commit b3317f1962dac34ebbc9e5fd42acd177712d9adc Merge: 1e0a54336 0729d692b Author: 李天时 Date: Fri Jun 12 15:48:23 2020 +0800 Merge branch 'master' into dev-260-stage-one-20200527 commit a0153747641e82c31100e10c0545bc305a11626f Author: 赵学亮 Date: Fri Jun 12 15:27:20 2020 +0800 优化章节提示信息 commit 7594383cee87ad4c6efc065a113af33891fdbc5c Author: 赵学亮 Date: Fri Jun 12 15:13:35 2020 +0800 修复个人中心页广告展示 commit cb75050513b86af4abcaab045ddf9f81267d0f3b Author: 赵学亮 Date: Fri Jun 12 15:07:59 2020 +0800 修改支付取消弹窗 commit 637e7d867b01a543cde72a2c934a972782d25243 Merge: a096ef3be 2823412eb Author: 赵学亮 Date: Fri Jun 12 14:12:00 2020 +0800 Merge branch 'dev-ad-20200604' of 192.168.0.31:fe/cps into dev-ad-20200604 commit a096ef3be2d71b68265656c1ea66f95bbd8bab37 Author: 赵学亮 Date: Fri Jun 12 14:11:39 2020 +0800 修复问题 commit 2823412eb390370ad154e94f4ce2c83f38e13215 Merge: 8139dfe53 0729d692b Author: wanggb Date: Fri Jun 12 10:45:50 2020 +0800 Merge branch 'master' into dev-ad-20200604 commit 0729d692b4049163741418055e65d796ba707cd3 (tag: cps_20200612_102742) Author: xuehuiwen Date: Fri Jun 12 10:00:27 2020 +0800 block ios system opt commit 8139dfe533712aea7d84001550d304952dae84ef Author: wanggb Date: Thu Jun 11 19:27:07 2020 +0800 校验表单提交内容，插屏&章节数 commit 9adaef9e231a4385b5596f588ccf2558659daced Author: 赵学亮 Date: Thu Jun 11 17:52:28 2020 +0800 增加误(shua)点(liu)击(mang)功能 commit 854fdb7b001e15c467667231fe894947167942cb Author: wanggb Date: Thu Jun 11 16:14:28 2020 +0800 校验表单提交内容，插屏&章节数 commit bae60b2b6b1b88017992ea4c3f7c8f1bd0ed504f (tag: cps_20200611_155945) Author: zhenglh Date: Thu Jun 11 15:59:11 2020 +0800 vip书单统计 commit 743c51acf08ede6c1b051e189fcd3fa3830482a0 Merge: d6f1115ff 419fbb84c Author: wanggb Date: Thu Jun 11 15:56:20 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-20200604' into dev-ad-20200604 commit d6f1115ff110429e752da26f2421944db9f978aa Author: wanggb Date: Thu Jun 11 15:56:06 2020 +0800 校验表单提交内容，插屏&章节数 commit 419fbb84c5297d94b1bd224867a551306d1b96e9 Author: 赵学亮 Date: Thu Jun 11 11:47:18 2020 +0800 提交新文件 commit 1cb26e9dd2b0e3ae0c48ec531926297aeaae852b Author: 赵学亮 Date: Thu Jun 11 11:43:06 2020 +0800 下一章广告 commit f0f8fadfd02836418d1a6bcf3cec2a1af7b9e729 (tag: cps_20200610_200642) Author: zhenglihao Date: Wed Jun 10 19:08:31 2020 +0800 导出问题处理 commit da3a61bb6ef5dadab8511dee6fce4cf1fb648826 Author: guyuexuan <2651919937@qq.com> Date: Wed Jun 10 19:08:07 2020 +0800 修改客服消息标题查询标题 commit 4f1afad98177e2c0507c17be810558c6643aa5e7 Author: zhenglihao Date: Wed Jun 10 18:37:30 2020 +0800 枚举值添加 commit 25c1896afee8dd8238f02ac19a58b40be4c1f121 (tag: cps_20200610_175552, origin/dev-migrate-prepare-1-20200508) Author: zhenglihao Date: Wed Jun 10 17:34:04 2020 +0800 merge master commit fc00e44f042d34cea3c668f8e11eec1866a6494c Author: zhenglh Date: Tue Jun 9 19:51:56 2020 +0800 书单统计回滚 commit 05e6054d762b1ecdbe593c7afae116724e974ff4 Author: zhenglihao Date: Wed Jun 10 17:30:49 2020 +0800 channelapi commit 80edfaa5462e2fb8199514aaed53d7a812291f25 Author: zhenglh Date: Mon Jun 8 18:37:06 2020 +0800 vip与渠道客服接口 commit 2fd8f04eaa94bbe76279ca17d62cf870c082b49b Author: zhenglh Date: Mon Jun 8 16:02:40 2020 +0800 书单添加资源时，快速选择书籍会覆盖当前表单 commit 0845e38229aeb321aa2ea75d665fb0f65d392616 Author: zhenglh Date: Mon Jun 8 12:06:41 2020 +0800 复制事件只初始化一次 commit 7aab2baeec513ba1d8829bc5d15f988ab388363e Author: guyuexuan <2651919937@qq.com> Date: Wed Jun 10 17:14:08 2020 +0800 修改 VIP 客服消息展示列表 commit 9982b3c05e881355e1a5dd4184e8a4c86480288d (tag: cps_20200610_161431) Author: guyuexuan <2651919937@qq.com> Date: Wed Jun 10 16:09:39 2020 +0800 修正时间格式 commit 1013449958788a4979c7185e138df7f25ea24579 (tag: cps_20200610_154624) Author: guyuexuan <2651919937@qq.com> Date: Wed Jun 10 14:46:43 2020 +0800 充值页增加部分提示说明 commit 1f4b648231b583dba484bccf5496a50c7bd0beb4 Author: guyuexuan <2651919937@qq.com> Date: Wed Jun 10 12:28:53 2020 +0800 恢复书单 collect index 方法 commit e82ecf13291700842c0bd0a91c1482d4e5f3d11f Merge: c4917773a c3cc947ce Author: 赵学亮 Date: Wed Jun 10 11:36:36 2020 +0800 Merge branch 'dev-ad-20200604' of 192.168.0.31:fe/cps into dev-ad-20200604 commit c4917773a6d9e2a061a086013bde5ff5cd25544a Author: 赵学亮 Date: Wed Jun 10 11:36:11 2020 +0800 增加打点 commit c3cc947ce58ee55ed72cdfc1f106d7873c4c3dc0 Merge: 158fa71b2 092af6522 Author: wanggb Date: Wed Jun 10 11:32:59 2020 +0800 Merge branch 'master' into dev-ad-20200604 commit 158fa71b29f2fb2691b618b7dcb857c44a73ad07 Author: 赵学亮 Date: Wed Jun 10 11:24:28 2020 +0800 提测 commit e386b242b2a92e2d03529f2e361b2e523288549f Author: xuehuiwen Date: Wed Jun 10 11:09:26 2020 +0800 删除高级群发2小时验证的注释 commit aa83365af066b58a3f9001d32155b54255cd7c6a Merge: 092af6522 8003e5296 Author: guyuexuan <2651919937@qq.com> Date: Wed Jun 10 10:31:11 2020 +0800 Merge branch 'dev-migrate-prepare-1-20200508' of gitlab:fe/cps into master-merge-20200610 commit 092af6522e8f661f9ab359e1e50a8017bf6ad993 Author: zhenglihao Date: Tue Jun 9 23:36:04 2020 +0800 系统版本添加提示 commit dd37606a402a2ae63fe6a2aefa26e77756ad902c Author: 赵学亮 Date: Tue Jun 9 21:25:12 2020 +0800 充值页返回拦截广告 commit 6da92a3c97a5f9f21973878f6d84ae95afc088d8 (tag: cps_20200609_174623) Author: zhenglh Date: Tue Jun 9 16:30:43 2020 +0800 查询书籍变量错误 commit f39aed70aca3679898076e249b99191147e98054 Merge: 7d864141f a648ead0f Author: wanggb Date: Tue Jun 9 15:56:34 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-20200604' into dev-ad-20200604 commit 7d864141f504b3adf5250f364d6d0fec127af711 Author: wanggb Date: Tue Jun 9 15:56:22 2020 +0800 将变量提到公共位置 commit 6ddcd8687ba78e441ca09e6eff7c87e4c8f90e12 (tag: cps_20200609_155053, tag: cps_20200609_154933) Author: zhenglh Date: Tue Jun 9 15:47:51 2020 +0800 关注回复不进行版本过滤 commit a648ead0fdc4931a60f62daf0a2475760f2138c1 Author: 赵学亮 Date: Tue Jun 9 15:39:33 2020 +0800 分类首页广告 commit c93387c1382a3b5674ca958428290f417f66021b (tag: cps_20200609_153454) Author: zhenglh Date: Tue Jun 9 15:33:53 2020 +0800 关注回复返回空的话不进行系统版本判断 commit a838afc8ad1c2d9c1eb2dd74f06585ba919e2dd1 Author: 赵学亮 Date: Tue Jun 9 15:14:53 2020 +0800 个人中心广告 commit 7e962baa8ad2535d41947d2d895a419ea6f4d541 (tag: cps_20200609_135317) Author: xuehuiwen Date: Tue Jun 9 11:50:24 2020 +0800 独家消息 列表条目数 调整 commit b344b0b618c39edb10cc0be49bff3b79b1261fe2 (tag: cps_20200609_114109) Author: zhenglh Date: Tue Jun 9 11:39:20 2020 +0800 blockios方法key不存在问题处理 commit 1e0a54336f6f336632f099d912abf78f6eb1cd1c Merge: 3b93f6b04 3ed60baa9 Author: 李天时 Date: Tue Jun 9 11:32:28 2020 +0800 Merge branch 'master' into dev-260-stage-one-20200527 commit 3b93f6b04379eaa1d2c51d1e323e9b6ebc4ecff1 Author: 李天时 Date: Tue Jun 9 11:31:03 2020 +0800 优化榜单页面ui commit 6eca6ec5518493601b8eff6f6fc880e674da354f Author: 李天时 Date: Tue Jun 9 11:03:40 2020 +0800 优化榜单页面ui commit 3ed60baa997406892d189ba09d05f21e0b60b33e (tag: cps_20200609_103513) Author: xuehuiwen Date: Tue Jun 9 10:14:14 2020 +0800 block ios user opt commit 1006798d8a4aef5bce863346e7cb2839101ec789 Author: zhenglh Date: Tue Jun 9 10:01:46 2020 +0800 广深地区处理 commit 29fa7b18e5abc991fd221eeb2476af45809bae79 Author: zhenglh Date: Mon Jun 8 20:14:27 2020 +0800 ajax调用时不进行os版本的更新 commit a8ffeb4a2128c5d0703c625be7a6c211aaea71da Author: zhenglh Date: Mon Jun 8 19:14:10 2020 +0800 目录页id处理 commit f38984f93f2ba1d7487791a068f5a547227b3685 (tag: cps_20200608_185551) Author: wanggb Date: Mon Jun 8 17:43:24 2020 +0800 高级群发用户组-查看详情增加手机系统 commit 65cdd49aa94b563d42365531d5e0927a57b3832e Author: 赵学亮 Date: Mon Jun 8 16:52:35 2020 +0800 增加广告角标 commit 484a8e38555dfe3c7b9410b0fcdc0680c922c392 Author: zhenglh Date: Mon Jun 8 15:38:05 2020 +0800 渠道id获取 commit 537b07322ffdca540f47a9179f755b6352eeba09 Author: zhenglh Date: Mon Jun 8 14:12:52 2020 +0800 书籍详情页与章节列表页 commit 801a5da8efff8cda1c6d1d2149485be8afd11587 Merge: 8b8337b05 c6f3f4ec8 Author: zhenglh Date: Mon Jun 8 13:34:18 2020 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 8b8337b051fe2cc697498e6f723ac0af6c7dc203 Merge: 16a643b81 1088afcc7 Author: zhenglh Date: Mon Jun 8 13:34:01 2020 +0800 Merge branch 'dev-block-send-ios-pay-20200603' commit 1088afcc702f00fa82b2e6db7d7d0fe3291fdc62 Author: zhenglh Date: Mon Jun 8 11:35:09 2020 +0800 广深地区开放关注,头条回传新增获客改为激活 commit c6f3f4ec8f7d26ec327216d2d692465332944398 (tag: cps_20200608_134848) Author: xuehuiwen Date: Mon Jun 8 11:24:15 2020 +0800 block ios user commit bf59b169b102b6b5ae7649437b6d2b2b2fb45376 Merge: 16a643b81 e19c3d7d8 Author: xuehuiwen Date: Mon Jun 8 10:38:56 2020 +0800 Merge branch 'dev-block-send-ios-pay-20200603' commit 04ea47d640e20a00ce22ae62303baf48d9f539c3 Author: wanggb Date: Mon Jun 8 10:32:45 2020 +0800 维护广告点击概率 commit c8b83e1722f7336e541ca86902c32612d59dd66e Author: wanggb Date: Sat Jun 6 16:13:12 2020 +0800 维护广告更新标志 commit 9baef8a8fdf7a16bb93162953352e4f0736741ac Author: wanggb Date: Sat Jun 6 15:41:51 2020 +0800 初始化mobile_system commit 16a643b81e276bde12a4210d4bb96a6d7eca022f Author: zhenglh Date: Sat Jun 6 15:05:59 2020 +0800 消费记录KL过滤 commit e19c3d7d87f19556e778d6bbc1591728b67277c5 Author: xuehuiwen Date: Sat Jun 6 14:42:17 2020 +0800 block ios user commit c74f00d8397a77e1a84476f221b53b8e66f60732 Author: wanggb Date: Sat Jun 6 14:19:05 2020 +0800 广告二期优化，接口返回数据增加属性 commit 8fb9b4756a8cccc3e93a89bd8145f9054266eab9 Author: 李天时 Date: Sat Jun 6 11:42:12 2020 +0800 畅销榜限时目录 commit 37064bbf7b012fcdf3dc106cd9411c583df938b9 Merge: 33b53dbd4 ab24c1c32 Author: wanggb Date: Sat Jun 6 11:07:48 2020 +0800 Merge branch 'dev-reader-optimize-20200602' into dev-260-stage-one-20200527 commit ab24c1c32700dd3b24367b7a2c90e8eaaaf5bede (origin/dev-reader-optimize-20200602) Merge: a29a3207d d843e1896 Author: wanggb Date: Sat Jun 6 11:04:57 2020 +0800 Merge remote-tracking branch 'origin/master' into dev-reader-optimize-20200602 commit 8d86c17d30d087362eff5e7e5faf77b20d880478 Author: wanggb Date: Sat Jun 6 10:56:11 2020 +0800 广告二期优化 commit c2f8e930f406537e21b95b2e9a1a5b042f8fc69b Author: xuehuiwen Date: Sat Jun 6 10:42:22 2020 +0800 block ios user commit a26b2c507bc59b96385824b8b65cb7d41734f3b4 Author: xuehuiwen Date: Sat Jun 6 10:11:13 2020 +0800 block ios user commit 2f3ad92dbaa314f9d1ed159d52604b8ed71aacc2 Author: xuehuiwen Date: Fri Jun 5 21:19:34 2020 +0800 block ios user commit bf25616801d8c1fdd1526d30e4ed386c80b0ccc8 Author: xuehuiwen Date: Fri Jun 5 19:45:23 2020 +0800 block ios user commit 8003e5296d2d9e405666bfeaca951fe2025a3772 Author: zhenglh Date: Fri Jun 5 19:16:58 2020 +0800 书单格式修改 commit 33b53dbd46e98cbd8191d3da85815facf9f51a23 Author: 李天时 Date: Fri Jun 5 16:21:53 2020 +0800 公告增加对标题颜色标红的支持 commit 070fcf2aecb4687f73fe405ac4250ed81b74d695 Author: 李天时 Date: Fri Jun 5 16:15:09 2020 +0800 公告增加对标题颜色标红的支持 commit cb32a27204b7d4cf68eb5803696d104faec6111e Author: zhenglh Date: Fri Jun 5 16:10:53 2020 +0800 api对接 commit 94ea272d35e77f7849e9876f18e032ec29fd4945 Author: 李天时 Date: Fri Jun 5 15:25:23 2020 +0800 公告增加对标题颜色标红的支持 commit 58b654442a0e22a9e23b8e3e5587091918ad5f52 Author: xuehuiwen Date: Fri Jun 5 15:09:38 2020 +0800 block ios user commit 54abff8bda7ece33a3fefed045993f0120309795 Author: 李天时 Date: Fri Jun 5 14:58:13 2020 +0800 小说中心主笔推荐语显示增加到100个字符 commit 50d8309133d864a8a4bc85131ca76b0b03e54731 Author: xuehuiwen Date: Fri Jun 5 14:48:10 2020 +0800 block ios user commit 7f4a53a604b06c9f85929a9d03fe73637ced4c63 Author: zhenglh Date: Fri Jun 5 13:46:12 2020 +0800 api接口变更 commit 58f22bcbc06b8029cb098f9c49a22f0ba4c4e0ea Author: zhenglh Date: Fri Jun 5 13:44:59 2020 +0800 api接口变更 commit e21f18e40f00cead0f6bade102318d77760f114e Author: zhenglh Date: Fri Jun 5 13:43:19 2020 +0800 api接口变更 commit 7c6dfce85c548cc5b6e4f78584e6cafb17f2454e Author: xuehuiwen Date: Fri Jun 5 12:10:51 2020 +0800 block ios user commit 0df026e30dfdfa235b49f43a506c63ddbd382229 Author: zhenglh Date: Fri Jun 5 11:51:45 2020 +0800 api测试 commit 4ec3504dde97414f73894383b4a0f357cabed871 Author: 李天时 Date: Fri Jun 5 11:47:59 2020 +0800 前台分类的免费分类页面增加免费时间段 commit ea3f08a7eefab3c55d5a58c666557522ff4a8399 Author: zhenglh Date: Fri Jun 5 11:46:42 2020 +0800 api迁移时间配置 commit a235e83a97461953cf612078139081ea53e1678d Author: zhenglh Date: Fri Jun 5 11:44:19 2020 +0800 模板消息，客服消息调用接口 commit b6dce7d9beb236350e352d3d8ae032f1449ebca8 Author: xuehuiwen Date: Fri Jun 5 11:41:58 2020 +0800 block ios user commit fad850b4a8801f0aa7b98c5fa14f354c9a7b0e0d Author: zhenglh Date: Wed Jun 3 18:16:53 2020 +0800 客服消息，模板消息数据导入 commit e3bc245a4c15017aba5beb40a45286c9405b8d87 Author: zhenglh Date: Wed Jun 3 13:54:11 2020 +0800 api调试通过 commit 12143638f623899758c0d856f4a02025862539d4 Author: zhenglh Date: Wed May 27 17:44:51 2020 +0800 客服消息新格式 commit 528b71dcb5168c7ff0d3fd22348a7058b4e70a5d Author: 李天时 Date: Fri Jun 5 10:56:08 2020 +0800 书籍编辑页面标签可以为空 commit 916c2e25469e27ea91ffc6dda620ac7564133646 Merge: 860d2acbc d843e1896 Author: 李天时 Date: Fri Jun 5 10:19:06 2020 +0800 Merge branch 'master' into dev-260-stage-one-20200527 commit d843e1896ac62a0a40699250f11e9fd506ebb15b (tag: cps_20200605_103058) Author: zhenglh Date: Fri Jun 5 10:17:27 2020 +0800 头条落地页背景色 commit ef2733f4f78d1ff0af7ac94d1d90275433c27259 Author: xuehuiwen Date: Thu Jun 4 21:07:18 2020 +0800 block ios user commit db4f944fd92ec06abb1aabeccc9b4ec50722353d Author: xuehuiwen Date: Thu Jun 4 20:22:05 2020 +0800 block ios user commit deeed81309087d54cb7d940ae7fd6d4a3cd5e2c9 Author: wanggb Date: Thu Jun 4 20:07:25 2020 +0800 高级群发，用户组，增加属性，手机系统 commit 0b01ddb1c266b1605a1611ffac4fe08b9c82df5a Author: wanggb Date: Thu Jun 4 19:44:19 2020 +0800 增加广告位 commit ccb6d9b66b230bbc65df1a008506b4ee012c9701 (tag: cps_20200604_143530) Author: zhenglh Date: Wed Jun 3 14:25:39 2020 +0800 打点问题处理 commit bf8655a8b066df7b4af905d9ec2f1f730c5f648f Author: zhenglh Date: Fri May 15 20:00:40 2020 +0800 获取书币弹窗修改 commit d96fdbb1077534fae240d4ba3981dfba2e0a8754 Author: zhenglh Date: Fri May 15 19:39:41 2020 +0800 弹窗样式改版 commit 7b5c145e4b4989bd89c1cd1edb43ee18254d5ee9 Author: zhenglh Date: Fri May 15 16:03:27 2020 +0800 导量添加分享打点 commit d728e998a1866041f1345218c04dae2cb07b60d5 Author: zhenglh Date: Fri May 15 16:00:33 2020 +0800 导量添加分享打点 commit 917ed8bb16cea49d35c67216b60eea82059b272f Author: guyuexuan <2651919937@qq.com> Date: Thu May 14 11:59:31 2020 +0800 admin polardb 支持单独配置 hostname commit b0078bcb388976d2d00cf112ca0592bbb9176340 Author: zhenglh Date: Fri May 15 11:15:34 2020 +0800 导量赠币改为每天 commit ab48270bfd5281f95e26f99cec321520615100fa (tag: cps_20200603_141340, origin/dev-vipmenu-opt-20200601) Author: xuehuiwen Date: Wed Jun 3 11:55:55 2020 +0800 wechat menu commit 02d307bc6de436fc1775ec97f3f61ca7be0dd152 Author: xuehuiwen Date: Wed Jun 3 11:32:36 2020 +0800 wechat menu commit a29a3207d6887cbd8a2bf8030a26b2f7e483af90 Author: wanggb Date: Tue Jun 2 19:32:27 2020 +0800 阅读页 浮动弹窗 多主题样式 commit 073ff3f2f81d16f2b4cb94d385d143682646e4db Author: wanggb Date: Tue Jun 2 18:58:46 2020 +0800 阅读页 浮动弹窗 commit fb4c00be5b74b2f85a6125bb3d22ec21e77f0d1d Author: wanggb Date: Tue Jun 2 15:16:46 2020 +0800 阅读页增加开关 commit 7aa38b6293e0ad7445b6055f5c46a260fdc98f45 Author: xuehuiwen Date: Tue Jun 2 14:49:47 2020 +0800 wechat menu opt commit 3375b037ab2711ed640f991770b70a78f76e0218 Author: xuehuiwen Date: Mon Jun 1 19:56:43 2020 +0800 wechat menu opt commit e44b1f08d3609d83e9b7c45226a2a7e344ebdd3b Author: zhenglh Date: Mon Jun 1 14:00:55 2020 +0800 活动定时刷缓存任务去掉资源弹窗开关判断 commit 45b8b400763ca3be097c2a2a20e074522617b6ce (tag: cps_20200531_115112, origin/dev-merge-error-shortlink-20200531) Merge: 04710ed74 b9c7c4dfb Author: 李天时 Date: Sun May 31 10:25:22 2020 +0800 Merge branch 'dev-kuaifen-20200512' into dev-merge-error-shortlink-20200531 commit b9c7c4dfb495de4daf76cc5b2e670d7cd4870290 (origin/dev-kuaifen-20200512) Merge: 17863f4b5 b6a9781e3 Author: 李天时 Date: Sun May 31 10:24:45 2020 +0800 Merge branch 'master' into dev-kuaifen-20200512 commit 04710ed74b0633ad93df606a272b68179c1938ab Author: zhenglihao Date: Sat May 30 15:20:46 2020 +0800 客服消息报错抑制 commit 860d2acbc6213b8ec19fab912c148ae0f41b72ec Author: 李天时 Date: Fri May 29 19:36:17 2020 +0800 热门爽文样式修改 commit 91801b2247f331384bf20b030a459b9db170273d Author: weichenyu Date: Fri May 29 19:28:39 2020 +0800 ajax commit abec15f2748fdf239072b17165419eb0b912f38c Author: weichenyu Date: Fri May 29 18:43:31 2020 +0800 css commit af866569cde21d7d8c36dadd4ac0bc8f20767e10 Merge: 37c092ca7 b6a9781e3 Author: wanggb Date: Fri May 29 17:32:49 2020 +0800 Merge branch 'master' into dev-error-level-down-20200525 # Conflicts: # application/main/service/UserSilentService.php # tests/RedisTest.php commit c2d98f4755abdcc2e7a852679c246b43efa301e5 Author: weichenyu Date: Fri May 29 16:44:29 2020 +0800 css commit e0491c4a16911c108f9046c4ce493946a0d81d16 Author: weichenyu Date: Fri May 29 16:34:51 2020 +0800 css commit 01732924ce87790bf8c7ccc81353fcf64f9e9535 Author: weichenyu Date: Fri May 29 15:29:07 2020 +0800 css commit 43e790991a74fb15fe863bbc8bb008eed17e2c2a Merge: e0cead25a a264004e9 Author: weichenyu Date: Fri May 29 11:42:19 2020 +0800 Merge branch 'dev-260-stage-one-20200527' of http://192.168.0.31/fe/cps into dev-260-stage-one-20200527 commit e0cead25ae75f44d2225c84cc047c78a280244f7 Author: weichenyu Date: Fri May 29 11:41:57 2020 +0800 电击榜 commit a264004e92d69e0d7935e3096d1c3c21615813c9 Merge: 956dcd9b8 e11ad9f50 Author: 李天时 Date: Thu May 28 18:10:31 2020 +0800 Merge remote-tracking branch 'origin/dev-260-stage-one-20200527' into dev-260-stage-one-20200527 # Conflicts: # application/index/controller/Index.php # application/index/view/yg/public/remenshuangwen.html commit 956dcd9b879184c0c1cd8d37939319e55a377bbd Author: 李天时 Date: Thu May 28 18:09:07 2020 +0800 热门爽文样式修改 commit e11ad9f50deaafdc802d1f89c5e2c4f65e7d4f4e Author: 李天时 Date: Thu May 28 14:08:37 2020 +0800 前端列表页面增加标签展示 commit b6a9781e322da4caf84681b0ee6cca2dccea24eb (tag: cps_20200528_190329, tag: cps_20200528_140236) Author: wudongdong Date: Thu May 28 12:26:36 2020 +0800 充值成功-活动推送-bug commit cfaa2f3e8cec4f027452fefa1de32656403d711c (tag: cps_20200528_113744) Author: wanggb Date: Thu May 28 11:35:42 2020 +0800 追更页面，去掉错误的标签 commit 239a9cf19c4f55f331a908bd90f6fa3b5cf21164 (tag: cps_20200528_110944) Author: wudongdong Date: Thu May 28 10:56:32 2020 +0800 消耗活动弹窗bug commit 6f460973afc42709afe043e1c88f99b3bfde68ec Merge: 96fd1b147 0eb0081ea Author: wudongdong Date: Thu May 28 10:17:29 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 96fd1b1476ac4aa60c805ac174e6c6a43ea209e3 Author: wudongdong Date: Thu May 28 10:17:23 2020 +0800 消耗活动-禁止直接修改书币 commit 0eb0081ea0e1d83cbf7adea632177c708be3408b Merge: 9276df2bc 9a8e68e03 Author: wanggb Date: Thu May 28 10:03:44 2020 +0800 Merge remote-tracking branch 'origin/master' commit 9276df2bcab416c7aca248f56e2120870a69068a Author: wanggb Date: Thu May 28 10:03:26 2020 +0800 智齿客服域名被封了，重新配置域名 commit 9a8e68e03fd43a90ed3fc24beb76c2ffbeb2b991 Author: zhenglh Date: Wed May 27 20:37:59 2020 +0800 头条落地页添加跳转开关 commit 5e7e989385a4cb79e0b6915140a0cdf7a243292c (tag: cps_20200527_190405) Author: zhenglh Date: Wed May 27 18:19:33 2020 +0800 头条落地页添加跳转开关 commit ff8dda11ab042f503bb8d1d4c93e0fb91ddd0dcc (origin/dev-ad-20200511) Merge: 538deb79f 6c551be95 Author: 赵学亮 Date: Wed May 27 17:45:44 2020 +0800 Merge branch 'dev-ad-20200511' of 192.168.0.31:fe/cps into dev-ad-20200511 commit 538deb79fd4adcfda762eefff484a8f0c5956a5f Author: 赵学亮 Date: Wed May 27 17:45:35 2020 +0800 优化广告缓存 commit 6c551be950a581b526b00b3ce8101b7b0e7b29fd Author: wanggb Date: Wed May 27 17:35:26 2020 +0800 删除数组中对应值 commit fe7075664b04f7032783e011efcd28f4a2a7038d Author: 李天时 Date: Wed May 27 17:13:40 2020 +0800 前端列表页面增加标签展示 commit bb888d708ffcc72c199b366bd14f9e63db7bde3a Merge: fa8da329e 55382423d Author: 李天时 Date: Wed May 27 15:19:03 2020 +0800 Merge branch 'dev-booktags-20200521' into dev-260-stage-one-20200527 commit aa418b29cdb6ff577e02b990de73f637dd9f69fb Author: wanggb Date: Wed May 27 15:15:42 2020 +0800 优化接口，广告缓存不一致 commit 55382423d2a9b653ae47fbdda31555809f9b327e (origin/dev-booktags-20200521) Merge: 66d490c5a 8181d9bf9 Author: 李天时 Date: Wed May 27 14:50:46 2020 +0800 Merge branch 'master' into dev-booktags-20200521 commit a42aa8a6fb690acb3c530cad975d0cf7326c7b93 Merge: b93762614 3652a26bb Author: wanggb Date: Wed May 27 13:59:27 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-20200511' into dev-ad-20200511 commit b9376261481e8bfc8116659b8c1ee036f55f1414 Merge: 1939b7eb1 68a7e0655 Author: wanggb Date: Wed May 27 13:59:19 2020 +0800 Merge remote-tracking branch 'origin/dev-ad-20200511' into dev-ad-20200511 commit 1939b7eb1be698245f04dfbfe074c6452812845d Author: wanggb Date: Wed May 27 13:59:09 2020 +0800 编辑广告用户组信息时，不需要维护广告计划flag commit 3652a26bb47f4c4896ef11e152575f3660a768ef Merge: cc2ff84a3 68a7e0655 Author: wudongdong Date: Wed May 27 13:59:05 2020 +0800 Merge branch 'dev-ad-20200511' of 192.168.0.31:fe/cps into dev-ad-20200511 commit cc2ff84a3a5985df5e9ac8c8bffdb8cfb02d43a8 Author: wudongdong Date: Wed May 27 13:58:57 2020 +0800 订阅活动免费看书走vip逻辑 commit 68a7e0655b814541357960fc7c86e24b127f5443 Author: 赵学亮 Date: Wed May 27 13:41:33 2020 +0800 打点调整 commit f4ac4b950b292d4167ef40597d91abfb89a009fd Author: wanggb Date: Wed May 27 11:36:33 2020 +0800 编辑广告用户组信息时，维护广告计划flag commit 37c092ca78dfefb619b5c48329c769c607130f3b Author: zhenglh Date: Wed May 27 11:30:09 2020 +0800 取消腾讯短链的生成调用，置空 commit b67f3d65cb49614f1f0d450be62b8c36ecb26d3c Author: wanggb Date: Wed May 27 10:36:13 2020 +0800 修改接口 commit 640a1671e4657993e2a4a6833575854904da6092 Merge: c0ca929cb d04b45d63 Author: zhenglh Date: Wed May 27 10:35:01 2020 +0800 Merge branch 'dev-ad-20200511' of http://192.168.0.31/fe/cps into dev-ad-20200511 commit c0ca929cb7c5f6a8d79edf51d2fa90f153efb364 Author: zhenglh Date: Wed May 27 10:34:45 2020 +0800 vip客服消息群组过滤 commit d04b45d6384cd471060084133f76725500a2fae1 Author: wudongdong Date: Wed May 27 10:33:40 2020 +0800 订阅活动选择vip商品 commit 9e297d6f4979e4253c8ddcaf2e991669bd078d03 Author: 赵学亮 Date: Tue May 26 20:28:31 2020 +0800 修复问题 commit b951b782f3113cb5d1f9d4c60b37a10ba0caa9b8 Author: zhenglh Date: Mon May 25 17:58:36 2020 +0800 错误日志降级 commit 31c00ac8a52c5a43202d76f5e5008f4c9c9664aa Author: 赵学亮 Date: Tue May 26 18:19:57 2020 +0800 去掉log commit 40351b632dc769aaaec5ad8f2fcd0cd2e2347af9 Merge: dd9de8665 48df3bd34 Author: 赵学亮 Date: Tue May 26 18:16:17 2020 +0800 Merge branch 'dev-ad-20200511' of 192.168.0.31:fe/cps into dev-ad-20200511 commit dd9de866568230c74a623d930aa1c94f0de408a1 Author: 赵学亮 Date: Tue May 26 18:16:08 2020 +0800 修复bug commit 48df3bd34a1d563c67ebd437c31e60d673fbebbc Author: zhenglh Date: Tue May 26 17:52:26 2020 +0800 api接口添加推广链接金额统计 commit 17863f4b580fb34f141d0cf4d1985ae3312c335a Author: 李天时 Date: Tue May 26 15:41:07 2020 +0800 书籍简介过滤空格 commit 991f9164e1b0d95ce96cab5ef2932c0c124a0419 Author: wanggb Date: Tue May 26 13:58:38 2020 +0800 广告计划匹配素材，传入参数广告位置Code commit fa8da329ea85bc572aa99ad55792a2bcc72a5329 (origin/dev-260-bookcity-20200520) Author: 李天时 Date: Tue May 26 13:55:52 2020 +0800 排行榜ui优化 commit 49b7361ed6f72bc42686a9de1bbe3919b2eb11ff Author: wanggb Date: Tue May 26 11:39:08 2020 +0800 指定Redis实例地址 commit e18abf3c862c8fdd7f9d51027cb056f445510557 Merge: 15d2f7e27 8181d9bf9 Author: 李天时 Date: Tue May 26 10:59:41 2020 +0800 Merge branch 'master' into dev-260-bookcity-20200520 commit 82c8ee1b55d8c2b331a6bf6ac5edff54e2145102 Merge: 33218df32 8181d9bf9 Author: 李天时 Date: Tue May 26 10:58:54 2020 +0800 Merge branch 'master' into dev-kuaifen-20200512 commit 33218df329dc04e91460f30022399071e50ac382 Author: 李天时 Date: Tue May 26 10:51:21 2020 +0800 增加点击分享按钮后的js日志 commit 15d2f7e2727f568dc1b8ba8beab63be64dbe02fc Author: 李天时 Date: Tue May 26 10:42:18 2020 +0800 排行榜ui优化 commit a6d900e2217b4d0dd00af63767ec8fd4a3043be4 Author: wudongdong Date: Tue May 26 10:15:18 2020 +0800 消耗活动+订阅活动优化 commit 5f70606b9a2f2e15e84724b51c72da415ad6cd32 Author: wanggb Date: Mon May 25 20:44:11 2020 +0800 图片路径是相对路径时，替换成cdnurl域名 commit 285f532d3f38a1d81e59fe5aacbc910d857984b6 Merge: 5705b5348 8181d9bf9 Author: wanggb Date: Mon May 25 19:58:46 2020 +0800 Merge branch 'master' into dev-ad-20200511 commit 5705b5348f22850ba5fbdbf6f5a25f03468ca206 Author: 赵学亮 Date: Mon May 25 19:56:57 2020 +0800 cps广告系统第二版 commit 227d6f7f23585031c617ea8cba496e5f2dd5f22c Author: 李天时 Date: Mon May 25 19:38:55 2020 +0800 榜单ui优化 commit 7b919d475745b694fd4c9b59b1eb97a65e3ff219 Author: 李天时 Date: Mon May 25 18:19:01 2020 +0800 初始化快分后台页面 commit b9d229606f4802c08f9f18af711106184b716aa5 Author: weichenyu Date: Mon May 25 18:14:56 2020 +0800 书城，二级页 commit c724c05ed0c7cb57edbc0722af3efe2dd7903cf7 Author: wanggb Date: Mon May 25 18:04:18 2020 +0800 Redis 管道连接Redis commit 8f0af952f0fd9697c757f88de68cb2a785093f24 Author: wanggb Date: Mon May 25 16:42:08 2020 +0800 静默授权，用户UID不存在时，输出日志做降级处理 commit eba0b940764d133958ccc0f10628a9545835da23 Author: wanggb Date: Mon May 25 16:16:21 2020 +0800 优化管理后台操作界面 commit 8181d9bf9bec61317ed2204230c342006513cdb1 (tag: cps_20200525_143619) Merge: 844df943a 8b9fc003e Author: wudongdong Date: Mon May 25 13:39:20 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 844df943aae774154d2bfb3892f195e1ffbca400 Author: wudongdong Date: Mon May 25 13:38:44 2020 +0800 高级群发小程序码-跳转其他页面 commit 8b9fc003ec22ccb2a4174c17ca5a4d570fd0fa51 Author: zhenglh Date: Mon May 25 13:33:02 2020 +0800 推广链接接口开放 commit e6fd6b3a0df8c23ef055d17fe7a00af3be2aac39 Author: zhenglh Date: Mon May 25 12:33:35 2020 +0800 模板消息ext格式错误 commit 48b3f9f9f26b4e43ea66e727c9a3d396b5cc3368 (tag: cps_20200525_115634, origin/dev-send-mini-20200515) Author: wudongdong Date: Mon May 25 11:54:01 2020 +0800 去掉空格 commit 7700752c1b03bb921ca0f8f193b6fddf764ad3c3 (tag: cps_20200525_104703) Author: wudongdong Date: Mon May 25 10:39:05 2020 +0800 订阅活动选择vip商品-跟下个版本 commit ca7eb96e85c341573e739632e32e2485e861ce3a Author: wudongdong Date: Sun May 24 00:13:37 2020 +0800 订阅活动改成vip商品+高级群发优化 commit 7ffdde2daf1fe776ca8153d428b147515a3a9ebd Author: wanggb Date: Sat May 23 17:07:44 2020 +0800 优化管理后台操作界面 commit c5e4ac425ade494c4dd05780e21402a2176f664e Author: wanggb Date: Sat May 23 17:00:11 2020 +0800 优化管理后台操作界面 commit 2f29c250eefe3615bc5bbed8a938f708bafc036f Author: wudongdong Date: Sat May 23 16:47:40 2020 +0800 ueditor commit b6c6180908c37a9bd4dbf4b8d29a8150a7ab6d55 Author: wanggb Date: Sat May 23 16:42:32 2020 +0800 优化管理后台操作界面 commit e275295c54c5a4be37a727f1b6d93419f24ac385 Author: wanggb Date: Sat May 23 16:17:15 2020 +0800 注释掉废弃的代码 commit c960111957cdb11a66684ee07c112a45ff475e54 Author: wanggb Date: Sat May 23 16:07:50 2020 +0800 完善接口逻辑 commit 25c7bc02b4e1bbc84db3b531a8b8aa5f1c97d5fc (tag: cps_20200523_164616) Merge: e50ddf75f 7e883f5a4 Author: wudongdong Date: Sat May 23 16:00:29 2020 +0800 Merge branch 'master' into dev-send-mini-20200515 commit e50ddf75f16ed1108758ef76a4589f86aca0ce45 Author: wudongdong Date: Sat May 23 15:57:01 2020 +0800 高级群发限制字数 commit 3f2314bbe0c34486cc46238b8600c30fa810d4c6 Author: wanggb Date: Sat May 23 15:49:47 2020 +0800 完善接口逻辑 commit 94fa63d3e7d06651e8822e16f68eb68a0ebadd8c Author: wudongdong Date: Sat May 23 14:19:36 2020 +0800 高级群发-无连接 commit 86026bf0223b8be6846dd6359a845f3e5abfd6f2 Author: wudongdong Date: Sat May 23 10:12:30 2020 +0800 高级群发-小程序-bug commit 128b4cf0abc33d3d4f25f022f5d65981122d1b02 Author: wanggb Date: Fri May 22 18:22:06 2020 +0800 完善接口 commit a68bc5c6de3619e8956473672af8b7d1f1d5230c Author: wudongdong Date: Fri May 22 16:58:41 2020 +0800 高级群发-bug commit f57796e142c141e0f103dcba8cf57ae482770387 Author: wanggb Date: Fri May 22 16:27:49 2020 +0800 去掉上一版由PHP向页面下发广告数据 commit 7e883f5a4d57a60c0892e403a1ef2dcdc5f1d1dd Author: zhenglh Date: Fri May 22 16:25:09 2020 +0800 导量无法获取书币bug处理 commit 7ba555a8236d93fdb6cca7e5bbe602c38ef155ed Author: wanggb Date: Fri May 22 16:22:12 2020 +0800 增加接口，维护广告计划数据 commit 66d490c5a8ebe120d398f99f4089e9aa03779a7a Author: 李天时 Date: Fri May 22 16:15:05 2020 +0800 增加书籍标签同步 commit b56ed162c8b384e3bbb832a651d43d13d0795dad (tag: cps_20200522_134521) Author: xuehuiwen Date: Fri May 22 12:36:22 2020 +0800 exclusive opt commit 83579438756445caa5f4384039edb8af3c29fc78 Author: xuehuiwen Date: Fri May 22 12:26:21 2020 +0800 exclusive opt commit 77569ca83a308047b686df0274304c579a975fb0 Author: wanggb Date: Thu May 21 20:48:07 2020 +0800 修改广告计划表单 commit b5fd1f0f142476b76092e44028ba3c477e47b6ed Author: wudongdong Date: Thu May 21 20:24:46 2020 +0800 高级群发-小程序优化 commit b9c8def9d69f2fc1c64605b8f660200ba3384f90 Author: wanggb Date: Thu May 21 19:41:37 2020 +0800 添加素材表单变更，取消ad_type,增加展示位置 commit 684d650e3f1953e35df5177ba7989bdb47fe80f0 (tag: cps_20200522_103608, origin/master_20200520) Author: zhenglh Date: Thu May 21 16:58:36 2020 +0800 独家书籍优化 commit 1eb173dd451e9c6978f16fde4ce76f6b64fc2952 Author: 李天时 Date: Thu May 21 16:45:21 2020 +0800 增加书籍标签同步 commit be80f1b7577c66db72e31aae4cd6098860d6f703 Author: xuehuiwen Date: Thu May 21 16:19:21 2020 +0800 exclusive commit 878db2aa3d4b6cd33dc8a605d5c89c35039c4706 Author: wanggb Date: Thu May 21 16:12:16 2020 +0800 增加接口文档 commit cec4029faa560fcaa306bc471d24a10613ca83ae Author: wudongdong Date: Thu May 21 16:11:43 2020 +0800 高级群发-小程序 commit 8a0506911218c1264635ef5aa71cc2f34b77bcf5 Author: xuehuiwen Date: Thu May 21 16:07:33 2020 +0800 exclusive commit 8ca5c3920226d4c99b6dbf197e06b95136b8d69a Author: xuehuiwen Date: Thu May 21 15:44:19 2020 +0800 exclusive commit 7bfe8d2d93db981259df0fcea9ad347091055864 Merge: 0db6e8fb5 5bd0271d6 Author: zhenglh Date: Thu May 21 15:23:18 2020 +0800 Merge remote-tracking branch 'origin/master_20200520' into master_20200520 commit 0db6e8fb59011e9990e5dd567315ba04af981f79 Author: zhenglh Date: Thu May 21 15:23:07 2020 +0800 关键字回复处理 commit 5bd0271d6c70b0c0f613993e1233b8f1eaa0281f Author: xuehuiwen Date: Thu May 21 15:23:00 2020 +0800 exclusive commit d52d0f6460a13d490892a06fe5367d3baee3f305 Author: xuehuiwen Date: Thu May 21 14:52:52 2020 +0800 exclusive commit a3ed91af35bfc9ecd96a38da4847b14bee1427d9 Author: xuehuiwen Date: Thu May 21 14:42:56 2020 +0800 exclusive commit f02915e1b28db728422dea0e2c1d4800324cb932 Author: 李天时 Date: Thu May 21 13:58:08 2020 +0800 添加百度统计 commit f38332fe42bef57302d0a99b9cc72f8cc0bdd9c5 Author: wanggb Date: Thu May 21 11:52:57 2020 +0800 更改Tabbar钱包图标 commit 7fcc7a0bdb2f257f188e70533466d3fea73c9fd3 Author: wanggb Date: Thu May 21 11:41:29 2020 +0800 获取广告素材时，增加channel_id参数 commit a7b012b78904480ab5122eb2dec5272a58d4f6ac Author: 李天时 Date: Thu May 21 11:06:19 2020 +0800 排行榜显示头部导航 commit 76c7a9d9c3ec30a103863a578e8e675f41596534 Author: wudongdong Date: Thu May 21 10:35:01 2020 +0800 高级群发支持小程序-优化 commit e8ede85641f86bd9cb0a350c9729a4b7cd3aee21 Author: wudongdong Date: Thu May 21 00:51:06 2020 +0800 小程序卡片生成 commit b247d0647e52043990f42a2b09a3f7eadd28dea7 Author: wanggb Date: Wed May 20 22:04:52 2020 +0800 AD前端判断走缓存 commit 7f29d36cedba782c8fd7665395d61cfe8e2a0c26 Author: wanggb Date: Wed May 20 20:39:39 2020 +0800 命令行维护广告缓存 commit 617efe50df0c017eb48d87b1779f19431bff8322 Merge: a30c7b5ed b4333c134 Author: 赵学亮 Date: Wed May 20 20:28:53 2020 +0800 Merge branch 'dev-ad-20200511' of 192.168.0.31:fe/cps into dev-ad-20200511 commit a30c7b5ed055cec9abfab3960e38e9f92e7e30bf Author: 赵学亮 Date: Wed May 20 20:28:39 2020 +0800 增加广告功能 commit b4333c13425eb1099422bbbebe7b743bbde19c40 Author: wanggb Date: Wed May 20 19:47:44 2020 +0800 管理数据时，维护缓存 commit 6d90b9649c33e1202c97a54f551455a73f35c962 (tag: cps_20200521_120607, tag: cps_20200520_193838) Author: xuehuiwen Date: Wed May 20 19:35:00 2020 +0800 exclusive commit dda15836a839d9b1c67f82d96a03a852c3117d2b Author: xuehuiwen Date: Wed May 20 19:29:23 2020 +0800 exclusive commit ba75d6965aede71ad639422b2078257dcdaedc29 Author: 李天时 Date: Wed May 20 19:01:06 2020 +0800 接口验证签名 commit 7b38fa84c9f9c158ac3900150f1ee73b05b4c726 Author: wanggb Date: Wed May 20 18:02:24 2020 +0800 下发广告数据到前台 commit a140e8ae266bc2f2a5f55325c2dc36a6ed9da6d6 Author: 李天时 Date: Wed May 20 18:01:03 2020 +0800 接口验证签名 commit 0d9d0d8b35994d19cf99fdf46be267bfcfce6086 Author: 李天时 Date: Wed May 20 17:53:38 2020 +0800 接口验证签名 commit 9116e1621952fbfb5e407714916509a8e44a7ff3 Author: wudongdong Date: Wed May 20 17:19:08 2020 +0800 图片消息添加多个小程序 commit 796390e27b6c2a287ea8aca0f07e60cd22c4e92d Author: wanggb Date: Wed May 20 16:37:10 2020 +0800 下发广告数据到前台 commit 919391d49ca206f5f526335747db4d549a29bb85 Author: wanggb Date: Wed May 20 16:30:12 2020 +0800 下发广告数据到前台 commit c59623dc7b66b7b53f71e05228f2dfd3f85835a3 (tag: cps_20200520_155111) Author: xuehuiwen Date: Wed May 20 14:43:13 2020 +0800 exclusive commit 71b264a0d527de8e7d414c36f45d5a046a6723c9 Merge: 3c956b0e0 4151fd9b1 Author: xuehuiwen Date: Wed May 20 14:30:48 2020 +0800 Merge branch 'dev-exclusive-book-20200513' into master_20200520 commit 4151fd9b190d72e78500b1dd7fae75a164871603 (origin/dev-exclusive-book-20200513) Author: xuehuiwen Date: Wed May 20 14:14:24 2020 +0800 exclusive commit 225b3ae665620c45a00c3c3726e2fe31f3855d46 Author: 李天时 Date: Wed May 20 13:59:25 2020 +0800 接口验证签名 commit 585a50c8ef3d83e8ace4ac3fcc65400826f28a9b Author: xuehuiwen Date: Wed May 20 13:34:51 2020 +0800 exclusive commit ab172c8684639e57a70d772e9f6d4f1dc6361b44 Author: xuehuiwen Date: Tue May 19 17:54:36 2020 +0800 exclusive commit b1b6d0459a1644b7f6f193986d930b9651fa286c Author: 李天时 Date: Tue May 19 17:39:05 2020 +0800 接口验证签名 commit 5138a89ea67592d60edb9d6f46796a29aecc47ca Author: 李天时 Date: Tue May 19 17:29:26 2020 +0800 接口验证签名 commit 14082f693bf8d081983489fa9baf5cf8233f7b28 Author: 李天时 Date: Tue May 19 16:59:21 2020 +0800 接口验证签名 commit d061e7e5b37f41a81e15bd51ae1b74be723c7c5d Author: wudongdong Date: Tue May 19 15:37:10 2020 +0800 '高级群发-发送小程序' commit 5dcd40fbf0de588ec8bdbf2a69d59822f7145fe6 Author: wanggb Date: Tue May 19 14:32:15 2020 +0800 完善前台展示数据 commit c22e2ea2cf9371199e7ee830d0688d81751b8c6e Merge: d061c05bd 3c956b0e0 Author: 李天时 Date: Tue May 19 10:43:40 2020 +0800 Merge branch 'master' into dev-kuaifen-20200512 commit d061c05bd12abb826e5189744e60f5336f4cc822 Author: 李天时 Date: Mon May 18 19:28:00 2020 +0800 快分页面 commit 04acd57c4b7b36864e32376de426f291171c452f Author: 李天时 Date: Mon May 18 18:28:28 2020 +0800 快分页面 commit 3c956b0e022554403b354b919269d3fb6e24219c (tag: cps_20200518_195104, tag: cps_20200518_192514, tag: cps_20200518_173837) Author: 李天时 Date: Mon May 18 17:23:10 2020 +0800 米花支付修改API域名 commit 8bf128e40fe7b05f6b2c419454ba0397463e76c4 Author: zhenglh Date: Mon May 18 16:43:28 2020 +0800 头条，uc落地页书籍必填项 commit 6fb37cef39781150e4aa87665519d7be41571d19 Author: zhenglh Date: Mon May 18 16:29:18 2020 +0800 头条，uc落地页书籍必填项 commit 7da19ed1fb4178be2f07483ff68f2b3ae42fa6e4 Author: 李天时 Date: Mon May 18 15:22:48 2020 +0800 快分页面 commit 45410b6a04495170c43b1decfc4983c67a48eb2d Author: 李天时 Date: Mon May 18 15:09:57 2020 +0800 快分页面 commit 95a7a3085bce1ada30db14f8b5a4d1c033a4fe9f Author: 李天时 Date: Mon May 18 14:47:20 2020 +0800 快分页面 commit 27675039f935feb2648240153511a9ce940609a2 Author: 李天时 Date: Mon May 18 11:30:44 2020 +0800 快分页面 commit 1c2753e7defa65f60f08f501fdeee178d14ee4c8 Author: 李天时 Date: Mon May 18 10:43:49 2020 +0800 快分页面 commit 4950de155bf8ca3398f2538e01232adc3ac99d50 Author: 李天时 Date: Mon May 18 10:42:11 2020 +0800 快分页面 commit 0970b8adf3eb529f586960f4094d9fb050ed0337 Author: wanggb Date: Fri May 15 18:22:47 2020 +0800 修改用户组时，维护flag commit 43148b31eabd88c79089228c69ee1b00279a1a95 Merge: a23aeb147 1119b0912 Author: xuehuiwen Date: Fri May 15 17:30:58 2020 +0800 Merge branch 'master' into dev-exclusive-book-20200513 commit a23aeb1473fba15be5f27cef03897d3af7e97906 Author: xuehuiwen Date: Fri May 15 17:30:16 2020 +0800 exclusive commit e63dac00907b294a62ecf06d7a56d20d064b5392 Merge: 5b8c326d0 1119b0912 Author: 李天时 Date: Fri May 15 15:34:41 2020 +0800 Merge branch 'master' into dev-kuaifen-20200512 # Conflicts: # application/api/controller/Recharge.php # application/index/controller/Book.php commit 5b8c326d03d4d09a288dbf6249f462ecbeee9ae6 Author: 李天时 Date: Fri May 15 15:32:15 2020 +0800 快分页面 commit b5aac4b67e10862b685d804ff0fac1e619238b19 Author: xuehuiwen Date: Fri May 15 12:06:31 2020 +0800 exclusive commit 221ae2ea45dc0e9d391ef0e06542fc10df72a72f Author: xuehuiwen Date: Fri May 15 11:38:08 2020 +0800 exclusive commit 060c9ea4d7bdb267075eaa92ddd163d539e0bc2a Author: 李天时 Date: Fri May 15 11:12:01 2020 +0800 快分页面 commit 1119b0912101caa9a26c154e5e43457dd935db5b (tag: cps_20200515_133437, origin/dev-migrate-analysis-20200506) Author: zhenglh Date: Thu May 14 18:37:08 2020 +0800 排行，书籍详情页重复打点问题处理 commit 0f4053772c04f71e4971008e89c229c81c16f563 Author: zhenglh Date: Thu May 14 18:16:26 2020 +0800 多次打点bug修复 commit 727ca10d52896114ebff1bc217a9afea561ae918 Author: zhenglh Date: Thu May 14 15:42:28 2020 +0800 高级群发数据统计分析 commit dc27d9ed9a8f083720349216b2bb5da29d9be05e Author: zhenglh Date: Wed May 13 19:33:20 2020 +0800 首充打点 commit f49fcf64105576c70a6c772f2c663d05585aca75 Author: zhenglh Date: Wed May 13 10:40:13 2020 +0800 新用户定义为当天用户 commit b2bb5546a8bf61f7d23c5e08138174e602297708 Author: zhenglh Date: Tue May 12 15:31:56 2020 +0800 kafka高级消费测试 commit 024e1b68f132d312b27c8fbbcd2fdfb3930a655d Author: zhenglh Date: Thu May 7 18:41:58 2020 +0800 新用户数据格式改为int commit 0282be68b80db7ea36414d18616201263dac7b6e Author: zhenglh Date: Thu May 7 18:12:51 2020 +0800 pushidx commit a9b8e5c4addc88fb70e2c85cdea980b75b587a40 Author: zhenglh Date: Thu May 7 15:51:12 2020 +0800 性别打点处理 commit 4c914d9374490d8c7a402db5a98872fc005d4800 Author: zhenglh Date: Thu May 7 15:29:48 2020 +0800 性别打点处理 commit 76ffbbbb546333f3c91426fe1df4eeff479aa982 Author: zhenglh Date: Thu May 7 15:11:39 2020 +0800 性别打点处理 commit 2c7a2c54c6451a419d15a9ff82e07c3f328d72ab Author: zhenglh Date: Thu May 7 14:11:51 2020 +0800 打点更新测试 commit 7c175f02ce79b13ff1511246e4f566022ce4ccb0 Author: zhenglh Date: Wed May 6 18:44:55 2020 +0800 线上bug处理 commit b2021221d3941f5d25a788ca4998558255a5d216 Author: zhenglh Date: Wed May 6 15:03:04 2020 +0800 kafka生产消费测试 commit af976ae609f416cf7ed90621e5cc6830a05de243 (tag: cps_20200514_181508, tag: cps_20200514_174711) Author: wudongdong Date: Thu May 14 17:42:13 2020 +0800 订阅活动-不能创建当前时间 commit bb6e6485289d421cb353ee2c19f6f071647abbe5 Author: 李天时 Date: Thu May 14 17:39:36 2020 +0800 快分页面 commit 9befd757af8db9d5903adcc8c427ed90694d4734 Author: wanggb Date: Thu May 14 17:04:05 2020 +0800 广告管理-完善表单提交 commit 1f0c8e9cddb3a83d62036a6fe69749c9d56a7ee4 (tag: cps_20200514_163531) Merge: 4f5aa7ad3 6409a9a65 Author: wudongdong Date: Thu May 14 14:48:19 2020 +0800 Merge branch 'dev-subscrip-20200319' commit 6409a9a65feef7e0681f3b127cc0a0b848818883 (origin/dev-subscrip-20200319) Author: wudongdong Date: Thu May 14 14:47:28 2020 +0800 推广链接-key-RI:N: commit 780fa53798f6ec523f005d042e2ef2f994d54fb8 Author: wanggb Date: Thu May 14 14:31:18 2020 +0800 广告管理-用户组管理-关联用户组 commit 4f5aa7ad30ab2d2ed10a0d31f3c08e6d1f0ccd53 (tag: cps_20200514_121533) Merge: e0836380f 2b5fc20cd Author: wudongdong Date: Thu May 14 11:29:44 2020 +0800 Merge branch 'dev-subscrip-20200319' commit 2b5fc20cd873f2ba2b1b7f45e6a41f22493fdfba Merge: 1c69972ee 84a87f623 Author: wudongdong Date: Thu May 14 11:28:41 2020 +0800 Merge branch 'master' into dev-subscrip-20200319 commit 1c69972ee29efb5d57388b24d7571c4db6f40a98 Merge: 313991493 55dd1b1ce Author: wudongdong Date: Thu May 14 11:28:12 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 commit 3139914934ed64a921b477d6095b523d1f7090fc Author: wudongdong Date: Thu May 14 11:27:58 2020 +0800 订阅活动-用户中心增加占位 commit 55729ca89beefc97de71d5c2c52c1c9b82d6ea4d Author: 李天时 Date: Wed May 13 18:57:31 2020 +0800 快分页面 commit e0836380f15d318538218521bb32f191e6653c4d Merge: 84a87f623 55dd1b1ce Author: zhenglh Date: Wed May 13 18:52:09 2020 +0800 Merge branch 'dev-subscrip-20200319' commit 55dd1b1ce72ea07370ea85e686ef86a41592d06b Author: zhenglh Date: Wed May 13 18:47:11 2020 +0800 章节留存查询逻辑修改 commit bf58cdbcc28672c5c997b4463f09cefe7210268b Author: wanggb Date: Wed May 13 17:56:37 2020 +0800 广告管理-用户组管理 commit cbf36af89688c00dbc35fb5b5a6a4039d3be4004 Author: wanggb Date: Wed May 13 17:49:08 2020 +0800 广告管理-用户组管理 commit 84a87f623eb647ce2f58c99e72d1d5750d9f4046 (tag: cps_20200513_174844) Author: wudongdong Date: Wed May 13 17:09:58 2020 +0800 渠道接口 commit bbe3c1dc35832eed7451fd1b5e1e04c594b01516 Merge: c0b35bfd0 198d99484 Author: wudongdong Date: Wed May 13 16:49:32 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 commit 198d99484e07e6169a5086cf226e3875b3e9bdad Merge: ee6dea149 1e9463032 Author: zhenglh Date: Wed May 13 16:47:19 2020 +0800 Merge branch 'dev-subscrip-20200319' of http://192.168.0.31/fe/cps into dev-subscrip-20200319 commit ee6dea1492f4ce146bd9ce33042ca3277de60063 Author: zhenglh Date: Wed May 13 16:47:09 2020 +0800 vip去掉uv留存统计 commit c0b35bfd05fd0d7b53ab6f1ba3c1a79e62d3c4fd Merge: 1e9463032 918803466 Author: wudongdong Date: Wed May 13 16:34:32 2020 +0800 Merge branch 'master' into dev-subscrip-20200319 # Conflicts: # application/index/controller/Book.php commit 1e94630322340125f26a8b1d20d22eac237d10c2 Merge: b973dd41b 22f33e8e8 Author: wudongdong Date: Wed May 13 16:28:03 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 commit b973dd41b50ff488dd72d7550da6788f29630e49 Author: wudongdong Date: Wed May 13 16:27:51 2020 +0800 弹窗位置必填 commit 22f33e8e879633337f5939eeb68aa6e941057417 Author: zhenglh Date: Wed May 13 15:57:50 2020 +0800 vip用户充值分析，时间控件过滤 commit 956cbf845aac0f2db719379cc876fc78d550cfc3 Merge: a32430b90 8968a9fc2 Author: zhenglh Date: Wed May 13 15:52:45 2020 +0800 Merge branch 'dev-subscrip-20200319' of http://192.168.0.31/fe/cps into dev-subscrip-20200319 commit a32430b9037210449d2d9a2ba284f7a4edf8a39d Author: zhenglh Date: Wed May 13 15:52:38 2020 +0800 充值统计限制30天 commit 8968a9fc2136244977dd6cda9f3fd63fa870a424 Merge: 08881d1b7 5710ab7d8 Author: wudongdong Date: Wed May 13 14:34:56 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 commit 08881d1b75bf142be064babe0e0e0124ce2ea767 Author: wudongdong Date: Wed May 13 14:34:46 2020 +0800 订阅活动弹窗必填+补卡 commit 5710ab7d88b8be6870f09f6bcbe979fbbab3125a Author: zhenglh Date: Wed May 13 14:20:43 2020 +0800 渠道明细，回本率格式 commit 577cafd8285e6199446287bed098ab4e40971172 Author: xuehw Date: Wed May 13 13:42:31 2020 +0800 exclusive commit 91880346681183a2810853d6834b617f9ddd266d (tag: cps_20200513_135114) Author: wanggb Date: Wed May 13 13:41:55 2020 +0800 nginx 打点，主题为空时，设置 'xg' commit 17442f9f61e1fc16a3a9a68a6ed7bd770eba7cb0 Merge: cb8971fba de2a21761 Author: zhenglh Date: Wed May 13 12:09:38 2020 +0800 Merge branch 'dev-subscrip-20200319' of http://192.168.0.31/fe/cps into dev-subscrip-20200319 commit cb8971fba68c9274e676bd1c81a622003613d5a0 Author: zhenglh Date: Wed May 13 12:09:27 2020 +0800 留存百分比*100% commit 78591f6a56e44746feaf6b897d0c9e0e85802846 (tag: cps_20200513_103628) Author: wudongdong Date: Wed May 13 10:15:19 2020 +0800 渠道订单接口增加用户 关注时间+openid commit de2a2176167e62dfdcb3a54aa1aeb383b0b92cf2 Author: wudongdong Date: Tue May 12 18:53:25 2020 +0800 渠道订单接口增加字段 commit 8f2d660b7bda58cb942ba3d44aae34bd461a3991 Author: wudongdong Date: Tue May 12 16:32:21 2020 +0800 订阅活动-打卡日志优化 commit 4348d3f2aaa4915d7b9b5707fe56091cea4d46d7 Author: zhenglh Date: Tue May 12 11:57:53 2020 +0800 vip订单导出取消关联 commit 4e39be0409543f43fe034a0968fdae1d6fdca223 Author: wanggb Date: Tue May 12 10:42:36 2020 +0800 创建广告系统初始文件 v3 commit 6d41230c72766a888d9b3fea4b6a6b9e753a1f96 Author: wanggb Date: Tue May 12 02:51:44 2020 +0800 Orders 链接到Polardb commit bc3fb56ad3a7f6344927d5b3ba6b6468135ab1e2 Author: wanggb Date: Tue May 12 02:38:18 2020 +0800 创建广告系统初始文件 v3 commit ddefe65f1bbd865ab09241f0a88a2db0a5b90b6a Author: wanggb Date: Mon May 11 22:15:21 2020 +0800 创建广告系统初始文件 v2 commit c72e26a87d9574723e1d578e1abfd7184785404a Author: wanggb Date: Mon May 11 20:56:20 2020 +0800 创建广告系统初始文件 commit 6a1ae4818cd7aa52eba0214448e05f8aa4a7eb37 Merge: 9aa5fdf57 6f7c59aa7 Author: wudongdong Date: Mon May 11 19:43:33 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 commit 9aa5fdf57ec7a728be06c7f9cd37c58f67d98e29 Author: wudongdong Date: Mon May 11 19:43:24 2020 +0800 订阅活动-完成 commit 6f7c59aa711fdec556b3ef16bc36cc763fbea2c4 Merge: 971faac74 86fe2177b Author: zhenglh Date: Mon May 11 18:33:21 2020 +0800 Merge branch 'dev-subscrip-20200319' of http://192.168.0.31/fe/cps into dev-subscrip-20200319 commit 971faac74fb908dec50a02683e90b5a3b9b0c12f Author: zhenglh Date: Mon May 11 18:33:11 2020 +0800 新增用户充值分析 commit 86fe2177b94fb53b1bd7d0e3195f7cf2d58bae8e Author: wudongdong Date: Mon May 11 10:22:33 2020 +0800 订阅活动bug commit 0f8d35df9705f532277e51a3f14d0c56b32c830f (tag: cps_20200509_163556) Author: wanggb Date: Sat May 9 14:03:00 2020 +0800 不展示 pf 块 commit 3e65dc4168e017e7f5a8f76cb2ed52d0a22bd03a (tag: cps_20200509_112403) Author: wanggb Date: Sat May 9 10:22:03 2020 +0800 取消测试日志 commit 659ed03c8325e1a8d06620be229ea1e648c408db Merge: 997d7268d 4d93a27f3 Author: wanggb Date: Sat May 9 10:15:51 2020 +0800 Merge branch 'dev-cprebase-userdot-20200506' commit 4d93a27f3c4503679a78d24d30388635711028f5 (origin/dev-cprebase-userdot-20200506) Author: wanggb Date: Fri May 8 18:47:27 2020 +0800 首页不展示'非VIP收费书籍' commit 9fad3dc454a89800a61732f6e4677bc856d46dc2 Author: wanggb Date: Fri May 8 11:46:05 2020 +0800 同步签到页面样式 commit 99eea45a3b15ef8e984f3821a5961cf35bb6cfc8 Author: wanggb Date: Fri May 8 11:31:04 2020 +0800 同步签到页面样式 commit e52461b1d69d6cbcb2a4e62c8e0847d3461c4306 Author: wanggb Date: Fri May 8 10:55:35 2020 +0800 充值成功后，更新完用户vipendtime后再进行打点 commit 6cb81025cc6181be7719273d56dd4ab57b7fec40 Author: wanggb Date: Thu May 7 19:43:07 2020 +0800 个人中心消耗书币，维护IP打点信息 commit 978a794d57fbaef413f6b1fbaa780badee3990ef Author: wanggb Date: Thu May 7 18:39:23 2020 +0800 过滤已添加到CP库中的书籍 commit f1d9a24b81cea76708593f06c613b1af95d71705 Author: zhenglh Date: Thu May 7 18:14:07 2020 +0800 权重排序bug修复 commit 169a69b8fcb1fba86d095f1d194f6f7b5f069c24 Author: wanggb Date: Thu May 7 17:50:44 2020 +0800 消耗活动打点 commit 6b174c52540b05bc7d611c30cf960fa7ca950daa Author: xuehuiwen Date: Thu May 7 17:35:42 2020 +0800 vip menu commit 287313c9460e0401c971a74f73d2c0bf164af1bc Author: xuehuiwen Date: Thu May 7 17:05:48 2020 +0800 vip menu commit f735459fd088cf6541010834fa988944dd5530c2 Author: zhenglh Date: Thu May 7 15:52:20 2020 +0800 vip订单创建时间 commit 0df8f5d4c6b03d3feb5612b9f642b6657fdff833 Author: wanggb Date: Thu May 7 14:15:54 2020 +0800 cp-vip-manage 修改非VIP书籍标记展示逻辑 commit c883c83b8cf62dd5a7471920ddf22bd2f091f956 Author: zhenglh Date: Thu May 7 12:07:02 2020 +0800 订单明细中注册时间为时间戳 commit d35fa4e9166eb7b40060deb7f28c72efe60f3843 Author: wanggb Date: Thu May 7 11:47:00 2020 +0800 cp-vip-manage 修改非VIP书籍标记展示逻辑 commit ff70d896532ac544ef81e819c6716f54f4db6ec2 Author: wanggb Date: Thu May 7 11:22:28 2020 +0800 cp-vip-manage 增加书籍名称,检索 commit 77172bdf5dead610dea0bf9b62a46d7bc2b38198 Author: fermi Date: Wed May 6 19:11:49 2020 +0800 签到修改为连续签到 commit 179eded94f19673266106d417bf08f18243cfe16 Author: wanggb Date: Wed May 6 18:51:53 2020 +0800 cp-vip-manage 增加书籍名称 commit 525408dc35127fa94291c59b2c503f83b64859ea Author: zhenglh Date: Wed May 6 17:11:16 2020 +0800 延迟客服消息的兼容bug commit 77753e8e4a2ca13d4613866d78c06996b1c2a127 Author: zhenglh Date: Wed May 6 16:42:01 2020 +0800 签到分享有问题，可以设置回复为空 commit d74952d150de924e44dabfc6e12674d874ea936a Author: xuehuiwen Date: Wed May 6 16:23:09 2020 +0800 vim menu opt commit 95e448d444bea20101917e373f37740a2ff2185f Author: wanggb Date: Wed May 6 14:21:12 2020 +0800 修改获取用户ID commit 0f09a02cf49826ef9199dee583732964c86719d6 Author: wanggb Date: Wed Apr 29 16:16:31 2020 +0800 修改打点数据 commit 32fcb5a0a26289d94d0dd2d58076f968751ce3f2 Author: wanggb Date: Wed Apr 29 15:46:32 2020 +0800 修改请求方式为POST commit d343f2d9c977115626023c87e48f362c584e28e2 Author: wanggb Date: Tue Apr 28 00:44:47 2020 +0800 高级群发用户画像打点 commit 4b61b8ebbf6b27848966e7153c69a544133f3dd2 Author: wanggb Date: Wed Apr 29 11:32:37 2020 +0800 重新写cp- vip 书籍免费逻辑 commit 089cf29ddbaf060268a6567cfb1bdaac66ad8642 Author: wanggb Date: Wed Apr 29 11:08:11 2020 +0800 前台判断下标vip_pay是否存在 commit e4af4a722ed2e84119f97e03274cfb120f1d584e Author: wanggb Date: Sun Apr 26 18:17:44 2020 +0800 前台列表页面增加'非VIP书籍'角标 commit 0a36a968fffd02163710a95c899f0f44cf130f95 Author: wanggb Date: Sun Apr 26 17:11:41 2020 +0800 前台列表页面增加'非VIP书籍'角标 commit 1276846f258aba41f9972fd9f8b777d2da651161 Author: wanggb Date: Fri Apr 24 19:03:54 2020 +0800 修改VIP落地页效果 commit 68309dd27ff3a6fdf1f96c806950386ebb12ad05 Author: wanggb Date: Fri Apr 24 14:40:17 2020 +0800 修改VIP落地页效果 commit 0f50931199423632b3f0930737e952b00ae63a61 Author: wanggb Date: Thu Apr 23 18:36:26 2020 +0800 书籍详情页面增加 非VIP书籍标记 commit cca191e9cf15ee2f677365610e1bc41b94acdf08 Author: wanggb Date: Thu Apr 23 16:10:11 2020 +0800 阅读书籍时，增加VIP-CP书籍逻辑 commit 940d34464644a55eec21c73bce78624c2870644b Author: wanggb Date: Thu Apr 23 14:58:32 2020 +0800 管理VIP-CP书籍时维护redis commit bea0c33620f981dccddcc861cfaf00526b2ccabc Author: wanggb Date: Thu Apr 23 14:55:11 2020 +0800 管理VIP-CP书籍时维护redis commit 5ff8ddd8072525a03835af876b29028a4c521ee7 Author: wanggb Date: Wed Apr 22 18:46:23 2020 +0800 批量添加CP commit c0545f1c075b5b07da3a8a735d805102825cb3a5 Author: wanggb Date: Wed Apr 22 18:25:17 2020 +0800 批量添加CP commit 2da3bb0161e21d4a641ff9d08e1f660f32b88e34 Author: wanggb Date: Wed Apr 22 14:15:49 2020 +0800 记录vip开始时间 commit 2464020b2fd02abd64fb56c0f6fc2732395da277 Author: wanggb Date: Tue Apr 21 21:38:37 2020 +0800 vip-cp书籍管理 commit 733727f5949f03f44358662cd4a30055973eb101 Author: wudongdong Date: Fri May 8 21:03:10 2020 +0800 订阅活动-增加后台渠道权限和活动详情 commit 997d7268d528c462f7c2ce50b6479ea1c03c561d (origin/dev-toutiao-share-20200508) Author: zhenglh Date: Fri May 8 17:56:51 2020 +0800 头条补丁 commit bb8f44a1cd554e0497cbfbc689cf3e64f1c2f2d8 Merge: e9c74352d db01c5159 Author: wudongdong Date: Fri May 8 17:47:40 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 commit e9c74352d7c8140e2af3c503fda8924859e030b7 Author: wudongdong Date: Fri May 8 17:47:16 2020 +0800 其他平台弹窗调整 commit db01c515935cf291136551df729755cab326046c Author: zhenglh Date: Fri May 8 17:25:02 2020 +0800 个人中心vipbanner图判断逻辑 commit b84c59c5b4bf9fde96ba1420be7b141d00b503cd Author: zhenglh Date: Fri May 8 17:14:26 2020 +0800 字段错误 commit e407f980b2e159b963c5c280758718bdb577d10f Author: zhenglh Date: Fri May 8 15:36:31 2020 +0800 日期过滤处理 commit 75047d56171ae9c8c4b07d8dce1ea7c669814871 Merge: 8b993c473 07a0501e6 Author: zhenglh Date: Fri May 8 15:22:54 2020 +0800 Merge branch 'dev-subscrip-20200319' of http://192.168.0.31/fe/cps into dev-subscrip-20200319 commit 8b993c473bc8364ef82ba081364f71bc49b776a9 Author: zhenglh Date: Fri May 8 15:22:40 2020 +0800 日期过滤处理 commit 07a0501e6aec0ac8ae5a104617d5f51701b53559 Merge: 99e7b28da 1b02f9a88 Author: wudongdong Date: Fri May 8 14:30:00 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 commit 99e7b28da0237ea6115f4682bb1f311d622cbc0b Author: wudongdong Date: Fri May 8 14:29:48 2020 +0800 添加活动-自动选择书籍章节id commit 1b02f9a8889bd3aae85238bcae13e917cffa35ba Merge: df9636c5d 5ebfbee9e Author: zhenglh Date: Fri May 8 14:03:23 2020 +0800 Merge branch 'dev-subscrip-20200319' of http://192.168.0.31/fe/cps into dev-subscrip-20200319 commit df9636c5d8a7ffb2bfc5769db4b73909098f91ba Author: zhenglh Date: Fri May 8 14:03:05 2020 +0800 成本修改 commit 5ebfbee9e7178122eb320780929f893f525c7b15 Merge: 31cb7cd06 cecdd62ec Author: wudongdong Date: Thu May 7 19:54:41 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 commit 31cb7cd06f63e9ab3ce8ab7c505759ea12bd32c8 Author: wudongdong Date: Thu May 7 19:54:28 2020 +0800 订阅活动-修改活动 commit cecdd62ecf2a2ea2f5bea13194b5903e3fad51d8 Author: zhenglh Date: Fri Apr 17 18:17:29 2020 +0800 章节留存 commit f84395537b9da3fb9f8a9df19dfdb25d539c1fc9 Merge: 21f9dc567 ac51c5ab0 Author: wudongdong Date: Thu May 7 18:42:37 2020 +0800 Merge branch 'dev-subscrip-20200319' of 192.168.0.31:fe/cps into dev-subscrip-20200319 # Conflicts: # application/index/view/recharge/subscrip/index.html commit 21f9dc567662ad884aa2207c448e188a05e9f55a Author: wudongdong Date: Thu May 7 18:40:21 2020 +0800 订阅活动弹窗调整 commit ac51c5ab010799c6d9fd38fcb27d4bd33b90a876 Author: machao Date: Thu May 7 18:29:24 2020 +0800 禁止文字放大功能 commit a83b5106bab7c12d224e26ea719ef12669608cf1 Merge: 1789343f5 b261e2102 Author: wudongdong Date: Thu May 7 14:26:07 2020 +0800 Merge branch 'master' into dev-subscrip-20200319 # Conflicts: # application/common/controller/Frontend.php # application/index/view/px/index/index.html # application/index/view/px/user/index.html # application/index/view/px/user/recent.html # application/index/view/qy/user/recent.html # application/index/view/sf/user/recent.html # application/index/view/user/index.html # application/index/view/user/recent.html # application/index/view/yg/index/index.html # application/index/view/yg/user/index.html # application/index/view/yg/user/recent.html commit b261e2102dc2482945d8a49031604b83f6f8062b Author: zhenglh Date: Wed May 6 17:11:16 2020 +0800 延迟客服消息的兼容bug commit 764289e58b6b282b2d821c273522e20be5db0082 Author: zhenglh Date: Wed May 6 16:42:01 2020 +0800 签到分享有问题，可以设置回复为空 commit 10dc64f20fb11cfabd7709009278f74aaa86f44d (tag: cps_20200506_114508) Merge: 331757a1b 47a1fb85d Author: zhenglihao Date: Tue May 5 19:22:09 2020 +0800 Merge remote-tracking branch 'origin/master' commit 331757a1b3f00687cecbf93fd71dfaf29b7bc59d Author: zhenglihao Date: Tue May 5 19:21:52 2020 +0800 删除头条落地页敏感词 commit 47a1fb85d975c17000cea08bd0f8cf1348c57fe5 Author: xuehw Date: Tue May 5 09:16:31 2020 +0800 VIP客服消息 commit 8809b6401eed838bbbc33b412fc495cd77b6af63 Author: zhenglh Date: Thu Apr 30 20:25:16 2020 +0800 线上端口问题处理 commit 0ca780122e9a8bda29343ecbaf4ed46f620b6d8b (tag: cps_20200430_172936) Author: zhenglh Date: Thu Apr 30 17:16:34 2020 +0800 目录页去掉导量 commit e2d4d991f26bc20b07405a3163f369eb977783ce Merge: 37c1c9c1e dc6992a38 Author: zhenglh Date: Thu Apr 30 16:21:35 2020 +0800 Merge remote-tracking branch 'origin/master' commit 37c1c9c1e65ee47771d1b3b9cdf2241b5c3286d3 Author: zhenglh Date: Thu Apr 30 16:21:24 2020 +0800 目录页漏掉了js commit dc6992a3899bee2dd6e3e39a0924fea796c8b3e4 (tag: cps_20200430_155543) Author: wanggb Date: Thu Apr 30 15:16:28 2020 +0800 解决线上错误'title' of non-object commit ec3bcd55adef5c9bb5abb748c77e4c97c62bf705 (tag: cps_20200430_122707) Author: zhenglh Date: Thu Apr 30 12:09:50 2020 +0800 收费章节判断添加缓存 commit 89d99704cad76dc79bc76103a961199712c169bc (origin/dev-float-tips-sunshine-20200426) Author: zhenglh Date: Tue Apr 28 20:42:32 2020 +0800 弹窗统一处理 commit b272fab690630d7b7a1cd09c5bdab811b30ca907 Author: zhenglh Date: Mon Apr 27 10:38:54 2020 +0800 导量完成 commit 38f9e2bc809c408481598ac24434ca65a7756053 Author: zhenglh Date: Wed Apr 22 15:49:58 2020 +0800 橙子建站回传支持 commit 5ec9473549ea8f1927df3aceaab1f650b1f50b5b (tag: cps_20200429_154955) Author: zhenglh Date: Wed Apr 29 15:14:59 2020 +0800 书籍id改为，书籍选择 commit 58f5907b14b32e8ab74270b8e4706ea8c9720298 Author: fermi Date: Wed Apr 29 13:52:59 2020 +0800 修改商品最大限制bug commit acd7887470c53faacfc8dc2bd9648d9866b895a3 (tag: cps_20200429_111303) Author: zhenglh Date: Wed Apr 29 10:05:08 2020 +0800 vip订单bug处理 commit 7a7350209c3091c7d99b0b4396f49e6d346cbcd6 Author: zhenglh Date: Tue Apr 28 20:12:38 2020 +0800 书币不足时，收费时的章节收费显示优先使用渠道 commit adc9b735403bf9f941c534460256b113ef444794 (tag: cps_20200428_180153) Merge: 21fcf5a98 d8996f6a5 Author: xuehuiwen Date: Tue Apr 28 17:04:13 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' commit d8996f6a585f3deec90c653fc2390adbf3482910 (origin/dev-260-channel-merge-20200413) Author: xuehuiwen Date: Tue Apr 28 16:32:36 2020 +0800 追加uc落地页增加关注类型 commit fc9d35957c6ea1a57c7095667576796117f1c251 Author: xuehuiwen Date: Tue Apr 28 11:18:30 2020 +0800 追加uc落地页增加关注类型 commit c15d504d4072b87591ddcfc74226edea7ff867f7 Author: xuehuiwen Date: Tue Apr 28 11:17:04 2020 +0800 追加uc落地页增加关注类型 commit 21fcf5a98e8d03a75e265bf6df1af82e96938eba Merge: edd4c65be 710750089 Author: wudongdong Date: Tue Apr 28 10:28:45 2020 +0800 Merge branch 'master' into dev-260-channel-merge-20200413 # Conflicts: # application/main/constants/CacheConstants.php commit 710750089c2a0cf40c2dd7bb9d668f5844f26025 Author: guyuexuan <2651919937@qq.com> Date: Mon Apr 27 18:22:07 2020 +0800 增加 js 校验 commit 3b111b09dda11daca724c231d92f9ed6bf4d862f Author: guyuexuan <2651919937@qq.com> Date: Mon Apr 27 18:12:27 2020 +0800 增加参数校验格式 commit a4bde2e620902005a0b893b47c983d09b7d4562f (tag: cps_20200427_171324) Author: zhenglh Date: Mon Apr 27 17:04:36 2020 +0800 高级群发bug处理 commit edd4c65be594b2b2b1e4a95468ea1e17541bf57c Author: fermi Date: Mon Apr 27 16:18:04 2020 +0800 增加标题修改 commit fa730fae37288be3a94239c5cbbd3fba7436ab76 Author: wudongdong Date: Mon Apr 27 14:44:27 2020 +0800 渠道接口加字段了 commit bb37b0a3fbaee6f9123bf876a35d63dbba3effe5 Author: fermi Date: Mon Apr 27 14:16:09 2020 +0800 fix bug commit 8fc68a7417fffee66f24bfa459ed5e8696b2d071 (tag: cps_20200427_170124, tag: cps_20200427_152713) Author: zhenglh Date: Mon Apr 27 11:33:15 2020 +0800 show_vip_at_home控制商品列表页 commit 3ff5c179f66d87bbf1ae48a3d18b081d9c0d237f Author: fermi Date: Sun Apr 26 20:08:56 2020 +0800 修改 commit 25793ba2ab4a59e6325cfb4b3284e4b7ef9e4210 Author: fermi Date: Sun Apr 26 19:43:36 2020 +0800 修改文字属性 commit 929de8d472c406d9b4f20407fba046836c261d48 Author: fermi Date: Sun Apr 26 18:27:33 2020 +0800 修改常用链接类型 commit 24301369b38a85e22c6aaf6748a76e68d5e32080 (tag: cps_20200426_184849) Author: zhenglh Date: Sun Apr 26 17:56:52 2020 +0800 删除多余返回值 commit 394f8656c775f183503b59603a41f995e5184df9 Merge: a8f242fee d4e5c3df2 Author: zhenglh Date: Sun Apr 26 17:52:37 2020 +0800 Merge branch 'dev-chapter-remain-front-20200417' commit d4e5c3df248852724ae0bdfafcbf69586e646999 (origin/dev-chapter-remain-front-20200417) Author: zhenglh Date: Sun Apr 26 17:52:25 2020 +0800 线上默认数据兼容 commit 3fc752feb66244a1034577dda66c224335fe9721 Merge: 81dff7dec d638a3f4c Author: fermi Date: Sun Apr 26 17:41:30 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' of http://192.168.0.31/fe/cps into dev-260-channel-merge-20200413 commit 81dff7decee3e0c3679ac031a0e1206886e6ce23 Author: fermi Date: Sun Apr 26 17:41:17 2020 +0800 修改客服消息bug commit a8f242fee667f8a3b00bd603f4f293341c95f5c6 Merge: ad2f1b620 da46462c2 Author: zhenglh Date: Sun Apr 26 17:13:32 2020 +0800 Merge branch 'dev-chapter-remain-front-20200417' commit da46462c217989dc4ebeedee54090c412b7136fa Author: liyt Date: Sun Apr 26 17:00:06 2020 +0800 渠道接口订单接口索引使用 commit a2530572bc2010c392b7ec3806c9c90cc6812caa Author: wudongdong Date: Sun Apr 26 16:46:54 2020 +0800 渠道接口 优化sql commit d638a3f4c6dcef748f5d07ad394a0c4fb31c6fa4 Author: wudongdong Date: Sun Apr 26 16:36:16 2020 +0800 同步cp 更改话术 commit 87d041a26716d2466cdf384a4297bcb5f8aaf865 Merge: afa91f71b 0081aef42 Author: zhenglh Date: Sun Apr 26 16:33:29 2020 +0800 Merge remote-tracking branch 'origin/dev-chapter-remain-front-20200417' into dev-chapter-remain-front-20200417 commit afa91f71bde7153157337bd054cbb13808257a8d Author: zhenglh Date: Sun Apr 26 16:33:17 2020 +0800 商品缓存删除用户cookie添加 commit 012f653cbcdce5514d6790ff1911e9cc922af21d Author: wudongdong Date: Sun Apr 26 16:16:07 2020 +0800 同步cp 更改话术 commit 275bcae60f8d8d8d7d15f0c177436d0c84a5b57f Author: wudongdong Date: Sun Apr 26 16:14:41 2020 +0800 同步cp commit 0081aef42be84750890df4985c7077b3dca825dd Author: xuehuiwen Date: Sun Apr 26 15:48:38 2020 +0800 高级群发 commit 17368c84a5e0c0b3a50ed9f39118f7184d174633 Merge: ad0cc0ab0 8923f2ace Author: xuehuiwen Date: Sun Apr 26 14:27:22 2020 +0800 高级群发 commit 8923f2ace72051c78548c81ea076830562227464 Author: zhenglh Date: Sun Apr 26 14:21:36 2020 +0800 橙子建站扣量处理 commit 02c418321f70fafcd3885dce8a7dc6cec3ca2ecd Author: zhenglh Date: Sun Apr 26 14:18:03 2020 +0800 缓存问题处理 commit 2b034ab2af6015c896dfe189778f7537815c3e19 Author: zhenglh Date: Sun Apr 26 13:04:22 2020 +0800 find 处理，阅读页使用阅读记录问题处理 commit 5713058f99b6ad7e2694b0c4db8524c8b510a858 Author: zhenglh Date: Sun Apr 26 12:05:19 2020 +0800 章节跳转第一章问题处理 commit ad2f1b6205adc0416319bf8da5f099c42b8454e5 Author: zhenglh Date: Sun Apr 26 12:05:19 2020 +0800 章节跳转第一章问题处理 commit 6156a954e12c23daa5e09320e25aa52fa526ad2c Author: liyt Date: Sun Apr 26 11:25:45 2020 +0800 模板消息用户已付费 commit ad0cc0ab017168cc3c84ae7f4f4d624a7f16fc52 Merge: b81cc309c 2dfc63b02 Author: xuehuiwen Date: Sun Apr 26 11:19:52 2020 +0800 Merge branch 'dev-chapter-remain-front-20200417' of 192.168.0.31:fe/cps into dev-chapter-remain-front-20200417 commit 4016ee970eb9db8c9c8fbe79eb36518a132f54cc Author: liyt Date: Sun Apr 26 10:29:35 2020 +0800 渠道商品库用户阅读行为成功回传数据的log commit 2dfc63b02a7a939249706a2a797995d2d0ee7bc5 Author: xuehuiwen Date: Fri Apr 24 21:35:06 2020 +0800 高级群发 commit 310fb977857c173bb0ac551f1f4d73cd1b80580e Author: xuehuiwen Date: Fri Apr 24 18:44:17 2020 +0800 高级群发字数限制修改 commit 93ca5e8e88f968052b4881113d7e3a4818b09bb0 Author: xuehuiwen Date: Fri Apr 24 17:58:46 2020 +0800 高级群发字数限制修改 commit b3a4a9b24e5d57aef88b7c96b83e9f9f8fa9e711 Author: xuehuiwen Date: Fri Apr 24 16:00:38 2020 +0800 高级群发字数限制修改 commit 633a356185334dbe436818d4a9f48dbf1ebe809a Author: xuehuiwen Date: Fri Apr 24 12:48:00 2020 +0800 高级群发字数限制修改 commit fa552c98563df402e05a361b51103c0908c3c583 Author: xuehuiwen Date: Thu Apr 23 14:23:25 2020 +0800 高级群发文字&图文修改 commit 8be2bf76828f0f634bc8625caadf1d78658e211a Author: zhenglh Date: Fri Apr 17 15:32:08 2020 +0800 pv打点添加dd字段 commit 4081246418ac248de45461469cb02dfc186a78da Author: xuehuiwen Date: Tue Apr 21 18:33:16 2020 +0800 图文消息书籍添加selectpicker框 commit 6aa716e60a32c57d7acc3a9c3e413e43a0ae22ce Author: xuehuiwen Date: Tue Apr 21 10:40:43 2020 +0800 空行 commit a4ba88570553b3ddb577e0ad7a2ffa039b845c87 Author: xuehuiwen Date: Tue Apr 21 10:24:52 2020 +0800 高级群发文字消息修改 && rm console.log commit 781debe1b3d4248a2e75b20777b148705794be18 Author: xuehuiwen Date: Mon Apr 20 19:44:33 2020 +0800 高级群发文字消息修改 commit d6b300d6edb1e35bc8aa2d55b0f23ebc4ba72619 (origin/dev-toutiao-juice-20200422) Author: zhenglh Date: Fri Apr 24 19:57:12 2020 +0800 vip banner在个人中心展示开关 commit 6760a53b54e864905b28c38f6d5456a710debf85 Author: zhenglh Date: Wed Apr 22 15:49:58 2020 +0800 橙子建站回传支持 commit 1789343f5ec89dc7f53c47ab5fc3c94d16c607e5 Author: wudongdong Date: Sat Apr 25 23:23:04 2020 +0800 订阅活动弹窗问题 commit b70b30b28adf832d508086f866b0a8403b4f7407 Author: wudongdong Date: Sat Apr 25 15:12:13 2020 +0800 cp屏蔽后，书籍不再能改为上架可见状态 commit 5f5921ff9a0dd259f315e22b01a0835ad565d816 Author: wudongdong Date: Fri Apr 24 15:49:47 2020 +0800 根据 cp_name 屏蔽书籍 commit faa5b5f1afd977e79b9fe047596d106050e34cfb Author: zhenglh Date: Fri Apr 24 14:05:03 2020 +0800 书币配置失效 commit b81cc309cc61e025833e670871dd81c692dc708c Author: liyt Date: Fri Apr 24 12:37:06 2020 +0800 头条模板去掉好友两个字 commit 1559981f539674ed057b8c14689f1370de578f3f Author: wudongdong Date: Fri Apr 24 11:49:28 2020 +0800 书籍版权到期时间调整 commit 35125466992148c127dc3958b7425d295e5bcdcb Author: liyt Date: Fri Apr 24 10:31:11 2020 +0800 回传url增加直冲选项 commit ceb0431e6f6504e9c02c59ae15b2c294c4678454 Merge: d401dd95d 6bc87b1ed Author: zhenglh Date: Thu Apr 23 20:35:58 2020 +0800 Merge remote-tracking branch 'origin/dev-260-channel-merge-20200413' into dev-260-channel-merge-20200413 commit d401dd95d817f0772bab9a558faffb0e61b44c07 Author: zhenglh Date: Thu Apr 23 20:35:11 2020 +0800 配置修改 commit 6bc87b1ed66c6728504f9c30b3a32312f32b4d26 Merge: 3687f7b38 b057bea95 Author: wudongdong Date: Thu Apr 23 20:20:55 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' of 192.168.0.31:fe/cps into dev-260-channel-merge-20200413 commit 3687f7b386a68d82429664e8570a8df85d1f1f7c Author: wudongdong Date: Thu Apr 23 20:20:38 2020 +0800 同步cp列表 commit ac52d9d9c6fa86af28c5f1c7085ceae862b8d581 Author: liyt Date: Thu Apr 23 20:18:21 2020 +0800 回传修改access_token BUG commit b057bea9580bb085c277886988597bb896c287a9 Author: zhenglh Date: Thu Apr 23 19:17:07 2020 +0800 渠道自定义付费测试完成 commit dc8ea07b3ef4f4c3ebf8e35e6fd128fcd10ee0c3 Merge: 68b372b08 323fe5041 Author: zhenglh Date: Thu Apr 23 18:50:36 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' of http://192.168.0.31/fe/cps into dev-260-channel-merge-20200413 commit 68b372b08b6416b8a4e087d55a1be835d91283ea Merge: 26c40551b 0256e9e10 Author: zhenglh Date: Thu Apr 23 18:50:18 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' of http://192.168.0.31/fe/cps into dev-260-channel-merge-20200413 commit 26c40551bcd806d47f13ff749d30ad818b465663 Author: zhenglh Date: Thu Apr 23 18:50:05 2020 +0800 添加书籍收费设置 commit 323fe5041b04cc91bc8b1bd4d5c25c11dd39c207 Merge: a35c8e2c8 0256e9e10 Author: wudongdong Date: Thu Apr 23 18:41:39 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' of 192.168.0.31:fe/cps into dev-260-channel-merge-20200413 # Conflicts: # application/admin/controller/Orders.php # application/admin/service/CommonService.php # application/admin/view/custom/editlinktext.html # application/admin/view/referral/referral/daily.html # application/main/service/OfficialAccountsEventService.php commit 0256e9e1025451902dcd544b193c0e8bd3629452 Author: fermi Date: Thu Apr 23 18:24:48 2020 +0800 修改常用连接bug commit 8a87b1aac762048ea1a4aaf4f140d0217e62ba1a Author: fermi Date: Thu Apr 23 17:21:33 2020 +0800 fix bug commit f82be40f38034e3b4619f6591dbbdf65c14157d1 Author: liyt Date: Thu Apr 23 16:39:01 2020 +0800 查询数据时书籍推荐下返回一条阅读记录 commit a262338c7a5231bd90f4a9f995f411a6083fe3ee (origin/dev-exportfans-opt-20200423) Author: zhenglh Date: Thu Apr 23 12:42:06 2020 +0800 阅读页无法使用阅读记录的bug处理 commit dc7c8a5d358db82374cf9dae77c777ae6c29413d Author: zhenglh Date: Fri Apr 17 14:34:01 2020 +0800 vip&渠道订单导出添加关注时间，订单列表 commit cfd6bdf0b05aca6bb9854f108a2e3e6f9e5ff90b Author: zhenglh Date: Thu Apr 16 10:04:54 2020 +0800 添加IP信息接口 commit 1f8d06eccfa5888d6a5ea9b893834711b15622d2 Author: wudongdong Date: Mon Mar 30 15:17:55 2020 +0800 cp commit d7844381a25d1edea3b5a847318d854b69a9edb5 Author: wudongdong Date: Mon Mar 30 14:00:50 2020 +0800 260 同步书籍CP+增加订单注册时间+渠道自定义小说章节价格 commit 24ec991745dbdb138057310792f113f7061f8395 Author: liyt Date: Thu Mar 26 17:00:29 2020 +0800 客服消息新增付费类型已付费 推荐书籍加阅读记录 commit a1574f54634525fb60c794e90d0b076e28550a1a Author: fermi Date: Fri Apr 3 10:50:14 2020 +0800 code review commit 9d92837449a9a75864931f684169a1435712e470 Author: fermi Date: Mon Mar 30 11:24:38 2020 +0800 增加提交后刷新当前商品操作 commit f3fe97c9dab776d7362b68dd98657631e87ead2c Author: fermi Date: Sat Mar 28 17:16:49 2020 +0800 vip充值列表拆分未已充值和未充值 commit 64bbeed5fb3449c6c638bca28d5064c6dafe547d Author: fermi Date: Tue Apr 7 15:08:18 2020 +0800 fix 小额充值url构造判断错误 commit b00054ac25e2f37c35596366af28b017aee20454 Author: fermi Date: Tue Apr 7 13:57:07 2020 +0800 优化vip账号下可选的常用链接列表筛选 commit 3fbbc03a4cda8bbc175c67ab2acebcfd175c6324 Author: fermi Date: Fri Apr 3 11:05:28 2020 +0800 code review commit bffb9c2dfb95103f9ff7e185e8341230df098d0e Author: fermi Date: Mon Mar 30 14:18:20 2020 +0800 增加vip充值和小额充值常用链接 commit c991d1c25a044c04a15f18a8c8fd28bc0518cc34 Author: fermi Date: Sat Mar 28 11:36:13 2020 +0800 增加vip图文客服消息常用链接和vip文字客服消息常用链接 commit ab0d67c9b38978ccb2d8cb9e3038a843f3e8d0df Author: fermi Date: Sat Mar 28 11:11:00 2020 +0800 增加vip文字客服消息->常用链接地址 commit 9faeee5bc6d4733a857622dc8b070951e3ecd458 Author: fermi Date: Fri Mar 27 18:40:23 2020 +0800 增加常用链接排行榜 commit 5e9a631e8a5f0a547bffd88d7310db0b6d5ed7b2 Author: fermi Date: Fri Mar 27 18:30:45 2020 +0800 去掉Vip充值和小额充值 commit 817e4f2354af7c4f238ad6fae3988e6e023834fa Author: fermi Date: Fri Mar 27 17:38:43 2020 +0800 增加客服消息常用链接设置-V1 commit c040d29bfa5bc6b2f7b3bfe215b0deb02113ec0f Author: fermi Date: Fri Apr 10 10:47:48 2020 +0800 增加qy/sf/px/xg与yg平台同步连续签到功能 commit 6895d3ee9b12b245f6442ad33b3b8e81b416d1c4 Merge: 742f3f1aa 5c726d516 Author: zhenglh Date: Thu Apr 23 10:31:19 2020 +0800 Merge remote-tracking branch 'origin/master' commit 742f3f1aa58aa5d69def30cec10c26cd7856151b Author: zhenglh Date: Thu Apr 23 10:31:06 2020 +0800 vip签到回复，非vip不更新签到文本 commit 1bc8cfece7b6a89ba20776365c978cc5148606ca Author: wudongdong Date: Wed Apr 22 22:51:40 2020 +0800 订阅活动 commit cd10610e6e6190a01d06c5cd3f47d20ccd1e5f65 Merge: 8a1ed5c96 5c726d516 Author: wudongdong Date: Wed Apr 22 16:02:27 2020 +0800 Merge branch 'master' into dev-subscrip-20200319 commit 5c726d5164ff2ee68416bfa79bce8ddc366f1fe3 Author: wudongdong Date: Wed Apr 22 14:35:30 2020 +0800 渠道接口bug修改 commit 8a1ed5c9671530629f4ecdeec0220e7a35c755b4 Merge: 57a8f2a1c ab1d725f7 Author: wudongdong Date: Wed Apr 22 10:38:54 2020 +0800 Merge branch 'master' into dev-subscrip-20200319 commit f7a8780e278e567d32527847020f33666dbbc742 (tag: cps_20200422_111112) Merge: f9042d00e ab1d725f7 Author: zhenglh Date: Wed Apr 22 10:34:05 2020 +0800 Merge remote-tracking branch 'origin/master' commit f9042d00eabdbf1c062c4dc398055f327aa6e19b Author: zhenglh Date: Wed Apr 22 10:33:54 2020 +0800 报错降级 commit ab1d725f7e54000322c81f608c33b6d98e5c0cef Author: wudongdong Date: Wed Apr 22 10:22:09 2020 +0800 推广链接-更改rediskey commit 95149fe36ebe4ec9e5e0284616841af278086024 (tag: cps_20200421_184337, tag: cps_20200421_182853) Merge: ac2564e7c 13a0dae6f Author: liyt Date: Tue Apr 21 17:37:46 2020 +0800 Merge branch 'dev-gdt-report-20200402' commit 13a0dae6f9c65ca53d6eecbc0c719c18121bbf83 (origin/dev-gdt-report-20200402) Author: liyt Date: Tue Apr 21 17:37:05 2020 +0800 显示web数据源ID commit ac2564e7c599c7b8b9af7bc4fccaf230f8bcc771 Merge: 84d16f0f4 e9fba939c Author: wudongdong Date: Tue Apr 21 17:25:53 2020 +0800 Merge branch 'dev-sql-opt-master-polardb-merge-20200416' commit e9fba939c79b3ec84b4d919dfee717e22bcf1d6e (origin/dev-sql-opt-master-polardb-merge-20200416) Author: wudongdong Date: Tue Apr 21 17:03:32 2020 +0800 优化-bug处理 commit 84d16f0f4b52900c3d3a200d2a36129eefc643e4 Author: zhenglh Date: Tue Apr 21 16:51:45 2020 +0800 章节异常的bug处理 commit 72777f8eb5cc8b1bc11626e778e2b604bb018e1e (tag: cps_20200421_115442, tag: cps_20200421_105622) Merge: 0ebfa191f c6ee64365 Author: liyt Date: Mon Apr 20 20:43:32 2020 +0800 Merge branch 'dev-gdt-report-20200402' commit 0ebfa191f7d3cb55c421aff58b0f7fb9ecdc05b9 Merge: 813eb8f86 3248e824d Author: wudongdong Date: Mon Apr 20 20:42:07 2020 +0800 Merge branch 'dev-sql-opt-master-polardb-merge-20200416' # Conflicts: # application/api/controller/Channeldataapi.php commit c6ee64365ddfdd78607036c19cfd80c14e19e517 Author: liyt Date: Sat Apr 18 11:17:05 2020 +0800 数据回传增加book_id参数和url commit 3248e824dc718592856e723bbf6835197e4b09a9 Merge: 1e78b46b9 346dc77e4 Author: zhenglh Date: Mon Apr 20 19:15:01 2020 +0800 Merge branch 'dev-sql-opt-master-polardb-merge-20200416' of http://192.168.0.31/fe/cps into dev-sql-opt-master-polardb-merge-20200416 commit 1e78b46b933149b7db624fc161395056a08eeef6 Author: zhenglh Date: Mon Apr 20 18:06:45 2020 +0800 渠道不存在时的兼容 commit c4800ef46da1e5638fb7fa38d290291eb94fc420 Author: zhenglh Date: Mon Apr 20 17:58:04 2020 +0800 用户取关时错误兼容 commit 346dc77e4e69cb48096811e71b293305f30bb465 Author: wudongdong Date: Mon Apr 20 17:55:09 2020 +0800 书籍目录+取消授权-异常请求直接抛出异常 commit ea38c2a0d551be03656a379ac476f96b5587dc71 Author: zhenglh Date: Mon Apr 20 17:05:34 2020 +0800 用户点击下一章关注回复，下一章章节不存在时的兼容 commit 1d2501f996d4bd463fe424822e0fff6c5883ad65 Author: zhenglh Date: Mon Apr 20 16:50:39 2020 +0800 当url链接只带问号时，删除参数错误处理 commit 813eb8f86ce8224f9d6ac0224e1046dcfec1f50e Author: zhenglh Date: Mon Apr 20 15:56:46 2020 +0800 VIP关键字回复同步bug处理 commit 91219453306be1be5ccc2237d635b2610ba0e3ad Author: wudongdong Date: Mon Apr 20 14:36:43 2020 +0800 渠道接口改为polardb commit 9313ac983834e8653abe05b28dc2aa76f2f78054 Merge: 5f01ece7d 1a22c0d65 Author: wudongdong Date: Mon Apr 20 14:26:45 2020 +0800 Merge branch 'dev-sql-opt-master-polardb-merge-20200416' of 192.168.0.31:fe/cps into dev-sql-opt-master-polardb-merge-20200416 commit 5f01ece7d299573775c151f24aa483fe46d26599 Author: wudongdong Date: Mon Apr 20 14:21:53 2020 +0800 渠道订单接口改为polardb commit 17d4ae74c3615d477718d2cca2179e743b9a1c55 Merge: 3ce1994f2 69895eea0 Author: zhenglh Date: Mon Apr 20 14:14:23 2020 +0800 Merge remote-tracking branch 'origin/master' commit 3ce1994f2a54bc0fc8de60b8647c5a68bcd9999b Author: zhenglh Date: Mon Apr 20 14:14:11 2020 +0800 阳光备案域名修改 commit 1a22c0d6528d5a5609275af7cfd782a3c4688ed1 Author: wanggb Date: Mon Apr 20 12:52:43 2020 +0800 polardb配置 commit a54181b93c79328b5c4a5222444ead24a8191bfd Merge: 5f3540117 b8a3d8204 Author: wanggb Date: Mon Apr 20 12:51:07 2020 +0800 Merge remote-tracking branch 'origin/dev-sql-opt-master-polardb-merge-20200416' into dev-sql-opt-master-polardb-merge-20200416 commit 5f3540117c41abcdf628ae78e2dfff6c78c54228 Author: wanggb Date: Mon Apr 20 12:50:58 2020 +0800 书籍排行榜添加过滤条件 commit 69895eea005ca440443bc4eb245924c1eca0c51f Author: wudongdong Date: Mon Apr 20 11:10:22 2020 +0800 渠道接口又加字段 commit b8a3d820465e945315edf79e3e8af096de43ed9e Author: wudongdong Date: Mon Apr 20 11:02:55 2020 +0800 vip分流bug commit 68732901e9ea9498b7c8047cd04912d715dc1136 Merge: 1be3e130a d5ea01f66 Author: wudongdong Date: Sun Apr 19 11:55:19 2020 +0800 Merge remote-tracking branch 'origin/dev-sql-opt-master-polardb-merge-20200416' into dev-sql-opt-master-polardb-merge-20200416 commit 1be3e130a423f56309fb1d1b88d612fe8a2d67ef Author: wudongdong Date: Sun Apr 19 11:55:03 2020 +0800 SQL优化+读写分离修改 commit d5ea01f669dbe3130693b36bcbc8eb53afb81a32 Author: wanggb Date: Sun Apr 19 11:24:26 2020 +0800 导出Excel时，解决科学计数法问题 commit e94e1856cd97d7433c9e0815d0dfe378ba64a83a Merge: 61a092a04 b420b97e7 Author: wanggb Date: Sun Apr 19 10:05:24 2020 +0800 Merge remote-tracking branch 'origin/dev-sql-opt-master-polardb-merge-20200416' into dev-sql-opt-master-polardb-merge-20200416 commit 61a092a04af115836bf451bafe7fd4343627f273 Author: wanggb Date: Sun Apr 19 10:05:12 2020 +0800 订单查询条件错误&客服消息编辑时加入纯文本 commit b420b97e7acea47c0e51a6d448ecb45f4715e076 Author: zhenglihao Date: Sat Apr 18 11:51:27 2020 +0800 章节不存在是取最近阅读时使用缓存 commit 110bbd2e9a4e65cff0d6ab11facafd6b34226f7e Merge: 6e8ae437d a28bd0214 Author: liyt Date: Sat Apr 18 10:25:16 2020 +0800 Merge branch 'master' into dev-gdt-report-20200402 # Conflicts: # application/common/controller/Frontend.php commit 6a244318f516596eb2f9fb3293c1657824c4b2a6 Merge: a28bd0214 67f354549 Author: zhenglh Date: Fri Apr 17 20:28:03 2020 +0800 Merge branch 'dev-sql-opt-master-polardb-merge-20200416' into dev-merge-opt-20200417 # Conflicts: # application/main/service/BookService.php commit a28bd02143211ca58affd894b67e63850042ee94 (tag: cps_20200417_195333, tag: cps_20200417_194727) Author: zhenglh Date: Fri Apr 17 19:43:28 2020 +0800 签到无法选择分组处理 commit c13dd9e7f1338ec0c322c00ec9a51d57309558dd (tag: cps_20200417_183455) Merge: 9271a8848 3514d156e Author: zhenglh Date: Fri Apr 17 17:47:16 2020 +0800 Merge branch 'dev-250-2-left-20200407-merge' commit 3514d156e2c5f4e85a20581f34f8e9103abfaed0 Author: zhenglh Date: Fri Apr 17 17:47:02 2020 +0800 userjson默认值 commit 9271a8848a3b764f0c4fea8079cd4b4e8b25d02b Merge: f1a8ca301 eb023f90c Author: zhenglh Date: Fri Apr 17 17:27:04 2020 +0800 Merge branch 'dev-250-2-left-20200407-merge' commit eb023f90c82afa409e0a39e64a7f16ae8b266518 Merge: 0916ef88f eb52b5c92 Author: zhenglh Date: Fri Apr 17 17:26:27 2020 +0800 Merge remote-tracking branch 'origin/dev-250-2-left-20200407-merge' into dev-250-2-left-20200407-merge commit 0916ef88f13c4fbc2839c7bbc2af8227e8ca037b Author: zhenglh Date: Fri Apr 17 17:26:16 2020 +0800 同步bug处理 commit eb52b5c9206aab3b0e812f14c3220e21ebab35ce Author: xuehuiwen Date: Fri Apr 17 17:23:04 2020 +0800 vip menu commit 6731a435d6ce3e1f57e3d55e07a2394ac5df404b Author: zhenglh Date: Fri Apr 17 17:13:32 2020 +0800 同步bug处理 commit 67f354549a4700c23e1a6426f2c578113fedb15b Author: wanggb Date: Fri Apr 17 16:43:36 2020 +0800 Tabbar 排行链接地址默认定位到男生 commit 03db6b176c10ae3e93f466c96111a49572ee52b7 Merge: 93d8154c5 90c6a8942 Author: wanggb Date: Fri Apr 17 14:40:56 2020 +0800 Merge remote-tracking branch 'origin/dev-sql-opt-master-polardb-merge-20200416' into dev-sql-opt-master-polardb-merge-20200416 commit 93d8154c5b3a02615a4980929f61a708c4c7d583 Author: wanggb Date: Fri Apr 17 14:40:47 2020 +0800 修改Polardb默认值 commit f1a8ca30138b22513326569f65eaf5f5b47fa6cb (tag: cps_20200417_144652, tag: cps_20200417_142323) Author: zhenglh Date: Fri Apr 17 12:33:48 2020 +0800 书籍兼容问题处理 commit 5ede70954d3fbd319f439d0b99234b840a9d9e86 Author: xuehuiwen Date: Wed Mar 25 10:57:27 2020 +0800 vip 菜单@xuehuiwan commit de81d6dc49ebe171c829f57a0ac87e20fe64f1e3 Author: zhenglh Date: Tue Mar 17 19:25:00 2020 +0800 VIP关注延迟客服消息 VIP关注延迟客服消息 VIP关键字回复 vue优化 commit 90c6a8942ad80536e5a09570b7b313a77c24581e Author: guyuexuan <2651919937@qq.com> Date: Thu Apr 16 16:46:12 2020 +0800 修改 command 主从配置 commit ab71d5e7454834873774c3686a0bf9d053a598fa Merge: 28d14aed4 486f617ea Author: wudongdong Date: Thu Apr 16 16:44:13 2020 +0800 Merge branch 'dev-sql-opt-master-polardb-merge-20200416' of 192.168.0.31:fe/cps into dev-sql-opt-master-polardb-merge-20200416 commit 28d14aed4d5590cd2cce99aa679c4b8b1878fae7 Author: wudongdong Date: Thu Apr 16 16:43:47 2020 +0800 读写分离优化补充 commit 486f617eac6550fa4b0c1c15025a140a507f37e8 Merge: a10de8e5a 19d91de8f Author: wanggb Date: Thu Apr 16 16:39:40 2020 +0800 Merge remote-tracking branch 'origin/dev-sql-opt-master-polardb-merge-20200416' into dev-sql-opt-master-polardb-merge-20200416 commit a10de8e5a14ca9b6a4a3baee80a6bdc0f485874f Author: wanggb Date: Thu Apr 16 16:39:26 2020 +0800 修改Polardb配置 && 静默授权入库时，加锁 commit 19d91de8fbca58130ae83fc1ecf7191cbbc0df70 Author: fermi Date: Thu Apr 16 14:58:55 2020 +0800 读写分离 commit da3f9366c14ce7febc972919c8f965a3be9b5c86 Merge: 2f75c92b2 a923d3a3c Author: guyuexuan <2651919937@qq.com> Date: Thu Apr 16 12:04:12 2020 +0800 Merge branch 'dev-polardb-optimize-20200409' of 192.168.0.31:fe/cps into dev-sql-opt-master-polardb-merge-20200416 commit 2f75c92b2c35b8cbd888e69a50063397d0dd15af (origin/dev-sql-opt-master-merge-20200407) Merge: 3197e9a48 c40f24ca8 Author: guyuexuan <2651919937@qq.com> Date: Thu Apr 16 12:02:53 2020 +0800 merge master commit c40f24ca844d8c4a13fff158c92f1e5490305904 (tag: cps_20200415_180524) Author: cuigang_qianduan <891257242@qq.com> Date: Wed Apr 15 17:45:53 2020 +0800 master commit 3197e9a488218d63bdae5a73144eb824a0bb5c97 (origin/dev-sql-opt-20200407) Author: wudongdong Date: Wed Apr 15 17:15:22 2020 +0800 SQL优化-推广链接-设置书籍的关注章节bug修复 commit ed43d42cf8e7fcd80f52466891addbe887203ef5 Author: wudongdong Date: Wed Apr 15 17:11:18 2020 +0800 SQL优化-推广链接-设置书籍的关注章节bug修复 commit 6083dc866d22937ec12284180b84f488df2aa019 Merge: 0e253d20e efe59b5a4 Author: wudongdong Date: Wed Apr 15 17:09:23 2020 +0800 Merge branch 'dev-sql-opt-20200407' of 192.168.0.31:fe/cps into dev-sql-opt-20200407 commit f6611e35a8125331dd53da84b25611af2083620b (tag: cps_20200415_165535) Merge: 6f2739e10 1deaadb89 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Apr 15 16:29:16 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 6f2739e106df6ca6049a179abfb0342bdce7b865 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Apr 15 16:28:58 2020 +0800 css_调整 commit efe59b5a4c49bcb95e9003af94e2771e89965a62 Author: zhenglh Date: Wed Apr 15 15:28:07 2020 +0800 章节阅读页不存在时兼容 commit a923d3a3ca63e67ab8b38a3101b2537776d9e60c (origin/dev-polardb-optimize-20200409) Author: wanggb Date: Wed Apr 15 15:28:06 2020 +0800 Orders是否使用Polardb增加 env 配置开关 commit 0e253d20ef1a71b497dd67717680cd8ef01af163 Merge: 992f95eee 1deaadb89 Author: wudongdong Date: Wed Apr 15 15:13:57 2020 +0800 Merge branch 'master' into dev-sql-opt-20200407 # Conflicts: # application/api/controller/Channeldataapi.php commit 57a8f2a1c6020364f8ede65de67726e02fd8332b Merge: 9ec7f4663 1deaadb89 Author: wudongdong Date: Wed Apr 15 14:31:12 2020 +0800 Merge branch 'master' into dev-subscrip-20200319 commit 1deaadb89221df7c7441d8a6abbac06559244590 Author: wudongdong Date: Wed Apr 15 14:30:10 2020 +0800 渠道接口增加字字段+优化 commit 9ec7f466398496f11eea643849c61bd18a9b4474 Author: wudongdong Date: Wed Apr 15 13:49:12 2020 +0800 订阅活动报名弹窗 commit 6aceda3458c36b8fe896f704a70d03a01b546f21 Author: zhenglh Date: Wed Apr 15 12:21:32 2020 +0800 vip订单查询，订单号，商户单号取消模糊匹配 commit 6e306731bd8315e1198062707558d7ecc84f9638 Author: wanggb Date: Wed Apr 15 11:29:10 2020 +0800 调整用户群组配置-自定义类型将uids存储到Polardb commit 8561af2511ab73ab780ac43f498625e69d7ab6d2 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Apr 14 23:47:31 2020 +0800 样式重排 commit af703fc1b4305c25c63c2c18a1d9b93fdab30d61 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Apr 14 23:36:56 2020 +0800 修改全局样式 commit bdac3a7b852b82d4b90596054ca65d489d9697fc Author: wudongdong Date: Tue Apr 14 20:06:06 2020 +0800 订阅活动添加消费记录 commit 8cabdc8113d0c0083650191a8223639f1976d64c Author: wudongdong Date: Tue Apr 14 18:18:45 2020 +0800 订阅活动用户弹窗判断 commit 1b1eb0aaa0462e6587fbc878f1282b4d4877dc76 Merge: 2b345bd6a f3e26f1ad Author: wudongdong Date: Tue Apr 14 18:16:16 2020 +0800 Merge branch 'master' into dev-subscrip-20200319 # Conflicts: # application/common/controller/Frontend.php # application/index/view/index/index.html commit 43689e76d10b52e35046db0b5242eb6016d4952f Author: wanggb Date: Tue Apr 14 16:36:34 2020 +0800 脚本：订单统计 -> 将Order 链接到 Polardb commit 4cf407a7d2fbef2a3bba565368d2da83ef60e139 Author: wanggb Date: Tue Apr 14 15:41:30 2020 +0800 admin -> 参数管理 -> 查看订单 -> 将Order拆解查询 Polardb commit f3e26f1ad73f692b50822846fe274ad0b8416f9d Merge: 674beea1e 84d9804f9 Author: wudongdong Date: Tue Apr 14 13:43:36 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 674beea1e242c440fa37103645e1ddc7a62404af Author: wudongdong Date: Tue Apr 14 13:43:27 2020 +0800 渠道接口调整 commit 992f95eee6ea082ef3e1eabac7ff7738bd215d93 Merge: 790741eb4 ac0a869cf Author: wudongdong Date: Tue Apr 14 13:35:33 2020 +0800 Merge branch 'dev-sql-opt-20200407' of 192.168.0.31:fe/cps into dev-sql-opt-20200407 commit 790741eb478af538f432e331fdcd29493316e271 Author: wudongdong Date: Tue Apr 14 13:35:22 2020 +0800 配置默认值 commit 84d9804f9825bc83885c0ab18cfa728c9cf0f939 (tag: cps_20200414_133919) Author: cuigang_qianduan <891257242@qq.com> Date: Tue Apr 14 12:00:05 2020 +0800 css commit 035f1ab1d0d02cd29532774b304c41ce2a946123 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Apr 14 11:43:18 2020 +0800 IOS听书屏蔽 commit 651052fe39759daeda664ebe11bb80d2ef4d9110 Author: wanggb Date: Tue Apr 14 11:41:02 2020 +0800 vip -> 订单明细 -> 导出 -> 改造 取消关联查询 commit ac0a869cf77b6e08306fd711c36ec3a67bea4e58 Merge: 33bf99a9d fe3abe1db Author: zhenglh Date: Tue Apr 14 10:01:46 2020 +0800 Merge remote-tracking branch 'origin/dev-sql-opt-20200407' into dev-sql-opt-20200407 commit 33bf99a9d2cb4ca2866251622801857eda0f7156 Author: zhenglh Date: Tue Apr 14 10:01:38 2020 +0800 dd规则缓存添加 commit fe3abe1dbbb0ed5c0f67f10e9d8f6564bc781701 Author: wudongdong Date: Mon Apr 13 20:19:38 2020 +0800 sql优化 commit e08dfb303f5070240ede7d87bcf8252253a65067 Merge: 38f538a01 8631f4cc9 Author: wudongdong Date: Mon Apr 13 20:18:36 2020 +0800 Merge branch 'dev-sql-opt-20200407' of 192.168.0.31:fe/cps into dev-sql-opt-20200407 # Conflicts: # application/main/constants/CacheConstants.php commit 8631f4cc951085fc2336c5d6e22a6401b7cdae01 Author: zhenglh Date: Mon Apr 13 19:52:22 2020 +0800 dd规则缓存添加 commit 38f538a0144405c730eb0fa03f26027c038db002 Merge: 74169267c 75fabab8b Author: wudongdong Date: Mon Apr 13 19:41:48 2020 +0800 Merge branch 'master' into dev-sql-opt-20200407 commit f94736fb858b352888798fdaf50da57bfb4ae464 Author: zhenglh Date: Mon Apr 13 19:38:24 2020 +0800 dd规则缓存添加 commit 75fabab8bbb3952038d4c3d4a6d65f0755d84fd2 (tag: cps_20200414_102934, tag: cps_20200413_190809, origin/dev-JDaudio-IOS-debug) Merge: 1e36c2b3e b204e39ae Author: cuigang_qianduan <891257242@qq.com> Date: Mon Apr 13 19:04:50 2020 +0800 Merge branch 'dev-JDaudio-IOS-debug' of 192.168.0.31:fe/cps into dev-JDaudio-IOS-debug commit 1e36c2b3e14dd8fd6f87d1306f9222cd835b3254 Author: cuigang_qianduan <891257242@qq.com> Date: Mon Apr 13 19:04:28 2020 +0800 debug commit 74169267cde1bc309180e88144e683c939889199 Merge: d8964c2c8 049db2b05 Author: wudongdong Date: Mon Apr 13 17:07:43 2020 +0800 Merge branch 'dev-sql-opt-20200407' of 192.168.0.31:fe/cps into dev-sql-opt-20200407 commit b204e39ae8e96bf1528e1bd618bb74f849cdef83 (tag: cps_20200413_174533, origin/dev-command-20200413) Author: liyt Date: Mon Apr 13 14:21:03 2020 +0800 脚本基类开启主从、修改 admin config redis 判断 commit a35c8e2c81047183ad822bbd3fed5192d43cda54 Merge: dc8b95e84 398a555e1 Author: wudongdong Date: Mon Apr 13 16:31:23 2020 +0800 Merge branch 'dev-260channel-20200327' into dev-260-channel-merge-20200413 commit dc8b95e84ec5ff9e226bdbb8a67ab842dfe5b178 Merge: 0d5391cbb 529cda56e Author: wudongdong Date: Mon Apr 13 16:31:01 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' of 192.168.0.31:fe/cps into dev-260-channel-merge-20200413 commit 98b70fbc1b1ed7d7057e2df17beabadb0e7cc6d5 Merge: 0d5391cbb 55a7f3332 Author: cuigang_qianduan <891257242@qq.com> Date: Mon Apr 13 16:09:55 2020 +0800 Merge branch 'dev-JDaudio-IOS-debug' into cg-new-master commit 55a7f33323f83e49032002172c3be4937b444178 Author: cuigang_qianduan <891257242@qq.com> Date: Mon Apr 13 16:01:39 2020 +0800 90min commit 9e057a011b06dc00dd124ccf5b7fee6063df7b24 Author: cuigang_qianduan <891257242@qq.com> Date: Mon Apr 13 16:00:49 2020 +0800 初始百分比 commit d8964c2c8a3430f1a4281f6125ceb22210fb913c Author: wudongdong Date: Mon Apr 13 16:00:25 2020 +0800 前台读写分离优化 commit 695bd2ce28e5d404c7373a5fa9c03b600ef2d794 Merge: d20f232e8 0d5391cbb Author: wudongdong Date: Mon Apr 13 15:59:11 2020 +0800 Merge branch 'master' into dev-sql-opt-20200407 commit 35e19c3e540057cde6019e0d6fea451d5e6b2d20 Author: cuigang_qianduan <891257242@qq.com> Date: Mon Apr 13 15:56:42 2020 +0800 debug 测试通过 commit 0d5391cbb4f2388a04c3de424e7bca79c9887da2 Author: liyt Date: Mon Apr 13 15:41:03 2020 +0800 导粉icon走cdn commit 94bd566edc5431794d89783ae18ca848e24386ee Author: liyt Date: Mon Apr 13 15:34:42 2020 +0800 图片替换 commit f293021f7ea9b1e9a5b658f2a382ab2a23b44363 Author: wanggb Date: Mon Apr 13 15:25:26 2020 +0800 文件中两个方法应该是没在用了，所以注释掉 commit 529cda56e5c9efcd1637cc01ba947624f8c1a1ad Merge: 3b5eb7f8a edaeb32f5 Author: liyt Date: Mon Apr 13 14:28:20 2020 +0800 Merge branch 'dev-260-1-20200326' into dev-260-channel-merge-20200413 commit edaeb32f5ad5bb2fb71a8d5b890af01e04712185 Author: liyt Date: Thu Mar 26 17:00:29 2020 +0800 客服消息新增付费类型已付费 推荐书籍加阅读记录 commit 3b5eb7f8a0091f68bdd085d1abed956b9b14287d Merge: 849d8657e 92be8a7ea Author: fermi Date: Mon Apr 13 14:18:19 2020 +0800 Merge branch 'recharge-20200328' into dev-260-channel-merge-20200413 commit 849d8657efecf1ec7550c57a960af6a4c4e7a359 Merge: c381fab0a 135631af2 Author: fermi Date: Mon Apr 13 14:15:50 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' of http://192.168.0.31/fe/cps into dev-260-channel-merge-20200413 commit c381fab0aeb22f8a551cba4ce69e4d689476ec26 Merge: acead7723 d90bec892 Author: fermi Date: Mon Apr 13 14:15:22 2020 +0800 Merge branch 'add-link-20200326' into dev-260-channel-merge-20200413 commit 135631af2d3f77cb1d5b5fb7b8a07347e1251dfc Merge: 5c560f67f acead7723 Author: zhenglh Date: Mon Apr 13 14:15:06 2020 +0800 Merge branch 'dev-260-channel-merge-20200413' of http://192.168.0.31/fe/cps into dev-260-channel-merge-20200413 commit 5c560f67ff9e8f844687e67b21dde7a32feb57e2 Author: zhenglh Date: Mon Apr 13 11:32:05 2020 +0800 客服消息添加无链接模式 commit acead7723450ee875c91dc9bd9d9e428163b2c51 Merge: 7295734f9 24ce3eac3 Author: fermi Date: Mon Apr 13 14:12:10 2020 +0800 merge 连续签到功能 commit 049db2b05a2737396123a6f63d4feab9d26d1ebe Author: zhenglh Date: Mon Apr 13 11:32:28 2020 +0800 前端域名限制未登录情况 commit 8afa33a480012a5d2f48c07e6da87c1313c3c35f Author: zhenglh Date: Mon Apr 13 11:32:05 2020 +0800 客服消息添加无链接模式 commit 6e8ae437d80ef297b487004a86ab9fa7ccd6a787 Author: liyt Date: Mon Apr 13 10:49:04 2020 +0800 GDT订单回传 commit 7295734f911ede37bd1e77c81e12b37763cf22b6 (tag: cps_20200413_110131) Author: zhenglh Date: Fri Apr 10 11:58:19 2020 +0800 头条回传使用加载js文件的方式 commit 4923873fc4a6aa7b903ac7efb6a50c0d4dbe7283 Merge: 093ee0be4 12e1ea564 Author: zhenglh Date: Mon Apr 13 09:54:53 2020 +0800 Merge branch 'dev-sql-opt-20200407' of http://192.168.0.31/fe/cps into dev-sql-opt-20200407 commit 093ee0be4b73a363dd8acd4bd88a7d1495057544 Author: zhenglh Date: Mon Apr 13 09:54:45 2020 +0800 限频日志等级降级 commit 12e1ea5643dd549c55e39bf4c004a536ee88cd10 Merge: 083349620 514424655 Author: wanggb Date: Mon Apr 13 09:53:16 2020 +0800 Merge remote-tracking branch 'origin/dev-sql-opt-20200407' into dev-sql-opt-20200407 commit 083349620e66b7563d1b8649e63d649ab835b2a7 Author: wanggb Date: Mon Apr 13 09:53:04 2020 +0800 解决问题：F:silent: error:SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry commit 0f53ad6ce90f17173f86fcd281fab97d9cfc2420 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Apr 10 20:49:09 2020 +0800 语速控制优化 commit f1f0e38bb56418ed8d785e18542aec6c34e340f5 Merge: 81d1b050e 62883a544 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Apr 10 19:24:56 2020 +0800 Merge branch 'dev-JDaudio-IOS-debug' of 192.168.0.31:fe/cps into dev-JDaudio-IOS-debug commit 81d1b050e25db22b4351b5b547296f92a3dc5ac9 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Apr 10 19:23:39 2020 +0800 定时器时间修改 commit 62883a54408ebd9442d02a09a9a49b87af6b5f22 Author: wanggb Date: Fri Apr 10 18:36:58 2020 +0800 听书开关逻辑打开 commit 4345817477d4828bb81f381847f875d2e72dd7b3 (tag: cps_20200410_175506) Author: liyt Date: Fri Apr 10 17:53:19 2020 +0800 修复重复回复两次问题 commit 8efadba5c736e832fe7848ed4a6f1b25cf84a037 Author: wanggb Date: Fri Apr 10 17:28:30 2020 +0800 仅阳光平台下Orders表连接到PolarDB commit bebc0318ce2a0cc17196ce01b826f2ab0da255bf (tag: cps_20200410_155928) Author: wudongdong Date: Fri Apr 10 15:53:48 2020 +0800 去掉.do后缀 commit 5c0faf15793a64143198a1daa7c6de70243104ae (tag: cps_20200410_154800) Author: liyt Date: Fri Apr 10 15:39:55 2020 +0800 优化换行 commit 05c6ecc11fe4eb3b0a6a0338378e0bc4d157981c Author: wanggb Date: Fri Apr 10 14:55:02 2020 +0800 新增PolarDbModel父类，同时将静默授权和分享活动改造继承该Model类 commit 30fb32e258d60e4b0fdf6af951dab839ed17b099 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Apr 10 14:48:32 2020 +0800 隐藏更多按钮 commit e09da932dfe21f9707e7dce2eb0a2f4c0ccc7f36 Author: wanggb Date: Fri Apr 10 14:09:55 2020 +0800 听书开关逻辑打开 commit 51442465567355aab19658ce41ddfe3ed399a06c Merge: 397b5bc79 7eee0182d Author: zhenglh Date: Fri Apr 10 13:45:02 2020 +0800 Merge remote-tracking branch 'origin/dev-sql-opt-20200407' into dev-sql-opt-20200407 commit 397b5bc796822f15c1e0d4c1a34afebbfa69b9a0 Author: zhenglh Date: Fri Apr 10 13:44:46 2020 +0800 文字客服消息标题长度限制120个字符 commit 33dfc6e3a9163d970aae471b63098cd770e5c35b Author: cuigang_qianduan <891257242@qq.com> Date: Fri Apr 10 11:38:44 2020 +0800 引导页展示 commit 643821c7e409e4f4c43dddcf412ec34108cf8d2f Author: cuigang_qianduan <891257242@qq.com> Date: Fri Apr 10 11:23:45 2020 +0800 php处理关闭 commit 7eee0182d2837ddbfc87e6a284f0edd66b25d837 Author: fermi Date: Fri Apr 10 11:13:22 2020 +0800 code review commit e2d0159880aeab9ce237bbbd2d5f2bf59d4914ca Author: cuigang_qianduan <891257242@qq.com> Date: Fri Apr 10 11:01:41 2020 +0800 样式调整 commit c6c6d24bcee93c2aa7ad6f5d7578be67054352ac Author: fermi Date: Fri Apr 10 11:01:18 2020 +0800 优化sql索引顺序 commit 24ce3eac3e9cb13069a674da3406c62df52fe638 Author: fermi Date: Fri Apr 10 10:47:48 2020 +0800 增加qy/sf/px/xg与yg平台同步连续签到功能 commit 07c4d5105328e0e34ce96b3742222edf42652d80 (tag: cps_20200410_144046, tag: cps_20200410_112843) Author: liyt Date: Wed Apr 8 20:41:19 2020 +0800 导粉入口优化 commit beebb3269fab225f75a496e475b55dcffa7555a2 Merge: e8293b9fa 166b7006b Author: cuigang_qianduan <891257242@qq.com> Date: Thu Apr 9 20:33:50 2020 +0800 Merge branch 'dev-JDaudio-IOS-debug' of 192.168.0.31:fe/cps into dev-JDaudio-IOS-debug commit e8293b9fae3c8b96424dd8a98a0e7317195c14f9 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Apr 9 20:31:45 2020 +0800 调整样式 commit 0aea93e5a6b70d20416b40742e399ead4c571848 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Apr 9 19:20:30 2020 +0800 增加断网检测 commit 166b7006b084f0c2d4a14bf944c032a1623114d1 Author: wanggb Date: Thu Apr 9 19:04:14 2020 +0800 听书开关逻辑打开 commit d20f232e870eafd7e8cf7dae2f018003212f7bcd Merge: 8d5240da3 e8c08d374 Author: wudongdong Date: Thu Apr 9 18:33:45 2020 +0800 Merge branch 'dev-sql-opt-20200407' of 192.168.0.31:fe/cps into dev-sql-opt-20200407 commit e8c08d37415dcd23c93a268ae3ffce52e9c2f20c Author: wanggb Date: Thu Apr 9 17:59:40 2020 +0800 优化最新的一条挑战赛活动信息 & 静默授权增加日志 commit 5c18698f15f5fe2b3953fb391b2292f934b386e9 Author: fermi Date: Thu Apr 9 15:54:08 2020 +0800 BookCollect数据汇总/BookCollectSum读取数据从从库获取 commit 7afbad5d3da6246060f07c5c8edc80b4a1d9937f Author: fermi Date: Thu Apr 9 13:56:50 2020 +0800 修改用户按月和汇总统计/UserCollectUpdate 从从库读取数据 commit 94853163f62ac6a2f18ad226c677ada554d01de7 Author: zhenglh Date: Thu Apr 9 11:53:32 2020 +0800 用户登录错误信息屏蔽处理 commit 2b345bd6ac2799f48613d0d09e0275f16c665f24 Author: wudongdong Date: Thu Apr 9 10:19:08 2020 +0800 订阅活动bug修改 commit f5757ba4fc6d199c088323dadd41d4c4d303c79b Author: zhenglh Date: Wed Apr 8 19:51:32 2020 +0800 异常处理 commit 022dac1123461710a7379495e448a1cc60febeed Author: cuigang_qianduan <891257242@qq.com> Date: Wed Apr 8 19:19:42 2020 +0800 测试语音 commit 1476ebf874ef89fd5c803f5eee0aa8d49883d46b Author: cuigang_qianduan <891257242@qq.com> Date: Wed Apr 8 19:05:49 2020 +0800 安卓对接OK commit f165768d6ec96f37106a612934f0dd48f34318c9 Author: fermi Date: Wed Apr 8 18:53:35 2020 +0800 阅读页增加分享拉新活动是否开启 commit 5ef097e4398f8149e3fd3f42201da66baadbca6c Merge: d12690668 4d723aed6 Author: wudongdong Date: Wed Apr 8 17:23:35 2020 +0800 Merge branch 'master' into dev-subscrip-20200319 commit 16f00145c788a6067cdb44f13517b6c46461fc60 (tag: cps_20200408_170809) Author: xuehuiwen Date: Wed Apr 8 16:48:07 2020 +0800 send message commit 30115997e6022967240f83fbcc68fcbf9bf0fa65 Author: xuehuiwen Date: Wed Apr 8 16:36:13 2020 +0800 send message commit e51a9cd28c2d59471b5dd014a6a11172b3ecb1c8 Author: xuehuiwen Date: Wed Apr 8 16:34:17 2020 +0800 send message commit c6bfb8e93c8ffbb47f59b9b77b2d819199066611 Author: fermi Date: Wed Apr 8 14:39:23 2020 +0800 去除用户行为标签维护 commit 98e37ac7942c64c99e30145cd99104a7e111b45c (tag: cps_20200408_110958) Merge: 2bae6fa16 227d13192 Author: xuehuiwen Date: Wed Apr 8 10:07:21 2020 +0800 Merge branch 'master' into dev-high-message20200214 commit b5c9ff6391afa87a3461572a63abc87cd3fb197b Author: fermi Date: Wed Apr 8 10:05:00 2020 +0800 分享拉新功能未开启时不创建用户归属关系 commit 2bae6fa162225353103d9451b2f3b2dbae491f67 Author: xuehuiwen Date: Tue Apr 7 21:08:49 2020 +0800 send message commit 227d131927a3e2847f93bab6ee5602fa1794afaf (tag: cps_20200407_200033) Merge: 4d723aed6 f0c3eaec0 Author: xuehuiwen Date: Tue Apr 7 19:39:50 2020 +0800 Merge branch 'dev-high-message20200214' commit f0c3eaec0ea8a1254e7c79e96838a24e545269dd Author: xuehuiwen Date: Tue Apr 7 19:38:20 2020 +0800 send message commit 59089eeae28a24e115a7d064ddf825c31308c620 Author: fermi Date: Tue Apr 7 19:35:38 2020 +0800 消耗书币，修改用户过期时间24H to 10H commit f707cb765d7f06c595b8c7c4752592024ef4e5bf Author: fermi Date: Tue Apr 7 19:30:11 2020 +0800 修改用户过期时间24H to 10H commit 3412e4d52f68c588033006b59ecb57de6fdf54fa Author: xuehuiwen Date: Tue Apr 7 18:52:20 2020 +0800 send message commit 8d5240da304c209b9d926bb32691968e4afeabbc Merge: 4d723aed6 2a6450c5d Author: wudongdong Date: Tue Apr 7 18:52:16 2020 +0800 Merge branch 'dev-sql-opt-20200407' of 192.168.0.31:fe/cps into dev-sql-opt-20200407 commit 2a6450c5df0b6a6e82fb0f4cf560d1b0d5bf7e2f Author: liyt Date: Tue Apr 7 18:48:46 2020 +0800 优化redis查询 commit 4d723aed6fa6feec4d658627d9735c39fa539da8 Merge: 2b308e420 32405a670 Author: wudongdong Date: Tue Apr 7 18:46:48 2020 +0800 Merge branch 'dev-channelapi-20200330' commit 32405a6701ef390a42b72e2b19846f49b6959aa8 Author: wudongdong Date: Tue Apr 7 18:45:41 2020 +0800 渠道接口-推广链接接口 commit 06f2adabdef3b34596ea75d8ab81a1418c07eb7e Author: liyt Date: Tue Apr 7 18:32:14 2020 +0800 优化redis查询 commit 483877458eb997c15c3c3d4c78973a1a8f72357a Author: xuehuiwen Date: Tue Apr 7 18:26:34 2020 +0800 send message commit 8ce24cfd33efec27ba13d2cc99963d36bd663619 Author: liyt Date: Tue Apr 7 17:51:28 2020 +0800 书籍分类ID为0的sql查询 commit bdb5dccf3ce289b8d9898137430daf98a6f2cf5d Author: fermi Date: Tue Apr 7 17:13:52 2020 +0800 优化获取昨日签到数据,去除无用的order by id commit 2b308e420c27eaba09df11d20bbe8a311c0444fc (tag: cps_20200407_161221) Merge: 94b03d82f 6ea53c091 Author: wanggb Date: Tue Apr 7 15:14:18 2020 +0800 Merge branch 'dev-high-message20200214' commit 6ea53c091e512764fd99fb8feb9cad9ba7169a61 Author: wanggb Date: Tue Apr 7 15:13:05 2020 +0800 高级群发- 渠道黑名单 - 筛选条件 去掉状态 commit d90bec892db84c41afd8db47e33b226cfef2e4bc Author: fermi Date: Tue Apr 7 15:08:18 2020 +0800 fix 小额充值url构造判断错误 commit 94b03d82f5fdc335bf660f6d580e681e7a21a081 Merge: 8ab15c19f 2b8b74386 Author: wudongdong Date: Tue Apr 7 14:29:33 2020 +0800 Merge branch 'master' into dev-channelapi-20200330 commit 2b8b74386ad1f6dc45dabac8bbe252c8de3318cc Merge: e0194c98a fbbe0b8b9 Author: wudongdong Date: Tue Apr 7 14:28:04 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 8ab15c19fb20e7f1a59c55ec6521ecf20eb6b7ac Author: wudongdong Date: Tue Apr 7 14:26:29 2020 +0800 渠道接口 commit d2155b242ab6187fcadbf4e8d6e154f7030cf824 Author: liyt Date: Tue Apr 7 14:14:17 2020 +0800 vip分流全部取出数组随机取一个 commit 2a63fe08fa3f940e687e6c952a2f3842ea929cea Author: fermi Date: Tue Apr 7 13:57:07 2020 +0800 优化vip账号下可选的常用链接列表筛选 commit fbbe0b8b942df68c9caa57e93aa2109828b877cc Author: liyt Date: Tue Apr 7 13:35:38 2020 +0800 商品库是否为新书 commit cbf7c1ac7273e11c9612efab4b106277d7d8ca18 Author: liyt Date: Tue Apr 7 10:55:45 2020 +0800 tdc书籍详情页域名可配置 commit a8854793100b9372cbba5152688cd60436736d5a Author: liyt Date: Tue Apr 7 10:39:41 2020 +0800 回传日志 commit c3f40ef9aa448b828a3598ee2685eb30eb062e5f Author: xuehuiwen Date: Tue Apr 7 10:22:18 2020 +0800 send message commit 10233b3ccbc08eef06f8b97c17189c69e861880b Merge: 0f8c88b3e e0194c98a Author: wudongdong Date: Tue Apr 7 10:19:38 2020 +0800 Merge branch 'master' into dev-channelapi-20200330 # Conflicts: # application/api/controller/Channeldataapi.php commit 6e3ac45b1d70804e8b5132f51e75df653333a58c Author: liyt Date: Tue Apr 7 10:10:05 2020 +0800 gdt的mp回传 commit 607c8616e64b101e4bf26cbd900bc1376047bbba Merge: 4650544c8 976dbb765 Author: xuehuiwen Date: Tue Apr 7 10:09:55 2020 +0800 merge master commit 976dbb765504c4c3f2b84200f4a24437bc54fe25 Author: zhenglihao Date: Sat Apr 4 19:30:06 2020 +0800 书币刷新前置操作，避免老用户书币无法使用 commit c055c1239779e5de5e05e89a3000a28d47ea193b Merge: 06104adcc d4cc9a30f Author: zhenglh Date: Fri Apr 3 19:19:52 2020 +0800 Merge remote-tracking branch 'origin/master' commit 06104adcc5d909ed287b06cb9e449fc2d8fa26da Author: zhenglh Date: Fri Apr 3 19:19:41 2020 +0800 浮动条css改动 commit 4650544c83a7502b87d6437ed53f9afb6828715d Author: wanggb Date: Fri Apr 3 19:17:21 2020 +0800 高级群发- 统计 -总UV 不加 今日uv commit d4cc9a30f80933e60e05d9d244442c06a207c4f2 Author: liyt Date: Fri Apr 3 17:13:53 2020 +0800 活动列表标题修改 commit e0194c98a03f6da24400b2627ae62e21dde1a7d8 Merge: 59c1f8ba3 f7008cecd Author: wudongdong Date: Fri Apr 3 17:11:02 2020 +0800 Merge remote-tracking branch 'origin/master' commit 0f8c88b3edecdd14855a30dbe463c3a667b707c9 Author: wudongdong Date: Fri Apr 3 17:10:03 2020 +0800 渠道接口 commit f7008cecd59db6f9faeb7b3ff3cd2abb725019a0 Author: liyt Date: Fri Apr 3 15:25:12 2020 +0800 活动提示修改 commit b0621a7d5f59b1538b4419f58e11d30761888357 Author: liyt Date: Fri Apr 3 15:17:56 2020 +0800 活动提示修改 commit 03fff343ee0e1663f260c77349ae965cff111af0 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Apr 3 13:38:57 2020 +0800 自动点击下一章时才自动朗读 commit 59c1f8ba3a58dfa3b80b3fd4981f19a7c2425af0 Merge: 0912c1847 c94a6db7e Author: wudongdong Date: Fri Apr 3 12:57:35 2020 +0800 Merge remote-tracking branch 'origin/master' commit c94a6db7e7243c2cb52776742775a1bda33b628e (tag: cps_20200403_131836, tag: cps_20200403_131340) Merge: 11cd8c20f 247958e36 Author: zhenglh Date: Fri Apr 3 12:28:36 2020 +0800 Merge branch 'dev-float-tips-cache-20200403' commit 247958e36cd4ff345912851926e653b47c46eeb5 Author: zhenglh Date: Fri Apr 3 12:28:26 2020 +0800 方式使用错误 commit 11cd8c20fd84742b1b4fc1db96ba4ea22334ccf5 Merge: 511302f08 a799a8964 Author: zhenglh Date: Fri Apr 3 12:27:21 2020 +0800 Merge branch 'dev-float-tips-cache-20200403' commit 511302f0811423ae8bcbabe9b893026d4dcce948 Author: zhenglh Date: Fri Apr 3 11:25:20 2020 +0800 头条，uc类文件前端调用错误 commit a9cb1d5308853ed2ea25f02ccc81d29e9bf646d2 Author: fermi Date: Fri Apr 3 11:05:28 2020 +0800 code review commit a799a8964f01512929a7e918a82431f0aa634eab Author: zhenglh Date: Fri Apr 3 10:59:01 2020 +0800 浮动条用户关联直接走缓存 commit 92be8a7ea7eac4000b0526e9ab3ad7906763bb80 Author: fermi Date: Fri Apr 3 10:50:14 2020 +0800 code review commit 9e81768c571ff52fd8a335f6bf6082d080fa4898 (tag: cps_20200403_103458) Author: zhenglh Date: Thu Apr 2 21:05:02 2020 +0800 内推页充值缓存删除，浮动窗缓存添加 commit 82500729bbdf681a7731784a6553157d09505f94 Author: wanggb Date: Fri Apr 3 10:10:27 2020 +0800 高级群发- 统计 - 重新获取当天UV commit 0912c1847cc768977fd5facaa8d979674a35a6ae Merge: 977ce57cb 83621971e Author: wudongdong Date: Thu Apr 2 21:45:04 2020 +0800 Merge remote-tracking branch 'origin/master' commit 83621971ec912e03ae236124d92f8bf0eef2adb2 Author: zhenglh Date: Thu Apr 2 20:59:42 2020 +0800 内推页充值缓存删除，浮动窗缓存添加 commit a91ad91e7efd74a35102589514a65211ce4777e0 Author: zhenglh Date: Thu Apr 2 20:58:16 2020 +0800 内推页充值缓存删除，浮动窗缓存添加 commit df7456224ff33e7824bff9aae0e2ab9025207088 Merge: 00ec09384 6d62381fe Author: wudongdong Date: Thu Apr 2 20:51:58 2020 +0800 Merge branch 'dev-merge-250-danye-export-fans-20200402' of 192.168.0.31:fe/cps into dev-merge-250-danye-export-fans-20200402 commit 977ce57cb239fd62b49c7aa99bfbcfb121eeceed Merge: 6d62381fe 00ec09384 Author: wudongdong Date: Thu Apr 2 20:50:35 2020 +0800 Merge branch 'dev-merge-250-danye-export-fans-20200402' commit 00ec093849271359643c85feac192b0c7a157699 Author: wudongdong Date: Thu Apr 2 20:49:33 2020 +0800 内推页-delredis commit 6d62381fe92c24ad4c1568efcecaf20422b9c343 (tag: cps_20200402_201516) Author: zhenglh Date: Thu Apr 2 19:54:13 2020 +0800 头条落地页，配置默认值 commit fff70853864a539c3e1981028bd98c31302e80f4 Author: zhenglh Date: Thu Apr 2 19:25:37 2020 +0800 头条落地页，配置默认值 commit 9df96ac7cc7361d1154340c9e27589c7999b9302 (tag: cps_20200402_185728) Author: zhenglh Date: Thu Apr 2 17:29:48 2020 +0800 搜索页面 commit 218bae6925893c8fb66701ae3d6162c7dfa4adf3 Author: zhenglh Date: Thu Apr 2 17:20:26 2020 +0800 字段修改 commit 4be8b9917767a1a8da05edec594678905b0f8014 Author: zhenglh Date: Thu Apr 2 17:14:59 2020 +0800 字段修改 commit cd670f6a8b74b43a03e1b630967b03bce8dd70bd Author: zhenglh Date: Thu Apr 2 16:25:59 2020 +0800 文件样式处理 commit 2f660339967a47ef81c799ce8b6f7df492eaa166 Author: zhenglh Date: Thu Apr 2 16:21:06 2020 +0800 文件样式处理 commit 4930c6c9b01b7c2bea8802c0d6e44e47bf2d137c Merge: be1508a22 b7cc90a33 Author: zhenglh Date: Thu Apr 2 16:13:52 2020 +0800 Merge branch 'dev-merge-250-danye-export-fans-20200402' of http://192.168.0.31/fe/cps into dev-merge-250-danye-export-fans-20200402 commit be1508a22882b9924ec5b5036acdd68f1580078e Author: zhenglh Date: Thu Apr 2 16:13:38 2020 +0800 文件样式处理 commit b7cc90a330d194d41d5ea0c581584350944ff679 Author: liyt Date: Thu Apr 2 15:50:35 2020 +0800 渠道VIP自定义活动弹窗时间列 commit 59c8cd3a5acc7ad0e120532f9b262a0e1e33c280 Author: wudongdong Date: Thu Apr 2 15:41:52 2020 +0800 打点 commit ba8d758fdeaa294338adfbc2aa406908b2687269 Author: xuehuiwen Date: Thu Apr 2 15:27:10 2020 +0800 send message commit 0cac726a0fa6bf19807b5b597f148a15eae8fca7 Author: zhenglh Date: Thu Apr 2 15:18:11 2020 +0800 添加导量支付项，默认开启 commit 09fd2a2007e47488f53b15e1a1ba50fa2856e0bf Author: liyt Date: Thu Apr 2 14:56:29 2020 +0800 素材为空更新素材处理失败 commit 374b0bf84bf78a9bc456e5029ec85f9c39a85e6a Author: zhenglh Date: Thu Apr 2 14:37:26 2020 +0800 素材失效处理 commit ec03c7804a30055f2c3994d8247f11ce16547faf Author: zhenglh Date: Thu Apr 2 14:36:39 2020 +0800 素材失效处理 commit 10f6c418b5d017b0e9bd5114b4c5f643f49854cb Author: zhenglh Date: Thu Apr 2 14:21:51 2020 +0800 素材失效处理 commit 72af1d93171673eae851e00690a120e709639278 Merge: 8d79d1417 c2213ad4f Author: zhenglh Date: Thu Apr 2 14:14:53 2020 +0800 Merge branch 'dev-merge-250-danye-export-fans-20200402' of http://192.168.0.31/fe/cps into dev-merge-250-danye-export-fans-20200402 commit 8d79d1417bd0e2bd6edaa70a112949e21963c9e5 Author: zhenglh Date: Thu Apr 2 14:14:34 2020 +0800 导量弹窗优先级最高 commit c2213ad4f0e44fe0505811990781b569fabad606 Author: wudongdong Date: Thu Apr 2 14:10:00 2020 +0800 内推页-优化 commit 224776795b1a60f5d0ef1ea3e4bd1cbc6e193773 Merge: 301ca09e4 987e91224 Author: wudongdong Date: Thu Apr 2 14:02:35 2020 +0800 Merge branch 'dev-merge-250-danye-export-fans-20200402' of 192.168.0.31:fe/cps into dev-merge-250-danye-export-fans-20200402 commit 8f74a3f65a85c34b8f72a6d449ea80c5e23cddb8 Author: xuehuiwen Date: Thu Apr 2 14:00:40 2020 +0800 send message commit 301ca09e4440ec7726b8be90a8b4d76de3965456 Merge: 6a2bb38be 8d07af4a8 Author: wudongdong Date: Thu Apr 2 13:59:18 2020 +0800 Merge remote-tracking branch 'origin/master' commit 987e9122423f558b1f16f44ff4f7d4e31f5f9925 Merge: 99da1aec0 b11aac43d Author: zhenglh Date: Thu Apr 2 13:43:04 2020 +0800 Merge branch 'dev-merge-250-danye-export-fans-20200402' of http://192.168.0.31/fe/cps into dev-merge-250-danye-export-fans-20200402 commit 99da1aec09210991c0d36eaf57e0f670f2495e80 Author: zhenglh Date: Thu Apr 2 13:42:40 2020 +0800 样式调整 commit b11aac43d584c6ed9a8223da95f9dbb4e749faab Author: wanggb Date: Thu Apr 2 13:36:36 2020 +0800 focus_status 修改字段类型为tinyint commit d9fe3f2c01834f5ea7674393797041a80e4e6d4b Author: zhenglh Date: Thu Apr 2 12:31:48 2020 +0800 粉丝导量资源缓存 commit b5b80025bd8a1100716c15d92b4406d685099812 Merge: 91f761f09 758bc2632 Author: zhenglh Date: Thu Apr 2 11:17:00 2020 +0800 Merge branch 'dev-merge-250-2-20200325' into dev-merge-250-danye-export-fans-20200402 commit 91f761f09b5b5a89f54bbf8c29259a115346d931 Merge: 8cf27566b 343970898 Author: zhenglh Date: Thu Apr 2 11:15:50 2020 +0800 Merge branch 'dev-workwechat-20200331' into dev-merge-250-danye-export-fans-20200402 commit 343970898f272a52e62d21e857f87d409bc28351 Author: zhenglh Date: Wed Apr 1 11:11:16 2020 +0800 粉丝导量测试完成 commit 8cf27566b678efc35af08a934b9a21f5e862cc3d Author: liyt Date: Wed Mar 25 15:27:33 2020 +0800 uc头条统计入库 内推页 批量关联渠道 commit d3581894e80c569992fdc3cee2e05cb725cd2ec2 Author: wudongdong Date: Thu Mar 19 16:39:35 2020 +0800 多个vip支持 commit 758bc263202263c25cc835e022537eb1962e8e32 Author: wanggb Date: Thu Apr 2 10:51:46 2020 +0800 Tabbar 点击加打点数据 commit 6632add4f7c40a0a7e6b79fe337f75a6d1de98bd Author: xuehuiwen Date: Thu Apr 2 10:46:05 2020 +0800 send message commit 3ec8f7efbbff9bc734ebb4bc06d81f61208fd450 Author: liyt Date: Thu Apr 2 10:39:43 2020 +0800 更新发送失败 commit 89656002d2061448694228d5f6ca9cf8bcfb3689 Author: xuehuiwen Date: Wed Apr 1 19:56:43 2020 +0800 send message commit 46989913603c3c703c5a9e61b0137629f82812fb Author: xuehuiwen Date: Wed Apr 1 19:18:52 2020 +0800 send message commit 381e5680b20d35563776602b054710f7bea638df Author: xuehuiwen Date: Wed Apr 1 19:15:50 2020 +0800 send message commit 06fa0c7029e88305e174339ee521bb8c9b59b63a Author: zhenglh Date: Wed Apr 1 18:14:30 2020 +0800 文件处理 commit da9af02af903d3709a9004bc429e638a1f055fde Author: xuehuiwen Date: Wed Apr 1 17:24:05 2020 +0800 send message commit 5320c8f34e8bc628fc32288c6d5d9e1cfc46884e Author: wanggb Date: Wed Apr 1 17:11:23 2020 +0800 头条落地页模板一增加留言 commit 6f1d950d4b38e931984066ff0bfd005e73389cdf Author: xuehuiwen Date: Wed Apr 1 16:48:24 2020 +0800 send message commit 439a3022f9c847994ecd3638f2337731cd14d7b4 Author: wudongdong Date: Wed Apr 1 16:47:28 2020 +0800 customnew commit 0e9d97b1c28f09973638e78597490f645990c962 Author: zhenglh Date: Wed Apr 1 16:16:00 2020 +0800 vip导出添加渠道商字段 commit ff9634e7eeaa2f36e956e987c175b3fe182adf5f Merge: 180aee7d9 629844254 Author: wanggb Date: Wed Apr 1 16:02:16 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 180aee7d92d87cf9a40d7783c0804b7bbf9e9708 Author: wanggb Date: Wed Apr 1 16:02:06 2020 +0800 高级群发- 统计 - 优化 uv 充值金额 commit 62984425400c5e7f865430fa0c1097ae1680ba2f Author: xuehuiwen Date: Wed Apr 1 15:56:54 2020 +0800 send message commit 00ea3fff12de0ffec5d15d54379271c55020bc86 Author: xuehuiwen Date: Wed Apr 1 15:35:02 2020 +0800 send message commit 00fd65b80f5b1f96b256600f2cd1b1a2b981ae3c Merge: 0886ed620 214a5d3df Author: xuehuiwen Date: Wed Apr 1 15:18:51 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 0886ed6209cf66081b58c78cf90e884769c52329 Author: xuehuiwen Date: Wed Apr 1 15:18:39 2020 +0800 send message commit 6b992fc3bdbd0c159dbacf1b975305d2a875e7f9 Author: zhenglh Date: Wed Apr 1 15:09:41 2020 +0800 代码回归 commit fcafb3e7d6f205a7694e79613ec448c1e40efbfc Author: zhenglh Date: Wed Apr 1 15:06:48 2020 +0800 活动开启代码 commit d37a795ef142b9f631b367c3114b6a1aeaf5f025 Author: zhenglh Date: Wed Apr 1 15:04:42 2020 +0800 活动开启代码 commit 214a5d3df72c9406c95fcd877f8eff62899d8640 Author: wanggb Date: Wed Apr 1 14:46:07 2020 +0800 高级群发- 统计 - 优化 uv 充值金额 commit 03b43590142b4fbffa4a19fecef969dae4375c3f Merge: 788480515 0446e731d Author: wanggb Date: Wed Apr 1 14:33:35 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 7884805156f2a2c0409c1d5c9d474e9ed448088c Author: wanggb Date: Wed Apr 1 14:33:26 2020 +0800 高级群发- 统计 - 优化 uv 充值金额 commit 784cfed47147a726ed2dbd49cbf081d50e90a8d2 Author: zhenglh Date: Wed Apr 1 12:33:57 2020 +0800 客服消息添加自定义活动最多显示21个 commit f72c789803b7a584792bab8586a1e4dfd4de5485 Author: zhenglh Date: Wed Apr 1 12:22:26 2020 +0800 vip删除自定义活动 commit d79174aadd33f37778573a06cb5570e09292b684 Author: zhenglh Date: Wed Apr 1 12:19:49 2020 +0800 vip删除自定义活动 commit 0446e731db730bd3f2b3838abe055d9c3485cf51 Author: xuehuiwen Date: Wed Apr 1 11:55:46 2020 +0800 send message commit a504c6e5e9cf1809f0c07f667ff993a131717451 Author: wudongdong Date: Wed Apr 1 11:30:26 2020 +0800 userinfo 接口修复 commit e60340268a29843b9c2a7323a1667d0ffbabb9b5 Merge: 94eb522d7 c32afaebc Author: wanggb Date: Wed Apr 1 11:19:07 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 94eb522d7a2fe029554d213e9063cf809a1f6f23 Author: wanggb Date: Wed Apr 1 11:18:56 2020 +0800 高级群发- 统计 - 加入今日统计数据 commit c32afaebc470c18c9182fea59129ae89e2cd009c Author: xuehuiwen Date: Wed Apr 1 10:53:27 2020 +0800 send message commit e42b1cdd1638bbb06f96ebf53825874013a5de8c Author: wanggb Date: Tue Mar 31 16:24:19 2020 +0800 个人中心页面有tabbar，同时有开通年费VIP广告栏时，阅读记录被覆盖； commit 2d7aa9dbe9f430e15c0373141f6518804e084744 Author: wanggb Date: Tue Mar 31 15:56:25 2020 +0800 书籍简介-为空时，整个板块不显示 commit 38de74763ccf8c2044a2d69e32de8e4cf842edc8 Author: wanggb Date: Tue Mar 31 15:09:44 2020 +0800 cnzz input 替换为 textarea commit df45a481e089e88f6d8304c752d040508a18cd3a Author: liyt Date: Tue Mar 31 14:45:24 2020 +0800 隐藏平台活动的弹窗时间 commit d1b4a9f456bfbcaf778208622a71715a934c5708 Author: wanggb Date: Sat Mar 28 18:38:04 2020 +0800 头条页面优化 commit ebddf56efe9e78a0f4eace01cf865c05323e3f9c Author: wanggb Date: Sat Mar 28 11:51:22 2020 +0800 头条页面优化 commit b0428d36eb1ad42b6fcdc188b86a3a2f90d233d6 Author: wanggb Date: Wed Mar 25 16:36:34 2020 +0800 头条优化，新增模板 commit b503117d2694d9f178a7966b533e77253caf062b Author: wanggb Date: Wed Mar 25 10:42:01 2020 +0800 头条优化，后台增删改查 0 commit ffdc8a606f3c3a4549b2e78e7fecf768e0ff87d1 Author: wanggb Date: Mon Mar 23 16:09:26 2020 +0800 merge commit 32a0401e55f54f9590d70fc65051e28d0f0a74e8 Author: liyt Date: Wed Mar 25 10:45:42 2020 +0800 活动需求改造 commit d81ad621ff0681c6a7300d46acebc2caf0988127 Author: xuehuiwen Date: Tue Mar 31 22:51:11 2020 +0800 send message commit 10b50302eefe8b5391dff893831894928b5b953b Merge: 11ba78182 bf691954d Author: xuehuiwen Date: Tue Mar 31 19:09:13 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 11ba78182e9b239a98f0bfab908dbe7b18146b7b Author: xuehuiwen Date: Tue Mar 31 19:09:01 2020 +0800 send message commit bf691954de2df6848f3e852091b3cc09f2170b06 Merge: 403c699c9 76a3f205a Author: wanggb Date: Tue Mar 31 18:55:33 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 403c699c9aa6edc34d01c21cc4a437db262fb3b4 Author: wanggb Date: Tue Mar 31 18:53:43 2020 +0800 高级群发- 校验是否是配号代理商 commit 76a3f205a28ae1bbe3bc624faf37150e07d70dfe Author: xuehuiwen Date: Tue Mar 31 18:46:11 2020 +0800 send message commit 6532699ad48b21077ebc690a495534a955a94e9d Author: xuehuiwen Date: Tue Mar 31 18:28:15 2020 +0800 send message commit 02dda565696589f4d4e973161a61c2c29545a0ea Merge: 1efb459f1 efabca732 Author: xuehuiwen Date: Tue Mar 31 18:10:44 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 1efb459f12cd3dd4c82b4156d69e3fdc8e9a3408 Author: xuehuiwen Date: Tue Mar 31 18:10:37 2020 +0800 send message commit efabca7325e206db1fdd3a7646fc31584d59c25d Author: wanggb Date: Tue Mar 31 17:35:40 2020 +0800 高级群发- 用户群组去掉 - 消费书籍分类 commit cb27bb9aed26ce01ef85a0dddc97d7551db1dd70 Author: xuehuiwen Date: Tue Mar 31 17:12:59 2020 +0800 send message commit 7ccb9803c146399e4921bc04a8341857055f9d9b Author: xuehuiwen Date: Tue Mar 31 16:25:32 2020 +0800 send message commit eec6522dead4e606d8dfedd0344aa506737ec38a Author: xuehuiwen Date: Tue Mar 31 16:01:29 2020 +0800 send message commit 2f0e8c11c42dcb44cd27ce33d47f94c1aeac32dc Author: xuehuiwen Date: Tue Mar 31 15:41:04 2020 +0800 send message commit 8d07af4a820a371995f00995aecd29305b67ee6c Merge: b36b8a408 750b5911c Author: wanggb Date: Tue Mar 31 14:30:03 2020 +0800 Merge branch 'master' into dev-tragedy-20200330 commit 4fb7fd83b2a99c7104324d57b2832c6b7423245d Author: xuehuiwen Date: Tue Mar 31 14:27:38 2020 +0800 send message commit 750b5911c32cb87a2d8b91d937073c66adb66d8e Merge: 133404813 57da8bed6 Author: wanggb Date: Tue Mar 31 14:27:21 2020 +0800 Merge remote-tracking branch 'origin/master' commit d5a323eeaf85ea5568123833a2e65f0af2fa40a6 Author: xuehuiwen Date: Tue Mar 31 13:40:38 2020 +0800 send message commit 799a62f6470cc4864b232d88ab06b5fcdcbb1ada Merge: e30122c54 f2f7a0412 Author: wanggb Date: Tue Mar 31 11:14:54 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit e30122c54e4a7853bb3e0a0218e14655e831fe3c Author: wanggb Date: Tue Mar 31 11:14:45 2020 +0800 高级群发统计-点击人数展示UV commit f2f7a041226559efafe93ece672f171c1993a265 Author: xuehuiwen Date: Tue Mar 31 11:06:32 2020 +0800 send message commit b729c4f6cae25c2ba05ca60003ba17dd6da564a0 Author: xuehuiwen Date: Tue Mar 31 10:23:33 2020 +0800 send message commit 405801492370486f025873348e925238655788cf Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 31 10:10:13 2020 +0800 IOS不自动播放 commit 57da8bed61577f87dac8bc512b849c499cd94515 Author: zhenglh Date: Mon Mar 30 16:17:48 2020 +0800 详单查询，排序问题处理,用户阅读下一章关注时报错处理 commit d1231ce7e660092303bb38f9cc697d5e0b849b9a Author: xuehuiwen Date: Tue Mar 31 09:42:12 2020 +0800 send message commit b36b8a408fd5bc7efb7fb812d75bb050877ebc74 Author: wanggb Date: Mon Mar 30 17:57:23 2020 +0800 增量：QR_UV数据统计 commit cd37721e576c76e5d295d5d5bbc7456a36eee03d Author: wanggb Date: Mon Mar 30 16:46:35 2020 +0800 高级群发数据统计-全部用户 commit 133404813786b1d4210503f216403136e8e8c0f2 Author: zhenglh Date: Mon Mar 30 16:17:48 2020 +0800 详单查询，排序问题处理 commit 4e0d0f1267ce5218e874dbade2156afd5c982e80 Author: zhenglh Date: Mon Mar 30 16:07:35 2020 +0800 详单查询，排序问题处理 commit 683cec80d8a61499906aa9ad3ce9fd65c1137f6f Author: zhenglh Date: Mon Mar 30 15:42:34 2020 +0800 详单查询，排序问题处理 commit c641b499a2cb92ce0ddeb2fda62340fbaac7c475 Merge: c2bc53bb0 fe678c71f Author: wanggb Date: Mon Mar 30 15:38:26 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit c2bc53bb06adc7fe2322aa1cbe9312a5fab99f3d Author: wanggb Date: Mon Mar 30 15:38:16 2020 +0800 高级群发-脚本删除用户Tag commit 398a555e10f89a1a23e77270aaf519ba3725b21c Author: wudongdong Date: Mon Mar 30 15:17:55 2020 +0800 cp commit fe678c71f5a37a63de26bc8111324de5eb7b3e2a Author: xuehuiwen Date: Mon Mar 30 14:52:18 2020 +0800 send message commit 30738ed684ce3d6d9a8f9002d0150ca52134097c Author: fermi Date: Mon Mar 30 14:18:20 2020 +0800 增加vip充值和小额充值常用链接 commit 6a2bb38be30ead954202627fffb433506714b489 Merge: bd98da165 63942dda9 Author: wudongdong Date: Mon Mar 30 14:08:57 2020 +0800 Merge remote-tracking branch 'origin/master' commit b0059f9435f8024335ddb6e2056d264ac64eb743 Author: wudongdong Date: Mon Mar 30 14:00:50 2020 +0800 260 同步书籍CP+增加订单注册时间+渠道自定义小说章节价格 commit a1a305d70b357e4bef3f0f9dd11ac947359f6f9a Author: wanggb Date: Mon Mar 30 13:57:00 2020 +0800 高级群发-数据统计-只能看到自己创建的数据 commit 9d2a5cc3acafc840f478456fd4711401738db712 Author: wanggb Date: Mon Mar 30 13:53:22 2020 +0800 高级群发-数据统计-只能看到自己创建的数据 commit b1e368fc28f73e974fbd9d19ddc96b1708b12680 Author: fermi Date: Mon Mar 30 11:24:38 2020 +0800 增加提交后刷新当前商品操作 commit 704a721b06dd0bca4aebd6a8d662bd8569cce5dd Author: wanggb Date: Mon Mar 30 10:22:23 2020 +0800 高级群发-用户组只能看到自己创建的群组 commit 2f0e1a0f0fa7446d07b0f6bc9db9b8368f906b50 Author: xuehuiwen Date: Sat Mar 28 17:33:30 2020 +0800 send message commit 8b440cdbede0a03ece2d6017f6251669740cde23 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 17:17:33 2020 +0800 $isListenBookOpen commit f4d0665bde079544aca99583f7aaae0d554bac16 Author: fermi Date: Sat Mar 28 17:16:49 2020 +0800 vip充值列表拆分未已充值和未充值 commit 9d93dbcfc7389a804a6e9d9b28ebcb59735769cd Author: xuehuiwen Date: Sat Mar 28 17:04:59 2020 +0800 send message commit ecc44054e84e3cda1b327e4ce3cf42945406c1cb Author: xuehuiwen Date: Sat Mar 28 16:50:17 2020 +0800 send message commit 4b79a1dd7855ea79dba5e5de42af694a94928680 Author: xuehuiwen Date: Sat Mar 28 16:49:21 2020 +0800 vip auto reply commit 2572e4452cdb3ed86c8eaa72c59e76ebdb70d085 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 16:26:48 2020 +0800 imgtext_dig commit 5555c69fcb2e9fbf20abd7bf13efe28926c0114a Merge: 0a3ea59f3 b486c4733 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 15:46:04 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 0a3ea59f3991aea602858125dc270fd19b3a66b1 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 15:45:22 2020 +0800 2行省略号 commit f8bc8d3efe91ccd49b64d5e84dcc8ca2ff6ba2db Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 15:40:36 2020 +0800 style="background: rgba(0,0,0,.3);" commit b7ca6d3c63d37ebe858564eb6ca511bf58bb2627 Merge: ddc18b573 63942dda9 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 13:45:04 2020 +0800 Merge branch 'master' into dev-JDaudio-IOS-debug commit b486c473392cc02a632e996bf2fc72d86ab33ee5 Author: xuehuiwen Date: Sat Mar 28 11:47:54 2020 +0800 send message commit beb94bda336615d026f2385d8ee5ac7741bdd3c4 Merge: 2ca5a80dd 52f68c715 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 11:47:07 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 2ca5a80dd1c8b655ea8102e87893533757580194 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 11:46:55 2020 +0800 图片消息超1隐藏添加按钮 commit 96388c0b8e8f2204dac1dce07588aad25e36aef3 Author: fermi Date: Sat Mar 28 11:36:13 2020 +0800 增加vip图文客服消息常用链接和vip文字客服消息常用链接 commit 4341aee24a325180eff8fe385a0928c2bb44e56f Author: fermi Date: Sat Mar 28 11:11:00 2020 +0800 增加vip文字客服消息->常用链接地址 commit 52f68c71588c3896fb2287924c7b34df3dd767c0 Author: wanggb Date: Sat Mar 28 10:57:19 2020 +0800 高级群发-用户组界面优化 commit 5bed0d821bb888061ae17e2faf70f4755a6b0746 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 10:45:38 2020 +0800 h180 commit 33c91d07b63b9c7bea890d35e2a98465ddb2e307 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 10:36:30 2020 +0800 preview 图片180移除 commit d5c398373ef8c6afbf1c33ceece83ab5af08ec42 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Mar 28 10:24:11 2020 +0800 文字颜色改黑色,文字背景移除,文字省略号 commit 63942dda9c07e086c2b605de75698ef9a45cb129 Author: zhenglh Date: Fri Mar 27 19:16:28 2020 +0800 章末推荐 commit 8a56385707c40b46987ad536426eb6c1601df9fc Author: fermi Date: Fri Mar 27 18:40:23 2020 +0800 增加常用链接排行榜 commit 3b123bd7cdcd7435bfc4d17b66d1df3c9f38f0e9 Author: fermi Date: Fri Mar 27 18:30:45 2020 +0800 去掉Vip充值和小额充值 commit 24c32822a35c6405ae218632db9f67458e4d2d05 Author: fermi Date: Fri Mar 27 17:38:43 2020 +0800 增加客服消息常用链接设置-V1 commit faecb224392babc6387d3696a2c8b507caa44164 Author: xuehuiwen Date: Fri Mar 27 17:33:20 2020 +0800 send message commit 364b0746ed0469b4f2a39818defd1c7da3a66602 Merge: 6f94582f5 f37b23e3b Author: wanggb Date: Fri Mar 27 15:06:20 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 6f94582f56adfd1516704bb85600380d5544739a Author: wanggb Date: Fri Mar 27 15:06:10 2020 +0800 高级群发-用户组界面优化-详情 commit f37b23e3bdabadece216315e589dc62040c4adcc Author: xuehuiwen Date: Fri Mar 27 15:02:26 2020 +0800 send message commit eeaad16b4fca6f4938bb46da4848ac9c210f8ec3 Author: wanggb Date: Fri Mar 27 13:02:05 2020 +0800 高级群发-用户组界面优化-导入用户ID commit de3cf98542cec1564add70822c58a3e23a9dc173 Author: wanggb Date: Fri Mar 27 11:28:21 2020 +0800 高级群发-用户组界面优化 commit bd98da165687d8888b17ff4fc412838fce075b0c Merge: 9efbdd9a3 a5ca6a5e6 Author: wudongdong Date: Fri Mar 27 10:31:04 2020 +0800 Merge remote-tracking branch 'origin/master' commit 3b845bfe3d4381b4a351fc5f56acaba0af58a3aa Author: wanggb Date: Fri Mar 27 10:17:57 2020 +0800 高级群发-用户组界面优化 commit d12690668a6231c357da01a7fe60be1eb438aec7 Author: wudongdong Date: Thu Mar 26 19:02:32 2020 +0800 订阅活动-渠道统计 commit 5cdd48a38b14a61e831b1c453da2f6da9419ec6e Author: wanggb Date: Thu Mar 26 18:43:49 2020 +0800 高级群发-用户组界面优化 commit 6814b9bd26180b664c3befb0dcb0ac9ddaa53532 Author: xuehuiwen Date: Thu Mar 26 18:34:46 2020 +0800 send message commit b8ef1cbf0e1684bc61ec030d9f8025372f1472d5 Author: wudongdong Date: Thu Mar 26 15:32:40 2020 +0800 订阅活动优化 commit a01d0e6788241867437e1490d7704d09635a1a85 Author: xuehuiwen Date: Thu Mar 26 15:28:48 2020 +0800 send message commit ddc18b573358b2924680f55791f610ea57af06e8 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 26 13:44:22 2020 +0800 最新接口地址增加id参数 commit dc9d2a9f9c171a9455411bce05f576089c037715 Author: xuehuiwen Date: Thu Mar 26 11:53:08 2020 +0800 send message commit a5ca6a5e6accea908c20a7bc87779ad81ca59159 (tag: cps_20200326_135239) Author: wanggb Date: Thu Mar 26 11:51:52 2020 +0800 充值加购模板增加tabbar commit 06b73789c7571e22375dc555e089507946c125bc Author: wudongdong Date: Thu Mar 26 11:12:47 2020 +0800 订阅活动优化 commit 9c4630fc97b044f095d6eaf962964c17cf0eeff4 Author: xuehuiwen Date: Thu Mar 26 11:10:03 2020 +0800 send message commit 23065494d3c7f5aca34a6185a99ebb87a7223883 (tag: cps_20200326_102322) Author: zhenglihao Date: Wed Mar 25 22:01:21 2020 +0800 回传kl逻辑修正 commit 136d16355ba5aa529b11db04a5ea7a34e3e3a11d Author: wanggb Date: Wed Mar 25 19:48:27 2020 +0800 点看修改开始阅读href commit 972693b672cc9662cd6d51e9d66fb8167c1b3a9e Author: wudongdong Date: Wed Mar 25 18:08:21 2020 +0800 打卡完成页面 commit 7ad34c4804e0c398b9d3cffe71ce842f01781b82 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 25 17:52:08 2020 +0800 还原html结构中audio部分 commit b3cf916497fcd0071d9b5040ef907dbabb5fcd28 (tag: cps_20200325_184531, tag: cps_20200325_173833, tag: cps_20200325_171549) Author: wanggb Date: Wed Mar 25 17:09:15 2020 +0800 tabbar A/B test commit ae26010230a1a3c403310eb53de5e093f01624c4 Author: machao Date: Wed Mar 25 15:18:56 2020 +0800 去掉适配iphonex commit bbd17e4533f35804c9f3154e0864f7396334ace7 Author: xuehuiwen Date: Wed Mar 25 15:01:51 2020 +0800 高级群发 commit 06226d463762c4ec6dd0f4e87bd74f995ba7abfd (tag: cps_20200325_145329) Merge: 0fee3f218 a4b5514c2 Author: wanggb Date: Wed Mar 25 14:47:28 2020 +0800 Merge branch 'master' into dev-pity-20200318 commit 0fee3f21891768c7d741d410663d8094aa1c6b3d Merge: 77d316add a0366729e Author: wanggb Date: Wed Mar 25 14:46:50 2020 +0800 Merge remote-tracking branch 'origin/dev-pity-20200318' into dev-pity-20200318 commit 77d316addd06bec764e4510fdb313a1c00f9a98c Author: wanggb Date: Mon Mar 23 18:08:15 2020 +0800 merge rebase-- commit a4b5514c2bced0746219a31a4df20e0353c06314 Author: 李天时 Date: Wed Mar 25 13:57:43 2020 +0800 刷新前一天转移渠道订单统计表，优化order表sql查询 commit a0366729e32af6a623b356197f2cff1af6c0e60a Author: wanggb Date: Wed Mar 25 13:57:30 2020 +0800 优化 commit da04a2e3ea11365dba955defbe42b17f6f73677a Author: machao Date: Wed Mar 25 13:56:19 2020 +0800 tabbar字体修改 commit af788714c3e3bbcbe2f603c6252378762d03c78c Author: 李天时 Date: Wed Mar 25 13:54:00 2020 +0800 刷新前一天转移渠道订单统计表，优化order表sql查询 commit 33fbbf7da984647b67a23b2b3222eebb38f25621 Author: wanggb Date: Wed Mar 25 13:20:06 2020 +0800 优化 commit b8ef34c90c814c636c77db51bd1347a86c6558bd Author: wudongdong Date: Wed Mar 25 12:44:03 2020 +0800 订阅活动补卡 commit 3b4496d6c216740b3f04f94fb245f105a110270e Merge: a25ffa2ae 9aecb71d5 Author: wanggb Date: Tue Mar 24 20:11:25 2020 +0800 Merge remote-tracking branch 'origin/dev-pity-20200318' into dev-pity-20200318 commit a25ffa2ae46740c7360ebe27a3a4a66132811260 Author: wanggb Date: Tue Mar 24 20:11:13 2020 +0800 优化 commit 8df3105c7c09fdc7674ff8b1bc3183820a1f63d3 Author: xuehuiwen Date: Tue Mar 24 19:39:32 2020 +0800 send message commit c56b8c63228f58665573106aa8ef9d8798c68fcd Author: wudongdong Date: Tue Mar 24 19:32:38 2020 +0800 活动入口 弹窗 commit 9aecb71d5cd48e7f9ac6c242b5e0b71a443d327c Author: machao Date: Tue Mar 24 19:27:39 2020 +0800 修改书籍详情 commit 48a94ba99fc8db05713496b390ca58c3052d5550 Author: 李天时 Date: Tue Mar 24 18:51:58 2020 +0800 刷新前一天转移渠道订单统计表 commit 6b4bd23dd17b8e228cdd38688009d0b2ffa4ca61 Author: machao Date: Tue Mar 24 18:36:26 2020 +0800 修改书籍详情 commit 6a1af997751ef9e8668d7d8b35b6d947ad44594c Author: wanggb Date: Tue Mar 24 18:35:31 2020 +0800 优化 commit 5d4cec4e9f7844393eda2efc6cb682af9efe8a62 Author: xuehuiwen Date: Tue Mar 24 18:17:57 2020 +0800 添加发送状态值 8：发送失败(接收人数小于2) commit 433ae352864f93741d3b145d5d26133cba38f93e Author: wanggb Date: Tue Mar 24 16:50:40 2020 +0800 优化 commit 41cc2f7bd22dd4d99d47f53fd550d88b23d3f957 Author: machao Date: Tue Mar 24 16:32:54 2020 +0800 修改样式书籍详情头部 commit eef55de4fda8597fac308658ded1575e54bafb5f Author: xuehuiwen Date: Tue Mar 24 16:14:29 2020 +0800 注释掉发送时间限制 commit b2149ebd0c5b01f7672a585ba1ec1e021eba8b9d Author: machao Date: Tue Mar 24 16:01:41 2020 +0800 修改样式 commit c006fc87890578dfbc0a7900c8afc48d20a95a99 Author: wanggb Date: Tue Mar 24 15:57:08 2020 +0800 优化 commit 01bb5969fa9420c3a824ab21c4eb7e584ee26494 Author: 李天时 Date: Tue Mar 24 15:44:52 2020 +0800 刷新前一天转移渠道订单统计表 commit 2f195d0abc593e3e8fd07236c2ebec17c7f6a03f Merge: 5a5d543c1 f8f1f73f6 Author: xuehuiwen Date: Tue Mar 24 14:02:16 2020 +0800 send message merge master commit f2632526dc4d2703f2e2d822b5a729823d2daf73 Author: wanggb Date: Tue Mar 24 13:45:15 2020 +0800 优化 commit 09a445ca4d980b17e4b084b465033e0213aabcda Author: 李天时 Date: Tue Mar 24 13:41:43 2020 +0800 刷新前一天转移渠道订单统计表 commit 24b7a5dba1e7e4ca321f4b8019a036339e5a9202 Author: wanggb Date: Tue Mar 24 13:20:49 2020 +0800 优化 commit 97cc41e17de251934a42180ec728ce9915566411 Author: wudongdong Date: Tue Mar 24 11:15:53 2020 +0800 报名 commit 7bd05f32e88c819ce202b568226cc52f1a29e8ff Merge: 3e2dd3a72 f8f1f73f6 Author: 李天时 Date: Tue Mar 24 10:51:14 2020 +0800 Merge branch 'master' into dev-ordercollect-20200318 # Conflicts: # application/command.php commit 06edf111ac1184cc31101100496a56e4eade6232 Author: wudongdong Date: Tue Mar 24 10:10:42 2020 +0800 大小写 commit 50a380b3e04fc3da4676fc68c665bd7874548152 Author: wudongdong Date: Tue Mar 24 10:03:39 2020 +0800 订阅活动前端 commit 039265106ddd7d997ae75cd119fba557f8d44ad2 Author: wanggb Date: Mon Mar 23 19:45:04 2020 +0800 优化 commit a5f444fc118c3b72c2494886c174a72c3555c827 Author: wanggb Date: Mon Mar 23 18:08:15 2020 +0800 优化 commit 5387e1979d8cfd7084f4a101f2408d778bda1037 Author: wudongdong Date: Mon Mar 23 15:01:06 2020 +0800 订阅活动报名 commit bd1d851accee7be94811c44cf3e040e371759b08 Merge: 81d146770 f8f1f73f6 Author: wanggb Date: Mon Mar 23 11:02:58 2020 +0800 Merge branch 'master' into dev-pity-20200318 commit 81d146770e440aadf8332f90fd40503e1e39436d Author: wanggb Date: Fri Mar 20 18:40:02 2020 +0800 底部Tab commit f8f1f73f63ef742189a2bb8b1d4bb1c7bbf14dec (tag: cps_20200320_193213) Author: liyt Date: Fri Mar 20 17:55:37 2020 +0800 客服消息搜书条件 commit 9efbdd9a33483dc8d4b85e6ae5823ec49cb18aa8 Merge: 99250facf c50b1fde9 Author: wudongdong Date: Fri Mar 20 16:32:17 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps into dev-250-append-20200313 commit 99250facf8bfeccc80fb17712ced133794f143e2 Author: wudongdong Date: Fri Mar 20 16:31:38 2020 +0800 vip commit 2f21cbcb89b2ed6761dc596fccf483d06894ee89 Author: wudongdong Date: Fri Mar 20 16:02:09 2020 +0800 订阅活动添加 commit c50b1fde9c5b558088a26542cf724ab47c9494d6 (tag: cps_20200320_165603) Author: zhenglihao Date: Fri Mar 20 15:49:01 2020 +0800 点看，阳光页面vip处理 commit 03c60c922da22c14be7c827572145b17335f6a9f Merge: bb9a8fc39 c88e14783 Author: wanggb Date: Fri Mar 20 11:34:13 2020 +0800 Merge branch 'master' into dev-pity-20200318 commit c88e14783000591efbe2a18ab33f601791f188ca Author: liyt Date: Fri Mar 20 08:17:20 2020 +0800 缩短弹窗缓存时间增加返回字段 commit 2f86064f7f364602d8b2e491afc4eefbe8a94d69 Merge: d73678500 9bbda7e31 Author: zhenglh Date: Fri Mar 20 05:58:49 2020 +0800 merge from 250-append commit d73678500768674ff370e93d2ef87bca8725cb9e Author: zhenglh Date: Fri Mar 20 05:31:45 2020 +0800 签到错误 commit 0a004b554f118dc24748ca4d142fc682f814213a Merge: 95ca6c80c 6a12dd6f9 Author: zhenglh Date: Fri Mar 20 05:11:08 2020 +0800 Merge remote-tracking branch 'origin/master' commit 95ca6c80c302074ed0766e7152cc719bb8dac02c Author: zhenglh Date: Fri Mar 20 05:10:59 2020 +0800 活动缺失的处理 commit 6a12dd6f969762753138ec3a53a4ec547eccb77a (tag: cps_20200320_043056) Author: liyt Date: Fri Mar 20 04:29:49 2020 +0800 赠币活动不关联商品 commit 08d93d8b5bdb05d2599ffc9d2192a8bc74b12f4e (tag: cps_20200320_040615) Author: liyt Date: Fri Mar 20 04:03:57 2020 +0800 编辑活动删除弹窗缓存 commit 6cdead97290fd28e4da36fbed31d8b77ac5306b9 (tag: cps_20200320_034432) Author: liyt Date: Fri Mar 20 03:10:57 2020 +0800 活动缓存 commit b9da5c12d6386aa00b8a14c9e57a814db034f2de Author: liyt Date: Fri Mar 20 02:52:51 2020 +0800 刷入缓存 commit db3d9bac8a5e3363117477e8aebf26b2821064c7 Author: liyt Date: Fri Mar 20 02:52:03 2020 +0800 刷入缓存 commit 4b0c5bc75729889e3ad5f8d5519d074afd9d661a Author: liyt Date: Fri Mar 20 02:24:14 2020 +0800 刷入缓存 commit d6fc627cfc7022ec06b85cc53706cdf3f24439cf Author: zhenglh Date: Fri Mar 20 02:08:27 2020 +0800 客服消息时间处理 commit a45bb8eacc37b0f00ab1a28d9fe59d2d1298aba1 Author: zhenglh Date: Fri Mar 20 02:01:48 2020 +0800 微信自动回复 commit eeef25ab4e3222787f96f73ea4c19f2c84396e63 (tag: cps_20200320_015130) Author: zhenglh Date: Fri Mar 20 01:49:21 2020 +0800 250补丁 commit 9bbda7e3140201f6cf4445170df1dfc28f88ba3e Author: zhenglh Date: Fri Mar 20 01:19:25 2020 +0800 搜索处理 commit 0970502be76033a8191971dd02b657cbefd3e293 (tag: cps_20200320_003752) Author: zhenglh Date: Thu Mar 19 22:20:25 2020 +0800 自动回复处理 commit 0426569651c357481feb12d6405fab28874da5ed Author: zhenglh Date: Thu Mar 19 19:01:16 2020 +0800 常用链接处理 commit bb9a8fc390bd84eff738b9c6e2eea8babdc24fda Author: wanggb Date: Thu Mar 19 18:59:06 2020 +0800 书籍详情页面完善 commit 0393dc4517b9c2e7bfa79556a8b5d86f59e880a3 (tag: cps_20200319_181918) Merge: 06aacdcb8 76bf98394 Author: zhenglh Date: Thu Mar 19 17:34:52 2020 +0800 merge from 250-append commit 76bf98394e52b6d65ab2d3a93ab9fa0b610a6a33 Author: zhenglh Date: Thu Mar 19 17:24:49 2020 +0800 vip开关 commit cbabb0e0b9a32869e51601b6e1fa08872aea5ac2 Author: wudongdong Date: Thu Mar 19 16:39:35 2020 +0800 多个vip支持 commit d312b30c3d5878de1be28e7461d35842e55f92bc Merge: 95a5b35ae 06aacdcb8 Author: wudongdong Date: Thu Mar 19 16:38:58 2020 +0800 Merge remote-tracking branch 'origin/master' into dev-250-append-20200313 commit 5bad596b254504eef4a17250ecccee8ebcb65a45 Author: zhenglh Date: Thu Mar 19 16:20:28 2020 +0800 vip金额换成商品 commit 0d595614793dd72df8741194b7fae329b2626db0 Author: wudongdong Date: Thu Mar 19 16:11:38 2020 +0800 订阅活动添加 commit 8180185e1e136305c433716156f2135a5455b55e Merge: 1aafa3450 770d1b57b Author: zhenglh Date: Thu Mar 19 16:08:08 2020 +0800 Merge branch 'dev-250-append-20200313' of http://192.168.0.31/fe/cps into dev-250-append-20200313 commit 1aafa34505a6539eccb883310d8ca858d609f63d Author: zhenglh Date: Thu Mar 19 16:07:41 2020 +0800 vip金额换成商品 commit 06aacdcb8984533f9508409c877b3a38e2237e33 Author: zhenglh Date: Thu Mar 19 15:30:45 2020 +0800 客服消息关注时间可以为空 commit c6b3a48301a74d41da0d07dafc29bbbffd985389 Merge: 30835a0de a8726ba64 Author: wanggb Date: Thu Mar 19 15:13:32 2020 +0800 Merge branch 'master' into dev-pity-20200318 commit a8726ba64295dd2daab426e1753de9a6ff562565 Author: wanggb Date: Thu Mar 19 14:51:29 2020 +0800 update 替换掉 save commit 770d1b57b69c3aa6d8becf7d3be22113697784f0 Author: liyt Date: Thu Mar 19 13:25:09 2020 +0800 回传扣单逻辑 commit b2b727dd6528ebae6fa8cd631d0258b27a7ca4f6 Author: zhenglh Date: Thu Mar 19 12:16:23 2020 +0800 vip商品 commit f1b7d4a66e95bebca1d0a0013d12df7da9717cf2 Author: zhenglh Date: Thu Mar 19 12:08:03 2020 +0800 vip商品 commit fc049b363d1710478d96f9efb7eb7ef16819580e Author: zhenglh Date: Thu Mar 19 11:48:50 2020 +0800 区块调整 commit c440e2d0088b10f341b32c81aadfe76d3a49f8a6 Author: zhenglh Date: Thu Mar 19 11:48:32 2020 +0800 区块调整 commit 30835a0de78b1d3c285f3eb608635d5cf542d695 Author: wanggb Date: Thu Mar 19 11:28:06 2020 +0800 书籍详情页,套模板数据初版 01 commit 2bfb465adfba74c5a2c7ab44876b17020f72d2e9 Author: zhenglh Date: Thu Mar 19 10:39:30 2020 +0800 配置处理 commit 304e8786baf8c0a3dc011b0197202a5d03f64b30 Merge: 2da75d8ef ac4e52ee4 Author: zhenglh Date: Wed Mar 18 19:28:23 2020 +0800 Merge branch 'dev-250-append-20200313' of http://192.168.0.31/fe/cps into dev-250-append-20200313 commit 2da75d8ef34b7eee68dcb8682b8d4b07b0e0dd4d Author: zhenglh Date: Wed Mar 18 19:28:06 2020 +0800 导语可以为空 commit 3f87e7f7146d9e12144dad75b52dc4d9b2f19ab1 Author: zhenglh Date: Wed Mar 18 18:09:00 2020 +0800 浮动条更新上传用户 commit 3a3317424c24678f531e8b44762da878058c1e21 Author: wanggb Date: Wed Mar 18 17:06:42 2020 +0800 书籍详情页,套模板数据初版 commit eda222ff8aa0241256f1c6a5d1447bbe342356d0 (tag: cps_20200318_180049, tag: cps_20200318_163749) Merge: 9a97b51a0 f6437632d Author: zhenglh Date: Wed Mar 18 16:36:21 2020 +0800 Merge branch 'dev-250-20200226' commit f6437632df1c3eab7421917b1c083efbf605c68f Author: zhenglh Date: Wed Mar 18 16:10:45 2020 +0800 vip自定义商品，排序 commit ac4e52ee40f3e635823a9ff655c0f11daaab4f1d Author: liyt Date: Wed Mar 18 16:29:34 2020 +0800 回传扣量订单笔数修改 commit 95a5b35ae9c5d02a771723806ccae37d65ae9d02 Author: wudongdong Date: Wed Mar 18 15:37:46 2020 +0800 添加 commit 3e2dd3a72d3596bdcecca9d88fd908716ec55731 Author: 李天时 Date: Wed Mar 18 15:21:02 2020 +0800 刷新前一天转移渠道订单统计表 commit 6cf55de8b8d2c73b70f5b6d16a41f5ec05f89491 Merge: b12fbca9f 029e16864 Author: wanggb Date: Wed Mar 18 14:38:31 2020 +0800 Merge branch 'mac313' into dev-pity-20200318 commit 029e168641bb80b5881d209194e9bc67a5ec02af Merge: c46bc554a 9a97b51a0 Author: wanggb Date: Wed Mar 18 14:37:38 2020 +0800 Merge branch 'master' into mac313 commit b12fbca9fe00f5ca53c6f4635b5c7084b75f5a7c Author: wanggb Date: Wed Mar 18 14:36:09 2020 +0800 书籍详情页，增加作者其他书籍 commit 043342844ea45d83a1ea387b0d2b60fc895ac494 Author: liyt Date: Wed Mar 18 14:07:12 2020 +0800 扣量金额逻辑修改 commit ef3dcb9f68950f6df952c5f55703c3f880c36e85 Merge: 1748e07c7 7995c25fc Author: wudongdong Date: Wed Mar 18 14:04:39 2020 +0800 统一参数 commit 1748e07c7cfe9eacb18db86abd27a035474a6179 Merge: 3eb1450e8 9a97b51a0 Author: wudongdong Date: Wed Mar 18 13:59:47 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps into dev-250-append-20200313 commit 3eb1450e8c8292a92bc0137776b3b36ebcbc141f Author: wudongdong Date: Wed Mar 18 13:17:18 2020 +0800 统一返回字段 commit 7995c25fcb284d310e4b1405e248336ee0ec6d78 Author: liyt Date: Tue Mar 17 14:34:49 2020 +0800 uc访问匹配 commit 5388e6ae75a4bfc5990d2186033f8b7b2556372c Author: liyt Date: Mon Mar 16 16:08:26 2020 +0800 uc回传 和 回传扣量规则修改 commit d8ef8af54acddf952d0dfbece225dbcb53fdaa4b Author: zhenglh Date: Tue Mar 17 16:08:07 2020 +0800 书籍章节访问参数校验 commit 7f869e57016beaec9cd91abb9e36e7400b3350e6 Author: zhenglh Date: Tue Mar 17 14:38:10 2020 +0800 商品类型新用户的配置添加 commit 84d96a8ef4d14bb12fc60540fdc47b7f822889db Author: zhenglh Date: Tue Mar 17 14:31:42 2020 +0800 商品类型新用户的配置添加 commit a69c0218ce4f073a73022ec785db563da98960ed Author: zhenglh Date: Tue Mar 17 14:12:06 2020 +0800 回传配置 commit ef740c6e5684236053199a1f0199c26cb557eb4d Author: zhenglh Date: Tue Mar 17 10:56:36 2020 +0800 商品类别：新老用户 commit f2b1da7ba904cc7b734f1352a8d6da04b085797a Author: zhenglh Date: Tue Mar 17 10:39:18 2020 +0800 商品类型待添加 commit 82bc1aa50cb12461d7442c063b35a217d3db5cf1 Author: zhenglh Date: Mon Mar 16 19:41:59 2020 +0800 配置位置修改 commit 2a8d52f36f70dae11053ae64f9d93be3856019d8 Author: zhenglh Date: Mon Mar 16 12:37:41 2020 +0800 章末推荐可关闭 commit 894ae0375bac0007b0b8567a7c8ccc6edb95e431 Author: zhenglh Date: Mon Mar 16 11:32:06 2020 +0800 章末下一章点击的关注处理 commit f200f4e18ec30079954b592afb5599a2019d792e Author: zhenglh Date: Mon Mar 16 10:54:20 2020 +0800 测试 commit c4e315f9231540f5c55e5eb576e170ae5e0fc798 Author: wudongdong Date: Tue Mar 17 19:33:08 2020 +0800 渠道对接接口 commit 30bcaf5c35805eb4619e18b97b28343307f90a66 Merge: adf614fe3 b2d769028 Author: wudongdong Date: Tue Mar 17 19:49:53 2020 +0800 Merge branch 'dev-250-append-20200313' of 192.168.0.31:fe/cps into dev-250-append-20200313 commit adf614fe398858243422b237c3ba20990d391853 Author: wudongdong Date: Tue Mar 17 19:33:08 2020 +0800 渠道对接接口 commit 9a97b51a0d0db4baa659d8ed65706dfa109443e0 (tag: cps_20200318_110206) Author: zhenglh Date: Tue Mar 17 19:25:00 2020 +0800 关注延迟客服消息样式添加 commit 5a5d543c1bf46c9fbd7a7a29ae391898268ed7ab Author: xuehuiwen Date: Tue Mar 17 19:09:10 2020 +0800 send message list commit ed4eaf02dfb6596e57e2de1e2713daa7fa493a0f Author: zhenglh Date: Wed Feb 26 15:54:14 2020 +0800 2.5.0需求处理 commit b2d7690287d62592f30823fbd4c8d69f70c8ba3c Merge: 52a2c9128 b5798e444 Author: liyt Date: Tue Mar 17 17:32:57 2020 +0800 Merge branch 'dev-uc-20200316' into dev-250-append-20200313 commit 359315a70abc56c97825225cd3987c8d8f0255f3 Author: xuehuiwen Date: Tue Mar 17 17:21:08 2020 +0800 send message list commit f815be81aad432afef8713b650b9a0bf5e1b20a4 Author: xuehuiwen Date: Tue Mar 17 16:54:59 2020 +0800 send message list commit b5798e4446d3ec8600c799ed6e1ad509e43a0fb9 Author: liyt Date: Tue Mar 17 14:34:49 2020 +0800 uc访问匹配 commit 765471fd6f90cd6ad46c825868ec7d7e8792e34d Merge: 0a30e828d 7eaf499ab Author: wanggb Date: Tue Mar 17 16:15:42 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 0a30e828dd193ca144921cdf02657a7e2a7f29ed Author: wanggb Date: Tue Mar 17 16:15:34 2020 +0800 高级群发, API 查看 群组标签，删除群组标签 commit 52a2c91287f9be4c9c4a7c1aee112b335d8256a6 Author: zhenglh Date: Tue Mar 17 16:08:07 2020 +0800 书籍章节访问参数校验 commit 7eaf499abafa9db19f049435d012f2674e14b894 Author: xuehuiwen Date: Tue Mar 17 16:07:10 2020 +0800 send message list commit af65e37631ac2356670c64cba57164e349731d04 Merge: d51a8f8b1 8719c9cd1 Author: wanggb Date: Tue Mar 17 14:41:52 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit d51a8f8b1bea25407e6a31b926ca710910317ca5 Author: wanggb Date: Tue Mar 17 14:41:40 2020 +0800 高级群发, API 修改 commit 6964503c203777e974d5539490630d0d4f6b760f Author: zhenglh Date: Tue Mar 17 14:38:10 2020 +0800 商品类型新用户的配置添加 commit 158fa8924bb23201e8351a6e3dd5725af0b0fc85 Merge: 3a57517ed b28844fe1 Author: liyt Date: Tue Mar 17 14:33:31 2020 +0800 Merge branch 'master' into dev-uc-20200316 commit 3a57517ed4a4da5abfe8283f2f998b41ae415548 Author: liyt Date: Mon Mar 16 16:08:26 2020 +0800 uc回传 和 回传扣量规则修改 commit a2a657f58f22c956f246346e89c04c4797c50800 Author: zhenglh Date: Tue Mar 17 14:31:42 2020 +0800 商品类型新用户的配置添加 commit b28844fe1bd9119da4547097bcbd2dec599fc95e Merge: 7ca21f125 cbbbca44d Author: zhenglh Date: Tue Mar 17 14:19:21 2020 +0800 Merge remote-tracking branch 'origin/master' commit 00473c43606670fbca57c7645c83f6a316a69deb Author: zhenglh Date: Tue Mar 17 14:12:06 2020 +0800 回传配置 commit 8719c9cd1f19ecbd8af97342407756b8d5fc92ea Author: xuehuiwen Date: Tue Mar 17 14:01:14 2020 +0800 send message list commit 4536b21346a9de3370fc851efd77d6fe6c5bb0dc Merge: f0833a85a cd9a47e13 Author: wanggb Date: Tue Mar 17 11:57:35 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit f0833a85ad5e1025448e77748e70030c698e650e Author: wanggb Date: Tue Mar 17 11:57:27 2020 +0800 高级群发,Wechat API commit cd9a47e135eef27752bdd2b87fbae7ddbef5a639 Author: xuehuiwen Date: Tue Mar 17 11:57:14 2020 +0800 send message list commit 851361bc8b56afd45919e3ae32febe382d270bac Author: xuehuiwen Date: Tue Mar 17 11:51:39 2020 +0800 send message list commit a423add1d10478ea2e11bb0b64e904f40369bdd0 Author: xuehuiwen Date: Tue Mar 17 11:47:19 2020 +0800 send message list commit 7ca21f1250fb5773797398c8dd81cb5296a2638c Author: zhenglh Date: Tue Mar 17 11:42:52 2020 +0800 appid回传参数未生效 commit 2a9e094bae175591c98252683738493b54128ec2 Author: xuehuiwen Date: Tue Mar 17 11:37:34 2020 +0800 send message list commit c017fe8c2b3c8e3aa388a8054cbaff24469d3956 Author: xuehuiwen Date: Tue Mar 17 11:31:57 2020 +0800 send message list commit 44692118261f55aae744d58d7a66e8f109f8b5a2 Author: wanggb Date: Tue Mar 17 11:08:36 2020 +0800 高级群发,Wechat API commit 4a50b1373c62301549a6b7e00fd3d4d4d68507b5 Author: zhenglh Date: Tue Mar 17 10:56:36 2020 +0800 商品类别：新老用户 commit 8f610a978bc6c56c0873260830e5b6270cfd7fc0 Merge: 49a563d45 cf7d5186d Author: wanggb Date: Tue Mar 17 10:48:04 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 49a563d4507716c5c2f5c16b19566052b0b967f8 Author: wanggb Date: Tue Mar 17 10:47:43 2020 +0800 高级群发，修改接口 commit a91184a11df1d77211e21b2c18d41950ed5f34bd Author: zhenglh Date: Tue Mar 17 10:39:18 2020 +0800 商品类型待添加 commit cf7d5186d4b4c90917703514156e746b01498852 Author: xuehuiwen Date: Tue Mar 17 10:31:38 2020 +0800 send message list commit c6e5f596dbf5cebe62d2c2d4caa31cc5716a8169 Author: xuehuiwen Date: Tue Mar 17 10:03:31 2020 +0800 send message list commit 8311dd5f4f4f14fd2b2b024b9665e04a428d5edf Author: xuehuiwen Date: Tue Mar 17 10:02:18 2020 +0800 send message list commit c46bc554ada2111f303f3f63cb38396854c1a13c Author: machao Date: Mon Mar 16 20:21:27 2020 +0800 个人中心修改 commit 458e4a23df5b29b95e048a25dad10e19167fd1fb Merge: d07a4d556 cbbbca44d Author: machao Date: Mon Mar 16 19:56:03 2020 +0800 Merge remote-tracking branch 'origin/master' into mac313 commit d07a4d5563a267e72bf68e73fac3972c22bf0395 Author: machao Date: Mon Mar 16 19:55:46 2020 +0800 修改样式 commit b000db8fde734b5ffddd473ceaeb6c8853f50fc4 Author: zhenglh Date: Mon Mar 16 19:41:59 2020 +0800 配置位置修改 commit 9065342e90e12697a6d493d7c0bc23dffdeb1b57 Author: xuehuiwen Date: Mon Mar 16 18:11:16 2020 +0800 send message list commit baf0dc5ec815d4caf6c4681008ea3cde960dafad Author: xuehuiwen Date: Mon Mar 16 17:38:11 2020 +0800 send message list commit 4b4206af2dc5e4b74be25eab7c16ea5984692a6d Author: xuehuiwen Date: Mon Mar 16 17:13:59 2020 +0800 send message list commit e82d3b9104b9b943a6b06da38ee660c585ee5e6a Merge: e3ad83180 d3e059b42 Author: xuehuiwen Date: Mon Mar 16 17:08:37 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit e3ad8318001db99031e1622bd5f936265f20dd5d Author: xuehuiwen Date: Mon Mar 16 17:08:33 2020 +0800 send message list commit d3e059b420bee53fba2c3d700233bfcfe7c47f16 Merge: 528daaebd e05165dc2 Author: wanggb Date: Mon Mar 16 16:23:56 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 528daaebdb6879a985bbf26b2196a5061c9628f1 Author: wanggb Date: Mon Mar 16 16:23:47 2020 +0800 高级群发，统计信息，用户支付时，加入打点信息(user_id, channel_id) commit e05165dc23bae498e696f4619a7b59a2795ae915 Author: xuehuiwen Date: Mon Mar 16 16:18:44 2020 +0800 send message list commit d51c38473f6c768e5f7caec4b96102eedfefdd0f Author: machao Date: Mon Mar 16 16:12:15 2020 +0800 阳光书籍样式 commit 862da2a89001a273c492b99617d8349d9ac0f1d1 Author: xuehuiwen Date: Mon Mar 16 15:33:15 2020 +0800 send message list commit 533aaa628fade21653fa19ea883cccc96ad0b7fe Author: xuehuiwen Date: Mon Mar 16 15:01:28 2020 +0800 send message list commit 9658b9a5959840d643596016238f3f3a9d59c6ee Author: xuehuiwen Date: Mon Mar 16 14:57:31 2020 +0800 send message list commit f20c5e6c1fae3cae4aabbed2af5ace4db56089ec Author: xuehuiwen Date: Mon Mar 16 14:39:58 2020 +0800 send message list commit 88574d71aea5f369aa18007b5008c3212b399a6a Author: wanggb Date: Mon Mar 16 14:32:17 2020 +0800 高级群发，统计信息，区分用户角色 commit 7b7e371d8540bbf13ecb79ea441327be295a8890 Author: zhenglh Date: Mon Mar 16 12:37:41 2020 +0800 章末推荐可关闭 commit 1cadca905c2af455f3ed1532094d4076afddcba8 Author: wanggb Date: Mon Mar 16 11:52:19 2020 +0800 高级群发，统计信息，区分用户角色 commit 2c05fc27d75bab1120396d2b0c7fee568bc6560d Merge: 849c92e3a c097f9ee8 Author: wanggb Date: Mon Mar 16 11:48:34 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 849c92e3a301d9a1a3763b29dc40f7426a2bd765 Author: wanggb Date: Mon Mar 16 11:48:25 2020 +0800 高级群发，统计信息，区分用户角色 commit c097f9ee8354ccc887d4a6c59f999bfb952e0e70 Author: xuehuiwen Date: Mon Mar 16 11:38:39 2020 +0800 send message list commit 805987c2e9277f1e8d193256280182fda3c05433 Author: zhenglh Date: Mon Mar 16 11:32:06 2020 +0800 章末下一章点击的关注处理 commit 1824e2eda0ae29db2e87f4cbf761389cdba974c1 Author: zhenglh Date: Mon Mar 16 10:54:20 2020 +0800 测试 commit c7e391f10fede6a40d8c8e8f159355bf51a72675 Merge: 943928201 6e5696c3b Author: wanggb Date: Mon Mar 16 10:11:56 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 94392820182b9c916e0c96e882e46eda9ccd6c52 Author: wanggb Date: Mon Mar 16 10:11:44 2020 +0800 高级群发，用户组表单校验 commit 6e5696c3b25f29ad3db9d49e263fb08745cd705e Author: xuehuiwen Date: Sun Mar 15 15:29:14 2020 +0800 send message list commit cbbbca44d50632e0b9a8a096358e640b00a604de Merge: 3ef49a2c8 aacfa8b1c Author: zhenglihao Date: Sun Mar 15 14:40:46 2020 +0800 Merge remote-tracking branch 'origin/master' commit 3ef49a2c8ca81f9027511b90f8fcfb3a079e889c Author: zhenglihao Date: Sun Mar 15 14:40:20 2020 +0800 订单导出删除逗号 commit b6123f9273af666eb127915ab6b2da0e58330cbf Author: wanggb Date: Sun Mar 15 13:55:28 2020 +0800 高级群发，完善界面交互 commit aacfa8b1c3e954ae4665465e5baaeeb4a929f817 Author: wanggb Date: Sat Mar 14 17:43:51 2020 +0800 _buildVipActivityUrl commit 661150590551712f870dc57300a326747c4fd5be Author: wanggb Date: Sat Mar 14 14:23:53 2020 +0800 高级群发，完善界面交互 commit 07f0c8700f6ade45534862a9515eb7e519f7d799 Author: zhenglihao Date: Sat Mar 14 12:40:33 2020 +0800 体现金额 commit fe3badeded479854feceb9c4bf1669d7919a9fea Author: zhenglihao Date: Sat Mar 14 12:35:04 2020 +0800 书籍阅读页行首中文空格处理-2 commit b37efed353f1731bdf2dc179c8d28bd3002a0554 (tag: cps_20200314_104205) Merge: e8efc1079 79c392b63 Author: zhenglihao Date: Sat Mar 14 10:29:53 2020 +0800 Merge remote-tracking branch 'origin/master' commit e8efc107908d2cacd10c7f5ce6758869cb893ebd Author: zhenglihao Date: Sat Mar 14 10:29:44 2020 +0800 订单详单导出，排序固化为降序 commit 89a371d2c3e8497e578b8f1a81bfe01e33f60df2 Merge: 7c25c704b 6cdb2cbb5 Author: xuehw Date: Sat Mar 14 10:14:37 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 7c25c704b5626925d261f903fce7178cacd3bd30 Author: xuehw Date: Sat Mar 14 10:13:57 2020 +0800 send message commit 79c392b635e696ab11bd6e005f6555dc1ff7a3af Author: liyt Date: Sat Mar 14 10:06:27 2020 +0800 回传click——id commit 6cdb2cbb554e074184ded6e712b706a1dc48c284 Merge: a404552ef 9d6b1fd4c Author: wanggb Date: Sat Mar 14 08:42:07 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit a404552ef35015d8e8ba02993d033ce957130eb3 Author: wanggb Date: Sat Mar 14 08:40:47 2020 +0800 高级群发，完善界面交互 commit 1bc63e4436696fba1fd2099e91cf66277007da6a Merge: 9aba10bf9 564c51946 Author: zhenglh Date: Fri Mar 13 20:04:01 2020 +0800 Merge remote-tracking branch 'origin/master' commit 9aba10bf97b55f77f2dfed14b50021967b5874bf Author: zhenglh Date: Fri Mar 13 20:03:48 2020 +0800 书籍阅读页行首中文空格处理 commit 564c51946afc7278a0caf951f0693b56cab9af1c Author: liyt Date: Fri Mar 13 19:41:30 2020 +0800 API渠道设置 commit 9d6b1fd4cccb56e7082f9816bdc97e219415c903 Author: xuehw Date: Fri Mar 13 19:37:31 2020 +0800 send message commit bfeda84d0124f6ca6f824f3992d15caaaea5018e Author: liyt Date: Fri Mar 13 19:19:12 2020 +0800 商品库书籍详情页 commit a6e7c89372721d2d991b61fdaeafa0e2ed14b2a6 (tag: cps_20200313_184907) Author: liyt Date: Fri Mar 13 18:46:26 2020 +0800 书籍详情页 commit 2a7b8fcdef3a22ff8d429b261a4fe4671994dcef Author: xuehw Date: Fri Mar 13 18:43:26 2020 +0800 send message commit 70f74c9b3789e3e8365b3aa42e1615a610b4c52d (tag: cps_20200313_184308) Author: liyt Date: Fri Mar 13 18:25:54 2020 +0800 添加tdc商品库请求日志 commit b3d300a1bf82f25911ad466d8ca854092245bd11 Author: liyt Date: Fri Mar 13 18:00:36 2020 +0800 商品库书籍详情页 commit 9d09baa7ab2530cce4253aedf9a9f90393dae107 Merge: f3519b65a d0cb4f8b3 Author: wanggb Date: Fri Mar 13 17:37:37 2020 +0800 Merge branch 'dev-rainbow-20200305' commit d0cb4f8b31486cecd7ba4f885128d933bf7f154d Merge: a6865fc8b 85e6cf027 Author: wanggb Date: Fri Mar 13 17:22:18 2020 +0800 Merge branch 'master' into dev-rainbow-20200305 commit a6865fc8beaefeb8ec1a5c2e458f3b38844a2abb Author: wanggb Date: Fri Mar 13 17:22:02 2020 +0800 除阳光外的其他平台，首页将排行榜入口放出来 commit f3519b65ac0fc56ac317d5d5b6dbd9052a01aee9 Merge: fe30c4e26 85e6cf027 Author: liyt Date: Fri Mar 13 17:00:00 2020 +0800 Merge branch 'master' into dev-dataapi-20200310 commit 85e6cf02752a1668889da6d5fa90dc6404606210 Merge: 43b4674c4 e66940611 Author: wanggb Date: Fri Mar 13 16:24:11 2020 +0800 Merge branch 'dev-rainbow-20200305' commit e6694061118c0737568d25e95071d4c179e2760e Author: zhenglh Date: Fri Mar 13 16:10:47 2020 +0800 书城管理排序处理 commit 8bacdae4801f51184876328038e00d907db78f27 Author: zhenglh Date: Fri Mar 13 15:51:00 2020 +0800 排序问题处理 commit 43b4674c4cd61e4152d9654bb06b5f0a2a5a656d Merge: dcb7c07f4 6dc9311b1 Author: wanggb Date: Fri Mar 13 15:42:05 2020 +0800 Merge branch 'dev-rainbow-20200305' commit 6dc9311b1df4f8b3acf1fb09aa180a771216dc03 Author: zhenglh Date: Fri Mar 13 15:41:05 2020 +0800 浮动条限定处理 commit c2cffbc98e82e58143c018dc316422e075a44492 Author: zhenglh Date: Fri Mar 13 15:31:46 2020 +0800 章节更新以及导出处理 commit fe30c4e26aa13931a47b6229eee5d57b98042b15 Author: liyt Date: Fri Mar 13 14:59:31 2020 +0800 修改返回值 commit 5db15b7046f0366e700060c5c4626fcb4e24ca9a Author: liyt Date: Fri Mar 13 14:20:59 2020 +0800 接口限制次数 commit 7cd3bf3164c7174c71e579024352dbc02750481b Author: zhenglh Date: Fri Mar 13 14:19:45 2020 +0800 文末推荐，推荐语为空的处理 commit 0a76d0ab134dd6a0ee22194c68e90b3cb4724610 Author: zhenglh Date: Fri Mar 13 14:15:23 2020 +0800 dda bug处理 commit d9cfa75f7c37dfb67fd7c90b426695edb324a8e0 Author: liyt Date: Fri Mar 13 14:05:24 2020 +0800 API接口 commit b850c67abbda1d6ef28b091e8fd65183232733ea Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 13 13:44:03 2020 +0800 添加按钮显示隐藏 commit 344c0fa063b9277a01750da3b6991da8f45bf3f9 Author: zhenglh Date: Fri Mar 13 12:48:36 2020 +0800 方法合并缺失 commit e2c03a45ed1468f2132c22b586f3db3a923c390b Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 13 11:22:51 2020 +0800 按钮显示隐藏 commit dcb7c07f47d8e6f60cd92b829a2c4d73d6470f5d Author: liyt Date: Fri Mar 13 10:48:12 2020 +0800 删除特殊符号 commit 5b5f40fa05a9de3aa6db90fccf57be76aaaedd16 Merge: 19f0ffa7c 93152ed3b Author: wanggb Date: Fri Mar 13 10:48:09 2020 +0800 Merge branch 'master' into dev-rainbow-20200305 # Conflicts: # application/index/view/book/chapter.html # application/main/service/OrderService.php commit 1b563d0f3c2f33d72ef67d61aca53d0c2ebf6616 Author: xuehw Date: Fri Mar 13 10:41:40 2020 +0800 send message commit aeec154ca7f1cef80a4d3a5ad6f87183cbd75c6d Author: wanggb Date: Fri Mar 13 10:40:29 2020 +0800 高级群发烈性替换成变量 commit 19f0ffa7c9b82d64c06efd742581da6135f5f4c1 Merge: 50ac84794 484b0fc09 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 13 10:34:35 2020 +0800 Merge branch 'dev-rainbow-20200305' of 192.168.0.31:fe/cps into dev-rainbow-20200305 commit 50ac84794b91b55a425455042b8ae4a25538a976 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 13 10:34:19 2020 +0800 拆除听书 commit 69621ffae5726f96ea2315f7768cdbeab220ba30 Author: xuehw Date: Fri Mar 13 10:21:04 2020 +0800 send message commit afd569073f51241a2044f6af38459dff6507a037 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 13 10:16:37 2020 +0800 删除JD语音 commit 484b0fc09d7878fec76d3ecb0678a31f47cd1d99 Author: wanggb Date: Fri Mar 13 10:12:36 2020 +0800 听书功能暂时注释掉 commit 936ee2db78c00187fede28ae47c1a808e099c2d3 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 13 10:08:46 2020 +0800 听书暂时不上 commit b073734a9490d3a4ddf1f6f10ac76787e7f42cd5 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 13 10:08:19 2020 +0800 听书功能暂时不上 commit 8d24a733fdfd410105d9f29802ef6e8e7e138525 Author: xuehw Date: Fri Mar 13 09:57:53 2020 +0800 send message commit f4772ba4eb50251633b0ac23130caf7130f6dcf9 Author: xuehw Date: Fri Mar 13 09:43:31 2020 +0800 send message commit 0f7ce8fcff17f11e917ee0220e5bcbb072513fa5 Author: xuehw Date: Fri Mar 13 09:40:30 2020 +0800 send message commit f53cfdaad0a79158a2df67c3ae1ee6f70488f8c9 Author: wanggb Date: Thu Mar 12 21:15:24 2020 +0800 用户群组优化 commit 4d2a1a9c40cf2694df05be66a4da77733a962284 Author: wanggb Date: Thu Mar 12 20:43:59 2020 +0800 用户群组优化 commit f90cd534b2cabd60f0709b26ef8351654a0dbc25 Merge: 286bce412 0b9486e79 Author: wanggb Date: Thu Mar 12 20:42:57 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 286bce4129128fb45d034fb9c13687d4720e92d2 Author: wanggb Date: Thu Mar 12 20:42:46 2020 +0800 用户群组优化 commit 0b9486e7940a740c037ceb48053a9cbee29119e3 Merge: 5e1f2eacb d41f224ef Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 19:59:54 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 5e1f2eacbd91e0bfd4debd512ac296ab8b4120a7 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 19:59:43 2020 +0800 debug commit d41f224ef518d4e12ef45aba290c1691e0ab1923 Author: xuehw Date: Thu Mar 12 19:38:04 2020 +0800 send message commit daf97a8049cf2e6d56e593e532ff50fc4ed10a30 Author: xuehw Date: Thu Mar 12 19:29:33 2020 +0800 send message commit a43b32e92a9622c8666286e187b6e05336257f84 Author: xuehw Date: Thu Mar 12 19:15:47 2020 +0800 send message commit bda38f5a94aebf465147d4278eaf5b0a1b4567b0 Merge: 9f2a56d50 0446adbd9 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 19:10:09 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 9f2a56d50fc6377923d899a49cf14dc85f936243 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 19:09:56 2020 +0800 新需求done commit 0446adbd9c128797d0d23c6b2342e6f302b3c4d7 Author: xuehw Date: Thu Mar 12 19:08:53 2020 +0800 send message commit 112cfee7d59dc6324f73de6c148565f6364f56ff Author: xuehw Date: Thu Mar 12 17:11:17 2020 +0800 send message commit e75311b41cb1d389cfcb0e62aefb2d4676571a67 Author: xuehw Date: Thu Mar 12 15:50:38 2020 +0800 send message commit 42f1b4ff6de8e25dd5a37b4243a9eaaf9d32bb9c Author: xuehw Date: Thu Mar 12 15:35:29 2020 +0800 send message commit 76c13fb7a737fc060200f86511456ca0fc28312a Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 15:32:17 2020 +0800 换请求地址 commit 8219fc947878db85337fd17f115bad2d7063d69a Author: xuehw Date: Thu Mar 12 15:15:38 2020 +0800 send message commit 3cba1683f2648c78552458756a035ee45dccbb04 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 14:54:28 2020 +0800 分批添加及切换,每条编辑删除undone commit c55671538bacaa913ca10e147209a471b9457643 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 13:50:07 2020 +0800 去测试工具 commit 47440e4a15d1b4bec5e2631798e5a439e41da0f6 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 13:42:35 2020 +0800 icon commit 63309797e30d8b0d5fe9c74a0f8985ffc888a65f Author: xuehw Date: Thu Mar 12 13:33:05 2020 +0800 send message commit dd3aa9abf9d5a44f1c90a505c8aae5ce2f317189 Merge: 45f3dc2fa b73477a76 Author: xuehw Date: Thu Mar 12 13:19:33 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 45f3dc2fa428b92de7fd88ebf3411b1299591b5b Author: xuehw Date: Thu Mar 12 13:19:27 2020 +0800 send message commit b73477a767f60a9c96480ade34c998c126167082 Author: wanggb Date: Thu Mar 12 12:53:08 2020 +0800 用户群组删除 commit 83cef04342898f80a9813dd89578691da71891e2 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 12:40:24 2020 +0800 去console commit bb2c3a9c38581a91af4c5e68e254319d68db0689 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 11:47:24 2020 +0800 img commit aff0966466bd39317c5db8e9d6e9686e448e3452 Author: wanggb Date: Thu Mar 12 11:18:37 2020 +0800 渠道黑名单 commit 93152ed3bffd6c2919750c34c349ac2282efd33a (tag: cps_20200312_144229) Author: liyt Date: Thu Mar 12 11:06:44 2020 +0800 token缓存 commit 594d70fe8459638ede5ade109a4815a438bda6db Author: liyt Date: Thu Mar 12 10:45:49 2020 +0800 回传两次 commit f503031abc45c635d77a5163a810835d30f13fd4 Merge: b7f97fa00 f68fc0989 Author: liyt Date: Thu Mar 12 10:39:19 2020 +0800 Merge branch 'master' into dev-gdt-shop-20200303 # Conflicts: # application/api/controller/Wechat.php commit 9469923650af55cd710f09d175c3cbb78a88b9fd Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 12 09:58:00 2020 +0800 vconsole commit e12fdc819974d45fd5b0f519f9724f8c18602b61 Author: liyt Date: Thu Mar 12 09:57:36 2020 +0800 数据接口 commit d5c95b9f36e5e01d6d706b91f249238269072495 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 11 19:20:43 2020 +0800 toggleData commit 92d3a9f1bd5bd8182a77819179c5149ab60ffeb8 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 11 19:17:49 2020 +0800 toggleData commit 64cda1a43f9f6c9a9eb607032f014c403e83f051 Author: wanggb Date: Wed Mar 11 19:15:51 2020 +0800 听书-测试 commit f68fc0989f0e0d25c951055a6a8fbb07ccc08904 (tag: cps_20200311_192001) Author: zhenglh Date: Wed Mar 11 19:00:06 2020 +0800 gdt回传参数处理 commit 1c6c1fbde392727a111b0dd469756dc9627df339 Merge: 4ed6d11b5 6f2af24a9 Author: wanggb Date: Wed Mar 11 18:57:37 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 4ed6d11b5b9092cb0e222df7ce2b7e67ffb2932c Author: wanggb Date: Wed Mar 11 18:57:27 2020 +0800 高级群发- commit 2b4b7bf021f52a461a8fd5ebe1e9c256e201a471 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 11 17:54:19 2020 +0800 debugs commit 6f2af24a9a6db7134396a20dd30dfac0441833cd Author: xuehw Date: Wed Mar 11 17:43:50 2020 +0800 send message commit 6c3bf9280cb397c919fe64ef141adb3141fb4ced Author: xuehw Date: Wed Mar 11 17:09:49 2020 +0800 send message commit 4e2b17b8ba8acf3ed085cfc7125f5a8cb3d36eea (tag: cps_20200311_174857) Author: zhenglh Date: Wed Mar 11 12:09:42 2020 +0800 头条，广点通回调配置信息 commit 8c10438c6716fbe3870d3bc71550d47b49affcb5 Author: xuehw Date: Wed Mar 11 16:57:02 2020 +0800 send message commit 1c91fab50d473be4cd6b646a7e1397eb64626b3a Merge: 6cbb18c75 94aab7cc0 Author: wanggb Date: Wed Mar 11 16:04:56 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 6cbb18c753241f3a3562e84808a44a666efce895 Author: wanggb Date: Wed Mar 11 16:04:44 2020 +0800 客服消息，URL中没有http commit 94aab7cc07bf5d3e7f776f870c64bcb4ec716325 Author: xuehw Date: Wed Mar 11 15:58:40 2020 +0800 send message commit b7f97fa007a62bf538709853657f218f5b806ffc Author: liyt Date: Wed Mar 11 14:24:28 2020 +0800 gdt click_id 关联 commit 60ac1482d8ee21dfb009897ea4588646be373ac2 Merge: 0eb57f8bd 02df23af8 Author: wanggb Date: Wed Mar 11 13:38:13 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 0eb57f8bd557b075de83473f2a22a199bc6fd87d Author: wanggb Date: Wed Mar 11 13:38:03 2020 +0800 增加菜单权限 commit 71944c094217797213a844989ff659d0d840287f Merge: e233d9a0c 1169159de Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 11 11:52:35 2020 +0800 Merge branch 'dev-rainbow-20200305' of 192.168.0.31:fe/cps into dev-rainbow-20200305 commit e233d9a0c37ca4a04d4fcec27f57761f82437899 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 11 11:51:26 2020 +0800 5档语速 commit 1169159de825b8eca879ddb54e973ba70d2ca54d Author: wanggb Date: Wed Mar 11 11:49:10 2020 +0800 showIntro 维护判断逻辑 commit e141c83a309934068a3abeab8a91babf60fc64f4 Author: wanggb Date: Wed Mar 11 10:53:37 2020 +0800 showIntro 维护判断逻辑 commit 02df23af808f611800fe6b0435e50c0529b5e52f Merge: 848cce7f4 6140a2d82 Author: xuehw Date: Wed Mar 11 10:43:26 2020 +0800 Merge branch 'master' into dev-high-message20200214 commit 848cce7f4d6ee8be6f8b2874b7bea15f2dc6562e Author: xuehw Date: Tue Mar 10 18:49:13 2020 +0800 send message commit 773c8debf41adb9afdbf60dfe139ae172b8aab29 Author: liyt Date: Tue Mar 10 18:02:46 2020 +0800 脚本 commit 019c877f6b33551f42b701427ed15ec3644373f3 Author: wanggb Date: Tue Mar 10 16:38:48 2020 +0800 关注文案修改 commit f3066261d50aedf165bd4cea0e2c9b2ea201c70e Author: liyt Date: Tue Mar 10 16:15:37 2020 +0800 回传日志 commit 3ced287a35c176bec61d9be3ed25edf5316dd133 Author: liyt Date: Tue Mar 10 14:24:47 2020 +0800 合并代码 commit bc5e2ef711005aa9a09a5bb82fcfddffcf407ca9 Merge: d98c41c7d 6140a2d82 Author: liyt Date: Tue Mar 10 14:20:40 2020 +0800 Merge branch 'master' into dev-gdt-shop-20200303 # Conflicts: # application/api/controller/Wechat.php commit 5fa8158688b49d6c1340628baeefc39ba3dd9fc9 Author: wanggb Date: Tue Mar 10 11:56:37 2020 +0800 vip-素材管理-增加自动签到 commit 6140a2d820fbe2094075b8e0076e0896ba7e7247 (tag: cps_20200310_110540) Merge: 7dc5b1f8d 45f7dae6f Author: zhenglh Date: Tue Mar 10 10:41:30 2020 +0800 Merge remote-tracking branch 'origin/master' commit 7dc5b1f8d85862f99dc9880380564e4ea4cd63f2 Author: zhenglh Date: Tue Mar 10 10:41:23 2020 +0800 头条回传 commit 0f7780bb474b88064c9bd67bc8958b9a7cc67d4c Merge: 2a7bb60f2 45f7dae6f Author: xuehw Date: Tue Mar 10 10:32:29 2020 +0800 Merge branch 'master' into dev-high-message20200214 commit 45f7dae6f7e56a4889cbd40b6a240dca5a8ea895 Author: liyt Date: Tue Mar 10 10:23:53 2020 +0800 回传订单号写入集合缓存 方便后期排查数据 commit 618bc74e989154f4c2494e6ffe006f7e7b36cf42 Author: liyt Date: Tue Mar 10 10:00:37 2020 +0800 用户注册24小时首次下单回传 commit 2e3bbd7fa10ce377860a7f29ec0eab1a105c7961 Merge: 398dbbc19 01cb09998 Author: liyt Date: Mon Mar 9 20:07:16 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 01cb09998fd01e8f2bcd5950c153696977ce2a2a Author: zhenglh Date: Mon Mar 9 18:42:55 2020 +0800 kl查询优化 commit 398dbbc192572961576669c48656d0e8ec925155 Author: liyt Date: Mon Mar 9 19:24:48 2020 +0800 AD回传首单回传 commit 62d687de43937cf3e351a7b5e0cca3e2cc4ae3f7 Author: zhenglh Date: Mon Mar 9 18:42:55 2020 +0800 kl查询优化 commit d807f630ab53ef2484fe9afd6d2d40faac374abd Author: wanggb Date: Mon Mar 9 17:55:13 2020 +0800 修改排行榜排序 commit 2a7bb60f27c03c93b4cd10022b86f190fcdcdb9f Merge: 82ba52195 639a2fd97 Author: xhw Date: Mon Mar 9 17:40:09 2020 +0800 merge master commit 639a2fd973ea3150caa7de6c20d875638b510e57 (tag: cps_20200309_161951) Author: zhenglh Date: Mon Mar 9 16:07:13 2020 +0800 查询优化 commit 399e3e075aff06647f70a45437c8c861bf9f2c40 Author: zhenglh Date: Mon Mar 9 15:55:42 2020 +0800 查询优化 commit 01e66ccdc89823e8cef8c8f7ba244bc2360840fa Author: zhenglh Date: Mon Mar 9 15:13:05 2020 +0800 浮云条过滤，书籍名称使用配置的名称 commit 9c714d883bd1f7eb48197666679dbad915fc150e (tag: cps_20200309_141643) Merge: 531ff5a98 d31709776 Author: zhenglh Date: Mon Mar 9 13:44:14 2020 +0800 Merge branch 'dev-sell-float-20200305' commit d317097768d963a79ce1a520e3048c35ea4256fb Author: zhenglh Date: Mon Mar 9 13:43:48 2020 +0800 上架处理 commit c6cc40142919187c04c3f77a710b024f21e914fc Author: wanggb Date: Mon Mar 9 12:06:46 2020 +0800 排行榜书库管理 commit 531ff5a988ea6f1519e899c3793b24dd9b83c42d Author: zhenglh Date: Mon Mar 9 11:36:41 2020 +0800 样式调整 commit 4201e0856be72e6b3d15632f62b0fda156b2e5fb Author: zhenglh Date: Thu Mar 5 19:19:15 2020 +0800 dda 添加 & 章末推荐添加 commit 82ba52195c20f869ea5549d0067e8d1b8886324d Author: xhw Date: Mon Mar 9 11:18:48 2020 +0800 send message list commit 50fcfa6eb0d708b64a74ac91be2804fab5fcdf2e Author: wanggb Date: Mon Mar 9 11:13:40 2020 +0800 关注自动回复优化 commit 6422c237107f6e9049e250fa602641f4f7224bed Author: zhenglihao Date: Sun Mar 8 14:15:57 2020 +0800 缓存处理 commit 52623f4ec3bfed18196595e61a95d97f4bc69957 Author: xhw Date: Mon Mar 9 11:02:25 2020 +0800 send message list commit d4128389c592a6100414e028bdc78eeafb0494b5 Author: xhw Date: Mon Mar 9 10:57:19 2020 +0800 send message list commit 8ff045eae3dc3c26642bd3922fc82a1aac154ab3 Author: liyt Date: Mon Mar 9 10:38:30 2020 +0800 检查脚本逻辑 commit 4fb3f97898ffd92542a8bd0cd07b742922880ba9 Author: wanggb Date: Sun Mar 8 19:26:41 2020 +0800 排行榜书库管理 commit 604873fd3165af2629e09dd6d6462768fad48427 Author: wanggb Date: Sun Mar 8 17:44:07 2020 +0800 排行榜书库管理 commit 73134d59e64ab06f78379b4bc98770e392c2d1ec Author: zhenglihao Date: Sun Mar 8 16:05:33 2020 +0800 打包 commit 18e6530ca945df541b4812b796c3908079a64d21 Author: wanggb Date: Sun Mar 8 15:57:49 2020 +0800 自动回复 commit 244c51c37fb082b138c9919fb0cc9ad78c3cab28 Author: wanggb Date: Sun Mar 8 12:07:19 2020 +0800 排行榜书库管理 commit d98c41c7d173f4b27e6d6831d3fdbe40e47f1121 Author: liyt Date: Sun Mar 8 10:55:59 2020 +0800 下单回传回两次 commit fed4b52823b377c6f2983323c7f9e913a6f3c3e6 Author: xhw Date: Sun Mar 8 10:52:49 2020 +0800 send message list commit bc00717086e0abd5a145e9953e357a2693ba3790 Author: wanggb Date: Sun Mar 8 10:13:11 2020 +0800 客服消息管理-自动签到 commit 2a3be23a3282414334646c607c9f96f8ac91cb86 (tag: cps_20200308_121104) Author: zhenglh Date: Tue Mar 3 13:45:40 2020 +0800 浮动条添加，轮播添加专题 commit 1f0c5f00a3b3403007ca4d6ad8d6f2f40b2af479 Merge: db44ecd15 a0e84e2d3 Author: wanggb Date: Sat Mar 7 18:18:14 2020 +0800 Merge remote-tracking branch 'origin/dev-rainbow-20200305' into dev-rainbow-20200305 commit db44ecd15eaeb2e0fc8bb843fee866eec0b5d4d9 Author: wanggb Date: Sat Mar 7 18:17:58 2020 +0800 客服消息管理-自动签到 commit a0e84e2d34dfc6cde12bc19096f8a639de312d8f Author: zhenglihao Date: Sat Mar 7 17:11:10 2020 +0800 打款规则处理 commit c9de1ab8fbea4cb7cc808db4de25f82f9d8d50da Author: liyt Date: Sat Mar 7 15:57:45 2020 +0800 tdc行为回传 commit fa976a2b9e06b1abcd32c4e08663f46253ed94fe Author: wanggb Date: Sat Mar 7 12:52:29 2020 +0800 排行榜书库管理-优化检索 commit 08daece436d6675e15d195916ebd4ac20b27c5f2 Merge: a38573678 17ae4fc8d Author: liyt Date: Sat Mar 7 10:57:29 2020 +0800 Merge branch 'master' into dev-gdt-shop-20200303 # Conflicts: # application/admin/controller/Gdtaccount.php # application/api/controller/Wechat.php # application/command.php # application/common/model/GdtAccount.php # application/main/service/GdtService.php # application/main/service/OfficialAccountsEventService.php # public/assets/js/backend/gdtaccount.js commit a38573678f6b3a2a8743209db5161bbf63384053 Author: liyt Date: Sat Mar 7 10:53:38 2020 +0800 tdc商品库及行为回传 commit 17ae4fc8d13e8c9dbd65f19a9d1d55538b9b438c (tag: cps_20200307_102000) Author: liyt Date: Sat Mar 7 10:11:15 2020 +0800 调整gdt信息缓存时间 commit f29850fd2cd390d43e8ca28db55aabad3f713e4f Author: liyt Date: Sat Mar 7 10:04:08 2020 +0800 调整回跳地址 commit a5f0d846eccee940888dca58879c1f2a265bfb00 Author: xhw Date: Fri Mar 6 18:53:33 2020 +0800 send message list commit c670b28984a97e4cca04caf6f9eb186424090795 Merge: 1171a95e7 8bfa0bfe0 Author: wanggb Date: Fri Mar 6 18:44:55 2020 +0800 Merge branch 'master' into dev-rainbow-20200305 commit 1171a95e77dd80257c0aaf09e2535adae2d24817 Author: wanggb Date: Fri Mar 6 18:13:57 2020 +0800 修改CSS commit 9580610547660696d6498de5df2e5a2f2125c037 Author: wanggb Date: Fri Mar 6 18:04:06 2020 +0800 渠道听书开关是否开启 commit 3863e3e6c778063da97861e137a7f597d2fec8b3 (tag: cps_20200306_172358) Author: liyt Date: Fri Mar 6 17:22:55 2020 +0800 gdt授权成功后回跳地址 commit ff35eec02c51af0790abfb58140a9118a2b6c025 (tag: cps_20200306_171537) Author: liyt Date: Fri Mar 6 17:13:25 2020 +0800 gdt授权成功后回跳地址 commit 527e76cfc8bcbb34b7e3f955b1bc7eb94b4c8b6d Author: xhw Date: Fri Mar 6 16:39:53 2020 +0800 send message list commit 0e21b121d68953259d19b988ad5bd658c9925146 Author: xhw Date: Fri Mar 6 16:14:05 2020 +0800 send message list commit e49eb1e3a6f8e67ea0a5cc0b370877bb7d1e8553 Author: liyt Date: Fri Mar 6 16:07:03 2020 +0800 click获取 commit 59ea1295e17242e9aa405d27b656f4d61f3273f6 Author: xhw Date: Fri Mar 6 15:27:53 2020 +0800 send message list commit 46a17be0ed698b3f3f3c12997b0b1a9cd13e4fa6 Author: xhw Date: Fri Mar 6 15:26:45 2020 +0800 send message list commit cac817f099fd525c405b828edfebfb6c2508c993 Author: xhw Date: Fri Mar 6 15:24:49 2020 +0800 send message list commit 48d17b59d0ecc015fc25b31f355c8f142407b4ed Author: xhw Date: Fri Mar 6 15:24:20 2020 +0800 send message list commit f49c9dda750d358e43e1df339bfb26ac3236d16c Author: xhw Date: Fri Mar 6 15:23:50 2020 +0800 send message list commit 8b1929593a88e381a4956b81e002e80c9e34646e Author: xhw Date: Fri Mar 6 15:22:35 2020 +0800 send message list commit 0a71a8a87b83705d848f0d15c3e0f45ab3b1d908 Author: xhw Date: Fri Mar 6 15:20:05 2020 +0800 send message list commit aedc78d83504d599886352e15a3ae6e4b4c7b7e7 Author: xhw Date: Fri Mar 6 15:19:29 2020 +0800 send message list commit 5aa1a14d88cbf206f235789327e423aa3f14edf6 Author: xhw Date: Fri Mar 6 15:00:18 2020 +0800 send message list commit 086caaccef2d7ebc3b3932f84e2f5234d9b48707 Author: xhw Date: Fri Mar 6 14:33:53 2020 +0800 send message list commit a62ad76e20017eea3bfbbe2aac0cc214b2e751db Author: xhw Date: Fri Mar 6 14:31:46 2020 +0800 send message list commit ceff9c4a8c24d44f4f56221e35c7626b52bd9270 Author: xhw Date: Fri Mar 6 14:30:54 2020 +0800 send message list commit b3597e1a19e621d17b722d5fe891d074b1c03482 Author: xhw Date: Fri Mar 6 14:27:31 2020 +0800 send message list commit d6ef5921ee44ef3af9ccce2e4d884fa99ba06df5 Author: xhw Date: Fri Mar 6 14:26:20 2020 +0800 send message list commit 40d671df4087f5547540f19670be21321b8ca1d6 Author: xhw Date: Fri Mar 6 14:14:46 2020 +0800 send message list commit 674a3b05fbf7aba38662f093071dc891884b24db Author: xhw Date: Fri Mar 6 14:11:45 2020 +0800 send message list commit 6316fa4f65cc3e20779703dd960e3511a3d59d8b Merge: aa8e3f382 9eb1ea292 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 6 14:05:15 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit aa8e3f3828571c43521373d6bbccbd66abc2335a Author: cuigang_qianduan <891257242@qq.com> Date: Fri Mar 6 14:05:07 2020 +0800 '纯文字content,纯图img_path' commit ddc16e3bbaeb3058a120c9d3bf0a78c9d51acf03 Merge: 9346c143a 8bfa0bfe0 Author: liyt Date: Fri Mar 6 13:42:25 2020 +0800 Merge branch 'master' into dev-dgt-1-20200227 commit 9346c143aafa4ccaa4d135a1626a92106debbecc Author: liyt Date: Mon Mar 2 19:05:20 2020 +0800 GDT用户行为回传 commit 9eb1ea29231e052c7c74bb31c7d5109a5e5ef614 Author: xhw Date: Fri Mar 6 12:07:29 2020 +0800 send message list commit c06a78baa333b76e2676e3cf8241a6f06aefd343 Author: xhw Date: Fri Mar 6 12:07:01 2020 +0800 send message list commit 5bb2b15620e4767673cafd8c145302122cac0799 Author: xhw Date: Fri Mar 6 12:05:56 2020 +0800 send message list commit b3f500b38a7d29e0cfd646b1a913cf04c626a26e Author: xhw Date: Fri Mar 6 11:59:15 2020 +0800 send message list commit 4ebe541fae7502e616716e29c789d8d3b699514e Author: xhw Date: Fri Mar 6 11:48:41 2020 +0800 send message list commit e2534dc41d6cf26a67060df6e952b6502119169c Author: xhw Date: Fri Mar 6 11:36:08 2020 +0800 send message list commit 8bfa0bfe0124a0360caa511c3d6be1f180a01d7d (tag: cps_20200306_105034) Author: liyt Date: Fri Mar 6 10:08:51 2020 +0800 vip活动金额统计 commit 86a6d02a2cc5b5df6ceb3d95c076bc6381c00f42 Author: xhw Date: Thu Mar 5 19:03:18 2020 +0800 send message list commit e7a40d4b743359e79ca58b6ea539910e48696717 Author: xhw Date: Thu Mar 5 18:52:25 2020 +0800 send message list commit 1f180ac5533cda551b6c8522cbf4b41d026550e0 Author: xhw Date: Thu Mar 5 18:16:56 2020 +0800 send message list commit 12f7728bd6c16f1d0523f8856c79ba924ecc4ba1 (tag: cps_20200305_192006) Merge: 508cad26d 9c067cb30 Author: wanggb Date: Thu Mar 5 18:02:51 2020 +0800 Merge branch 'dev-pineapple-20200305' commit 9c067cb30eb48fbe007546cfdc45e7b1223816f2 Author: wanggb Date: Thu Mar 5 18:01:58 2020 +0800 静默授权解决code 40163 commit fa853bc11990b6dc1703b19c2883abab531aa0fa Author: xhw Date: Thu Mar 5 17:56:07 2020 +0800 send message list commit 2cade1fae4baa6ebb15d51f23a1a45fd1a43b70f Author: xhw Date: Thu Mar 5 17:50:58 2020 +0800 send message list commit 508cad26d716a1dce78d12ce91a59a9f87512a32 Author: liyt Date: Thu Mar 5 17:36:55 2020 +0800 修改文案 commit 44269f58b6a9689aebfa6c56eedbf5604f861565 Author: zhenglh Date: Thu Mar 5 16:47:52 2020 +0800 落地页标题可以为空 commit ad4d3f54fb30b3bf7ddb37f1de71ce8fdf7dc10f Merge: e5a011b5f 92e9b407e Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 5 16:22:00 2020 +0800 merge commit e5a011b5f721befa2ef2bf30181e0adfb674b331 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 5 16:19:26 2020 +0800 '素材管理添加 commit 92e9b407ec2762d16587696631c5d73f5b7eac79 Author: xhw Date: Thu Mar 5 15:52:29 2020 +0800 send message list commit 7152107fcc04f08c6d691cd053d6476b2dcb3628 Author: xhw Date: Thu Mar 5 15:51:39 2020 +0800 send message list commit af10c9b28235ab15eb6073aaf5de1d3aa7af15eb Author: xhw Date: Thu Mar 5 15:41:20 2020 +0800 send message list commit 0d8bd193ff6d0cdc44027c2482894050f5247a1d Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 5 15:38:27 2020 +0800 '素材编辑-dom结构' commit efec21701f3a8b88680eb579830994a6acdafc45 Author: xhw Date: Thu Mar 5 15:27:59 2020 +0800 send message list commit a5af2d24641389c8bb2dfe84574c4e008b07fee8 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 5 15:06:17 2020 +0800 add commit 33f81083402d0238ae4567f64186fc908289db47 Author: xhw Date: Thu Mar 5 15:04:27 2020 +0800 send message list commit 741f89e3c2ef6a1b064bb393bdd9b7e92b365f97 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 5 14:59:46 2020 +0800 is_url commit 86c3d1a492553c628ae312efeb59d6a5ccc2e128 Author: wanggb Date: Thu Mar 5 14:45:50 2020 +0800 静默授权 tri_appid & 渠道商管理增量 commit 5494d5d0a44d7490f6354dd5dde07bae9da63567 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Mar 5 14:42:02 2020 +0800 素材库添加 commit 83738812c59a2fac496380f46ec0525c0612d209 Author: xhw Date: Thu Mar 5 14:06:50 2020 +0800 send message list commit 49a91319dbcc375f3d83928d61e9215e02665500 Author: xhw Date: Thu Mar 5 14:06:37 2020 +0800 send message list commit f3a77dc61164f2dfe03f98be45f950b78bb739a0 Author: xhw Date: Thu Mar 5 13:48:32 2020 +0800 send message list commit 6ba493d7fd145b588870c1469ccef494c74f39f9 Author: xhw Date: Thu Mar 5 11:04:33 2020 +0800 send message list commit d7d2cb3b0fa34a59d3e3a62a9c2c1b16b5444f5e Author: zhenglh Date: Tue Feb 11 12:23:33 2020 +0800 对公结算优化 commit cd0aea046524348b51d35d7a800ccda6ae2a07b9 Merge: 7e8ed2a5b 7dd9d00c3 Author: wanggb Date: Thu Mar 5 10:38:24 2020 +0800 Merge branch 'dev-ranklist-book-20191206' into dev-rainbow-20200305 commit 7e8ed2a5b1753262e10aaf4603476d4c26bb0fb8 Merge: 1b3ad9922 4c5d9fd86 Author: wanggb Date: Thu Mar 5 10:23:20 2020 +0800 Merge branch 'cg_bookReading_2020_02_10' into dev-rainbow-20200305 commit 1b3ad99229710ab588a6c2d532f7e7fa705370fb Merge: 3cec3f98b b57b781e5 Author: wanggb Date: Thu Mar 5 10:22:20 2020 +0800 Merge branch 'dev-qiandao-20200205' into dev-rainbow-20200305 # Conflicts: # application/admin/controller/vipcustom/Createcustom.php # application/admin/controller/vipcustom/Viplinktextmedia.php # application/admin/service/CustomService.php # application/admin/view/vipcustom/createcustom/createlinkmessage.html # application/admin/view/vipcustom/viplinktextmedia/editlinktext.html # application/common/constants/Message.php commit 9aff41a3f34cfdb5918ea3f7c1b2c5b83ed6e508 Author: xhw Date: Thu Mar 5 10:12:00 2020 +0800 send message list commit 3cec3f98b8b4f57f838c1ae757774b3aaec7dcca (tag: cps_20200305_122629) Author: zhenglihao Date: Fri Feb 21 10:06:43 2020 +0800 回传扣量改版,头条统计数据,特殊菜单选择账号列表 commit e80f8749096c12e8b3d37049e54faccffeb4c635 Author: xhw Date: Wed Mar 4 19:20:53 2020 +0800 send message list commit 3f40e255373cb1014b141a772688e7f92d2c92b0 Author: xhw Date: Wed Mar 4 19:08:42 2020 +0800 send message list commit 8c0d8a9253762e5617727849e69c6b694ce93026 Author: xhw Date: Wed Mar 4 19:05:49 2020 +0800 send message list commit 3cf04c0ca3044a7bf2b9aebbf88662b7b8dfcffd Author: xhw Date: Wed Mar 4 17:56:22 2020 +0800 send message list commit 4ea3226370fc329530fd999526732b1ec1e6c5ba Author: xhw Date: Wed Mar 4 17:34:08 2020 +0800 send message list commit df11f5568fe7e2689540e85778e5354b5e7bd8de Merge: 9e693cb93 7ddbc3e95 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 17:12:52 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 9e693cb93ccc92eb2c502f545d2f87cc373e2292 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 17:12:45 2020 +0800 修改回显 commit d8f59807cc54e03b5c6021fa0a92328952096dd2 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 17:12:07 2020 +0800 首页修改 commit 7ddbc3e95eeaa795cf50e590603fe917a9b0cb83 Author: xhw Date: Wed Mar 4 17:02:37 2020 +0800 send message list commit 866b038dbb936778aa9676644123aed369653df7 Author: xhw Date: Wed Mar 4 16:17:36 2020 +0800 素材库 commit de7b6b22af86a9606e0af6fb745ae5e5c0e54908 Author: xhw Date: Wed Mar 4 14:42:09 2020 +0800 send message list commit e16f6469821bf87e5af3e2f13967f88635c37b1f Author: xhw Date: Wed Mar 4 14:29:38 2020 +0800 send message list commit 70c87920058cf1cecf50d9fcc98b95e091adc1b5 Author: xhw Date: Wed Mar 4 14:26:29 2020 +0800 send message list commit 9464e1e019be012277b769b53229a753266bef84 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 14:10:05 2020 +0800 修改编辑结构 commit ba054b39e42f419addbbec399e754dc5d54550fb Merge: e24fc49ca 3d36184f7 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 13:51:17 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 3d36184f7cf4f618b5303bd455bebf915ef98e8d Author: xhw Date: Wed Mar 4 13:51:08 2020 +0800 send message list commit e24fc49ca16af22c27db64f43174e208d5755c7d Merge: 4b3b352c3 a4d9e1df0 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 13:46:53 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 4b3b352c3cbb1592f9625273751a8f4c47346ee0 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 13:46:47 2020 +0800 增加 commit a4d9e1df026b5e38d22785a1a81f59f7d7117002 Author: xhw Date: Wed Mar 4 13:46:15 2020 +0800 send message list commit f431f9b771d4a690f41bd74510fb2add85fecd58 (tag: cps_20200304_135838) Author: wanggb Date: Wed Mar 4 13:31:02 2020 +0800 静默授权，暂时取消tri_appid commit d7af863df63be85f323bb62b272adab683f496b6 Author: xhw Date: Wed Mar 4 11:49:43 2020 +0800 send message list commit c95e0b26adb9c62020c100b293af8ea17ff209e6 Merge: d8548494d 2f2922a80 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 11:36:28 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit d8548494dd4a67cfcc65acd78a923da218658239 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 11:36:18 2020 +0800 文字&纯图消息 commit 49175684adf56feb52ad953929ec5b53854fb9c1 Author: cuigang_qianduan <891257242@qq.com> Date: Wed Mar 4 11:35:08 2020 +0800 图片消息 commit 2f2922a8032d1b0052c92f812b132fee0a004e31 Author: xhw Date: Wed Mar 4 11:22:15 2020 +0800 send message list commit 4e6aec3aa586207767ffb6cb42bd5353d2d061ac Author: xhw Date: Wed Mar 4 11:15:42 2020 +0800 send message list commit 44e0db98f95057101f0efb5b4275ce123f3a88f8 Author: wanggb Date: Wed Mar 4 11:11:57 2020 +0800 静默授权，增加一行日志 commit 66ac1aadbfa798daad98d933b1fac5eff146ef28 Author: wanggb Date: Tue Mar 3 18:42:04 2020 +0800 添加命令行，增加config Tab commit 3a96c7c7a5951eed784423684436f6fdd0708afe Author: xhw Date: Tue Mar 3 17:40:30 2020 +0800 send message list commit aeff9f291b565fc91a09b202e5eba8bea513c148 Author: xhw Date: Tue Mar 3 17:27:35 2020 +0800 send message list commit f812412aef68d20f58e3aa8801c5183635ca1283 Author: xhw Date: Tue Mar 3 17:00:20 2020 +0800 send message list commit 0ddff7f2ff5597ebd4baba9165d73c407e769e14 Merge: bb7b1e3d8 e4800d42b Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 16:49:53 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit bb7b1e3d8e5a1686ab52931d17f1d98e93fbe098 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 16:49:49 2020 +0800 用户群组 commit e4800d42ba3b52276a7f9cf71a9e9b08d3035bab Author: xhw Date: Tue Mar 3 16:18:48 2020 +0800 send message list commit cf420a3bba082c60052a9acbc0d69f683288a4e1 Author: xhw Date: Tue Mar 3 16:18:25 2020 +0800 send message list commit d4ffb65acca3ca95e2323aa5dae6f9be703b0278 Author: xhw Date: Tue Mar 3 16:06:17 2020 +0800 send message list commit 7661db278d3b4a9581767bcda86039d980a552b3 Author: xhw Date: Tue Mar 3 15:58:25 2020 +0800 send message list commit 3787ae4a532e99cf551260c3930a75854a29eaf5 Merge: b62615399 199262174 Author: wanggb Date: Tue Mar 3 15:43:40 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit b626153993a84c804d245dafa78fe6fa9e387ba0 Author: wanggb Date: Tue Mar 3 15:43:31 2020 +0800 高级群发-增加接口，维护wx_msg_id commit 199262174ee4b395f2295af925719b250fc71087 Author: xhw Date: Tue Mar 3 15:35:35 2020 +0800 send message list commit fb6beeb63352e324fb5e0c216c16eb9737e19606 (tag: cps_20200303_162840) Author: wudongdong Date: Tue Mar 3 15:20:54 2020 +0800 改为polardb commit 7a0484355b29d33caf7016af03d693d3d58c49af Merge: 89b6fd39b dc9e576d1 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 15:13:07 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 89b6fd39b2808d9a4db044b6253bd1a54ebf09b9 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 15:12:52 2020 +0800 切换全部公众号清空指定内容 commit dc9e576d158b27420a0463ce2ba987c489fbbd0c Author: wanggb Date: Tue Mar 3 15:09:09 2020 +0800 测试高级群发-导入用户ID commit eb1c184d02ae9447ec2be59f61f7c77ff80ceaa9 Author: xhw Date: Tue Mar 3 15:04:41 2020 +0800 send message list commit f777fcd41815e631fbecdcd1f37c75d29cfa404c Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 14:55:59 2020 +0800 table文字居中 commit 0f7f7258c078ab34a32a918eb6c4d49efd14b6bd Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 14:55:20 2020 +0800 公众号添加,预览,删除 commit 3a618d5410501e01bddfc0cfbb6133bf7895f98f Merge: 3a3f35293 4cffb80d8 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 13:40:24 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 3a3f35293097205b970c5a96a820242a895d296c Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 13:40:12 2020 +0800 添加id commit 28fd2184d1ef29cefacc76c7efa0c0d36bf140c1 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Mar 3 13:38:37 2020 +0800 公众号 commit d3ef5fe8e90e7de77d6c5ef8d0a130b99f4d5bba Author: wudongdong Date: Tue Mar 3 13:38:19 2020 +0800 兼容 polardb commit 4cffb80d8bdec4aeb98222aed9154894b09d9ed4 Author: xhw Date: Tue Mar 3 13:35:58 2020 +0800 send message list commit f7496234b24de09598ed6cba2d43adb947ec63fe Author: xhw Date: Tue Mar 3 12:54:02 2020 +0800 send message list commit 23a53aa55e1ca717b05babe118228f243aa485e4 Author: wudongdong Date: Tue Mar 3 11:39:22 2020 +0800 强制关注，关注后进入下一章 commit d733778a30766e0b48f837c41c548087f0b2401e Author: xhw Date: Tue Mar 3 11:34:12 2020 +0800 send message list commit b7ec6a997a85a5f9515456435b2cfe0271971f6e Merge: 78e39f49e 02da546a0 Author: wudongdong Date: Tue Mar 3 10:57:33 2020 +0800 Merge branch 'dev-share-user-202002281615' of 192.168.0.31:fe/cps into dev-share-user-202002281615 commit 78e39f49e72c3272797614d56393f50542afb03a Author: wudongdong Date: Tue Mar 3 10:57:13 2020 +0800 share commit 02da546a08b4e7b0c9d8a896add15e5c968ac3dd Author: wanggb Date: Tue Mar 3 10:04:19 2020 +0800 添加命令行，增加config Tab commit b3d1edcbfc9c7ba1dbad5d7bbb37dac711fa5a63 Merge: 2227367af dedd95002 Author: wudongdong Date: Tue Mar 3 10:03:37 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps into dev-share-user-202002281615 commit f89c3a2e4ca8c9bd7f4e31b4e00822792f0b0e23 Author: xhw Date: Tue Mar 3 09:22:04 2020 +0800 send message list commit 95bf1b9ebeb265d08d547c181ff31f416017c8b4 Author: xhw Date: Mon Mar 2 19:31:10 2020 +0800 send message list commit 5ade88d230f6c08f3a5fcc8bc41b4942986ea1a7 Author: xhw Date: Mon Mar 2 19:23:51 2020 +0800 send message list commit 8446b1f2e0806b12fb7c50c179d33cc2d666b5ef Author: liyt Date: Mon Mar 2 19:05:20 2020 +0800 GDT用户行为回传 commit a2ea2e3e590c085f35a4e5b7a1eb9853c4233479 Author: xhw Date: Mon Mar 2 17:52:06 2020 +0800 send message list commit 85212b319f159371f3f0ca7192ca117f54a662c7 Author: xhw Date: Mon Mar 2 17:39:57 2020 +0800 send message list commit a2976677e65c52137599fbf48e4e73989940c87f Author: xhw Date: Mon Mar 2 17:00:00 2020 +0800 send message list commit 31d82b71777c6d8a838b66202cf6c489b6554386 Author: xhw Date: Mon Mar 2 16:58:13 2020 +0800 send message list commit 8363c0ec754bc11b277eff39e47584c9f4d73a42 Author: xhw Date: Mon Mar 2 16:16:30 2020 +0800 send message list commit 3a7d88be5aab592ca9c05e683b56bbe9a22b8b4e Author: wanggb Date: Mon Mar 2 15:41:57 2020 +0800 测试高级群发 commit 0dd7ada796cc3db689dfcede7aa8b19c177d2707 Author: xhw Date: Mon Mar 2 13:11:30 2020 +0800 send message list commit 40772719b9cae07c8a38689e0d86d86319c3fd16 Author: xhw Date: Mon Mar 2 11:30:14 2020 +0800 send message list commit 742d0d1dcd01485681e6d3ab8cd405fcbd845f02 Author: xhw Date: Mon Mar 2 11:13:31 2020 +0800 send message list 图片 commit 27f165719fc49c83f1d92367dea8ed6539f9334c Author: xhw Date: Mon Mar 2 11:11:06 2020 +0800 send message list 图片 commit dedd95002bfc9a0dc6db46001b0debf257f6dd75 Author: liyt Date: Mon Mar 2 10:26:10 2020 +0800 vip客服消息无法创建时删除push commit 2227367afbb6d7865b7cdc4fbc31e3456c938cb6 Merge: 0d4e5fa1d 24cfddbfb Author: wudongdong Date: Sun Mar 1 19:34:04 2020 +0800 Merge branch 'dev-share-user-202002281615' of 192.168.0.31:fe/cps into dev-share-user-202002281615 commit 0d4e5fa1d95ed1868f5275164e869f9d61197f20 Merge: ba493a02c 0bf2cd250 Author: wudongdong Date: Sun Mar 1 19:33:08 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps into dev-share-user-202002281615 commit ba493a02c67ff102c2666e393dba512c5650330c Author: wudongdong Date: Sun Mar 1 19:33:01 2020 +0800 分享活动-跨渠道分享问题 commit 24cfddbfbb331913d5fc0d2f5c45623b35306ab1 Merge: 5f3ed14e5 eccceb5f1 Author: wanggb Date: Sat Feb 29 20:28:48 2020 +0800 Merge remote-tracking branch 'origin/dev-share-user-202002281615' into dev-share-user-202002281615 commit 5f3ed14e59dba3ab42e4e6ddec21a8253524f42f Author: wanggb Date: Sat Feb 29 20:22:57 2020 +0800 添加命令行，增加config Tab commit 03db54f754c1babc18e1c67bf8992b92ea8448f9 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Feb 29 19:38:01 2020 +0800 注释 commit bcd608fb49d602f42ad7e8fea668b21bc16f5b03 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Feb 29 19:29:52 2020 +0800 公众号添加 commit e57c22902e9609b3013d15f615fd5f37489cc529 Author: xhw Date: Sat Feb 29 17:20:08 2020 +0800 send message list commit d4294a0c8864f9420e5f92f14c09c875044d03fc Author: cuigang_qianduan <891257242@qq.com> Date: Sat Feb 29 16:59:29 2020 +0800 封面回显 commit 7f0ec255218059cd8a4b40e061ebe087ea51436b Author: cuigang_qianduan <891257242@qq.com> Date: Sat Feb 29 16:48:06 2020 +0800 基本功能实现 commit d6c594bf6fca6b935994aa99f67bd49ff4a5293f Merge: c5b1aa26c a69f9d0b7 Author: cuigang_qianduan <891257242@qq.com> Date: Sat Feb 29 16:04:46 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit c5b1aa26c697597ffaefa6795309841ecf7a37df Author: cuigang_qianduan <891257242@qq.com> Date: Sat Feb 29 16:04:42 2020 +0800 图文消息编辑删除 commit 0bf2cd25003bc59cdabcb9927c3d97b2c509e44a Author: zhenglihao Date: Sat Feb 29 15:39:47 2020 +0800 头条过期时间改为关注后的24小时 commit a69f9d0b77c85f021941ee1acf77478b969cd6ed Author: xhw Date: Sat Feb 29 15:03:16 2020 +0800 send message list commit da5d966c384d4c44be0eadae37beb05d6c3d487c Author: xhw Date: Sat Feb 29 14:57:30 2020 +0800 send message list commit 9a5228a7efa41533ff030fbe47cae4208a6f671f Author: xhw Date: Sat Feb 29 14:35:28 2020 +0800 send message list commit d912a47d34a3f1a277ade6394e3cb43eed0ab9a5 Author: xhw Date: Sat Feb 29 10:27:50 2020 +0800 send message list commit 541b9503222687407154abe1de633fdd2ed5078d Author: xhw Date: Sat Feb 29 09:52:08 2020 +0800 send message list commit 6b2c0e9b7894f1f95398dd4d90b9547e2cd85acc Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 19:28:50 2020 +0800 优化提示 commit eccceb5f1e815e543e41fcc75f981f763f9ef616 Merge: b063be072 6baef5abb Author: wudongdong Date: Fri Feb 28 19:05:24 2020 +0800 Merge branch 'dev-share-user-202002281615' of 192.168.0.31:fe/cps into dev-share-user-202002281615 commit b063be072db7782bee79a595f0ad5078c07fe498 Author: wudongdong Date: Fri Feb 28 19:05:20 2020 +0800 分享活动 commit 6baef5abb54b3eae85e7cc180960e8ab0e8e1071 Author: wanggb Date: Fri Feb 28 18:55:56 2020 +0800 添加引用 commit eca5df89ea347083959c9bb6c42d0e05c0b55c28 Author: xhw Date: Fri Feb 28 18:48:58 2020 +0800 send message list commit 3da5c14019f68406116d2555c6b50ac1c416fb5e Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 18:10:39 2020 +0800 json字段 commit c4cb5f5947cda77e42cdae926449d95fde3c909c Merge: ce6d6311b 3f8fa2016 Author: wudongdong Date: Fri Feb 28 17:50:32 2020 +0800 Merge branch 'dev-share-user-202002281615' of 192.168.0.31:fe/cps into dev-share-user-202002281615 commit ce6d6311b0f6125c4cc830a811633d3a3d221191 Merge: a58a36333 6837c23eb Author: wudongdong Date: Fri Feb 28 17:50:08 2020 +0800 Merge branch 'master' of 192.168.0.31:fe/cps into dev-share-user-202002281615 commit 3f8fa2016fc12760fc947b7a03e32146a078942c Author: wanggb Date: Fri Feb 28 17:48:03 2020 +0800 添加引用 commit e4ade16b367c0ded0a25fc9feaf6235ae52330fc Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 17:43:47 2020 +0800 json格式 commit a58a36333710de588211d02fd90a225fae3c9e2a Author: wanggb Date: Fri Feb 28 17:21:23 2020 +0800 合代码 commit 879f493ed51791e7cf540536ec1493c64970aff6 Merge: 4a33cdc95 9124defbd Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 17:03:04 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 6837c23eb31e4122fb52c4f75330e31943d6522c Author: liyt Date: Fri Feb 28 16:49:50 2020 +0800 降低日志级别 commit 4a33cdc95cbe68f8a47dec652fc709a1ae7980bc Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 16:43:29 2020 +0800 收集页面数据 commit 82087a676349b4a32c15a8b4338acc7bb9bc8486 Merge: 73acde0a9 a229811bf Author: wanggb Date: Fri Feb 28 16:25:42 2020 +0800 Merge branch 'dev-share-user-20200203' into dev-share-user-202002281615 # Conflicts: # application/extra/db.php # application/index/controller/User.php # application/index/view/book/chapter.html # application/main/service/OfficialAccountsEventService.php commit 9124defbd6f727a8ceecb0cb47c52db9a147ffe2 Author: xhw Date: Fri Feb 28 16:15:54 2020 +0800 send message list commit de44315e778616c9df2a4163e90c94c0e56cd288 Merge: 552544c74 aaeee3714 Author: xhw Date: Fri Feb 28 15:54:29 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 552544c74e673bf7f4009a86a90faf2006c184d9 Author: xhw Date: Fri Feb 28 15:54:20 2020 +0800 send message list commit c8076156109f5bf06d8a662b5be5a8b0cc4a2c12 Merge: 3dad21190 aaeee3714 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 15:51:04 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 3dad211909ceaeae2799bbc956ec332884a1f996 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 15:50:54 2020 +0800 提交数据收集 commit aaeee37141c672b26c917a28d419e6e8b4ef02ec Merge: 94920d933 549448ef3 Author: wanggb Date: Fri Feb 28 15:36:37 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 94920d933fc4d44b0f95d7c07d1d4b60b6f37573 Author: wanggb Date: Fri Feb 28 15:35:42 2020 +0800 高级群发接口 commit 549448ef311e37554354d00e0daaf219bab8c9e6 Author: xhw Date: Fri Feb 28 15:03:38 2020 +0800 send message list commit 34d3b08036db783a749a6fee53a5fd4fad3adad6 Author: xhw Date: Fri Feb 28 14:34:35 2020 +0800 send message list commit 156f2cb6f35d024d00bd0c05479ae4c0f6f6d99c Author: xhw Date: Fri Feb 28 14:20:26 2020 +0800 send message list commit 9222257367c29c461158a5c6e7eee5ac0e4c0cc6 Author: xhw Date: Fri Feb 28 14:17:14 2020 +0800 send message list commit c17218a5cce0d4460900397b301e44156d5892be Merge: 210e15e9d ac6d6c2cb Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 14:11:30 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 210e15e9d58a44e3333cae42eb0a6975e3125229 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 14:11:04 2020 +0800 图文消息提交点击 commit ac6d6c2cb4739a5fed4441b5c9b6894ec0a87f55 Author: xhw Date: Fri Feb 28 14:06:44 2020 +0800 send message list commit 824d6cb42731d7094fae460bcd16cc45a13a4ef6 Author: xhw Date: Fri Feb 28 13:54:44 2020 +0800 send message list commit 682045451893e304f9fbaba74693a175bcb3045a Merge: bb0807e2c 5c94eda89 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 12:08:27 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit bb0807e2cf3b5145b5e3041c595b0a7d9ab140b7 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 12:08:23 2020 +0800 富文本延迟1.5秒初始化 commit 5c94eda89ed942af39821dc807f174a27045f63d Author: xhw Date: Fri Feb 28 10:19:23 2020 +0800 send message list commit 6cd8847860a377e2c3fff30ba2af2046e85c2159 Merge: f298bafff a0d94a9fc Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 10:09:30 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit f298baffff5fd45e44aad619308ff612af724521 Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 28 10:09:24 2020 +0800 富文本编辑器嵌入 commit a0d94a9fc08ed13bde1a06669457ebbe35c22d5d Author: xhw Date: Fri Feb 28 09:59:24 2020 +0800 send message list commit 7db7ca1391f5d3b4a07b77da9fbdbdcf2eb54e1b Author: xhw Date: Fri Feb 28 09:41:20 2020 +0800 send message list commit c78a2b822f01fb615f57fef97e1e3e8cb30f8f2f Author: xhw Date: Thu Feb 27 20:22:18 2020 +0800 send message list commit 99f75d8b23418440aaa038bcd24de7cafb3bd9d7 Author: xhw Date: Thu Feb 27 19:11:47 2020 +0800 send message list commit 6ee4a4275a6f4d5e54fc859350f3763c82cfa403 Merge: 36274dcf4 da31509d7 Author: cuigang_qianduan <891257242@qq.com> Date: Thu Feb 27 17:02:23 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 36274dcf4e75e493bd5f4197c3d7350a4dc0e58a Author: cuigang_qianduan <891257242@qq.com> Date: Thu Feb 27 17:02:17 2020 +0800 消息类型判断加载弹窗 commit da31509d73cebadb6a6058e82e60659359ba67ac Author: xhw Date: Thu Feb 27 16:33:54 2020 +0800 send message list commit 964f1ba6e6d8a56a61a77ef430d70d1f1033ae7c Author: xhw Date: Thu Feb 27 15:54:36 2020 +0800 send message list commit ed0e87e50411799fac99d52fc8379312edc88a9c Author: xhw Date: Thu Feb 27 15:34:18 2020 +0800 send message list commit 73acde0a9975e616558d4d808f0a8b8bb9c58ae2 (tag: cps_20200228_134901, tag: cps_20200228_105636) Author: zhenglh Date: Thu Feb 27 15:09:29 2020 +0800 头条回传外部api commit 1e05cc069b324e695395b9497cbb8f80c9e88385 (tag: cps_20200227_161926) Merge: 73bb16647 733a0f87b Author: zhenglh Date: Thu Feb 27 14:47:21 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' commit 9e1bf12921f07788de0ea1a0ca536f33c8f62d8f Author: xhw Date: Thu Feb 27 13:01:36 2020 +0800 send message list commit dad2b3a29765a68a17989c3cc9f798cd5791c4fd Author: xhw Date: Thu Feb 27 12:51:53 2020 +0800 send message list commit 8e079a3a66591fbdf1dac2b2a6681252d94ae60f Author: xhw Date: Thu Feb 27 11:48:04 2020 +0800 send message list commit 482ce30f7ed62126d4f0e329d76fa28168d46f3f Author: xhw Date: Thu Feb 27 11:21:51 2020 +0800 send message list commit 733a0f87b501ed8ce34bb15729c77ea432dcb9cf Author: zhenglh Date: Thu Feb 27 10:18:34 2020 +0800 引导关注相同处理 commit b694dd19a63552bb0f306af4877e395def566754 Author: liyt Date: Thu Feb 27 10:08:15 2020 +0800 素材处理脚本 commit 017e09956242c5082c70b4e3ad2c21498b31a860 Author: zhenglh Date: Thu Feb 27 10:00:42 2020 +0800 强制关注点下一章弹关注二维码时，关注后进入下一章 commit 1927b2aa4a855adcd4036ad496b80bdf68154c19 Author: liyt Date: Wed Feb 26 19:14:18 2020 +0800 去掉调试代码 commit e7a0990aeb9101925c54202f28840f4ed7b0b96b Author: liyt Date: Wed Feb 26 19:12:30 2020 +0800 消息资源处理脚本 commit 7716c39605feda9e838632de4e8eeb376acdceee Author: wanggb Date: Wed Feb 26 18:44:38 2020 +0800 后台-高级群发-群发统计 commit 417fcd041edea544606608170ea1403b9e6ac295 Author: xhw Date: Wed Feb 26 16:12:31 2020 +0800 send message material library commit 3e7a7fa9318d97926f12b99deaa6242168cb2510 Author: xhw Date: Wed Feb 26 16:07:50 2020 +0800 send message material library commit bcdfea07ab19118571c5ec6cfe3ea85ad6c31f1b Author: xhw Date: Wed Feb 26 15:00:42 2020 +0800 send message material library commit 73bb16647e138bfe9fbc048ee66b75e58f3eafa6 (tag: cps_20200227_135519, tag: cps_20200226_160259) Merge: 29cea7347 7f453cfcc Author: wudongdong Date: Wed Feb 26 14:30:36 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' commit 7f453cfcc7e75affa2f1960a0aca839d3673f269 Author: wudongdong Date: Wed Feb 26 14:30:01 2020 +0800 书籍质检状态 commit 29cea7347ca6992cae9841f32edb3d82c2cf3624 Author: wudongdong Date: Wed Feb 26 14:04:17 2020 +0800 去除同步书籍上下架状态 commit 7153623f1323e7dfae9e2f94ca269b7dc133c016 Author: xhw Date: Wed Feb 26 13:42:15 2020 +0800 send message select subscription list commit 4c4da8e6f97452822d89da6226c8b678b96f975f Merge: bee52322b 2d273fd4d Author: wanggb Date: Wed Feb 26 11:06:30 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' commit 2d273fd4d62796b269057e4338682a6481d72449 Merge: 34dc171b1 f48de7c86 Author: wanggb Date: Wed Feb 26 11:04:15 2020 +0800 Merge remote-tracking branch 'origin/dev-silent-corner-sys-20200109' into dev-silent-corner-sys-20200109 commit 34dc171b132b31d1c75008a7ad7a6ac78db7ad76 Author: wanggb Date: Wed Feb 26 11:04:06 2020 +0800 静默授权，页面跳转40163错误 commit f48de7c86dfd1d5e1c203b8299e19c35c62f0025 Merge: 259aaf0d6 d8d3ca6f6 Author: wudongdong Date: Wed Feb 26 10:47:32 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of 192.168.0.31:fe/cps into dev-silent-corner-sys-20200109 commit 259aaf0d6a153de4af8457fbf32f6983df673cd8 Author: wudongdong Date: Wed Feb 26 10:47:15 2020 +0800 延迟公告弹窗 commit 81174f4a64deb53cbfc725874a91c400afa14770 Author: xhw Date: Wed Feb 26 10:27:56 2020 +0800 send message select subscription list commit 0922830c4801a3bdb0bb68151ca5a2e76c5ff4ff Author: xhw Date: Wed Feb 26 10:25:34 2020 +0800 send message select subscription list commit d8d3ca6f6b515f47ad6803f97a89ddf87c32a8ed Author: wanggb Date: Tue Feb 25 18:24:38 2020 +0800 静默授权，页面跳转40163错误 commit 38fe1c62e5d8db76535ea8255f302ee6faa5ba5c Author: wanggb Date: Tue Feb 25 18:08:12 2020 +0800 静默授权，增加一行日志，排查错误 commit 4f86139ff2e3413c7f84302aa1ccdb85457d787d Merge: 20521a630 2b41d490c Author: wanggb Date: Tue Feb 25 16:50:15 2020 +0800 Merge remote-tracking branch 'origin/dev-silent-corner-sys-20200109' into dev-silent-corner-sys-20200109 commit 20521a630ae12615745d487faf104b35446f7b61 Author: wanggb Date: Tue Feb 25 16:50:08 2020 +0800 静默授权，删除url中的code 参数 commit f796345caa6fb4dce0953e260fe33e0dc28be562 Merge: 27eb5ea01 a77ba6097 Author: wanggb Date: Tue Feb 25 16:18:16 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 27eb5ea01a2d755b64ae4987ad23d57be8c41011 Author: wanggb Date: Tue Feb 25 16:18:08 2020 +0800 后台-高级群发-群组表单维护删除分类 commit a77ba60977f4725473336b59fff3157d13e3c084 Merge: 9c14ce51c 9799e4018 Author: xhw Date: Tue Feb 25 16:17:01 2020 +0800 Merge branch 'dev-high-message20200214' of 192.168.0.31:fe/cps into dev-high-message20200214 commit 9c14ce51c8bb09cb3cda3c75af1cae9056bbacce Author: xhw Date: Tue Feb 25 16:16:56 2020 +0800 send message update commit bee52322b2e03f4bc5e69f4b893d8a9cb8d01bf8 Author: liyt Date: Tue Feb 25 15:54:37 2020 +0800 分组编辑修复 commit 2b41d490ca3503fbd33cc6dc8cdf7f89926d656c Author: liyt Date: Tue Feb 25 15:17:29 2020 +0800 功能白名单加默认值 commit 9799e401805c8d140ccb8703910bc8d28b829689 Merge: 603c97305 f48c4eb4e Author: wanggb Date: Tue Feb 25 14:58:38 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 603c973058c3a423e547d3db8168ec5e1ad5785e Author: wanggb Date: Tue Feb 25 14:58:28 2020 +0800 后台-高级群发-群组表单设置默认值 commit f48c4eb4e306daebd9d3930de8cb7c595046419c Author: xhw Date: Tue Feb 25 14:43:42 2020 +0800 send message add commit 2c0d163964cbdea181dacf374674d28c157bbee9 Author: liyt Date: Tue Feb 25 12:17:10 2020 +0800 群发服务方法 commit 2f14f8cfe3971c380a8ed825035fa737444ce89b Merge: 8b860030b 43cea5213 Author: wanggb Date: Tue Feb 25 11:02:51 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 8b860030bec0ffb47d21de306ddcf74461243868 Author: wanggb Date: Tue Feb 25 11:02:43 2020 +0800 后台-高级群发-群组列表优化 commit 43cea52131632ac20cf26b208a7c6b6119811e16 Author: xhw Date: Tue Feb 25 10:46:31 2020 +0800 send message add commit 2ec07dad193b335b022955f4018a947f9aef30a9 Author: xhw Date: Mon Feb 24 17:56:21 2020 +0800 send message add commit 347f1fea4907729cf745f39dfbe515d1da0d32cd Author: xhw Date: Mon Feb 24 15:01:43 2020 +0800 send message add commit a3722ff63ff74b84300749d2b52618f8a542f1a4 Author: wanggb Date: Mon Feb 24 14:50:15 2020 +0800 后台-高级群发-统计信息 commit 095c738506790864d4e814bb778b1cf070d00616 Merge: ab3d6a9c3 24fe215ea Author: wanggb Date: Mon Feb 24 13:53:08 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit ab3d6a9c3740080ba95d22eaecb503db3046531e Author: wanggb Date: Mon Feb 24 13:50:16 2020 +0800 后台-高级群发-用户组配置-新增 commit 24fe215eab5e53c313d659997cb849b91dd4a641 Author: xhw Date: Mon Feb 24 12:45:16 2020 +0800 rm old send message list commit 0c738b5960eb5dcb41894b3718cef5153ab7c26f (tag: cps_20200224_115606) Author: liyt Date: Mon Feb 24 11:30:25 2020 +0800 分组筛选条件bug修复 commit bbd53839afad7408622e7b6cb375d7a64e205b5a Merge: 8b6413946 5cb6fab3b Author: wudongdong Date: Mon Feb 24 11:16:55 2020 +0800 静默授权 commit ddfe28ed0dc52d04bf097e45b0489996a1c59718 Author: xhw Date: Mon Feb 24 10:15:16 2020 +0800 advanced mass message list commit 8b641394646e46de446b8d4f39f3f739bb11eb14 Author: zhenglihao Date: Sun Feb 23 00:51:00 2020 +0800 复粉需求处理 commit cd0f50069837fe97dbfd67521a059184f2ea9bd8 Author: zhenglihao Date: Sat Feb 22 10:01:13 2020 +0800 优化 commit 9013cb5f83d6c5ecbe2334ba010055ff1685220c Author: zhenglihao Date: Fri Feb 21 17:31:08 2020 +0800 字段修改 commit cdf74a48c5c1ee4fd246481e5562c7ec6632d294 Merge: fe61586d8 c3d8660d1 Author: xhw Date: Mon Feb 24 09:39:48 2020 +0800 Merge branch 'master' into dev-high-message20200214 commit f83cbcdc40069ae286f2ee0c65c03dde9a9db7ac Merge: 9d34650bf c3d8660d1 Author: zhenglihao Date: Sun Feb 23 00:58:57 2020 +0800 Merge remote-tracking branch 'origin/master' commit c3d8660d106c48f55b24b6bee04c402990af3cfd Author: liyt Date: Sun Feb 23 00:57:49 2020 +0800 订单查询条件修复 commit 9d34650bf4eebeb9a083e7a8d96c43827fe0814e Merge: 20237f11b 79038bca4 Author: zhenglihao Date: Sun Feb 23 00:54:07 2020 +0800 Merge remote-tracking branch 'origin/master' commit 79038bca447a93f937d58eaa91ae0bc9f832bf7d Author: liyt Date: Sat Feb 22 16:54:58 2020 +0800 '切换账号列表' commit 6abe64d58f1f33bc4a99ba45e191f43c2acc0764 (tag: cps_20200222_141700) Author: xhw Date: Sat Feb 22 12:46:49 2020 +0800 9.9 增量 commit 39aff847d40809ef302ac13cdbc1c6f15248dd68 Author: liyt Date: Sat Feb 22 11:03:30 2020 +0800 智能推送样式 commit fe61586d8cc2d7aadb95f2a8b5f7530c23833e14 Author: xhw Date: Sat Feb 22 10:48:46 2020 +0800 advanced mass message list commit 5907d6057e1c0273ff387e53aac6f715b00c838f (tag: cps_20200222_102344) Author: liyt Date: Fri Feb 21 21:07:42 2020 +0800 智能推送样式 commit 339c25af151d5e82faaa48a07e1d1eff51d9daab Author: wanggb Date: Fri Feb 21 13:19:17 2020 +0800 后台-高级群发-用户组配置-新增 commit b0c385587a4e8a613d76a51d8e74e4e2126b5fd1 (tag: cps_20200221_184749) Author: liyt Date: Fri Feb 21 13:13:44 2020 +0800 消息去重 commit 0a0b377c6684fbf400e8c9c5f540ad0c66c1e855 Author: liyt Date: Fri Feb 21 12:11:30 2020 +0800 客服消息自定义活动列表 commit 20237f11bd52726a05df958d5128350635b83121 Author: zhenglihao Date: Fri Feb 21 11:49:03 2020 +0800 复粉添加 commit 41c18f68e8fbd1d5c8364f5afebb9f446d4d1e70 (tag: cps_20200221_111013) Merge: 5a12833fa 0d208d3a5 Author: liyt Date: Thu Feb 20 22:31:07 2020 +0800 Merge branch 'master' into dev-240-2-20200219 commit 77df4ecfc4d75346d82d6e76632891975b82a7b9 Merge: 795d8ec61 3f14bb3af Author: wanggb Date: Thu Feb 20 19:22:21 2020 +0800 Merge remote-tracking branch 'origin/dev-high-message20200214' into dev-high-message20200214 commit 0d208d3a558145e4dab5ff5feb02f53b8c391f4a Author: liyt Date: Thu Feb 20 18:05:46 2020 +0800 系统活动菜单 commit 3f14bb3af9d8fa9d144b828a2216bd08575384f7 Author: xhw Date: Thu Feb 20 17:41:26 2020 +0800 advanced mass messages list commit 795d8ec615dba201604c9d65169220885523f922 Author: wanggb Date: Thu Feb 20 16:28:05 2020 +0800 后台-高级群发-渠道黑名单+用户分组 commit 5a12833fa10570ce14e596809e48a852f02958b1 Merge: f3f4ca629 860e36d23 Author: liyt Date: Thu Feb 20 15:22:11 2020 +0800 Merge branch 'dev-orders-select-20200219' into dev-240-2-20200219 commit f3f4ca629c873e08f648bc91e40c37a2114cda8b Author: liyt Date: Thu Feb 20 15:17:28 2020 +0800 测试发送 commit e7e1a38ebcba271ede3989e2685514727ddee790 Author: xhw Date: Thu Feb 20 15:03:03 2020 +0800 qds list commit 62ac2a27567455ef8ba1579d1000266cad8ed5cb (tag: cps_20200220_154130) Author: wudongdong Date: Thu Feb 20 14:42:53 2020 +0800 sf-签到回复 commit 860e36d23008608f8f0623e6e6489e881bb826fe Author: liyt Date: Thu Feb 20 14:26:40 2020 +0800 订单明细筛选时间范围 commit 688981a8bef6a60f031942341877a4779d089d57 Author: wudongdong Date: Thu Feb 20 13:02:48 2020 +0800 try catch commit e1d0cafe2995423d0f3c941d4bad2fc5e83eeef8 Author: wudongdong Date: Thu Feb 20 12:40:11 2020 +0800 230sell commit 0d1177ee28026e9b6171d9aa0285ee7ae9d26271 Author: xhw Date: Thu Feb 20 12:30:17 2020 +0800 qds list commit 9bd236160812baa1236824fee98129116b7a7352 Merge: 3c0fe4a96 ec6e961ef Author: xhw Date: Thu Feb 20 11:38:33 2020 +0800 Merge branch 'master' into dev-high-message20200214 commit b21ef098fd14ba81796100a8b703295511909112 Merge: ec0f5d356 ec6e961ef Author: xhw Date: Thu Feb 20 11:02:58 2020 +0800 Merge branch 'master' into dev-240-2-20200219 commit ec0f5d3567aebbff9b97ef773de962e3acee7fdd Author: xhw Date: Thu Feb 20 10:54:49 2020 +0800 count uv commit 3c0fe4a968105e58525c97a12c1d9fde7f7dd1ba Author: xhw Date: Thu Feb 20 10:44:58 2020 +0800 advanced mass message commit d743dbec1131bb2a13e3cfd9510d096fad415e32 Author: xhw Date: Wed Feb 19 20:00:11 2020 +0800 advanced mass message commit f9c1393178826b04acf16a317ddc6c295465ab53 Author: xhw Date: Wed Feb 19 19:59:29 2020 +0800 advanced mass message commit ec6e961efb764a604284a14734216fc1fae0670e (tag: cps_20200219_194619) Author: wudongdong Date: Wed Feb 19 19:34:02 2020 +0800 230-文末推荐过滤书籍自己 commit 22422550657ac87862a71ba5e765532a7bf3db53 Author: xhw Date: Wed Feb 19 18:55:56 2020 +0800 count uv commit 6caca28885a9f17892d17e91b2b5c15c176f7977 Merge: fa33014c8 c024a9a6f Author: liyt Date: Wed Feb 19 17:34:43 2020 +0800 Merge branch 'dev-240-2-20200219' of 192.168.0.31:fe/cps into dev-240-2-20200219 commit fa33014c8800f33691b65b55fe3cd75b38d531c6 Author: liyt Date: Wed Feb 19 17:34:28 2020 +0800 vip分组bug修复 commit c024a9a6fb0e81b998806a72b432ec029129ac36 Merge: 04e9ee741 f828791c9 Author: wudongdong Date: Wed Feb 19 17:33:27 2020 +0800 Merge branch 'dev-240-2-20200219' of 192.168.0.31:fe/cps into dev-240-2-20200219 commit 04e9ee7416b70b01565ca5077f4489cef03c745c Author: wudongdong Date: Wed Feb 19 17:33:10 2020 +0800 240-公公告弹窗+切换账号 commit f828791c97838147b6a1eea4e9018381e79191c2 Author: xhw Date: Wed Feb 19 17:32:58 2020 +0800 智能推送页面调整 commit bd6b5e9e925e6e303af1ee8acd2eec2443b59ab5 Merge: 069231bec c5cf90b98 Author: xhw Date: Wed Feb 19 17:30:50 2020 +0800 Merge branch 'dev-240-2-20200219' of 192.168.0.31:fe/cps into dev-240-2-20200219 commit 069231bec7e627fe0249ba4b0ea731f4aa726fc0 Merge: 8d203d0a3 f866c51ed Author: xhw Date: Wed Feb 19 17:30:18 2020 +0800 Merge branch 'dev-list-opt-202002101' into dev-240-2-20200219 commit c5cf90b98e718a82c5632afb40ba20b593693315 Merge: b596e33cd e8be566cb Author: liyt Date: Wed Feb 19 17:30:14 2020 +0800 Merge branch 'dev-vip_custom_activity_20200210' into dev-240-2-20200219 commit b596e33cd1afdd3abee85d487447f848d609e416 Merge: 8d203d0a3 6b2ebd00b Author: liyt Date: Wed Feb 19 17:30:06 2020 +0800 Merge branch 'dev-vip-group-20200205' into dev-240-2-20200219 commit 8d203d0a3fc63d734b4e947a7f0866fde4f5bfe9 Merge: faeab3489 707431e10 Author: xhw Date: Wed Feb 19 17:29:08 2020 +0800 Merge branch 'custom99_202002051' into dev-240-2-20200219 commit faeab348929e9063cb49272b21e0cd71061b3bce Merge: 3712c7ce6 b8a5e9a8b Author: xhw Date: Wed Feb 19 17:27:23 2020 +0800 Merge branch 'countuv_202002061' into dev-240-2-20200219 commit 143a5b296e0e1136228dacbdfc765a202e2a6d2b Merge: 693c1c26d 207c4d90c Author: wudongdong Date: Wed Feb 19 17:07:32 2020 +0800 Merge branch 'dev-230sell-20200203' of 192.168.0.31:fe/cps into dev-230sell-20200203 commit 693c1c26de459d2504615bafb05e39d99afd6a39 Author: wudongdong Date: Wed Feb 19 17:07:22 2020 +0800 230-0219 commit 207c4d90cf58f1becbb168de63868b1bdaa2b6fe Author: liyt Date: Wed Feb 19 16:59:30 2020 +0800 重新合并代码 commit 2e2183435e7bf6c0891581f9ab14096daae92d51 Author: wudongdong Date: Wed Feb 19 16:43:44 2020 +0800 230-猜你喜欢排序 commit 3712c7ce65839296d97964bec538aab06a864c9f Author: 李天时 Date: Wed Feb 19 16:16:48 2020 +0800 书架新增渠道开启白名单 commit 8a041e35e3c9d7d0d0c8a11c93b767291b9f976b Author: xhw Date: Wed Feb 19 14:37:23 2020 +0800 advanced mass message commit bd43d57aba39f4d724102cc31f71bc433c0826d3 Author: xhw Date: Wed Feb 19 14:34:20 2020 +0800 advanced mass message commit 09ef35b1834b3d93d37df01e6ad6d8c05772ad38 Merge: 81d54d137 7e6364a13 Author: xhw Date: Wed Feb 19 12:04:47 2020 +0800 Merge branch 'master' into dev-high-message20200214 commit 81d54d137f591347dab8a37aa36691aabb28de27 Author: xhw Date: Wed Feb 19 12:01:38 2020 +0800 advanced mass message commit 7e6364a136ed29ea10f8d12b304fa4983dafb611 (tag: cps_20200219_115632) Author: wudongdong Date: Wed Feb 19 10:08:04 2020 +0800 猜你喜欢排序 commit e02fe631451aa652ffdef14d63b7f32e6c705a14 Author: xhw Date: Tue Feb 18 18:47:45 2020 +0800 advanced mass message commit 6103a245025d4ba04a6e65ef3fd97f7d86581303 Author: xhw Date: Tue Feb 18 15:35:07 2020 +0800 advanced mass message commit c5438421a9a2b3abbebfd249a6634f8c6fb8d0d7 Author: wudongdong Date: Tue Feb 18 14:30:41 2020 +0800 后台增加永久书币改为20天赠送书币 commit 8790b9ee3260359fb8a2f1ea4303cee378ccacd3 Author: xhw Date: Tue Feb 18 14:26:27 2020 +0800 advanced mass message commit 029eae2910c65be8b9b08a6ea29926d653d52e30 Merge: 964b32841 8a9923035 Author: liyt Date: Tue Feb 18 14:05:33 2020 +0800 Merge branch 'master' into dev-230sell-20200203 # Conflicts: # application/main/service/FinancialService.php commit 7ca1abfb241ca2251a054b22d0d63a323a925e0c Author: xhw Date: Tue Feb 18 11:51:22 2020 +0800 advanced mass message commit 8a9923035c4e5d9458bd468899ae8b4a4c022044 (tag: cps_20200218_103206) Author: 李天时 Date: Mon Feb 17 17:56:55 2020 +0800 阳光书架，阳光添加书架开关白名单 commit eb6054f298250812fd8ee5900b2c041454cf7173 Merge: bdf7869ae 086e2f716 Author: 李天时 Date: Mon Feb 17 16:15:10 2020 +0800 Merge branch 'dev-shelf-white-20200215' commit bdf7869aeb2e560c2ce7cd01a77d08a27379d82b Merge: 098a42c1c 768967201 Author: 李天时 Date: Mon Feb 17 16:14:41 2020 +0800 Merge remote-tracking branch 'origin/master' commit 768967201f14e5446eee8f21d9edadf51ce7b579 (tag: cps_20200216_121147) Merge: 96161ceaf ffcacf2eb Author: zhenglh Date: Sun Feb 16 10:23:01 2020 +0800 Merge branch 'dev-postback-kl-20200211' commit 96161ceafa48d133df629823342f5d4eebe8e8d9 Author: zhenglh Date: Sun Feb 16 10:22:47 2020 +0800 粉丝迁移赠币 commit ffcacf2ebe94f102d341ebb8bc95abf39468cf33 Author: zhenglh Date: Wed Feb 12 11:43:23 2020 +0800 回传扣量添加 commit 0e97026052c6d14c3bd7ac9e7fbbcc847b6c7249 Author: zhenglh Date: Sat Feb 15 18:47:25 2020 +0800 粉丝迁移赠币 commit 086e2f716b589e0452e9040790ec0be09b821971 Author: 李天时 Date: Sat Feb 15 17:29:37 2020 +0800 阳光书架，阳光添加书架开关白名单 commit 098a42c1c1abdb1c4cd2a78b4f2ae0865b820041 Merge: 952969740 cc0450ece Author: 李天时 Date: Sat Feb 15 17:08:27 2020 +0800 Merge remote-tracking branch 'origin/master' commit a588d48d9dbb232d8168959e88750ee7a8772e03 Author: zhenglh Date: Sat Feb 15 13:28:20 2020 +0800 kandian commit bf47916bb7207d9496cccf4f83deede1a32e8db9 (tag: cps_20200216_111741, tag: cps_20200214_212958) Author: zhenglh Date: Fri Feb 14 20:50:33 2020 +0800 赠送看点样式处理 commit a1e87665f2ccbc230fa94d536615a6272e582409 Author: zhenglh Date: Fri Feb 14 19:00:26 2020 +0800 赠送书币配置添加 commit 4c5d9fd8655ae1674333fbeed8ba7d04396cc11d Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 14 10:08:06 2020 +0800 新增打点,引导页 commit 3cf6e5af3fc73173af9a754d2067b23fcdc8099e Author: cuigang_qianduan <891257242@qq.com> Date: Fri Feb 14 00:16:24 2020 +0800 更新JD地址 commit ec045578197fadf534c54077b86beb3aa648686b Author: cuigang_qianduan <891257242@qq.com> Date: Thu Feb 13 19:47:41 2020 +0800 关注时关闭听书 commit cc0450ece85077587ec6099822dc8a182fd84766 (tag: cps_20200213_200113) Author: wudongdong Date: Thu Feb 13 19:25:10 2020 +0800 订单导出优化-强制索引 commit 57ed55411bce390129e111d474f36e8169cf5d62 Author: wudongdong Date: Thu Feb 13 19:08:07 2020 +0800 '订单导出优化' commit 66099b071aa99a1f8ea4f94dbfaa5b26a86ecf8f (tag: cps_20200213_164030) Author: zhenglh Date: Thu Feb 13 16:06:07 2020 +0800 链接只展示在配置的渠道 commit 708bdebeee6059e55aa32a349e0577048178a77c Merge: be50ba62e c757e128d Author: zhenglh Date: Thu Feb 13 15:28:14 2020 +0800 Merge branch 'dev-adminMoney-20200204' of http://192.168.0.31/fe/cps into dev-adminMoney-20200204 commit be50ba62eaf0ce293f8f515efa73b708a1cf3f6f Author: zhenglh Date: Thu Feb 13 15:27:59 2020 +0800 跳转链接处理 commit c757e128d8f431cc566f08efb6359c2a3133ec63 Merge: c7679a7cb d8916611f Author: wudongdong Date: Thu Feb 13 15:21:14 2020 +0800 Merge branch 'dev-adminMoney-20200204' of 192.168.0.31:fe/cps into dev-adminMoney-20200204 commit c7679a7cb59aec680c0a324bf2adc870264b886b Author: wudongdong Date: Thu Feb 13 15:21:02 2020 +0800 订单导出优化 commit d8916611f44d7e504b067042bc3d713e17880623 Author: zhenglh Date: Thu Feb 13 14:59:49 2020 +0800 支付缓存 commit 23c3c5758055d49df1c9c62716ec43292eed855d Merge: 1ced6d83f bccbea2bc Author: zhenglh Date: Thu Feb 13 14:42:45 2020 +0800 Merge branch 'dev-small-pay-20200210' into dev-adminMoney-20200204 commit bccbea2bc866be2ebfa21328644379bc4d4ae020 Author: zhenglh Date: Mon Feb 10 10:40:48 2020 +0800 小额充值添加 commit 5cb6fab3ba2f8f9ee4ef3bca75c17228b7be3eb4 Author: wanggb Date: Thu Feb 13 11:01:18 2020 +0800 静默授权-连接polardb commit 1ced6d83fd6539c79c9ee5a4ab1309ceaf008ed7 (tag: cps_20200213_101406) Merge: d7d64ebbe 74ba31291 Author: liyt Date: Thu Feb 13 10:06:46 2020 +0800 Merge branch 'master' into dev-adminMoney-20200204 commit 74ba31291f56768e68732091244bda4e91b36ac0 Author: zhenglh Date: Thu Feb 13 09:59:55 2020 +0800 刷新用户kandian字段处理 commit f866c51edc3cd9a0c8bf82a6afb0fee1d7e0499e Author: xhw Date: Wed Feb 12 19:23:28 2020 +0800 list optimization commit 4459ae623f715c7d74314eddef8f8ebbd39ec780 Author: xhw Date: Wed Feb 12 19:22:38 2020 +0800 list optimization commit 0644ac7232831ee663315cdac6ae0870cf6962f9 Author: xhw Date: Wed Feb 12 19:20:47 2020 +0800 list optimization commit 7b8efba04bced58f30098b67e9c4072713577871 Author: xhw Date: Wed Feb 12 19:14:41 2020 +0800 list optimization commit 3997d0b4ecb5213ae652b2fe8d30f675a7cbe58a Author: xhw Date: Wed Feb 12 19:13:12 2020 +0800 list optimization commit 8ec34484b0cc30b42a35df7401a5ed182cd5d814 Author: xhw Date: Wed Feb 12 19:12:06 2020 +0800 list optimization commit 9881c1589a87c9314abdcf653fe61483ce9e2bfe Author: xhw Date: Wed Feb 12 19:06:39 2020 +0800 list optimization commit a4f94179fc0ba0725e09ac1101febd069ec578e6 Author: xhw Date: Wed Feb 12 19:02:08 2020 +0800 list optimization commit fb84ce618927f7645cd1c3e77c321bab69b0ae65 Author: xhw Date: Wed Feb 12 18:50:34 2020 +0800 list optimization commit 47bc93f1540da803a14c14ce16b9975490644701 Author: xhw Date: Wed Feb 12 18:30:59 2020 +0800 list optimization commit ea68511bf04788dc10e1e89a17854368ead271b0 Author: xhw Date: Wed Feb 12 18:24:18 2020 +0800 list optimization commit 40614df47ef1514160edbe71077394f7145c3040 Author: xhw Date: Wed Feb 12 18:18:51 2020 +0800 list optimization commit 37a062aff3d5bffcf95bf4e8b1322e7d7527f992 Author: xhw Date: Wed Feb 12 18:07:15 2020 +0800 list optimization commit d9b3eed3d8632ec8416beac2ff944b335dc6ca99 Author: xhw Date: Wed Feb 12 18:04:38 2020 +0800 list optimization commit 035a78a709807dde10cc4b396378fb65d42e66ce Author: xhw Date: Wed Feb 12 18:03:47 2020 +0800 list optimization commit 5bff40560fe584ce3e6d24c781d0a536f4c45fe2 Author: xhw Date: Wed Feb 12 17:58:41 2020 +0800 list optimization commit 63c1de15b4c6d770a0b319c996961a4eb12f9b78 Author: xhw Date: Wed Feb 12 17:57:01 2020 +0800 list optimization commit a5a4906a65cd2c4ff06c1a70a7b26810595cdc53 Author: xhw Date: Wed Feb 12 17:56:10 2020 +0800 list optimization commit e56e7e1ad2b2343744e0b551a68495c1bb905244 Author: xhw Date: Wed Feb 12 17:55:13 2020 +0800 list optimization commit 11c5a6dbb9c62e020be2e177e4afa5b0991d52f9 Author: xhw Date: Wed Feb 12 17:54:09 2020 +0800 list optimization commit f67447b80fb0af14998c1252387cf08a0817add9 Author: xhw Date: Wed Feb 12 17:51:49 2020 +0800 list optimization commit d7d64ebbec1836b600cbc2ca9a1a3ce0ac0de25f Merge: 70ea77af4 1c026a15b Author: wudongdong Date: Wed Feb 12 17:47:15 2020 +0800 Merge branch 'dev-adminMoney-20200204' of 192.168.0.31:fe/cps into dev-adminMoney-20200204 commit 70ea77af43c36f99d64073ce95158b82d2840bba Author: wudongdong Date: Wed Feb 12 17:47:03 2020 +0800 vip导出增加字段 commit 7da2706e4eed8f91113d30ed9100c1cebc697138 Author: xhw Date: Wed Feb 12 17:45:49 2020 +0800 list optimization commit 209f59e26682ed66ca52bcbf0365442c73851221 Author: xhw Date: Wed Feb 12 17:45:19 2020 +0800 list optimization commit 9c634bf00bcde620e3cb663e84be6f1b2615f88f Author: xhw Date: Wed Feb 12 17:43:28 2020 +0800 list optimization commit 03452eb687054b7e4089bb36143ff13899792443 Author: xhw Date: Wed Feb 12 17:42:27 2020 +0800 list optimization commit d7128b27071b247d4187c06460c4976ac99d15b0 Author: xhw Date: Wed Feb 12 17:33:37 2020 +0800 list optimization commit 69259240c61cfbb64612a845cb3384cd2060a0b2 Author: xhw Date: Wed Feb 12 17:30:57 2020 +0800 list optimization commit 765ecc0ed597dea1102d49bab7aad94f45e6a870 Author: xhw Date: Wed Feb 12 17:18:05 2020 +0800 list optimization commit bc3b6d52d02a299a9b65b133ab1065c46c151427 Author: wanggb Date: Wed Feb 12 17:09:43 2020 +0800 听书-根据最近的阅读记录传递参数showIntro commit 1c026a15bc666727aa7cf7680fe263921b1d3c82 Author: liyt Date: Wed Feb 12 16:47:16 2020 +0800 代理商结算金额取自身 commit 913f510cc2bb7e005227c28a10ea0947b876ae8d Author: cuigang_qianduan <891257242@qq.com> Date: Wed Feb 12 15:08:18 2020 +0800 自动阅读,重载页面更新定时:DONE; 引导页展示:UNDONE; commit 9529697408bd2183446a78e16503b24f1c8a90cb Merge: 26f296b1d 0490a275d Author: 李天时 Date: Wed Feb 12 15:07:46 2020 +0800 Merge remote-tracking branch 'origin/master' commit 3c8ec3b683bfa38153d44edeeda4e04f2d08d9f4 Author: wudongdong Date: Wed Feb 12 14:11:47 2020 +0800 追加-订单导出增加用户注册时间字段 commit db56608f92543563e87f83ee1180b2b88bb79680 Merge: b858c301f 0490a275d Author: liyt Date: Wed Feb 12 13:43:06 2020 +0800 Merge branch 'master' into dev-adminMoney-20200204 # Conflicts: # application/admin/controller/auth/Channel.php commit e8be566cbf67a4908356280db3c5408bad473120 Merge: 55d7c551a 0490a275d Author: liyt Date: Tue Feb 11 16:39:06 2020 +0800 Merge branch 'master' into dev-vip_custom_activity_20200210 commit 6b2ebd00be91765acdce523abbff7d11f1f3f99f Author: liyt Date: Tue Feb 11 16:25:07 2020 +0800 公众号去重 commit 964b32841b725f59a135c92125fe557200473fa4 Author: liyt Date: Tue Feb 11 16:11:11 2020 +0800 sell弹窗超大字体样式修改 commit b57b781e567e594c004a3bf29bc5901e311be729 Author: wanggb Date: Tue Feb 11 14:16:24 2020 +0800 后台-被关注回复-文字模式 commit 0490a275df76715bb88759b938ed5996db8eecf6 (tag: cps_20200211_150741) Author: zhenglh Date: Tue Feb 11 11:53:32 2020 +0800 免费看点使用缓存 commit a4529915af9823b1891d458d2d952324d962d0bb Author: zhenglh Date: Tue Feb 11 09:08:36 2020 +0800 修改书币 commit 2bb76615ff4eb886bb6fe543611867a672f63e9e Author: zhenglh Date: Mon Feb 10 14:53:42 2020 +0800 用户查询剩余免费看点 commit 8e6e374bb45ec12a6637a50d8fa7d2504791004a Author: zhenglh Date: Wed Jan 8 13:35:46 2020 +0800 看点测试完成 commit 550a1b4f3a174fe8c6f7cf7ecd291049258ee6f5 Author: zhenglh Date: Wed Jan 8 12:05:03 2020 +0800 看点测试完成 commit 64cafac5a8543b7cc5c678bb0547e1e6f1051dbb Author: zhenglh Date: Tue Jan 7 14:42:22 2020 +0800 用户kandian与free_kandian删除 commit c9f9f23c0bd42a9ec757ede5549d3138ee111e13 Author: cuigang_qianduan <891257242@qq.com> Date: Tue Feb 11 11:29:32 2020 +0800 剔除新语法 commit d78adebfcb086e378360624a37f5ac635e067d53 Merge: 612e48a7e 1ea4ce566 Author: liyt Date: Tue Feb 11 11:19:27 2020 +0800 Merge branch 'master' into dev-230sell-20200203 commit 612e48a7e62b9a856a2068f4fa38b905c434fc8d Author: liyt Date: Tue Feb 11 11:19:20 2020 +0800 sell条超大字体情况 commit aa114609da177d3622b29d47209b4e91d2e88081 (tag: cps_20200211_113535) Author: wanggb Date: Tue Feb 11 10:56:49 2020 +0800 vip后台-添加文字客服消息-自动签到 commit 00389b00e99aa4971519cef0c17a154152c914fb Merge: 4974c4c0e 1246163e6 Author: liyt Date: Tue Feb 11 10:02:35 2020 +0800 Merge branch 'master' into dev-vip-group-20200205 commit 4974c4c0e322cc83f9a40d391ac7f54aff0b2250 Author: liyt Date: Wed Feb 5 18:14:28 2020 +0800 VIP账号分组及客服消息选择分组 commit 79556c498631b5ce0052f32c9de480b58d7108ca Author: liyt Date: Mon Feb 10 20:45:47 2020 +0800 修改关联渠道 commit 9b6d6ba932a7ea722cd476dfeb401b9618bbb896 Merge: 73de69961 1246163e6 Author: liyt Date: Mon Feb 10 19:53:09 2020 +0800 Merge branch 'master' into dev-230sell-20200203 commit 86a79d1b0cafb6d640b58106f21f7c637ac43bb7 Author: cuigang_qianduan <891257242@qq.com> Date: Mon Feb 10 18:24:33 2020 +0800 添加蒙版,蒙版点击事件 commit 1ea4ce566d2e80bdc4ffef188cb71484d5d5b53f (tag: cps_20200211_114649) Author: zhenglh Date: Mon Feb 10 17:25:18 2020 +0800 剪贴板处理错误 commit e5cf53816eb3169c6392ef7368157bb985cb68df Author: cuigang_qianduan <891257242@qq.com> Date: Mon Feb 10 17:10:07 2020 +0800 整合语音设置css commit 1246163e69ddd750444b2b51c887c596f1781c6a Author: zhenglh Date: Mon Feb 10 16:54:30 2020 +0800 主体名称规则修改 commit 55d7c551a80a3d797135dc20a2710d0dc2c3085d Author: liyt Date: Mon Feb 10 16:45:43 2020 +0800 VIP客服消息新增自定义活动选项 commit 2399e5267debbdedd437d0c69ea15fb3bc1a6035 Author: cuigang_qianduan <891257242@qq.com> Date: Mon Feb 10 16:42:18 2020 +0800 拼接结构done, undone:1.获取章节内容;2.确定触发下一章按钮;3.自动下一章逻辑与预期不符 commit b8a5e9a8bf71ff31ae8ce4ae8361ed74e9b23d5a Author: xhw Date: Mon Feb 10 13:53:25 2020 +0800 countuv commit 6d3b6c714080dc0ca07d066fc06655b03e81bb65 Author: wanggb Date: Mon Feb 10 11:29:48 2020 +0800 后台-被关注回复-文字模式 commit de6fd7e8fd6bf24e1bb82cb3952f2bda6b401f11 Author: wanggb Date: Mon Feb 10 11:26:14 2020 +0800 后台-被关注回复-文字模式 commit 22a109efc2ee603fbcce9756110db45f1ce359c3 Author: wanggb Date: Mon Feb 10 11:25:08 2020 +0800 后台-被关注回复-文字模式 commit 08ce5468cd84d1c7c30b84aae45cf476d42e44eb (tag: cps_20200209_162541) Merge: d40d24004 f323cc194 Author: zhenglh Date: Sun Feb 9 15:34:08 2020 +0800 merge from toutiao commit f323cc1944bce8dae1cd2ce5715a1132b31dc64d Author: zhenglh Date: Fri Feb 7 15:52:45 2020 +0800 落地页新需求修改 commit d40d24004915b56b80d6752b74ddc5d4629cae50 Author: zhenglh Date: Sat Feb 8 14:09:56 2020 +0800 头条落地页渠道关联 commit e856f4d83294c12b6fb0b9e3f99e01be400d2f02 Author: zhenglh Date: Sat Feb 8 12:18:13 2020 +0800 二维码回复及数字问题处理 commit f70204b1e594801d3de5b48b6e0b6a337ef48159 (tag: cps_20200207_173102) Author: zhenglh Date: Fri Feb 7 15:52:45 2020 +0800 去掉落地页修改 commit 8612403de9cf82d1316bf920565f2f1508a420cd Author: zhenglh Date: Tue Feb 4 12:01:16 2020 +0800 头条回传功能添加 commit 707431e10f6a413e9740c8186210ca8b28a1404a Author: xhw Date: Fri Feb 7 11:57:21 2020 +0800 first recharge 9.9 commit 12572f1c8bbb6bf8236ea7cd98efe16e34cfa768 Author: xhw Date: Fri Feb 7 11:55:37 2020 +0800 first recharge 9.9 commit fddbbf72581a07af0e59fba977af7d764976a0a4 Author: xhw Date: Fri Feb 7 11:51:44 2020 +0800 first recharge 9.9 commit e60469648335d6700dc14706d510a2cb03d5c822 Author: xhw Date: Fri Feb 7 10:22:10 2020 +0800 first recharge 9.9 commit afd7c82eb06945609d2b8154db986eef952b42c5 Author: xhw Date: Fri Feb 7 10:14:43 2020 +0800 first recharge 9.9 commit 22f848967a0b7f7ad769690b5f437fd7f86768fa Author: xhw Date: Fri Feb 7 10:12:16 2020 +0800 first recharge 9.9 commit 146c276a5584d7f7c5c3512c6e5e813e1d6367c6 Author: xhw Date: Fri Feb 7 08:56:50 2020 +0800 first recharge 9.9 commit 34f02728307aaf940919645b4dac96650cc64f43 Author: xhw Date: Fri Feb 7 08:52:28 2020 +0800 first recharge 9.9 commit a229811bf2c68a0542fa0cc4bb2f72f5936ea2fc Author: wudongdong Date: Thu Feb 6 21:33:10 2020 +0800 分享活动-修改过期时间 commit d3fce25cc05c7fb4bebf5193c4befba38564afe2 Merge: 08e6d8693 d8ba154a9 Author: wudongdong Date: Thu Feb 6 18:15:45 2020 +0800 Merge branch 'dev-share-user-20200203' of 192.168.0.31:fe/cps into dev-share-user-20200203 commit 2359eb23427791542255084626015af19b02625a Author: wanggb Date: Thu Feb 6 17:43:45 2020 +0800 小说推广-客服消息-文字客服消息增加自动签到回复类型 commit f4a47dc239a75413a1acf5f4f62cd8e81c6f7809 Author: xhw Date: Thu Feb 6 17:36:58 2020 +0800 first recharge 9.9 commit 08e6d8693447605cec299e04bb8741a12860f925 Author: wudongdong Date: Thu Feb 6 16:26:35 2020 +0800 分享活动-链接过期时间 commit d8ba154a912b01060ba15704cab0024c6efbfcf7 Author: wanggb Date: Thu Feb 6 16:21:46 2020 +0800 替换个人中心分享签到弹窗 commit a17c6cc088f2070f004e2c788c15378f161c2006 Author: wanggb Date: Thu Feb 6 16:07:57 2020 +0800 替换个人中心分享签到弹窗 commit 73de69961be3fbae2e51ce86f9ffdb2c35b55138 Author: wudongdong Date: Wed Feb 5 21:56:37 2020 +0800 230sell-书籍互斥 commit ee5543ddeb8971828bf64693631fb37c0f7f2a37 Author: wudongdong Date: Wed Feb 5 21:12:52 2020 +0800 230sell书籍互斥 commit 01eb0ade9a9d3b6698cc81a43d081f4539a6bf55 Author: liyt Date: Wed Feb 5 18:25:35 2020 +0800 调查问卷和vip角色小说中心 commit bcdae679cbd3c986c8879bce700fd65b41cedad7 Author: wanggb Date: Wed Feb 5 13:45:50 2020 +0800 连续签到文案：签到领取的书币有效期为3天。 commit 8c553b0107aa2a7a7b143d4f1d04b66e0bc142df Merge: d43327138 6e79606b1 Author: wanggb Date: Wed Feb 5 13:28:51 2020 +0800 Merge remote-tracking branch 'origin/dev-share-user-20200203' into dev-share-user-20200203 commit d43327138d6f6a0864decc62d6e2de20a56fbd43 Author: wanggb Date: Wed Feb 5 13:28:33 2020 +0800 修改签到文案 commit d20e6325663ecf4d1a9edcee80cce44a806f8ec0 Author: wudongdong Date: Wed Feb 5 12:09:49 2020 +0800 230sell commit 6e79606b148d4383ec185dd722868b75d9a25afa Author: wudongdong Date: Wed Feb 5 11:50:25 2020 +0800 分享活动入库类型 commit 26f296b1df0a4b84d2ff06f078a8b51a0d2720bc Merge: a71bf6d26 c26d16117 Author: 李天时 Date: Wed Feb 5 11:08:49 2020 +0800 Merge remote-tracking branch 'origin/master' commit 5b481df11129945f6349cc1203c282320a4c0656 Author: wudongdong Date: Tue Feb 4 19:24:42 2020 +0800 分享活动弹窗样式修改 commit c26d16117ae524224e1f4fab5937f63367b6b06e Author: liyt Date: Tue Feb 4 10:20:47 2020 +0800 关联渠道列表URL过长 commit cedf80f6fe7db8f3e6f1333546c6ec550e8607f3 Merge: 91721a95c ff0e3a3fc Author: wudongdong Date: Tue Feb 4 15:16:40 2020 +0800 Merge branch 'dev-share-user-20200203' of 192.168.0.31:fe/cps into dev-share-user-20200203 commit 91721a95ca70a9f9839658f8d2168a3aac581b35 Author: wudongdong Date: Tue Feb 4 15:16:19 2020 +0800 分享活动弹窗 commit ff0e3a3fc7ef419b3a93b692cd7fc3d3191ff227 Author: wanggb Date: Tue Feb 4 13:57:37 2020 +0800 分享赚书币，分支有遗漏的代码 commit 97a6e02cc359a2c2f87a705e652ccc29ea1d7b07 Author: wanggb Date: Tue Feb 4 13:36:06 2020 +0800 分享赚书币，分支有遗漏的代码 commit eea8e0bb224877b68ce63d10af3853d3a9673b97 Author: wanggb Date: Tue Feb 4 11:58:31 2020 +0800 分享赚书币，分支有遗漏的代码 commit b858c301fc8517bc644e4cdb194b2fd43357c225 Author: liyt Date: Tue Feb 4 10:44:50 2020 +0800 提现操作时no_cash_money维护去掉 commit 7fa45b0b7c401b8d4d5e57900e0c286768b44c4a Author: liyt Date: Tue Feb 4 10:00:03 2020 +0800 提现表字段维护 commit bb745bbbad641917cc452d3e1e651e5d66cbfa5b Author: wudongdong Date: Mon Feb 3 23:03:32 2020 +0800 分享活动图片 commit 9fe1b7567deecd621423c69ee6dbee76fc3c7311 Author: wudongdong Date: Mon Feb 3 22:59:25 2020 +0800 分享活动 commit 9f3dac55bb27f65528cb0080bbfca064ccb28362 Author: wudongdong Date: Mon Feb 3 22:49:29 2020 +0800 分享活动 commit 9c65f60a46e4483663e3ebc27c3f91b8d24b8b15 Author: wudongdong Date: Mon Feb 3 21:37:36 2020 +0800 分享活动 commit b41eee0794dca9a52a86a55b5769ecd40c50388c Author: liyt Date: Mon Feb 3 20:13:17 2020 +0800 sell条 commit e43a9e86d4efbcb6ee20805f181e5c4b89aaa47c Author: wudongdong Date: Mon Feb 3 19:30:46 2020 +0800 230功能合并 commit 91f3c3480786af8518131db16cebf9079c652e79 Author: liyt Date: Mon Feb 3 16:54:09 2020 +0800 增量代码 commit a71bf6d26e69b6d9dde45a13beaaee4202ecdca0 Author: wanggb Date: Fri Jan 17 11:59:56 2020 +0800 静默授权逻辑加条件判断 !empty($silent_default_channel) commit f18ee828202149a4aab6d40cecae13ec424d14c5 Author: liyt Date: Tue Jan 14 18:55:40 2020 +0800 企业微信二维码 commit f4efd19702a1e039f0320858a101241222e3c847 Merge: 3daf577c3 26bd192d3 Author: wanggb Date: Tue Jan 14 18:10:40 2020 +0800 Merge branch 'dev-hetong-20200113' commit 3daf577c31c91a442056e21005a8fb09198ecdf5 Author: liyt Date: Tue Jan 14 17:30:03 2020 +0800 深圳市关注降级为不关注 commit 4e85fea905ebbd040a228d263044f61da101a42d Author: liyt Date: Tue Jan 14 16:28:35 2020 +0800 资源自定义活动时间 commit 26bd192d3776f489a7f797a019e307ea4ab3042e Author: wanggb Date: Tue Jan 14 14:00:03 2020 +0800 修改模板二中合同内容 commit 8b7aaa385a6620a6b26c69f89842a90a875499c3 Author: wanggb Date: Tue Jan 14 11:17:40 2020 +0800 合同修改内容和签约时间 commit f02e681fd89a5120e4376ef8062625804d62245c Author: wudongdong Date: Sat Jan 11 20:05:27 2020 +0800 limit commit e7b24d345d5df2fe24fc64746f5bf55d6174e0d2 Author: wudongdong Date: Sat Jan 11 20:02:35 2020 +0800 limit commit 9e28bc298a88edca866a1ef5009ac1031ab3d8ae Merge: 9f119843d 31061e0f5 Author: wudongdong Date: Sat Jan 11 18:25:16 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit 9f119843de508f70c59776c0865d92cb8d462442 Author: wudongdong Date: Sat Jan 11 18:25:08 2020 +0800 cansee commit 31061e0f5ba0eee3e49bd3b3edf6952944658ee7 Author: wanggb Date: Sat Jan 11 16:07:18 2020 +0800 校验角标是否存在 commit ef45d451876df4765e44370bbf0a9fbaa95c0a30 Author: wudongdong Date: Sat Jan 11 14:56:47 2020 +0800 decode commit f188844db590376525a82b9ba177a1a77254c7a9 Merge: 270099d2d fa2f4c2f0 Author: wanggb Date: Sat Jan 11 14:22:07 2020 +0800 Merge remote-tracking branch 'origin/dev-silent-corner-sys-20200109' into dev-silent-corner-sys-20200109 commit 270099d2d77fcde59a2291acfbf453d6230a80f6 Author: wanggb Date: Sat Jan 11 14:21:58 2020 +0800 静默授权，增加逻辑，解决CODE重复使用 commit fa2f4c2f0a37da9ddb87f148379e08dbbc91e393 Author: wudongdong Date: Sat Jan 11 14:03:34 2020 +0800 原始书库变更redis commit e39a315031cace2ff604fe7c1ada84292e5b2f11 Author: wudongdong Date: Sat Jan 11 11:51:41 2020 +0800 弹窗话术 commit 8cf859a0907eb7115b4a1aa9df00404d8150374c Merge: b675377d1 c62c4725f Author: wudongdong Date: Sat Jan 11 11:32:31 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit b675377d1fe73bb9e07ed1780c1fcf801e0bf9e7 Author: wudongdong Date: Sat Jan 11 11:32:21 2020 +0800 rank commit c62c4725fe29b0c47edf266263f633dafc5f952d Merge: 2178159c2 086fb7a23 Author: wanggb Date: Sat Jan 11 11:10:12 2020 +0800 Merge remote-tracking branch 'origin/dev-silent-corner-sys-20200109' into dev-silent-corner-sys-20200109 commit 2178159c2841b77ec9b83113cd76c1021d1c7c38 Author: wanggb Date: Sat Jan 11 11:10:03 2020 +0800 添加书籍时，加入推荐角标 commit 086fb7a230ddd0157b7db5b8c40a51731f2a4647 Author: wudongdong Date: Sat Jan 11 10:23:27 2020 +0800 num commit 693144bafb64592da4e4ecab84f6999a95a14f9d Author: wudongdong Date: Fri Jan 10 23:13:09 2020 +0800 同步书籍 commit ed30da2990a62f9e7a6ecd7843d2cda58c6b63f4 Merge: ac786edb1 9936ee9d6 Author: wudongdong Date: Fri Jan 10 21:19:13 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit ac786edb15eee4ba52650fd7273a3097213bb62b Author: wudongdong Date: Fri Jan 10 21:18:55 2020 +0800 'rank' commit 9936ee9d61c498df3e4922fa81035c6809ed16f6 Author: wanggb Date: Fri Jan 10 19:30:16 2020 +0800 猜你喜欢，如果入库的书籍，在猜你喜欢中不显示 commit 3ff4885487da0f871499584f9e66db14509e33fb Author: wudongdong Date: Fri Jan 10 19:12:03 2020 +0800 title commit bff9b8814a19f69f6ede760299ed9027a938bac1 Author: wudongdong Date: Fri Jan 10 18:51:37 2020 +0800 弹窗 commit 7c23d07700b5d11192509332a1ad0dac99a74475 Merge: b94173dce 76132679d Author: wudongdong Date: Fri Jan 10 16:45:06 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit b94173dce41990b531cf26a1c21488f715570e77 Author: wudongdong Date: Fri Jan 10 16:44:48 2020 +0800 tanc commit 76132679d6a80da2d33246fe61d144e6a37478f4 Author: wanggb Date: Fri Jan 10 16:41:13 2020 +0800 推荐角标：修改删除按钮样式 commit 398b5eaa627fd45153e13e8f722df50287552285 Merge: 76875b54e 91e2da07d Author: wanggb Date: Fri Jan 10 15:52:23 2020 +0800 Merge remote-tracking branch 'origin/dev-silent-corner-sys-20200109' into dev-silent-corner-sys-20200109 commit 76875b54ed3ae310c37d0c5c1214369a8050cbfe Author: wanggb Date: Fri Jan 10 15:52:07 2020 +0800 静默授权 commit 91e2da07ddf05deb9005ab2f6bffeb324243ba04 Merge: 94ff5b5ae 351e3f2b6 Author: wudongdong Date: Fri Jan 10 15:41:07 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit 94ff5b5ae5baf690f626e51190bc4dcc3c948ca6 Author: wudongdong Date: Fri Jan 10 15:39:44 2020 +0800 '手动同步质检状态' commit e832bda2149ea158bd9765803e10bf195b0d865c Merge: d556e6c9a 04c557217 Author: wudongdong Date: Fri Jan 10 15:39:31 2020 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit 351e3f2b6369de91857e5e4f394d5e27c46710b8 Author: wanggb Date: Fri Jan 10 13:35:57 2020 +0800 维护推荐角标 commit 04c5572174f93ec8a5b1c4602bbfe02349996ce5 Author: liyt Date: Fri Jan 10 10:31:44 2020 +0800 广州市强制关注降级为引导关注 commit 2510d7eeccbad1a53784ba4add0e85650236b365 Author: liyt Date: Fri Jan 10 10:17:30 2020 +0800 广州市强制关注降级为引导 commit d556e6c9a88cd99e30dd886858987c712b389a13 Merge: 17f086780 37a767696 Author: wudongdong Date: Thu Jan 9 20:25:19 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit 17f086780dd3ac12ee3a44ebb8ebe3aae7d881ae Author: wudongdong Date: Thu Jan 9 20:24:44 2020 +0800 '合并代码' commit 37a76769627baccdd72b4cb9f802ef0065287a32 Author: wanggb Date: Thu Jan 9 19:58:56 2020 +0800 db.php=> user_silent commit f59383b7c1863c7d157b6ae7989e8537899b3da6 Merge: 1262880d8 039dd17ce Author: wanggb Date: Thu Jan 9 19:51:28 2020 +0800 Merge remote-tracking branch 'origin/dev-silent-corner-sys-20200109' into dev-silent-corner-sys-20200109 commit 1262880d86a759264a6eac8e4588519b2840d14d Author: wanggb Date: Thu Jan 9 19:51:19 2020 +0800 后台管理推荐角标,设置默认色值 commit 039dd17cea75912ccdf56683780f20a34a63e5ed Author: wudongdong Date: Thu Jan 9 19:49:06 2020 +0800 '合并' commit c0df72ce87d359cda7d8d43d3ce75f5ee5181588 Author: wudongdong Date: Thu Jan 9 19:29:43 2020 +0800 book commit d18c40d54baea5e0eaca9500504e5e9de73860f8 Author: wudongdong Date: Thu Jan 9 19:27:10 2020 +0800 book commit 7f4d2367d04cbd7ad26375724fb4c82421167ac4 Merge: 076d954ba 51dbb936b Author: wudongdong Date: Thu Jan 9 19:22:52 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit 076d954ba4084371beaf9d4632783574d132bc53 Merge: 2cd6bae7e 6a7b57a63 Author: wudongdong Date: Thu Jan 9 19:18:12 2020 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit 2cd6bae7e6b16fc0a5ccd29e3786a4df2ecfd79f Author: wudongdong Date: Thu Jan 9 19:18:09 2020 +0800 'book' commit 51dbb936b951aaa61b894d657d7f03df3ace371c Author: wanggb Date: Thu Jan 9 18:12:00 2020 +0800 后台管理推荐角标 commit a88714ad0d5cb6ab292b40ad98610b62874aa20f Author: wanggb Date: Thu Jan 9 16:27:11 2020 +0800 后台管理推荐角标 commit 6a7b57a63b161c3236939d18d3a703e8cb1cd17a (tag: cps_20200109_152341, tag: cps_20200109_151619) Author: liyt Date: Thu Jan 9 15:15:01 2020 +0800 修复code commit c1c4c89e13724313db45e999a5d50be1dcf814e3 Author: wudongdong Date: Thu Jan 9 14:13:28 2020 +0800 'read' commit e81aa2a4522d13d7dec427d9b44d81c31ef0f4ca Merge: c5c4c52b5 5540fbc51 Author: wudongdong Date: Thu Jan 9 13:40:35 2020 +0800 Merge branch 'dev-silent-corner-sys-20200109' of http://192.168.0.31/fe/cps into dev-silent-corner-sys-20200109 commit c5c4c52b52fccfb52c2465b823ffa31f5abd6102 Merge: eaccbafaf 966bb5093 Author: wudongdong Date: Thu Jan 9 13:38:25 2020 +0800 Merge branch 'dev-book-tags-20191122' into dev-silent-corner-sys-20200109 commit 966bb5093ccc4c944b5a65a0f8d8fd406a288043 Merge: 90a2a0d31 d7af89cc0 Author: wudongdong Date: Thu Jan 9 13:37:12 2020 +0800 Merge branch 'master' into dev-book-tags-20191122 # Conflicts: # application/admin/view/activity/config.html # application/api/controller/User.php # application/clientweb/controller/Index.php # application/common/model/Book.php # application/common/model/Sign.php # application/common/model/UserRecentlyRead.php # application/common/service/GussNovelService.php # application/index/controller/Book.php # application/index/controller/User.php # application/index/view/book/shelf.html # application/index/view/px/book/shelf.html # application/index/view/px/user/recent.html # application/index/view/qy/book/shelf.html # application/index/view/qy/user/recent.html # application/index/view/sf/book/shelf.html # application/index/view/sf/user/recent.html # application/index/view/user/recent.html # application/index/view/yg/book/chapter.html # application/index/view/yg/book/shelf.html # application/index/view/yg/user/recent.html # application/main/service/BookService.php # application/main/service/ClientAppService.php # application/main/service/FinancialService.php # application/main/service/OfficialAccountsEventService.php # public/assets/css/frontend/campaign/index.css # public/assets/css/frontend/recently_new.css # public/assets/yg/css/frontend/recently.css commit 5540fbc5187bbf6a91582d3e931777d1e432f734 Author: wanggb Date: Thu Jan 9 12:38:29 2020 +0800 静默关注：访问后台时，不出发静默逻辑 commit eaccbafaf70de51297f9a506e21ef9d7e30f4c2f Merge: fb30fdbda 0f05eb65d Author: wanggb Date: Thu Jan 9 11:09:02 2020 +0800 Merge branch 'dev-wx-silent-20191231' into dev-silent-corner-sys-20200109 commit fb30fdbda554eeaec2fd1afac62ae480b18f251d (tag: cps_20200109_103659) Author: liyt Date: Thu Jan 9 10:15:42 2020 +0800 阳光书籍介绍页关注弹窗位置 commit d3b4a8760b9de9d657339f291442c8148aa37b52 Author: liyt Date: Thu Jan 9 10:13:13 2020 +0800 合并master代码 commit 88ec33bcc69cc160230b24f2320c1d1b351191a4 Merge: 1e4dbcf0e d7af89cc0 Author: liyt Date: Thu Jan 9 10:10:40 2020 +0800 Merge branch 'master' into dev-subscribe-tips-20200106 # Conflicts: # application/index/controller/Book.php # application/index/view/yg/book/info.html commit 0f05eb65de399c568376c9186058668868c3f6c6 Author: wanggb Date: Wed Jan 8 20:23:49 2020 +0800 静默关注：加一层Redis校验 commit b3ea77ed354f2be1d749b0a2fe5d2bb906f46899 Author: wanggb Date: Wed Jan 8 18:26:37 2020 +0800 静默关注：用户浏览的页面是从业务域名进入则进入静默关注逻辑 commit d7af89cc0a5c68f4d0d8db4525ac546ce1e4ffc5 (tag: cps_20200108_171710) Merge: 2677c1ca0 df860f71e Author: wudongdong Date: Wed Jan 8 17:12:08 2020 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 2677c1ca018e93a3ad2b5146b0eb3f7a6f20dcd1 Author: wudongdong Date: Wed Jan 8 17:12:03 2020 +0800 'bg_png' commit 1e4dbcf0ec704d115f913aa70bbd1e7a8d4911dd Author: liyt Date: Wed Jan 8 15:23:40 2020 +0800 引导关注弹窗 commit df860f71eb503744048f8113d0cc1d42a7baea2e (tag: cps_20200108_154515) Merge: 9b89a52e3 65dd9142a Author: 李天时 Date: Wed Jan 8 14:29:00 2020 +0800 Merge branch 'master' into dev-Campaign-log-20191209 commit 9b89a52e3b6d979973c213c9d2181ffaac392769 Author: 李天时 Date: Wed Jan 8 14:21:27 2020 +0800 阳光书架，阳光添加书架开关，书架排序。 commit 3a89525fb276269224b71165127e2c159b7f3679 Author: 李天时 Date: Wed Jan 8 11:52:02 2020 +0800 阳光书架，阳光添加书架开关，书架排序。 commit 76f202d400cf8b22724ab24baa0cacfaf41ab296 Author: 李天时 Date: Wed Jan 8 11:00:40 2020 +0800 阳光书架，阳光添加书架开关，书架排序。 commit 7d25ab30ddef45deb6ad89187bfbbc14d91b22d3 Author: 李天时 Date: Wed Jan 8 10:46:21 2020 +0800 阳光书架，阳光添加书架开关，书架排序。 commit 65dd9142af3272d0c81ff4772c4b936ddc1acb97 (tag: cps_20200108_102642) Merge: 224c884fd 3ce9f4155 Author: wanggb Date: Wed Jan 8 10:01:28 2020 +0800 Merge branch 'dev-Campaign-log-20191209' commit 76fbaa943adefd973c554f4faef632cd38e7fe9c Merge: 224c884fd 3ce9f4155 Author: 李天时 Date: Wed Jan 8 09:59:54 2020 +0800 Merge remote-tracking branch 'origin/dev-Campaign-log-20191209' into dev-Campaign-log-20191209 commit 3ce9f4155e8125088c2ccbd089e80f07b35b6db9 Merge: 2ce63bbda dc8da2940 Author: wanggb Date: Wed Jan 8 09:55:10 2020 +0800 Merge remote-tracking branch 'origin/dev-Campaign-log-20191209' into dev-Campaign-log-20191209 commit 2ce63bbda76ff37f1ee687289c0ca98cf57a6c5f Author: wanggb Date: Wed Jan 8 09:54:51 2020 +0800 统一处理分隔符 commit 660c4d754e8f6e95e8a7b77ca4426e4011b409df Author: liyt Date: Tue Jan 7 19:18:41 2020 +0800 引导关注弹窗 commit 224c884fdb953c2ec886c895e1bca7f18e8a4274 Merge: 32041666d 7e2548120 Author: wudongdong Date: Tue Jan 7 19:45:13 2020 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 32041666dda1c8841095c5116a148f124bbe0468 Merge: 710f8d3f6 dc8da2940 Author: wudongdong Date: Tue Jan 7 19:45:03 2020 +0800 Merge branch 'dev-Campaign-log-20191209' commit dc8da294044d921b0c4804289f9dfddfcc890d4e Author: wudongdong Date: Tue Jan 7 19:43:55 2020 +0800 'campaign' commit dc03ae3c782dcea832c5e6b96195ffd6aceaaf9f Author: liyt Date: Tue Jan 7 18:50:51 2020 +0800 修改关注和支付顺序 commit 5a8549e0a85fc2cafda7c541331e98a521d6343b Merge: 04ca7ba1f 710f8d3f6 Author: liyt Date: Tue Jan 7 18:48:37 2020 +0800 Merge branch 'master' into dev-subscribe-tips-20200106 # Conflicts: # application/index/controller/Book.php commit 7e2548120432096fe775483daba2d8e6b0085f95 Author: 李天时 Date: Tue Jan 7 18:47:12 2020 +0800 阳光书架，访问最近阅读，无论新老用户都不跳转到书架页 commit 04ca7ba1fcb90dc5bedcda6a3f7f0dc48d8996ad Author: liyt Date: Tue Jan 7 18:46:49 2020 +0800 修改付费关注顺序 commit 710f8d3f6843a3ad15a8e4694f2e8aaed43a0816 Author: zhenglh Date: Tue Jan 7 17:08:03 2020 +0800 阅读页引导关注，用户取消关注时可以无限制读书 commit f94c9986df3edf11e18750c7fd7f1ab902f54355 (tag: cps_20200107_164910) Merge: 281ba5c02 704b9be94 Author: wudongdong Date: Tue Jan 7 15:31:44 2020 +0800 Merge branch 'dev-Campaign-log-20191209' # Conflicts: # application/command.php # public/assets/js/frontend/recharge/pay.js # public/assets/px/js/frontend/recharge/pay.js commit 7f8a2eb55786c82a4e0c393da4bceba5ec298485 Merge: 6c3f625d2 281ba5c02 Author: liyt Date: Tue Jan 7 15:30:22 2020 +0800 Merge branch 'master' into dev-subscribe-tips-20200106 # Conflicts: # application/index/controller/Book.php commit 704b9be94026362ae085afa5369c38102ce6959b Author: wanggb Date: Tue Jan 7 15:24:38 2020 +0800 校验活动时间交叉问题 commit 6c3f625d26ff89a159d155dcb6ea98eb5084a1a8 Author: liyt Date: Tue Jan 7 14:59:18 2020 +0800 阅读页关注弹窗 commit 281ba5c026d56fb37d318020109c4fa8c10cf7d9 (tag: cps_20200107_113323) Author: liyt Date: Tue Jan 7 11:08:33 2020 +0800 关注页企业微信弹窗 commit 36eaee07be12656655fbf9c1a91f58a1d862d23b (tag: cps_20200106_193453) Merge: 50cb038de c680d542c Author: 李天时 Date: Mon Jan 6 14:58:59 2020 +0800 Merge branch 'dev-subscribe-20190104' into dev-tips-20191228 commit c680d542c1449ce97d8ce3e9c4294d4f8fe923d7 Author: 李天时 Date: Mon Jan 6 14:13:46 2020 +0800 阳光书架，处理获取最近阅读方法的返回值。 commit 50cb038de115be3960b8acda73d0aa34ba785003 (tag: cps_20200106_163025) Merge: 20395daac e91abb2bc Author: liyt Date: Mon Jan 6 12:01:25 2020 +0800 Merge branch 'master' into dev-tips-20191228 commit e91abb2bc3496fc739cd2c7ee75a9a34b34cdc26 Author: liyt Date: Mon Jan 6 11:14:37 2020 +0800 后台首页二维码 commit 20395daac52e1e19f807fb1929761b4247c6e615 Author: liyt Date: Mon Jan 6 11:12:42 2020 +0800 关注用户才弹出企业微信二维码弹窗 commit f8f91d7faba0f6c00455b76e3346599de0519a95 Author: liyt Date: Sat Jan 4 20:13:31 2020 +0800 章节列表关注状态是否可点击 commit 34d37c45a24a03a334a492be2154a724b67cd976 Author: liyt Date: Sat Jan 4 16:31:28 2020 +0800 企业微信弹窗 commit fa0b84cb3a8b44ee5e376655e388f10865bb8aec Merge: e28306dc2 53a7b5fee Author: liyt Date: Sat Jan 4 10:03:57 2020 +0800 Merge branch 'master' into dev-tips-20191228 commit 58540bf5a09f22baf3b556f2f6ecc70a044534cd Author: wudongdong Date: Fri Jan 3 19:47:43 2020 +0800 'yg充值' commit 84319330846c52c81183bc67dab35162c54e32da Author: wudongdong Date: Fri Jan 3 18:30:12 2020 +0800 '弹窗文案' commit 53a7b5fee10f6103c3e05a8230d1d3a59fe69b63 (tag: cps_20200103_190844) Author: 李天时 Date: Fri Jan 3 17:50:50 2020 +0800 阳光书架，修改样式 commit 0dbbef5b335506fec3195dc832856f1e4d650f12 Author: 李天时 Date: Fri Jan 3 17:46:07 2020 +0800 阳光书架，修改样式 commit 8e5c9d56196230c5f88ace7343c305ca81f5ad7d Author: wudongdong Date: Fri Jan 3 17:25:48 2020 +0800 '活动充值跳转' commit 6aed2e0cd9de5fb9186885980bcc81dacf64fc7c Author: wudongdong Date: Fri Jan 3 17:07:46 2020 +0800 '活动充值后跳转' commit e2b355e409922863acdd45e15cef2fdc40a9dabf (tag: cps_20200103_172153) Author: 李天时 Date: Fri Jan 3 17:06:30 2020 +0800 阳光书架，修改样式 commit 10fc1ea3cc82662c12abe64e8799e039b104bc8f Author: wudongdong Date: Fri Jan 3 16:32:28 2020 +0800 '活动补签充值' commit 9335bdd4fe4bfccd24c1b4d57dbbe255c32f1c64 Author: wudongdong Date: Fri Jan 3 16:12:58 2020 +0800 '活动补签充值弹窗' commit c7ae90671ad5634dd7bb5c7a0edcd6305b3c72f7 Author: wudongdong Date: Fri Jan 3 14:50:31 2020 +0800 '去补签弹窗适配' commit 094cf7d088bb242565c9f93f5fcb0cb9ab95bfb3 Author: wudongdong Date: Fri Jan 3 14:30:08 2020 +0800 '补卡弹窗' commit 838a00b24e3e76cd3de727f54dda025bb88abd87 Author: wanggb Date: Fri Jan 3 14:10:17 2020 +0800 公众号静默关注,修改日志 commit e9698ad9bf04d751bb74bdf99b05cfff95addec6 (tag: cps_20200103_160719, tag: cps_20200103_143350) Author: 李天时 Date: Fri Jan 3 14:10:10 2020 +0800 阳光书架，修改样式 commit e28306dc2b7599a6db25b35d977620f9adcccd24 Author: liyt Date: Fri Jan 3 14:02:28 2020 +0800 自定义活动资源活动时间区间单独配置 commit 1a18ff33d455cd4fd5784a5d832021add31493d5 (tag: cps_20200103_115918) Author: liyt Date: Fri Jan 3 11:57:07 2020 +0800 修改平台活动弹窗的key commit c7f82ef453e06eebf3cd1ccd755fbf94239c6db2 Author: wanggb Date: Fri Jan 3 11:53:47 2020 +0800 公众号静默关注,增加渠道校验逻辑 commit 33a4bf59a9512bb825ed7a3e45288babe9d77167 Author: wanggb Date: Fri Jan 3 11:44:09 2020 +0800 公众号静默关注,增加渠道校验逻辑 commit dbe5f781bb9470b8ae831618d0506b08a43cd7e5 Author: wanggb Date: Fri Jan 3 11:08:25 2020 +0800 公众号静默关注,页面cpslog打点 commit afcd256aec19e2b18240371a599747a5f14f9858 (tag: cps_20200103_111048) Author: zhenglh Date: Fri Jan 3 10:54:03 2020 +0800 订单查询兼容老查询格式 commit 192f43ad1bb47e1f44a8cd9e12bc0c8155355672 Author: wanggb Date: Thu Jan 2 21:31:57 2020 +0800 公众号静默关注 commit 0da4e5215f278c120a6c8f2fdc38269d9d7d97e7 Author: zhenglh Date: Thu Jan 2 17:17:13 2020 +0800 点看阅读页大字体兼容调整 commit 336cdb72417f8ec7042f18ed7a63eab5b07ddca7 Author: wudongdong Date: Thu Jan 2 16:49:30 2020 +0800 'yg' commit a15c9c6e5f4b2c6447e390a3fbcd5b53636af467 Merge: 12d208830 ce2a81ffd Author: 李天时 Date: Thu Jan 2 16:39:03 2020 +0800 Merge branch 'master' into dev-yg-bookshelf-20191213 commit ce2a81ffdde4561249d171923b908078829d28f5 Author: liyt Date: Thu Jan 2 15:47:41 2020 +0800 VIP订单导出分账字段 commit 12d20883077f5f43baf17fd6c954f757675db7bb Author: 李天时 Date: Thu Jan 2 15:40:54 2020 +0800 阳光书架，修改样式 commit 17c4123be87e713e73c09eeadd305051f3322e58 Merge: 1e2da1b7e e97675bde Author: wudongdong Date: Thu Jan 2 15:40:18 2020 +0800 Merge branch 'master' into dev-Campaign-log-20191209 # Conflicts: # application/index/controller/Recharge.php commit 3998b8e1075868781f8d189651e80520d1bca024 Author: liyt Date: Thu Jan 2 15:31:54 2020 +0800 订单导出分账字段 commit f51fa67b71d0268d9256775a307f283a19dabc2a Author: liyt Date: Thu Jan 2 15:20:48 2020 +0800 订单导出分账字段 commit fc0bc03238bdaca9b3bf5e738285f1397cf731a1 Author: 李天时 Date: Thu Jan 2 15:07:35 2020 +0800 阳光书架，修改样式 commit b849981928b22a2a7d2f25eb2c67121c434e47e8 Author: 李天时 Date: Thu Jan 2 14:31:58 2020 +0800 阳光书架，修改样式 commit 78f1fa7c4d8218c8d44d38f18eff6b95b46feea0 Author: zhenglh Date: Thu Jan 2 14:15:19 2020 +0800 阳光阅读页大字体兼容调整 commit 4eb355b1066dfa4e10066013d36f5d1d2227644f Author: 李天时 Date: Thu Jan 2 14:10:35 2020 +0800 阳光书架，修改样式 commit f959855f46d8195941adca385e7c82b54fd1876e Author: 李天时 Date: Thu Jan 2 13:43:25 2020 +0800 阳光书架，修改样式 commit 5491bca8eec0a004c989aab99989c98999c2eefa Author: 李天时 Date: Thu Jan 2 13:35:50 2020 +0800 阳光书架，修改样式 commit d6684fb4fe949dda2e086ef3065c5770ccfe66dc Author: liyt Date: Thu Jan 2 12:13:06 2020 +0800 AB号列表加admin_id条件 commit 86c72e1557db5c4e5e74d0fab51db6862b066629 Author: 李天时 Date: Thu Jan 2 11:40:57 2020 +0800 阳光书架，修改样式 commit 3bf1b7cc8fd741a00f42f2868d6846e6f4da5a13 (tag: cps_20191231_165445) Author: liyt Date: Tue Dec 31 16:52:29 2019 +0800 下单传参 commit c28b59e5331cf0323c6f109084df41d08ced9a13 Author: 李天时 Date: Tue Dec 31 16:33:58 2019 +0800 阳光书架，修改样式 commit e6b35242258289b144d1f243078213bdfb06bee6 Author: wanggb Date: Tue Dec 31 15:56:07 2019 +0800 增加静默关注Service commit 4caf7ff74a36c216d2d9985f6630c686d92482fa Author: 李天时 Date: Tue Dec 31 15:50:41 2019 +0800 阳光书架，修改样式 commit bcf63726dca7750556276a4799b2f562dd6a73e8 Author: 李天时 Date: Tue Dec 31 12:00:44 2019 +0800 阳光书架，充值加购 commit 17f1f424606cc4e0921b7cd1186d6a6b26051d2e Author: 李天时 Date: Tue Dec 31 11:44:34 2019 +0800 阳光书架，充值加购 commit d377db8a55ab4ddfa3c1c412c318f828398ef2df (tag: cps_20191231_111946) Merge: 81307455b b4a89a2a2 Author: liyt Date: Tue Dec 31 11:05:17 2019 +0800 Merge branch 'dev-recharge-order-command-20191205' into dev-consume-command-20191211 # Conflicts: # application/command.php commit b4a89a2a2ebe221c1908e551b0465d0fade682e5 Merge: e03a7ac4d e607ed683 Author: liyt Date: Tue Dec 31 11:02:16 2019 +0800 Merge branch 'master' into dev-recharge-order-command-20191205 # Conflicts: # tests/DotTest.php commit 318efe78541eabf8dc8422fb34e5c7d6f54a2c47 Merge: 793a758aa 7717d8093 Author: 李天时 Date: Tue Dec 31 10:56:36 2019 +0800 Merge remote-tracking branch 'origin/dev-yg-bookshelf-20191213' into dev-yg-bookshelf-20191213 commit 793a758aa1bd29c4c4148b2632d6e6e8542bdcd0 Author: 李天时 Date: Tue Dec 31 10:56:25 2019 +0800 阳光书架，调整角标优先级 commit 7717d8093c0070cbd46431dbdf868bd756bab85f Author: liyt Date: Tue Dec 31 10:44:57 2019 +0800 还原消费详情字段 commit 08125f129aa3e9a7f41d72fa79d29c128cc8cbb7 Author: 李天时 Date: Tue Dec 31 10:37:01 2019 +0800 阳光书架，调整角标优先级 commit cbb9b75c041cc6acf36af8417afbb34792b204d5 Author: 李天时 Date: Mon Dec 30 20:20:24 2019 +0800 阳光书架，推荐书籍读取阅读记录 commit e607ed683e5cdf94b06696bc90bfd9fff3474d76 (tag: cps_20191231_103850) Merge: 7dd791f52 e97675bde Author: liyt Date: Mon Dec 30 20:14:24 2019 +0800 Merge branch 'master' into dev-fenzhang20191115 # Conflicts: # application/admin/controller/Viporders.php commit 7dd791f523c2e80e1f4b0179467ff501d25a7294 Author: liyt Date: Wed Dec 11 21:00:40 2019 +0800 四方分账提现 commit e61ac0f8cc242e79ba0e79afac6e37fe7387d894 Author: liyt Date: Mon Dec 30 20:04:10 2019 +0800 弹窗 commit c253b4682b67c8b2dd24870b6df3d4043becfaaf Author: 李天时 Date: Mon Dec 30 19:58:30 2019 +0800 阳光书架，推荐书籍读取阅读记录 commit e5c093c29d595666fbae8ee848161d6cdf3108b0 Author: 李天时 Date: Mon Dec 30 17:04:31 2019 +0800 阳光书架，集成充值加购角标样式 commit e7f481c9d221ee3f86495e399849956e9a18784b Author: 李天时 Date: Mon Dec 30 15:50:14 2019 +0800 阳光书架，首页获取最近阅读记录获取书籍信息 commit 0363e07aa7f69c99e2d43a3771583c2c2cac9b9c Author: 李天时 Date: Mon Dec 30 15:02:56 2019 +0800 阳光书架，阅读到第十章之后自动删除推荐书架书籍 commit 81307455b8a597afb3232902a244951e5372c94e Author: liyt Date: Sat Dec 28 17:42:26 2019 +0800 调整更新数量 commit 8ac9469b63dfbea336827230b808594f7f4fc06e Author: wudongdong Date: Sat Dec 28 11:03:57 2019 +0800 '书架角标' commit 5dca838d5b5fc69e12b1f91af152d34b32c501a3 Author: liyt Date: Sat Dec 28 10:58:00 2019 +0800 清理脚本 commit b21969477dab546c2ea8cf3c255a6e65339d96f4 Author: liyt Date: Fri Dec 27 18:22:18 2019 +0800 consume_info 更新为null commit 3074ee9be778b8b7d87c7f5c95260ea715a5dedc Author: liyt Date: Fri Dec 27 18:05:59 2019 +0800 合并最新master分支 commit 800b12968b74bd169af543b8700bce8aa0cad9e5 Merge: ed07182e4 e97675bde Author: liyt Date: Fri Dec 27 18:03:55 2019 +0800 Merge branch 'master' into dev-yg-bookshelf-20191213 # Conflicts: # application/admin/controller/Viporders.php # application/main/service/FinancialService.php commit be1dece1f6f90d360f179ecfc611f0befdc24578 Author: liyt Date: Fri Dec 27 16:51:55 2019 +0800 去掉consume_info写入 commit e97675bdef81df12dd6313f91571b252bb068d8a (tag: cps_20191230_111721, tag: cps_20191227_181832) Author: liyt Date: Fri Dec 27 16:49:56 2019 +0800 去掉消费记录consume_info写入 commit 46213efd9d2553a5253dfd8066d3e76c21a64418 Author: wanggb Date: Fri Dec 27 16:32:36 2019 +0800 增加测试方法 commit bba44444a7e1a948035531bf2021a739d122cf92 Author: liyt Date: Fri Dec 27 16:14:31 2019 +0800 修改脚本 commit a6bf2c41cb05f513a9af2ded5c34ed449a039474 Author: liyt Date: Thu Dec 26 23:08:38 2019 +0800 负数的扣减逻辑 commit 1a0a89e06d7cc4f969d2d826a6be16018e9f4c3b (tag: cps_20191227_154954) Merge: 828af946c 49f9e9de8 Author: zhenglh Date: Thu Dec 26 14:08:53 2019 +0800 Merge remote-tracking branch 'origin/master' commit 828af946cd2d8af49c386de8f49a36867aebc88c Author: zhenglh Date: Thu Dec 26 14:08:38 2019 +0800 关闭渠道首页修改入口 commit c90e25c75e9ef48be74e6e80d0c3cb879a6e1448 (tag: cps_20191226_102552, tag: cps_20191225_175446) Merge: 99ec4e5f7 49f9e9de8 Author: liyt Date: Wed Dec 25 15:59:27 2019 +0800 Merge branch 'master' into dev-consume-command-20191211 commit 90a2a0d31dab459573c570e8e6f203ffe3dbb7e4 Author: wudongdong Date: Wed Dec 25 15:04:27 2019 +0800 '推荐语' commit 49f9e9de84c47da067a1bf989bce9d7e3cdf1180 Merge: 499b667e3 9695877a2 Author: wanggb Date: Wed Dec 25 14:59:53 2019 +0800 Merge branch 'dev-wxmenu-qrcode-20191207' commit 9695877a2e3e56b07691c9b9da49772ee983475b Author: wanggb Date: Tue Dec 24 19:30:53 2019 +0800 设置菜单后提示信息 commit 7dfd551f3e2c9f313ad4f5fcd3f51b2902468da4 Author: wanggb Date: Tue Dec 24 15:40:11 2019 +0800 重置公众号菜单时，同步菜单给二维码菜单 commit 7189a2498acc299a45c56af85691b6b089a526f0 Author: wanggb Date: Tue Dec 24 15:04:03 2019 +0800 当前菜单为二维码格式，修改菜单时，同步数据到二维码菜单 commit 298c857f78ca516df0fcd4700749c0bffffb8740 Author: wanggb Date: Tue Dec 24 14:38:10 2019 +0800 当前菜单为二维码格式，修改菜单时，同步数据到二维码菜单 commit a95d905591867739e78c2006442071f76026f5e2 Author: wanggb Date: Tue Dec 24 14:17:55 2019 +0800 当前菜单为二维码格式，修改菜单时，同步数据到二维码菜单 commit 499b667e331f00ac436a8f15ad5364587dffefd0 (tag: cps_20191224_134637) Author: zhenglh Date: Tue Dec 24 12:19:58 2019 +0800 订单查询排序优化 commit 9fcc3976bcfa19d40d1f8ab972487f6e1dd5b508 Author: wanggb Date: Tue Dec 24 11:00:53 2019 +0800 修改菜单对齐方式 commit 0be33866493dc52298c36e189ce1dbbdc26e8db2 (tag: cps_20191224_110147) Merge: 12dc0294b 951c9ed3f Author: liyt Date: Tue Dec 24 10:44:59 2019 +0800 Merge branch 'master' into dev-consume-rechargeId-20191202 commit 12dc0294b485950487385fe88d8e60be268aa203 Author: 李天时 Date: Tue Dec 24 10:38:17 2019 +0800 下单接口，扣量订单，在订单统计表创建转移渠道的统计数据 commit 43c9df4dfe0b8b41a856502d88fddb7e20bc7a6d Author: liyt Date: Mon Dec 23 11:59:42 2019 +0800 消费看点订单信息充值记录信息写入消费记录 commit 37f33182817e3b4fa2d42135a97812867560713e Author: 李天时 Date: Fri Dec 20 17:05:51 2019 +0800 下单接口，扣量订单，在订单统计表创建转移渠道的统计数据 commit fecea057cd7a84fe6cb1d55a40c363e8900a8174 Author: 李天时 Date: Fri Dec 20 16:18:10 2019 +0800 下单接口，扣量订单，在订单统计表创建转移渠道的统计数据 commit 951c9ed3f8279ded14e771273532f5c5e79b0b83 (tag: cps_20191223_102850, tag: cps_20191220_164457) Merge: d95a640ab 4cef06aac Author: liyt Date: Fri Dec 20 16:03:58 2019 +0800 Merge branch 'master' into dev-ABwechat-20191119 commit d95a640abf4b768a0ab1b0e61737fb78603fc828 Author: liyt Date: Mon Dec 16 18:54:22 2019 +0800 AB号授权回源 commit 510fc8d5af8aa80a30c1aee804dc626e49bf9f94 Author: liyt Date: Fri Dec 20 14:55:53 2019 +0800 消耗活动消费书币记录 commit 99ec4e5f7a58b0188419f490e581e10284127e1c Author: liyt Date: Fri Dec 20 14:47:36 2019 +0800 消费脚本 commit d79eb26b0bce164878d2bd0b04334c692aebfb51 Merge: 2b4c5293b a7f1248ec Author: 李天时 Date: Fri Dec 20 13:53:14 2019 +0800 Merge branch 'dev-dd-deliver-20191203' into dev-consume-rechargeId-20191202 commit a7f1248ece4d626b3dd8cd8f9750949ce9934733 Merge: eb7031c92 4cef06aac Author: 李天时 Date: Fri Dec 20 12:10:51 2019 +0800 Merge branch 'master' into dev-dd-deliver-20191203 # Conflicts: # application/api/controller/Wechat.php # application/command.php commit eb7031c92ecfb3cf2d6338a357a80f59393cc9ad Author: 李天时 Date: Fri Dec 20 12:03:27 2019 +0800 支付回调订单统计，转移订单纳入统计 commit 35aebf72161713748023b0159a07e855a8fd4c0c Author: wanggb Date: Mon Dec 9 10:08:30 2019 +0800 微信公众号菜单替换成图片二维码 commit a9dc5d4cfd3071adc39dadccc948546119191ac9 Author: zhenglh Date: Thu Dec 19 17:26:30 2019 +0800 订单查询，推广链接查询优化 commit 2b4c5293bd58d5498bec6f987a10f310140c3e87 Author: liyt Date: Thu Dec 19 14:55:55 2019 +0800 json 结构 commit fb6e5fecd29cdc2b79fca16aed23a6cc46b2be6a Author: liyt Date: Thu Dec 19 14:29:29 2019 +0800 json结构调整 commit a2ff20ab0812096bddef06269c1cd40b7e1036e0 Author: liyt Date: Thu Dec 19 14:06:47 2019 +0800 json 结构 commit b67037d882444b37ed0e6b77f3df6bf4f7a6f485 Merge: c6a4e94be 4cef06aac Author: liyt Date: Thu Dec 19 11:33:08 2019 +0800 Merge branch 'master' into dev-consume-rechargeId-20191202 # Conflicts: # application/command.php commit e03a7ac4dd1339136e51c78b28f5149676804cf6 (tag: cps_20191220_103852) Author: liyt Date: Thu Dec 19 11:21:15 2019 +0800 加购 commit 4cef06aacb02f74483b8c5874469c542b098ffb9 Author: zhenglh Date: Mon Dec 16 17:55:14 2019 +0800 活动充值回调不判断资源的禁用状态，充值加购的充值记录添加订单id commit a7504ba254f3973f40ea7d115c07d31b88f79230 (tag: cps_20191218_165548) Author: liyt Date: Wed Dec 18 15:48:51 2019 +0800 加购订单匹配 commit 9cc82d46cee5f806760a3a638becbd9744f4ced3 Author: liyt Date: Wed Dec 18 11:57:09 2019 +0800 加购判断 commit db2f5c930175595ef0b3542760921be70e617d13 Author: liyt Date: Wed Dec 18 11:22:32 2019 +0800 快乐农夫加备案信息 commit 38729ec046ceaf6209cc81f687afbbfca870daca Author: liyt Date: Wed Dec 18 10:34:19 2019 +0800 快乐农夫加备案信息 commit 288302f45f528ce86c4ccac5b9989c58e3c03c0b Author: zhenglh Date: Wed Dec 18 03:28:38 2019 +0800 php think脚本memory_limit参数128M改为512M commit 5a9e03647c4fc78187c9e2aa1807974fcecb1920 Author: liyt Date: Tue Dec 17 20:06:47 2019 +0800 VIP无加购 commit 1e2da1b7ebbbf3c667285e001aff35a3c6b37e60 Author: wudongdong Date: Tue Dec 17 14:41:32 2019 +0800 补卡打点 commit 35435814acceb9b820c2c7932e15f8cfa033d5f2 Merge: 2c2140532 a5ea393c7 Author: wudongdong Date: Tue Dec 17 14:28:31 2019 +0800 Merge branch 'dev-Campaign-log-20191209' of http://192.168.0.31/fe/cps into dev-Campaign-log-20191209 commit 2c21405325610e05e880f63db86140ed1c237641 Author: wudongdong Date: Tue Dec 17 14:28:19 2019 +0800 打点 commit bb82fc58655ac8735864633eacbf4bcd3e0655be (tag: cps_20191217_115021) Author: liyt Date: Mon Dec 16 17:45:50 2019 +0800 加购情况处理 commit 92972871c7cd8af0c96a65c5c8feb483e587a503 Author: liyt Date: Mon Dec 16 17:30:18 2019 +0800 加购情况处理 commit 950d90c85bb7fd2890de6bd2d5669a6bd948d533 Author: liyt Date: Mon Dec 16 16:50:54 2019 +0800 加购情况处理 commit 2b9569c357be14d5eed2089f1cdf9a409f0f8df6 Author: liyt Date: Mon Dec 16 16:41:58 2019 +0800 加购情况处理 commit f884e5121a43961bc6df72cf889e30fac8c68b8c Author: liyt Date: Mon Dec 16 16:37:29 2019 +0800 加购情况处理 commit db290b2147735177b5d1e38cad5bfd4829180a8b Author: zhenglh Date: Mon Dec 16 14:13:28 2019 +0800 重新打包 commit f0f6960ee3572a8f6e762b8fba756f650ccb2393 Merge: 6640537da e71f9e946 Author: liyt Date: Mon Dec 16 14:10:45 2019 +0800 Merge branch 'master' into dev-ABwechat-20191119 # Conflicts: # application/api/controller/Wechat.php # public/assets/dist/component.bundle.js # public/assets/dist/component.bundle.js.map # src/index.js # src/packages/input-search/index.html # src/packages/referral-home/main.vue # src/packages/referral-novel/main.vue # src/packages/reply-form/main.vue # src/packages/subscribe-delay-form/main.vue commit 6640537da2431c0fab4ec0063f493847e6180c28 Author: liyt Date: Fri Nov 22 17:06:47 2019 +0800 AD广告回源AB号 commit a5ea393c7c0c1106ddd52401bbe80a24265ef808 Author: wanggb Date: Mon Dec 16 11:42:49 2019 +0800 读书挑战赛后台增加渠道黑名单 commit a7e0143df54f6f68bfb143bdb5bc4b8ad05bca2b Merge: 54c562d8a e71f9e946 Author: liyt Date: Mon Dec 16 11:15:30 2019 +0800 Merge branch 'master' into dev-recharge-order-command-20191205 # Conflicts: # application/command.php commit 54c562d8a161ae2307a1556f0c17d5756be740af Author: liyt Date: Mon Dec 9 10:45:10 2019 +0800 优化脚本 commit ed07182e46a51c78b8b7e7de55b40353ae186fd6 Merge: 7a475bb7a aae0bccb1 Author: liyt Date: Sat Dec 14 17:38:29 2019 +0800 Merge branch 'dev-yg-bookshelf-20191213' into dev-opt-20191108 # Conflicts: # application/admin/controller/referral/Book.php # tests/RedisTest.php commit aae0bccb1d33c1f5cbf0c8ce9dd0a380da105b06 Merge: b04913506 e71f9e946 Author: 李天时 Date: Sat Dec 14 17:14:51 2019 +0800 Merge branch 'master' into dev-yg-bookshelf-20191213 commit e71f9e9465fdddc96831bfa7d530bbb682f30d7a (tag: cps_20191214_164414) Merge: 74bf53c02 e21dbbcdf Author: 李天时 Date: Sat Dec 14 16:42:18 2019 +0800 Merge branch 'master' into dev-bookshelf-20191214 commit 74bf53c023499132bde869c40dc6e05359b4a0b4 Author: 李天时 Date: Sat Dec 14 15:37:37 2019 +0800 为渠道商刷用户推荐书架信息 commit e21dbbcdfac33b260a5ee8608d3f14d82f4e0716 Author: zhenglh Date: Sat Dec 14 14:30:52 2019 +0800 字符串类型错误，增购免费书籍添加可能会添加失败 commit b0491350675a217d439d0c8eedb92cf575f55683 Author: 李天时 Date: Fri Dec 13 18:53:42 2019 +0800 改版书架样式 commit 0fcd5fc8b2070fad2eb35228ae4cbf0d5162af42 (tag: cps_20191213_193505, tag: cps_20191213_173023) Merge: 350fa51db 085a33950 Author: 李天时 Date: Fri Dec 13 17:25:47 2019 +0800 Merge remote-tracking branch 'origin/master' commit 350fa51db70a6cc32e7c898e8900e84bee5af121 Author: 李天时 Date: Fri Dec 13 17:25:40 2019 +0800 fixbug，修复后台章节内容也不能翻到下一章的问题 commit 085a339508a3cddee09a77019966a2bc9766b399 Author: wudongdong Date: Fri Dec 13 16:42:05 2019 +0800 try catch commit 8099af15e29db0e1ae4cdde5626c1d0257265aad Merge: 10d0e9cf6 61be60376 Author: wudongdong Date: Fri Dec 13 16:22:24 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 61be60376bfda8f1ef939f412da6d4414606dc2b (tag: cps_20191213_160412) Merge: 5cbfc9da6 c54ae90a5 Author: 李天时 Date: Fri Dec 13 15:52:39 2019 +0800 Merge remote-tracking branch 'origin/master' commit 5cbfc9da660a7c293d5ad2a8bf5a0f536efb4a0c Author: 李天时 Date: Fri Dec 13 15:52:24 2019 +0800 fixbug，修复后台章节内容也不能翻到下一章的问题 commit 10d0e9cf6ad74a14827302e8e2af3ff476eea23d Author: wudongdong Date: Fri Dec 13 15:49:19 2019 +0800 老用户扣减书币失败增量 commit c54ae90a5e047114130b9ca607ed66eaa069668d Author: liyt Date: Fri Dec 13 14:52:04 2019 +0800 支付回调赏金统计 commit 31019fbe4d130d97dfc50c63e2211b2efbdc645a Author: wudongdong Date: Fri Dec 13 13:46:37 2019 +0800 消耗活动统计脚本 commit 1c1d382b0191515732983972705fbcb38f03fd12 (tag: cps_20191213_112301) Author: guyuexuan <2651919937@qq.com> Date: Thu Dec 12 21:21:47 2019 +0800 增加备案说明 commit 7dd9d00c33e4130e8e0188bbfd02a95262680732 Author: wanggb Date: Thu Dec 12 19:28:06 2019 +0800 排行榜书籍,前端渲染 commit b5d4bce50e70529bbebf4710cfafc0f35c94148e Author: zhenglh Date: Thu Dec 12 18:15:06 2019 +0800 充值加购书籍版权处理 commit 68fa56596c97a0b227b065426b113b45a331ae2b Author: zhenglh Date: Thu Dec 12 15:11:11 2019 +0800 定时任务redis to mysql,延时5秒。模板回调appid不存在限制请求 commit eb9dbdc362cb66ae908bac33c46a337833592c3a Author: wanggb Date: Thu Dec 12 16:08:11 2019 +0800 排行榜书籍管理，后台完善 commit 932607e808917988cd7e6f073a3fdbdd7b36ed19 Author: wudongdong Date: Thu Dec 12 14:33:23 2019 +0800 自动报名 commit 7fd91b5c8cce5bd0db0ac1cf89ffd54c1be1fad0 Author: wudongdong Date: Thu Dec 12 13:56:11 2019 +0800 5 commit 9b273eb74c1570dc200e41a41a48a0dac28869eb Author: wudongdong Date: Thu Dec 12 13:55:45 2019 +0800 报名中 commit bcd5f2335be1e9bad7d634a60d3c88ca81ad584c Author: wudongdong Date: Thu Dec 12 10:47:58 2019 +0800 自动打卡后，再次进入弹出打卡成功 commit c559b703d78c0825313e6ab5ebcfb850f14f0edc (tag: cps_20191212_110743) Merge: 9be275982 28e3dbab5 Author: zhenglh Date: Wed Dec 11 19:30:37 2019 +0800 Merge remote-tracking branch 'origin/master' commit 9be275982119a1536171947a7679bff26e7633d4 Author: zhenglh Date: Wed Dec 11 19:30:05 2019 +0800 充值加购配置文件修改 commit c6a4e94bead1547ead09817340781f9cd8cea9b7 Author: liyt Date: Wed Dec 11 18:22:55 2019 +0800 更新消息详细 commit 91f4c092c210ae2931b7284b47edb9ad45b15c10 Author: wudongdong Date: Wed Dec 11 18:17:44 2019 +0800 统计报名人数和下单数 commit f0c23737be710241ca28df81c45421b8efa44ea5 Author: liyt Date: Tue Dec 10 17:25:53 2019 +0800 消费看点写入订单信息 commit 28e3dbab533d876c02edc585573e5bbdb6bf498d (tag: cps_20191211_174606) Author: liyt Date: Wed Dec 11 17:42:34 2019 +0800 开启调查问卷 commit 9f180f3926dc8f21f5a4660c4788a6511ac33b56 Author: wudongdong Date: Wed Dec 11 17:38:00 2019 +0800 充值直接报名 commit 4508a4f2ab8c4181881f4bf819650bd5e4be31a7 (tag: cps_20191211_173512, tag: cps_20191211_172446) Merge: 5df8dd40e 5b20968b4 Author: 李天时 Date: Wed Dec 11 17:13:25 2019 +0800 Merge remote-tracking branch 'origin/master' commit 5df8dd40eb807467d664a6bd37a0fc48bacc8afc Author: 李天时 Date: Wed Dec 11 17:13:18 2019 +0800 js+css文件打包 commit 1f739fc55417824f53f84a7166932060fd1b1970 Author: wudongdong Date: Wed Dec 11 16:36:54 2019 +0800 充值报名 commit 6c44dae614262e30a10789530c9e2ced86555ddd Author: liyt Date: Wed Dec 11 16:11:38 2019 +0800 消费记录脚本 commit 5b20968b458859b63d26c01d375f5e5b6ed3e984 (tag: cps_20191211_162234) Author: zhenglh Date: Wed Dec 11 16:09:49 2019 +0800 200金额赠送书币改为49元 commit b88b327e6e03f6ef7d012149d252ceea1fbc6163 Author: zhenglh Date: Wed Dec 11 14:07:20 2019 +0800 充值加购金额配置修改 commit df9e5adbc02b3edd19ba3c4250d93197dc2707ee Author: wudongdong Date: Wed Dec 11 13:49:24 2019 +0800 消耗活动充值后自动报名 commit 1b294b1b870d837bc4e4067e5d5002322419a5a5 Merge: 7564fca77 c370242a5 Author: 李天时 Date: Wed Dec 11 13:39:40 2019 +0800 Merge branch 'master' into dev-chapter-list-20191126 commit 0c390766fe0d30844604bdf688dc8b59848e3010 Merge: d730ffd7e c370242a5 Author: liyt Date: Tue Dec 10 20:00:23 2019 +0800 Merge branch 'master' into dev-fenzhang20191115 # Conflicts: # application/admin/controller/Withdraw.php commit d730ffd7e7abdf39fb83fed9880a99dc18e5bb0b Author: liyt Date: Mon Nov 18 11:39:39 2019 +0800 分账 commit 279e4855683296d645dfdafcf6ab0447a2fc9776 Author: liyt Date: Fri Nov 15 19:35:46 2019 +0800 分账提现 commit 6bff4310fdf4e5921134118c01ff27cb8940051b Author: 李天时 Date: Thu Nov 14 19:11:32 2019 +0800 fixbug,解决检查书架count判断obj类型报错的问题。 commit bb9541f996997f8fc31b8c800158f26f26ff573b Author: wudongdong Date: Tue Dec 10 16:00:56 2019 +0800 打点 commit c370242a5377daf1900c521cfa69aaa37204f520 (tag: cps_20191210_165416) Author: zhenglh Date: Tue Dec 10 15:42:09 2019 +0800 主题问题处理 commit 660c33c7ff398db1676c5fb2f39c93b280fd3dda Author: zhenglh Date: Tue Dec 10 15:36:18 2019 +0800 加购问题js处理 commit 876029b0f0865ea1f1395d556f75d0b1ff437058 (tag: cps_20191210_150136) Author: 李天时 Date: Tue Dec 10 14:41:52 2019 +0800 从原始书库添加书籍，兼容旧系统与华为系统 commit d6e7699d80eff0a87a70e11b505035ad7eed24da Author: wudongdong Date: Tue Dec 10 14:27:05 2019 +0800 主编推荐语 commit d330bfe39ffd30186d8592d5910a95e369f366fa (tag: cps_20191210_134802) Merge: 43261ccf3 0f65a6acf Author: wanggb Date: Tue Dec 10 13:45:42 2019 +0800 Merge branch 'dev-hetong-20191202' commit 0f65a6acf3688e9635f0b4386be835ea6a07e760 Author: wanggb Date: Tue Dec 10 13:45:24 2019 +0800 合同 ,$agreementyiArr 初始化 commit 43261ccf353f71fdad9f5edd1c9a88e2cb159801 Author: wudongdong Date: Tue Dec 10 13:18:08 2019 +0800 扣减书币 commit 79cd6acabe896e7a08f7a0231de28728c3ab12a9 Merge: e7d039734 91e5b97e6 Author: wudongdong Date: Tue Dec 10 13:16:30 2019 +0800 Merge branch 'dev-Campaign-log-20191209' of http://192.168.0.31/fe/cps into dev-Campaign-log-20191209 commit e7d0397341c08c1a0ea6f61698e985ee566c5ece Author: wudongdong Date: Tue Dec 10 13:16:15 2019 +0800 扣减书币 commit d05ec4b5a10a572c529cc49e21e1ef27022b4660 Author: wudongdong Date: Tue Dec 10 11:34:48 2019 +0800 扣减书币日志优化 commit 91e5b97e614cf0fc0d6502462e100f02367982d6 Author: liyt Date: Tue Dec 10 11:34:15 2019 +0800 消耗活动弹窗曝光uv打点 commit 108f6252f690eedbe153c1d1e118eaabe28c6cd7 Author: wudongdong Date: Tue Dec 10 11:33:56 2019 +0800 扣减书币日志优化 commit 3e5f8e6e93a7f2529f8280b6342a561fd1681646 Merge: ab8948346 a3b623980 Author: wudongdong Date: Tue Dec 10 11:18:17 2019 +0800 Merge branch 'dev-Campaign-log-20191209' of http://192.168.0.31/fe/cps into dev-Campaign-log-20191209 commit ab89483463053b37d3d5716b650d52656000767d Author: wudongdong Date: Tue Dec 10 11:17:58 2019 +0800 书币扣减失败 commit a3b623980917537f84900cdadb5c3ea7342c82f4 Author: liyt Date: Tue Dec 10 11:15:42 2019 +0800 消耗活动弹窗曝光uv打点 commit 3192b8c9590e629fc7a67b3f37e9cb02cf435192 Author: wudongdong Date: Tue Dec 10 11:11:04 2019 +0800 log commit 38278f6de893afecd0add79ccdebaaf94bf9c047 (tag: cps_20191210_113357) Merge: 9e54f22a5 0a381b462 Author: wanggb Date: Mon Dec 9 16:59:18 2019 +0800 Merge branch 'dev-hetong-20191202' commit 9e54f22a53c88fd56fe6d3b90e4eb735f3b829c7 Merge: 1cbbc9739 b7eafc46a Author: 李天时 Date: Mon Dec 9 15:55:34 2019 +0800 Merge remote-tracking branch 'origin/master' commit 1cbbc97392aec89dd350f6e07d67f618772c75b3 Author: 李天时 Date: Mon Dec 9 15:55:28 2019 +0800 cps袋鼠首页删除“帮助中心” commit b7eafc46a1b11d81569526c03ac1a0467a22949d Author: wudongdong Date: Mon Dec 9 15:44:31 2019 +0800 管道使用修改 commit 7564fca775fdd21460b4dad100e7b95806e12940 Merge: af18dd222 b4e771127 Author: 李天时 Date: Mon Dec 9 14:17:48 2019 +0800 Merge branch 'master' into dev-chapter-list-20191126 commit b4e77112761997b7032c517b791322967480e87a Author: liyt Date: Mon Dec 9 13:37:54 2019 +0800 消耗活动弹窗去掉已付费条件 commit 0a381b4625436d257b7d9984295619a9d4b8b21b Merge: 961d68f37 b4d082c9f Author: zhenglh Date: Sat Dec 7 16:32:11 2019 +0800 Merge remote-tracking branch 'origin/dev-hetong-20191202' into dev-hetong-20191202 commit 961d68f37c092b6a765191694d413d347ca812d0 Author: zhenglh Date: Sat Dec 7 16:32:00 2019 +0800 加购2为8折 commit 2a4f8ec6ceb5de5bc300755e9afed176697132e5 Author: zhenglh Date: Sat Dec 7 16:17:11 2019 +0800 提现申请redis锁逻辑优化 commit b4d082c9ff65d59f05b610037397e19a6cc1dda8 Merge: 611e1c6ed 7e7c15aa9 Author: wanggb Date: Sat Dec 7 15:10:58 2019 +0800 Merge remote-tracking branch 'origin/dev-hetong-20191202' into dev-hetong-20191202 # Conflicts: # application/admin/model/Agreementyi.php # application/command.php commit 611e1c6edd6c7ce8be8eea1de5084be25e574d7b Author: wanggb Date: Sat Dec 7 15:08:45 2019 +0800 校验是否是变动了乙方信息 commit 7e7c15aa9c971eb03df517bca85c4c6079d9dffb Author: wanggb Date: Sat Dec 7 14:18:11 2019 +0800 校验,合同名称 commit 0a9577096d1ba88dee80778552165bcf4d3e99a1 Author: wanggb Date: Thu Dec 5 17:29:15 2019 +0800 合同，脚本刷新增的字段,维护历史benefit commit 4aadf5ed91a715d2f00c41116567c4f908d0f3d2 Author: wanggb Date: Tue Dec 3 19:29:48 2019 +0800 乙方合同，刷库，分成比例 commit 66c84df40770f8e4c7b6e51ff04153db68611610 Author: wanggb Date: Tue Dec 3 17:33:57 2019 +0800 乙方合同协议修改，一对多 commit 6c32f526356f5a02c80ba5c28db0631f19de96ec Author: wanggb Date: Tue Dec 3 14:02:33 2019 +0800 合同修改,甲方名称和合同内容 commit 48e327c9ccc32a0ca3c34bb4f9e894b807344711 Author: wanggb Date: Tue Dec 3 11:31:32 2019 +0800 合同修改,甲方名称和合同内容 commit c62d805398a8c47df5be1d72ff09fb0be71890b5 Author: wanggb Date: Tue Dec 3 11:25:21 2019 +0800 合同修改,甲方名称和合同内容 commit 7a5c4176846da750a8588ecc6729c70715853a5f Author: wanggb Date: Tue Dec 3 10:45:24 2019 +0800 合同修改 commit a33e0728ead72dc62c6b59bc39f06a5550dce41f Author: zhenglh Date: Fri Dec 6 11:59:08 2019 +0800 充值加购页面调整 commit e87741727feab8beee3522df1db580303a6fcd16 Author: zhenglh Date: Thu Dec 5 20:21:11 2019 +0800 充值加购页面调整 commit 911681409faa3639f405d7c25f781334a42a3836 Author: zhenglh Date: Wed Dec 4 19:54:23 2019 +0800 充值加购新模板页面 commit 0ce4621c0612f330198ad4be33c7ab32b3199205 Author: wanggb Date: Sat Dec 7 14:18:11 2019 +0800 校验,合同名称 commit af18dd2226197401053123a6bad4fe26f8dbe329 Author: liyt Date: Sat Dec 7 14:14:11 2019 +0800 模板消息url过滤前后空格 commit d07fb58a096ac559364280e66baa1d59c34bd0e5 Author: wanggb Date: Sat Dec 7 13:18:43 2019 +0800 暂停开发，接手新需求 commit f3dd853e22baea3fe0c7056caed8e6c66548a03b Author: liyt Date: Sat Dec 7 10:39:37 2019 +0800 模板消息链接过滤前后空格 commit c925639647727b5206f17448b663f8d7105f8e1b Author: liyt Date: Fri Dec 6 15:06:30 2019 +0800 签到 commit 5434fdb8079a25988fe8c940fa77d26237fa26d5 Author: liyt Date: Fri Dec 6 14:35:29 2019 +0800 签到 commit e82148e243191a06fb9b2c99c97cbc4f8eaf645a Author: zhenglh Date: Fri Dec 6 13:50:40 2019 +0800 增加控制器及Model commit ea9f597170775061c004b071700c155cf11f3f3f Author: wudongdong Date: Fri Dec 6 13:40:14 2019 +0800 消费表中增加充值和订单信息 commit df7e5011d9e0019a27351da979abdff5e29c60d7 Merge: c6ee6110b c4c488bd7 Author: wudongdong Date: Fri Dec 6 13:35:23 2019 +0800 Merge branch 'master' into dev-consume-rechargeId-20191202 # Conflicts: # application/command.php commit c6ee6110b88817a169cfb7a57c308b317e7801c1 Author: wudongdong Date: Fri Dec 6 12:05:10 2019 +0800 consume commit 5b4f0b76185ea08a4d90aac8888bbb01aa9c5415 Author: liyt Date: Fri Dec 6 11:45:13 2019 +0800 客服消息生成短链时对url进行trim过滤前后空格 commit d04b37975c1824313c275d551e5918d8dbf09011 Author: liyt Date: Fri Dec 6 10:06:39 2019 +0800 支付回插入recharge的orders_id字段和签到书币根据用户状态更新dd字段 commit 99bdddb816d55c6659b5177f9dc83b663e134f80 Author: wudongdong Date: Fri Dec 6 09:49:11 2019 +0800 consume commit c4c488bd777c89aa4876341aefdaa333661ecb1c (tag: cps_20191206_112615, tag: cps_20191206_101140) Merge: 9a1a4c367 cc652da38 Author: wudongdong Date: Thu Dec 5 20:50:40 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 9a1a4c3677d1306cbf35ebc988793ce9ca4273ed Merge: 3df031eba fc75c2113 Author: wudongdong Date: Thu Dec 5 20:50:00 2019 +0800 Merge branch 'dev-aplain-cost-20191204' commit fc75c2113f7bed72c88bbb1f6f033f52e6a071cf Merge: 8c517b77e 0c6f18a0c Author: wudongdong Date: Thu Dec 5 20:24:58 2019 +0800 Merge branch 'dev-aplain-cost-20191204' of http://192.168.0.31/fe/cps into dev-aplain-cost-20191204 commit 8c517b77edecb1fd4e9fc77c6683a740be9b0a16 Author: wudongdong Date: Thu Dec 5 20:24:50 2019 +0800 cam commit cc652da384ad09d3ecbf7b51bf06dd8cc7236313 Merge: 3df031eba 0c6f18a0c Author: wanggb Date: Thu Dec 5 19:47:54 2019 +0800 Merge branch 'dev-aplain-cost-20191204' commit 0c6f18a0c6539c6c1d16923e90e9a53e675919e9 Author: wanggb Date: Thu Dec 5 19:45:30 2019 +0800 px 个人中心 消耗活动 commit 3df031ebafcd41b334cc46c9bda875ca0a4c4abb (tag: cps_20191205_190312) Merge: d356d4e67 b9410c0bd Author: wudongdong Date: Thu Dec 5 18:50:35 2019 +0800 Merge branch 'dev-aplain-cost-20191204' commit b9410c0bdcd9178dc1c6374b50bb521eae7fe8ce Author: wudongdong Date: Thu Dec 5 18:49:59 2019 +0800 cam commit d356d4e67131a9c04dd5842b9d2f561edf8facb3 Merge: 816a507ab 937dd95f1 Author: wudongdong Date: Thu Dec 5 18:44:09 2019 +0800 Merge branch 'dev-aplain-cost-20191204' commit 937dd95f1a2faf706e18f5a7718c1675ed728430 Author: wudongdong Date: Thu Dec 5 18:43:28 2019 +0800 消耗活动 commit 393e449a75ba1efa470f040c3b4eeddfd084e8f6 Author: wanggb Date: Thu Dec 5 17:29:15 2019 +0800 合同，脚本刷新增的字段,维护历史benefit commit 816a507abfd7b5c6f58f2847323af998dd236e75 Merge: feb864de3 7edfc372a Author: wudongdong Date: Thu Dec 5 17:27:33 2019 +0800 Merge branch 'dev-aplain-cost-20191204' commit 7edfc372ab07330db063dc3df1bd85141d060dfc Merge: 023da7bb1 fb6dd5bf6 Author: wudongdong Date: Thu Dec 5 17:26:34 2019 +0800 Merge branch 'dev-aplain-cost-20191204' of http://192.168.0.31/fe/cps into dev-aplain-cost-20191204 commit 023da7bb19084d07b88bc02df035e765f075f5cb Author: wudongdong Date: Thu Dec 5 17:26:27 2019 +0800 计算奖励 commit fb6dd5bf668e77f76fc68def167a8132e521d184 Author: wanggb Date: Thu Dec 5 17:19:49 2019 +0800 KL读者查询 commit 07b11b67be82e3392f4ed7fccceaaad4cb3e227c Author: wudongdong Date: Thu Dec 5 17:19:44 2019 +0800 consume commit dbdc3ec29ae8ae3fc967f9400e99644261599aa7 Author: wudongdong Date: Thu Dec 5 16:30:38 2019 +0800 consume commit 5b1aa94ff7393e3faf29547752eec55cbdd3e49d Author: 李天时 Date: Thu Dec 5 15:53:08 2019 +0800 改造章节列表获取方式，按需获取。解决小说中心关注章节为null的问题 commit ce8118192eb95eca98811bb7c5b04329395893cc Author: liyt Date: Thu Dec 5 15:39:15 2019 +0800 充值记录与订单关系脚本 commit 8ce88ee9dc91b8fe7876a8a8132645d24bed3904 Author: 李天时 Date: Thu Dec 5 15:27:00 2019 +0800 改造章节列表获取方式，按需获取。解决小说中心关注章节为null的问题 commit 096b8433d35e635813ee1ee921686a9fc11d14ce Merge: a71723013 feb864de3 Author: 李天时 Date: Thu Dec 5 14:09:14 2019 +0800 Merge branch 'master' into dev-chapter-list-20191126 commit feb864de3f4823d4f2a13e48d8c8ff3bf764eba3 (tag: cps_20191205_155208) Author: zhenglh Date: Thu Dec 5 14:08:42 2019 +0800 充值加购bug处理 commit eb764f3e8ec927faf17551f1def8a5a45dcbaba7 Merge: dcdbc3e37 c11d0490f Author: wudongdong Date: Thu Dec 5 12:16:00 2019 +0800 Merge branch 'dev-aplain-cost-20191204' of http://192.168.0.31/fe/cps into dev-aplain-cost-20191204 commit dcdbc3e37fbecbe190d71c99edf36bba8294c98a Author: wudongdong Date: Thu Dec 5 12:15:55 2019 +0800 like commit c11d0490f049c80f6e7347315be6f2f4262b5e34 Merge: 585575080 8d53e955a Author: wanggb Date: Thu Dec 5 11:47:06 2019 +0800 Merge remote-tracking branch 'origin/dev-aplain-cost-20191204' into dev-aplain-cost-20191204 commit 585575080d10ff9c668937a4b92b3a4fa6301217 Author: wanggb Date: Thu Dec 5 11:46:53 2019 +0800 预发布数据库安全级别 & 活动开始时间交叉问题 commit a7172301347fc5a5b100e53bb917ae3be811c464 Author: 李天时 Date: Thu Dec 5 11:21:16 2019 +0800 改造章节列表获取方式，按需获取。 commit 05f41033452657d93c1c134c20b34cbcc86dcd25 Author: 李天时 Date: Thu Dec 5 11:03:40 2019 +0800 改造章节列表获取方式，按需获取。 commit 8d53e955a634a815aadcd95d84bf00247d1f9049 (tag: cps_20191205_104415) Author: wudongdong Date: Thu Dec 5 10:30:25 2019 +0800 updateMatchTest commit d0ccc3bace91f6b5e01aee32e53217d8b2f187c1 Author: wudongdong Date: Wed Dec 4 21:08:07 2019 +0800 阅读记录 commit 1862c3b4e34694de4902332db3b1b6c7dffa35ab Author: wanggb Date: Wed Dec 4 20:59:38 2019 +0800 修改Redis & 数据库安全级别 & 连续签到文案 commit da35cba200f630c18a4eab128b2231ff7dbfd178 Author: wudongdong Date: Wed Dec 4 19:05:37 2019 +0800 consume commit 66360d8bf1c676f97dcafce09cfcfe138cd2c2e0 Author: 李天时 Date: Wed Dec 4 17:47:54 2019 +0800 改造章节列表获取方式，按需获取。 commit 0c4440bae3203bc57f862214cb154be8d58ce03c (tag: cps_20191204_172811) Merge: 69cdc7616 9b074f59c Author: wanggb Date: Wed Dec 4 16:50:09 2019 +0800 Merge remote-tracking branch 'origin/master' commit 69cdc76161076e50098df6ae608bd6124d859414 Author: wanggb Date: Wed Dec 4 16:49:54 2019 +0800 智齿客服接口自定义参数发生变动 commit 72a86604c0f439651f56c61619925af11edee1d1 Merge: 1768c33e8 9b074f59c Author: 李天时 Date: Wed Dec 4 15:36:33 2019 +0800 Merge branch 'master' into dev-chapter-list-20191126 commit 61f9280fed5c832d17bc3380f3abf25f35fd2c24 Author: wudongdong Date: Wed Dec 4 14:13:42 2019 +0800 consume commit 9b074f59caad7157cfbe4a5c8e29ecdc3af801cd Author: liyt Date: Wed Dec 4 14:04:10 2019 +0800 梦嘉数据任务优化sql索引 commit 7798c8909dbd37e396672eeac9ecf1cd35ce967b Author: wanggb Date: Wed Dec 4 10:36:52 2019 +0800 智齿客服接口地址更新 commit 483bf0df217d5721d04ea04dd2b0e3e370d37b90 Author: wudongdong Date: Wed Dec 4 10:31:54 2019 +0800 consume commit 102a457be002ba905443ff6648103b4f6fc969f0 Author: 李天时 Date: Wed Dec 4 10:27:47 2019 +0800 KL订单回调计入订单统计与adminmoney commit 0e33346a61549293c51081b5fe5c7e72e5f904c9 Author: 李天时 Date: Wed Dec 4 10:11:52 2019 +0800 KL订单回调计入订单统计与adminmoney commit 5f7e2272bee76af290d9e7bb4974b8f501b5d3b5 Merge: f204bcd39 0e0fe9ba6 Author: wanggb Date: Wed Dec 4 10:03:19 2019 +0800 Merge branch 'dev-cost-kandian-20191029' # Conflicts: # application/command.php # application/index/controller/Recharge.php commit f204bcd39feffa7ad53cfda33f078c82d03bd4b4 Merge: d365da782 3eaa86306 Author: wanggb Date: Tue Dec 3 21:59:11 2019 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # application/admin/view/activity/add.html commit 0e0fe9ba647525bfba3dc37547881fe4e1c4c4c6 Author: wudongdong Date: Tue Dec 3 20:16:26 2019 +0800 rediskey commit 428b7cb0085112586053614f01a890777f23029d Author: wanggb Date: Tue Dec 3 19:29:48 2019 +0800 乙方合同，刷库，分成比例 commit 22217be1cdae953d1facdfc2e89b24af3e46656c Author: wudongdong Date: Tue Dec 3 19:10:50 2019 +0800 consume commit 6e544d47ab9c57b113a5f8b2b1da2d32300e9846 Author: wanggb Date: Tue Dec 3 17:33:57 2019 +0800 乙方合同协议修改，一对多 commit 3eaa86306852278a47a7b5c770be69036567f7d1 Author: zhenglh Date: Tue Dec 3 17:24:31 2019 +0800 加购限免书籍与免费书籍配置更新 commit 3c9189454a16bdb8f6c41bf7c88a1982264bd950 Author: zhenglh Date: Tue Dec 3 16:10:05 2019 +0800 活动文案字符0~100 commit 952ecfde08e09ce3dc21a07b00aa83906575ec7b Author: wudongdong Date: Tue Dec 3 15:33:12 2019 +0800 cam commit 920b46310a9635d82946bc7a5134fdec72cf12ae Author: wudongdong Date: Tue Dec 3 15:26:22 2019 +0800 toredis commit ac53e2f53b04f0b279505eeca1b1a4657ef45bb0 Author: 李天时 Date: Tue Dec 3 15:21:40 2019 +0800 KL订单回调计入订单统计与adminmoney commit 9508b6ab4a09fd9c012c409be1198647b58bd28f Author: wudongdong Date: Tue Dec 3 15:20:24 2019 +0800 consume commit 549f9c66703b91e2c4c1d0f6f76bf8af89b206f1 Author: wanggb Date: Tue Dec 3 14:02:33 2019 +0800 合同修改,甲方名称和合同内容 commit 87dd09ea44a2292cc8bf7d309d2ba5df9be3dad5 Author: wudongdong Date: Tue Dec 3 11:43:32 2019 +0800 updateConsume commit 30e804bc803d99b15544b2e76be30677f7ef1b08 Author: wanggb Date: Tue Dec 3 11:31:32 2019 +0800 合同修改,甲方名称和合同内容 commit 07cb360a6d9310cb395c04b8193e4d383e461713 Author: wanggb Date: Tue Dec 3 11:25:21 2019 +0800 合同修改,甲方名称和合同内容 commit fc128378119ead7c0d860e5831487f82c3ffaf11 (tag: cps_20191203_111110) Author: zhenglh Date: Tue Dec 3 11:04:16 2019 +0800 配置上架书籍 commit 07f6a3b1720ef550aa9cd5e08579dab0d4773612 Author: zhenglh Date: Tue Dec 3 11:01:17 2019 +0800 缓存处理 commit 46b343fc4b4609d6162d9c92bb76b1450d90b7c4 Author: wanggb Date: Tue Dec 3 10:45:24 2019 +0800 合同修改 commit f100a62904d5014eb3a9cd0b6f71fabd8d9fdbb0 (tag: cps_20191203_101756) Merge: 708870569 2535eb1c9 Author: zhenglh Date: Tue Dec 3 10:05:51 2019 +0800 Merge branch 'dev-subscribe-sell-20191026' commit 2535eb1c93c9b380050bfb6b363d90fc5c37d2e6 Author: zhenglh Date: Tue Dec 3 10:05:30 2019 +0800 配置文件buymore字符换Key commit 70887056927064a7464841e9b65e4cff0db0f4d3 (tag: cps_20191202_191439, tag: cps_20191202_160817) Author: liyt Date: Thu Nov 28 15:19:28 2019 +0800 检测平台下授权公众号refresh_token commit bc0ee77f32a53e6f203c72fca3ec57bdf4052b76 Author: liyt Date: Fri Nov 29 15:22:37 2019 +0800 活动文案限制长度 commit 1afa09052e719cddbf159f76f8cd597d92b51b35 Author: liyt Date: Fri Nov 29 14:46:15 2019 +0800 批量创建自定义活动 commit d365da782b482b10b9b88f1120b96bd1940861d8 Merge: ba46ff7cf 84712d8e4 Author: zhenglh Date: Mon Dec 2 15:31:09 2019 +0800 Merge remote-tracking branch 'origin/master' commit ba46ff7cff49604ba1e437191cb5ac269cf10b97 Author: zhenglh Date: Thu Nov 28 18:25:07 2019 +0800 增购页面修改，关注回复无法添加链接，视图添加ab测 commit 1d194077c76aa7d3bc3e8aec3f890e60ee0f2885 Author: wudongdong Date: Mon Dec 2 15:07:25 2019 +0800 tags commit 84712d8e457cb957515cdb64acd24a8828c4a6cf Merge: ad6f87c07 46edf77b0 Author: liyt Date: Mon Dec 2 10:43:58 2019 +0800 Merge branch 'dev-command-refresh-token-20191128' commit 46edf77b0b07aa58dc4d059600c6b1afecc65b9e Author: liyt Date: Thu Nov 28 15:19:28 2019 +0800 检测平台下授权公众号refresh_token commit c5e4c7ff87bd5684761b8fb49b4ef56122e86fb9 Author: wudongdong Date: Fri Nov 29 15:26:28 2019 +0800 tags commit ad6f87c0750b6ed9c71c7c23d73985dc3931c5e8 Author: liyt Date: Fri Nov 29 15:22:37 2019 +0800 活动文案限制长度 commit 1768c33e87e2ab7800e10ae79659e6f9072938f1 Author: 李天时 Date: Fri Nov 29 15:11:02 2019 +0800 后台推广链接列表分页只显示10条 commit a191de7bed10a7dd056703055601f4c7c506edfb Author: wudongdong Date: Fri Nov 29 15:05:53 2019 +0800 cam commit 6727a6b53302953d06a652f588aa8859eabaa6f4 Author: 李天时 Date: Fri Nov 29 15:00:25 2019 +0800 后台推广链接列表分页只显示10条 commit 7feb295076bf30ba44c8c7b2bc6e048e371a7036 Author: liyt Date: Fri Nov 29 14:46:15 2019 +0800 批量创建自定义活动 commit 59a1c080597750a4c3917c5db148f91690aa5d3f Author: wudongdong Date: Fri Nov 29 14:22:48 2019 +0800 cammm commit 3a8c86960acf382513a5d15b30b30a38c5219cfe Author: wudongdong Date: Fri Nov 29 11:44:35 2019 +0800 cam commit a423a432181860f7c1f9bce0d028cfc796a49de8 Author: wudongdong Date: Fri Nov 29 10:45:50 2019 +0800 cam commit b7505aae8d63cc828501a167ba30ad975a646084 Author: liyt Date: Fri Nov 29 10:31:47 2019 +0800 弹窗位置 commit 6d2c5f7f7d8d1b44123d6aeaeb4dfa261f850bba Author: wudongdong Date: Fri Nov 29 10:22:49 2019 +0800 cam commit e8b134de8080ead9a64f674b29825c0f6d5414e7 Author: wudongdong Date: Fri Nov 29 10:03:55 2019 +0800 cam commit ef84cafb536acd9dda468ac88a3131542fdd35b3 Author: wudongdong Date: Fri Nov 29 09:33:51 2019 +0800 cam commit 0556f326aade7d0cc4f7d0d61628083d4fe54ffa Author: wudongdong Date: Fri Nov 29 09:32:13 2019 +0800 cam commit 5a56ea16a0ac91bc17e9655a0fe34ecc7496d303 Author: wudongdong Date: Fri Nov 29 09:25:53 2019 +0800 cam commit 9b50356f657b15120dafc6f305a112c541c9e22b Author: wudongdong Date: Fri Nov 29 09:19:16 2019 +0800 cam commit 4878147bc290e9349a1aa2a0d82f6d73557d97c9 Author: wudongdong Date: Thu Nov 28 20:57:49 2019 +0800 cam commit 6a13822b0103b89ba19d0e7c84747b6851bc2151 Author: liyt Date: Thu Nov 28 19:54:17 2019 +0800 vip自定义活动统计 commit 7390abb852da6e8d29a5fa242d37fd6527d7bb1c Author: 李天时 Date: Thu Nov 28 19:34:30 2019 +0800 后台订单列表分页只显示10条 commit 18690b7d5d5bd11be63f4eea1b9a6fc743219cb9 Author: wudongdong Date: Thu Nov 28 17:49:17 2019 +0800 css commit 4d65bd1ffd0bc35832efcf060a1e649ded2ab1b2 Author: wudongdong Date: Thu Nov 28 17:43:06 2019 +0800 ceshi commit 5f0235e53a1907f1edf48c5ffa5bfc1a120af376 Author: wanggb Date: Thu Nov 28 14:16:27 2019 +0800 Demo => MQ写入数据 commit ba403b0d06f2fc782b3105bd2275fcad04ade8f3 Author: wudongdong Date: Thu Nov 28 13:46:47 2019 +0800 tag commit 486a636f3d9879258619eb1a16e22391329288a7 Merge: 2fa73593f dd42ff5de Author: yunfeng ke Date: Thu Nov 28 11:49:43 2019 +0800 Merge branch 'keyunfeng_yangguang_index' commit dd42ff5deaa1a709fef02ef9a76ae480d6fbe2b3 Author: yunfeng ke Date: Thu Nov 28 11:48:59 2019 +0800 修改手机版bug commit 2fa73593f59c9a22c020f4f32a228c205bdf914a Merge: f1d38bfea 34668f6a6 Author: 李天时 Date: Thu Nov 28 11:03:27 2019 +0800 Merge branch 'keyunfeng_yangguang_index' commit 7921934121f69ade80f83b2ceade7041d3151625 Author: 李天时 Date: Thu Nov 28 10:54:24 2019 +0800 后台订单列表分页只显示10条 commit 34668f6a69a1af7da98ee57f2736f7768741b150 Author: yunfeng ke Date: Thu Nov 28 10:50:09 2019 +0800 修复浏览器放大缩小bug commit f1d38bfea7cd54b9d6f01ea8967585e15170368f Merge: 1caed2213 5b5fceb3e Author: 李天时 Date: Wed Nov 27 19:40:41 2019 +0800 Merge branch 'keyunfeng_yangguang_index' commit 5b5fceb3e213ae0c4da9212f13ae230a1b3eb53f Author: yunfeng ke Date: Wed Nov 27 19:29:04 2019 +0800 修改完成 commit a1dbee6d97185c0ff1b31da75f3873a01a7a746c Author: 李天时 Date: Wed Nov 27 18:41:25 2019 +0800 改造章节列表获取方式，按需获取。 commit 1caed2213b11d98a960855ca54660376efec8f69 (tag: cps_20191127_175154) Merge: 03e5f4390 30e589e75 Author: zhenglh Date: Wed Nov 27 16:42:11 2019 +0800 Merge remote-tracking branch 'origin/master' commit 03e5f43904453a4246de9bce3332b72aeaa8abcb Author: zhenglh Date: Wed Nov 27 16:41:59 2019 +0800 商品金额单位为毛时，无法加购 commit aaeda48f5d44c1df3a96f1ef243ec765a1175201 Author: 李天时 Date: Wed Nov 27 15:03:27 2019 +0800 改造章节列表获取方式，按需获取。 commit 30e589e75239c6a58dae302665faf84bce36172e (tag: cps_20191127_143500) Author: liyt Date: Wed Nov 27 11:55:28 2019 +0800 完成率跟js一致向下取整 commit a7d2d2aeffcbb9b054dd112230ca9a9185243a41 Author: 李天时 Date: Wed Nov 27 10:03:36 2019 +0800 改造章节列表获取方式，按需获取。 commit ca74dd13f388e80ade4f70985b1218316ed66238 Author: wudongdong Date: Tue Nov 26 20:13:04 2019 +0800 ceshi mq commit 64053fdf6501b29f24cba8e6cca71bad3d48a7b1 (tag: cps_20191126_201017, tag: cps_20191126_195830) Author: liyt Date: Tue Nov 26 19:42:28 2019 +0800 活动不存在字段删除 commit 4b3964c6b1b1a0cd48b233d4febf69708c125da6 Author: liyt Date: Tue Nov 26 19:38:15 2019 +0800 活动不存在字段删除 commit 8b2ff782d00e084bc55b04502460df5b1e916bcb Author: zhenglh Date: Tue Nov 26 17:22:18 2019 +0800 引导关注与vip页面修复,书架样式修改 commit 57a15492577e4dff04d4fdf222205fdb06156f25 Merge: 25e5a3b75 156625a5c Author: wudongdong Date: Tue Nov 26 17:01:57 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 25e5a3b75a685de79509df2f1b841eca0eb3c38b Author: wudongdong Date: Tue Nov 26 17:01:48 2019 +0800 cam commit 156625a5c5ae934b1faa98027607c1de3c3d716d Author: liyt Date: Tue Nov 26 16:09:17 2019 +0800 弹窗冲突 commit 21a7cd432bd11c38be3de78ec15cfa5593c4032c Merge: e995af483 46ddaaf25 Author: wanggb Date: Tue Nov 26 16:06:11 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit e995af4836c6ab924f348980949aadd42f3ca253 Author: wanggb Date: Tue Nov 26 16:05:58 2019 +0800 KL commit 4fb72a0648d507958e06a148bcabe2658f70b385 (tag: cps_20191126_154801) Merge: 3123159f0 e0fa6e4c5 Author: zhenglh Date: Tue Nov 26 15:36:08 2019 +0800 Merge branch 'dev-subscribe-sell-20191026' commit e0fa6e4c548549da5d85bbbc9f128c90af0c5ba4 Author: zhenglh Date: Tue Nov 26 15:35:36 2019 +0800 增购配置 commit 3123159f05a7da32c31a88e9a5f3f75dfe811a85 (tag: cps_20191126_140014) Merge: 5aca9da37 7eb5ad472 Author: zhenglh Date: Tue Nov 26 13:33:48 2019 +0800 Merge branch 'dev-subscribe-sell-20191026' commit 7eb5ad47299b0012f4da7b26ce26531475a3b9a2 Merge: 7f99ff46a 77d578a6a Author: zhenglh Date: Tue Nov 26 12:35:24 2019 +0800 Merge remote-tracking branch 'origin/dev-subscribe-sell-20191026' into dev-subscribe-sell-20191026 # Conflicts: # public/assets/dist/component.bundle.js # public/assets/dist/component.bundle.js.map commit 7f99ff46a89551bacad8a66d135377c49631febf Author: zhenglh Date: Tue Nov 26 12:35:08 2019 +0800 自动回复问题处理 commit 46ddaaf25dda77dbf5fdc7b45d1f7c911f454438 Merge: b5a91e8fe b94611f5e Author: wudongdong Date: Tue Nov 26 12:06:31 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit b5a91e8fedf9414f62dcb28dd4e91e5a6fb1e5f7 Author: wudongdong Date: Tue Nov 26 12:06:26 2019 +0800 cam commit 5aca9da3797f77eb9976efaadd6d711f9e5e7094 Merge: b45cd29c2 77d578a6a Author: liyt Date: Tue Nov 26 12:01:39 2019 +0800 Merge branch 'dev-subscribe-sell-20191026' commit 77d578a6ab49a57e6ab9878ac11c488b380ce4ed Author: zhenglh Date: Sat Nov 23 11:59:34 2019 +0800 被关注延时消息和充值加购和修复批量创建自定义活动bug commit b94611f5effc217c21d7c55045e98477e081a214 Author: wanggb Date: Tue Nov 26 11:46:55 2019 +0800 修改活动时间，判断是否交叉精确到天 commit f19c583940be9e40e770d69ac303712eb010e953 Author: zhenglh Date: Tue Nov 26 11:27:55 2019 +0800 书籍不存在是报错处理 commit d9f82c56baa9b3c0ad05442cff5ef933915eeb4d Author: zhenglh Date: Tue Nov 26 11:08:31 2019 +0800 支付明细在支付时隐藏 commit 52d79faf8fc8ee2c14ac1adf1b0bdcf413b30f20 Author: liyt Date: Tue Nov 26 10:34:37 2019 +0800 清理缓存 commit bb9a595f440bf2a47940038d40aa5f0d8c577a94 Author: wudongdong Date: Mon Nov 25 22:08:36 2019 +0800 cam commit 02b8cac5ce7208e550ef6981e6f05a14d2cee8e7 Author: wudongdong Date: Mon Nov 25 22:04:14 2019 +0800 cam commit e2873343684d98adc1d3f7847c633a97c94c444b Author: wanggb Date: Mon Nov 25 19:38:35 2019 +0800 完成推荐标签交互效果 commit 805adc58eeb762a3cf82ec8dc7393c67b7f27230 Author: zhenglh Date: Mon Nov 25 18:17:28 2019 +0800 被关注回复，派单渠道验证 commit 6ff631c77818cb61f05505aa8159b5480d2676cf Merge: abc8e3eb2 aeff0e06c Author: wudongdong Date: Mon Nov 25 17:39:21 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit abc8e3eb275cb6fee311a30c2f5038d33e014ae8 Author: wudongdong Date: Mon Nov 25 17:39:15 2019 +0800 cam commit aeff0e06c32b8b1407498a9f6d8ae511fe1bea3b Author: liyt Date: Mon Nov 25 17:02:37 2019 +0800 弹窗 commit 69cf690887b1f4c3033a39e84e7effbe65da48de Author: zhenglh Date: Mon Nov 25 16:38:10 2019 +0800 删除添加标题 commit 5cd61c3c54aa57b12d01261c1bdcdc3eb2a59d71 Author: zhenglh Date: Mon Nov 25 16:29:40 2019 +0800 延迟客服消息删除问题处理 commit 32f5d64a212d363ed08243d190cecdb3f5859c7c Merge: 1278fb298 a8a7ada38 Author: wudongdong Date: Mon Nov 25 16:17:34 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 1278fb298a81450fff3619baace15cd80c382c45 Author: wudongdong Date: Mon Nov 25 16:17:29 2019 +0800 cam commit a8a7ada38157d7c48c0a5eeafcc4ef8394d8ba27 Author: liyt Date: Mon Nov 25 16:16:45 2019 +0800 弹窗 commit a4dd90b59729a2a255fa8ebffd4655e1a8545007 Merge: dbcf5378d ef2cace55 Author: wudongdong Date: Mon Nov 25 15:44:02 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit dbcf5378d659f869b92f4d349fd5f5e43aa647fb Author: wudongdong Date: Mon Nov 25 15:43:58 2019 +0800 cam commit ef2cace55f57aaf209d3c21f912adc4333d2b603 Author: liyt Date: Mon Nov 25 15:37:32 2019 +0800 弹窗 commit 07c7b00885ec32c517c5a6825ae7e929f3020f02 Author: liyt Date: Mon Nov 25 15:29:14 2019 +0800 弹窗 commit 6056c94ef751b06b98aac4ba5f62d90685f102c5 Author: wanggb Date: Mon Nov 25 15:12:21 2019 +0800 消耗活动数据及样式优化 commit f546e7bb1f6f47d09ebd5e861ae4af9070972a38 Merge: 86c814d97 b1043e3ad Author: wudongdong Date: Mon Nov 25 15:03:29 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 86c814d97191911c89cf0b8cb29585a40fc3d1da Author: wudongdong Date: Mon Nov 25 15:03:12 2019 +0800 cam commit b45cd29c212de6d196c28f86ff1e63913d0c5fd1 (tag: cps_20191125_174643) Author: 李天时 Date: Mon Nov 25 14:59:45 2019 +0800 session由原来的文件模式改为redis模式 commit 5fce48153ea697e7d3718a60f25ef7ea197a3259 Author: zhenglh Date: Mon Nov 25 12:02:31 2019 +0800 消费测试 commit ce0501771707c673174c6ee6d8334b9b0b0118e0 Author: zhenglh Date: Mon Nov 25 11:31:13 2019 +0800 支付加购折扣添加 commit 7338505ae96fda0673d61c0f55fa17989ef70cbe Author: wanggb Date: Sat Nov 23 18:26:13 2019 +0800 推荐书籍标签 commit 3a0b31c6e8222987f21fe84744f30787f961cc1c Author: zhenglh Date: Sat Nov 23 18:14:32 2019 +0800 不关注情况处理 commit 8ad2a2a81cd3b0f2608a5869baf57b0251720c66 Merge: fc7d47fa2 523343c19 Author: liyt Date: Sat Nov 23 14:04:34 2019 +0800 Merge branch 'master' into dev-subscribe-sell-20191026 commit fc7d47fa2e40d7de169d5652cd86afdf6f8fe6ae Author: zhenglh Date: Sat Nov 23 12:01:38 2019 +0800 自定义导粉链接判断 commit b4ff2e9400127736bccaa270245c5d7507a1bf82 Author: zhenglh Date: Sat Nov 23 11:59:34 2019 +0800 自定义导粉链接判断 commit a757603c6f2da8c4d9c00a2074bd7b98ff0c70af Merge: 4dbbc1acc 515adc09f Author: zhenglh Date: Sat Nov 23 11:55:16 2019 +0800 Merge branch 'master' into dev-subscribe-sell-20191026 commit 4dbbc1acccd650b95e2ca1f44164827548913a21 Author: zhenglh Date: Sat Nov 23 10:13:39 2019 +0800 自定义导粉链接失效处理 commit b1043e3ad3be15c5a290d5c00f8c9727d0e67f8a Author: wanggb Date: Fri Nov 22 19:32:57 2019 +0800 读者查询，消耗活动 commit 523343c1930db0138129c70bd3f9102bfb129e15 (tag: cps_20191125_154317) Author: liyt Date: Fri Nov 22 19:23:47 2019 +0800 VIP自定义活动save改为insert commit dd9164c42789427c020795c7f8e18becef886c95 Author: 李天时 Date: Fri Nov 22 19:21:21 2019 +0800 vip后台订单统计页面sql查询效率，去掉admin_id不等于0 commit b402ed1f70d38e1fb4fac68149b4370a0bcf634c Author: wanggb Date: Fri Nov 22 19:07:09 2019 +0800 读者查询，消耗活动 commit 68fd14c20b520f1dade5db9b5816f302683180d2 Author: zhenglh Date: Fri Nov 22 15:07:00 2019 +0800 内网IP取消限制 commit 2ec5b69d463567113ccf2264e936aca734742742 Merge: d37a3dc45 da36713c3 Author: wanggb Date: Fri Nov 22 15:05:59 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit d37a3dc452c8b322fdae4c8a055318bd3ffc7426 Author: wanggb Date: Fri Nov 22 15:05:44 2019 +0800 统计列表，修改活动状态 commit da36713c3114c9c0e9d8cdcb475535806103d348 Author: wudongdong Date: Fri Nov 22 14:50:06 2019 +0800 cam commit 54952d618bcc34ff1aff37976ff32001c1322372 Author: wudongdong Date: Fri Nov 22 13:52:48 2019 +0800 cam commit 7a475bb7aca66a419b5f7b861c1380ded548ed51 Author: zhenglh Date: Fri Nov 22 13:35:37 2019 +0800 渠道数组兼容 commit a3c909073fea7ffbd871fe4fd7b04a2f3260cf58 Author: wanggb Date: Fri Nov 22 11:06:14 2019 +0800 校验表单 commit 292caa62b37235e7c1c541d70e585458ff5d5a50 Author: wanggb Date: Fri Nov 22 10:52:35 2019 +0800 判断是否需要打卡 commit a541212a0c206caf283511c74c08cb3b959d5c72 Author: wanggb Date: Fri Nov 22 10:37:36 2019 +0800 判断是否需要打卡 commit 6e69f4451a0ad4f16db15ff02cae4547c2d21bca Author: wanggb Date: Thu Nov 21 21:21:19 2019 +0800 判断是否需要打卡 commit 3d4cb11dc537df07bb40762c932b30275eef19a9 Merge: a709807c3 ed32df831 Author: wanggb Date: Thu Nov 21 20:42:21 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit a709807c3c5f2a916b50263ab06b4b61e32236dc Author: wanggb Date: Thu Nov 21 20:42:12 2019 +0800 判断是否需要打卡 commit 5cac2ff503e75eea8a6961ae8be9a4b203e046ef Author: zhenglh Date: Thu Nov 21 19:23:40 2019 +0800 章节过滤参数丢失 commit 515adc09f94974b8604b608ca9a24af0a7682276 Author: zhenglh Date: Thu Nov 21 19:08:58 2019 +0800 点看推广链接接口兼容 commit ed32df831f6c68c28b029aadef5d240488526d7b Author: wudongdong Date: Thu Nov 21 15:08:37 2019 +0800 cam commit 2845b532e7010ec5752fb9c91db2899541bbbde4 Author: wudongdong Date: Thu Nov 21 14:03:42 2019 +0800 cam commit 306754b0f98317c0c41d40b6b7339861f80a7ca9 Author: wudongdong Date: Thu Nov 21 14:00:10 2019 +0800 cam commit 1c1ef27a2a60431ca61f0f791d394b08fd115a27 Author: wudongdong Date: Thu Nov 21 13:27:14 2019 +0800 cam commit 8d34f7a8cab8636a328195fa2559781848301c5f Author: liyt Date: Thu Nov 21 12:12:39 2019 +0800 更新打卡人数 commit a2e38ec8bb2b39f56f3da6c28440836bfa01d24c Author: liyt Date: Thu Nov 21 11:50:42 2019 +0800 打卡计数 commit 2aeb5e00db162104ab41a06e8e99f8473c2fd5e0 Author: wanggb Date: Thu Nov 21 10:49:06 2019 +0800 消耗活动菜单加入到Tabs commit 5245145c4182f1b44b469523ab7498b0a084885c Author: wudongdong Date: Thu Nov 21 10:15:56 2019 +0800 cam commit 9bd6c27d2b00f89fd8f2f8ce0145bd806cc9c9b6 Author: wudongdong Date: Wed Nov 20 19:29:02 2019 +0800 cam commit 10af4a46317f8b0cd9faef0f138a66180ed09a2b Author: wudongdong Date: Wed Nov 20 17:29:14 2019 +0800 cam commit 898bfb3ee58382073f8777209dd56872e4a858e9 Author: wudongdong Date: Wed Nov 20 15:38:45 2019 +0800 s commit bd0d7dc3ed2df0005a11a00ae9b10efe4911a0f7 Author: wudongdong Date: Wed Nov 20 14:10:13 2019 +0800 cam commit 86b0f1308017dd12664ecb68092e6e1c24577309 Author: wudongdong Date: Wed Nov 20 13:37:03 2019 +0800 cam commit 4a98f3d1bf63bcd6afe00dd7946d25ac47ec0fe8 Author: wanggb Date: Wed Nov 20 11:26:33 2019 +0800 ~~ commit 1a0e55b8fab76cf6bf935c4f2db0f45ca06d4b8d Author: wanggb Date: Wed Nov 20 11:22:16 2019 +0800 推荐书标签 commit c9ca23b5f00989ffe0f42d9e99827f4fc80a3ae4 Author: guyuexuan <2651919937@qq.com> Date: Wed Nov 20 04:40:10 2019 +0800 修改 redis delete 命令 commit af26edd80462b1cb933bce1649d223b77c56b075 Author: wanggb Date: Tue Nov 19 22:00:38 2019 +0800 推荐书标签 commit 577d8737297d6c6c041973df067a37be08bc9a99 Merge: 3f62dc44b a6c158c40 Author: wudongdong Date: Tue Nov 19 20:51:38 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 3f62dc44bd2e0f47a8bd6f51f8e6a984a141bbe2 Author: wudongdong Date: Tue Nov 19 20:51:31 2019 +0800 cam commit a6c158c40361ad85db93e4c6b997d2e4f6df7cdc Author: wanggb Date: Tue Nov 19 20:35:08 2019 +0800 挑战赛活动，详情展示弹窗位置 && 失效状态处理 commit 7102a10c8ee5dbf7f0cbfb1113486d0530c654ae Merge: b596ee9c1 fa6a96ae3 Author: wanggb Date: Tue Nov 19 20:31:00 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit b596ee9c1495e27414490a62a319fadfeb2f1b04 Author: wanggb Date: Tue Nov 19 20:30:50 2019 +0800 挑战赛活动，详情展示弹窗位置 && 失效状态处理 commit fa6a96ae31251d6f99114f8533225cf77fe1f3d6 Author: wudongdong Date: Tue Nov 19 20:27:49 2019 +0800 del commit e37aa796bd292cb2d56c4d7b140d3c82bc7af50d Author: wudongdong Date: Tue Nov 19 20:22:48 2019 +0800 del commit 90ee1265a131e434621d4d063e55291838f5b280 Author: wudongdong Date: Tue Nov 19 20:18:13 2019 +0800 del commit b5ee9d7be94bfb28c57acaef77d702596be277ff Author: wudongdong Date: Tue Nov 19 19:44:09 2019 +0800 报名 commit a596c16c2a28092bddd2c4f2aaa1d26b94e103d0 Author: wudongdong Date: Tue Nov 19 19:41:25 2019 +0800 cam commit 24d8a6bab5114af99296a89a90ad43668f0aba74 Author: wudongdong Date: Tue Nov 19 19:36:28 2019 +0800 cam commit f39676ad457c48c6ed2c9bd1709c53dcdeb6016c Author: wudongdong Date: Tue Nov 19 18:25:22 2019 +0800 sign commit 8701f6b6223cb505fc24246bf7fd9e27396e579d Author: wudongdong Date: Tue Nov 19 18:04:30 2019 +0800 myScene commit 568c394382e301b5ebe827a664db58aff6bd0d4c Author: liyt Date: Tue Nov 19 18:01:59 2019 +0800 微信A账号授权 commit 20588c8e3a9158a5f96717424f067e1c560c98d9 Author: wudongdong Date: Tue Nov 19 17:59:52 2019 +0800 myScene commit 3a99b0782e92a1ff15caff55c5ae52f072bf6cfd Author: zhenglh Date: Tue Nov 19 17:49:05 2019 +0800 推荐书籍不能显示限免 commit b69a755f591eb80f6aeceb6f83f38a6c753bef8e Author: wudongdong Date: Tue Nov 19 17:21:49 2019 +0800 int commit cc559c1d745389cbd9164fcba95e3c28d162d1da Author: wanggb Date: Tue Nov 19 17:19:59 2019 +0800 挑战赛活动，选择商品时，关联书币个数 commit b893ec492bf8fec0153cf32fceb4d73344a74835 Author: wanggb Date: Tue Nov 19 16:52:57 2019 +0800 挑战赛活动，选择商品时，关联书币个数 commit d707e9d71921b4b9d5973d434ce83e7169b7f5ce Merge: 99a287bbf 3595f2cc2 Author: wanggb Date: Tue Nov 19 16:33:27 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit 99a287bbfd8769963aa932f5f0d598ce939dbdea Author: wanggb Date: Tue Nov 19 16:33:12 2019 +0800 挑战赛活动，选择商品时，关联书币个数 commit 3595f2cc2a52be1093a6b7062463219c197252a2 Author: wudongdong Date: Tue Nov 19 15:42:09 2019 +0800 滚动条 commit 1a0a3088ad6f008f37e9adc95314be3b3f1bb03f Author: zhenglh Date: Tue Nov 19 15:30:37 2019 +0800 未登录状态的限制,增购限免书籍传参去掉 commit 9e3652076c0e0c5b5a08f13bea9ebfabb92a2820 Author: zhenglh Date: Tue Nov 19 15:09:13 2019 +0800 频率限制每分钟只报一次 commit 8f4f71a7bfad7c99faef5645616d199531ec91a1 Author: zhenglh Date: Tue Nov 19 15:01:07 2019 +0800 限频时添加提示信息 commit 8c7dc8254c06982c57fdd679397a8edc69ccbdc7 Author: wudongdong Date: Tue Nov 19 14:12:25 2019 +0800 兼容 commit 563a3e59b8ba62541e9340a789d47f3311a7580f Merge: 9a2f62ed2 fa0a3ea53 Author: wudongdong Date: Tue Nov 19 14:02:55 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 9a2f62ed2d61d8e634bb15b73e57c88fc9378be9 Author: wudongdong Date: Tue Nov 19 14:02:49 2019 +0800 兼容 commit fa0a3ea53a115547aee65c8e05d1bbb4567f0534 Merge: 297ecb388 f3e21fa9b Author: wanggb Date: Tue Nov 19 12:02:32 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit 297ecb388ac78475f839a28ad10bc749b11f4e47 Author: wanggb Date: Tue Nov 19 12:02:20 2019 +0800 挑战赛活动，修改样式 commit f3e21fa9b11473b108d1bcd6f7a3ffa7e6767ec3 Author: wudongdong Date: Tue Nov 19 11:04:00 2019 +0800 弹幕 commit 8263b748fd10f129477bb8928fb7e9d79afa5c7e Author: wanggb Date: Tue Nov 19 10:14:30 2019 +0800 推荐角标 commit ac7c91280a7369733e45a239c6935451d5c1f5e0 Author: wanggb Date: Mon Nov 18 20:02:07 2019 +0800 获取挑战赛活动信息，维护到Redis commit df6abbbcd3e4aef241929f36bc4b2fddd11f0cbe Author: wanggb Date: Mon Nov 18 20:01:53 2019 +0800 获取挑战赛活动信息，维护到Redis commit da7b80377b2aafd03db14fcc8072afc7dc1eb72a Author: wanggb Date: Mon Nov 18 19:52:36 2019 +0800 获取挑战赛活动信息，维护到Redis commit b0dc8696189977dbf809639963e65bc9efed280f Merge: fecb26e4f c059c2e27 Author: wanggb Date: Mon Nov 18 15:17:12 2019 +0800 Merge branch 'dev-share-qrcode-20191118' commit c059c2e271a01bb7643f7d2bffc7fead3c25f9bb Author: wanggb Date: Mon Nov 18 14:57:22 2019 +0800 导粉页面二维码尺寸调整 commit 78c48c25fd9a6459e6582e702be7da1428852b8b Author: wanggb Date: Mon Nov 18 14:20:42 2019 +0800 内推，二维码不弹出 commit aac73b028d63fc25f3af5917b7ccc0887e92982d Merge: 9f9d26055 05839b6b2 Author: zhenglh Date: Mon Nov 18 13:56:26 2019 +0800 merge from master commit 9f9d26055485faad417a1ca477dfd0f6d807593a Merge: b2f7ff4e0 9bdc50261 Author: zhenglh Date: Mon Nov 18 13:55:02 2019 +0800 merge 限制后台访问频率 commit 8f1d0e184fdcb430108f7db12d5187e7f2e5c5c2 Author: wanggb Date: Mon Nov 18 13:54:11 2019 +0800 矫正二维码宽度 commit b41102b9b9d7db45f12f9c5556e3b64b48efe97a Author: wanggb Date: Mon Nov 18 13:37:43 2019 +0800 推广链接内推，引导关注二维码 commit fecb26e4f234034f1fc1fb3b060e996ce46de79f Merge: a4307dec1 2fe5e4f1d Author: 李天时 Date: Mon Nov 18 11:07:53 2019 +0800 Merge branch 'dev-db-deploy-20191116' commit a4307dec1237cfc7123be2ac77a5b21f45642dd8 Author: zhenglihao Date: Sun Nov 17 18:00:50 2019 +0800 如果是VIP未关注用户读到需要关注章节，无法弹出二维码 commit 2fe5e4f1d740667496cdec30ca8473582dbf4702 Author: 李天时 Date: Sat Nov 16 21:51:05 2019 +0800 修改分库分表主从读取逻辑 commit 1c1d2f11b9961b644fb0ae5346216590e268f990 (tag: cps_20191116_205423) Author: guyuexuan <2651919937@qq.com> Date: Sat Nov 16 20:46:07 2019 +0800 支持根据 db 配置决定是否开启读写分离 commit 40f1ddfff6490e9db116501ffdaf44ed12116807 Author: zhenglihao Date: Sat Nov 16 11:02:23 2019 +0800 导粉的最近阅读逻辑修改 commit e64dcd3a190f051909a96c0ce835df1f03b23a31 (tag: cps_20191115_203827) Author: 李天时 Date: Fri Nov 15 20:30:12 2019 +0800 添加书籍封面 commit c840f1da998feea05b102f55d46f61049228058e Author: wudongdong Date: Fri Nov 15 18:56:56 2019 +0800 书架UI优化 commit 05839b6b2c52eaa21d1ec083ede351672c279548 (tag: cps_20191115_163441) Merge: 96bb15c30 e30d4b385 Author: wanggb Date: Fri Nov 15 16:17:35 2019 +0800 Merge branch 'dev-share-qrcode-20191113' commit e30d4b3855a0bea9621289c469575ffedc34680d Author: wanggb Date: Fri Nov 15 15:45:20 2019 +0800 优化弹窗逻辑。。 commit 5cd99de6b3e5fc034bfe33b2ac47aa7e8ecd5f5e Author: wanggb Date: Fri Nov 15 15:42:41 2019 +0800 优化弹窗逻辑。。 commit f129922b48f892fb527cd9bb830a552e302e087b Author: wanggb Date: Fri Nov 15 15:39:16 2019 +0800 优化弹窗逻辑。。 commit 42dbe60880d8bfe573a988c6e9180d141cb685af Author: 李天时 Date: Fri Nov 15 14:07:32 2019 +0800 书架最近阅读样式修改 commit e0b508cfea5adbc46a336f8b46c4631d202abd53 Author: wanggb Date: Fri Nov 15 11:40:56 2019 +0800 获取所有有效活动 commit d65a1f05aa9e719e5ba3d5213b14124586351e70 Author: 李天时 Date: Fri Nov 15 11:35:26 2019 +0800 书架最近阅读样式修改 commit 96bb15c307d29d1ba91b71f92cb2755cf68dbf6a (tag: cps_20191115_111921) Author: zhenglh Date: Fri Nov 15 11:17:58 2019 +0800 书架exists方法处理 commit f17e71c30f54e8be373a660dcb61ee27d6dcea81 Author: zhenglh Date: Fri Nov 15 10:20:48 2019 +0800 首单缓存去掉 commit c284d72e495f4f65259ce967f7e4ac1ca83d5a38 Author: 李天时 Date: Thu Nov 14 20:04:11 2019 +0800 书架最近阅读样式修改 commit 6208b76d1c69fe0a7e3e03ead3b853fe32dc7b52 (tag: cps_20191114_204223) Merge: 6797f61d7 b8ba704a9 Author: wanggb Date: Thu Nov 14 19:43:37 2019 +0800 Merge branch 'dev-share-qrcode-20191113' commit b8ba704a9b195c373af0b0d88fae8593ad5b8561 Author: zhenglh Date: Thu Nov 14 19:35:09 2019 +0800 二维码降级放到外部 commit 6797f61d78114b8cc3b2a2d7fa47fbac3809a8ad (tag: cps_20191114_194046) Author: 李天时 Date: Thu Nov 14 19:11:32 2019 +0800 fixbug,解决检查书架count判断obj类型报错的问题。 commit 3de38854cfc3ef9c87d72a3b8cd23b110b74a913 Author: liyt Date: Thu Nov 14 18:29:15 2019 +0800 弹窗传参 commit 2326a0286603c93c37f237a03f69234bf2f4f277 (tag: cps_20191114_172819) Author: wanggb Date: Thu Nov 14 16:04:24 2019 +0800 全主题修改，关注引导逻辑优化 commit dbd4f7427f36993a5e491c8a81e38191d328ad42 Author: wanggb Date: Thu Nov 14 15:53:11 2019 +0800 全主题修改，关注引导逻辑优化 commit fb3089855daae099e4d768f7daf86c4b171339e0 Author: wudongdong Date: Thu Nov 14 14:23:00 2019 +0800 挑战 commit 90ad646657983c12ce44709760692c01dd8e81e5 Author: wanggb Date: Thu Nov 14 13:41:14 2019 +0800 关注引导逻辑优化 commit 21dcd69a8798f50a9c43596a73486bda4ce36ae4 Author: wanggb Date: Thu Nov 14 12:29:01 2019 +0800 关注引导逻辑优化 commit 27e0621f1f3ccf417030358041c0c995b66928aa Author: wudongdong Date: Thu Nov 14 11:57:44 2019 +0800 补卡 commit 247bbf782478fe5a530bca3443181939ac16a6f9 Author: wudongdong Date: Thu Nov 14 11:37:31 2019 +0800 自动打卡 commit 3dec80edf12e04475fc5a843e87acda650a70a84 Author: wanggb Date: Thu Nov 14 11:37:16 2019 +0800 关注引导逻辑优化 commit e5bc5da66077bb361b3766680a693dd14d01aaec Author: wanggb Date: Thu Nov 14 11:36:11 2019 +0800 关注引导逻辑优化 commit 4d9180487e33f4b9e3cd72569216a389daf23dde Author: wanggb Date: Thu Nov 14 11:33:58 2019 +0800 关注引导逻辑优化 commit 5566a64d628d7cbfaccc7cd17cda32feb89ebb71 Author: 李天时 Date: Thu Nov 14 11:28:02 2019 +0800 最近阅读逻辑修改 commit 6da83329e44db964422fde0634c1341ff5022f48 Author: wanggb Date: Thu Nov 14 11:18:50 2019 +0800 关注引导逻辑优化 commit 9bdc502619804b8093f2ea7ed18c86870a9333e4 Author: zhenglh Date: Thu Nov 14 11:06:36 2019 +0800 添加uri配置入口 commit 17f53a1223512544df9a9f371b022c0bb62ce3c5 Author: wanggb Date: Thu Nov 14 10:59:35 2019 +0800 关注引导逻辑优化 commit 4d88e38662a756a99852616a28aac223a90b372b Author: wanggb Date: Thu Nov 14 10:42:54 2019 +0800 关注引导逻辑优化 commit 9964e955dc8165b5e16af7608b121f0c489bdce9 Author: zhenglh Date: Wed Nov 13 20:01:19 2019 +0800 uri与IP访问添加频率限制 commit f2fdfb30db6c3464a84c5699b350b8544dbd6adc Author: wanggb Date: Wed Nov 13 20:29:20 2019 +0800 关注引导逻辑优化 commit af25a169847908a2c5d555ca99b91294288208cf Author: wanggb Date: Wed Nov 13 17:14:31 2019 +0800 关注引导逻辑优化 commit 3ca864ff3fa86c20a2de12d288f9e01a6ee1bc69 Merge: ff94a6131 059565c4a Author: zhenglh Date: Wed Nov 13 14:43:53 2019 +0800 Merge remote-tracking branch 'origin/dev-opt-20191108' into dev-opt-20191108 commit ff94a6131f95a7a2e4352c6043f51eac75ec4b41 Author: zhenglh Date: Wed Nov 13 14:43:43 2019 +0800 过期逻辑修改 commit d09f1866b79141e4d5b35287ac36c9e1b0527e20 Merge: 84ef33d9d 4bdcf7951 Author: wanggb Date: Wed Nov 13 11:57:33 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit 84ef33d9d258cb325f7d33f3515d83b5d6398799 Author: wanggb Date: Wed Nov 13 11:57:15 2019 +0800 读书挑战赛,优化缓存及Banner commit fdea24b6c6f9820bfd93733e50d164545b5e9fa6 Author: 李天时 Date: Wed Nov 13 10:42:07 2019 +0800 最近阅读逻辑修改 commit 2635b787de6f9c05a4126873229b2ec33283567d (tag: cps_20191114_113738, tag: cps_20191113_163334, tag: cps_20191113_161047) Author: liyt Date: Tue Nov 12 20:27:14 2019 +0800 平台活动缓存bug commit 4bdcf7951f73eacd7bbb4a0f916fa280dd6ca411 Merge: 1c7ba4579 6c8a42e8a Author: wudongdong Date: Tue Nov 12 19:41:19 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 1c7ba457949f3cd277a33eb3a7d1571afc7ff76c Author: wudongdong Date: Tue Nov 12 19:35:53 2019 +0800 barrage commit 6c8a42e8a3c69289389d4d8074ce9a70a41ca079 Merge: 492d4b91d 05a5544af Author: wanggb Date: Tue Nov 12 16:18:25 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit 492d4b91d8ebfb44231b0a3bef68df8e70d17ad5 Author: wanggb Date: Tue Nov 12 16:18:14 2019 +0800 读书挑战赛,优化缓存及Banner commit 4286d5d5805c20e27dfd19c21b85d15b2bef64b9 Author: liyt Date: Tue Nov 12 10:17:26 2019 +0800 优化梦嘉数据脚本sql commit 059565c4a55acf1461dfa6e616dce388ef420661 Author: liyt Date: Tue Nov 12 11:39:38 2019 +0800 充值信息排序 commit 71ce9326757444b735418e5338ffa905ceb7f03f Author: zhenglh Date: Tue Nov 12 11:29:07 2019 +0800 如果有时间过滤则使用时间索引 commit 05a5544af92d60faa30d36659c128d72e8ef7acc Author: wudongdong Date: Tue Nov 12 10:39:32 2019 +0800 cam commit b00b6b1760cf83a90d99ac4eee5bb3d474a1ab6e Author: zhenglh Date: Tue Nov 12 10:14:11 2019 +0800 缓存key设置到枚举文件 commit 00c0337535f73c71675442dbfd6500d304c0fbf5 Merge: 8b78078ad bfe76cd25 Author: zhenglh Date: Tue Nov 12 10:06:02 2019 +0800 Merge remote-tracking branch 'origin/dev-opt-20191108' into dev-opt-20191108 commit 8b78078ad2a6cb037a0ad8e04e309490498fd5b6 Author: zhenglh Date: Tue Nov 12 10:05:52 2019 +0800 渠道过滤为空的处理 commit bfe76cd2517ab6ed06d6a7248e745366a5cb4a41 Merge: 2c9ce884a f6029ef1b Author: liyt Date: Mon Nov 11 20:21:33 2019 +0800 Merge branch 'dev-opt-20191108' of 192.168.0.31:fe/cps into dev-opt-20191108 commit f6029ef1bbe9d0dfa39df52edf8485f64784a380 Merge: 9b7f3fc4c 155d1c5ea Author: zhenglh Date: Mon Nov 11 20:12:41 2019 +0800 Merge remote-tracking branch 'origin/dev-opt-20191108' into dev-opt-20191108 commit 9b7f3fc4c823dacf2d9c2a498f2558ffd7979772 Author: zhenglh Date: Mon Nov 11 20:12:35 2019 +0800 订单排序和索引更新 commit 96fe9543a9494cec06dae8f6f3105f3059c3e165 Author: zhenglh Date: Mon Nov 11 20:12:18 2019 +0800 订单排序和索引更新 commit dd9db123b2c32c3673141fcbaa8b810c7fd2b80e Author: wudongdong Date: Mon Nov 11 19:26:37 2019 +0800 cam commit 2c9ce884a54ae5e6ca69822b3d42f6d1ffd8b023 Author: liyt Date: Mon Nov 11 18:56:56 2019 +0800 删除弹窗缓存 commit 155d1c5eab92bfccedbb3de872eac58740a5f36b Author: liyt Date: Mon Nov 11 18:21:54 2019 +0800 删除弹窗缓存 commit ff2198a4e9f6c2be2e213a29047d874291548d46 Author: liyt Date: Mon Nov 11 17:47:31 2019 +0800 新手充值弹窗 commit c8ecdae6b2b1574d8f8f3651e9f9beb4ace4dadf (tag: cps_20191111_164135) Author: zhenglh Date: Mon Nov 11 16:31:16 2019 +0800 用户刷新状态添加默认值 commit 02684ef9c1ff07f915f552a1e2a695cf9dbf8325 Author: liyt Date: Mon Nov 11 16:10:39 2019 +0800 修改活动状态 commit 201c38509c5cf781df61d1c56ab55171682fbe10 Author: liyt Date: Mon Nov 11 15:42:31 2019 +0800 修改状态时清除缓存 commit 0b792f76f43ca59bb15182be2ad1ce3982170ffc Author: liyt Date: Mon Nov 11 14:44:10 2019 +0800 弹窗 commit 6078983c8d25f961a42c5e0b495df3db0815a072 Author: wudongdong Date: Mon Nov 11 14:30:01 2019 +0800 cam commit a9a53bc6c8c1429fe858da3eaf48ec78301de1c4 Author: wudongdong Date: Mon Nov 11 13:56:57 2019 +0800 cam commit 736d3740bddf31d65c7b58c395cb77decfbef119 Author: wudongdong Date: Mon Nov 11 13:52:04 2019 +0800 cam commit d7fe7a978fe9daf7a4a10149628ba56b94d82010 Author: wudongdong Date: Mon Nov 11 13:43:08 2019 +0800 cam commit 16cc6e07e712926621953543358c0254220e649a Merge: af1b42004 8e4699795 Author: wanggb Date: Mon Nov 11 13:40:54 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit af1b42004388153c59f3a7f42fb12571b7e8e4b5 Author: wanggb Date: Mon Nov 11 13:40:43 2019 +0800 读书挑战赛,cdnurl commit 8e46997955274a5b7dffc3b85ed3d76800654916 Author: wudongdong Date: Mon Nov 11 13:37:42 2019 +0800 cam commit 9ebe9727a7464066cd558b18152ed1b8d7ca2a7b (tag: cps_20191111_141640) Author: zhenglh Date: Mon Nov 11 13:34:28 2019 +0800 刷书币错误时打印堆栈 commit 3aa2ce2d37b62185a4e739988ecae07c8d075f9a Merge: 631349f5e 70a926cb3 Author: zhenglh Date: Mon Nov 11 13:33:55 2019 +0800 Merge remote-tracking branch 'origin/master' commit 2bac95798e941b460bb776ddc6e331b5972aab28 Author: wudongdong Date: Mon Nov 11 12:25:16 2019 +0800 cam commit 635d5167f2197dd0a536aed9e9039a451f32e560 Author: zhenglh Date: Mon Nov 11 12:16:02 2019 +0800 刷书币异常时打印堆栈信息 commit d57ab0d89817d81765c85b8fe3cfc9a0d149a883 Author: wudongdong Date: Mon Nov 11 12:15:31 2019 +0800 cam commit 0c0f07d174b54f890257ebdc4e4c30407277afa6 Author: wudongdong Date: Mon Nov 11 11:59:50 2019 +0800 cam commit 0c5c887868498a66490552bdf45ea8042391d856 Author: wudongdong Date: Mon Nov 11 11:30:25 2019 +0800 cam commit 70a926cb3cb8116346451ce0ec63c7728c88dfbe (tag: cps_20191111_112532) Merge: afc18365a 2bc4ceb5c Author: liyt Date: Mon Nov 11 11:00:03 2019 +0800 Merge branch 'dev-recharge-style-20191108' commit 2bc4ceb5c9ff1aa1e3cf249891561c10052eb9ce Author: liyt Date: Fri Nov 8 19:08:00 2019 +0800 充值弹窗 commit 07d13580476856bc36da2194ce727788c2de1486 Author: zhenglh Date: Mon Nov 11 10:50:13 2019 +0800 添加校正日志 commit 1d1be86ce99b18a5ada7106d390085e98e7dfd25 Author: zhenglh Date: Mon Nov 11 10:44:49 2019 +0800 校正看点时维护用户信息 commit c148e2d1bdd2937dcedc56f257e8b2f9ea353276 Author: liyt Date: Mon Nov 11 10:43:27 2019 +0800 sell条白名单缓存修改 commit e1211695000a953efcf13210b6fae59866def41b Author: zhenglh Date: Mon Nov 11 10:42:26 2019 +0800 校正看点时维护用户信息 commit a53a24735ac038b8da17d861553c5e5b727d6f61 Merge: de67d13b4 3396853cc Author: zhenglh Date: Mon Nov 11 10:34:15 2019 +0800 Merge branch 'dev-kandian-bug-20191109' into dev-opt-20191108 commit 3396853ccac22c1d5e7a334ebb58b99778cd3015 Author: zhenglh Date: Mon Nov 11 10:30:20 2019 +0800 章节缓存有效期改为2秒 commit e2dcbbbcba69ae6b718277c8dfaa0c115cb91ca0 Author: zhenglh Date: Mon Nov 11 10:14:18 2019 +0800 看点为0的不忽略 commit 26a874f788f3eb2982ce7ea0ee9e0657f30e813d Author: 李天时 Date: Sat Nov 9 19:36:07 2019 +0800 最近阅读逻辑修改 commit 154739cbcda24df9e65d52f6ca9e86f2d28a7177 Author: wudongdong Date: Sat Nov 9 19:20:26 2019 +0800 cam commit 2ac3c2d91ed7ab5fb1ba93c4938f14d26525a606 Author: wudongdong Date: Sat Nov 9 19:15:50 2019 +0800 cam commit baa1422da4acd59dcd1666adfc784674f6cba284 Author: wudongdong Date: Sat Nov 9 18:27:26 2019 +0800 cam commit 7a0792ae99bafa55c0545a35d45ff2865092f7c8 Author: zhenglh Date: Sat Nov 9 18:15:24 2019 +0800 章节缓存时间改为5秒 commit fcf8fac3ed0da4cfa29f63bf779dc205aecf860d Author: wudongdong Date: Sat Nov 9 17:52:15 2019 +0800 cam commit ebc0b8d0ff59fb0bbb6faa8010e8a74c7196cb37 Author: liyt Date: Sat Nov 9 17:44:11 2019 +0800 实例 commit 99f61f32dd37b0105d75df4fd88a0a8f0999cc78 Author: wudongdong Date: Sat Nov 9 16:54:24 2019 +0800 read_num commit aceafb17aae6319f2a86c1edc9bbb76e9ac6197a Author: wudongdong Date: Sat Nov 9 16:35:11 2019 +0800 read_num commit 973af1beb3b6d59b215ec9cfce57f1c8af42df74 Author: wudongdong Date: Sat Nov 9 16:32:47 2019 +0800 read_num commit 0cf0c542d70477856b3a458267af8c70ee3c146c Author: wudongdong Date: Sat Nov 9 16:10:20 2019 +0800 move commit eb09b4c2a8bdcb4ec6af9be459bf1f7332711f3a Author: wudongdong Date: Sat Nov 9 15:48:08 2019 +0800 cam commit d5f58d9a2951602f6f99cf2346006e733150fc53 Author: zhenglh Date: Sat Nov 9 15:25:20 2019 +0800 看点同步bug处理 commit de483d35bb3db5996126957eb0e46c04d488b652 Merge: 65a4a390a 14ffcbe4e Author: wudongdong Date: Sat Nov 9 15:11:01 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 65a4a390a711be09afa1b45b8b7637a813943d9b Author: wudongdong Date: Sat Nov 9 15:10:57 2019 +0800 cam commit 14ffcbe4e72aec5df532d8d695fe5b8a19febb48 Author: liyt Date: Sat Nov 9 14:38:44 2019 +0800 弹窗 commit afc18365a4f4278072c57444a8b21f36a9796238 Author: liyt Date: Sat Nov 9 13:40:36 2019 +0800 优化梦嘉数据发送任务 commit e125e5013e6509014c8e33616e12acd51b53e603 Merge: 501e86e40 88bd9ead2 Author: wudongdong Date: Fri Nov 8 18:02:46 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit c0e12868bf3e6de5fce70e0c9adda7dcfd0b4dca Author: wudongdong Date: Fri Nov 8 17:55:52 2019 +0800 不在bookinfo里面维护 互斥关系 commit de67d13b416b912e62df381f7affb452e5224b6d Author: liyt Date: Fri Nov 8 17:07:31 2019 +0800 活动添加删除缓存 commit 501e86e40d4337b0af629a63a71ce75351024434 Author: wudongdong Date: Fri Nov 8 16:50:34 2019 +0800 cam commit 88bd9ead23b3496e9f3bf905263536bfc9b1d0fa Author: liyt Date: Fri Nov 8 16:44:29 2019 +0800 消耗活动弹窗 commit bd5d032b134dfc2391db5aa1338d3ca99dee7229 Author: wanggb Date: Fri Nov 8 16:33:31 2019 +0800 读书挑战赛,弹窗位置设定常量 commit 41daee2964fa5af22544ff1cbb3161302023b051 Author: liyt Date: Fri Nov 8 15:47:01 2019 +0800 修改活动弹窗缓存结构 commit fe645684624952f04ce58bec172ec6a008c48470 Author: wanggb Date: Fri Nov 8 15:23:29 2019 +0800 读书挑战赛,优化，弹窗位置多选 commit 2af858f4b6443c16f921ddfbd38ebe1255fe549d Author: liyt Date: Fri Nov 8 15:01:49 2019 +0800 修改活动弹窗缓存结构 commit a70e3a7e1b8524c74de5b56346590db2b87903e0 Author: liyt Date: Fri Nov 8 14:13:34 2019 +0800 删除exists commit a5ed819c96131294cdc8815f1c7853033ac06454 Author: liyt Date: Fri Nov 8 12:14:48 2019 +0800 活动弹窗缓存和订单统计排序 commit 631349f5ee54442a0f1d4b69a8b0b2d3bcf1e9a8 Author: zhenglh Date: Fri Nov 8 11:58:10 2019 +0800 app扣量错误 commit 8f3a6be28e18d86ff268265b0bb854406f34a1d5 Author: wanggb Date: Fri Nov 8 11:27:15 2019 +0800 读书挑战赛,修改活动开始结束时间 commit 5e4bb6f9bc95b8aee3de19142dc6b93459418543 Author: wanggb Date: Fri Nov 8 11:00:39 2019 +0800 读书挑战赛,解决代码被覆盖 commit 35ee6bd3fc276f503313416a74caf165e89188a6 Merge: 71f573517 3e3b10379 Author: wudongdong Date: Fri Nov 8 10:46:00 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 71f573517563b2809d686de1650692bf801f4dd1 Author: wudongdong Date: Fri Nov 8 10:45:57 2019 +0800 cam commit 3e3b1037914455111919f6e1c35b887e516a8d41 Author: wanggb Date: Fri Nov 8 10:41:28 2019 +0800 读书挑战赛 commit 31a99bd37029eed8d622fec67dfef5713628e39c Author: liyt Date: Fri Nov 8 10:27:32 2019 +0800 补卡流程 commit 96fcdcb1a51d770d2d3e8af1a20e37da59db7aae Merge: 8bc81e9cd 00642979f Author: liyt Date: Fri Nov 8 10:03:59 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of 192.168.0.31:fe/cps into dev-cost-kandian-20191029 commit 8bc81e9cd227842d5edf9e0e983987ca9029efc5 Author: liyt Date: Fri Nov 8 10:03:53 2019 +0800 接口 commit c5a49f273851542b493ec93d5281a71ee51217b5 Author: liyt Date: Fri Nov 8 10:01:06 2019 +0800 sell修改 commit 1d6f4ead031889941ae68ee204f47ae840ed101b Author: 李天时 Date: Thu Nov 7 19:39:59 2019 +0800 最近阅读逻辑修改 commit 00642979fc25a7d0705008fc6814ca5d40dafbe1 Author: wanggb Date: Thu Nov 7 16:10:54 2019 +0800 读书挑战赛 commit 4b1a135c77942dfb395393bd66b7a5e6ea6807aa Author: wudongdong Date: Thu Nov 7 15:46:18 2019 +0800 cam commit c71a616db1b9bb91f0b9e7d4aa52ba30786535e6 Author: zhenglh Date: Thu Nov 7 15:39:19 2019 +0800 黑灰属性配置bug处理 commit bcfd1547a75a86db45bf60e65c29aa40130008ff Author: 李天时 Date: Thu Nov 7 15:25:32 2019 +0800 最近阅读逻辑修改 commit 08863e0455ac72633decd2b25d6bd1ccb8ec7d90 Author: wudongdong Date: Thu Nov 7 13:54:09 2019 +0800 cam commit b2f7ff4e01ad837921fd9309cc9d310153a60c1f Merge: 6b3f90281 3f90d899d Author: zhenglh Date: Thu Nov 7 10:17:18 2019 +0800 关键字回复添加推广链接选项 commit 7fd3ea3fd0c1f74e2b8f425533feb9cbba880e2c Author: wudongdong Date: Wed Nov 6 21:08:00 2019 +0800 chongzhi commit e579a9553f4a65e7f8a8cc9dca63f96112e7daf8 Merge: b4d682665 67becb21d Author: wudongdong Date: Wed Nov 6 20:06:57 2019 +0800 Merge branch 'master' into dev-cost-kandian-20191029 # Conflicts: # application/index/controller/Book.php commit 3f90d899d651d12ace94290da0e1b5a8ec3a0754 Author: zhenglh Date: Wed Nov 6 19:53:41 2019 +0800 测试通过 commit 67becb21d1e53cf51615dd94ea51cfc1fdd518aa Author: zhenglh Date: Wed Nov 6 19:53:06 2019 +0800 书币数据问题处理 commit b4d682665dbb1c3ee34b1da3e1c0a11b5ce38b70 Merge: 5708762f7 fdfa6805a Author: wudongdong Date: Wed Nov 6 18:21:04 2019 +0800 cam commit 5708762f7ebac12923e9667c320471bb4229c816 Author: wudongdong Date: Wed Nov 6 18:17:46 2019 +0800 cam commit 64c2c49b2f9d79e6587f17139426861eccc2690c Author: 李天时 Date: Wed Nov 6 18:14:57 2019 +0800 最近阅读逻辑修改 commit fdfa6805abd85b0c84b7b81759622b47f15132fd Author: wanggb Date: Wed Nov 6 18:07:34 2019 +0800 读者查询，消耗活动列表 commit 5f7a93585f863fdfe83268e4abecad70219db5ff Author: 李天时 Date: Wed Nov 6 17:23:17 2019 +0800 最近阅读逻辑修改 commit a410a9b9a77f2ecb46a17060b96a138c0c8faa09 Author: wanggb Date: Wed Nov 6 17:21:55 2019 +0800 读者查询，消耗活动列表 commit 0d3f9d0fa94ffddfbc6abfdaf1c685d903391186 Merge: 3bc7e752c 6a31bc773 Author: 李天时 Date: Wed Nov 6 16:30:50 2019 +0800 Merge remote-tracking branch 'origin/dev-230rebase-191026' into dev-230rebase-191026 commit 3bc7e752c15f55100ddb0c5d7e8673c4fa366f06 Author: 李天时 Date: Wed Nov 6 16:30:38 2019 +0800 最近阅读逻辑修改 commit 0261f1fa9cc9b420faa78e85e8bb5285a5e1e997 Author: liyt Date: Wed Nov 6 16:00:43 2019 +0800 补卡失败异常 commit 64c0dd86004737f768a6d2ffdaca2f41696f280f Author: wanggb Date: Wed Nov 6 16:00:08 2019 +0800 读书挑战赛 commit 6a31bc773cc1df79da72a06ce088aae8ae5c6b29 Author: liyt Date: Wed Nov 6 15:37:49 2019 +0800 优化sell条代码 commit cf7300f2708488d0482a7839eea8c0f8d40592dd Author: 李天时 Date: Wed Nov 6 15:01:37 2019 +0800 最近阅读逻辑修改 commit 9e6066b176b2dcc82a739b4f1d4a4f1fefeadb87 Author: liyt Date: Wed Nov 6 14:56:40 2019 +0800 补卡 commit 3ac6e9f4a21ecfd7318fe11fe27dd26687dff588 Author: zhenglh Date: Wed Nov 6 14:45:49 2019 +0800 测试完成 commit 0d880b8eab1f9702ca87584379f0712b217ad65c Author: zhenglh Date: Mon Nov 4 14:46:21 2019 +0800 关键字回复添加推广链接支持 commit 04f3bdb450292fe0d02a0219d116c858316302ce Author: liyt Date: Fri Oct 25 11:44:11 2019 +0800 被关注延时消息 commit 2e989f61df6b9afa69a96cf8221ad34287e05a9a Author: liyt Date: Tue Oct 22 19:01:10 2019 +0800 渠道商菜单、被关注延时消息 commit 5f50410355e023ac97dbe3a45b476abf4a744057 Author: zhenglh Date: Wed Oct 23 18:07:02 2019 +0800 延时客服消息页面开发 commit 9ad23f7a68b29c0ee7c397bde880c7d29387de7b Author: liyt Date: Tue Oct 22 13:47:25 2019 +0800 延时推送 commit 64652d3415ff9ce3a9ce59cb17a41a928b7971f3 Author: liyt Date: Wed Nov 6 14:30:53 2019 +0800 消耗活动常量 commit 9f28c478f18d1ec1ba2e4f86b2ae8775831c1559 Author: liyt Date: Wed Nov 6 14:05:38 2019 +0800 缓存更新入redis commit 6439f6a2e3599828cf35501a5cbc705546c31a44 Author: liyt Date: Wed Nov 6 13:55:29 2019 +0800 阅读章节计数 commit d8443795c721e86a3485f38ab506f169cf4f3040 Merge: c2fbb2501 82ce90df6 Author: liyt Date: Wed Nov 6 13:49:45 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of 192.168.0.31:fe/cps into dev-cost-kandian-20191029 commit 82ce90df676474c07fec91441d593c7fa34919b4 Author: wudongdong Date: Wed Nov 6 13:45:30 2019 +0800 campaign commit c2fbb2501328c63e623e6caaea0610f61317acd2 Merge: d85ea8c24 798fa9586 Author: liyt Date: Wed Nov 6 11:36:27 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of 192.168.0.31:fe/cps into dev-cost-kandian-20191029 commit 798fa958683f158c16dcf2f512fb885c44941d9a Author: wudongdong Date: Wed Nov 6 11:35:50 2019 +0800 campaign commit 810aefabe9809f68fe46b4b2590bd33f936b16a9 Author: zhenglh Date: Wed Nov 6 11:30:04 2019 +0800 推广链接点看添加查询接口 commit d85ea8c2435104eb5e33dd321e40bba09104bc18 Merge: 98d54a469 385e925a7 Author: liyt Date: Wed Nov 6 11:29:17 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of 192.168.0.31:fe/cps into dev-cost-kandian-20191029 commit 385e925a733a7b87fa5c374d6fe92ae2309e7850 Merge: da1e29762 a50351a4f Author: wudongdong Date: Tue Nov 5 15:33:10 2019 +0800 active commit 7c0c40d19fe820424ecbe7e76b6de8e508b138ef (tag: cps_20191105_153457) Merge: b552087e9 d32a5e4a4 Author: zhenglh Date: Tue Nov 5 15:32:54 2019 +0800 Merge remote-tracking branch 'origin/master' commit b552087e9f106920af966635af1241db7e3dd54c Author: zhenglh Date: Tue Nov 5 15:32:42 2019 +0800 用户看点数更新逻辑修改 commit da1e29762391a5dcd331b31e49aeb39b80e9b03f Author: wudongdong Date: Tue Nov 5 15:30:35 2019 +0800 active commit d32a5e4a4fc604b983e908b38211cfecada4ee33 Author: liyt Date: Tue Nov 5 14:41:47 2019 +0800 活动短链转换链接 commit 98d54a4693b331e3f44e953add54bacb9262e9cb Author: liyt Date: Tue Nov 5 14:06:44 2019 +0800 阅读 commit e52796075677297c3258f20d6ca24ab9465790d8 Author: zhenglh Date: Tue Nov 5 14:02:20 2019 +0800 被关注回复有一定机率无法配置链接 commit 12584949abc9d118f62bedb83e02a2fd477eea90 Merge: 0e509137e a50351a4f Author: liyt Date: Tue Nov 5 13:44:58 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of 192.168.0.31:fe/cps into dev-cost-kandian-20191029 commit 8055787810fb85d90d6eb1143253f985a86c9804 Author: liyt Date: Tue Nov 5 11:46:15 2019 +0800 加缓存 commit a50351a4fd4c25d5f0265d513c7d994c81a5484e Author: wanggb Date: Tue Nov 5 11:18:15 2019 +0800 读书挑战赛,统计 commit 0571eaaa3778a0ec316991a1dd9555344247a7ac Author: liyt Date: Tue Nov 5 10:24:00 2019 +0800 梦嘉接口数据分组 commit 0e509137efb6c7d2ddbd74fe6b135ac523b97292 Author: liyt Date: Tue Nov 5 10:07:43 2019 +0800 阅读章节数计数 commit cc0bfe49d6f76a9b577ad8eff82b132611d3c42c Merge: d40e20648 ebcedaeaa Author: wanggb Date: Mon Nov 4 20:10:17 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 commit d40e2064834e18b65d8c9f65364010b3a10acc98 Author: wanggb Date: Mon Nov 4 20:10:11 2019 +0800 读书挑战赛,统计 commit ebcedaeaaa572b587d9cf386fc2022b3d11c2cf9 Author: liyt Date: Mon Nov 4 18:49:53 2019 +0800 补签 commit a408ea3281049d22abe80ded898df589fe81a12d Author: liyt Date: Mon Nov 4 18:18:25 2019 +0800 补卡 commit 58fdfc4ee3b2036c8f0e07b4a804c0df3f05f765 Merge: 5f60e0abc d31789e66 Author: liyt Date: Mon Nov 4 18:10:30 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of 192.168.0.31:fe/cps into dev-cost-kandian-20191029 commit 8dc0b34df6e576debcdb06f839ad91230b4a93a4 Author: liyt Date: Mon Nov 4 17:52:37 2019 +0800 修改梦嘉数据脚本 commit d31789e66b807b3e7bd36e856c960f10bdf7f1f0 Author: wanggb Date: Mon Nov 4 17:46:07 2019 +0800 读书挑战赛,统计 commit 5f60e0abc688c3a701a3b901f61661625c81d231 Author: liyt Date: Mon Nov 4 17:11:19 2019 +0800 补签 commit f9fb7a338f3f0bcdc66452d490b9101e65da85c5 Author: liyt Date: Mon Nov 4 16:02:16 2019 +0800 “我的场次 commit 6c100df380c20956a6d3d97fb1a817f4895294ad Author: liyt Date: Mon Nov 4 15:14:13 2019 +0800 客服消息入库bug修复 commit 7219c330a78cbba0555a9def718b5d6d993c332f Author: liyt Date: Mon Nov 4 12:12:30 2019 +0800 打卡 commit 0e1377b7f990da5bf5658499fdeb295fe6e4f862 Author: zhenglihao Date: Sat Nov 2 12:39:24 2019 +0800 修复openid创建用户未创建无法创建用户信息的bug commit e3433575600a81138aa4bf951669b71f5adb78cf (tag: cps_20191101_171656) Author: liyt Date: Fri Nov 1 17:13:21 2019 +0800 客服消息统计入库 commit 4f1aa1ca26d72848d5ab68ded1375dcc8d540cd1 (tag: cps_20191101_165707) Author: liyt Date: Fri Nov 1 16:55:39 2019 +0800 统计数据入库 commit c4e13204f2ea5a173b792705e04a31353f271f31 (tag: cps_20191101_160622) Merge: 9378179e0 69f760a82 Author: zhenglh Date: Fri Nov 1 15:59:27 2019 +0800 Merge remote-tracking branch 'origin/master' commit 9378179e0ef6045afbbef2c60fb30d6d0cac3542 Author: zhenglh Date: Fri Nov 1 15:59:13 2019 +0800 用户消费同步处理 commit 69f760a820b3f99b3b8cb44b71047076c90b058a Merge: b78707a48 758a7b57b Author: liyt Date: Fri Nov 1 15:47:01 2019 +0800 Merge branch 'dev-custom-command-20191031' # Conflicts: # application/command.php commit 758a7b57b11a07d10043e8457a972e2a72412db3 Author: liyt Date: Thu Oct 31 21:05:03 2019 +0800 客服消息任务 commit 9517d5a6e4b147158024443be1a566bd58d42fb9 Author: wanggb Date: Fri Nov 1 14:56:06 2019 +0800 读书挑战赛 commit 1a5363850e8704644768759384e73b3622af1caf Author: wanggb Date: Fri Nov 1 11:49:49 2019 +0800 读书挑战赛，删除 维护缓存 commit bdf62237f8ac8d6312fc252b8815e94632f5bde3 Author: wanggb Date: Fri Nov 1 11:30:37 2019 +0800 读书挑战赛，删除 维护缓存 commit bc9c0e59ae6c643e435cd2533f3d387d64277c3e Merge: 4fb2b80a6 c85358c04 Author: wudongdong Date: Fri Nov 1 11:15:51 2019 +0800 cam commit 4fb2b80a686412beba2121914c18215bde7686a7 Author: wudongdong Date: Fri Nov 1 11:13:46 2019 +0800 cam commit c85358c04de2c84ecb1304724d20626473a1fd62 Merge: b5fc82461 9d5b05a4e Author: wanggb Date: Fri Nov 1 11:10:37 2019 +0800 Merge remote-tracking branch 'origin/dev-cost-kandian-20191029' into dev-cost-kandian-20191029 # Conflicts: # application/common/service/CampaignService.php commit b5fc824616926272ecf74bebb65314a806d9775f Author: wanggb Date: Fri Nov 1 11:06:59 2019 +0800 读书挑战赛，修改|删除|详情 commit b78707a48188d223e71bfa661b070a5d972e0b99 (tag: cps_20191101_034254) Author: 李天时 Date: Thu Oct 31 19:21:25 2019 +0800 生成url测试文件 commit 222a01bba26b4d2152b1df28cc9f6e1116fb426f Merge: f34e5952c 9d5b05a4e Author: wudongdong Date: Thu Oct 31 19:04:06 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit f34e5952c34f25a8d977ac79546ba1227e027f7f Author: wudongdong Date: Thu Oct 31 19:04:02 2019 +0800 cam commit 9d5b05a4ec79525cc785b4a074333f924664320c Author: liyt Date: Thu Oct 31 19:02:13 2019 +0800 消耗活动 commit 4d2f7b23fffb6790c624abccfb836e0184b30312 Author: 李天时 Date: Thu Oct 31 18:34:04 2019 +0800 最近阅读逻辑修改 commit 1bf2dd27588e4e4894e70f0d8e4eac19b17c7769 Merge: 1808d7580 a8b5b9f9e Author: 李天时 Date: Thu Oct 31 18:19:06 2019 +0800 Merge remote-tracking branch 'origin/dev-230rebase-191026' into dev-230rebase-191026 commit 1808d75800cc25ddf56fc04c58ab560dceb774f0 Author: 李天时 Date: Thu Oct 31 18:18:56 2019 +0800 最近阅读逻辑修改 commit d14578ec996fffaf9cfee706d615986d988099df Author: liyt Date: Thu Oct 31 16:57:47 2019 +0800 redis连接数改为3000 commit 1c66b662c644f47924f69d5609b05d6fa5e8d273 Author: liyt Date: Thu Oct 31 16:37:40 2019 +0800 AD回源添加注册时间今日的条件 commit 9be6c863d6fbc94aaf809f81c8cee7a6a305ed4b Author: liyt Date: Thu Oct 31 16:33:54 2019 +0800 我的场次 commit a8b5b9f9e41f6a39dd80833461ae1ccb55803183 Author: 丁海波 Date: Thu Oct 31 15:51:48 2019 +0800 r_book_num commit 5099f58fb3a68b3185fac12b4ed947b84220d9b2 Author: zhenglh Date: Thu Oct 31 15:42:29 2019 +0800 下单回调时用户缓存清除，消费时缓存不强制同步数据库 commit 6b3f9028184348a5cc1a28058e6a8dc38def575d Author: liyt Date: Thu Oct 31 15:20:03 2019 +0800 缓存 commit 1eda6c4d812aa926d9202f24b61873a20a18723f Author: liyt Date: Thu Oct 31 15:18:54 2019 +0800 我的 commit 20b8eadc679ca68d7f5e77d8cffce7d70880d380 Author: wudongdong Date: Thu Oct 31 15:07:23 2019 +0800 ss commit cd06df316a5827a243f5e515d58fb5efbfebe6c8 Author: liyt Date: Thu Oct 31 14:54:10 2019 +0800 我的场次 commit a7ecb960256eedfc58eadb1552c729f3e42bf4d3 Author: 丁海波 Date: Thu Oct 31 14:52:13 2019 +0800 我的书架 历史记录 commit 88dbcef8cf9cf4791dd2eadf7508d3cc59dd5b90 Author: wudongdong Date: Thu Oct 31 14:21:34 2019 +0800 页面 commit 823e5147e8178165cf5119becf29a76f038f448d Author: zhenglh Date: Thu Oct 31 11:35:13 2019 +0800 用户消费时强制使用数据表数据 commit 76c67a9720871be53dd0c6757d8428fe491f9c21 Merge: 71636e2fd 45df073f8 Author: 李天时 Date: Wed Oct 30 20:38:02 2019 +0800 Merge remote-tracking branch 'origin/dev-230rebase-191026' into dev-230rebase-191026 commit 9c35243129d540b38e0b521bcfc5e9be12a1e675 Author: liyt Date: Wed Oct 30 20:19:43 2019 +0800 缓存 commit 45df073f86d82161eb8578d2057cdfedaea17a3f Author: liyt Date: Wed Oct 30 20:14:48 2019 +0800 sell缓存 commit 8c8f804e15612377154ddf90401768734a566439 Author: liyt Date: Wed Oct 30 19:51:36 2019 +0800 sell优化 commit 9eab9d7c5e1b1ac211829aaab74fd23a10bba141 Author: liyt Date: Wed Oct 30 19:18:29 2019 +0800 sell条 commit 76f7bec822900551c5c374fba70fa744eb2edc6b Author: liyt Date: Wed Oct 30 18:31:54 2019 +0800 自定义活动和赠币活动时间自己定义 commit 39f3827c1468ab6ef69475108614502e0747f583 Author: zhenglh Date: Wed Oct 30 18:10:02 2019 +0800 增购全本书籍每个类型书籍不同 commit c1a70e9ef2fa57c4cc2e3d0ec08b171962cd674f Author: wanggb Date: Wed Oct 30 17:42:24 2019 +0800 连续签到文案信息 commit ce7d381ff31ad5c3bc467db221948c5a1e15fc71 Merge: eda1aff4e 2ab12411f Author: wanggb Date: Wed Oct 30 17:11:00 2019 +0800 Merge remote-tracking branch 'origin/dev-fix-redis-delscan-20191030' into dev-fix-redis-delscan-20191030 commit eda1aff4e34cb91e25a1b0149d499544a61ba901 Author: wanggb Date: Wed Oct 30 17:10:48 2019 +0800 连续签到获取最后一条信息 commit 2ab12411f9604395aa60d5745f0cc0401f65e3c4 Merge: 84b65f5e5 5ffb09731 Author: 李天时 Date: Wed Oct 30 14:39:11 2019 +0800 Merge remote-tracking branch 'origin/dev-fix-redis-delscan-20191030' into dev-fix-redis-delscan-20191030 commit 84b65f5e5933e7ebfbfcbf377b465e60589b8a16 Author: 李天时 Date: Wed Oct 30 14:39:05 2019 +0800 fixbug,书籍缓存配置在默认redis服务器，批量删除缓存没有生效 commit 5ffb09731b876b3bcfb8265cb8131d2cf9c1d9a0 Merge: 05345c750 a82420db5 Author: wanggb Date: Wed Oct 30 14:33:34 2019 +0800 Merge branch 'dev-fix-sign-20191030' into dev-fix-redis-delscan-20191030 commit 05345c75057376869ea534bf720ced729af6e076 Author: 李天时 Date: Wed Oct 30 14:30:22 2019 +0800 fixbug,书籍缓存配置在默认redis服务器，批量删除缓存没有生效 commit 40f2dd1a3582a24b9c934b4c04bfa268b6a2e98e Author: 李天时 Date: Wed Oct 30 14:27:47 2019 +0800 fixbug,书籍缓存配置在默认redis服务器，批量删除缓存没有生效 commit a82420db548dc8444e99679024561d878097d756 Author: guyuexuan <2651919937@qq.com> Date: Wed Oct 30 14:23:41 2019 +0800 修复连续签到记录字段 commit 887f6431e2e7be90a528520841406dfa0701094d Author: zhenglh Date: Wed Oct 30 14:14:25 2019 +0800 增购全本书籍每个类型书籍不同 commit dc9924bee016823cccde97ef6ab8147f11fbac46 Merge: 26dfddc10 42c50e043 Author: wudongdong Date: Wed Oct 30 13:37:59 2019 +0800 Merge branch 'dev-cost-kandian-20191029' of http://192.168.0.31/fe/cps into dev-cost-kandian-20191029 commit 26dfddc10e4bdedb9021475a802e7791eaeb3849 Author: wudongdong Date: Wed Oct 30 13:37:51 2019 +0800 消耗活动 commit 71636e2fd0a2d82a0184598be914139962d00cf3 Merge: 7d8ec3aaf bd85fb478 Author: 李天时 Date: Wed Oct 30 13:34:30 2019 +0800 Merge remote-tracking branch 'origin/dev-230rebase-191026' into dev-230rebase-191026 commit 7d8ec3aaf93e9ea1c6394a3a337018472e96b30e Author: 李天时 Date: Wed Oct 30 12:06:02 2019 +0800 最近阅读逻辑修改 commit fa1ff095d2a52b06b7e86ddfdf4522b471d8b246 Author: liyt Date: Wed Oct 30 12:04:49 2019 +0800 修改梦嘉数据订单查询sql commit 2b0e4442840cc5a09e9be7d77a0d3d68affddd44 Author: liyt Date: Wed Oct 30 12:00:10 2019 +0800 调整梦嘉数据脚本 commit e4951ce035ba717b2b910863cf86c1e4cad897aa Author: liyt Date: Wed Oct 30 11:44:48 2019 +0800 调整梦嘉推送代码 commit 42c50e04306ad0275732965c01290e4158de96e5 Author: wanggb Date: Wed Oct 30 11:32:44 2019 +0800 消费活动，初始创建 commit c3efe6e3d0c257860976ab0da4bc059186820eed Author: guyuexuan <2651919937@qq.com> Date: Wed Oct 30 11:11:11 2019 +0800 修改 delScan 方法 commit bd85fb47800ff7e971421ab3f7948ab5cf189323 Author: liyt Date: Tue Oct 29 20:01:53 2019 +0800 前台功能关联 commit 8a84d7d249a7abc7aa2f685c915c078ff90c6586 Author: liyt Date: Tue Oct 29 19:07:47 2019 +0800 sell条加cookie commit 1d2407e824729c8fe0e8c2ce1c0884daac305964 Author: liyt Date: Tue Oct 29 19:04:43 2019 +0800 sell条加cookie commit 402a3f2e0531138cd6cd27ae5c3ca5369b204d50 Author: liyt Date: Tue Oct 29 18:53:46 2019 +0800 sell commit 979becd08bd8e73a2fd1cbb85973d65baa3e15a5 Author: wudongdong Date: Tue Oct 29 17:20:32 2019 +0800 create commit bc7a87be9d219d669059dbb874a62ac2c3164b61 Author: liyt Date: Tue Oct 29 15:11:35 2019 +0800 sell commit d9912b2894bbb22f31130770e618209a9dd5682a (tag: cps_20191030_110006) Author: guyuexuan <2651919937@qq.com> Date: Tue Oct 29 15:04:02 2019 +0800 postdata 脚本增加结束时间 commit 6c954efd53fa46090964706df7b81903ff7570ca Author: liyt Date: Tue Oct 29 13:55:11 2019 +0800 sell条 commit ec52dd1a98cb301f76f2545bb8c28a444b5a8336 Merge: f80e85a74 6ecd8692e Author: liyt Date: Tue Oct 29 13:55:00 2019 +0800 Merge branch 'dev-230rebase-191026' of 192.168.0.31:fe/cps into dev-230rebase-191026 commit 6ecd8692efde801b7c291c2407b2ff0d4d7ac9f0 Author: wudongdong Date: Tue Oct 29 13:38:34 2019 +0800 230 commit 35df7a194b844142bb2918d6eb4fd58a4ae5346f Merge: 9a21bf285 1dc34106f Author: zhenglh Date: Tue Oct 29 13:33:08 2019 +0800 Merge remote-tracking branch 'origin/dev-subscribe-sell-20191026' into dev-subscribe-sell-20191026 commit 9a21bf285c9e7c8aa93f4ce791327281039b5db5 Author: zhenglh Date: Tue Oct 29 13:32:57 2019 +0800 后台删除多余代码 commit 26e6925058d12e5529fcacb12506dab64e4b0f69 Author: wudongdong Date: Tue Oct 29 13:13:26 2019 +0800 230 commit f80e85a74d0bc0a76b653de3cb356737adadbbba Merge: 02bfd62b1 c231baf56 Author: liyt Date: Tue Oct 29 12:00:26 2019 +0800 Merge branch 'dev-230rebase-191026' of 192.168.0.31:fe/cps into dev-230rebase-191026 commit 02bfd62b1c63224ba3aa6350b3744adcf6793faa Author: liyt Date: Tue Oct 29 12:00:22 2019 +0800 sell commit c231baf56e8867489033367ce18663c4b05f31de Merge: 73012a800 b85a5226a Author: wudongdong Date: Tue Oct 29 11:57:53 2019 +0800 Merge branch 'dev-230rebase-191026' of http://192.168.0.31/fe/cps into dev-230rebase-191026 commit 73012a800275b7310c912e3ce417771c4e7b97eb Author: wudongdong Date: Tue Oct 29 11:57:49 2019 +0800 230 commit b85a5226a821b22ecd9f84eb8d801fee590adbbe Author: 丁海波 Date: Tue Oct 29 11:57:07 2019 +0800 阅读页弹窗 commit 816c9597121914fe3e2385f723fda85e26727795 Author: wudongdong Date: Tue Oct 29 11:55:03 2019 +0800 230 commit 3b3dbc76641134e499439efc1665ff83a36d1a89 Author: wudongdong Date: Tue Oct 29 11:51:12 2019 +0800 230 commit 9d14decbae0a3b5f62114b2e7a87c69469933b65 Merge: ebdb42053 cccb5994d Author: wudongdong Date: Tue Oct 29 11:17:49 2019 +0800 230bug commit ebdb420538a2ed1d4f522c2ba3c92bbb7d42a3ba Author: wudongdong Date: Tue Oct 29 11:07:45 2019 +0800 230bug需求 commit 6d6f3f9a69de95d5aefe26174a89b0cae295e842 (tag: cps_20191029_114409) Merge: e5b702b32 9272fead1 Author: liyt Date: Tue Oct 29 10:42:11 2019 +0800 Merge branch 'dev-wechat-ad-20191026' commit 9272fead103a347b7b8d1a52e0e403471172087e Author: liyt Date: Sat Oct 26 10:57:59 2019 +0800 微信AD回源 commit 4d1141898a85ae8e69ec1b2eca8f682ece80e913 Author: liyt Date: Tue Oct 29 10:15:41 2019 +0800 sell条 commit 1dc34106f7c4797f942e0cd8bc58b35e282abaaa Author: liyt Date: Mon Oct 28 17:32:34 2019 +0800 vip创建客服消息去掉仅发送选择 commit 86a769a715ce4b7aea7e23d351a7d7a47506a40b Author: liyt Date: Mon Oct 28 17:27:28 2019 +0800 sell条 commit b2e51f245323e1dd1d3305829bc772b112c919c1 Author: zhenglh Date: Mon Oct 28 16:51:12 2019 +0800 限制创建的客服消息条数为20 commit e5b702b323db6e33f7597ad959e6112bcf7d554d (tag: cps_20191028_163332, tag: cps_20191028_162259) Author: zhenglh Date: Mon Oct 28 15:56:45 2019 +0800 添加规则操作管理 commit 5df4572b0a5b4e593a623b23e6200b1ba551d43b Author: zhenglh Date: Mon Oct 28 15:02:28 2019 +0800 样式修改 commit 92ecead6cb827d0df699d1eb639efd4e4fbc7dc3 Author: zhenglh Date: Mon Oct 28 14:30:33 2019 +0800 样式修改 commit 66c982d104aeeb725d190d261d397b9babb49b3a Author: zhenglh Date: Mon Oct 28 14:09:31 2019 +0800 样式修改 commit a3320481b6815b407a2f1bb27dcadc1f01e4d585 Author: zhenglh Date: Mon Oct 28 13:47:36 2019 +0800 延迟客服消息样式调整 commit 9c9ed31dbb6040f843973a3d38f1c6e01cf529c8 Author: wudongdong Date: Mon Oct 28 12:13:31 2019 +0800 vip账号下渠道商推广搜索优化 commit 72f10f3ad95a3282c6e3bb0becee06f97813153d Author: zhenglh Date: Mon Oct 28 12:00:59 2019 +0800 延时客服消息样式修改 commit ff13640f917e9df44c12145d9b36139dc148ac15 Author: zhenglh Date: Mon Oct 28 11:55:59 2019 +0800 样式修改 commit cccb5994dc13fc6710bb43e3b61bff904dd04f8b Author: liyt Date: Mon Oct 28 11:41:56 2019 +0800 添加系统活动标签 commit 5bc12ac4e8db0d3c9e148dbf40d34c3199e8aa50 Author: zhenglh Date: Mon Oct 28 11:09:11 2019 +0800 样式与书籍修改 commit 68adfc308b53bd36dfd7fcf79ca1d9ae09a37e85 (tag: cps_20191028_113150, tag: cps_20191028_104820) Author: zhenglh Date: Tue Oct 22 19:04:26 2019 +0800 新版扣量添加扣量比例限制 直充为非活动充值 非阅读充值 添加规则时的注释添加 回调添加永久书币的逻辑修改 commit c5112ae9cc70584598b9e33b45db9a358290b490 Author: zhenglh Date: Mon Oct 28 10:03:04 2019 +0800 切换选项卡时加购选项默认启用 commit 9aaf1de4a7e3b71778cc251e8e54d9917638b2fa Author: zhenglh Date: Sat Oct 26 19:15:21 2019 +0800 永久看点更新到用户表 commit 3d70bcb0332e08b9b684c96bdfcf0828bc73b7cc Merge: c68101637 5793f6c89 Author: liyt Date: Sat Oct 26 15:39:17 2019 +0800 Merge branch 'dev-buy-more-20191011' into dev-subscribe-sell-20191026 commit 5793f6c8933417ed596dc77d3e45ea8345d6e0e1 Author: 丁海波 Date: Thu Oct 17 11:03:13 2019 +0800 加购 commit c68101637a480d5daa5db00fbbca94d213f16507 Merge: 8fe67134d 785f6318b Author: liyt Date: Sat Oct 26 15:27:14 2019 +0800 Merge branch 'dev-subscribe-delay-20191021' into dev-subscribe-sell-20191026 # Conflicts: # public/assets/dist/component.bundle.js # public/assets/dist/component.bundle.js.map # tests/RedisTest.php commit 785f6318bad8a5f27232e149530ed6fa438ba41f Author: liyt Date: Tue Oct 22 13:47:25 2019 +0800 渠道商菜单、被关注延时消息 commit 8fe67134d4e836f31a1a8a9c1dff550655f1c5df Author: guyuexuan <2651919937@qq.com> Date: Sat Oct 26 00:55:11 2019 +0800 修改命令 commit 510b531ccff4892f994a1131d5f96ab110f169b0 (tag: cps_20191026_004039) Author: guyuexuan <2651919937@qq.com> Date: Sat Oct 26 00:37:19 2019 +0800 校验 change book redis commit c54d7f9b816e5b25ab3d1649de7a746aedd588fe (tag: cps_20191026_003816) Author: liyt Date: Fri Oct 25 21:14:28 2019 +0800 修复今日的推广链接UV等数据 commit c304941e7b875bc583675f18c7dc1b07b3968b38 Author: liyt Date: Fri Oct 25 17:45:29 2019 +0800 fixed活动短链缓存错误 commit cc52edfd29443deefd472359f9781c2ea79b60ec (tag: cps_20191025_164753) Author: liyt Date: Fri Oct 25 16:24:40 2019 +0800 订单明细同步显示派单渠道 commit fb12e0fff7c2a8aa3535fc1c447a73a58fbdb3c3 Merge: e0076d880 e18f48728 Author: 李天时 Date: Fri Oct 25 14:23:45 2019 +0800 Merge remote-tracking branch 'origin/master' commit e0076d880c36ef53c42ad51a1c183f318bbd7378 Author: 李天时 Date: Fri Oct 25 14:23:39 2019 +0800 备份开发环境env文件 commit e18f48728de4190db287d23dc4d9a86ff41bb08b (tag: cps_20191025_142043) Author: liyt Date: Fri Oct 25 14:06:22 2019 +0800 渠道梦嘉数据的测试地址 commit 25a2871bfd336cd549b2ed4a21f6666c3c63ff0c (tag: cps_20191025_130414) Author: 李天时 Date: Fri Oct 25 13:01:18 2019 +0800 fixbug，批量获取书籍信息redis分片错误的问题 commit 07f2e82fa0ce4a85f5e039985f02c863873e1da6 (tag: cps_20191024_202149) Author: 李天时 Date: Thu Oct 24 19:48:09 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit e6680ef64a5c2d56cdb1e0edfe1dad8e93360bb2 Merge: db1ccf54c 7ee1de11c Author: 李天时 Date: Thu Oct 24 19:36:09 2019 +0800 Merge branch 'master' into dev-merge-period-1-20191022 # Conflicts: # application/common/service/GussNovelService.php commit db1ccf54c4c6fe2321f892b4687165fab4385b7b Author: 李天时 Date: Thu Oct 24 18:08:45 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit 29c79038a0b02eb2c1b29a422965c91fb4b7d2c0 Author: 李天时 Date: Thu Oct 24 17:48:26 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit 043f497aed58ebeca4cb812308ddeacf863b1c0c Author: wudongdong Date: Thu Oct 24 17:19:27 2019 +0800 return commit b9ee4afd7f039c968cbf54e8b3a49d51a0a1c16c Author: wudongdong Date: Thu Oct 24 17:01:53 2019 +0800 return commit 95b797e06b5ae89e46942df913487df7743fbd58 Author: wudongdong Date: Thu Oct 24 16:51:56 2019 +0800 return commit b02279106478a41b3d1898a497606be36bcad410 Author: wudongdong Date: Thu Oct 24 16:41:50 2019 +0800 return commit 7ee1de11c228e972ab60cc8fcc6dfefb6e2a26dc Author: 李天时 Date: Thu Oct 24 16:10:01 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit d93be7cf7059a61235b0b76c0f1bb04c5ff9dc2c Merge: afa23a116 992c9016f Author: 李天时 Date: Thu Oct 24 14:51:51 2019 +0800 Merge branch 'master' into dev-merge-period-1-20191022 # Conflicts: # application/common/service/GussNovelService.php commit 992c9016f408d7b2864bdbf079252fab3ca99af6 Author: 李天时 Date: Thu Oct 24 14:16:56 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit afa23a11679575d2ec33d2e24aff7b6594a401c2 Author: wudongdong Date: Thu Oct 24 14:07:14 2019 +0800 return commit 023e3045fb16f974047bf1ab4b33c4a462a6bf39 Author: 李天时 Date: Thu Oct 24 14:03:13 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit 2697f32def024efd557110a86713a96581c07d2b Author: wudongdong Date: Thu Oct 24 11:51:08 2019 +0800 relation commit 967a8d132eb0c4bf4b32312afcb77f3612a892a4 (tag: cps_20191024_115654) Author: 李天时 Date: Thu Oct 24 11:48:31 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit 5b6d8db9158cdd1135775a3902418bd9d9054c16 Author: 李天时 Date: Thu Oct 24 11:31:35 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit 75f1ae3a0b92969cbff4ca5ad3c12c3a10001c22 Author: wudongdong Date: Thu Oct 24 11:08:59 2019 +0800 relation commit b0686966c4a4a6c5f8f72f35cfcd1bbee202d287 Merge: a2442cef6 9b3d5d0c9 Author: wudongdong Date: Thu Oct 24 11:07:40 2019 +0800 Merge branch 'dev-merge-period-1-20191022' of http://192.168.0.31/fe/cps into dev-merge-period-1-20191022 commit a2442cef63f75553629eb1f6639f4f1cc0d538fb Author: wudongdong Date: Thu Oct 24 11:07:34 2019 +0800 relation commit 9b3d5d0c93b89e4eee346717b8beb767d9cece62 Merge: 453107a83 fb67c6ccd Author: 李天时 Date: Thu Oct 24 11:03:24 2019 +0800 Merge branch 'master' into dev-merge-period-1-20191022 # Conflicts: # application/common/service/GussNovelService.php commit fb67c6ccd4dcd182d73da1097bf2751d3b95808c Author: 李天时 Date: Thu Oct 24 10:26:37 2019 +0800 fixbug，"猜你喜欢"获取书籍的方法加一层文件缓存 commit 453107a831fba7b236dda69c4c72b824ff4ae035 Author: wudongdong Date: Wed Oct 23 21:40:54 2019 +0800 relation commit 0ea7d42f5337a5653c6ccd5b668d6fd779f8fe26 Author: wudongdong Date: Wed Oct 23 21:08:23 2019 +0800 relation commit b9eca78157dec061e087fa1eeed87b65b37d10f6 Author: wudongdong Date: Wed Oct 23 20:22:48 2019 +0800 relation commit 146c8806c94c04f9f8d5aa6f2bd6afaa112a0088 Author: wudongdong Date: Wed Oct 23 20:18:23 2019 +0800 relation commit c3e3f88755eacd5458c40817e11f0de21bda3ee2 Author: wudongdong Date: Wed Oct 23 19:54:12 2019 +0800 relation commit 9554a0983a08dc850d2f4faced2b5b89eb2bd9f9 Author: wudongdong Date: Wed Oct 23 19:38:17 2019 +0800 s commit 78455a3f09d2aa83df1154bc3020c3ec930ba509 Author: liyt Date: Wed Oct 23 19:44:07 2019 +0800 排行榜 commit 6b67552bacdf88475e909ffaa37d42d7651086a2 Author: liyt Date: Wed Oct 23 19:24:27 2019 +0800 推送格式转换 commit 129bb536dc37dd1aa68c53fc183e6e9f292d1e18 Author: 李天时 Date: Wed Oct 23 17:34:12 2019 +0800 fixbug，解决后台文末推荐书库隐藏报错的问题。 commit 661889ca5fd522b194f8e9522a63496c88ea2a61 Author: 李天时 Date: Wed Oct 23 17:07:23 2019 +0800 fixbug，解决猜你喜欢的缓存失效时多次写入缓存，由list类型改为set类型。 commit 2d21b4263bf76f30942a909967592d449fd459cd Author: liyt Date: Wed Oct 23 15:19:30 2019 +0800 排行榜热度修改 commit 12c5409854fe4858c4403c47f1f59628ad4c421d Author: liyt Date: Wed Oct 23 15:11:43 2019 +0800 排行榜页面优化 commit 3686d1397a233f8fdaa5f0a7b808bf3ff15d0c32 Author: liyt Date: Wed Oct 23 14:21:05 2019 +0800 推送数据不转义斜杠 commit 24b40a0ce9acb62276c1eea9a38196524b1047a3 Author: liyt Date: Wed Oct 23 12:10:27 2019 +0800 已付费的js刷新 commit 08ed9892da18be7c939947befefb0b542b7bc998 Author: liyt Date: Wed Oct 23 10:55:33 2019 +0800 展示已付费 commit c84ca70a72f4a469ea7748574d19d66de775b6a0 Author: 李天时 Date: Wed Oct 23 10:12:34 2019 +0800 打开redis日志记录 commit b24fb3b291627ccecd529d05d0706cd09fa77e0b Author: liyt Date: Tue Oct 22 20:26:31 2019 +0800 VIP活动状态 commit 1169de6744efa9a448c4210749bd18c115286acc Author: liyt Date: Tue Oct 22 19:59:08 2019 +0800 小说推广 commit 8cad3bbcdb32b8202654f0a24f3c5b94fb54d398 Author: liyt Date: Tue Oct 22 19:54:45 2019 +0800 VIP常用链接 commit 0857113963225ec8b99b9aab784eb049c9d0390c Author: liyt Date: Tue Oct 22 19:40:01 2019 +0800 书籍列表默认进入点击排行 commit 0ac3a5c33b9fd6404ee1283a04b70961b6735579 Merge: 85ff535db 16c523cc9 Author: zhenglh Date: Tue Oct 22 15:16:00 2019 +0800 Merge branch 'dev-oct-20190927' into dev-merge-period-1-20191022 # Conflicts: # application/main/constants/CacheConstants.php # application/main/service/UserdotService.php # tests/RedisTest.php commit 85ff535db0e93d9cdaa36ba7d8ee683f4420e40d Merge: 809c464e5 50894cd80 Author: zhenglh Date: Tue Oct 22 15:12:16 2019 +0800 Merge branch 'dev-mengjiapost-20191015' into dev-merge-period-1-20191022 # Conflicts: # application/command.php commit 809c464e580741005450401fcd1fcc524694a06f Merge: eaf83729b 412a0bf53 Author: zhenglh Date: Tue Oct 22 15:11:41 2019 +0800 Merge branch 'dev-book-relation-2019-10-12-rebase' into dev-merge-period-1-20191022 commit 412a0bf53720969baa08749da6dd3058457a71ba Merge: a6de7c9a5 d2567c942 Author: wudongdong Date: Tue Oct 22 15:04:32 2019 +0800 Merge branch 'dev-book-relation-2019-10-12-rebase' of http://192.168.0.31/fe/cps into dev-book-relation-2019-10-12-rebase commit a6de7c9a55c2152ddc1f768d37ea22bc1bdfe2f9 Author: wudongdong Date: Tue Oct 22 15:04:12 2019 +0800 猜你喜欢优化 commit 50894cd803742bd1483f3108c03de6cd53048c9f Author: liyt Date: Tue Oct 15 20:22:45 2019 +0800 parent eaf83729b7f454b32ead8aa72eae2225bee04e68 author liyt 1571142165 +0800 committer zhenglh 1571727122 +0800 梦嘉发送数据 commit 16c523cc913c99858772ee7dad5eb9128e61b9f0 Author: wudongdong Date: Mon Oct 21 17:25:22 2019 +0800 order-refferral commit eaf83729b7f454b32ead8aa72eae2225bee04e68 (tag: cps_20191021_171309) Author: liyt Date: Mon Oct 21 17:11:30 2019 +0800 修复专属链接代理商用户无法打开 commit 9e84b750abf301f5a1b9f49085ea071f92adb893 (tag: cps_20191021_155418) Author: liyt Date: Mon Oct 21 15:51:55 2019 +0800 VIP用户统计显示30天 commit d2567c9422a6597d6cd6728661ed53bb02d1ab52 Merge: 52c9dde63 985745b6c Author: guyuexuan <2651919937@qq.com> Date: Mon Oct 21 15:27:15 2019 +0800 Merge branch 'dev-book-relation-2019-10-12-rebase' of 192.168.0.31:fe/cps into dev-book-relation-2019-10-12-rebase commit 52c9dde63d6e3e1f2ccd09b514a6f07f104ee3c7 Author: guyuexuan <2651919937@qq.com> Date: Mon Oct 21 15:26:31 2019 +0800 修改 redis 日志，去除 pfadd 方法 修改部分 redis exists 方法 commit 985745b6c802f4d2c84f2d4875e572262533d015 Merge: 296e28820 0b13f6485 Author: wudongdong Date: Mon Oct 21 14:14:02 2019 +0800 relation commit 296e28820c402a4b8c5094ce333dba4c07e8bb7c Author: wudongdong Date: Mon Oct 21 14:08:06 2019 +0800 relation commit 0b13f6485dc9a4fc49cb1887d6f044c190dff6f4 Author: 李天时 Date: Mon Oct 21 10:29:36 2019 +0800 redis管道用法改造 commit f1795f1af9d003823ebef7a9e9f73d33193ef519 Author: 李天时 Date: Fri Oct 18 14:54:52 2019 +0800 redis管道用法改造 commit 846eca1949d3cf3dc12efd530a04b9cd383d7685 Author: wudongdong Date: Fri Oct 18 11:00:06 2019 +0800 relation commit 3548946b28b982b46d353f1d585ebda0516446e6 Author: wudongdong Date: Thu Oct 17 19:19:39 2019 +0800 relation commit 684d3bb605b25240c0088dc3d8f767cdfd0c484f Author: 李天时 Date: Fri Oct 18 14:14:06 2019 +0800 redis管道用法改造 commit cf70ef81ef477e8365ab17c74628092e10e2bc6f Author: wudongdong Date: Thu Oct 17 17:53:21 2019 +0800 relation commit 08be834a627cc0dd231c75886e34dad0cac8a7ca Author: wudongdong Date: Thu Oct 17 16:48:01 2019 +0800 relation commit bff67c8921ccc07bfdd9fd36c4d587cae8a4d66d Author: wudongdong Date: Thu Oct 17 16:42:16 2019 +0800 relation commit ad9097c185c42c4816c5ffa7165274243cb4c3be Author: wudongdong Date: Thu Oct 17 16:17:52 2019 +0800 relation commit 0b6b173431788041e159826bd21ccdd8499d229d Author: 李天时 Date: Thu Oct 17 18:07:29 2019 +0800 redis管道用法改造 commit 71d98b0bf5781a94fee0a534973375a72caa4f74 Author: 李天时 Date: Thu Oct 17 16:07:19 2019 +0800 redis管道用法改造 commit d451e088e8a9109637cb48614a192660cd12aa5e Author: wudongdong Date: Thu Oct 17 10:28:04 2019 +0800 relation001 commit fbe7734d9ae9433377de7d490c915d3c9ee2500d Author: wudongdong Date: Wed Oct 16 20:25:34 2019 +0800 unique commit d541ddec4079806378a26969beda8e5b2db1c939 Author: wudongdong Date: Wed Oct 16 15:53:46 2019 +0800 re commit 6580734af5129ed2cc8abdf2750dc7c093030037 Author: 李天时 Date: Thu Oct 17 10:26:00 2019 +0800 redis管道用法改造 commit cd178a51d453a29e901dd17a8133ee04b770418e Author: 李天时 Date: Thu Oct 17 10:21:46 2019 +0800 redis管道用法改造 commit 0c7d4b17207d48fc749dd402656d8f7d7aa9afde Author: wudongdong Date: Wed Oct 16 13:43:52 2019 +0800 relation commit 28d35eaa17b3b9cb7d21def7be303175b86356af Author: 李天时 Date: Mon Oct 14 19:42:47 2019 +0800 redis管道用法改造 commit 7e22021129e1ce7dc0c2d632db74ffc40979a155 Author: wudongdong Date: Wed Oct 16 11:49:36 2019 +0800 relation commit 6cc461d3b552fe9dc89f99bb2f5be0bae7efc0d1 Author: wudongdong Date: Tue Oct 15 14:25:27 2019 +0800 book-relation commit 7ddb84385ed7b067256ed688335738207a021e4e (tag: cps_20191021_150429) Author: liyt Date: Mon Oct 21 10:40:14 2019 +0800 新增用户充值金额二期 commit a4fdd8774276b472f877543653bdf9b22a102267 Author: 李天时 Date: Mon Oct 21 10:29:36 2019 +0800 redis管道用法改造 commit 8cf6d77c1c964fd7a63da02ef7ac29881cf41d3d Merge: 29c2a4e77 ec300ccda Author: zhenglh Date: Mon Oct 21 10:02:56 2019 +0800 Merge remote-tracking branch 'origin/master' commit 29c2a4e779beacb81f1988968cbd72f2c9bc148c Author: zhenglh Date: Mon Oct 21 10:02:46 2019 +0800 客服增加书币时主从同步处理 commit ec300ccdace04632473efa88230242632e43bc85 Author: liyt Date: Tue Oct 8 18:01:13 2019 +0800 VIP活动专属链接,完成率 commit 088abb76f32381740d5c19367dc3aa43e74f0505 Author: 李天时 Date: Fri Oct 18 14:54:52 2019 +0800 redis管道用法改造 commit f60d98b3b279a39f0c76a62744cb06f8d9b30081 Merge: 7d2445385 c00c8b02b Author: 李天时 Date: Fri Oct 18 14:14:14 2019 +0800 Merge remote-tracking branch 'origin/dev-book-relation-2019-12-12' into dev-book-relation-2019-12-12 commit 7d244538521adb475fc65d2e3b29b4153ba468a8 Author: 李天时 Date: Fri Oct 18 14:14:06 2019 +0800 redis管道用法改造 commit f4d52d2a373672c397b3f431b14a9fe10da795f0 Author: zhenglh Date: Fri Oct 18 11:48:46 2019 +0800 客服查询也需要同步用户状态 commit c00c8b02b261b61977d4a5ecee1a61c47ad83ecb Author: wudongdong Date: Fri Oct 18 11:00:06 2019 +0800 relation commit 0c96ba6d0a20e2220e6d6664016a4307397b739a (tag: cps_20191018_103620) Author: liyt Date: Fri Oct 18 10:33:02 2019 +0800 修改新增充值统计入库时间 commit cb17580dc9c2f52b512dfa47665e1b7a2fb44678 Author: zhenglh Date: Thu Oct 17 19:57:15 2019 +0800 免费看点更新错误处理 commit f65d25d6ff356543f821e901fed61b5847483231 Author: zhenglh Date: Thu Oct 17 19:46:52 2019 +0800 免费看点更新错误处理 commit 65b68a864ef253b5ecc08bfaaf555be62b04275a Author: zhenglh Date: Thu Oct 17 19:44:04 2019 +0800 免费看点更新错误处理 commit 763b24ba376e31fe765c6b20449e8ef4d5592907 Author: zhenglh Date: Thu Oct 17 19:42:26 2019 +0800 免费看点更新错误处理 commit 06ea6c766b9cd30dfa2d6f39aa8fef822680a091 Author: zhenglh Date: Thu Oct 17 19:39:53 2019 +0800 免费看点更新错误处理 commit 22e29756b14f2fd2c8180cae2bf5ce688bedaa97 Author: zhenglh Date: Thu Oct 17 19:36:37 2019 +0800 免费看点更新错误处理 commit e9554a6b930eec39b3da65cfb5427e512eebfd49 Merge: 2f263f83f 2608fb0c4 Author: wudongdong Date: Thu Oct 17 19:19:46 2019 +0800 Merge branch 'dev-book-relation-2019-12-12' of http://192.168.0.31/fe/cps into dev-book-relation-2019-12-12 commit 2f263f83f4ecdd0b5dff5aabe00e33c246d86498 Author: wudongdong Date: Thu Oct 17 19:19:39 2019 +0800 relation commit cf2002278054a3b3c4aeb65482f81f296341047e Author: zhenglh Date: Thu Oct 17 19:01:12 2019 +0800 异常日志，后台登录检测删除 commit 0c559e5124f0353c3f49b239b3f28fbc0f1f394e Author: zhenglh Date: Thu Oct 17 18:59:48 2019 +0800 异常日志，后台登录检测删除 commit 2608fb0c4f94d7338560e51add7ac333a8c7ea4c Merge: dbcabf947 f3697a195 Author: 李天时 Date: Thu Oct 17 18:07:43 2019 +0800 Merge remote-tracking branch 'origin/dev-book-relation-2019-12-12' into dev-book-relation-2019-12-12 commit dbcabf9474b272c45274a157256d326afbd9d227 Author: 李天时 Date: Thu Oct 17 18:07:29 2019 +0800 redis管道用法改造 commit f3697a19521ab6d300a4a9a6d90b68744b6f1926 Author: wudongdong Date: Thu Oct 17 17:53:21 2019 +0800 relation commit 1d77bc55a8560f2edbfd70ef220dc95c63c657f1 (tag: cps_20191017_172236) Merge: fa0a9f2af c06b3ff72 Author: zhenglh Date: Thu Oct 17 17:22:18 2019 +0800 Merge remote-tracking branch 'origin/master' commit fa0a9f2af145f8c4d96a18959a3641fdfd6e8909 Author: zhenglh Date: Thu Oct 17 17:22:09 2019 +0800 KL dd字段优先执行 commit 9e79cb24bafb35d046756cc5aa539dbb5619c707 Author: wudongdong Date: Thu Oct 17 16:48:01 2019 +0800 relation commit 1cdf3feeeef8e32bb0c980dbff11c5064e8d7e66 Author: wudongdong Date: Thu Oct 17 16:42:16 2019 +0800 relation commit ed980770fbc2ff60322a9323ea42fc9c1e1e37e6 Author: wudongdong Date: Thu Oct 17 16:17:52 2019 +0800 relation commit 91ad0ef0cc12cf748cc3309ef30de25893c2e571 Author: 李天时 Date: Thu Oct 17 16:07:19 2019 +0800 redis管道用法改造 commit c06b3ff72c0ef0f85ce4bd9b724b52ca5965a701 (tag: cps_20191017_160532) Author: liyt Date: Thu Oct 17 15:58:35 2019 +0800 '还原页面展示' commit 706a858eed672cf0e495fe6d1c3a2733b6a8d722 Author: liyt Date: Thu Oct 17 15:56:36 2019 +0800 '还原页面展示' commit 4c78157881d43b93e9789770f19c71230e16c3a7 (tag: cps_20191017_140425) Merge: 36ddefec3 8debd2afe Author: liyt Date: Thu Oct 17 10:57:26 2019 +0800 Merge branch 'dev-merge-20191017' of 192.168.0.31:fe/cps into dev-merge-20191017 commit 36ddefec303dd0b72426f3ea08fff927a148a236 Author: liyt Date: Thu Oct 10 16:58:11 2019 +0800 vip用户统计 commit 4cdf8d02a0a3b48f4623bbb5545e0ab49fdb21f0 Author: liyt Date: Thu Oct 10 15:22:29 2019 +0800 新增用户chongzhi commit 7be9cc6d78bc3fca52a5a2713c1100895f3ff3ac Author: liyt Date: Thu Oct 10 14:56:54 2019 +0800 新增用户chongzhi commit a346d37b05acebd6d353c22e9ad9b32db322c777 Author: liyt Date: Wed Oct 9 16:46:41 2019 +0800 新增用户统计 commit cd7698b0c4249bf167192b0aa11d51786a11db97 Author: liyt Date: Tue Oct 8 19:17:27 2019 +0800 新增用户统计 commit f98bdc59c3ce78e289befa3e773f9bbe36a9fc1d Author: liyt Date: Tue Oct 8 18:01:13 2019 +0800 订单查询精准匹配 commit 8debd2afe675475b8239b00591cd2e29e12c7f86 Merge: 546db4666 b9f329a6d Author: liyt Date: Thu Oct 17 10:51:19 2019 +0800 Merge branch 'dev-new-recharge-count-20191008' into dev-merge-20191017 commit 7562024334322437cbda7787bcad9039e83972f7 Author: wudongdong Date: Thu Oct 17 10:28:04 2019 +0800 relation001 commit 44138b74f94a5e4f5b11e747a4f49691680a63bc Merge: 665cd4174 3bf193bca Author: 李天时 Date: Thu Oct 17 10:26:09 2019 +0800 Merge remote-tracking branch 'origin/dev-book-relation-2019-12-12' into dev-book-relation-2019-12-12 commit 665cd4174e4c94f8d99d58fc5a0c76d7137424f9 Author: 李天时 Date: Thu Oct 17 10:26:00 2019 +0800 redis管道用法改造 commit c11585a14ecf8696ca450bc2af0130d1570f33a6 Author: 李天时 Date: Thu Oct 17 10:21:46 2019 +0800 redis管道用法改造 commit 3bf193bcac2dd69616fd735c402f58a79979d656 Author: wudongdong Date: Wed Oct 16 20:25:34 2019 +0800 unique commit 0551af67e43fa6c872dcc9bfe36064bff994ff4d Author: liyt Date: Wed Oct 16 19:53:42 2019 +0800 去掉自动回复管理的批量操作 commit 2ebd0550b8b295689fd1b8b64fa00dfd12c6175c Author: wudongdong Date: Wed Oct 16 15:53:46 2019 +0800 re commit 546db4666029bb35d1be69809bc02be65df2c2a7 (tag: cps_20191016_154944) Merge: 6a64b1eca 48276ee8b Author: zhenglh Date: Wed Oct 16 15:37:36 2019 +0800 Merge branch 'dev-kl-update-20190927' commit 48276ee8b889d31ba4e1b5b91d6b96aa02a33f66 Author: zhenglh Date: Wed Oct 16 15:34:05 2019 +0800 刷新消费时不检测是否有扣减书币 commit dde8c175223be27f6781d2286eea2e7a4135242f Author: zhenglh Date: Wed Oct 16 15:16:50 2019 +0800 优先更新dd字段 commit 355e27e3495c38906d88172fb5c78017b210dfad Author: zhenglh Date: Wed Oct 16 14:54:37 2019 +0800 充值会默认更新 commit 41eb2f33099be46c391050a09f260ff59279a22c Author: zhenglh Date: Wed Oct 16 14:53:53 2019 +0800 充值会默认更新 commit 198eaf9e687d8cdb0104a601d8880c9628dd1382 Author: zhenglh Date: Wed Oct 16 14:27:17 2019 +0800 刷新充值dd字段改为动态更新，刷新免费看点前更新dd字段 commit 67ddeccf3c24710c871c55f8ed95b1ce1198a033 Author: wudongdong Date: Wed Oct 16 13:43:52 2019 +0800 relation commit 6a64b1ecadf5344966fd89f3da1531bf0935f402 Author: zhenglh Date: Wed Oct 16 11:54:21 2019 +0800 KL订单逻辑处理：一定要扣的才会加黑名单 commit a3b048bb929f1f54bb93b01cc92f8bdd77bf6b8f Merge: 82e7b4e80 7fb877b53 Author: wudongdong Date: Wed Oct 16 11:50:14 2019 +0800 Merge branch 'dev-book-relation-2019-12-12' of http://192.168.0.31/fe/cps into dev-book-relation-2019-12-12 commit 82e7b4e80ad7409e4713f1c3e3e4d8a8dc7a382f Author: wudongdong Date: Wed Oct 16 11:49:36 2019 +0800 relation commit d1e5ae04217e26e116a318157171bfd109b17a87 Author: zhenglh Date: Tue Oct 15 19:31:26 2019 +0800 充值信息默认同步，与扣量无关 commit 5d361492994b845fa69d189e7cac870c86b89cb2 (tag: cps_20191015_180009) Merge: 446d957d2 c3942a80e Author: zhenglh Date: Tue Oct 15 17:35:36 2019 +0800 Merge branch 'dev-kl-update-20190927' commit c3942a80e88ad3ed0a647db9aaa3ecf67c54526c Author: zhenglh Date: Tue Oct 15 17:15:36 2019 +0800 更新用户清理缓存 commit 446d957d2282073a95a55622acb2470ee069b315 Author: zhenglh Date: Tue Oct 15 17:06:57 2019 +0800 track 缓存更新 commit d8160e5e98ff5694e9e2399d6007a9df3081b3f2 Author: zhenglh Date: Tue Oct 15 16:14:12 2019 +0800 刷新vip优化 commit c01d7548b73be288e1905f980c9b2d557410810f Author: zhenglh Date: Tue Oct 15 15:43:39 2019 +0800 充值与消费脚本日志处理 commit 2c2c1f790367a9d39c790e5ef99a79be5f0879e1 Author: zhenglh Date: Tue Oct 15 15:38:46 2019 +0800 扣量订单检测前移 commit 015d31fac89905c7badf721744b4436821c30f70 Author: zhenglh Date: Tue Oct 15 15:32:24 2019 +0800 flush状态使用枚举值 commit c76dc070165c71adeab7aa18bb4ef88895bd85b8 Author: zhenglh Date: Tue Oct 15 15:29:32 2019 +0800 放量状态改为2或3 commit 7fb877b534f0b969bb4574d20f3d26697efd816d Merge: 92ae3c4b2 092d7b389 Author: 李天时 Date: Tue Oct 15 15:27:57 2019 +0800 Merge branch 'dev-origin-tag-20191011' into dev-book-relation-2019-12-12 commit 92ae3c4b2401dd2210ec235baad93342c6651e88 Merge: 15b14fdb6 09aaf4ebf Author: 李天时 Date: Tue Oct 15 15:27:34 2019 +0800 Merge branch 'master' into dev-book-relation-2019-12-12 commit 474e5078d3c93b164b4569ee4e1e0bea4b35fdcc Author: zhenglh Date: Tue Oct 15 15:19:43 2019 +0800 后台查询时自动更新充值消费与vip信息 commit 15b14fdb6b61af76ab9752cbfa7354265261c998 Author: wudongdong Date: Tue Oct 15 14:25:27 2019 +0800 book-relation commit 092d7b389a0068e4333c35342af58a11209a6276 Author: 李天时 Date: Mon Oct 14 19:42:47 2019 +0800 redis管道用法改造 commit 09aaf4ebffb199cc81d092696ef693f706895023 (tag: cps_20191014_185826, tag: cps_20191014_185301) Author: zhenglh Date: Mon Oct 14 18:52:37 2019 +0800 创建目录问题处理 commit 1d253a1bba494f199054323aad9be05983c1c4cf (tag: cps_20191014_184959) Author: zhenglh Date: Mon Oct 14 18:47:52 2019 +0800 创建目录问题处理 commit 202e367b74e00b5b82859fe9df374dfe94213095 Merge: ca54694c5 342f83936 Author: zhenglh Date: Mon Oct 14 18:41:20 2019 +0800 Merge branch 'dev-origin-tag-20191011' # Conflicts: # application/admin/controller/auth/UserDetailBase.php # application/config.php # application/main/constants/CacheConstants.php commit 342f83936db62b3500743f05fe88b30a98a67f81 (tag: cps_20191014_172150) Author: zhenglh Date: Mon Oct 14 17:20:54 2019 +0800 渠道与代理查看KL订单数据处理 commit 914d3fcca11d71ade388727e52215ba4b827f39b Author: zhenglh Date: Mon Oct 14 16:51:35 2019 +0800 redis抛异常处理 commit 0ab405dbada8d4d7d196af875b61b6e77c4c4b84 Author: zhenglh Date: Mon Oct 14 16:39:33 2019 +0800 redis限制阈值修改，抛异常处理 commit b3219e56e1799f27d480b48c0ccc7e31712c0c90 Author: zhenglh Date: Mon Oct 14 14:58:52 2019 +0800 商品编辑时缓存清理错误 commit 9ccb59cf8764c3a97d10e1204a914d53b213f62e Author: zhenglh Date: Mon Oct 14 14:43:31 2019 +0800 添加track缓存前缀 commit ca54694c548c68c7d05281b0332e6b4948bb5816 (tag: cps_20191014_135258) Merge: 64fd4fd30 2ff50c33c Author: zhenglh Date: Mon Oct 14 11:44:20 2019 +0800 merge from kl commit 2ff50c33c02694d6f381bf1fe719d3870bae2062 Merge: 44472fc0a 7e6972f40 Author: zhenglh Date: Mon Oct 14 11:40:41 2019 +0800 Merge branch 'dev-kl-update-20190927' into dev-merge-kl-20191012 commit 7e6972f402a11b01af63af443143a25f44c3a76a Author: liyt Date: Mon Oct 14 11:17:37 2019 +0800 优化脚本 commit 3647698962e0e8d7dc9363fd8898d0d009b44117 Merge: 4243c53c0 ad96d93c9 Author: zhenglh Date: Mon Oct 14 11:07:19 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190927' into dev-kl-update-20190927 commit 4243c53c0398e3fe56b64da19e5754204d907b1e Author: zhenglh Date: Mon Oct 14 11:07:09 2019 +0800 数据取模 commit ad96d93c903e605000f0010fd4b7f989034f5b25 Author: liyt Date: Sat Oct 12 20:05:34 2019 +0800 消费记录脚本更新 commit 5f99b24426345cfcea71eb41c7260cf3d553d801 Author: liyt Date: Sat Oct 12 17:47:44 2019 +0800 刷新config commit 9024ced46fc4de1e102150c55eb4901155309f1f Author: zhenglh Date: Sat Oct 12 17:22:07 2019 +0800 flush_state为2时执行新逻辑。数据库阈值改为511 commit 1ffd03eaf6dacaecb20ea7032c107e62afec0563 Author: liyt Date: Sat Oct 12 16:54:00 2019 +0800 排行榜主题 commit 16b23a422aa83d86b5ddb6a7f3b91ad94f0d13f2 Merge: 34fbe739b ef723a9f6 Author: zhenglh Date: Sat Oct 12 16:50:15 2019 +0800 Merge branch 'dev-kl-update-20190927' of http://192.168.0.31/fe/cps into dev-kl-update-20190927 commit 34fbe739bc7bb95d3529ce51f295e35933db83ee Author: zhenglh Date: Sat Oct 12 16:50:05 2019 +0800 备案号作为新老扣费阈值 commit 64fd4fd3040ba92ee33cb371f1fdfd5b073ba1de (tag: cps_20191012_184413) Author: liyt Date: Sat Oct 12 15:37:32 2019 +0800 修复消费数据脚本 commit ef723a9f6878fb75b38b6a151c85dfa404e07e9a Author: liyt Date: Sat Oct 12 15:31:40 2019 +0800 修复跑消费记录脚本 commit d21165878b3044cb304a25507d22178ff66953f7 Author: 李天时 Date: Sat Oct 12 15:03:24 2019 +0800 KL,刷新DD字段的脚本增加结束id的限制 commit cb1afa7656ad9160d11c53bfc7ca51da9b35366d Author: 李天时 Date: Sat Oct 12 14:48:37 2019 +0800 KL,刷新DD字段的脚本增加结束id的限制 commit 034fd50da0f03229222ac12422b0b3aa8c92fc42 Author: liyt Date: Sat Oct 12 11:20:28 2019 +0800 vip按钮 commit 882b5a2a4892237f5b41687d0f1646ea4be9d90c Author: liyt Date: Sat Oct 12 10:47:08 2019 +0800 排行榜 commit 44472fc0a71b7847031317be104aaacd1e717e21 (tag: cps_20191012_150717) Merge: 7587f0bce 32e539876 Author: zhenglh Date: Sat Oct 12 10:16:11 2019 +0800 merge from kl to master commit 44c86899c1520cbc88311249167b70b306b2198e Author: zhenglh Date: Fri Oct 11 20:08:22 2019 +0800 被关注回复标题可以编辑 commit 7d383930d5c9d18a3296134feb0b6da01266e64e Author: zhenglh Date: Fri Oct 11 16:05:53 2019 +0800 入口追踪redis缓存key添加前缀，UTK，过期时间由七天改为3天 commit 7587f0bce8e1a474fc98d9a598c1d673691856cc (tag: cps_20191011_153134) Author: liyt Date: Fri Oct 11 15:07:33 2019 +0800 fix 书籍分类缓存bug2不是数组再查询一次 commit 78729ab0fcad1f285ddf089e673fa1c5895c56e9 (tag: cps_20191011_135232) Author: liyt Date: Fri Oct 11 13:47:53 2019 +0800 fix 书籍分类缓存bug2加数组变量 commit d0e307ff677a7588c34fe7fd9a42ea9e5988b852 Author: liyt Date: Fri Oct 11 12:32:11 2019 +0800 fix 书籍分类缓存bug2 commit 61ab488ff5843be43ae22b3438a71dcf1146275f Author: liyt Date: Fri Oct 11 12:18:46 2019 +0800 fix 书籍分类缓存bug1 commit 756c28f537cbc066590a9bf39671426e0912542d Author: liyt Date: Fri Oct 11 12:04:36 2019 +0800 fix 书籍分类缓存bug commit b10e33cb08179eaa37490e3a8572013133540290 Author: zhenglh Date: Fri Oct 11 11:33:51 2019 +0800 用户充值的免费看点丢失的处理 commit 963d2cf5dfdd241bb6c1795c9b616924d4a77931 (tag: cps_20191011_103628) Author: guyuexuan <2651919937@qq.com> Date: Thu Oct 10 20:25:54 2019 +0800 增加判断条件 commit b9f329a6dc2a17ebfb15193dad8b4fa470010b33 Author: liyt Date: Thu Oct 10 16:58:11 2019 +0800 vip用户统计 commit 5dc6fb0ac5415ba6719d4a24e45680d37c516e55 Author: liyt Date: Thu Oct 10 15:22:29 2019 +0800 新增用户chongzhi commit cbb76ba90ecb6568031f349d5b60cfbc804ef1a6 Author: liyt Date: Thu Oct 10 14:56:54 2019 +0800 新增用户chongzhi commit 32e5398765d9113b6b580ce22a7b0abcb8eb18a5 Merge: 2004b8660 0cb69ba11 Author: wanggb Date: Thu Oct 10 11:54:40 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190927' into dev-kl-update-20190927 commit 2004b86608261421858e8810f2a89d35d61ba531 Author: wanggb Date: Thu Oct 10 11:54:29 2019 +0800 统计qds 查看用户vip结束时间，精确到小时 commit 35fe43782d210528e92fb718d7aae9e96ac8702e (tag: cps_20191010_172734, tag: cps_20191010_135022, tag: cps_20191010_133829) Merge: dad523477 9cf14c2a4 Author: liyt Date: Thu Oct 10 11:04:47 2019 +0800 Merge branch 'dev-optimize-sql-20191008' of 192.168.0.31:fe/cps into dev-optimize-sql-20191008 commit dad523477bc75edff4faa344eda71a9ddcd2791e Author: liyt Date: Thu Oct 10 10:17:09 2019 +0800 清理缓存 commit 5406cd113879e9c7bbacdd64f59880b8f430780f Author: liyt Date: Wed Oct 9 21:14:38 2019 +0800 赠币活动 commit b57e4f4dc09cfd569909329df65da571efb02821 Author: liyt Date: Wed Oct 9 20:56:52 2019 +0800 平台活动 commit 7d2c53e6880fdaf16d5732a9a877155c78ca356e Author: liyt Date: Wed Oct 9 20:55:19 2019 +0800 平台活动 commit a3dbb021bebaa9618df3a053b686e33f273c89ab Author: liyt Date: Wed Oct 9 19:23:17 2019 +0800 平台活动 commit 9a2341e86282308914c7bd2afc7414bf3746f78f Author: liyt Date: Wed Oct 9 19:07:47 2019 +0800 平台活动 commit 82571cc1a422b9f5d660a3579816af95b96e42b3 Author: liyt Date: Tue Oct 8 19:20:05 2019 +0800 删除key commit 9a094b855da09c5308b8695cb79bcbf0448de160 Author: guyuexuan <2651919937@qq.com> Date: Tue Oct 8 19:04:27 2019 +0800 增加 redis 执行日志 commit b577e61aa6a7de4c2088b78d60564c515379bd6a Author: liyt Date: Tue Oct 8 17:27:47 2019 +0800 优化缓存 commit 2796966675de197b6cca266171c4f2261723c145 Author: liyt Date: Tue Oct 8 16:49:48 2019 +0800 添加admin-config缓存 commit 93af5955650cd8ca0de0224e529666c8fff46c97 Author: wanggb Date: Tue Oct 8 17:07:22 2019 +0800 APPGuide新增时，维护缓存 commit 633a991db47f21d240687e6ff9470808c840bb75 Author: liyt Date: Tue Oct 8 16:02:48 2019 +0800 book_category走缓存 commit 5432e8304717cbd6878edf875121a1fb6bbc0611 Author: liyt Date: Tue Oct 8 14:30:35 2019 +0800 活动相关加缓存 commit 5216bc5f970a1617f55ca61ada70622110c7cd13 Author: liyt Date: Tue Oct 8 14:20:15 2019 +0800 活动相关加缓存 commit 1b4c907422dbf1540061c981babba910b7bd2199 Author: wanggb Date: Tue Oct 8 14:51:48 2019 +0800 guide_manage表中读取数据不存在时，缓存中存入字符串标记空 commit 9cf14c2a46f420851eb7ab5742a5e375b65248c3 Author: liyt Date: Thu Oct 10 10:17:09 2019 +0800 清理缓存 commit b1ead32717f663e9aa38d0684f3dbd13dc8cf867 Author: liyt Date: Wed Oct 9 21:14:38 2019 +0800 赠币活动 commit 75244330a330b2e38d5396e9fff10b6359c07748 Author: liyt Date: Wed Oct 9 20:56:52 2019 +0800 平台活动 commit 36f8d9b6800f0aa879a4b7a2dc59b4fd0e8c1580 Author: liyt Date: Wed Oct 9 20:55:19 2019 +0800 平台活动 commit 01a37be4391e95f7a24c6c49c562f2a1869314ff Author: liyt Date: Wed Oct 9 19:23:17 2019 +0800 平台活动 commit 65143eb7df68532c5b2c15a56c9cc23414efbc03 Author: liyt Date: Wed Oct 9 19:07:47 2019 +0800 平台活动 commit cc2a166eb43873bc5195a859e6c2bffae65d52a6 Author: liyt Date: Wed Oct 9 16:46:41 2019 +0800 新增用户统计 commit f0bbac2f13c5090192eb245a6c2eaae787735833 (tag: cps_20191009_165724) Author: 李天时 Date: Wed Oct 9 15:37:04 2019 +0800 书架相关，阳光站隐藏书架相关页面 commit 12739bd9c14c69f43fa1138e4ccd30df64e9de1d Author: 李天时 Date: Wed Oct 9 15:34:36 2019 +0800 书架相关，阳光站隐藏书架相关页面 commit ff173f2d615c112bd93ce954185f7fcf0d6343de Author: 李天时 Date: Wed Oct 9 15:21:32 2019 +0800 书架相关，阳光站隐藏书架相关页面 commit 0cb69ba11394fbb44a6812721c1e1eaedafa9a43 Author: liyt Date: Wed Oct 9 11:59:00 2019 +0800 后台扣减书币 commit fbcaf0b0a990073b58800664d5e9e96f30024d5f Author: liyt Date: Wed Oct 9 10:37:20 2019 +0800 后台修改书币加备注 commit b58dc1ba257ba0959cf5b490205cdec52404c9c2 Author: 李天时 Date: Wed Oct 9 10:12:49 2019 +0800 书架相关，阳光站上线，最近阅读页面不跳转到书架 commit d405da0884e8823b122cb8cdf63d0443bd42be38 Author: liyt Date: Tue Oct 8 19:20:05 2019 +0800 删除key commit 97eafddce8b4012fe689498fb0ee90dd546bb98d Author: liyt Date: Tue Oct 8 19:17:27 2019 +0800 新增用户统计 commit e7d139936e7549c8f8bc8a0d5e822e26593c1df9 Author: guyuexuan <2651919937@qq.com> Date: Tue Oct 8 19:04:27 2019 +0800 增加 redis 执行日志 commit f8e0bf9e94e7411e872cccc2e0e08a8e41f3fa16 Author: liyt Date: Tue Oct 8 18:01:13 2019 +0800 订单查询精准匹配 commit b2b5f40f1b58a6dd33ed7aed0c313973d5d452bb Author: liyt Date: Tue Oct 8 17:27:47 2019 +0800 优化缓存 commit f039e8de52416c67fab7bf70fda04805736a2015 Merge: 451532970 4404e4496 Author: wanggb Date: Tue Oct 8 17:07:32 2019 +0800 Merge remote-tracking branch 'origin/dev-optimize-sql-20191008' into dev-optimize-sql-20191008 commit 451532970473d02660dbcb05b1eba4542ceb1402 Author: wanggb Date: Tue Oct 8 17:07:22 2019 +0800 APPGuide新增时，维护缓存 commit 4404e44962ef8159882892d62930bd6e766b19a1 Author: liyt Date: Tue Oct 8 16:49:48 2019 +0800 添加admin-config缓存 commit 83430a0ea410d8acf63f37bb87c0576d8ee357e7 Author: wanggb Date: Tue Oct 8 16:14:01 2019 +0800 渠道|代理|VIP 可以查询灰度用户信息 commit d449827694b11ce42b7096a6678584f824e88c9b Author: liyt Date: Tue Oct 8 16:02:48 2019 +0800 book_category走缓存 commit cf10ed296443f5729d4473bdfeb735c34a453d0d Merge: ba812c510 e1420f66c Author: wanggb Date: Tue Oct 8 15:39:43 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190927' into dev-kl-update-20190927 commit ba812c510db4a230055e1b919adc6aeee7557329 Author: wanggb Date: Tue Oct 8 15:39:29 2019 +0800 渠道|代理|VIP 可以查询灰度用户信息 commit e1420f66cf0269f98f74088569f3efd43d55a1f3 Author: liyt Date: Tue Oct 8 15:22:35 2019 +0800 已有订单不走扣量 commit 79704c17e51b3487c435e4ff20207128f2e0c0ff Author: wanggb Date: Tue Oct 8 15:07:31 2019 +0800 判断是否有值 commit 18d32d1a3de2928f8690b00c60d15b56dc63e867 Merge: 9b9c2bfd3 11b86d26d Author: wanggb Date: Tue Oct 8 14:51:58 2019 +0800 Merge remote-tracking branch 'origin/dev-optimize-sql-20191008' into dev-optimize-sql-20191008 commit 9b9c2bfd3d4caa9b19d2f547a5b765b8f747b6c3 Author: wanggb Date: Tue Oct 8 14:51:48 2019 +0800 guide_manage表中读取数据不存在时，缓存中存入字符串标记空 commit 11b86d26dac78f6a406a3b454c48c14389766fc7 Author: liyt Date: Tue Oct 8 14:30:35 2019 +0800 活动相关加缓存 commit d1a5c6c7c6ac113902c92b85a629572b739bcf4f Author: liyt Date: Tue Oct 8 14:20:15 2019 +0800 活动相关加缓存 commit 75121f2307bdb0c89a6b109f3266574e1490dc9e Author: liyt Date: Tue Oct 8 10:55:47 2019 +0800 订单明细显示永久推广链接ID commit 9dd83e7f84a6d94a11185688f1d3d32adb508270 Merge: 722fa554f 546088310 Author: wanggb Date: Tue Oct 8 10:40:03 2019 +0800 Merge remote-tracking branch 'origin/dev-oct-20190927' into dev-oct-20190927 commit 722fa554fa6f832df1fcb8fd3026cf828d22da57 Author: wanggb Date: Tue Oct 8 10:39:52 2019 +0800 修改页面展示，对齐 commit 54608831053b607adcefbaeed332ecd41af79a6f Author: liyt Date: Tue Oct 8 10:32:43 2019 +0800 排行榜图标 commit 86dbf696e0d83902142e73dac0d3e90d92847eb7 Merge: 2f48c9d8f 19513b75f Author: liyt Date: Tue Oct 8 10:03:24 2019 +0800 Merge branch 'dev-oct-20190927' of 192.168.0.31:fe/cps into dev-oct-20190927 commit fbf80d9c409a810da3f6122b0767a598c8d657e5 Author: liyt Date: Mon Sep 30 19:06:10 2019 +0800 后台修改书币bug commit b47e5dc4184423e7b6eeef206464fd4134cd41e8 Author: wanggb Date: Mon Sep 30 19:00:23 2019 +0800 is_pay = 0 commit 81c27e0edbf1343c13cb12924534b9af205ccead Author: wanggb Date: Mon Sep 30 18:35:25 2019 +0800 恢复，微信user表中is_pay，如果扣量，is_pay = 0 commit 29ca53d08b64035ef13a7d23926b18e66907c992 Merge: 1cc540190 87d0d4628 Author: wanggb Date: Mon Sep 30 18:11:31 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190927' into dev-kl-update-20190927 commit 1cc540190d4e455c3d75323040c330db2996579a Author: wanggb Date: Mon Sep 30 18:11:18 2019 +0800 微信user表中is_pay，如果扣量，is_pay = 0 commit 87d0d4628e2ffff4a14daf00be9aa64189878503 Author: liyt Date: Mon Sep 30 14:41:40 2019 +0800 免费书币扣除BUG commit 424c6edd08f6e1771f6b85def5734010b3546824 Author: 李天时 Date: Mon Sep 30 14:20:26 2019 +0800 KL,办公ip识别为北京 commit eced68d7a93cf120571315c12d65d2226445201d Author: liyt Date: Mon Sep 30 12:14:18 2019 +0800 筛选器编辑初始化 commit 19513b75f415a9134003e2117fbc883007fa3e1d Author: wanggb Date: Mon Sep 30 12:07:29 2019 +0800 渠道商后台--常用链接处增加VIP充值链接 commit fc22d93a38e987ba9047200bc71028dbf04e338c Author: wanggb Date: Mon Sep 30 10:58:09 2019 +0800 更新图片 commit 3a039033b9b5e061801b800bb765e3337a8e3522 Author: wanggb Date: Sun Sep 29 18:18:12 2019 +0800 更改用户白名单，删除缓存 commit 8f329a1194ab57fcd5db35be6bf7961a35c26b48 Author: wanggb Date: Sun Sep 29 18:10:19 2019 +0800 小说追更，下放到渠道 commit 2f48c9d8ff2d2db6dd216203c7d256a212b0a99b Author: liyt Date: Sun Sep 29 17:19:11 2019 +0800 排行榜渲染 commit c6b71529ad24bfdee7ffce084f07642dd8d8d85b Author: wanggb Date: Sun Sep 29 16:59:59 2019 +0800 读者查询，查询不到用户时，不统计remain_kandian commit 10fa769b764ada6703fbed1175c554568e6cc80d Author: zhenglh Date: Fri Sep 27 17:01:08 2019 +0800 充值记录格式修改 commit 576c1690fdf46faef8f32d90f1be7c02eaedff52 Author: wanggb Date: Fri Sep 27 16:25:43 2019 +0800 常量代替数字 commit 29938518a92475ba67e34f7f5529751fe2b49ddc Author: zhenglh Date: Fri Sep 27 15:18:54 2019 +0800 恢复白名单测试完成 commit 810b47c07a75108d76b6d99b306db37de6ee81ed Author: wanggb Date: Fri Sep 27 14:37:19 2019 +0800 去掉- 不可贪心 commit e6152d040529566122cd038a9aab594f571ac31f Author: zhenglh Date: Fri Sep 27 14:33:14 2019 +0800 永久书币缓存列表的维护 commit a6decc2c61b7fbf4f1302597a8442d922adaffa7 Author: zhenglh Date: Fri Sep 27 13:38:04 2019 +0800 测试消费 commit 2c238a7baf76490dd52849817ceb107bd249091b Author: zhenglh Date: Fri Sep 27 11:40:31 2019 +0800 用户添加白名单 commit dda00cb1bba26239a432f04a73ef8b675f0f4ac2 Merge: 9c80c5f0e 92e5d1a76 Author: zhenglh Date: Fri Sep 27 11:39:06 2019 +0800 Merge branch 'dev-kl-update-20190909' into dev-kl-update-20190927 commit 9c80c5f0eefaedc74efa598378001cb536281aed Author: zhenglh Date: Fri Sep 27 11:33:15 2019 +0800 消费处理 commit b379a7c65087eaf8db9c8590af392c4341fa3f57 Author: zhenglh Date: Fri Sep 27 10:48:37 2019 +0800 一二期合并 commit 92e5d1a76a2b3e6bd010121908e7109bf41befd0 Author: wanggb Date: Fri Sep 27 10:11:23 2019 +0800 用户踢出黑名单同时加入白名单 commit 3b8eb77f1eca18edef611e4bf24357d82f2f19d6 Author: zhenglh Date: Thu Sep 26 18:43:10 2019 +0800 书币后台维护 commit e2dda2397db52d8002a1000e344b7450710b0dbd Author: zhenglh Date: Thu Sep 26 15:55:12 2019 +0800 订单扣减测试完成 commit 55bcbe837f45a9526b475fd45ccfbc4ffa7c578d Author: wanggb Date: Thu Sep 26 15:29:25 2019 +0800 关联渠道修改展示效果 commit 004a3af5e71abe6769a3825262de144185c2a5b9 Merge: 6fd0241e0 698bf945e Author: zhenglh Date: Thu Sep 26 14:32:07 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-follow-20190923' into dev-kl-follow-20190923 commit 6fd0241e076c15ffd9d521019e85dbe7f97cfd3c Author: zhenglh Date: Thu Sep 26 14:31:57 2019 +0800 消费处理 commit e500ece59c7283bc1abab21b0e38bf4a19266e0e Author: wanggb Date: Thu Sep 26 14:05:48 2019 +0800 VIP结束时间小于当前时间时，显示 ‘-’ commit 35e146d97049451b59525068142b3ba61d4e4318 Merge: 8052f6781 e56d587b4 Author: wanggb Date: Thu Sep 26 13:40:20 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 8052f6781bba2b7a2010c71b09eba2cba28fceeb Author: wanggb Date: Thu Sep 26 13:39:52 2019 +0800 客服操作vip时间时，维护channelvip_starttime commit e56d587b44502b93d0ed4d7a09124b3f14ed4d12 Author: liyt Date: Thu Sep 26 12:00:37 2019 +0800 kl的js优化 commit e08e189bab8377da92b3a350aa8ab34c3071d98b Merge: fbd832ba8 f31c6fb86 Author: zhenglh Date: Thu Sep 26 11:22:11 2019 +0800 Merge branch 'dev-kl-update-20190909' into dev-kl-follow-20190923 # Conflicts: # application/admin/controller/auth/User.php # application/admin/controller/auth/UserDetailBase.php # application/command.php commit fbd832ba87efd8298f0f89d11cf278c9574c8ad6 Author: zhenglh Date: Thu Sep 26 11:16:12 2019 +0800 后台看点处理 commit 4115cd7af3015549b1f5b7bc3ce48f0919c45b95 (tag: cps_20190926_133522) Author: liyt Date: Thu Sep 26 11:04:39 2019 +0800 优化图文客服消息素材库入库 commit 75c1b9a07131bed03e7459b8e1c62ab9697af050 Author: wanggb Date: Thu Sep 26 10:56:47 2019 +0800 获取channel_vip_starttime条件 commit 698bf945ebf2f64064d39eac3fb439451e72f74d Author: liyt Date: Wed Sep 25 20:33:36 2019 +0800 重置重刷剩余永久书币 commit 3d7368f9e0f94a062ea4f43fa1b7155662565c9e Merge: 0f9fa865a d006d7d2b Author: wanggb Date: Wed Sep 25 20:05:35 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 0f9fa865a16633d8d34d0bf3781ae7911c1907a1 Author: wanggb Date: Wed Sep 25 20:05:21 2019 +0800 vip 时间刷脚本时，计算hour commit aa9da390d34158cbedc2fd3e084968fb5e6d9f1d Author: liyt Date: Wed Sep 25 20:04:34 2019 +0800 刷永久书币 commit d006d7d2b3ad9b8b0ae029b5ff1b2ef9b2d294ec Merge: 64c54962d c5a5cb7de Author: 李天时 Date: Wed Sep 25 19:59:11 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 64c54962d9d54ff7e8d02e9b1c13bd84b421252c Author: 李天时 Date: Wed Sep 25 19:59:05 2019 +0800 KL,刷新充值表dd字段脚本 commit 2625fb2674d7d9aad2c2114efc5d7969b5f9bcb1 Author: zhenglh Date: Wed Sep 25 19:38:56 2019 +0800 手动充值与回调处理 commit b06c2149b68e7588f6401e8cf8ba4af86bff3e36 Merge: fa2a19f10 d54fe6a72 Author: zhenglh Date: Wed Sep 25 18:55:09 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-follow-20190923' into dev-kl-follow-20190923 commit d54fe6a726dac18ec0af3606386663decf243cfb Author: liyt Date: Wed Sep 25 18:53:23 2019 +0800 刷书籍充值统计 commit c5a5cb7de33c1050b90a895032450fd983a411a6 Author: wanggb Date: Wed Sep 25 18:06:30 2019 +0800 vip充值时，维护 channel_vip_starttime 字段 commit d511ffbdfc150626448e6fad9372c2c039f147b7 (tag: cps_20190926_110046, tag: cps_20190925_192004) Merge: 9a0818644 f5f51c34d Author: 李天时 Date: Wed Sep 25 17:49:22 2019 +0800 Merge branch 'master' into dev-bookshelf-special-20190904 # Conflicts: # application/main/service/BookService.php commit 9a0818644c91a39837944bcad99666a6b8bd140a Author: 李天时 Date: Wed Sep 25 17:46:35 2019 +0800 书架相关，已加入书架的书籍不记录错误日志 commit 9b72dfa3cd9321d792f1f36c77fb8fa636cf2e38 Author: wanggb Date: Wed Sep 25 17:45:55 2019 +0800 vip 时间刷脚本时，计算hour commit 3cc0cd97a5231ab6c0931194ae6b6560c727ad7e Author: liyt Date: Wed Sep 25 17:19:43 2019 +0800 优化刷消费记录脚本 commit ca102e6cdff41c0ecdf0f8a793ff43c3c3bbc227 Author: liyt Date: Wed Sep 25 17:07:35 2019 +0800 优化刷消费记录脚本 commit f31c6fb86c772a603c84f1a318810d64be71cbd5 Author: wanggb Date: Wed Sep 25 16:56:34 2019 +0800 qd 查询用户，vip结束时间 commit e0b597549000615b2d918819c1b6494b7d4c8ddf Author: liyt Date: Wed Sep 25 16:47:13 2019 +0800 优化刷消费记录脚本 commit f97327f49120c79ca98cb004d11466347474c27b Author: wanggb Date: Wed Sep 25 16:35:50 2019 +0800 DD充值笔数 commit 918e80ee0f25a411702b6e00e2a3c2d6589fce02 Merge: 59823a757 24151aa99 Author: wanggb Date: Wed Sep 25 16:27:22 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 59823a7570dd4c54316f8d2dd2dad20044c09045 Author: wanggb Date: Wed Sep 25 16:27:14 2019 +0800 qd 查询用户，vip结束时间 commit 24151aa9961bbb7e695f750633bc0517ed3d3bb5 Author: 李天时 Date: Wed Sep 25 16:26:33 2019 +0800 KL,刷新充值表dd字段脚本 commit 5e43490d3b92f5fc0cfc40826c9311aa54f4b6fa Merge: 3b023526e 4c7c8007b Author: wanggb Date: Wed Sep 25 16:14:37 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 3b023526e66e62db63580c2590391aea9258e212 Author: wanggb Date: Wed Sep 25 16:14:27 2019 +0800 qd 查询用户，vip结束时间 commit 4c7c8007b59e2f17d4782769997fcb67567a3922 Author: zhenglh Date: Wed Sep 25 16:02:40 2019 +0800 起充人数错误 commit 23b9952cd4797169fdfa38450a2481e7528fc2bc Merge: 6cb2eee1c 5268f1d39 Author: zhenglh Date: Wed Sep 25 16:00:56 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 6cb2eee1cdbbb7844f07df99262586d5eea25cf3 Author: zhenglh Date: Wed Sep 25 16:00:49 2019 +0800 充值检测admin_id类型 commit fa2a19f1064a162af3d4f3f90c4f4141680a6014 Author: zhenglh Date: Wed Sep 25 15:54:05 2019 +0800 消费改版 commit 03e5c0f7bd7a26531bab40d3d699dc4731821634 Author: liyt Date: Wed Sep 25 15:52:53 2019 +0800 刷扣量消费书币 commit 5268f1d39856ebac9d8a47b39ccb241ce048f26d Author: wanggb Date: Wed Sep 25 14:46:59 2019 +0800 QDS 展示 channel_vip_starttime commit 9ca4f460935ea0764fe61ac9cd1e05136071311b Author: wanggb Date: Wed Sep 25 14:08:07 2019 +0800 添加Command命令 commit 47ea32802a769c97e550dd6165fc18cbf0774f9b Merge: f1ea2d588 5d27ddfc3 Author: wanggb Date: Wed Sep 25 13:58:14 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit f1ea2d5884d79d279e31be7b11326188ba90620b Author: wanggb Date: Wed Sep 25 13:58:05 2019 +0800 添加Command命令 commit 5d27ddfc36a05d6e68f603c2dc2cfa04c0b66d2d Author: zhenglh Date: Wed Sep 25 13:55:49 2019 +0800 扣量缓存key修改 commit 17becafd89dfdbbde6fea330d0781045d2317bf9 Merge: 292d9d8a6 32ab764e0 Author: zhenglh Date: Wed Sep 25 13:51:59 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 292d9d8a623943861450121611b23358cf661aff Author: zhenglh Date: Wed Sep 25 13:51:49 2019 +0800 添加备注 commit 32ab764e0c784d66a5fe6e57e9f5f16ce98544cd Merge: c0f8709a3 0accfcd54 Author: wanggb Date: Wed Sep 25 13:49:25 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit c0f8709a3bcc1127d75533f1472910756f16df9e Author: wanggb Date: Wed Sep 25 13:49:13 2019 +0800 添加Command命令 commit 0accfcd54cf8c1002a481c503f835a9c805f28a2 Author: zhenglh Date: Wed Sep 25 13:47:55 2019 +0800 老用户活跃用户人数 commit a27bac28c1d16a6e2a44de68b67ef5d58a78af1a Author: zhenglh Date: Wed Sep 25 13:41:04 2019 +0800 老用户活跃用户人数 commit 23b832641a79217609a2ba74c0fc711c52b1bd6e Merge: 0a80bce38 107a9a470 Author: zhenglh Date: Wed Sep 25 13:36:36 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 0a80bce38b4f5d9e59ff2bb4cbbca200a935eb22 Author: zhenglh Date: Wed Sep 25 13:36:28 2019 +0800 老用户活跃用户人数 commit 107a9a470e2998dade3ebf4c2a54c4b747ecbdf9 Author: wanggb Date: Wed Sep 25 11:19:09 2019 +0800 刷新 channel_vip_starttime 数据 commit da7fb4df67da785627a0b8fbc2e8c9827eada316 Merge: 077683a94 b92646b10 Author: wanggb Date: Wed Sep 25 10:29:47 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 077683a941fcdc12dd445f7f447e133c425b88ae Author: wanggb Date: Wed Sep 25 10:29:37 2019 +0800 客服查找黑名单用户 commit b92646b1089e65d6b6252d1bc18654ff145d77b6 Author: zhenglh Date: Tue Sep 24 20:30:22 2019 +0800 日志更新 commit 3391650ab354d966f8a5f97c186bf9cf96f639ea Author: liyt Date: Tue Sep 24 20:28:50 2019 +0800 刷消费记录 commit 80b54870cf4a09233254be4a30103d5ad5e33493 Author: liyt Date: Tue Sep 24 20:26:05 2019 +0800 刷消费记录 commit dd890710cc7e34aea8fe8008b82ee3ce65cc8f80 Author: liyt Date: Tue Sep 24 20:23:29 2019 +0800 刷消费记录 commit 9350f3866ecc764b19c930d0bbaaed43ddb0c845 Author: zhenglh Date: Tue Sep 24 20:22:37 2019 +0800 用户黑名单bug修复 commit 115e42225749c908d37f92ac5d411fee39ba6f8f Merge: 37e95fdf0 cb7685bbf Author: zhenglh Date: Tue Sep 24 19:58:50 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 37e95fdf05ff5b4f15a82ded87ee1bff36af7cea Author: zhenglh Date: Tue Sep 24 19:58:41 2019 +0800 首单加黑 commit cb7685bbf7c86e9067c1deb85a2b3a93c1a03741 Author: wanggb Date: Tue Sep 24 19:35:15 2019 +0800 VIP 查询不到is_black USER commit 71e69620d3cd406c449809833e5565410fe4af4c Author: wanggb Date: Tue Sep 24 19:23:00 2019 +0800 VIP 查询不到is_black USER commit ce854c60accfe9e9195df8d40299519f20d2107d Author: wanggb Date: Tue Sep 24 19:16:29 2019 +0800 IS_BLACK USER commit 0dd3c12fb7065f65fbf85e56839f396f97833078 Merge: 2a30bce08 0cec15f74 Author: wanggb Date: Tue Sep 24 19:11:04 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 2a30bce08909a292df4d2c034f23b5cad88be2d6 Author: wanggb Date: Tue Sep 24 19:10:55 2019 +0800 仅客服可以看到dd订单 commit 0a5b5c5b61470abdf66a2c4f8d21f322f07f2fbc Author: liyt Date: Tue Sep 24 19:08:38 2019 +0800 前台用户刷新状态 commit 0cec15f745b3c6c2c149f6a078b5108b416efb3a Author: liyt Date: Tue Sep 24 18:46:30 2019 +0800 添加规则js效果 commit 069b58280c67b7d6c68fa97e870337b636aebfdc Author: liyt Date: Tue Sep 24 17:49:18 2019 +0800 刷剩余永久书币 commit f0da6dbba7f5d0f6b4d414601c74531393252741 Author: liyt Date: Tue Sep 24 17:13:22 2019 +0800 新用户扣量比例隐藏bug commit 61584bf4af5c96f109bc9d3914f1062d1c487b08 Author: liyt Date: Tue Sep 24 16:59:46 2019 +0800 刷消费记录 commit 166f4c8d524f77566a73d9d0bdfcc1531590539a Merge: 172a4ccd8 5f0b07d88 Author: zhenglh Date: Tue Sep 24 16:17:17 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 172a4ccd897e366ab369ba74b323a1da259a4996 Author: zhenglh Date: Tue Sep 24 16:16:34 2019 +0800 规则验证，只验证配置的规则 commit f5f51c34dcf0b8198331c8a17baf38be642f883a (tag: cps_20190925_135958, tag: cps_20190924_192815, tag: cps_20190924_160859) Author: 李天时 Date: Tue Sep 24 16:02:38 2019 +0800 书架相关，修改书架脚本 commit 1b312001976a0942189829856b09eb2302323c62 Author: liyt Date: Tue Sep 24 15:57:30 2019 +0800 刷消费记录 commit 5543b5036332577095fe7ed43061e4d13f253c09 Author: liyt Date: Tue Sep 24 15:31:10 2019 +0800 刷消费记录 commit 5f0b07d88462e4dd1cae53aa327525b967c48f8a Author: wanggb Date: Tue Sep 24 15:22:10 2019 +0800 dudect => dd commit f3c8e4ab652f2b87507c192000987797d704024d Author: liyt Date: Tue Sep 24 14:52:26 2019 +0800 刷消费记录 commit 604b9db4aeefe925b41cca8f8554247135836149 Author: wanggb Date: Tue Sep 24 14:46:04 2019 +0800 KL规则管理，没有添加规则，不允许管理渠道 commit 9a5599a8ea523168c8de4d7bd485b05213c7272c Author: wanggb Date: Tue Sep 24 14:26:27 2019 +0800 KL规则管理，没有添加规则，不允许管理渠道 commit cd565db17e1b3eb7133199f6b183bfea2240064c Author: wanggb Date: Tue Sep 24 14:24:57 2019 +0800 KL规则管理，检索 commit c5d6e79eef7fa873d38fba9999b7037a5efb7216 Author: wanggb Date: Tue Sep 24 13:56:59 2019 +0800 KL规则管理，检索 commit eaea2be267b3a74635dad4d8e52e9b38c2e9e0d1 Merge: 9fa8038f2 445582851 Author: wanggb Date: Tue Sep 24 13:47:57 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 9fa8038f2ebca652cd1c6a1fa6bdc6b48567e2e3 Author: wanggb Date: Tue Sep 24 13:47:49 2019 +0800 KL规则管理，检索 commit c8165f72381305cceadfe3ac2e33e5ba130b7247 Author: 李天时 Date: Tue Sep 24 13:42:15 2019 +0800 书架相关，修改书架脚本 commit b04408b78815c07f466fd510a077f09bc960c0aa Merge: 9cba59aac 35895a18d Author: zhenglh Date: Tue Sep 24 10:56:07 2019 +0800 Merge branch 'dev-kl-update-20190909' into dev-kl-follow-20190923 # Conflicts: # application/command.php commit 44558285127ce3d31e6a69950e7125c9debc350f Author: liyt Date: Tue Sep 24 10:54:35 2019 +0800 未选择选项隐藏并置空 commit 9cba59aac6b573e875d117f09270135a992a732d Merge: 8c0ba0b71 72dbbd48a Author: zhenglh Date: Tue Sep 24 10:48:47 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-follow-20190923' into dev-kl-follow-20190923 commit 35895a18dfd1adc930e8119765a9b57374f46c6a Merge: 9ee30c97d dde84af8f Author: zhenglh Date: Tue Sep 24 10:47:16 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 9ee30c97d3c64cca045fb6c0eb24fd6c7a93a6aa Merge: 4649d5ed3 dae8c7e3d Author: zhenglh Date: Tue Sep 24 10:46:57 2019 +0800 Merge branch 'master' into dev-kl-update-20190909 # Conflicts: # application/main/service/AppGuideService.php commit b244650afe20714dfb790a68d91c8761a076e0ab Merge: 74c4e53ae dae8c7e3d Author: 李天时 Date: Tue Sep 24 10:43:31 2019 +0800 Merge remote-tracking branch 'origin/master' commit 74c4e53ae68f82b7dfc3a47dfe77ba875fff534d Author: 李天时 Date: Tue Sep 24 10:43:25 2019 +0800 书架相关，修改书架脚本 commit dde84af8f202e0586e29e93e2685f2e8f8a13011 Author: liyt Date: Tue Sep 24 10:36:46 2019 +0800 城市列表 commit 72dbbd48a3afb1cc25b342af0bca077dd079c5db Author: liyt Date: Tue Sep 24 10:26:12 2019 +0800 刷剩余永久书币 commit 4fd78871becbc4a15e078723cda317c977dcdc83 Merge: c514429cb 4649d5ed3 Author: wanggb Date: Tue Sep 24 10:23:40 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit c514429cb084e3d740186209859729a066a3728d Author: wanggb Date: Tue Sep 24 10:23:31 2019 +0800 KL规则修改, 批量删除 commit dae8c7e3dfe0a1637357498b11fe9802ebcc007d Merge: bbfdf6081 9586946be Author: zhenglh Date: Tue Sep 24 10:18:12 2019 +0800 Merge remote-tracking branch 'origin/master' commit bbfdf6081dfe95e95c2b3de4492501e9016f0a6e Author: zhenglh Date: Tue Sep 24 10:18:03 2019 +0800 用户统计时间错误 commit 4649d5ed3d381e42135fa2e56dd38ea6d598d69d Merge: 5a2bb7838 0f62a6bf9 Author: zhenglh Date: Tue Sep 24 10:04:29 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 5a2bb7838d5bba457a184a086760c61a67c87366 Merge: b7ae585c4 a24a4422e Author: zhenglh Date: Tue Sep 24 10:04:17 2019 +0800 Merge branch 'master' into dev-kl-update-20190909 commit 0f62a6bf921686c37dd1ccedfb37257511d62aa5 Author: wanggb Date: Mon Sep 23 20:31:54 2019 +0800 KL规则修改 commit a73856801b47b5f7d662175e0a0df2770bba24de Merge: 1600e0494 b7ae585c4 Author: wanggb Date: Mon Sep 23 19:45:14 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 1600e0494cca484acc7e2b88f8acd4b6a83a811f Author: wanggb Date: Mon Sep 23 19:45:03 2019 +0800 deduct => dd commit b7ae585c46d8da1479d4bfdec52ee0741d8d86f5 Author: zhenglh Date: Mon Sep 23 19:39:41 2019 +0800 按天计算新老用户 commit cf6287f901b02140689bc456bff79025fe91d305 Merge: ed379fc86 6fd41c233 Author: zhenglh Date: Mon Sep 23 19:33:08 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit ed379fc864be0e810a6cbe700cec238edf9fec9d Author: zhenglh Date: Mon Sep 23 19:32:54 2019 +0800 按天计算新老用户 commit 8c0ba0b71cb744f658170a1d2acaab1544998089 Author: zhenglh Date: Mon Sep 23 19:32:15 2019 +0800 按天计算新老用户 commit 6fd41c233a72b6fdd684996248f7c50fde40f217 Merge: 59ed09151 98de9cdec Author: liyt Date: Mon Sep 23 16:00:32 2019 +0800 Merge branch 'dev-kl-update-20190909' of 192.168.0.31:fe/cps into dev-kl-update-20190909 commit 59ed091516c52a7654413d5c6a6a49e15600d9b9 Author: liyt Date: Mon Sep 23 16:00:25 2019 +0800 js提示 commit 9586946beec76993e44f3aa9d2628315416aca9d (tag: cps_20190923_185836) Merge: db713048c c3107fae2 Author: 李天时 Date: Mon Sep 23 15:07:39 2019 +0800 Merge branch 'master' into dev-bookshelf-special-20190904 # Conflicts: # application/command.php commit db713048cd9c1aeeebb1accc73b732f055d23b77 Author: 李天时 Date: Mon Sep 23 14:49:27 2019 +0800 书架相关，书架列表 commit ec15214b78ac989516b0155a3e90676c8a68dcbf Author: 李天时 Date: Mon Sep 23 14:35:26 2019 +0800 书架相关，书架列表 commit 98de9cdeca13aaa96f0991d19d53d7a5afff3586 Author: zhenglh Date: Mon Sep 23 14:27:42 2019 +0800 缓存优化 commit bca8cb96879e4e975b355ac26d564020c335eb4b Merge: c5339337e 5643b4b40 Author: zhenglh Date: Mon Sep 23 14:10:36 2019 +0800 Merge branch 'dev-kl-update-20190909' of http://192.168.0.31/fe/cps into dev-kl-update-20190909 commit c5339337e3c59d80009d264d412576447e3cb3c9 Author: zhenglh Date: Mon Sep 23 14:10:32 2019 +0800 缓存优化 commit 5643b4b4039af14f7b97b55b4ad204c738d76f60 Merge: 73d37f94d e783d3323 Author: wanggb Date: Mon Sep 23 13:54:07 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 73d37f94d043a087cc5a5d03ed4dd4b5a15e595a Author: wanggb Date: Mon Sep 23 13:53:56 2019 +0800 扣量规则，增加权重 commit b074ab888cab4714abf0f8e5929a2a946636a571 Author: 李天时 Date: Mon Sep 23 12:01:15 2019 +0800 书架相关，书架列表 commit d2a3dd36179a474d976a7fa802d6090d121869e9 Author: 李天时 Date: Mon Sep 23 11:06:19 2019 +0800 书架相关，书架列表 commit e783d3323f7f31f33700e584e4e103718b84dd5b Author: liyt Date: Mon Sep 23 10:35:14 2019 +0800 扣量配置 commit c3107fae29d711490c8f4683df053218059c9774 (tag: cps_20190923_102147) Author: liyt Date: Sat Sep 21 19:28:32 2019 +0800 vip测试粉丝跳过不匹配公众号 commit 28bd9a6c7adcae79fafabf0eb00e911327a57285 Author: zhenglh Date: Sat Sep 21 18:33:44 2019 +0800 渠道所在城市添加 commit 00fa568c35b8ac896e14594102e3fcb7a691d03e Author: zhenglh Date: Sat Sep 21 18:17:55 2019 +0800 日志整理 commit 571697ef44a09eecfb7e7c8ca0f923049705b4cc Merge: 4e68865ba 332cbca62 Author: zhenglh Date: Sat Sep 21 17:43:54 2019 +0800 Merge branch 'dev-kl-update-20190909' of http://192.168.0.31/fe/cps into dev-kl-update-20190909 commit 4e68865ba65419b8e744d2223940f10f1a888741 Author: zhenglh Date: Sat Sep 21 17:43:46 2019 +0800 书币扣减，重复回调限制 commit 332cbca62536c68715ecb84cc5fb5e309e77a2ef Author: wanggb Date: Sat Sep 21 16:48:30 2019 +0800 查询用户信息，chongzhijilu不展示扣量的信息 commit 2553c3807851d80f11bf501551def3d9aa627bbc Author: 李天时 Date: Sat Sep 21 15:59:41 2019 +0800 书架相关，书架列表 commit fe45f08f669f26dc90ed78d2b9bbcb9df89c71a3 Author: wanggb Date: Sat Sep 21 15:57:06 2019 +0800 查询用户信息，不展示扣量的信息 commit f16919c3518ee1917210cdeb99d5da3288600baf Author: wanggb Date: Sat Sep 21 14:58:16 2019 +0800 Table 表格对齐 commit 4d81988d368d648108f74bdde573ef5ffdf627ad Author: wanggb Date: Sat Sep 21 14:44:07 2019 +0800 recharge表中增加KL标记 commit 4ad23ef86b40cd6e274b8b67569cf42aa58ac051 Author: 李天时 Date: Sat Sep 21 14:30:05 2019 +0800 书架相关，书架列表 commit 4334761723d6f2fa6883b97f2a98ee92ffea951b Author: wanggb Date: Sat Sep 21 14:15:29 2019 +0800 KL规则管理完善 commit 49ba2aafe4889179e2c834ca4b9306312444fa27 Merge: 7f00e47c5 3da6502e9 Author: wanggb Date: Sat Sep 21 11:39:17 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 7f00e47c5b5c4855a1cf8a5d87b03be9216e40b7 Author: wanggb Date: Sat Sep 21 11:39:05 2019 +0800 KL规则管理完善 commit 3da6502e9181e9aac5859345e8c06b8954ea1a4c Author: liyt Date: Sat Sep 21 11:33:23 2019 +0800 扣量规则 commit cdd2e27447e9eefc361dcbbf146d80e0907fc061 Merge: 742fb0a3c b80d951ce Author: wanggb Date: Fri Sep 20 20:45:59 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 742fb0a3c9eeddcfb80a40081dae63bc672d1bc4 Author: wanggb Date: Fri Sep 20 20:45:48 2019 +0800 读者查询，用户黑名单 commit 5fcb0abf5986d9a360d2df0346dd1299459b1ef0 Author: 李天时 Date: Fri Sep 20 19:18:05 2019 +0800 书架相关，书架列表 commit b80d951ceedafeb1e24ace1e5cb4ed19d5c8a2f6 Author: zhenglh Date: Fri Sep 20 18:40:03 2019 +0800 用户白名单逻辑 commit 5127331fca4e4bb8bc46f59854d9192387e2ebbf Author: 李天时 Date: Fri Sep 20 18:35:12 2019 +0800 书架相关，书架列表 commit fe4ce6dc53ff8fbf1bc4faa23e803cf8433b7559 Author: zhenglh Date: Fri Sep 20 18:28:08 2019 +0800 用户白名单逻辑 commit e3c4517106313705918a8608b8a9450d84b27f91 Author: 李天时 Date: Fri Sep 20 18:06:11 2019 +0800 书架相关，书架列表 commit f74f89b69f022c64992f77bf53517dd149d4ca2d Merge: 942caea3b a831a20a6 Author: zhenglh Date: Fri Sep 20 17:46:16 2019 +0800 Merge branch 'dev-kl-update-20190909' of http://192.168.0.31/fe/cps into dev-kl-update-20190909 commit 942caea3bed0b62184c22e4a67a94cd006680571 Author: zhenglh Date: Fri Sep 20 17:46:11 2019 +0800 下单测试完成 commit a831a20a63dc14063f17cd4b9ae0775608d6e3b5 Merge: 5898ead0d 3348dc060 Author: wanggb Date: Fri Sep 20 17:44:00 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 5898ead0d3d28d76c68ac396fa163c16ee1c8a32 Author: wanggb Date: Fri Sep 20 17:43:48 2019 +0800 KL规则 关联渠道 commit 3348dc0606183f401430f8380cb7307fb72719b5 Author: liyt Date: Fri Sep 20 17:24:41 2019 +0800 添加规则清理缓存 commit 61f87e03cef5766e8cc69325f9631b7730bb508c Author: zhenglh Date: Fri Sep 20 16:41:52 2019 +0800 新增与直充人数，redis缓存添加 commit 97921ac479fe1cd7e75f4fd9c7ace1097423c6a2 Author: zhenglh Date: Fri Sep 20 16:19:07 2019 +0800 扣量测试，基本通过 commit 9a5c46975dbf434cfa5b9ba67cf3ffd321c428b9 Merge: 701547580 80819cb6e Author: zhenglh Date: Fri Sep 20 15:34:51 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 701547580bf3adcc75e449cd2b8aa9e648bbcb8c Author: zhenglh Date: Fri Sep 20 15:34:42 2019 +0800 debug模式下data日志打印 commit 005b1f9002cd5e951306b6a334eae0838313f7c2 Author: 李天时 Date: Fri Sep 20 15:15:49 2019 +0800 书架相关，书架列表 commit 80819cb6e8fa20c5de7e0b712dc67a5e7f2271a8 Author: wanggb Date: Fri Sep 20 13:49:52 2019 +0800 找出渠道匹配的规则ID commit e9ab82a22b043ed1a75c6c2cc663f8e685d7b514 Merge: 7dd416862 d2eb6aeff Author: zhenglh Date: Fri Sep 20 13:36:25 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit d2eb6aeffd4fb195763fed80807a31000104072f Merge: f7a3ad214 458caa873 Author: wanggb Date: Fri Sep 20 13:01:56 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit f7a3ad214cc189a5f7c5fbd3347a5833c118ccff Author: wanggb Date: Fri Sep 20 13:01:47 2019 +0800 KL规则管理,增加权重，完善 新增 | 编辑 | 删除 commit 7dd416862d429ca4975e52a304459d98ceb0bdae Merge: 458caa873 2fdb27613 Author: zhenglh Date: Fri Sep 20 11:56:00 2019 +0800 Merge branch 'master' into dev-kl-update-20190909 # Conflicts: # application/common/service/OrderService.php # application/main/service/AppGuideService.php commit 458caa873a79315282efdcb505fd938dc135a45d Merge: fe8c2b51a ec3a1688b Author: zhenglh Date: Fri Sep 20 11:48:45 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit fe8c2b51ad4f9ef591f4be76af55c5a144997db7 Author: zhenglh Date: Fri Sep 20 11:48:32 2019 +0800 订单方法修改，待测试 commit ec3a1688b006e93c805bc4249df03ee10a93f12c Author: liyt Date: Fri Sep 20 11:22:46 2019 +0800 扣量规则添加js验证 commit 4d887385f2629f4afba15bfbb9056d2427832976 Merge: 911c51b8d 7594476b7 Author: 李天时 Date: Fri Sep 20 11:15:37 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 911c51b8d7f9e8fb868ce86818aeab71f657e873 Author: 李天时 Date: Fri Sep 20 11:15:30 2019 +0800 书架相关，书架列表 commit 7594476b7751681afc0a93a0a32d06b628746a2c Merge: e20c92ea6 06cee4a51 Author: wanggb Date: Fri Sep 20 11:03:03 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit e20c92ea6b833772f60add1aef9bb4e066426ec4 Author: wanggb Date: Fri Sep 20 11:02:49 2019 +0800 取消缓存测试5秒时间 commit 06cee4a51372890dd519db57f0e82ce5c3ab628f Merge: 5bd30035f 0c3caeaf9 Author: 李天时 Date: Fri Sep 20 10:37:44 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 5bd30035f5222a2b87499f9f56818d3f7d54aa26 Author: 李天时 Date: Fri Sep 20 10:37:36 2019 +0800 书架相关，书架列表 commit e1b21ee9feb00f46ebd82c723494f41b7abe4965 Author: liyt Date: Fri Sep 20 10:36:37 2019 +0800 js验证规则 commit 0c3caeaf9b6605d21b925928dceb7adca533512e Merge: 05e7d836b 0d489c550 Author: wanggb Date: Fri Sep 20 10:25:09 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 05e7d836b9f1ffaef3e33b4b36aa87f054de84f7 Author: wanggb Date: Fri Sep 20 10:25:02 2019 +0800 后台编辑书籍时不清缓存 commit c0863096c51e99e67e405f3a130f493950d4019c Merge: 714ce9e64 6d33bfcf8 Author: liyt Date: Fri Sep 20 10:20:44 2019 +0800 Merge branch 'dev-kl-update-20190909' of 192.168.0.31:fe/cps into dev-kl-update-20190909 commit 714ce9e64a2a5e58cf9be3b69b6cd1f80ebbaea9 Author: liyt Date: Fri Sep 20 10:20:28 2019 +0800 优化扣量规则方法 commit 6d33bfcf8791193a486d9499b0f2bf8d35e5d776 Author: wanggb Date: Fri Sep 20 10:18:22 2019 +0800 批量关联KL规则 commit e8ab892f030577ab28edd4eb04c484ba60eaa914 Merge: c93ca3948 a4f26e4a2 Author: wanggb Date: Thu Sep 19 20:59:41 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit c93ca39482241ea9bc4f87c94ea80117fc1a9f26 Author: wanggb Date: Thu Sep 19 20:59:32 2019 +0800 批量关联KL规则 commit 0d489c550f3121b03863a8a9fa9a13d39542e722 Author: liyt Date: Thu Sep 19 20:34:12 2019 +0800 复制链接 commit a4f26e4a20f449846fa952990061d2ab11ef75f4 Merge: 2266ec7da 15b8b3587 Author: zhenglh Date: Thu Sep 19 20:31:13 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 2266ec7dadb5b61cdad014706577f8539ec889dc Author: zhenglh Date: Thu Sep 19 20:30:59 2019 +0800 基本测试通过 commit a24a4422e31e294a91cdeee67f7fc77651f1ac1e (tag: cps_20190920_134352) Merge: 4897e7e0d 2fdb27613 Author: wanggb Date: Thu Sep 19 19:25:29 2019 +0800 Merge remote-tracking branch 'origin/master' commit 4897e7e0d14742375bc831b0648913aa586e72f6 Author: wanggb Date: Thu Sep 19 19:25:21 2019 +0800 签到自动回复内容 commit 7e28c0be51017d15b778fbe68708e4d0328cf454 Author: wanggb Date: Thu Sep 19 19:24:07 2019 +0800 签到自动回复内容 commit 15b8b358784a463241d30fbf9b9079b91a74a1cc Author: wanggb Date: Thu Sep 19 19:08:40 2019 +0800 书架 | 文末书架推荐 增加清除缓存 commit 2fdb27613b50fe8e1c3e470246e7918505acc953 (tag: cps_20190919_191340) Author: zhenglh Date: Thu Sep 19 18:31:31 2019 +0800 订单统计bug修复 commit 1479e0b0da22aafb7d0e0ce9bcd016159e1e2cdd Author: zhenglh Date: Thu Sep 19 18:31:10 2019 +0800 订单统计bug修复 commit 5510c81ac27ce6e00d76fb85d597c621310cfcc3 Author: wanggb Date: Thu Sep 19 18:01:47 2019 +0800 书架 | 文末书架推荐 增加清除缓存 commit a7f2a533a15eba4836b6060f9f6992af8a392ac0 Merge: 3da971fd2 25f370eb4 Author: wanggb Date: Thu Sep 19 17:47:01 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 3da971fd2684f6827d306d362234f7594564b62d Author: wanggb Date: Thu Sep 19 17:46:52 2019 +0800 书架 | 文末书架推荐 增加清除缓存 commit cac3b4dd0147f6b96308ebcd498dd05c7883872e Author: wanggb Date: Thu Sep 19 17:29:41 2019 +0800 实现单个渠道的关联 commit 25f370eb4864ddfe75cdcfb53e21fb2333949eef Author: 李天时 Date: Thu Sep 19 15:11:53 2019 +0800 书架相关，书架列表 commit b8c3ab8f32d5805ad1e4f48af1de82459e17ac31 Author: wanggb Date: Thu Sep 19 14:35:49 2019 +0800 推荐书架 | 文末推荐书架 增加批量删除 commit 40004fbde0300c096e024144abf58fe819c53646 Author: wanggb Date: Thu Sep 19 14:28:05 2019 +0800 调整页面，加入书架 按钮颜色 commit a4070432f55bd30e8c8bf9166b20cd118a3d07ca Author: wanggb Date: Thu Sep 19 14:16:17 2019 +0800 调整页面，加入书架 按钮颜色 commit 2f77b682daf345653e4882cf26c778269d70df6d Merge: 80a058d03 29746ca08 Author: wanggb Date: Thu Sep 19 14:05:04 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 80a058d0314c1a7e2e41493a65e1eb5819b95a28 Author: wanggb Date: Thu Sep 19 14:04:55 2019 +0800 调整页面，加入书架 按钮颜色 commit 29746ca08c7cacb49c38e0c0a7ac6f5e29db84c1 Merge: c36a0b302 b2ff76067 Author: zhenglh Date: Thu Sep 19 12:01:39 2019 +0800 Merge branch 'dev-bookshelf-special-20190904' of http://192.168.0.31/fe/cps into dev-bookshelf-special-20190904 commit c36a0b3022955f7fb0536fec14caa1a0433b1a93 Author: zhenglh Date: Thu Sep 19 12:01:33 2019 +0800 呼出样式无法关闭 commit b2ff76067ecc9ffba958481154e78429b0c4e90d Author: wanggb Date: Thu Sep 19 11:59:56 2019 +0800 书架推荐书籍 | 文末推荐书籍， 新增| 编辑时不可添加重复的书籍 commit 8b4cfcc55cde4ab6fd827b3cb787994b40a8f8f5 Merge: aa3c8304b a3befdd6a Author: wanggb Date: Thu Sep 19 11:33:55 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit aa3c8304bfa56863b0cad7139c90d75e88000070 Author: wanggb Date: Thu Sep 19 11:33:47 2019 +0800 书籍的Redis是永久缓存，因用到Read_num，删除永久缓存 commit 21dd90f81d4d207f1c995df271047c3f3a125ef2 Author: wanggb Date: Thu Sep 19 11:10:07 2019 +0800 关联 查看 渠道 commit a3befdd6a8a4ac80b30a77f48afa1af5bc42bfcf Author: zhenglh Date: Thu Sep 19 10:46:27 2019 +0800 阅读页主题样式兼容 commit f699e4bd1b0087a364df73763c2040ec8ab03387 Author: liyt Date: Thu Sep 19 10:23:47 2019 +0800 活动track追踪 commit 6369024aebbbc2a6980a3140179c238b4569c1ef Merge: a79a7cf9a 8b2eaee1d Author: wanggb Date: Thu Sep 19 10:15:24 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit a79a7cf9a36756f2249d58fb9fe0eb46e6e0a341 Author: wanggb Date: Thu Sep 19 10:15:15 2019 +0800 书架推荐书籍 | 文末推荐书籍， 新增| 编辑时不可添加重复的书籍 commit 8b2eaee1dbb89f29118156fbd1c458588b864ee3 Author: liyt Date: Wed Sep 18 20:21:49 2019 +0800 专题 commit 4456b6e6f23f393d1c3f3565da89db87b0be4528 Author: wanggb Date: Wed Sep 18 20:06:41 2019 +0800 调整页面，加入书架 按钮颜色 commit daff193bd9ad86ea24d0bdee67547425ec9dca48 Author: wanggb Date: Wed Sep 18 19:54:32 2019 +0800 调整页面TAB颜色 commit c0549366bd2f8e91318199a5b576a6a8ea213ef1 Merge: c271cdcb2 544434332 Author: wanggb Date: Wed Sep 18 19:18:56 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit c271cdcb27957f4e4885904b9b2ca38fbba7933e Author: wanggb Date: Wed Sep 18 19:18:49 2019 +0800 测试，将缓存时间改为5秒 commit 544434332bd43e8d4263d0a8b469f56d98d9d044 Author: liyt Date: Wed Sep 18 19:15:49 2019 +0800 专题页按钮宽度 commit c3807c73ef935b6a6751e530f08e43bee222960c Author: wanggb Date: Wed Sep 18 19:11:28 2019 +0800 书籍阅读页，维护阅读数UV过滤 commit 90f238f3858b68540ae83a649d13c7c08b2f43ee Author: wanggb Date: Wed Sep 18 19:11:06 2019 +0800 书籍阅读页，维护阅读数UV过滤 commit 0a0fb57f3ec2fd01f501123fef428cb680af062a Merge: d10708783 b8bbfb01f Author: wanggb Date: Wed Sep 18 18:51:54 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit d10708783add12cb3dd38c57537ff16b12561813 Author: wanggb Date: Wed Sep 18 18:51:46 2019 +0800 书籍阅读页，维护阅读数UV过滤 commit 5664bb782a2d452bb01c1f9e7102d5ce80d71db1 (tag: cps_20190919_134607, tag: cps_20190918_180450) Author: zhenglh Date: Wed Sep 18 17:47:00 2019 +0800 字段属性变更 commit b8bbfb01fa0724f1a6ab939e2d06396188bf7dd1 Author: liyt Date: Wed Sep 18 17:42:17 2019 +0800 专题页活动打点 commit 9d65d6049e8def07533d33e055ba5810e416b3f9 Author: wanggb Date: Wed Sep 18 17:09:42 2019 +0800 阈值，根据UV计算 commit cf8154c99f67676260ae46790cb24bbbb431ec00 Author: wanggb Date: Wed Sep 18 16:26:39 2019 +0800 阈值，根据UV计算 commit 0da53d9d31d63904555ac78cd83217842ee412ff Author: wanggb Date: Wed Sep 18 16:17:08 2019 +0800 继续阅读，加入书架全平台修改 commit 1816951fe825ef8d8fb5abb9d2fe95d12013708d Merge: 7c7aa45e5 e0488a17e Author: wanggb Date: Wed Sep 18 14:52:13 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 7c7aa45e591466bbeb9935b3c07122d850b4d33d Author: wanggb Date: Wed Sep 18 14:52:05 2019 +0800 猜你喜欢，Redis中读取顺序 commit e0488a17e53a66832a2ef2ddbeca8ec04632d909 Merge: b03ed2920 ba27e7d05 Author: zhenglh Date: Wed Sep 18 14:49:01 2019 +0800 Merge branch 'dev-bookshelf-special-20190904' of http://192.168.0.31/fe/cps into dev-bookshelf-special-20190904 commit b03ed2920da6d02880cedb56d16346145c93e1ac Author: zhenglh Date: Wed Sep 18 14:48:52 2019 +0800 阅读页样式修改 commit ba27e7d05585653beb6286e5e50616a832ba8d77 Author: wanggb Date: Wed Sep 18 13:49:05 2019 +0800 书籍详情页面，增加猜你喜欢 commit 6a15807383f4635db1e23d428440e37a10770407 Author: wanggb Date: Wed Sep 18 12:01:55 2019 +0800 我的书架，修改各主题样式 commit a456465b5e83eafc1fbd67e7aa57eba3b19e149c Author: wanggb Date: Wed Sep 18 11:00:42 2019 +0800 我的书架，修改各主题样式 commit 13eba209b19ba8afa01fd4bfcd5bc13a0143f976 (tag: cps_20190918_112824) Author: zhenglh Date: Wed Sep 18 09:58:43 2019 +0800 统计日志 commit 1dd57836f62a29c6a58cb2d62bab3c484b27c0c7 Merge: fef5d9f73 48c43b55e Author: wanggb Date: Tue Sep 17 20:23:41 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit fef5d9f739415de5f0b139ed1b7d2c3092dc95af Author: wanggb Date: Tue Sep 17 20:23:31 2019 +0800 产品需求，书籍末页有推荐书籍ID情况下，干掉1，2,3跳转 commit 48c43b55ee0a51d70af7ae341c4ee1d2574123a7 Merge: b8d0c7437 9b4f4013a Author: liyt Date: Tue Sep 17 20:06:06 2019 +0800 Merge branch 'dev-bookshelf-special-20190904' of 192.168.0.31:fe/cps into dev-bookshelf-special-20190904 commit b8d0c7437b8ee75705fef58f910f7bd99733963a Author: liyt Date: Tue Sep 17 20:05:57 2019 +0800 下架角标 commit 9b4f4013a8b582a20f72558fe88aded5cbcdc599 Merge: 7baeed5a2 714e00783 Author: wanggb Date: Tue Sep 17 20:01:57 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 7baeed5a243770853cc428795370305bff2afd76 Author: wanggb Date: Tue Sep 17 20:01:49 2019 +0800 产品需求，书籍末页有推荐书籍ID情况下，干掉1，2,3跳转 commit 714e00783917e95edf987bd175ea3c447d38ff5c Author: liyt Date: Tue Sep 17 19:59:56 2019 +0800 下架角标 commit b0ad101a10f062eb8307b57cae1d90f7b50c26b7 Author: zhenglh Date: Tue Sep 17 19:25:11 2019 +0800 订单统计添加业务线 commit d59e906c6054e43896f62276a3c765b5ee5359d8 Merge: 03b034473 0e819e847 Author: zhenglh Date: Tue Sep 17 19:20:16 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 03b0344731534fd7ef59910268264e425a8919b9 Author: zhenglh Date: Tue Sep 17 19:20:06 2019 +0800 性别字段未保存成功 commit 0e819e847fa6c5357ec70826fb4110afc96a23b3 Author: 李天时 Date: Tue Sep 17 19:11:03 2019 +0800 书架相关，书架列表 commit dd3fe4c30af5cd273421a5b7b99467c58da5cd12 Author: liyt Date: Tue Sep 17 18:08:27 2019 +0800 扣量 commit 7bb19faa7476db949c7b09475ee0c0c53ae0a2ca Author: wanggb Date: Tue Sep 17 17:54:12 2019 +0800 猜你喜欢，作者码字 commit 1d53e39d367db338a3c94e53203c68183ab381b3 Merge: 5005f76c6 af3c3ea00 Author: wanggb Date: Tue Sep 17 17:38:30 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 5005f76c61746ac45a726c402c6693bf615d5810 Author: wanggb Date: Tue Sep 17 17:38:22 2019 +0800 猜你喜欢，作者码字 commit af3c3ea00b60a15d1808f359b2aa7dbb283ade37 Author: liyt Date: Tue Sep 17 17:28:26 2019 +0800 资源排序 commit 81c86220f0bad4e593d9db729b6205ce5a3d6e7d Author: wanggb Date: Tue Sep 17 17:26:10 2019 +0800 猜你喜欢，书籍ID排重逻辑 commit 3ca5fbd58bf4404ac864d730822d208d52f05c51 Author: wanggb Date: Tue Sep 17 17:22:40 2019 +0800 猜你喜欢，书籍ID排重逻辑 commit b61b75d6f09579ca6f3bed3648ac7b4fdbf0ceac Author: liyt Date: Tue Sep 17 17:20:28 2019 +0800 ip库 commit 41ece016c8c3b09d50a9f9c85c3bf9d694e1446f Author: liyt Date: Tue Sep 17 17:15:55 2019 +0800 城市白名单 commit 5db0949a7302fd958825ab7d43712da301165457 Author: wanggb Date: Tue Sep 17 17:05:32 2019 +0800 书架取消下架角标 commit 85d71b19b39d6a9cfef1f5f2ca08cea14133bfcb Author: wanggb Date: Tue Sep 17 16:47:30 2019 +0800 书籍末尾章节，添加猜你喜欢 commit c90a11e6bea6a2a5272b56a590e4cf6b7709df6e Merge: 708072571 5203c5cfc Author: liyt Date: Tue Sep 17 16:46:06 2019 +0800 城市白名单 commit 70807257134bb1311a2e477e64b4f6b8965808a3 Author: liyt Date: Tue Sep 17 16:44:50 2019 +0800 城市白名单 commit c8f93372623fc1bf76c19532c210a8ed308ffcd5 Author: wanggb Date: Tue Sep 17 16:37:27 2019 +0800 将猜你喜欢,去掉data-zone commit 1cd5d370ef1e6f93052c03a01c0f4d1acba1c50e Author: wanggb Date: Tue Sep 17 16:27:35 2019 +0800 将猜你喜欢变量提公 commit 5203c5cfc73989d7808b41e74c1ba1bfa079689e Merge: d56dad8aa 5a443901f Author: wanggb Date: Tue Sep 17 15:36:42 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit d56dad8aa6e330f22269fe4bf429caa63ba4365d Author: wanggb Date: Tue Sep 17 15:36:35 2019 +0800 扣量规则管理，格式化关联渠道 和 添加规则 commit 5a443901fff3f61ed7c66779d4ec3e3839213fcc Author: liyt Date: Tue Sep 17 15:04:50 2019 +0800 扣量规则 commit c190b66350d8c4fb91880bbd5f04d743744889b1 Merge: e9763e6e7 c4f300478 Author: wanggb Date: Tue Sep 17 14:52:58 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit e9763e6e7fa11803ff8870ec44b38cd3d60af078 Author: wanggb Date: Tue Sep 17 14:52:50 2019 +0800 修改书架交互效果 commit c4f300478f65b89f503b5d8cb08278e6551281af Author: 李天时 Date: Tue Sep 17 14:21:28 2019 +0800 书架相关，书架列表 commit 12d8f2f6e6a616abef2d31c8bda57ab72d7fb83d Merge: 141d70ca5 af6214fae Author: 李天时 Date: Tue Sep 17 14:16:12 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 141d70ca51068dbf821fd7246e80a51463da07af Author: 李天时 Date: Tue Sep 17 14:16:06 2019 +0800 书架相关，书架列表 commit af6214fae426ef48eb4bb8b954a4e5dd5b04d1be Merge: 149ee3209 27e1dd824 Author: wanggb Date: Tue Sep 17 14:08:53 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 149ee3209d72645fc1b5902e79f217174a5d1cc5 Author: wanggb Date: Tue Sep 17 14:08:45 2019 +0800 书架中引入recommend标记 commit 27e1dd8246a5bef5fb848d7e914b51230545449b Author: 李天时 Date: Tue Sep 17 14:01:15 2019 +0800 书架相关，书架列表 commit 4a55313596dc405a99c4665e00a8cb57d7349605 Author: 李天时 Date: Tue Sep 17 14:00:09 2019 +0800 书架相关，书架列表 commit 9cae11298656ba7a66889f05f32af4dbc2726db7 Merge: 5975ab4fb 559970b72 Author: zhenglh Date: Tue Sep 17 13:53:46 2019 +0800 Merge branch 'master' into dev-orders-collect-20190912 commit 5975ab4fb74116823d1d5945c22a8277e77196f9 Merge: b8d1dcbab ea6f726a2 Author: zhenglh Date: Tue Sep 17 13:52:58 2019 +0800 Merge branch 'master' into dev-orders-collect-20190912 commit 7fde3021108bd4035abb715b03ca11b09aebea75 Author: wanggb Date: Tue Sep 17 13:46:09 2019 +0800 我的书架样式调整 commit f48f05c58f117135a8e9144eafc80fbebd75f493 Merge: d6003e284 a40fbd926 Author: wanggb Date: Tue Sep 17 11:50:12 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit d6003e284e14a545368601932b731e63f5f58aa8 Author: wanggb Date: Tue Sep 17 11:50:04 2019 +0800 我的书架样式调整 commit a40fbd926bebaa19ff27a400315f2882b880016e Author: liyt Date: Tue Sep 17 11:41:47 2019 +0800 书籍下架状态 commit c8d67a540dc4afcad30ecc4ba994488d5fee96c1 Author: wanggb Date: Tue Sep 17 11:29:22 2019 +0800 管理无反应JS commit 83249d555c5e8bbd374f35c8dd17842cfac186a2 Author: wanggb Date: Tue Sep 17 11:14:47 2019 +0800 管理无反应JS commit bcc658dfedeb8c85b1c819d45e88ab54036cdcc1 Author: liyt Date: Tue Sep 17 10:49:22 2019 +0800 扣量常量 commit 5d8b9771fb67f5fa370cc23f42ebd57b5b014433 Author: wanggb Date: Tue Sep 17 10:45:53 2019 +0800 修改加入书架样式 commit f289254577c4311dd8dbc7c9520d15a254a54103 Author: wanggb Date: Tue Sep 17 10:42:06 2019 +0800 修改加入书架样式 commit 089d575059198c2fd3f37113fbe597393a51f0b8 Merge: 61a56238a bc696ef0e Author: wanggb Date: Tue Sep 17 10:34:24 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 61a56238ace3cadbf07d8d3166a906d16c3f2b6b Author: wanggb Date: Tue Sep 17 10:34:15 2019 +0800 修改加入书架样式 commit d88ca98be50f1acd5b8ab58f216ce4c06fe17cc4 Merge: 63b77ecc3 b783775e5 Author: liyt Date: Tue Sep 17 10:28:44 2019 +0800 Merge branch 'dev-kl-update-20190909' of 192.168.0.31:fe/cps into dev-kl-update-20190909 commit bc696ef0e31b12234869ff3b41b09fb91f276048 Author: liyt Date: Tue Sep 17 10:21:22 2019 +0800 书籍去向 commit 6eaa16837540f2593036e042b052005139575aba Author: liyt Date: Tue Sep 17 10:08:41 2019 +0800 专题样式修改 commit 48e1fbd557aefc3c5b4da45cb28b36db51e65465 Merge: cd5fa0e3b c908e7273 Author: 李天时 Date: Mon Sep 16 20:24:12 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit cd5fa0e3b9c5fe5f144bccbf70d51f4bb9d968a6 Author: 李天时 Date: Mon Sep 16 20:24:06 2019 +0800 书架相关，书架列表 commit c908e727386db7c1aea6ca205814bdc5a61105de Author: liyt Date: Mon Sep 16 20:20:31 2019 +0800 添加书单默认隐藏 commit b8d1dcbabc04996c0ffbc31a8278760237024616 Author: zhenglh Date: Mon Sep 16 20:16:25 2019 +0800 统计修改 commit 196b327acef5d0e3eac9af1a6e9fd322d04ebd64 Author: liyt Date: Mon Sep 16 20:04:53 2019 +0800 书籍去向 commit b783775e54325d9b04c14def99155062234ce149 Author: wanggb Date: Mon Sep 16 20:01:30 2019 +0800 格式化状态显示 commit c0863ca4aa7e88861de847a58e706b1fb74dbbbe Author: zhenglh Date: Mon Sep 16 19:37:34 2019 +0800 用户统计 commit 559970b72130326bf4e16d3a20905c2da1684b5d Author: liyt Date: Mon Sep 16 18:35:22 2019 +0800 订单列表搜索条件 commit 4752e2249822a26eabdd4e8ca6d6c13bf69a3036 Author: liyt Date: Mon Sep 16 18:32:36 2019 +0800 专题优化 commit c721e147ba768b221cf95b40f49e97ce06c44d98 Merge: f1ba9d496 a27e3954a Author: 李天时 Date: Mon Sep 16 18:24:09 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit f1ba9d496c480bc9e9d3e75c8156dc8e5f2fc77f Author: 李天时 Date: Mon Sep 16 18:24:02 2019 +0800 书架相关，书架列表 commit a27e3954a6ae7e9b67aec3f8360390127ac8287a Author: liyt Date: Mon Sep 16 18:03:31 2019 +0800 扣量常量 commit 879f83b67be478a4f3a6d9518c265d1d2705b477 Author: liyt Date: Mon Sep 16 18:01:51 2019 +0800 专题优化 commit fc0e4dbc11d5895a7d4da24b224a16f39c99a696 Author: 李天时 Date: Mon Sep 16 17:39:20 2019 +0800 书架相关，书架列表 commit a2e0b52d67c8c572a400069d2b42d4a51fee1ab5 Author: zhenglh Date: Mon Sep 16 17:33:52 2019 +0800 用户统计与订单统计方法测试完成 commit a8b7111b26fe0ff3f20f50df7dd68d2a03a04597 Merge: 85d60aecd 4d1ee3f2d Author: 李天时 Date: Mon Sep 16 17:24:47 2019 +0800 Merge branch 'master' into dev-bookshelf-special-20190904 commit de3404438a843526277f92cc132a77f97f5d8cc7 Author: zhenglh Date: Mon Sep 16 17:12:00 2019 +0800 用户统计测试完成 commit 85d60aecdcc8bc5030cb6509e4246be711e4e691 Merge: 84570995c d5e1e2def Author: 李天时 Date: Mon Sep 16 16:47:23 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 84570995cd81bd14c167504492d85000b68e021f Author: 李天时 Date: Mon Sep 16 16:47:17 2019 +0800 书架相关，书架列表 commit 4d1ee3f2da66c709d7470e1d8805f4274b8454e4 (tag: cps_20190916_163937) Merge: 2a3f55133 cfcf0bd7a Author: wanggb Date: Mon Sep 16 16:35:39 2019 +0800 Merge branch 'dev-app-20190806' commit bdc2bd6fe84b884979600d67d21a830ca29dcac7 Author: wanggb Date: Mon Sep 16 16:30:07 2019 +0800 增加JS commit 63b77ecc37e60a25e9794665e078f8afbf0b8de6 Author: liyt Date: Mon Sep 16 16:11:32 2019 +0800 扣量常量 commit 05644201266fde6b3ffd116144edb56e71c5024f Author: liyt Date: Mon Sep 16 15:19:06 2019 +0800 kl规则 commit f35fc48ecbbc05e0f2a6da811888b511e92f1fde Author: zhenglh Date: Mon Sep 16 14:09:48 2019 +0800 订单测试完成 commit 2a3f55133a311e31ef0520654495ec1b7263517c (tag: cps_20190916_161133) Author: wanggb Date: Mon Sep 16 14:08:51 2019 +0800 vip提现记录页面，取消普通检索 commit dcefc9b36b92ec015d4c3b9cb19a2c29fe01976a Author: wanggb Date: Mon Sep 16 13:45:16 2019 +0800 KL规则管理新增页面 commit d5e1e2def48a5d070d136510feb5f8a8ebdb60aa Author: zhenglh Date: Mon Sep 16 12:41:44 2019 +0800 加入书架 commit 12faf012af2cd85db11661cfa765e48facb74aed Author: zhenglh Date: Mon Sep 16 12:22:50 2019 +0800 加入书架 commit d619257685983f82c3c1f319ced934e1f27ac877 Merge: eb6937df7 bd80638fc Author: zhenglh Date: Mon Sep 16 11:17:32 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit c134f92ba6eb3837bc758dc3f070c8d2c71c4329 Author: zhenglh Date: Thu Sep 12 21:07:42 2019 +0800 测试 commit bd80638fc5c87143198ea8e5281e1be36c8f5167 Author: wanggb Date: Thu Sep 12 20:47:01 2019 +0800 修改阳光主题下，加入书架动作 commit 8fb0fc7c16c67cff902794d85deacc30ad187c42 Author: zhenglh Date: Thu Sep 12 19:54:42 2019 +0800 订单统计，待测试 commit 4c2acaf35d614b9b9ab9ae13133de4caf4bc9a24 Author: wanggb Date: Thu Sep 12 19:48:02 2019 +0800 修改书架样式 commit 702cf4efd51f9f3cf9a31f0a5857971370dccb70 Author: 李天时 Date: Thu Sep 12 19:39:28 2019 +0800 书架相关，书架列表 commit e13e2921590aa61cbab5b08e75a3decc8c67b1ed Author: liyt Date: Thu Sep 12 18:20:01 2019 +0800 扣量规则js commit 8c5c9762011a51a3145176aecb7094ec1f0ae7ab Author: 李天时 Date: Thu Sep 12 18:14:58 2019 +0800 书架相关，书架列表 commit 449a59dadc037cf106939944cff5726886f8210f Author: liyt Date: Thu Sep 12 17:48:45 2019 +0800 数据列展示 commit 7c74948665d34b470ab732175d8579a4f52d7f7c Author: 李天时 Date: Thu Sep 12 17:47:48 2019 +0800 书架相关，书架列表 commit 0db8e764d396728e5f403b27a2952502a2d6af1d Merge: 49d3859c8 367fe3211 Author: wanggb Date: Thu Sep 12 17:46:29 2019 +0800 Merge remote-tracking branch 'origin/dev-kl-update-20190909' into dev-kl-update-20190909 commit 49d3859c892c52ae8629623541de9d89616ba420 Author: wanggb Date: Thu Sep 12 17:46:20 2019 +0800 CPS后台，增加KL规则菜单 commit cfcf0bd7a9b1d4aeeb824fed4c2b7a2eaec3c124 Author: wanggb Date: Thu Sep 12 17:33:34 2019 +0800 APP返回用户记录时，增加notes commit daf87d53a35564e3b27edaeaccf33407b738710a Author: wanggb Date: Thu Sep 12 17:30:22 2019 +0800 APP返回用户记录时，增加notes commit 271b7085c1603e0ebc68dd1ca646ae2540101a19 Author: wanggb Date: Thu Sep 12 17:27:45 2019 +0800 APP返回用户记录时，增加notes commit ffbd4e53bad56369b289e84e6e3621011aadcfca Author: wanggb Date: Thu Sep 12 17:24:17 2019 +0800 APP返回用户记录时，增加notes commit 90a36bde1eea214a7198be3f4303fcfac9cd6301 Merge: 2f2cf5000 ea6f726a2 Author: wanggb Date: Thu Sep 12 17:08:15 2019 +0800 Merge branch 'master' into dev-app-20190806 commit 2f2cf50007fd494c3d77712b8e4baf4d37ccb9fe Author: wanggb Date: Thu Sep 12 17:05:11 2019 +0800 APP注册时，标记bussiness_line commit 1afe2f3137220066d61ded81ae46e07c302c5af7 Author: wanggb Date: Thu Sep 12 17:01:45 2019 +0800 APP注册时，标记bussiness_line commit 712f5d366be9596d4ce7ac443318451b1dc0a138 Author: 李天时 Date: Thu Sep 12 16:34:21 2019 +0800 书架相关，书架列表 commit d7a70d609b156cc4e47e40e97898e1a73a502557 Author: wanggb Date: Thu Sep 12 16:22:36 2019 +0800 手机号码校验加入 19段 commit 67acd4f88d965889d5a1eae8c48b9f3b7ca269e0 Author: wanggb Date: Thu Sep 12 16:16:24 2019 +0800 APP用户绑定赠送看点增加标记business_line commit 367fe32119ea5af0dab8e5cbdca11bf3a4a93c59 Author: liyt Date: Thu Sep 12 16:14:52 2019 +0800 扣量规则js commit eb6937df7a220384c906b79e5c7cbe510076ebd5 Author: zhenglh Date: Thu Sep 12 15:57:46 2019 +0800 模型修改 commit 587425e02cd015a290dee371020d5ef5f218b2e7 Author: 李天时 Date: Thu Sep 12 15:42:38 2019 +0800 书架相关，书架列表 commit eb5651452c1fbceefd102e7003e9910d78b86e86 Author: zhenglh Date: Thu Sep 12 15:38:43 2019 +0800 获取不存在属性的异常捕获 commit e1eb63757fc45e08415ac772749acedcc554a088 Author: zhenglh Date: Thu Sep 12 15:32:40 2019 +0800 阅读页导航添加配置，模型追加属性修改 commit bc30b87912e529ef12dd50a6fd7fb421eb013ef5 Author: wanggb Date: Thu Sep 12 15:32:06 2019 +0800 后台，根据用户手机查询用户 commit 899e2fd90669c908cfa962eac522ccfa2869e433 Merge: 3ac6c3e02 5529af75d Author: 李天时 Date: Thu Sep 12 14:42:51 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 3ac6c3e022c0e56d265749c89f405a1c9ce9b40c Author: 李天时 Date: Thu Sep 12 14:42:43 2019 +0800 书架相关，书架列表 commit ea6f726a2415b13178a5c5cd1fabb12604ebf628 Author: liyt Date: Thu Sep 12 14:41:08 2019 +0800 客户端数据菜单 commit fdf8edef58f71a999aab64259fa46cbd23a66a8b Author: liyt Date: Thu Sep 12 14:24:10 2019 +0800 客户端数据菜单 commit 5529af75de16c477d37950f26533bebdd585d214 Author: wanggb Date: Thu Sep 12 12:02:47 2019 +0800 所有主题，书架页面增加TAB commit 65966cfa215dd7b6aed560ebd05fd6a591ceb25b Author: 李天时 Date: Thu Sep 12 11:44:17 2019 +0800 书架相关，书架列表 commit 2bfbacb24a503cbbbdbb0a17453be2f372a36934 Author: liyt Date: Thu Sep 12 11:31:49 2019 +0800 规则添加 commit f8f2fcccef908195b4cc33a0be5a18247d632bee Author: 李天时 Date: Thu Sep 12 10:37:51 2019 +0800 书架相关，书架列表 commit b4b1d557adac02c7fc24a7012e7908f83e8e359e Merge: d406f518f ffe80fce2 Author: 李天时 Date: Thu Sep 12 10:14:17 2019 +0800 Merge branch 'master' into dev-bookshelf-special-20190904 commit d406f518f6b7d08d94ae04d0ab6f6b1b0e15cbee Author: wanggb Date: Wed Sep 11 20:24:16 2019 +0800 调整页面样式 commit 6488d332696962f987490d414a7cda49312cd8e4 Merge: 0c7ee8fec e1cf9fdd0 Author: wanggb Date: Wed Sep 11 20:22:48 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 0c7ee8fec2af327e5dce1b49af71e77e3455ced7 Author: wanggb Date: Wed Sep 11 20:22:40 2019 +0800 调整页面样式 commit e1cf9fdd0ae68bbb4fabf123aa64eefb9f43936e Author: 李天时 Date: Wed Sep 11 20:20:34 2019 +0800 书架相关，书架列表 commit e87c7e94a36edf68d5caeba075d147f71af73cbe Author: wanggb Date: Wed Sep 11 19:44:56 2019 +0800 完成删除书架操作 commit 57d102728c414a3fdd7f9f204534c8f944d2b3db Author: zhenglh Date: Wed Sep 11 19:38:40 2019 +0800 扣量待测试，渠道链接生成时过滤非法参数 commit 61622f0eeac32c7f7729b0796b9781d11f5615f4 Author: 李天时 Date: Wed Sep 11 19:15:35 2019 +0800 书架相关，书架列表 commit ffe80fce2fd23943799315487b7ea1edb4299454 Author: 李天时 Date: Wed Sep 11 18:17:04 2019 +0800 阳光app，解决章节内容p标签问题，解决redis管道落在编号1上的问题 commit 2312f53a665b5964707db79eeda906d4aac4bbcb Author: wanggb Date: Wed Sep 11 17:18:56 2019 +0800 修改我的书架布局和样式 commit deac4f0b842997c90707984c9df4ba3611ce7e86 Author: guyuexuan <2651919937@qq.com> Date: Tue Sep 10 21:57:47 2019 +0800 增加 redis 限流机制 commit 564b4b15938b51f5ac7db9eec1dffc613ce94230 Author: 李天时 Date: Wed Sep 11 15:14:05 2019 +0800 书架相关，书架列表 commit 5b5f3f50e93829d05a6b2ba011841394526f09bc (tag: cps_20190911_142841) Merge: 89c5e466b d88fe0aa2 Author: 李天时 Date: Wed Sep 11 13:39:05 2019 +0800 Merge branch 'dev-app-20190806' commit d88fe0aa2dd4dff350c81afe933220380ab4af67 Author: 李天时 Date: Wed Sep 11 13:38:45 2019 +0800 阳光app，修复章节内容变量格式问题 commit 3c487247a5bed290600170d445fde9bf0902d06f Merge: 99a1915ce 30ec92de0 Author: 李天时 Date: Wed Sep 11 11:54:52 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 99a1915ceda11bdf4f3f6496cc386d5f131432ba Author: 李天时 Date: Wed Sep 11 11:54:45 2019 +0800 书架相关，书架列表 commit 89c5e466bebf0a39faef6cfedb614cdc875d1947 Merge: a763ebb05 2fed2d4e4 Author: liyt Date: Wed Sep 11 10:13:57 2019 +0800 Merge branch 'dev-activity-first-tpl-20190910' commit b2b753475e86097d99d28e7c81b1ed9112fb632c Author: liyt Date: Wed Sep 11 10:06:57 2019 +0800 扣量新增 commit a763ebb0576c645f8e15365c117709b2f937ae05 Merge: 964367dd2 8f890e83a Author: zhenglh Date: Tue Sep 10 21:21:02 2019 +0800 Merge remote-tracking branch 'origin/master' commit 964367dd2621c8028be26f96e594b1db71914f73 Author: zhenglh Date: Tue Sep 10 21:20:52 2019 +0800 有效期至提示添加，商品模型返回值错误，短链无法生成 commit ca4db709ee25dda44a1b5ab75609d6747b604610 Author: 李天时 Date: Tue Sep 10 20:30:52 2019 +0800 书架相关 commit 2fed2d4e408b068115811d2f5c5a665a50690f25 Author: liyt Date: Tue Sep 10 19:45:09 2019 +0800 首冲9.9充值模板 commit 3b5de110ef17f5f98873f1a6318ebf941b6eac94 Author: 李天时 Date: Tue Sep 10 18:42:11 2019 +0800 书架相关 commit 44a3beedde58ab78f71bcdd5ac6181a25e88a270 Author: liyt Date: Tue Sep 10 17:16:06 2019 +0800 扣量规则添加 commit 8f890e83a8979ba2882e8da7618f0b4c0f4c8a34 (tag: cps_20190910_161919) Merge: 80d0c8067 72162bd3d Author: wanggb Date: Tue Sep 10 15:27:44 2019 +0800 Merge remote-tracking branch 'origin/master' commit 80d0c80676ba241043eb3fde86573d475f30d250 Author: wanggb Date: Tue Sep 10 15:27:32 2019 +0800 后台通用验证码配置开启，不根据debug来处理 commit 30ec92de0559ebf6265bcde8fe79db4246c0da8e Author: wanggb Date: Tue Sep 10 15:21:44 2019 +0800 书架页面，套用模板 commit 6116090223e4fc185a663ae8d1e58136a5d18c59 Merge: 494792d52 d935fe8f9 Author: wanggb Date: Tue Sep 10 11:50:02 2019 +0800 Merge branch 'master' into dev-bookshelf-special-20190904 # Conflicts: # application/main/service/AppGuideService.php commit 72162bd3d40db011d2ee9dca836b10e80c299cab Merge: 0ebb898a7 d935fe8f9 Author: zhenglh Date: Tue Sep 10 11:19:08 2019 +0800 Merge remote-tracking branch 'origin/master' commit 0ebb898a7ce91b3ccd5802d8e980d0b7941a385a Author: zhenglh Date: Tue Sep 10 11:18:58 2019 +0800 日志报错恢复 commit d935fe8f949c4fcded3265d0b8229903f20adf58 Author: wanggb Date: Tue Sep 10 11:16:31 2019 +0800 APP开关开启才引入打点 commit 494792d52ebecd38e227e2136d4b0fe7911fda92 Author: wanggb Date: Tue Sep 10 10:01:26 2019 +0800 书架模板页面 commit 34365396c482f4e702211795bacf1e276ff56739 Author: zhenglh Date: Tue Sep 10 09:54:44 2019 +0800 模板消息，客服消息支付打点 commit c5637cb073e94c1bb95d39bfa037325ef900a499 Author: 李天时 Date: Mon Sep 9 21:12:20 2019 +0800 书架相关 commit b6b1f9c77335403fa639b31bd1865879eef80ed3 (tag: cps_20190909_204905) Merge: 509de1f92 c3f8ba1a6 Author: zhenglh Date: Mon Sep 9 20:48:03 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 509de1f9240c4bd3e15e37e21057faf5276627d7 Author: zhenglh Date: Mon Sep 9 20:47:58 2019 +0800 cps_log路径过滤 commit 221d8c899a5cfe69ad1053c5268aa45f127a0854 Merge: cc1733de7 c007d932d Author: 李天时 Date: Mon Sep 9 20:01:11 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit cc1733de71e00d7ac9779082c44db0e8d33f8765 Merge: bdb681537 c3f8ba1a6 Author: 李天时 Date: Mon Sep 9 19:54:08 2019 +0800 Merge branch 'master' into dev-bookshelf-special-20190904 commit bdb6815370334ec608f44fa9ffdc976a84fd92b5 Author: 李天时 Date: Mon Sep 9 19:51:00 2019 +0800 书架相关 commit c3f8ba1a6c723df98a1f5408493cebd4b2aebe1e (tag: cps_20190909_203432) Author: wanggb Date: Mon Sep 9 19:48:11 2019 +0800 修复dycode 未定义问题 commit c007d932d7feecd845e2c5e64dc9510cd0e93370 Author: wanggb Date: Mon Sep 9 19:44:02 2019 +0800 书架详情页面修改加入书架 commit 7296f50b3e66b1c52701f4e4df4cbe01e882f416 Author: wanggb Date: Mon Sep 9 17:39:12 2019 +0800 APP连续签到注释掉cps_log.js打点 commit cc65f085634a2611829aa4e1a1df83b3d5e1f3b0 Author: 李天时 Date: Mon Sep 9 17:11:41 2019 +0800 书架相关 commit c5c3009e3d2568f65a999fd8045f9019e43b6622 Author: wanggb Date: Mon Sep 9 16:59:08 2019 +0800 修复dycode 未定义问题 commit 89fb2831a0a061374f7a728eb5b957a98753599e Author: liyt Date: Mon Sep 9 16:40:37 2019 +0800 专题打点 commit fe44cd8a0912f198d32aae5d75638133c5c3afec Merge: 5678a5a0b 4ab4539ad Author: wanggb Date: Mon Sep 9 16:07:32 2019 +0800 Merge branch 'dev-guess-like-20190904' into dev-bookshelf-special-20190904 # Conflicts: # application/common/model/NovelEndRecommend.php # application/index/controller/Book.php commit 4ab4539ad9357b77acfdf229da993bb47e99126e Author: wanggb Date: Mon Sep 9 15:59:34 2019 +0800 增加猜猜你喜欢SERVICE commit a3b8200f43885423040b550690372b43321739d5 Author: liyt Date: Mon Sep 9 15:41:49 2019 +0800 扣量规则方法 commit 645c660af6c3c21efa670e6e72b2e88a21059fe8 Merge: c4e2f398f e5b19741e Author: zhenglh Date: Mon Sep 9 13:42:18 2019 +0800 Merge branch 'master' into dev-kl-update-20190909 commit e5b19741ee95da6e8fc1152b952c8697c68cdd65 (tag: cps_20190909_152634) Author: zhenglh Date: Mon Sep 9 11:43:23 2019 +0800 商品管理预发布 commit 5678a5a0b3cdab7987aeb36e379cdc8df3f25ad6 Author: liyt Date: Mon Sep 9 10:43:29 2019 +0800 专题清理缓存 commit c4e2f398fdb47f66123e71b11b192062ce118eb8 Merge: 2944f897b 62b37eadc Author: zhenglh Date: Mon Sep 9 10:27:51 2019 +0800 Merge branch 'master' into dev-bookshelf-special-20190904 # Conflicts: # application/api/controller/Wechat.php # application/main/service/OrderService.php commit 62b37eadccbc3f44105df95293d5d677dddfe2d9 (tag: cps_20190909_101857) Author: liyt Date: Sat Sep 7 17:06:13 2019 +0800 资源回退 commit e7c4ef31a7433ca147b1e8cb0528fef5c639a518 Author: wanggb Date: Sat Sep 7 17:05:33 2019 +0800 增加猜猜你喜欢SERVICE commit f7de0aebef160a3f548e27e9c90deecac88e82d4 Author: liyt Date: Sat Sep 7 17:04:02 2019 +0800 资源回退 commit 2944f897bea4e38efb127788aac1fc202136426f Author: zhenglh Date: Sat Sep 7 15:57:27 2019 +0800 最近阅读删除背景类 commit 7a1807ad3289281010a25db0fc482ef1c2090c4d Merge: a8b716c69 53fd4b548 Author: zhenglh Date: Sat Sep 7 15:52:01 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit a8b716c69dc59aacbe0f7eb1b3b5f045a3815106 Author: zhenglh Date: Sat Sep 7 15:51:51 2019 +0800 阅读页页面基本完成 commit 53fd4b5480efee51ba61011b5d60730b3a67f2c5 Author: liyt Date: Sat Sep 7 15:39:48 2019 +0800 专题 commit 89cb603dc70a1f2259066aaaf5f2fb747df7f47b Merge: f2c5360d9 a025dfe5e Author: 李天时 Date: Sat Sep 7 15:28:48 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit ff99d1c025b724f77b35af99b3f0a09d17eb6f45 Author: 李天时 Date: Sat Sep 7 15:17:14 2019 +0800 阳光app，书籍详情接口，格式化字数与阅读人数 commit e8810c89987f4fc563fe366e6cf40a59e58c0ef5 Author: 李天时 Date: Sat Sep 7 15:00:14 2019 +0800 阳光app，书籍详情接口，格式化字数与阅读人数 commit b3b04e9880c0ebfe4fdf0acb2d5f7da830f7b7f5 Merge: 1aaba2e37 90dc24b9e Author: 李天时 Date: Sat Sep 7 14:52:19 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 1aaba2e375c82e83a695820d4a6b2a5afecd3016 Author: 李天时 Date: Sat Sep 7 14:52:14 2019 +0800 阳光app，书籍详情接口，格式化字数与阅读人数 commit 90dc24b9eee04f218589dde5609c4128814444bb Author: liyt Date: Sat Sep 7 14:31:32 2019 +0800 书城首页轮播 commit a025dfe5e3fa57930fb480c7853ab8dacd1c1dc2 Author: liyt Date: Sat Sep 7 14:26:17 2019 +0800 专题 commit 81e0b0f48969da002a17b931d213fb6abcdafc2a Merge: a512e4968 3a13fd7db Author: liyt Date: Sat Sep 7 14:19:11 2019 +0800 Merge branch 'dev-bookshelf-special-20190904' of 192.168.0.31:fe/cps into dev-bookshelf-special-20190904 commit 3a13fd7dbc766b811fd78dedb5b1e6d604bec1b9 Author: zhenglh Date: Sat Sep 7 12:07:19 2019 +0800 阅读器页面处理 commit 0fd2b46ef97bbc3f94ca6197cbaf70fc00cc8d45 (tag: cps_20190907_160333) Author: wanggb Date: Sat Sep 7 11:57:41 2019 +0800 设置菜单权限 commit 5ac6a63cb7fda374897fbca972e3f94df2bfb896 Author: wanggb Date: Sat Sep 7 11:55:34 2019 +0800 猜猜你喜欢Sever commit a8557e94293057d8a3818e1cf56eab08da0d62e7 Merge: 39f398bed a5f6f181a Author: zhenglh Date: Sat Sep 7 11:44:31 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 39f398bed57b7eaed92673d010e1186fc51c254f Author: zhenglh Date: Sat Sep 7 11:44:15 2019 +0800 vip图标样式修改 commit e76901cd9ee1cfba271e6647544bcdda4ee09449 Author: zhenglh Date: Sat Sep 7 11:14:47 2019 +0800 阅读页 commit a5f6f181a612fcba5ed360af3811344713fdac53 Merge: 31b93734e a6bb3868f Author: 李天时 Date: Fri Sep 6 20:46:42 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 31b93734e918b396ba280a4cccaedf148abfdb87 Author: 李天时 Date: Fri Sep 6 20:46:35 2019 +0800 阳光app，书架接口修改阅读记录后返回actionTime返回当前时间 commit a6bb3868fda050cde8e7ffd88b7eedfff08ff8ac Author: wanggb Date: Fri Sep 6 20:16:02 2019 +0800 普通代理商只查自己 commit 0fc3ff5c1087a368e7d7d483beb2d00a482e208b Merge: adbde7fd5 35ef8c0bf Author: wanggb Date: Fri Sep 6 20:05:36 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit adbde7fd56b5c633892022a577432e7df490dad1 Author: wanggb Date: Fri Sep 6 20:05:19 2019 +0800 orders_collect表中统计启用新字段 commit 35ef8c0bf68ae35e58f924fa9635affce03f3305 Merge: 387fb89f3 5e99cfb0c Author: zhenglh Date: Fri Sep 6 19:54:37 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 387fb89f36a08a38751f699a827386e5b95e0ab4 Author: zhenglh Date: Fri Sep 6 19:54:27 2019 +0800 订单统计表添加汇总字段 commit 5e99cfb0c0429c27905bf37afa131720aba168a4 Author: wanggb Date: Fri Sep 6 19:52:12 2019 +0800 缺少引用类 commit 911f64c446f51ce9278799ea28a71ca3c8d5ff8c Merge: 5426cdad0 3217bfa0c Author: wanggb Date: Fri Sep 6 19:49:22 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 5426cdad0da218ad9a6c30d65f95987d3cac8c56 Author: wanggb Date: Fri Sep 6 19:49:11 2019 +0800 缺少引用类 commit 3217bfa0c2682126c78f1b01b9c072560740cb3f Merge: 832d88282 8347f4d04 Author: zhenglh Date: Fri Sep 6 19:48:01 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 832d88282f8a52a57703cdf5354cc388d0e616a6 Author: zhenglh Date: Fri Sep 6 19:47:48 2019 +0800 订单统计表添加汇总字段 commit 8347f4d0446b3df671192c9949a7db66886175cf Author: wanggb Date: Fri Sep 6 19:42:29 2019 +0800 APP 导端数据统计，普通代理商只显示充值人数和充值金额 commit ef0049dfd77d6dcd0c1eb294c4a3f4c1de8abe2d Merge: 4570218c2 fa7c49a96 Author: wanggb Date: Fri Sep 6 19:22:59 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 4570218c2898317f57f31886af4c67267e905b81 Author: wanggb Date: Fri Sep 6 19:22:51 2019 +0800 APP 导端数据统计，普通代理商只显示充值人数和充值金额 commit f2c5360d951ec4684ec7e894bf934c0200a0f2d0 Author: 李天时 Date: Fri Sep 6 19:03:26 2019 +0800 书架相关 commit fa7c49a969e267bc46e0fb23ff6216ad14f54db7 Merge: 320d29f79 b8f264a4a Author: zhenglh Date: Fri Sep 6 18:34:18 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 320d29f791b7f7af9e652ff1b1722773d8f0a762 Author: zhenglh Date: Fri Sep 6 18:34:07 2019 +0800 修改商品时清除缓存 commit b8f264a4aad1514b7aac253543770d056c9a0b3f Author: wanggb Date: Fri Sep 6 18:11:10 2019 +0800 APP 导端数据统计，普通代理商只显示充值人数和充值金额 commit 58b5da75e27c9496710c8c856038639b01a04991 Merge: 5474eea4f 3c611c357 Author: wanggb Date: Fri Sep 6 17:17:25 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 5474eea4f70c4fcfff20f488f10bdafabaa7143c Author: wanggb Date: Fri Sep 6 17:17:16 2019 +0800 订单统计 flag = 3 commit 3c611c3576b1c0ce90f199c5198cdb2260cb5175 Author: zhenglh Date: Fri Sep 6 16:12:36 2019 +0800 充值用户数缓存key添加 commit 4ecdbf5db70c84cf5799a9c731136d02a68521b2 Author: zhenglh Date: Fri Sep 6 15:37:47 2019 +0800 充值用户数缓存key添加 commit eeca9e26d8d8fec6e6ea64d8265ab7590ce3684c Merge: 03c2e1bef a7f069dd3 Author: zhenglh Date: Fri Sep 6 15:29:32 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 03c2e1bef30deb3f4884075fb033e18252c7a02f Author: zhenglh Date: Fri Sep 6 15:29:22 2019 +0800 充值用户数缓存key添加 commit a7f069dd3509d1c7559ca27f0243f25cfa0bff57 Merge: d8c56e5ec 941b85d77 Author: 李天时 Date: Fri Sep 6 15:28:14 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit d8c56e5ec6c6fb2bac078342f3f58b420e9f9774 Merge: 015d0b092 27edc208b Author: 李天时 Date: Fri Sep 6 15:27:00 2019 +0800 Merge branch 'master' into dev-app-20190806 commit a512e4968a76b2b23c789f902f9e10783b95dc3a Author: liyt Date: Fri Sep 6 15:14:44 2019 +0800 专题 commit 941b85d7721506345795b943e94aceeef5c24cc0 Author: liyt Date: Fri Sep 6 14:59:35 2019 +0800 跳转异常 commit 015d0b0920d5f5f04010250b6581a19552c6c08c Author: 李天时 Date: Fri Sep 6 14:52:17 2019 +0800 阳光app，修改签名算法 commit 4eba39e6e632b32ce2c50a5675ddda8464c53a32 Author: zhenglh Date: Fri Sep 6 14:35:05 2019 +0800 充值用户数缓存key添加 commit f3ae0f41272bfbc84f06b3aaec2b2683237f7a5f Merge: 2ec09d56f 392c74c13 Author: zhenglh Date: Fri Sep 6 14:33:17 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 2ec09d56fa1f31ffd63b3f20c90d47c9672f0e77 Author: zhenglh Date: Fri Sep 6 14:33:06 2019 +0800 充值用户数 commit 392c74c13af85bf263cb6c94f106fdd932eb108b Author: liyt Date: Fri Sep 6 14:30:05 2019 +0800 跳转异常trycatch commit c8efd7e6aabf11c029554cb8f55a3be2401359e7 Author: liyt Date: Fri Sep 6 14:21:09 2019 +0800 专题 commit c15e296b76c14dafa4c7a9627ae1948274b91634 Merge: 5c639caea 61e468ae8 Author: wanggb Date: Fri Sep 6 11:32:40 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 5c639caea1e5993988e76f043518a97f507ced8a Author: wanggb Date: Fri Sep 6 11:32:33 2019 +0800 发送短信， commit 61e468ae8a890c0864d07c057011c500021892f5 Author: liyt Date: Fri Sep 6 11:18:02 2019 +0800 未登录拉起支付 commit a21a2f68a11d4b5e08165dd9ad58bdb9579e9804 Author: liyt Date: Fri Sep 6 11:06:11 2019 +0800 专题 commit f287ef83d76cb64ce1fd4bc76cb3e6013e77b366 Merge: 22c521a7a 88126f6a9 Author: liyt Date: Fri Sep 6 10:46:43 2019 +0800 Merge branch 'dev-bookshelf-special-20190904' of 192.168.0.31:fe/cps into dev-bookshelf-special-20190904 commit 75ce43d5225afcd026e8265a38e851b9b2f2743a Author: liyt Date: Fri Sep 6 10:46:10 2019 +0800 活动页显示回退按钮 commit 88126f6a976bcebd3a132d1f737f930285418dc9 Merge: f76f7bc03 5a1d74168 Author: zhenglh Date: Fri Sep 6 10:38:10 2019 +0800 Merge branch 'dev-app-20190806' into dev-bookshelf-special-20190904 commit 5a1d74168d94803a2e8e61123948bc147091afdd Author: zhenglh Date: Fri Sep 6 10:37:50 2019 +0800 代理商orders_collect区分业务线 commit 22c521a7a47766161c374e2976a603200f04a4d7 Author: liyt Date: Fri Sep 6 10:37:42 2019 +0800 专题 commit 743fd5ecc44846fb13bbe9a6f28c30ea5d47398b Merge: ddadae842 88788f8bb Author: zhenglh Date: Fri Sep 6 10:25:34 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit ddadae84209e8d62f51055fbea613a5b80f89c71 Author: zhenglh Date: Fri Sep 6 10:25:23 2019 +0800 代理商orders_collect区分业务线 commit 88788f8bbe1a604c5ab363a7253e008532e24f09 Author: wanggb Date: Fri Sep 6 10:20:37 2019 +0800 198手机校验 commit f76f7bc0373094b7434f9d7200e34c463883d8fe Merge: 96a8df4cb f208cbeac Author: zhenglh Date: Fri Sep 6 10:08:49 2019 +0800 Merge branch 'dev-bookshelf-special-20190904' of http://192.168.0.31/fe/cps into dev-bookshelf-special-20190904 commit 96a8df4cb31ca6e387edff2d6015e0c453b88628 Merge: 65780d0e0 89d19f4ea Author: zhenglh Date: Fri Sep 6 10:08:31 2019 +0800 Merge branch 'dev-app-20190806' into dev-bookshelf-special-20190904 commit 65780d0e02310cf70201681ffa3ee7a42ab7eef3 Author: zhenglh Date: Fri Sep 6 10:07:18 2019 +0800 订单添加用户数 commit 268701d04c0177d21753a1cc8ebb4e3d54441a8a Merge: 526a26437 88c86f47a Author: wanggb Date: Fri Sep 6 09:55:07 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 526a264370af794f24d83e9ca292e3fdef17e203 Author: wanggb Date: Fri Sep 6 09:54:55 2019 +0800 198手机校验 commit 89d19f4ea1a336a4a906f72520fb8760f99366b7 Author: zhenglh Date: Thu Sep 5 20:34:37 2019 +0800 渠道添加逻辑 commit 88c86f47a814d716450babfc2ea7ef07ea987560 Author: liyt Date: Thu Sep 5 20:32:21 2019 +0800 书城管理选活动 commit 1f5cdb85ec590766943988e08d38ee0649e783cd Author: liyt Date: Thu Sep 5 20:21:40 2019 +0800 书城管理选活动 commit d781b8d84fdb8b3059b6db284ade534a279ee927 Merge: f868cf536 d039d190f Author: wanggb Date: Thu Sep 5 19:55:10 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit f868cf5362420e2ed033763425e1040f9cd75543 Author: wanggb Date: Thu Sep 5 19:55:02 2019 +0800 collect表，迁移到collect库 commit 6102ca2f534b50223441ca9d6488b071d8d34bb8 Author: zhenglh Date: Thu Sep 5 19:52:58 2019 +0800 添加导航接口 commit f208cbeacbc9dd216cac5fa4698b367d9141d36a Merge: 803745937 d7d5af079 Author: liyt Date: Thu Sep 5 19:51:45 2019 +0800 Merge branch 'dev-bookshelf-special-20190904' of 192.168.0.31:fe/cps into dev-bookshelf-special-20190904 commit 8037459378be23b63eb3dacae3c7ddd6e2d39ccc Author: liyt Date: Thu Sep 5 19:51:38 2019 +0800 专题 commit d7d5af079003aba2956a9e7b9b539b7410e09008 Merge: e981847ae 4148fb3fd Author: wanggb Date: Thu Sep 5 19:11:32 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit e981847aec3681a4cf122c9b5321e0bc04bac1ef Author: wanggb Date: Thu Sep 5 19:11:23 2019 +0800 198手机校验 commit 4148fb3fdf9803f823ba18b4781ff87ab0c99337 Merge: e8b486f06 0c29a7592 Author: 李天时 Date: Thu Sep 5 18:36:58 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit e8b486f0654473fcfe283c4691209431bb8196c6 Author: 李天时 Date: Thu Sep 5 18:36:51 2019 +0800 书架相关 commit d039d190f33a558ebcdeac2d4149bfa9d158a8b3 Author: 李天时 Date: Thu Sep 5 18:19:37 2019 +0800 阳光app，弹窗和运营位下行参数增加beginTime commit 0c29a759250d0778f3150711463e9bac1997554b Merge: c5638e56d fc5ecb6a8 Author: zhenglh Date: Thu Sep 5 18:16:44 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit c5638e56dddb3964f7157920de37105534adbae3 Author: zhenglh Date: Thu Sep 5 18:16:36 2019 +0800 阅读导航添加 commit ff24388a97b52a0b5fb65186bde645dabaa23703 Author: liyt Date: Thu Sep 5 17:56:00 2019 +0800 去掉弹窗阴影 commit eb1c5fbb50370cfad436da2a6dfe00974b7466a5 Author: liyt Date: Thu Sep 5 17:50:01 2019 +0800 专题 commit fc5ecb6a8810a88ab19f936564aac00291be5ccc Author: liyt Date: Thu Sep 5 17:41:06 2019 +0800 专题后台 commit d90274283f401403305bd09b17bc7ee38cdbef52 Author: liyt Date: Thu Sep 5 17:05:35 2019 +0800 专题 commit f602a7a38f187ca1bd6cf02bc5831ce9168896fd Merge: 9b718265e 56fbd8840 Author: zhenglh Date: Thu Sep 5 16:58:55 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 # Conflicts: # application/admin/controller/Novelendrecommend.php commit 9b718265edc920ec2330a23881021bb3918faca3 Author: zhenglh Date: Thu Sep 5 16:58:09 2019 +0800 添加频道 commit 56fbd8840acf1819dacc039fc464bd159a305916 Merge: 73da982b9 364976eb8 Author: wanggb Date: Thu Sep 5 16:54:30 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 73da982b91ae26e0670776d82704438e7721278d Author: wanggb Date: Thu Sep 5 16:54:11 2019 +0800 测试书架 commit 364976eb8e2cb541a78a7376df048f349fc47eec Author: liyt Date: Thu Sep 5 16:47:33 2019 +0800 专题管理 commit b6beca4538dfe62795b6202b117e511a93dfbfc1 Author: liyt Date: Thu Sep 5 16:41:29 2019 +0800 专题模块 commit 5f21aaf5a7f04cbeeb7d82d0b41441e3ce64535b Author: zhenglh Date: Thu Sep 5 16:34:50 2019 +0800 订单转移使用渠道配置 commit 4b9ba092185d7b96ad0d21bcbcd3a567109a2bb7 Author: zhenglh Date: Thu Sep 5 16:23:30 2019 +0800 商品列表 commit c1fea73ecdad7d85213f3e3f394f418a73ef1611 Merge: 447f9c31a 096745463 Author: wanggb Date: Thu Sep 5 15:57:14 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 1d529f2a5e8f2a6a8c09d7c4289febbaa087177e Merge: c9f1b36f7 7bf14a45a Author: zhenglh Date: Thu Sep 5 15:34:27 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit c9f1b36f772b5071726f126f8383f871f159a6e5 Author: zhenglh Date: Thu Sep 5 15:34:22 2019 +0800 商品使用统一格式 commit 7bf14a45ac1acc5027360f4bb89445716644bcc7 Merge: 39c8f7533 6e969bf4d Author: wanggb Date: Thu Sep 5 15:17:24 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 39c8f75330a2b72cdfd3eb3dc05dae602dd3e293 Merge: eee999ceb 12206402d Author: wanggb Date: Thu Sep 5 15:17:19 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 6e969bf4d7d558fefe7f62cff2d06a81ffc35bf8 Author: 李天时 Date: Thu Sep 5 15:17:12 2019 +0800 阳光app，弹窗和运营位下行参数增加beginTime commit eee999ceb7b0ace2c814a7a44fa721808a27aa25 Author: wanggb Date: Thu Sep 5 15:17:09 2019 +0800 导量入口说明 commit 12206402da240727aec7abbdad679896431dd284 Author: 李天时 Date: Thu Sep 5 15:13:32 2019 +0800 阳光app，弹窗和运营位下行参数增加endTime commit 10defcd31a750b8b014fe126a5a6e7e488543457 Merge: d1f17c7d9 80ae8d03b Author: 李天时 Date: Thu Sep 5 15:10:02 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit d1f17c7d913a152ef146deb5ac75893bd9206b94 Author: 李天时 Date: Thu Sep 5 15:09:55 2019 +0800 阳光app，弹窗和运营位下行参数增加endTime commit 80ae8d03b421d1b02220e1acb6232c6328dffbaa Merge: c4d45ad05 01141b9e3 Author: zhenglh Date: Thu Sep 5 14:52:31 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit c4d45ad053f76c3c0ca35b680dd1e2d2fad5c61a Author: zhenglh Date: Thu Sep 5 14:52:25 2019 +0800 渠道vip商品列表 commit 01141b9e3041eda8bcf77216f665a0d07fcae712 Author: liyt Date: Thu Sep 5 14:09:51 2019 +0800 APP活动 commit 096745463bc522d139b4d5fafc0f2bd2e4cd500c Author: liyt Date: Thu Sep 5 14:04:21 2019 +0800 专题页块编辑 commit 4c6c72ce06e7c5a0f29c9a2254dfed6d6a1d6f20 Author: zhenglh Date: Thu Sep 5 14:04:09 2019 +0800 商品列表 commit 77cc4c89b29f42082e86c23e2e6cd30e5369d590 Author: zhenglh Date: Thu Sep 5 13:57:22 2019 +0800 参数管理和商品列表 commit f6fa49ad64fe02f8c5ddd503a0faed3684b2fa33 Merge: b58eea2c7 4ccfc3b4e Author: zhenglh Date: Thu Sep 5 12:30:58 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit b58eea2c742345eaea01bb9a5ea4e75b3da9fc46 Author: zhenglh Date: Thu Sep 5 12:30:54 2019 +0800 测试商品 commit 447f9c31a3c5adcb719fbd88274213381590b96d Merge: 93b2e0b05 51ab0f6ac Author: wanggb Date: Thu Sep 5 11:50:47 2019 +0800 Merge branch 'dev-guess-like-20190904' into dev-bookshelf-special-20190904 commit 93b2e0b05cf596e0a313c1dac21c170cb23f4c92 Merge: 9499b4934 5c67cb725 Author: zhenglh Date: Thu Sep 5 11:43:03 2019 +0800 Merge remote-tracking branch 'origin/dev-bookshelf-special-20190904' into dev-bookshelf-special-20190904 commit 9499b4934b9cb9fe0d6e31a71bfe75e245a35012 Merge: 91ebed36e fbcf10189 Author: zhenglh Date: Thu Sep 5 11:42:47 2019 +0800 Merge branch 'dev-guess-like-20190904' into dev-bookshelf-special-20190904 commit 4ccfc3b4e1b340c93db438a90d9a0c4e382af506 Merge: c030be4a8 216be23da Author: wanggb Date: Thu Sep 5 11:40:33 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c030be4a89c0f1d42895f691a11c92dc6b3b2bf9 Author: wanggb Date: Thu Sep 5 11:40:21 2019 +0800 动态码页面传递用户信息 commit 5c67cb7250f1d297e51e566ab7de5aa04ab986f2 Author: liyt Date: Thu Sep 5 11:35:36 2019 +0800 模块添加 commit 216be23da6a062f30bcbf175b37fbaf4b8f2f2bd Merge: fc4c7ffae 86f0566d4 Author: zhenglh Date: Thu Sep 5 11:33:16 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 86f0566d4399032fc3741707e1618013f5bcb9f4 Author: wanggb Date: Thu Sep 5 11:32:03 2019 +0800 动态码页面传递用户信息 commit fc4c7ffaed02fde3f6d54ded3470dc2ad59814a0 Author: zhenglh Date: Thu Sep 5 11:23:05 2019 +0800 商品列表修改 commit bff8fd646427d47fc6e5e217859cd0c370aa0b4d Author: wanggb Date: Thu Sep 5 11:20:10 2019 +0800 动态码页面传递用户信息 commit 05205752d548544d02fe0672e27a6d9ce73f2fcc Author: wanggb Date: Thu Sep 5 11:10:03 2019 +0800 动态码页面传递用户信息 commit a90194ae087b3766cc74cc903fe1a03621c33afc Merge: ed5a06e1c 58b31f1ef Author: wanggb Date: Thu Sep 5 10:58:27 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit ed5a06e1c2111ca7a70bbb34f6220f660ec5e6f0 Author: wanggb Date: Thu Sep 5 10:58:14 2019 +0800 接口返回 commit 51ab0f6acc157b010a494179f536515117058574 Author: wanggb Date: Thu Sep 5 10:47:13 2019 +0800 书架推荐书库管理 commit 58b31f1ef8ad751777f576625e481755c83a5009 Author: zhenglh Date: Thu Sep 5 10:41:24 2019 +0800 track修改 commit 2e39666ebc34b911ec2621d802afdc61e56aa141 Merge: 83a39254d 1359e57a5 Author: zhenglh Date: Thu Sep 5 10:25:03 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 83a39254d6bcefd3188269569de4691e92cdc147 Author: zhenglh Date: Thu Sep 5 10:24:55 2019 +0800 APP KL支付间隔配置与cps相同，配置去掉 commit 1359e57a52c01fafae9faaeceaf4589e01b14b92 Merge: fc9e56e17 88af87537 Author: wanggb Date: Wed Sep 4 20:37:20 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit fc9e56e1787c821e428cf22a097c1ce5e9ec94ba Author: wanggb Date: Wed Sep 4 20:37:09 2019 +0800 接口返回 commit 88af87537b3bb36fff32e1d4098c87318a29c2bd Merge: bb2198e78 10dd281d7 Author: zhenglh Date: Wed Sep 4 19:32:46 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit bb2198e782958747edc3dbe8f18c1761b906b046 Author: zhenglh Date: Wed Sep 4 19:32:36 2019 +0800 今日回调数据参数错误 commit fbcf10189ce27d004e5e324f89ffb5b5b3a2988b Author: zhenglh Date: Wed Sep 4 19:32:04 2019 +0800 今日回调数据参数错误 commit 10dd281d7b6481a462aed8ce610a3526ed47cdab Author: 李天时 Date: Wed Sep 4 19:11:49 2019 +0800 阳光app，修改批量获取书籍接口 commit e17441b7c247478933172f47b145d326f2f41c21 Author: 李天时 Date: Wed Sep 4 18:54:00 2019 +0800 阳光app，修改批量获取书籍接口 commit c90a31dc976b0bff67452a37132d2e7f7f50fe0f Merge: 9a7400a54 f381973d0 Author: wanggb Date: Wed Sep 4 18:52:10 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 9a7400a54229aa085422b836e8bf97678652af68 Author: wanggb Date: Wed Sep 4 18:51:50 2019 +0800 加入测试接口，打点 commit c54fe134f92448f29682b91f408d15045ee3bfa6 Author: zhenglh Date: Wed Sep 4 18:47:35 2019 +0800 书籍添加点击阈值和排序权重 commit f381973d05f58f325a23420baaff65e21e546421 Author: liyt Date: Wed Sep 4 18:04:33 2019 +0800 客户端H5书城首页 commit 1112688c6854adca7c03ce1da8805e63408032fa Author: wanggb Date: Wed Sep 4 18:00:06 2019 +0800 加入测试接口，打点 commit e0aad0f4e47aa67342bd10701b8d2624b9396ef9 Author: wanggb Date: Wed Sep 4 17:55:49 2019 +0800 签到完成后，传用户信息到APP commit 91ebed36ea66847ffe8d0f2c21510edcecdcb40c Author: liyt Date: Wed Sep 4 17:48:49 2019 +0800 专题页魔力 commit 69b2140d9f83814b80fd158dfb3890abc63008b6 Merge: 1079a3f90 3fec7f874 Author: wanggb Date: Wed Sep 4 17:20:49 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 1079a3f90762808f38ca4e9a95eed0c29f599b63 Author: wanggb Date: Wed Sep 4 17:20:37 2019 +0800 签到完成后，传用户信息到APP commit 3fec7f874cc1b50cb3ac1d7c767d24914dc70e3c Merge: 0762bfc96 2150f4e0c Author: 李天时 Date: Wed Sep 4 17:18:07 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 0762bfc96d4c0923b1b424f14f225d3303342dc9 Author: 李天时 Date: Wed Sep 4 17:18:02 2019 +0800 阳光app，书籍接口更新操作后，返回的当前阅读章节为需要更新的章节 commit db336d65865cac70f1765d2cacae28fea6193085 Author: zhenglh Date: Wed Sep 4 16:47:05 2019 +0800 猜你喜欢后台管理 commit 61017c1ac46f5b765437958d6fa496a0e02aabe3 Author: zhenglh Date: Wed Sep 4 16:00:19 2019 +0800 vip导出添加渠道商列 commit 33f0a169e5b6228cb2d91f56d7913d9e52ba2f47 Author: liyt Date: Wed Sep 4 15:40:46 2019 +0800 专题页管理 commit 2150f4e0c800f91a03f5c14b457a62716fbb1a48 Merge: 098e999d3 2f00c1fd1 Author: zhenglh Date: Wed Sep 4 15:31:00 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 098e999d378f87df169eceec74e253e913ce763f Author: zhenglh Date: Wed Sep 4 15:30:55 2019 +0800 商品处理 commit 2f00c1fd14e9e64bc27da31e17f14792f0a4dcf7 Author: wanggb Date: Wed Sep 4 15:02:45 2019 +0800 APP 管理页面，导端用户格式化导端率 commit ce3f191978692c688fa9d1a5a8f83608b161ecf4 Author: wanggb Date: Wed Sep 4 15:00:25 2019 +0800 APP 管理页面，导端用户数 commit 9d43ee0b23d92fea315cb57daaf64a80e362dd0b Author: wanggb Date: Wed Sep 4 14:56:31 2019 +0800 APP 管理页面，导端用户数 commit 2306a94484336b75c3f54974119b2e696e4dd313 Author: wanggb Date: Wed Sep 4 14:44:40 2019 +0800 APP 管理页面，导端用户数 commit 2b2f1616a8cd10c112942489c4c3c22f39094bb4 Merge: c390937cc ddadd0729 Author: wanggb Date: Wed Sep 4 13:49:43 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c390937cc6ecca5a573c7633120f59699c01a937 Author: wanggb Date: Wed Sep 4 13:49:32 2019 +0800 APP 绑定微信动态码 打点 commit ddadd072903eb8642f4a368ecb8548aa48a6e1c0 Author: 李天时 Date: Wed Sep 4 11:57:33 2019 +0800 阳光app，书架和章节列表接口的chapterKey统一使用book表中的最后章节id commit f21c1a1e70c746e3d98e8042af080e8f3c3f33ac Author: wanggb Date: Wed Sep 4 11:09:09 2019 +0800 APP手机号注册|绑定手机号赠送书币 commit 68a7e6a0aa59d55d780b0910cf7b3b7ade7b7347 Author: wanggb Date: Wed Sep 4 11:04:40 2019 +0800 APK 下载地址设置 commit 51ad15f1f657b28b0da12901701ea73f4fa799fe Author: liyt Date: Wed Sep 4 10:57:08 2019 +0800 生成专题页文件 commit 860195997e28483ad4ef78612dd8b68d6831c69d Author: wanggb Date: Wed Sep 4 10:47:35 2019 +0800 APK 下载地址设置 commit 2da5479f2b772a68026f91455a926ba5e320ab2f Merge: 27edc208b f970f9452 Author: liyt Date: Wed Sep 4 10:12:04 2019 +0800 Merge branch 'dev-app-20190806' into dev-master-app-20190904 commit f970f9452e6cc31ddaa8537c90dadf28108b7ed6 Merge: 6236b94f2 cd0a08a7b Author: wanggb Date: Tue Sep 3 20:53:31 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 6236b94f2f9d548f98664f9c6f31f947ec30b3b0 Author: wanggb Date: Tue Sep 3 20:53:21 2019 +0800 修改openinstall commit cd0a08a7b8546f6992f736061327babe1eb9657e Merge: c6363e8e1 818561034 Author: 李天时 Date: Tue Sep 3 20:36:15 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c6363e8e196cc3a5e9a9100cb331632a52fe0cda Author: 李天时 Date: Tue Sep 3 20:36:10 2019 +0800 阳光app，如果书架上行参数的书籍不在阅读记录中，将参数中的actiontime返回到下行参数。 commit 81856103437a55e52e81a758a6e95be750368c40 Author: liyt Date: Tue Sep 3 19:56:10 2019 +0800 去掉h5验签 commit cd51a9c6ead87347fe6ff04c8ab436d9cf942db9 Author: liyt Date: Tue Sep 3 19:19:11 2019 +0800 自定义商品列表 commit 66218a64786656e11a0b894c6c408bba986b429c Merge: 959875b17 70ed24b77 Author: zhenglh Date: Tue Sep 3 19:01:18 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 959875b1710f2c4891f249f248780b3cbf0c89f6 Author: zhenglh Date: Tue Sep 3 19:01:12 2019 +0800 扣量缓存key修改 commit 70ed24b77b79bbcabc57fcbb0a73b815c6692ce1 Merge: 0918c41a5 2c29fcd2f Author: wanggb Date: Tue Sep 3 18:55:55 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 0918c41a5218f8897367042544677063bd96b8f9 Author: wanggb Date: Tue Sep 3 18:53:17 2019 +0800 签到成功后给安卓传值，标记已签到 commit 2c29fcd2f307ae772581928efed6568420736afe Author: 李天时 Date: Tue Sep 3 18:48:58 2019 +0800 阳光app，书籍详情页推荐书籍，排除当前书籍id commit aeaba71464b6071416f8c1c5d4d80099837d6636 Author: 李天时 Date: Tue Sep 3 18:32:35 2019 +0800 阳光app，书籍详情页推荐书籍，排除当前书籍id commit 957b050e8d4469547b91d98328a52e29a1143351 Merge: 5319ff8ae d7f90e7c0 Author: 李天时 Date: Tue Sep 3 18:03:52 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 5319ff8ae3b1c09feac813db00d27c5c76632f91 Author: 李天时 Date: Tue Sep 3 18:03:46 2019 +0800 阳光app，书籍详情页推荐书籍，排除当前书籍id commit d7f90e7c0a0b86ca4c1783f2c3aad039b9901052 Author: wanggb Date: Tue Sep 3 17:46:24 2019 +0800 签到成功后给安卓传值，标记已签到 commit 0669b57305b961c6b75e7d1a9dabb6ceabd5ee99 Author: wanggb Date: Tue Sep 3 17:09:09 2019 +0800 充值成功，弹出下载 commit 0a7bcd42c2c954f9140d9d9f378d9a39de41e7b2 Author: wanggb Date: Tue Sep 3 16:49:21 2019 +0800 充值成功，弹出下载 commit 91ec3abad913b452503985f4d898246721b386bc Merge: aceec26e6 a89d8b41b Author: wanggb Date: Tue Sep 3 16:11:57 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit aceec26e67a295c9dbec9881d9a8944bdfda6503 Author: wanggb Date: Tue Sep 3 16:11:50 2019 +0800 充值成功，弹出下载 commit a89d8b41be069208128ba12132e4b37ac17940b8 Merge: 79b15eea3 fc71f61b1 Author: 李天时 Date: Tue Sep 3 16:06:58 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 79b15eea3ecc8eb8c16fd11a1cdac7b744af547d Author: 李天时 Date: Tue Sep 3 16:06:49 2019 +0800 阳光app，app版本管理页面，当前版本号必须大于结束版本号 commit fc71f61b13e422cbc3a469aa71821155862efab7 Author: liyt Date: Tue Sep 3 12:10:57 2019 +0800 热门搜索换一换 commit a5a62567308561677a3182b0bff0529539bbc646 Merge: 325c3e99e 86440545b Author: 李天时 Date: Tue Sep 3 10:59:29 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 325c3e99e56796ccb0c3efa0bcb12b2d5b32c348 Author: 李天时 Date: Tue Sep 3 10:59:22 2019 +0800 阳光app，app版本管理页面，当前版本号必须大于结束版本号 commit 86440545bc0b295fbbcd50c9d8546de33e81a738 Author: liyt Date: Tue Sep 3 10:49:17 2019 +0800 修改文案 commit 95ff19cf76833be0a945c1d8024eb39f070a3e2b Author: wanggb Date: Tue Sep 3 10:30:52 2019 +0800 充值页面打点 commit b7f38320f7a8e437bb1f1c1a318d1f8665bd1259 Author: 李天时 Date: Tue Sep 3 10:23:27 2019 +0800 阳光app，app版本管理页面，当前版本号必须大于结束版本号 commit 95ccefac20c12f6749b3c4fe8c326682efeca088 Author: wanggb Date: Mon Sep 2 20:07:59 2019 +0800 增加页面，使用协议和隐私协议 commit 177edd248ccf1b15ba03f8f7b70659c30e6b7b91 Author: wanggb Date: Mon Sep 2 20:00:07 2019 +0800 充值页面加图片 commit 8fd0395dac2e39a5ed245b5d90cfeef04c395a09 Author: wanggb Date: Mon Sep 2 19:55:50 2019 +0800 动态绑定码页面，加入站位图片 commit 2a062a55f48104dfad4e434127ff21a39e5281df Author: wanggb Date: Mon Sep 2 19:50:58 2019 +0800 充值页面加图片 commit c3676ce653d5e7ea22d218546dfdc204fa6b0f3e Author: wanggb Date: Mon Sep 2 19:46:26 2019 +0800 dycode 设置初始变量'' commit 121964d4cd76631ae0f0dc72fbc75792f1bc1d56 Author: wanggb Date: Mon Sep 2 19:40:38 2019 +0800 dycode 设置初始变量'' commit 5924b737d55aa73f0ba53a875795b225bad9e590 Author: wanggb Date: Mon Sep 2 19:23:36 2019 +0800 签到回复，调用后台配置数据 commit 6751a2967421ae91b627fe75db1ebff3c26984d0 Author: wanggb Date: Mon Sep 2 19:16:27 2019 +0800 签到回复，调用后台配置数据 commit 47c78cceec10207a284d1863f39a8b5bf2e80e7d Author: wanggb Date: Mon Sep 2 17:58:57 2019 +0800 用户信息标记订单来源 commit 74522ad924af72ad6a850558d5cca88f43d07a68 Author: wanggb Date: Mon Sep 2 17:56:28 2019 +0800 用户信息标记订单来源 commit c91d80d01fadbe243f95601cab1fe5de83a03347 Author: wanggb Date: Mon Sep 2 17:17:16 2019 +0800 用户信息标记订单来源 commit b1a22297410aed96cde43e4ef2547f9fea977c51 Author: wanggb Date: Mon Sep 2 17:08:19 2019 +0800 用户信息标记订单来源 commit 645118de3a60fb75e4ea27cd6515508c92ae6655 Merge: 587e84cf3 e9c20f830 Author: wanggb Date: Mon Sep 2 16:31:06 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 587e84cf3e60c5058f613198f95a6613994fddbb Author: wanggb Date: Mon Sep 2 16:30:54 2019 +0800 APP客户端下载中转页面 commit e9c20f8304b2189f0adef209d74a1553a76baa9e Merge: 85de0608d d5d754486 Author: zhenglh Date: Mon Sep 2 15:35:17 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 85de0608db095f47c70ab068a5dd18b03f72bac9 Author: zhenglh Date: Mon Sep 2 15:35:11 2019 +0800 充值图标添加 commit d5d754486db2cdd58fd1fae8021c54a840193d4b Merge: 7f76ddc05 4f648d354 Author: wanggb Date: Mon Sep 2 15:28:26 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 7f76ddc05c15892e5dc5dd0e7d38d720e5d1dc92 Author: wanggb Date: Mon Sep 2 15:28:17 2019 +0800 APP客户端下载中转页面 commit 4f648d354f0dde8c10771a91f6a613d59e3ee102 Author: liyt Date: Mon Sep 2 15:13:56 2019 +0800 书籍下架隐藏运营位 commit 39e8ffbdddc9141e90e1e7c0d66c03bf753527dd Merge: 2167a94ad 75f40ff8d Author: zhenglh Date: Mon Sep 2 14:47:26 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 2167a94ade6962794dc3c7ef0f09188a62ab02e1 Author: zhenglh Date: Mon Sep 2 14:47:17 2019 +0800 支付方式添加图片 commit 75f40ff8da4883feabbcf100008326e6d8cdf192 Author: liyt Date: Mon Sep 2 14:20:56 2019 +0800 h5支付列表 commit 9b37b814892c619c571da1d87616c59e08163fba Author: liyt Date: Mon Sep 2 12:05:14 2019 +0800 支付列表 commit 758781f93d27f762e8b183af97934daafe76845b Merge: d92eb91af 67591df38 Author: liyt Date: Mon Sep 2 11:57:28 2019 +0800 Merge branch 'dev-app-20190806' of 192.168.0.31:fe/cps into dev-app-20190806 commit d92eb91af688d6b75519edb6b17a5e0d9630b369 Author: liyt Date: Mon Sep 2 11:57:19 2019 +0800 h5支付列表 commit 67591df3819d5583fd8af005c78cb9aef29dbd53 Author: wanggb Date: Mon Sep 2 11:57:15 2019 +0800 APP客户端数据统计 commit 27edc208be67c809c007306f92edd2e31638a97b Author: liyt Date: Mon Sep 2 10:37:26 2019 +0800 常用链接注释调查问卷入口 commit 872b756b3c10cef49faa75c3b995f4d8242f1cdc Author: wanggb Date: Mon Sep 2 10:05:09 2019 +0800 签到回复下载客户端 commit a3f1bab14564ab0d04e121d306b85205d1c52d1a (tag: cps_20190829_005931) Author: guyuexuan <2651919937@qq.com> Date: Thu Aug 29 00:52:23 2019 +0800 修改手机号默认显示 commit e7a5ed6d5824fd8c4d1536908190a2cb8840e579 (tag: cps_20190829_000428) Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 23:23:11 2019 +0800 去除 pdf 标题 commit 982fc622b25713cec395ecfc22d0314511612ae4 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 23:11:52 2019 +0800 协议变更 commit 0d9d0f7cbded09d4e85fa57bfe114a75311f345d Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 23:08:51 2019 +0800 修改弹窗提示 commit 41d3847e955ec599cadafc6e34814664eaa67305 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 22:52:15 2019 +0800 修改第一次提现日期录入 commit 081a99cb3e0c05b2a6b36c8d8e9e823d12c498a0 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 22:41:08 2019 +0800 修改关联查询 commit 0d86f663e348152f86c2759e474f2660d79e9637 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 22:18:46 2019 +0800 增加关联查询 commit b702727a4d677a28f50511913ff2c67d24ebea8b Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 22:04:37 2019 +0800 修改协议时，删除 PDF 缓存文件 commit 3a9452b8eafed6544ad1798c6f636d2c3d55bd29 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 22:03:07 2019 +0800 修改 pdf 文件名 commit 8cd893e5fc7ec29f9d2c2763709bed4af85e7587 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 21:52:46 2019 +0800 西瓜 & 沙发 平台不需要签署协议 commit 00f439cbbb7ed4483826db4da483eb162bb35e65 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 21:44:04 2019 +0800 去除验证 commit 777d5a6955586fecbf6a0829c7bd9c3cff3444f4 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 21:28:41 2019 +0800 追加date 字段 commit 359337eeb453cc265003110dc6ecc84a08a960da Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 20:40:55 2019 +0800 显示搜索框 commit 8b005944f09d9a1677683c75a11b1c321bafceab Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 20:27:13 2019 +0800 协议乙方批量下载 commit 713a38bd9983d146a1b39523a98192fe96ad949b Author: wanggb Date: Wed Aug 28 20:03:43 2019 +0800 签到回复下载客户端 commit 78378ceb84273f1e9cf8009a14ffc8a2b0542d0d Author: wanggb Date: Wed Aug 28 19:55:42 2019 +0800 签到回复下载客户端 commit 7e6df9b9317e43b442efd19a4cfeb5d6c4595e4d Merge: 6530a2201 fe0b67a0c Author: wanggb Date: Wed Aug 28 19:53:39 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 6530a2201429062a5ff9578ae34e74fb166d211a Author: wanggb Date: Wed Aug 28 19:53:32 2019 +0800 签到回复下载客户端 commit fe0b67a0cd341bba5bcaec64b439d9833224d426 Author: liyt Date: Wed Aug 28 19:48:39 2019 +0800 搜索 commit 1b5522b87df3771681a75ef38124c6522499e492 Author: wanggb Date: Wed Aug 28 19:46:47 2019 +0800 签到回复下载客户端 commit 8f518caa6de20928e09372eb9e39d565101d97d6 Author: wanggb Date: Wed Aug 28 19:43:38 2019 +0800 签到回复下载客户端 commit 2c394a928cd39a43c39e820912312f853d9bf33a Merge: 8849f3e11 2c879ac22 Author: wanggb Date: Wed Aug 28 19:35:22 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 8849f3e11b86f669491b61a54e3b38e8f17b4dd7 Author: wanggb Date: Wed Aug 28 19:35:14 2019 +0800 签到回复下载客户端 commit 2c879ac225ebdc522626ce878d4482fe1818d47b Author: liyt Date: Wed Aug 28 19:27:38 2019 +0800 去除老的打点 commit 5171ebbbfb004cc2be43b2648f013389c4113926 Author: wanggb Date: Wed Aug 28 19:25:45 2019 +0800 签到回复下载客户端 commit 28ade5ce0386a166f2d4b19a1ffc9e7eadc57942 Author: wanggb Date: Wed Aug 28 19:20:00 2019 +0800 签到回复下载客户端 commit 698680ec12cf3bce5afe34b795ee162a1f0667d9 Author: wanggb Date: Wed Aug 28 19:11:37 2019 +0800 签到显示 commit d6713b8dfaadecc5927f43a5183dc9bcfcc3851b Author: wanggb Date: Wed Aug 28 19:07:17 2019 +0800 签到显示 commit 9d6244bd689fdd416eba1ed516f7e8054cc4a9d3 Author: wanggb Date: Wed Aug 28 18:54:54 2019 +0800 签到显示 commit eee8ee354efb7ec8a4d00af6aacf4084e601d584 Author: wanggb Date: Wed Aug 28 17:45:14 2019 +0800 dycode commit f12790157be6f8fe00d0569f2a15e3d95ad79116 Author: wanggb Date: Wed Aug 28 17:18:41 2019 +0800 绑定手机，赠送书币 commit 1c3a307f1a86ec6b4ab6249215a8fa35aeb045e1 Author: wanggb Date: Wed Aug 28 17:14:44 2019 +0800 绑定手机，赠送书币 commit 83c0bab54baf288e02a89b410f48854362b66c65 Merge: 96c914598 b8d353b94 Author: wanggb Date: Wed Aug 28 17:06:12 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 96c914598f9daa4efb2ac70aaa693283445bfa92 Author: wanggb Date: Wed Aug 28 17:05:57 2019 +0800 绑定手机，赠送书币 commit b8d353b94fd911db006a274658ba628fa2d4e183 Merge: 7476e643a 3ba80ab95 Author: 李天时 Date: Wed Aug 28 17:03:12 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 7476e643a02c51c89694fa430800f15c5d6c6c74 Author: 李天时 Date: Wed Aug 28 17:03:03 2019 +0800 阳光app，获取app版本改造 commit 3ba80ab95563011d76fb538e7396061a8d0c8fd6 Author: liyt Date: Wed Aug 28 16:32:20 2019 +0800 书城资源选择书籍时去掉图标 commit 1f1f6961338751419ccbe72e9c5968de34ae8beb Author: wanggb Date: Wed Aug 28 16:31:35 2019 +0800 绑定手机，赠送书币 commit 0f7b8da08f9e197d7961fe00f081ddd8878d6adc Merge: 96a1a93d9 c0378f970 Author: wanggb Date: Wed Aug 28 16:25:01 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 96a1a93d91947fd0e1ce9fb2c98621d58e51ea0c Author: wanggb Date: Wed Aug 28 16:24:52 2019 +0800 绑定手机，赠送书币 commit c0378f970ebb83ed14508bbfdba9f102bb1c7ad9 Merge: ca5d9b97c ae884d33c Author: zhenglh Date: Wed Aug 28 16:24:13 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit ca5d9b97cd12c3a28d542e46b44308ef5996da36 Author: zhenglh Date: Wed Aug 28 16:24:01 2019 +0800 日志格式化处理 commit ae884d33cb3cea9f9f156eebaea89ff7e4600c8c Merge: c41baeee6 09482db96 Author: 李天时 Date: Wed Aug 28 16:12:54 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c41baeee60dd5e16afbfdec4510e1346a44aed5b Author: 李天时 Date: Wed Aug 28 16:12:47 2019 +0800 阳光app，fixbug-0003777从书城进入书籍详情页，底部精彩推荐只展示7本书 commit 09482db96bda5183da27f698e114589716a8c39f Merge: 6e54c02fb 76869fbb3 Author: zhenglh Date: Wed Aug 28 15:55:03 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 6e54c02fb4feb2e7a08480084f6f1179288b3a0b Author: zhenglh Date: Wed Aug 28 15:54:53 2019 +0800 日志添加时间参数 commit 76869fbb3747f0e85c76ecec414d444fbbc66d24 Merge: f8be0e708 c0695dcad Author: 李天时 Date: Wed Aug 28 15:44:48 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit f8be0e7080ad0d7f0dd6af8b0095019af4848589 Author: 李天时 Date: Wed Aug 28 15:44:41 2019 +0800 阳光app，fixbug-0003777从书城进入书籍详情页，底部精彩推荐只展示7本书 commit c0695dcad5e5ace8f7f1b9c9cb1c13b857533513 Merge: 53b85e974 013ff7e6e Author: wanggb Date: Wed Aug 28 15:38:04 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 53b85e974567f8c198cbb0f1337f0121bd9e2a29 Author: wanggb Date: Wed Aug 28 15:37:52 2019 +0800 点击下载客户端打点 commit 013ff7e6ec9a9d3684de5eefeca978556664dad9 Author: zhenglh Date: Wed Aug 28 15:01:20 2019 +0800 下单查单订单号 commit c5dad18871374f6d5f57b75023f49087791575c1 Merge: 3ae5b535e bdbb48110 Author: zhenglh Date: Wed Aug 28 14:56:38 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit bdbb48110cabcd4857dadf554f9b35f235194b3b Author: wanggb Date: Wed Aug 28 14:40:09 2019 +0800 点击下载客户端打点 commit b041e6d09383613a18425a8eacd58c5f1a5a3f7b Merge: 71393a7b1 068576ade Author: wanggb Date: Wed Aug 28 14:25:01 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 71393a7b17ddc213cb401a4922c9ee38a0609aa3 Author: wanggb Date: Wed Aug 28 14:24:43 2019 +0800 点击下载客户端打点 commit 068576ade87e590c8e20ce4a348f4751096b3882 Author: liyt Date: Wed Aug 28 14:07:42 2019 +0800 - commit c8d6150b6a14585432fecb2360ae124dd24bf8a5 Merge: b3d8c43c5 0b5c43762 Author: wanggb Date: Wed Aug 28 13:56:11 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit b3d8c43c56a6d366545dd96c8e77c5e601281712 Author: wanggb Date: Wed Aug 28 13:55:58 2019 +0800 点击下载客户端打点 commit ce7c556524cc4a27279147b11f5b775dabb105fa Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 28 12:07:25 2019 +0800 限制渠道阅读收费章节 commit 0b5c437622216583a196b38b5617c1bd631e395a Author: liyt Date: Wed Aug 28 11:48:57 2019 +0800 去掉拖动排序 commit 4a6f94cdf76952d66344c8c281ab8c53a2bdfbc8 Merge: a9c692c2d 5c797cd51 Author: wanggb Date: Wed Aug 28 11:44:14 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit a9c692c2d14836487a125f5798abbd74aec7720a Author: wanggb Date: Wed Aug 28 11:44:05 2019 +0800 点击下载客户端打点 commit 5c797cd51756c9a770e596fd21faa118bf13613b Author: 李天时 Date: Wed Aug 28 11:32:50 2019 +0800 阳光app，fixbug-0003777从书城进入书籍详情页，底部精彩推荐只展示7本书 commit 47d8d6d0324129cc0799f23a00fee378ce7463f1 Merge: 3eb9908e7 d25641f1a Author: 李天时 Date: Wed Aug 28 11:04:56 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 3eb9908e748aeb041305046808d93ed7ea92b73f Author: 李天时 Date: Wed Aug 28 11:04:47 2019 +0800 阳光app，修改启动接口user对象 commit d25641f1ab4191842f0873d0dce46426cd35e547 Author: wanggb Date: Wed Aug 28 10:57:49 2019 +0800 将用户信息重组方法提公 commit e6d0d83e5dec9840d8dd1cc733eb0ef32f3b7406 Merge: fa47082bf 898ddd7b6 Author: wanggb Date: Wed Aug 28 10:48:31 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit fa47082bf69d845b951213b4f819cb53cd1aea96 Author: wanggb Date: Wed Aug 28 10:48:15 2019 +0800 将用户信息重组方法提公 commit 898ddd7b6ba95cd44bd3a8aa6c0450dcda462875 Author: 李天时 Date: Wed Aug 28 10:47:13 2019 +0800 阳光app，修改启动接口user对象 commit d8c4c7622d764bcba0962dd24ff7a46426ab3f89 Author: wanggb Date: Wed Aug 28 10:42:16 2019 +0800 将用户信息重组方法提公 commit d5c1e15d9e86960199ad307cec15c3f50c0057a4 Author: guyuexuan <2651919937@qq.com> Date: Tue Aug 27 21:57:17 2019 +0800 协议签署 commit 4823fae368e844bb2775d89672f76313783d2265 Author: liyt Date: Tue Aug 27 20:36:12 2019 +0800 h5活动弹窗过滤APP活动 commit 1dc2188ab3a0960b73d8cf7de2673694b5936a5d Merge: 81841f593 3ed67fce2 Author: wanggb Date: Tue Aug 27 19:56:17 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 81841f59396a972d33b5ac16e4823addccd6f9e0 Author: wanggb Date: Tue Aug 27 19:56:04 2019 +0800 引导位，展示浏览量打点 commit 3ed67fce25416cb0ee91495cd92de38c899857b3 Merge: fb5114fbb 55662bb20 Author: liyt Date: Tue Aug 27 19:50:45 2019 +0800 Merge branch 'dev-app-20190806' of 192.168.0.31:fe/cps into dev-app-20190806 commit fb5114fbb06cafbe24c0b0593631138ebd036550 Author: liyt Date: Tue Aug 27 19:50:35 2019 +0800 客户端配置列表展示开始结束时间 commit 55662bb20db03b8566cf363c4430d82a1735a2aa Author: 李天时 Date: Tue Aug 27 19:50:19 2019 +0800 阳光app，运营位加缓存 commit 50f1a57aaea97ced88b9dcc42aab7b86810c65d2 Author: 李天时 Date: Tue Aug 27 19:39:06 2019 +0800 阳光app，运营位加缓存 commit 3ae5b535e6eda19e7d0e7acd8f6189ee524f4945 Author: zhenglh Date: Tue Aug 27 19:24:36 2019 +0800 日志顺序 commit 25a097850f447c889aff022db2b5426c4e6e00d3 Author: 李天时 Date: Tue Aug 27 18:09:11 2019 +0800 阳光app，运营位加缓存 commit 997573ab46623d057038a232e9f2301604aa9efc Author: 李天时 Date: Tue Aug 27 17:49:26 2019 +0800 阳光app，运营位加缓存 commit 7f3996435c421eea71752d0c085a0d751b10bb92 Merge: 5d6f644ca e91f8b33f Author: 李天时 Date: Tue Aug 27 17:30:43 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 5d6f644cadddc5bff3a6cc3f663444817719b73e Author: 李天时 Date: Tue Aug 27 17:30:33 2019 +0800 阳光app，运营位加缓存 commit e91f8b33f23b6ea61eb0a827cf3506bd13ac6725 Merge: 116607e0e d6af70cfb Author: wanggb Date: Tue Aug 27 17:28:35 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 116607e0ee10d4609b4c9c657ac773c1420e2b0d Author: wanggb Date: Tue Aug 27 17:28:24 2019 +0800 添加引导入口页面 commit d6af70cfb3a8c253d6f0f4fcebd78ab315dfc50c Author: liyt Date: Tue Aug 27 16:12:35 2019 +0800 搜索精彩推荐颜色 commit 8d4ad8bbdb40e6e4adaf69bfe9d40294a603f15c Author: 李天时 Date: Tue Aug 27 15:40:52 2019 +0800 阳光app，运营位加缓存 commit 9f0b40ea157f26fac7be4924f0951fe0a6e2e36c Author: 李天时 Date: Tue Aug 27 15:14:18 2019 +0800 阳光app，运营位加缓存 commit a07a99cc3321bd27d293a871a6033dca40bafde3 Merge: fddf8fc0e d99ccc515 Author: zhenglh Date: Tue Aug 27 14:40:49 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit fddf8fc0e0e199509029dde0c26590a1e0466c78 Author: zhenglh Date: Tue Aug 27 14:40:44 2019 +0800 支付回调返回值添加 commit d99ccc515e71ab1bb2ae6e8a4f1a676550c14c87 Author: liyt Date: Tue Aug 27 14:34:09 2019 +0800 添加块时提示已存在 commit 5886a3b3c87974d6872e2c8addc369376873894a Merge: d9f9d7465 83bd5e264 Author: 李天时 Date: Tue Aug 27 14:14:52 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit d9f9d7465f096dee8298c2fc5553500d5a1e7b55 Author: 李天时 Date: Tue Aug 27 14:14:42 2019 +0800 阳光app，运营位加缓存 commit 83bd5e264970137eeb02e43a28f12956426eeb36 Author: zhenglh Date: Tue Aug 27 12:16:42 2019 +0800 查单接口修改看点返回值 commit c8d490ed65b027fb1b5d1216305b6a9da2484e0c Author: wanggb Date: Tue Aug 27 12:10:45 2019 +0800 Userinfo Free_kandian 重新獲取 commit 2b425fd276117222a5a7bd10217575e8c40df649 Merge: 9588edb98 9eafa8e14 Author: wanggb Date: Tue Aug 27 12:04:00 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 9588edb9817dedc6e30b5623f0020da7e8cbe38c Author: wanggb Date: Tue Aug 27 12:03:50 2019 +0800 Userinfo Free_kandian 重新獲取 commit 9eafa8e14349b245115854b5bd69c1bf0fddb17a Author: liyt Date: Tue Aug 27 11:58:30 2019 +0800 有效活动 commit ccd24b09957cfc7cfc4573012124671644d9f8ab Merge: dd4d0c1bd 188c6c721 Author: 李天时 Date: Tue Aug 27 11:54:46 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit dd4d0c1bd344d4a1cfef181ce3997731565d18e2 Author: 李天时 Date: Tue Aug 27 11:54:31 2019 +0800 阳光app，运营位加缓存 commit 188c6c721d634b9ec01c8284a3972c1ec3a8cbbf Author: liyt Date: Tue Aug 27 11:49:04 2019 +0800 数据资源编辑 commit c3e7b92dffbd2687f5183c356984231cc8667720 Merge: 633b77698 f0718332a Author: 李天时 Date: Tue Aug 27 11:38:04 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 633b7769894ae4c48d283e2f7b7e1cc9e549be62 Author: 李天时 Date: Tue Aug 27 11:37:54 2019 +0800 阳光app，运营位加缓存 commit f0718332a35f89d31378e14291c9a078334081f9 Author: liyt Date: Tue Aug 27 11:35:41 2019 +0800 运营位选书 commit 311050d5453b1c7d83cb2e9d90b5e224e1db9a37 Author: wanggb Date: Tue Aug 27 10:46:49 2019 +0800 编辑、删除导量入口时，删除缓存 commit 483f1ccedda2f1281ff63dd5767888cf10f07ac3 Merge: 2baeb27b0 5248ea896 Author: wanggb Date: Mon Aug 26 20:00:09 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 2baeb27b088cf9a4dfaae21d2d385aa998f7d2d8 Author: wanggb Date: Mon Aug 26 19:59:57 2019 +0800 编辑引导入口后，刷新缓存 commit 5248ea896365804a820c2038ab3d40216e4d189f Author: liyt Date: Mon Aug 26 19:45:03 2019 +0800 批量失效 commit 563f27881ea227ea9270572b1578750db14c821c Author: wanggb Date: Mon Aug 26 19:35:11 2019 +0800 添加引导入口，渠道号不能重复添加 commit 218f318fc1831aed5e447de8ae501ec26601a7e8 Author: wanggb Date: Mon Aug 26 19:15:09 2019 +0800 充值成功，弹窗加入下载入口 commit 8626aea0980820de47ace8d3a3d0cfea4ab9c42b Author: wanggb Date: Mon Aug 26 18:21:41 2019 +0800 充值成功，弹窗加入下载入口 commit 9c24f5ced22a81c2a0e0a941fb3efde2f315bac3 Merge: c00bd9f91 2a7713c06 Author: 李天时 Date: Mon Aug 26 18:15:41 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c00bd9f9143d964d6e218d6d7a51e409fcec201a Author: 李天时 Date: Mon Aug 26 18:15:30 2019 +0800 阳光app，运营位加缓存 commit 2a7713c0644ed83902eea9507e2bed8a12e1ee15 Author: wanggb Date: Mon Aug 26 17:39:50 2019 +0800 充值成功，弹窗加入下载入口 commit 874d6916f42f1fa9a46bb4c8e7b8850caf0cab7b Author: wanggb Date: Mon Aug 26 17:35:01 2019 +0800 充值成功，弹窗加入下载入口 commit 87504cb5a4bc0690fbca704fda0bb18fa2a71479 Author: wanggb Date: Mon Aug 26 17:23:28 2019 +0800 充值成功，弹窗加入下载入口 commit da7f62f8a359ee65f359abfba3aad60ce3dad946 Author: wanggb Date: Mon Aug 26 17:18:36 2019 +0800 充值成功，弹窗加入下载入口 commit d4866c3dc64ccbda03257eca2af7aeb48640e2a6 Author: liyt Date: Mon Aug 26 17:13:39 2019 +0800 js commit 5ddf65ae1d3933032508165cf7bc4156aacdbde9 Author: wanggb Date: Mon Aug 26 17:12:31 2019 +0800 签到页面背景色透明 commit 2ae1263bf67aa22dc9d92acc823650f8fe1c9954 Author: wanggb Date: Mon Aug 26 16:47:44 2019 +0800 加入接口，清空bindtime commit 07b2784047cbcddddb184d09d352a254e8a2c5b1 Merge: bbc5b3abc 95bb19a97 Author: wanggb Date: Mon Aug 26 16:43:14 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit bbc5b3abc7912ca359b2380093508ed9fbd3589e Author: wanggb Date: Mon Aug 26 16:43:06 2019 +0800 加入接口，清空bindtime commit 95bb19a977dc531beefce02b0692f43a536757a3 Author: liyt Date: Mon Aug 26 16:31:01 2019 +0800 搜索返回 commit b2d72bfff34c12c822fcb80b8c3444a6a9eb3840 Merge: 6e79b6d1c c87eb5fda Author: wanggb Date: Mon Aug 26 16:20:07 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 6e79b6d1c7b6dc0524baca308438f6c535d1889d Author: wanggb Date: Mon Aug 26 16:19:59 2019 +0800 点击下载APP JS提公 commit c87eb5fdae2f7741a7130867e26486f72fc3021f Author: 李天时 Date: Mon Aug 26 16:10:04 2019 +0800 阳光app，运营位加缓存 commit 156da50bc59aeaeca71814913d54e67c809c716a Author: liyt Date: Mon Aug 26 16:03:02 2019 +0800 弹窗配置新增展示位置 commit d6a98388d172cb3e995e9114499b454a1327a3f9 Merge: 640d0c493 cbe139292 Author: wanggb Date: Mon Aug 26 15:57:18 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 640d0c49386872ea41712178ac6547c19ab965a4 Author: wanggb Date: Mon Aug 26 15:57:08 2019 +0800 点击下载APP JS提公 commit cbe13929227ddee4ad8131c539fa346d5329b4ad Author: liyt Date: Mon Aug 26 15:45:55 2019 +0800 平台活动过滤 commit b48b91ab785a248d2e55c85b190eed539cf6b2b2 Author: wanggb Date: Mon Aug 26 15:44:47 2019 +0800 将CODE码提公 commit 835411f4d085e6ecb1e6c14eb44d38493356359e Author: wanggb Date: Mon Aug 26 15:40:15 2019 +0800 将CODE码提公 commit 3f5b615f459f77761a86f262ce3ede39b8b0a9ed Merge: c2c4f5638 9be3483c0 Author: wanggb Date: Mon Aug 26 15:21:09 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c2c4f563817c36c4973a4a1d203c23f1c6f2182c Author: wanggb Date: Mon Aug 26 15:16:04 2019 +0800 将CODE码提公 commit 9be3483c08e389970bf4d5ded445ebc68a567ff3 Author: zhenglh Date: Mon Aug 26 15:11:48 2019 +0800 空数据不作为错误 commit 1eef9c36230e7e996ea61fe704b98c3c855fdd1c Author: liyt Date: Mon Aug 26 14:41:57 2019 +0800 批量失效 commit 6988a8af7d20636fdeab2ede4b053c781ce9948a Author: wanggb Date: Mon Aug 26 14:21:44 2019 +0800 将CODE码提公 commit 613285113cc324b7afd1c6142efa1a96b84a1bca Author: wanggb Date: Mon Aug 26 14:15:42 2019 +0800 将CODE码提公 commit 93c726fb42323b5c833c216b3faa35b73367214e Author: wanggb Date: Mon Aug 26 14:07:42 2019 +0800 将CODE码提公 commit 394f260840b25b8328c500ff2ad7579afbbaeedd Merge: 0c3353ddf 5fc8ee505 Author: wanggb Date: Mon Aug 26 11:07:50 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 0c3353ddf6af2544b4c65782984b74d879e0eb1d Author: wanggb Date: Mon Aug 26 11:07:39 2019 +0800 Code 码加前缀 DZ# commit 5fc8ee505e40fd8891daa553c64d06cc519f5139 Author: liyt Date: Mon Aug 26 11:05:55 2019 +0800 书架运营位用户类型搜索 commit 9681a60d3ee3dfa47765e0366d4309e5868a3317 Author: liyt Date: Mon Aug 26 10:52:58 2019 +0800 APP活动 commit 0c052bddb137563a12d34d682ab68ed94f56308c Merge: a279f5537 433779fe0 Author: zhenglh Date: Mon Aug 26 10:12:43 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 # Conflicts: # application/api/controller/Wechat.php commit a279f553718c3fd3a1849cdcda0d759df8d2192b Author: zhenglh Date: Sat Aug 24 18:21:28 2019 +0800 小说统计-充值 commit 689e985a0f74e9e7726592c192d578beaf9428f8 Author: wanggb Date: Sat Aug 24 17:57:04 2019 +0800 Code 码加前缀 DZ# commit 7aa66f5a91487d0e93b057312929e8e763bb708a Author: liyt Date: Sat Aug 24 18:03:43 2019 +0800 活动下单传参 commit ef7547c4b846e4eed09de11fb51c359ad65e524e Author: 李天时 Date: Sat Aug 24 17:38:58 2019 +0800 阳光app，运营位加缓存 commit cb4c94b67c1a17a72d12681627811b13f52ad2de Author: wanggb Date: Sat Aug 24 17:54:36 2019 +0800 Code 码加前缀 DZ# commit db03fc9cbb2fa38825764992571d586ef0f63ec0 Author: wanggb Date: Sat Aug 24 17:24:42 2019 +0800 Code 码加前缀 DZ# commit 1827ba6905f24d8122fa690afc2b3ec4898538d0 Author: zhenglh Date: Sat Aug 24 18:17:30 2019 +0800 扣量测试完成 commit cdd2fe6904feae59e048c82f94e4e15e59ea5c85 Author: wanggb Date: Sat Aug 24 17:01:41 2019 +0800 Code 码加前缀 DZ# commit 8669675d038dbc57a914c49eab58f35cce802046 Author: wanggb Date: Sat Aug 24 16:38:33 2019 +0800 Code 码加前缀 DZ# commit a16c1aa5003eab8d1aea0aa2fab67fb9011a1991 Author: wanggb Date: Sat Aug 24 16:07:55 2019 +0800 app 引导位数据统计 commit 674cc506f192b757d8115ede53cf6f67f45b01a2 Author: zhenglh Date: Sat Aug 24 17:07:38 2019 +0800 日志格式改为json格式 commit 0c914becc7aee6f4bcbe8ae570ac62f036962de0 Author: zhenglh Date: Sat Aug 24 15:48:55 2019 +0800 清除缓存问题处理 commit a492ff67f858e4a2ccd8d1f3a18c03dfe65cff32 Author: zhenglh Date: Sat Aug 24 15:39:01 2019 +0800 清除缓存问题处理 commit ef620b6fb6b5848c7d9e2736b76d1d8fcdedae8a Author: zhenglh Date: Sat Aug 24 15:05:41 2019 +0800 支付添加订单缓存 commit d2239d6a9d2bbc6bf8057d15080d27853ba1b712 Author: 李天时 Date: Sat Aug 24 14:24:06 2019 +0800 阳光app，运营位加缓存 commit 5ee0090f4edb16db168fba074d51c70325ef981c Author: liyt Date: Sat Aug 24 14:18:26 2019 +0800 排序改为越大越靠前 commit 6890f62237a48d3b3787a870497b9ffe51113cd2 Author: liyt Date: Sat Aug 24 14:15:04 2019 +0800 通用手机验证码 commit 42dba6cf3ac36a768fd69c56d8b7c0b9f281a9d5 Author: liyt Date: Sat Aug 24 14:10:16 2019 +0800 通用手机验证码 commit 97f5297756148ad17af1468ef246ca0c78b76834 Author: liyt Date: Sat Aug 24 14:09:33 2019 +0800 通用手机验证码 commit 2b19e2a34dbd71b4e8a3afed0aff540368420272 Author: 李天时 Date: Sat Aug 24 14:21:36 2019 +0800 阳光app，运营位加缓存 commit aae1d27c920c3e60ba02c93f619b97d25d042af3 Author: zhenglh Date: Sat Aug 24 14:39:49 2019 +0800 支付缓存添加 commit 6ed1c40a305482b6f5a0eb43d95dda4167da7a42 Author: zhenglh Date: Sat Aug 24 13:47:55 2019 +0800 app分成比例 commit ad86466415c78fe843b83e7285c5c0ca59e395df Author: zhenglh Date: Sat Aug 24 13:45:45 2019 +0800 app分成比例 commit c976ce0669ce0fe93036537d7a0a78390fa0e0d2 Author: liyt Date: Sat Aug 24 10:51:54 2019 +0800 搜索 commit afa3421caed8b0f6497197526497c75ce56e29b6 Author: zhenglh Date: Sat Aug 24 13:37:32 2019 +0800 原充值添加business_line commit 1f14839467a90e87a738fbba44ed6760a7d544c3 Author: wanggb Date: Sat Aug 24 10:35:24 2019 +0800 app 引导位数据统计 commit a0a4874bca3b6603078ecf3716f833c5fe436e34 Author: zhenglh Date: Sat Aug 24 10:39:25 2019 +0800 日志 commit f35fd17c9a9edb8274eea3998b6710f8d5763b62 Author: zhenglh Date: Sat Aug 24 09:59:42 2019 +0800 回调时添加金额缓存使用公共方法 commit 6e03e263a89a6a7aa9d4e24293a251b0afd0ac14 Author: wanggb Date: Fri Aug 23 20:15:32 2019 +0800 引入新版Openinstall.js commit d8140dce35b4475f4f128dca2c950713955be45f Author: zhenglh Date: Fri Aug 23 20:34:49 2019 +0800 扣量日志变更 commit 68cbf6e4d9f41f464e7e6589168e4d27ad5aa8e0 Author: wanggb Date: Fri Aug 23 19:47:00 2019 +0800 引入新版Openinstall.js commit 56085220d475ab2c055120dfa31468b92b5e1c9b Author: wanggb Date: Fri Aug 23 19:17:00 2019 +0800 引入新版Openinstall.js commit 3054fd16ce81475a92b62f7794ffa1e4f7de5971 Author: 李天时 Date: Fri Aug 23 19:42:30 2019 +0800 阳光app，运营位加缓存 commit 03fe18ca041e243d9bdc01efc39d5b9c151c7f67 Author: zhenglh Date: Fri Aug 23 20:13:33 2019 +0800 类文件名称修改 commit 2deb11e3e9ed4c40552297bf8575d8ea81d5f403 Author: liyt Date: Fri Aug 23 19:00:10 2019 +0800 下单关闭选择方式 commit f7a6722982ecb741b2cf23f471d670d71cc315b9 Author: 李天时 Date: Fri Aug 23 19:06:12 2019 +0800 阳光app，运营位加缓存 commit a66d7244d2558b7495ea18fc839bda637016476c Author: liyt Date: Fri Aug 23 17:49:56 2019 +0800 修复在自定义商品BUG commit b7f299c2c76d400ebfdaf54ca8e21b699dde584a Author: wanggb Date: Fri Aug 23 18:20:10 2019 +0800 APP导量 增加打点 commit 99bd1fdbecbc84df38042760e71c34a38e467335 Author: 李天时 Date: Fri Aug 23 18:46:56 2019 +0800 阳光app，app版本 commit 4a8714fe723ae501807daa5b77011e401c757dc7 Author: liyt Date: Fri Aug 23 16:44:58 2019 +0800 块管理下书籍打点 commit 5c285a17e39245d1b60af998288267634167bf58 Author: liyt Date: Fri Aug 23 15:45:16 2019 +0800 块管理下书籍打点 commit b29c0ea9a967f4e1a08f48d565d5d728c05a433e Author: liyt Date: Fri Aug 23 15:20:55 2019 +0800 分类下书籍打点 commit 8f25ef62ee85d45e670992d5f139c31bcb0e907e Author: liyt Date: Fri Aug 23 15:02:28 2019 +0800 搜索打点 commit b6d4d5769973c5f48d954f2b1d00549c15c58673 Author: liyt Date: Fri Aug 23 14:30:43 2019 +0800 打点 commit b0759ef9fd3f674f531281f827370685e839e308 Author: 李天时 Date: Fri Aug 23 17:15:47 2019 +0800 阳光app，app版本 commit f4fc50e158e8b38ac607db180023b9d9cc504518 Author: zhenglh Date: Fri Aug 23 19:09:08 2019 +0800 扣量单元测试完成 commit d0a30d7ef66c2f0841aa0e827345e326ddcc08be Author: liyt Date: Fri Aug 23 11:57:35 2019 +0800 弹窗背景 commit 362d30e92f47ac28eb7921d0dd865f85a06231f7 Author: liyt Date: Fri Aug 23 11:13:52 2019 +0800 弹窗背景 commit 548733c7a08d8857cf7edc5687fc18b3351a1d88 Author: liyt Date: Fri Aug 23 10:13:29 2019 +0800 弹窗 commit cc7b9e41f271a297e2a8c4f6331cca280dbd858a Author: wanggb Date: Fri Aug 23 11:14:14 2019 +0800 guide_manage增加字段APP_URL commit d008a073a4ba8ee130c72bb9ebddc4e41d61a3fa Author: wanggb Date: Thu Aug 22 19:53:17 2019 +0800 删除上一版多余文件 commit 9625a27ada93652ecf91ec6364de6875d69b0f5b Author: liyt Date: Thu Aug 22 17:41:53 2019 +0800 活动结束 commit de837666e01752f0ee952effa55b9a284e82a4ee Author: 李天时 Date: Thu Aug 22 18:00:52 2019 +0800 阳光app，消费打点 commit 1dd1260159c93071c5166d88eb9648a59ebe5065 Author: 李天时 Date: Thu Aug 22 17:35:36 2019 +0800 阳光app，消费打点 commit 2d7d34031b55e8fad6e6584eef6d9021023ec139 Author: wanggb Date: Thu Aug 22 19:07:03 2019 +0800 获取用户返回信息 commit 92bf546fa8fa03ac7926e326ffe90c41b518bef1 Author: wanggb Date: Thu Aug 22 17:17:35 2019 +0800 获取用户返回信息 commit 8033a7a7d0ce8b25f5aa0a90fdeb7b8fba124950 Author: zhenglh Date: Fri Aug 23 12:08:07 2019 +0800 后台添加APP配置 commit 8c85cb3129bc0c2eb8b81d513168e8319e20c84b Author: wanggb Date: Thu Aug 22 17:01:54 2019 +0800 获取用户返回信息 commit 8318075718db6e3bc319935531456847ee8653b7 Author: 李天时 Date: Thu Aug 22 16:52:04 2019 +0800 阳光app，消费打点 commit 674cc529f6e71fb1c8c9760a1c85bb160bd750d5 Author: wanggb Date: Thu Aug 22 16:53:01 2019 +0800 获取用户返回信息 commit 6ae1670e305f16a2debcd4aa9a4f9d5e49122268 Author: wanggb Date: Thu Aug 22 16:42:40 2019 +0800 获取用户返回信息 commit c303f653374390dc258a109ec9d4a3d365f2be0b Author: wanggb Date: Thu Aug 22 16:41:22 2019 +0800 章节页面，Openinstall下载APP commit 3768cec00bc2a68d9ae240b3330fcd7841f874cb Author: wanggb Date: Thu Aug 22 15:30:06 2019 +0800 章节页面，Openinstall下载APP commit dfd396bfd5fe6e2e350b952e14840137e857449d Author: 李天时 Date: Thu Aug 22 14:59:09 2019 +0800 阳光app，消费打点 commit 2cf0bb7ca605f7205159adb9bc32f28b1cb2110b Author: 李天时 Date: Thu Aug 22 14:19:26 2019 +0800 阳光app，弹窗运营位配置 commit 36f3a031b242a6a3094bdc59777e87362a6e177e Author: wanggb Date: Thu Aug 22 15:21:31 2019 +0800 章节页面，Openinstall下载APP commit 490172f3a9abd96ffeaac584c00942c2df610d30 Author: wanggb Date: Thu Aug 22 14:00:27 2019 +0800 Boot 签到页面 commit f221e4e29d44323ab3b5ef696a099bc303c09e21 Author: wanggb Date: Thu Aug 22 11:49:01 2019 +0800 文章页面拉起openinstall commit 7c9cda83f8c0483b5bc138cddb689d1875b62ee7 Author: liyt Date: Thu Aug 22 11:27:24 2019 +0800 修改文案 commit 5aae4b910410ab421d4477b1538d89622fac2f66 Author: wanggb Date: Thu Aug 22 11:30:05 2019 +0800 文章页面拉起openinstall commit e1652a9e0081d12469727ab8de4ae50dd47306ab Author: wanggb Date: Thu Aug 22 11:20:48 2019 +0800 文章页面拉起openinstall commit c207a616b9bbf11f11028fce1ff8f835ef5be5dc Author: wanggb Date: Thu Aug 22 11:14:14 2019 +0800 文章页面拉起openinstall commit 5013630972ce3bc562985c4c10c62e70c8830447 Author: zhenglh Date: Thu Aug 22 17:07:32 2019 +0800 活动id限制 commit 5a3316662b2ba45d2d65bc8f028664c2dc0816fa Author: liyt Date: Thu Aug 22 10:43:24 2019 +0800 注释冗余代码 commit 31e9d6b270e53501854a5f449645abec8566fff4 Author: wanggb Date: Thu Aug 22 11:03:15 2019 +0800 文章页面拉起openinstall commit d5866c2a198aa78e03ad088a7772e7593dfc9f07 Author: zhenglh Date: Thu Aug 22 11:08:55 2019 +0800 查单接口添加商品信息 commit 99185ef3775166bcb1e180237cc5eefaa230074b Author: liyt Date: Thu Aug 22 10:24:58 2019 +0800 回退 commit 52c98201e5cadae7e2f320521211ebd84c549fd8 Author: liyt Date: Wed Aug 21 21:26:30 2019 +0800 去掉回退按钮 commit 161183dfbf941553afab2307d3d1d21571cd2ce1 Author: liyt Date: Wed Aug 21 21:16:54 2019 +0800 回退 commit 70c1e56e45622fbdd24622ce3308314c6811ef8a Author: wanggb Date: Wed Aug 21 20:38:37 2019 +0800 CPS 个人中心页面是否展示客户端绑定的动态码 commit eecec8b378026fff7c659b1847f861138e26e5b7 Author: liyt Date: Wed Aug 21 20:28:08 2019 +0800 返回 commit 22b9528be1504481ca33d8110d35150bbb93813a Author: wanggb Date: Wed Aug 21 20:29:04 2019 +0800 CPS 个人中心页面是否展示客户端绑定的动态码 commit d088ece7757cb7178e8d0b49120f86c9ba908121 Author: liyt Date: Wed Aug 21 20:09:55 2019 +0800 书城首页 commit e552d030b0a9aeb94441121b26937dd727570a16 Author: zhenglh Date: Wed Aug 21 20:11:23 2019 +0800 订单成功支付时返回书币 commit 1fc0e5deda001ac09d14bad9c39d20c9ed65c9d0 Author: wanggb Date: Wed Aug 21 20:24:43 2019 +0800 CPS 个人中心页面是否展示客户端绑定的动态码 commit 72701fe767b344d6238786f762109d36d3d4fc17 Author: liyt Date: Wed Aug 21 18:49:10 2019 +0800 领取大礼包 commit 344fc37296f05cae42ab6e988af1abea7b389444 Author: liyt Date: Wed Aug 21 18:03:07 2019 +0800 h5验证签名 commit 7636995b49085c1253c20c252a0a17c526444ade Author: wanggb Date: Wed Aug 21 19:53:58 2019 +0800 APP 用户注册|绑定手机号，加入打点 commit cca8b32ca5fbb0cb15b80703c8b3b1cf2c9fbd8b Author: 李天时 Date: Wed Aug 21 20:51:47 2019 +0800 阳光app，消费打点 commit 4d7d7c7118129d5cdf281968baa15346be1c405c Author: liyt Date: Wed Aug 21 17:22:29 2019 +0800 pv打点 commit e411c3f1aa1fa05da9cb3006270c1a85263d1a90 Author: liyt Date: Wed Aug 21 17:18:19 2019 +0800 pv打点 commit 7c604300e6256c23db9cf54416a48ae3439c75ce Author: liyt Date: Wed Aug 21 16:33:43 2019 +0800 pv打点 commit d4a53c8820721ea752a3ccd155bf874eeeb10346 Author: liyt Date: Wed Aug 21 16:08:46 2019 +0800 打点 commit f6ca10da42de972b76fdbfd9d134d5f1e6634dfb Author: zhenglh Date: Wed Aug 21 17:20:51 2019 +0800 添加查单接口，下单添加订单ID commit 06eac955c2ccdfebf11b435f0aa2edcc20f87be8 Author: 李天时 Date: Wed Aug 21 17:57:11 2019 +0800 阳光app，启动接口 commit f15503f0d0efcf0d3be827de18c1608617800aff Author: liyt Date: Wed Aug 21 15:12:59 2019 +0800 吊起登录 commit 705e6fbdc17cd4d34e52fe18cc5da5b7280a4eca Author: zhenglh Date: Wed Aug 21 15:01:16 2019 +0800 订单统计过滤业务端 commit bd871dd6f7218af6632183c40835b009a1c30e16 Author: 李天时 Date: Wed Aug 21 15:27:16 2019 +0800 阳光app，启动接口 commit aaa6552aa5a9a425f573f7c0dedf2caed83be348 Author: 李天时 Date: Wed Aug 21 14:22:07 2019 +0800 阳光app，书籍详情页推荐书籍接口 commit 15818ce45751f4132597cb73d7077b80ec43ea70 Author: liyt Date: Wed Aug 21 14:41:17 2019 +0800 吊起登录 commit 8bb73462feccf57ca35657bc2778662f6e811cc8 Author: liyt Date: Wed Aug 21 10:53:59 2019 +0800 吊起登录 commit fe2c2c2faf1eeec1bcb13bfce2e191e42fda4458 Author: wanggb Date: Wed Aug 21 14:58:21 2019 +0800 APP 用户注册打点 commit bc3b3af72d2f16a6283c4eb34f52172b5d96135d Author: wanggb Date: Wed Aug 21 11:10:16 2019 +0800 APP　连续签到 commit 39b99257e17ee7883c3c7627efebf2242a65bf23 Author: wanggb Date: Wed Aug 21 11:07:43 2019 +0800 APP　CODE注册 commit a7de557be2d6f97ab56597c66084c616d4c7b13a Author: liyt Date: Tue Aug 20 21:04:12 2019 +0800 联调 commit dc0451e169026e37932b6ffbf633558c2a610794 Author: liyt Date: Tue Aug 20 19:16:13 2019 +0800 联调 commit be0c964fc08333aa21524d639906fd634c6691b2 Author: liyt Date: Tue Aug 20 18:45:41 2019 +0800 联调 commit aea6d91444527be4dc1c1447cbfdc6513ea59b5c Author: liyt Date: Tue Aug 20 18:16:28 2019 +0800 充值记录 commit 3e27d69351e11e7f43428717f7e3324e0bfa2d50 Author: liyt Date: Tue Aug 20 17:30:31 2019 +0800 js联调 commit b1dbc0e9fe4485e42ce462043d5634f9b46608ca Author: wanggb Date: Tue Aug 20 17:24:26 2019 +0800 APP 打包userinfo commit 63cb7686941f23397d03dd2c897a3f7d01135cf0 Author: wanggb Date: Tue Aug 20 16:29:31 2019 +0800 APP 打包userinfo commit b8febff72aa9f48d5b892342e0110e7ac0f8df0b Author: wanggb Date: Tue Aug 20 16:02:53 2019 +0800 APP 打包userinfo commit 422fd904403fafb66891e6f799245cd871ed9373 Author: liyt Date: Tue Aug 20 15:42:52 2019 +0800 充值记录 commit 17b3c07971a515aac95a1c6f8820db66fff68c47 Author: liyt Date: Tue Aug 20 15:19:51 2019 +0800 充值方式选择 commit 18f5f0dc9999f60abaf7b28717f6de7f9ea16f92 Author: wanggb Date: Tue Aug 20 15:52:44 2019 +0800 APP 打包userinfo commit 15df222ea1bbc87e86277a53ef9b6864bd5b232b Author: liyt Date: Tue Aug 20 14:14:19 2019 +0800 清理代碼 commit 473eb88ce8c2d5cd6b180e9035f77bc59acc5e9d Author: liyt Date: Tue Aug 20 11:43:49 2019 +0800 商品列表 commit c6b7dc52e2fe87c99f86e036b20f23ad6c2f851d Author: liyt Date: Tue Aug 20 11:33:00 2019 +0800 h5登录 commit 00a643889ad63cfb3933aa96a508d5ad362fd963 Author: liyt Date: Tue Aug 20 11:07:27 2019 +0800 商品列表选择末班 commit bf6677684586e9fe9aa097ac1629e2d5b07aff50 Author: wanggb Date: Tue Aug 20 14:55:41 2019 +0800 APP　Code码注册后返回用户信息，统一格式 commit 36436a35b258f443a755c72c76fecd5a27f7bbb9 Author: liyt Date: Tue Aug 20 10:29:53 2019 +0800 去掉适配 commit ae69a1aab122a72971730744d2fba0bcfa8bed22 Author: liyt Date: Mon Aug 19 20:34:07 2019 +0800 联调 commit 1ae4a500003120322b0cc339c0c961bdbdcbbec9 Author: liyt Date: Mon Aug 19 20:00:44 2019 +0800 联调 commit 755df0e1f5458e09f8915f21e82824c5bd6bd057 Author: liyt Date: Mon Aug 19 19:45:21 2019 +0800 联调 commit 1d4f4cf1b7a27cfa28d143191c487c058b122f5c Author: liyt Date: Mon Aug 19 18:48:08 2019 +0800 h5登录 commit 4628c3659deab73c8d00fe7799d0f1f065e44211 Author: liyt Date: Mon Aug 19 18:42:28 2019 +0800 jsapi接口的书籍详情页链接 commit 7d191c91e226876efebd511d3e4e82a57f45e1fa Author: zhenglh Date: Mon Aug 19 19:36:24 2019 +0800 支付列表添加图片地址 commit a11ca68540355d30f027665d81dfb183374c905a Author: zhenglh Date: Mon Aug 19 17:53:18 2019 +0800 添加支付方式列表 commit b6b1ee27da8dbc276dda5c666f083ea6916010bc Author: liyt Date: Mon Aug 19 16:49:17 2019 +0800 联调 commit 066a188b767587b7ccb50bf6b15bd9f836735466 Author: liyt Date: Mon Aug 19 16:40:34 2019 +0800 联调 commit efa02107150b58d898d029963b02d9e16bb16e7d Author: 李天时 Date: Mon Aug 19 17:18:07 2019 +0800 阳光app，书籍详情页推荐书籍接口 commit cafc8eb0254040fc9dca515f052412077697d053 Author: liyt Date: Mon Aug 19 16:27:23 2019 +0800 联调 commit 04d5762ae1c39c22783292f83e8d57b3a16e0a02 Author: liyt Date: Mon Aug 19 16:13:43 2019 +0800 联调 commit 10ac6de3076c316c1cdf328a4823d5253e95133b Author: liyt Date: Mon Aug 19 16:01:43 2019 +0800 联调 commit 4660e4d95e6e48ee5e8222c90d73d615c72dd8eb Author: liyt Date: Mon Aug 19 15:50:19 2019 +0800 联调 commit 570e1d0047725fde2b84f915458485a08d9bf410 Author: liyt Date: Mon Aug 19 15:15:57 2019 +0800 配置 commit ec1f9bc7aa62809788db62340ebff79771bef972 Author: liyt Date: Mon Aug 19 15:00:32 2019 +0800 配置 commit 0f50db6cfebabee3a0e4bb15ab4dbed1c20a1a88 Author: liyt Date: Mon Aug 19 14:45:17 2019 +0800 弹窗配置 commit 799e7f0877c9f030a068ca583a0842b4cfb36033 Author: 李天时 Date: Mon Aug 19 16:31:56 2019 +0800 阳光app，书籍详情页推荐书籍接口 commit 03b925aa3d797cbbabebad9d0eb385d32e5519d6 Author: zhenglh Date: Mon Aug 19 17:24:23 2019 +0800 订单记录 commit 5d8b4957ea016bf9acd0c8c865d6fbe88dd6397e Author: liyt Date: Mon Aug 19 14:35:44 2019 +0800 弹窗配置 commit b142cbf939e7761f9a36cf107a962b23f9013294 Author: 李天时 Date: Mon Aug 19 14:32:22 2019 +0800 阳光app，书籍详情页推荐书籍接口 commit 7aebcc7899aa53a20a3b57ab860cf14a7d90483e Author: 李天时 Date: Mon Aug 19 14:21:00 2019 +0800 阳光app，获取书籍信息接口 commit 2034fdc39d3a1703c124cf6dc3404df317c08df7 Author: zhenglh Date: Mon Aug 19 14:40:52 2019 +0800 充值记录列表格式修改 commit bc824c48482415037404fdaace81aa3c92ba67d3 Author: liyt Date: Mon Aug 19 12:12:06 2019 +0800 调试页 commit 45499e517fc7d19ee788e9cb301b79f98dc5fa25 Author: liyt Date: Mon Aug 19 11:06:10 2019 +0800 活动 commit 68379fba639e9aa81f6ed0fcf9500e08a786de1d Author: zhenglh Date: Fri Aug 16 19:56:39 2019 +0800 添加充值记录接口 commit 4621522b8c3e808f69ce53fb7e9e981277f20640 Author: 李天时 Date: Fri Aug 16 20:25:46 2019 +0800 阳光app，获取书籍信息接口 commit 84c0263c5ab35f53bf66971e8c3efa6e0936b6c7 Author: zhenglh Date: Fri Aug 16 17:46:40 2019 +0800 支付方式未配置时的处理 commit 16620fca948cb42ec12e0aec0bb9762a1ebea56a Author: zhenglh Date: Fri Aug 16 17:20:32 2019 +0800 手误 commit 451802a22718aef30972a79d3999cfe622385440 Author: liyt Date: Fri Aug 16 17:09:14 2019 +0800 活动 commit 465c3468e151608cf7fff2d7c0f51cd778a64313 Author: zhenglh Date: Fri Aug 16 17:13:59 2019 +0800 支付修改 commit 926354f0f441dcd983cbf05d9bb98527bde3c57b Author: zhenglh Date: Fri Aug 16 15:14:22 2019 +0800 充值修改 commit 7541d781a59a91867531b01ce9d4c39d4ce579d0 Author: zhenglh Date: Fri Aug 16 14:42:08 2019 +0800 支付方式不需要指定 commit a809e9aec369cf0a00100f83a918c24e0c8eb78c Author: 李天时 Date: Fri Aug 16 18:00:40 2019 +0800 阳光app，获取书籍信息接口 commit 704847ef96161160c3a6329a536634eacd6b3ad0 Author: 李天时 Date: Fri Aug 16 14:38:44 2019 +0800 阳光app，获取书籍目录 commit 7d872e90bbd8cf0821b1ac05fb81036cba072763 Author: liyt Date: Fri Aug 16 14:03:06 2019 +0800 书城首页 commit 2cd3dc81bcba0f562c332283c6ca6bcf09019ac2 Author: liyt Date: Fri Aug 16 14:00:54 2019 +0800 书城首页 commit a39ac1cbe099690fd90d56c15a6b8af77bad8d57 Author: 李天时 Date: Fri Aug 16 14:19:05 2019 +0800 阳光app，章节订购接口 commit eb97653938f05d4175aa70d652bc876721a2637b Author: liyt Date: Fri Aug 16 13:50:18 2019 +0800 书城url commit 43d19c79970bf66cabcb9651883b231a607138c8 Author: 李天时 Date: Fri Aug 16 13:59:36 2019 +0800 阳光app，章节订购接口 commit 63b198400a920f675da1ec61b5685114670ea902 Author: liyt Date: Fri Aug 16 11:40:38 2019 +0800 APP弹窗 commit 4e659e0c1946c896ea89a6c3ce89af76a138680a Author: 李天时 Date: Fri Aug 16 11:50:13 2019 +0800 阳光app，修改运营位接口 commit 6d4e52b393d1241575b2138bb24a20c7d867f495 Author: wanggb Date: Tue Aug 20 10:48:45 2019 +0800 测试阶段，将短信验证码设置为1111 commit 27391a1c484405bd30c46577ce7675e262eb3b8d Author: liyt Date: Thu Aug 15 19:26:41 2019 +0800 弹窗 commit ecc06f800c537da694df2e0f96d3c5590412651f Author: liyt Date: Thu Aug 15 19:19:51 2019 +0800 弹窗 commit b358e9785905f5b5cf0857ed84032f7e7d34dff0 Author: liyt Date: Thu Aug 15 19:16:10 2019 +0800 弹窗 commit 83906cab53c27d3607ed78507b9bb1c38b4acf26 Author: liyt Date: Thu Aug 15 17:52:08 2019 +0800 js联调 commit 3fdc3e12e7896862c6dd8a13aa2dae5edb8f71b9 Author: wanggb Date: Thu Aug 15 20:27:07 2019 +0800 APP　连续签到 commit 584239a2a397bfc919d6b1fe9802e0bce2767f06 Author: liyt Date: Thu Aug 15 17:01:41 2019 +0800 调用 commit f4c95168eb2f5f3b7161a599318e2d40ba8b9db9 Author: liyt Date: Thu Aug 15 17:01:00 2019 +0800 调用 commit 3838de48f01990a3ef45ddb0a62a0ea77b2bb391 Author: liyt Date: Thu Aug 15 16:39:12 2019 +0800 组装APPurl commit 49170249b3038ff932c90a937531ba11ee262cc2 Author: wanggb Date: Thu Aug 15 17:07:36 2019 +0800 联调，测试交互 commit d56208a1239680db61a337a12356aa689e8cfaa7 Author: wanggb Date: Thu Aug 15 12:12:53 2019 +0800 读者查询，根据手机号查询用户信息 commit ba7c31d65e3ec461764a73cab1b46f61971d9b7a Author: 李天时 Date: Thu Aug 15 10:22:55 2019 +0800 阳光app，获取书籍信息接口 commit 64858643930b24e21e5da7da679fef1541ca67c3 Author: 李天时 Date: Wed Aug 14 20:04:01 2019 +0800 阳光app，获取书籍信息接口 commit 649cc4674c118681d5ad8eafadc365169b31d6aa Author: wanggb Date: Wed Aug 14 19:06:01 2019 +0800 用户注册增加bindtime commit eac97914c403764ddb60405e8554af032731376f Author: wanggb Date: Wed Aug 14 18:50:54 2019 +0800 用户注册增加bindtime commit d660e18280533c507a6f510ea47fcdb34e06f4fe Author: 李天时 Date: Wed Aug 14 19:44:27 2019 +0800 阳光app，运营位配置 commit ae75155da5817a28218269daf0a24a96ffd84792 Author: 李天时 Date: Wed Aug 14 18:11:27 2019 +0800 阳光app，书架接口 commit 8fce91252d6e65d58356e4b075fd21b27f22521e Author: 李天时 Date: Wed Aug 14 18:10:03 2019 +0800 阳光app，书架接口 commit f6d0e5d054937e91c64fc685f6cde72b2b0e4aa7 Author: liyt Date: Wed Aug 14 14:15:25 2019 +0800 APP活动 commit 8bfd43d5bb380166d77aeb34f14ed2cbc6248505 Author: liyt Date: Wed Aug 14 10:54:57 2019 +0800 APP活动 commit c86677e4ffd109ba1a3b961db1b5b4ca20e3cf9b Author: 李天时 Date: Tue Aug 13 20:08:10 2019 +0800 阳光app，书架接口 commit f21064b1a8da940dacf6d3987f29efd0c8d049b7 Author: wanggb Date: Wed Aug 14 16:16:05 2019 +0800 APP签到 commit 97fffb2dc2c9569adcb4a3b831bd677b7d8c4c33 Author: zhenglh Date: Tue Aug 13 19:46:08 2019 +0800 订单流程添加日志 commit 8c3d55fabbeba68c56461c6ab325105d08c5ec65 Author: wanggb Date: Tue Aug 13 19:51:32 2019 +0800 阅读页增加引入导量入口, 加入Redis commit c31f0817172a42ba1704ae0798025430ec639828 Author: wanggb Date: Tue Aug 13 18:41:06 2019 +0800 阅读页增加引入导量入口 commit 32cabda072a6d0d9b67cb6b3e19cb5d24c8c47cd Author: liyt Date: Tue Aug 13 17:39:53 2019 +0800 自定义商品 commit 85ad3d3b8272991ef40e0a397f902392509bd5d1 Author: zhenglh Date: Tue Aug 13 18:02:44 2019 +0800 用户信息校验处理 commit b8de2842dbf218bdf1297f9b7dcebc5b0d1eb981 Author: wanggb Date: Tue Aug 13 18:35:02 2019 +0800 阅读页增加引入导量入口 commit 2da612bd7ae81a1e02868eb037917f1bb9731d2a Author: wanggb Date: Tue Aug 13 17:33:55 2019 +0800 APP 导量管理 上传图片 commit 244859b21df98d69d55c41cf118d820818fafaaa Author: 李天时 Date: Tue Aug 13 18:44:58 2019 +0800 阳光app，书架接口 commit 107f95695e072ae878f210d69c07660454aaa870 Author: liyt Date: Tue Aug 13 16:46:09 2019 +0800 app自定义商品是否显示 commit 40aa8a41062ee626dbb542f4c80e60e5c0589ad6 Author: wanggb Date: Tue Aug 13 15:43:17 2019 +0800 动态码注册接口 commit afda169659efa192b6c481859b9f4e6d006f48c2 Author: wanggb Date: Tue Aug 13 15:34:11 2019 +0800 动态码注册接口 commit f2dccb274c40dc0aff74c4278f68b0a5aea2ec14 Author: liyt Date: Tue Aug 13 16:32:12 2019 +0800 app自定义商品 commit da568743b96a92a6f1a80231351d053b7beff1b4 Author: zhenglh Date: Tue Aug 13 17:11:53 2019 +0800 商品列表的返回 commit 3f72e0da25ee282cd37e6374356a33d25c6d6e67 Author: wanggb Date: Tue Aug 13 14:53:48 2019 +0800 动态码 commit 46b726b70ab9f56ed5713a2b85f929ca4a4455ac Author: wanggb Date: Tue Aug 13 14:49:56 2019 +0800 动态码 commit 0049f4787f46ee34dacef22a4dba323972365933 Author: wanggb Date: Tue Aug 13 14:44:54 2019 +0800 动态码 commit 9c774da9b60db62caff04a94eb788446a8e2b013 Author: wanggb Date: Tue Aug 13 14:42:41 2019 +0800 动态码 commit dcb73a40292bd8055727f1432f19796de74d9d14 Author: liyt Date: Tue Aug 13 13:57:54 2019 +0800 web基类方法 commit 098c385d56cb580dc99fbb3a2263a91517ba8117 Author: wanggb Date: Tue Aug 13 14:31:44 2019 +0800 动态码 commit 82653bc7406e43eab9567e08acdec4e5a34a77bc Author: wanggb Date: Tue Aug 13 13:28:26 2019 +0800 动态码 commit 0aa9a7c4607bafed994b4200f3b1c125368b29ad Author: wanggb Date: Tue Aug 13 11:56:01 2019 +0800 动态码 commit d76db7a1f5db81aadd56351153411f31f0d7495e Author: zhenglh Date: Tue Aug 13 15:19:52 2019 +0800 支付调试完成 commit 57fbd63059681da2066aa93083551bc08a9a2a6c Author: 李天时 Date: Tue Aug 13 17:15:17 2019 +0800 阳光app，书架接口 commit e81917dd8c26f523f60682cf68a4d36af33178d8 Author: wanggb Date: Tue Aug 13 11:09:01 2019 +0800 修改Code commit 05e627d7a833454f94148a3e647a1338bbb8b790 Author: zhenglh Date: Mon Aug 12 18:54:21 2019 +0800 订单取消缓存 commit c645ec4392e2b1af5b3e4d0ff4d75f8da1ec0084 Author: zhenglh Date: Mon Aug 12 17:36:13 2019 +0800 1分钟内的重复订单不重复下单 commit c028557fc214c3e068d2a427004d472a4a381e49 Author: zhenglh Date: Mon Aug 12 17:00:00 2019 +0800 下单完成后的跳转页面 commit 78ae07e5cc318913bb5082c34fd6d7b666c51922 Author: zhenglh Date: Mon Aug 12 14:40:47 2019 +0800 订单统计如果是app不添加推广统计 commit 76f90a32efd97855a0236e3d38be2693fbf7aed8 Author: 李天时 Date: Mon Aug 12 19:39:37 2019 +0800 阳光app，书架接口 commit 23a06ffece58155f3412f8b5498d2622b0e24fc8 Author: 李天时 Date: Mon Aug 12 17:27:16 2019 +0800 阳光app，启动接口 commit aa1148e96c059dc895d9d307f7ba25d0bf6385f8 Author: wanggb Date: Tue Aug 13 10:28:24 2019 +0800 增加测试签到页面 commit 5ba903baf667c247a96c35d42c8996248849020b Author: wanggb Date: Mon Aug 12 15:21:29 2019 +0800 递归转驼峰 commit 81b42d6ba4354d1551e878fd91e00118652d0029 Author: 李天时 Date: Mon Aug 12 11:25:56 2019 +0800 阳光app，如果返回值为空，则返回的data为json对象 commit abc00b658c53002cfd8100a63a92882750048de0 Author: wanggb Date: Mon Aug 12 15:07:14 2019 +0800 添加Log commit c0c825d0ffe99cf0b84afce5b439fcaceca5bf3b Author: wanggb Date: Mon Aug 12 10:51:54 2019 +0800 添加Log commit 0677739a8fd263e170a11689ed67ff56c375f429 Author: zhenglh Date: Sat Aug 10 20:04:49 2019 +0800 微信测试 commit aa987cc17003172543964e0d121d69ca67eeab3a Author: zhenglh Date: Sat Aug 10 19:12:08 2019 +0800 订单回调测试完成 commit 2343de33643ecafed3a6fe70f18c4fd9c687a84f Author: zhenglh Date: Sat Aug 10 18:51:38 2019 +0800 充值表添加business_line参数 commit b0e06da8a21d673cdc27b613d5720639a8df704d Author: zhenglh Date: Sat Aug 10 18:25:21 2019 +0800 business_line回调 commit 35c592a02e81eb80372adcdf6e717fe6c2ddabc7 Author: zhenglh Date: Sat Aug 10 16:45:48 2019 +0800 支付回调方法添加 commit a546a37d0d824296c2de3979e9bf9b9f9e49e1c6 Author: zhenglh Date: Sat Aug 10 16:37:34 2019 +0800 支付回调方法添加 commit 11ad680da737201945ae0b61d7f87ef1979c5596 Author: zhenglh Date: Sat Aug 10 15:53:02 2019 +0800 页面调整 commit cea7c007a05bd0538540f35ee2d15197c080cb00 Author: zhenglh Date: Sat Aug 10 15:45:14 2019 +0800 页面调整 commit a35904c0cb6f55093cdba534f6be7df062849355 Author: zhenglh Date: Sat Aug 10 15:44:35 2019 +0800 支付页面调整 commit abe95dcc98e5841b5c1700ce44cca3e7a0a57191 Author: zhenglh Date: Sat Aug 10 11:56:59 2019 +0800 add pay package commit b6d0cb166c0e42ada09ff4d6efe28ba45b2306c1 Author: zhenglh Date: Sat Aug 10 11:56:53 2019 +0800 add pay package commit e115c8a9dc97cfda147adffd6c7246a7aceb263d Author: 李天时 Date: Mon Aug 12 10:17:12 2019 +0800 阳光app，合并代码 commit af693812747c99b423080a096b005e073a0799a0 Author: wanggb Date: Mon Aug 12 10:25:33 2019 +0800 添加Log commit 50ebbbe1f3d109ca5e5c9abddcb1ac5f2b248d6e Author: wanggb Date: Fri Aug 9 19:18:55 2019 +0800 优化API接口， 使用接口码方式 commit d2fa1996f4a38d7923cc86e59febfe1dcadf6198 Author: liyt Date: Fri Aug 9 16:09:52 2019 +0800 搜索 commit fcf54e0b46b37e6a2510a98cbcf6bea55806ccf1 Author: liyt Date: Fri Aug 9 15:50:59 2019 +0800 h5页面 commit a39b214c581423b277766573cecfd7eb7e8ad668 Author: liyt Date: Fri Aug 9 15:33:39 2019 +0800 h5页面 commit c3d60e94d79a5d8d7fa552bfe565a28984fd0da4 Author: wanggb Date: Fri Aug 9 17:46:28 2019 +0800 管理后台增加"导量管理" commit 7e4aa6ab28fc79ab62a4a57e544d2509002b2a29 Author: wanggb Date: Fri Aug 9 11:24:19 2019 +0800 增加接口() commit a536625e4ef310b706063d940fcf43c91a6b1d13 Author: 李天时 Date: Fri Aug 9 11:29:31 2019 +0800 阳光app，合并代码 commit 57b53c4e27827cadbc1396bdc97eb604e4a9b2f5 Author: liyt Date: Fri Aug 9 10:38:06 2019 +0800 客户端配置 commit 4198a9846cfd7e89b8ae05e673f75b061ee0aab5 Author: 李天时 Date: Fri Aug 9 11:20:51 2019 +0800 阳光app，合并代码 commit d5ada5da546a2360d3380f2e6df1ebf92598916f Author: 李天时 Date: Fri Aug 9 10:37:36 2019 +0800 阳光app，合并代码 commit d5d07b4ef22dd4b8179295caf2f9314b71f07301 Author: liyt Date: Thu Aug 8 17:48:00 2019 +0800 倒计时 commit 2aeb35d18c81a889bfc9dada7fdd2142405b23ad Author: liyt Date: Thu Aug 8 17:38:21 2019 +0800 倒计时 commit 3a68d8e6f3b8cb9a02026206b3c171a01026a4c9 Author: liyt Date: Thu Aug 8 15:27:32 2019 +0800 批量失效 commit 1d814019840b6d5b1f4cd9ecbf0f330a65855ba0 Author: liyt Date: Thu Aug 8 14:59:47 2019 +0800 配置 commit 4fe4e410f66182dcb9a8e87ec2dfd545655450e9 Author: liyt Date: Thu Aug 8 14:54:20 2019 +0800 配置 commit f2093895b6522dc98342542319187d745f29d950 Author: wanggb Date: Thu Aug 8 17:33:30 2019 +0800 增加接口(获取用户信息) commit da696f2a1feaee143d1ee2c86b5ab2168e1d1fa8 Author: liyt Date: Thu Aug 8 10:13:10 2019 +0800 热门搜索词 commit 8e537256cd97549181c52ea87158f57d16f67142 Author: liyt Date: Thu Aug 8 10:08:26 2019 +0800 代码转移 commit c2f0d4a3b8504e0ffd970f2e0f88339fb02af7b2 Author: liyt Date: Thu Aug 8 10:05:49 2019 +0800 代码转移 commit 56bdd2f4a954889f0df02e1d100946dbbe204227 Author: liyt Date: Wed Aug 7 17:36:56 2019 +0800 转移之前的代码 commit bead9ed2facd8296cccdd2796603ca85bf1f678b Author: liyt Date: Wed Aug 7 16:31:59 2019 +0800 搜索关键词 commit 4efa61aa132dc4e64fb7c9546a03a2de6548e7fd Author: wanggb Date: Thu Aug 8 11:41:17 2019 +0800 增加遗漏文件 commit add84455931fe313f00bf4f68423b89bfd2ba9b1 Author: wanggb Date: Wed Aug 7 13:33:51 2019 +0800 搬移文件 commit a52b80c357dbfbf0426371a1d7c3758632856c12 Author: wanggb Date: Wed Aug 7 11:53:55 2019 +0800 搬移文件 commit a0d19c885a650927f7a1635f41d10fdbfc57e096 Author: wanggb Date: Wed Aug 7 11:49:01 2019 +0800 搬移文件 commit c8de06f325423d44b6e7d506c394eb55ce91494d Author: wanggb Date: Wed Aug 7 11:40:32 2019 +0800 搬移文件 commit 2bc53723d2ace1fe8472a57f4bb94d763b20029c Author: wanggb Date: Wed Aug 7 11:18:11 2019 +0800 搬移文件 commit 98a5eaf133ad158a2fba6aefa788037232faa4e0 Author: liyt Date: Tue Aug 6 15:39:40 2019 +0800 app后天配置 commit 433779fe0c102834b0826eb602358c33179ee96f Author: zhenglh Date: Sat Aug 24 18:21:28 2019 +0800 小说统计-充值 commit 9f178ae01c338162532ea95b4e1856fe4c1a63ed Merge: 6e8955bb8 89ba8298f Author: zhenglh Date: Sat Aug 24 18:17:36 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 6e8955bb805bf0e2ddfd43d4a8ea514cac153c87 Author: zhenglh Date: Sat Aug 24 18:17:30 2019 +0800 扣量测试完成 commit 89ba8298ff2c12622e5a52c9e893b88fb6d75696 Merge: d443d013d 98ccfad76 Author: liyt Date: Sat Aug 24 18:03:51 2019 +0800 Merge branch 'dev-app-20190806' of 192.168.0.31:fe/cps into dev-app-20190806 commit d443d013d13829792cef4b7a739fa496107c316f Author: liyt Date: Sat Aug 24 18:03:43 2019 +0800 活动下单传参 commit 98ccfad7686fecf690701706dbea9e5628a0d7e5 Author: wanggb Date: Sat Aug 24 17:57:04 2019 +0800 Code 码加前缀 DZ# commit 2b241cbe34140b76d1cbf5739675ec827f7c5a18 Merge: 4e12c5dd7 c1b5ce3fc Author: wanggb Date: Sat Aug 24 17:54:47 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 4e12c5dd7bb2766954a4af03489c1e12679d97f3 Author: wanggb Date: Sat Aug 24 17:54:36 2019 +0800 Code 码加前缀 DZ# commit c1b5ce3fc9766532f64da7e84c6cc693facd6553 Merge: ad3ce757c f54e737e4 Author: 李天时 Date: Sat Aug 24 17:39:06 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit ad3ce757c9b232a23f4cd5004a35c144ada9668d Author: 李天时 Date: Sat Aug 24 17:38:58 2019 +0800 阳光app，运营位加缓存 commit f54e737e488ea626a3550e53e1221c6c19c2a584 Merge: ba67e5335 05c66156a Author: wanggb Date: Sat Aug 24 17:24:53 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit ba67e53353b52db7388f6943faaea719a857c729 Author: wanggb Date: Sat Aug 24 17:24:42 2019 +0800 Code 码加前缀 DZ# commit 05c66156adc0b6e57bb5989751c9d9386c055753 Merge: b94479448 8aec703ae Author: zhenglh Date: Sat Aug 24 17:07:44 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit b9447944812044f070d59ef4d645df0e63ef81ab Author: zhenglh Date: Sat Aug 24 17:07:38 2019 +0800 日志格式改为json格式 commit 8aec703aeb1446cc4b51ecd7f6fe2d5ab09242d8 Author: wanggb Date: Sat Aug 24 17:01:41 2019 +0800 Code 码加前缀 DZ# commit 4b396384a96f3f96425ad6c5717e908c90b9fa41 Author: wanggb Date: Sat Aug 24 16:38:33 2019 +0800 Code 码加前缀 DZ# commit ef739bcb45dea2e4d10bb111ec2e738868c40bd6 Merge: 23363f612 29e0117d5 Author: wanggb Date: Sat Aug 24 16:08:19 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 23363f612e2e91b9d32c1385e1f43b80015bb902 Author: wanggb Date: Sat Aug 24 16:07:55 2019 +0800 app 引导位数据统计 commit 29e0117d5d354850ded21c24a46a85f8dba84f36 Author: zhenglh Date: Sat Aug 24 15:48:55 2019 +0800 清除缓存问题处理 commit d7c961d8a41f14fc4de11c14528b4c765329372f Author: zhenglh Date: Sat Aug 24 15:39:01 2019 +0800 清除缓存问题处理 commit 4dec635a3832ed82a92e267963791795e159f456 Author: zhenglh Date: Sat Aug 24 15:05:41 2019 +0800 支付添加订单缓存 commit f4fd03116ee5a136455837f498b51f8b5098b827 Merge: a62b7315c 8ef117b16 Author: zhenglh Date: Sat Aug 24 14:39:59 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit a62b7315cdc5e8874fefe936241227822a8c4ed8 Author: zhenglh Date: Sat Aug 24 14:39:49 2019 +0800 支付缓存添加 commit 8ef117b16c315c88cb83af6361fe21cb8902b048 Author: 李天时 Date: Sat Aug 24 14:24:06 2019 +0800 阳光app，运营位加缓存 commit 9943a35209dbe958f77d2ebfb6e81a2f6905b0b9 Merge: d00c61002 40880e7a0 Author: 李天时 Date: Sat Aug 24 14:21:46 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit d00c61002b0a170f10dff661df0d9798660aa950 Author: 李天时 Date: Sat Aug 24 14:21:36 2019 +0800 阳光app，运营位加缓存 commit 40880e7a00af33fcdc7d91db95b4a23b8d4f59d8 Author: liyt Date: Sat Aug 24 14:18:26 2019 +0800 排序改为越大越靠前 commit e33dd8d0011144cd75e0230e8fc7a7602c949a95 Author: liyt Date: Sat Aug 24 14:15:04 2019 +0800 通用手机验证码 commit 3872e1f7ca0b5dca1d5c4233f9f6c79283c18d41 Author: liyt Date: Sat Aug 24 14:10:16 2019 +0800 通用手机验证码 commit 5360a0d356a9b7a5c6a30318b89d8f490bf5f864 Author: liyt Date: Sat Aug 24 14:09:33 2019 +0800 通用手机验证码 commit 6a7dfb4f90194a06cd7d69f6a7a6d57590ce2e5d Author: zhenglh Date: Sat Aug 24 13:47:55 2019 +0800 app分成比例 commit 1af1ba0eb4e2f301912c519843100805eb2b21f9 Author: zhenglh Date: Sat Aug 24 13:45:45 2019 +0800 app分成比例 commit e49b4a3cc043bd5e3510a9f393a2d66b8eac5387 Merge: 2e74cb6f4 d94ab900d Author: zhenglh Date: Sat Aug 24 13:37:42 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 2e74cb6f48cd74f2f30fd7debe57278c2ca900da Author: zhenglh Date: Sat Aug 24 13:37:32 2019 +0800 原充值添加business_line commit d94ab900d2284556fa2a7bd01108285c16a6ff52 Author: liyt Date: Sat Aug 24 10:51:54 2019 +0800 搜索 commit 6c9696c54cfbbbb41d6344d3ab7edb5d2648b5da Merge: a0c9facbb 59f74459c Author: zhenglh Date: Sat Aug 24 10:39:29 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit a0c9facbb77e898e9f325f160076962174b60a6e Author: zhenglh Date: Sat Aug 24 10:39:25 2019 +0800 日志 commit 59f74459cf1bbaf735234c9e3331ecf6dded8abd Merge: 57347713f bf74efdde Author: wanggb Date: Sat Aug 24 10:35:33 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 57347713fea8c2c1b7bba0549e2a85290cf4363c Author: wanggb Date: Sat Aug 24 10:35:24 2019 +0800 app 引导位数据统计 commit bf74efdde67679c3dbcc71bfb0af0a4ce87a1bd7 Author: zhenglh Date: Sat Aug 24 09:59:42 2019 +0800 回调时添加金额缓存使用公共方法 commit ad47637b693b48f6c95f03fba6140ae3a2a7bff9 Merge: ec985aace c4fd7b280 Author: zhenglh Date: Fri Aug 23 20:34:57 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit ec985aace1558159a5a4abbcaf3bc63733e7a013 Author: zhenglh Date: Fri Aug 23 20:34:49 2019 +0800 扣量日志变更 commit c4fd7b280dce320fbd95b7f1b822bc7f9b8fba38 Merge: 654923286 751b7b8d2 Author: wanggb Date: Fri Aug 23 20:15:40 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 654923286bd8fcceb07909f2c26f44680cb25d47 Author: wanggb Date: Fri Aug 23 20:15:32 2019 +0800 引入新版Openinstall.js commit 751b7b8d2016c219cd0a17f2cc12f88be795ee0e Merge: 90b5ccbd6 fa6b4832f Author: zhenglh Date: Fri Aug 23 20:13:52 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 90b5ccbd67fa101d7ae26ff83452d9375430d4ba Author: zhenglh Date: Fri Aug 23 20:13:33 2019 +0800 类文件名称修改 commit fa6b4832fc9541f5d0af3102614b41032fb4c4ce Author: wanggb Date: Fri Aug 23 19:47:00 2019 +0800 引入新版Openinstall.js commit 9375291764956ddf9e1045be4e850b513459bffd Merge: 23d303c49 59f572b34 Author: 李天时 Date: Fri Aug 23 19:42:37 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 23d303c4942ca6c455507f9dfa15992221b8696f Author: 李天时 Date: Fri Aug 23 19:42:30 2019 +0800 阳光app，运营位加缓存 commit 59f572b34fd33e281645e148769f3988953b9f1a Merge: 6d66e409f 679d2425f Author: wanggb Date: Fri Aug 23 19:17:11 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 6d66e409f27765c44753f591614edf7090ab63b1 Author: wanggb Date: Fri Aug 23 19:17:00 2019 +0800 引入新版Openinstall.js commit 679d2425fdc9a21387114f757ad62d4a08557c35 Merge: 153e956df 51de37e68 Author: zhenglh Date: Fri Aug 23 19:09:18 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 153e956df7b70cedddab2efa5b8b1052220ad277 Author: zhenglh Date: Fri Aug 23 19:09:08 2019 +0800 扣量单元测试完成 commit 51de37e68bb2ce096cd6ff9c8be2e76f280afbe6 Merge: 3eebdd04b 700a9ab76 Author: 李天时 Date: Fri Aug 23 19:06:18 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 3eebdd04b29d0728ff408607c2b41505988b5055 Author: 李天时 Date: Fri Aug 23 19:06:12 2019 +0800 阳光app，运营位加缓存 commit 700a9ab76c2641068ef5a6e64d00cfde3ee412ad Author: liyt Date: Fri Aug 23 19:00:10 2019 +0800 下单关闭选择方式 commit 8fcb4731472edcbdfaff0a2fb824379de709adef Merge: f7f400188 3ec268da5 Author: 李天时 Date: Fri Aug 23 18:47:03 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit f7f400188641c1612c9c5a1bdff04f9193b34fbf Author: 李天时 Date: Fri Aug 23 18:46:56 2019 +0800 阳光app，app版本 commit 3ec268da5ffdfc23f79df1922dfb4fd5af84dd52 Merge: b6989cc38 e005f9f8b Author: wanggb Date: Fri Aug 23 18:20:24 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit b6989cc387382ce1f81c6e110efff6a4a4383d90 Author: wanggb Date: Fri Aug 23 18:20:10 2019 +0800 APP导量 增加打点 commit e005f9f8b22fd6cf24a7fc439e1bab7cb9936353 Author: liyt Date: Fri Aug 23 17:49:56 2019 +0800 修复在自定义商品BUG commit ef709322883ba40322d5d2259fc5f4c6ef763426 Merge: 492edd914 a9db20071 Author: 李天时 Date: Fri Aug 23 17:15:54 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 492edd9144ede02b363c7130df26daa348fc4405 Author: 李天时 Date: Fri Aug 23 17:15:47 2019 +0800 阳光app，app版本 commit a9db200715c89a18478960a3c5e882d31f5d1da6 Author: liyt Date: Fri Aug 23 16:44:58 2019 +0800 块管理下书籍打点 commit d520606b3c5f7d4227108e953cf5e7a41309b918 Author: liyt Date: Fri Aug 23 15:45:16 2019 +0800 块管理下书籍打点 commit 66d0dc531de792365911f8796cf6a6256cdd19cd Author: liyt Date: Fri Aug 23 15:20:55 2019 +0800 分类下书籍打点 commit f83d497dc0a091e96c0a2f3f6af2cc9815482e50 (tag: cps_20190828_105014) Author: zhenglh Date: Fri Aug 23 15:19:00 2019 +0800 用户订单查询添加KL逻辑 commit aebdd190381695e46a3624d8eba71aafca1447dd Author: liyt Date: Fri Aug 23 15:02:28 2019 +0800 搜索打点 commit d415cc35735c840823ec275f765a3261153f6d4f Author: liyt Date: Fri Aug 23 14:30:43 2019 +0800 打点 commit 5b1845c9fb46934e961a9a43d4eeefa2d9a9b1e6 Merge: b6fee9f54 f7efea1d9 Author: zhenglh Date: Fri Aug 23 12:08:17 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit b6fee9f54cc2258ddf7ddcd15c631a6f284c633b Author: zhenglh Date: Fri Aug 23 12:08:07 2019 +0800 后台添加APP配置 commit f7efea1d9c28c1c8e548613fae6b0cbd9a035f02 Author: liyt Date: Fri Aug 23 11:57:35 2019 +0800 弹窗背景 commit 52e8410873d183b3f68de84162fdf7eecb58f7fa Merge: b14f62918 d33f0dbd7 Author: wanggb Date: Fri Aug 23 11:14:24 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit b14f62918ad2db68f245cabb71cbfad1144673c1 Author: wanggb Date: Fri Aug 23 11:14:14 2019 +0800 guide_manage增加字段APP_URL commit d33f0dbd7d2b61f24eabacdd63296a1ab639b2b6 Author: liyt Date: Fri Aug 23 11:13:52 2019 +0800 弹窗背景 commit 7203e4d37732af1e6c8e23224d50f881d6686c96 Author: liyt Date: Fri Aug 23 10:13:29 2019 +0800 弹窗 commit 8846016e67af177a6c3279b2f2efef07207c3568 Author: wanggb Date: Thu Aug 22 19:53:17 2019 +0800 删除上一版多余文件 commit 1a6ee8046a23ea34b5f5dd008fa799ec9417b99b Merge: 51d8fc92a d9575d170 Author: wanggb Date: Thu Aug 22 19:07:14 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 51d8fc92abda6a9bf0ca34cc75faeabbebe58313 Author: wanggb Date: Thu Aug 22 19:07:03 2019 +0800 获取用户返回信息 commit d9575d1706c865ebd937ff04b500dfb0d0ce11d1 Merge: bd639542b 94a9e22d8 Author: 李天时 Date: Thu Aug 22 18:01:01 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit bd639542bded19531b0f99adde3ae1e78c47d40d Author: 李天时 Date: Thu Aug 22 18:00:52 2019 +0800 阳光app，消费打点 commit b08126dc143be145538cb3fc655192ae984d41d9 (tag: cps_20190823_110240) Author: guyuexuan <2651919937@qq.com> Date: Thu Aug 22 17:45:48 2019 +0800 修改 book redis 基础缓存内的书籍封面相对路径 commit 94a9e22d84b3520570b3e1beaba2a2b27c337762 Author: liyt Date: Thu Aug 22 17:41:53 2019 +0800 活动结束 commit 90fdeac7159125e2b1573bd26474100065b88ae1 Merge: e15c464ef 07930f963 Author: 李天时 Date: Thu Aug 22 17:35:43 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit e15c464ef5459832d3c510dd2177c46958f998e2 Author: 李天时 Date: Thu Aug 22 17:35:36 2019 +0800 阳光app，消费打点 commit 07930f963b26d06d352272e43a95969b7d0e73dd Merge: e4e14bb7e 4af986f11 Author: wanggb Date: Thu Aug 22 17:17:47 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit e4e14bb7eb26842fc6a07f1811edf6fbc1a45899 Author: wanggb Date: Thu Aug 22 17:17:35 2019 +0800 获取用户返回信息 commit 4af986f11c82f7ef6945331b7e2ea247ebdb0e7c Merge: 69500b01c f13265034 Author: zhenglh Date: Thu Aug 22 17:07:39 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 69500b01ca7e37808b018c7ea696191f43a7d70a Author: zhenglh Date: Thu Aug 22 17:07:32 2019 +0800 活动id限制 commit f1326503410aa56568474590f62987aeaf52340d Author: wanggb Date: Thu Aug 22 17:01:54 2019 +0800 获取用户返回信息 commit 7d10c6402d9e8a1fcb86509e57a0248632e13193 Merge: 46f87160f 97553ef38 Author: wanggb Date: Thu Aug 22 16:53:13 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 46f87160fc6f7d6e569e2592e9ebd84943ce7bd8 Author: wanggb Date: Thu Aug 22 16:53:01 2019 +0800 获取用户返回信息 commit 97553ef388ac9eb4eb119a425b5654b921b5a8fe Merge: 92ddcbb3b c0b1ce231 Author: 李天时 Date: Thu Aug 22 16:52:11 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 92ddcbb3b18f47a68159009e114463b4dc12c8fa Author: 李天时 Date: Thu Aug 22 16:52:04 2019 +0800 阳光app，消费打点 commit c0b1ce231d779b997a82b6b1aba4476299008764 Author: wanggb Date: Thu Aug 22 16:42:40 2019 +0800 获取用户返回信息 commit f093e32c6557ff723719fca60d3350c7c5676522 Author: wanggb Date: Thu Aug 22 16:41:22 2019 +0800 章节页面，Openinstall下载APP commit 1a9452415e06c224471e9dd3c21d53024828d1f2 Author: zhenglh Date: Thu Aug 22 15:41:17 2019 +0800 赠币活动在客服消息发送时处理 commit e644ff87b7d54474641c5e925c7104fef0ab325e Author: wanggb Date: Thu Aug 22 15:30:06 2019 +0800 章节页面，Openinstall下载APP commit 35af0ab29b8383c14ce68ee1d99443fd3f55ec3b Merge: 42f249609 9b10b91f9 Author: wanggb Date: Thu Aug 22 15:21:40 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 42f2496092b80084f19b669df4f96df8697643d4 Author: wanggb Date: Thu Aug 22 15:21:31 2019 +0800 章节页面，Openinstall下载APP commit 9b10b91f99d5caa759384e394c884dee7e69aa8a Author: 李天时 Date: Thu Aug 22 14:59:09 2019 +0800 阳光app，消费打点 commit c09c5153cab1f51040298ec4caadea2bb6363d4f Merge: cd8e1a11b 5b6b072bb Author: 李天时 Date: Thu Aug 22 14:19:35 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit cd8e1a11b413e2fc5967841d5a14366cdf6d78ea Author: 李天时 Date: Thu Aug 22 14:19:26 2019 +0800 阳光app，弹窗运营位配置 commit 0f84764a68f1729001f7540296fb739dd9982acf (tag: cps_20190822_142309) Merge: 796251e15 c9045a33d Author: zhenglh Date: Thu Aug 22 14:04:30 2019 +0800 Merge remote-tracking branch 'origin/master' commit 5b6b072bb0ffa466156643aeb97769d6894f7ba8 Author: wanggb Date: Thu Aug 22 14:00:27 2019 +0800 Boot 签到页面 commit 796251e1537f9086bd50b8655aafc89324dceada Author: zhenglh Date: Thu Aug 22 13:54:07 2019 +0800 ext为空时的处理 commit ab40a59b08fa5bbe55b4daa7f754ca29278d1233 Author: wanggb Date: Thu Aug 22 11:49:01 2019 +0800 文章页面拉起openinstall commit 6ff9ae85f1423ac4925631e812e557480fb0ac3f Merge: 20fcbabe8 e60944904 Author: wanggb Date: Thu Aug 22 11:30:18 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 20fcbabe87ba8ca8ae4eab918811b302758223bd Author: wanggb Date: Thu Aug 22 11:30:05 2019 +0800 文章页面拉起openinstall commit e609449048bdac9cd8076ae5235c6044aba2ca64 Author: liyt Date: Thu Aug 22 11:27:24 2019 +0800 修改文案 commit 5064cdb8e80e28c23eb8104003d566402b83e9fc Author: wanggb Date: Thu Aug 22 11:20:48 2019 +0800 文章页面拉起openinstall commit 8a6236a6109b5c11cf48d6d8685303cee59d6b32 Merge: c2da2561b ef864bcf2 Author: wanggb Date: Thu Aug 22 11:14:54 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c2da2561bad1d0d40fb78beeb505abb542b0a08b Author: wanggb Date: Thu Aug 22 11:14:14 2019 +0800 文章页面拉起openinstall commit ef864bcf275c89882ffedae56f08273de55900f0 Merge: cbca3dbf0 1a130203a Author: zhenglh Date: Thu Aug 22 11:09:05 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit cbca3dbf0de7110806e3220408f6286733937979 Author: zhenglh Date: Thu Aug 22 11:08:55 2019 +0800 查单接口添加商品信息 commit 1a130203a806e655d6b7a357dd814746e89475d4 Merge: 9293f76ee 18fc14645 Author: wanggb Date: Thu Aug 22 11:03:29 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 9293f76ee64d74255b703467778cee0cf0800053 Author: wanggb Date: Thu Aug 22 11:03:15 2019 +0800 文章页面拉起openinstall commit 18fc14645f9518c08af76e158a84a9ba6b5ce43b Author: liyt Date: Thu Aug 22 10:43:24 2019 +0800 注释冗余代码 commit 35a64c89d0d2facf15e515573938cf465f5de6fe Author: liyt Date: Thu Aug 22 10:24:58 2019 +0800 回退 commit 67f81e2238a6fc0f81c21da9163299215eeb8ef5 Author: liyt Date: Wed Aug 21 21:26:30 2019 +0800 去掉回退按钮 commit 131dd97e8ad42c61fd840d09b8c9d3e9199bdeeb Author: liyt Date: Wed Aug 21 21:16:54 2019 +0800 回退 commit 76608754f90e6a1f4314d4215f93583264533c71 Merge: ff342dd00 5d103a469 Author: 李天时 Date: Wed Aug 21 20:51:54 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit ff342dd006a0a8f765da7fa4ab24e604096514ec Author: 李天时 Date: Wed Aug 21 20:51:47 2019 +0800 阳光app，消费打点 commit 5d103a469dd98cd065c22e374f1f073ed3af3f47 Author: wanggb Date: Wed Aug 21 20:38:37 2019 +0800 CPS 个人中心页面是否展示客户端绑定的动态码 commit 8d9cdec15e651bf96966a1c908dfa7326b8e46ed Merge: 1d9b9cb13 efb610f3f Author: wanggb Date: Wed Aug 21 20:29:15 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 1d9b9cb13d9e0940b087df3a1a385d7af7c57a6b Author: wanggb Date: Wed Aug 21 20:29:04 2019 +0800 CPS 个人中心页面是否展示客户端绑定的动态码 commit efb610f3f31e3ad898f8270248bba06cc04c4fc3 Author: liyt Date: Wed Aug 21 20:28:08 2019 +0800 返回 commit 7f86b01c70eb02dc00f2d0da91986e01fbd80523 Merge: 4aee8dc91 67bb78c24 Author: wanggb Date: Wed Aug 21 20:24:52 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 4aee8dc9149476545084c0109f676c8ea0e8d79c Author: wanggb Date: Wed Aug 21 20:24:43 2019 +0800 CPS 个人中心页面是否展示客户端绑定的动态码 commit 67bb78c24deb4585756626d7c853ea1ae4cb72d9 Merge: ed128e423 99338127e Author: zhenglh Date: Wed Aug 21 20:11:32 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit ed128e4236c3586708ed0c6c002cec4c26f274c8 Author: zhenglh Date: Wed Aug 21 20:11:23 2019 +0800 订单成功支付时返回书币 commit 99338127e4d8d4aab6218a6e51b75eb6addbb7b6 Author: liyt Date: Wed Aug 21 20:09:55 2019 +0800 书城首页 commit 2a5ded81f8a6fa89c1f5c5297ffb4ff7adb1c304 Merge: 213925105 d796ad5c9 Author: wanggb Date: Wed Aug 21 19:54:43 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 2139251057352b4ce1f621ec473f366b95ddda29 Author: wanggb Date: Wed Aug 21 19:53:58 2019 +0800 APP 用户注册|绑定手机号，加入打点 commit d796ad5c9576db245b1b1f74b9ef2c0d2feb406c Author: liyt Date: Wed Aug 21 18:49:10 2019 +0800 领取大礼包 commit 189e328d06e8580fc297f983659a49bbc8cee5ce Author: liyt Date: Wed Aug 21 18:03:07 2019 +0800 h5验证签名 commit 368205aefb5931f4ab5d3059de5932c414bd4827 Merge: c69a1e218 c1cf99f30 Author: 李天时 Date: Wed Aug 21 17:57:18 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c69a1e2184f8d88fc9d7359efc67fa849eba4d1a Author: 李天时 Date: Wed Aug 21 17:57:11 2019 +0800 阳光app，启动接口 commit c1cf99f3089efde9fcc956b7ccb39398be6b5360 Author: liyt Date: Wed Aug 21 17:22:29 2019 +0800 pv打点 commit 5f53644ec06c798d2eead2fc6f69676d9f4bf88f Merge: f2c3b2c15 c6ced96da Author: zhenglh Date: Wed Aug 21 17:21:01 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit f2c3b2c15d465901647d30147775ca204d6b6774 Author: zhenglh Date: Wed Aug 21 17:20:51 2019 +0800 添加查单接口，下单添加订单ID commit c6ced96da7d27499b315376c98287064cf308724 Author: liyt Date: Wed Aug 21 17:18:19 2019 +0800 pv打点 commit 5c9341910eda8dff01026ebb24ff978084689d5b Author: liyt Date: Wed Aug 21 16:33:43 2019 +0800 pv打点 commit 5e53ab24eb0775294d3291fa1e2a0ca6a3895399 Author: liyt Date: Wed Aug 21 16:08:46 2019 +0800 打点 commit 04911985cf50348484d9feecbf64b7c8e8b389b9 Merge: 5c68df5a5 99bd4eed0 Author: 李天时 Date: Wed Aug 21 15:27:23 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 5c68df5a58655ea8bfb0a180db062c108c86fe65 Author: 李天时 Date: Wed Aug 21 15:27:16 2019 +0800 阳光app，启动接口 commit 99bd4eed0e12b8ae09d3c66acf68a1961c886751 Author: liyt Date: Wed Aug 21 15:12:59 2019 +0800 吊起登录 commit e3a424566df319db50115bbb664d68f1ff3418d8 Merge: 407183550 fd8825ca9 Author: zhenglh Date: Wed Aug 21 15:01:22 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 407183550d148501642ca9b04b46e38df029a037 Author: zhenglh Date: Wed Aug 21 15:01:16 2019 +0800 订单统计过滤业务端 commit fd8825ca9b6e92b0ece747d69cc0ab985fbbf7b4 Merge: f43ce57e4 02e7884c0 Author: wanggb Date: Wed Aug 21 14:58:32 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit f43ce57e49916914d325c643ef3f75cf5802cb1e Author: wanggb Date: Wed Aug 21 14:58:21 2019 +0800 APP 用户注册打点 commit 02e7884c030957502d099c89654dfbf09fd621b7 Merge: e10867d2d ebeb932ee Author: liyt Date: Wed Aug 21 14:41:31 2019 +0800 Merge branch 'dev-app-20190806' of 192.168.0.31:fe/cps into dev-app-20190806 commit e10867d2d6bfb6b3bfcacf1665401585d45a96b1 Author: liyt Date: Wed Aug 21 14:41:17 2019 +0800 吊起登录 commit ebeb932ee047aa4484437f91e68fb14cead5c569 Merge: 3e3de952a 94f8d5bf8 Author: 李天时 Date: Wed Aug 21 14:22:14 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 3e3de952a9f95efcd631095469adeb679d208757 Author: 李天时 Date: Wed Aug 21 14:22:07 2019 +0800 阳光app，书籍详情页推荐书籍接口 commit c9045a33dfcce775ee9648989ba5624c15e2f505 Author: guyuexuan <2651919937@qq.com> Date: Wed Aug 21 14:18:13 2019 +0800 增加基础缓存分片映射 commit fa867599f4dc37e8b1c5a37f8b5fe79bd08c4a85 (tag: cps_20190821_145853) Author: zhenglh Date: Wed Aug 21 14:09:08 2019 +0800 订单返回列表去掉deduct字段 commit 97e7a747db5308635bae3cf10393aa7002423ad6 Author: zhenglh Date: Wed Aug 21 13:53:58 2019 +0800 客服消息资源弹窗&返回资源弹窗功能取消 commit 8647076b1b8090406fe7c9f1e9ac8fe27fa29596 Author: zhenglh Date: Wed Aug 21 12:52:26 2019 +0800 签到回复chapter_id改为sid问题处理 commit 47bdd68a63ade0bd0a08194e1875132d53328c66 Author: zhenglh Date: Wed Aug 21 11:14:18 2019 +0800 支付回调客服消息使用订单的ext commit 94f8d5bf8b934b2553fb5fa1420a0f4f584e09ed Author: wanggb Date: Wed Aug 21 11:10:16 2019 +0800 APP　连续签到 commit 68f325f2c6e388b3f15a1e51d866393d72dea9ac Author: wanggb Date: Wed Aug 21 11:07:43 2019 +0800 APP　CODE注册 commit be38a3158b9be121786f010d052686b3055fa857 Author: liyt Date: Wed Aug 21 10:53:59 2019 +0800 吊起登录 commit 171795edd387f715f74ad834089698f8cd2e1089 Author: liyt Date: Tue Aug 20 21:04:12 2019 +0800 联调 commit 912854b1c2cbe70d763e1ec8d90bd6b3d405a6e3 Author: liyt Date: Tue Aug 20 19:16:13 2019 +0800 联调 commit 026e5f5ae5c208735d0cf94ef23efe631c61c908 Author: liyt Date: Tue Aug 20 18:45:41 2019 +0800 联调 commit c53458c0af12089dbe1ea88e41799278120c005f Author: liyt Date: Tue Aug 20 18:16:28 2019 +0800 充值记录 commit a5772b125177c4a6543ba31a9c63eb79eb05742f Author: liyt Date: Tue Aug 20 17:30:31 2019 +0800 js联调 commit f2d84ab4c94fe5bf115fe9c678bf0d0c8028016e Author: wanggb Date: Tue Aug 20 17:24:26 2019 +0800 APP 打包userinfo commit 4feae18c79f529fb1c7d673b781574894cfd207c Author: wanggb Date: Tue Aug 20 16:29:31 2019 +0800 APP 打包userinfo commit 521b4b2785ef6e831dd71e06e2e0a1b5eec4f5e4 Author: wanggb Date: Tue Aug 20 16:02:53 2019 +0800 APP 打包userinfo commit 99f884e1ea55f6dd66fc62720272160ad8929c8a Merge: d41dcbb60 ab812a02f Author: wanggb Date: Tue Aug 20 15:52:53 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit d41dcbb607c55213e911bee07dc9aab93be2c643 Author: wanggb Date: Tue Aug 20 15:52:44 2019 +0800 APP 打包userinfo commit ab812a02f10f3901f864cd3236d168e8ae7603c7 Author: liyt Date: Tue Aug 20 15:42:52 2019 +0800 充值记录 commit 7f36cdf6558d80541a6e3ee55b0752b752225cba Author: liyt Date: Tue Aug 20 15:19:51 2019 +0800 充值方式选择 commit ef248d6db1ac0821c8dc7419cba63a3eb3b7ad34 Merge: 162c54910 849baf222 Author: wanggb Date: Tue Aug 20 14:55:50 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 162c549105bfdb53b7737de733be11db9fc78a72 Author: wanggb Date: Tue Aug 20 14:55:41 2019 +0800 APP　Code码注册后返回用户信息，统一格式 commit 849baf2220805e2b73d1538f71646fb7edb8f5b9 Author: liyt Date: Tue Aug 20 14:14:19 2019 +0800 清理代碼 commit d8d891212f968e210283e3376cbf0b9ffaa34810 Author: liyt Date: Tue Aug 20 11:43:49 2019 +0800 商品列表 commit c42fcda0afaa55b1ff5bcc37fdccfd67ad4d3be0 Author: liyt Date: Tue Aug 20 11:33:00 2019 +0800 h5登录 commit 44026ad5a657ab36c3cb8801d96eba0ecd71e018 Author: liyt Date: Tue Aug 20 11:07:27 2019 +0800 商品列表选择末班 commit 3572734cf164ddaacbfadf3c80869e86e10f42e9 Merge: 661ad4150 0c69f3674 Author: wanggb Date: Tue Aug 20 10:48:57 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 661ad41500849277f9e3f82225eb77fd4048e738 Author: wanggb Date: Tue Aug 20 10:48:45 2019 +0800 测试阶段，将短信验证码设置为1111 commit 0c69f3674ca0eed0eb345ffd51c4f1bf53d59f8f Author: liyt Date: Tue Aug 20 10:29:53 2019 +0800 去掉适配 commit fcb790831b8cac6caa70e95bd1a2c8a4741b8d9b Author: liyt Date: Mon Aug 19 20:34:07 2019 +0800 联调 commit 73373560421f57f5a16b82d8af96be64b2c2c99c Author: liyt Date: Mon Aug 19 20:00:44 2019 +0800 联调 commit c92a2eef932d36257cba55eb818b769aec5dfb19 Author: liyt Date: Mon Aug 19 19:45:21 2019 +0800 联调 commit a649de682de54894990360026722725c4a92812d Merge: 00fa53138 7d5d9483e Author: zhenglh Date: Mon Aug 19 19:36:29 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 00fa53138c24b88a1ae981d523a922cf6ceff64f Author: zhenglh Date: Mon Aug 19 19:36:24 2019 +0800 支付列表添加图片地址 commit 45c93e1a4b3a2c0bea7e513e8e18928f958c7120 Author: zhenglh Date: Mon Aug 19 19:25:54 2019 +0800 用户默认信息去掉，防止更新 commit 7d5d9483ebe5bf800a190e974eab1d92f3477479 Author: liyt Date: Mon Aug 19 18:48:08 2019 +0800 h5登录 commit 019cef61f21e021321be435c88d6727e6e2c4261 Author: liyt Date: Mon Aug 19 18:42:28 2019 +0800 jsapi接口的书籍详情页链接 commit 1e7073f1ac1b45a5575b7ea40a105eb35682d6ca Author: zhenglh Date: Mon Aug 19 17:53:18 2019 +0800 添加支付方式列表 commit 8fc1a974976096b60a1d450076a2a981d3248e3b Merge: c90665972 6c737f4a7 Author: zhenglh Date: Mon Aug 19 17:24:31 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit c90665972b5fb8557c29952ffe1465eeb5eda25b Author: zhenglh Date: Mon Aug 19 17:24:23 2019 +0800 订单记录 commit 6c737f4a7b34884421d3852143d236ec767b8748 Merge: 7be90303b 89bea88ba Author: 李天时 Date: Mon Aug 19 17:18:13 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 7be90303b113a94e3222e65446dd01b45796d4fa Author: 李天时 Date: Mon Aug 19 17:18:07 2019 +0800 阳光app，书籍详情页推荐书籍接口 commit 89bea88baf35da5fbdf03db89b76466f8622b848 Author: liyt Date: Mon Aug 19 16:49:17 2019 +0800 联调 commit 6fe12905cf39f4ee833372c6d0aa14fe0e4f1e6f Author: liyt Date: Mon Aug 19 16:40:34 2019 +0800 联调 commit baad08093bbdc467289adeffaf8e7d34197cf4fe Merge: 545d0c8fb 47e885108 Author: 李天时 Date: Mon Aug 19 16:32:03 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 545d0c8fbde4e02b547a792b48f5ce2d0b123ca2 Author: 李天时 Date: Mon Aug 19 16:31:56 2019 +0800 阳光app，书籍详情页推荐书籍接口 commit 47e885108e2ad93359492243690673d5f0d5652d Author: liyt Date: Mon Aug 19 16:27:23 2019 +0800 联调 commit 3744b2c82121a4b0e8290500fc4cf73306f4e592 Author: liyt Date: Mon Aug 19 16:13:43 2019 +0800 联调 commit edf727f038354c285e7805b852b809258a205869 Author: liyt Date: Mon Aug 19 16:01:43 2019 +0800 联调 commit 75d26e44f7c4063361ced353449f285895f6ed36 Author: liyt Date: Mon Aug 19 15:50:19 2019 +0800 联调 commit 36ff646fc6d21a26cf7a7d6f7217a728eafd453e Author: liyt Date: Mon Aug 19 15:15:57 2019 +0800 配置 commit da584e1a27a4014c3676fcaa39e25a8cbd4ce467 Author: liyt Date: Mon Aug 19 15:00:32 2019 +0800 配置 commit db5b07863097dee55833d6d674e3266e2ae27431 Author: liyt Date: Mon Aug 19 14:45:17 2019 +0800 弹窗配置 commit 7abc05bdd4d1eaf8b90554e073d6b68ff3d5eddc Merge: e173c2008 d148b7e73 Author: zhenglh Date: Mon Aug 19 14:40:57 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit e173c20086e41da2cbdb922af645da1a4babc13a Author: zhenglh Date: Mon Aug 19 14:40:52 2019 +0800 充值记录列表格式修改 commit d148b7e73ab7aa26517608b44435c14735d23cdc Author: liyt Date: Mon Aug 19 14:35:44 2019 +0800 弹窗配置 commit 36432feacf9e173e9424ec0fa12f6d8e7b61086b Author: 李天时 Date: Mon Aug 19 14:32:22 2019 +0800 阳光app，书籍详情页推荐书籍接口 commit 356e303c5726ff70aa965b1c56958221a569cfa1 Author: zhenglh Date: Mon Aug 19 14:21:43 2019 +0800 客服消息打点添加out_trade_no参数 commit 1f94227770d4fcde049ad4909e760ace3bf5e227 Merge: c0825a9b6 e1f19cacd Author: 李天时 Date: Mon Aug 19 14:21:11 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c0825a9b6659c505cb25da9b675c9d1ba67f43dc Author: 李天时 Date: Mon Aug 19 14:21:00 2019 +0800 阳光app，获取书籍信息接口 commit e1f19cacdc739f75623f735e7d7189f179e32430 Author: liyt Date: Mon Aug 19 12:12:06 2019 +0800 调试页 commit 833c71f4e851553a39820d2a4b829fa82972581a Author: liyt Date: Mon Aug 19 11:06:10 2019 +0800 活动 commit 61a7c162dd6a9439ae887752ebb2c028749381dd (tag: cps_20190816_205019) Author: liyt Date: Fri Aug 16 20:48:47 2019 +0800 调查问卷命令行送书币 commit 518737c9ce23fa2568b90e9ca3f7dcf1d833cd7f Merge: 341afce3f de8b3d499 Author: 李天时 Date: Fri Aug 16 20:25:52 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 341afce3f254f2302eb36c976b5c146c8586fa41 Author: 李天时 Date: Fri Aug 16 20:25:46 2019 +0800 阳光app，获取书籍信息接口 commit 03fa9f78b6d6af41c668c27d468524dcdcc72e77 (tag: cps_20190816_203513) Author: liyt Date: Fri Aug 16 20:24:42 2019 +0800 调查问卷命令行送书币 commit 067cd0adfa20533d7c016e688eaa187629ffebb6 Author: liyt Date: Fri Aug 16 20:17:15 2019 +0800 调查问卷命令行送书币 commit 40fcf80e22f33a924e73eeb9aaf562f7e66078ea Author: liyt Date: Fri Aug 16 20:16:53 2019 +0800 调查问卷命令行送书币 commit de8b3d499b8b6c7387e4167e2b88a5e075d2144f Merge: cd4b95308 fd45102a3 Author: zhenglh Date: Fri Aug 16 19:56:46 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit cd4b9530828cbc4cbc10346ffac2c838f12e837f Author: zhenglh Date: Fri Aug 16 19:56:39 2019 +0800 添加充值记录接口 commit 9766a81290681213b7ac0fc557e1b5e2980ac748 Author: liyt Date: Fri Aug 16 18:34:11 2019 +0800 调查问卷文案修改 commit fd45102a34186907fd686c2dc1904b56628dd434 Merge: 72e44ac4c 34994391a Author: 李天时 Date: Fri Aug 16 18:00:47 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 72e44ac4c2358c6bfaf80804ffea67a2d60d6ef9 Author: 李天时 Date: Fri Aug 16 18:00:40 2019 +0800 阳光app，获取书籍信息接口 commit 34994391a5c9096cb7badb4982450e9693b93435 Author: zhenglh Date: Fri Aug 16 17:46:40 2019 +0800 支付方式未配置时的处理 commit 3a33373290eb399f99440d7beb9f16f4757d4c43 Author: zhenglh Date: Fri Aug 16 17:20:32 2019 +0800 手误 commit 7d83e8e4187957a6d71b120dc5e79ae1f9d8ac73 Merge: 688f05d7a e69658615 Author: zhenglh Date: Fri Aug 16 17:14:12 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 688f05d7ae1186282e28f70531a0ce319596cfe6 Author: zhenglh Date: Fri Aug 16 17:13:59 2019 +0800 支付修改 commit e69658615a5747740a8aa5990b6ce512e002e668 Author: liyt Date: Fri Aug 16 17:09:14 2019 +0800 活动 commit 59326f9d9ef8ca51f4f26278a4dd4f8a162cb7bc Author: zhenglh Date: Fri Aug 16 15:14:22 2019 +0800 充值修改 commit 4f3b9b79dc1d8b7e6fb79f6b2eacdb908495e707 Merge: 14f195650 d82cb141a Author: zhenglh Date: Fri Aug 16 14:42:17 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 14f195650e34b2fb66f4a79bc23fd835a58e932b Author: zhenglh Date: Fri Aug 16 14:42:08 2019 +0800 支付方式不需要指定 commit d82cb141add46dfb65b6106fbd755b36fcbb3df5 Author: 李天时 Date: Fri Aug 16 14:38:44 2019 +0800 阳光app，获取书籍目录 commit 8716a689289a2b5a5b4275e93a41bc19fcdebe79 Merge: 639bd8c2e 6bec78b88 Author: 李天时 Date: Fri Aug 16 14:19:12 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 639bd8c2e1eb6a5b364552d2a9a7ff98cb3c141e Author: 李天时 Date: Fri Aug 16 14:19:05 2019 +0800 阳光app，章节订购接口 commit 6bec78b8813efbdefafe5e41d8ac67044de87d37 Author: liyt Date: Fri Aug 16 14:03:06 2019 +0800 书城首页 commit 61f7fc6674b0a1f9cf6eb00bc20cfeab0b756e06 Author: liyt Date: Fri Aug 16 14:00:54 2019 +0800 书城首页 commit 8a017dbdff1e6bdd8baf7a24a660a6ee4491e734 Merge: 0a9f0d928 49d8035f8 Author: 李天时 Date: Fri Aug 16 13:59:43 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 0a9f0d928708a40cd33e1ff5c9c444ed40056778 Author: 李天时 Date: Fri Aug 16 13:59:36 2019 +0800 阳光app，章节订购接口 commit 49d8035f85c6d80eebd170ca1c638c3d53b86762 Author: liyt Date: Fri Aug 16 13:50:18 2019 +0800 书城url commit 7f6cd9d0ac55fe7e4fc405b84ca9d732a377cc16 Merge: 44d942ad0 f43cf6d51 Author: 李天时 Date: Fri Aug 16 11:50:21 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 44d942ad0294ab1a858c82209d5d0dc9fdb65231 Author: 李天时 Date: Fri Aug 16 11:50:13 2019 +0800 阳光app，修改运营位接口 commit f43cf6d518411b45da16cc38db537e97751c57bf Author: liyt Date: Fri Aug 16 11:40:38 2019 +0800 APP弹窗 commit 7e31af6529355454d89443f3a28d997386c15407 Merge: c5c207828 01968c82e Author: wanggb Date: Thu Aug 15 20:27:16 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c5c207828c208557c390f13381dea92373bfd155 Author: wanggb Date: Thu Aug 15 20:27:07 2019 +0800 APP　连续签到 commit 01968c82e9e9dc33b8e9790985c5b4c5b86c5184 Author: liyt Date: Thu Aug 15 19:26:41 2019 +0800 弹窗 commit 42a0d65d975b2ce17e88751f8c41eda837487d4b Author: liyt Date: Thu Aug 15 19:19:51 2019 +0800 弹窗 commit 7e84be775776b59ac27e839f540af07d693a8872 Author: liyt Date: Thu Aug 15 19:16:10 2019 +0800 弹窗 commit 86ae075abf466e7f38e84e3e5a0a79e3b804d6dd Author: liyt Date: Thu Aug 15 17:52:08 2019 +0800 js联调 commit 3c8a4682b0141c68c544412db6030ed040765043 Merge: 61fde075b 56d9aff21 Author: wanggb Date: Thu Aug 15 17:07:48 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 61fde075b698852fa79f50e6397e94ed899a6b11 Author: wanggb Date: Thu Aug 15 17:07:36 2019 +0800 联调，测试交互 commit 56d9aff217a629e662c50228bb57a57acd7f964c Author: liyt Date: Thu Aug 15 17:01:41 2019 +0800 调用 commit e1587b6643a885034df99e9795ac47585076b61c Author: liyt Date: Thu Aug 15 17:01:00 2019 +0800 调用 commit 11c5d64699539ac1f51771c8f997076d01bd3d29 Author: liyt Date: Thu Aug 15 16:39:12 2019 +0800 组装APPurl commit 69a134b09795d128a61825c5bb0090e8dc39c4ef Author: wanggb Date: Thu Aug 15 12:12:53 2019 +0800 读者查询，根据手机号查询用户信息 commit 01cbda4122981c6cf2ca986945af903a85166eba Author: 李天时 Date: Thu Aug 15 10:22:55 2019 +0800 阳光app，获取书籍信息接口 commit 313b5e257d2b98aac794a3ed36404349057cf9fd Author: 李天时 Date: Wed Aug 14 20:04:01 2019 +0800 阳光app，获取书籍信息接口 commit 96c7808631cd0d7294ddd4ad5ceeef64e2e6c081 Merge: d6e2f7c75 edbc4444b Author: 李天时 Date: Wed Aug 14 19:44:33 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit d6e2f7c75074cffce326703022780ed9fdc4f2b0 Author: 李天时 Date: Wed Aug 14 19:44:27 2019 +0800 阳光app，运营位配置 commit edbc4444b551d9ac26d2bc9a760da3e38eba4237 Author: wanggb Date: Wed Aug 14 19:06:01 2019 +0800 用户注册增加bindtime commit 3b10677de589df433e978a5ac3e586f372e8942d Merge: facc649be 82b51459f Author: wanggb Date: Wed Aug 14 18:51:13 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit facc649be4070efee43687e07793b8d9cf187047 Author: wanggb Date: Wed Aug 14 18:50:54 2019 +0800 用户注册增加bindtime commit 82b51459ff44acb5deda42491cd7ed5f9eeeaaf3 Author: 李天时 Date: Wed Aug 14 18:11:27 2019 +0800 阳光app，书架接口 commit 670245ff01cf9cbe5168a7e97f2f00a8b20b518d Author: 李天时 Date: Wed Aug 14 18:10:03 2019 +0800 阳光app，书架接口 commit 53d7f4f16f6214c5137fd8b544fe33fa88349d55 Merge: ff4b40628 7e63aa49c Author: wanggb Date: Wed Aug 14 16:16:24 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit ff4b4062851d6faad46c5d97304fe517289a65a4 Author: wanggb Date: Wed Aug 14 16:16:05 2019 +0800 APP签到 commit 7e63aa49c5fac09262c9a9f12e5f3e6fa24c312b Author: liyt Date: Wed Aug 14 14:15:25 2019 +0800 APP活动 commit 9d064fec6210d54da75dbaefc00dbe117f7b62a8 Author: liyt Date: Wed Aug 14 10:54:57 2019 +0800 APP活动 commit 5dd3b17b839537536c72ffcfab8cfece13abd0ec Merge: e637c9621 86e531e3b Author: 李天时 Date: Tue Aug 13 20:08:16 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit e637c96217ef398a3665cd48b41d05ce8210569f Author: 李天时 Date: Tue Aug 13 20:08:10 2019 +0800 阳光app，书架接口 commit 86e531e3be3a09c23e0ccd55454dec57a6187441 Merge: 73c58796b de706b19f Author: wanggb Date: Tue Aug 13 19:51:40 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 73c58796b21f63e62b7193389d10025ea6134d7a Author: wanggb Date: Tue Aug 13 19:51:32 2019 +0800 阅读页增加引入导量入口, 加入Redis commit de706b19f17ddb730fcc3dfe852d4ff071a7db54 Merge: a57d3c297 0fb01f491 Author: zhenglh Date: Tue Aug 13 19:46:15 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit a57d3c297e66d1b99c9579b8ba8c98732bc2ae7f Author: zhenglh Date: Tue Aug 13 19:46:08 2019 +0800 订单流程添加日志 commit 0fb01f4917430c1685eba519854395defd3fc04f Merge: 2d3b770d5 01b8d2976 Author: 李天时 Date: Tue Aug 13 18:45:05 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 2d3b770d5b0b3b125697a882d36e44bff519c1cf Author: 李天时 Date: Tue Aug 13 18:44:58 2019 +0800 阳光app，书架接口 commit 01b8d2976cfa22a38e6563e8e3bf4d40c4f31fd5 Author: wanggb Date: Tue Aug 13 18:41:06 2019 +0800 阅读页增加引入导量入口 commit 95abce400519b37e72f2b00b2a9590995fc48afc Merge: 54b832224 3731c5859 Author: wanggb Date: Tue Aug 13 18:35:12 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 54b83222418daa90efb8c808ec65c938057e139b Author: wanggb Date: Tue Aug 13 18:35:02 2019 +0800 阅读页增加引入导量入口 commit 3731c5859bd7d7eb41955f1bbc48aec01a76d053 Merge: a9807c502 677f92f9d Author: zhenglh Date: Tue Aug 13 18:02:51 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit a9807c5029c37a851e55a6eb9a993ff37a805e86 Author: zhenglh Date: Tue Aug 13 18:02:44 2019 +0800 用户信息校验处理 commit 677f92f9df425254bab065caeb60e11620fb2747 Author: liyt Date: Tue Aug 13 17:39:53 2019 +0800 自定义商品 commit 94602a2a8a74311b325833905ab742c79c506a59 Merge: 207cf3b2e 898aa9b63 Author: wanggb Date: Tue Aug 13 17:34:04 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 207cf3b2e880223e264923ebea950aadb3f03449 Author: wanggb Date: Tue Aug 13 17:33:55 2019 +0800 APP 导量管理 上传图片 commit 898aa9b6305aa4d9300c2e1a9ed5eba8259bbd0a Merge: a7bd5cc0c 727e58ad8 Author: 李天时 Date: Tue Aug 13 17:15:24 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit a7bd5cc0ceb5aef90b737d0e7ff1e67de1106f73 Author: 李天时 Date: Tue Aug 13 17:15:17 2019 +0800 阳光app，书架接口 commit 727e58ad8266b0bee0468252152945dedb4fb543 Merge: 5853cfe44 f740dda64 Author: zhenglh Date: Tue Aug 13 17:11:59 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 5853cfe44eba7bd6b8bf68a604cd435e5eff613d Author: zhenglh Date: Tue Aug 13 17:11:53 2019 +0800 商品列表的返回 commit f740dda64d5814b626b379e605f2d6b566fe787b Author: liyt Date: Tue Aug 13 16:46:09 2019 +0800 app自定义商品是否显示 commit 53f00db00f87b36460d74a52114b2d743e0891c5 Merge: 866fc4583 e28300bf5 Author: liyt Date: Tue Aug 13 16:32:27 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 866fc4583c4306cf57208d0b770ce71f4075c890 Author: liyt Date: Tue Aug 13 16:32:12 2019 +0800 app自定义商品 commit e28300bf5dd48640efe0ceb9a5433e31dc191535 Author: wanggb Date: Tue Aug 13 15:43:17 2019 +0800 动态码注册接口 commit 685b247bef3189ee8e319bea5481b3d789bbd61f Merge: 032f94d61 f93709226 Author: wanggb Date: Tue Aug 13 15:34:20 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 032f94d610f8bca4769ea1a6ffc0011432788797 Author: wanggb Date: Tue Aug 13 15:34:11 2019 +0800 动态码注册接口 commit f93709226d87f4ce751b4a0fc3bc8946672bec4a Merge: bf455e27a 6fcf6bf2b Author: zhenglh Date: Tue Aug 13 15:19:58 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit bf455e27ad291ae75af54e573e546ee549c3d7bf Author: zhenglh Date: Tue Aug 13 15:19:52 2019 +0800 支付调试完成 commit 6fcf6bf2b3feeea22e98ea2df435ab08144ebce9 Author: wanggb Date: Tue Aug 13 14:53:48 2019 +0800 动态码 commit 5cc3b76d2f7b34f14e3c5874ee443134c5f9a9dc Author: wanggb Date: Tue Aug 13 14:49:56 2019 +0800 动态码 commit e67e25723d457a98a210056463fa8a8db203ee92 Author: wanggb Date: Tue Aug 13 14:44:54 2019 +0800 动态码 commit cb1512daafbd99881cee56b9892899c48656c4be Author: wanggb Date: Tue Aug 13 14:42:41 2019 +0800 动态码 commit 69a0066158913434075d3711055a91641931a045 Merge: 754e76f44 1a52c1343 Author: wanggb Date: Tue Aug 13 14:31:54 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 754e76f4426d34a687edc8a2703624d00ea98ba6 Author: wanggb Date: Tue Aug 13 14:31:44 2019 +0800 动态码 commit 1a52c1343c7e49e5d86865159e52d905c658f1f5 Author: liyt Date: Tue Aug 13 13:57:54 2019 +0800 web基类方法 commit d01453074d33800fbe4af7d9c68678fa2c4010ab Author: wanggb Date: Tue Aug 13 13:28:26 2019 +0800 动态码 commit c7b3ac33215e177c5fd8322f9e06a569593723d0 Author: wanggb Date: Tue Aug 13 11:56:01 2019 +0800 动态码 commit 1e36d7611b3afc4ba4b153c42eebaf2c6445e894 (tag: cps_20190813_111438) Author: liyt Date: Tue Aug 13 11:13:55 2019 +0800 平台id和代理IP缓存 commit f093b4242d66585f5fc8dc653c3dfb08885dfe35 Author: wanggb Date: Tue Aug 13 11:09:01 2019 +0800 修改Code commit ad18a9a4016b3aa01a5cdd0447bfea638f26f5d6 Merge: bc121e699 afb695851 Author: wanggb Date: Tue Aug 13 10:28:35 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit bc121e6996478a7a66472d34e70d239cf6e7d3d0 Author: wanggb Date: Tue Aug 13 10:28:24 2019 +0800 增加测试签到页面 commit afb695851f58e5874ffd783fbb0e42a8c9d4e1ee Merge: 66c85b409 eda47e25f Author: 李天时 Date: Mon Aug 12 19:39:43 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 66c85b409fbd1639e1a3845ed125c477b383e878 Author: 李天时 Date: Mon Aug 12 19:39:37 2019 +0800 阳光app，书架接口 commit eda47e25fab5e5f729111c4eace1b689b904a7cd Merge: 9ad5a26c6 bea386e60 Author: liyt Date: Mon Aug 12 19:17:24 2019 +0800 Merge branch 'master' into dev-app-20190806 commit 9ad5a26c6f80ea7d42275d4b820fcbff67375719 Author: zhenglh Date: Mon Aug 12 18:54:21 2019 +0800 订单取消缓存 commit bea386e607a31cb493e0adb1d63ccaee99cfb325 (tag: cps_20190812_191911) Author: liyt Date: Mon Aug 12 18:35:26 2019 +0800 实例化公众号时添加平台判断 commit a1312a0add91ab15d1fceeede1e14fc4e43ac007 Merge: a9644b204 9f26ec85b Author: zhenglh Date: Mon Aug 12 17:36:20 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit a9644b2041f4b3ac52083817ac5df1baac20d127 Author: zhenglh Date: Mon Aug 12 17:36:13 2019 +0800 1分钟内的重复订单不重复下单 commit 9f26ec85bb583a7a5031fcc242694e2903c962d9 Author: 李天时 Date: Mon Aug 12 17:27:16 2019 +0800 阳光app，启动接口 commit 1f38c6e8347592927788750dd271f9d7899fd25f Merge: 4e5b50208 ce2cb36b3 Author: zhenglh Date: Mon Aug 12 17:00:08 2019 +0800 Merge branch 'dev-app-20190806' of http://192.168.0.31/fe/cps into dev-app-20190806 commit 4e5b5020842332950dbc4343ba4a0ddfa1551ae6 Author: zhenglh Date: Mon Aug 12 17:00:00 2019 +0800 下单完成后的跳转页面 commit ce2cb36b360e45525252a5b31ba6a929e30850cb Author: wanggb Date: Mon Aug 12 15:21:29 2019 +0800 递归转驼峰 commit 5fe55a2b6b16e1b70ff82774374a8c2b20afdefc Merge: 57497d158 7fe3c8cdd Author: wanggb Date: Mon Aug 12 15:08:51 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 57497d158aad7bf8a24c3594a8466058e54edec0 Author: wanggb Date: Mon Aug 12 15:07:14 2019 +0800 添加Log commit 8549dd87bb0a03e059b4fc7ac193157d80c860e8 Author: zhenglh Date: Mon Aug 12 14:40:47 2019 +0800 订单统计如果是app不添加推广统计 commit 7fe3c8cdd618364c9e2222930941d25753583928 Merge: f5f6e12b4 6ff7aebe5 Author: 李天时 Date: Mon Aug 12 11:26:05 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit f5f6e12b4497d05738cfb2a82abca24d2f1c5dfe Author: 李天时 Date: Mon Aug 12 11:25:56 2019 +0800 阳光app，如果返回值为空，则返回的data为json对象 commit a29d9b79d653914324496e398ee7efa3c799fb30 Author: wanggb Date: Mon Aug 12 10:51:54 2019 +0800 添加Log commit 6ff7aebe574e002ddd9c13325fa5b0f4ef3f687f Merge: df4273e34 ef6331495 Author: wanggb Date: Mon Aug 12 10:25:46 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit df4273e3417da8c44d905956d78883488c10e617 Author: wanggb Date: Mon Aug 12 10:25:33 2019 +0800 添加Log commit ef63314955c9f27b4de3b77db231b7ec0bd8d7f7 Merge: 7215e5bb3 1a67b1232 Author: 李天时 Date: Mon Aug 12 10:17:31 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 7215e5bb3e5117bad4a9d39ce1fc2ad514ac6e19 Author: 李天时 Date: Mon Aug 12 10:17:12 2019 +0800 阳光app，合并代码 commit 1a67b1232236f2366fc86893e30e5a643e0699dd Author: zhenglh Date: Sat Aug 10 20:04:49 2019 +0800 微信测试 commit 8cee1fb9e010c06c6143162ed337587376505f99 Author: zhenglh Date: Sat Aug 10 19:12:08 2019 +0800 订单回调测试完成 commit e59fe38a17e18ff1023976211e00e9ce1eb2215a Author: zhenglh Date: Sat Aug 10 18:51:38 2019 +0800 充值表添加business_line参数 commit e6bbae8993a595daeabdb18d8b474c9cdf5b7038 Author: zhenglh Date: Sat Aug 10 18:25:21 2019 +0800 business_line回调 commit 89bfe71266093790fbfa7beb4bc68b494f65e24a Author: zhenglh Date: Sat Aug 10 16:45:48 2019 +0800 支付回调方法添加 commit ed9f93e43c77f41e962041621224b5d358ae4ae8 Author: zhenglh Date: Sat Aug 10 16:37:34 2019 +0800 支付回调方法添加 commit de770971dec579fda08033414b10dffe727eaa54 Author: zhenglh Date: Sat Aug 10 15:53:02 2019 +0800 页面调整 commit 7e28be160966a6920bd3626800e7d7841b040516 Author: zhenglh Date: Sat Aug 10 15:45:14 2019 +0800 页面调整 commit 917d5ea04eedc57a9c9fe565815f02f2a500cb27 Author: zhenglh Date: Sat Aug 10 15:44:35 2019 +0800 支付页面调整 commit dc0fae6630b4d56db15b7e5c5490c7e3ab1936ae Author: zhenglh Date: Sat Aug 10 11:56:59 2019 +0800 add pay package commit e6b7d4f46c5c37e3f1a394b139c9cafc3801c2f7 Author: zhenglh Date: Sat Aug 10 11:56:53 2019 +0800 add pay package commit 52e206c89d7e2f4bdd3e2072592e5938de015000 Merge: 20126a996 ec52cad3c Author: zhenglh Date: Sat Aug 10 10:17:44 2019 +0800 Merge branch 'master' into dev-app-20190806 commit 9b62f8704c3de7ab7d01dc6e169eba36d2d36d6c (tag: cps_20190812_135216) Merge: 324cb4244 e03c40d50 Author: liyt Date: Fri Aug 9 20:19:17 2019 +0800 Merge branch 'dev-easywechat-ip' commit 324cb42448fb054fa65242a8b1f51b2e282a1a4e Merge: 376d4d2a5 ec52cad3c Author: liyt Date: Fri Aug 9 20:18:51 2019 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit e03c40d50d5330b9c8c635b1257209f12e3e4cc2 Author: liyt Date: Fri Aug 9 20:18:31 2019 +0800 代理IP字段判断 commit ec52cad3ca2546da3a351981285a211de1acf5bd Author: zhenglh Date: Fri Aug 9 13:27:57 2019 +0800 cps_log.html 参数处理 commit 1b27aeada58845d5f5c0e5a3a998b4e1522b92de Merge: 0ff5de751 376d4d2a5 Author: liyt Date: Fri Aug 9 19:53:21 2019 +0800 Merge branch 'master' into dev-easywechat-ip commit 376d4d2a5f39cb0663da45a25650ef6b4ed45742 Author: zhenglh Date: Fri Aug 9 19:33:41 2019 +0800 cps_version版本错误 commit 20126a996cc3c4970b4c5d926bf314f3b066e0b7 Author: wanggb Date: Fri Aug 9 19:18:55 2019 +0800 优化API接口， 使用接口码方式 commit fc120a3c2a9450102d1df4fec0207f63754ffc4c (tag: cps_20190809_175002) Author: zhenglh Date: Fri Aug 9 17:48:20 2019 +0800 变量未定义的情况处理 commit 47cb2aaa74ba809e4a198a03063c0f2b8b92c71c Merge: 09ad56ff7 5243505c9 Author: wanggb Date: Fri Aug 9 17:46:37 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 09ad56ff73052df12778cb2e22c7e52cfdd2b1c9 Author: wanggb Date: Fri Aug 9 17:46:28 2019 +0800 管理后台增加"导量管理" commit 5243505c96f9e3b3c31b870e451dde07371a2cfc Author: liyt Date: Fri Aug 9 16:09:52 2019 +0800 搜索 commit bb691c354361f3610b8873c2dc5f9292b8619fbe (tag: cps_20190809_161802) Author: zhenglh Date: Fri Aug 9 16:07:19 2019 +0800 cps_log iframe 异步加载 commit 9b688c1bda788fdb320813c47c50c06d59ecc04a Author: liyt Date: Fri Aug 9 15:50:59 2019 +0800 h5页面 commit 49f299091ee827c14a2fb0a6a90b1b164161508d Author: zhenglh Date: Fri Aug 9 15:44:31 2019 +0800 cps_log iframe 异步加载 commit f1c5b1daeb0d0cd0123f84afaf6a47b6a8f17e19 Author: zhenglh Date: Fri Aug 9 15:35:58 2019 +0800 cps_log iframe 异步加载 commit 8ba80cc8ee0d866cd922bf044f26a3793aaef579 Author: liyt Date: Fri Aug 9 15:33:39 2019 +0800 h5页面 commit 1eb9453c99ad508271270d2a57eff19eb3d9177b (tag: cps_20190809_144615) Author: zhenglh Date: Fri Aug 9 14:33:10 2019 +0800 cps_log.html 参数处理 commit c759459135405648400b320a420ed85c637d21d6 (tag: cps_20190809_140019) Author: zhenglh Date: Fri Aug 9 13:54:09 2019 +0800 cps_log.html 参数处理 commit fe26c5610793a5409e8b06a1ce6d0abf977a9937 Author: zhenglh Date: Fri Aug 9 13:27:57 2019 +0800 cps_log.html 参数处理 commit 9dba33b859cd51dedf5f941a29384cda32e57516 Merge: c981e4a23 a3acaeb0e Author: 李天时 Date: Fri Aug 9 11:29:38 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit c981e4a23d2249b033deb4113c5309fd5ab1e594 Author: 李天时 Date: Fri Aug 9 11:29:31 2019 +0800 阳光app，合并代码 commit a3acaeb0e069ee592984144ddb78318d1d70b655 Merge: 9c81b1d89 d0b442cb9 Author: wanggb Date: Fri Aug 9 11:24:31 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 9c81b1d8993b0eeb0a06074e0f8ef8cc581ddd46 Author: wanggb Date: Fri Aug 9 11:24:19 2019 +0800 增加接口() commit d0b442cb95717a6db78412b63fba1e5ff92b76d8 Merge: 5d7890909 67c81d0a3 Author: 李天时 Date: Fri Aug 9 11:20:59 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit 5d789090942996b8dafe0aa5be57805b1b6290bd Author: 李天时 Date: Fri Aug 9 11:20:51 2019 +0800 阳光app，合并代码 commit acda6487220628492c91ab6ba77eec221e481e31 Merge: 6276f7066 c3434b73b Author: 李天时 Date: Fri Aug 9 10:38:11 2019 +0800 Merge branch 'master' into dev-app-20190806 commit 67c81d0a3ecda6727725c015e3505404b3e7a3b9 Author: liyt Date: Fri Aug 9 10:38:06 2019 +0800 客户端配置 commit 6276f706656ae964687c19257f4de7dd2f0babf6 Author: 李天时 Date: Fri Aug 9 10:37:36 2019 +0800 阳光app，合并代码 commit be64e7f7f58865aaa3a987152b76fff3deb6d276 Author: liyt Date: Thu Aug 8 17:48:00 2019 +0800 倒计时 commit c3434b73b2742db4321c37ee25c2a32270435b21 (tag: cps_20190808_173930) Author: zhenglh Date: Thu Aug 8 17:38:26 2019 +0800 未关注情况下，导粉号跳转逻辑去掉 commit 4a6795b50cc341136730fd7a2f793b364d1336d8 Author: liyt Date: Thu Aug 8 17:38:21 2019 +0800 倒计时 commit 80bdcf90921431830e1c2f56f476ea45d0326cb0 Merge: a0c5c4e88 4ad8d6c3a Author: wanggb Date: Thu Aug 8 17:33:44 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit a0c5c4e88aaac071cf28e98a24c7544cb1142bac Author: wanggb Date: Thu Aug 8 17:33:30 2019 +0800 增加接口(获取用户信息) commit 74f52fd3c1145ff24405648591ea4e17e69d77cc (tag: cps_20190808_154744) Merge: 12e7ad016 aa5a225b8 Author: zhenglh Date: Thu Aug 8 15:40:21 2019 +0800 Merge branch 'dev-dot-add-page-id-20190731' commit 4ad8d6c3aedb2f434cf2f256d9103e99539e8134 Author: liyt Date: Thu Aug 8 15:27:32 2019 +0800 批量失效 commit 6cc32953c5d35c4408f96a26a9a24607a09b31c8 Author: liyt Date: Thu Aug 8 14:59:47 2019 +0800 配置 commit 2d6f80b1edebe5953e6614d25992e2cf1e63751c Merge: 482e4aefa 955dcfa81 Author: liyt Date: Thu Aug 8 14:54:42 2019 +0800 Merge branch 'dev-app-20190806' of 192.168.0.31:fe/cps into dev-app-20190806 commit 482e4aefa8944f86d209111f1c021919f77b5569 Author: liyt Date: Thu Aug 8 14:54:20 2019 +0800 配置 commit aa5a225b8beb54350867510d4e1b3056cf5c51ab Author: zhenglh Date: Thu Aug 8 13:49:59 2019 +0800 返回弹窗打点，只需要一个 commit 955dcfa8181991fb67d113e7d202faecdbd23dac Merge: a4cbab4c8 908b71bf8 Author: wanggb Date: Thu Aug 8 11:41:27 2019 +0800 Merge remote-tracking branch 'origin/dev-app-20190806' into dev-app-20190806 commit a4cbab4c886d684c55517afd071e2a653ae8932a Author: wanggb Date: Thu Aug 8 11:41:17 2019 +0800 增加遗漏文件 commit 3320affed3e66c815f62321a82b1a2481b10e148 Author: zhenglh Date: Thu Aug 8 11:23:07 2019 +0800 返回弹窗调整 commit fbc8e67c92e71870eae5b3df76ae8c4c7a78b098 Author: zhenglh Date: Thu Aug 8 11:14:50 2019 +0800 弹窗恢复 commit 12e7ad0164fade003425d114a85ca3bcae09672f (tag: cps_20190808_103924) Merge: b70d5676b 3cf437583 Author: 李天时 Date: Thu Aug 8 10:36:06 2019 +0800 Merge branch 'dev-activity-expand-20190725' commit 3cf437583b0af56e97b56c117a6f341b0baeed29 Author: 李天时 Date: Thu Aug 8 10:27:06 2019 +0800 自定义活动关联商品，点看站充值成功后弹窗，去看书 commit 908b71bf893cac878313a7dc777b20c7752ccb30 Author: liyt Date: Thu Aug 8 10:13:10 2019 +0800 热门搜索词 commit bc8483c9bc4d815428745f79ea392aeffc3264e1 Author: liyt Date: Thu Aug 8 10:08:26 2019 +0800 代码转移 commit 7ce03c53739d424a25cbb0b0f2e770f5b3784f3d Author: liyt Date: Thu Aug 8 10:05:49 2019 +0800 代码转移 commit 3e2a0c5c41b83478b077ba40a0de1ce2799d1737 Author: zhenglihao Date: Wed Aug 7 23:21:48 2019 +0800 弹窗打点 commit 991801e402e8ebcb7a3babd32b3934730de089e7 Author: zhenglihao Date: Wed Aug 7 22:43:45 2019 +0800 弹窗添加打点 commit 629ed1784765c93d378146bfb2ceeca5595ec658 Author: 李天时 Date: Wed Aug 7 18:28:04 2019 +0800 自定义活动关联商品，活动以管理商品为主 commit 04f878d3b6f29decfbbeb52ff706a3f70777c5cd Author: 李天时 Date: Wed Aug 7 18:20:26 2019 +0800 自定义活动关联商品，活动以管理商品为主 commit b70d5676bb23f4648be4e5de025a022860647162 (tag: cps_20190807_174609) Merge: 15b09db65 fc5a11318 Author: 李天时 Date: Wed Aug 7 17:41:22 2019 +0800 Merge branch 'dev-activity-expand-20190725' commit f3a82adf51f68b73f21168f84c2f2376d37c37f0 Author: liyt Date: Wed Aug 7 17:36:56 2019 +0800 转移之前的代码 commit fc5a113183257663b20197a13fe399ed0c7ce2c0 Author: 李天时 Date: Wed Aug 7 17:36:19 2019 +0800 自定义活动关联商品，活动以管理商品为主 commit 15b09db655cb8cc36c90f5f48b7b80ef5dce75bb Merge: dceb5703f 740b1ba45 Author: 李天时 Date: Wed Aug 7 17:30:24 2019 +0800 Merge branch 'dev-activity-expand-20190725' commit 0ff5de7518cce5262d3d9ed40b8d2c1b40e74d59 Author: liyt Date: Wed Aug 7 17:27:16 2019 +0800 签到代理IPbug修复 commit 740b1ba4505784832ad7b64110208a699c2ad869 Author: 李天时 Date: Wed Aug 7 17:24:47 2019 +0800 自定义活动关联商品，活动以管理商品为主 commit 142ca7e8689c2c6cc3b145bbb26942aa4b160785 Author: liyt Date: Wed Aug 7 16:36:14 2019 +0800 维护消费表extend2字段 commit 1ef31027f85da11f2373a43b1b0c1bb16ba54420 Author: liyt Date: Wed Aug 7 16:31:59 2019 +0800 搜索关键词 commit c396a464a6e3155bf89441f4b82c44feb39e300c Author: liyt Date: Wed Aug 7 14:38:55 2019 +0800 三方平台代理IP日志 commit ca4f59b97b4444853057642db52e078f07263b3b Author: zhenglh Date: Wed Aug 7 14:01:23 2019 +0800 活动订单扣量参数添加 commit e4afaadbe6c2bd5529b58fa5e795789e4f1c5d31 Author: zhenglh Date: Wed Aug 7 13:50:16 2019 +0800 活动订单扣量参数添加 commit 82e00abc18228b033d4d00fe7890ab6372c1496b Author: wanggb Date: Wed Aug 7 13:33:51 2019 +0800 搬移文件 commit 47462b84b6da22542f3242f0d050a689ca7f40b5 Author: zhenglh Date: Wed Aug 7 12:00:39 2019 +0800 关键字回复中的subscribe取消跳转按钮 commit e16cb7fa6c4221f1ea90e8bcb5e130437792d080 Author: zhenglh Date: Wed Aug 7 11:58:15 2019 +0800 跨域问题处理 commit e27c8a9fff2a7303516bfdaf484a0da41a4fee9b Author: wanggb Date: Wed Aug 7 11:53:55 2019 +0800 搬移文件 commit b29ccf569369af39c5870ab2543aed31ea82a391 Author: wanggb Date: Wed Aug 7 11:49:01 2019 +0800 搬移文件 commit dceb5703fe280c4ad211183ac96d8b59ab418442 (tag: cps_20190807_144818) Author: zhenglh Date: Wed Aug 7 11:46:37 2019 +0800 客服消息redis缓存添加，缓存刷新命令添加 commit ee1b3390ae1372074ede1e9c78e9ef2a0865f7fe Author: wanggb Date: Wed Aug 7 11:40:32 2019 +0800 搬移文件 commit 5a8c41e502710ba5a9147d6aed2b9c101f168a48 Author: wanggb Date: Wed Aug 7 11:18:11 2019 +0800 搬移文件 commit 3e52b091aa789ce0713742686ea6cff9d11ac751 Author: zhenglh Date: Tue Aug 6 16:59:30 2019 +0800 关注回复编辑按钮处理 commit d6c49817abd4bec9f4a58f68ec1f2980f19cccb4 Author: liyt Date: Tue Aug 6 16:54:20 2019 +0800 VIP客服消息粉丝测试 commit 43c7091629d83ffefc6c2024a169544dec157013 Merge: 6c20f042e 055bfe65c Author: zhenglh Date: Tue Aug 6 16:21:26 2019 +0800 merge from master commit f39ec3eaffc7387d056e2e1a7763462c9dd7914b Author: liyt Date: Tue Aug 6 16:18:41 2019 +0800 微信AD commit f8ca114a194997a828de27304a8fdd9eae036456 Author: liyt Date: Tue Aug 6 15:39:40 2019 +0800 app后天配置 commit 94041525d24beebaf141815bd2264b0dede3be59 Merge: 8ad947d05 2ac8f9826 Author: liyt Date: Tue Aug 6 13:56:53 2019 +0800 Merge branch 'dev-easywechat-ip' into dev-app-20190806 commit 8ad947d05a7f001466dc09e490587e38b26adb41 (tag: cps_20190806_151742) Merge: 63f687916 055bfe65c Author: 李天时 Date: Tue Aug 6 13:40:27 2019 +0800 Merge remote-tracking branch 'origin/master' commit 63f687916975ba236160a7a6bc786a51fdc7c5b7 Merge: da33a6112 fec7b5f83 Author: 李天时 Date: Tue Aug 6 13:34:08 2019 +0800 Merge branch 'master' into dev-activity-expand-20190725 # Conflicts: # application/admin/controller/Activity.php commit 055bfe65cb2892e2b1b6cb234cee269d75b0ab90 Author: zhenglh Date: Mon Aug 5 21:22:04 2019 +0800 推广链接与ext关系缓存，关注打点 commit da33a6112d99b5f3878686fb79574052e58f5847 Author: 李天时 Date: Mon Aug 5 19:46:16 2019 +0800 自定义活动关联商品，活动以管理商品为主 commit b4ae30523c5513fd9b87fc013c415dafd86fec7f Author: zhenglh Date: Mon Aug 5 19:46:15 2019 +0800 活动bug处理 commit 15c74d1d8ead0d01272da05c2b3f0f8c0d135ef2 Author: 李天时 Date: Mon Aug 5 19:39:06 2019 +0800 自定义活动关联商品，活动以管理商品为主 commit 0231ad240777be9f6c4f7a1050a490f2f58aff41 Author: 李天时 Date: Mon Aug 5 19:33:20 2019 +0800 自定义活动关联商品，adminConfigInfoall,缓存处理 commit 3e40c1c0331f2fe072c3bc0919a570f07266a727 Author: 李天时 Date: Mon Aug 5 18:59:17 2019 +0800 自定义活动关联商品，活动以管理商品为主 commit 6c20f042ea8a8b34b02cf730e07cc8b75f091ca5 Author: zhenglh Date: Mon Aug 5 16:45:17 2019 +0800 书籍分类按钮遵循权限管理 commit 2ac8f98260c282bed33b1b92b42290f5ccb50813 Merge: 3c5506389 fec7b5f83 Author: liyt Date: Mon Aug 5 15:27:33 2019 +0800 Merge branch 'master' into dev-easywechat-ip commit 26c059f1a60808d4e63cb1a07464633190708e4d Author: zhenglh Date: Mon Aug 5 15:06:48 2019 +0800 关注关键字处理 commit 3c5506389a5dab0fd5e16427de1968f062846bdd Author: liyt Date: Mon Aug 5 14:38:34 2019 +0800 获取tokenJSon格式不转义字符 commit 730467336a99fcdf24549ce06054d161c3ffa759 Author: liyt Date: Mon Aug 5 13:36:23 2019 +0800 优化语法错误 commit f30495bb8ec42568e60e2041d274992906f338b6 Author: zhenglh Date: Mon Aug 5 11:53:02 2019 +0800 escape函数替换 commit a29f828ef10e2e8be1aaadc9117dc5400420ada7 Merge: d25392871 2b41d53e7 Author: zhenglh Date: Mon Aug 5 11:45:58 2019 +0800 Merge branch 'dev-subscribe-obscure-20190805' into dev-dot-add-page-id-20190731 commit 2b41d53e72c16f28246c72f741c6697815b4b48c Author: zhenglh Date: Mon Aug 5 11:45:37 2019 +0800 ext与referral_id关系缓存时间改为10分钟 commit e22d0617012f655523563a593707c2635f14c8f7 Author: zhenglh Date: Mon Aug 5 11:42:51 2019 +0800 缓存优化，取消模糊关注业务逻辑 commit fec7b5f833d2add599e535466f55d99ff7e95854 (tag: cps_20190805_135211) Author: zhenglh Date: Mon Aug 5 10:31:04 2019 +0800 订单导出时ext的json校验异常处理 commit e568f8db0c3cfe3c7afe48229c8b6a34c8d91166 Author: liyt Date: Fri Aug 2 21:34:09 2019 +0800 三方授权微信菜单切换失败 commit f0cdee9915926837db2f390d568e25d424168fc1 Author: liyt Date: Fri Aug 2 20:33:14 2019 +0800 客服消息弹窗入库下架不可见书不弹窗 commit 95415a344aaa162f115586c913d8c8ab77b51a73 Author: liyt Date: Fri Aug 2 20:09:59 2019 +0800 客服消息编辑保存 commit 31be106e005d24d6eee1046257fc0382616c62e7 Author: 李天时 Date: Fri Aug 2 19:41:37 2019 +0800 自定义活动关联商品，添加修改活动资源，免费书币时效限制大于1 commit ca821876fbfe4ce6b4d2cc09a74fab8de01b6eab Author: zhenglh Date: Fri Aug 2 19:32:35 2019 +0800 ext后置 commit d180e3d63c06fd3e8c5a85129faf75e18badded9 Author: 李天时 Date: Fri Aug 2 18:56:22 2019 +0800 自定义活动关联商品，添加修改活动资源，免费书币时效限制大于1 commit e714e03f3d94bc5a2bfd6cf24744d1ff709f2753 Author: 李天时 Date: Fri Aug 2 18:10:26 2019 +0800 自定义活动关联商品，添加修改活动资源，免费书币时效限制大于1 commit f3e391b9e459e7b9798fda03a039e6cc6e05122b Author: 李天时 Date: Fri Aug 2 15:55:22 2019 +0800 渠道商订单统计页面pvuv支取2小时之内的数据 commit 32e8c7fc3fe6c4cd0779595243df88ea9ae1e2cf (tag: cps_20190802_154826) Author: zhenglh Date: Fri Aug 2 15:47:56 2019 +0800 提示语恢复默认 commit 9182d392bb8549718a1510fee9daa083d14592bb Author: liyt Date: Fri Aug 2 15:40:16 2019 +0800 前台登陆时设置httpClient commit 805c0b646fdc4f53a891069e86caa4b7da985dc3 (tag: cps_20190802_152724) Author: zhenglh Date: Fri Aug 2 15:25:21 2019 +0800 自动回复默认值添加@用户昵称 commit ce1f69329bef1ce8b541e3c218b1c4e39ca9b1b4 (tag: cps_20190802_144401) Author: zhenglh Date: Fri Aug 2 14:24:35 2019 +0800 统计库使用的用户名密码配置更新 commit 7238e6ca4b0b721ed371fd2d0555f2bcc2a5f00b Author: 李天时 Date: Fri Aug 2 14:18:49 2019 +0800 自定义活动关联商品，添加修改活动资源，免费书币时效限制大于1 commit ff7d8b041c35e749acb8befb94f5030f34779107 Author: 李天时 Date: Fri Aug 2 14:00:37 2019 +0800 自定义活动关联商品，1、调整选择商品样式。2、选择活动商品弹框需要展示vip商品。3、修改商品书币类型商品不保存vip天数信息。 commit c0543055164ac54a5546c80cee66e767e669ab43 (tag: cps_20190802_102943) Author: wanggb Date: Fri Aug 2 10:22:52 2019 +0800 增加脚本，刷菜单联系客服 commit 288743b13b19ed6a765333643f1cdcf97dc47797 Author: wanggb Date: Fri Aug 2 10:12:22 2019 +0800 增加脚本，刷菜单联系客服 commit 3bbebcb88cca00b4bea1465909241241540ba235 Merge: fe93c3b42 260d24237 Author: liyt Date: Thu Aug 1 19:32:05 2019 +0800 Merge branch 'master' into dev-easywechat-ip commit fe93c3b42402434b298434d3b07ff7e8e8c75540 Author: liyt Date: Thu Aug 1 18:11:10 2019 +0800 新增job代理IP设置 commit 6354b5e1c73ad43bf7927a754c073b965db1c353 Author: liyt Date: Thu Aug 1 17:59:47 2019 +0800 三方平台管理搜索 commit 260d24237ee45c6db9bd51c3380e4ce6db9ec95b (tag: cps_20190801_182456, tag: cps_20190801_170300) Author: wanggb Date: Thu Aug 1 16:40:27 2019 +0800 cps 兼容公众号迁出的问题 commit 170387f12a372c60e75d9ff3ba032202a32b8773 Author: liyt Date: Thu Aug 1 16:36:54 2019 +0800 三方平台管理搜索 commit 1c05a917f0aebf7c9c0eab47de9ae32ba68ee129 Author: liyt Date: Thu Aug 1 15:37:44 2019 +0800 三方平台管理搜索 commit 0a92d280e6103e9b2228f49905e71045e9e2b215 Author: liyt Date: Thu Aug 1 15:27:44 2019 +0800 代理IP commit 78cd2645dda19381520111a75780f2dd5e0cf271 Author: 李天时 Date: Thu Aug 1 14:50:39 2019 +0800 自定义活动关联商品，增加渠道商的开关 commit 06fcc240b3f3ff6034f1bf45eefbd624c97899b7 (tag: cps_20190801_160316) Author: guyuexuan <2651919937@qq.com> Date: Thu Aug 1 12:29:26 2019 +0800 修改 book collect 统计日志 commit d2539287111e8c6600e7381a435610a59531ecf5 Author: zhenglh Date: Thu Aug 1 12:14:48 2019 +0800 js打点添加id追踪 commit 4280b30713e35dd992cb5f096597f6a83df12c87 Author: 李天时 Date: Thu Aug 1 11:29:54 2019 +0800 自定义活动关联商品，增加渠道商的开关 commit 6916c638954ff054e8d1f65a0443ec49ff0dd51f Author: 李天时 Date: Thu Aug 1 11:21:47 2019 +0800 自定义活动关联商品，增加渠道商的开关 commit 13159a2f90a7be8862272385b79fb955382e0d83 Author: zhenglh Date: Wed Jul 31 20:11:08 2019 +0800 关键字回复，text_tip_input初始化 commit 4030d280084b614cb568a0e32187327210909935 (tag: cps_20190731_194338) Merge: 727871dbc 3eb55de32 Author: zhenglh Date: Wed Jul 31 19:42:15 2019 +0800 Merge branch 'dev-keyword-reply-20190724' commit 3eb55de325596da95b4ec94457492a718a07fefc Author: zhenglh Date: Wed Jul 31 19:38:56 2019 +0800 推广链接不可编辑 commit 727871dbc9eac17a7135e3c37d0f9b17e18138b0 Author: guyuexuan <2651919937@qq.com> Date: Wed Jul 31 19:31:38 2019 +0800 解决冲突错误 commit efbd3d1d596144734eb9ff69a50eff82cd11c501 (tag: cps_20190731_192347, tag: cps_20190731_191749) Merge: c7bdc5840 0e01a786f Author: zhenglh Date: Wed Jul 31 19:16:31 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit c7bdc5840a5019c72dee0a304999edcae4823d7b Merge: ce9442ee7 13741a7f9 Author: zhenglh Date: Wed Jul 31 19:10:51 2019 +0800 Merge branch 'dev-keyword-reply-20190724' commit 13741a7f94a288e42b2df626144526860204d247 Author: zhenglh Date: Wed Jul 31 18:39:47 2019 +0800 vip客服消息标题处理 commit 0e01a786f03c214f3cc5f407fd20b5f0340e68f3 Merge: 758d25638 dafec8e5e Author: wanggb Date: Wed Jul 31 18:29:07 2019 +0800 Merge branch 'dev-changeMenuZhichi' # Conflicts: # application/admin/command/BookCollectSum.php commit dafec8e5efe1d613718c043bfd632e8c453d359d Author: wanggb Date: Wed Jul 31 18:25:22 2019 +0800 cps 书籍统计数据增加详细的日志 commit 758d2563891369178c525536cc07a6b1ad6706a6 Author: guyuexuan <2651919937@qq.com> Date: Wed Jul 31 18:00:16 2019 +0800 小说统计脚本，补全日志 commit 1fae78934fade6137273baa0182497e11ad6097b Author: wanggb Date: Wed Jul 31 17:42:53 2019 +0800 cps 书籍统计数据增加详细的日志 commit 224a11a24b775323a35313d11a1adfee2cf08f28 Author: 李天时 Date: Wed Jul 31 16:43:31 2019 +0800 自定义活动关联商品 commit 149e75984345b30d6e38a27b04e68668cb591ecf Author: 李天时 Date: Wed Jul 31 16:07:15 2019 +0800 自定义活动关联商品 commit 8326bf8a1dff588cca8ea52c0c4d274de5e59398 Author: wanggb Date: Wed Jul 31 11:50:14 2019 +0800 cps 联系客服菜单跳转到智齿客服平台，同时获取微信信息给客服 commit ce9442ee7e9f9ad54833bcfff0a63333a551f675 (tag: cps_20190731_154002, tag: cps_20190731_153528, tag: cps_20190731_145827) Merge: 501cae453 b3e53d7cd Author: zhenglh Date: Wed Jul 31 11:37:08 2019 +0800 Merge branch 'dev-keyword-reply-20190724' commit b3e53d7cd214d2e846b5c7bb64dd3515ca8e70d7 Author: zhenglh Date: Wed Jul 31 11:33:46 2019 +0800 标题信息行数处理 commit 501cae4533d0ef9751bee22f88bb15e3346607f7 Merge: 344e9da7a 60b2973b1 Author: zhenglh Date: Wed Jul 31 11:13:22 2019 +0800 Merge branch 'dev-keyword-reply-20190724' # Conflicts: # application/api/controller/Wechat.php # application/common/controller/Frontend.php # application/main/service/SmartPushDotService.php commit 60b2973b13311def90f5d1facb14ccac84f7b478 Author: zhenglh Date: Wed Jul 31 11:03:21 2019 +0800 关键字回复，关注回复与客服消息 commit 96cdb5c2056d7b84ae678fbacdcddb61e5a81ea8 Merge: 3a1ab4a4d 033099ede Author: 李天时 Date: Tue Jul 30 19:22:27 2019 +0800 Merge remote-tracking branch 'origin/dev-databases' into dev-activity-expand-20190725 commit 3a1ab4a4daaed66a7bbd23b3aebae80edf743d39 Author: 李天时 Date: Tue Jul 30 19:21:06 2019 +0800 自定义活动关联商品 commit 09c24d20e6f20c7979057e774175a69760b8bb17 Merge: 1533aab6a f968fa520 Author: 李天时 Date: Tue Jul 30 19:19:22 2019 +0800 Merge branch 'master' into dev-activity-expand-20190725 # Conflicts: # application/common/model/Activity.php commit 1533aab6ada0819e68dea47fd84d30ce198ee8ae Author: 李天时 Date: Tue Jul 30 19:13:45 2019 +0800 自定义活动关联商品 commit 344e9da7a957bf016f79712104daf95533f0798b Merge: 8a1dba5e2 f968fa520 Author: zhenglh Date: Tue Jul 30 11:08:11 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 8a1dba5e2792c9e45ed7e3decbfb32e70d628ec2 Author: zhenglh Date: Tue Jul 30 11:08:00 2019 +0800 小说中心css外链处理 commit b31ae4ebdec3403255495fdc34165e661eb7cc6e Author: 李天时 Date: Mon Jul 29 21:02:59 2019 +0800 自定义活动关联商品 commit 033099ede834c8f2564d03678b4eb37fff3d308f Author: guyuexuan <2651919937@qq.com> Date: Mon Jul 29 20:04:04 2019 +0800 删除调试内容 commit e4526dbd13b812b17ed26e05f2087952b2b02b43 Author: guyuexuan <2651919937@qq.com> Date: Mon Jul 29 20:03:09 2019 +0800 修改数据库分库链接方式 commit e19dc091d385891c1f842deca131116aeb7d3b5f Author: 李天时 Date: Mon Jul 29 18:42:38 2019 +0800 自定义活动关联商品 commit f7b37efe2f87ae6f98fe153e572959d027fe18f5 Author: 李天时 Date: Mon Jul 29 18:41:23 2019 +0800 自定义活动关联商品 commit 2892b393f3f47356dac0228d78870224c3a7f6f6 Author: 李天时 Date: Mon Jul 29 16:35:26 2019 +0800 自定义活动关联商品 commit f968fa520630d99926def05ceadb82c3bfdead35 (tag: cps_20190730_155807) Author: 李天时 Date: Mon Jul 29 16:16:22 2019 +0800 fixbug：解决银生宝下单失败 commit 5e7532921cd1828e1226e44acc164bc602eea9ad (tag: cps_20190729_111933) Author: liyt Date: Mon Jul 29 10:31:09 2019 +0800 沙发API消费记录更新extend1字段 commit 1e089cf7b3b06c9269e6cda6cd3674d767526256 Author: liyt Date: Sat Jul 27 18:36:15 2019 +0800 修复活动资源编辑充值资源免费看点及有效期为0的bug commit f63c02a49e58304b28f2de8962ec930eac9bb38b Author: liyt Date: Sat Jul 27 15:35:28 2019 +0800 API消费时老接口兼容extend1字段 commit edc62e35a8f4bbd31559d3f3c092c5bae446e058 (tag: cps_20190726_195706) Merge: b272337d6 73b5dfa30 Author: liyt Date: Fri Jul 26 17:21:40 2019 +0800 Merge branch 'master' into dev-vipcustom-addfilter-20190724 commit 73b5dfa30f4f9b79a6e6f3b0a3516fab18d6dfa6 (tag: cps_20190726_150419) Merge: 6f8e32052 ce30b69e6 Author: wanggb Date: Fri Jul 26 13:33:13 2019 +0800 Merge branch 'dev-export-20190722' commit ce30b69e662eb61d2dc9db578d2eb441aac78f50 Author: wanggb Date: Fri Jul 26 13:32:44 2019 +0800 签署协议， 修改模板一的签约时间 commit b272337d6476a08fa87c59f57e3f69fbe428d599 Author: liyt Date: Fri Jul 26 09:55:06 2019 +0800 fixUserFollow commit 56d59a5341ee0679b8c8f87f2d7cc942178062e6 Author: liyt Date: Thu Jul 25 19:37:17 2019 +0800 VIP客服消息带群发编辑 commit 6f8e32052be7fd84cf50b16d3c3e80b56e626dd0 (tag: cps_20190725_161636) Merge: dffb728df 4b52951c1 Author: wanggb Date: Thu Jul 25 16:14:34 2019 +0800 Merge branch 'dev-export-20190722' commit 4b52951c1f80800421502f990a84a75271b253d6 Author: wanggb Date: Thu Jul 25 16:04:50 2019 +0800 签署协议， pdf文字重叠问题 commit f626272cf895dd3bef19ffc131e310d65992d937 Author: wanggb Date: Thu Jul 25 15:58:03 2019 +0800 签署协议， pdf文字重叠问题 commit 7de91062cca2e1714fa4a56c1dcfbed3b27c8c51 Author: liyt Date: Thu Jul 25 15:33:35 2019 +0800 接收用户切边标签 commit 1b64969060a8440cacb141af5ae0380bca4974f2 Author: liyt Date: Thu Jul 25 15:10:14 2019 +0800 vip图文群发验证发送时间 commit 2d77d44551ef5b8ffc49cde51159347be9b45e68 Author: liyt Date: Thu Jul 25 14:41:39 2019 +0800 添加时二维码生成问题 commit dffb728df25a9be107d67b6413a977607b16870e (tag: cps_20190725_150604) Merge: 881de2d49 37ac614bd Author: wanggb Date: Thu Jul 25 14:32:08 2019 +0800 Merge branch 'dev-export-20190722' commit 10352aafd7902867ad8cc0e9674a1225838cf4ea Merge: 073ebe22e 881de2d49 Author: liyt Date: Thu Jul 25 11:46:56 2019 +0800 Merge branch 'master' into dev-vipcustom-addfilter-20190724 commit 073ebe22e71d08e7fe780a1965d44aab6bdd3f41 Author: liyt Date: Thu Jul 25 11:39:14 2019 +0800 VIP客服消息新增接收用户标签 commit 37ac614bd5f6aa776bf05ccf1f210651c5774379 Author: wanggb Date: Thu Jul 25 11:19:11 2019 +0800 签署协议， 修改签约时间 commit 7f1a0cbe398d519ffab3e226b653b17fe32dac84 Author: wanggb Date: Thu Jul 25 11:00:20 2019 +0800 签署协议， placeholder commit f7d40e00a0747c196b47acc9f2a844c6f5563927 Author: wanggb Date: Thu Jul 25 10:28:36 2019 +0800 签署协议， placeholder commit 944fc00df624f79e8e51a068d5494983521460a0 Author: wanggb Date: Thu Jul 25 10:27:35 2019 +0800 签署协议， placeholder commit 42bee3f2c1db6f90f6157e374896f3996c79f5a1 Author: liyt Date: Thu Jul 25 10:15:30 2019 +0800 自定义二维码下载 commit 881de2d494ad496d6a31957a841277ccd4c9a0c7 (tag: cps_20190725_105129) Author: zhenglh Date: Wed Jul 24 18:58:30 2019 +0800 域名兼容.open域名方式 commit d48eb5658f2e80021c51be53f427fe8b2d28823a Author: wanggb Date: Wed Jul 24 17:30:02 2019 +0800 签署协议， placeholder commit 69fae0c13d8bb611b924258af9c8c5e4b58dd60e Author: wanggb Date: Wed Jul 24 17:08:15 2019 +0800 签署协议， agreement_platform_name commit 8dff01c86ff55afc154ee414821642adcc526ad7 Author: wanggb Date: Wed Jul 24 17:01:04 2019 +0800 签署协议， agreement_platform_name commit c046fa2ba03ab067ecd43dd29ac8ea237ec83b33 Author: wanggb Date: Wed Jul 24 15:04:08 2019 +0800 签署协议，下载合同|批量下载 commit b2625fac115e8b4f8befac791720114ab5177be3 Author: zhenglh Date: Wed Jul 24 14:41:43 2019 +0800 关键字回复处理 commit 0d3a8abcfed55461d5f00c42057f6973d04611e6 Author: liyt Date: Wed Jul 24 13:58:29 2019 +0800 自定义活动优先级高于平台活动 commit 5c77ae020c4ad22b7aec0afa2c239fbdaf1de696 (tag: cps_20190724_104857) Author: liyt Date: Tue Jul 23 20:25:06 2019 +0800 书单打点 commit c1e9d38d68ae9a134681b1955bd80ad757fbc347 Author: liyt Date: Tue Jul 23 15:30:21 2019 +0800 回退弹窗js放外面 commit 0eb36341d22ba8b9497b58544be059c56f3db069 Author: liyt Date: Tue Jul 23 14:46:16 2019 +0800 修复cpslog异常抛出代码 commit 18ba5ad47b9a0cf2fa8d6beb45da125a25e2d391 Author: liyt Date: Tue Jul 23 10:51:01 2019 +0800 优化客服消息弹窗 commit 6f1766c84c44b56a479bc7b5dcceca9fae0fad66 Merge: fd47fab9f 68213a1fa Author: liyt Date: Tue Jul 23 10:04:42 2019 +0800 Merge branch 'master' into dev-booklist-dot-20190717 commit 68213a1fa59800d2509bb4a36d860c38852dbf3c Merge: 6b1823076 e8dcc8bf5 Author: 李天时 Date: Mon Jul 22 20:54:00 2019 +0800 Merge remote-tracking branch 'origin/master' commit 6b182307675701feaa0a79c6f4915de61b03aba5 Author: 李天时 Date: Mon Jul 22 20:53:53 2019 +0800 fixbug：解决活动读取活动相关redis失效 commit fd47fab9ff434d9254d9ab85ba03fdfcd17e4748 Author: liyt Date: Mon Jul 22 16:01:33 2019 +0800 注释掉支付是cps的检测 commit 80399337daa33a845dbd258b874b219b0518c6dd Merge: 2c25fa038 6518b0ad6 Author: 李天时 Date: Mon Jul 22 15:39:24 2019 +0800 Merge branch 'dev-subsidiary-goods-20190629' into dev-booklist-dot-20190717 commit 2c25fa03815f67d3900d95d556068bc731d951a8 Author: liyt Date: Mon Jul 22 15:36:06 2019 +0800 修复客服消息弹窗视图文件ext参数被截断 commit 9bc62089eb97cd967edace772d1059aa053fb4af Merge: 42617a343 e8dcc8bf5 Author: liyt Date: Mon Jul 22 14:39:37 2019 +0800 Merge branch 'master' into dev-booklist-dot-20190717 commit e8dcc8bf5cf34aebe95a858b12a784f38917d7d1 Author: liyt Date: Mon Jul 22 14:38:24 2019 +0800 pay.js判断打点函数bug修复 commit 42617a3432d953cadc001f200b0a495e90d5ada6 Author: liyt Date: Fri Jul 19 17:08:08 2019 +0800 推广链接每日数据凌晨临界点支付回调创建跨天问题 commit 3534bb06f66d6c80ba23d2db70937ca999d10ec1 Merge: fcf280592 1a0eb6aa6 Author: liyt Date: Fri Jul 19 16:47:33 2019 +0800 Merge branch 'master' into dev-booklist-dot-20190717 commit 1a0eb6aa65eae35b164d11157074abad54fbbbc3 Author: wanggb Date: Fri Jul 19 15:52:29 2019 +0800 取消 noNeedRight commit 5e2af9989fd34430683bbd2488702e96e335a25a Author: liyt Date: Fri Jul 19 15:09:14 2019 +0800 还原提现导出 commit b3afe9b17785928cbcc5185084395319a6aa99d0 Author: liyt Date: Fri Jul 19 14:58:05 2019 +0800 历史数据查询语法错误 commit d26e03a33fda85f940bb21c068fcd6a2fe9199c7 (tag: cps_20190719_115414) Author: liyt Date: Fri Jul 19 11:49:08 2019 +0800 cps_log方法trycatch commit 6518b0ad6784daa6202b21dac7d992b1658a16e9 Author: 李天时 Date: Thu Jul 18 23:08:38 2019 +0800 自定义商品,fixbug普管修改渠道商失败 commit 2c514b7543ad93d25c5ad931d10e3494f0ab38f1 Author: 李天时 Date: Thu Jul 18 22:22:30 2019 +0800 自定义商品,fixbug普管修改渠道商失败 commit 672669d41e6f639873f6aaa6980683afe2ead3ad (tag: cps_20190719_102905, tag: cps_20190718_170929) Merge: 6ed5637a7 2d58ff421 Author: wanggb Date: Thu Jul 18 17:07:01 2019 +0800 Merge branch 'dev-tongji-220190713' commit 2d58ff421b927f1cfc1f0d810d950ba2e00aa0ac Author: wanggb Date: Thu Jul 18 16:56:35 2019 +0800 提现历史记录，筛选查询条件 commit 6ed5637a75b98132e73ba69108bf40c25057e06b (tag: cps_20190718_164422) Merge: 03ed4cd67 69e232f40 Author: wanggb Date: Thu Jul 18 16:43:31 2019 +0800 Merge branch 'dev-tongji-220190713' commit 03ed4cd6784222a2695ad8197a24965619ee0517 Merge: 682d3fff7 d4e377166 Author: 李天时 Date: Thu Jul 18 16:33:50 2019 +0800 Merge remote-tracking branch 'origin/master' commit fcf280592548d267c32d6a6fdf4a7489491209fa Author: liyt Date: Thu Jul 18 16:31:35 2019 +0800 推广书单统计 commit 69e232f40c5be2f1ee360d3ed878a0ecdb1e0df7 Author: wanggb Date: Thu Jul 18 16:26:43 2019 +0800 提现历史记录，筛选查询条件 commit 682d3fff7481002e1b19dec847e50c1346eeb15a Merge: 268107f93 a03ffe033 Author: 李天时 Date: Thu Jul 18 16:23:19 2019 +0800 Merge branch 'dev-subsidiary-goods-20190629' commit a03ffe03336166505f63e6d10212af2605a44ef9 Author: 李天时 Date: Thu Jul 18 16:16:10 2019 +0800 自定义商品,fixbug普管修改渠道商失败 commit b929ded8621e08c493211d3d17029fc2a58f8a16 Merge: ccef091c0 d4e377166 Author: wanggb Date: Thu Jul 18 16:15:37 2019 +0800 Merge remote-tracking branch 'origin/dev-tongji-220190713' into dev-tongji-220190713 commit ccef091c0dd56aa50a83cbbecfc5bdea2276ed7b Author: wanggb Date: Thu Jul 18 16:15:28 2019 +0800 提现历史记录，筛选查询条件 commit bae9d35bbbd9a49870a22157ae49646449b17474 Author: liyt Date: Thu Jul 18 15:23:10 2019 +0800 推广书单统计 commit d4e3771668a761e47cf92d89136d95b556760216 (tag: cps_20190718_143724) Merge: 66b9cfcf8 268107f93 Author: liyt Date: Thu Jul 18 14:25:57 2019 +0800 Merge branch 'master' into dev-tongji-220190713 commit 4930611154db2b43e78700c25fcc81da9a576aa1 Author: liyt Date: Thu Jul 18 14:24:36 2019 +0800 推广书单数据统计 commit a78296ebf6674ebbb648081b8585f9211a45137a Author: liyt Date: Thu Jul 18 10:46:23 2019 +0800 推广书单打点 commit 268107f93ffae98f03505cd4d1ffd3a5740e52ab (tag: cps_20190718_101051) Author: 李天时 Date: Wed Jul 17 20:35:24 2019 +0800 自定义商品,修改二次下单的日志 commit 66b9cfcf82b3f54aba78576a5eea4c9e6d0ff3a3 Author: liyt Date: Wed Jul 17 18:48:16 2019 +0800 调查问卷 commit 0561b5f4d7e24cb851a824c2a67c7a1d2c56e773 Author: liyt Date: Wed Jul 17 18:17:30 2019 +0800 调查问卷 commit afbdc767ce02497d206f50d5e835177b6a22322f Merge: 7ae262733 f151de7bb Author: liyt Date: Wed Jul 17 18:08:48 2019 +0800 Merge branch 'dev-tongji-220190713' of http://192.168.0.31/fe/cps into dev-tongji-220190713 commit 7ae26273397e2629ba57b516c0d77fcea4a7944f Author: liyt Date: Wed Jul 17 18:08:21 2019 +0800 调查问卷 commit 684417a0820be4851c5497c91c7528ca30f24c74 Merge: d78c1bf36 1b7a30d1a Author: liyt Date: Wed Jul 17 18:05:10 2019 +0800 Merge branch 'master' into dev-tongji-220190713 commit 1b7a30d1a293af3b929087f8d7f3db5ab41b2c01 Author: liyt Date: Wed Jul 17 17:18:47 2019 +0800 替换config.cdn地址 commit f151de7bb8de7b18e8a9199a5f3da5d18f4e9710 Author: wanggb Date: Wed Jul 17 17:09:22 2019 +0800 最低提现10yuan commit c71e27a44ce1517c3cc94b80ec007ffbf3bdf238 Author: liyt Date: Wed Jul 17 17:01:36 2019 +0800 推广书单数据统计打点 commit 7dd2f6c079ddcbd988099ffee89431d80ede2001 Merge: 3a2a7b24a d78c1bf36 Author: wanggb Date: Wed Jul 17 14:59:32 2019 +0800 Merge remote-tracking branch 'origin/dev-tongji-220190713' into dev-tongji-220190713 commit 3a2a7b24a1a339a3f45766b38baa1e61c6b998fd Author: wanggb Date: Wed Jul 17 14:59:22 2019 +0800 增加提现记录 commit ed43e98243da38326e43088c736e9bf06cfabac2 (tag: cps_20190717_160727, tag: cps_20190717_153619, tag: cps_20190717_145911) Author: 李天时 Date: Wed Jul 17 14:42:43 2019 +0800 自定义商品,提示一或者提示二为空，展示占位符nbsp commit c93365bb7b644a005daf00405d59d9442cfb27a5 (tag: cps_20190717_134951, tag: cps_20190717_134543) Merge: a7262039e 428bf44a8 Author: 李天时 Date: Wed Jul 17 10:48:48 2019 +0800 Merge branch 'master' into dev-subsidiary-goods-20190629 commit d78c1bf3652838c54d72cb3b9d5c9f74d6274db3 Merge: 548be58dd 428bf44a8 Author: liyt Date: Wed Jul 17 10:12:26 2019 +0800 Merge branch 'master' into dev-tongji-220190713 commit 548be58dd9a12553ed21f1f455588739f63e1955 Author: liyt Date: Tue Jul 16 21:32:02 2019 +0800 调查问卷 commit a7262039e943c59c3ac84fc8a02ddcea2000f1f6 Author: 李天时 Date: Tue Jul 16 21:00:37 2019 +0800 自定义商品,充值页面增加userid commit 45c928c68dfee1ef5d5f9a941c79955591e0d7f4 Author: liyt Date: Tue Jul 16 19:47:08 2019 +0800 调查问卷 commit 1234131bbffec5b2624ae73d1988fac665eaf798 Author: liyt Date: Tue Jul 16 19:15:04 2019 +0800 调查问卷 commit 293aae36464a91054551562dc36d29b65fcb7c5d Author: liyt Date: Tue Jul 16 19:10:05 2019 +0800 调查问卷 commit e3e4efbf67aaee9b56f0c11a0f586730adee0764 Author: 李天时 Date: Tue Jul 16 18:24:27 2019 +0800 自定义商品,修改微信端展示样式，去掉头像，商品框改为圆角 commit 428bf44a8e93cc85bd1d56d8398ed2be60ffce63 (tag: cps_20190716_175935) Author: zhenglh Date: Tue Jul 16 17:44:14 2019 +0800 推广链接字段处理错误 commit 4d0318d6da950041089629c9eda5d1b9e045f2eb Author: 李天时 Date: Tue Jul 16 17:35:11 2019 +0800 自定义商品,修改微信端展示样式，去掉头像，商品框改为圆角 commit e523f117d51dda96f88e53a9152f46fb695075da Author: zhenglh Date: Tue Jul 16 17:26:05 2019 +0800 推广链接字段处理错误 commit ebd3c137a540d7dd26c253a7033db546189e0022 Author: wanggb Date: Tue Jul 16 15:50:46 2019 +0800 测试提现0.1 commit acfc07ac6a2db191091b272afa387242ee408ebd Merge: 527f4f646 696167fb7 Author: wanggb Date: Tue Jul 16 14:23:05 2019 +0800 Merge remote-tracking branch 'origin/dev-tongji-220190713' into dev-tongji-220190713 commit 527f4f6466c7a6dd1ef31e394a1bb3f3edd735df Author: wanggb Date: Tue Jul 16 14:22:54 2019 +0800 微信管理-关注自动回复-兼容手机 commit 41fa7beab816c9d4b68234f272f0c69bd167953a (tag: cps_20190716_142009) Merge: b35022199 33165b662 Author: zhenglh Date: Tue Jul 16 14:12:59 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit b35022199d4d33504e3f9611cd395d61b732fa75 Author: zhenglh Date: Tue Jul 16 14:12:54 2019 +0800 推广链接过滤处理 commit 696167fb74ad7b16b3963103f4e992b2c8786111 Author: liyt Date: Tue Jul 16 14:10:23 2019 +0800 调查问卷 commit e286ccc6dcb9a865b752431b5be6f9fa7cdc2d77 Author: liyt Date: Tue Jul 16 14:00:45 2019 +0800 禁用vip分流链接 commit 33165b662144573848f22a2030e5d7e2712fb179 Author: liyt Date: Tue Jul 16 12:27:51 2019 +0800 客服消息自定义链接长度不能超过255 commit d295ff90a4ba0f6a69b19fd717fdbf85a6fd7d03 Author: liyt Date: Tue Jul 16 12:21:41 2019 +0800 客服消息自定义链接长度不能超过255 commit 20a1d157ada7126e61f95853318aaa6f669214d4 Author: liyt Date: Tue Jul 16 11:10:23 2019 +0800 修复客服消息弹窗正则匹配问题 commit 773166addf2b27f2ad201f3d6634f361a7b3038a Author: liyt Date: Tue Jul 16 11:07:13 2019 +0800 调查问卷 commit 8e7d5566aa07ecadea4e829afa70687c7a068b6d Author: 李天时 Date: Mon Jul 15 20:37:27 2019 +0800 自定义商品,优化渠道商重置商品列表 commit b056a5596779120b657fcf11a2db58eb40e4d434 Author: 李天时 Date: Mon Jul 15 18:23:03 2019 +0800 自定义商品,优化样式 commit a8174ee35be3e9ac46d7851d37187d00839f0ce2 Author: liyt Date: Mon Jul 15 17:55:52 2019 +0800 分流链接搜索 commit 870d517a6f6e26ed34a2349a16220d9b4d0b7150 Author: wanggb Date: Mon Jul 15 17:01:52 2019 +0800 vip-提现信息-查看-渠道商的提现记录 commit c762fb4cfb6b2f5a355dbdbc8a8bfa4af99f41a1 (tag: cps_20190715_163318) Author: zhenglh Date: Mon Jul 15 14:30:54 2019 +0800 书籍不存在时的处理 commit a6f59f80192395aa77c115217f13135bc41aaccb Merge: e19fe8d5a 9bb948ea5 Author: zhenglh Date: Mon Jul 15 14:15:57 2019 +0800 Merge branch 'dev-referral-to-admin-20190709' of http://192.168.0.31/fe/cps into dev-referral-to-admin-20190709 commit e19fe8d5aa083b49c0f19e6110c1d2b8794360fa Merge: 373d11bca 9f20d2208 Author: zhenglh Date: Mon Jul 15 14:15:36 2019 +0800 Merge branch 'master' into dev-referral-to-admin-20190709 commit ce4d111754146090dd5aaaee08201c1081a410a5 Author: 李天时 Date: Mon Jul 15 14:11:09 2019 +0800 自定义商品,优化样式 commit 4db485847d0571c33ac5b19e2900524570ab0a38 Author: 李天时 Date: Mon Jul 15 11:59:28 2019 +0800 自定义商品,优化样式 commit 9f20d22086aa814fc8194ca6c1a4fa3487b2f397 (tag: cps_20190715_114353) Author: liyt Date: Mon Jul 15 11:31:58 2019 +0800 模板文件判断变量是否定义 commit a9df095e4e780bb82b0006ee21e99891f5764e73 Author: liyt Date: Mon Jul 15 11:22:51 2019 +0800 模板文件判断变量是否定义 commit 0f9d25b051b0cfaded9c477248a059dd05568850 Author: wanggb Date: Mon Jul 15 11:18:02 2019 +0800 微信管理-关注自动回复-兼容手机 commit d179653a5d85231bbe2dcadfa3e63e442894f439 (tag: cps_20190715_103339) Merge: 70313bad1 43aa8231e Author: zhenglh Date: Mon Jul 15 10:24:06 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 70313bad1b05c84a68b2300b979726d018aa6b47 Author: zhenglh Date: Mon Jul 15 10:23:55 2019 +0800 小说中心异步处理 commit 9bb948ea58e9b2cf6bcf08238961251758223d05 Author: zhenglh Date: Sat Jul 13 18:51:49 2019 +0800 小说中心js组件异步引入，不影响书籍列表展示 commit de369c27cc39040fb24ee0610d033f1d4dd37c11 Merge: bb6e7ee0e 43aa8231e Author: liyt Date: Sat Jul 13 15:20:39 2019 +0800 Merge branch 'master' into dev-tongji-220190713 commit bb6e7ee0ecfa20c397263fbf7f9c3f4ed435b728 Author: liyt Date: Sat Jul 13 15:19:47 2019 +0800 账号管理加总充值金额 commit 1a32b0c945dcbf10a63a6115f7c64e5893630b37 Author: liyt Date: Sat Jul 13 14:52:04 2019 +0800 分流链接禁用 commit 43aa8231e14d2e862e79f3a8da8298267e0b91a5 (tag: cps_20190713_144018) Author: liyt Date: Sat Jul 13 14:17:31 2019 +0800 回滚文件到未修改 commit 65805ebc663f6df83f91882825e6520b671c43e9 Author: liyt Date: Sat Jul 13 14:16:48 2019 +0800 Revert "分流链接加禁用" This reverts commit 3006f23fc2c4bbc5998ed0d6a0daf92a35ea623d. commit 3006f23fc2c4bbc5998ed0d6a0daf92a35ea623d Author: liyt Date: Sat Jul 13 14:15:38 2019 +0800 分流链接加禁用 commit 89eb57b78103f5719b9573be8028b688187a7de7 Author: liyt Date: Sat Jul 13 14:07:15 2019 +0800 分流链接加禁用 commit 0a1cb0e7849562feb749ef3bbb7987df4a50dfca Author: liyt Date: Sat Jul 13 11:09:11 2019 +0800 最近阅读字段未定义 commit 373d11bcab5dcaefeb81211ecc8ce5016b50f01f Author: zhenglh Date: Sat Jul 13 10:10:59 2019 +0800 推广链接操作按钮ui调整 commit 50ef2d6f682ad015f5dfee2e7a459a0d9ef48f6e Author: zhenglh Date: Sat Jul 13 10:04:49 2019 +0800 最近阅读getRecentlyRead方法返回值数据格式修改 commit b7e12d3e464ef928f291faddfa16640082e6fa39 Author: liyt Date: Fri Jul 12 20:05:30 2019 +0800 固定页回退弹框 commit beff0af205e53ec043341288a7cec77a33013f7d Author: 李天时 Date: Fri Jul 12 18:21:53 2019 +0800 fixbug用户端模块的书籍完本信息都是连载中 commit 58253becd83a39727545c1b9d7725dcb04184dfa Author: liyt Date: Fri Jul 12 18:08:30 2019 +0800 固定页回退弹框 commit 1d29c3f2b5132dbe8b0e2c3d7150bce78b6a37ca Author: liyt Date: Fri Jul 12 17:34:33 2019 +0800 最近阅读书籍状态逻辑优化 commit 664c4690abaeb8e80a00f45ccc0c4a4928efd28d Author: liyt Date: Fri Jul 12 17:24:08 2019 +0800 优化回退弹框 commit 2730aa8f0ac9c1fb5b138d16d17d922947676133 Merge: cbad8c469 84dcf276a Author: zhenglh Date: Thu Jul 11 20:10:04 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit cbad8c46999e4dee96f26dddb4077e2ab2d3bb59 Author: zhenglh Date: Thu Jul 11 20:09:54 2019 +0800 合并支付与最近阅读补丁 commit 84dcf276a64709dcd83290c93310e19ce222eb12 Author: liyt Date: Thu Jul 11 19:00:48 2019 +0800 批量下架删除对应缓存 commit 6632e3b5e313837d6f487cac8177dfe9118ac8f4 Merge: e6ece7492 e0a68769b Author: 李天时 Date: Thu Jul 11 11:31:45 2019 +0800 Merge branch 'master' into dev-subsidiary-goods-20190629 # Conflicts: # application/admin/view/auth/channel/add.html commit e6ece74920b933a60122a81fb41aad7f3361613c Author: 李天时 Date: Wed Jul 10 19:55:46 2019 +0800 自定义商品,优化样式 commit 86da99b12b276b4f6d760fa45d5bbf45636868f3 Author: zhenglh Date: Wed Jul 10 19:34:36 2019 +0800 阅读章节优化 commit d3456b630ab380c82cea5e4af8dca97774852760 Author: 李天时 Date: Wed Jul 10 18:21:45 2019 +0800 自定义商品,配号代理商开关 commit dc4a5f21d127dffe09bd97cbd63351c7d092f6fa Author: zhenglh Date: Wed Jul 10 18:11:10 2019 +0800 书籍阅读页抛异常捕获 commit 3e1952a5e2903e0073e362a018dc99990c7b9cc9 Author: 李天时 Date: Wed Jul 10 17:34:11 2019 +0800 自定义商品,优化界面 commit 847811fcca51812522ed61580c01e4c9772a5701 Author: zhenglh Date: Wed Jul 10 15:58:40 2019 +0800 支付页面返回弹窗回滚 commit e9e1a0795fd4c9c71af19db3301b57165ca11c95 Author: zhenglh Date: Wed Jul 10 14:46:03 2019 +0800 支付返回弹窗测试完成 commit fe8e4bb57bd567fc8b82aa00931496855f56a69a Author: zhenglh Date: Wed Jul 10 14:27:01 2019 +0800 支付页返回添加弹窗 commit 0869809da4b301b3fb4866195c1ab67617759c34 Author: zhenglh Date: Wed Jul 10 09:57:12 2019 +0800 cookie添加 commit 1850f8758c042074f9d5b5680198851f174d8676 Author: zhenglh Date: Tue Jul 9 19:48:08 2019 +0800 支付页后退添加弹窗 commit d308fa297f6f79ce14bc5ff2d1d3c8f4ebf4f641 Author: zhenglh Date: Tue Jul 9 19:34:53 2019 +0800 权限菜单逻辑修改 commit 92016441f4df1894ebd7e9723001f325d1b4f7ab Author: zhenglh Date: Tue Jul 9 17:50:53 2019 +0800 添加管理员与超管推广链接 commit 3fa932c444b61538dd833a197cb31954a9abb13a Author: 李天时 Date: Tue Jul 9 16:57:58 2019 +0800 自定义商品 commit 5afb8eb109ea305b06da0df5250ed443d46c1822 Author: zhenglh Date: Tue Jul 9 15:19:31 2019 +0800 客服消息导出，拆分今日数据 commit e0a68769bb519b86de112fc729d7516a8d2fdd79 (tag: cps_20190709_144053) Merge: 4e45c8915 a3402a1d1 Author: liyt Date: Tue Jul 9 11:16:24 2019 +0800 Merge branch 'master' into dev-custom-tips-20190702 commit 4e45c8915f249a8a6ac84513aee9d59a672b4d83 Author: liyt Date: Tue Jul 9 11:16:09 2019 +0800 优化客服消息弹框 commit a3402a1d1ed7c18d206cc5d2e6b8f8738d8c23c2 Author: liyt Date: Tue Jul 9 10:37:40 2019 +0800 推广链接历史数据js分页 commit 78957a9be4e4db0809a9e1119e7c815e547224af Author: liyt Date: Tue Jul 9 10:10:03 2019 +0800 推广链接历史数据js分页 commit f9e7cac0e59e73256e3d6d5fd3f4d06d5769bbbc Author: 李天时 Date: Mon Jul 8 20:11:53 2019 +0800 自定义商品 commit bed4098c40a9cb9d14acab503f3afd92a94e6f3a Merge: 7ef26277a 82e260f38 Author: liyt Date: Mon Jul 8 18:35:36 2019 +0800 Merge branch 'master' into dev-custom-tips-20190702 commit 7ef26277a4378d14fcf11c640ed41b415f3c1c91 Author: liyt Date: Mon Jul 8 18:01:18 2019 +0800 主题关闭弹窗 commit e0c63fa7d4b8ba5e711dd874762478d46c774f2d Author: liyt Date: Mon Jul 8 17:59:07 2019 +0800 主题关闭弹窗 commit 82e260f383b69938a133830344d65860d5671951 Author: liyt Date: Mon Jul 8 17:12:53 2019 +0800 推广文案背景图推广图片复制原文改为短链地址 commit b270fbc972e69d7bffe24a1e1d5628894fc44518 Merge: 4cbb78b2e 84012d444 Author: liyt Date: Mon Jul 8 13:52:03 2019 +0800 Merge branch 'master' into dev-custom-tips-20190702 commit 84012d444047169afbad0eb1d13169decde743a9 (tag: cps_20190705_194405) Author: liyt Date: Fri Jul 5 19:18:42 2019 +0800 点看主题赠币活动弹窗js commit 0866c34137af892dd6f5cad66eb8594d3f7bc031 (tag: cps_20190705_171251) Merge: 453a740dc 9e0034b0e Author: zhenglh Date: Fri Jul 5 17:12:15 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 453a740dc2a8eecdd9e50e9d4a9ede4ac822efff Merge: 9fdaa68c9 ddf189f61 Author: zhenglh Date: Fri Jul 5 17:12:03 2019 +0800 Merge branch 'dev-vue-update-chapter-return-20190703' commit ddf189f61916bee2f49f6464a3dd6cf2d4428e86 Author: zhenglh Date: Fri Jul 5 17:11:51 2019 +0800 书籍修改 commit b663b57d149efe400c4486219eb35747bbadf347 Author: zhenglh Date: Fri Jul 5 16:59:18 2019 +0800 书籍名称修改，返回按钮延迟时间改为8小时 commit 4cbb78b2e62d69f51f4eb4d9a9ceed0199b1ba4d Author: liyt Date: Fri Jul 5 15:56:17 2019 +0800 客服消息弹窗 commit 2f560af9f56966aa658d6b31dba61217832aad18 Merge: 9866356d5 9e0034b0e Author: liyt Date: Fri Jul 5 15:54:31 2019 +0800 Merge branch 'master' into dev-custom-tips-dev-20190702 # Conflicts: # application/admin/view/auth/channel/add.html # application/admin/view/auth/channel/edit.html # application/common/controller/Frontend.php commit 9e0034b0e567407077a1b13e67a6ed460d6530b5 (tag: cps_20190705_152806) Merge: 9fdaa68c9 e870e535a Author: liyt Date: Fri Jul 5 14:30:33 2019 +0800 Merge branch 'dev-master-20190705' commit 9fdaa68c9bf91cd9a6f10399b473907e6345a133 Merge: 815dfe8f1 6aacabb8b Author: zhenglh Date: Fri Jul 5 13:51:25 2019 +0800 Merge branch 'dev-vue-update-chapter-return-20190703' commit 6aacabb8b34fd35deeba9ca2b809e889e2dc8e5d Author: zhenglh Date: Fri Jul 5 13:51:10 2019 +0800 修改打包方式 commit e870e535a5b93134d3b57ece4d95eb399a5774e4 Author: liyt Date: Fri Jul 5 13:41:57 2019 +0800 赠币活动开关 commit e1667954f35e32cef9866dbf965195473655bf8a Author: liyt Date: Fri Jul 5 11:59:12 2019 +0800 赠币活动开关 commit 4e004cb15188d129a55dfac8b2ad8c9c8b57928f Author: 丁海波 Date: Fri Jul 5 11:36:35 2019 +0800 微信管理 vip充值管理样式优化 commit 815dfe8f11296ab903a4aa24999694fff76c7d3d Author: zhenglh Date: Fri Jul 5 11:07:47 2019 +0800 返回推荐书籍不处理redis缓存 commit c06d28e3bd46b9a1bb5231c14d16b7fb166b6bc8 Author: zhenglh Date: Fri Jul 5 11:02:33 2019 +0800 返回推荐书籍不处理redis缓存 commit 9866356d5e00b31b4234071e4fc8319cf1178825 Merge: b268ee4fe 3a6196085 Author: wanggb Date: Fri Jul 5 10:39:58 2019 +0800 Merge remote-tracking branch 'origin/dev-custom-tips-20190702' into dev-custom-tips-20190702 commit b268ee4fec76a99eeef5ddbaf4b2b834aedbd9e1 Author: wanggb Date: Fri Jul 5 10:39:42 2019 +0800 修改图文客服消息时，维护custom_url表数据 commit 3a0d8d7bc783e05f044c35bc17d85bf5e7316f2d (tag: cps_20190705_104505) Merge: 5aed762f2 ea7858dad Author: zhenglh Date: Fri Jul 5 10:32:52 2019 +0800 Merge branch 'dev-vue-update-chapter-return-20190703' commit 5aed762f2f3cd27a7367ef163ba895aefeb9d5ed Author: liyt Date: Fri Jul 5 10:27:38 2019 +0800 赠币活动不限选项改为1次 commit ce435deabf6ff44f1a075b99c0ba9d6d7e1423b8 Author: 李天时 Date: Fri Jul 5 10:27:21 2019 +0800 自定义商品 commit ea7858dad9b3919f0e6f9bf69e2013462af5e01f Author: zhenglh Date: Thu Jul 4 20:24:25 2019 +0800 代码更新 commit 3a61960852019168ec1ebb564fce60f15028aef1 Author: liyt Date: Thu Jul 4 19:16:37 2019 +0800 赠币活动开关设置 commit d2bb03dcf36b798b4dadb125444196f0d0badb05 Author: zhenglh Date: Thu Jul 4 18:22:16 2019 +0800 活动弹窗优化级高于推荐书籍 commit 2e4aea4d915b16d68dc25f717e872b6e35ef55b5 Author: zhenglh Date: Thu Jul 4 17:25:49 2019 +0800 点击继续阅读时关闭弹窗 commit 9ec8cba9487835064231eae1f993a38fcb0ff9d3 Author: zhenglh Date: Thu Jul 4 17:19:39 2019 +0800 模板错误 commit 4a0f8a8cfac61946ea0803909a67de0036151c65 Author: zhenglh Date: Thu Jul 4 17:08:02 2019 +0800 阅读页回退的时候动态添加返回书籍 commit fb40517dfa021b92bb787a85540c87f132e8e0ae Author: liyt Date: Thu Jul 4 15:36:01 2019 +0800 主题模板客服消息弹窗 commit 9fb22434133ec85fd160508051d8b3698ed9f9ae Author: zhenglh Date: Thu Jul 4 15:31:43 2019 +0800 书籍阅读页报错屏蔽 commit b65409d7a32c15d7f2de1d5abd6339786291dbb2 Author: liyt Date: Thu Jul 4 14:52:26 2019 +0800 客服消息弹窗 commit 620fc1ab285e7d4f20844ae3e792b6f6343c74cc Author: zhenglh Date: Thu Jul 4 14:44:42 2019 +0800 第一页不进行弹窗 commit 9aa622c276815706adee2426c7900036221e88a5 Author: liyt Date: Thu Jul 4 14:23:40 2019 +0800 客服消息弹窗 commit 544b04933edef12cf87fc3020e664dccbf9588e2 Author: zhenglh Date: Thu Jul 4 12:52:07 2019 +0800 js优化 commit f356829b04a5cc8ba357985febcdc829281fba6a Author: zhenglh Date: Thu Jul 4 12:48:48 2019 +0800 js优化 commit 4aab8107662adc01b29299873593a862471534b5 Author: liyt Date: Thu Jul 4 12:16:14 2019 +0800 客服消息弹窗 commit 682fa8b180209f273652b5d1664d11e1d859b8ac Merge: 9a4a87158 d4e70f96a Author: liyt Date: Thu Jul 4 11:17:30 2019 +0800 Merge branch 'master' into dev-custom-tips-20190702 commit 9a4a871585f13261509ef835484a6331c57a93dc Author: liyt Date: Thu Jul 4 11:16:31 2019 +0800 客服消息弹窗 commit 98385f2415719222f7efb1209a1ed994f3a73bcb Author: zhenglh Date: Thu Jul 4 10:59:34 2019 +0800 推荐书籍过滤掉最近阅读的书籍 commit 0d3eafe464503b86cedd19e01bed4ad6ae5e2270 Author: liyt Date: Wed Jul 3 20:06:42 2019 +0800 客服消息弹窗 commit 2da5a7f035779afcdc97eaaf103ec698546f8673 Author: zhenglh Date: Wed Jul 3 19:23:37 2019 +0800 书籍打点逻辑处理 commit f917b498b4a0c50755a90c7bf267ce8e04974c76 Author: zhenglh Date: Wed Jul 3 17:57:56 2019 +0800 弹窗事件打点 commit e6eedc832a136bf2e27d02f7c09f617ba317d2e3 Author: zhenglh Date: Wed Jul 3 17:56:01 2019 +0800 弹窗事件打点 commit 59e2117b6dfe7fc68bc8249099ef86827a72a4e2 Author: zhenglh Date: Wed Jul 3 17:13:20 2019 +0800 章节优先选择最近阅读 commit e2532606f1150bbd163f3a347bcd19af2e9e84cb Author: zhenglh Date: Wed Jul 3 16:42:04 2019 +0800 关注回复，页面样式调整 commit 90809d64a4a1ab6456a1d8de5e7bbeef6f60f796 Author: zhenglh Date: Wed Jul 3 16:36:34 2019 +0800 测试完成 commit 7802ef9abf3ab5dfa4bb15fb7bc23e5aa9b62eef Author: liyt Date: Wed Jul 3 14:56:26 2019 +0800 消费记录维护extend1字段 commit 5adef36782af2141ec676136cb4c5c44fa6a3e05 Author: zhenglh Date: Wed Jul 3 14:42:18 2019 +0800 vue文件名称修改 commit 0c2f654ffbbc8443a5c315e80932146d42cf6769 Author: zhenglh Date: Wed Jul 3 14:33:35 2019 +0800 element-ui打包加载 commit 61284bd45a383d2021ada75c12022ebaa4851dc6 Author: zhenglh Date: Wed Jul 3 14:33:19 2019 +0800 element-ui打包加载 commit d4e70f96a1115a44af8736a102f22e50322407c4 Author: liyt Date: Wed Jul 3 14:31:19 2019 +0800 Revert "extend1字段维护" This reverts commit 52d6694b300afb59803d3f0291fea492d14a7dc2. commit 52d6694b300afb59803d3f0291fea492d14a7dc2 Author: liyt Date: Wed Jul 3 13:44:42 2019 +0800 extend1字段维护 commit 94fea99a6aea4d830f45d6fd32aadacfa897d87f Author: zhenglh Date: Wed Jul 3 13:38:26 2019 +0800 css样式 commit a971dae3bec3cf5bebe95b2a31ea071cdd74bc59 Author: liyt Date: Wed Jul 3 13:00:13 2019 +0800 每日数据新增充值金额为null commit 41b0fc1b53869f94e06ffeec68eac0d5e0cebdbd Author: zhenglh Date: Wed Jul 3 12:32:48 2019 +0800 压缩优化 commit f8aa5fd9bca97c353823c520e4c8702a0431794b Author: zhenglh Date: Wed Jul 3 11:53:05 2019 +0800 js压缩 commit be6fb94b06d94f3a81fb841bde4ec4a8ab772a90 Author: zhenglh Date: Wed Jul 3 11:11:57 2019 +0800 后退添加推荐书籍测试完成 commit 92b9d45318dcda6998f7427e775fc47abcf20037 Author: zhenglh Date: Tue Jul 2 19:32:52 2019 +0800 阅读页返回添加弹窗 commit e969212bf4d9c2319e4feb204a5d87aa224daffa Author: liyt Date: Wed Jul 3 11:40:06 2019 +0800 每日数据新增充值金额为null commit 9909e9959a447b993356faedbdb2a83f972c6f55 Author: liyt Date: Wed Jul 3 10:18:02 2019 +0800 客服消息弹框充值记录赠币活动 commit 5d20aa03d6b772e8336d181b62dd2c6f5c62c586 Author: liyt Date: Wed Jul 3 10:13:55 2019 +0800 客服消息弹框充值记录赠币活动 commit 3069e9d45df2a036fff0636ae20e9855b85cc36c Author: liyt Date: Tue Jul 2 20:41:45 2019 +0800 ms commit 3e5a80efe67cd82cf6e47cb7aef5938a6abfb02e Author: liyt Date: Tue Jul 2 20:32:51 2019 +0800 隐藏举报按钮 commit 25af2e0788134e24e745f2b751ab74df68ace2cf Author: liyt Date: Tue Jul 2 20:09:20 2019 +0800 code commit e615efae72d5597321dfd97c0feefcb4e0991e5e Author: zhenglh Date: Tue Jul 2 18:32:24 2019 +0800 压缩 commit 5e99465be70e8780f1f9f745ac079b2a7cbf9ac4 Author: zhenglh Date: Tue Jul 2 18:16:19 2019 +0800 压缩文件 commit 57efd3341eed9dc1929e0c9ee0014f5ec656bcc2 Author: zhenglh Date: Tue Jul 2 16:59:22 2019 +0800 表单兼容 commit e3a284f4ea84dca2682f23b3b320f8d7afbc3ab7 Merge: d38f91127 322ca724c Author: wanggb Date: Mon Jul 1 15:39:09 2019 +0800 引入vue,webpack开发架构 commit 8e0178e96ce1430ab155349d18efc94d82459cd4 Author: 李天时 Date: Mon Jul 1 17:51:53 2019 +0800 下单失败二次重试 commit ba366faa4fd9f98d40ae5359e47d94ac4bfd678a (tag: cps_20190701_163037) Merge: d38f91127 322ca724c Author: wanggb Date: Mon Jul 1 15:39:09 2019 +0800 Merge remote-tracking branch 'origin/dev-booklist-20190624' into dev-booklist-20190624 commit d38f911276fea077d9ef4d35ef6b6084af58c7d3 Author: wanggb Date: Mon Jul 1 15:38:59 2019 +0800 vip 充值时间精确到小时 commit 322ca724cdcf8e0a6307b7b56d3a4aebdc8294a3 Author: liyt Date: Mon Jul 1 15:37:43 2019 +0800 vip运营创建书单 commit 2bd311b011522c0e365755b493845a146c1630b3 (tag: cps_20190701_134109) Merge: d6f0e978f 998edb4bb Author: liyt Date: Mon Jul 1 10:14:46 2019 +0800 Merge branch 'master' into dev-booklist-20190624 commit d6f0e978f4a7cdaeb4e580787d9a2f639e24c8fd Author: liyt Date: Sat Jun 29 19:38:03 2019 +0800 书单 commit 0c713a3115ebbf37e17bdd6d1bd830ed85ff56d9 Author: liyt Date: Sat Jun 29 19:30:59 2019 +0800 书单 commit 43c7f1088153e30a79c7cf5ede472548a8e7a6a3 Author: liyt Date: Sat Jun 29 17:38:19 2019 +0800 vip天数 commit 82109e5754443e0582c328c55390142dab2ca9d0 Author: liyt Date: Sat Jun 29 17:20:37 2019 +0800 vip天数 commit f7843fc48baaf30065ef6846dfdca8fe7df4d117 Author: wanggb Date: Sat Jun 29 16:36:32 2019 +0800 vip 充值时间精确到小时 commit c1561d239735393f570fb4988af86d55d8bfe7d7 Merge: 2efe0d626 a2eac49b0 Author: wanggb Date: Sat Jun 29 16:23:01 2019 +0800 Merge remote-tracking branch 'origin/dev-booklist-20190624' into dev-booklist-20190624 commit 2efe0d6269ca28ca1e0a7dc5ff5f93a4005f37da Author: wanggb Date: Sat Jun 29 16:22:42 2019 +0800 vip 充值时间精确到小时 commit a2eac49b0eab3ae3bb5167ce4c5bdcd1e9d684db Author: liyt Date: Sat Jun 29 16:13:36 2019 +0800 领取弹窗 commit 6fccd33e070f1bf5d36631f0600e066e25cce0b6 Author: liyt Date: Sat Jun 29 15:23:22 2019 +0800 vip天数 commit 32d5ecbd1c3ac3ab6e55ac6f1d1af46b6dc3a764 Author: liyt Date: Sat Jun 29 15:00:29 2019 +0800 活动创建次数key commit 7b543f200bb7e56cb7e1074b817f4f532a498da3 Author: liyt Date: Sat Jun 29 11:51:06 2019 +0800 默认主题活动弹窗关闭按钮 commit af04389be91b61e6a3554699a2ded40544c2b22f Author: DuanEnJian Date: Sat Jun 29 11:38:13 2019 +0800 修改活动展示问题 commit fad0ac0db80a40250a82acf30d21c3dce657ff89 Author: liyt Date: Fri Jun 28 15:25:46 2019 +0800 刷单编辑 commit 6131cf153fed6dd527347e1269ca77c6822851f5 Author: liyt Date: Fri Jun 28 13:59:21 2019 +0800 刷单编辑 commit 998edb4bb100d0dc65e8a9a65f2413d322b7b051 Author: liyt Date: Fri Jun 28 12:10:35 2019 +0800 用户统计已付费显示错误 commit 9ec7543c6c9afe1e26c978117a31d07e67e8e93b Author: liyt Date: Fri Jun 28 12:07:27 2019 +0800 用户统计已付费显示错误 commit 11ba04c805dbe7ebe0692e36792235909dc4efff Author: liyt Date: Fri Jun 28 11:29:46 2019 +0800 推广书单 commit 91fed7e4e434bfec4be65611449158c37a4f70f1 Author: liyt Date: Fri Jun 28 11:19:32 2019 +0800 推广书单 commit c0433b8e6baa25c173ced37ff5451644153a17e9 Author: liyt Date: Fri Jun 28 10:37:32 2019 +0800 送币活动资源编辑 commit b863ad193baaca5742fa2b559537301195b3d287 Author: liyt Date: Thu Jun 27 18:08:42 2019 +0800 书单 commit c102c7dc1c8515cd288372ee49a74209f6bfe887 Author: liyt Date: Thu Jun 27 17:47:57 2019 +0800 书单 commit 83d6c6e3571e4fe23fe5b7f4a43336cfc0ddd56f Author: liyt Date: Thu Jun 27 17:37:35 2019 +0800 书单 commit 5819b505c2774663916a0bb8278ee33fa090a5ad (tag: cps_20190627_162926) Author: zhenglh Date: Wed Jun 26 10:44:06 2019 +0800 书籍列表页改版,关注回复优化 commit 83d65cd24c7b0c395b36948cfff4044e46375f62 Author: liyt Date: Thu Jun 27 15:30:45 2019 +0800 书单 commit 697ae60b8254950b2963ae50496ea10a71bd2fd8 Author: liyt Date: Thu Jun 27 15:23:07 2019 +0800 书单 commit e4b247188736682143de6aea7dd809d02da050fc Author: liyt Date: Thu Jun 27 13:57:50 2019 +0800 书单 commit 7e4e99c8cd5f37074b27eed4bf1b6c6ec5cfeb3e Merge: dc73ac1db d749daf5d Author: DuanEnJian Date: Thu Jun 27 12:02:48 2019 +0800 Merge remote-tracking branch 'origin/dev-booklist-20190624' into dev-booklist-20190624 commit dc73ac1dbd58912d61e497a4eb04006df6559438 Author: DuanEnJian Date: Thu Jun 27 12:02:45 2019 +0800 活动改版,添加赠币活动 commit d749daf5db299248353b736f4393a0259a5b47b6 Merge: 6b0347811 ca6c381a5 Author: liyt Date: Thu Jun 27 10:45:30 2019 +0800 Merge branch 'master' into dev-booklist-20190624 commit ca6c381a58117cadb54bccdddfc51af9b9ed6170 Author: liyt Date: Thu Jun 27 10:35:05 2019 +0800 继续阅读弹窗去掉关注条件 commit 6b03478116398ab5199271b3b056515da4acf1b1 Merge: 6046cadc3 6d1d847db Author: DuanEnJian Date: Thu Jun 27 09:59:46 2019 +0800 Merge remote-tracking branch 'origin/dev-booklist-20190624' into dev-booklist-20190624 commit 6046cadc3aa5ac39c4b1c68e6f984b60724dd47e Author: DuanEnJian Date: Thu Jun 27 09:59:42 2019 +0800 活动改版 commit 6d1d847db78261687810ceb5b587c93ca16f91bb Author: liyt Date: Wed Jun 26 22:12:35 2019 +0800 切换账号菜单更改 commit 280c158a8253b553b4a9562681aab3ad4724d279 Author: liyt Date: Wed Jun 26 18:34:40 2019 +0800 每日数据样式和关注回复签到文案 commit 1e28b5ead213b33b9f0c5523fceab0357cbe7c72 Author: liyt Date: Wed Jun 26 18:33:23 2019 +0800 每日数据样式和关注回复签到文案 commit 84cd603d6834ed68b60d724793b907f04b77c2bd Author: liyt Date: Wed Jun 26 17:19:31 2019 +0800 书单 commit d62bdf125a04de74a76ed180b02c0153804f2123 (tag: cps_20190626_102445) Merge: 11bafd718 adb84aca2 Author: wanggb Date: Tue Jun 25 20:59:22 2019 +0800 Merge branch 'dev-sign-20190625' commit adb84aca2f1988bf0d90c08652c14e12a2a4d8b1 Author: wanggb Date: Tue Jun 25 20:53:47 2019 +0800 修改菜单：每日签到流程 commit b55b04ffde849e0ee704767aefcf9ff67e7ffd47 Author: wanggb Date: Tue Jun 25 20:41:42 2019 +0800 修改菜单：每日签到流程 commit ac5d45debdc3554389de140e9e998152d9768d31 Author: wanggb Date: Tue Jun 25 19:53:34 2019 +0800 修改菜单：每日签到流程 commit 11bafd71805b9e7a9a578f1fa3177d182cadc954 (tag: cps_20190625_194333) Merge: 1ec3d7892 b0c01924f Author: wanggb Date: Tue Jun 25 19:31:34 2019 +0800 Merge branch 'dev-sign-20190625' commit b0c01924fa9e746ad1e0113ddbac048385867e79 Author: wanggb Date: Tue Jun 25 19:30:50 2019 +0800 修改签到弹窗位置 commit 1ec3d7892e729f07d5205af9c19d6a8bc0958de5 Author: liyt Date: Tue Jun 25 18:13:38 2019 +0800 关注回复模板修改 commit 2013cb600a72abc62c61ae736384999cd8ca39eb Author: wanggb Date: Tue Jun 25 18:03:55 2019 +0800 修改连续签到推送语 commit 43a397ab3d50ccc9f2be184138741c520cc20543 Author: liyt Date: Tue Jun 25 17:57:36 2019 +0800 书单 commit 3bfa5c580c7c43ff9078ca62730855f499c57e0f Merge: ecd492130 87a6083f9 Author: liyt Date: Tue Jun 25 17:32:06 2019 +0800 Merge branch 'dev-booklist-20190624' of http://192.168.0.31/fe/cps into dev-booklist-20190624 commit ecd4921306df63a4a3adc39ab95d75a2e9466eae Author: liyt Date: Tue Jun 25 17:31:51 2019 +0800 书单 commit 7e9eafb4d0730385bba9638c9508e6f9688a3172 (tag: cps_20190625_173639) Author: liyt Date: Tue Jun 25 15:58:38 2019 +0800 客服消息与推广链接关系维护 commit 1ba9ebf9a519ae73e388bf22b39e19adbb82c1d3 Author: liyt Date: Tue Jun 25 15:47:18 2019 +0800 书单 commit 87a6083f91ecab8eb5f706be157a16dbe25ff63e Author: DuanEnJian Date: Tue Jun 25 14:56:20 2019 +0800 活动改版 commit 5cb8e813bd2f97424f7f3d003174d9c84c86d8e6 Author: DuanEnJian Date: Tue Jun 25 14:24:28 2019 +0800 活动改版 commit ecc66105bd9b2aa13e70b6ee138a2ccdd5859932 Author: liyt Date: Tue Jun 25 10:21:35 2019 +0800 书单 commit 1bc2596264d9fed86f995a567c33bbeb2852bda9 Author: liyt Date: Mon Jun 24 19:47:30 2019 +0800 渠道查看代理推广链接为空 commit 0eb4d4dc389e745a70bb8d02db89cc5da39b0e4f (tag: cps_20190624_165529) Merge: 0593dc5a5 fd18fce8d Author: wanggb Date: Mon Jun 24 10:38:02 2019 +0800 Merge branch 'dev-account-self' commit 0593dc5a55985240ad76e4f96bb8853b68c59875 Author: liyt Date: Fri Jun 21 16:49:37 2019 +0800 微博短链api改为https commit 43a6e0a24361e20d9195d8dd256b43e3ccaeac43 Author: liyt Date: Fri Jun 21 15:34:38 2019 +0800 修改表结构 commit 37b3b096f5feadc68a5f8e8b8421f5d881381529 Author: liyt Date: Fri Jun 21 14:48:34 2019 +0800 查询条件 commit 4ae8ba527129d8cffb78b75b74c7fefa88ce3638 Merge: a3c3b2bfa 3c201b6de Author: liyt Date: Fri Jun 21 13:44:39 2019 +0800 Merge branch 'dev-referral-day-collect' into dev-20190621 commit 3c201b6de1cb3107a35465e1920b76a7898d54b1 Author: liyt Date: Fri Jun 21 10:58:27 2019 +0800 回本率 commit 1df230c1d8e8f97006d029928b139e0281f1037c Author: liyt Date: Fri Jun 21 10:46:08 2019 +0800 回本率 commit 9972edc4aa4f171fba8d2ad4d3b2c974414c8e38 Author: liyt Date: Fri Jun 21 10:37:59 2019 +0800 回本率 commit f5b20fe3055675bc8392ee16726ec9519e9c158f Author: liyt Date: Fri Jun 21 10:36:04 2019 +0800 回本率 commit 32126205ef3d40adedfa2b3b382f0f84bbb4c0cf Author: liyt Date: Fri Jun 21 10:34:32 2019 +0800 回本率 commit c33d96603420b7bbc9c6fd648a9e79cb72df8993 Author: liyt Date: Fri Jun 21 10:22:50 2019 +0800 回本率 commit 66bd2a0e3d59dfcdc22ec49d55ab9efb96841ffc Author: liyt Date: Fri Jun 21 10:09:12 2019 +0800 回本率 commit ba373cf01729b2daadd0b0fe562df9ac413a00a9 Author: wanggb Date: Thu Jun 20 20:03:23 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 355cade1858ca12415167de4250503843f649df1 Merge: ed771346e 5fe0a4d01 Author: wanggb Date: Thu Jun 20 19:53:35 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit ed771346e380bc5331cd8dfcc345019d484a0793 Author: wanggb Date: Thu Jun 20 19:53:27 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 5fe0a4d018251f7cff36fadc62f892b913c5e318 Author: liyt Date: Thu Jun 20 19:21:54 2019 +0800 历史充值金额 commit cdd2dcafe44a29ba502f6a479561f9a63f7bf6e0 Merge: 7b1c25688 1628a0bcc Author: wanggb Date: Thu Jun 20 19:10:58 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit 7b1c256882a8b201dd74c8e4fcfade85e981dd67 Author: wanggb Date: Thu Jun 20 19:10:50 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 1628a0bcc9aa6066ba5c119064f2898df3c13ecc Author: liyt Date: Thu Jun 20 19:04:28 2019 +0800 历史充值金额 commit f418fb8358d8b11a3931fee92bcc418c43a07454 Author: liyt Date: Thu Jun 20 19:00:18 2019 +0800 历史充值金额 commit 5ae6e49798106d7d6410422057c5387fa8278265 Author: wanggb Date: Thu Jun 20 18:07:55 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 79c7829ae60f7a0a04f63131f8afa3e7e4a86738 Author: wanggb Date: Thu Jun 20 17:55:59 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 4835b16905ba92759c1c078caed281ffecc2f88e Author: wanggb Date: Thu Jun 20 17:53:22 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 06a17603e61c99d784dab3cd600ff5d605a92f62 Merge: e75747d0c 00558e237 Author: wanggb Date: Thu Jun 20 17:49:43 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit e75747d0cabe24e2bc1a37bb98c67f2ca239ea1a Author: wanggb Date: Thu Jun 20 17:49:29 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 00558e237b06d522387523c36bd4b921d1551ef5 Author: liyt Date: Thu Jun 20 17:42:51 2019 +0800 每日新增充值数 commit 79c2b2df40750d4415f8ca7107013b9fdff257bd Author: liyt Date: Thu Jun 20 17:40:39 2019 +0800 每日新增充值数 commit 58b0991d4e87780e8861b74244e82cc3a5a08e77 Author: liyt Date: Thu Jun 20 17:39:41 2019 +0800 每日新增充值数 commit 77de1da2ec79ebfa57e2ea9f8ddb770d51252366 Author: liyt Date: Thu Jun 20 17:20:03 2019 +0800 禁用按钮 commit 743aeec41c1fd2cb98634a8cd55a183a6c248a02 Author: liyt Date: Thu Jun 20 16:40:59 2019 +0800 每日新增充值数 commit e375b33286fc1520ff78133161d0b1e26075e496 Author: liyt Date: Thu Jun 20 16:22:41 2019 +0800 每日新增充值数 commit 065be900130eb172ba4a22472b182c81b08c3e37 Author: liyt Date: Thu Jun 20 16:00:55 2019 +0800 禁用按钮 commit 7293c3ce95cbf9e5f338856ac51f49a7869bb037 Author: liyt Date: Thu Jun 20 15:25:00 2019 +0800 推广链接禁用恢复按钮 commit aa9b3bab90267ffac2ec9b2df41cc28d375e86c6 Merge: b1dc0df91 a24df6658 Author: DuanEnJian Date: Thu Jun 20 14:38:04 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit b1dc0df91b71b0508acdb94ea49c4484082121be Author: DuanEnJian Date: Thu Jun 20 14:38:01 2019 +0800 修改背景图大小 commit a24df665861bf3cc6c0bbebae61b401525fc6081 Author: liyt Date: Thu Jun 20 14:32:54 2019 +0800 管理员每日新增充值 commit bea4cdca41483464a252edc32f5daae8335ea38f Author: liyt Date: Thu Jun 20 14:24:22 2019 +0800 管理员每日新增充值 commit 6ab1d1e0ac51ddaff0522915ffd9141d0bae3a7a Author: liyt Date: Thu Jun 20 14:03:09 2019 +0800 每日新增充值管理员数据 commit abdaecb09acbe679323cd68e75d0d2a4f10759c4 Author: liyt Date: Thu Jun 20 13:36:17 2019 +0800 今日新增充值数 commit de10d1b553bbe2f366e33ebec0a9bf054baf627a Author: wanggb Date: Thu Jun 20 11:31:44 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 5367f4a0faf7c24a22880afbba144ff017f6985b Author: wanggb Date: Thu Jun 20 11:09:16 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 42f7cc06920129b6d95803e46f4bc554c0361151 Author: wanggb Date: Thu Jun 20 11:03:43 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit 310b81c69d588793960a097d3035e9f03c2a515d Author: wanggb Date: Thu Jun 20 10:55:01 2019 +0800 连续签到 && 每日签到 修复 多次签到推送消息 commit a56152ff028f3982c74231909916c66bc1795dce Merge: f75a879e0 24ae12496 Author: wanggb Date: Thu Jun 20 10:34:58 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit f75a879e023b3f9518afee01ff314349c01f3a64 Author: wanggb Date: Thu Jun 20 10:34:35 2019 +0800 连续签到 && 每日签到 commit 24ae1249679dea0bc92b932900439c768c025c6f Author: liyt Date: Wed Jun 19 19:11:30 2019 +0800 每日统计提示 commit a3c3b2bfa8ca44d5c48bd62d2584d6d18f52551a Author: liyt Date: Wed Jun 19 18:29:50 2019 +0800 关注回复开关缓存 commit 2d80da9c43c5cd6f6d0c3cdde4194036f9bdc2b3 Author: wanggb Date: Wed Jun 19 18:04:20 2019 +0800 连续签到 && 每日签到 commit 6771894b4c319c9ec6b9bc752d9a5580ff6c726b Author: wanggb Date: Wed Jun 19 17:46:42 2019 +0800 修改签到展示效果 commit 6d63083190f198c08b0f0a9fde13998ea425cfa2 Author: wanggb Date: Wed Jun 19 17:05:45 2019 +0800 测试完成 commit 9ab13645feb89bd7105c8eb2a61fb13aa355c3df Author: wanggb Date: Wed Jun 19 17:01:56 2019 +0800 ceshi commit 40e03c28a09d3cd4f3aab0d2e94cade8ab544061 Merge: 72d96bdea 5e4a4a64d Author: DuanEnJian Date: Wed Jun 19 16:29:02 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit 72d96bdea19e5f729f341a91140df2f832ee5ec2 Author: DuanEnJian Date: Wed Jun 19 16:28:58 2019 +0800 修改背景图大小 commit 5e4a4a64db3e7d74e557930b5d08fedbfb43b4e4 Author: wanggb Date: Wed Jun 19 16:20:31 2019 +0800 连续签到, JS commit 6df85c77410b403418e6d921d34340039e7605ae Author: wanggb Date: Wed Jun 19 15:55:27 2019 +0800 连续签到, JS commit b65ec740f1530f1089133af97fa17d9fadbb58af Author: wanggb Date: Wed Jun 19 14:40:59 2019 +0800 连续签到, JS 效果实现 commit 4f2ceb2b776db584dc2e86916a0cb664aa7619e5 Merge: 39cacd706 ddb555834 Author: liyt Date: Wed Jun 19 13:49:00 2019 +0800 Merge branch 'dev-referral-day-collect' into dev-referral-20190619 # Conflicts: # application/index/view/yg/user/index.html commit ddb55583463f8cc774d2438a9b6079612708547e Merge: 84175d621 97327cea0 Author: DuanEnJian Date: Wed Jun 19 12:05:41 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit 84175d621d097e51503e0ab700f7dc18a64d2d16 Author: DuanEnJian Date: Wed Jun 19 12:05:37 2019 +0800 修改背景图大小 commit 97327cea019d6dc7ae79df4dcf88868b182579f7 Author: liyt Date: Wed Jun 19 11:28:20 2019 +0800 新增用户充值金额 commit 39cacd706d5cf04a3ae667d7e2184065161bcd92 Author: liyt Date: Wed Jun 19 10:15:13 2019 +0800 去掉关注弹窗必要条件关注 commit e2e092bf8314a0715bb1ef479bf634b06b5050fc Merge: 00a39a9eb b3e49b791 Author: DuanEnJian Date: Wed Jun 19 10:10:26 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit 00a39a9eb00c6127d88e0298b063956caef75297 Author: DuanEnJian Date: Wed Jun 19 10:10:23 2019 +0800 修改背景图大小 commit b3e49b7912b47ce4c29c5d542f50ceb0b358e40b Merge: e27226d58 205494972 Author: wanggb Date: Wed Jun 19 10:02:45 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit e27226d58300ed673c2c451c74bbe5bce47c6395 Author: wanggb Date: Wed Jun 19 09:57:06 2019 +0800 连续签到, JS 效果实现 commit 20549497285e963ea73d3c3ae7629bc04d6a9ebf Author: liyt Date: Tue Jun 18 20:33:10 2019 +0800 历史数据交易笔数 commit 4ed1cdf42c64e8804c8888d83c85909a56741d8e Author: DuanEnJian Date: Tue Jun 18 20:16:17 2019 +0800 修改用户统计样式 commit acca42616636ec53048d3714f6dc6b190cc65b21 Author: liyt Date: Tue Jun 18 19:58:35 2019 +0800 分流拦截js commit 4f6b6b502cfc2b23e735465fb14345042036e100 Merge: 3631ba50e 57094f8a2 Author: wanggb Date: Tue Jun 18 17:58:21 2019 +0800 Merge branch 'dev-continuous-sign0190617' into dev-referral-day-collect commit 7faf60d133b9fc2ddd742c76a28fe897ee56a1d4 Author: zhenglh Date: Tue Jun 18 17:15:10 2019 +0800 弹窗拼接错误 commit 57094f8a2f6625be602abcb425a9702d85e441ff Author: wanggb Date: Tue Jun 18 15:38:31 2019 +0800 连续签到, JS 效果实现 commit f78d75c9a50a57bad24be40ea1d4bcc9e558f823 Author: wanggb Date: Tue Jun 18 15:07:33 2019 +0800 连续签到, JS 效果实现 commit 0b7f48b3f15cd79770701a4f7d86ad05a41634a7 (tag: cps_20190618_145242) Author: zhenglh Date: Tue Jun 18 14:52:13 2019 +0800 描述使用标题 commit 59841493f8936cc1f8aaaddb42f7327f943cc522 (tag: cps_20190618_142437) Author: zhenglh Date: Tue Jun 18 14:23:50 2019 +0800 图片修改 commit 0d2490319e676db380558dfaf0c08dddf23fd1be (tag: cps_20190618_141552) Author: zhenglh Date: Tue Jun 18 14:13:14 2019 +0800 添加空文字链接提示 commit ee8fa66912e5162047fd306659807c16081bd7fb Author: zhenglh Date: Tue Jun 18 14:10:22 2019 +0800 添加描述接口 commit f38825a69c617722f8d1256ff885ea93ba9c26e4 Author: wanggb Date: Tue Jun 18 11:03:22 2019 +0800 连续签到 commit b68e80cf691f8a0a4d8957046aa752f100496ee4 (tag: cps_20190618_111324) Merge: afaca00eb f4c6a42fe Author: zhenglh Date: Mon Jun 17 20:06:14 2019 +0800 Merge branch 'dev-subscribe-20190604' commit f4c6a42fe81f01b8d471561b3bc599fe288f7d8a Author: liyt Date: Mon Jun 17 18:21:43 2019 +0800 关闭subscribe关键字入口 commit 5f525fb7cb52fe1f313c65ce515349f15dad355b Author: liyt Date: Mon Jun 17 17:45:01 2019 +0800 关闭subscribe关键字入口 commit 853caf2d74e4a79ce5f9d06412d94e2977127d69 Author: liyt Date: Mon Jun 17 17:02:22 2019 +0800 弹窗bug commit 3631ba50e479b3876931884d4752c9e041bba9d3 Merge: 23cd2e92d 0b72a04a5 Author: DuanEnJian Date: Mon Jun 17 16:16:37 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit 23cd2e92d3c35a1b0d02ea551d63209bfacfe61f Author: DuanEnJian Date: Mon Jun 17 16:16:33 2019 +0800 修改背景图字体大小 commit 0b72a04a5f32c07c01fb2bd18d6396a4abc41c88 Author: liyt Date: Mon Jun 17 15:21:57 2019 +0800 每日新增用户充值 commit eb39bee8f021448c036bc9fbcd892cab5c49d4d6 Author: liyt Date: Mon Jun 17 12:58:16 2019 +0800 每日统计展示 commit 78d9feb0371846657078168b50bae23140ca13aa Author: liyt Date: Mon Jun 17 12:55:42 2019 +0800 每日统计支付回调 commit df747fdcf0d74884d712abc70ea4b6e94adb79d2 Author: liyt Date: Mon Jun 17 11:13:59 2019 +0800 每日统计展示 commit c0066160324bd8ebb1a3338158cab0c79e82f1f0 Author: zhenglh Date: Sat Jun 15 18:22:08 2019 +0800 文字添加取消状态 commit eee19a608f511a7c9562b38f0b095155a8be9bf6 Merge: abb757f12 b67698996 Author: zhenglh Date: Sat Jun 15 18:01:37 2019 +0800 Merge branch 'dev-subscribe-20190604' of http://192.168.0.31/fe/cps into dev-subscribe-20190604 commit abb757f12019728b6ed12249a9cd3047b6905a10 Author: zhenglh Date: Sat Jun 15 18:01:31 2019 +0800 弹窗处理 commit b676989965603dffd8c151022c70ccf1a3d48495 Author: liyt Date: Sat Jun 15 17:52:04 2019 +0800 继续阅读弹窗 commit 72d377a71d21951cf98a7a32bc8b51dc8a12e138 Author: zhenglh Date: Sat Jun 15 17:40:53 2019 +0800 过滤处理 commit b826ba28d5b569c60550da10476e22ed78ad5fc8 Author: zhenglh Date: Sat Jun 15 17:29:14 2019 +0800 过滤处理 commit c715e93728ee50151252043a7b158cb89f955b5b Author: zhenglh Date: Sat Jun 15 17:07:41 2019 +0800 小说选择处理 commit b3d84c2b36220efac28220f36e3fbe13a7c84dff Author: zhenglh Date: Sat Jun 15 16:30:28 2019 +0800 描述添加删除空行 commit b9208a29dc8ddfedfcc05b854df36d753fdb26ff Author: zhenglh Date: Sat Jun 15 16:20:21 2019 +0800 回调处理链接错误 commit 0efc973c56288057e7249a1b235990540817b13c Author: zhenglh Date: Sat Jun 15 16:04:09 2019 +0800 新建小说推广链接时添加提示 commit df5b4bdb2abb1a10c932fa1f44fff24ec65a9c81 Author: zhenglh Date: Sat Jun 15 15:57:25 2019 +0800 描述过滤隐藏数据 commit d0a2005a3b95c86ff3ebf8919db8fbf96a19d6cf Author: zhenglh Date: Sat Jun 15 15:47:38 2019 +0800 标题修改事件 commit 6c261c3547dbec32824fc5d6f9136a7287c5e2c7 Author: zhenglh Date: Sat Jun 15 15:26:59 2019 +0800 图文添加默认内容 commit f41b77ad85b1a97ff85a778c4165422eb8a985d9 Merge: 387c74465 3047e9a4d Author: zhenglh Date: Sat Jun 15 13:58:18 2019 +0800 Merge branch 'dev-subscribe-20190604' of http://192.168.0.31/fe/cps into dev-subscribe-20190604 commit 387c74465b808272834c6948ee8e74c4c05df6ce Author: zhenglh Date: Sat Jun 15 13:58:06 2019 +0800 搜索框处理 commit 3047e9a4d49470330d366ade52c65e4e6c92327c Author: liyt Date: Sat Jun 15 13:53:44 2019 +0800 继续阅读弹窗 commit 44e74df25a6985702419e525087d3fb118eee908 Author: zhenglh Date: Sat Jun 15 11:50:20 2019 +0800 添加数字校验 commit 3810b5a185a860a0b3aa2e37ceda677f36bb9b84 Author: zhenglh Date: Fri Jun 14 18:44:52 2019 +0800 页面调试完成 commit 288629ff8f82e364f5cf8ec6c7e1cce461d96104 Author: zhenglh Date: Fri Jun 14 17:12:39 2019 +0800 调试完成 commit 76b4d5ffdb9214d560abbab6a450a86501d855f3 Author: zhenglh Date: Fri Jun 14 15:19:53 2019 +0800 modify commit 47895b22c91402bda995e5c978a1ef9a403a3ed5 Author: liyt Date: Fri Jun 14 13:57:41 2019 +0800 回复占位符替换 commit 134647734e089a7380b4a1027eaadd3ab8e2c2fc Author: zhenglh Date: Fri Jun 14 13:23:19 2019 +0800 模板修改 commit fd18fce8ddc2ad9a0f21c18f2c105cc06e6a5463 Author: wanggb Date: Fri Jun 14 12:09:09 2019 +0800 添加功能：自家转移号（智能客服使用） commit f16a7016ce0384c49eab80ec39dc8612bc7e5572 Author: liyt Date: Fri Jun 14 12:02:33 2019 +0800 调试接口 commit 375328e3f17e418c13dae5c9ef9509b4cc86d724 Author: zhenglh Date: Fri Jun 14 11:51:43 2019 +0800 图文格式修改 commit 994fa1930aa1102a50396c7b9aad33339c893f6e Author: DuanEnJian Date: Fri Jun 14 11:25:57 2019 +0800 修改背景图字体大小 commit ab44fbc2a27717c7fd6ee8755c7e6d4f819ca6cb Author: zhenglh Date: Fri Jun 14 11:25:43 2019 +0800 小说链接修改 commit edad98f917341656d6ab4fa95d34fa50384bc597 Author: liyt Date: Fri Jun 14 11:19:12 2019 +0800 调试接口 commit 288ceb89afe82c67e5c0da5ac8ce580ccc88d966 Author: liyt Date: Fri Jun 14 11:06:05 2019 +0800 调试接口 commit 156edd04b1ca2c0ec916ea1be86b57dcc838cf5f Author: liyt Date: Fri Jun 14 10:41:41 2019 +0800 调试接口 commit 6b46213edb994f681a52641dc078a0e209500bc7 Author: liyt Date: Fri Jun 14 10:39:10 2019 +0800 调试接口 commit 4e9c1d70936253bba2f98bdb0293be0d447e576e Merge: 7e41e4dba da74e2928 Author: zhenglh Date: Thu Jun 13 20:04:02 2019 +0800 代码合并 commit 7e41e4dbaa64409da8140d4aa15f3570a48e4248 Author: zhenglh Date: Thu Jun 13 19:58:36 2019 +0800 小说标题与描述可选择 commit da74e2928c23b9d9018c9b0ceb13fcc85bf56a56 Author: liyt Date: Thu Jun 13 19:14:08 2019 +0800 调试接口 commit a0358512d70f33c503c373405b18d9ce1c5ef383 Merge: 5805393a6 3f60b8b9c Author: zhenglh Date: Thu Jun 13 19:07:33 2019 +0800 Merge branch 'dev-subscribe-20190604' of http://192.168.0.31/fe/cps into dev-subscribe-20190604 commit 5805393a6c55b0e5e7b4333a29d71b210d135adc Author: zhenglh Date: Thu Jun 13 19:07:21 2019 +0800 页面功能完成性 commit 7c0c812b5fb4457eb89fb5b203d7836d4f8e862f Merge: 1c1af071c 77948fe1e Author: DuanEnJian Date: Thu Jun 13 18:11:26 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit 1c1af071c1c69fc01074645f2cd213644318e097 Author: DuanEnJian Date: Thu Jun 13 18:11:23 2019 +0800 VIP后台-客服消息数据-增加导出功能 commit afaca00eb749944677e6f22c9addd0e2c0b32b94 Merge: 1b8c9b9b7 463e9b743 Author: wanggb Date: Thu Jun 13 17:52:43 2019 +0800 Merge remote-tracking branch 'origin/master' commit 1b8c9b9b7a4027ac181b6924ed11b98e800b5c2a Author: wanggb Date: Thu Jun 13 17:52:26 2019 +0800 删除重复的方法 commit 3f60b8b9cd1d1a5b33afd2fb8516520f7d14e38d Merge: ef9cf53a3 463e9b743 Author: liyt Date: Thu Jun 13 17:24:08 2019 +0800 Merge branch 'master' into dev-subscribe-20190604 commit ef9cf53a3124dd17a2b2713fbffe43d6f3152bb2 Author: zhenglh Date: Thu Jun 13 17:19:09 2019 +0800 页面导入完成 commit 77948fe1eb59a428546e0536f52ce35f6236bf7f Author: liyt Date: Thu Jun 13 17:14:49 2019 +0800 更新每日数据 commit e684151f12de52cfdad135668a782e13c85cb683 Merge: db547fb9a 463e9b743 Author: liyt Date: Thu Jun 13 17:12:14 2019 +0800 Merge branch 'master' into dev-referral-day-collect commit db547fb9a7937d432e97d40878b376a7edb812be Author: liyt Date: Thu Jun 13 17:08:02 2019 +0800 更新每日数据 commit 7b966163e3160c669d718be191edb57ee81a689f Merge: 8cc0851b4 f3aa3789f Author: DuanEnJian Date: Thu Jun 13 17:01:39 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-day-collect' into dev-referral-day-collect commit 8cc0851b429248a43a23190ceb02ef5ce14f8f2a Author: DuanEnJian Date: Thu Jun 13 17:01:35 2019 +0800 修改推广链接页面展示 commit 463e9b743f6d189dfec0eafc934dd57f94d17487 (tag: cps_20190613_162017) Merge: f8941867c b6aa3bf7a Author: zhenglh Date: Thu Jun 13 16:18:20 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit f8941867c2afb86ac436562e5d0a92f2e6540049 Author: zhenglh Date: Thu Jun 13 16:07:31 2019 +0800 模块不存在日志降级 commit b6aa3bf7afd5ad19413043f2f36d37bd81edaa7f (tag: cps_20190613_145426) Author: 李天时 Date: Thu Jun 13 14:49:20 2019 +0800 米花支付方式增加风险参数 commit f63c6637438a1d5ebfbf74fadd77c0854e40815f Merge: 3d850c6a2 fb1975191 Author: 李天时 Date: Thu Jun 13 14:46:18 2019 +0800 Merge remote-tracking branch 'origin/master' commit f3aa3789fefa7e5b318ef4db9eaf57ee5fc49417 Author: liyt Date: Thu Jun 13 11:55:08 2019 +0800 更新每日数据 commit fb19751910ea9d81ebfc45bb33154e8bac9e09ed (tag: cps_20190613_114531) Author: zhenglh Date: Thu Jun 13 11:00:56 2019 +0800 最近阅读加载书籍格式修改 commit 84d37b271309c3ddf27232ecf2202902475a8012 Author: liyt Date: Wed Jun 12 19:52:47 2019 +0800 支付回调更新推广链接每日数据 commit 3d50604aeac62984cbbef8f3c4972cfb73a34c88 Author: liyt Date: Wed Jun 12 19:35:13 2019 +0800 推广链接日统计 commit e248aea1df00260f44825068fdb9716e2e71a88f Author: liyt Date: Wed Jun 12 19:32:58 2019 +0800 推广链接日统计 commit a2135fa34e8daf51fbb588a3bc00e155bba33fb8 (tag: cps_20190613_101642) Author: zhenglh Date: Wed Jun 12 16:25:52 2019 +0800 主题处理 commit b135eb7988e2e137d2e74b5548ee900289dea174 Author: 李天时 Date: Wed Jun 12 13:49:20 2019 +0800 米花支付方式增加风险参数 commit 9fa734a83328cc6372b53b9786ca15e235773979 Merge: adab8f7a1 cb89f3520 Author: zhenglh Date: Wed Jun 12 12:23:10 2019 +0800 Merge branch 'dev-fix-small-demand-20190612' of http://192.168.0.31/fe/cps into dev-fix-small-demand-20190612 commit adab8f7a14aa88d17978097fef75002cae7eaad6 Author: zhenglh Date: Wed Jun 12 12:22:54 2019 +0800 分流链接总充值金额格式修改 commit 56e4aea90988e2047019f02e3f9504ad770be623 Author: zhenglh Date: Wed Jun 12 11:44:20 2019 +0800 最近阅读删除推荐书籍，页脚二维码 commit cac2366cc818b826101bdf997ac13f0d31f0f89c Author: zhenglh Date: Wed Jun 12 11:26:51 2019 +0800 最近阅读下架书籍显示下架，不显示更新章节 commit 346c81862351e2dd570b428b43023a18c3929764 Author: zhenglh Date: Wed Jun 12 11:22:08 2019 +0800 提现金额格式处理 commit cb89f352031cb71e811aaf4640d4604bea784464 Author: 李天时 Date: Wed Jun 12 10:42:29 2019 +0800 米花支付方式增加风险参数 commit 5b2e8c9720e80e002b0683f0f1754d7060f36950 Author: zhenglh Date: Wed Jun 12 09:59:45 2019 +0800 最近阅读删除推荐，微信回调日志打点 commit 3d850c6a2fc372c2a747d8253d11f3a7b9070d50 Merge: 3d2364900 e3b699f7e Author: 李天时 Date: Wed Jun 12 09:59:27 2019 +0800 Merge remote-tracking branch 'origin/master' commit ea4244082906d8f116bb0cf7ac84239b1cab1df6 Author: liyt Date: Tue Jun 11 14:51:34 2019 +0800 关注事件关闭开关 commit 2b71008cbb257471ae0522bccff6e0fa81a559b5 Author: liyt Date: Tue Jun 11 14:50:56 2019 +0800 关注事件关闭开关 commit f764115ac657f9e93e6dd32f46bd896ac894fd6e Author: liyt Date: Tue Jun 11 11:07:59 2019 +0800 分流链接小数点 commit adc300cfcc9e08ebf6cc0f4c00312eeeb588fb57 Author: liyt Date: Mon Jun 10 17:49:52 2019 +0800 关注回复接口 commit d9caced7eab59dca9f2bc7d83822f3b9a81accb1 Author: liyt Date: Mon Jun 10 17:48:56 2019 +0800 关注回复接口 commit 3d23649007672bbb3f7c8f3239a625b45f1298a0 Merge: 89e2cf58d 8b0e310a4 Author: 李天时 Date: Mon Jun 10 16:44:35 2019 +0800 Merge remote-tracking branch 'origin/master' commit 7af6934a56239775aa5309ad9b213ab0ffb8fc6d Author: liyt Date: Mon Jun 10 14:40:02 2019 +0800 关注回复接口 commit e3b699f7e81b059e20ea1596f43570b85c399c1d Author: liyt Date: Thu Jun 6 13:51:20 2019 +0800 客服消息内容url替换顶级域名host commit 189a69bb1e14c549b12099c5a63284bd29516dc6 Author: liyt Date: Wed Jun 5 20:50:14 2019 +0800 查询下拉 commit 8b0e310a4c0a3f7c3dc7488674f5bb51b183ba47 Author: liyt Date: Wed Jun 5 17:33:59 2019 +0800 vip分流链接导粉章节数必填 commit b9fb7da8a089ef0d4c4af3ed9e854685854f55f6 Author: liyt Date: Wed Jun 5 16:50:53 2019 +0800 关注回复 commit 99347a4c1a16bc8805a05aaa461a594838ad28c9 Author: zhenglh Date: Wed Jun 5 14:24:18 2019 +0800 沙发，袋鼠阅读页路径错误 commit 9f6457a9127d5b3c652893a09cf4d0afa7201820 Author: zhenglh Date: Wed Jun 5 13:33:30 2019 +0800 修复新用户关注回复无法推送消息的bug commit 89e2cf58ddb931fce6bc0ac1411525834fbd4d52 Merge: f81cd7912 efe247d21 Author: 李天时 Date: Wed Jun 5 12:00:41 2019 +0800 Merge remote-tracking branch 'origin/master' commit efe247d212801bcdc4a46e406fa124dd023cb178 (tag: cps_20190604_161726) Merge: 68b37fb1e afc85f174 Author: zhenglh Date: Tue Jun 4 16:03:34 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 68b37fb1eec9f3d346e7750ea8a58675d708e127 Author: zhenglh Date: Tue Jun 4 16:01:50 2019 +0800 运营账号将清除编辑缓存按钮去掉 commit 5b9679330be2109b09c05c156f06ef9cd4d4753a Author: liyt Date: Tue Jun 4 12:09:49 2019 +0800 被关注回复 commit f81cd7912a2a80773e6f850db1bcfbeab8b77fc5 Merge: 4b1a2556d afc85f174 Author: 李天时 Date: Mon Jun 3 14:33:56 2019 +0800 Merge remote-tracking branch 'origin/master' commit 4b1a2556d994c56736632138ff8294e868c6d29f Merge: e9a3f683b 860beba31 Author: 李天时 Date: Mon Jun 3 14:33:49 2019 +0800 Merge remote-tracking branch 'origin/master' commit afc85f17406b3ff4cf5cb693123b9a2625e7ff5b (tag: cps_20190603_144452) Author: liyt Date: Mon Jun 3 14:32:03 2019 +0800 修复分流链接导致关注二维码不弹出bug commit 878dd43b7a5a43babf717546e85b8b619ed45f7f Merge: ff35563d2 860beba31 Author: liyt Date: Mon Jun 3 14:27:13 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 860beba31165958701161b80b3576327486bcc3e Author: zhenglh Date: Mon May 27 17:37:38 2019 +0800 css主题处理&订单统计请求处理&签到处理 commit 796e1e91fa785bb06e0f592ca81a4d023942eb3c (tag: cps_20190603_103240) Author: DuanEnJian Date: Fri May 31 17:41:31 2019 +0800 修复新接入的支付逻辑分类判断问题 commit e9a3f683b1ac2093a03acce862b59fddc5230209 Merge: b7dc4ca48 bf197133d Author: 李天时 Date: Fri May 31 17:25:51 2019 +0800 Merge remote-tracking branch 'origin/master' commit ff35563d292ad3427a506e9f40e5002916638e9b Merge: c17b4fc7f bf197133d Author: liyt Date: Fri May 31 09:55:45 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit bf197133de061a4e51f26e47950855f4f10a77ef (tag: cps_20190530_164422) Merge: 38089a632 464019f35 Author: DuanEnJian Date: Thu May 30 16:19:15 2019 +0800 Merge branch 'dev-goods-modify3' of 192.168.0.31:fe/cps 合并商品逻辑修改分支 commit 464019f3554e3a842dd3125d25c3054b6afba3f3 Author: DuanEnJian Date: Thu May 30 16:17:27 2019 +0800 更新展示文档 commit c9f980e3379548eb7c82384d45dbfffc6e74e5b7 Author: DuanEnJian Date: Thu May 30 16:16:41 2019 +0800 更新展示文档 commit c17b4fc7fb494bf12134a6395e3fce26321fd600 Merge: 61e60509e 38089a632 Author: liyt Date: Wed May 29 17:53:44 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 38089a632639eedb6eba49b5d81f4f2d149a2954 (tag: cps_20190529_183624) Merge: ad02b1f8b fbe109e64 Author: DuanEnJian Date: Wed May 29 15:37:08 2019 +0800 Merge branch 'dev-kl-city-modify' of 192.168.0.31:fe/cps 合并KL&首冲9,9逻辑修改的代码 commit b7dc4ca48c57d59aa829a2f0d0f5a6baba2833bf Merge: ad02b1f8b 61e60509e Author: zhenglh Date: Wed May 29 09:45:15 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit ad02b1f8bb24ff30b979701a1258fafe24c8b110 (tag: cps_20190529_101706) Author: zhenglh Date: Wed May 29 09:45:04 2019 +0800 书籍页缓存获取格式修改 commit 61e60509ed9ded3ccca5b02c7738d23ca9c27029 Author: DuanEnJian Date: Tue May 28 16:55:16 2019 +0800 更新composer.json commit 984f4bcd585296534fab487d9eda841d3dab9c74 Author: zhenglh Date: Tue May 28 16:33:57 2019 +0800 书籍页有缓存时添加来源状态 commit 536c83e7ae31ebeee2cbc712fce8dcc5ed845c70 (tag: cps_20190527_105044) Merge: e2701e63f af8448e02 Author: liyt Date: Mon May 27 10:33:39 2019 +0800 Merge branch 'dev-daohang-20190523' into dev-daohang-master-20190527 commit fbe109e6440ddc4746cb394d207626480389d3ef Author: DuanEnJian Date: Sat May 25 19:05:14 2019 +0800 修改用户充值取消时,客服消息发送时间 commit aa4c2bba3eb78f0711e64bf4f7d01bcd2e5c220e Author: DuanEnJian Date: Sat May 25 19:04:22 2019 +0800 修改用户充值取消时,客服消息发送时间 commit f412278ff9a5299bcba3fc0f5a68c18517b47870 Author: DuanEnJian Date: Sat May 25 19:00:00 2019 +0800 修改用户充值取消时,客服消息发送时间 commit eefa58b763ddb9f0e91b3cce8f12bd74e08dbd42 Author: DuanEnJian Date: Sat May 25 18:54:34 2019 +0800 修改用户充值取消时,客服消息发送时间 commit b66f40feaa281fac402dfc3f196972fd79286c93 Author: DuanEnJian Date: Sat May 25 16:47:33 2019 +0800 修改用户充值取消时,客服消息发送时间 commit af8448e02a7f873c7bd0e4ccb601c1d54c624fae Author: liyt Date: Sat May 25 15:58:25 2019 +0800 heng3 commit f3639dfd3dfccb65f694962cb0daea3beffba4c7 Author: DuanEnJian Date: Sat May 25 14:06:22 2019 +0800 修改用户充值取消时,客服消息发送时间 commit 591f538fb9c9b1765470c5f6dac370be4746e4c5 Author: DuanEnJian Date: Sat May 25 13:21:33 2019 +0800 修改商品编辑分类必选问题 commit e2701e63fab7241ed127725594d31cd656e4120e Merge: a4e332ace 0ba09ed33 Author: wanggb Date: Sat May 25 11:38:33 2019 +0800 Merge branch 'dev-update-wechatmenu-20190521' commit 0ba09ed330ed3b7f0cff3f9895a73d9ab6d1306e Author: wanggb Date: Sat May 25 11:37:06 2019 +0800 优化命令，增加条数限制 commit 1a9ce06396bd8d327b08bd05834277d2c11cfb97 Author: DuanEnJian Date: Sat May 25 11:36:22 2019 +0800 修改商品编辑分类必选问题 commit 4ba4050fac207059b6e131dbe6380b0bea521a4d Author: DuanEnJian Date: Sat May 25 11:31:10 2019 +0800 修改商品编辑分类必选问题 commit aa328b722ea2a1d83bcf349cf47493ea32b57786 Author: zhenglh Date: Sat May 25 11:25:07 2019 +0800 章节缓存添加重置按钮 commit 1a0ab0931fa8199a2777eaf2a3e210dce9e3a206 Author: zhenglh Date: Sat May 25 11:18:53 2019 +0800 章节缓存添加重置按钮 commit b98cdf001157eb46fcb154d7c816b48d0c5a33d2 Author: zhenglh Date: Sat May 25 10:49:48 2019 +0800 章节缓存添加重置按钮 commit 0d32a7c1f6828cf2cd7799e2c9de200edfb34a94 Merge: 28fe973ac 79a97c9b8 Author: zhenglh Date: Sat May 25 10:14:53 2019 +0800 Merge branch 'dev-daohang-20190523' of http://192.168.0.31/fe/cps into dev-daohang-20190523 commit 28fe973ac354357247179b268bd52d3b9239112a Merge: 1b9858958 ef588b287 Author: zhenglh Date: Sat May 25 10:14:23 2019 +0800 Merge branch 'dev-edit-chapter-cache-20190523' into dev-daohang-20190523 commit 79a97c9b8d31c9dfdac4f7e70b31780c72a2f67e Merge: 1b9858958 a4e332ace Author: liyt Date: Fri May 24 19:51:55 2019 +0800 Merge branch 'master' into dev-daohang-20190523 commit a4e332ace70e014f8bff36db1c7a0fce542892ba Merge: 6811f72a6 a2c065e1f Author: wanggb Date: Fri May 24 19:50:25 2019 +0800 Merge branch 'dev-update-wechatmenu-20190521' commit a2c065e1fb511cfe2dbb6dacb223617bb141df5b Author: wanggb Date: Fri May 24 19:39:08 2019 +0800 vip,客服消息统计筛选条件优化 commit 680178959e268de70aa2300a4a0d58803460225a Author: DuanEnJian Date: Fri May 24 19:01:44 2019 +0800 修改商品编辑分类必选问题 commit 1295555ddf7ad53732ad70284c630a366951a636 Merge: 699871f35 6e88970c9 Author: DuanEnJian Date: Fri May 24 17:55:38 2019 +0800 Merge remote-tracking branch 'origin/dev-goods-modify3' into dev-goods-modify3 commit 699871f35072878395eed3b84331f8a70b2d74ed Author: DuanEnJian Date: Fri May 24 17:55:36 2019 +0800 修改商品编辑分类必选问题 commit 1b9858958a39dc7f4da54a4115a16799f526b468 Author: liyt Date: Tue May 14 11:49:56 2019 +0800 导航修改,转义用户输入 字体大小 导出 关注回复点打错误修复 commit 6e88970c9ffdc0500429754bea58f4050a036b70 Author: liyt Date: Fri May 24 17:03:07 2019 +0800 '书库状态' commit 0c2a50ebe642111593ce8b0840533301ca6308a0 Author: liyt Date: Fri May 24 16:58:48 2019 +0800 '书库状态' commit ff49e041daf2df516636e974aa63769e42b84995 Author: DuanEnJian Date: Fri May 24 16:51:49 2019 +0800 解决编辑渠道时,定时推送开关JS问题 commit be1a07b45f3b8e13e25ac8beb36d370442c9010c Author: DuanEnJian Date: Fri May 24 16:49:51 2019 +0800 解决编辑渠道时,定时推送开关JS问题 commit 82f5c7eda95115626556410abaeca6ae0f6fa6f2 Author: DuanEnJian Date: Fri May 24 15:42:02 2019 +0800 解决编辑渠道时,定时推送开关JS问题 commit a79cd90db21d2001a7b92a157aaddc6f8e3c80b5 Author: DuanEnJian Date: Fri May 24 15:38:49 2019 +0800 解决VIP商品修改时,类型保存错误问题 commit 9d99dfa6d6a6d48837e6ce5db5befce3698a564e Author: DuanEnJian Date: Fri May 24 15:22:08 2019 +0800 修改充值页商品展示 commit ea0dad25838a2e0caccae69c4f4a3c9d2c4b99e6 Author: DuanEnJian Date: Fri May 24 15:02:14 2019 +0800 取消授权时,清空微信AD接入源ID,并关闭AD commit d663ff4a1f787fc2d63eb583029997b53ff9037f Author: DuanEnJian Date: Fri May 24 11:50:09 2019 +0800 取消授权时,清空微信AD接入源ID,并关闭AD commit eccce538ebe9946414e8d2b890b09d16af775452 Author: DuanEnJian Date: Fri May 24 11:45:53 2019 +0800 取消授权时,清空微信AD接入源ID,并关闭AD commit 6811f72a6ab47bd18ea573f716d2e69f121d3814 (tag: cps_20190523_182038) Merge: c143b1a67 b8d014d4c Author: wanggb Date: Thu May 23 18:20:16 2019 +0800 Merge branch 'dev-update-wechatmenu-20190521' commit b8d014d4c6685e49d3cd7b79b01bce765b31a4c6 Author: wanggb Date: Thu May 23 18:19:40 2019 +0800 兼容微信公众号被封的情况，被封公众号直接忽略，同时记录日志 commit 30c48fa08b8ff26c8d585e5a43b42e61a146f499 Author: DuanEnJian Date: Thu May 23 18:14:25 2019 +0800 修改充值页商品展示逻辑 commit 4a45e82ee35fd344a521c9a1976f4e2dcd957fb5 Author: DuanEnJian Date: Thu May 23 18:05:57 2019 +0800 修改商品编辑时,添加处理逻辑 commit d3f2e4f4ccf89a692a54e5353f9b8cc1bdf67931 Author: DuanEnJian Date: Thu May 23 17:40:07 2019 +0800 修改AD创建数据源时已存在问题处理 commit a0970fc449917b86b1e415aadfc26232d25711ce Author: DuanEnJian Date: Thu May 23 17:11:24 2019 +0800 修改商品业务线为必填 commit 625a572eca7042724ed8422d63bc154c14a35633 Author: DuanEnJian Date: Thu May 23 17:06:15 2019 +0800 修改商品编辑添加时,活动看点赠送展示问题 commit c143b1a67d196b25dccf9b87d491e3fd633af700 (tag: cps_20190523_171506) Merge: 573b23f3b ced081333 Author: wanggb Date: Thu May 23 16:59:02 2019 +0800 Merge branch 'dev-update-wechatmenu-20190521' commit ced081333d9162312350d58cd1542a49e787ebf8 Author: wanggb Date: Thu May 23 16:37:03 2019 +0800 修改菜单是否一致逻辑 commit 17ab61b26db6956cd30f817bbe066c7c3a7cd002 Author: DuanEnJian Date: Thu May 23 16:36:37 2019 +0800 修改商品编辑添加时,活动看点赠送展示问题 commit 8108322b1d5440703171e85004329edcd815dff1 Author: DuanEnJian Date: Thu May 23 16:20:53 2019 +0800 添加渠道时,添加微信AD开关 commit ef588b28784ffc800b592a100fa9530e25331e8b Author: zhenglh Date: Thu May 23 16:09:41 2019 +0800 阅读页缓存 commit a3fe24e6a36b8f1d06b6ad621a5695320a9023cd Author: wanggb Date: Thu May 23 16:00:53 2019 +0800 修改菜单是否一致逻辑 commit 573b23f3b85fe29e0a1f7b4db607834b85ae196f Author: zhenglh Date: Thu May 23 15:53:57 2019 +0800 自动回复最近阅读时，过滤关注事件 commit 6bf672b408689b28582bcc5c71c2ebf57a8c6a4d Author: wanggb Date: Thu May 23 15:38:23 2019 +0800 修改菜单是否一致逻辑 commit 70f84bc0b971365f5ec380eebceb6bc1f2029561 Author: wanggb Date: Thu May 23 14:24:40 2019 +0800 修改菜单位置 commit 4d682818119620d870220b26fb21d95ed0ad9041 Author: wanggb Date: Thu May 23 11:51:26 2019 +0800 修改菜单 commit d87c73fb7328fe4486144aecbc4d1533efea7862 Author: DuanEnJian Date: Thu May 23 10:48:16 2019 +0800 修改城市白名单直接写入Redis,去掉后台用户登录信息 commit c11602544795ba666a4bb6401fdcea9de462e972 Author: zhenglh Date: Wed May 22 18:28:05 2019 +0800 关注回复，添加图片与图文类型的最近阅读检测 commit 13cef19fd9d85661844600f0467ac962f2a769c1 Author: DuanEnJian Date: Wed May 22 17:33:56 2019 +0800 修改VIP页面展示错误问题 commit c7581644139aed641246d6252855cda6fac88ae8 Author: DuanEnJian Date: Wed May 22 11:04:47 2019 +0800 修改公告分页不展示问题 commit 678e0a2db7cb8e2a01bdcbf2b3378d7af4f7bf1b Merge: 3365c98a3 23a4fb2e6 Author: DuanEnJian Date: Wed May 22 10:22:35 2019 +0800 Merge branch 'dev-goods-modify2' of 192.168.0.31:fe/cps into dev-goods-modify3 # Conflicts: # application/api/controller/Activity.php 合并master最新代码 commit 3365c98a3d7136015da61873375a584587e9102a (tag: cps_20190522_102222) Author: zhenglh Date: Thu May 16 18:46:52 2019 +0800 回调链接添加ext打点信息,pvuv添加query参数,关注打点添加,运营角色的章节编辑功能,添加文末跳转，微信回退打点 commit 82ee1bba7b071639c47bcfcc3a05275f70d7fcb1 Author: wanggb Date: Tue May 21 17:13:49 2019 +0800 刷新平台菜单 commit a76dc968b45b53a18f39ae9ef1ae69d8421dbe48 Author: wanggb Date: Tue May 21 17:04:00 2019 +0800 刷新平台菜单 commit 23a4fb2e690ebd9f9f02ba09a3e2824256de1716 Author: DuanEnJian Date: Tue May 21 16:43:58 2019 +0800 修改授权更新检测权限 commit baa6d9257df58549ffb0bd818dad14e4b0db2d28 Author: DuanEnJian Date: Tue May 21 16:04:41 2019 +0800 修改授权更新检测权限 commit 7b2dc2dff092782fdc48ef4b9d7a981dcee634c4 Author: DuanEnJian Date: Tue May 21 15:59:20 2019 +0800 修改VIP的banner图 commit 0e8faf155baea2dc24db56edad5318cd0ceb8b88 Author: DuanEnJian Date: Tue May 21 15:53:37 2019 +0800 修改VIP的banner图 commit 6dbe356b57c1e086645351b8342c0e9d3695c1b1 Author: DuanEnJian Date: Tue May 21 15:41:50 2019 +0800 更新授权时创建微信Ad数据源 commit 0757e4aafc80b25613cb1f19adc900a252aa7f76 Author: DuanEnJian Date: Tue May 21 14:54:22 2019 +0800 更新授权时创建微信Ad数据源 commit 1fc999d7b06b665fe8aa39e4eaa5d3d51906bcf6 Author: DuanEnJian Date: Tue May 21 13:50:55 2019 +0800 更新授权时创建微信Ad数据源 commit f1f905262f2b591fce9c978f193bb00e8b854ca9 Author: DuanEnJian Date: Tue May 21 12:26:00 2019 +0800 更新授权时创建微信Ad数据源 commit 190fb88e6592a199ee3f7c1565846ad8a705b9b1 Author: DuanEnJian Date: Tue May 21 12:16:28 2019 +0800 更新授权时创建微信Ad数据源 commit 5aa2b5523e8917b796b3f6b37323f0d8a14ed487 (tag: cps_20190521_145600) Author: liyt Date: Tue May 21 12:16:22 2019 +0800 'vip分流域名替换' commit 4577ba5f69831d9aba49badea66e295af7c32d14 Author: liyt Date: Tue May 21 11:48:22 2019 +0800 'vip分流域名替换' commit a22b58d60cd13d7fbb1e068342fce0bae83d50c4 Author: DuanEnJian Date: Tue May 21 11:40:31 2019 +0800 修改商品展示问题 commit 62b754f1a9fca3c667e80f96955b2855dc2ceeb6 (tag: cps_20190521_105739) Merge: 383e941d0 7b2d8b48f Author: 李天时 Date: Tue May 21 10:48:00 2019 +0800 Merge branch 'dev-ipaynow-20190514' commit 7b2d8b48fc31ec5a4019f8b38d73206fc4047352 Author: 李天时 Date: Tue May 21 10:32:43 2019 +0800 现在支付，支付配置的添加编辑页面的上传文件空间重命名 commit 68606858a96a3ca71f0aec71989e3e3f93f4e7c9 Merge: 44ae3c65a 5d99b900b Author: DuanEnJian Date: Tue May 21 10:29:50 2019 +0800 Merge remote-tracking branch 'origin/dev-goods-modify2' into dev-goods-modify2 commit 44ae3c65abbbbd063fbff7862529fd5fc384796a Author: DuanEnJian Date: Tue May 21 10:29:48 2019 +0800 添加渠道商更新权限功能 commit 5d99b900b35e451d3f9c0653dde978c4b2aeb439 Author: 丁海波 Date: Tue May 21 10:18:20 2019 +0800 js_loading commit 457b7df1d667ae5efccac037c64a0fc0dba9544b Author: 丁海波 Date: Tue May 21 10:10:11 2019 +0800 ..... commit e92258524e2c4dd0bd764a6400970a9977828599 Author: 丁海波 Date: Mon May 20 22:26:16 2019 +0800 vip 充值 commit 353202cdc64efc00554296c4b646059f4c5bbd10 Author: 李天时 Date: Mon May 20 20:15:03 2019 +0800 现在支付，添加四方支付页面改造 commit ad7bdb3f33673a6ee0469fe97c7ad1e61a847699 Author: 李天时 Date: Mon May 20 19:14:07 2019 +0800 现在支付，活动下单商品名称使用下划线分隔 commit 32dfead0e3e7895bccb81668e30a618ca5e26c83 Author: DuanEnJian Date: Mon May 20 19:05:48 2019 +0800 添加渠道商更新权限功能 commit 383e941d0c7739a1e296fc6c28e3e322af84b88c (tag: cps_20190520_143034) Author: liyt Date: Mon May 20 13:23:24 2019 +0800 '优化' commit 6d1e0d0771572c79f50ae97bc82fed226b7d55b1 (tag: cps_20190520_114406) Merge: c43d1aef6 4df3a08a3 Author: 李天时 Date: Mon May 20 11:19:50 2019 +0800 Merge remote-tracking branch 'origin/master' commit 2173b02d5d6caefef19979314943d118c3c976ce Author: DuanEnJian Date: Mon May 20 11:11:57 2019 +0800 添加VIP充值用户的banner跳转 commit 4df3a08a300d1875244f1a8ec805002286e63d52 (tag: cps_20190520_105402) Author: liyt Date: Mon May 20 10:49:04 2019 +0800 'sql' commit 52defb54fb7b8853a1324c2feb7ade7cb170a1bf Author: DuanEnJian Date: Mon May 20 10:43:43 2019 +0800 添加VIP充值用户的banner跳转 commit c43d1aef6dfcf62ecf4439663e32fcd3a36be1b0 Author: 李天时 Date: Mon May 20 10:41:45 2019 +0800 现在支付，活动下单商品名称使用下划线分隔 commit 300f6a3396a610826b7431fbc24640abe2b6ee03 Author: liyt Date: Mon May 20 10:14:19 2019 +0800 'sql' commit c41a6e601398ad58f227f2f5f831fdc026e3e7d3 Author: DuanEnJian Date: Fri May 17 17:35:26 2019 +0800 添加VIP充值用户的banner跳转 commit 494f4bc9e021aba993439285c3feeb27003376dd Author: DuanEnJian Date: Fri May 17 17:29:33 2019 +0800 添加VIP充值模板 commit 4a79dee707d2d6f0aca7f7adb05c2627b889d56d Author: wanggb Date: Fri May 17 17:02:16 2019 +0800 创建订单时，维护ext字段 commit 5ac002ed0a2b7bd7ba5c50b59406ab5f425fee3b Merge: 986008a43 acad4abef Author: 李天时 Date: Fri May 17 16:46:11 2019 +0800 Merge branch 'dev-ipaynow-20190514' commit acad4abef59b353258e8dd4ae9733c077b6dda13 Author: 李天时 Date: Fri May 17 16:21:01 2019 +0800 现在支付，活动下单商品名称使用下划线分隔 commit 986008a43c7bd895297667c46209fe1e2e222238 (tag: cps_20190517_150729) Author: liyt Date: Fri May 17 15:06:41 2019 +0800 '脚本' commit 7e16037441045adc24246300b8177902aeb33adf Author: 李天时 Date: Fri May 17 14:35:09 2019 +0800 现在支付，活动下单签名修改 commit 3c4fa5f0f9eebbf6eb2c0bc78a2623f51a8ac5be (tag: cps_20190517_144951) Author: liyt Date: Fri May 17 14:11:46 2019 +0800 '脚本' commit f25f2b11bddc812c9f0249afeb57b2204239aeb2 (tag: cps_20190517_134633) Author: liyt Date: Fri May 17 13:20:17 2019 +0800 '脚本' commit 097e264e5ad0e8b17470d068bcd0fa7b11e94630 Author: liyt Date: Fri May 17 13:16:43 2019 +0800 '脚本' commit 2d1b48a70250c64cd2ad10ab0e4822664ce941a2 (tag: cps_20190517_120544) Merge: 128785700 eba6ebf75 Author: wanggb Date: Fri May 17 11:41:49 2019 +0800 Merge remote-tracking branch 'origin/dev-referral-orders-20190516' into dev-referral-orders-20190516 commit 12878570049551b5d2cd8703f4a6fc552e7a2b43 Author: wanggb Date: Fri May 17 11:41:34 2019 +0800 vip | vip 运营者统计数据统计 展示公众号信息 commit eba6ebf7536a43dc68a3d012169594aa39021f42 (tag: cps_20190517_111018) Author: liyt Date: Fri May 17 10:20:12 2019 +0800 '推广文案优化' commit df04b448d523046ca1f82f0cf4d2b7f50584ab48 Merge: 2604e4141 238196255 Author: liyt Date: Fri May 17 10:15:49 2019 +0800 Merge branch 'master' into dev-referral-orders-20190516 commit 2604e4141d43a4874bde3cd2420c1ea5ef08d391 Author: wanggb Date: Thu May 16 20:54:52 2019 +0800 vip | vip 运营者统计数据统计 commit 6b5de5698a458dc9404a10e8db9cfd4a88f8d589 Author: DuanEnJian Date: Thu May 16 20:04:24 2019 +0800 添加VIP充值模板 commit ea7515da3632bf8d421fe9f605ce6513e473340b Author: liyt Date: Thu May 16 19:07:30 2019 +0800 '回调打点' commit 238196255c35400acd5ebea7cc81d9cc14ab33ba Author: wanggb Date: Thu May 16 19:05:56 2019 +0800 SaveOrder设置打点信息 commit 359e77c07cf0a7ff21de3c66d45014bbadaa427d Author: DuanEnJian Date: Thu May 16 18:49:52 2019 +0800 添加VIP充值模板 commit 8d7bbc79f90365effd3c593d3917600a803f2f53 Author: DuanEnJian Date: Thu May 16 18:44:06 2019 +0800 添加VIP充值模板 commit a6d1a31e03c384e3a70a3fdeca21746e4a9d4da3 Author: liyt Date: Thu May 16 17:54:11 2019 +0800 '回调打点' commit d9d68b978a16a003bea33e86ae17673f26a99048 Author: liyt Date: Thu May 16 17:50:32 2019 +0800 '回调打点' commit 79b5c0367e3a4f516ffa3b55de33f5b90b0027d0 Author: liyt Date: Thu May 16 17:40:42 2019 +0800 '回调打点' commit 29c6ea7c1918a331a845081b57c7b1f01e4af1e5 Author: liyt Date: Thu May 16 17:27:31 2019 +0800 '回调打点' commit 8212b17af7a9067caa2512911e5b6b51c3c9132d Merge: ca07bb869 bce908c9f Author: liyt Date: Thu May 16 16:50:09 2019 +0800 Merge branch 'master' into dev-referral-orders-20190516 commit ca07bb869aa1962186c5b9de049a2bfb964b1555 Author: liyt Date: Thu May 16 16:33:01 2019 +0800 '推广链接每日订单数统计' commit bce908c9fed17d1b7debb101c13a3f376556ed6d (tag: cps_20190516_161214) Author: wanggb Date: Thu May 16 15:50:00 2019 +0800 push_id增加默认值 commit 5fd7ab22bdf4fc24fc4e7219c728078dd19cf957 Author: wanggb Date: Thu May 16 15:47:12 2019 +0800 push_id增加默认值 commit 1703ee5b4ab4ac1ec4f96e28791c6941ef8e8cda Author: wanggb Date: Thu May 16 15:32:33 2019 +0800 打点加入日志 commit fd15f253bf002bd65b9dfee4d542f15047e5499a Author: DuanEnJian Date: Thu May 16 15:06:39 2019 +0800 添加VIP充值页面展示 commit ce7fc889a0aa6f74076f85bf80a3146c471fdeb4 Author: liyt Date: Thu May 16 15:06:17 2019 +0800 '推广链接每日订单数统计' commit 0227f82c983c6302d65478a2600aa81cedb26f0d Author: DuanEnJian Date: Thu May 16 14:59:28 2019 +0800 添加VIP充值页面展示 commit dbfeccf03ee6f0d54399490ac5ea26f1e51819fd Author: 李天时 Date: Thu May 16 14:33:31 2019 +0800 现在支付，商品名称详情 commit 1af1ffeb08c79503fd3a314ea2d33245f7d0242d (tag: cps_20190516_113358) Merge: 9969fddfc d8bb07028 Author: wanggb Date: Thu May 16 11:29:40 2019 +0800 Merge branch 'dev-dot-20190510' commit d8bb07028bc8d5d3eb49583b5612330b6333f9fa Author: wanggb Date: Thu May 16 11:22:14 2019 +0800 打点加入日志 commit b6e50540106df009fa6dc2149e0b5cac80668aa5 Author: wanggb Date: Thu May 16 11:04:05 2019 +0800 打点加入日志 commit 9d2d8a30421fcae47562a39b6c31253dbf3b4bad Author: wanggb Date: Thu May 16 10:45:15 2019 +0800 VIP 编辑图文，注释掉最近阅读链接 commit 35c18e2628c78750a4e68f906b2823501efbcdbe Author: wanggb Date: Wed May 15 21:44:54 2019 +0800 回滚打点MQ commit 9969fddfc820382987087df6d4975409d465e1a7 (tag: cps_20190515_205137, tag: cps_20190515_193526) Merge: 34425ed45 060229674 Author: wanggb Date: Wed May 15 19:11:17 2019 +0800 Merge branch 'dev-dot-20190510' commit 060229674975f48fb93846efe28cb09aa93edcfe Author: wanggb Date: Wed May 15 18:59:58 2019 +0800 编辑客服消息，修改custom_url commit a065d1e986ddcc4043f8537e15bbaf85bd480de5 Author: DuanEnJian Date: Wed May 15 18:04:19 2019 +0800 普通代理商屏蔽VIP充值管理菜单 commit 34425ed456e41efec1d4396fc69ea3ce1114333c Merge: ff92037a6 d9abf38a0 Author: wanggb Date: Wed May 15 18:02:37 2019 +0800 Merge branch 'dev-dot-20190510' commit a237318d1690695a11caa34ff1ffd9432cd2a27a Author: DuanEnJian Date: Wed May 15 17:58:10 2019 +0800 添加VIP充值开关配置 commit d9abf38a0f5316f815e1c2894c593ec4d14267cd Author: wanggb Date: Wed May 15 17:56:03 2019 +0800 编辑客服消息，修改custom_url commit 6b9637c573f526347d18fb14a6850be95a342e83 Author: wanggb Date: Wed May 15 17:44:44 2019 +0800 编辑客服消息，修改custom_url commit 4721fc28c9b2dd2973e70f7bba583ac0aa2c8a5e Author: wanggb Date: Wed May 15 15:35:48 2019 +0800 自定义链接 commit 0147f4f743eddedb4a504d778991e282d2869aa9 Author: DuanEnJian Date: Wed May 15 15:09:15 2019 +0800 添加渠道商代理商微信AD数据源接入相关功能 commit ff92037a64a730cb9ae2d8d2c107a158fb81af14 Merge: 3bfcf4924 8d427a64e Author: wanggb Date: Wed May 15 14:49:05 2019 +0800 Merge branch 'dev-dot-20190510' commit 8d427a64e28f0212b711922f151c66a65cedc18d Author: wanggb Date: Wed May 15 14:48:19 2019 +0800 配置菜单，图文客服消息统计 | 文字客服消息统计 代理商不可见 配号代理商可见 commit 3bfcf49244bd590f8d0a1cbefe19856e74cd423a (tag: cps_20190515_143223) Merge: 7c18000a2 ce2302486 Author: wanggb Date: Wed May 15 14:14:13 2019 +0800 Merge branch 'dev-dot-20190510' commit ce230248659b92fe519b5cf893032d8f26ed5a76 Author: wanggb Date: Wed May 15 14:11:43 2019 +0800 配置菜单，图文客服消息统计 | 文字客服消息统计 代理商不可见 配号代理商可见 commit 7c18000a2e16ebde623352be98c176814c95d727 (tag: cps_20190515_140056) Merge: 9e1ccfe9b 27dc0b584 Author: zhenglh Date: Wed May 15 13:57:43 2019 +0800 Merge remote-tracking branch 'origin/master' commit 9e1ccfe9b00f97742ff890b80d60e3f12f638f8b Merge: d64681570 430de950b Author: zhenglh Date: Wed May 15 13:57:27 2019 +0800 Merge branch 'dev-reply-message-20190514' commit 27dc0b584c285987a9521f847f4a92981a5722e0 (tag: cps_20190515_135557) Merge: 419f39199 68505c1ad Author: wanggb Date: Wed May 15 13:55:37 2019 +0800 Merge branch 'dev-dot-20190510' commit 68505c1ad000bbc2670d76fa0f026e7ca981c091 Author: wanggb Date: Wed May 15 11:35:03 2019 +0800 配置菜单，图文客服消息统计 | 文字客服消息统计 代理商不可见 配号代理商可见 commit 419f39199a826f7bbed4d90d8278e1d358046736 Merge: 771fc733f 88c005234 Author: wanggb Date: Wed May 15 11:17:50 2019 +0800 Merge branch 'dev-dot-20190510' commit 88c00523446720df49aeff7e92a7b11bad26992f Author: wanggb Date: Wed May 15 11:17:12 2019 +0800 配置菜单，图文客服消息统计 | 文字客服消息统计 代理商不可见 配号代理商可见 commit 0a48be94d2f932e0df018ff480e9b74a4b48da29 Author: DuanEnJian Date: Wed May 15 10:58:30 2019 +0800 添加渠道商代理商微信AD数据源接入开关 commit c3e6ff08fce5963504152f46d5ec05182b40a029 Merge: b235c6835 440d0f86b Author: DuanEnJian Date: Tue May 14 19:29:43 2019 +0800 Merge remote-tracking branch 'origin/dev-goods-modify2' into dev-goods-modify2 commit b235c6835d84937b4c524386fec607459a461bc8 Author: DuanEnJian Date: Tue May 14 19:29:41 2019 +0800 修改推广链接二维码模板展示 commit 771fc733ff24c0b7e44b23f05edddbc9f97ec216 (tag: cps_20190514_195442) Merge: 276cc2fd6 13675515d Author: wanggb Date: Tue May 14 18:39:45 2019 +0800 Merge branch 'dev-dot-20190510' # Conflicts: # application/common/service/ReferralService.php commit 276cc2fd63baf350bc0db2f6b80c551bc87706d6 Merge: d64681570 a322d304d Author: liyt Date: Tue May 14 18:31:58 2019 +0800 Merge branch 'dev-youhua-20190507' commit a322d304d20c6b2609521104bf87a3b8d36d6112 Author: liyt Date: Tue May 14 18:28:11 2019 +0800 '关键字查询防sql注入补丁' commit daf029fce450bcc3fea1e88240537a16ff16a124 Author: liyt Date: Tue May 14 18:22:07 2019 +0800 '关键字查询防sql注入补丁' commit 13675515de7fab93adbbef968d809f87630e9a68 Author: wanggb Date: Tue May 14 17:42:05 2019 +0800 延时MQ commit 044ecb35815cb38ff0d7c554aa44a18f011ee076 Author: wanggb Date: Tue May 14 17:28:13 2019 +0800 延时MQ commit bb51db9a45de13da12dc33f1a2867520c9db08a3 Author: wanggb Date: Tue May 14 17:17:41 2019 +0800 延时MQ commit 5fb66bca9b8c998f42d8ca943b114fa17bd2bd4f Author: wanggb Date: Tue May 14 17:07:56 2019 +0800 延时MQ commit d64681570008a107245e8dd3d85e2d1cc5fcd49c Merge: 0c9d9d00e c7b439b75 Author: zhenglh Date: Tue May 14 16:53:32 2019 +0800 Merge remote-tracking branch 'origin/master' commit 0c9d9d00e5685af8e9fd8ebf0c7e77558eea9e66 Author: zhenglh Date: Tue May 14 16:53:21 2019 +0800 美书书籍参数错误 commit 440d0f86b2913f18a7d52bed9c8eedafe2e87225 Author: liyt Date: Tue May 14 16:26:03 2019 +0800 '书库' commit c7b439b75d5b51d64b16ae3fba59e9abedd828eb Author: wanggb Date: Tue May 14 16:06:33 2019 +0800 点看增量上线文件，解决域名被封问题 commit 430de950b442b65858c7a088a1ea60f2fd1ae7d6 Author: zhenglh Date: Tue May 14 16:04:48 2019 +0800 回复消息 commit fecb4b3ec3732e2cca9c73a957e60b7e740bc726 Author: wanggb Date: Tue May 14 15:44:00 2019 +0800 点看增量上线文件，解决域名被封问题 commit 9e0801d46198c87b3e5795b21c65fc3fddfab49b Merge: 787598466 957825802 Author: 李天时 Date: Tue May 14 15:30:33 2019 +0800 Merge branch 'dev-ipaynow-20190428' into dev-ipaynow-20190514 commit 957825802bdee4fba7e846ca414ce1053c7e0bba Author: 李天时 Date: Tue May 14 15:29:38 2019 +0800 现在支付，后台维护页面改造 commit e219b7ba11468904b9efefbf0293fd99a0e277f8 Author: wanggb Date: Tue May 14 15:19:11 2019 +0800 延迟推送 commit 58c7e256c453e83b09dd7c9226522989211b5c57 Author: 李天时 Date: Tue May 14 14:48:58 2019 +0800 现在支付，后台维护页面改造 commit c72d602d38b7b3b8104860b07dd9228af6374455 Merge: 78fb312ee 54a878f87 Author: wanggb Date: Tue May 14 14:07:42 2019 +0800 Merge remote-tracking branch 'origin/dev-dot-20190510' into dev-dot-20190510 commit 78fb312ee7d539f10ed412cc99ba244882db6cd6 Author: wanggb Date: Tue May 14 14:07:27 2019 +0800 点看，修改189url获取的值 commit 54a878f87b801d66ab690761877c7e0413234d24 Author: DuanEnJian Date: Tue May 14 14:04:56 2019 +0800 修改VIP推文展示自己的客服消息统计 commit cee885664b132c7639de5d3087611bd07b25a0aa Author: DuanEnJian Date: Tue May 14 14:00:46 2019 +0800 修改VIP推文展示自己的客服消息统计 commit 21488c31ba0b9792abf007c62b1f344d13d94a28 Author: DuanEnJian Date: Tue May 14 13:56:49 2019 +0800 修改VIP推文展示自己的客服消息统计 commit 31eb76eccf13a3b54cfcf7e20250088ac0f93c7a Author: liyt Date: Tue May 14 12:16:54 2019 +0800 '定时推送书库' commit a4c8437e401157bf4e83cee2d671d34ab3f074d4 Author: DuanEnJian Date: Tue May 14 11:56:20 2019 +0800 修改VIP推文展示自己的客服消息统计 commit 8f96dbdb916141c341359a41fd373d0f908f4bfc Merge: 96050097c 01a05c04a Author: DuanEnJian Date: Tue May 14 11:47:42 2019 +0800 Merge remote-tracking branch 'origin/dev-dot-20190510' into dev-dot-20190510 commit 96050097c5026e3abfb2a72d309d481bd0ebe829 Author: DuanEnJian Date: Tue May 14 11:47:40 2019 +0800 修改VIP推文展示自己的客服消息统计 commit fd30b7fd33ae1d40e40320c2516663190bbce420 Author: DuanEnJian Date: Tue May 14 11:33:12 2019 +0800 添加AdminConfig,定时推送开关,VIP充值开关 commit 2082777fc29a095f38c265cb5901626d005e3c3b Author: 李天时 Date: Tue May 14 11:17:00 2019 +0800 现在支付，活动支付 commit 01a05c04a499f972aaaea52e973f90a663cfb837 Merge: 09cc945be 43cfa7cb7 Author: wanggb Date: Mon May 13 19:56:32 2019 +0800 Merge remote-tracking branch 'origin/dev-dot-20190510' into dev-dot-20190510 commit 09cc945be294cdd2a8d0310880f0baf632461cc6 Author: wanggb Date: Mon May 13 19:56:21 2019 +0800 创建订单时，ext添加默认值 commit 5b037f554ec0ac917b48ede033a39a978b564a09 Merge: 787598466 df02e0a06 Author: DuanEnJian Date: Mon May 13 19:36:57 2019 +0800 Merge branch 'dev-goods-modify' of 192.168.0.31:fe/cps into dev-goods-modify2 commit 43cfa7cb73221a5322d2204259fb7bf1a5f5417b Author: DuanEnJian Date: Mon May 13 18:33:25 2019 +0800 添加模板消息当日统计 commit 368ac51cc0b80bcbc1cc3fcace98f0df84118ec1 Author: wanggb Date: Mon May 13 17:56:47 2019 +0800 格式0.00 commit 23f4765ab8e9a0a57bf768341b450fb04ba1f4f1 Author: wanggb Date: Mon May 13 17:47:46 2019 +0800 格式0.00 commit c2677f433cedb3e3892b57fd46f8035fe0c53414 Author: wanggb Date: Mon May 13 17:37:16 2019 +0800 格式0.00 commit 7ad3f3051eeb00d20b03e2f150ddd2085661b77e Author: wanggb Date: Mon May 13 17:31:47 2019 +0800 模板消息取消 pv commit 1a4e16f8a6d478a614b98fe91c8d196710478711 Author: wanggb Date: Mon May 13 16:19:53 2019 +0800 修改展示类型 commit d72d6759f61b5cbd75fd08c06a4819fac504faf0 Author: wanggb Date: Mon May 13 16:09:51 2019 +0800 修改展示类型 commit e318f4815d9b94db4641e5acf2e28a52d70892b5 Author: wanggb Date: Mon May 13 15:49:35 2019 +0800 创建订单时，维护ext字段 commit 78759846609de016f4d754b3db060fddb6b2ee9a (tag: cps_20190513_154224, tag: cps_20190513_151940) Author: liyt Date: Tue May 7 17:25:46 2019 +0800 关键字回复书库 commit ab75b9ad48e1b5fd50594793237eb6cd8de59144 Author: wanggb Date: Mon May 13 11:12:11 2019 +0800 创建订单时，维护ext字段 commit 06d9b76eed2f8007e01115df500c674a78c06d9f Merge: f6bc37a30 a1fbb0c66 Author: wanggb Date: Sat May 11 18:47:07 2019 +0800 Merge remote-tracking branch 'origin/dev-dot-20190510' into dev-dot-20190510 commit f6bc37a30ea678db714c32c58b0c01e294f5f12f Author: wanggb Date: Sat May 11 18:46:56 2019 +0800 统计，书籍加入超链接 commit a1fbb0c6682cfc8cd8737daf9ac6605052bc6331 Merge: d42b8d2dc 97e924cd3 Author: liyt Date: Sat May 11 15:40:21 2019 +0800 Merge branch 'dev-dot-20190510' of http://192.168.0.31/fe/cps into dev-dot-20190510 commit d42b8d2dcade539ce4ad4915275336b97174c8a8 Author: liyt Date: Sat May 11 15:40:06 2019 +0800 '短链加打点参数' commit 97e924cd3306422d9171b61c4b2fcc1c8ac34ecf Author: wanggb Date: Sat May 11 15:39:15 2019 +0800 统计，书籍加入超链接 commit e85fe39470957d84b6568162d78cb59ac930dfcd Author: wanggb Date: Sat May 11 15:19:55 2019 +0800 统计，书籍加入超链接 commit eee3f76595d88fcbe3e0b342e19964cdd2f75127 Author: wanggb Date: Sat May 11 15:09:44 2019 +0800 统计，书籍加入超链接 commit a04cfa5b089aa8589d4a149cd4e3b26734bebe32 Author: wanggb Date: Sat May 11 14:35:57 2019 +0800 设置默认值 commit dd02204a92c0f937d53649189d7fcc9117b44171 Author: wanggb Date: Sat May 11 14:20:57 2019 +0800 设置默认值 commit b98577433973d16b4e859d4db72ea64b93bcc901 Author: wanggb Date: Sat May 11 14:09:12 2019 +0800 设置默认值 commit 1c9acac1c20233069ddf1d90d8dd66ee6cfb588f Author: wanggb Date: Sat May 11 13:50:55 2019 +0800 设置默认值 commit 9f2e1bb7c1e8e5a69c5886f7856a6fe4b7d71159 Author: wanggb Date: Sat May 11 13:42:22 2019 +0800 设置默认值 commit d9e92d9db038ab6cd1c100e298185f5dc1523055 Merge: bf38af772 d1ee4948f Author: wanggb Date: Fri May 10 15:04:23 2019 +0800 Merge branch 'dev-dot-20190505' into dev-dot-20190510 commit bf38af7728abd672ccb90b9b05697910286dc85b (tag: cps_20190510_133951, tag: cps_20190510_103744) Author: zhenglh Date: Fri May 10 10:15:04 2019 +0800 跳转去掉 commit 62cb7924c6c60e053adac7f4a0456e64d315692a Author: zhenglh Date: Thu May 9 20:51:31 2019 +0800 a标签添加href内容 commit 9ef65538b18cea9952e8ce5956c622223444eeb8 (tag: cps_20190510_101122, tag: cps_20190509_181632) Author: zhenglh Date: Thu May 9 18:15:50 2019 +0800 大家都在看block commit 9f79aea1a31ca0b13e4c82de29a66cb8c882458d (tag: cps_20190509_162131) Author: zhenglh Date: Thu May 9 16:18:14 2019 +0800 最近阅读取消点击事件 commit d1ee4948f5f0f73003b4a30ef6a0451a70649660 Merge: c9ba47798 b3e16620b Author: wanggb Date: Thu May 9 15:51:04 2019 +0800 Merge remote-tracking branch 'origin/dev-dot-20190505' into dev-dot-20190505 commit c9ba477980e4d64c38342470f55e359261bf5495 Author: wanggb Date: Thu May 9 15:50:50 2019 +0800 模板消息统计 commit 4f948567233467b0b529836e17d95c46a8b3b592 (tag: cps_20190509_142624) Author: zhenglh Date: Mon May 6 19:52:32 2019 +0800 pv,uv打点测试完成 commit b3e16620b45c9ad652d095499cb787ea80cd7113 Author: DuanEnJian Date: Thu May 9 14:09:11 2019 +0800 添加订单查看mark相关订单 commit 8dbb93e398daf462d896b628d336bc11845f248a Merge: fc2503459 046909333 Author: DuanEnJian Date: Thu May 9 13:36:35 2019 +0800 Merge remote-tracking branch 'origin/dev-dot-20190505' into dev-dot-20190505 commit fc25034591d77fed9cde9b940f8e9de5afd60468 Author: DuanEnJian Date: Thu May 9 13:36:33 2019 +0800 添加图文客服消息统计数据展示 commit 04690933313a4146190defdacd3ce94c5c2a80de Author: wanggb Date: Thu May 9 10:31:18 2019 +0800 入口页面，打点MQ commit 770daf5cb8fa70f23497d3f10c4b5a0b7da49293 Author: DuanEnJian Date: Wed May 8 17:53:58 2019 +0800 添加图文客服消息统计数据展示 commit d21de2d0a3a90237806ca34053f1fee2a7b0f3a7 Author: DuanEnJian Date: Wed May 8 17:50:53 2019 +0800 添加图文客服消息统计数据展示 commit 9d04ddc9aca2f9b3e8131c7e23fafc90fd03e2a2 Merge: 1b7332917 37d98e1c5 Author: DuanEnJian Date: Wed May 8 17:43:14 2019 +0800 Merge remote-tracking branch 'origin/dev-dot-20190505' into dev-dot-20190505 commit 1b7332917e3bed86896bde0e308fcd7fb63ae8e3 Author: DuanEnJian Date: Wed May 8 17:43:10 2019 +0800 添加图文客服消息统计数据展示 commit 37d98e1c5a347f2edc0c03b75aa60dcda0dac625 Author: wanggb Date: Wed May 8 17:05:37 2019 +0800 模板消息，URL，打点MQ commit 989181ee0743689e5c44725799f003ff659130ef Author: wanggb Date: Wed May 8 14:37:10 2019 +0800 客服消息，阅读文章，打点MQ commit dec15eaf76028f8297c641206900aa87c76ab22d Author: wanggb Date: Wed May 8 11:52:00 2019 +0800 微信支付回调打点MQ commit d7084177cdb8560d5a4e4b490838fbee79e07633 Author: wanggb Date: Wed May 8 11:10:24 2019 +0800 改写MQ方法 commit fa373d5be64afb4332965e4ea6a2310946698ef6 Merge: d386f30c0 dfcd797d5 Author: liyt Date: Wed May 8 10:36:18 2019 +0800 Merge branch 'dev-custom-url-20190506' * dev-custom-url-20190506: '订单导出优化' commit dfcd797d5cef68e8b88fb02a74f459d1770ddf52 Author: liyt Date: Wed May 8 10:35:19 2019 +0800 '订单导出优化' commit d386f30c02322b9b8d5c86b3bbb4a73682d702e4 Merge: b0491a012 e32d1686c Author: liyt Date: Wed May 8 10:31:30 2019 +0800 Merge branch 'dev-custom-url-20190506' commit e32d1686cd51fd0e7b6a022ff033c23f63a5143f Author: liyt Date: Wed May 8 09:57:37 2019 +0800 '短链替换bug' commit dc61f96544587b6eefbe41e8af9b798095a5cb33 Author: 李天时 Date: Tue May 7 15:01:13 2019 +0800 现在支付，活动支付 commit 2252249ceef56065de5b5a16ab41b0ef9c5b5110 Author: wanggb Date: Tue May 7 14:18:33 2019 +0800 前端解析ext,压入MQ commit b0491a012aada3691d87d81f2ca4cd7db4ac785d Merge: 0e24fa917 8b795a7ac Author: liyt Date: Tue May 7 11:13:56 2019 +0800 Merge branch 'dev-custom-url-20190506' commit 8b795a7ac1a5c58ae02b66fc4ad449d660da034b Author: liyt Date: Tue May 7 10:53:20 2019 +0800 '图文消息描述不填留白' commit 0e24fa9175b221e95fc8050676f4165575c73a44 Merge: 678c66fb0 6c56187f6 Author: liyt Date: Mon May 6 20:47:10 2019 +0800 Merge branch 'dev-custom-url-20190506' commit 678c66fb074d10216bf71977968446df11148a83 Author: wangch Date: Mon May 6 18:42:19 2019 +0800 修复require-table.js初始化operate commit d07b6266f4e1e96814dafdbecb936a96cffbecbb Author: wangch Date: Mon May 6 16:43:45 2019 +0800 修复require-table.js初始化operate新加button方法因判断不严谨，个别页面因用法不同将新加按钮展示在无关页面上的bug commit 68fcd798753e7a50760a0c8e3a827d488dd73940 Author: wangch Date: Mon May 6 14:48:34 2019 +0800 修复require-table.js初始化operate新加按钮因条件判断不严显示到其它页面bug commit ae3be53e287e008cc8ddfaa271d1fa1dd9c3f121 Author: wanggb Date: Mon May 6 14:22:25 2019 +0800 前端解析ext,压入MQ commit 6c56187f6b758dce40ee9a50735d095d22a5cef2 Author: liyt Date: Mon May 6 13:58:56 2019 +0800 '客服消息自定义链接' commit 9ad1257933bc7875a7671fd1ca0cb890d4a1e38e Merge: 80e9771d6 a3371a21e Author: DuanEnJian Date: Mon May 6 11:59:47 2019 +0800 Merge remote-tracking branch 'origin/master' commit 80e9771d67e5655a1d4a22ebb342f5f293365e9f Author: DuanEnJian Date: Mon May 6 11:59:40 2019 +0800 添加系统活动,并添加系统活动的展示处理 commit dbe4bbb7c3c5fad0b991dc03d6d0aad8ca41594c Author: 李天时 Date: Sun May 5 18:49:19 2019 +0800 现在支付，活动支付 commit 545b5e8d0ff2fb56f20876603a912ac16532ff4b Author: wanggb Date: Sun May 5 16:07:27 2019 +0800 MQ 增加智能推送 commit f552a6e41a678936d045b3b14d33adb7dd8e5832 Author: 李天时 Date: Sun May 5 16:05:57 2019 +0800 现在支付，维护页面修改 commit a3371a21e3eb58cad3dc6bb435efadcde8dffb23 Author: zhenglh Date: Sun May 5 13:53:02 2019 +0800 add diankan 修复 commit 16b4f219caf05a4901ff4584d57b38a23cfc889a Merge: 8e70d7ff1 8dc21299e Author: zhenglh Date: Sun May 5 13:51:01 2019 +0800 Merge branch 'dev-custom-20190428-back' commit e2832dbd06ca8627e3d99d28e5753b3cacdf54e5 Merge: 99dcd4aca 9c8bef376 Author: 李天时 Date: Sun May 5 10:41:13 2019 +0800 Merge branch 'master' into dev-ipaynow-20190428 commit 8dc21299e2d79f9943f1b8e6dad7bd6b18b84d82 Merge: 1434063da 9c8bef376 Author: zhenglh Date: Sun May 5 10:34:10 2019 +0800 Merge branch 'master' into dev-custom-20190428-back commit 8e70d7ff123e56cd9036fc3ef9c1f0525e6aab73 Author: zhenglh Date: Mon Apr 29 20:01:48 2019 +0800 模板回调优化调整 commit 1434063da497d5996dec2a08a07a3a4b12c983dd Author: liyt Date: Tue Apr 30 19:45:37 2019 +0800 '兼容客服消息查看' commit 49b2583b4404fb69b9b1c26d355bf7e3c174f565 Author: liyt Date: Tue Apr 30 19:42:01 2019 +0800 '兼容客服消息查看' commit 8b2714bf160387f5f26db51f8ca4ac8171da927b Author: liyt Date: Tue Apr 30 19:35:06 2019 +0800 '兼容客服消息查看' commit 3ea8245365ab3386fcc7e43ea7a82c77d5825c83 Author: liyt Date: Tue Apr 30 19:10:44 2019 +0800 '兼容客服消息查看' commit 9e4e3fa6448a90778ba50459e31d1a1ef053c029 Author: liyt Date: Tue Apr 30 19:05:51 2019 +0800 '兼容客服消息查看' commit 58fb54a00bdf4a7469507aa26b430db9e6b6ea46 Author: liyt Date: Tue Apr 30 18:22:17 2019 +0800 '兼容客服消息查看' commit 99dcd4aca0ec83c64804d03dfe0550f601ac86ab Author: 李天时 Date: Tue Apr 30 18:17:26 2019 +0800 现在支付，init commit fdf2fb0b3744690a400098d6e33a1983d2272248 Author: liyt Date: Tue Apr 30 18:12:50 2019 +0800 '兼容客服消息查看' commit 6a34464c70a9f617ab180e0477e4516f9d34de8f Author: liyt Date: Tue Apr 30 17:44:34 2019 +0800 '兼容客服消息查看' commit 9c8bef3761357e56721516d468cbec12c1b63a14 Merge: bb5b3c8cf 0518234b0 Author: liyt Date: Tue Apr 30 16:21:32 2019 +0800 Merge branch 'dev-custom-20190428' commit 0518234b0ca9dcbfefda6ad8a279cff6a03cff12 Author: liyt Date: Tue Apr 30 16:09:09 2019 +0800 '隐藏模板消息统计' commit f267d72aa9d78c17a183aec9ecd1efbb70f5fd3c Author: liyt Date: Tue Apr 30 15:30:26 2019 +0800 '列出所有渠道' commit 57256089cf4d96b812d8d4245f3915ef88c26501 Author: liyt Date: Tue Apr 30 15:29:41 2019 +0800 '列出所有渠道' commit bb5b3c8cf214f73f09fd52e244fe091c88350ab8 (tag: cps_20190430_133958) Merge: b7429c5bd 1d29eb534 Author: liyt Date: Tue Apr 30 11:55:27 2019 +0800 Merge branch 'dev-custom-20190428' commit 1d29eb53420d7dfca651ee895b3107cd534baf5e Author: liyt Date: Tue Apr 30 10:45:11 2019 +0800 '列出所有渠道' commit b7429c5bda416fac6a417dad6cded281cc77e7e7 (tag: cps_20190429_192905) Merge: c70dc2688 454c166a8 Author: liyt Date: Mon Apr 29 19:13:06 2019 +0800 Merge branch 'dev-qiehuan-20190418' commit c70dc26883490e09e0678ce015473aecaebfc977 (tag: cps_20190429_181918) Author: DuanEnJian Date: Mon Apr 29 18:14:36 2019 +0800 重新打包backendJS commit 454c166a843b42bb96962dd733308bb3a01c0789 Author: liyt Date: Mon Apr 29 18:05:52 2019 +0800 '隐藏菜单' commit b7dc5669fe0cfea01ab4d35f89b561413f16a1fe Author: 李天时 Date: Mon Apr 29 15:55:40 2019 +0800 现在支付，init commit ddc0d372444dabcd63f9f4ccdccf3b8d9e4d5cb8 (tag: cps_20190429_163449) Author: wangch Date: Mon Apr 29 14:36:11 2019 +0800 将master分支上得代码同步到本地 commit 15bcf50c84594d5a2b33b254f46b0cb2b384b11b Merge: e2fb7ce5e c49b94bdb Author: wangch Date: Mon Apr 29 14:26:28 2019 +0800 Merge branch 'master' into dev-qiehuan-20190418 # Conflicts: # application/route.php commit e2fb7ce5e311f2972df92d90dde46d45ebaf9db4 Author: liyt Date: Mon Apr 29 12:16:37 2019 +0800 '统计' commit 9c6bf43b8b2873a09433e3798def5d8bae8bfab4 Author: liyt Date: Mon Apr 29 12:09:25 2019 +0800 '统计' commit 98f94c70f5f9e781153e0e5784037991bca30b92 Author: liyt Date: Sun Apr 28 17:16:19 2019 +0800 'vip分流' commit 8eca943114ded3af55fa565a9b9d4b3b7a2becb2 Author: liyt Date: Sun Apr 28 15:06:00 2019 +0800 'vip运营者分流链接' commit 78d9959ffc7ab065ae349ba6ef4a0311284be6a4 Author: liyt Date: Sun Apr 28 14:52:08 2019 +0800 'vip运营者分流链接' commit 4ad18f31bc5ab93cabc5cfe37ded044f3ea0b5be Author: liyt Date: Sun Apr 28 14:49:03 2019 +0800 'vip运营者分流链接' commit 503c70a1b7cb546a09acd0f7e75716cc2ae26f3e Author: wangch Date: Sun Apr 28 14:42:17 2019 +0800 引入必要类 commit f343c4f711acf1180dc3f881f85fe92314ced679 Author: wangch Date: Sun Apr 28 14:33:26 2019 +0800 random类引入 commit c49b94bdb2233a33876751496296a0818b91c8cb (tag: cps_20190429_135527, tag: cps_20190428_142950) Author: liyt Date: Sun Apr 28 13:32:36 2019 +0800 '推广链接多条push' commit 119d10ddd17b4463becb480fd2958da1225afa6a Author: wangch Date: Sun Apr 28 12:18:02 2019 +0800 删除账号失败文案调整 commit cf53389f985880297c910a0e291e2ea6d180ad55 Author: wangch Date: Sun Apr 28 11:59:10 2019 +0800 绑定账号置顶 commit 2ca1271e6ea823f31260bd2e400874c2f169218d Author: wangch Date: Sun Apr 28 11:49:49 2019 +0800 新绑定账号置顶 commit a392ed9b629a47e75351088c462d952930d3f5f9 Author: liyt Date: Sun Apr 28 11:38:08 2019 +0800 '编辑改为添加' commit 7d0fd52d5a7fd6b185b388aa7ff6e50aabe590a4 Author: liyt Date: Sun Apr 28 11:26:54 2019 +0800 '编辑改为添加' commit d7c11334d82b72af49c3d6304ab251594413bd18 Author: wangch Date: Sun Apr 28 11:00:19 2019 +0800 修复绑定账号关联渠道已存在插入多条问题 commit 015b37bc8f3ca09699ea0df79e23646cfa8558db Author: wangch Date: Sun Apr 28 10:57:56 2019 +0800 修复绑定账号关联渠道已存在插入多条问题 commit 8e814fbfea121fc48fa30b31bc19fd271f88e06b Author: wangch Date: Sun Apr 28 10:40:47 2019 +0800 修复绑定账号关联渠道已存在插入多条问题 commit 7cdfa96d7cfab063ad9b5932248a7806e13adfa8 Author: liyt Date: Sun Apr 28 10:38:25 2019 +0800 '替换模板消息链接' commit 3597736eecbbb27e76f0cb723f1dc1caa4f1c57d Author: wangch Date: Fri Apr 26 20:33:36 2019 +0800 修复绑定账号关联渠道已存在插入多条问题 commit 6b31f0932cd1ec17a371f02a8a18e1d611fdb383 Author: wangch Date: Fri Apr 26 20:25:50 2019 +0800 修复绑定账号关联渠道已存在插入多条问题 commit f585b9a65bde6d5ee5e39746979841493324b6fd Author: liyt Date: Fri Apr 26 20:10:21 2019 +0800 '默认导粉章节' commit deea6b6ea3ed086f90b50e3cea9346b685028a34 Author: wangch Date: Fri Apr 26 19:51:27 2019 +0800 解决渠道商绑定排序翻页不一致问题 commit c67690ef77aeac433fdb09470a5dca9129d18440 Author: wangch Date: Fri Apr 26 19:43:09 2019 +0800 修复渠道商绑定数量不一致问题 commit 7230de987bad16287ece004b7e2c903ed33ff39a Author: liyt Date: Fri Apr 26 19:37:30 2019 +0800 '新增' commit a9883e15e18abe18e44e5091452db0f430d6a385 Author: liyt Date: Fri Apr 26 18:27:31 2019 +0800 '分流统计' commit 8856797924887062c106fbdf9b23e92635fb1f24 Author: liyt Date: Fri Apr 26 18:23:59 2019 +0800 '分流统计' commit fb4700306f8edb625ad2b65811571f1ab948a477 Author: liyt Date: Fri Apr 26 18:22:31 2019 +0800 '分流统计' commit e6bf71dfe94e128c82c1794115b5837284818689 Author: liyt Date: Fri Apr 26 17:48:13 2019 +0800 '统计' commit af555e2b132720a555d158dc1a35ad82291e8230 Author: liyt Date: Fri Apr 26 17:41:41 2019 +0800 '分流统计' commit 7ab9dafa8c1bec5ba6533c345d91a9d7a215d191 Merge: 546458bbf cee8575cc Author: liyt Date: Fri Apr 26 16:29:52 2019 +0800 Merge branch 'dev-custom-20190417' into dev-custom-20190426 commit df1c5b93b76ad51c345864ea7782df67308c9aab Author: liyt Date: Fri Apr 26 16:17:30 2019 +0800 '修改章节name存储错误' commit 8e333fdae6a2f6605e0e01141633fedb4f7222a5 Merge: 06e874adf 4654a4b0e Author: wangch Date: Thu Apr 25 16:45:22 2019 +0800 Merge remote-tracking branch 'origin/dev-qiehuan-20190418' into dev-qiehuan-20190418 commit 06e874adfdc850e634474c1e222c89f28b5baaaf Author: wangch Date: Thu Apr 25 16:45:05 2019 +0800 关注自动回复文案修改 commit 546458bbf0281573b4dc7d837f396fd5aaebc2df (tag: cps_20190426_133932) Merge: 7455a445d 5d27edae4 Author: DuanEnJian Date: Thu Apr 25 16:08:14 2019 +0800 合并dev-guide-pvuv 代码 commit 5d27edae4abdf50173af45db700dda5004e1a879 Author: DuanEnJian Date: Thu Apr 25 16:06:51 2019 +0800 修改前置导粉域名PV,UV SQLGroup问题 commit 4654a4b0ea6fdfb32de89a1c64640134d1c5d520 Author: liyt Date: Thu Apr 25 15:03:38 2019 +0800 '补全方法' commit c510d9d285ff9b770cf59e934707613e386904c4 (tag: cps_20190425_145544) Author: DuanEnJian Date: Thu Apr 25 14:53:30 2019 +0800 修改前置导粉域名PV,UV SQLGroup问题 commit 5b399e9632075efc1ab107e6d8ae27645a3425d2 Author: wangch Date: Thu Apr 25 12:02:32 2019 +0800 多图文支持文案提示修正 commit 7455a445d19e29e91b0a10565df0e935296f1634 (tag: cps_20190425_115324) Author: 李天时 Date: Thu Apr 25 11:31:10 2019 +0800 银生宝支付,回调使用http commit e8a3e0ce0c1e1264ddd9b18943f2f9e7eb28271c Author: 李天时 Date: Thu Apr 25 11:29:26 2019 +0800 银生宝支付,回调使用http commit 311d5fcf0fd025ff604e396b24e4bc590b507cdb Author: wangch Date: Thu Apr 25 11:23:44 2019 +0800 修复翻页排序不一致问题 commit 25833479680b5558bc3ec9bcb31454ff2da57f32 Author: liyt Date: Thu Apr 25 11:21:30 2019 +0800 '隐藏搜索框' commit 8024e91d2d3f8304c63de1031d685a623dda9ed1 Author: wangch Date: Thu Apr 25 11:14:47 2019 +0800 修复翻页搜索框隐藏bug commit 18b7283c49dae1f6c70aa932f02bebcad6775abb (tag: cps_20190425_135524) Author: DuanEnJian Date: Thu Apr 25 11:01:12 2019 +0800 修改前置导粉域名PV,UV展示方式 commit d5fa419081d8da283482e9a385401ec17cea1b3d Author: DuanEnJian Date: Thu Apr 25 10:54:44 2019 +0800 修改前置导粉域名PV,UV展示方式 commit 02e4545c814a94cd6f507df6d5ed20a80ecbfb94 Author: DuanEnJian Date: Thu Apr 25 10:49:10 2019 +0800 修改前置导粉域名PV,UV展示方式 commit 608a66bca27190f07329f4803780702690f7b6bd Author: DuanEnJian Date: Thu Apr 25 10:43:53 2019 +0800 修改前置导粉域名PV,UV展示方式 commit ae260e6bc740d1ad6a3db804951887be573f1532 Author: DuanEnJian Date: Thu Apr 25 10:35:34 2019 +0800 修改前置导粉域名PV,UV展示方式 commit 6896585c705eb126b01a7e6545cc79959ba7fe4f Author: DuanEnJian Date: Thu Apr 25 10:27:07 2019 +0800 修改前置导粉域名PV,UV展示方式 commit 8cea7482b022a891d0bb81e939df3b7281a7ebd1 Author: wangch Date: Wed Apr 24 20:16:28 2019 +0800 bug修正 commit 4579a20fecfc449c0b98993465384cec4946c20c Author: DuanEnJian Date: Wed Apr 24 19:48:47 2019 +0800 修改前置导粉域名PV,UV展示方式 commit 61878512d266604db39a6c84fb7882a7f93dc067 Author: wangch Date: Wed Apr 24 16:13:41 2019 +0800 cps后台功能修改 commit 31f4f474f2b5541920f58475efbc9deb461c7020 (tag: cps_20190424_152352) Merge: 514f0e18a 5cc6107ae Author: 李天时 Date: Wed Apr 24 14:29:46 2019 +0800 Merge branch 'dev-unspay-20190416' of http://192.168.0.31/fe/cps into commit-unspay # Conflicts: # application/api/controller/Wechat.php commit 514f0e18a3d35e6b4d7070e89792aa464a58cae2 Author: DuanEnJian Date: Wed Apr 24 14:13:47 2019 +0800 修改线上,西瓜,袋鼠,阳光 首页联系方式 commit 4f3695e5288cf39abd52d64c5d96b1a4c1fa520d Author: wangch Date: Wed Apr 24 13:23:10 2019 +0800 bug修复 commit 7c7332b2cbfba55c3b9a064a8307f8d61fa2561d Author: liyt Date: Wed Apr 24 12:35:11 2019 +0800 '去掉分流二维码' commit 53f87136395ddcd36c33587040b708f8dd6b5a13 Author: DuanEnJian Date: Wed Apr 24 12:04:11 2019 +0800 添加前置域名PV,UV统计 commit 0840b7976fb5deb1853873526ff67c3595a5653c Author: DuanEnJian Date: Wed Apr 24 11:34:45 2019 +0800 添加前置域名PV,UV统计 commit 5cc6107aed945fef599da94c164e49806bf196e5 Author: 李天时 Date: Wed Apr 24 11:05:39 2019 +0800 银生宝支付,页面查询修改 commit 00cccb54e149cba7fb447b4e0f64c6f3ee2dadf3 Author: wangch Date: Wed Apr 24 09:41:44 2019 +0800 渠道商绑定商户账户自由切换 commit efbad6140159847b47132a200c8c41d2784ba58e Author: wangch Date: Tue Apr 23 21:17:12 2019 +0800 测试 commit aa7c51399572b6ba2b629e69a046991e4d5d8f32 Author: wangch Date: Tue Apr 23 20:49:46 2019 +0800 测试 commit 2331a34d50424b284a8134037ff57b5c4dc4f3c1 Author: wangch Date: Tue Apr 23 20:43:29 2019 +0800 切换测试 commit 7c386656e0603c16851869379c349aaa1ffea165 Author: liyt Date: Tue Apr 23 20:15:09 2019 +0800 '活动弹窗修改' commit cee8575cc56dbf11d42d097917a2d335e51e5663 Author: wanggb Date: Tue Apr 23 19:57:29 2019 +0800 客服消息，修改自定义活动链接 commit 1d83e001f5db74b29174d959403dd88ec2127866 Author: wanggb Date: Tue Apr 23 19:42:52 2019 +0800 客服消息，修改自定义活动链接 commit 0370cf10ea1a589b80010a8f53f0deb48874ce32 Author: wanggb Date: Tue Apr 23 19:35:33 2019 +0800 客服消息，修改自定义活动链接 commit 9eebd06efd5ca98430c36d882a5a0b1356fbb7a5 Author: wangch Date: Tue Apr 23 19:29:26 2019 +0800 test commit 70604263eb988181fce77344a6625a7ce148982b Merge: 58d4afa22 8606a33aa Author: wangch Date: Tue Apr 23 19:26:40 2019 +0800 Merge remote-tracking branch 'origin/dev-qiehuan-20190418' into dev-qiehuan-20190418 commit 58d4afa2216e62cf10603752f54eaca46b24e001 Author: wangch Date: Tue Apr 23 19:24:45 2019 +0800 绑定账号自由切换 commit 1c7d5b4cf2aa03895c0a30a3ac7141b85bb26ac8 Author: wanggb Date: Tue Apr 23 19:19:11 2019 +0800 客服消息，修改自定义活动链接 commit 76cfb9b239da8e262c46ced67049fb328a77f5ce Author: wanggb Date: Tue Apr 23 18:14:27 2019 +0800 客服消息，修改自定义活动链接 commit 8606a33aa19b198971ef21ee9eeb38bccc8544c1 Author: liyt Date: Tue Apr 23 18:03:52 2019 +0800 '活动显示控制' commit 944bba820101f16edbbff3a613070672ecca0c1a Author: liyt Date: Tue Apr 23 17:55:29 2019 +0800 '活动显示控制' commit 1eb38d795e1d7cd016e6dd9b8ae91fc788922aa9 Author: zhenglh Date: Tue Apr 23 17:44:20 2019 +0800 缓存bug修复 commit b35345c200a9224902b18212705128617ca7f9ab Author: liyt Date: Tue Apr 23 17:04:20 2019 +0800 '活动显示控制' commit 282da39331a4bed638659fc5fe5c55bd9b261267 Author: wangch Date: Tue Apr 23 16:28:32 2019 +0800 关注自动回复增加多图文支持 commit e82bedbff8772a09da6d3d277843d3fce90f3641 Author: wangch Date: Tue Apr 23 16:25:11 2019 +0800 自动回复菜单内，关注自动回复支持多图文模式 commit a600068b4bcf21b2d9791210d1c6e0c8524c3205 Author: liyt Date: Tue Apr 23 16:19:44 2019 +0800 'vip分流' commit 92ba8da5f447b9b86b8be1255e0f7765c5a22e42 Author: liyt Date: Tue Apr 23 15:24:32 2019 +0800 'vip分流' commit 4aebecc43860586a3e5cacea4c32f97a331f014a Author: 李天时 Date: Tue Apr 23 14:43:44 2019 +0800 银生宝支付,只有超管能够看到结算角色 commit 92d2603850e95bf8c399e2d980e6db414d55ef99 Author: wangch Date: Tue Apr 23 14:43:16 2019 +0800 渠道多图文支持 commit a8917d6af3a48e4b46d7322434317a2e4160093a Author: wanggb Date: Tue Apr 23 14:04:56 2019 +0800 客服消息，选活动 渠道显示 平台活动和渠道自定义的活动 commit 1416c7a1ad4587025f3b943b3840f886baf2421b Author: liyt Date: Tue Apr 23 11:58:27 2019 +0800 'vip分流' commit b915c87158228fdf9d8f8a7501dd338a0819048e Author: wangch Date: Tue Apr 23 11:42:13 2019 +0800 多图文支持 commit 9b8efe071373c1fcbeca4a69891873e71ad8375b Author: wangch Date: Tue Apr 23 11:33:58 2019 +0800 多图文支持 commit e774adc971337d7b83c91bfbb52b4a0c203b8ea3 Author: 李天时 Date: Tue Apr 23 11:28:34 2019 +0800 银生宝支付,活动下单 commit e77c42cdc9c077123c66f73f9f2009f5522fc048 Author: wanggb Date: Tue Apr 23 11:25:34 2019 +0800 客服消息，选书时 不再生成推广链接 而是返回拼接的阅读页链接 commit 1bac048d94b6bd9d3ce3c83f6709317c0b88db0f Author: wangch Date: Tue Apr 23 11:24:58 2019 +0800 渠道商自动获取多图文支持 commit 780a2bd94e60ce1418f5f9c46513e4b73b90bcc2 Author: 李天时 Date: Mon Apr 22 17:30:09 2019 +0800 银生宝支付,编辑窗口 commit e3e84e99014621b246e15e1e68e1babfc578478d Author: liyt Date: Mon Apr 22 16:38:14 2019 +0800 '测试' commit 714891bd8f5ba67c3a2244520052835061782f93 Author: liyt Date: Mon Apr 22 15:52:06 2019 +0800 '测试' commit e853d429b6af6ab61b5e4d649c621ccd45dcb15a (tag: cps_20190422_160515) Author: liyt Date: Mon Apr 22 15:25:44 2019 +0800 '测试' commit 9284c8caf987da4f92d8380fcc36e2349f0870e0 Author: liyt Date: Mon Apr 22 15:19:35 2019 +0800 '测试' commit 516f62a5706f079ddb9190994703ba52c3a15d78 Author: wangch Date: Mon Apr 22 12:00:13 2019 +0800 小说统计按照充值金额降序排列 commit 797399bbb5549e7c932b0578f41347eec19bc1f1 (tag: cps_20190422_120635) Author: liyt Date: Mon Apr 22 11:56:44 2019 +0800 'fix-bug' commit b4640c6a26503853845fd16f7db4d0b64d92b6ae Author: DuanEnJian Date: Mon Apr 22 11:55:08 2019 +0800 修改渠道APPID为空时,错误日志降级 commit 1611a36c90dfd71dff99b076efa075347db925c6 (tag: cps_20190422_115931) Author: liyt Date: Mon Apr 22 11:18:13 2019 +0800 'fix-bug' commit 0dd5e8b5c4ed7bc38c3a061db85916b8108c57d2 Author: wangch Date: Mon Apr 22 11:14:23 2019 +0800 后台新增渠道商互相切换功能，切换后保持当前编辑页面不变 commit 8b54b8dfedf539c7952c047484474dc0c6a1013c Author: liyt Date: Mon Apr 22 11:14:12 2019 +0800 'fix-bug' commit 3c2f197a2e396709f7e9fafb2b5e4c6b9330bad0 (tag: cps_20190422_110908) Author: liyt Date: Mon Apr 22 11:06:57 2019 +0800 'fix-bug' commit 342963daaf5a88a4cc1f9947fa1803d9246c2981 Author: liyt Date: Mon Apr 22 10:59:00 2019 +0800 'fix-bug' commit 092b3f3727eb9577ca6912c498087654c3b46521 (tag: cps_20190422_101401) Author: liyt Date: Mon Apr 22 10:04:04 2019 +0800 'fix-bug' commit 3408d5c94acf1604206e4aaa50283ba741e6f190 Author: liyt Date: Fri Apr 19 21:37:07 2019 +0800 'fix-自增' commit 0d23457c3e567a9fd5f53e1dd50f35e7084e15d1 Author: liyt Date: Fri Apr 19 21:29:57 2019 +0800 'fix-自增' commit 8e9b2f5627a5ac83d6230c53ee5f830ef5b3a6e9 Author: liyt Date: Fri Apr 19 21:20:21 2019 +0800 'fix-自增' commit c12d1d49705d5918c69bafb5f9ac7fad1f9def72 Author: liyt Date: Fri Apr 19 21:16:01 2019 +0800 'fix-自增' commit bcb28011314c7af4e504a62c26c64f2ce874560c Author: liyt Date: Fri Apr 19 21:12:02 2019 +0800 'fix-自增' commit fcdaad6c4e7aa507237fbbd464873d962427969c Author: liyt Date: Fri Apr 19 20:57:30 2019 +0800 'fix-自增' commit 60bb184af1398729110ce727a78cc12e0665352e Author: liyt Date: Fri Apr 19 20:31:08 2019 +0800 '分流' commit 3078b5c1372055b0d78bb3fc68eb26ea54c9de3f (tag: cps_20190419_200737) Author: liyt Date: Fri Apr 19 19:57:42 2019 +0800 '客服消息推广链接' commit d514aa0b656c59e3866858ac10e02f5675f4fa27 Author: liyt Date: Fri Apr 19 19:50:33 2019 +0800 '分流' commit b2ab9d49be7b87ded89bc88fb6c17d5d146eb7a1 Author: liyt Date: Fri Apr 19 19:50:02 2019 +0800 '分流' commit cf010f36cbfaa4d1d561e614f737ea12ee1c67ea Author: 李天时 Date: Fri Apr 19 18:43:27 2019 +0800 银生宝支付,编辑窗口 commit 9c44ab81527355610913624015d3683a36f8068f (tag: cps_20190422_175154) Author: zhenglh Date: Fri Apr 19 17:59:49 2019 +0800 平台无效时的处理 commit 3c07ada28b62a39121d687db63ff0a684e438d9b Author: zhenglh Date: Fri Apr 19 17:29:27 2019 +0800 平台无效时不报错 commit df02e0a06e61e0e5b2a0836f0214001bb0038569 Author: DuanEnJian Date: Fri Apr 19 17:28:59 2019 +0800 修改活动资源为商品ID,商品活动分类添加赠送书币免费天数 commit 7cfc3448469eb0241630ab921cc6e3c444344746 Author: liyt Date: Fri Apr 19 17:17:15 2019 +0800 '短链fix' commit 32f9ce34aad8fb24f144a7c0c09fe8fb1728ea21 Author: 李天时 Date: Fri Apr 19 17:03:19 2019 +0800 银生宝支付,活动下单 commit 98d2aa834ddcc7d154c8fe06f6fd6e71fd8aa113 Author: DuanEnJian Date: Fri Apr 19 17:01:49 2019 +0800 修改活动资源为商品ID,商品活动分类添加赠送书币免费天数 commit aff368142f4a38bb77bcc9c25445cf0b82936549 Author: 李天时 Date: Fri Apr 19 16:46:49 2019 +0800 银生宝支付,mac校验 commit 10340e5ad33e9fd92bd48dd0ca113da5e6bcab9f (tag: cps_20190419_180206) Author: liyt Date: Fri Apr 19 16:18:16 2019 +0800 '短链fix' commit 1df7eb2ebd3e589413e87ad56508f86e0cf25db7 Author: zhenglh Date: Fri Apr 19 16:08:50 2019 +0800 平台无效时直接退出，不进行任何操作 commit 852cbc5bd67de0305fa573cec4f431f7a63daff2 Author: liyt Date: Fri Apr 19 16:07:43 2019 +0800 '短链fix' commit 07c08f5d7e13bc6030c57bbc3c06dc9370c9b3c3 Author: liyt Date: Fri Apr 19 15:45:17 2019 +0800 '短链fix' commit 43fe0a86fe422145d2c746253b9050628f5b6ad5 Author: liyt Date: Fri Apr 19 15:42:42 2019 +0800 '短链fix' commit d784e099991c2b52cf80a05ecd09ff54e1f2c6a8 Author: liyt Date: Fri Apr 19 15:27:21 2019 +0800 '短链fix' commit 53c0d13d68ba6709b353577bb58334c46599e5e5 Author: liyt Date: Fri Apr 19 15:15:58 2019 +0800 '短链fix' commit 53042d5b08788ba582735bc8a66b26f002dc21de Author: 李天时 Date: Fri Apr 19 14:57:51 2019 +0800 银生宝支付,mac校验 commit 101019a5a0a946b8eb115fbd488fcfb483137055 Author: liyt Date: Fri Apr 19 14:26:15 2019 +0800 'vip推广链接分流' commit d0675daaa1ff457171870db2d8e61c26a752da8b Author: DuanEnJian Date: Fri Apr 19 14:23:47 2019 +0800 修改活动资源为商品ID,商品活动分类添加赠送书币免费天数 commit 5ee86b43e7b51b649814e5bacfdb968a7a1bb576 Author: liyt Date: Fri Apr 19 14:12:19 2019 +0800 'vip推广链接分流' commit 74e2352630474effde4cf4eeaada8054a9316e3f Author: liyt Date: Fri Apr 19 14:04:08 2019 +0800 '书籍自动补全' commit 2a6b3ac4e08adee75250fa24010666f7666b19c6 Author: liyt Date: Fri Apr 19 14:02:48 2019 +0800 '书籍自动补全' commit b393dac44b995824fc06f5de407d5261adfaa883 Author: DuanEnJian Date: Fri Apr 19 14:01:27 2019 +0800 修改活动资源为商品ID,商品活动分类添加赠送书币免费天数 commit f206e8b66bb49254ba5ca2a1a0dfa8955f183274 Author: liyt Date: Fri Apr 19 13:47:01 2019 +0800 '书籍自动补全' commit e3016cc7f24c9e48090f32c95722bd83c56333e2 Author: liyt Date: Fri Apr 19 13:45:15 2019 +0800 '书籍自动补全' commit 06ae6a205b08fb76a2f57925c272800621501280 Author: liyt Date: Fri Apr 19 12:22:09 2019 +0800 '书籍自动补全' commit 4533394c4f14df81957c864975d7d50996b4026c Author: liyt Date: Fri Apr 19 12:08:00 2019 +0800 '书籍自动补全' commit f22b3ade056807f482fa2409dd9739c88150a178 Author: liyt Date: Fri Apr 19 12:06:00 2019 +0800 '选择书' commit d21a6da120dab66cb8b740ec852de7dbf7068e87 (tag: cps_20190419_110535) Author: guyuexuan <2651919937@qq.com> Date: Fri Apr 19 11:02:16 2019 +0800 压缩 js commit 5fa61fafffa5b7a2296f53a51946c37dc426c086 Author: liyt Date: Fri Apr 19 10:54:26 2019 +0800 'vip' commit 88e12e50df63d1388a7b073661719a061f95a00e Author: liyt Date: Thu Apr 18 18:15:25 2019 +0800 'vip推广链接' commit 8789d68e37dbd538d65973c7cbe53f9359fe2f5c Author: zhenglh Date: Thu Apr 18 17:06:21 2019 +0800 请求时间标记 commit d847ec00c827fd590dcf413e82e105ab09525bac Author: zhenglh Date: Thu Apr 18 16:59:15 2019 +0800 时间添加 commit 8a53ccad30064e101eb82cec3871c3ebf55bbe34 Author: zhenglh Date: Thu Apr 18 16:58:49 2019 +0800 时间添加 commit a45d5b6299bb08a76779ff865989d608950def0a Author: zhenglh Date: Thu Apr 18 16:54:49 2019 +0800 请求时间添加 commit 5be6357168f7aeab85ce38b2224b4eaf7ef2adf8 Author: zhenglh Date: Thu Apr 18 15:47:34 2019 +0800 测试通过 commit df88a0453931eb03b5feba9c4e122887e214459c Author: zhenglh Date: Thu Apr 18 15:44:22 2019 +0800 返回值有误时记录日志 commit 4ad7b89922b9e000329a5aed56c1af42cde1b042 Author: zhenglh Date: Thu Apr 18 15:42:06 2019 +0800 方法迁移 commit 8666f2ad4eff217d06f70a29d77c54fffd3e8300 Author: zhenglh Date: Thu Apr 18 15:28:31 2019 +0800 不兼容老粉丝的迁移 commit 5cc87e6bd5e46f97e2713818df4c43c6a59f898a (tag: cps_20190418_190305) Author: liyt Date: Thu Apr 18 15:12:31 2019 +0800 'fix-bug' commit 302e805db6f2f9190d474ad2f4754817d4ccf651 Author: liyt Date: Thu Apr 18 15:05:47 2019 +0800 'fix-bug' commit fc153b1b95fb2c809ac14c8ed88e8c18ffcbf5ab Author: zhenglh Date: Thu Apr 18 14:58:10 2019 +0800 用户删除后信息更新 commit 4351698ddba28dade56f243de9c605cd96375367 Author: liyt Date: Thu Apr 18 14:57:11 2019 +0800 'vip推广链接' commit 6d1c645e7a38385c1f795a30540cda588478d3c0 Author: zhenglh Date: Thu Apr 18 14:41:05 2019 +0800 测试通过 commit b9edc50b65ec1d7f8c40a045af3396d5f5419bb6 Merge: 60ae7b01a 2251b3573 Author: zhenglh Date: Thu Apr 18 14:40:47 2019 +0800 Merge branch 'master' into dev-callback-optimize-20190416 commit 0df9179885091b059a4ff59b878d74986a7fa28e Author: liyt Date: Thu Apr 18 13:58:26 2019 +0800 '推送類型' commit 60ae7b01af1214f9f4877f4afef063d2e43ac36d Author: zhenglh Date: Thu Apr 18 12:18:22 2019 +0800 mpapi回调测试完成 commit 163a729b263fab1e8d2664ee9f0bfddc01b51efe Author: zhenglh Date: Thu Apr 18 10:57:18 2019 +0800 回调优化测试开始 commit 2c9621d14b643b1e020f9f4d618405d0da4bcde0 Author: liyt Date: Wed Apr 17 20:32:14 2019 +0800 'fix-bug' commit c582a209d2d7ab90ce216b1858f16d57cc2cf465 Merge: 2251b3573 ec745a124 Author: liyt Date: Wed Apr 17 18:55:12 2019 +0800 Merge branch 'dev-custom-20190416' into dev-custom-20190417 commit 80dd3b1f7908d478dca66fb869716b02c107eb32 Author: 李天时 Date: Wed Apr 17 15:42:55 2019 +0800 银生宝支付,mac校验 commit ce2a8cb0cdbcf90adf1c55222260acccdf4d3fc8 Author: 李天时 Date: Wed Apr 17 15:07:14 2019 +0800 fix管理员登录isp过长的问题；管理员列表展示结算角色用户 commit 994c13fd5e07dd3dffeb6f55f5dd9c51621659d7 Author: 李天时 Date: Wed Apr 17 14:44:07 2019 +0800 银生宝支付,支付回调 commit 2251b3573b982deb4ae01922b08a0fb4d0efc419 (tag: cps_20190417_112350) Merge: 9618f95f8 64c7fed7c Author: zhenglh Date: Wed Apr 17 09:15:53 2019 +0800 Merge remote-tracking branch 'origin/master' commit 9618f95f8b49922d104fe909f6fac65531f652cd Author: zhenglh Date: Wed Apr 17 09:15:41 2019 +0800 活动链接修改 commit 64c7fed7c856ea8c6b14dbea07330bd80c968164 Author: DuanEnJian Date: Tue Apr 16 20:17:40 2019 +0800 修改活动 commit 82be3f5839280dddf7d36356e676f6fc95879034 Author: DuanEnJian Date: Tue Apr 16 19:37:09 2019 +0800 修改活动 commit 0fcf3b5a677025ba32cbecc8620d59fe6bb3c50c Author: 李天时 Date: Tue Apr 16 19:15:48 2019 +0800 银生宝支付,支付回调 commit ac1fd914532ae630c69dcda96c12ceeb0c869752 Author: 李天时 Date: Tue Apr 16 18:18:46 2019 +0800 银生宝支付 commit ec745a12495b6c7b704ea1427cb4e96519dc7da3 Author: liyt Date: Tue Apr 16 14:55:58 2019 +0800 'fix-bug' commit 18dee263b2a66b0aa19ee1500dd75806202b5c59 Merge: d6416e89f 0834dd890 Author: liyt Date: Tue Apr 16 10:36:58 2019 +0800 Merge branch 'dev-vipcustom-20190329' into dev-custom-20190416 commit 9a0fb1741fd0db91deb5a4f098e0c1a8101af265 (tag: cps_20190416_164740) Merge: 8d4dc8a62 d6416e89f Author: zhenglh Date: Tue Apr 16 10:06:33 2019 +0800 Merge branch 'master' into merge-master-referral-ref-20190416 commit d6416e89f2ed3716c1e027d1e3e26f2da6d4aa6a Author: zhenglh Date: Mon Apr 15 17:54:10 2019 +0800 黑名单屏蔽问题处理 commit af285f29a3dc97fd477b32a6a8a21e1bcb020a35 Author: zhenglh Date: Mon Apr 15 15:27:50 2019 +0800 运营，书籍列表无法选择分类 commit 8d4dc8a62ebdc9559b4380dc8243304488c738a5 Author: zhenglh Date: Mon Apr 15 14:19:15 2019 +0800 开启与关闭无限二级 commit b76accb5c1ee2dfd5bf37bcab144dddcd31db682 Merge: e542b3fbc 23dd2ad37 Author: zhenglh Date: Mon Apr 15 14:18:05 2019 +0800 merge from master commit 23dd2ad37d24a43e0870a7e816d7258db416ffe1 Author: zhenglh Date: Mon Apr 15 14:15:38 2019 +0800 无限二级bug修复 commit 409a06f87b3e469cf1d6a53d77123492d0677e64 Author: zhenglh Date: Mon Apr 15 11:08:42 2019 +0800 无限二级用户链接分享bug修复 commit 6057ce0f2cebee540b4af50d5e6dd6b7d56e4209 Merge: 250fc4075 3b4e2ab0f Author: wangch Date: Mon Apr 15 09:43:11 2019 +0800 Merge branch 'master' into dev-unlimit-domain-20190322 commit 250fc407514c0c6ad25ec07593ae80f8bc6f0a5d Merge: 7491c2d22 48044dc22 Author: wangch Date: Mon Apr 15 09:40:52 2019 +0800 Merge branch 'master' into dev-unlimit-domain-20190322 commit 7491c2d225c5f88d5d17ef5e1c785679fdd54f17 Author: wangch Date: Mon Apr 15 09:35:11 2019 +0800 修复通过二级域名获取uid信息和浏览url用户信息不一致bug commit 3b4e2ab0f8bee0b46574e051eee8ea5db7bae364 (tag: cps_20190413_193308) Author: zhenglh Date: Sat Apr 13 19:32:38 2019 +0800 添加redis无限二级开关 commit cd68a47a9063a19be8aa477b19b6d3e89c8c49cb Author: zhenglh Date: Sat Apr 13 19:30:48 2019 +0800 添加redis无限二级开关 commit 48044dc227124930623544974f5f8d09545e2023 (tag: cps_20190413_161343) Author: zhenglh Date: Sat Apr 13 16:08:42 2019 +0800 压缩js commit 25baeb6081018e77a26a104069750000620dc1b9 (tag: cps_20190413_152039) Author: zhenglh Date: Sat Apr 13 15:13:25 2019 +0800 合并遗失文件 commit e542b3fbcd66f7269445550579577d5d94a2c15d Author: zhenglh Date: Sat Apr 13 15:02:04 2019 +0800 用户推广链接统一更新 commit ff325f8cc7532c8950f3d759ea1523f47103e47a (tag: cps_20190413_142013) Merge: e6e414314 d6a588c46 Author: zhenglh Date: Sat Apr 13 14:10:32 2019 +0800 Merge branch 'merge-master-palmpay-subaccount-20190413' commit d6a588c464222429b0e86ae6a61c8b98bac50360 Author: zhenglh Date: Sat Apr 13 14:10:13 2019 +0800 getcurrentdomain 修改 commit e6e4143148ea4113ba240096df2e3402c2a5fb8d Merge: fa9a5bf3a 91b4689a5 Author: zhenglh Date: Sat Apr 13 14:06:21 2019 +0800 Merge branch 'merge-master-palmpay-subaccount-20190413' commit 91b4689a5bd31ce128197d82dbb6cbd6019c2667 Merge: 8f346e2f4 9bdd64ebd Author: zhenglh Date: Sat Apr 13 14:06:06 2019 +0800 merge from master-qrcode-test commit fa9a5bf3ab5f261711cff9835c60a92cc2feddfa (tag: cps_20190413_133418) Merge: 8f346e2f4 1444d3239 Author: zhenglh Date: Sat Apr 13 11:40:45 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 1444d32393f318511237e7dd8f669b230b379a1b Author: wanggb Date: Sat Apr 13 11:19:37 2019 +0800 推广链接多条-设置执行时间120秒 commit 8f346e2f442ff15251f5256195d274415b79595d Author: zhenglh Date: Sat Apr 13 10:58:47 2019 +0800 merge 四方分账到master commit 09599adee1e63b7c014b2bb30d2e5754ff9a23a0 Merge: 941df4a3a 7f4570702 Author: zhenglh Date: Sat Apr 13 10:58:00 2019 +0800 merge 四方分账到master commit 7f45707029809aca9103903ccf817f5f2ae08597 Author: wangch Date: Fri Apr 12 20:59:41 2019 +0800 渠道商添加四方分账子商户删除全选按钮 commit 139f74db86882f48a98d225a620c4f2731a8e999 Author: wangch Date: Fri Apr 12 20:54:55 2019 +0800 渠道商添加四方分账子商户删除全选按钮 commit 595ee5eca28714f1db21544d9541112b06f98010 Merge: 0cb486384 7c977de0c Author: zhenglh Date: Fri Apr 12 20:07:59 2019 +0800 Merge remote-tracking branch 'origin/dev-palmpay-subaccount-20190328' into dev-palmpay-subaccount-20190328 commit 0cb4863841b1df49c8854b06166214703967766c Author: zhenglh Date: Fri Apr 12 20:07:49 2019 +0800 同一渠道下公司主体不能重复 commit 7c977de0cc22e27b3cd14b7ff35c18969d798dbd Author: wangch Date: Fri Apr 12 19:34:21 2019 +0800 活动充值订单失败bug修复 commit c09d5678eec0419a8fa9e7a0a634503f81ad10e3 Author: zhenglh Date: Fri Apr 12 18:48:02 2019 +0800 订单参数错误处理 commit 0f4d6b8e0a5b39428ff3bf550b8c6a96a5acc509 Author: wangch Date: Fri Apr 12 18:32:08 2019 +0800 订单统计，添加点众和渠道分账索引 commit 49d40ecba1a26625f8ed879eb04da334d50c2b96 Merge: 60304760d f3bb3021d Author: zhenglh Date: Fri Apr 12 17:31:13 2019 +0800 Merge branch 'dev-referral-add-20190410' into merge-referral-ref-config-20190412 commit f3bb3021d28cb522534de32ff3753684c23d1b32 Author: zhenglh Date: Fri Apr 12 17:30:27 2019 +0800 推广链接统计时，相同时只统计一次 commit 18b08dcc0f43ef840fd35b4e3f17c2368e3c29ae Author: wangch Date: Fri Apr 12 17:30:06 2019 +0800 订单统计标题，渠道和点众调换位置 commit 068398c96c614e3238eeaaa27132531d84882f53 Author: wangch Date: Fri Apr 12 17:20:17 2019 +0800 渠道商子商户必填去除 commit 128c5f957e51975ead96fed57e58335da7cfc3a9 Author: wangch Date: Fri Apr 12 16:05:56 2019 +0800 渠道商子商户必填去除 commit c29ea79ec01cad662374f987801829d0107811c2 Merge: 7597d606e 223724381 Author: zhenglh Date: Fri Apr 12 15:44:37 2019 +0800 Merge remote-tracking branch 'origin/dev-palmpay-subaccount-20190328' into dev-palmpay-subaccount-20190328 commit 7597d606e021753e63c262bde85747e6767dc682 Author: zhenglh Date: Fri Apr 12 15:44:27 2019 +0800 扣量时直接分配给自家子商户 commit 223724381a1854de6dea4a87250cb6d0db34e6ba Author: wangch Date: Fri Apr 12 15:22:16 2019 +0800 子商户长度限制16个字符 commit 4b5b5919121b28a31245dc257958c275df9bb9ae Author: zhenglh Date: Fri Apr 12 15:07:48 2019 +0800 扣量时直接分配给自家子商户 commit ae53c0c7a0083db574545e062a614c6bcbe98b09 Author: zhenglh Date: Fri Apr 12 14:38:25 2019 +0800 扣量逻辑处理 commit 17c51d634b7e931493b9b749bba2c506e1a72f6e Author: zhenglh Date: Fri Apr 12 14:34:18 2019 +0800 扣量逻辑处理 commit 60304760db741777dbaa1bdd29c3e1728499ff49 Author: DuanEnJian Date: Fri Apr 12 11:44:11 2019 +0800 修改推广链接内推外派展示开关 commit b942d72b47c7855e126daecf6db00099cb98d349 Author: wangch Date: Fri Apr 12 11:14:47 2019 +0800 四方分账采用原来的分账算法 commit 9bdd64ebd314f897ba01414a5176b6378e9fc5bd (tag: cps_20190413_115055, tag: cps_20190412_111038) Author: DuanEnJian Date: Fri Apr 12 11:10:09 2019 +0800 补充漏改文件 commit 19c4f070aadf11495f003ff48a6ec64aa965bc65 Author: DuanEnJian Date: Fri Apr 12 10:58:50 2019 +0800 添加渠道&配号代理商内推外派开关 commit 2219bca24a0aa54cd47808fa8354a87891cedb05 Author: zhenglh Date: Fri Apr 12 10:05:59 2019 +0800 推广链接测试完成 commit 9dae33e5ec24f1664418d43e1217a2f1df13f01f Author: zhenglh Date: Fri Apr 12 10:02:49 2019 +0800 推广链接测试完成 commit f72fb7267f9b17207fb4d23b8e632130849de568 Author: zhenglh Date: Fri Apr 12 09:24:09 2019 +0800 用户信息中永久推广链接取消默认值 commit c64ec0180e3f7aebc04cd4a3de70e281b3a8fd10 Author: wangch Date: Thu Apr 11 19:41:51 2019 +0800 四方分账解决小数点后第三位四舍五入的问题 commit 10e8e328418ac9b8cc54b86e1e573eb1fcc37966 Author: zhenglh Date: Thu Apr 11 19:36:23 2019 +0800 用户删除情况的处理 commit bc91cf482238e4fb5806f4b7dc6dc15569a63783 Author: zhenglh Date: Thu Apr 11 17:28:36 2019 +0800 支付回调修改 commit 6dc395caf3292745cb9292192ca64faa012a9d69 Merge: f8606a016 941df4a3a Author: zhenglh Date: Thu Apr 11 17:28:14 2019 +0800 Merge branch 'master' into dev-referral-add-20190410 commit 3c88ac31e01d388c89285c4e03b54aa37baf5ab0 (tag: cps_20190412_105358, tag: cps_20190411_171025) Merge: fa6430fd5 28b659a0c Author: DuanEnJian Date: Thu Apr 11 16:59:24 2019 +0800 Merge branch 'dev-qrcode-modify' of 192.168.0.31:fe/cps into master-qrcode-test 合并自定义二维码 commit 28b659a0c7a71b7af5d2ffa8a8b5f996f1fa624b Author: DuanEnJian Date: Thu Apr 11 16:36:24 2019 +0800 修改推广链接展示问题 commit c28c82a9dc00f3b745daa20bf85cd4cb1adea8f9 Author: DuanEnJian Date: Thu Apr 11 16:33:26 2019 +0800 修改推广链接展示问题 commit a679b6e3ca0c466b39952b28a96e3037418be84a Author: DuanEnJian Date: Thu Apr 11 16:23:57 2019 +0800 修改推广链接展示问题 commit 90700f06f313a4dd70c3734b237ea598c748a1d9 Author: DuanEnJian Date: Thu Apr 11 16:19:14 2019 +0800 修改推广链接展示问题 commit 7a72143044692f47354cd617442f28c9881bbe6a Author: DuanEnJian Date: Thu Apr 11 16:10:54 2019 +0800 修改推广链接展示问题 commit 2d9eca45bd3c86e67d1728eda9ebdcf7d7976b78 Author: DuanEnJian Date: Thu Apr 11 16:05:37 2019 +0800 修改推广链接展示问题 commit 7d2e9d8bbd6c2152316e3b2ac2a9af79bbbab93e Author: wangch Date: Thu Apr 11 16:00:41 2019 +0800 四方分账bug修正 commit f8606a01676f119562691a5b6ae3dccca30191aa Author: zhenglh Date: Thu Apr 11 14:28:22 2019 +0800 更新推广链接 commit 1bc075063a269fe66d51c9b1b01925bdf93266df Author: zhenglh Date: Thu Apr 11 14:16:08 2019 +0800 更新推广链接 commit 343a60ed820aa638ec788c83e4171df9de970e38 Author: zhenglh Date: Thu Apr 11 14:02:35 2019 +0800 推广链接测试开始 commit a4065aa4e69f5d7cc776bdf73f8e8ec6f8b034e6 Author: wangch Date: Thu Apr 11 13:55:51 2019 +0800 微信支付设置，四方分账支付不启用分账隐藏分账子商户 commit a469f82f091af0b7db6e348518de331b8d111217 Merge: 1f826c270 4d8271f5a Author: DuanEnJian Date: Thu Apr 11 11:52:41 2019 +0800 Merge remote-tracking branch 'origin/dev-qrcode-modify' into dev-qrcode-modify commit 1f826c270bbb6947eee41b272309e6d3ea92f41a Author: DuanEnJian Date: Thu Apr 11 11:52:25 2019 +0800 修改推广链接展示问题 commit ae4371f66064b4e9418de16927408d79ae5ab4d5 Author: wangch Date: Wed Apr 10 21:35:44 2019 +0800 分账记录日志 commit 0de8eb02db324bf6ff0bf67a722ca0bad6e35af4 Author: wangch Date: Wed Apr 10 21:22:04 2019 +0800 分账记录日志 commit cd173273046a632bdfbe6873abd4d014814e0caa Author: wangch Date: Wed Apr 10 21:20:31 2019 +0800 分账记录日志 commit 2f1d966b4141c9451b82244c250978099f8da55d Author: wangch Date: Wed Apr 10 21:07:43 2019 +0800 分账记录日志 commit b9ef2462a7fe84dea2f991c172a66b2966fca9b3 Author: wangch Date: Wed Apr 10 20:48:18 2019 +0800 分账记录日志 commit d45f34eaa79e0e926115b195d109c7ba483a5a4f Author: wangch Date: Wed Apr 10 20:45:46 2019 +0800 分账记录日志 commit 41f8aed590f8755162241d63f88dbe6a763635b1 Author: wangch Date: Wed Apr 10 20:43:56 2019 +0800 分账记录日志 commit 7a22930c45883852e622b69067418f03874de23b Author: wangch Date: Wed Apr 10 20:42:47 2019 +0800 分账记录日志 commit aa27e52de1aa5822044c4e885ba252413820d14d Author: wangch Date: Wed Apr 10 20:41:23 2019 +0800 分账记录日志 commit 2a4fe130e483c09764361ef89a65c0a474292fa9 Author: wangch Date: Wed Apr 10 20:40:39 2019 +0800 分账记录日志 commit 3e86b7a039b50547cfc357c2b44c41c84a14dc13 Author: wangch Date: Wed Apr 10 20:38:29 2019 +0800 分账记录日志 commit a14cfa5f5b9bf4f5294fd0b302c3750af51861b0 Author: wangch Date: Wed Apr 10 20:36:42 2019 +0800 分账记录日志 commit 0834dd8909352401bf96ad542423204b7b7fa7d5 Author: liyt Date: Wed Apr 10 20:08:49 2019 +0800 'config' commit 7870e033463910fd678cc6214129baade769f84d Author: wangch Date: Wed Apr 10 20:03:42 2019 +0800 分账记录日志 commit a264229664de45aae0ade0152f64962d382b849d Author: liyt Date: Wed Apr 10 20:00:06 2019 +0800 'config' commit 2128f1a004ede0d8bd2ca117f64a1f7f2678edac Author: liyt Date: Wed Apr 10 19:58:45 2019 +0800 'config' commit 0eb1e0a15982b40b67d21c5dc0b833c33bbf62ed Author: liyt Date: Wed Apr 10 19:52:38 2019 +0800 'config' commit e7f0aa7c4e5f939fe707371a1ccb0da5b74851aa Author: wangch Date: Wed Apr 10 19:48:34 2019 +0800 分账记录日志 commit 067c9dfc241734638a7789c7308f8e2bbb03bff0 Author: wangch Date: Wed Apr 10 19:43:42 2019 +0800 分账记录日志 commit 1f6265d8ffefe73ccb6ec38d4cfbb31bdc99cf33 Author: wangch Date: Wed Apr 10 19:39:38 2019 +0800 分账记录日志 commit 9ae4b346ad22c8a817a73504d7ea07f9a0de9c28 Author: wangch Date: Wed Apr 10 19:30:41 2019 +0800 分账记录日志 commit 674f0fc23ec7d4d66c789ed57454d379372115a2 Author: liyt Date: Wed Apr 10 19:22:43 2019 +0800 'config' commit 941df4a3af2bff2d27d1e5cdf8658b3151373649 (tag: cps_20190410_190627) Author: wangch Date: Wed Apr 10 18:40:50 2019 +0800 无效文件删除 commit 61d0e5ebe02e756bf40a352e06307d75659239d1 Author: wangch Date: Wed Apr 10 17:31:19 2019 +0800 四方分账虚假顶级域名进展删除 commit 4451a14360b7555a28b1a6e0a1fcf5db940677f0 Author: wangch Date: Wed Apr 10 17:26:41 2019 +0800 四方分账虚假顶级域名进展删除 commit 4d8271f5a53c4dc91e7bbf12c6b629514f9bee80 Author: 段恩建 Date: Wed Apr 10 17:03:09 2019 +0800 Update Customqrcode.php commit 98713c852696ea5875713c37adce6b56101a41a7 Author: liyt Date: Wed Apr 10 16:27:37 2019 +0800 'api' commit eb2eb625b3012ce92f14dc411a9ba1db7a4eb1c3 Author: wangch Date: Wed Apr 10 15:43:26 2019 +0800 四方分账订单 活动订单添加KL订单逻辑 commit 7008fead3db32d00860e92c6030ae87fdd437b45 (tag: cps_20190410_180430) Merge: eb590e6af 091da1278 Author: wangch Date: Wed Apr 10 13:58:03 2019 +0800 Merge branch 'master' into dev-unlimit-domain-20190322 commit 6a3f20dd9d3d96605c25752ee104c90318ba9740 Author: wangch Date: Wed Apr 10 13:45:35 2019 +0800 四方分账订单 添加KL订单逻辑 commit 091da1278df634909c4d36dc9378ba067d9b097e (tag: cps_20190410_121011) Merge: fa6430fd5 b381cfdda Author: wanggb Date: Wed Apr 10 12:09:02 2019 +0800 Merge branch 'dev-dk-share-changedomain-20190402' # Conflicts: # application/api/controller/Changedomain.php commit b381cfdda72dad8f064b39fdadfcac332feccc74 Author: wanggb Date: Wed Apr 10 11:42:40 2019 +0800 追加注释 commit 1217c3ee40946da7a2b5b3af75484450789b6f22 Author: wanggb Date: Wed Apr 10 11:30:15 2019 +0800 域名切换,对接口返回值进行不同的处理 commit 73b5b55840e7a773859f9b98b7c064ac816b81a5 Author: liyt Date: Wed Apr 10 10:58:12 2019 +0800 'fix-bug' commit 78d618fe09fa761f4ef324568e0d3fba088ad293 Author: liyt Date: Wed Apr 10 10:51:09 2019 +0800 'fix-bug' commit 2fda1122fd665b8eb8073e9661ab9a402554ad13 Author: wangch Date: Wed Apr 10 10:14:09 2019 +0800 adminConfig缓存未及时更新，换成getAdminInfoAll方法 commit 75c3fa67e3fa6ea8a4915748b618c9c20094013b Author: DuanEnJian Date: Tue Apr 9 20:40:14 2019 +0800 修改推广链接展示问题 commit c03829c1bc80e702f807a3d0e55bd4e9dafa5026 Author: wangch Date: Tue Apr 9 20:39:16 2019 +0800 分账主体一致才分账，不一致钱款打点众子账户 commit b6d1823ebbb7d899a287d5df23cfe030f479d7ed Author: DuanEnJian Date: Tue Apr 9 18:18:24 2019 +0800 取消getCurrentDomain的入口域名 commit 0113414df7c17ffb62a79a8cf7c3b50226aade6e Author: DuanEnJian Date: Tue Apr 9 17:47:31 2019 +0800 自定义二维码改版 commit c4b23a228b1bbd20d493072e0482a3a5523d079c Author: DuanEnJian Date: Tue Apr 9 17:37:08 2019 +0800 自定义二维码改版 commit 0999e1cfba1f01f6ab5622bf6c731f381a70af16 Author: DuanEnJian Date: Tue Apr 9 17:27:57 2019 +0800 自定义二维码改版 commit be57c839cf9890f07bcba2eab7c38fd876eae041 Author: DuanEnJian Date: Tue Apr 9 17:04:11 2019 +0800 自定义二维码改版 commit eb2ceab399fb209c9f6ffebdcdb8a10c6025c11b Author: DuanEnJian Date: Tue Apr 9 16:59:13 2019 +0800 自定义二维码改版 commit d2cc37cb5255272f039d5be1e8cb9a39b21dd10f Author: DuanEnJian Date: Tue Apr 9 16:45:44 2019 +0800 自定义二维码改版 commit 91bdd6d7429b4bd355c9d3d4427cd3b5e07c3a9b Author: liyt Date: Tue Apr 9 16:38:57 2019 +0800 'fix-bug' commit 7a389a632c776ee5152c5119f698fdafda8f0736 Author: liyt Date: Tue Apr 9 16:35:49 2019 +0800 'fix-bug' commit 9bcd09ef8e7801f495de1ec9b313abdf4ea38ebf Author: DuanEnJian Date: Tue Apr 9 16:02:13 2019 +0800 自定义二维码改版 commit eb590e6afce1952485a86ff4cd54c55b6b5c004f Author: wangch Date: Tue Apr 9 15:35:07 2019 +0800 无限二级域名&虚假顶级域名业务域名和菜单域名同时开启不可用bug修复 commit f900b4e3c2fb4f04c42a8f486753a59577a038d0 Author: wangch Date: Tue Apr 9 15:17:30 2019 +0800 无限二级域名&虚假顶级域名业务域名和菜单域名同时开启不可用bug修复 commit 5c72e8d28f2b367ecead1da34c7c2228130f4155 Author: liyt Date: Tue Apr 9 15:07:02 2019 +0800 'fix-bug' commit 5a1ab7fb9a93bd32d747bfff40b518f8f2f9a813 Author: liyt Date: Tue Apr 9 15:04:20 2019 +0800 'fix-bug' commit 05caad7279522c6e546d11862583fb617aa25343 Author: wangch Date: Tue Apr 9 14:28:29 2019 +0800 无限二级域名&虚假顶级域名首次点击不跳转bug修复 commit fa6430fd5cceeccc06ae6ec7eb8c8987b1ba57a4 (tag: cps_20190409_150209) Author: 李天时 Date: Mon Apr 8 20:19:35 2019 +0800 新增结算角色 commit a862635f89b558d7db88627ced30ae3a246eebf6 Author: 李天时 Date: Mon Apr 8 20:16:23 2019 +0800 新增结算角色 commit 1b0837414304ef8d56920a3266dd1cb66067fae1 Author: 李天时 Date: Mon Apr 8 19:50:59 2019 +0800 新增结算角色 commit eea2933aacfd098de0ee7ce2891e1f7c84196ec2 Author: liyt Date: Mon Apr 8 19:34:36 2019 +0800 '消息短链' commit afb8dbd193dc3b3892270af1bb740c4410a912df Author: 李天时 Date: Mon Apr 8 19:29:36 2019 +0800 新增结算角色 commit a8dd5cb164a2965551fc1f3dfa1367b52e9300af Author: wangch Date: Mon Apr 8 19:19:53 2019 +0800 四方分账调整测试 commit 2bc8fe7a5c30811d4a13ddb4888fc7e6ba7e670b Author: 李天时 Date: Mon Apr 8 19:09:46 2019 +0800 新增结算角色 commit b90ccf2292643ad329e0e5e942133624d58bb714 Author: liyt Date: Mon Apr 8 19:06:52 2019 +0800 '消息短链' commit 9511f8dde54ab92c379fbce1c2ad4d171d6ee89e Author: wangch Date: Mon Apr 8 18:54:18 2019 +0800 四方分账调整测试 commit a2e01e4b4beb136aa1a74a9324dc7b52adf94a94 Author: wangch Date: Mon Apr 8 18:33:14 2019 +0800 四方分账调整测试 commit e2b09c7ef8518eac21ed179356855d622503c003 Author: liyt Date: Mon Apr 8 18:27:04 2019 +0800 '消息短链' commit 496662046e3dba5068a8a548ae3362dd6203765e Author: wangch Date: Mon Apr 8 18:25:37 2019 +0800 四方分账调整测试 commit 67070fb7af94c4c88fdb9d2cd01771dfe53a9efa Author: liyt Date: Mon Apr 8 18:20:17 2019 +0800 '消息短链' commit 451b0431eb8b3d734e55059d4438d2151a776112 Author: liyt Date: Mon Apr 8 17:44:46 2019 +0800 '消息短链' commit 7b419fce51c55355d3ae647737037cdf967d4eac Author: 李天时 Date: Mon Apr 8 17:30:25 2019 +0800 新增结算角色 commit ae623e1e09b5f61cd371b69134214049445c3a33 Author: liyt Date: Mon Apr 8 17:18:34 2019 +0800 '消息短链' commit f218450485fe159035562f2de3b8b99e88b2875c Author: wanggb Date: Mon Apr 8 17:09:20 2019 +0800 点看分享|域名切换，优化代码 commit 392ed4057129f3f689cd54349b778ac20a4309c5 Author: wangch Date: Mon Apr 8 16:51:24 2019 +0800 四方分账调整测试 commit 5c0a7c565cc3ec81eac484653d312d9b389d043d Author: wangch Date: Mon Apr 8 16:40:07 2019 +0800 四方分账调整测试 commit d6b0669c5bfdd4fb749dfa1e753d63bef5b0aa5c Author: zhenglh Date: Mon Apr 8 16:36:37 2019 +0800 日志修改 commit fd956f3e61f857ea081e0bf8b17ee3bde96515b7 Author: liyt Date: Mon Apr 8 15:58:53 2019 +0800 '消息短链' commit 66be7cc16b580862ff1f49bea1b95c06cae4e86c Author: liyt Date: Mon Apr 8 15:30:50 2019 +0800 '消息短链' commit e888302bdbb7a22edf0504d4016a9448a10d6276 Author: liyt Date: Mon Apr 8 15:16:32 2019 +0800 '消息短链' commit fce93957ac46b46d34ff84a22a3d6e430ec8de23 Author: liyt Date: Mon Apr 8 14:51:14 2019 +0800 '消息短链' commit 7759b5fab13d1c2f8921ecddeff0318995e9b601 Author: liyt Date: Mon Apr 8 14:40:45 2019 +0800 '消息短链' commit 2bea3f0ad484ff0d83229d8ce42d244a1133803c Author: liyt Date: Mon Apr 8 14:25:56 2019 +0800 '消息短链' commit 738fab0bc2bf6dd428341c74418aa466d804e1fa Author: liyt Date: Mon Apr 8 14:18:23 2019 +0800 '消息短链' commit 40defec5fd4d84eac2617e9cb94e2e7d6962acb5 Author: liyt Date: Mon Apr 8 14:01:46 2019 +0800 '消息短链' commit 9529c1ec37250a228875a2a7d3beb2ae02591b64 Author: wangch Date: Mon Apr 8 13:54:08 2019 +0800 四方分账调整测试 commit 57b4ab70f3acd919a40b3aa967ce9e8381004f0b Author: liyt Date: Mon Apr 8 12:43:25 2019 +0800 '消息短链' commit 9ab8d08c0508af217e41406208c7db808996434f Author: liyt Date: Mon Apr 8 12:39:27 2019 +0800 '消息短链' commit fcd079bd200f2802125bbdc1d77767442e8baa2e Author: liyt Date: Mon Apr 8 12:38:17 2019 +0800 '消息短链' commit 7805a00451d0ff0a8424e3536e8351857edfe574 Author: liyt Date: Mon Apr 8 12:24:49 2019 +0800 '消息短链' commit 3468c07cd9ecc893bfc2fbe3b856a1979d2a5dd9 Author: liyt Date: Mon Apr 8 11:23:38 2019 +0800 '消息短链' commit 3aa7132ed7b078428f7bae49aecfeda583618d47 Author: liyt Date: Mon Apr 8 11:14:03 2019 +0800 '消息短链' commit 50043a0698acfc9d458af224724c66fa67392533 Merge: 22a89cab0 0261c1d93 Author: 李天时 Date: Mon Apr 8 11:07:37 2019 +0800 Merge remote-tracking branch 'origin/master' commit 22a89cab03e389ed70c884f1017b6923329e0c7c Author: 李天时 Date: Mon Apr 8 11:06:45 2019 +0800 生成推广文案、生成推广图片、背景图模式取消内推外派第一章限制 commit e6debf013f26b0c39352fb7252f337a02e1d6c42 Author: 李天时 Date: Mon Apr 8 11:06:01 2019 +0800 生成推广文案、生成推广图片、背景图模式取消内推外派第一章限制 commit db8006cb982fba9e99eb42a67297dadc739d241e Merge: accd6f12c 1f5517515 Author: 李天时 Date: Mon Apr 8 11:03:04 2019 +0800 Merge branch 'dev-referral-guide-idx-20190404' # Conflicts: # application/admin/view/referral/referral/add.html commit 0261c1d933249e4b44f23e7b3a91cadf84e58d32 Author: DuanEnJian Date: Mon Apr 8 10:58:21 2019 +0800 修复管理员无法查看渠道推广链接问题 commit 9ef760369471ac4f40ca7bce5646a2b5232eac06 Author: liyt Date: Mon Apr 8 10:56:01 2019 +0800 '消息短链' commit 8b9b13572d741429eda8c4708db25500d4a27bdc Author: liyt Date: Mon Apr 8 10:47:51 2019 +0800 '消息短链' commit 27121c900c85378d6ca050c878f906d0e6aabcfa Author: liyt Date: Mon Apr 8 10:40:46 2019 +0800 '消息短链' commit c540914b536d59f2085f3806c7541466b2608af2 Author: liyt Date: Mon Apr 8 10:35:17 2019 +0800 '消息短链' commit 8ef0603721f46d00d66f4fc0b9bc912cf8d85d13 Author: wangch Date: Thu Apr 4 21:23:10 2019 +0800 四方分账调整测试 commit 2ea0118de4ca95fb07974f5877c057477fc3ba43 Author: liyt Date: Thu Apr 4 20:49:42 2019 +0800 调试 commit 1f5517515a409a55337ed8de066b111e4edb3908 Author: 李天时 Date: Thu Apr 4 20:45:14 2019 +0800 生成推广文案、生成推广图片、背景图模式取消内推外派第一章限制 commit 13e8b867703924a6a4e5a004a077b746dcee749f Author: 李天时 Date: Thu Apr 4 20:42:55 2019 +0800 生成推广文案、生成推广图片、背景图模式取消内推外派第一章限制 commit 7762a026f729fd8b9810ff732843eece16416c68 Author: 李天时 Date: Thu Apr 4 20:30:41 2019 +0800 生成推广文案、生成推广图片、背景图模式取消内推外派第一章限制 commit df868f8f72c385fc3e4e2265f4520536625fcf08 Author: liyt Date: Thu Apr 4 20:23:27 2019 +0800 调试 commit 5e560db939ff6f63c12af75b86a2876ff493e768 Author: liyt Date: Thu Apr 4 20:20:03 2019 +0800 调试 commit 023fdc1383c5f71ec2b149c46499260a2e29f66e Author: 李天时 Date: Thu Apr 4 20:15:41 2019 +0800 生成推广文案、生成推广图片、背景图模式取消内推外派第一章限制 commit 10ff088a18cb729040235cb33590acc7da141209 Author: liyt Date: Thu Apr 4 20:15:34 2019 +0800 调试 commit db61aee924566546980ce399b242db628fb222c1 Author: liyt Date: Thu Apr 4 20:05:48 2019 +0800 调试 commit 8931d5c07d0d2a549a90426a4c2de25c36f11efc Author: liyt Date: Thu Apr 4 19:58:08 2019 +0800 'tiaoshi' commit 39801c46aa5b415163e0a5ba6b386007b7830bb1 Author: liyt Date: Thu Apr 4 19:51:51 2019 +0800 'tiaoshi' commit 3301abef23ddae9d2ab1602984fe6e5b04c9587a Author: 李天时 Date: Thu Apr 4 19:45:44 2019 +0800 生成推广文案、生成推广图片、背景图模式取消内推外派第一章限制 commit e99ab87fd2bd42d551f70814c3bc357449fbc612 Author: liyt Date: Thu Apr 4 19:45:05 2019 +0800 编辑bug commit efbddee9888115551041927e73c625403b16c34f Author: liyt Date: Thu Apr 4 19:10:43 2019 +0800 新增描述 commit 9ceb85cc167a302ade0acb55e14692cf0e3511e0 Author: wanggb Date: Thu Apr 4 18:57:27 2019 +0800 点看分享，解决缓存丢失的问题 commit 99a2b0d17fdf2488aff9786d0b7f9c241c844098 Author: guyuexuan <2651919937@qq.com> Date: Thu Apr 4 18:44:52 2019 +0800 修改第一章生成落地页 commit c05e95f053c19ce0a2acb73ec7cc4fe34822ed21 Author: liyt Date: Thu Apr 4 18:37:39 2019 +0800 新增描述 commit 0aa381ff4be4faf2517272276d229fa6bbab88c2 Author: liyt Date: Thu Apr 4 16:30:27 2019 +0800 'ceshi' commit 749fffc4388677819b5bf17c558c62162bf6063f Author: liyt Date: Thu Apr 4 16:13:22 2019 +0800 调试 commit ff643175d702a7cd0a591fc59a10b8b57787787e Author: liyt Date: Thu Apr 4 16:09:37 2019 +0800 调试 commit accd6f12cea7efca034bbc63dfb55c47ae49a0bc Author: 李天时 Date: Thu Apr 4 16:08:39 2019 +0800 第一章第二章内推，改成仅第一章内推。生成落地推广，由第三章改成第二章 commit a479b92ead8cbd85b5b55c3aa1e36adce2a6a046 Author: 李天时 Date: Thu Apr 4 16:07:45 2019 +0800 第一章第二章内推，改成仅第一章内推。生成落地推广，由第三章改成第二章 commit 602b09227799fffce86fd0889da8d4cd4d48d3f7 Author: liyt Date: Thu Apr 4 15:55:04 2019 +0800 调试 commit d3bbe9756738b49166935f0aeea5e57bdd7aa37f Author: 李天时 Date: Thu Apr 4 14:51:25 2019 +0800 第一章第二章内推，改成仅第一章内推。生成落地推广，由第三章改成第二章 commit 6f4e5ed95ba700ec708b2cc73b33e4b99b1f6583 Author: wanggb Date: Thu Apr 4 14:45:13 2019 +0800 点看分享，QQ包的URL加urlencode commit 97f9541ef716de1ed7a7b4c659dc9f00a855d595 Author: wanggb Date: Thu Apr 4 14:40:07 2019 +0800 点看分享，QQ包的URL加urlencode commit bbc10fc2f7eeccafd4a63bb680de394ee7940288 Merge: 593ccb08f 1a7039942 Author: wangch Date: Thu Apr 4 14:08:52 2019 +0800 Merge branch 'master' into dev-unlimit-domain-20190322 commit 9483273ed77539c552890e2bd27133c8cc77e5cf Author: wangch Date: Thu Apr 4 13:06:33 2019 +0800 四方分账调整测试 commit 63369f3e0618d5dbad445c804a885ae476bea02d Author: wangch Date: Thu Apr 4 13:03:03 2019 +0800 四方分账调整测试 commit 30e4af1b5a71a6d4cbc9154d92b2c19bdb34e3d2 Author: wangch Date: Thu Apr 4 12:49:15 2019 +0800 四方分账调整测试 commit 9110a62396b49fbbfd2be02d5e2fafcccb1c3832 Author: wanggb Date: Thu Apr 4 10:24:40 2019 +0800 点看分享，更换实现逻辑 commit 1a703994277776f05396af08c2db82c4db20fc0b (tag: cps_20190404_104806, tag: cps_20190404_104639, tag: cps_20190403_234320) Author: DuanEnJian Date: Wed Apr 3 23:42:27 2019 +0800 修改自定义活动,渠道ID检查 commit 12ddc67d73d4227d65beb0795b17b1699fcc10a9 (tag: cps_20190403_212915) Author: DuanEnJian Date: Wed Apr 3 21:27:19 2019 +0800 修改导粉二维码,只在微信内展示 commit d4d56e176a4c8c7afe948f2e7e375fe61b1b60cd Author: DuanEnJian Date: Wed Apr 3 21:26:10 2019 +0800 修改导粉二维码,只在微信内展示 commit 14805abb0365d3b50c33a08aca5cc4401acda2c4 Author: wangch Date: Wed Apr 3 19:39:10 2019 +0800 四方分账调整测试 commit 47bf0b9e7c5b66b18cfd421f519eb2a13a251749 (tag: cps_20190403_165100) Merge: 8d0612bb6 e1eb2699f Author: DuanEnJian Date: Wed Apr 3 16:38:43 2019 +0800 Merge branch 'dev-ref-act-test' of 192.168.0.31:fe/cps 合并 推广链接添加内推外派功能&渠道自定义活动功能 commit b1f7e271a1809a5be743a78d905c74e8f7ac270a Author: wangch Date: Wed Apr 3 16:33:00 2019 +0800 四方分账调整测试 commit e1eb2699f0c3be585d646719b8856c4d3309dd61 Author: DuanEnJian Date: Wed Apr 3 16:27:36 2019 +0800 修改导粉二维码,只在微信内展示 commit 6e8064dd73ee2341bb71ea2fbec53529af46f849 Author: DuanEnJian Date: Wed Apr 3 16:23:16 2019 +0800 修改导粉二维码,只在微信内展示 commit 95d1d900c50d3435d78d95295a8c96d54dfaeae4 Author: DuanEnJian Date: Wed Apr 3 16:20:27 2019 +0800 修改导粉二维码,只在微信内展示 commit 55523931a39b0ad26827e7e55999154d890d6001 Author: DuanEnJian Date: Wed Apr 3 16:15:22 2019 +0800 修改导粉二维码,只在微信内展示 commit bb9a103bbd667b0b7bb87b4bbb6c8b520eec7f35 Author: liyt Date: Wed Apr 3 16:13:29 2019 +0800 取消按钮返回上一页 commit 1b05c39905dda52c1e5cb294753d6d37765b421f Author: DuanEnJian Date: Wed Apr 3 15:52:40 2019 +0800 修改导粉二维码,只在微信内展示 commit 8d0612bb6abd5ca1599c371dc9645a14ed548aac Author: wanggb Date: Wed Apr 3 15:44:19 2019 +0800 优化提示换行 commit 2687b19ed8e2376b8ca158cff76d966ab05fe661 Author: wanggb Date: Wed Apr 3 15:42:13 2019 +0800 优化提示换行 commit eeae0ef2b7ae2889837304804791c368b98dd018 Author: DuanEnJian Date: Wed Apr 3 15:25:45 2019 +0800 修改活动,跳转问题 commit 3641f660c662bdfe3fccafe7a24857b8bebf0cf2 Author: DuanEnJian Date: Wed Apr 3 15:22:52 2019 +0800 修改活动,跳转问题 commit d70f64684b653934d25261bb7f2dee9c249f8015 Author: DuanEnJian Date: Wed Apr 3 15:15:46 2019 +0800 修改活动,跳转问题 commit f66817fcf9aa3f38d30feea5a9effe08a7233b44 Author: DuanEnJian Date: Wed Apr 3 14:53:18 2019 +0800 修改活动,跳转问题 commit b04a324ac2511410d125276f58c1d3aeece08f4f Author: DuanEnJian Date: Wed Apr 3 14:41:01 2019 +0800 修改活动,跳转问题 commit aaa8f594d9ba8cd707dfaedd54093713f7b7f425 Author: DuanEnJian Date: Wed Apr 3 14:35:07 2019 +0800 修改活动,跳转问题 commit 4d277eaae3bafe73c4c583779ed316b45f6b4231 Author: DuanEnJian Date: Wed Apr 3 14:34:14 2019 +0800 修改活动,跳转问题 commit 489b017a17e6f689d6951c20aa6aef2b7a4e7261 Author: wanggb Date: Wed Apr 3 14:12:09 2019 +0800 优化自动切换域名逻辑 commit c725fced382ce2f97251b765e434331e23602851 Author: wanggb Date: Wed Apr 3 14:08:40 2019 +0800 推广链接->guide_domain commit af7e6f3a45ecf9d0a7fc4662a9cd2acba2201159 Author: DuanEnJian Date: Wed Apr 3 13:51:32 2019 +0800 修改活动,配号代理商渠道活动显示问题 commit 23fdfbe4e0677f4f9b40a5b1257fde4ae62e1a6e Author: DuanEnJian Date: Wed Apr 3 13:26:22 2019 +0800 修改活动,配号代理商渠道活动显示问题 commit e98eee4267ca59cced6d2838617a25ac56d51520 Author: DuanEnJian Date: Wed Apr 3 13:09:35 2019 +0800 修改活动,配号代理商渠道活动显示问题 commit 5729854f68fe6ca5979fca574c698cae637bfe82 Author: DuanEnJian Date: Wed Apr 3 13:05:28 2019 +0800 修改活动创建限制 commit a4e3827fb23a876eb63145f2ba3ff5a91f21e222 Author: DuanEnJian Date: Tue Apr 2 21:32:35 2019 +0800 修改弹窗范围错误问题 commit 618a4e3a24d71b8f2965ad3adc857fd909352eb8 Author: DuanEnJian Date: Tue Apr 2 21:05:59 2019 +0800 添加编辑活动,自动刷新 commit 369251257925d922a5b384eb8ca2f326fe138df8 Author: DuanEnJian Date: Tue Apr 2 20:57:03 2019 +0800 添加编辑活动,自动刷新 commit 8c449dbb3f7b6f1917aa5549c2b273841fb5bc2d Author: wangch Date: Tue Apr 2 20:22:29 2019 +0800 四方分账调整测试 commit b05f7a94b92afe3a02d58e0dbdc8315fa3066846 Author: DuanEnJian Date: Tue Apr 2 20:20:35 2019 +0800 活动展示当前渠道OR配号代理商的活动 commit 7badbe985990c0c7c68c15b81fa2c6ff899a4e12 Author: DuanEnJian Date: Tue Apr 2 20:14:10 2019 +0800 活动展示当前渠道OR配号代理商的活动 commit b7d2c701ddf8acf2ddd3b52f6010c0b528d1e397 Author: DuanEnJian Date: Tue Apr 2 19:57:04 2019 +0800 修改活动充值时,取不到活动ID commit 9fffb646f3bea4814a4e1a606cf2459067030e80 Author: DuanEnJian Date: Tue Apr 2 19:12:01 2019 +0800 修改活动时间范围问题 commit 473e67701e06d8a300db655f7e5e3ab7d17c4f7a Author: DuanEnJian Date: Tue Apr 2 18:30:05 2019 +0800 修改分页跳转问题 commit 8261ddbe5d60129955659bab12b5f4186482f492 Author: liyt Date: Tue Apr 2 18:18:44 2019 +0800 'youhua' commit 89deab968e8a7957b8be2911d2f47a1e84ef0d66 Author: liyt Date: Tue Apr 2 18:08:07 2019 +0800 'youhua' commit c211d7156b4eab0ee3245b15c8a95f566e69785a Author: DuanEnJian Date: Tue Apr 2 17:51:09 2019 +0800 修改活动报错问题 commit 6b67612be0bb62351782e2f0acf3ffc75ed41c8a Author: DuanEnJian Date: Tue Apr 2 17:42:17 2019 +0800 修改活动报错问题 commit dd85e5c95f8d5ff0c6897c93b5c093823523f1c1 Author: DuanEnJian Date: Tue Apr 2 17:11:41 2019 +0800 修改活动报错问题 commit 39bb2ce407cffa4472cd5e99f331d2186d745fd7 Author: liyt Date: Tue Apr 2 17:09:00 2019 +0800 '修改' commit e3f69f92a3786099bb61d70fd8ccafe2a1196cc2 Author: DuanEnJian Date: Tue Apr 2 16:55:30 2019 +0800 修改活动报错问题 commit 593ccb08f28f03741218dd5498bbb81629131897 Author: guyuexuan <2651919937@qq.com> Date: Tue Apr 2 16:11:31 2019 +0800 增加 px- 域名格式的逻辑判断 commit 732b7bffb9c499d8ca323b9f80fb670faccbf241 Author: DuanEnJian Date: Tue Apr 2 16:08:06 2019 +0800 修改活动报错问题 commit 33b10c9b935bb36d638ced1aff9bf924ca8cb724 Author: DuanEnJian Date: Tue Apr 2 16:06:13 2019 +0800 修改活动报错问题 commit 88e5ed6d8c302e4a95f12b0b2e716585756c717c Author: DuanEnJian Date: Tue Apr 2 15:53:22 2019 +0800 修改活动报错问题 commit 2f5f3688a5f4d35a56836b0e6784cf244e130aa6 Author: wangch Date: Tue Apr 2 15:49:55 2019 +0800 无限二级&虚假顶级调整测试 commit 2b47853aa03e8d88f9cfa1138c52381029121667 Author: wangch Date: Tue Apr 2 15:44:23 2019 +0800 无限二级&虚假顶级调整测试 commit 0f2bd4a0a8b59cadcba5132c23e522f8dcefedd3 Author: DuanEnJian Date: Tue Apr 2 15:43:24 2019 +0800 修改活动报错问题 commit c6de3d4291aa0fed5caaa20d18120784ba2cc561 Author: liyt Date: Tue Apr 2 15:32:28 2019 +0800 'tiaoshi' commit 7a92698bfacd8625b41b84189732a00450634982 Author: liyt Date: Tue Apr 2 15:28:18 2019 +0800 'tiaoshi' commit 397eed69c6015486b99e787f27842c0cb7e51fdf Author: liyt Date: Tue Apr 2 15:26:16 2019 +0800 'tiaoshi' commit 02e601c66d91fd5c92573dcc2b3944ab8a19b209 Author: DuanEnJian Date: Tue Apr 2 15:23:53 2019 +0800 修改活动报错问题 commit 03fb565188c131b6278ef06eaa647750e81c3219 Author: wangch Date: Tue Apr 2 15:22:02 2019 +0800 无限二级&虚假顶级调整测试 commit f9473aa832d18a47bee9e0eb5e948cff1b9f2435 Author: liyt Date: Tue Apr 2 15:15:56 2019 +0800 'tiaoshi' commit d0ef0d889bd80e2608f234b7d154d7c586a82347 Author: liyt Date: Tue Apr 2 15:04:51 2019 +0800 'tiaoshi' commit d078f704f0db7c8da9911d941ac4449741f04b61 Author: DuanEnJian Date: Tue Apr 2 14:55:05 2019 +0800 修改活动报错问题 commit 82f0bdd7ad63b064d03a0f46b5bc07271de077e9 Author: liyt Date: Tue Apr 2 14:54:07 2019 +0800 'tiaoshi' commit 040537d6c1793cb7d8841a5cbca325928d89e25e Author: DuanEnJian Date: Tue Apr 2 14:51:11 2019 +0800 修改活动报错问题 commit f456b48cf3c8c9e8317b231e36b01dd9ba91eb67 Author: liyt Date: Tue Apr 2 14:47:15 2019 +0800 'tiaoshi' commit 4be8fd4cbdbbfc4c673d223a1436c93ea2afad14 Author: liyt Date: Tue Apr 2 14:45:55 2019 +0800 'tiaoshi' commit 001586de26f41bfa491ba48a2fa602313056cec7 Author: liyt Date: Tue Apr 2 14:44:42 2019 +0800 'tiaoshi' commit 40123baf9886825c68e0e7ddb803c5f93ff50a05 Author: liyt Date: Tue Apr 2 14:43:38 2019 +0800 'tiaoshi' commit 768e2171f6874b4c722c7f756b776d4b036b8f74 Author: liyt Date: Tue Apr 2 14:42:11 2019 +0800 'tiaoshi' commit 51aa7ffb8d53ee855b5cd89086879afba3f165d9 Author: liyt Date: Tue Apr 2 14:40:02 2019 +0800 'tiaoshi' commit 568c1d70ce9f66914102732848eda78ebabb92b1 Author: liyt Date: Tue Apr 2 14:38:55 2019 +0800 'tiaoshi' commit fd7584c4e50a08dac1eee09941ea354a4e75e074 (tag: cps_20190402_145120) Author: DuanEnJian Date: Tue Apr 2 14:36:48 2019 +0800 修改阅读也书籍统计问题 commit b790d06bcde0b2a3221e20b1ce459165b346a37f Author: liyt Date: Tue Apr 2 14:36:45 2019 +0800 'tiaoshi' commit 60ed170b54fba3a949b3b66466cb9a103c64c530 Author: liyt Date: Tue Apr 2 14:35:10 2019 +0800 'tiaoshi' commit 81056034119f11c209b86a1e365d959cdca2a0b0 Author: wangch Date: Tue Apr 2 14:34:16 2019 +0800 无限二级&虚假顶级调整测试 commit 1170122ae8d8773e8bb01ca89a0d8bb0aec36eef Author: liyt Date: Tue Apr 2 14:33:25 2019 +0800 'tiaoshi' commit cbae94eb10b2189d460bda9f1bff6beb8bc275fc Author: liyt Date: Tue Apr 2 14:28:20 2019 +0800 'tiaoshi' commit 6e8b6db650f194c7a0b84c276a1a17275c309e86 Author: liyt Date: Tue Apr 2 14:22:33 2019 +0800 'tiaoshi' commit 424eb8df419a48eb037b23b13123025f70021121 Author: wangch Date: Tue Apr 2 14:04:23 2019 +0800 无限二级&虚假顶级调整 commit 4171b045d1153234dcfee210ec0b239a3701a8fc Author: DuanEnJian Date: Tue Apr 2 13:51:29 2019 +0800 修改活动 commit 6f1e3fc4e96ab2236bc70f8adeb707ed125b9b0e Author: wangch Date: Tue Apr 2 13:39:35 2019 +0800 无限二级&虚假顶级调整 commit 5f4b73803da8dab377c69a24b99278191fb58dd1 Author: DuanEnJian Date: Tue Apr 2 10:44:16 2019 +0800 修改活动 commit e789c857baa2fa7420d8a4966bb469b80163f886 Author: wangch Date: Tue Apr 2 10:10:30 2019 +0800 无限二级&虚假顶级调整 commit 84b3f5d679b852c14549152605cb76eb83162cd5 Author: wangch Date: Mon Apr 1 22:14:21 2019 +0800 无限二级&虚假顶级调整 commit 6e019b9ba2e877cebc7bbde9cd7bf293cd5fe376 Author: wangch Date: Mon Apr 1 22:10:21 2019 +0800 无限二级&虚假顶级调整 commit e6dbc15188ad0300c1bb390be7ae6adfdf5c87bd Author: wangch Date: Mon Apr 1 22:04:31 2019 +0800 无限二级&虚假顶级调整 commit de8f243e0113304884cb43d7ffc28985231ddf9a (tag: cps_20190402_123826) Author: DuanEnJian Date: Mon Apr 1 21:31:35 2019 +0800 修改阳光主题样式 commit 23e42308286edcb9de35af9a6f85abecaeaa5fac Author: wangch Date: Mon Apr 1 21:16:33 2019 +0800 无限二级&虚假顶级调整 commit a287f192f6188868a265daa467710a404acc93d0 Author: wangch Date: Mon Apr 1 20:42:37 2019 +0800 无限二级&虚假顶级调整 commit d35cbde3586fdf8c6501a87fd409e6c5236290fc Author: wangch Date: Mon Apr 1 20:28:42 2019 +0800 无限二级&虚假顶级调整 commit 2687b95363e15afe6a61892956096e2f26cf9092 Author: wangch Date: Mon Apr 1 20:22:56 2019 +0800 无限二级&虚假顶级调整 commit 7d0802fdae5f1088cbca9fe27c7f00ca1e8368db Author: DuanEnJian Date: Mon Apr 1 18:20:19 2019 +0800 添加域名备案信息 commit 3a3cb2452272888abb2c8ae7721d1eb953084e1e Author: DuanEnJian Date: Mon Apr 1 17:37:03 2019 +0800 推广链接最先处理 commit 838de07e9ecc7f312fa9e04e24b60df4f5c5b4bf Author: liyt Date: Mon Apr 1 15:29:26 2019 +0800 'huanyuan' commit ed163bdee7cb02828a652acbefafcae4ab05750f Merge: 534294996 fd4533097 Author: wanggb Date: Mon Apr 1 15:23:01 2019 +0800 Merge remote-tracking branch 'origin/dev-vipcustom-20190329' into dev-vipcustom-20190329 commit 53429499679e06c6d3dcba61d1c67b6943643cf7 Author: wanggb Date: Mon Apr 1 15:22:51 2019 +0800 修改JS小说名称问题 commit 5be4f34505fc45a03963354b18e1ca3c1effbe26 Author: DuanEnJian Date: Mon Apr 1 15:01:47 2019 +0800 修改活动 commit fd453309791334152567a55b8e576ae2cae9f3f4 Author: liyt Date: Mon Apr 1 14:52:30 2019 +0800 '修改' commit bce0d1cab2ceac5df3607103610470bfeaaeae06 Author: DuanEnJian Date: Mon Apr 1 14:51:08 2019 +0800 修改活动 commit 1e6671af0b568f14af39916461db533638a4bd6f Author: DuanEnJian Date: Mon Apr 1 13:53:12 2019 +0800 修改活动问题 commit 9133fa4960d6afcfffe7962e2aeeff8880091eb3 Author: DuanEnJian Date: Mon Apr 1 11:55:28 2019 +0800 修改活动问题 commit c5ccb48636850eb212837b513800c4dc28ff5804 Author: DuanEnJian Date: Mon Apr 1 11:43:11 2019 +0800 修改活动问题 commit 25bc25291119b576765745f166954073228e81cb Merge: fa90f199e bed7e9389 Author: DuanEnJian Date: Mon Apr 1 11:35:32 2019 +0800 Merge branch 'dev-referral-category' of 192.168.0.31:fe/cps into dev-ref-act-test # Conflicts: # application/admin/controller/referral/Referral.php 合并master最新代码 commit f9f4ffc05ed7140afe33cba3a9b7d19a15beeac4 Author: wanggb Date: Mon Apr 1 11:34:56 2019 +0800 格式化代码 commit bed7e9389fefe91c34b08113396f888711d2e81c Author: DuanEnJian Date: Mon Apr 1 11:17:29 2019 +0800 修改活动 commit 5526f267193a451b108860e5193e99da508ece90 Author: DuanEnJian Date: Mon Apr 1 10:55:15 2019 +0800 修改活动 commit c8a93ddce543cc1ad6e8983d073bb0c5302f6cd6 Author: liyt Date: Mon Apr 1 10:37:21 2019 +0800 'youhua' commit 82767f37bc96f171f04f92f06980a8265a515a06 Author: DuanEnJian Date: Mon Apr 1 10:35:19 2019 +0800 修改活动 commit 201b47ab5e194fba8a9fc87c8cac10c84460dfe5 Author: DuanEnJian Date: Mon Apr 1 10:17:16 2019 +0800 修改活动 commit fa90f199ecd6bf004243a8da12ed1acf88e44a6a (tag: cps_20190401_153318, tag: cps_20190401_105743) Merge: b913cc0c7 117d330f2 Author: wanggb Date: Mon Apr 1 10:13:00 2019 +0800 Merge branch 'dev-dk-referral-20190322' commit 5f69e870f7a28cc06ca24f60a5428deb9ddaa346 Author: DuanEnJian Date: Mon Apr 1 10:09:50 2019 +0800 修改活动 commit 5c35c68f2dc3072e54cc5bbcc1b35d756cf60be2 Author: DuanEnJian Date: Mon Apr 1 09:59:15 2019 +0800 修改活动 commit bcbaf4e43a061a46428c543472b5caa537ce5ece Author: DuanEnJian Date: Fri Mar 29 20:25:07 2019 +0800 修改活动 commit 446456c170776cc67963c5fb9cb1eab9471924b3 Author: DuanEnJian Date: Fri Mar 29 20:19:40 2019 +0800 修改活动 commit 70cf6e84d61fb169906633a1d715a24da51040f0 Author: wangch Date: Fri Mar 29 20:06:34 2019 +0800 微信支付配置菜单新增四方支付是否启用分账功能 commit e908aed4569f7cc91ba45426c8164d694be21132 Author: liyt Date: Fri Mar 29 20:04:31 2019 +0800 '补全域名替换占位符' commit 486e7bd1a39b6fc2bd971afaec070504a668f7ce Author: DuanEnJian Date: Fri Mar 29 19:23:00 2019 +0800 修改活动展示 commit 70f2332785310b1a422e7257f6e88c72b6f84262 Author: DuanEnJian Date: Fri Mar 29 19:20:42 2019 +0800 修改活动展示 commit 2bc6205ca0499417f497f682400a0d1c775ebc72 Author: zhenglh Date: Fri Mar 29 19:13:13 2019 +0800 子商户配置格式修改 commit 84a97a5b3da2e143cc8a15dbfe0415dd7830fa00 Author: zhenglh Date: Fri Mar 29 19:02:22 2019 +0800 子商户查询 commit fcccf1e4f51cd6fb3a1a9605cb12f25f97ad1d2d Author: zhenglh Date: Fri Mar 29 18:58:19 2019 +0800 显示，查询与渲染子商户 commit b8795a5a228be1df1074bc9079cafb4e109b279e Author: DuanEnJian Date: Fri Mar 29 17:50:10 2019 +0800 修改活动展示 commit abaae2a78be3b5a9f6175a596c69a50b04c43c50 Author: DuanEnJian Date: Fri Mar 29 17:44:45 2019 +0800 修改活动展示 commit 117d330f248bc5209d2aaf5c571d3a3dff20321d Author: wanggb Date: Fri Mar 29 17:37:21 2019 +0800 推广链接,189改QQ commit a4571d128812c7d6921be97ed05d6483f8025e21 Author: zhenglh Date: Fri Mar 29 17:30:37 2019 +0800 添加四方支付子商户 commit 586883c4d39eae8a6cc2373a8ab0e0ece9e85f5a Author: wanggb Date: Fri Mar 29 17:07:27 2019 +0800 推广链接,189改mp commit b74d4f022c739c9a2d4ce1c2c55097aa94299af8 Author: wanggb Date: Fri Mar 29 17:00:35 2019 +0800 推广链接，域名池存储到数据库,添加日志 commit 62e404d04f2cb8a50bc7e9ec33601ee4f489a234 Author: wanggb Date: Fri Mar 29 16:52:53 2019 +0800 推广链接，域名池存储到数据库,添加日志 commit 640a60afc2b72573bcf04666e4116cf5d8a138b9 Author: zhenglh Date: Fri Mar 29 16:44:49 2019 +0800 四方下单接口测试完成 commit d07c7e834e23f98accad69d90107e691d66f6c15 Author: wanggb Date: Fri Mar 29 16:09:09 2019 +0800 推广链接，域名池存储到数据库 commit d81ed55d062ffb5818b06f716785e1d943d5a443 Author: wanggb Date: Fri Mar 29 16:08:51 2019 +0800 推广链接，域名池存储到数据库 commit b913cc0c7028d2843162e42539b498ddc3de4a60 Author: DuanEnJian Date: Fri Mar 29 15:32:10 2019 +0800 添加备案域名 commit ac5735e457d34e4ef42177f17a92853525ad8759 Author: DuanEnJian Date: Fri Mar 29 15:14:33 2019 +0800 添加备案域名 commit 770db867cca204a224dfb06cf3593a74949f1ccc Author: DuanEnJian Date: Fri Mar 29 15:10:30 2019 +0800 修改活动&推广链接 commit cfe64adbb837ab413ee5861f4a3b31fd88ef07e7 Author: DuanEnJian Date: Fri Mar 29 12:37:40 2019 +0800 修改活动&推广链接 commit f554ea0765d3bb38b28afa5dd7cfda8c1f442cbe Author: zhenglh Date: Fri Mar 29 12:20:06 2019 +0800 子账号 commit 03035531355aa076f235a75f9447a01c13103933 Merge: cdfd496e6 a4cc2cd91 Author: wanggb Date: Fri Mar 29 10:31:25 2019 +0800 Merge branch 'dev-migrate-poxiao-to-master-20190311' into dev-vipcustom-20190329 # Conflicts: # application/admin/controller/Custom.php commit feb0f27bec27e257cb7532aca404c7778c6be8c6 Author: wanggb Date: Fri Mar 29 09:55:17 2019 +0800 推广链接， commit 4a63a86a3d39a28eea5fa73d25099e6d59af4f4f Author: wangch Date: Thu Mar 28 21:39:04 2019 +0800 微信支付配置菜单新增四方支付是否启用分账功能 commit cdfd496e6bdc16ab41f23899b1fa7b8dc23a116b (tag: cps_20190329_114716) Merge: aa7a61cec 7ac9ea01f Author: DuanEnJian Date: Thu Mar 28 21:16:02 2019 +0800 Merge branch 'dev-delssdb-bookpage' of 192.168.0.31:fe/cps 合并删除ssdb&书单相关功能 commit 91298b6c3cec347729749c8ae5401131ed70ebd9 Author: DuanEnJian Date: Thu Mar 28 21:11:22 2019 +0800 修改活动&推广链接 commit ca743f93e98e0bc8e85ac6c0788dd05b11866e22 Author: zhenglh Date: Thu Mar 28 17:47:53 2019 +0800 添加分账表 commit a4cc2cd919f05ab1eefeb3d8c6fa5139cfa62136 Author: liyt Date: Thu Mar 28 17:14:04 2019 +0800 'custom' commit 61018679ff3e1a28d992e06924946ef34c8bbd38 Author: liyt Date: Thu Mar 28 17:08:03 2019 +0800 'custom' commit aa7a61cec3080a022d97d77eddbf86f03b39bf48 Author: guyuexuan <2651919937@qq.com> Date: Thu Mar 28 16:08:39 2019 +0800 修改判断条件 commit f7873aa8d66e1a02f73613de68531c7aa7788584 Author: guyuexuan <2651919937@qq.com> Date: Thu Mar 28 15:23:18 2019 +0800 修改微信菜单检查脚本 commit cc69842ec0f7c98f06a2799d8fa42fabeb088c09 Author: wanggb Date: Thu Mar 28 15:22:43 2019 +0800 自动切换域名，增加日志 commit 154ff9c46f8c011b86e7b9c4d5003152398573e5 Author: DuanEnJian Date: Thu Mar 28 12:45:53 2019 +0800 修改推广链接分类问题 commit 4224dcb8e63ff8e093417a7be6ffc73a39f7b8d4 Author: DuanEnJian Date: Thu Mar 28 11:44:26 2019 +0800 修改推广链接分类问题 commit b80094a8c23814bd802c70eff8ee086e2dc08fa9 Author: DuanEnJian Date: Thu Mar 28 11:18:38 2019 +0800 修改推广链接分类问题 commit e8267a1a6e26d0fdefe80873b4383d3ab222dc92 (tag: cps_20190328_133415) Author: wanggb Date: Thu Mar 28 11:05:02 2019 +0800 更改图文，增加判断条件 commit 0e648ee1cdc5f9beb47790124c9d4676c4dd19ae Author: DuanEnJian Date: Thu Mar 28 10:05:59 2019 +0800 推广链接添加内推外派分类 commit d34e95b0a25e4784d44651642c88e11ad40750ac Merge: 023f062c2 b61bf70b4 Author: wanggb Date: Wed Mar 27 18:57:24 2019 +0800 Merge branch 'master' into dev-dk-referral-20190322 commit d228bda8b6da3da72906a020413d798b1fffcbe5 Author: liyt Date: Wed Mar 27 18:05:12 2019 +0800 '修改' commit 023f062c28b8bbdea5b5ff3a9141c089cf7b8288 Author: wanggb Date: Wed Mar 27 17:47:21 2019 +0800 修改展示字段 commit 0ac3c60500e0cede3676f671421423cd7a56f873 Merge: 8df0225a0 b61bf70b4 Author: zhenglh Date: Wed Mar 27 17:41:34 2019 +0800 Merge branch 'master' into dev-unlimit-domain-20190322 commit af4c46b55bfde8552ac8bfafcbb52a1e437c87eb Author: wanggb Date: Wed Mar 27 17:13:28 2019 +0800 修改展示字段 commit b61bf70b4559f4fdafe1eb690673cb1e277840a9 Author: zhenglh Date: Wed Mar 27 16:32:25 2019 +0800 推广链接落地页编辑bug修复 commit 0bdf179e3d607fefa1bd3aaddde8e11a4bb16590 Author: liyt Date: Wed Mar 27 15:48:46 2019 +0800 '修改' commit 8df0225a0be9ab2a758edb80cf8e528b2924af66 Author: wangch Date: Wed Mar 27 15:28:34 2019 +0800 虚假顶级域名后台功能添加 commit 54019c9825bb5d05f93137128d5e7f25b61c031c Author: wangch Date: Wed Mar 27 15:27:32 2019 +0800 虚假顶级域名后台功能添加 commit b38157c5e8d704069fbfd462be751918a579b858 Merge: 12e496338 d3d6241e6 Author: wanggb Date: Wed Mar 27 14:37:33 2019 +0800 Merge branch 'master' into dev-dk-referral-20190322 commit baeb1b1a3fb5c1499e9eabc75f43495564b9bc31 Author: wangch Date: Wed Mar 27 14:07:11 2019 +0800 虚假顶级域名后台功能添加 commit 338eb7d248a8c16cac40a160de28d10716640217 Author: wangch Date: Wed Mar 27 13:29:32 2019 +0800 虚假顶级域名后台功能添加 commit d3d6241e69729c5b9d3b17d546372e037a63fec8 (tag: cps_20190327_124016) Author: zhenglh Date: Wed Mar 27 12:36:04 2019 +0800 最近阅读bug修复 commit db5bb15379f99c8b1aaa32171760d3e0ab5b44d1 (tag: cps_20190327_113441) Author: zhenglh Date: Wed Mar 27 11:29:56 2019 +0800 先不关注，字体修改 commit 95cb317198a497767513c0db6c218f02379d0f25 Author: zhenglh Date: Wed Mar 27 10:44:23 2019 +0800 阅读页最近阅读 commit aa14ffe4c876829d0352bdbc6ecda68aa9136334 Author: wangch Date: Wed Mar 27 10:46:23 2019 +0800 虚假顶级域名后台功能添加 commit 1804fc43521a9293e1114b84acfc29514f4437cb Author: wanggb Date: Wed Mar 27 10:46:04 2019 +0800 点看需求，去掉群发订阅号 commit 042972c3fa1011341524065f385ebcf87eed2b4e Author: zhenglh Date: Wed Mar 27 10:26:53 2019 +0800 域名测试完成 commit 4fffbba261466c6707b77d026fbcc2335157920c Author: zhenglh Date: Wed Mar 27 09:54:51 2019 +0800 域名链接修改 commit d54f50e508ce29c020d52dde1aa598655a2f3057 Merge: dd1891a2f 811380338 Author: zhenglh Date: Wed Mar 27 09:54:05 2019 +0800 Merge branch 'dev-unlimit-domain-20190322' of http://192.168.0.31/fe/cps into dev-unlimit-domain-20190322 commit dd1891a2f229bc4910b0578a817a36463b8d4f31 Author: zhenglh Date: Wed Mar 27 09:53:53 2019 +0800 域名链接修改 commit 811380338dbfb5830a577f13940c5e7ea87420bd Author: wangch Date: Tue Mar 26 21:38:41 2019 +0800 虚假顶级域名后台功能添加 commit fc4334f52fc10a4ec294672656339194e1d4d06a Author: wangch Date: Tue Mar 26 21:35:45 2019 +0800 虚假顶级域名后台功能添加 commit 4ac18346773163ec31923da841a39a5426a0088e Author: wangch Date: Tue Mar 26 21:21:24 2019 +0800 虚假顶级域名后台功能添加 commit 104e446a307942118f0cb7cd9ea1bac0c19a2c1d Author: wangch Date: Tue Mar 26 21:12:30 2019 +0800 虚假顶级域名后台功能添加 commit a33c0ecc439c057575e56346dce5f46f50dee6b4 Author: wangch Date: Tue Mar 26 20:35:04 2019 +0800 虚假顶级域名后台功能添加 commit 35a6cacd8ac4b6491944d662876b40bb8c3e2661 Author: wangch Date: Tue Mar 26 20:30:39 2019 +0800 虚假顶级域名后台功能添加 commit 6d8d929f7769c49095df043b17aab889e69c6249 Author: wangch Date: Tue Mar 26 20:24:23 2019 +0800 虚假顶级域名后台功能添加 commit a543778958053a7e098862b7f14dc8512aa5eef8 Author: wangch Date: Tue Mar 26 20:11:39 2019 +0800 虚假顶级域名后台功能添加 commit 075c5349301c6aff50ba06e570a9bf5ee3ce565d (tag: cps_20190326_200633) Author: zhenglh Date: Tue Mar 26 19:59:45 2019 +0800 破晓主题测试完成 commit 8e002e4bf4f9cdbfa45f4ac4e7348d5ccd32d544 Author: zhenglh Date: Tue Mar 26 18:46:57 2019 +0800 ds样式替换 commit 34adbe2784f2330073c97504efa3642f47da4f4a Author: zhenglh Date: Tue Mar 26 18:44:49 2019 +0800 ds样式替换 commit a6eafadae58d2b8323047df5e2e20e71835ab0bf Author: zhenglh Date: Tue Mar 26 18:06:57 2019 +0800 二维码修改 commit b16cbf16a273b272831dba7e3674104e4f3e21fd Merge: 4fc8c92c4 f9d7e62a2 Author: zhenglh Date: Tue Mar 26 16:37:50 2019 +0800 Merge branch 'master' into dev-poxiao-zhuti-20190326 commit 4fc8c92c486984814275998fd59c16857f0a94c0 Author: zhenglh Date: Tue Mar 26 16:37:46 2019 +0800 破晓主题 commit f9d7e62a206933906f101e52639602872c33860c Author: zhenglh Date: Tue Mar 26 16:21:33 2019 +0800 添加推广链接没有next_id,pre_id处理 commit 5e58dc5a72b673ea3cab6df24674c6573c8a845f Author: zhenglh Date: Tue Mar 26 15:16:01 2019 +0800 破晓阅读页兼容 commit b089c01b491c40f3dc83c9a98b41182ec5cf4ec9 Author: zhenglh Date: Tue Mar 26 14:59:53 2019 +0800 处理后台推广链接书籍阅读页的bug commit 7ac9ea01f765e7de2d767714bf46eec5fc589760 Author: liyt Date: Tue Mar 26 13:56:03 2019 +0800 测试 commit 574d5450cae990c136590f1193cf6ff839378ab4 Author: zhenglh Date: Tue Mar 26 13:53:43 2019 +0800 书籍阅读页bug修复，推广链接修复 commit 7c6156e2f2f308e3279ed1183eaa93060b1c3e04 Author: liyt Date: Tue Mar 26 13:31:19 2019 +0800 测试 commit a536bf41a038f94b058d70b1cb0d1c6ab482553e Author: liyt Date: Tue Mar 26 13:06:08 2019 +0800 测试 commit dc8afa3cb86488d9f325bff33d00709a8351c3d1 Author: liyt Date: Tue Mar 26 13:03:39 2019 +0800 测试 commit 46e68026287b269e18e50da9cb6c0f1bb9b4ee19 Author: liyt Date: Tue Mar 26 12:41:26 2019 +0800 测试 commit 5c9c0e8b15585a444e279f4d9d35d5a1457da26d Author: liyt Date: Tue Mar 26 12:38:34 2019 +0800 测试 commit 7632894fa61b3d43b5a89a5fe218d3f4fbc5a7d0 Author: liyt Date: Tue Mar 26 12:37:14 2019 +0800 测试 commit e43f40e4903d93d78af44fc4e4a0982e3aae8847 Author: liyt Date: Tue Mar 26 12:36:15 2019 +0800 测试 commit e5fff20179c5a3037daf6fe159ee377b34a47d01 Author: liyt Date: Tue Mar 26 12:30:57 2019 +0800 测试 commit 2dcfe7595f3a72d811d48828439dc14e8c06be6d Author: liyt Date: Tue Mar 26 12:26:23 2019 +0800 测试 commit 51bc75d7b2395a4e5edeeddd19de156fff4739b3 Author: liyt Date: Tue Mar 26 12:24:15 2019 +0800 测试 commit d075323cb49da964da5fb2cc76dd9b92da28a117 Author: liyt Date: Mon Mar 25 20:11:45 2019 +0800 '书单' commit 3cab0e6762d3a2eb5662c3ec89837f9f2892febb Author: liyt Date: Mon Mar 25 19:58:06 2019 +0800 '书单' commit ccad6985cea783fef330e3b6c50ef05a35fa4f47 Author: wangch Date: Mon Mar 25 19:28:59 2019 +0800 虚假顶级域名后台功能添加 commit efbb321752514f58c1b47ed10c360b83ddc6f9ed (tag: cps_20190325_171423) Author: zhenglh Date: Mon Mar 25 17:06:40 2019 +0800 书籍章节问题处理 commit c541714e19b3d2a6c7d3c05816d8c65423e8dc78 (tag: cps_20190325_161249) Author: zhenglh Date: Mon Mar 25 16:12:28 2019 +0800 书籍bug处理 commit 308a62908141175585b331dce3feea9587e7f53a (tag: cps_20190325_150414) Author: zhenglh Date: Mon Mar 25 15:03:47 2019 +0800 书籍扣费模式 commit f83ae350972d0ceb2711d7ec332a9934354369cc Author: DuanEnJian Date: Mon Mar 25 13:15:01 2019 +0800 解决Kl脚本字段错误问题 commit d21f923108dc4a3ce81eae7ce84fd9341ba7e9af (tag: cps_20190325_133639) Author: zhenglh Date: Mon Mar 25 12:55:30 2019 +0800 阅读页提交 commit ac7a40616b5c1dd947f4f2361210dddbfa2622c8 Author: zhenglh Date: Mon Mar 25 12:00:25 2019 +0800 阅读页提交 commit f2148e75ec610f223ec90638f3137cd004804a25 Merge: 557ad4479 ea13ecc3e Author: DuanEnJian Date: Mon Mar 25 10:20:42 2019 +0800 Merge branch 'dev-youhua-201903181200' of 192.168.0.31:fe/cps into dev-delssdb-bookpage 合并 书单和修改书币和VIP备注 commit 557ad4479db2fb604dd3a5de6d2f57722dc33521 Merge: 76ba75d2f 574cae420 Author: DuanEnJian Date: Mon Mar 25 10:18:39 2019 +0800 Merge branch 'dev-ssdb-delete' of 192.168.0.31:fe/cps into dev-delssdb-bookpage # Conflicts: # application/command.php 合并dev-ssdb-delete commit 574cae420917faf142d1d66586a87e75e78c0609 Author: DuanEnJian Date: Mon Mar 25 10:04:50 2019 +0800 解决Kl脚本字段错误问题 commit cfae9a15dde0d82d87627f517769c6144899d20f Author: DuanEnJian Date: Mon Mar 25 09:59:28 2019 +0800 修改脚本M-T:问题 commit 5613455b688981ffc79df65ed259bb0503fe8939 Author: DuanEnJian Date: Mon Mar 25 09:55:04 2019 +0800 修改脚本M-T:问题 commit 091a461928074e5bb53b002691764a66d9ab21ad Merge: c0ced833b a4e0617b5 Author: wangch Date: Sat Mar 23 19:41:11 2019 +0800 Merge remote-tracking branch 'origin/dev-unlimit-domain-20190322' into dev-unlimit-domain-20190322 # Conflicts: # tests/UnlimitDomainTest.php commit a4e0617b513cbc73d64000c01140456ec5fd868d Author: zhenglh Date: Sat Mar 23 18:40:27 2019 +0800 虚假顶级域名管理添加 commit 2e5f9c702edb7b8f73ec40d4eb12437122794b75 Author: zhenglh Date: Sat Mar 23 18:32:52 2019 +0800 用户未登录情况处理 commit c0ced833b366adcee7407004a2e2581ef128ac54 Author: wangch Date: Sat Mar 23 18:07:38 2019 +0800 Merge branch 'dev-unlimit-domain-20190322' of D:\AppServ\www\htdocs\fe\cps with conflicts. commit bade99e8435126a71d7e29bc29a05a965e138b6f Author: zhenglh Date: Sat Mar 23 17:52:56 2019 +0800 二级域名测试完成 commit 212cfe5000473cdb4ec184a9c47c755a5fbd94a4 Author: wangch Date: Sat Mar 23 15:43:32 2019 +0800 测试无限二级 commit ea13ecc3e122d5cd8709c7485c227d2cf98f885d Author: liyt Date: Sat Mar 23 15:30:45 2019 +0800 '优化' commit 12e496338bc04e9ecb449d3e378f99d3f913a10b Author: wanggb Date: Sat Mar 23 14:34:37 2019 +0800 点看需求，多推广链接 小说推广微信分享功能是否开启 commit 76ba75d2fb308875296cc30b0bbd366ffc3e55d3 (tag: cps_20190323_133702) Author: liyt Date: Sat Mar 23 12:19:24 2019 +0800 '优化导出方法' commit 52bff1f90882ceab0e9efb8ad82e49a1ab4c0519 (tag: cps_20190323_114010) Author: liyt Date: Sat Mar 23 11:30:28 2019 +0800 优化提取数字函数 commit 4039d519853aa0ae0661d7867e71ba2ae22fb244 Author: liyt Date: Sat Mar 23 11:26:52 2019 +0800 优化提取数字函数 commit 738c9cda03a9858b28604390d5cfc05fcbc7c968 Author: liyt Date: Sat Mar 23 11:23:13 2019 +0800 优化提取数字函数 commit 6d5a52d658a317d9fc4630174318222044e73e6a Author: liyt Date: Sat Mar 23 11:10:09 2019 +0800 '优化导出方法' commit 24b73df3d6b6e183ce0e7da7627cca5dd813139d Author: liyt Date: Fri Mar 22 19:57:07 2019 +0800 '清除缓存' commit c5b0640817b645cab12d8388c44c6380e97f3162 Author: liyt Date: Fri Mar 22 18:11:39 2019 +0800 书单页 commit ca351bf0e0bfe170f500745fedcd918f5afa519b (tag: cps_20190322_202642) Author: liyt Date: Fri Mar 22 17:37:19 2019 +0800 导出优化过滤不识别字符 commit 9ec1cabee8c3336c1be7c0f2b4d5797d73af0ce5 Author: liyt Date: Fri Mar 22 16:26:00 2019 +0800 '书单' commit 5cd13ab58f599b03e9509f3bca9b8d69b21e5ee7 Author: wanggb Date: Fri Mar 22 13:43:32 2019 +0800 域名自动切换，修改配置文件 commit e008f49fbbaee1b5d4e6d94c6ce758f8f738e209 (tag: cps_20190322_141106) Author: wanggb Date: Fri Mar 22 11:27:55 2019 +0800 域名自动切换，修改配置文件 commit 8b8f199add87aa90cf9bfd087b7c629d2faac06c Author: wanggb Date: Fri Mar 22 10:51:36 2019 +0800 域名自动切换，修改配置文件 commit 633027a705636d6d698205c96be5bb6b3cf254d1 Author: wanggb Date: Fri Mar 22 10:35:18 2019 +0800 域名自动切换，修改配置文件 commit 0ebbab926017eb841c6ab86f57e2bf9a270deaee Author: wanggb Date: Thu Mar 21 19:34:26 2019 +0800 域名自动切换，修改逻辑，如果本身可用，无需切换域名 commit 32b01b2de5af93031471b34b91540af736d83be4 Author: wanggb Date: Thu Mar 21 16:48:59 2019 +0800 域名自动切换，修改逻辑 commit 901bb477fd3bd2b9ee40cf2908b73a2d515e72aa Author: wanggb Date: Thu Mar 21 15:48:03 2019 +0800 域名自动切换，修改告警信息 commit 0284a684b41f48d27309b521dee8b7437f228090 Author: wanggb Date: Thu Mar 21 15:35:55 2019 +0800 域名自动切换，$platform_id_filter SQL commit 7a7aeed90085445875f5fcab605b9a79ccfdc92b Author: wanggb Date: Thu Mar 21 15:21:52 2019 +0800 域名自动切换，优化platform_id SQL commit 9db1ed829b2142268698b7cd339f4176a2ebd792 Author: wanggb Date: Thu Mar 21 15:01:09 2019 +0800 域名自动切换，优化platform_id commit 52971b96246b5851314526ea1d08d755597562e2 Author: wanggb Date: Thu Mar 21 14:14:58 2019 +0800 域名自动切换，添加日志 commit 208317c5ada12751beb005770a52a17c3dff2358 Author: wanggb Date: Thu Mar 21 14:06:00 2019 +0800 域名自动切换，添加日志 commit 2d71f7e09bcbb329daad7fa325be344b4d3ec06e Author: wanggb Date: Thu Mar 21 11:59:06 2019 +0800 域名自动切换，添加日志 commit 98e3841492799c50ac776450e40a48df6e70ae35 Merge: 4f491bb13 d19a468e8 Author: wanggb Date: Thu Mar 21 11:45:50 2019 +0800 Merge remote-tracking branch 'origin/merge-reading-service-changdomain-20190313' into merge-reading-service-changdomain-20190313 commit 4f491bb13ed1451523b9b385dd91adb45794b925 Author: wanggb Date: Thu Mar 21 11:45:37 2019 +0800 修改菜单，添加日志 commit d19a468e8e6323a712f9e87dec59beb0d7395f50 (tag: cps_20190321_164641) Author: zhenglh Date: Thu Mar 21 10:37:27 2019 +0800 删除空文件 commit 9c1ced26d68c8a55e7bb9e67c2c8583013be062b Author: DuanEnJian Date: Wed Mar 20 20:18:16 2019 +0800 修改脚本问题 commit 3b88b0b1e261dd15aa0bcf4663570bfa1987600a Author: wanggb Date: Wed Mar 20 20:18:11 2019 +0800 修改菜单，添加日志 commit 0a7832db99a2c62c36acd47fcbb0dbab370ede25 Author: wanggb Date: Wed Mar 20 19:57:41 2019 +0800 修改菜单，添加日志 commit fe8b26cdfdcacc801f8fb091dfe9749bf1ea4a48 Author: wanggb Date: Wed Mar 20 19:50:51 2019 +0800 修改菜单，添加日志 commit 6276438337c368edc0c115c1fc45ac19dcac5f58 Author: wanggb Date: Wed Mar 20 19:40:37 2019 +0800 修改菜单，添加日志 commit 42ad9d17d097e605e980c27b17b8465428e9f61c Author: wanggb Date: Wed Mar 20 19:35:08 2019 +0800 修改菜单，添加日志 commit 397ae254e244b8312a39025401597eceb533a6a4 Author: wanggb Date: Wed Mar 20 17:53:45 2019 +0800 渠道商，成功添加客服消息 修改提示 commit 213296c9034ef6c057dca4ba3aa9cd1cd121458d Merge: 2ac2101ae 5f618f441 Author: liyt Date: Wed Mar 20 17:50:44 2019 +0800 Merge branch 'merge-reading-service-changdomain-20190313' of http://192.168.0.31/fe/cps into merge-reading-service-changdomain-20190313 commit 2ac2101aea7515bea4cebf9f287bc448663301bd Author: liyt Date: Wed Mar 20 17:49:45 2019 +0800 '优化替换空格' commit ecb6a1767a9a03430d1b8bd570421500e189cc7a Author: liyt Date: Wed Mar 20 17:42:51 2019 +0800 'book_list' commit 7122477aa15181fcbbc7111ca60db0d6bf49e308 Author: wanggb Date: Wed Mar 20 17:03:02 2019 +0800 渠道商，成功添加客服消息 commit 5f618f441080122b9dfb3d7569df4462fc0f6dd9 Merge: f1565e3a0 dfe9148d0 Author: zhenglh Date: Wed Mar 20 14:28:17 2019 +0800 Merge branch 'master' into merge-reading-service-changdomain-20190313 # Conflicts: # application/index/view/yg/user/recent.html commit d3bc747d73b6a665c46332357a7c12da06bca7b3 Author: liyt Date: Wed Mar 20 13:52:31 2019 +0800 '书单' commit 6880e023eddcafbafcadc7b5089b60777a0852e5 Author: liyt Date: Wed Mar 20 11:06:46 2019 +0800 '书单' commit dfe9148d0fde4536132f1d3ff76e651bdd601434 Author: 李天时 Date: Tue Mar 19 17:49:13 2019 +0800 fix阳光样式删除阅读记录报错的bug commit 0ff90de32c262bf5e69de1f34f430b2dbfaa8e03 Author: DuanEnJian Date: Tue Mar 19 16:42:37 2019 +0800 修改添加用户白名单失败问题 commit de0ea9d1d0be2dd71cfca8e1cce7aba0bdc96026 Author: DuanEnJian Date: Tue Mar 19 14:33:56 2019 +0800 修改当日推广链接统计金额Redis使用问题 commit 4705c1952772e0a1999cc646b190d79a418c7cdc Author: DuanEnJian Date: Tue Mar 19 14:12:02 2019 +0800 修改统计错误 commit d864ddfe3b1e6a0f565497474202404299d56cee Author: DuanEnJian Date: Tue Mar 19 14:00:25 2019 +0800 修改统计错误 commit f1565e3a05896cb1318a07d02594e217ce7373a9 Merge: 7c9934e5a ea39bf0f0 Author: zhenglh Date: Tue Mar 19 12:10:42 2019 +0800 Merge branch 'merge-reading-service-changdomain-20190313' of http://192.168.0.31/fe/cps into merge-reading-service-changdomain-20190313 commit 7c9934e5aa03f67da23ebe518067f73d65ebc5d8 Author: zhenglh Date: Tue Mar 19 12:10:31 2019 +0800 导粉数量新增用户>=生效 commit 6eec4520cf248422134090616d58ea592cfc51c8 Author: DuanEnJian Date: Tue Mar 19 11:30:11 2019 +0800 修改 新用户首冲9.9状态为2 commit 6e9e4875c4208f71927729efbe5aed8890dbce84 Author: wanggb Date: Tue Mar 19 11:15:45 2019 +0800 vip 直接跳转到添加图文 文字 素材页面 commit ea39bf0f03b46594c13e10c28bf152f1217f44b6 Author: wanggb Date: Tue Mar 19 10:40:39 2019 +0800 自动切换菜单域名后，发送消息，刷新微信菜单 commit 51ba0e808c532c489627961cb067a19286818f8f Author: wanggb Date: Tue Mar 19 10:32:31 2019 +0800 补上缺失的文件 commit 523a6ba562ede83c3daeb19a96aad665c06cfea1 Author: DuanEnJian Date: Mon Mar 18 17:56:30 2019 +0800 修改 新用户首冲9.9状态为2 commit 8d8dc18bf83880a07bf7cfa90fcd07951a1f16a5 Author: DuanEnJian Date: Mon Mar 18 16:26:42 2019 +0800 修改登录刷新渠道城市缓存 commit ef4e982502bd4193116db9cee6c08539207de6f1 Author: wanggb Date: Mon Mar 18 16:19:54 2019 +0800 补上缺失的文件 commit 8fef29ebc0ad44062889c2b9f601cbbbb01cb825 Author: wanggb Date: Mon Mar 18 16:08:35 2019 +0800 补上缺失的文件 commit 2bb96b2d50f6890d1879083a2dce18466eeb2ef2 Author: liyt Date: Mon Mar 18 14:17:25 2019 +0800 '搜索优化' commit b936cd04d974b1a14acd5156b1c5fd6f731aa742 Author: liyt Date: Mon Mar 18 12:01:17 2019 +0800 '优化' commit f71624f9199b14a49ff549de61072ab27ae946b8 Author: wanggb Date: Mon Mar 18 11:37:13 2019 +0800 域名切换，优化了文案 commit 9aeea3c9a1289a105e0ec4a4df48130acd395cbb Merge: f0de6761c 91753b1fe Author: zhenglh Date: Fri Mar 15 16:17:09 2019 +0800 Merge branch 'merge-reading-service-changdomain-20190313' of http://192.168.0.31/fe/cps into merge-reading-service-changdomain-20190313 commit f0de6761ca9a10a26480060bf6051ca497fe89ee Author: zhenglh Date: Fri Mar 15 16:16:55 2019 +0800 日志id格式修改 commit 16489bd52cb6b8912526b237e84f53de199c2663 (tag: cps_20190315_135015) Author: wanggb Date: Fri Mar 15 12:09:55 2019 +0800 分享功能，限制配号代理商 commit 3f1b6da5d9f17823cf2bf3be6c4ec26da79b8d10 Author: DuanEnJian Date: Thu Mar 14 17:56:51 2019 +0800 修改二维码UV展示 commit c00a4ecd028863a434bd93e03ac2fde612f5944d Author: DuanEnJian Date: Thu Mar 14 17:00:17 2019 +0800 修改二维码UV展示 commit 108c252fa16fd6a5ac6b8a78cbe34a881ee4bc27 Author: DuanEnJian Date: Thu Mar 14 16:52:13 2019 +0800 修改二维码UV展示 commit 27acfcd372deb1ba31b3024fa5ac1086c7735727 Author: DuanEnJian Date: Thu Mar 14 16:40:31 2019 +0800 修改Redis pfAdd commit be86769bbad2542b1f290acb315aa783f7b332e5 Author: DuanEnJian Date: Thu Mar 14 16:35:27 2019 +0800 修改Redis pfAdd commit bb6b8e5161729a5337c66fa178a6e37c13bccdc9 Author: DuanEnJian Date: Thu Mar 14 16:34:29 2019 +0800 修改Redis pfAdd commit 80f1d81bb6091372dbf37690a0a8c7e641956934 Author: DuanEnJian Date: Thu Mar 14 15:30:29 2019 +0800 添加ssdb迁移脚本 commit 2f26d43b26c1c6d2ca2961019711c3ab84be3da4 Author: DuanEnJian Date: Thu Mar 14 15:28:21 2019 +0800 添加ssdb迁移脚本 commit 91753b1fe6ed746cec2e548dc5877e621f3b1e30 Author: wanggb Date: Thu Mar 14 15:16:28 2019 +0800 是否加入自动切换域名 commit 64c91ed0d362d3e7911a4b0cb8c60afe95a893cd Author: DuanEnJian Date: Thu Mar 14 14:59:37 2019 +0800 添加ssdb迁移脚本 commit 41f5f7f4bc48a22bedcdb6275d98e71fd21523ce Author: liyt Date: Thu Mar 14 11:40:04 2019 +0800 '导出优化' commit be320577f56b0a3d3c2f2eb3295430dc70a7325b Author: DuanEnJian Date: Thu Mar 14 11:18:51 2019 +0800 添加刷新用户白名单信息 commit 36028749ee1474d74b9c1ec6cdf126f03392d7e1 Author: liyt Date: Thu Mar 14 11:13:47 2019 +0800 导出优化 commit 836172edde7590af1719446e47b676b99dc65cae Author: liyt Date: Thu Mar 14 11:04:37 2019 +0800 '渠道商编辑收款信息过滤空格' commit 15b7c86413016b3731056d3c251a48e280a2d841 (tag: cps_20190314_181306) Merge: 9463ff2da 94a3f1d67 Author: wanggb Date: Wed Mar 13 19:54:58 2019 +0800 Merge remote-tracking branch 'origin/dev-migrate-poxiao-to-master-20190220' into dev-migrate-poxiao-to-master-20190220 commit 9463ff2dab304be434f54810ab0c71c94fe146eb Author: wanggb Date: Wed Mar 13 19:54:33 2019 +0800 合成分享图片，没有可用的底图，提示信息 commit 94a3f1d67fee1561f31ed119889438bead960b69 Merge: 7f9996fb2 2b0cd1eda Author: DuanEnJian Date: Wed Mar 13 19:06:04 2019 +0800 Merge remote-tracking branch 'origin/dev-migrate-poxiao-to-master-20190220' into dev-migrate-poxiao-to-master-20190220 commit 7f9996fb25104ae41cfcc469af473a85b5ecd2b5 Author: DuanEnJian Date: Wed Mar 13 19:05:58 2019 +0800 限制配管添加,超管和配管用户 commit a08490499165be9721500b041c12141f902676ac Author: DuanEnJian Date: Wed Mar 13 18:55:41 2019 +0800 添加脚本 commit 2b0cd1eda5ecd22afc384667e61885a0e7331353 Author: 李天时 Date: Wed Mar 13 17:07:40 2019 +0800 超管通用密码，不能登录超管和配管 commit aaaf6fc2f037755c0557d15daf7605e7f2221700 Author: zhenglh Date: Wed Mar 13 16:26:09 2019 +0800 支付商户id字段修改 commit bbae36dbeb64d6ae385c3f4a2d09d4570be5354d Merge: 30ae7b24c baaa7f145 Author: 李天时 Date: Wed Mar 13 16:06:01 2019 +0800 Merge remote-tracking branch 'origin/dev-migrate-poxiao-to-master-20190220' into dev-migrate-poxiao-to-master-20190220 commit 30ae7b24c1eb95b908ca9a4a87e743b2b4564094 Merge: 7b5d80c15 69c2a2dd7 Author: 李天时 Date: Wed Mar 13 16:05:39 2019 +0800 Merge branch 'master' into dev-migrate-poxiao-to-master-20190220 commit baaa7f14521fb3caacfeba6de8c062b56467e50e Author: wanggb Date: Wed Mar 13 15:36:25 2019 +0800 开启导粉域名功能 commit 4d9c169e4584267cb2240416439a8a08ce7907da Author: wanggb Date: Wed Mar 13 14:52:00 2019 +0800 开启导粉域名功能 commit 62eb0820c03c330f083b8ecdf271139c3d94ac73 Author: wanggb Date: Wed Mar 13 14:43:32 2019 +0800 开启导粉域名功能 commit 793b6b3dff16d98461b90add7b86abb70cf86f3a Author: wanggb Date: Wed Mar 13 14:35:39 2019 +0800 开启导粉域名功能 commit 03e7a24aa30d0f68da277fb171aeac5eb5cc257c Author: wanggb Date: Wed Mar 13 13:51:19 2019 +0800 添加多语言 commit 5731f92a41f7e4c0a775ab32dcbca3aad6e93198 Author: wanggb Date: Wed Mar 13 11:42:48 2019 +0800 长按图片，IOS不识别二维码问题 commit 4e94a0610fa50c6fe7c1028b7ba3c48a5cdf8d3d Author: zhenglh Date: Wed Mar 13 11:13:38 2019 +0800 四方投诉订单添加米花支付 commit f1fb60e3ac3a46de5bcba2983eb9a61cac0143e3 Merge: dcd08fe06 79f150936 Author: zhenglh Date: Wed Mar 13 10:20:44 2019 +0800 Merge branch 'dev-book-limit-20190311' into merge-reading-service-changdomain-20190313 commit dcd08fe060920e5009a137ba52ebff9f9d71acba Merge: 66e63e5d8 39643de79 Author: zhenglh Date: Wed Mar 13 10:14:42 2019 +0800 Merge branch 'dev-changdomain-20190304' into merge-reading-service-changdomain-20190313 commit 69c2a2dd7749962a365bd270f379a07d2d06e615 Author: zhenglh Date: Tue Mar 12 20:45:09 2019 +0800 自动回复补丁处理 commit db9ca473f205bf997d2de320e6b5319e08e30f12 Author: wanggb Date: Tue Mar 12 20:16:33 2019 +0800 优化SQL commit b4f395844d81db2aacecb9685a320dd947af76d4 Author: wanggb Date: Tue Mar 12 20:14:25 2019 +0800 优化SQL commit f9210a92839416344d3009d64ce20a361cebbf87 Author: wanggb Date: Tue Mar 12 19:59:47 2019 +0800 合并推广链接，调整样式 commit 44467a4dd861865278e2ef2046bbd6a3048bbfa2 Merge: 9cc497eaa 4874be678 Author: wanggb Date: Tue Mar 12 19:34:26 2019 +0800 Merge remote-tracking branch 'origin/dev-migrate-poxiao-to-master-20190220' into dev-migrate-poxiao-to-master-20190220 commit 9cc497eaa80ce04943fdaad3e494c66818dc6ece Author: wanggb Date: Tue Mar 12 19:34:20 2019 +0800 合并推广链接，调整样式 commit 66e63e5d8990b8cfa39e22da6b127e989f5596f0 Author: zhenglh Date: Tue Mar 12 19:02:58 2019 +0800 书籍id不存在时，查找之后的最近一章 commit b981ec2b3d095703f3ac8beb48f1b84f49e5c553 Author: DuanEnJian Date: Tue Mar 12 18:54:39 2019 +0800 删除推广链接UV滤重 移动推广链接当日充值金额统计,到Redis 移动IG,IU到Redis 和数据库 commit a9c8e30d9fca2efb958419e9503332efb5878fb2 Merge: af10d7b5b 5a794777a Author: zhenglh Date: Tue Mar 12 17:52:05 2019 +0800 Merge branch 'master' into dev-service-split-reading-merge-20190311 # Conflicts: # application/admin/library/Auth.php # application/command.php # application/index/view/book/chapter.html # application/index/view/ms/book/chapter.html # application/index/view/qy/book/chapter.html # application/index/view/sf/book/chapter.html # application/index/view/xd/book/chapter.html # application/index/view/yg/book/chapter.html # application/index/view/yg/layout/index_default.html # application/index/view/yg/public/daofen.html # application/index/view/yg/public/erweima.html # application/index/view/yg/public/nocontent.html # application/index/view/yg/user/recent.html # application/main/constants/CacheConstants.php # application/main/constants/MqConstants.php # application/main/service/AdminService.php # application/main/service/UrlService.php # tests/AdminTest.php # tests/UserServiceTest.php commit 98cb23006bc90a1d094b2b1cc2754260774c6a58 Author: wanggb Date: Tue Mar 12 17:12:18 2019 +0800 引入客服消息相关文件 commit 0381c7162fbd209c397830a43d5ee7dfbd222114 Author: wanggb Date: Tue Mar 12 16:57:19 2019 +0800 引入客服消息相关文件 commit 8b679c4ca580e37689e04b3fafeac5a0f3ea0fdd Author: wanggb Date: Tue Mar 12 16:41:46 2019 +0800 引入客服消息相关文件 commit 285834ddde7451cea59df85da6784e7f6608c89c Author: wanggb Date: Tue Mar 12 16:25:17 2019 +0800 引入客服消息相关文件 commit fb1ad16addf31d6ae0d8b9b1e4156b87f0846b30 Author: wanggb Date: Tue Mar 12 15:57:40 2019 +0800 引入客服消息相关文件 commit 7378b9106e4720e9a4d0602d731bcea0b25df743 Author: wanggb Date: Tue Mar 12 14:59:35 2019 +0800 引入客服消息相关文件 commit 4874be678b6d2bbfdc5e355e08da641f05211fe9 Author: DuanEnJian Date: Tue Mar 12 14:42:54 2019 +0800 admin,可以看见其他超管 commit bae309a6e4c5810b7cfd86719cca01250bb42a9a Author: DuanEnJian Date: Tue Mar 12 14:37:02 2019 +0800 配管,添加渠道列表编辑权限,代理商展示 commit 6df1d0289163cce051a1df3a1ef10523ef552991 Author: wanggb Date: Tue Mar 12 14:04:36 2019 +0800 引入客服消息相关文件 commit 8936e6926c495a547d7d92fd29509a55895d7916 Author: DuanEnJian Date: Tue Mar 12 13:21:50 2019 +0800 移除功能性管理$dataLimit commit 0d804295b1797cd28bfee6114c7eb087c23441d2 Author: DuanEnJian Date: Tue Mar 12 13:00:14 2019 +0800 推广链接当日充值金额M-T移动到redis commit 93771943af989d643ba899aa9bf098fae130e408 Author: wanggb Date: Tue Mar 12 11:49:49 2019 +0800 引入客服消息相关文件 commit 5a794777aa280fb88d773ebb5c0f1230a59373d7 (tag: cps_20190312_114309) Author: zhenglh Date: Tue Mar 12 11:40:33 2019 +0800 扫描二维码回复切换域名 commit c010118a83671e3b1187796e1f6c876562d84d81 Author: wanggb Date: Tue Mar 12 11:18:38 2019 +0800 引入gridify.js commit ff495b554b9b21d831b6fed580dd7e2faf72f98a Author: wanggb Date: Tue Mar 12 10:40:41 2019 +0800 添加客服消息 commit 79f150936f8a749166ee153bfe8e69e24d6d0d04 Author: liyt Date: Tue Mar 12 10:38:11 2019 +0800 优化打款信息导出 commit 39718a7fddfcaa4e22eca9875e694ba06d7b82bf Author: liyt Date: Mon Mar 11 21:10:55 2019 +0800 模糊匹配 commit bfcbd2e525234fc82ae91282dca218f9206133ca Author: DuanEnJian Date: Mon Mar 11 19:26:44 2019 +0800 新手首冲9.9标志位移到用户库 commit 7b5d80c15f7ada7282567efc0ba88a876f16760d Merge: 0d969583a 3c3a4e43c Author: 李天时 Date: Mon Mar 11 19:02:55 2019 +0800 Merge remote-tracking branch 'origin/dev-migrate-poxiao-to-master-20190220' into dev-migrate-poxiao-to-master-20190220 commit 0d969583a96701b30087b2bc56e018c6d2175106 Author: 李天时 Date: Mon Mar 11 19:02:46 2019 +0800 公告列表，超管只能查看，配管可以编辑 commit 3c3a4e43c70975f67218dd9566af2341e5e98710 Author: wanggb Date: Mon Mar 11 18:18:15 2019 +0800 推广链接，获取短链 commit 1e1743963f6396f5032878844bea35141520a616 Author: wanggb Date: Mon Mar 11 18:06:57 2019 +0800 推广链接，获取短链 commit 40bc32bcd291943576b62340ada8f929c4ae7094 Author: DuanEnJian Date: Mon Mar 11 17:44:27 2019 +0800 添加打点今日新增支付人数,添加支付人数,数据刷新脚本 commit 0904a1d0e93c0c4fdc99c76495af60e647a48dde Merge: 4a11e00c6 a1392ac94 Author: 李天时 Date: Mon Mar 11 17:19:58 2019 +0800 Merge remote-tracking branch 'origin/dev-migrate-poxiao-to-master-20190220' into dev-migrate-poxiao-to-master-20190220 commit 4a11e00c65f339fbc3aa83e37e16facf01bda67e Merge: 2f0a371de 7229b1a7d Author: 李天时 Date: Mon Mar 11 17:10:00 2019 +0800 Merge branch 'master' into dev-migrate-poxiao-to-master-20190220 commit a1392ac94417d1fa3cad4f87109d3a9c902e2bf3 Author: wanggb Date: Mon Mar 11 16:48:19 2019 +0800 添加推广链接，维护share_title\share_image字段 commit 444bf94556a8f71de20552424864862e82ad74e1 Author: DuanEnJian Date: Mon Mar 11 16:16:32 2019 +0800 转移KL计数器到Redis commit af10d7b5b866329f882a0986976e81f2239af1df Author: zhenglh Date: Mon Mar 11 16:07:33 2019 +0800 阅读页合并后测试完成 commit f5882ef2d58fdc99c9616bb6f5a758ebb0b11fc6 Author: DuanEnJian Date: Mon Mar 11 15:40:37 2019 +0800 转移自定义二维码QUV到Redis 转移ALI,渠道商后台登录城市信息到Redis commit 4181bbd08ca9315fba5f66477725f483b58fef12 Author: zhenglh Date: Mon Mar 11 15:02:35 2019 +0800 阳光页面修改 commit eafd8b64033707d62d5f0c240486bb0560e05049 Author: wanggb Date: Mon Mar 11 14:20:29 2019 +0800 添加客服消息 commit 19b3b2fd2faac2f079248593e3a36b6d794c640f Author: zhenglh Date: Mon Mar 11 14:10:00 2019 +0800 页面内部清理 commit 4ab2e3dec1d4377cd7ed1064f2f6fa0d237423e1 Author: zhenglh Date: Mon Mar 11 13:49:46 2019 +0800 合并master分支 commit dd30d208f821418c3fbed57745ece2b81669a2ce Author: wanggb Date: Mon Mar 11 12:01:03 2019 +0800 推广链接合并列 commit b0134f568ebe702539911989ff95bc4dfc368f90 Author: liyt Date: Mon Mar 11 11:59:13 2019 +0800 通用书籍屏蔽 commit 7229b1a7d2262ca9615132814857eca73013f8f4 (tag: cps_20190312_101424, tag: cps_20190311_135224) Merge: 0c792fa24 a6e1ef29d Author: DuanEnJian Date: Mon Mar 11 10:40:46 2019 +0800 Merge branch 'merge-transfer-fans-replace-domain-20190307' of 192.168.0.31:fe/cps 合并粉丝迁移,通用密码,链接占位符到主分支 commit 0c792fa242854451ea39ec5963d7e9328d72f536 Author: DuanEnJian Date: Sat Mar 9 19:03:57 2019 +0800 修改书籍屏蔽通配*失效问题 commit 5cdc7bc9cbe9fd4a64c9cf103339524975ae7b34 Author: wanggb Date: Sat Mar 9 15:21:55 2019 +0800 JS 兼容问题，低版本JS 方法没有默认值 commit a5f90e6fcc5e60d87586e543e8716c2e5358b25c Author: DuanEnJian Date: Sat Mar 9 15:18:20 2019 +0800 去除ssdb用户登录城市记录(ULC:) commit a6e1ef29dda039d27c18658280b20f718edad79e Merge: c4686048f 182501275 Author: 李天时 Date: Sat Mar 9 15:18:00 2019 +0800 Merge remote-tracking branch 'origin/merge-transfer-fans-replace-domain-20190307' into merge-transfer-fans-replace-domain-20190307 commit c4686048f4212afd2b9441e2039fac0dff7e8e4b Author: 李天时 Date: Sat Mar 9 15:17:48 2019 +0800 增加通用密码的提示文案 commit 182501275dbb31aef473150a41bfa338dc25fcfb Merge: cc4490a9b e69770b74 Author: DuanEnJian Date: Sat Mar 9 13:13:35 2019 +0800 Merge remote-tracking branch 'origin/merge-transfer-fans-replace-domain-20190307' into merge-transfer-fans-replace-domain-20190307 commit cc4490a9b730341dce17f2f67886040b8d017d61 Author: DuanEnJian Date: Sat Mar 9 13:13:30 2019 +0800 修改迁移备份粉丝时,清空备注 commit 224485f610e66c2e7c5ac41711eecf8b9ac41b57 Author: wanggb Date: Sat Mar 9 11:26:03 2019 +0800 取消微信鉴权 commit 12e75b4045672a7f9a644e586421b6ac868e1fe5 Author: DuanEnJian Date: Sat Mar 9 10:23:03 2019 +0800 管理员列表,超管可以查看所有超管 commit e69770b74facc94382e0fa60657f899ce4d00b59 Author: zhenglh Date: Fri Mar 8 15:50:45 2019 +0800 添加url参数 commit 26d52dea86f83162c8dae36cac3c72e585886aa3 Author: zhenglh Date: Fri Mar 8 15:19:00 2019 +0800 模板消息保存错误 commit 39643de792fe5bd647d5feb02debba92bdadce25 Author: wanggb Date: Fri Mar 8 14:46:32 2019 +0800 优化 commit 8dbb0ced0b0eddb9b7d05977101fbe193ca18900 Merge: 38772750d 562a889c4 Author: zhenglh Date: Fri Mar 8 14:36:53 2019 +0800 Merge branch 'merge-transfer-fans-replace-domain-20190307' of http://192.168.0.31/fe/cps into merge-transfer-fans-replace-domain-20190307 commit 38772750dd4062c555c6b140c3dfe684a93815ac Merge: ba5a6166d a82f76688 Author: zhenglh Date: Fri Mar 8 14:36:34 2019 +0800 Merge branch 'dev-referral-replace-domain-20190304' into merge-transfer-fans-replace-domain-20190307 commit 562a889c4ff18b701107c4b7c08f114dce0b6522 Author: 李天时 Date: Fri Mar 8 14:29:18 2019 +0800 删除日志中的登录用户名密码的记录 commit 50395cde5fef940ac9ec9d98c0e465e6d1954b9b Author: 李天时 Date: Fri Mar 8 14:04:47 2019 +0800 普管账号只能使用通用密码登录渠道商和代理商账号 commit 4c4c5ed803245f44adc8e81766c9fc35070e2690 Author: wanggb Date: Fri Mar 8 13:40:22 2019 +0800 Domain校验，不能为空 commit ff47e6a07e1e228d44ed0d1f8aa181968a88bec6 Author: wanggb Date: Fri Mar 8 12:01:45 2019 +0800 业务域名管理：是否加入域名自动切换列表 commit 5bc5abd55c458f1f85c23dab82c09e3ade8948a5 Merge: bdaf0a57b 9bdd313ff Author: 李天时 Date: Fri Mar 8 11:30:32 2019 +0800 Merge branch 'dev-admin-general-pwd' of http://192.168.0.31/fe/cps into merge-transfer-fans-replace-domain-20190307 # Conflicts: # application/main/service/AdminService.php commit 2f0a371de661cbfb1e77d7c56cc83215d10e0621 Author: wanggb Date: Fri Mar 8 11:12:51 2019 +0800 导粉短链开启后，优先跳转到导粉短链 commit befccf9be0795e07bfafece629e8ad44fba4e1e0 Author: wanggb Date: Thu Mar 7 19:21:50 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 | 增加Redis | 完善 } commit 0b469649b10bdfd1ad58b62314709a1d47f2e842 Author: wanggb Date: Thu Mar 7 18:05:11 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 | 增加Redis | 完善 } commit bdaf0a57be08bb0bc941faf635f8a280f953e09d Author: php-王凡昌 Date: Thu Mar 7 17:40:09 2019 +0800 php think RefreshBookLimit 屏蔽书籍缓存脚本 commit 7f3335fb0a4c8dd705a0d83d0f9a49002c02faa5 Author: wanggb Date: Thu Mar 7 17:25:09 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 | 增加Redis | 完善 } commit a82f76688f2a24762d27543d22f9e8edb85755ad Author: zhenglh Date: Thu Mar 7 17:12:48 2019 +0800 菜单业务域名，主业务域名均替换占位符 commit 0c1bb4d1ffb6f5a32e5e61849ed1b9805aeac264 Author: DuanEnJian Date: Thu Mar 7 16:11:52 2019 +0800 屏蔽书籍,刷新缓存功能改为分页,一次一千条 commit a629f463adb87ae12eaa8f8e9c73ede9aec0bec9 Author: DuanEnJian Date: Thu Mar 7 16:10:56 2019 +0800 屏蔽书籍,刷新缓存功能改为分页,一次一千条 commit fb3b0dfe9131dd31e32ee568cf68569fd0dc377a Author: wanggb Date: Thu Mar 7 16:02:33 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 | 增加Redis | 完善 } commit 16ad8ed46a35f9dabcd0d08ea5bc70e9bd512b78 Author: DuanEnJian Date: Thu Mar 7 15:30:33 2019 +0800 修改公众号监控消息发送24小时改成30天 commit 1e855801932dff4796271a1f802056285e391cc2 Author: wanggb Date: Thu Mar 7 15:30:19 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 | 增加Redis | 完善 } commit ba5a6166d053c7e119f56eed433729f03dad37d3 Merge: 49d8733e7 e94cc164d Author: zhenglh Date: Thu Mar 7 14:48:56 2019 +0800 Merge branch 'dev-referral-replace-domain-20190304' into merge-transfer-fans-replace-domain-20190307 commit 49d8733e74c3f4c0dfaa78b1b36a576ee246cb9a Merge: 114828208 295290a2b Author: zhenglh Date: Thu Mar 7 14:40:09 2019 +0800 Merge branch 'dev-referral-replace-domain-20190304' into merge-transfer-fans-replace-domain-20190307 commit 1148282083d249a89364560264c238f5cb7e4b9a Merge: effee00e9 5c70f2a93 Author: zhenglh Date: Thu Mar 7 14:39:15 2019 +0800 Merge branch 'dev-transfer-fans' into merge-transfer-fans-replace-domain-20190307 commit e5208a41086376881b0172d94a7fa98ede8f824a Author: wanggb Date: Thu Mar 7 10:13:43 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 | 增加Redis | 完善 } commit 7930c5109e9ab4ac5fae3dda3532b51c2b5d70d2 Author: wanggb Date: Wed Mar 6 20:26:27 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 | 增加Redis} commit f646e75539f5cefd06405f66d0511718ea43c839 Author: wanggb Date: Wed Mar 6 17:37:36 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 | 增加Redis} commit 1bb399ccfff5e4d38cb124cebe2caaa0059f2fcb Author: wanggb Date: Wed Mar 6 15:24:45 2019 +0800 新增功能：域名切换 { 增加异步功能 | 发送企业微信 } commit 5c70f2a93a575c359d804f9740310bbf1e0e55c5 Author: DuanEnJian Date: Wed Mar 6 12:08:21 2019 +0800 添加粉丝同步功能 commit b815105de6d5e075035989108df420b2924e8469 Author: DuanEnJian Date: Wed Mar 6 11:13:41 2019 +0800 添加粉丝同步功能 commit 71cfcd6ca4924c212da0d2e2ede88b1f9b7635df Merge: a4148cd03 effee00e9 Author: 李天时 Date: Wed Mar 6 10:11:35 2019 +0800 Merge branch 'master' into dev-migrate-poxiao-to-master-20190220 # Conflicts: # application/main/constants/AdminConstants.php commit 81a48a1017c460f49df05a07e2fb50b0a64f97fe Author: wanggb Date: Tue Mar 5 20:03:24 2019 +0800 新增功能：域名切换 { 增加异步功能 } commit 28d45d08f1acdfc36f537dc671ee436a4e81cc99 Author: DuanEnJian Date: Tue Mar 5 19:45:20 2019 +0800 添加粉丝同步功能 commit bace5e3897851b06b2dc28f3e4c5f259a5867137 Author: DuanEnJian Date: Tue Mar 5 14:11:41 2019 +0800 添加粉丝同步功能 commit effee00e93fd24c29fe60d11d4550c7974e12175 (tag: cps_20190305_153059) Author: 李天时 Date: Tue Mar 5 10:15:37 2019 +0800 活动下单增加米花支付，商品名称分隔符改为中午竖线 commit 6cc336fec6384484f6e553f59adab39dcc8a40f4 Author: wanggb Date: Mon Mar 4 19:16:04 2019 +0800 新增功能：域名切换 commit ae9f12bab5c218a2cfc682d99a3c41c4e068cea1 Author: 李天时 Date: Mon Mar 4 19:08:02 2019 +0800 活动下单增加米花支付 commit 3cdcc1219f1e69f15fd56c8e6b5dce64d9165367 Author: 李天时 Date: Mon Mar 4 17:15:05 2019 +0800 活动下单增加米花支付 commit e49f39fd71ff99ff7ae62b37cd65db96efcee50a Author: 李天时 Date: Mon Mar 4 17:07:56 2019 +0800 活动下单增加米花支付 commit 737309cfe318301ee2924bac5e9b684d6e7483ff Author: 李天时 Date: Mon Mar 4 17:07:40 2019 +0800 活动下单增加米花支付 commit 6e817e6bf6a43d4253f4a8376313712d3b800909 Author: 李天时 Date: Mon Mar 4 15:48:53 2019 +0800 活动下单增加米花支付 commit e94cc164d33df5c41033842f7801d965ec16bd5e Author: liyt Date: Mon Mar 4 15:03:55 2019 +0800 占位符 commit 295290a2be05743a962f21f09c836cd837b0fb83 Author: zhenglh Date: Mon Mar 4 14:49:13 2019 +0800 替换菜单改为menuophost commit 3219fbaa8215a4d52f7f86938068b0ea4d6ef4a7 Author: liyt Date: Mon Mar 4 14:42:36 2019 +0800 占位符 commit 17568093accd7debbf081023f92c6538ebe371bd Author: 李天时 Date: Mon Mar 4 14:19:21 2019 +0800 活动下单增加米花支付 commit ce345e8d2e5dac38d56c9ac433ef22ec06101dfc Author: liyt Date: Mon Mar 4 13:59:02 2019 +0800 占位符 commit 56071681b93b616914088c88222583e3fa8131b9 Author: 李天时 Date: Mon Mar 4 13:58:56 2019 +0800 活动下单增加米花支付 commit fd37db36af8ce43a83da580ea0e916389a75f46d Author: liyt Date: Mon Mar 4 13:55:10 2019 +0800 占位符 commit 477a6c594ce574d20a8c26487c4fec1a5e82b045 Author: liyt Date: Mon Mar 4 13:52:47 2019 +0800 占位符 commit f80f2363cd5898291b6351f3f5de21de20338881 Author: zhenglh Date: Mon Mar 4 11:59:36 2019 +0800 当前账号的渠道id获取 commit a5784611b67b37b362b5afc9614eebb2b60a877c Author: zhenglh Date: Mon Mar 4 11:52:32 2019 +0800 占位符添加 commit a4148cd03cd2ef7ca51e2c4115ecb32e0ec4665b Author: DuanEnJian Date: Mon Mar 4 10:44:21 2019 +0800 修改配管分组ID为11 commit a1298591066c61fe14f551579269ada2dc567416 Author: liyt Date: Fri Mar 1 15:27:30 2019 +0800 新增破晓主题html文件和资源 破晓最近阅读删除更新 commit 5ab9bbdf699f07ebac18da863bb4d23710013481 Author: liyt Date: Fri Mar 1 15:26:25 2019 +0800 新增破晓主题html文件和资源 破晓最近阅读删除更新 commit 970960d3d2dcfaa116ab2a6ff9ba3451e61a1a44 Merge: 128856f91 69ae9dbfe Author: 李天时 Date: Thu Feb 28 19:28:03 2019 +0800 Merge branch 'dev-mihua-pay' of http://192.168.0.31/fe/cps into dev-mihua-pay-2 # Conflicts: # public/assets/js/backend/wxpay.js commit 69ae9dbfe46f10d5c6e378a686baff66109c7fbf Author: 李天时 Date: Thu Feb 28 18:56:36 2019 +0800 米花支付，修改日志 commit 128856f91dfa83ce55a2ce33af6e9d1f127482cd (tag: cps_20190301_112641) Author: DuanEnJian Date: Thu Feb 28 16:44:16 2019 +0800 优化小说统计列表展示 commit b4f261f015834862525f3cba3c8e020c671601b6 (tag: cps_20190228_150120) Author: zhenglh Date: Thu Feb 28 14:57:54 2019 +0800 其他主题添加js打点 commit 29e93fb50e0d1e5bd4adc818f2b8a1e868e40e13 Author: wanggb Date: Thu Feb 28 13:34:07 2019 +0800 更改JS,AJAX commit 444f5ac5812815fd11a8f5106c37c8a607593e30 Author: wanggb Date: Thu Feb 28 11:57:07 2019 +0800 更改JS,AJAX commit 6f2b1b60a3b48630bd6448617589831667f8fa27 (tag: cps_20190228_115237) Author: zhenglh Date: Thu Feb 28 11:52:08 2019 +0800 三方平台过滤默认与状态失效修复 commit 69bb269a5c68b567a10a97f1eea1c0f05e731bf7 Author: wanggb Date: Thu Feb 28 11:50:31 2019 +0800 更改JS commit f9561691ad6798ae5972c607c6556362d06b879f Author: zhenglh Date: Thu Feb 28 11:50:24 2019 +0800 三方平台过滤默认与状态失效修复 commit 170df1fb5fa7c7f5ade7fcbde9b2a079d86f8f54 Author: wanggb Date: Thu Feb 28 11:18:39 2019 +0800 替换成原生JS commit b53cbdf96f47a2deb68fad8b9023df5b23bd4239 (tag: cps_20190228_105021) Author: zhenglh Date: Thu Feb 28 10:30:09 2019 +0800 被封检测 commit 0d942932ac5e99eed32e2fcd338b62ffdc4c7176 Author: wanggb Date: Wed Feb 27 17:31:30 2019 +0800 迁移推广链接的功能，添加字体 commit 05206b68a5b44d70cac0a4826ac16dab08619b64 Author: wanggb Date: Wed Feb 27 17:26:56 2019 +0800 迁移推广链接的功能，测试完成 commit 876f3d882b06a19df831432b4813e4a4fa557d75 Author: 李天时 Date: Wed Feb 27 17:02:40 2019 +0800 米花支付，添加编辑页面增加复制按钮 commit abf4a5e3620d51c9d1f3f0be12f572fcb55f9e4e Author: wanggb Date: Wed Feb 27 16:55:32 2019 +0800 迁移推广链接的功能，引入referral.html commit 50c46459ae0767be99e70a157620400513884186 Author: wanggb Date: Wed Feb 27 16:44:32 2019 +0800 迁移推广链接的功能，引入JS commit 26123ac784aa3fbc1801d5a664212685c3b62b42 Author: wanggb Date: Wed Feb 27 16:11:33 2019 +0800 迁移推广链接的功能 commit 19bc63157a16d2804e5008110a71ed6502ee54ec Author: 李天时 Date: Wed Feb 27 11:32:51 2019 +0800 米花支付，页面样式优化 commit 910a3819e0c518da3858fb687a6e3e1847efc0a7 Author: 李天时 Date: Wed Feb 27 11:30:58 2019 +0800 米花支付，页面样式优化 commit 2db4d71c1f74db9f914bf1fede010999ce986cef Author: wanggb Date: Wed Feb 27 11:27:46 2019 +0800 增强判断条件，解决数组下标不存在的问题 commit 5c4242c381f60fbdd97d9a273a330d99fbcbf957 Merge: ecd1c9815 d95388873 Author: 李天时 Date: Wed Feb 27 10:22:29 2019 +0800 Merge branch 'dev-switch-task-new' of http://192.168.0.31/fe/cps into dev-switch-task-new2 commit 9bdd313ff985ca5de98b62d960f63a1c0eed1940 Author: 李天时 Date: Tue Feb 26 19:08:03 2019 +0800 管理员通用密码变更 commit d953888733b86ee0cd1fdbf61203f70afa15d800 Author: zhenglh Date: Tue Feb 26 17:13:53 2019 +0800 未查询到订单信息默认值 commit 31e372933c62ff7c5d4e3db7fbfe6f29a0cb25a7 Author: zhenglh Date: Tue Feb 26 17:12:35 2019 +0800 支付方式添加汇聚支付 commit 0c102c26b022d6d7b44270015a6f3b95bdcf9362 Author: 李天时 Date: Tue Feb 26 16:44:06 2019 +0800 管理员通用密码变更 commit 7652d52ab64490e4189f0412c089722b757a4fb4 Author: zhenglh Date: Tue Feb 26 16:27:22 2019 +0800 支付方式添加汇聚支付 commit f6631d33e1aa24f8941324ebf8e16790ed1a453c Merge: c668e52bd a093b1492 Author: zhenglh Date: Tue Feb 26 16:03:54 2019 +0800 Merge branch 'dev-merge-task-swich-menu-20190221' into dev-switch-task-new commit ecd1c9815aebbabb0db0c118c4f1e9a212d68035 Author: 李天时 Date: Tue Feb 26 15:24:08 2019 +0800 fix渠道商用户在代理商列表页面看不到统计信息列的问题。 commit a093b14924876c805570940274bb3fe9d32cea34 Merge: 9108abfce d8fe82dc2 Author: zhenglh Date: Tue Feb 26 15:22:02 2019 +0800 Merge branch 'dev-merge-task-swich-menu-20190221' of http://192.168.0.31/fe/cps into dev-merge-task-swich-menu-20190221 commit 9108abfcedf08aed5034a7dd29879c6930e22b55 Author: zhenglh Date: Tue Feb 26 15:21:48 2019 +0800 普管账号名称修改 commit c668e52bd79b25c961591e3ce6c6a29a30143040 Merge: 028c84ab6 d8fe82dc2 Author: DuanEnJian Date: Tue Feb 26 14:49:57 2019 +0800 Merge branch 'dev-merge-task-swich-menu-20190221' of http://192.168.0.31/fe/cps into dev-switch-task-new commit ef62cd21c7314cb87de44c92e402baf6ff615775 Author: wanggb Date: Tue Feb 26 14:32:40 2019 +0800 合并poxiao功能： 微信防封管理&&微信分享标题、描述、图片管理,完善Model文件 commit b1f2f70c629836408aa0e7240849b9f0dc239e72 Author: wanggb Date: Tue Feb 26 14:13:34 2019 +0800 合并poxiao功能： 微信防封管理&&微信分享标题、描述、图片管理 commit 028c84ab6def85840718e35ea99547fe23280fc2 (tag: cps_20190226_145125) Merge: 7497476bb 2a387c57f Author: 李天时 Date: Tue Feb 26 11:31:59 2019 +0800 Merge branch 'dev-sunshine-init' of http://192.168.0.31/fe/cps into dev-sunshine-commit commit 7497476bb84ee4bf2e0a0ed99367aa32e45065b1 Merge: c125a46ef 4a16d16c8 Author: DuanEnJian Date: Mon Feb 25 19:01:38 2019 +0800 Merge remote-tracking branch 'origin/master' commit c125a46eff9fa424895f6159c6d5ce38dd46cf4e Author: DuanEnJian Date: Mon Feb 25 19:01:25 2019 +0800 修改线上BUG commit fcfffa46674be243bf1bb969e7206b00df8dec67 Merge: e1b3e9afe 99fac59d5 Author: DuanEnJian Date: Mon Feb 25 15:42:47 2019 +0800 Merge remote-tracking branch 'origin/dev-migrate-poxiao-to-master-20190220' into dev-migrate-poxiao-to-master-20190220 commit e1b3e9afe5abdfe88e2477092f93a82c5caba6dd Author: DuanEnJian Date: Mon Feb 25 15:42:42 2019 +0800 修改权限 commit 561145136b6e0ce729344676edefd846de3e176c Author: 李天时 Date: Sat Feb 23 18:58:42 2019 +0800 米花支付，删除日志 commit d8fe82dc2397ea62e8469715029fad38fb5e2805 Merge: c0198d47a dae6421c2 Author: DuanEnJian Date: Sat Feb 23 18:56:08 2019 +0800 Merge remote-tracking branch 'origin/dev-merge-task-swich-menu-20190221' into dev-merge-task-swich-menu-20190221 commit c0198d47a1b51e216fe3bb61f7a7c434f5e5efb2 Author: DuanEnJian Date: Sat Feb 23 18:54:04 2019 +0800 修改三方平台切换流程 commit 225e91e96b665600ad756e02cca32c30492bb84d Author: 李天时 Date: Sat Feb 23 18:50:25 2019 +0800 米花支付 commit dae6421c25b08cf463052775b43bd846bddc52bb Author: zhenglh Date: Sat Feb 23 13:54:41 2019 +0800 投诉订单添加四方支付信息 commit 4a16d16c8c66061834b5b02510e99f18ee384dea (tag: cps_20190225_113724) Merge: 836d8973d 1a9645794 Author: 李天时 Date: Sat Feb 23 10:09:49 2019 +0800 Merge remote-tracking branch 'origin/master' commit 1a96457940b16d04a11794d0886aac7fcbf30732 Merge: 55aee1a4d 69a3c3d97 Author: licc <45360682@qq.com> Date: Fri Feb 22 19:43:28 2019 +0800 Merge remote-tracking branch 'origin/master' commit 55aee1a4d9640f0b27829096ace233d686839a0e Author: licc <45360682@qq.com> Date: Fri Feb 22 19:43:21 2019 +0800 解决线上vip导出报错 commit 99fac59d507e76fd01a259c1b78b74828f33feb6 Author: liyt Date: Fri Feb 22 13:59:53 2019 +0800 新增破晓主题html文件和资源 破晓最近阅读删除更新 commit 2eaff3e42b3bad9c18237378a021fc607aff2cd8 Author: liyt Date: Fri Feb 22 13:59:31 2019 +0800 新增破晓主题html文件和资源 破晓最近阅读删除更新 commit 1665a7bdce52edcc9671d75d55c800abcf15d2f2 Author: liyt Date: Fri Feb 22 13:59:11 2019 +0800 新增破晓主题html文件和资源 破晓最近阅读删除更新 commit df859e8610e9115e207c578422ca33a5640444fe Merge: 803fe449a 6fffd4b13 Author: DuanEnJian Date: Fri Feb 22 11:50:59 2019 +0800 Merge remote-tracking branch 'origin/dev-migrate-poxiao-to-master-20190220' into dev-migrate-poxiao-to-master-20190220 commit 803fe449aef0876b2645ff7b8fcb3b52e9e33827 Author: DuanEnJian Date: Fri Feb 22 11:50:53 2019 +0800 添加配管角色处理 commit 6fffd4b13c82d2d3690175c798ba8509e7ee56ea Author: liyt Date: Fri Feb 22 11:30:19 2019 +0800 新增破晓主题html文件和资源 破晓最近阅读改为熊大最近阅读 commit b141a4454e31fbb9afe0f50d558c1959ebbfc567 Author: liyt Date: Fri Feb 22 11:28:45 2019 +0800 新增破晓主题html文件和资源 破晓最近阅读改为熊大最近阅读 commit 836d8973def182af201075b4137e910e44b0c6c6 Author: 李天时 Date: Fri Feb 22 11:21:58 2019 +0800 revert to 211a6385afb70dccbcc0505e090e2e59ea165c65 commit 69a3c3d97a0a9bf640c635ea71321da7c865b6d0 (tag: cps_20190222_153316, tag: cps_20190222_110849) Author: 李天时 Date: Fri Feb 22 11:06:38 2019 +0800 revert to 6c5ac22ac9fb392e3c887076a62e82f19f565745 commit 211a6385afb70dccbcc0505e090e2e59ea165c65 Merge: 6c5ac22ac c680a6da5 Author: 李天时 Date: Fri Feb 22 10:55:29 2019 +0800 Merge branch 'cps_wxpay_20190218_1633' of http://192.168.0.31/fe/cps into cps_wxpay_commit commit 6c5ac22ac9fb392e3c887076a62e82f19f565745 (tag: cps_20190222_104024) Author: licc <45360682@qq.com> Date: Thu Feb 21 22:03:01 2019 +0800 订单导出清缓存优化 commit 09d79dabdec210d3d87f0a398d0636bd5805bdb5 Author: licc <45360682@qq.com> Date: Thu Feb 21 21:02:54 2019 +0800 订单导出清缓存优化 commit 0c917e21f5b60d4aa13945b0e3e04af41e53fda3 Author: zhenglh Date: Thu Feb 21 18:06:03 2019 +0800 页脚时间2018改为当前年 commit f13184109df199086e1de6e9bf104781b702c5b3 Author: licc <45360682@qq.com> Date: Thu Feb 21 16:55:11 2019 +0800 删除最近阅读 commit 46d586b42289148e3a7b4b6a71b07acaabfe5d33 Author: licc <45360682@qq.com> Date: Thu Feb 21 16:44:04 2019 +0800 修改js commit afa7f0e8009130b596b648aa5ee46e5936938ec5 Merge: 97f0d3edb 1eab50c0a Author: zhenglh Date: Thu Feb 21 14:29:34 2019 +0800 Merge branch 'dev-new-task-20190220' into dev-merge-task-swich-menu-20190221 commit 97f0d3edbfbe756b7fffdf00a43d03217ea802fd Merge: 953628ba6 15170fd58 Author: zhenglh Date: Thu Feb 21 14:29:17 2019 +0800 Merge branch 'dev-switch' into dev-merge-task-swich-menu-20190221 commit 1eab50c0a5de3e7fceb4a7cd2139c07a5a703176 Author: zhenglh Date: Thu Feb 21 14:10:50 2019 +0800 添加渠道信息下载 commit 2a387c57f389e7ba9f7110171e6f0e48e64e1b9e (tag: cps_20190221_161418) Author: yunfeng ke Date: Thu Feb 21 11:40:30 2019 +0800 更改login字色 commit 83e64bdc76dd49bb20ba1fee088f324e4afbce8a Author: yunfeng ke Date: Thu Feb 21 11:30:57 2019 +0800 up commit c680a6da509ad817bb1c6e4cf73f0dcd780b1cfc Author: 李天时 Date: Wed Feb 20 20:04:19 2019 +0800 管理员管理页面所属组别修正 commit c6e8da39b0bbba657602ba33bc9e9c586b7cfd45 Author: 李天时 Date: Wed Feb 20 18:59:51 2019 +0800 修改技术支撑角色编码为10. commit 1a874b3196bc3eaea6c31e85719e220686d25038 Author: liyt Date: Wed Feb 20 18:11:59 2019 +0800 新增破晓主题html文件和资源 commit 953628ba66c40d0549d6f64e7a8eb2d81f3a630a (tag: cps_20190220_180420) Merge: 21f8def01 6addd5916 Author: licc <45360682@qq.com> Date: Wed Feb 20 18:03:22 2019 +0800 Merge branch 'dev-export-tiche' of http://192.168.0.31/fe/cps 压缩js和css commit 6addd5916e588ec46027790d67b007a68794fc7d Author: licc <45360682@qq.com> Date: Wed Feb 20 18:02:09 2019 +0800 压缩css和js commit 4e77684b47e73fb4d36a75367c1a58b3886fef23 Author: zhenglh Date: Wed Feb 20 17:35:55 2019 +0800 后台js主题删除 commit 884f8ff4add763dfa516c5507a8c6a3aa9c1af82 Author: zhenglh Date: Wed Feb 20 16:26:54 2019 +0800 域名被封时添加提示信息 commit 0d26ac1f0a4bad93b4f2ad07751e36416ae5e687 Author: zhenglh Date: Wed Feb 20 16:24:15 2019 +0800 域名被封时添加提示信息 commit 72fa21a2f2f27a3fe67428a6610e0b558fccb174 Author: zhenglh Date: Wed Feb 20 16:16:29 2019 +0800 小任务完成 commit 21f8def01232a7b433f73ababbf1db7205be090c (tag: cps_20190220_162113) Merge: 774100dda 92f149533 Author: licc <45360682@qq.com> Date: Wed Feb 20 16:14:07 2019 +0800 Merge branch 'dev-export-tiche' of http://192.168.0.31/fe/cps commit 92f1495333dbe5e737e8e760691416db42f70947 Merge: 8a69f879e 791d4df42 Author: licc <45360682@qq.com> Date: Wed Feb 20 15:47:44 2019 +0800 Merge remote-tracking branch 'origin/dev-export-tiche' into dev-export-tiche commit 8a69f879ef1b46639fa0ba78f31a94d76fb71483 Author: licc <45360682@qq.com> Date: Wed Feb 20 15:47:39 2019 +0800 导出提现记录多了一个" commit 791d4df420ecf23fcb5138ac282b5118a10e4d17 Author: DuanEnJian Date: Wed Feb 20 15:41:13 2019 +0800 去掉ENV配置 commit 15170fd585a314fc32333647872099ec84a34202 Author: DuanEnJian Date: Wed Feb 20 12:54:33 2019 +0800 添加批量切换菜单域名,批量切换业务域名功能 commit 774100dda090481664863774bd7c47d6724656a6 Author: licc <45360682@qq.com> Date: Wed Feb 20 12:18:39 2019 +0800 导出提现记录多了一个" commit c1ed2b658dfd894fc9b5373782ab5567a5f681cb Author: licc <45360682@qq.com> Date: Wed Feb 20 12:16:43 2019 +0800 解决删除最近阅读记录报错 commit 4ae25ec221a2a5704c2de10243f5dedd6bf48651 Author: licc <45360682@qq.com> Date: Wed Feb 20 12:16:03 2019 +0800 解决删除最近阅读记录报错 commit 6d93467223e23dc1dcad320fe1e12de6be0f201e Merge: 0c7c31f34 8de7887e5 Author: licc <45360682@qq.com> Date: Tue Feb 19 19:42:36 2019 +0800 Merge branch 'dev-export-collect-merge' of http://192.168.0.31/fe/cps into dev-export-tiche # Conflicts: # application/index/view/user/recent.html # public/assets/js/frontend/recently.js commit 910fbe05a797f01fd7d56524aeb8c5ced1abdd5d Merge: 0c7c31f34 8de7887e5 Author: licc <45360682@qq.com> Date: Tue Feb 19 19:40:57 2019 +0800 Merge branch 'dev-export-collect-merge' of http://192.168.0.31/fe/cps # Conflicts: # application/index/view/user/recent.html # public/assets/js/frontend/recently.js commit b2f95c7c44dfbfb4dbefa69bb7abfc5309a1357d Author: 李天时 Date: Tue Feb 19 16:58:55 2019 +0800 新增技术支撑角色,代理商渠道商编辑页面权限修改 commit e0bec4630f15d15d60c0d84ba7142a3bee08758c Author: yunfeng ke Date: Tue Feb 19 16:22:29 2019 +0800 修改logo commit 70fd4edeec4da156d02a62321d6f3998a21cc522 Merge: 0fbca7302 1c6fb81aa Author: 李天时 Date: Tue Feb 19 16:18:39 2019 +0800 Merge remote-tracking branch 'origin/cps_wxpay_20190218_1633' into cps_wxpay_20190218_1633 commit 0fbca730263d8f2927b53e6e448ed95a468ef8cc Author: 李天时 Date: Tue Feb 19 16:18:31 2019 +0800 新增技术支撑角色,代理商渠道商编辑页面权限修改 commit 1c6fb81aa6a3271666668fd8e8112e4a29466ad7 Author: liyt Date: Tue Feb 19 16:12:54 2019 +0800 微信支付域名新增和编辑 编辑封禁选项错误 commit 4cb36b6b559f8bf39adc0d90f0a1eda05314c3e1 Author: 李天时 Date: Tue Feb 19 15:42:41 2019 +0800 新增技术支撑角色 commit 5c93fb358c1c4e4fd7651944e17320d6d371763a Author: liyt Date: Tue Feb 19 15:38:32 2019 +0800 微信支付域名新增和编辑 列表未显示 commit 4beeaf0722c4cfc8c53eaca703aa689e54869a10 Author: 李天时 Date: Tue Feb 19 14:32:26 2019 +0800 阳光站前端初始化 commit 0003e078f282dc54e285914a0fb95c81473a1023 Merge: 770b6f0b9 c504c512c Author: 李天时 Date: Tue Feb 19 14:10:50 2019 +0800 Merge branch 'dev-technical-support-20190215' into cps_wxpay_20190218_1633 commit 770b6f0b9fa5e55c523cacd1f9a449d9769837b6 Author: liyt Date: Tue Feb 19 12:45:06 2019 +0800 微信支付域名新增和编辑 commit c504c512cd9067ff37935480b039a28f67af8bca Author: 李天时 Date: Tue Feb 19 11:43:58 2019 +0800 新增技术支撑角色 commit 0c7c31f3428672bcd873da71971572dbc9c7d13a Merge: d278a1bef 05e422aaf Author: licc <45360682@qq.com> Date: Tue Feb 19 11:27:30 2019 +0800 Merge branch 'dev-export-csv-new' of http://192.168.0.31/fe/cps # Conflicts: # application/index/view/user/recent.html commit 09d013af95d763305c9217fa5676093e5edceb96 Author: liyt Date: Mon Feb 18 20:27:56 2019 +0800 微信支付域名新增和编辑 commit 03b9b72aceb03f8dd26a7ce7844f8c54e846dbe0 Author: liyt Date: Mon Feb 18 20:22:09 2019 +0800 微信支付域名新增和编辑 commit d88db0157ee38b2a361b0a580804d2555bdbebbe Author: 李天时 Date: Mon Feb 18 17:23:25 2019 +0800 修改技术支撑编码 commit d1414cc3af79b6cfc0e27d43546f4d0cae591b21 Author: 李天时 Date: Mon Feb 18 17:00:48 2019 +0800 取消博瑞监控 commit d278a1bef15beac15783135bb5a4cc6855a4e11d (tag: cps_20190218_162848) Author: licc <45360682@qq.com> Date: Mon Feb 18 16:24:03 2019 +0800 去掉多合并进来的代码 commit a18b8782d4a255fa10f258cf996f128942c4d1bb Author: 李天时 Date: Fri Feb 15 18:01:26 2019 +0800 新增技术支撑角色 commit ea3cbbb01f799179def84196809002df8e5d5953 (tag: cps_20190218_122010, tag: cps_20190215_104901) Author: zhenglh Date: Thu Feb 14 17:50:10 2019 +0800 update auto.ini commit a39afc6d3e8ade60c23549d19b2f3e4290e775fb Author: zhenglh Date: Thu Feb 14 17:45:10 2019 +0800 后台账号登录日志添加&vip,vip运营调整为使用超管密码登录 commit 6764b206a1c6983375b981b0c07c7ec12fa9b5e5 (tag: cps_20190214_120311) Merge: 2ccd106c4 31bff2f95 Author: zhenglh Date: Thu Feb 14 10:20:29 2019 +0800 merge from branch dev-passwordupdate-logout-20190129 commit 31bff2f9514953db154015b7f9956b36230fc3ab Author: zhenglh Date: Thu Jan 31 16:40:14 2019 +0800 update auto.ini commit 529b0e82f607fc2e5eba1875615f4cbc7545a4b3 Author: php-王凡昌 Date: Thu Jan 31 16:36:23 2019 +0800 增加ajax判断 commit 628e714cd4c648bd265a4b77b2fcc1fe052cb15b Author: zhenglh Date: Thu Jan 31 16:29:18 2019 +0800 用户支付时首次强制重新登录 commit 46fe2761c44906a394ef5f8d01f03e178784528a Author: zhenglh Date: Thu Jan 31 16:23:59 2019 +0800 用户支付时首次强制重新登录 commit 7161172be9ddfdea6f1a63e82290678f01ae97c5 Author: zhenglh Date: Thu Jan 31 15:37:37 2019 +0800 用户支付时首次强制重新登录 commit 2ccd106c4f380d484d94556a0081d6ca4571086c Author: zhenglh Date: Thu Jan 31 09:54:19 2019 +0800 订单补丁添加 commit 4c6afcd4b8f1bc43dfab85901ef78826c79e61d2 Author: zhenglh Date: Thu Jan 31 09:53:17 2019 +0800 去除订单修复补丁文件 commit 6dc9d4008b64d29bb993287b7bc0325ab8de6bf6 Author: zhenglh Date: Thu Jan 31 09:51:42 2019 +0800 订单补丁添加 commit 02333a0c20c19fb9b099462d271ad9eb8032e9e8 Author: zhenglh Date: Wed Jan 30 21:11:49 2019 +0800 update auto.ini commit e2f2f47b35fe4ca6f0d6bf5be2225260883e8244 Author: zhenglh Date: Wed Jan 30 21:10:48 2019 +0800 订单问题修复处理 commit 961ccea92c35166cad9eb21c59d9ee62a4e0284b Author: zhenglh Date: Wed Jan 30 21:00:40 2019 +0800 订单问题修复处理 commit 95f7f0b6b3e7d92a8d174434a2c9b87884f5d390 Author: zhenglh Date: Wed Jan 30 19:27:28 2019 +0800 auto.ini update commit 3754fc76af44665510e13053e28ad64b1129b790 Author: zhenglh Date: Wed Jan 30 19:25:54 2019 +0800 修复切换账号，无法登录 commit 7c182f9f97262f5ddba466dd077ddf52ced8d0a2 Author: zhenglh Date: Wed Jan 30 15:22:33 2019 +0800 add auto.ini to deploy commit bf987e0d68ae0948af620cf2279259e388d39a63 Author: zhenglh Date: Wed Jan 30 14:34:52 2019 +0800 退出登录时，session_id重新生成 commit eaefed63edbe6798fd112670a90d067b00634b9d Author: zhenglh Date: Wed Jan 30 12:43:01 2019 +0800 用户密码更新后，跳转登录 commit 9a066d0c5e81f8ff5d2819b7bf31dc0ebf542fb5 Author: zhenglh Date: Wed Jan 30 12:39:04 2019 +0800 用户密码更新后，所有终端需要重新登录 commit 209642aa8f796a7ec50199a3428c88d93b9ed267 Author: zhenglh Date: Wed Jan 30 11:26:03 2019 +0800 用户密码更新后，所有终端需要重新登录 commit 23c5394433b3f1823f135d60599b2b9e16a845b8 Author: 郑立浩 Date: Tue Jan 29 22:44:29 2019 +0800 渠道，运营，管理员密码修改后强制退出登录 commit 3332bec5a6239ee2766a15572695368fea57824c Author: zhenglh Date: Tue Jan 29 20:49:35 2019 +0800 密码更新退出登录 commit 121119d71b4d9a32a9c236b20bd74b2e9e105423 (tag: cps_20190129_142024) Author: zhenglh Date: Tue Jan 29 11:19:47 2019 +0800 处理，汇聚支付添加用户id,公众号信息 commit e74e342e8f67b45d9bdb286bec00f5451da6720f Author: zhenglh Date: Mon Jan 28 20:48:50 2019 +0800 处理，汇聚支付添加用户id,公众号信息 commit 931a30517ee221982742692a69eeee6c80585b29 Author: zhenglh Date: Mon Jan 28 16:50:46 2019 +0800 openid只有在推广域名时进行cookie更新 commit 05c6723e9c3ce3d183b4d810ed62e01ef95aefec Author: zhenglh Date: Mon Jan 28 16:48:43 2019 +0800 bug修复 commit 1ef78bc4188961b6826716aea1fffd50cfaf3e79 Author: zhenglh Date: Mon Jan 28 11:49:03 2019 +0800 处理打点日志未包含admin_id字段信息 commit 91887fe2d77b9dff2c85395450e8e58734e2cb27 Author: zhenglh Date: Sat Jan 26 16:47:40 2019 +0800 配号代理商订单处理 commit dc4adb2043bfc6fdd793909b51af0877faf9a181 (tag: cps_20190129_113716) Author: DuanEnJian Date: Fri Jan 25 15:03:04 2019 +0800 添加用户消费接口 commit 90323d2a6a5795a9bc9aef638f1703e0130d47e4 Merge: 6af719a39 791aa5f8b Author: licc <45360682@qq.com> Date: Fri Jan 25 14:39:52 2019 +0800 Merge branch 'dev-master-repair-20190125' of http://192.168.0.31/fe/cps 增量上线 commit 791aa5f8bf7386017aa572cde795ef1bea8dc3e5 Author: licc <45360682@qq.com> Date: Fri Jan 25 14:38:47 2019 +0800 增量上线内容 commit 6af719a397dc33a370b803507c7b1d68fb867688 Merge: b1271fee7 4557f2423 Author: zhenglh Date: Fri Jan 25 14:29:25 2019 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit b1271fee77b1cbcebeffb45a0f91ae2345209eb6 Author: zhenglh Date: Fri Jan 25 14:29:19 2019 +0800 referral_id，agent_id强制转化为整型 commit 4557f24233f82eedd4ecb3a2af23e29d7dafed2e Merge: 3c06dc35f 5994815a0 Author: 李天时 Date: Fri Jan 25 13:56:38 2019 +0800 Merge remote-tracking branch 'origin/master' commit 3c06dc35ff718d8b6c4e7c789cbbb83b1c9f5f9a Author: 李天时 Date: Fri Jan 25 13:56:26 2019 +0800 1、模板消息回调不读取数据库。2、getToken API失败日志记录为info级别 commit 5994815a0800d66b1b7c04d9470d531d3a9935ba Author: zhenglh Date: Fri Jan 25 11:58:09 2019 +0800 普通代理商，四方与汇聚支付bug修复 commit 8de7887e589cbabe2ec6923db211f581e4afb44d Merge: aeadaf172 81f9ad981 Author: DuanEnJian Date: Thu Jan 24 14:31:09 2019 +0800 Merge remote-tracking branch 'origin/dev-export-collect-merge' into dev-export-collect-merge commit aeadaf1720e2ceaeee698d86806acccd329e6aed Author: DuanEnJian Date: Thu Jan 24 14:31:03 2019 +0800 修改book_collect脚本,金额统计错误问题 commit 3bfba76489f24fcbac88bd638aea4fe9840ac6f1 (tag: cps_20190124_135716) Author: zhenglh Date: Thu Jan 24 13:41:05 2019 +0800 用户头像为null时添加默认值 commit 81f9ad981a966db0fb8ee11e9fb8a9861f15d38c Author: 李天时 Date: Wed Jan 23 18:57:16 2019 +0800 1、解决破晓站公众号设置富文本编辑框工具条高度过高。 2、fix easyWeChat日志配置错误。 commit 20d385495db4f983185501bd411aef2a40cc73db Author: 李天时 Date: Wed Jan 23 18:42:14 2019 +0800 1、code无效页面跳转。2、模板消息回调不读取数据库 commit 452e31e63c14d0b48325ea4148a21ba3ce39c88c Author: DuanEnJian Date: Wed Jan 23 17:21:18 2019 +0800 修改book_collect脚本,金额统计错误问题 commit aa234b2d60f652ff14d4eb7ac95ffc8f6cdc78ef Author: DuanEnJian Date: Wed Jan 23 16:28:59 2019 +0800 修改book_collect脚本,金额统计错误问题 commit a4d0466c11c028299cb3c3bc50f31fb366eafcbb Author: DuanEnJian Date: Wed Jan 23 16:24:56 2019 +0800 修改book_collect脚本,金额统计错误问题 commit ef58d16421aaf859a414851a0b323d4cfc9d8f95 Author: DuanEnJian Date: Wed Jan 23 16:23:51 2019 +0800 修改book_collect脚本,金额统计错误问题 commit b1a1823c8873acbd161d2739cd47271ff6a79f7f Author: DuanEnJian Date: Wed Jan 23 15:36:38 2019 +0800 修改book_collect脚本,金额统计错误问题 commit 9eb779a7744971eb1baa49bad11a06374ecadbe2 Merge: dc5d94508 9df25deca Author: DuanEnJian Date: Wed Jan 23 15:35:34 2019 +0800 Merge remote-tracking branch 'origin/dev-export-collect-merge' into dev-export-collect-merge commit dc5d94508015c1d05b8ffabc2cc4bb583e62cb73 Author: DuanEnJian Date: Wed Jan 23 15:35:21 2019 +0800 修改book_collect脚本,金额统计错误问题 commit 9df25deca54d73da6192fe18247dc42f25fa0158 Author: licc <45360682@qq.com> Date: Wed Jan 23 14:53:17 2019 +0800 vip月报月份导出加单引号 commit 89f80eb320c05478777be56d0f53323a80ed6f4f Author: licc <45360682@qq.com> Date: Wed Jan 23 14:44:13 2019 +0800 导出JS优化 commit 535dda54fd3cd9d998add8928e3653edfa9b6590 (tag: cps_20190123_114324) Author: zhenglh Date: Wed Jan 23 11:41:04 2019 +0800 修复referral_id缓存的bug commit 397e5b84b5744ea57189d89e8a74283417927e12 Merge: cbc9052ed 836a74288 Author: DuanEnJian Date: Wed Jan 23 10:38:29 2019 +0800 Merge branch 'dev-export-collect' of 192.168.0.31:fe/cps into dev-export-collect-merge # Conflicts: # application/command.php # application/common/model/UserRecentlyRead.php # application/index/controller/Fee.php commit cbc9052edbf811786291de141833b5a78e624c23 (tag: cps_20190122_174529) Author: zhenglh Date: Tue Jan 22 15:29:58 2019 +0800 关注时，推广链接id从用户信息中获取 commit 7dcc69751d10e4596fe0e4ba2c77225161c2f796 Merge: bc4d03f26 c1777c415 Author: zhenglh Date: Tue Jan 22 14:23:42 2019 +0800 merge from master commit c1777c4158b37273145356edb67f623927e520a3 Author: zhenglh Date: Mon Jan 21 15:32:29 2019 +0800 推广链接规则修改 commit a448f918cea95e8acb9c4a295b7e1aaffeff32f9 Author: zhenglh Date: Mon Jan 21 10:57:10 2019 +0800 删除redis缓存的处理 commit bc4d03f26bdf5fa4c240eea43b20122912599060 (tag: cps_20190121_152641) Author: DuanEnJian Date: Mon Jan 21 10:23:31 2019 +0800 修改统计方式 commit 7a88ba9d47242794eb82533dba386a7b80ac9b84 Author: DuanEnJian Date: Sat Jan 19 20:33:21 2019 +0800 修改统计方式 commit e52b867689947b3aba2587fb3696ade17d826ff5 Merge: 2a97ed023 ca4a8463c Author: DuanEnJian Date: Sat Jan 19 16:40:10 2019 +0800 Merge branch 'dev-referral-shell' of 192.168.0.31:fe/cps into dev-referral-shell-new commit 2a97ed02323e876adbe27ce2ff6b47ffb398b771 Author: licc <45360682@qq.com> Date: Sat Jan 19 16:09:32 2019 +0800 屏蔽阅读页自动签到功能 commit b7c0d229a5b5c55d24b9306497251d0c09ba5e4e Author: licc <45360682@qq.com> Date: Sat Jan 19 15:08:58 2019 +0800 屏蔽阅读页自动签到功能 commit ca4a8463c4267c174dc47735879f87d966725034 Merge: bb87e50d2 988af3312 Author: DuanEnJian Date: Sat Jan 19 13:46:15 2019 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 836a742887931e7babad83da073937fabe6d72eb Author: licc <45360682@qq.com> Date: Fri Jan 18 20:34:39 2019 +0800 test commit 05e422aafb2563cbc8f0b2e758a6d4e39ce59859 Author: licc <45360682@qq.com> Date: Fri Jan 18 19:54:39 2019 +0800 test commit baeccf1604966b9b8df347dc863cb0d567a74aa4 Author: zhenglh Date: Thu Jan 17 20:17:50 2019 +0800 支付域名取消admin_id的cookie添加 commit bb87e50d21cec3cda558d0726bdb9c1241bf47eb (tag: cps_20190118_141123) Author: licc <45360682@qq.com> Date: Thu Jan 17 19:59:32 2019 +0800 Merge branch 'dev-sign-push' of http://192.168.0.31/fe/cps into dev-sign-push-new # Conflicts: # application/command.php commit 7c000adeb216609b248085fba02d275c6c3ac710 Author: zhenglh Date: Thu Jan 17 18:55:13 2019 +0800 支付域名和推广域名的处理 commit 434f88f9b1e99f3cc7714ceea64da64a3b592557 Author: zhenglh Date: Thu Jan 17 18:48:33 2019 +0800 支付域名和推广域名的处理 commit 396a342d19b61a7f18d063d89aaccf4f5d0b9035 Author: zhenglh Date: Thu Jan 17 17:14:46 2019 +0800 日志添加，活动缓存 commit 5ad35045e1a01a083228e495272d54dff6d572f5 Author: zhenglh Date: Thu Jan 17 16:51:53 2019 +0800 修复相同支付域名，用户支付相同的问题 commit 988af331249e180f4f2543063a7f2020bb8921e6 Author: DuanEnJian Date: Thu Jan 17 14:49:37 2019 +0800 添加ENV环境支持 commit a2d480d674763e0f190abf9b394fc03d7394b696 Author: licc <45360682@qq.com> Date: Thu Jan 17 11:06:39 2019 +0800 修改汇聚支付商品名称和商品描述反了的问题 commit 5f856207a75247f7eeaeb173ece7fe73d6dc8da6 Author: DuanEnJian Date: Wed Jan 16 20:00:28 2019 +0800 修改简介填充脚本 commit d2fe38b5b7834f244b948eb90f9ce492da05f269 (tag: cps_20190117_102118) Author: zhenglh Date: Wed Jan 16 19:52:06 2019 +0800 日志单词修改 commit 2f6091920ba81154100b2a3008744c8d6f4d1ede Merge: 574edcef4 a54846e84 Author: zhenglh Date: Wed Jan 16 19:34:31 2019 +0800 Merge branch 'master-merge-fix-agent-referral-bug-back' into master-merge-fix-agent-referral-bug commit f87bdc4bd5f1f8a339e59aa4db126d06fd20ef4f Author: DuanEnJian Date: Wed Jan 16 19:20:48 2019 +0800 修改简介填充脚本 commit b647b43a261eba8aecea9bc23520f5377f77eaad Author: DuanEnJian Date: Wed Jan 16 19:17:49 2019 +0800 修改简介填充脚本 commit a54846e848459c4d10b0023a253518f54f1b95b7 Author: zhenglh Date: Wed Jan 16 18:41:35 2019 +0800 用户新建，关注与取关的打点 commit 844b2cc6b7a017a9b4fab001cd8c7ce3e09eb015 Author: DuanEnJian Date: Wed Jan 16 18:26:42 2019 +0800 修改简介填充脚本 commit b8a210ece80cdeb98798e56700a11cc0514ec1b0 Author: DuanEnJian Date: Wed Jan 16 18:26:04 2019 +0800 修改简介填充脚本 commit e6209b8db7b10038eedf80fa9d1d877d33137274 Author: DuanEnJian Date: Wed Jan 16 18:22:18 2019 +0800 修改简介填充脚本 commit 4ee05e44c760fbac5439f23f009801185d8bb2de Author: DuanEnJian Date: Wed Jan 16 18:17:02 2019 +0800 修改简介填充脚本 commit afc76d72427c97a25b182e78f991a7b942b55c9f Author: DuanEnJian Date: Wed Jan 16 18:09:22 2019 +0800 修改简介填充脚本 commit abf8cfd7f1093fd5cab9b4a78c234753ef52e213 Author: DuanEnJian Date: Wed Jan 16 18:04:46 2019 +0800 修改简介填充脚本 commit 2ce3fd323f4a960ff985c1a956aa68b3ad7b99a0 Author: DuanEnJian Date: Wed Jan 16 17:58:53 2019 +0800 修改简介填充脚本 commit b322da6736c3b823b9643a71aae8393b773334b1 Author: DuanEnJian Date: Wed Jan 16 17:53:58 2019 +0800 修改简介填充脚本 commit d55d968601be85346ddb4f091ebd6afb9539ae84 Author: DuanEnJian Date: Wed Jan 16 17:47:56 2019 +0800 修改简介填充脚本 commit 820a230db01b4c39732e4d257f80b94d17145814 Merge: dcfbae12b a7ae8e9c4 Author: DuanEnJian Date: Wed Jan 16 17:15:39 2019 +0800 Merge remote-tracking branch 'origin/dev-sign-push' into dev-sign-push commit dcfbae12be107a09be660323e6de0d2887dc8307 Author: DuanEnJian Date: Wed Jan 16 17:14:27 2019 +0800 修改简介填充脚本 commit a7ae8e9c4ab1ff8a36eda25afbbcae761d35797b Merge: 4a51033f7 09f616c7c Author: licc <45360682@qq.com> Date: Wed Jan 16 16:53:59 2019 +0800 Merge remote-tracking branch 'origin/dev-sign-push' into dev-sign-push commit 4a51033f7230d0d2c2a906903642bdaa40ab1943 Author: licc <45360682@qq.com> Date: Wed Jan 16 16:53:54 2019 +0800 已签到的，阅读页自动签到不推送 commit 574edcef4cd75665fb3e6e0f99ad4c793a8b9d66 Author: 李天时 Date: Wed Jan 16 16:39:42 2019 +0800 tp5漏洞修复。参考https://www.fastadmin.net/news/71.html commit f3539e4d103e2719b3f6b91b08892e66ef588f7b Author: DuanEnJian Date: Wed Jan 16 16:35:54 2019 +0800 去掉Log日志 commit 09f616c7c8ab2411ab659559001a74a8c4e988f3 Author: 李天时 Date: Wed Jan 16 16:14:02 2019 +0800 tp5漏洞修复。参考https://www.fastadmin.net/news/71.html commit 974dfb1496beed6de3fdde6850eb540d20720d1b Author: DuanEnJian Date: Wed Jan 16 15:59:01 2019 +0800 修改获取wechat的时候,去掉site commit e5a35d0b4820d191af8b17ff95e01af5967ebbd7 Author: licc <45360682@qq.com> Date: Wed Jan 16 15:54:48 2019 +0800 订单导出修改js commit 931866cb92372e600d7f0e531f444bbc457c2d35 Author: DuanEnJian Date: Wed Jan 16 15:52:47 2019 +0800 修改获取wechat的时候,去掉site commit df3481ffa28bd07d11ae50732c281b9743ab9b5f Author: 李天时 Date: Wed Jan 16 15:45:53 2019 +0800 修改汇聚支付日志 commit add28c5812a4f96ad84c1c024bb26cf50893bc7c Author: zhenglh Date: Wed Jan 16 15:37:49 2019 +0800 推广链接获取失败处理 commit 325c1f200f1b187f4117b99f49ce4f4644c0bddd Author: licc <45360682@qq.com> Date: Wed Jan 16 15:25:51 2019 +0800 订单导出修改js commit 85044b70da26802a0e0ee2d8b95d64e77a1095ee Author: licc <45360682@qq.com> Date: Wed Jan 16 14:24:55 2019 +0800 订单导出修改 commit b1bff16b8881caa9c21c8dc03f1328b884ae173f Author: DuanEnJian Date: Wed Jan 16 10:57:42 2019 +0800 添加运营推文推荐书库,简介自动填充脚本 commit 83e72160c9a05178e166d88202596d5d05c5d0c9 Merge: 010d94c45 fd10accc1 Author: DuanEnJian Date: Tue Jan 15 19:36:49 2019 +0800 Merge remote-tracking branch 'origin/dev-sign-push' into dev-sign-push commit 010d94c45d6ebb5931064d7ebb393833121fee50 Author: DuanEnJian Date: Tue Jan 15 19:36:40 2019 +0800 修改简介功能,选择推广链接时自动填充简介 commit 11e149313d1dd0881ab34ee2c6802fb48a690145 Merge: 25e4ebb26 4f5192836 Author: zhenglh Date: Tue Jan 15 19:09:18 2019 +0800 Merge branch 'dev-fix-agent-referral-bug-20181227' into master-merge-fix-agent-referral-bug-201901115 # Conflicts: # application/api/controller/Activity.php # application/api/controller/Recharge.php # application/command.php # application/index/controller/Book.php # application/index/controller/User.php commit fd10accc1d58fb7f0d7d7f64d1b686784e3dca22 Author: licc <45360682@qq.com> Date: Tue Jan 15 18:11:55 2019 +0800 暂存 commit c42463c27bea4b4cd25e57a8516027b057ead070 Author: licc <45360682@qq.com> Date: Tue Jan 15 18:01:32 2019 +0800 暂存 commit 77aedcdcb55289cec703b5562da2bcba2d1813f2 Author: licc <45360682@qq.com> Date: Tue Jan 15 17:57:31 2019 +0800 暂存 commit 7660d55b2a7729d503fa29b6bcd3684c1435a7aa Author: licc <45360682@qq.com> Date: Tue Jan 15 17:19:12 2019 +0800 暂存 commit 496a7f08c1d5c972354cb9430dc754f0cafee5e5 Author: licc <45360682@qq.com> Date: Tue Jan 15 16:58:04 2019 +0800 签到自动回复加图片展示 commit 295b7eca8ab13e7bedaec0126a834a1a36483487 Author: licc <45360682@qq.com> Date: Tue Jan 15 15:59:04 2019 +0800 暂存 commit 091957e8626b38d11c4efde19ea0ffef855c13a8 Merge: 1ba8ba594 58c3a4e4a Author: licc <45360682@qq.com> Date: Tue Jan 15 15:13:15 2019 +0800 Merge branch 'dev-sign-test' of http://192.168.0.31/fe/cps into dev-sign-push commit 1ba8ba5945a0cef9ab6a9fbfc40591b29f43303d Merge: 25e4ebb26 fb53ea2d1 Author: licc <45360682@qq.com> Date: Tue Jan 15 15:12:31 2019 +0800 Merge branch 'dev-push-message' of http://192.168.0.31/fe/cps into dev-sign-push commit 0e08a7b8602e8bed047f0f83ac6a9b16c4514b9a Merge: c0778126e 152da8f7e Author: licc <45360682@qq.com> Date: Tue Jan 15 15:09:24 2019 +0800 Merge branch 'dev-export-collect' of http://192.168.0.31/fe/cps into dev-export-collect commit c0778126e8fc060dc09585df92f16c4fe4db49be Author: licc <45360682@qq.com> Date: Tue Jan 15 15:08:23 2019 +0800 暂存 commit 58c3a4e4a1d98dbf3d1c942b08447929762aaf03 Author: licc <45360682@qq.com> Date: Tue Jan 15 14:44:10 2019 +0800 添加吐司 commit 25e4ebb268ad375fd0ce3dd83ae78de9031c860d Merge: 1f43eccf0 2918c8198 Author: 李天时 Date: Tue Jan 15 14:37:36 2019 +0800 Merge remote-tracking branch 'origin/master' commit 1f43eccf0bab7a61891e51c037ad60cb68fe2cd2 Author: 李天时 Date: Tue Jan 15 14:37:24 2019 +0800 微信回调优先使用本地缓存，优化日志 commit 152da8f7ee4dbb675b7e3777168d8c2a609c1925 Merge: deccf42bc 3b3929cd1 Author: DuanEnJian Date: Tue Jan 15 14:31:23 2019 +0800 Merge remote-tracking branch 'origin/dev-export-collect' into dev-export-collect commit deccf42bcc17d5f4c39dfe7d7ca697b089b14bc4 Author: DuanEnJian Date: Tue Jan 15 14:31:17 2019 +0800 修改,小说统计,SSDB合并处理错误问题 commit 3b3929cd1a415c24e410deec759c82613e7d24da Merge: 1f15b713d 9d198072e Author: licc <45360682@qq.com> Date: Tue Jan 15 14:00:27 2019 +0800 Merge remote-tracking branch 'origin/dev-export-collect' into dev-export-collect commit 1f15b713dbc686682c9e2448a9aaedeacaffd228 Author: licc <45360682@qq.com> Date: Tue Jan 15 14:00:22 2019 +0800 暂存 commit 2918c819836c70e3e8901945d65c6c71f074b06c (tag: cps_20190115_120626) Author: WangGaoBo Date: Tue Jan 15 12:03:43 2019 +0800 Log大小写 commit 9d198072ea8286eb303bfeff9ecc751ce572e618 Author: DuanEnJian Date: Tue Jan 15 11:37:15 2019 +0800 修改,小说统计,SSDB数据合并开关 commit d88c253fd2bc3e3079b77f7c21bf65c3f925a00f Author: DuanEnJian Date: Mon Jan 14 19:04:05 2019 +0800 修改 推广链接关注取消关注打点(取消关注时使用关注推广链接ID) commit e29f94798474e2b04018dfe3bc22c14ecae3a2e9 (tag: cps_20190114_173530) Author: WangGaoBo Date: Mon Jan 14 17:25:24 2019 +0800 ms增加永久书币 commit 0ac4dfd20e4571db73c2aa0202aa13ea4973efe8 Author: WangGaoBo Date: Mon Jan 14 17:21:38 2019 +0800 ms增加永久书币 commit e04bbd513aef8aec70ad641956f1576a37223e2a Author: licc <45360682@qq.com> Date: Mon Jan 14 17:07:26 2019 +0800 阅读页自动签到 commit 27f8699dc4a5ada303f59a3a5cc1e373abd3ab51 (tag: cps_20190114_160817) Author: WangGaoBo Date: Mon Jan 14 15:00:56 2019 +0800 修改createtime commit bc752d43f5e605455499bd0dec4e86658bc29d44 Author: DuanEnJian Date: Mon Jan 14 14:56:42 2019 +0800 修改小时统计,数据兼容 commit 50fcff1b95908e22194f7ad560b48ea6550ca7de Merge: f27b0871e 4d0c78220 Author: WangGaoBo Date: Mon Jan 14 11:02:18 2019 +0800 Merge branch 'dev-customer-merge-master-20180102' into merge-master-customer # Conflicts: # application/api/controller/Wechat.php # application/index/controller/Book.php commit 1cf7989c2cdbe0763bafa20d48c865645d031803 Merge: 7237a28b2 175188269 Author: licc <45360682@qq.com> Date: Mon Jan 14 10:39:37 2019 +0800 Merge branch 'dev-export-csv-new' of http://192.168.0.31/fe/cps into dev-export-collect commit 7237a28b2161586b5097d849692312b21e4dbee1 Merge: f27b0871e e7f89b877 Author: licc <45360682@qq.com> Date: Mon Jan 14 10:37:48 2019 +0800 Merge branch 'dev-book-collect' of http://192.168.0.31/fe/cps into dev-export-collect # Conflicts: # application/api/controller/Wechat.php commit 4f519283619eaebe5d60fec0e056e15c572159de Author: zhenglh Date: Sat Jan 12 18:17:11 2019 +0800 推广链接关系的判定修改 commit f27b0871e93ef2d52032795f013e91f3c7785271 (tag: cps_20190112_180901) Author: licc <45360682@qq.com> Date: Sat Jan 12 18:06:00 2019 +0800 解决入库书籍显示已下架 commit 8339c5461ad60c52337212bde24bddc621d6a8eb Author: licc <45360682@qq.com> Date: Sat Jan 12 18:04:53 2019 +0800 解决入库书籍显示已下架 commit afcbdac15db8eb1236af7300af8af823cea3484e Author: zhenglh Date: Sat Jan 12 16:07:15 2019 +0800 用户中心获取缓存数据处理 commit c145c75a58a9f31134aa5d924b20b050729fc1a0 (tag: cps_20190112_152243) Author: licc <45360682@qq.com> Date: Sat Jan 12 15:22:20 2019 +0800 解决入库书籍显示已下架 commit 379efda1d672727a25b3dbaf60ca5c4d1403d1d7 Author: DuanEnJian Date: Sat Jan 12 15:16:35 2019 +0800 修改推广链接当日阅读人数统计 commit 967f5d477cc12a81415ecc077178274b43ada174 Author: DuanEnJian Date: Sat Jan 12 15:14:45 2019 +0800 修改推广链接当日阅读人数统计 commit df4f009c411ad31dd5336a6793b65cb1554cb661 (tag: cps_20190112_140904) Merge: ecdfa73cb 9f7627f94 Author: licc <45360682@qq.com> Date: Sat Jan 12 14:07:31 2019 +0800 Merge remote-tracking branch 'origin/master' commit ecdfa73cbe0428f66c2b02983d6fef0d5df2eb1e Author: licc <45360682@qq.com> Date: Sat Jan 12 14:07:26 2019 +0800 解决入库书籍显示已下架 commit 58339bc4a69ffecfe07b0eef5fab2d85f6235776 Author: zhenglh Date: Fri Jan 11 17:48:12 2019 +0800 代理与推广链接的更新 commit fb53ea2d12271b198c510639efaacb8bcd457bae Author: DuanEnJian Date: Fri Jan 11 15:11:11 2019 +0800 首冲9.9自动回复,添加简介功能 commit 97a9f4bd0ed2ca27b8da059336ed5320352ca088 Author: DuanEnJian Date: Fri Jan 11 14:30:10 2019 +0800 书籍搜索自动回复,添加简介功能 commit 8ae0febdb4ecb7bc0387dec0e864cc572a87c9ea Author: DuanEnJian Date: Fri Jan 11 12:16:28 2019 +0800 添加图文推送,简介功能 commit 175188269c22b08aade84a30731715cdd63bf6d5 Author: licc <45360682@qq.com> Date: Fri Jan 11 10:20:19 2019 +0800 导出结算 commit 9f7627f944cf1f1ca4e8eac0a08a3a53c570aa80 Author: zhenglh Date: Fri Jan 11 10:06:06 2019 +0800 微信使用永久二维码关注bug修复 commit 6d7c467f38882f05e1514fd5514049849c8721c3 Author: licc <45360682@qq.com> Date: Thu Jan 10 17:06:52 2019 +0800 导出结算 commit bcc575459abac2cf4dd769c00ab2d83111ce88cb Author: licc <45360682@qq.com> Date: Thu Jan 10 16:00:50 2019 +0800 暂存 commit 4d0c78220bd76e950f4e9bdc9d20d08dd1478f02 Author: WangGaoBo Date: Thu Jan 10 15:29:49 2019 +0800 优化脚本 commit cc500a91d9bc64a8454b54b9b599bb93d7746537 (tag: cps_20190110_153402) Merge: ce6a63bdd c96645191 Author: licc <45360682@qq.com> Date: Thu Jan 10 14:51:14 2019 +0800 Merge branch 'dev-huijupay' of http://192.168.0.31/fe/cps commit 21142a5f508a56a511f8e9b06b76caedf4ffae42 Author: WangGaoBo Date: Thu Jan 10 14:46:43 2019 +0800 优化脚本 commit bab35cc1f817a915da50ce7054717e6155ac0ba3 Author: licc <45360682@qq.com> Date: Thu Jan 10 14:39:12 2019 +0800 暂存 commit 038667985f7d9da969a8b18ef14d61bb4c750e8a Author: WangGaoBo Date: Thu Jan 10 14:20:01 2019 +0800 优化脚本 commit 1ba05e8cc678396855ff6018cc9d5039828e9332 Author: WangGaoBo Date: Thu Jan 10 13:40:28 2019 +0800 优化脚本，限制脚本中传入的数据库序号 commit dab9e41ff953704d887ae4cf0658ec47619cd0b6 Author: WangGaoBo Date: Thu Jan 10 13:35:24 2019 +0800 优化脚本，传入文件名 commit a58f2478db57eddc4c3269f47fbeb47c75b9864c Author: WangGaoBo Date: Thu Jan 10 13:30:21 2019 +0800 增加脚本 commit bdbd4c1a924bfaae45372db09321a2a6b5250515 Author: WangGaoBo Date: Wed Jan 9 20:30:19 2019 +0800 执行脚本每次设置条数5000 commit 717653bf429e9be3849a2db6aacfb7fa45246cbc Author: WangGaoBo Date: Wed Jan 9 19:45:25 2019 +0800 充值记录,增加开始时间 commit 1b649b0f3d4aad3bc6717fd4695cc203e28d7a52 Author: WangGaoBo Date: Wed Jan 9 19:34:51 2019 +0800 充值记录,重置，刷新页面 commit a021d291c413468167913fdd9094ae18cb4f1ac0 Author: WangGaoBo Date: Wed Jan 9 18:35:02 2019 +0800 充值记录,VIP_STARTTIME commit f31e37fa7c904e523cb19b0c2e62093a9b7eed4e Author: licc <45360682@qq.com> Date: Wed Jan 9 16:50:08 2019 +0800 test commit 50b35b0815437176b97cf2b50164c68c57a54fd6 Author: WangGaoBo Date: Wed Jan 9 15:37:07 2019 +0800 充值记录，时间筛选无效问题 commit b874cd6b09b791fe485f7c1904ca0370e01af3d5 Author: WangGaoBo Date: Wed Jan 9 15:18:53 2019 +0800 充值记录，时间格式 commit e0e0a465ee57c26d462a4217907bdc769073e9ea Author: WangGaoBo Date: Wed Jan 9 15:06:03 2019 +0800 已删除阅读记录，重新阅读后，更改ｆｌａｇ状态 commit e1c69270a297f59259be523c3c6a6e66159ed6fd Author: zhenglh Date: Wed Jan 9 14:55:25 2019 +0800 全局免费章节数的判断 commit 1facaf5445e1cbbdc98b06c426d18e51d9952f4f Author: WangGaoBo Date: Wed Jan 9 14:41:14 2019 +0800 免费章节，判断 commit 68e4bf085470f54ae77cc58f482b65e30a97a8b2 Author: WangGaoBo Date: Wed Jan 9 14:39:38 2019 +0800 充值记录，重置按钮功能 commit 4a00dea63bcfc0f92bd11b2a9577a9c8f3226a99 Author: WangGaoBo Date: Wed Jan 9 14:32:51 2019 +0800 充值记录，重置按钮功能 commit 405328521b4fe377f413ccd81499a8fc1bcefc7b Author: zhenglh Date: Wed Jan 9 13:44:04 2019 +0800 用户id暂不改动 commit d96b0b8dbfee0f6cd0c9d8551a02b46a86ce89a0 Author: WangGaoBo Date: Wed Jan 9 13:41:26 2019 +0800 配号代理商复制链接 commit 98108bb5a82c13d8a34737b2c5b63b80e0cb1068 Author: WangGaoBo Date: Wed Jan 9 12:40:37 2019 +0800 充值记录 commit b85a55894d57f4049b2b1eb8ab1ab2fcc523566f Author: WangGaoBo Date: Wed Jan 9 11:46:12 2019 +0800 修改刷数据的脚本 commit 17d575e6892d6f3f1d74ed09f83ed904fe680b03 Author: licc <45360682@qq.com> Date: Wed Jan 9 10:36:56 2019 +0800 test commit 8992fc2452014f10ec67cea8d3faedf5db5848ed Author: zhenglh Date: Wed Jan 9 09:59:28 2019 +0800 取消登录 commit b37cb27de9904b1364a72caa58a93888758448ce Author: WangGaoBo Date: Tue Jan 8 20:11:09 2019 +0800 修改记录 commit 9f8cf8a362faead50902f61c795d162c905d4422 Author: WangGaoBo Date: Tue Jan 8 19:37:05 2019 +0800 用户信息，总消费书币 commit fcb1f2879e728d3871432fac233241d2629467a1 Author: licc <45360682@qq.com> Date: Tue Jan 8 19:32:42 2019 +0800 test commit f2ac4f1070642961cad8471d77b075984ef2bbe9 Author: zhenglh Date: Tue Jan 8 19:30:13 2019 +0800 收藏处理 commit 31190e95469c2a62b8a39ecc49e0bd4f1316eeee Author: WangGaoBo Date: Tue Jan 8 19:18:31 2019 +0800 修改代理商ID commit f7923cf4dad1203732e762d718cbc419c16e7e4a Author: zhenglh Date: Tue Jan 8 18:01:50 2019 +0800 添加最近阅读，地址错误时显示404页面修改 commit aef0589f222e35e10c1e80121f79eba5fa5e8c9a Author: zhenglh Date: Tue Jan 8 17:58:36 2019 +0800 添加最近阅读，地址错误时显示404页面修改 commit b7030de2a6536c78bfc0ba4046318e8e3bac8d7e Author: WangGaoBo Date: Tue Jan 8 17:57:09 2019 +0800 充值记录 commit 4354861f628cc641c996b4f5d0b36f9d067413e6 Author: WangGaoBo Date: Tue Jan 8 17:48:43 2019 +0800 消费汇总，书币看点 commit f6abaf9f51d56084586b3c7256873c0edb876ea7 Author: zhenglh Date: Tue Jan 8 17:41:22 2019 +0800 导粉章节获取错误 commit 76c0379db51c2018e6acdd7d346e9fb369ed0fb1 Author: zhenglh Date: Tue Jan 8 17:08:37 2019 +0800 user_id修改 commit 4b7fea0e27b10242424d7aaf91fc6e20999ac555 Author: zhenglh Date: Tue Jan 8 16:50:17 2019 +0800 referral_id修改 commit dcf9d8fb78452d4e93f100468608ea5a098562c2 Author: WangGaoBo Date: Tue Jan 8 16:44:30 2019 +0800 测试脚本 commit 724bbb56325e246952188a1e4bc94da556f4d539 Author: zhenglh Date: Tue Jan 8 16:43:14 2019 +0800 导粉逻辑修改 commit 708ee4f023f0e4f8d46eb2d29d3af81c26a3f226 Author: WangGaoBo Date: Tue Jan 8 16:33:43 2019 +0800 测试脚本 commit 0bfcf9fd5f0212070e9ede9fa304724879626394 Author: zhenglh Date: Tue Jan 8 16:27:51 2019 +0800 referral_id修改 commit 53928d89d2f00e4c177821c49d1bb68be31e2689 Author: zhenglh Date: Tue Jan 8 16:27:01 2019 +0800 referral_id修改 commit f917465d0365c56734210ba635b0de73fa2ca3b9 Author: zhenglh Date: Tue Jan 8 16:15:42 2019 +0800 referral_id修改 commit f5f0b1598b5e6da9a156615cb59c7b7840447428 Author: licc <45360682@qq.com> Date: Tue Jan 8 15:46:58 2019 +0800 vip账号推广链接统计导出 commit 9bb9e642a780529346e6db75760445a27e10e0c6 Author: zhenglh Date: Tue Jan 8 15:11:02 2019 +0800 用户修改命令的添加 commit a10fd2d498f021c4134cbca8ac85b59e75ac4a3e Author: zhenglh Date: Tue Jan 8 15:03:27 2019 +0800 下一章参数错误 commit cd905c3a599b02f9c4e7548296de2a64c40ec155 Author: zhenglh Date: Tue Jan 8 14:42:04 2019 +0800 旧的代理商及推广链接的更新 commit 4e6e356fdf8ac727711364b90a2d1ffb3a9f96eb Author: zhenglh Date: Tue Jan 8 14:04:44 2019 +0800 旧用户信息处理 commit c6c24c72f783d79773c9aef2d8babc08a63e7891 Author: zhenglh Date: Tue Jan 8 13:32:49 2019 +0800 channel_id从用户表中获取 commit 9bc30981872cf7d1000187ddc7666f5e9efe0d68 Author: zhenglh Date: Tue Jan 8 12:35:18 2019 +0800 openid 与 user_id的获取修改 commit cd59a1f7e5a802c04609012d1069c02e15d61e0b Author: WangGaoBo Date: Tue Jan 8 12:06:39 2019 +0800 修改充值记录 commit 5c33a5e3097cbe077ad21c3ca437765bcf2c7514 Author: zhenglh Date: Tue Jan 8 11:20:44 2019 +0800 支付测试完成 commit e10feb077f42236f8d72430bf919d6db8ff63465 Author: zhenglh Date: Mon Jan 7 20:26:05 2019 +0800 阅读页处理 commit b66684df4ae0603d37bf044c616b041567bb456d Author: WangGaoBo Date: Mon Jan 7 20:09:26 2019 +0800 修改Bug commit 01b930b2f3e9f9d86f8c59d7f48742487fff6cfc Author: zhenglh Date: Mon Jan 7 19:50:18 2019 +0800 推广链接与活动链接测试完成 commit 25e965f34fb58bfc90018b8df124d522ab95f862 Author: WangGaoBo Date: Mon Jan 7 19:43:48 2019 +0800 修改Bug commit c0ecc91b863f0f6fc71c2bd226ca9272d0a3b30b Merge: 4ca688691 9803da94e Author: 丁海波 Date: Mon Jan 7 19:37:14 2019 +0800 Merge remote-tracking branch 'origin/dev-customer-merge-master-20180102' into dev-customer-merge-master-20180102 commit 4ca688691764fd747a0a5db867e626a05e98cd02 Author: 丁海波 Date: Mon Jan 7 19:37:04 2019 +0800 充值时间 commit 9803da94eb2e30245d95a0ed9301f33927465ba8 Merge: 6a9158866 ca7128960 Author: WangGaoBo Date: Mon Jan 7 19:36:57 2019 +0800 Merge remote-tracking branch 'origin/dev-customer-merge-master-20180102' into dev-customer-merge-master-20180102 commit 6a91588664e49e74265fd206f1ed14c179ba871c Author: WangGaoBo Date: Mon Jan 7 19:36:42 2019 +0800 修改Bug commit ca71289609e7cc30254f9dc465f8fdf210a5a492 Author: 丁海波 Date: Mon Jan 7 19:35:50 2019 +0800 充值时间 commit c60de32efa69eaa01defe93fb6e111cd6de7e9d2 Author: zhenglh Date: Mon Jan 7 19:21:42 2019 +0800 充值测试 commit f3c73d3a29ffc3958f8f18e700174e0b0f28517d Merge: 4449f0b2b 1ae334229 Author: 丁海波 Date: Mon Jan 7 17:36:01 2019 +0800 Merge remote-tracking branch 'origin/dev-customer-merge-master-20180102' into dev-customer-merge-master-20180102 commit 4449f0b2b622e8f1d0b0f1fba2f0ebbfcb7de870 Author: 丁海波 Date: Mon Jan 7 17:35:51 2019 +0800 日期 commit 1ae334229aab4fe7c6189a4b90210da19a71c682 Author: WangGaoBo Date: Mon Jan 7 17:23:01 2019 +0800 修改Bug commit 9faa6ed13a3ce4fa201eaa170613bc60a33a0294 Author: licc <45360682@qq.com> Date: Mon Jan 7 17:08:36 2019 +0800 订单详情导出 commit 0f6fcbc3462d4ff55a1b93c4fa91a02abe743a84 Author: WangGaoBo Date: Mon Jan 7 16:45:21 2019 +0800 充值类型 commit 66e944af0692e22409b4fc6c91fc574ed2ba8e5e Author: zhenglh Date: Mon Jan 7 14:54:11 2019 +0800 用户登录逻辑修改，测试开始 commit e7f89b8776533b77c820c310133fc489ba43d4b8 Author: DuanEnJian Date: Mon Jan 7 13:33:48 2019 +0800 修改小说统计方式,修改渠道商展示错误问题 commit c7d5b157b9cff08eab8003b6b1dbc6e2afc4bce1 Author: WangGaoBo Date: Mon Jan 7 11:41:33 2019 +0800 Tab 标记 Active commit ecb75e62562903021f03010770b0a6f8e5560b64 Author: DuanEnJian Date: Mon Jan 7 11:18:58 2019 +0800 修改小说统计方式,修改渠道商展示错误问题 commit 5eb190708fa70a0c2cc30c4942cbfa644da96556 Author: DuanEnJian Date: Mon Jan 7 11:17:06 2019 +0800 修改小说统计方式,修改渠道商展示错误问题 commit d338edc0c352d5f1d9febf45856e5476b63e3025 Author: WangGaoBo Date: Mon Jan 7 11:08:30 2019 +0800 修复BUG commit e0532e8c9a55eaef83b56e1d512cc6a723e76647 Author: zhenglh Date: Mon Jan 7 10:48:51 2019 +0800 支付充值完成 commit c9664519116f877886ccf6c7a90858ba20891194 Author: licc <45360682@qq.com> Date: Sat Jan 5 18:59:59 2019 +0800 Cache-control:private commit 8a06eec14766aef693df237aed9f60875f967fb2 Author: zhenglh Date: Sat Jan 5 18:56:51 2019 +0800 index 支付测试完成 commit c32d911d35be9ea58638f44fc9b48806f2f823fe Author: 丁海波 Date: Sat Jan 5 18:32:16 2019 +0800 个人中心 commit 8ad91d415fb24a8a019e764896d8607cb156ddc6 Author: 丁海波 Date: Sat Jan 5 18:28:37 2019 +0800 复选框 commit 58f7e528bbbafbfecd09f6b0d3d446ba23aa7550 Author: zhenglh Date: Sat Jan 5 18:21:09 2019 +0800 agent_id与referral_id的存取规则修改 commit 5c0e4912a85dbc1f5786df736b937bb22602041f Merge: baa4c59bb a1f08a2e1 Author: 丁海波 Date: Sat Jan 5 18:01:56 2019 +0800 Merge remote-tracking branch 'origin/dev-customer-merge-master-20180102' into dev-customer-merge-master-20180102 commit baa4c59bb4b97394b7e8004735368c5e1efd1608 Author: 丁海波 Date: Sat Jan 5 18:01:46 2019 +0800 复选框 commit 450b2a9d5950137863200e04e72f65a4c427458a Author: zhenglh Date: Sat Jan 5 17:43:36 2019 +0800 agent_id与referral_id的存取规则修改 commit a1f08a2e1299805592cac90636b9a9e39bac6786 Author: WangGaoBo Date: Sat Jan 5 17:28:35 2019 +0800 修复，获取链接，复制链接功能 commit 0bcb4716949ca7aaf860570bdc65b77af37730b1 Author: zhenglh Date: Sat Jan 5 16:25:26 2019 +0800 收藏功能 commit dbe8860c306c5fd6d622d87b1ff9a2e5fce4b143 Author: zhenglh Date: Sat Jan 5 16:02:00 2019 +0800 页面调整 commit c3b8a5b2bea6832cef901236ad4dc14de0c90e0f Author: 丁海波 Date: Sat Jan 5 15:51:48 2019 +0800 样式优化 commit 806e610a74e3c57357a9912b04776fcfd7c1343b Author: zhenglh Date: Sat Jan 5 15:48:56 2019 +0800 多平台样式修改 commit 0c8c7d4252dcfe9cd262a12054960c1fa689fe78 Author: WangGaoBo Date: Sat Jan 5 15:14:58 2019 +0800 充值类型-增加type commit cd01c515b73bb75d1ee26c935b6d93a82ccb19e1 Merge: 28a0574b3 ce6a63bdd Author: zhenglh Date: Sat Jan 5 15:03:19 2019 +0800 Merge branch 'master' into dev-service-split-reading # Conflicts: # application/main/service/FinancialService.php commit 8895887a2bc98b202b74c5844c12ae62a732c80c Author: WangGaoBo Date: Sat Jan 5 11:08:31 2019 +0800 书籍列表，限制客服不能操作书籍，只能查看 commit ae5d1ba911ab9e7f149206875a12b1d4a5ca30bd Author: WangGaoBo Date: Sat Jan 5 10:23:27 2019 +0800 优化命令行日志信息 commit 78df4f8a07b6c43ddfe45d144598b65016085736 Author: WangGaoBo Date: Sat Jan 5 10:12:12 2019 +0800 VIP充值，设置有效期 commit 28a0574b3911b1fe6647ccabc0122c623b328a44 Author: zhenglh Date: Sat Jan 5 10:01:04 2019 +0800 计费章节获取 commit 4ec04775a906d82b8d1da4dec55a682edb00715d Author: zhenglh Date: Fri Jan 4 20:10:26 2019 +0800 导粉 commit 655be496cc680153e390dc02fc79e19180668fb0 Author: WangGaoBo Date: Fri Jan 4 14:27:53 2019 +0800 转化成数组 commit 8eef13a31650fb9fb64f839566556f5f269de6ed Author: zhenglh Date: Fri Jan 4 11:47:32 2019 +0800 单元测试补全 commit dd1a2acb45f174b6649c17ffb5a4e4814de0013f Author: licc <45360682@qq.com> Date: Fri Jan 4 11:26:25 2019 +0800 用户统计修改 commit 05e76d28177b61daede9ae038bb3e1067289b7ca Author: DuanEnJian Date: Thu Jan 3 20:21:19 2019 +0800 修改小说统计方式 commit 3a816e4ae2336f83b62fa19fed640b03b6b9c0b3 Author: DuanEnJian Date: Thu Jan 3 19:53:14 2019 +0800 修改小说统计方式 commit ce6a63bdd89e9804ba1a82b838812bd35501d53b (tag: cps_20190110_144403, tag: cps_20190104_102625) Author: licc <45360682@qq.com> Date: Thu Jan 3 19:48:23 2019 +0800 增加被合并掉的域名屏蔽功能 commit 8b2af14d99ecb96e420838f6d831c775a6f6ed82 Author: WangGaoBo Date: Thu Jan 3 19:45:33 2019 +0800 前端入口，增加域名屏蔽 commit 3d520a152cf73101e2dd03c50a8cda5513f10735 Author: licc <45360682@qq.com> Date: Thu Jan 3 17:51:59 2019 +0800 加上合并掉的汇聚支付回调 commit f0d79b81f46ba16d1e5368258ddf41f1bb0a3e5f (tag: cps_20190103_171421) Author: licc <45360682@qq.com> Date: Thu Jan 3 17:09:56 2019 +0800 去掉美书性别判断 commit 66730e13dc5e0f440e893b2d658e4bd21ca95757 Author: licc <45360682@qq.com> Date: Thu Jan 3 15:40:02 2019 +0800 汇聚支付文案小修改 commit 83ef223bfcb69afacea4151989bfe358090ce87d Merge: 713f5333e e2c7304dc Author: licc <45360682@qq.com> Date: Thu Jan 3 15:32:35 2019 +0800 Merge branch 'dev-pay-new' of http://192.168.0.31/fe/cps into dev-huijupay # Conflicts: # application/api/controller/Wechat.php commit 4bb7ffa7a064f7e92715e5e0b33bdaf21a6992cc Author: zhenglh Date: Thu Jan 3 15:21:47 2019 +0800 测试支付完成 commit a5918a609db49ef2cce76ec0b031c41449579597 Author: zhenglh Date: Thu Jan 3 12:17:14 2019 +0800 阅读页测试完成 commit f5738a566c2ce14c3d3e3385b0300f6d2b9101bc Author: zhenglh Date: Thu Jan 3 11:59:20 2019 +0800 处理导粉 commit 713f5333e93b97d111eec37a6b7b39de79a0b4f8 (tag: cps_20190103_115852) Merge: 7b467648e 7e5f16ba2 Author: licc <45360682@qq.com> Date: Thu Jan 3 11:36:45 2019 +0800 Merge branch 'dev-meishu-merge-np-new' of http://192.168.0.31/fe/cps commit 1656ac7188e4cd7909d62e62e22d345531e13cc8 Merge: 30a8ba3cd 8717391ba Author: WangGaoBo Date: Thu Jan 3 10:17:05 2019 +0800 Merge branch 'dev-customer-20181221' into dev-customer-merge-master-20180102 commit 8717391ba6e1c84c576b235518bc27acc033565e Author: WangGaoBo Date: Wed Jan 2 20:28:58 2019 +0800 修改命令行，刷新脚本 commit f163633277dc4e379fa5d10bd2944269baa478db Author: WangGaoBo Date: Wed Jan 2 19:52:06 2019 +0800 VIP充值时，更新vip_start_time commit 2b9ffc3f58033fb3e0376994b6ad46ae274acd33 Author: WangGaoBo Date: Wed Jan 2 19:51:21 2019 +0800 完成命令行，刷vip_start_time commit abbd6e111d338f4a70e6c3e1148c850c9c38df50 Author: zhenglh Date: Wed Jan 2 19:50:23 2019 +0800 书籍阅读调试开始 commit c742b569419582a4b3a15018b5cebf0aa5600764 Author: WangGaoBo Date: Wed Jan 2 19:01:23 2019 +0800 充值vip,设置vip_starttime commit 7e5f16ba24826d4ce0c2fb18bca45b319d72b1f8 Author: zhenglh Date: Wed Jan 2 16:22:36 2019 +0800 推广链接统计统计列表字段调整 commit 7b467648e92b6377b4e788c98143f28f15279011 (tag: cps_20190102_164610) Merge: 49d398488 46ebdd4d2 Author: 李天时 Date: Wed Jan 2 16:11:38 2019 +0800 Merge branch 'dev-xiongda' of http://192.168.0.31/fe/cps into dev-xiongda-commit commit 46ebdd4d2de97724cec196e2b1db8bc32fff7b5c Author: 李天时 Date: Wed Jan 2 16:10:52 2019 +0800 fix线上关注问题 commit 189dd726cda5e1fa87d6e85b55079bf82f09cfa2 Author: 李天时 Date: Wed Jan 2 16:08:35 2019 +0800 fix线上关注问题 commit 6ceb95d20c16736da7b1853e130d759d215cb1aa Author: yunfeng ke Date: Wed Jan 2 15:04:31 2019 +0800 add del2img commit 49d398488b141093de57cb57cc80200029083334 Merge: b228adcbb 878c666dc Author: 李天时 Date: Wed Jan 2 14:05:34 2019 +0800 Merge branch 'dev-xiongda' of http://192.168.0.31/fe/cps into dev-xiongda-commit commit 30a8ba3cd8cd4ab292eedf08dcda0ed1473c2657 Author: zhenglh Date: Wed Jan 2 13:58:31 2019 +0800 处理免费阅读的bug commit 55f1ce5583dd9c8c4e1d7d3f8dd59bfa17d21f59 Author: zhenglh Date: Wed Jan 2 12:13:39 2019 +0800 vip运营未绑定渠道时，渠道id返回-1 commit 385cfb348aeb89cd85167826a82840ee3479ec71 Merge: 4e37b9193 b228adcbb Author: zhenglh Date: Wed Jan 2 11:58:21 2019 +0800 merge from master commit f7beb1e8fc1aade52117b1324724a3eb684fd74d Author: DuanEnJian Date: Wed Jan 2 11:25:59 2019 +0800 修改小说统计,书籍统计展示问题 commit f4dc055979e8297fd69ba99757a7b4c12c17f0b2 Author: DuanEnJian Date: Wed Jan 2 10:16:30 2019 +0800 修改统计方式 commit 76b4e10bd15d7967aa0598fd10b72af381946a2f Author: DuanEnJian Date: Wed Jan 2 10:14:06 2019 +0800 修改统计方式 commit 6d15b0e5f2e95274b242c63d88c3c03242fabc81 Author: 李天时 Date: Sat Dec 29 23:30:52 2018 +0800 fix订单信息记录数据库报错日志的bug commit edaee7be3d2e6a2e22985c534da71d010c2b55d3 Author: 李天时 Date: Sat Dec 29 23:28:36 2018 +0800 fix非强制关注新用户能读收费章节 commit a55e11a172103daa4ed4141bcd7a220062c84d42 Author: 李天时 Date: Sat Dec 29 23:14:11 2018 +0800 微信和四方支付回调打点日志 commit fecd40f503f5a099ba6796b6b6aa97cc455589ed Author: 李天时 Date: Sat Dec 29 21:40:36 2018 +0800 微信回调，使用filecache commit 6a52dfd04f954508140bbb0da02539f5feb9a0a2 Author: 李天时 Date: Sat Dec 29 21:03:41 2018 +0800 微信回调，使用filecache commit 4e37b919365949f8de8328a32e87c976108c5af9 Author: WangGaoBo Date: Sat Dec 29 11:04:10 2018 +0800 前端-设置用户默认信息 commit b095ca39d21d9661510e2c2c0eef89b02989cb5f Author: licc <45360682@qq.com> Date: Sat Dec 29 10:40:23 2018 +0800 暂存 commit eb7840ac709a21925ca8b553532734d3fc5956b1 Merge: 95e3a9d0b 2e1f77255 Author: licc <45360682@qq.com> Date: Fri Dec 28 17:52:59 2018 +0800 Merge branch 'dev-export-csv' of http://192.168.0.31/fe/cps into dev-export-csv-new commit c402f1945b02bc8a4c037a45a830fbfec1a2368c Author: WangGaoBo Date: Fri Dec 28 17:48:14 2018 +0800 获取链接-完成复制功能 commit 878c666dc4e5c512ff61bcce61b76504d33ac3a8 Author: yunfeng ke Date: Fri Dec 28 16:14:51 2018 +0800 chg color commit f54bba7340b44d2a81e25c26025709be20ad28c6 Author: yunfeng ke Date: Fri Dec 28 15:43:33 2018 +0800 up code commit e00ff10ee32dd4e76c5ec62b126fde42a7ecf8ea Author: yunfeng ke Date: Fri Dec 28 15:36:46 2018 +0800 up code commit 479a89190608588ecdd71a524916131a7415537e Author: yunfeng ke Date: Fri Dec 28 15:06:20 2018 +0800 up code commit 5c277263030d343bdec5ef6ec2ac421714f8ba23 Author: yunfeng ke Date: Fri Dec 28 15:02:46 2018 +0800 up code commit c4760f58c013f746d02ba05a7f2e9006efbab1f5 Author: WangGaoBo Date: Fri Dec 28 14:55:56 2018 +0800 获取链接-切换Tab commit 6403d418d7efdd43ab7196ad892f633899301389 Author: WangGaoBo Date: Fri Dec 28 11:23:34 2018 +0800 获取链接-增加验证 commit 216caa2d642f286e3baa2ebaae379186a99bc9d8 Author: DuanEnJian Date: Thu Dec 27 19:56:49 2018 +0800 添加书籍统计汇总功能 commit 65bb489c8c8f1aae98b80cef25f0fc49fdd75041 Author: DuanEnJian Date: Thu Dec 27 19:15:20 2018 +0800 添加书籍统计汇总功能 commit f41e5084d2046b91012abb10ac2b7cd62d3a63ad Author: yunfeng ke Date: Thu Dec 27 19:04:39 2018 +0800 up code end commit f69e70672c189d97459ac6a9871cfb7638cffffc Merge: db6a47c98 a79add973 Author: WangGaoBo Date: Thu Dec 27 18:19:59 2018 +0800 Merge remote-tracking branch 'origin/dev-customer-20181221' into dev-customer-20181221 commit db6a47c98f768332cd59fba2944be647c041de01 Author: WangGaoBo Date: Thu Dec 27 18:19:49 2018 +0800 读者查询-90%完成 commit 4cc06afbc2712fd9a74f3b3c8154d7b41a44530a Author: DuanEnJian Date: Thu Dec 27 17:54:59 2018 +0800 添加书籍统计汇总功能 commit 24b5242b10eac682e20033d74d52b430d4814ff2 Author: yunfeng ke Date: Thu Dec 27 17:31:38 2018 +0800 换图*3 commit c572a0e937e64094983956d0611d04ef0d4d14be Author: yunfeng ke Date: Thu Dec 27 16:54:59 2018 +0800 后台首页 commit a79add9736a74c94e2ff8046b1b161d98746453a Merge: 411691af0 0b7dfbaf8 Author: 李天时 Date: Thu Dec 27 16:40:24 2018 +0800 Merge remote-tracking branch 'origin/dev-customer-20181221' into dev-customer-20181221 commit 411691af039375a4f4899da60786e942d0df6250 Author: 李天时 Date: Thu Dec 27 16:40:14 2018 +0800 删除阅读记录改为软删除 commit 0b7dfbaf8cebaf40eb8dc6deac5ae5e8b4f9a8b1 Author: WangGaoBo Date: Thu Dec 27 16:03:19 2018 +0800 读者查询-筛选条件-增加时间查找 commit e2c7304dca8f3cb5837491769cc0d3358f90ba24 Author: licc <45360682@qq.com> Date: Thu Dec 27 15:39:06 2018 +0800 修改美书，袋鼠，沙发最近阅读瀑布流问题 支付回调加监控日志 commit 4fa162db5de086268ed0c3384d453b53c58be45b Author: yunfeng ke Date: Thu Dec 27 15:32:54 2018 +0800 up style commit b71f0f1ef5c143da67320c860e8bb18cb7a1bf19 Author: yunfeng ke Date: Thu Dec 27 14:50:53 2018 +0800 add img commit 25dbbc750a776cb0f7740968d3a272e0c534aa6e Author: yunfeng ke Date: Thu Dec 27 11:21:03 2018 +0800 chg img commit 31fed5ba4c14b78a3c290e9c70a4a6d9ee67b785 Author: WangGaoBo Date: Thu Dec 27 11:13:20 2018 +0800 读者查询-充值记录-VIP开始时间和结束时间 commit b228adcbb6b68d46cfab06fb8ba7a0ff83c6e5dd (tag: cps_20181229_104555) Merge: 95e3a9d0b ceb42d633 Author: licc <45360682@qq.com> Date: Thu Dec 27 10:47:05 2018 +0800 Merge branch 'dev-meishu-merge-np' of http://192.168.0.31/fe/cps into dev-meishu-merge-np-new commit 95e3a9d0b70b094c7b8f8e451a76c4857402e4fc (tag: cps_20181228_115635, tag: cps_20181228_100518) Merge: 7cb7ca14b 7a767220b Author: zhenglh Date: Thu Dec 27 10:40:59 2018 +0800 Merge branch 'dev-subscribe-migrate-20181220' commit 7a767220b8d5c71859a1a3529ef03e15ed0983bb Author: zhenglh Date: Thu Dec 27 10:40:13 2018 +0800 微信api，事件处理用户信息时未连接用户分库 commit 7cb7ca14b8694a39aba774ce22c70177aed2ad46 Merge: 4fa0deaf1 ab5bf2362 Author: zhenglh Date: Thu Dec 27 10:39:13 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 4fa0deaf1ba3e7b6e7894355707c33aeeead8b05 Merge: d380da3d4 d05787e98 Author: zhenglh Date: Thu Dec 27 10:39:02 2018 +0800 Merge branch 'dev-subscribe-migrate-20181220' commit d05787e9812b77595902de80d672c988ef9a4b74 Author: zhenglh Date: Thu Dec 27 10:38:24 2018 +0800 微信api，事件处理用户信息时未连接用户分库 commit f87c03db9056d5c58f77ed76f38ca5aeb29ed5d0 Merge: e0635707a 0804e721b Author: DuanEnJian Date: Wed Dec 26 19:29:05 2018 +0800 Merge remote-tracking branch 'origin/dev-service-split-reading' into dev-service-split-reading commit e0635707a55d407b63de7d1dfb155b93aced7f22 Author: DuanEnJian Date: Wed Dec 26 19:29:00 2018 +0800 添加支付逻辑 commit 0804e721b7d0a40f70327cfcdd5d3cca8794dea8 Author: zhenglh Date: Wed Dec 26 19:25:46 2018 +0800 添加监控日志 commit ce6d6d2ae64b85befe680f289d22f317192771b7 Author: zhenglh Date: Wed Dec 26 19:00:19 2018 +0800 日志处理 commit 300a99f1cc0d2fd481632aa0f72bbca8e5172709 Author: zhenglh Date: Wed Dec 26 17:59:51 2018 +0800 阅读配置添加 commit 463ac63c159250aa0465c2e05a7f5e958ba973b6 Merge: c6022e3e4 860fed5b4 Author: zhenglh Date: Wed Dec 26 17:46:34 2018 +0800 Merge branch 'dev-service-split-reading' of http://192.168.0.31/fe/cps into dev-service-split-reading commit c6022e3e4a10b2cede6dae9b9befc49ac3bae9fc Author: zhenglh Date: Wed Dec 26 17:46:26 2018 +0800 阅读测试完成 commit 53ca2b4fb7b04ca32f335925fab4400af10ad4df Merge: 283466a9c ecea40a3b Author: licc <45360682@qq.com> Date: Wed Dec 26 17:42:09 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-new' into dev-pay-new commit 283466a9c2080020879865503bd57ab126797ff8 Author: licc <45360682@qq.com> Date: Wed Dec 26 17:42:04 2018 +0800 加查单功能 commit ecea40a3b9323e70ad32b25a6520a1de2dbbc2d8 Author: 李天时 Date: Wed Dec 26 17:15:32 2018 +0800 记录调用支付API的时长 commit 860fed5b4937e1464d9a513bf16673d47702305a Merge: 95bd0a0f7 552dfc6b9 Author: DuanEnJian Date: Wed Dec 26 16:32:53 2018 +0800 Merge remote-tracking branch 'origin/dev-service-split-reading' into dev-service-split-reading commit 95bd0a0f75c2c27fb31c5c2627076f23bb163024 Author: DuanEnJian Date: Wed Dec 26 16:32:47 2018 +0800 添加支付逻辑 commit 552dfc6b9b360760e520130e9fdef2f5fa92ca89 Author: zhenglh Date: Wed Dec 26 13:51:47 2018 +0800 推广二维码与弹出二维码获取,测试 commit cbfd91c527c8379c8ab017b167a52e7b631bc4b7 Author: licc <45360682@qq.com> Date: Wed Dec 26 13:46:01 2018 +0800 pay.do改成pay commit 04eff15db4d95c3edd2c1e4277388f7ffb117e75 Author: licc <45360682@qq.com> Date: Wed Dec 26 13:26:29 2018 +0800 活动钱数修改 commit 5fab19ed3611b84bcdaede152663053d599d8ad7 Author: licc <45360682@qq.com> Date: Wed Dec 26 13:25:31 2018 +0800 钱数计算修改 commit c5baab6153d93250c3181bf64538a4acfc7c956a Author: zhenglh Date: Wed Dec 26 13:04:35 2018 +0800 推广二维码与弹出二维码获取 commit 2a92dd161ee0c4d464d51b270a0034bb2c84300a Author: licc <45360682@qq.com> Date: Wed Dec 26 13:02:15 2018 +0800 test commit 969d3b75ae34487e0265cbc544cfbbb289e7fde8 Author: licc <45360682@qq.com> Date: Wed Dec 26 13:00:00 2018 +0800 test commit d778c5235314c6357e37d1f3992c36eaae8127ab Author: licc <45360682@qq.com> Date: Wed Dec 26 12:56:12 2018 +0800 test commit 68cb9acda0d64431ee52bb659407263a586280b1 Author: zhenglh Date: Wed Dec 26 12:46:06 2018 +0800 导粉章节测试 commit 703c0e0f9a6de9a137e1332ddcf7599056355457 Author: licc <45360682@qq.com> Date: Wed Dec 26 12:08:23 2018 +0800 汇聚支付活动修改提交 commit 6fd30e5bf3fb5a7d143e0860adce010c503b23c4 Author: licc <45360682@qq.com> Date: Wed Dec 26 11:57:16 2018 +0800 汇聚支付活动修改提交 commit 1a2d1a6fd5590e8af900bd333ccf9b603080c26a (tag: cps_20181226_114023) Author: 李天时 Date: Wed Dec 26 11:11:10 2018 +0800 熊大站前端样式初始化 commit 1852dcec206bef2ccffdde13eb4e4cada15b34b0 Author: licc <45360682@qq.com> Date: Wed Dec 26 10:49:22 2018 +0800 四方支付提交 commit 3d9531b07996afe6c0280ad19be621e3101d6bd2 Author: WangGaoBo Date: Tue Dec 25 18:59:18 2018 +0800 读者查询-充值记录 commit eb7144d08347c858ece6827b412968e2b67e0846 Author: WangGaoBo Date: Tue Dec 25 17:54:59 2018 +0800 读者查询-消费记录 commit c51bf95f8d8f40ac2152014d760ada15e8e442a3 Author: licc <45360682@qq.com> Date: Tue Dec 25 17:12:04 2018 +0800 模拟post commit 5968fa28cabcb671fa7c78fa84a3ee1f13e364ee Author: licc <45360682@qq.com> Date: Tue Dec 25 17:07:29 2018 +0800 test commit 042b7a80593c82ba68a14d1c49bee3b85f3ca388 Author: licc <45360682@qq.com> Date: Tue Dec 25 16:40:44 2018 +0800 测试 commit 486e3ea8771f798a569c57a057ef64e2a7b9af13 Author: licc <45360682@qq.com> Date: Tue Dec 25 16:09:01 2018 +0800 测试 commit df78212a0a8c4c9da0571881c2b3f6f545f0f5a4 Author: WangGaoBo Date: Tue Dec 25 14:46:05 2018 +0800 读者查询-订单记录 commit 2e1f772552f44dcfec261ca885618ef0544e834c Author: licc <45360682@qq.com> Date: Tue Dec 25 14:24:47 2018 +0800 导出功能 commit e503e7b1be6fe12b4367363c982cb317935cdd8b Author: zhenglh Date: Tue Dec 25 12:36:52 2018 +0800 微信api，事件处理用户信息时未连接用户分库 commit 516bff775bf01b6527f8cc2a26b00a65e1f65d3a Author: 李天时 Date: Mon Dec 24 21:10:30 2018 +0800 用户信息详情页面 commit 3e7063d05a5adde3fc7bb903850f9e7d495da12c Author: zhenglh Date: Mon Dec 24 18:16:50 2018 +0800 书籍获取方法整理 commit 539173c9f3ec6cfc5831d067bbcc8eb5ba37b3d1 Author: 李天时 Date: Mon Dec 24 16:15:08 2018 +0800 用户信息详情页面 commit 8701d600abf7aaaa6b749696f76424899a652e3a Merge: 86a16ead1 a9109defb Author: 李天时 Date: Mon Dec 24 15:52:21 2018 +0800 Merge remote-tracking branch 'origin/dev-customer-20181221' into dev-customer-20181221 commit 86a16ead1a07041efaad106475a0d77874558dfb Author: 李天时 Date: Mon Dec 24 15:52:14 2018 +0800 用户信息详情页面 commit ceb42d633528708c97e29ee98313e7ccf1372a1f Merge: ab5bf2362 23d120bf2 Author: licc <45360682@qq.com> Date: Mon Dec 24 15:11:25 2018 +0800 合并美书默认男频功能到master commit a9109defb5dd90bfd5eaf29b2abe6acf466d7573 Author: WangGaoBo Date: Mon Dec 24 14:01:04 2018 +0800 客服不能查看收费章节内容 commit 962e6bd7c4a48ae5ca111c88ae893f7ce12f6252 Author: WangGaoBo Date: Mon Dec 24 14:00:34 2018 +0800 客服不能查看收费章节内容 commit c8f7630064ed5035845e208ea85a7f07eb306c6e Author: WangGaoBo Date: Mon Dec 24 10:24:10 2018 +0800 个人中心页面：添加永久书币和赠送书币，调整颜色 commit 7c7f4cf89abc6a7a692c565526d15cd9ea2ace27 Author: WangGaoBo Date: Mon Dec 24 10:23:13 2018 +0800 个人中心页面：添加永久书币和赠送书币，调整颜色 commit c4fd4eb65e3ef84ef0ca2cd4f17c5a7ab80266c1 Author: zhenglh Date: Sat Dec 22 19:00:43 2018 +0800 书籍章节获取，页面展示 commit 1de5709cd6d50a293190fc7d0078c9187d4f028e Author: WangGaoBo Date: Sat Dec 22 17:58:56 2018 +0800 个人中心页面：添加永久书币和赠送书币 commit ab5bf23627a3603bab7af2bb3977c14a78872ec6 (tag: cps_20181224_144845, tag: cps_20181222_154042) Author: DuanEnJian Date: Sat Dec 22 15:16:10 2018 +0800 去掉倒粉域名缓存 commit 5435ce07a5d2fe0824cf3fca01eb6b4d38af8c76 Merge: cfb49f9fc 519f4dfbe Author: WangGaoBo Date: Sat Dec 22 14:49:45 2018 +0800 Merge remote-tracking branch 'origin/dev-customer-20181221' into dev-customer-20181221 commit cfb49f9fc0fa218fea61107524010a57f952b2d7 Author: WangGaoBo Date: Sat Dec 22 14:49:33 2018 +0800 获取链接 commit d380da3d439a83c65b7b3bdc84be482b994e7be0 Merge: f1b94451b df7e75675 Author: zhenglh Date: Sat Dec 22 14:06:53 2018 +0800 Merge branch 'dev-subscribe-migrate-20181220' commit df7e75675e39de188ea329e29cc34d970092f798 Author: zhenglh Date: Sat Dec 22 14:05:03 2018 +0800 关注与取消关注打点方法使用错误 commit 519f4dfbe413f179dfd8ee7985ae5d3427e85c63 Author: 李天时 Date: Sat Dec 22 11:58:33 2018 +0800 fixbug微信支付配置状态和是否默认的查询不生效 commit 58037b415c200d7508b7e7de207fd8d795447afc Author: 李天时 Date: Sat Dec 22 11:30:46 2018 +0800 四方支付记录api调用时长 commit f1b94451b9c1e05b10e9e63a538354bd2d8c37d4 Merge: 60a61f42e dfb3ab622 Author: zhenglh Date: Sat Dec 22 11:25:10 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit f8aa0da8838b08d0bac75a09bd40f85968755349 Author: 李天时 Date: Sat Dec 22 11:15:27 2018 +0800 四方支付记录api调用时长 commit dfb3ab6228c584820730bc137092c689d1bd0f13 Author: php-王凡昌 Date: Sat Dec 22 11:14:36 2018 +0800 修复安全漏洞 commit 829f68d9033d81b7ac31600f09541bb683d12462 Author: 李天时 Date: Sat Dec 22 11:09:59 2018 +0800 四方支付记录api调用时长 commit c1883e85c7c016612a1737c54e80555b9966e1ec Author: 李天时 Date: Sat Dec 22 11:07:37 2018 +0800 四方支付记录api调用时长 commit 60a61f42e73bb51cf2bdca3c8552d3c996f08306 Author: WangGaoBo Date: Sat Dec 22 10:57:14 2018 +0800 新增打点MQ commit ce270b9f0730658fb8d67ca8625847ce1d5a8d39 Author: WangGaoBo Date: Fri Dec 21 20:15:27 2018 +0800 获取链接 commit f26255bb810ccbc84b49a7a3b19123f60a36b93a Author: zhenglh Date: Thu Dec 20 15:20:57 2018 +0800 取消关注打点去掉is_first commit dbce5190de81c99591bc8cabbef398158c389856 Merge: 38d2e1284 bc19c5766 Author: zhenglh Date: Thu Dec 20 15:14:32 2018 +0800 Merge branch 'dev-subscribe-migrate-20181220' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-20181220 commit 38d2e12843be138c66704f2a4a0bbb58c2a5dc06 Author: zhenglh Date: Thu Dec 20 15:14:15 2018 +0800 打点信息删除is_first字段 commit bc19c5766ea0f5a0a83f948af105dedaa8d866be Author: licc <45360682@qq.com> Date: Thu Dec 20 15:02:49 2018 +0800 用户统计修改 commit df9d918c6ee18b8dbaed0555130b061fab072668 Author: licc <45360682@qq.com> Date: Thu Dec 20 14:55:51 2018 +0800 改一些文案 commit 23d120bf260d6b85bbc66152ba3727db9d476575 Author: licc <45360682@qq.com> Date: Thu Dec 20 14:33:42 2018 +0800 美书默认女频改成默认男频 commit 25d9aef86ad7967eecb3d39a31fb93da34b7c897 Author: zhenglh Date: Thu Dec 20 14:28:21 2018 +0800 导粉用户模糊关注，is_first字段值为1 commit 3c1505ce353aebb29d596b8d99b905e442f72575 Author: licc <45360682@qq.com> Date: Thu Dec 20 13:47:45 2018 +0800 暂存 commit 1a92a0125b46105b6bf8f384c8e68d4b3c02d02b Merge: 824c45b72 79f4656f3 Author: zhenglh Date: Thu Dec 20 10:45:01 2018 +0800 Merge branch 'master' into dev-subscribe-migrate-20181220 commit 79f4656f3a010d914396f19b59c85a7325f669f9 (tag: cps_20181219_202144) Author: 李天时 Date: Wed Dec 19 19:10:39 2018 +0800 书城前端充值页面底部 温馨提示 文案修改 书城前端充值页面底部 温馨提示 文案修改1 commit 824c45b72cb65f0a6cef1406f68bd5e6930e80b8 Author: zhenglh Date: Wed Dec 19 17:33:37 2018 +0800 js 用户统计刷新 commit 2179c0eb59222588f26a38aa188620c5c1d81f88 Author: zhenglh Date: Wed Dec 19 17:31:59 2018 +0800 referral controller add方法自增id从redis获取 commit 738a722df9e0adeee7afe173f02cd8ba27a60a19 Merge: a42f6889d af99298e7 Author: 李天时 Date: Wed Dec 19 11:13:12 2018 +0800 Merge branch 'dev-search-fix' of http://192.168.0.31/fe/cps into commit-search-fix commit af99298e71daf1de7357ed5b05130a45bea3e86e Author: 李天时 Date: Tue Dec 18 17:22:30 2018 +0800 活动页面和美书充值页面修改loading样式 commit 6f1c42ba5f722a8a5b36502087b57350044fcc03 Author: 李天时 Date: Tue Dec 18 17:14:47 2018 +0800 活动页面和美书充值页面修改loading样式 commit 98005046087c7392e900759dc6c7f3bec6fdf598 Author: 李天时 Date: Tue Dec 18 17:04:36 2018 +0800 活动页面和美书充值页面修改loading样式 commit 10d956de49487e52513e385f397f6d16b5258782 Author: licc <45360682@qq.com> Date: Tue Dec 18 16:46:45 2018 +0800 用户统计字段修改 commit 716c073861a62846b243ad1675c5bd7517965b5d Author: licc <45360682@qq.com> Date: Tue Dec 18 15:44:28 2018 +0800 推广链接去掉俩字段 commit 4594f8568f12c5fb750e77b03864d9b3ce1b4308 Merge: f5576c2e1 8a2935e51 Author: licc <45360682@qq.com> Date: Tue Dec 18 15:44:08 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-20181213' into dev-subscribe-migrate-20181213 # Conflicts: # public/assets/js/backend/referral/referral.js # public/assets/js/backend/referral/vipagentreferral.js # public/assets/js/backend/referral/vipchannelreferral.js commit f5576c2e1e910b0146bc0100bd755bb426589fd6 Author: licc <45360682@qq.com> Date: Tue Dec 18 15:43:01 2018 +0800 推广链接去掉俩字段 commit 8a2935e51147688cfc42581c4dd963ad63a52808 Author: zhenglh Date: Tue Dec 18 14:45:35 2018 +0800 主号关注与取消关注js处理 commit 3fee7105e84d9863385cdba7060e9b8a9c426a80 Author: zhenglh Date: Tue Dec 18 14:27:20 2018 +0800 主号关注、取消关注添加user_id字段 commit 323a793ef4720b33897e35f1b5e7781c23a398a3 Author: licc <45360682@qq.com> Date: Mon Dec 17 15:32:12 2018 +0800 改文案 commit aca2d6ad9b0a74854219e9ff26d1afd493f845d4 Author: licc <45360682@qq.com> Date: Mon Dec 17 13:55:41 2018 +0800 代理商推广链接统计主号关注 commit 5fee413dfbecfcfe8fdfe457c8a3637a58be2b05 Author: licc <45360682@qq.com> Date: Mon Dec 17 11:38:15 2018 +0800 代理商推广链接统计 commit de5bd29d0a8368e7d5be9cd885f932d49ad65870 Author: licc <45360682@qq.com> Date: Fri Dec 14 19:45:08 2018 +0800 60秒刷新样式修改 commit 4deacf960237b21afd200465de7cd88f30a939e9 Author: licc <45360682@qq.com> Date: Fri Dec 14 19:38:48 2018 +0800 VIP运营者账号--刷新改为手动 VIP账号--用户统计列表中文案的修改增加（比例的文案）（其他账号也需要） 渠道商账号--查看代理商推广链接列表中--增加相同字段 管理员账号--渠道商管理--更多--推广链接增加相同字段 commit 1c13782572547efa97f7d17e0137f6de5f997aab Author: 李天时 Date: Fri Dec 14 19:17:25 2018 +0800 活动页面和美书充值页面修改loading样式 commit 8092a05af3816cca5e17455aec2ff5bd3055a446 Author: 李天时 Date: Fri Dec 14 18:56:41 2018 +0800 活动页面和美书充值页面修改loading样式 commit 724cc0ed04c331950dea33e768b2f7fc29906d08 Author: 丁海波 Date: Fri Dec 14 18:44:32 2018 +0800 正在加载 commit 864ec8f34518d3b0d26cbe254f098b07792818c4 Author: 丁海波 Date: Fri Dec 14 18:43:29 2018 +0800 正在加载种 commit f756d7f2dd29b99dc3a8758482fba5bf27814a4b Author: 丁海波 Date: Fri Dec 14 18:39:38 2018 +0800 正在加载 commit b4b4f01b7648321ccebaf937acefa7aaa9326034 Author: 李天时 Date: Fri Dec 14 17:38:14 2018 +0800 优化充值链接中带有无效code参数的问题 commit 82915996f3385f1a26c36860ef6abc7c39bfc5e1 Author: 李天时 Date: Fri Dec 14 17:20:53 2018 +0800 优化充值链接中带有无效code参数的问题 commit 487b9c48153c1222f37a10cc8c4fdde8d1f6e75c Author: 李天时 Date: Fri Dec 14 17:05:30 2018 +0800 优化充值链接中带有无效code参数的问题 commit 32905e91b500dd6611cd8de90205a55a08dc883d Merge: 90841853b 61966f95b Author: 李天时 Date: Fri Dec 14 16:24:31 2018 +0800 Merge remote-tracking branch 'origin/dev-search-fix' into dev-search-fix commit 61966f95b21a4e80d1cfd8b075b42460fadff622 Author: 丁海波 Date: Fri Dec 14 16:22:19 2018 +0800 弹出框 commit 90841853b35c9857dc9f873f801016eddc03681b Merge: 774ef7a61 fd666a5eb Author: 李天时 Date: Fri Dec 14 15:33:10 2018 +0800 Merge remote-tracking branch 'origin/dev-search-fix' into dev-search-fix commit 774ef7a61a7978cfc7c8d7200b5428a875509c0d Author: 李天时 Date: Fri Dec 14 15:30:50 2018 +0800 优化充值链接中带有无效code参数的问题 commit fd666a5eb600d255b67cc86978093ca9180ad680 Author: 丁海波 Date: Fri Dec 14 15:29:13 2018 +0800 充值页弹框 commit 7b99420cd486f3ee7598e81fbdee2b35af5cd53e Author: 李天时 Date: Fri Dec 14 15:03:30 2018 +0800 优化充值链接中带有无效code参数的问题 commit c1b63fc17ce2ad275ab040279de38d038c12e9fc Merge: 450998bd0 fa22c6351 Author: licc <45360682@qq.com> Date: Fri Dec 14 14:23:08 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-20181213' into dev-subscribe-migrate-20181213 commit 450998bd01d634acf9a8062ed4ea776c1510c02b Author: licc <45360682@qq.com> Date: Fri Dec 14 14:23:03 2018 +0800 用户统计修改字段 commit fa22c6351c9bb57645b22cbeed13bd0815b9d544 Merge: 12194eaae 80058a6f7 Author: zhenglh Date: Fri Dec 14 10:07:26 2018 +0800 Merge branch 'dev-subscribe-migrate-20181213' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-20181213 commit 12194eaae63116cac3700199f3923292636cea94 Author: zhenglh Date: Fri Dec 14 10:07:16 2018 +0800 VIP，用户统计，今日数据在无数据显示null值 commit 80058a6f799e441e756fe0d5e8b8fa902c0bfd82 Author: licc <45360682@qq.com> Date: Thu Dec 13 20:24:23 2018 +0800 vip渠道商推广链接统计修改字段 commit 1abeac0b8efb371c6e52f7ffa1568484bcfe7272 Author: zhenglh Date: Thu Dec 13 20:04:03 2018 +0800 用户统计，js修改 commit e453cf60474ce7a42c58a3ebb236405c000ad969 Author: zhenglh Date: Thu Dec 13 19:49:56 2018 +0800 三方平台补充 commit c1afe067915de8c1b69426480095455caaa51b67 Author: zhenglh Date: Thu Dec 13 19:45:12 2018 +0800 用户关注服务化 commit 327286789945f0a53a7a0d513fe7d36316bca2a6 Merge: 027887c45 cf1b07c71 Author: zhenglh Date: Thu Dec 13 19:40:29 2018 +0800 Merge branch 'dev-subscribe-migrate-20181213' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-20181213 commit 027887c455fa6f34aa9986d6f5d24b0826365e6a Merge: 7fb7d2f4d 982f08ce9 Author: zhenglh Date: Thu Dec 13 19:40:12 2018 +0800 Merge branch 'dev-subscribe-migrate-20181213' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-20181213 commit cf1b07c7124ca7056bcdca8f132e024273c1df78 Author: licc <45360682@qq.com> Date: Thu Dec 13 19:40:11 2018 +0800 vip渠道商推广链接统计加字段 commit 7fb7d2f4d463981027e63821527c0ac323672994 Author: zhenglh Date: Thu Dec 13 19:40:03 2018 +0800 用户关注服务化 commit 982f08ce957188ce6a8c2f2747c55dc05f781599 Author: licc <45360682@qq.com> Date: Thu Dec 13 19:20:10 2018 +0800 vip用户近30天统计js加字段 commit a42f6889d94f61d899cebca4b233c8c39e59bde6 Author: 李天时 Date: Thu Dec 13 19:19:27 2018 +0800 取消充值链接删掉code参数 commit 19cec879396268e9b06e1597bc418325cacb0ce8 Author: zhenglh Date: Thu Dec 13 19:15:36 2018 +0800 用户统计月份数据 commit 9954d9fd9d8ce06abd0c8ff935dc894718059c83 Merge: ff26b06c7 cf436d0f0 Author: licc <45360682@qq.com> Date: Thu Dec 13 19:10:40 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-20181213 # Conflicts: # application/admin/controller/vip/admin/Collect.php # application/api/controller/User.php # application/api/controller/Wechat.php # application/common/controller/Api.php # application/common/controller/Frontend.php # public/assets/js/backend/vip/admin/collect.js # tests/TestInit.php commit cf436d0f0f79b1a0f14ad020050ca5081e531764 Author: zhenglh Date: Thu Dec 13 18:01:00 2018 +0800 用户统计修改 commit 417be0252e7016e6a0c7347e62fc8333497e7d51 Merge: 9ed70af89 d30a5ef05 Author: zhenglh Date: Thu Dec 13 17:59:12 2018 +0800 用户统计修改 commit 9ed70af89b9d3fa347970202877a11158cb18c37 Author: zhenglh Date: Thu Dec 13 17:53:54 2018 +0800 用户统计服务迁移 commit d30a5ef05e1e4ddbe1be5857a186364e174c6a6e Author: licc <45360682@qq.com> Date: Thu Dec 13 17:41:08 2018 +0800 vip用户统计新增统计字段 commit b62a308014ca8518ecc32e2d55c508420838e837 Merge: e11ab0af9 d707e6618 Author: licc <45360682@qq.com> Date: Thu Dec 13 17:40:38 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 # Conflicts: # application/admin/controller/vip/admin/Collect.php commit e11ab0af91fc904f4cd20d457c0aa110b826d7bf Author: licc <45360682@qq.com> Date: Thu Dec 13 17:39:05 2018 +0800 vip用户统计新增统计字段 commit d707e6618ca027d8c57665f8099dfa542f2ce530 Merge: 18be20dfa 6e7188e6b Author: zhenglh Date: Thu Dec 13 16:48:10 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 18be20dfa4c86adca1f26a50907b863ad7854eea Author: zhenglh Date: Thu Dec 13 16:47:57 2018 +0800 查询null值的处理 commit 6e7188e6bd346cefbaf865b60b4d1b651b0b58d1 Merge: 4394946be 5af0bf84d Author: licc <45360682@qq.com> Date: Thu Dec 13 16:42:26 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 4394946bea4972e81c5e35aaef68c83557c24a85 Author: licc <45360682@qq.com> Date: Thu Dec 13 16:42:19 2018 +0800 渠道商推广链接新增字段 commit 5af0bf84dcbcaeac4c2b811855707a0a0ef15405 Author: zhenglh Date: Thu Dec 13 16:31:11 2018 +0800 用户统计完成 commit 10f9ff5d7da23c0ed97f95169a5ee36883e8271d Merge: 22c1ee460 ecd3b4b71 Author: zhenglh Date: Thu Dec 13 14:18:35 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 22c1ee4603bd8ed8215b44365e0623fc615df649 Author: zhenglh Date: Thu Dec 13 14:18:28 2018 +0800 用户统计，昨日，本月，总用户的处理处理 commit ecd3b4b713a56e2968e7ba2406fcec78037423a0 Author: WangGaoBo Date: Thu Dec 13 11:13:24 2018 +0800 单词拼写错误，修改 commit 147da53340209445e74c03b3149c035d3ecd1ca4 Merge: 914125e10 4fd05eb6f Author: WangGaoBo Date: Thu Dec 13 10:59:49 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 914125e10f6434f88301e0010d886c615141d7d1 Author: WangGaoBo Date: Thu Dec 13 10:59:36 2018 +0800 单词拼写错误，修改 commit 4fd05eb6f3b6b6f14faf049eabc5c7fb4927eb02 Author: zhenglh Date: Thu Dec 13 10:44:32 2018 +0800 用户统计新增处理 commit be84434666f57c1c6760d2c94e09a9b75884e532 Merge: 931cf4d94 cba52617a Author: zhenglh Date: Wed Dec 12 20:33:02 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 931cf4d94d3f31b54396eb451807681def4227c3 Author: zhenglh Date: Wed Dec 12 20:32:50 2018 +0800 用户统计错误 commit 8224a72f02ec248ef13eed3551144db985e7d2d1 Author: 李天时 Date: Wed Dec 12 19:33:05 2018 +0800 充值增加loading commit cba52617a79c582f5d58bd2031fa7d13951513b6 Author: WangGaoBo Date: Wed Dec 12 19:16:24 2018 +0800 单词拼写错误，修改 commit e6dccb845a5333ed108882db8f3e2cf781bf0c6b Merge: 5a847a515 f8c2dbdb0 Author: WangGaoBo Date: Wed Dec 12 17:19:38 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 5a847a515dc36292097ba07114bfb1f1810b41ef Author: WangGaoBo Date: Wed Dec 12 17:19:26 2018 +0800 重新组装打点数据 commit f8c2dbdb0780a2b57bedc840b549853ddb71da9d Author: zhenglh Date: Wed Dec 12 17:19:25 2018 +0800 推广链接添加is_first commit 823f83b78df87f37149af6d23f49e04edcc4e8e1 Author: 李天时 Date: Wed Dec 12 16:11:07 2018 +0800 充值增加loading commit 33d80c1314ef22f5640b2c2204225e7d090f2a2d Author: zhenglh Date: Wed Dec 12 16:08:54 2018 +0800 推广链接今日阅读数量，由ssdb转到redis获取 commit 99cb24573d2a006a90fa7f1418c2484cb93d75c3 Author: 李天时 Date: Wed Dec 12 14:43:40 2018 +0800 充值增加loading commit c082a22227fe29f65cbfe65a21827072ffae15c5 Author: 丁海波 Date: Wed Dec 12 14:17:56 2018 +0800 js_loading commit cd755cf03313ae5fb673a0608244955230d78041 Author: WangGaoBo Date: Wed Dec 12 14:12:57 2018 +0800 重新组装打点数据 commit a6d7d646dc80f1d4de9ddfb9f1859e6208e2e548 Merge: acfef52a9 ed5675389 Author: WangGaoBo Date: Wed Dec 12 14:09:12 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit acfef52a9ab66466aa493d9e138d4e1ea23f6b94 Author: WangGaoBo Date: Wed Dec 12 14:08:54 2018 +0800 重新组装打点数据 commit d3a7c62fb19ae8b2e5d00a2235bf4efb82c4442d Author: 李天时 Date: Wed Dec 12 14:05:00 2018 +0800 充值增加loading commit ed56753890935c15599778a3e9c81024a5d67f87 Author: zhenglh Date: Wed Dec 12 13:19:34 2018 +0800 取消关注，修改关注状态 commit 2336fd837fce6d0c7619f82fd26951492ee54ddf Author: zhenglh Date: Wed Dec 12 12:31:02 2018 +0800 模糊关注,添加首次关注和性别信息 commit d4864f055232ee0b475ead3835ee6a708f172ee5 Author: zhenglh Date: Wed Dec 12 12:24:10 2018 +0800 模糊关注,添加首次关注和性别信息 commit e96d4a6858d0e0ceab8f3656c1b0eb7643935989 Author: zhenglh Date: Wed Dec 12 12:16:38 2018 +0800 模糊关注 commit fc7321b06851f4882ffcd1b245cb3a8961a58405 Author: zhenglh Date: Wed Dec 12 12:03:07 2018 +0800 模糊关注 commit 557008c561a36958f8920e090ccb84efc0ec6332 Author: 李天时 Date: Wed Dec 12 10:57:13 2018 +0800 fixbug 用户阅读记录负责章节，多一个斜杠 commit 7ec7aeebd3ebf0d03632f5dd26633ac44dfd442b Author: zhenglh Date: Wed Dec 12 10:19:38 2018 +0800 三方平台实例化修改 commit 92cf10a021a59032305f29d6e48f49376cf2dd59 Merge: 553aed73c f4f952bc3 Author: zhenglh Date: Tue Dec 11 18:57:17 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 553aed73c68f254eb9fd758c2acdf8dcabdcba69 Author: zhenglh Date: Tue Dec 11 18:57:04 2018 +0800 推广链接列表，今日关注人数，使用redis的统计的数据 commit f4f952bc38a59c68b22207e83c4d54e03d9dc746 Merge: 114e3f51a 7f0309db6 Author: WangGaoBo Date: Tue Dec 11 18:23:47 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 114e3f51a901caf9b4d6cfa9c12e84905aa28522 Author: WangGaoBo Date: Tue Dec 11 18:23:34 2018 +0800 重新组装打点数据 commit 7f0309db67afdf6055b62881a2bb776b18c64a32 Author: zhenglh Date: Tue Dec 11 18:20:05 2018 +0800 取消关注，推广链接打点添加 commit 2b0625cda89fefbb6d34b218084ed23c1e812119 Merge: 689f53f46 588dd5587 Author: zhenglh Date: Tue Dec 11 18:16:49 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 588dd55870de06cd9075bca7fc8cf6b5f766086e Merge: 6bdd9d732 07e052624 Author: WangGaoBo Date: Tue Dec 11 18:16:42 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 6bdd9d732c7087fd0b20f753dedb415a7b55c094 Author: WangGaoBo Date: Tue Dec 11 18:16:32 2018 +0800 重新组装打点数据 commit 689f53f4679fdf2e5c3b8a7c564889e0c81fd19f Author: zhenglh Date: Tue Dec 11 18:16:13 2018 +0800 取消关注，推广链接打点添加 commit 7f3272a80e3f8c01a56789100ae7265ab12b1f28 Author: licc <45360682@qq.com> Date: Tue Dec 11 18:11:24 2018 +0800 打款信息导出数字问题，搜索联动问题，新增渠道商打款人默认为未知 commit 07e05262470f1c364facb56fce2c4d6fd667e85f Author: zhenglh Date: Tue Dec 11 18:07:19 2018 +0800 新增性别打点 commit beddb10becde3988daf6ece76fbe53e1b284579d Author: zhenglh Date: Tue Dec 11 17:47:12 2018 +0800 新增性别打点 commit 1ae3fb111cb04f38efc926dcc674648e2d576b7c Author: zhenglh Date: Tue Dec 11 17:43:03 2018 +0800 新增性别打点 commit e968cad9f657c0998a3fb40431bd2cda82dd6ab0 Author: WangGaoBo Date: Tue Dec 11 17:38:45 2018 +0800 重新组装打点数据 commit 34a9d7b1784afbbb48850766e10e223c59bb1e67 Author: zhenglh Date: Tue Dec 11 17:32:31 2018 +0800 新增性别打点 commit 6fa6b54a4150bc3a2680ed3fdefb85dd0a92a958 Author: licc <45360682@qq.com> Date: Tue Dec 11 17:08:56 2018 +0800 test withdraw commit 81a0a6132f3c46f6abb6f85fb294895353596f0e Author: zhenglh Date: Tue Dec 11 16:14:06 2018 +0800 签到 commit 98b6673d5104e5d921176d279f7a381b15a071c9 Author: zhenglh Date: Tue Dec 11 15:58:13 2018 +0800 sign $user commit 26df247c468c796cbadaa59589ab39c06fda7f58 Author: zhenglh Date: Tue Dec 11 15:45:21 2018 +0800 导粉逻辑修改 commit fb64173a5ec1c9bd13f18bc85e8819d57175d049 Author: zhenglh Date: Tue Dec 11 15:15:40 2018 +0800 导粉逻辑修改 commit 9aa29e233338e3b5b8728e0701232f23df687c7e Author: zhenglh Date: Tue Dec 11 14:52:27 2018 +0800 referral获取 commit a17d008e07f4a3d086f47ac9767dd5a0f1af73ec Author: zhenglh Date: Tue Dec 11 14:30:01 2018 +0800 取消关注的老用户查阅导粉章节需要先关注 commit 11e7b433fa521ad79f1f9ac98015fe4c03ba7cca Author: zhenglh Date: Tue Dec 11 12:09:08 2018 +0800 取消关注的老用户查阅导粉章节需要先关注&ssdb U-C字段删除 commit e3092230e9e2c496d0308afa8f5c44b8761972f4 Author: zhenglh Date: Tue Dec 11 11:18:46 2018 +0800 性别错误 commit 4520fc21aabaeb244cf72abe012a8639228ee654 Author: zhenglh Date: Tue Dec 11 11:11:06 2018 +0800 跨三方平台签到错误 commit 975ec427470b305dde7185a02506d956d4ec6b4b Merge: 066610d0c dfdcfa938 Author: WangGaoBo Date: Mon Dec 10 19:14:26 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 066610d0c4b1ed0dca34a8eb464b16616e09195b Author: WangGaoBo Date: Mon Dec 10 19:14:10 2018 +0800 重新组装打点数据 commit dfdcfa93884e73b06e67b59f5cbfd6f259222456 Author: zhenglh Date: Mon Dec 10 19:12:59 2018 +0800 处理打点格式 commit ff26b06c7bea9fe66956ce8775049ac696ded02c Merge: e455400e7 d2e86f987 Author: DuanEnJian Date: Mon Dec 10 16:41:06 2018 +0800 Merge remote-tracking branch 'origin/fix-kl-online' into fix-kl-online commit e455400e7871adaaaaa9d96bf41c074c5bb83e07 Author: DuanEnJian Date: Mon Dec 10 16:41:00 2018 +0800 去掉倒粉域名缓存 commit d2e86f98779b7349b88b89a9d34d1fbb1c04fcec Author: licc <45360682@qq.com> Date: Mon Dec 10 16:21:49 2018 +0800 把updatetime条件改成按id更新/查询 条件 commit f8e3bcce20b6202a95e0a788181721358231bc73 Author: DuanEnJian Date: Mon Dec 10 15:37:31 2018 +0800 修改KL,新渠道,没有订单计数时,第一单必KL问题 commit 58a0ccaa6299278b6c2fd426c346c7edc850bc10 Author: zhenglh Date: Mon Dec 10 14:34:32 2018 +0800 测试内容 commit 05e042145d591b45d1105b2f6bcd5d348fc4c1e8 Merge: 44bc2fbe5 15cb3f7a1 Author: zhenglh Date: Mon Dec 10 12:10:38 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 44bc2fbe59df235362a087fb6f86122bec892d96 Author: zhenglh Date: Mon Dec 10 12:10:26 2018 +0800 添加缓存常量类 commit 15cb3f7a14063f2dab7dab0bdd0820d0f9a3dc49 Merge: 9a8bc2b9d 0dba506cf Author: DuanEnJian Date: Mon Dec 10 11:32:55 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 9a8bc2b9d0ae903969baab94acd77c92a7a4d448 Author: DuanEnJian Date: Mon Dec 10 11:32:49 2018 +0800 推广链接关注,打点字段修改 commit 0dba506cf35224f0d2de2261fba45900f73b8c9c Author: zhenglh Date: Mon Dec 10 10:30:20 2018 +0800 通过推广链接新增用户时，推广链接从参数中获取 commit 01ab7c7689f83a8459bac9724d85cd6c7af4c1b7 Author: zhenglh Date: Sat Dec 8 16:57:09 2018 +0800 用户表字段去掉referral_id的存储 commit 80e314af5beec0d155db575b187b2ddd8c72d5e4 Author: zhenglh Date: Sat Dec 8 15:30:39 2018 +0800 referral_id问题处理 commit a5bb58063532e7437945c258d4186a9f37ae7b95 Merge: e0f1face5 44b2178c2 Author: 李天时 Date: Sat Dec 8 15:30:10 2018 +0800 Merge branch 'dev-groupby-20181207' of http://192.168.0.31/fe/cps commit 44b2178c24461bfde58f95016d9b1e210b1869eb Merge: 630aa6afd 73c9a7780 Author: WangGaoBo Date: Sat Dec 8 15:25:51 2018 +0800 Merge remote-tracking branch 'origin/dev-groupby-20181207' into dev-groupby-20181207 commit 630aa6afd5f7468ccccf51e220aaa1003d267f50 Author: WangGaoBo Date: Sat Dec 8 15:25:39 2018 +0800 代理商推广链接统计 commit f307b93574060c936d8208ff10541baa0f8acb7e Author: zhenglh Date: Sat Dec 8 15:03:59 2018 +0800 agentlogin,用户新增 commit 697877b47636a3a2820c1fc405f97619e0eed4fc Author: zhenglh Date: Sat Dec 8 14:48:31 2018 +0800 agentlogin,用户新增 commit 84407076239174e416d989b69e3729fd09414041 Author: zhenglh Date: Sat Dec 8 14:29:08 2018 +0800 jump类的引入，去掉 commit a934c3c2481f36d561a001ed5584027745e64668 Author: zhenglh Date: Sat Dec 8 13:53:23 2018 +0800 新用户第一次进入个人中心无个人信息 commit e128214580a4ff6b07b555b53feb53c914c679a0 Author: zhenglh Date: Sat Dec 8 13:19:00 2018 +0800 user test add commit d9f86c9075825e79d6fcbba37855def46ee655f7 Author: zhenglh Date: Sat Dec 8 11:51:20 2018 +0800 新创建用户添加referral_id打点 commit a852a8d1004593a9e93bb644e127d2249a7d03dc Author: zhenglh Date: Sat Dec 8 11:28:08 2018 +0800 支付后书币未同步 commit e0f1face5f5ae607f39b3f588ca3fc3f7c4d54f8 Merge: 4c05080a3 73c9a7780 Author: 李天时 Date: Sat Dec 8 10:32:37 2018 +0800 Merge branch 'dev-groupby-20181207' of http://192.168.0.31/fe/cps commit 73c9a77802b0e997b4e06fb95188d414e8756021 Merge: ca09b321e 544f19fed Author: zhenglh Date: Sat Dec 8 10:25:50 2018 +0800 Merge branch 'dev-groupby-20181207' of http://192.168.0.31/fe/cps into dev-groupby-20181207 commit ca09b321eecb1f90a60ab5e01a127f7dbb00d8f1 Author: zhenglh Date: Sat Dec 8 10:25:40 2018 +0800 充值信息的分页问题处理 commit 51249380261fd0c3d30247272df1272877373cf1 Author: zhenglh Date: Sat Dec 8 10:20:32 2018 +0800 推广链接，取消关注打点信息 commit 6bc0d23f3929fb9723fbdc61dcca0fbd421c63fc Author: zhenglh Date: Sat Dec 8 10:03:12 2018 +0800 取消关注添加性别信息 commit 1c1b52043e6deda1d79ddea7261ee60c63069e9c Author: zhenglh Date: Fri Dec 7 18:04:30 2018 +0800 充值页 commit 4c05080a3865f44bf6aebbf7bd5aeea1c4c68bf5 Merge: b997e5f54 544f19fed Author: 李天时 Date: Fri Dec 7 17:59:50 2018 +0800 Merge branch 'dev-groupby-20181207' of http://192.168.0.31/fe/cps commit 544f19fedca7ec02f2dc7f4130c616065ebcce16 Author: 李天时 Date: Fri Dec 7 17:54:20 2018 +0800 下单和回调记录可统计的日志 commit 42a21a246ae0a5f7d29e387a6f97e0aa7c47450f Author: WangGaoBo Date: Fri Dec 7 17:33:43 2018 +0800 调整日期区间 commit a6952c27313e166286d64ce879302855ae913c0c Author: zhenglh Date: Fri Dec 7 17:19:17 2018 +0800 用户信息处理 commit b997e5f548aa22b4fe9127cca7e44ccd58212688 Merge: 512e2994c bd734bb86 Author: 李天时 Date: Fri Dec 7 16:27:58 2018 +0800 Merge branch 'dev-groupby-20181207' of http://192.168.0.31/fe/cps commit bd734bb863e14f538103b17580daff6f2d8da8dc Merge: 4ff1bb7fb cc085cee7 Author: WangGaoBo Date: Fri Dec 7 16:26:03 2018 +0800 Merge remote-tracking branch 'origin/dev-groupby-20181207' into dev-groupby-20181207 commit 4ff1bb7fbdd9221241a30b31b764915be309df43 Author: WangGaoBo Date: Fri Dec 7 16:25:53 2018 +0800 调整分页 commit cc085cee7c39dba84bf049061581f95df13c1d3d Author: zhenglh Date: Fri Dec 7 16:11:23 2018 +0800 充值信息添加日的类型过滤 commit e8adeee2b881c70f3e8eada3b73ca64c8fbd20fa Author: WangGaoBo Date: Fri Dec 7 16:04:53 2018 +0800 调整分页 commit e0aa2ce883b1c77ca47fe85477b7a9f1b5e1dcbf Author: zhenglh Date: Fri Dec 7 15:36:51 2018 +0800 支付登录错误 commit 512e2994c8d1102ccd686ddc9d76efcb5eb7179b Merge: 94f79b8ad ab8d53a04 Author: licc <45360682@qq.com> Date: Fri Dec 7 15:10:22 2018 +0800 Merge remote-tracking branch 'origin/master' commit 94f79b8ad8217d108d9289d4902dba66b4ef52a8 Author: licc <45360682@qq.com> Date: Fri Dec 7 15:10:15 2018 +0800 修复美书取不到redis地址的问题 commit ab8d53a04153884a7e772ac94a7a18c882fb1890 Author: 李天时 Date: Fri Dec 7 13:47:46 2018 +0800 压缩js文件 commit a0bf409c00ea37be11ffd881b8d784fce1cd4bab Author: zhenglh Date: Fri Dec 7 13:04:05 2018 +0800 平台初始化方法调用优化 commit 983c3c3bf18a5bd1782e1467d58b85a1adb16176 Author: zhenglh Date: Fri Dec 7 13:00:29 2018 +0800 日志内容添加时间参数 commit 93088820a86c28099778676c563fb0dd8499906f Author: licc <45360682@qq.com> Date: Fri Dec 7 11:48:51 2018 +0800 去掉排序id commit e9ad6e0c357a64ac86ca3c5f654a195d6c112cc5 Author: zhenglh Date: Fri Dec 7 11:16:59 2018 +0800 若使用公众号信息，保证平台信息先初始化 commit 9424c02ff5f355b22fc79acc0b8b9f7f9cad5b61 Author: zhenglh Date: Fri Dec 7 10:54:13 2018 +0800 未登录时的用户信息获取 commit 20767f8c89632c6986218d604ad233526ebcf4f5 Author: zhenglh Date: Thu Dec 6 20:05:36 2018 +0800 Userservice 单例魔术get方法 commit 04e4e8b807cc5f8ad124b87672877427041f259c Author: zhenglh Date: Thu Dec 6 20:02:17 2018 +0800 处理未登录的用户 commit 94103db878c958dfdd8e11c51fe551211d0014d9 Merge: b98a85139 e12741b1c Author: zhenglh Date: Thu Dec 6 17:55:14 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit b98a85139949398b3d3b1a70d964abb43ce8a763 Author: zhenglh Date: Thu Dec 6 17:55:03 2018 +0800 bonree配置添加 commit bde7c726b355c4883ccd7ed47f829661514b5f69 Merge: 171b3c08a d05965c74 Author: 李天时 Date: Thu Dec 6 17:06:34 2018 +0800 Merge branch 'dev-vip-analysis-181121' of http://192.168.0.31/fe/cps into origin/dev-vip-analysis-181121-commit commit e12741b1c6687a883fdac717e0223d7b750596d2 Merge: 3aa3b8c58 8b8a6f68e Author: WangGaoBo Date: Thu Dec 6 16:08:44 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 3aa3b8c582cb0452f0290e3d07002560f87bad4d Author: WangGaoBo Date: Thu Dec 6 16:08:27 2018 +0800 删除多余代码 commit 8b8a6f68e89445a9eae911e8d943b9ab560f502f Merge: 966a534c3 f16db22cd Author: zhenglh Date: Thu Dec 6 11:56:32 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 966a534c3a53b576ee05507a45caad20c15f0f4b Author: zhenglh Date: Thu Dec 6 11:56:24 2018 +0800 用户创建打点添加 commit f16db22cdc84d72ebae0914bd94e3dd0692d6cbd Merge: f46fed0ff 3e60fc461 Author: WangGaoBo Date: Thu Dec 6 10:54:02 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit f46fed0ffd7c307b1e277a54584c04ef80bb9668 Author: WangGaoBo Date: Thu Dec 6 10:53:50 2018 +0800 优化格式 commit 3e60fc46106bd7ae788dc4be7cbb1a4747a6f997 Author: zhenglh Date: Thu Dec 6 10:40:31 2018 +0800 用户单元测试，登录 commit d05965c74cb27b5b0c95b976eb5c2ccd1229e14d Merge: 5f51a9652 81b256a20 Author: 李天时 Date: Thu Dec 6 10:18:55 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 5f51a96520d5b3c59555400261c7ae8cfae4af7e Author: 李天时 Date: Thu Dec 6 10:18:45 2018 +0800 下单和回调记录可统计的日志 commit 64043564c1300079c54bb018d85f2d321fd305fc Author: WangGaoBo Date: Wed Dec 5 20:37:51 2018 +0800 模糊关注 commit 81b256a20080d2aa2560ed0c4e1458f88ca5e0b4 Merge: ff00076d4 c0dc7af67 Author: WangGaoBo Date: Wed Dec 5 20:23:36 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit cc524f8263fde5e265155a4260c6974636c0cb45 Author: zhenglh Date: Wed Dec 5 20:23:35 2018 +0800 添加模糊关注 commit ff00076d47f2b70ba6708067cba5781911657bce Author: WangGaoBo Date: Wed Dec 5 20:23:23 2018 +0800 订单统计，近30天数据 commit c0dc7af677565ab25c346fc275b324d11e9208b9 Author: 李天时 Date: Wed Dec 5 20:11:05 2018 +0800 下单和回调记录可统计的日志 commit 97a4f9b56dabb9e1b4a700b758ca5e8ea918bd80 Author: 李天时 Date: Wed Dec 5 20:07:14 2018 +0800 下单和回调记录可统计的日志 commit 829f7bdbbd175ac53673cd957a8e9bdda8720bbd Author: 李天时 Date: Wed Dec 5 19:54:56 2018 +0800 下单和回调记录可统计的日志 commit 7035b9a364767454704fb56dbf2a7930a27b4876 Author: 李天时 Date: Wed Dec 5 19:35:52 2018 +0800 下单和回调记录可统计的日志 commit ceed64d8a7e194033f4cf157203de2219d238a57 Author: zhenglh Date: Wed Dec 5 19:29:37 2018 +0800 单元测试，取消关注 commit 6601e5ba49869fc97b15bdda6b6de3ec88972886 Author: zhenglh Date: Wed Dec 5 19:13:55 2018 +0800 单元测试，事件 commit 7dbbd0cba0c70c8669fcbcce942a4db2d40310a2 Author: WangGaoBo Date: Wed Dec 5 17:10:39 2018 +0800 订单统计，近30天数据 commit 7a330a180deb26adffbd50f3fbe3c86dd0a92f83 Author: zhenglh Date: Wed Dec 5 17:04:30 2018 +0800 url测试 commit d4d0a3da0d9f79ffaa4a8d74e6c66fe6fb63a07e Author: zhenglh Date: Wed Dec 5 15:57:28 2018 +0800 api域名修改 commit 66d2b915cf9b8d45fa143071d5811f69f6338004 Author: zhenglh Date: Wed Dec 5 15:53:56 2018 +0800 returnObject重置 commit d3f155178c4b2ad33fcf7d9ec21d5100f8ccc8f7 Author: zhenglh Date: Wed Dec 5 15:49:54 2018 +0800 模糊关注测试 commit e398a8370ddc588d30c04789a5b0268879879871 Author: WangGaoBo Date: Wed Dec 5 15:27:38 2018 +0800 首页订单，近30天数据 commit 8d9f92142d89f2ad6369bd874db1bfe172c649a4 Author: WangGaoBo Date: Wed Dec 5 14:15:16 2018 +0800 代理商推广链接统计 commit ccb547a2d56ea63b23b70a1f4272a4073c69a481 Author: zhenglh Date: Wed Dec 5 13:54:01 2018 +0800 resourcedomain commit 5307aa67b2d00bc85c18fda81a4fabfa9ada9108 Author: zhenglh Date: Wed Dec 5 13:46:40 2018 +0800 整理修改 commit 0222c2576756f1d190fde8c2ef3e6f6edb7bfc2b Author: WangGaoBo Date: Wed Dec 5 12:13:50 2018 +0800 代理商推广链接统计 commit ad49b4f5f02f77f574dd11bf9752b690e26c3b1e Author: WangGaoBo Date: Wed Dec 5 11:43:08 2018 +0800 代理商推广链接统计 commit 023dd7232bfbf3039c68ae02c461004246b2ada4 Author: WangGaoBo Date: Wed Dec 5 11:38:02 2018 +0800 代理商推广链接统计 commit 8d791b1532a21b08a4220bbee19e967dd282a56b Author: WangGaoBo Date: Wed Dec 5 11:21:28 2018 +0800 首页订单，近30天数据 commit 7aaa5a71bef9115637edbaf652026d5864ee8f0c Author: WangGaoBo Date: Wed Dec 5 10:56:13 2018 +0800 代理商推广链接统计 commit 28843a2c2543ed1c994c66d72b29ebd0c25ea653 Merge: 9c707d678 ef26adf72 Author: WangGaoBo Date: Tue Dec 4 20:39:25 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 9c707d678bedd37851e109932b2e7d33281f2af7 Author: WangGaoBo Date: Tue Dec 4 20:39:14 2018 +0800 代理商推广链接统计 commit ef26adf729a48658769a2d043db932c0ec5dfecd Author: zhenglh Date: Tue Dec 4 20:33:09 2018 +0800 订单分页 commit 648977438405c2c0dc5cea18c6aa49679ee8f78d Merge: a4e4dcd60 dcfafefa5 Author: zhenglh Date: Tue Dec 4 20:15:28 2018 +0800 Merge branch 'dev-vip-analysis-181121' of http://192.168.0.31/fe/cps into dev-vip-analysis-181121 commit a4e4dcd602fc3802c09d4fc2de56de1ad12d2cd7 Author: zhenglh Date: Tue Dec 4 20:15:15 2018 +0800 渠道商分成收益计算修改 commit dcfafefa57a5527e71c54e343a192cd0564ac54f Author: WangGaoBo Date: Tue Dec 4 19:56:21 2018 +0800 隐藏筛选条件 commit 4f37b926a39cf02bb033f2ceeef4b417144a6a75 Merge: acfc6744e 27e6e9e42 Author: WangGaoBo Date: Tue Dec 4 19:42:50 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit acfc6744e1a03b956674ae6274d240ba31dfeaab Author: WangGaoBo Date: Tue Dec 4 19:42:37 2018 +0800 首页订单，近30天数据 commit 27e6e9e429896ee6e8fc84007ed9ec174728d550 Author: zhenglh Date: Tue Dec 4 19:41:59 2018 +0800 fixe #213 选择当月数据时查询范围从昨天开始 commit 28a14492d3869c008a1f07da83775a04269caaa7 Author: zhenglh Date: Tue Dec 4 19:26:24 2018 +0800 添加标题提示信息 commit 4eb3f6ada346452684f5e7c16f2b9aeb594bd38d Author: zhenglh Date: Tue Dec 4 18:55:18 2018 +0800 批量添加标题 commit 5f5be50d42a7e1e3d548caa5ff68b671d3a287d5 Author: zhenglh Date: Tue Dec 4 18:50:56 2018 +0800 月报显条数错误 commit 3a551f2f208a01e835f6406d7e13da641d611c83 Author: zhenglh Date: Tue Dec 4 18:49:43 2018 +0800 月报显条数错误 commit 9c582932310ff8f17b4ab85347443825f833b2af Author: zhenglh Date: Tue Dec 4 17:38:44 2018 +0800 fixed #276 #278 commit 0719ee75ca9ca22628b4d13e26790e0a845e42d8 Author: zhenglh Date: Tue Dec 4 17:01:27 2018 +0800 阅读测试完成 commit 83e47bd8d4d6785c8a5dced63f448681a99b9814 Author: zhenglh Date: Tue Dec 4 16:48:18 2018 +0800 服务拆分完成，待测试 commit 1d63179d1fa3b476d358171ac626e726b942fb0c Merge: c30f313f5 1d4638086 Author: WangGaoBo Date: Tue Dec 4 16:44:28 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit c30f313f57cbeb44b8707629db2820a36d429a09 Author: WangGaoBo Date: Tue Dec 4 16:44:13 2018 +0800 修改统计推广页面 commit 1d46380865d238ed4f448f56014b3fe500fa7149 Author: 李天时 Date: Tue Dec 4 16:27:03 2018 +0800 VIP统计，渠道商推广链接数据统计。去掉添加按钮 commit 7cc0170093dac2283ce71dc25a72550556eba2d1 Author: 李天时 Date: Tue Dec 4 16:18:40 2018 +0800 VIP统计，渠道商推广链接数据统计。去掉添加按钮 commit beefb47e07da7b893b9aaaeb67cfd14c63c7e2ac Merge: 828e16b9b d6d3efc69 Author: 李天时 Date: Tue Dec 4 11:53:09 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 828e16b9b68115127418368acceedb4ac603d7e3 Author: 李天时 Date: Tue Dec 4 11:53:00 2018 +0800 VIP统计，渠道商推广链接数据统计。去掉添加按钮 commit d6d3efc6942b3e54badda71ff9503f4e1a89a1ca Author: WangGaoBo Date: Tue Dec 4 11:10:23 2018 +0800 隐藏状态（有效|失效） commit b05a35f99b13f416c283997df88c0aa3c9c618f3 Author: WangGaoBo Date: Tue Dec 4 11:04:47 2018 +0800 隐藏状态（有效|失效） commit e2e21126f5d03b5c5bf6831990289d9d17cc14bc Author: zhenglh Date: Tue Dec 4 09:59:41 2018 +0800 adminconfig属性 commit 3daa0090101de5b02e041ca382d2710bed47fe95 Author: zhenglh Date: Mon Dec 3 20:37:03 2018 +0800 推广链接 commit 4f673a3a60bfab2ae300d6702b264ce81576c6f9 Author: zhenglh Date: Mon Dec 3 20:29:01 2018 +0800 推广链接 commit 546d00a2e21c3a99745f19b7ae1ea86b89a90d88 Merge: 99168d5db 1aaedeb54 Author: WangGaoBo Date: Mon Dec 3 20:18:54 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 99168d5db4750bc1e4e4aadaee0106181d3b3eb9 Author: WangGaoBo Date: Mon Dec 3 20:16:28 2018 +0800 修改404页面 commit 937651d7209c15d379cfc24e424276b85d6d698e Author: zhenglh Date: Mon Dec 3 20:13:19 2018 +0800 用户信息 commit 1aaedeb541419836dfdc9e81b1d11ada060d351a Author: 李天时 Date: Mon Dec 3 20:05:00 2018 +0800 VIP统计，渠道商推广链接数据统计。去掉添加按钮 commit c09e1b59b8fb5f7c4b99ff94bf14ba3ecd66f1d2 Author: zhenglh Date: Mon Dec 3 19:56:15 2018 +0800 前台用户登录 commit e72b4521e3729b74cabff49d19ef48cf1ca1a0f7 Author: zhenglh Date: Mon Dec 3 19:41:20 2018 +0800 前台代码整理 commit 660aef71da2581a7542904c3251519b7c55ee23c Merge: 61bd9506a c806c8420 Author: zhenglh Date: Mon Dec 3 19:38:11 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 61bd9506a1cf69c629ec6114ba35c78649cc8b7f Author: zhenglh Date: Mon Dec 3 19:36:24 2018 +0800 base object to array commit e1ae403bbc77b08d021f838cdcab5ad5e15b3876 Author: zhenglh Date: Mon Dec 3 19:30:46 2018 +0800 用户关注，字段错误处理 commit c806c8420c5ed38bb9df2b6604a591116d35da6e Author: WangGaoBo Date: Mon Dec 3 19:12:10 2018 +0800 加入Log commit f125dcc9c130c70e21ca444adceb706c293b6374 Author: WangGaoBo Date: Mon Dec 3 19:07:37 2018 +0800 加入Log commit ef3ae601cd290925371705d8c7e46bc923c70f3c Author: WangGaoBo Date: Mon Dec 3 18:59:18 2018 +0800 加入映射 commit 39911dddbe037d16e658876892c3e9f042a65fe7 Author: 李天时 Date: Mon Dec 3 18:40:26 2018 +0800 VIP统计，订单明细页面，下单时间 commit a1b0860d197f9f811c886f56d82ed30a3de825f9 Author: WangGaoBo Date: Mon Dec 3 18:35:16 2018 +0800 获取域名 RedisKey，不加端口 commit 3585a5fbfac5a15e44d41aa69748ee38ee65bdc0 Author: WangGaoBo Date: Mon Dec 3 18:27:44 2018 +0800 获取域名 RedisKey，不加端口 commit a8a1511ccf9e8261eccbb47c2dc4c11bfefb7d18 Author: WangGaoBo Date: Mon Dec 3 18:12:35 2018 +0800 获取域名，不加端口 commit def99e7b5854281f6db4a10b264e38bc56fa709b Author: WangGaoBo Date: Mon Dec 3 17:56:40 2018 +0800 添加获取 Redis 日志 commit d6694ded27c230ea18a891fcbf463fc4079a4620 Merge: fa3b3f41a 355b3ff1a Author: WangGaoBo Date: Mon Dec 3 17:28:16 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit fa3b3f41a7870b87e81da692dd112c79e0c9da71 Author: WangGaoBo Date: Mon Dec 3 17:28:07 2018 +0800 添加获取 Redis 日志 commit 8c0767dccf003a7658886d6e4ce4edb40815753e Merge: fb1a410d4 e77cb35ff Author: WangGaoBo Date: Mon Dec 3 17:05:53 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit fb1a410d4f67de9b2f14d63efbfcda38e9e3371b Author: WangGaoBo Date: Mon Dec 3 17:05:39 2018 +0800 构建打点信息 commit e77cb35ff97b816af2d91de078ca0c350ca18a89 Merge: f476fcaf5 f8e7f6e67 Author: zhenglh Date: Mon Dec 3 16:49:38 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit f476fcaf54605e87a6ce8061ba5c7c17174009c8 Author: zhenglh Date: Mon Dec 3 16:49:28 2018 +0800 添加事件分类 commit f8e7f6e67dd83c0c5a23a92d9dfcb09c7f6ff9d9 Author: WangGaoBo Date: Mon Dec 3 14:55:17 2018 +0800 重新构建打点信息 commit f47cfa4a41e8220a1ae15bb5dc2d066b997a9f79 Author: zhenglh Date: Mon Dec 3 14:30:54 2018 +0800 routingkey 修改 merge commit 156f9d4de063b35f07283dad08e22f4e44be3ab2 Merge: 48d7bc1d1 636b1ed89 Author: zhenglh Date: Mon Dec 3 14:28:43 2018 +0800 routingkey 修改 merge commit 48d7bc1d1d8dffdfb0005663d466ff2cacbd0fdb Author: zhenglh Date: Mon Dec 3 14:26:04 2018 +0800 routingkey 修改 commit 355b3ff1ac4f41c063dff9c732057998bbf14ad8 Author: 李天时 Date: Mon Dec 3 11:27:18 2018 +0800 VIP统计，订单明细页面，下单时间 commit 636b1ed89aa380c28f202fa1c2c73f2440b6e163 Author: WangGaoBo Date: Sat Dec 1 19:05:50 2018 +0800 重新梳理逻辑 commit 84bbefa9b40ba8dfbef2f80b9a22494345f662d7 Author: WangGaoBo Date: Sat Dec 1 17:24:18 2018 +0800 重新梳理逻辑 commit bd0382df539ba98b3d2395577cff9f2b645be0c4 Merge: 7136f2b81 c9128d03e Author: 李天时 Date: Sat Dec 1 16:03:07 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 7136f2b81de8aba907d3bf306386ddf9a01221f3 Author: 李天时 Date: Sat Dec 1 16:02:54 2018 +0800 VIP统计，订单明细页面 commit 0a6e06860b36e88ca2c8ca6f8cacdb5b37a48512 Merge: 56156c6e9 b23a7754e Author: WangGaoBo Date: Fri Nov 30 19:46:50 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit 56156c6e905091f80fdfcbfe39a9c96b278db374 Author: WangGaoBo Date: Fri Nov 30 19:46:36 2018 +0800 临时修改 commit b23a7754e86831b5198463e83c6488580d37d140 Author: zhenglh Date: Fri Nov 30 18:51:09 2018 +0800 常量注释修改 commit 21fb2a641e3f1378fcb448f7fe0be8011056df9f Author: zhenglh Date: Fri Nov 30 18:49:27 2018 +0800 常量格式修改 commit e30ec21cdf623ed9e0b1f183dd7865ba9d5348cf Author: zhenglh Date: Fri Nov 30 17:57:31 2018 +0800 永久关注二维码，eventKey处理 commit bc4b5f861e4062b14305c9b40810319379dff5ef Author: zhenglh Date: Fri Nov 30 17:43:06 2018 +0800 打点信息格式化 commit 7f00b83ec16b64c77f853e0538bbc0459ae8ea8a Author: zhenglh Date: Fri Nov 30 17:25:49 2018 +0800 referrer_id字段错误 commit 7eeb4e4a2740c36f3a7b57fa704e26610f21e788 Author: zhenglh Date: Fri Nov 30 17:01:16 2018 +0800 整理完成 commit a9ff04d59a7314569d90246802e7f84034fc7c7a Author: zhenglh Date: Fri Nov 30 16:58:39 2018 +0800 整理完成 commit aeb4c6bb111f332cd665673796fddc317384258c Author: zhenglh Date: Fri Nov 30 15:28:30 2018 +0800 添加模糊关注打点类型，行为流程优化 commit ffce6fc97994739a38962efd2d588708975f00c9 Merge: 20014acee 10be3d3d6 Author: zhenglh Date: Fri Nov 30 14:06:10 2018 +0800 Merge branch 'dev-subscribe-migrate-php-20181129' of http://192.168.0.31/fe/cps into dev-subscribe-migrate-php-20181129 commit 20014acee6461a9f0b10f73f0908869c2920e26f Author: zhenglh Date: Fri Nov 30 14:06:03 2018 +0800 添加模糊关注打点 commit c9128d03e3674f228fc2bac2675f94443d7e2c6f Merge: 712e4877c 3c2c4a28d Author: licc <45360682@qq.com> Date: Fri Nov 30 13:55:58 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 712e4877c168c4a97f3578ae4e0283e42b7fcab5 Author: licc <45360682@qq.com> Date: Fri Nov 30 13:55:52 2018 +0800 去掉排序id commit 171b3c08aad1b65c99251c1166fb911f3489fc4d Author: DuanEnJian Date: Fri Nov 30 13:04:09 2018 +0800 添加菜单平台的Token缓存 commit 0a9a2686d477de4b7e9e64b03e733b44267bcadf Author: DuanEnJian Date: Fri Nov 30 13:03:24 2018 +0800 添加菜单平台的Token缓存 commit 10be3d3d67fb65ed8c6621a68eba466b4c0feaca Author: WangGaoBo Date: Fri Nov 30 12:47:54 2018 +0800 测试Tag commit 55e04751c84cc25c5f9472665e2237df36207368 Author: WangGaoBo Date: Fri Nov 30 12:39:38 2018 +0800 测试Tag commit f1ba683a5cf59c71876c3190433295aad0bba10f Author: WangGaoBo Date: Fri Nov 30 12:36:42 2018 +0800 测试Tag commit a2d529e988616832a35331f15f272d4744e6f41b Author: WangGaoBo Date: Fri Nov 30 12:32:46 2018 +0800 测试Tag commit 724118ee834707b77af994331374901dc274b6e2 Author: WangGaoBo Date: Fri Nov 30 12:30:53 2018 +0800 测试Tag commit 3c2c4a28d42c619ff240ea247348e807e915f237 Merge: f15fff232 0d7d8a56e Author: zhenglh Date: Fri Nov 30 12:12:42 2018 +0800 Merge branch 'dev-vip-analysis-181121' of http://192.168.0.31/fe/cps into dev-vip-analysis-181121 commit f15fff232de215ba0b0f64540f5e6095ef2ddcff Author: zhenglh Date: Fri Nov 30 12:12:34 2018 +0800 vip订单，运营书籍批量修改 commit 9372f5a968c4c883f8dcda8d093fc8e81c78e04a Author: WangGaoBo Date: Fri Nov 30 12:01:11 2018 +0800 测试Tag commit 008c185963a435852ab94efdc8bfbbb746bbb435 Author: WangGaoBo Date: Fri Nov 30 11:52:03 2018 +0800 测试Tag commit 3fd46ff9a5ca8e38bd7b784aaa0ad1dcb7d9bb2f Author: DuanEnJian Date: Fri Nov 30 11:42:57 2018 +0800 修改微信Token根据不同的平台来获取 commit 0d7d8a56e8c71eefaa2cf20ef015f9b81c39aecc Author: WangGaoBo Date: Fri Nov 30 11:17:10 2018 +0800 域名黑名单，刷新列表 commit fa1f2d1ee95795a96f621b7406df3a607beacfdc Merge: 3904b7f25 74b9e1df3 Author: WangGaoBo Date: Fri Nov 30 10:57:27 2018 +0800 Merge branch 'dev-domain-blacklist' into dev-vip-analysis-181121 commit d75b3d8de29cc02413dec1c5fb03501432aca589 Merge: dcffb30dc 35d60fea0 Author: WangGaoBo Date: Fri Nov 30 10:38:05 2018 +0800 Merge remote-tracking branch 'origin/dev-subscribe-migrate-php-20181129' into dev-subscribe-migrate-php-20181129 commit dcffb30dc707be8dc1d02b87ae47f1078185a5a4 Author: WangGaoBo Date: Fri Nov 30 10:37:43 2018 +0800 用户关注打点 commit 35d60fea098d06f2dd07661a86a5e60f6e531b30 Author: zhenglh Date: Fri Nov 30 10:32:41 2018 +0800 文本消息测试完成 commit c5afb825f239a98b65aaf96fbbbbb066aa67ac5e Author: zhenglh Date: Fri Nov 30 10:18:17 2018 +0800 用户关注与取消关注调试完成 commit 546d118736bcfd60a874e7ed20301371de9c26ed Author: zhenglh Date: Fri Nov 30 10:07:21 2018 +0800 用户关注与取消关注调试完成 commit 3904b7f2507691c6f2640c3e6856675d95d05ce6 Author: WangGaoBo Date: Thu Nov 29 21:08:22 2018 +0800 用户统计，统计近30天数据 commit 0299ff9c469585e1312ef3dabd5c96f8c664aa62 Author: zhenglh Date: Thu Nov 29 20:50:20 2018 +0800 初步测试完成 commit 0aa993f76f25421cfe9b706351e9b97b7ca80d37 Author: WangGaoBo Date: Thu Nov 29 20:21:39 2018 +0800 VIP，首页，统计近30天订单数据 commit 4a2dd8ae97ad20e1009dfe6c3c1858a768cdcd08 Author: zhenglh Date: Thu Nov 29 19:57:59 2018 +0800 微信关注行为待测试 commit 4f314bb849e01cf4412823779804d8755ae8ed5f Author: WangGaoBo Date: Thu Nov 29 17:16:30 2018 +0800 订单明细，增加筛选条件 commit bb22d8b7617ac0b06fca98401d2fd0b62b5c8d3c Author: DuanEnJian Date: Thu Nov 29 17:16:00 2018 +0800 修改Ophost根据域名查找时,添加5秒文件缓存 commit 6b76a92b0ec0a60dcd40298a72aef1b9d8aa90df Author: DuanEnJian Date: Thu Nov 29 16:36:25 2018 +0800 修改Ophost根据域名查找时,添加5秒文件缓存 commit 06b52bef0274e6532c94c6c49a9158618d06efaf Author: DuanEnJian Date: Thu Nov 29 16:31:55 2018 +0800 修改Ophost根据域名查找时,添加5秒文件缓存 commit ecaf3a4a2e8e67ef8baf4a0907b46b46f016c323 Author: zhenglh Date: Thu Nov 29 15:54:04 2018 +0800 文件添加 commit cde2d34c0f8bfeb4e66703e69abcc05066988edd Author: DuanEnJian Date: Thu Nov 29 13:07:50 2018 +0800 修改Redis取模规则0不生效问题 commit 1c1fb2a41974abce82f76c34e1f51053cee0c93e Author: licc <45360682@qq.com> Date: Thu Nov 29 10:42:48 2018 +0800 优化消费逻辑 commit 74d1a5c1f977375107204ed3df3bdc601cb18653 Author: zhenglh Date: Thu Nov 29 09:57:13 2018 +0800 初始化，微信关注迁移 commit 74b9e1df3bf6a7b8a4a60560f29b920b79eee775 Author: WangGaoBo Date: Wed Nov 28 20:17:12 2018 +0800 域名黑名单，优化 完善 commit 05b73ec8267de53fd17526d1594e6526372a9dbe Author: WangGaoBo Date: Wed Nov 28 17:49:20 2018 +0800 VIP 维护代理商推广列表 commit d99d68d5a35add03fad32c798c651740a2b0bf04 Author: 李天时 Date: Wed Nov 28 17:43:14 2018 +0800 vip账号管理页面进入渠道商账号时限由2分钟改为5小时 commit ff94d82f5ecbbb3e91c5aba6826057880afbf0d7 Merge: 82df0e8c2 97ddaec9a Author: WangGaoBo Date: Wed Nov 28 15:16:06 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 82df0e8c25dcee8f27903a47ddadf46bf72bb45c Author: WangGaoBo Date: Wed Nov 28 15:15:37 2018 +0800 VIP 增加派单渠道 commit 97ddaec9a8eb6fa4bdc4608a15e27b1ca99a913f Author: zhenglh Date: Wed Nov 28 14:50:24 2018 +0800 书籍批量修改提示信息，订单表时间初始化 commit 0470849a2eb78c83883d030ba03dcbfa11f9c109 Author: WangGaoBo Date: Wed Nov 28 11:52:59 2018 +0800 域名黑名单，优化 commit 942fa58a885e6d85050d9c9983cded0a6fe251bc Author: WangGaoBo Date: Tue Nov 27 19:31:30 2018 +0800 域名黑名單　前端通過Redis 校驗 commit 36c70c6a11246aee69748588006b37cba200a1e9 Author: WangGaoBo Date: Tue Nov 27 17:26:55 2018 +0800 保存域名黑名单时，存储到Redis commit d6298af22009d89eaa4fe23fb897201983d28e9e Author: WangGaoBo Date: Tue Nov 27 13:41:32 2018 +0800 优化页面 commit efaeeea55d468a6e4b5ebbfbd93e237956ff3ead Merge: ec1d290f4 86d2fc321 Author: 李天时 Date: Tue Nov 27 12:05:42 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit ec1d290f432d45b91be5eec28b45586e37d9a7d3 Author: 李天时 Date: Tue Nov 27 12:05:33 2018 +0800 VIP统计，订单明细 commit 86d2fc321651313560c97def3e5cb8c906433b5c Author: zhenglh Date: Tue Nov 27 11:45:22 2018 +0800 充值计算错误 commit ab36e7516d57e8ff751b5171e242301925c3eee4 Author: licc <45360682@qq.com> Date: Tue Nov 27 11:32:25 2018 +0800 去掉暂存代码 commit 9a789086867528b9f25189108b49676a8beef40a Author: WangGaoBo Date: Tue Nov 27 11:12:29 2018 +0800 优化页面 commit 234ac65eec5790cd6f392b1c1cc85a789d817a6c Merge: af9121961 41566efa4 Author: licc <45360682@qq.com> Date: Tue Nov 27 11:11:32 2018 +0800 Merge remote-tracking branch 'origin/fix-platform2' into fix-platform2 commit af912196153bcd146b8929916e58d7c6dcfb98e0 Author: licc <45360682@qq.com> Date: Tue Nov 27 11:11:26 2018 +0800 暂存 commit 41566efa461de648b0da4b30ffe67c54f9ec71e2 Author: DuanEnJian Date: Tue Nov 27 10:58:49 2018 +0800 修改三方平台根据域名查找平台 commit c1d760c1b7f8da5d0ffd859d2bbd912f3cb8707d Author: DuanEnJian Date: Tue Nov 27 10:55:54 2018 +0800 修改三方平台根据域名查找平台 commit 59abffe0956e11175733b9c151bffcb0d02a408e Author: DuanEnJian Date: Tue Nov 27 10:53:17 2018 +0800 修改三方平台根据域名查找平台 commit 1bb68f2d9f73ad5333dab3d2c4df1afc61053724 Author: DuanEnJian Date: Tue Nov 27 10:43:20 2018 +0800 修改三方平台根据域名查找平台 commit 76278b4aaf4eae8ea2639310cd67e8f7361316a8 Merge: 711d75022 6fa90eecd Author: DuanEnJian Date: Tue Nov 27 10:09:51 2018 +0800 Merge branch 'dev-master-tolog' of 192.168.0.31:fe/cps into fix-platform2 日志打点 commit 711d750227ddcfcda41653d25c1b9a96a63d1115 Author: DuanEnJian Date: Mon Nov 26 18:08:09 2018 +0800 修改三方平台根据域名查找平台 commit 212707ad66ec16a7c34198182545471e74182f6c Author: DuanEnJian Date: Mon Nov 26 17:48:06 2018 +0800 修改三方平台根据域名查找平台 commit dee71e738ff2c80b32fa3fa8b612062ee2546368 Author: DuanEnJian Date: Mon Nov 26 17:25:53 2018 +0800 修改三方平台根据域名查找平台 commit 9e1bc48657b1f496e74ee28816f2b23fc7b621c4 Author: DuanEnJian Date: Mon Nov 26 17:01:42 2018 +0800 修改三方平台根据域名查找平台 commit ae6bc4cb2bdfa17c247b01bf41ecf18612a6df3a Author: 李天时 Date: Mon Nov 26 17:01:28 2018 +0800 VIP统计，订单明细 commit 552e931bfbbaaaa5d91b76c157228a8a3211e4fa Author: DuanEnJian Date: Mon Nov 26 16:17:12 2018 +0800 修改切换平台时菜单两次jsonEncode commit 6fa90eecde27e974d57cb93b20d8679158c455a1 Author: 丁海波 Date: Mon Nov 26 16:17:08 2018 +0800 .substr(1); commit e375ca2b626d1578e5bf4c68bf83d0997fca45b9 Author: 丁海波 Date: Mon Nov 26 15:11:56 2018 +0800 ms pv log 书籍详情 目录添加map字段 commit 2cd77a5662f6e3c1740d2983ce9f8c207f2db5c1 Author: WangGaoBo Date: Mon Nov 26 14:46:03 2018 +0800 VIP 增加导出Excel按钮 commit 2e48a0c03211475942e3ad5980ec68311817200e Author: WangGaoBo Date: Mon Nov 26 13:57:09 2018 +0800 VIP 首页 - 近30天汇总 commit cc95f5e198281ca3888eec98d2e3f51e7683e890 Merge: ae3afca72 17a069a6b Author: WangGaoBo Date: Mon Nov 26 11:53:49 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit ae3afca72f9d518e64477e60f8d10daf66aad771 Author: WangGaoBo Date: Mon Nov 26 11:53:06 2018 +0800 VIP 代理商推广连接 commit 17a069a6b0a0ed46089b0b8265c5bc2882babe1f Author: zhenglh Date: Sat Nov 24 17:20:25 2018 +0800 添加导出按钮 commit b93f67df94e2d5cbccf1fdc3e04c5c1956176921 Author: WangGaoBo Date: Sat Nov 24 16:31:39 2018 +0800 VIP 用户统计 commit 8e30f2c232d31a4b063d8fa1e8adf7ca403a4f7e Author: WangGaoBo Date: Sat Nov 24 10:04:30 2018 +0800 域名黑名单初步完成 commit 37129ade12837c455cb3432c53213088dfea0750 Author: zhenglh Date: Fri Nov 23 18:52:21 2018 +0800 运营商数据为空时直接返回数据 commit 67918bd238c890b060777bbb37186f5fef5f3af1 Merge: b30099096 d0d15764d Author: zhenglh Date: Fri Nov 23 18:30:47 2018 +0800 Merge branch 'dev-vip-analysis-181121' of http://192.168.0.31/fe/cps into dev-vip-analysis-181121 commit b3009909644f6e4574f81c3126b1a1d314036a35 Author: zhenglh Date: Fri Nov 23 18:30:40 2018 +0800 vip充值信息完成 commit d0d15764dedd080c60d9bcfc3c8a57fe0106e400 Merge: 823024770 6196c0ba4 Author: 李天时 Date: Fri Nov 23 16:21:47 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 82302477097d8622617c8daa16ccef775addd070 Author: 李天时 Date: Fri Nov 23 16:21:36 2018 +0800 VIP统计，渠道商推广链接数据统计 commit bd5deed4e7d0f7190cb7f58ade9180a7dfd2b9f0 Author: 李天时 Date: Fri Nov 23 16:21:19 2018 +0800 VIP统计，渠道商推广链接数据统计 commit eaf8e703b18ece1cae961e62706abacc41b4dfe1 Author: WangGaoBo Date: Fri Nov 23 15:57:22 2018 +0800 域名黑名单初步完成 commit 6196c0ba43b49758c4f6c1159307409c41a367bc Author: licc <45360682@qq.com> Date: Fri Nov 23 10:51:02 2018 +0800 修改自动回复书籍模糊匹配方法 commit fdd9623644957a7e3fe569f3453ec72fae5542b9 Author: DuanEnJian Date: Fri Nov 23 09:25:05 2018 +0800 修改随机获取图片OR标题返回空的Bug commit a82f692e264c116442862e901a9f0db4b23f63bf Merge: 775919948 fcb1181e9 Author: zhenglh Date: Thu Nov 22 20:54:54 2018 +0800 Merge branch 'dev-vip-analysis-181121' of http://192.168.0.31/fe/cps into dev-vip-analysis-181121 commit 775919948c3a824f27e8e58428282a50640930b1 Author: zhenglh Date: Thu Nov 22 20:54:48 2018 +0800 vip充值信息整理 commit 03c914d2dba84d92fb1f475a53b40f824c4a6cfb Author: WangGaoBo Date: Thu Nov 22 19:51:50 2018 +0800 屏蔽域名黑名单-后台管理 commit 808b355ae7d12aabbc0b22bb021e1cc8af823a6b Author: WangGaoBo Date: Thu Nov 22 19:47:28 2018 +0800 屏蔽域名黑名单-后台管理 commit 785ac29cac856277923ae91eeb099e9d88d469a7 Author: WangGaoBo Date: Thu Nov 22 19:34:13 2018 +0800 屏蔽域名黑名单-后台管理 commit fcb1181e95e8af31c715912eefa273c51620cd9d Author: licc <45360682@qq.com> Date: Thu Nov 22 16:48:37 2018 +0800 付款信息提交 commit 4b2f4360d2d3f405eb370d416fb85f9df48c94e3 Merge: 2870105f1 fcaff58c9 Author: licc <45360682@qq.com> Date: Thu Nov 22 15:23:56 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-analysis-181121' into dev-vip-analysis-181121 commit 2870105f10db91dd0deda993a4431706f6e15e78 Author: licc <45360682@qq.com> Date: Thu Nov 22 15:23:49 2018 +0800 暂存 commit 047a606604d4f9e0839e236df02452ff9fc78e10 Author: DuanEnJian Date: Thu Nov 22 15:10:34 2018 +0800 修改编辑渠道商Bug commit fcaff58c907103c81c649fa886b5cac8b76837aa Author: zhenglh Date: Thu Nov 22 09:48:37 2018 +0800 add phpunit commit 9d03b365f19aa6948bae4af5b3b3a324098857f5 Author: zhenglh Date: Wed Nov 21 19:02:11 2018 +0800 标题批量删除 commit 5856ac20f6dc39a57afa2706e113f214f925ed99 Merge: b2f292498 dc2f147d5 Author: zhenglh Date: Wed Nov 21 17:42:31 2018 +0800 Merge branch 'dev-vip-analysis-181121' of http://192.168.0.31/fe/cps into dev-vip-analysis-181121 commit b2f292498eb8faac771e2e4aef43d8dc96ae3cb3 Author: zhenglh Date: Wed Nov 21 17:42:23 2018 +0800 书籍批量更新完成 commit dc2f147d546c7de0b0f0afd0f74e729e04025b5e Author: licc <45360682@qq.com> Date: Wed Nov 21 17:28:28 2018 +0800 增加付款者功能 commit 68871a8269fdd07b69d57db58385e7486dcad20e Author: WangGaoBo Date: Tue Nov 20 18:46:20 2018 +0800 取消测试的标志 commit f09d49116355df7c57b1234f26c9ad415485c1b4 Author: WangGaoBo Date: Tue Nov 20 15:42:25 2018 +0800 增加一个测试的标志 commit c2d5f2867d2dd0215c7a3e41aa68b4837a7b08e8 Author: WangGaoBo Date: Tue Nov 20 15:39:25 2018 +0800 增加一个测试的标志 commit 8cd3b92a52db72beaf8d5a4e3b4361eb5609c2a9 Author: DuanEnJian Date: Mon Nov 19 15:24:54 2018 +0800 修改菜单展示问题 commit 42338df14c471b706a53065aedbdd134a0e40e5e Author: DuanEnJian Date: Mon Nov 19 15:13:02 2018 +0800 修改菜单展示问题 commit 4a29fd8ecfff32df7b9529144b0f30c8add9365d Author: DuanEnJian Date: Mon Nov 19 15:10:07 2018 +0800 修改菜单展示问题 commit b8dde574769308b05e9ecf267f5ff94a017dca2c Author: DuanEnJian Date: Mon Nov 19 14:07:58 2018 +0800 修改菜单替换参数错误问题, commit 037c6df4e33934e28f3ba007e85296f3bfda9d93 Author: DuanEnJian Date: Mon Nov 19 13:34:22 2018 +0800 修改菜单替换参数错误问题, commit f59ee50a662d63d8994e98e0973663b41658f1bb Author: DuanEnJian Date: Mon Nov 19 13:33:38 2018 +0800 修改菜单替换参数错误问题, commit 2c41535e7161ef9101d3375407383c1c518911e5 Author: DuanEnJian Date: Mon Nov 19 11:59:18 2018 +0800 修改菜单替换参数错误问题, commit 3bf7c3970ca242eab1fc00b30737154d32b28b4a Author: DuanEnJian Date: Mon Nov 19 11:30:09 2018 +0800 修改已授权的平台检查,JS改为同步请求 commit fecdffbcea6b1c61d77d83285d5edb8649c0a118 Author: DuanEnJian Date: Mon Nov 19 11:05:39 2018 +0800 修改已授权的平台检查,JS返回错误Bug commit 336959e5723c7436ee2e2d0ac6291bf10fa194fc Merge: 0f8eab56e 0a315a835 Author: DuanEnJian Date: Fri Nov 16 18:23:57 2018 +0800 Merge remote-tracking branch 'origin/dev-platform3' into dev-platform3 commit 0f8eab56e8073a7114742fec5aca32bb5d67ccd6 Author: DuanEnJian Date: Fri Nov 16 18:23:29 2018 +0800 添加渠道OR配号代理商列表展示订阅号状态 commit 0a315a8359d6681eba202121ef790b30b26a6bf3 Author: yunfeng ke Date: Fri Nov 16 11:23:14 2018 +0800 改字 commit 8a89b42a150b56c2cb9c5a3e1b38aa53aab7a247 Author: DuanEnJian Date: Thu Nov 15 15:35:04 2018 +0800 修改平台基本配置,默认项可以关闭 commit 9ae8522c7cebdf581e69057c56c4a68bdd349ace Author: DuanEnJian Date: Thu Nov 15 15:31:15 2018 +0800 修改平台基本配置,默认项可以关闭 commit 499d6053b91d9134143a129ac3c211dac4529222 Author: DuanEnJian Date: Thu Nov 15 15:14:57 2018 +0800 修改平台基本配置,默认项可以关闭 commit 9deeb498b7c2129c7bab121219d58b829e086f5b Author: DuanEnJian Date: Thu Nov 15 15:06:49 2018 +0800 修改平台基本配置,默认项可以关闭 commit cc417e24a386c28431a2f510f6da6a40fa156839 Author: DuanEnJian Date: Thu Nov 15 14:52:06 2018 +0800 修改平台基本配置,默认项可以关闭 commit a6a2ec073585566b01cc32886725ccfdd68566d0 Author: DuanEnJian Date: Thu Nov 15 12:05:54 2018 +0800 修改Redis链接存储问题 commit 57cf2b7b0a90fdf9a8a2763f1a0ac25869c92d86 Author: DuanEnJian Date: Wed Nov 14 11:09:21 2018 +0800 修改登录时间保持7天,并默认勾选保持会话 commit 0e7726e475ad2ef9e19510afbba5656c45b742c8 Merge: d9dc581a0 16984b538 Author: DuanEnJian Date: Wed Nov 14 11:05:21 2018 +0800 Merge branch 'dev-platform2' of 192.168.0.31:fe/cps into dev-platform3 commit 16984b5384fe157e632e129685f88517d3ee1fb6 Author: licc <45360682@qq.com> Date: Wed Nov 14 10:43:38 2018 +0800 最近阅读优化 commit d9dc581a03689d7c09f80917e85b6374fd82cd0f Author: licc <45360682@qq.com> Date: Tue Nov 13 17:52:34 2018 +0800 test commit 185def9e387cdacacb3bd80a4ad08c6a30851e29 Author: licc <45360682@qq.com> Date: Tue Nov 13 15:32:00 2018 +0800 test commit 02332db0d4a39a2a5b1a8feb57bdaf9e90899661 Author: licc <45360682@qq.com> Date: Tue Nov 13 15:22:42 2018 +0800 支付凭证加描述 commit 0a1b27b8f6a8a3ef3f8c6f6ad50554970c3cee21 Merge: 4c6dd8380 107092615 Author: DuanEnJian Date: Tue Nov 13 12:02:47 2018 +0800 Merge branch 'dev-platform' of 192.168.0.31:fe/cps into dev-platform2 # Conflicts: # application/admin/controller/Wxpay.php # application/admin/controller/auth/Agent.php # application/admin/controller/auth/Channel.php # application/common/model/AdminConfig.php commit 4c6dd838005540a292f50f6eeb94ce5dd8b13da9 Merge: d70b2b2a1 6c729ed76 Author: DuanEnJian Date: Tue Nov 13 11:47:56 2018 +0800 Merge branch 'fix-online-test' of 192.168.0.31:fe/cps into dev-platform2 commit d70b2b2a109d1884e7975f448cb247568b9bbe5e Author: licc <45360682@qq.com> Date: Tue Nov 13 11:15:59 2018 +0800 解决下单后微信支付凭证显示错误问题 commit 72a95dbe0b4c5722479afd7648d78471b9779934 Author: licc <45360682@qq.com> Date: Tue Nov 13 11:05:19 2018 +0800 解决下单后微信支付凭证显示错误问题 commit 768b2655c3a5d7f1c252e0a5a78a3f866013c53e (tag: tag-20181112_185601) Author: licc <45360682@qq.com> Date: Mon Nov 12 18:46:54 2018 +0800 解决下单后微信支付凭证显示错误问题 commit 3ed8838f89d3bab5b0e0b9f8f37a0f58c58a88dc (tag: tag-20181112_161259) Merge: 0a9ea10bf f5168c1c7 Author: 李天时 Date: Mon Nov 12 15:37:31 2018 +0800 Merge branch 'commit-payment' of http://192.168.0.31/fe/cps into commit-payment2 commit 10709261599dbf750bfe5610d288e831fc5ebca3 Author: DuanEnJian Date: Sat Nov 10 15:30:53 2018 +0800 修改批量切换三方平台时,顶级校验 commit f5168c1c7314240396a991a567e69f3ff46a8229 Author: yunfeng ke Date: Sat Nov 10 11:30:42 2018 +0800 移除 commit 40b1107b4b4558d7554dcf9f21f302394f2220e4 Author: yunfeng ke Date: Sat Nov 10 11:21:11 2018 +0800 add 3 jump commit 686128c138f538e71610e83f470ce3a1789374d9 Author: licc <45360682@qq.com> Date: Fri Nov 9 20:08:44 2018 +0800 解决回调慢的问题 commit b615363b0100a162bf5015cbb94c7d75d1cf0c84 Author: licc <45360682@qq.com> Date: Fri Nov 9 19:36:51 2018 +0800 加上log commit 9a07dd7cfac6f1bce9af5251d9f3c924ac2cc637 Author: licc <45360682@qq.com> Date: Fri Nov 9 19:18:59 2018 +0800 去掉log commit cd972bc1f168e5e9e971c2936d9b86f6862fae00 Merge: 803e8e649 2113c72ea Author: licc <45360682@qq.com> Date: Fri Nov 9 17:59:38 2018 +0800 Merge remote-tracking branch 'origin/commit-payment' into commit-payment commit 803e8e649db3dc712d9c3c5214e4380e84cdb620 Author: licc <45360682@qq.com> Date: Fri Nov 9 17:59:33 2018 +0800 打log测试 commit 2113c72ea2ea49e167d538b4b805c86df864fb7b Author: DuanEnJian Date: Fri Nov 9 17:48:19 2018 +0800 修改三方平台支付&业务域名唯一性校验 commit 1d3befee7d1092d251e09714373b526666038a38 Author: licc <45360682@qq.com> Date: Fri Nov 9 16:33:05 2018 +0800 redirect跳转 commit 12c86173033207fa283f6775410cd8a73e123a8d Author: licc <45360682@qq.com> Date: Fri Nov 9 15:32:29 2018 +0800 redirect跳转 commit f2e0d5b50d1cfaf14357f2eec5d1e771b6d73fe3 Author: licc <45360682@qq.com> Date: Fri Nov 9 14:42:20 2018 +0800 支付订单方式修改 commit b64b8d2d19e0c43438e8521bba64a337d7939ab1 Author: DuanEnJian Date: Fri Nov 9 13:51:04 2018 +0800 修改改AdminInfoAll 异常数据兼容 commit 3ca10e594a9f71e8c69b9c062d3151dc65dda085 Author: DuanEnJian Date: Fri Nov 9 12:59:22 2018 +0800 UC,BC数据统计恢复 commit e5a9f4ac60b839cb1d48eb810de594f911b7ee5a Author: licc <45360682@qq.com> Date: Fri Nov 9 12:04:16 2018 +0800 支付订单方式修改 commit 5e6e031f9cff15d4d83a746584fcb96a6c585510 Author: licc <45360682@qq.com> Date: Fri Nov 9 12:02:32 2018 +0800 支付订单方式修改 commit 154e61ec6a9efce5e110972c18620d590b8c881e Merge: 78880bc0e 33e8b18d9 Author: licc <45360682@qq.com> Date: Fri Nov 9 11:58:43 2018 +0800 Merge remote-tracking branch 'origin/commit-payment' into commit-payment commit 78880bc0e7ec725cd2c23541161ee4b7e6f904b9 Author: licc <45360682@qq.com> Date: Fri Nov 9 11:58:38 2018 +0800 支付订单方式修改 commit 85a3ebcf689a49513e40fb29e9fcc2b66e6b1bc9 Author: DuanEnJian Date: Fri Nov 9 11:53:49 2018 +0800 UC,BC数据统计恢复 commit 908a44ee5fa4c09f64e8cd56fd81190e008f34eb Author: DuanEnJian Date: Thu Nov 8 20:27:25 2018 +0800 去掉清除AN缓存功能 commit 548ed2e4776c1a6147fe8a1626d06e2d761099c2 Author: DuanEnJian Date: Thu Nov 8 18:59:40 2018 +0800 修改AdminInfoAll缓存配置 commit 33e8b18d915f1c935a94c7c805077c29fb0857c7 Author: 李天时 Date: Thu Nov 8 17:39:11 2018 +0800 四方支付创建订单，打印错误信息 commit 2a5ce2fbefdf4b39c41a51d20ca3503f3ee522ea Author: DuanEnJian Date: Thu Nov 8 16:00:14 2018 +0800 添加平台,业务域名,支付域名 关闭限制 commit cf4007c96ed2d74fd0b569256f91564252ece9dd Author: DuanEnJian Date: Thu Nov 8 14:41:55 2018 +0800 超管添加平台切换 commit 4dafafeff0f3bda31a51903bd8aa0a9678b38dc9 Author: DuanEnJian Date: Thu Nov 8 14:40:42 2018 +0800 超管添加平台切换 commit 885502afa52a2d03f67a869d27fe91662e277812 Merge: cac33bdf2 cf7f12ace Author: 李天时 Date: Wed Nov 7 20:22:29 2018 +0800 Merge remote-tracking branch 'origin/commit-payment' into commit-payment commit cac33bdf25c310cb87772de4ab6ff003fa88cd24 Author: 李天时 Date: Wed Nov 7 20:22:21 2018 +0800 四方支付，fix商品描述bug commit 73930d6db27e026de5b186f9440590b430eb867b Author: DuanEnJian Date: Wed Nov 7 19:52:31 2018 +0800 修改配号代理商平台设置方式 commit cf7f12aceecc8685237bb01842726dcba29ea823 Author: licc <45360682@qq.com> Date: Wed Nov 7 19:33:28 2018 +0800 解决Cookie里admin_id拿不到的问题 commit daac1e54e209ba4786bd9cf9fe10b78097f51a57 Author: DuanEnJian Date: Wed Nov 7 17:40:15 2018 +0800 编辑渠道商时修改平台信息 commit c40e7bc124867787d7339c1465f132411b19de12 Author: licc <45360682@qq.com> Date: Wed Nov 7 17:24:35 2018 +0800 四方支付重复支付下单修改完成版 commit af377fe4e2cc02b7cab21bea325fec9efdd82456 Author: licc <45360682@qq.com> Date: Wed Nov 7 16:50:55 2018 +0800 四方支付重复支付下单修改 commit ac9c3b92e3e2488482cf658df0cc7b49c9f0e698 Author: licc <45360682@qq.com> Date: Wed Nov 7 15:08:53 2018 +0800 判断活动type commit bf391f8c00d3f267ad3447fa56d6ddef8583c981 Author: DuanEnJian Date: Wed Nov 7 14:07:23 2018 +0800 编辑渠道商时修改平台信息 commit b4bd5c2baa69320548293e85ee31e255ee79dfdc Author: licc <45360682@qq.com> Date: Wed Nov 7 11:05:42 2018 +0800 四方支付,fix活动充值商品描述乱码 commit f3c96bee35dcd32f31d57c2b898e224f38776d18 Author: DuanEnJian Date: Tue Nov 6 19:08:17 2018 +0800 修改平台选择方式 commit 610b3421a15f4bcc6d6e8f2eef2d01eb0ae1078e Author: DuanEnJian Date: Tue Nov 6 19:07:22 2018 +0800 修改平台选择方式 commit 5719387c57770f6c6255d88bf718c6a0b9a1a118 Author: 李天时 Date: Tue Nov 6 16:09:44 2018 +0800 四方支付，记录第三方订单号 commit 6f9a3455928f2e5f07ca2c6fb7ac1d59fecb7399 Author: 李天时 Date: Tue Nov 6 14:48:03 2018 +0800 四方支付，fix商品描述bug commit 0a9ea10bf757e75d87e1c821a1aa3bdaaeecc528 (tag: tag-20181106_175143) Author: licc <45360682@qq.com> Date: Tue Nov 6 14:23:19 2018 +0800 后台沙发，西瓜，袋鼠，美书首页添加备案号和隶属公司名 commit 32f27e35494e6f477650732330fdf8dfa47cd223 Author: licc <45360682@qq.com> Date: Tue Nov 6 13:57:30 2018 +0800 解决更新用户缺少where条件问题 commit 56b3e1b2a56f990723cfc0f82367e7b80b3c3105 Author: licc <45360682@qq.com> Date: Tue Nov 6 10:27:04 2018 +0800 改四方支付log日志输出 commit 9c90da0301b38cdc2c3a69208de71cdfb3632afd Author: 李天时 Date: Mon Nov 5 18:21:30 2018 +0800 四方支付，fix商品描述bug commit d2fa0e5a1f614f8f31d073b61e2acfd347b0e5a4 (tag: tag-20181105_161302) Author: yunfeng ke Date: Mon Nov 5 14:08:54 2018 +0800 chg ui commit daa4a8529391cef8f115b8aecc32ef369dcabc18 Author: 丁海波 Date: Fri Nov 2 21:12:17 2018 +0800 后台首页 commit 8c58aa194d90265a3b22e5d63c40912b0bca233f Author: 丁海波 Date: Fri Nov 2 20:58:20 2018 +0800 后台首页logo commit c8b3d2e16d3ed54b823883716f8c24954fbeae9d Author: 丁海波 Date: Fri Nov 2 20:54:24 2018 +0800 后台首页 commit a787ba822286403beefcb4838eae2b9aa595b14d Author: 丁海波 Date: Fri Nov 2 20:52:32 2018 +0800 后台首页 commit 8f777f3f54a88918c021643341a7cb04f521fe6e Author: 丁海波 Date: Fri Nov 2 20:50:21 2018 +0800 后台首页 commit 70166745545f34f4b96aab099021091abb183a73 (tag: tag-20181102_204131) Author: yunfeng ke Date: Fri Nov 2 20:25:45 2018 +0800 chg txt size commit a223497d22f4039b42eee80dbee8e5fea017f8fd Author: licc <45360682@qq.com> Date: Fri Nov 2 15:47:19 2018 +0800 作者改成书籍分类 commit 889a71507ca8f15a38798ab4a480e1c78986f604 Author: yunfeng ke Date: Fri Nov 2 14:58:15 2018 +0800 修改美书以外的搜索结果页bug commit d62528caade35ad927d0fc40ed9a3c72c3b19317 (tag: tag-20181102_145326) Author: yunfeng ke Date: Fri Nov 2 12:24:00 2018 +0800 测试ixs下样式问题 commit c5a2b35b180f73d7ae928d6209baf09cc402c228 Merge: 44202b784 58ea71b56 Author: yunfeng ke Date: Fri Nov 2 11:58:41 2018 +0800 Merge branch 'dev-meishu4-end' of 192.168.0.31:fe/cps into dev-meishu4-end commit 44202b7840e931451749dd4fd72c61f25312b39a Author: yunfeng ke Date: Fri Nov 2 11:58:29 2018 +0800 测试iXS兼容问题 commit 58ea71b5658e62fc3ff4e2ce9e9ea17fd95ccb63 Merge: 6dbcb7462 92ad195ba Author: licc <45360682@qq.com> Date: Fri Nov 2 11:47:34 2018 +0800 Merge remote-tracking branch 'origin/dev-meishu4-end' into dev-meishu4-end commit 6dbcb7462dabf2d1aa07924682e6d179998c8fa7 Author: licc <45360682@qq.com> Date: Fri Nov 2 11:46:13 2018 +0800 签到和自动回复 commit 92ad195ba11e0da274a61098671fc42357d2ead2 Author: yunfeng ke Date: Fri Nov 2 11:33:10 2018 +0800 测试ipX下的bug commit 2e2991dbcddcd95878be76424198bd6bfcf8c6c7 Author: licc <45360682@qq.com> Date: Fri Nov 2 10:33:00 2018 +0800 作者换成分类 commit d6598553e2071860e1ac4d47bb4ba0e5ed1008f3 Author: yunfeng ke Date: Thu Nov 1 21:29:02 2018 +0800 browser commit 52ae19871677e1bd18fd776e0a214425311ab05c Author: yunfeng ke Date: Thu Nov 1 21:18:40 2018 +0800 bg#fff commit c13aa40e22837f9228debe6f68271ab13593c3e0 Merge: cb3bbde6c 57d40bc4b Author: yunfeng ke Date: Thu Nov 1 21:13:22 2018 +0800 Merge branch 'dev-meishu4-merge' of 192.168.0.31:fe/cps into dev-meishu4-merge commit cb3bbde6cf61d11f5f057388213ad2e0603d0606 Author: yunfeng ke Date: Thu Nov 1 21:13:06 2018 +0800 add 浏览器下导粉 commit 57d40bc4ba0ebdb16b374f716f6d2be40a73ac98 (tag: tag-20181101_203913) Author: licc <45360682@qq.com> Date: Thu Nov 1 20:38:14 2018 +0800 作者换成分类 commit bbfe0d6ddb39ca07a1e10826bea3bc92d201c243 Author: yunfeng ke Date: Thu Nov 1 20:16:36 2018 +0800 padding commit a026531504b27b70051ce7a054d97640c123b226 Author: yunfeng ke Date: Thu Nov 1 20:05:13 2018 +0800 search add padding commit 678679e4bedaac06db196b4ce0c1605d8a2a5c65 Author: yunfeng ke Date: Thu Nov 1 19:59:12 2018 +0800 add user index bg#fff commit 9b34370ae4bca1a47ecffad388072d28ec7ea2a0 Author: yunfeng ke Date: Thu Nov 1 19:52:22 2018 +0800 bug txt 3px commit 5e344360d57a103258170b9f9049f4e0242a974f Author: yunfeng ke Date: Thu Nov 1 19:47:40 2018 +0800 bug menu commit 7933739c75a6ab537f839ee2f56552b6f19df0bd Author: yunfeng ke Date: Thu Nov 1 19:08:44 2018 +0800 bug 3 commit 4e5930a89a13b4fe83d211087f2fd9a834979cff Author: yunfeng ke Date: Thu Nov 1 19:06:30 2018 +0800 bug 2 commit 85398cee25d5d189956bd83a8b7f0a597909b35d Author: yunfeng ke Date: Thu Nov 1 18:56:28 2018 +0800 up code commit ad03ecabef3bbbc74e5d693a655f0780633f0399 Author: yunfeng ke Date: Thu Nov 1 18:53:13 2018 +0800 bug 2 commit 6c729ed76028aaecb732e62e34c6dc84677214b2 Author: DuanEnJian Date: Wed Oct 31 19:49:53 2018 +0800 修改Redis配置获取Bugs commit 604b204f229c03bde5a59abc4f8f2164b6a2d417 (tag: tag-20181101_172344) Merge: b0dd754f9 df773f143 Author: licc <45360682@qq.com> Date: Wed Oct 31 19:34:26 2018 +0800 Merge remote-tracking branch 'origin/dev-meishu4-merge' into dev-meishu4-merge commit b0dd754f9c071cc6a706926878bb2e8d69e425f8 Author: licc <45360682@qq.com> Date: Wed Oct 31 19:34:21 2018 +0800 作者换成分类 commit df773f14395f0fc89751f7bed7402b41331abc2c Merge: 84845fa90 784124b4a Author: yunfeng ke Date: Wed Oct 31 19:26:07 2018 +0800 Merge branch 'dev-meishu4-merge' of 192.168.0.31:fe/cps into dev-meishu4-merge commit 84845fa907cca9e11491a9b9637a96acf91841c1 Author: yunfeng ke Date: Wed Oct 31 19:25:51 2018 +0800 bug 1 commit b4afb6b844eb4d167d70962819a55b0b36feeed4 Merge: 12db13bf0 10df2e325 Author: 李天时 Date: Wed Oct 31 19:20:23 2018 +0800 Merge branch 'dev-payment' of http://192.168.0.31/fe/cps into commit-payment commit 10df2e3251ccdac81b350c7639cb1dcd5b61268d Author: 李天时 Date: Wed Oct 31 19:19:24 2018 +0800 删除调试代码 commit 12db13bf0d61808631f6d1e1640ae01c613f54fd Merge: e1021aba0 955037cf7 Author: 李天时 Date: Wed Oct 31 19:17:42 2018 +0800 Merge branch 'dev-payment' of http://192.168.0.31/fe/cps into commit-payment # Conflicts: # application/common/controller/Frontend.php commit 955037cf77019b0948e35b878b2f1f13548d1209 Author: 李天时 Date: Wed Oct 31 19:10:53 2018 +0800 删除多于文件 commit 784124b4a1a1a140383352144689a0eafbacdce1 Merge: 66634b135 a6b85ce05 Author: licc <45360682@qq.com> Date: Wed Oct 31 19:05:42 2018 +0800 Merge remote-tracking branch 'origin/dev-meishu4-merge' into dev-meishu4-merge commit 66634b135223874baa36101f2a24ada0936d460e Author: licc <45360682@qq.com> Date: Wed Oct 31 19:05:37 2018 +0800 作者换成分类 commit a63e298387f4a7b22803c644682652cb3a1602a1 Author: 李天时 Date: Wed Oct 31 17:54:30 2018 +0800 四方支付回调,优化代码 commit a6b85ce05e7ff599bfb40f7cd408a11ba12d9e69 Author: yunfeng ke Date: Wed Oct 31 17:45:48 2018 +0800 删除列表高度 commit 129fdf27cad1eae72b83bc2750d2f0b637aa68b2 Author: yunfeng ke Date: Wed Oct 31 17:17:24 2018 +0800 chg style commit df3d1465284f0f22214848739843b2fd39bf90ab Author: licc <45360682@qq.com> Date: Wed Oct 31 17:05:14 2018 +0800 搜索关键词 commit 6ae959830b56c99cc90bbcec135a1285d26594f6 Author: licc <45360682@qq.com> Date: Wed Oct 31 16:58:44 2018 +0800 搜索关键词 commit f8ca69d52f0c3970fd12504caa106960abf0faa0 Author: licc <45360682@qq.com> Date: Wed Oct 31 16:36:54 2018 +0800 限免隐藏 commit ded7b12a6380c73cbec624c95b8751695617220e Author: 李天时 Date: Wed Oct 31 15:37:15 2018 +0800 四方支付回调,优化代码 commit e43f8962424ee43ac5479d41c6eaa6d45cb704e1 Merge: 7f7a97f1b 2a9ff08f5 Author: 丁海波 Date: Wed Oct 31 15:22:51 2018 +0800 Merge remote-tracking branch 'origin/fix-online-test' into fix-online-test commit 7f7a97f1b127f8b829d15b76c1d7aee54cc4c7dd Author: 丁海波 Date: Wed Oct 31 15:22:42 2018 +0800 290 commit 50fe7c3b691c1778041965ae9cc64fd8800b1a1b Author: licc <45360682@qq.com> Date: Wed Oct 31 15:19:26 2018 +0800 限免隐藏 commit 2a9ff08f50b89afb783121e33d6194e14e0cc240 Author: DuanEnJian Date: Wed Oct 31 15:12:15 2018 +0800 添加自动回复书籍搜索开关 commit 18bc1b3030ffe9c19c5aafbd5293f1f87dcb6ea5 Author: 李天时 Date: Wed Oct 31 15:09:37 2018 +0800 四方支付回调,优化代码 commit 2aa69e40cf4ef1ed285137cfa6b58542f501e3bd Author: DuanEnJian Date: Wed Oct 31 15:00:20 2018 +0800 添加自动回复书籍搜索开关 commit 5584a2f91fe2894dc4e56a00d17f7f84d57bf2fe Merge: 0dfe92984 1718e33a3 Author: DuanEnJian Date: Wed Oct 31 14:43:50 2018 +0800 Merge remote-tracking branch 'origin/fix-online-test' into fix-online-test commit 0dfe92984748240ee13930357ddc6a4e0bbd4f56 Author: DuanEnJian Date: Wed Oct 31 14:43:44 2018 +0800 添加自动回复书籍搜索开关 commit 1718e33a3b9441de9a9b8b6eb1b640b494b56c8e Merge: c200c25d9 f4b92b91d Author: 丁海波 Date: Wed Oct 31 14:39:38 2018 +0800 Merge remote-tracking branch 'origin/fix-online-test' into fix-online-test commit c200c25d98c005c91b6a48426f38cbf802497b9b Author: 丁海波 Date: Wed Oct 31 14:39:29 2018 +0800 ; background-size:100% 100%;\"> commit f4b92b91d0a034696bb88c262f594aa8fc247bf9 Author: DuanEnJian Date: Wed Oct 31 14:37:48 2018 +0800 添加自动回复书籍搜索开关 commit f4d5a070946372b83289e3f4d2f29b23bd4059d2 Merge: f2898a255 1d5f284b9 Author: DuanEnJian Date: Wed Oct 31 14:35:12 2018 +0800 Merge remote-tracking branch 'origin/fix-online-test' into fix-online-test commit f2898a25595737284cf0329e3d3529670974564d Author: DuanEnJian Date: Wed Oct 31 14:35:06 2018 +0800 添加自动回复书籍搜索开关 commit 1d5f284b9436c3b32f8718c66304816578a2c9db Author: 丁海波 Date: Wed Oct 31 14:21:48 2018 +0800 290 commit ba74383f783a4b8101e24b0bedaadb702ab18b87 Author: 李天时 Date: Wed Oct 31 14:10:35 2018 +0800 四方支付回调,优化代码 commit 44036911eb9307af6d0b980e5af6143f74122b73 Author: licc <45360682@qq.com> Date: Wed Oct 31 13:45:39 2018 +0800 15分钟重复支付 commit 0e14a5e73309563e1c9fbd49c08f57d5597884d0 Author: licc <45360682@qq.com> Date: Wed Oct 31 11:07:37 2018 +0800 注释掉调试代码 commit c9f3446148e3f16b6037ab13163ba3f09b2b4163 Author: DuanEnJian Date: Wed Oct 31 11:00:10 2018 +0800 修改获取绝对值方式 commit bbff21d984c698c7521297bd37064814b2785177 Author: 李天时 Date: Tue Oct 30 18:14:32 2018 +0800 四方支付回调,优化代码 commit b8bf6a58d90e8bdd3aa1e9bf0cc76aa0eb0f5a58 Author: 丁海波 Date: Tue Oct 30 17:02:04 2018 +0800 background 弹窗生成推广链接 关闭跳到图片修改为跳至背景 commit c51281eba748258c3b2c0979763bb5b5f72997e4 Merge: e1021aba0 900d02121 Author: DuanEnJian Date: Tue Oct 30 16:53:57 2018 +0800 Merge branch 'fix-online' of 192.168.0.31:fe/cps into fix-online-test # Conflicts: # application/common/library/Redis.php commit 1466c5f9e851e1f9409a12374a1e4f797bf47028 Merge: e1021aba0 3b1af97f6 Author: licc <45360682@qq.com> Date: Tue Oct 30 16:40:10 2018 +0800 Merge branch 'dev-meishu4-test' of http://192.168.0.31/fe/cps into dev-meishu4-merge commit f8bcc6093315e4b6a66febb51915e4eba87175a6 Merge: 114fbf863 00494ad37 Author: 李天时 Date: Tue Oct 30 13:29:27 2018 +0800 Merge remote-tracking branch 'origin/dev-payment' into dev-payment # Conflicts: # application/api/controller/Rechargepalm.php commit 114fbf86376f3be03f142a874e82c5cd2f81e8a1 Author: 李天时 Date: Tue Oct 30 13:28:55 2018 +0800 四方支付回调 commit 00494ad37ee1ec0531facccf07954819c6d94605 Author: licc <45360682@qq.com> Date: Tue Oct 30 10:47:18 2018 +0800 注释掉调试代码 commit 91527e2b51d54a8d37fa1c043eecffd64d3d42a7 Author: licc <45360682@qq.com> Date: Tue Oct 30 10:44:35 2018 +0800 修改新用户进屏蔽书籍第一章能点进去的bug commit 3b46507a3960770a218f0ad88a7034bd95eeb109 Author: licc <45360682@qq.com> Date: Mon Oct 29 20:55:58 2018 +0800 test commit 6b0316a595a86b5458b89d71ce83336d9f57dc50 Author: licc <45360682@qq.com> Date: Mon Oct 29 20:53:44 2018 +0800 test commit 5d74181dc68029425ae0c17c6108b07c4a2db270 Author: licc <45360682@qq.com> Date: Mon Oct 29 20:50:21 2018 +0800 test commit 631675d67ef5afcecd2a0fdfd3d0a829714c194c Author: licc <45360682@qq.com> Date: Mon Oct 29 20:27:09 2018 +0800 test commit 900d02121f62820f22286242dfc70152ea97d339 Author: DuanEnJian Date: Mon Oct 29 19:26:50 2018 +0800 Redis规则 1=UN:#20@1&2&3&4 commit 7317847f705eca57299fc213d0f1b374c692e247 Author: licc <45360682@qq.com> Date: Mon Oct 29 18:58:49 2018 +0800 test commit a536231075316335b73559864a5f78514ebee987 Author: licc <45360682@qq.com> Date: Mon Oct 29 18:49:41 2018 +0800 test commit bca67f423f633c69ac1386a43ee25f7876ef14de Author: licc <45360682@qq.com> Date: Mon Oct 29 18:40:16 2018 +0800 test commit 090cbcad92f3db5a963a9ebe1f12a36560d7d376 Author: licc <45360682@qq.com> Date: Mon Oct 29 18:33:16 2018 +0800 test commit 78630441c12a9802598cdd0891875d5d49df25f3 Author: licc <45360682@qq.com> Date: Mon Oct 29 18:32:00 2018 +0800 test commit 6f9e9f7e19b6782a3caa25bc5d729f279ee19d2d Author: licc <45360682@qq.com> Date: Mon Oct 29 18:22:04 2018 +0800 test commit c85f844043438c205165768e36114e75a313a378 Author: licc <45360682@qq.com> Date: Mon Oct 29 17:46:59 2018 +0800 test commit 01a0df27b183d02b45f8261a6ce4d7367b4a0ef3 Author: licc <45360682@qq.com> Date: Mon Oct 29 17:40:02 2018 +0800 test commit ea795982385f96d4aafc2f0da34fecf14a4f8848 Author: licc <45360682@qq.com> Date: Mon Oct 29 17:22:32 2018 +0800 test commit fc41588ab7e22ef440c75b5667e56beee5e0e43b Author: licc <45360682@qq.com> Date: Mon Oct 29 17:12:48 2018 +0800 test commit eeb650a1f64c913971520ae69eaf717551f1dcbc Author: licc <45360682@qq.com> Date: Mon Oct 29 17:11:17 2018 +0800 test commit 6e89a4ad1d4a3768434d78ad4d1ffd7686482e7a Author: licc <45360682@qq.com> Date: Mon Oct 29 17:10:02 2018 +0800 test commit 13fd551063880fad7b66023685ef86b0cea4f97d Author: licc <45360682@qq.com> Date: Mon Oct 29 16:59:57 2018 +0800 test commit 3add30d5f31d835068d65b8b14dfcac8f711681e Author: licc <45360682@qq.com> Date: Mon Oct 29 16:52:34 2018 +0800 test commit f0145fb943cade8fd829479846ae34e1fa1e5c93 Author: licc <45360682@qq.com> Date: Mon Oct 29 16:52:02 2018 +0800 test commit e8b48c4ae84a9b7b560c73bc4df364da149250a9 Author: licc <45360682@qq.com> Date: Mon Oct 29 16:39:30 2018 +0800 test commit 236f61595eac77783f2ebffe6c5b465afb97a6b4 Author: licc <45360682@qq.com> Date: Mon Oct 29 16:38:14 2018 +0800 test commit 569b8b8035fffdad7cced18a19bc479bbb796a6d Author: licc <45360682@qq.com> Date: Mon Oct 29 16:34:23 2018 +0800 test commit 102c5a635941b870fa5c9b9644d9c857a7fc9869 Author: licc <45360682@qq.com> Date: Mon Oct 29 16:31:10 2018 +0800 test commit b2412a1b8c3fa6bab2bbb5ec07f4110fbdb3e9f5 Author: licc <45360682@qq.com> Date: Mon Oct 29 16:06:51 2018 +0800 test commit e52b74dd230e4cd63b48ca42d67f2281dc674530 Author: licc <45360682@qq.com> Date: Mon Oct 29 15:47:28 2018 +0800 test commit d900e84259d8d1f5dba7888149103a1e5d884431 Author: licc <45360682@qq.com> Date: Mon Oct 29 15:00:50 2018 +0800 test commit 4f871d46b17d4fa8e259cee687ceca29e22c1084 Author: licc <45360682@qq.com> Date: Mon Oct 29 14:59:12 2018 +0800 test commit e1021aba0c54637ac5b1042d335e28f5ee23b1cd (tag: tag-20181029_141427) Author: DuanEnJian Date: Mon Oct 29 13:44:35 2018 +0800 修改免费看到展示问题 commit 597acc8586a65deed9f09414cc47cfc6c3f31f7c Author: licc <45360682@qq.com> Date: Mon Oct 29 11:51:42 2018 +0800 test commit b9f623955a38de4a9460d2494231f06476a8e36f Author: licc <45360682@qq.com> Date: Mon Oct 29 11:31:15 2018 +0800 test commit 374172acf057d8899585454f9f835b9a78ff770c Author: licc <45360682@qq.com> Date: Mon Oct 29 11:24:12 2018 +0800 test commit 0fe0f4c012222e290713b6b4390cb35ecf51fbac Author: licc <45360682@qq.com> Date: Mon Oct 29 11:18:55 2018 +0800 test commit a849e8522b537f38682856d6a00b26b530a3bc01 Merge: d58bb2acd e5bbba44d Author: licc <45360682@qq.com> Date: Mon Oct 29 11:15:29 2018 +0800 Merge remote-tracking branch 'origin/dev-payment' into dev-payment commit d58bb2acdd0138c98142049f372492da8cc48e01 Author: licc <45360682@qq.com> Date: Mon Oct 29 11:15:23 2018 +0800 test commit a3abd465b86e2ba19ea8fe7db0021a27121e3447 Author: licc <45360682@qq.com> Date: Mon Oct 29 11:15:04 2018 +0800 test commit d874a90ca9f750167cff0b414b2fad4e15e92c3e (tag: tag-20181029_112356) Author: 李天时 Date: Mon Oct 29 10:17:24 2018 +0800 Merge branch 'chapter_commit' of http://192.168.0.31/fe/cps # Conflicts: # application/common/controller/Frontend.php commit 609f294adeb881252ef62bf5722d2e367df960b5 Merge: 993434ba5 84bf6a1a4 Author: 李天时 Date: Mon Oct 29 10:17:16 2018 +0800 Merge branch 'chapter_commit' of http://192.168.0.31/fe/cps # Conflicts: # application/common/controller/Frontend.php commit e5bbba44d091df3c437822dfe04eb23d5555d6ba Merge: 038d1f5ac 9813fa41a Author: 李天时 Date: Mon Oct 29 09:39:07 2018 +0800 Merge remote-tracking branch 'origin/dev-payment' into dev-payment commit 038d1f5ac7fad9f1b032d52ef6f4fd6a9c20e7f3 Author: 李天时 Date: Mon Oct 29 09:38:19 2018 +0800 四方支付回调 commit 84bf6a1a453fa34e44e3a9e4b50ef059d3deac70 (tag: tag-20181027_231534) Author: 李天时 Date: Sat Oct 27 22:37:48 2018 +0800 解决书籍屏蔽，用户第一次访问我们链接的时候屏蔽不生效 commit 9813fa41ab3c6d98ba06b76a60befc2303222398 Author: licc <45360682@qq.com> Date: Sat Oct 27 18:26:54 2018 +0800 test commit 71dffe18c11299a9c482a41415ea3c838bb23b49 Author: licc <45360682@qq.com> Date: Sat Oct 27 17:51:11 2018 +0800 test commit a9053dbf2fe2f3634e8fc736dd4cca328984a054 Author: licc <45360682@qq.com> Date: Sat Oct 27 17:41:55 2018 +0800 test commit 7b69ee29eec2a6eed342ca4b7926e12e44cdfc80 (tag: tag-20181027_202936) Author: 李天时 Date: Sat Oct 27 17:39:17 2018 +0800 小说章节相对路径改为配置 commit d5dd9c5f81992c340cc38319cfa67284b535ab9f Merge: cac89ebfb 8a5456227 Author: licc <45360682@qq.com> Date: Sat Oct 27 16:56:20 2018 +0800 Merge remote-tracking branch 'origin/dev-payment' into dev-payment commit cac89ebfbefa96c39ebdd3c29750bfb6f3aa5426 Author: licc <45360682@qq.com> Date: Sat Oct 27 16:56:14 2018 +0800 去掉无用代码 commit 8a5456227ee1b6cc6cbd3897b4cbe934891997a6 Author: licc <45360682@qq.com> Date: Sat Oct 27 16:36:15 2018 +0800 test commit d38c8bc1a474b787527096f6dea1f2fab8a55cff Author: licc <45360682@qq.com> Date: Sat Oct 27 16:18:28 2018 +0800 test commit 212a1d039b023f99a7f6255179a93d717b5fce39 Author: licc <45360682@qq.com> Date: Sat Oct 27 16:03:50 2018 +0800 调试支付js commit a4938223c8d1853ebc33e65f53a34abf65722599 Author: licc <45360682@qq.com> Date: Sat Oct 27 16:01:58 2018 +0800 去掉无用代码 commit e697c9aaaee62a3674c8f122444a736e7c388b9f (tag: tag-20181027_152552) Author: licc <45360682@qq.com> Date: Sat Oct 27 15:24:12 2018 +0800 屏蔽书籍 commit 893c109cb7585bd460af59e0cfff85e9a75dddd0 Author: licc <45360682@qq.com> Date: Sat Oct 27 15:16:36 2018 +0800 test commit eb55145af39db858a585f344685166b0daf2e0b9 Author: licc <45360682@qq.com> Date: Sat Oct 27 14:39:17 2018 +0800 test commit 603f7c2c3d35da681ebec4d8ebe75b9d5c1453ad Author: licc <45360682@qq.com> Date: Sat Oct 27 12:05:29 2018 +0800 test commit e3c9e0dd06451b0c1cb7dd75a8280fd79d1c9d3a Author: licc <45360682@qq.com> Date: Sat Oct 27 12:00:06 2018 +0800 test commit a6b95ca7b8741cce85c1b7fc61e4c93c95e551a1 (tag: tag-20181027_113123) Author: licc <45360682@qq.com> Date: Sat Oct 27 11:28:58 2018 +0800 test commit 24d6ed7d57f1d78916438cfa3432986790406643 Author: DuanEnJian Date: Fri Oct 26 23:50:59 2018 +0800 断开MySQL连接 commit 08639accd82446551c4ab86dcd5e2a8d8caf5ba1 Author: licc <45360682@qq.com> Date: Fri Oct 26 23:02:11 2018 +0800 test commit f82e86af7d3a423d6303ba8558742e094cd5d79c Author: licc <45360682@qq.com> Date: Fri Oct 26 22:57:37 2018 +0800 test commit 1019ec090cd6ea070d2602821627e3a85396b6c8 (tag: tag-20181026_214044) Author: licc <45360682@qq.com> Date: Fri Oct 26 21:31:43 2018 +0800 getadminconfigall修改 commit 0d2ca5ab394e69f3c9b3a40e8850593c722140cd Author: licc <45360682@qq.com> Date: Fri Oct 26 21:01:17 2018 +0800 getadminconfigall修改 commit 993434ba558755223f4af8e39b959c03725e3a43 (tag: tag-20181027_015303, tag: tag-20181026_201942) Merge: 51aac8c40 79c3eefeb Author: DuanEnJian Date: Fri Oct 26 20:18:40 2018 +0800 Merge branch 'dev-optimize-test' of 192.168.0.31:fe/cps commit 79c3eefeba1d870d6b06d708df4b9f7ffa2a19fc Author: 丁海波 Date: Fri Oct 26 20:10:25 2018 +0800 if(actions[0] == 'url') commit 4c4298a5b837f4788c250b89c1322524d2dcb73f Merge: a0cf86539 0340897ce Author: licc <45360682@qq.com> Date: Fri Oct 26 17:18:11 2018 +0800 Merge remote-tracking branch 'origin/dev-payment' into dev-payment commit a0cf865391fa1bae3e64bcf123430ba5d15aa8c2 Author: licc <45360682@qq.com> Date: Fri Oct 26 17:18:06 2018 +0800 getadminconfigall修改 commit 0340897ce0aa6e41f076ba1b1ff30de126674d7a Author: DuanEnJian Date: Fri Oct 26 16:41:18 2018 +0800 微信pay添加四方支付 commit 51aac8c406aa0323159d0b127829facec1f56df8 (tag: tag-20181026_151444) Merge: 47cb2ae5e f7ed5db1a Author: DuanEnJian Date: Fri Oct 26 14:41:04 2018 +0800 Merge branch 'dev-optimize-test' of 192.168.0.31:fe/cps commit 45771d8484a7f328ff3dabbb411773e8e7577e33 Author: DuanEnJian Date: Fri Oct 26 14:37:46 2018 +0800 微信pay添加四方支付 commit f7ed5db1a7bee6f3663425f9c354e2bcd5f8c8f2 Merge: 7fc6fd40f 077e87cc6 Author: 丁海波 Date: Thu Oct 25 19:56:23 2018 +0800 Merge remote-tracking branch 'origin/dev-optimize-test' into dev-optimize-test commit 7fc6fd40fd2d7bde81df45182bf32b895754fa29 Author: 丁海波 Date: Thu Oct 25 19:56:19 2018 +0800 -webkit-tap-highlight-color commit 077e87cc630c44f0dcbc7a8724d913bdd9141894 Author: DuanEnJian Date: Thu Oct 25 19:41:54 2018 +0800 添加获取用户ID commit aab8e232b86d1b4183562274880f6b53c2db6dcf Author: DuanEnJian Date: Thu Oct 25 19:41:26 2018 +0800 添加获取用户ID commit 54305f9d25fdd0ec30ad0aa6b0c4662fd171ebc4 Author: DuanEnJian Date: Thu Oct 25 19:39:44 2018 +0800 添加获取用户ID commit 3c98cf6faece42779c35bc6ea38eb3a010168c73 Author: DuanEnJian Date: Thu Oct 25 19:33:15 2018 +0800 添加获取用户ID commit 15d04d61b3d3c3ca9737fda71577f4a98c7e4b91 Author: DuanEnJian Date: Thu Oct 25 19:06:37 2018 +0800 修改禁用用户IDS空过滤 commit 4f07d7695fd60e2a80467f109e76077ff65516ee Author: 丁海波 Date: Thu Oct 25 16:04:56 2018 +0800 chapterList[j].content commit d6b48a53a1b49bc24877185942aa0670ab2aac64 Author: 丁海波 Date: Thu Oct 25 15:58:38 2018 +0800 for(var j=0; j Date: Thu Oct 25 15:56:32 2018 +0800 checkbox commit 5e8f9f9c9b1b96ba8aeb5a158d20b8a681e88487 Author: 丁海波 Date: Thu Oct 25 15:55:14 2018 +0800 label commit 355819dc6c6560e4972df053bbf7968c331b35ee Author: 丁海波 Date: Thu Oct 25 15:51:03 2018 +0800 chapterList.length commit 47cb2ae5ed0e5571386755c44f94749f91084bdb (tag: tag-20181025_195000, tag: tag-20181025_160942, tag: tag-20181025_155233) Merge: 7b1ab7543 6f1801011 Author: 李天时 Date: Thu Oct 25 15:26:54 2018 +0800 Merge branch 'dev-vip-bug-fix' of http://192.168.0.31/fe/cps commit 7ce38c43340fe7d016ead16efafbeda97035b9da Author: DuanEnJian Date: Thu Oct 25 15:10:12 2018 +0800 修改脚本关闭mysql链接 commit 3b1af97f6f5c4b3860c078764447eab257ba1816 Author: licc <45360682@qq.com> Date: Thu Oct 25 14:41:47 2018 +0800 未识别性别，默认走女生主题样式 1、书城首页，默认女频 2、最近阅读的推荐书，走女频书 3、书籍结束页的推荐书，走女频书 commit 699c393f650bc64af56dec5864ea4c2d61ca789d Author: DuanEnJian Date: Thu Oct 25 14:37:26 2018 +0800 修改分类里面的书籍列表缓存为30分钟 commit 7b1ab75438b6139a22077f2c53ff662680adf6e7 (tag: tag-20181025_115655) Merge: a144b821a 66d8a344b Author: php-王凡昌 Date: Thu Oct 25 11:41:32 2018 +0800 合并callback充值 合并阿里云书籍基础缓存 commit a8d82a37013f0754413bceae3ac32b05b74090a8 Author: DuanEnJian Date: Thu Oct 25 11:19:37 2018 +0800 修改推广链接Mysql自动断开 commit 393687519bb774c1cd9dd45c0180cd19fdfcf59b Author: DuanEnJian Date: Wed Oct 24 20:18:35 2018 +0800 修改签到看点问题 commit 4a66a113c1259685d8ee074cd1a8733a115df867 Author: DuanEnJian Date: Wed Oct 24 20:13:16 2018 +0800 修改签到看点问题 commit 2bbfe9f6868506633f05f18f4ebce7ee934caf32 Author: yunfeng ke Date: Wed Oct 24 19:57:37 2018 +0800 chg img commit 8f55e504f78d84f8ecefb0f4bb539ba2d1172214 Merge: 313a6047e a82cc0ef2 Author: DuanEnJian Date: Wed Oct 24 18:21:49 2018 +0800 Merge remote-tracking branch 'origin/dev-optimize-test' into dev-optimize-test commit 313a6047e4a8dec6455f80afc762b93230a65877 Author: DuanEnJian Date: Wed Oct 24 18:21:43 2018 +0800 修改推广链接章节内容为空时报错问题 commit a82cc0ef27415315c4995611a2819111a6b5b5ab Merge: 3059d483c 8a55235f6 Author: licc <45360682@qq.com> Date: Wed Oct 24 17:16:19 2018 +0800 Merge remote-tracking branch 'origin/dev-optimize-test' into dev-optimize-test commit 3059d483c5ea59ded41555217f1f7b1b41a15f8b Author: licc <45360682@qq.com> Date: Wed Oct 24 17:16:15 2018 +0800 刷新缓存 commit 6f18010116fae179e1a5b567b082c94b74903bb3 Author: 李天时 Date: Wed Oct 24 16:54:33 2018 +0800 解决vip功能bug。1、vip运营编辑后与所有渠道商解绑了，应该是禁用vip运营才解绑；2、批量提现只提现成功了最后一条。 commit 8a55235f63bc840fe4e97a35d65abfc88a6010cc Author: 丁海波 Date: Wed Oct 24 16:17:10 2018 +0800 type2 commit 81217a72e6c949bb06cebe446b724a886be07267 Author: DuanEnJian Date: Wed Oct 24 16:12:58 2018 +0800 修改脚本数据库链接 commit 8caf4c0909cb04a84642cd1439455e99f2db5f83 Author: yunfeng ke Date: Wed Oct 24 13:55:16 2018 +0800 修改连载状态 commit c7b81332cc31d3722ab4331eeb56f1d3f810af03 Author: DuanEnJian Date: Wed Oct 24 13:23:37 2018 +0800 修改阅读记录AJAX请求入库书不展示问题 commit 49555ce7f5b501cdb67ce6b9518af49df699018a Merge: 204d62186 0f2b382aa Author: DuanEnJian Date: Wed Oct 24 12:28:45 2018 +0800 Merge remote-tracking branch 'origin/fix-online' into fix-online commit 204d62186be58de189f715fecd589554b31f4c0f Author: DuanEnJian Date: Wed Oct 24 12:27:59 2018 +0800 修改Redis获取方式 commit 2dd0ca546f4d5564295cf46376d63ef6431d79fa Author: yunfeng ke Date: Wed Oct 24 12:14:33 2018 +0800 修改字色 commit 6a6e52bdc344950550a118a8e86b3000c4d48fe5 Merge: a144b821a a256574ed Author: licc <45360682@qq.com> Date: Wed Oct 24 10:24:20 2018 +0800 Merge branch 'dev-optimize' of http://192.168.0.31/fe/cps into dev-optimize-test commit 0f2b382aa2d0e63339b0794bd8c05e542f58fd73 Merge: 97992758e ba537093d Author: 丁海波 Date: Tue Oct 23 20:48:18 2018 +0800 Merge remote-tracking branch 'origin/fix-online' into fix-online commit 97992758e062957a729c8693e23c2cbecc30d0a1 Author: 丁海波 Date: Tue Oct 23 20:48:12 2018 +0800 cpslog /\/index\/book\/chapter|\/index\/book\/info|\/index\/book\/menu/ commit ba537093d73c1a5026aec9284e1e82cc2ae6c80a Author: DuanEnJian Date: Tue Oct 23 19:37:40 2018 +0800 get_db_connect 添加LOG commit 0de611d07cdd21400a96b4d6dd2405619650a124 Author: DuanEnJian Date: Tue Oct 23 17:33:40 2018 +0800 修改推广链接缓存BUG commit a456edc8ba7d1f86cc7fbb38408299ea98298135 Merge: a144b821a 509692556 Author: DuanEnJian Date: Tue Oct 23 17:24:35 2018 +0800 Merge branch 'dev-fix-wxpay' of 192.168.0.31:fe/cps into fix-online commit 6b702901e420347b42e46c875927bcb62895510f Author: yunfeng ke Date: Tue Oct 23 16:42:07 2018 +0800 加圆解 测试ios commit a4a03110cb274a680ddcb880ea7cc5c5f8ebaa26 Author: yunfeng ke Date: Tue Oct 23 16:15:08 2018 +0800 压缩图片 commit 03026a3425c3711e2978331969b3a24af549702b Author: yunfeng ke Date: Tue Oct 23 15:58:44 2018 +0800 分类页 is_finish 文案bug commit 554cb85901c5ad6a6cf414a33916bbe80c880f73 Merge: 1367e4f1e a85180aa8 Author: licc <45360682@qq.com> Date: Tue Oct 23 15:46:06 2018 +0800 Merge remote-tracking branch 'origin/dev-meishu4-test' into dev-meishu4-test commit 1367e4f1e7f90e57a892959232bd17eb6b2e5b27 Author: licc <45360682@qq.com> Date: Tue Oct 23 15:46:00 2018 +0800 书籍分类加is_finish，书籍目录页展示前3条目录 commit a85180aa8c83a472f27dd311158ff74f85bfa343 Author: yunfeng ke Date: Tue Oct 23 15:05:44 2018 +0800 支付页面更换样式 commit e6d78020749098d32a3ededbd39a92307f928a94 Author: yunfeng ke Date: Tue Oct 23 13:48:36 2018 +0800 up style commit 611d8172a96f076d88bd8e404654fc97e60c3c3e Author: yunfeng ke Date: Tue Oct 23 13:44:50 2018 +0800 up code commit 0d3765050ddb65eada6001e76eccd99ef2f8ce67 Merge: 289896a61 754a2aa4d Author: yunfeng ke Date: Mon Oct 22 21:02:03 2018 +0800 Merge branch 'dev-meishu4-test' of 192.168.0.31:fe/cps into dev-meishu4-test commit 289896a6152f1c13a61026c708f924ffeef2e149 Author: yunfeng ke Date: Mon Oct 22 21:01:54 2018 +0800 up code commit 754a2aa4d548952c084179b2b7167084c8518c30 Author: licc <45360682@qq.com> Date: Mon Oct 22 17:59:17 2018 +0800 解决添加书籍时如果基础数据里最后章节更新时间为空报错问题 commit a256574edd845a2504a0986136b5fcde56509edf Author: licc <45360682@qq.com> Date: Mon Oct 22 17:55:55 2018 +0800 解决添加书籍时如果基础数据里最后章节更新时间为空报错问题 commit 66d8a344ba820cf99e3575f973ba17d926f05ba5 (tag: tag-20181022_185550) Merge: 7c169b421 8c01bc970 Author: DuanEnJian Date: Mon Oct 22 17:48:40 2018 +0800 Merge branch 'fix-referral-sf' of 192.168.0.31:fe/cps into mastershafa commit 610441e426add78d56d93252a2ca26d4dcd42b12 Author: yunfeng ke Date: Mon Oct 22 16:03:05 2018 +0800 tst commit 36af17160e324e046f202053d00bfa4a2bc82fcb Author: licc <45360682@qq.com> Date: Mon Oct 22 13:24:07 2018 +0800 搜索页，书籍详情页随机书籍 commit db7d271a00c5976deb5fc09e5b74d2f735cd3739 Author: licc <45360682@qq.com> Date: Mon Oct 22 11:24:38 2018 +0800 解决bookmodel报错 commit c75ab0d30c35b6b4a9b6a0dbaef07e43d90b7461 Merge: 7c169b421 b73501888 Author: licc <45360682@qq.com> Date: Mon Oct 22 11:08:53 2018 +0800 Merge branch 'dev-meishu4' of http://192.168.0.31/fe/cps into dev-meishu4-test commit b7350188835ffbd04212d734b4a10ef1b86faa59 Merge: 0bbb44aa1 c8bf1dae1 Author: yunfeng ke Date: Mon Oct 22 11:01:09 2018 +0800 Merge branch 'dev-meishu4' of 192.168.0.31:fe/cps into dev-meishu4 commit 0bbb44aa1f13d810b048d19166e5b594da7a95af Author: yunfeng ke Date: Mon Oct 22 11:00:54 2018 +0800 books end commit 7c169b421e6d810c9da3b8416e618cf6e1a0d063 (tag: tag-20181022_151812) Author: licc <45360682@qq.com> Date: Fri Oct 19 20:49:12 2018 +0800 修复封面状态筛选 commit 44428d26071dbd7718c3dea9b4f6096e4a368c24 (tag: tag-20181019_202315) Author: licc <45360682@qq.com> Date: Fri Oct 19 20:16:13 2018 +0800 修复书籍基础缓存 commit af30c101eff4c6735d28ff2b667b5da6b5ca1f07 (tag: tag-20181019_195850) Author: licc <45360682@qq.com> Date: Fri Oct 19 19:57:51 2018 +0800 修复书籍基础缓存 commit c8bf1dae15f64ec037d786b8fd081e0a75cce845 Author: 丁海波 Date: Fri Oct 19 19:10:30 2018 +0800 if(!str) return 0; commit e4e46cb0651273a78da81356dba2b16cbfea0a8d Author: 丁海波 Date: Fri Oct 19 19:08:56 2018 +0800 str commit df290a98f1c953e3e28360ffa15f92e3f5098ea1 (tag: tag-20181019_194905) Author: licc <45360682@qq.com> Date: Fri Oct 19 18:56:56 2018 +0800 修复书籍基础缓存 commit 7cc23c36d5af32aab2f4895b3a50525caa10bb8d Author: licc <45360682@qq.com> Date: Fri Oct 19 18:54:07 2018 +0800 修复书籍基础缓存 commit 6157ca49fb3757030a2830c95e011a76c3479168 Author: licc <45360682@qq.com> Date: Fri Oct 19 18:49:56 2018 +0800 修复书籍基础缓存 commit 55f1f30871820768ed222d41a8c55163b7d9bc92 Author: 丁海波 Date: Fri Oct 19 18:12:06 2018 +0800 目录 commit 50950ea060804d8d71ad5c6f94ec4c5b0be334c7 Author: 丁海波 Date: Fri Oct 19 18:10:26 2018 +0800 目录 commit 729c703b6f8f4a4e2460bb3688a2dd60afc21fb1 Merge: 63d7fdd54 70e6c2f6d Author: 丁海波 Date: Fri Oct 19 17:59:47 2018 +0800 Merge remote-tracking branch 'origin/dev-meishu4' into dev-meishu4 commit 63d7fdd54ac874d709b3214ea7c9335e2b2e544a Author: 丁海波 Date: Fri Oct 19 17:59:40 2018 +0800 $menuindexjson commit 70e6c2f6d95484cb900aba9fce814968eee90c70 Author: yunfeng ke Date: Fri Oct 19 17:53:22 2018 +0800 user end commit 2bb0759ed6a72a78c869fdb837b34f03f66e3377 Author: DuanEnJian Date: Fri Oct 19 17:45:55 2018 +0800 去掉文字提示 commit a144b821ad214fcce6b631c9d114facbd91c12fa (tag: tag-20181022_185611) Author: DuanEnJian Date: Fri Oct 19 13:11:17 2018 +0800 修改推广链接管理员展示问题 commit 8c01bc970afa36d60896991a1699657cb8ed490f Author: DuanEnJian Date: Fri Oct 19 13:06:35 2018 +0800 修改推广链接管理员展示问题 commit fe080f6a1c6ec83339e5a85892555b589d5fb172 Author: DuanEnJian Date: Fri Oct 19 11:55:09 2018 +0800 修改推广链接,and 获取默认章节报错问题 commit c75379ccb84e087569829c59b9beff739823627c Author: DuanEnJian Date: Fri Oct 19 11:52:43 2018 +0800 修改推广链接,and 获取默认章节报错问题 commit 72026d08c941a7d3c187e6e84e3379af50acd6b2 Author: yunfeng ke Date: Thu Oct 18 20:45:54 2018 +0800 book,pay,user commit 4732908b29fd256a4716c56b774d82b048a24079 Author: php-王凡昌 Date: Thu Oct 18 11:31:15 2018 +0800 修正代理商订单金额分成字段错误 commit cc8bc0a1c4d13ccce2e662f8e990a88a19435529 (tag: tag-20181018_151742) Author: php-王凡昌 Date: Thu Oct 18 11:31:15 2018 +0800 修正代理商订单金额分成字段错误 commit 24be5ed78054810064106c5c8862710974f66ca2 Author: php-王凡昌 Date: Thu Oct 18 10:22:48 2018 +0800 修正语法校验 commit 9a2784c7c634dc78ed75e83121bbec776e883825 (tag: tag-20181018_102326) Author: php-王凡昌 Date: Thu Oct 18 10:22:48 2018 +0800 修正语法校验 commit 35122e08255b41fb24e39463c884710b3b6abfaf (tag: tag-20181017_215658) Author: php-王凡昌 Date: Wed Oct 17 21:48:43 2018 +0800 修改mysql查询顺序 commit d9ff3f3cb265defd048dabc37c18c3ddfc7d66b5 (tag: tag-20181018_094846, tag: tag-20181017_215333) Author: php-王凡昌 Date: Wed Oct 17 21:48:43 2018 +0800 修改mysql查询顺序 commit 157da71a8164416e6eacf737a0287e6d6d53bd47 (tag: tag-20181017_204026) Merge: 95995fbf0 19a191b39 Author: php-王凡昌 Date: Wed Oct 17 20:28:43 2018 +0800 Merge branch 'dev-daofen-sf' of 192.168.0.31:fe/cps into dev-daofen-sf-merge Conflicts: application/common/controller/Frontend.php commit 8f900130edba85aee4e2277b950eb1856983bb05 (tag: tag-20181017_203626) Merge: 2a0e8f0dc c5a29ec8a Author: php-王凡昌 Date: Wed Oct 17 20:27:39 2018 +0800 Merge branch 'dev-daofen' of 192.168.0.31:fe/cps into dev-daofen-merge Conflicts: application/common/controller/Frontend.php commit 19a191b39be88a54ecc5af9d3c612ed7588766dc Merge: 33450aa07 c5a29ec8a Author: php-王凡昌 Date: Wed Oct 17 19:56:04 2018 +0800 Merge branch 'dev-daofen' of 192.168.0.31:fe/cps into dev-daofen-sf Conflicts: application/admin/controller/Guidedomain.php application/admin/controller/Shortdomain.php commit c5a29ec8a6321d08c1e6af3d50f1dcaa009b5639 Merge: 6eaf95ad6 b1abfbb66 Author: php-王凡昌 Date: Wed Oct 17 19:54:00 2018 +0800 Merge branch 'dev-daofen' of 192.168.0.31:fe/cps into dev-daofen Conflicts: application/admin/controller/Guidedomain.php application/admin/controller/Shortdomain.php commit 6eaf95ad62a8413523ecaa781bd40e863be3f830 Author: php-王凡昌 Date: Wed Oct 17 19:52:57 2018 +0800 暂存 commit 3f913d5dd030dfeb6c6d6d528d3f42d0bbace0a0 Author: yunfeng ke Date: Wed Oct 17 19:47:43 2018 +0800 详情end commit 95995fbf0d1ccbb759d22273ac428babfa5989ba (tag: tag-20181017_202444, tag: tag-20181017_190018) Author: licc <45360682@qq.com> Date: Wed Oct 17 18:34:31 2018 +0800 书籍id判断 commit 2a0e8f0dc3cfec71db350d2dd27eb82e3ac79c89 (tag: tag-20181017_202157, tag: tag-20181017_185518) Author: licc <45360682@qq.com> Date: Wed Oct 17 18:33:14 2018 +0800 书籍id判断 commit 33450aa071843ebdd556ef60d012981701f4f619 (tag: tag-20181017_175310) Author: licc <45360682@qq.com> Date: Wed Oct 17 17:50:40 2018 +0800 书籍id判断 commit b1abfbb667dd9932b4beb9fc7b07c624b95a6b22 (tag: tag-20181017_175730) Merge: 922c2c220 7e4121a30 Author: licc <45360682@qq.com> Date: Wed Oct 17 17:49:43 2018 +0800 Merge remote-tracking branch 'origin/dev-daofen' into dev-daofen commit 922c2c220856d09d84dc8a31e74f988d628ecffa Author: licc <45360682@qq.com> Date: Wed Oct 17 17:49:38 2018 +0800 书籍id判断 commit 93cc755da5e24a831fe381a7393b59c04d7db516 Author: licc <45360682@qq.com> Date: Wed Oct 17 17:47:16 2018 +0800 书籍id判断 commit 37ea8f220edd3a5dc934f746e1aa743f72adf428 Author: licc <45360682@qq.com> Date: Wed Oct 17 17:45:21 2018 +0800 书籍id判断 commit 2e24a5e8fd02e932508822ec3130714d41ee4e50 Author: DuanEnJian Date: Wed Oct 17 17:43:05 2018 +0800 去掉关闭短链域名事物处理 commit 7e4121a30d8d1884e8116c65aeee1a5fcd178d08 Author: DuanEnJian Date: Wed Oct 17 17:40:53 2018 +0800 去掉关闭短链域名事物处理 commit 34eb9e06ad6451a81aeb2ad2c93618986d207a74 (tag: tag-20181017_160735) Author: DuanEnJian Date: Wed Oct 17 16:00:11 2018 +0800 修复推广链接JS错误问题 commit 86bc27605dc50c7dbf2b4136f8febb253d43ce84 (tag: tag-20181017_161259) Author: DuanEnJian Date: Wed Oct 17 15:59:29 2018 +0800 修复推广链接JS错误问题 commit a9e042e737d750643eaafd26d45685b529e76790 (tag: tag-20181017_135026) Merge: a36073968 488251abc Author: DuanEnJian Date: Wed Oct 17 12:18:58 2018 +0800 Merge branch 'dev-guide-merge' of 192.168.0.31:fe/cps into dev-daofen-sf # Conflicts: # application/admin/controller/referral/Referral.php # public/assets/js/backend/referral/referral.js commit fa89ef430bdfd82e00606089e36b77baf6f13358 (tag: tag-20181017_140036) Merge: 2b4037c33 488251abc Author: DuanEnJian Date: Wed Oct 17 11:54:54 2018 +0800 Merge branch 'dev-guide-merge' of 192.168.0.31:fe/cps into dev-daofen # Conflicts: # application/admin/controller/referral/Referral.php # public/assets/js/backend/referral/referral.js commit 93aebd1d9b336090f90c2c70c9a78a77c663aba7 Author: yunfeng ke Date: Wed Oct 17 11:30:08 2018 +0800 search end commit 488251abcfe8698ee83573035193579068e48e4c Author: DuanEnJian Date: Wed Oct 17 11:03:51 2018 +0800 修改推广链接禁用问题 commit 0e71ba26fd0f7ea07769ab9f92107554cf08e836 Author: DuanEnJian Date: Wed Oct 17 10:37:26 2018 +0800 修改推广链接禁用问题 commit 77ec298a14e67aa421a348be107c28e1d9a45f82 Author: DuanEnJian Date: Wed Oct 17 10:31:48 2018 +0800 修改倒粉域名去重问题 commit 6b06434e0e2cc297d0fc1fab98faf13202fd109f Author: DuanEnJian Date: Wed Oct 17 10:18:31 2018 +0800 修改倒粉二维码显示问题 commit ffeddc1c40608218ae0953158aa64432136c21a2 Author: DuanEnJian Date: Wed Oct 17 09:40:33 2018 +0800 修改倒粉二维码显示问题 commit f98ab23685738f3e5d159488c8850a9d22e0a5ce Author: DuanEnJian Date: Wed Oct 17 08:15:04 2018 +0800 修改倒粉域名添加关联关系提示问题 commit d829d2f28128fa82c59e173f4e8336de0e09a6e5 Author: DuanEnJian Date: Wed Oct 17 07:58:22 2018 +0800 修改搜索问题 commit a8c7bf3d304d20c31c789904b1d51bdb5c61af70 Author: DuanEnJian Date: Wed Oct 17 07:22:11 2018 +0800 修改单次添加倒粉域名条数不能超过50条 commit ce4c54fe042abd6f40a73fdaa9be16c164093bc3 Author: DuanEnJian Date: Wed Oct 17 07:17:28 2018 +0800 域名ID显示问题 commit d63a11e58d5f5126fa7e86eab9aae6b502ace0f2 Author: DuanEnJian Date: Wed Oct 17 06:47:30 2018 +0800 推广链接推送问题 commit 14ff0893d74edc053c46f9080d3e872b354ced35 Author: DuanEnJian Date: Wed Oct 17 06:44:46 2018 +0800 推广链接推送问题 commit 6bbe70987d395804cd77bc7e0ea808284e9c0afa Author: DuanEnJian Date: Wed Oct 17 06:13:26 2018 +0800 推广链接推送问题 commit a3607396830d348ad2ab4424ed04f79322bc923f (tag: tag-20181017_070234) Merge: 245fb3daf 2b4037c33 Author: licc <45360682@qq.com> Date: Wed Oct 17 05:50:39 2018 +0800 Merge branch 'dev-book-limit' of http://192.168.0.31/fe/cps into mastershafa commit bd57466a4a6c149eb355e6f2b8294045a70b1a6b Author: DuanEnJian Date: Wed Oct 17 05:41:26 2018 +0800 推广链接推送问题 commit df10c904e95ca1358ccdf8d96c4d88db76f2c868 Author: DuanEnJian Date: Wed Oct 17 05:31:05 2018 +0800 推广链接推送问题 commit 32e212de3151dd4c89f95ff9a59ede13d680aeef Author: DuanEnJian Date: Wed Oct 17 05:18:30 2018 +0800 推广链接推送问题 commit 4f7abc161b9e67fa686d91f2a4d9f643f8fd2e36 Author: DuanEnJian Date: Wed Oct 17 05:09:46 2018 +0800 阅读记录报错问题 commit 2b4037c336e53ff2fd3b96b0b3b67bcefcaf62d9 (tag: tag-20181017_054850) Author: licc <45360682@qq.com> Date: Wed Oct 17 04:33:19 2018 +0800 test commit 216c6d634d4b1ffa82bbb835b9e7cd88f99c1f6f Author: licc <45360682@qq.com> Date: Wed Oct 17 04:30:46 2018 +0800 test commit f0d967a86caf9f5882a9e49c696bdb861eb19219 Author: DuanEnJian Date: Wed Oct 17 04:25:06 2018 +0800 阅读记录报错问题 commit 721110320482d97fde833a0c764166cd1fc1e5b1 Author: DuanEnJian Date: Wed Oct 17 03:58:58 2018 +0800 阅读记录报错问题 commit aa0ec998121067972c76e0c5bb235eb29ce87dd8 Author: DuanEnJian Date: Wed Oct 17 03:49:30 2018 +0800 阅读记录报错问题 commit 772c2a1a377c1a6e3fd6712f1b04af3dc281ff92 Author: DuanEnJian Date: Wed Oct 17 03:38:56 2018 +0800 修改倒粉域名关联关系添加查询channelID问题 commit a83e6ff342cb61f9e1fefc6744e07e9a29ec51ce Author: licc <45360682@qq.com> Date: Wed Oct 17 03:32:47 2018 +0800 限制用户id 1以上 commit da41f9a6c07428fe97a2a829fc98c3d96178c8a8 Author: DuanEnJian Date: Wed Oct 17 03:27:03 2018 +0800 修改倒粉域名关联关系添加查询channelID问题 commit 24e39593b4f292e51c209cc4c9c753e3ed90bdbe Author: DuanEnJian Date: Wed Oct 17 03:19:42 2018 +0800 修改倒粉域名关联关系添加查询channelID问题 commit 9bb853a955e4b67cbc22b716b70d9d5990389563 Author: DuanEnJian Date: Wed Oct 17 03:11:22 2018 +0800 修改推广链接删除展示问题 commit a85782d12f5fbbc71252f29890c114949874ef4d Author: DuanEnJian Date: Wed Oct 17 03:04:35 2018 +0800 修改推广链接删除展示问题 commit 2447206599f07a0b517c4f47d5a81cad4fac4be1 Author: DuanEnJian Date: Wed Oct 17 02:57:11 2018 +0800 修改短链关闭问题 commit f15cdd4f497e1ca2436b1133488c6644c4ffa8d9 Author: DuanEnJian Date: Wed Oct 17 02:53:42 2018 +0800 删除多余时间 commit 83f3fd32c8f49cdedb71236ff38f133d9c815a4a Author: licc <45360682@qq.com> Date: Wed Oct 17 02:31:47 2018 +0800 去掉按时间范围搜索 commit 1949c89436096f0b875174b7e0636d583987d777 Author: DuanEnJian Date: Wed Oct 17 02:19:18 2018 +0800 落地页必填项修改 commit 723b55efa527764d3dd7f4a0783d771b5b792340 Author: DuanEnJian Date: Wed Oct 17 01:59:48 2018 +0800 修改编辑倒粉域名,不更新,更新时间问题 commit be3400766f68e27a83dc9699644eac918846f9c4 Author: DuanEnJian Date: Wed Oct 17 01:49:22 2018 +0800 修改多个排序字段,数据重复问题 commit 0737ce7025bd9e41d7472ebcf2784cd8f3413cda Author: licc <45360682@qq.com> Date: Wed Oct 17 01:43:12 2018 +0800 注释 commit 8bbe8b90fbbd7ca3b7a6f442c6efd96646699fb1 Author: licc <45360682@qq.com> Date: Wed Oct 17 01:29:16 2018 +0800 限制书籍逻辑修改 commit 39f74866beb25a6590a846fd3a28995d1968288e Author: licc <45360682@qq.com> Date: Wed Oct 17 01:07:03 2018 +0800 限制书籍逻辑修改 commit bfda548c3074073727bdab5dd4fb8bca4cc858fd Author: licc <45360682@qq.com> Date: Wed Oct 17 01:04:54 2018 +0800 限制书籍逻辑修改 commit 7bf168b27c651eb6c3f3ef200019b67e8481831f Author: DuanEnJian Date: Wed Oct 17 00:53:45 2018 +0800 修改推广链接落地页显示问题 commit 9b4fab951b9b680da9a06e99ffff9265a136277a Author: DuanEnJian Date: Wed Oct 17 00:42:02 2018 +0800 添加用户关注状态API commit 55a5b167662870d1d6d9acb581a9905891a9381c Author: licc <45360682@qq.com> Date: Wed Oct 17 00:26:09 2018 +0800 channel_id commit 2eeb7b823db81885ae37ccd7d7ae470a1dc17ff9 Author: DuanEnJian Date: Tue Oct 16 23:58:30 2018 +0800 添加用户关注状态API commit bd49c0c57cbdca0d46dffb008277e998d84db984 Author: DuanEnJian Date: Tue Oct 16 23:43:04 2018 +0800 修改阅读记录问题 commit b8939fe8498b41fcbf5df13b48492a62da3681b3 Author: DuanEnJian Date: Tue Oct 16 22:58:47 2018 +0800 倒粉域名编辑时唯一性检查 commit cdbe8c565024b9463bfd5edebff21de74973799a Author: licc <45360682@qq.com> Date: Tue Oct 16 22:35:52 2018 +0800 添加推广链接 commit 43937486dd1a27195032fcb941025c4b97b4feb9 Author: 丁海波 Date: Tue Oct 16 22:28:06 2018 +0800 height:auto; commit f71b780d95b5fab5469dffbb78d02dc892146579 Author: DuanEnJian Date: Tue Oct 16 21:52:19 2018 +0800 修改倒粉域名状态为关闭时处理逻辑 commit aca6e4689bf4b5d77cd608a12a3216add1c051da Author: DuanEnJian Date: Tue Oct 16 21:29:14 2018 +0800 修改倒粉域名状态为关闭时处理逻辑 commit 1486733a9b15afe48f779b9bb230ebc479734a7b Author: DuanEnJian Date: Tue Oct 16 21:16:39 2018 +0800 修改推广链接生成落地页时的落地页章节数校验 commit de1d6d9e10e097f4db128a907ab7d90a61fa5fe3 Author: licc <45360682@qq.com> Date: Tue Oct 16 21:16:17 2018 +0800 js空格 commit 2080b8a401ab3ac8abb849669723f428cef35acc Author: DuanEnJian Date: Tue Oct 16 21:03:56 2018 +0800 修复关闭短链OR倒粉域名时,渠道没有时,关闭渠道开关 commit be01ba196538acc9872b7bc9b34af62f4a4c397c Author: 丁海波 Date: Tue Oct 16 20:57:07 2018 +0800 去空格 commit e99c2b2b6327341a9817accb94a1f7402adfb39a Author: licc <45360682@qq.com> Date: Tue Oct 16 20:53:43 2018 +0800 js空格 commit 8296ef5567d094daaa63f8c2984e14ecd6d9fd3d Author: licc <45360682@qq.com> Date: Tue Oct 16 20:01:21 2018 +0800 js小修改 commit ec399253fac3f3d56761300c891dc565a83c5b34 Author: licc <45360682@qq.com> Date: Tue Oct 16 19:44:04 2018 +0800 推广链接后台展示修改 commit 8ce869175f58911b392a0a6cc7a1d739b166714a Author: licc <45360682@qq.com> Date: Tue Oct 16 19:38:56 2018 +0800 推广链接后台展示修改 commit c63f9dbea3e1693ad9335ac0c87a37ee36d5243e Merge: 1621f4d5e 9d202ab1f Author: licc <45360682@qq.com> Date: Tue Oct 16 19:28:05 2018 +0800 Merge remote-tracking branch 'origin/dev-book-limit' into dev-book-limit commit 1621f4d5e0397f7a301528288b946879567ddbdc Author: licc <45360682@qq.com> Date: Tue Oct 16 19:27:58 2018 +0800 推广链接后台展示修改 commit 9d202ab1fb0e2f168f0667d077dff307681baf49 Author: 丁海波 Date: Tue Oct 16 18:27:32 2018 +0800 display:inline-block; commit 631ae1bd79c4e202dd1d9a8bbf7d555c48e07811 Author: licc <45360682@qq.com> Date: Tue Oct 16 18:19:11 2018 +0800 推广链接后台展示修改 commit 4e16f350d2462a1d120c37465c19023ebe745305 Author: licc <45360682@qq.com> Date: Tue Oct 16 18:13:35 2018 +0800 推广链接后台展示修改 commit 2124b7a947814a7a4c755771a4ee4540962039e9 Author: yunfeng ke Date: Tue Oct 16 18:06:13 2018 +0800 ke search commit 3b62d3d7fd049ee02d83dd53138edfe737dfa1dc Author: DuanEnJian Date: Tue Oct 16 17:42:45 2018 +0800 删除渠道倒粉域名缓存 commit 1bbf8f4a8f3e0b2b1fc1e0af6983a170aee6e05b Author: 丁海波 Date: Tue Oct 16 17:41:23 2018 +0800 正则匹配判断 commit 903cf1d7fea47fe6f36254b403e05cb097dc2891 Author: 丁海波 Date: Tue Oct 16 16:58:16 2018 +0800 100行 2000字 commit 9d68ce6606edf0e29a8f05e440273d686730a04f Author: licc <45360682@qq.com> Date: Tue Oct 16 16:19:36 2018 +0800 书籍limit commit 7aeffdae02a704f5bafc858aae295701dffe9205 Author: DuanEnJian Date: Tue Oct 16 14:01:42 2018 +0800 删除渠道倒粉域名缓存 commit ebcfce6300f113c39d9a92fa3e9a03726847369f Author: licc <45360682@qq.com> Date: Tue Oct 16 09:59:41 2018 +0800 书籍limit commit 62f51d57eec5f30dca4eac28f262b94c4cb5fe3d Author: 丁海波 Date: Mon Oct 15 20:27:47 2018 +0800 微信管理 菜单管理 commit 245fb3dafd3b6ae89244d0f47ebd06c808586d53 (tag: tag-20181015_202212) Merge: 0f4c01fd7 4c15f67c0 Author: 李天时 Date: Mon Oct 15 20:20:07 2018 +0800 Merge branch 'dev-vip-login-fix' of http://192.168.0.31/fe/cps into mastershafa commit 4c15f67c06a7785ba0dda36a21c2b46fd4a779a6 (tag: tag-20181015_202620) Author: 李天时 Date: Mon Oct 15 20:13:13 2018 +0800 fix超管订单统计不到数据的bug commit 35e417820061c7d55abe3f20a2db365767d03137 Merge: f32bb06f5 3aa7e10f6 Author: DuanEnJian Date: Mon Oct 15 18:53:03 2018 +0800 Merge branch 'dev-guide-domain-tc' of 192.168.0.31:fe/cps into dev-guide-merge # Conflicts: # application/admin/controller/auth/Agent.php # application/admin/controller/auth/Channel.php # application/common/model/Admin.php # application/common/model/ManageCover.php commit 0f4c01fd7b01406c5af82b2b3cb74736ebb8f2f4 (tag: tag-20181015_174319) Merge: 0bcbb636a f32bb06f5 Author: 李天时 Date: Mon Oct 15 17:36:42 2018 +0800 Merge branch 'dev-vip-commit-2' of http://192.168.0.31/fe/cps into mastershafa commit fa1da9d18066dcc1905b99a821f88ca13cd6a138 Author: yunfeng ke Date: Mon Oct 15 16:43:11 2018 +0800 Config to ConfigAs commit f32bb06f5372ac2ee74372f7573341aeabf0970a (tag: tag-20181015_174826) Author: 李天时 Date: Mon Oct 15 16:30:24 2018 +0800 非vip和vip运营用户也可以在非url_root配置域名下正常访问。 commit a13635a3c6bfcb0c80ea50d363c10e58124dc51b Author: DuanEnJian Date: Mon Oct 15 16:16:07 2018 +0800 前端举报页面修改 commit 98c603c2baf1bc256ad29f66ed6bad673861415b Author: DuanEnJian Date: Mon Oct 15 12:01:59 2018 +0800 恢复默认菜单更新数据库 commit 0bcbb636aad15e402b103a2fb7cfc0adf7f281d3 (tag: tag-20181013_152509) Merge: a6cd05359 ad657fd45 Author: 李天时 Date: Sat Oct 13 14:50:42 2018 +0800 Merge branch 'dev-vip-commit-2' of http://192.168.0.31/fe/cps into mastershafa commit 73bd23f86c3c80664ab90bdff01893c0c7ef5ebf Author: DuanEnJian Date: Sat Oct 13 13:10:52 2018 +0800 修改用户状态权限管理 commit ad657fd45932b2b29867522d57c5a29f6bd4b408 (tag: tag-20181013_151450) Merge: 58f709ec9 74a5af642 Author: 李天时 Date: Sat Oct 13 10:55:14 2018 +0800 Merge branch 'dev-vip-commit' of http://192.168.0.31/fe/cps into dev-vip-commit-2 commit d81c3d6c13dc71ac5a35f8bd4218a7caaed32c7c Author: DuanEnJian Date: Fri Oct 12 20:29:52 2018 +0800 添加禁用用户功能,Log测试 commit 8d22d75b05b6544d4e0461da1df6090cd8a34514 Author: DuanEnJian Date: Fri Oct 12 20:24:59 2018 +0800 添加禁用用户功能,Log测试 commit 2779849f6fde766350cbdeb71930b6d1be2aa61e Author: DuanEnJian Date: Fri Oct 12 20:01:54 2018 +0800 添加禁用用户功能,Log测试 commit da15e1294b70fbf00ab651b5f84b652da590c766 Author: DuanEnJian Date: Fri Oct 12 19:56:07 2018 +0800 添加禁用用户功能,Log测试 commit 1100a26a6ff89cd097f305d6c378f09c47be5ed1 Author: DuanEnJian Date: Fri Oct 12 19:54:30 2018 +0800 添加禁用用户功能,Log测试 commit 9105320a63159343c91d9335c00f55257e51bbc6 Author: DuanEnJian Date: Fri Oct 12 19:51:56 2018 +0800 添加禁用用户功能,Log测试 commit 6ee5821c226282b2c51300ea386e557645e40449 Author: DuanEnJian Date: Fri Oct 12 19:44:20 2018 +0800 添加禁用用户功能 commit 18d8799271944c2d74c7d9b18ea61d1cb134909c Author: DuanEnJian Date: Fri Oct 12 19:28:14 2018 +0800 添加禁用用户功能 commit 74a5af642c3dbe86254e5690a602ae4946054bf8 Author: haoxiaofeng Date: Fri Oct 12 17:58:55 2018 +0800 暂存 commit a7ec1f537772b523d04109d17693c5c452b82f82 Author: haoxiaofeng Date: Fri Oct 12 16:46:18 2018 +0800 暂存 commit 557a39c7f117bb342f9c395c316c79439f49fe04 Author: haoxiaofeng Date: Fri Oct 12 16:41:52 2018 +0800 提现成功跳转 commit a60b72fdcb44eb4ce5badb29adf1a148cafe9981 Author: DuanEnJian Date: Fri Oct 12 16:37:23 2018 +0800 修改用户信息 commit c0ed561a80f6991d792b483d5bcd4dccb623367a Author: haoxiaofeng Date: Fri Oct 12 16:15:15 2018 +0800 批量提现成功处理 commit 38cd2300aa09aebd4697b5260bb308b66632242f Author: DuanEnJian Date: Fri Oct 12 15:55:20 2018 +0800 修改用户信息 commit e98df8ebeb8539c7ba51815cd23c01c9f0950b6e Author: haoxiaofeng Date: Fri Oct 12 15:25:07 2018 +0800 提现成功处理 commit 23da8bb551e71c1979846389c8e6598ec15c88af Author: DuanEnJian Date: Fri Oct 12 14:49:32 2018 +0800 修改签到 commit ba8c8c79849efa5bf2f79445c906fe04221a01e2 Merge: 0a5b331e7 49a610969 Author: DuanEnJian Date: Fri Oct 12 14:26:47 2018 +0800 Merge remote-tracking branch 'origin/dev-optimize' into dev-optimize commit 0a5b331e78d4c5a36d6c078b46760347f4122e56 Author: DuanEnJian Date: Fri Oct 12 14:26:40 2018 +0800 修改签到 commit 49a610969dbbf423a7304b6b80573b15d755db76 Author: 丁海波 Date: Fri Oct 12 12:03:00 2018 +0800 type1 commit 6105467262c78d772d3001206a80402e30ea950f Author: 丁海波 Date: Fri Oct 12 12:00:27 2018 +0800 菜单管理点击默认事件 commit 3a7d98e939d5e7c66c242f770a37d2346f059b8f Author: 丁海波 Date: Fri Oct 12 10:59:15 2018 +0800 radio input commit 065256c0e5877294725f6a2764466d9f7b6c188b Author: 丁海波 Date: Fri Oct 12 10:45:44 2018 +0800 tab commit a6cd0535937051d929d5950592bfce24dca1d2c5 (tag: tag-20181012_121816) Merge: 58f709ec9 3e8ff49b7 Author: php-王凡昌 Date: Thu Oct 11 11:41:53 2018 +0800 Merge branch 'dev-pay-callback' of 192.168.0.31:fe/cps into dev-pay-callback-merge commit 58f709ec92468929bcd82f1d186511023e9aea1e (tag: tag-20181010_232007) Author: DuanEnJian Date: Wed Oct 10 21:22:36 2018 +0800 添加代理商ID白名单 commit 83d8b3e02bfab5249795b4184e5836574c804c15 Author: DuanEnJian Date: Wed Oct 10 19:40:27 2018 +0800 添加代理商ID白名单 commit 4e0bcbd8f7298b6315a20e084ec2e818f0bb70c6 Author: DuanEnJian Date: Wed Oct 10 19:19:39 2018 +0800 添加代理商ID白名单 commit b64efdafff50b33cdbd9ff7d7d9d2a36b7edf553 Author: DuanEnJian Date: Wed Oct 10 18:50:29 2018 +0800 添加代理商ID白名单 commit 337d83a40fc6ce0b1ad2e75f1d6dfdfd47a18108 Author: DuanEnJian Date: Wed Oct 10 18:49:38 2018 +0800 添加代理商ID白名单 commit e9c06ef36b2f90eaa2f229210fb6b05ca6d2b37d Author: DuanEnJian Date: Wed Oct 10 17:49:11 2018 +0800 添加已签到推荐书库 commit 238c0badb672cf5eeece158cb04f00981b1aa967 (tag: tag-20181010_165800) Author: php-王凡昌 Date: Wed Oct 10 16:48:59 2018 +0800 修复自动恢复搜索书籍匹配数组下标 commit d8bc104ed4c7944c9e3f3dedd0e8205fe82e2b99 Author: DuanEnJian Date: Wed Oct 10 16:28:25 2018 +0800 修改微信菜单 commit 51bf5a2dfdf0e556ba257923e40f61fafe2565be Author: DuanEnJian Date: Wed Oct 10 13:57:15 2018 +0800 修改页面授权跳转问题 commit c9ba6365acfb287b182c3ca08db1d76f0e551d80 (tag: tag-20181010_101340) Author: DuanEnJian Date: Tue Oct 9 19:13:50 2018 +0800 修改页面授权跳转问题 commit c860fc8b63fd0c2d7a9ff24635780db382135f51 Author: DuanEnJian Date: Tue Oct 9 19:06:42 2018 +0800 修改页面授权跳转问题 commit 450646215350be9854dc4e0ee9c5a93d45282299 Author: DuanEnJian Date: Tue Oct 9 18:00:55 2018 +0800 修改API授权接口 commit 6977891c1a6082e2aa753ef0e618b6a6fe241723 Author: DuanEnJian Date: Tue Oct 9 17:51:19 2018 +0800 修改Custom脚本 commit 3a4624ea33957e834921d5a78e30611acd7611df Author: DuanEnJian Date: Tue Oct 9 17:24:33 2018 +0800 修改Custom脚本 commit 879294bdb85cdab4e4672977ba2ea5b70521d8e2 Author: DuanEnJian Date: Tue Oct 9 17:23:20 2018 +0800 修改Custom脚本 commit eafd6b4a9c9b181b57ca03be65b238d5d63b9173 Author: DuanEnJian Date: Tue Oct 9 17:17:47 2018 +0800 修改Custom脚本 commit 713586f568b905861290d54813fb2db22d3b678d Author: DuanEnJian Date: Tue Oct 9 17:17:08 2018 +0800 修改Custom脚本 commit 3e8ff49b7f2ad6feb4eb43d81f63445655bce8a7 Author: DuanEnJian Date: Tue Oct 9 16:17:02 2018 +0800 pay域名加callback commit b1d98defaf11a53d0f3e67e77e16ca4bdd6c58d4 Author: DuanEnJian Date: Tue Oct 9 16:15:32 2018 +0800 pay域名加callback commit c7dfecf760ede2becef0ff41ff343882472ad05a Author: DuanEnJian Date: Tue Oct 9 16:11:18 2018 +0800 pay域名加callback commit c949da75535f8f9ac96f339e216b104045547b01 Author: DuanEnJian Date: Tue Oct 9 15:59:11 2018 +0800 pay域名加callback commit 5a540361b7281310950a5093f21dfd5c58371b03 Author: DuanEnJian Date: Tue Oct 9 13:56:50 2018 +0800 刷新Custom的json数据,只保留一条 commit 256a6c38a23b1ff74b0e0c007efac160b63467e7 Author: DuanEnJian Date: Tue Oct 9 13:14:19 2018 +0800 刷新Custom的json数据,只保留一条 commit c40036eab76b7aaa7ed83908166e444cae1429fb Author: DuanEnJian Date: Tue Oct 9 10:59:53 2018 +0800 添加编辑活动,免费书币有效期为必填项 commit 5096925569223a579bb5faa8473521365346496b Author: haoxiaofeng Date: Tue Oct 9 10:54:07 2018 +0800 暂存 commit af9cbaa4e76c2a4a7a2f1a1d2600236325319add Author: DuanEnJian Date: Tue Oct 9 10:28:01 2018 +0800 清除书籍内容缓存,只有运营账号生效 commit 4cfe6e954fe3226237275fd396375d111ed4645b Merge: 0e8c1867e 9e602a685 Author: DuanEnJian Date: Mon Oct 8 20:48:57 2018 +0800 Merge remote-tracking branch 'origin/dev-optimize' into dev-optimize commit 0e8c1867e7b1a24b7c83f4c8942e08d3d281125e Author: DuanEnJian Date: Mon Oct 8 20:48:39 2018 +0800 清除书籍内容缓存 commit 9e602a685d6d8c6b07ddd5ed1ca058726c10df0f Author: 丁海波 Date: Mon Oct 8 19:34:55 2018 +0800 你妹 commit bac341e7c010693aaab4404b0c47b5e4cc420616 Author: 丁海波 Date: Mon Oct 8 19:26:39 2018 +0800 背景image commit 1f1493bc0198399b27c9f8db2d21e3ab694171c9 Author: 丁海波 Date: Mon Oct 8 19:07:15 2018 +0800 <\/span> commit 2ba421d90245d66cfeba94c491ffbcc60bb3f9dd Author: 丁海波 Date: Mon Oct 8 18:58:01 2018 +0800 this.height commit ba96a57980fc80daf9d4c2699ad4edad153b95cd Author: 丁海波 Date: Mon Oct 8 18:55:17 2018 +0800 auto 50% commit 0c965f5158958005f0b7ae1dd848f68b932100cc Author: 丁海波 Date: Mon Oct 8 18:54:29 2018 +0800 this.height commit 714a7e6ee314242547910a892276711042e14d9e Author: 丁海波 Date: Mon Oct 8 18:10:49 2018 +0800 bodys_background commit 290c1cf2037468a3e2c508fd75dc5bd80653c2c3 Author: 丁海波 Date: Mon Oct 8 18:09:45 2018 +0800 {{this.imgurl}} commit 3a6eb9bd0feb15b722d400c512f717e18ebf23c4 Author: haoxiaofeng Date: Mon Oct 8 17:59:33 2018 +0800 暂存 commit d662ac2f6df6cc741096065ccf95e8b760c12e0f Author: DuanEnJian Date: Mon Oct 8 15:43:18 2018 +0800 小说中心,生成推广图片,返回图片链接添加宽高 commit 0b7f5c3b9199475c036730aac23ed63aeb2b18a4 Author: DuanEnJian Date: Mon Oct 8 14:47:03 2018 +0800 添加生成推广链接背景图模式 commit ff2b3c08f8fa6546e2057b9d19d66bffd387547d Merge: 7cabfeccc d340667d0 Author: 李天时 Date: Mon Oct 8 11:51:16 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-commit' into dev-vip-commit commit d340667d015d973b75844f44ee660dd1c6c08219 Author: haoxiaofeng Date: Mon Oct 8 11:17:46 2018 +0800 暂存 commit 7cabfecccc63d0c751411094d652de73855bb0ec Author: 李天时 Date: Mon Oct 8 11:06:31 2018 +0800 vip统计所有渠道商，部分是否绑定微信；解绑渠道商需要将vip运营也解绑 commit 47596ec69793adb0b1af24749fd7d17c0104d88f Author: haoxiaofeng Date: Mon Oct 8 10:41:45 2018 +0800 未体现金额倒序 commit c1b7d94c9fe18cd4d4fc7310be8c8ebd46a1327e Merge: 809742a58 41fa94bb3 Author: DuanEnJian Date: Mon Oct 8 10:38:08 2018 +0800 merge dev-xxe分支 修改微信支付xxe漏洞问题 commit baab70e561daa83e2b8c4fb466f900b2715aa6b1 Author: haoxiaofeng Date: Sun Oct 7 18:40:43 2018 +0800 暂存 commit c0a9471db8d5c65007570ab65dd4cecaf53ee02f Author: haoxiaofeng Date: Sun Oct 7 17:07:56 2018 +0800 暂存 commit cf7f4b7c8e1e4e698ea7a43f5239449869de59cc Author: haoxiaofeng Date: Sun Oct 7 15:47:06 2018 +0800 暂存 commit d59705699c792548217649afad7fea0d81530264 Author: haoxiaofeng Date: Sun Oct 7 15:32:44 2018 +0800 暂存 commit 6bc2ba3d02a42662a03e0660adbd5b0f172ba869 Author: haoxiaofeng Date: Sun Oct 7 14:25:13 2018 +0800 puv时间限制 commit 72b3aca8257ae1b0c0827325b5e3a2a9b4acd458 Author: haoxiaofeng Date: Sun Oct 7 10:42:07 2018 +0800 暂存 commit 809742a58a105be53964631925915c19b1418ebd Author: DuanEnJian Date: Sat Oct 6 16:48:17 2018 +0800 修改授权问题 commit ed6973e3d2f0125be2446e9e1afa03af7a70ea7b Author: DuanEnJian Date: Sat Oct 6 16:47:07 2018 +0800 修改授权问题 commit c5ee3fdb9e295f5890ff3d7115568757a5286e41 Author: 丁海波 Date: Sat Oct 6 14:10:16 2018 +0800 智能推送图片更换 commit ac58dd16a0693c5022f2c85cb6f940df6cda457e Author: 丁海波 Date: Sat Oct 6 11:21:46 2018 +0800 袋鼠智能推送图片 commit b6c93b25f64fc3b69c9987444a28e7e52889101a Merge: 245fca15c a005cd244 Author: licc <45360682@qq.com> Date: Thu Oct 4 12:01:47 2018 +0800 Merge remote-tracking branch 'origin/dev-custom-change' into dev-custom-change commit 245fca15c7aea1acc9815e3ad3ef50edffa823d0 Author: licc <45360682@qq.com> Date: Thu Oct 4 12:01:41 2018 +0800 微信回复修改 commit a005cd244ef70d8e4a124908d8e91234aafde027 Merge: d1f0b855b 2a485365b Author: DuanEnJian Date: Thu Oct 4 11:27:46 2018 +0800 Merge remote-tracking branch 'origin/dev-custom-change' into dev-custom-change commit d1f0b855bfbf9a0502717534ebe38d0aa84d8e4f Author: DuanEnJian Date: Thu Oct 4 11:27:41 2018 +0800 去掉图文回复添加多条按钮 commit 2a485365b5b0fa4605b5b8b6d360237c4e57b757 Merge: 34b96f3da 010f9ea50 Author: licc <45360682@qq.com> Date: Thu Oct 4 11:10:14 2018 +0800 Merge remote-tracking branch 'origin/dev-custom-change' into dev-custom-change commit 34b96f3da64c91d906626ce8944d91c0ec32ea74 Author: licc <45360682@qq.com> Date: Thu Oct 4 11:10:10 2018 +0800 测试发送客服消息，如果为多条，只发送一条 commit 010f9ea50d1f7a9f02234f7368e64738ba4bb941 Author: DuanEnJian Date: Thu Oct 4 11:01:15 2018 +0800 去掉图文回复添加多条按钮 commit f59b568b1d204bdcbcbf44f3e210f4562018902d Author: licc <45360682@qq.com> Date: Thu Oct 4 10:36:27 2018 +0800 活动充值免费书币有效期修改 commit a2cd4f635b620a4fbab1a3e271ebc5b3bc2aaa5f Author: 李天时 Date: Sun Sep 30 18:05:25 2018 +0800 vip统计只展示绑定公众号的渠道商 commit a6d9d101298db0dafd7c4577189064499c5514bd Author: 李天时 Date: Sun Sep 30 17:47:28 2018 +0800 vip统计只展示绑定公众号的渠道商 commit fe315e9a40983403cad3152e336711e1e067c02e Author: 李天时 Date: Sun Sep 30 16:08:03 2018 +0800 vip统计只展示绑定公众号的渠道商 commit bace5d33c395db6addc077abe907f5b1716b6765 Author: 李天时 Date: Sun Sep 30 15:05:46 2018 +0800 cps-admin账号创建一个VIP账号后，在用户管理中不显示 commit c5b1610adfc5068a56be311307fab84a263c6186 Author: 李天时 Date: Sun Sep 30 14:49:34 2018 +0800 解决账号管理公众号名称模糊查询的问题 commit 4fbe18169027c1fc88e657758ccebef53601b81b Author: 李天时 Date: Sun Sep 30 14:26:27 2018 +0800 vip与其他角色使用不同的域名，不进行强制跳转 commit 3d7a6996c34ec360c3775719383f55dcf7a06f5f Author: 李天时 Date: Sat Sep 29 16:31:43 2018 +0800 修改充值信息，vip与其他权限分开域名 commit 4cdc9b02c5d0fd321ee59ef28f2e0b00e51562b1 Author: 李天时 Date: Sat Sep 29 15:30:27 2018 +0800 修改充值信息，vip与其他权限分开域名 commit 9885f4971faebf0143248f3c960b642a79961184 Author: 李天时 Date: Sat Sep 29 15:18:40 2018 +0800 修改充值信息，今日新增php处理小数的问题 commit 8498ad0083871d06e8a8f9563305b0deff918e32 Author: 李天时 Date: Sat Sep 29 14:50:27 2018 +0800 修改充值信息，今日新增php处理小数的问题 commit 7b774893bfa7aa3b0423516956500ff4c584d8b7 Merge: e225ac6d1 6f8ec3440 Author: 李天时 Date: Sat Sep 29 14:08:44 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-commit' into dev-vip-commit commit e225ac6d110e3867b35cca39e5e6e0df944188f7 Author: 李天时 Date: Sat Sep 29 14:08:33 2018 +0800 修改充值信息代理商收益的问题 commit 6eb40c6bb8ae0c378b647bfd182aa6448a087e61 (tag: tag-20180929_141023) Author: licc <45360682@qq.com> Date: Fri Sep 28 20:50:21 2018 +0800 打点修改 commit 6f8ec3440c42a8cc35b06398f233bc46da757af4 Author: haoxiaofeng Date: Fri Sep 28 18:21:59 2018 +0800 用户查询过滤 commit 165b06e831f3fcf8580e1af17b27000c837effa9 Author: licc <45360682@qq.com> Date: Fri Sep 28 17:21:07 2018 +0800 导粉页文案修改 commit b46755de60ee5612ed18bc20589a3027ed125eaa Author: licc <45360682@qq.com> Date: Fri Sep 28 17:17:32 2018 +0800 导粉页文案修改 commit 6173e569e7bdee00871bd5aa6915dcd1790118b1 Author: haoxiaofeng Date: Fri Sep 28 16:54:19 2018 +0800 公告返回列表索引不连续导致显示问题 commit ed79d29f1934cc0f482efb91314b6ebe1dba3ef2 Author: 李天时 Date: Fri Sep 28 16:21:03 2018 +0800 修改充值信息代理商收益的问题 commit ffd67d5d5b9c9ae92ce7574c29d805923f60b872 Author: 李天时 Date: Fri Sep 28 15:31:34 2018 +0800 修改用户统计页面获取今日充值数据bug commit d91eaea685da881c14f6a34b6f89e0b6a8719ce0 Author: 李天时 Date: Fri Sep 28 14:53:41 2018 +0800 修改用户统计页面获取今日充值数据bug commit fe602b1a3226600a7af48ac2105892f18bc00c4f Merge: 74d243274 8ed8ad079 Author: 李天时 Date: Fri Sep 28 11:32:57 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-commit' into dev-vip-commit commit 74d243274bcb45eea88c546c94629e81be3bf1f5 Author: 李天时 Date: Fri Sep 28 11:32:46 2018 +0800 修改用户统计页面数据为空时候的bug commit 8ed8ad0799f28745a1248b460a6b05b2d672ff2e Author: haoxiaofeng Date: Fri Sep 28 11:25:33 2018 +0800 兼容未授权公众号 commit 032dc99a99e87126ef60aca919620732d6e792e7 Author: 李天时 Date: Fri Sep 28 10:13:58 2018 +0800 修改用户统计页面数据为空时候的bug commit 9b8c23f505741f8686be50b81895fcf285e42eb7 Author: 李天时 Date: Thu Sep 27 19:38:25 2018 +0800 vip只统计名下渠道商的数据，不统计代理商的数据 commit f4d80cc10e0edf1366e4ea937759b39f7a85b363 Author: 李天时 Date: Thu Sep 27 18:02:20 2018 +0800 vip只统计名下渠道商的数据，不统计代理商的数据 commit 08e739039d43827a5ee44022aaf6adefc8ec3e42 Author: 李天时 Date: Thu Sep 27 17:24:46 2018 +0800 vip只统计名下渠道商的数据，不统计代理商的数据 commit d1ac01f555e17ed64b4f62e08a06d85a50e563f3 Author: 李天时 Date: Thu Sep 27 10:45:59 2018 +0800 修改文案 commit 4c458f75167cce40636b8163eb9bd11e571720a3 (tag: tag-20180926_160449, tag: tag-20180926_093541) Author: DuanEnJian Date: Wed Sep 26 09:34:17 2018 +0800 修复渠道缓存没有kl_rate报错问题 commit bf97cb76ba60dffb850adfbd65b60a779bf3411f Author: 李天时 Date: Tue Sep 25 15:56:54 2018 +0800 解决充值信息页面"刷新"按钮ajax回调错误的问题 commit 95ddbf588ed68ea2124719e020ccfd1503e9b1ef Author: DuanEnJian Date: Tue Sep 25 14:13:33 2018 +0800 分割SsdbToMysql脚本SQL语句 commit 702ba800a2758a4a5a650460dd2c251bfd524fd1 Author: 李天时 Date: Fri Sep 21 17:37:43 2018 +0800 解决充值信息页面总充值笔数=普通充值成功订单数+vip充值成功订单数 commit 8e4a66968fd7ca158572783f3c45b47368f98af1 Author: 李天时 Date: Fri Sep 21 17:35:54 2018 +0800 解决充值信息页面总充值笔数=普通充值成功订单数+vip充值成功订单数 commit 65cab4f2df7f3b9fb4f10374230795f6c2856281 Author: 李天时 Date: Fri Sep 21 16:41:45 2018 +0800 解决充值信息页面总充值笔数=普通充值成功订单数+vip充值成功订单数 commit 867701ddacd45264754a0a1730f31ca36ff0366e Author: 李天时 Date: Fri Sep 21 11:12:50 2018 +0800 解决充值信息页面的文案 commit 6be9feb9d9f260e1c3d5d0e0a535135072166db8 Author: 李天时 Date: Fri Sep 21 11:09:22 2018 +0800 解决充值信息页面的文案 commit 7264b8b9e8f6ddf5f277b2bd332b2ad68336106a Author: 李天时 Date: Fri Sep 21 10:57:43 2018 +0800 解决充值信息统计，月份统计总充值笔数为小数的问题 commit 12e10c061f30b0bfa75872fe35b31a5e40bcedf6 Merge: dd6572027 9b6ee6349 Author: 李天时 Date: Fri Sep 21 10:48:36 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-commit' into dev-vip-commit commit dd657202787943ad73441265e9396ed31a2d7b2a Author: 李天时 Date: Fri Sep 21 10:48:21 2018 +0800 解决用户统计数据统计当日数据，从ssdb中获取列表信息 commit 01bfc657018485ea6bba4e943dd006b2cd844635 Author: 李天时 Date: Fri Sep 21 10:41:46 2018 +0800 解决用户统计数据统计当日数据，从ssdb中获取列表信息 commit 9b6ee634965b8b98f9769add1323bb524c54c922 Author: haoxiaofeng Date: Fri Sep 21 10:30:23 2018 +0800 vip提现搜索关闭 commit 32652f3e81636202b992e9e87cdbc04a2ddab4f4 (tag: tag-20180925_115035, tag: tag-20180921_164714) Author: DuanEnJian Date: Thu Sep 20 22:26:09 2018 +0800 修改kl4期BUG commit b7aac3ec0adb45ccc4711a7ca4212623ac1f6264 Author: DuanEnJian Date: Thu Sep 20 22:20:13 2018 +0800 修改kl4期BUG commit 5f1913961bbf9eef56aca40aa8ede1c9898a9960 Author: 李天时 Date: Thu Sep 20 17:16:07 2018 +0800 解决昨日订单统计问题 commit fa6109eb54e09abc990081e00290e1b397e9d383 Merge: 7b7333258 80e50394e Author: 李天时 Date: Thu Sep 20 15:18:38 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-commit' into dev-vip-commit commit 7b73332580717b75c299f067072a98955f31798a Author: 李天时 Date: Thu Sep 20 15:18:27 2018 +0800 解决总订单数为小数的问题 commit 80e50394e6ed3c74750668c6a5f1d156d3365feb Author: haoxiaofeng Date: Wed Sep 19 18:34:07 2018 +0800 暂存 commit 4f81a58ec6bf23c11e731f9db37d242fc1f24a9b Author: haoxiaofeng Date: Wed Sep 19 18:25:35 2018 +0800 修复条数显示 commit a1394325d6b3a6419aefcacc7f1f4a371b85c773 Author: haoxiaofeng Date: Wed Sep 19 18:10:49 2018 +0800 修复查询条件 commit 6bf41e004a04ca6c000860c5ec7d85cf8386fde5 Author: haoxiaofeng Date: Wed Sep 19 17:00:10 2018 +0800 显示修复 commit 5ae66f19d850cef741f2d0fce80eabffe2bc6387 Author: haoxiaofeng Date: Wed Sep 19 15:51:30 2018 +0800 vip首页数据展示修复 commit bacdb0f9ceceba42869caef21ab6cbed8567dc19 Author: 李天时 Date: Wed Sep 19 13:55:56 2018 +0800 vip一期，解决vip域名与其他权限域名跳转的问题 commit a7a2a966a273cf78f72fcc717e1fb6899d2edef9 Author: 李天时 Date: Wed Sep 19 11:52:18 2018 +0800 vip一期，解决vip域名与其他权限域名跳转的问题 commit 0b4a1974139ac53ddc8d900a7843a91919f81b61 Merge: 00dc801ec a624e6448 Author: 李天时 Date: Wed Sep 19 10:37:01 2018 +0800 Merge remote-tracking branch 'origin/dev-vip-commit' into dev-vip-commit commit 00dc801ec60b5ac6e98a0e495cace11e86659bfc Author: 李天时 Date: Wed Sep 19 10:36:22 2018 +0800 vip一期，解决vip域名与其他权限域名跳转的问题 commit a624e644813539fb4b979b644273f8ef21601b5c Author: haoxiaofeng Date: Tue Sep 18 19:30:59 2018 +0800 文案提示修改 commit a16e1aee8661165da1bdfcb6f1e1545b5c874678 Author: haoxiaofeng Date: Tue Sep 18 13:57:14 2018 +0800 文案修改 commit e6c467b162c5160649bfcc793af5f8a720e112ca Merge: 8bfba42fa 6cd8845ec Author: 李天时 Date: Tue Sep 18 11:03:53 2018 +0800 vip合并最新master代码 commit 8bfba42fa67649bad39451c4ee588cd0e2734685 (tag: tag-20180917_171426) Merge: e14f94169 05a08da34 Author: licc <45360682@qq.com> Date: Mon Sep 17 15:31:35 2018 +0800 Merge branch 'dev-little-change-pro' of http://192.168.0.31/fe/cps commit 05a08da34b6bc229793a6aea4fd41107f0fe7c0c Author: DuanEnJian Date: Mon Sep 17 14:38:23 2018 +0800 修改授权问题 commit d8186c2bbca482114a54d4660edb4ab75fede06e Author: DuanEnJian Date: Mon Sep 17 14:15:15 2018 +0800 修改推广链接列表展示问题 commit b7992b7eca02ee5598499063f29ef3f5f4147313 Merge: cb264cc1c 2da8c2e4f Author: DuanEnJian Date: Mon Sep 17 14:03:30 2018 +0800 Merge remote-tracking branch 'origin/dev-little-change-pro' into dev-little-change-pro commit cb264cc1c962aa9c1c6f8ed4d096eee046478dbe Author: DuanEnJian Date: Mon Sep 17 14:03:20 2018 +0800 修改推广链接列表展示问题 commit 2da8c2e4f11bcdd26c8ec92a6c164126255b686b Merge: d9afc01e9 699b79794 Author: 李天时 Date: Mon Sep 17 13:59:29 2018 +0800 Merge remote-tracking branch 'origin/dev-little-change-pro' into dev-little-change-pro commit d9afc01e93010f9129fdced2ff6b919b512b180c Author: 李天时 Date: Mon Sep 17 13:59:17 2018 +0800 解决非admin的超管在编辑渠道商报错的问题 commit 699b79794a1989366e95d4d90e1e15afae917b41 Author: haoxiaofeng Date: Mon Sep 17 13:48:47 2018 +0800 修复超管校验判断 commit 2abd26fa24d064e0c2f02062153ce2461bb39027 Author: 李天时 Date: Mon Sep 17 11:22:23 2018 +0800 解决非admin的超管在"代理商管理"页面查询为空的bug commit 41fa94bb3766698eb7eefe948a29dfbdd4bbe2da Author: php-王凡昌 Date: Fri Sep 14 18:37:13 2018 +0800 修复微信支付xxe安全漏洞 commit 7d3d360c49a60e2e149dadfc75580ceb97a206da Author: 李天时 Date: Fri Sep 14 16:15:32 2018 +0800 管理员修改渠道商账号，渠道开关与超管相关属性分开处理。 commit 5edb16093392a6d463e4f0d7769f140f6a1da965 Author: 李天时 Date: Fri Sep 14 15:44:00 2018 +0800 管理员创建渠道商账号，选择推送开关，但是编辑页面全选了推荐开关。 commit 837cdeca677243d2af61af8003aa029d24031d67 Merge: 919adc884 1a2daadc0 Author: 李天时 Date: Wed Sep 12 19:49:23 2018 +0800 Merge remote-tracking branch 'origin/dev-little-change-pro' into dev-little-change-pro commit 919adc8848044af2c4734afdbe79fba539532414 Author: 李天时 Date: Wed Sep 12 19:49:13 2018 +0800 小说管理--封面管理--添加图片时选择小图，保存后点击编辑进入页面，显示为大图 commit 0520a5761dbe4a3432d1690c25c4946bb65bb6bd Author: 李天时 Date: Wed Sep 12 19:48:35 2018 +0800 用户管理--代理商管理页面，按照“账号、昵称、状态”条件查询; commit 1a2daadc0a9b0000e4719dc5bf00586f3326f415 Author: haoxiaofeng Date: Wed Sep 12 17:11:48 2018 +0800 公告管理员隐藏操作列 commit 4c201715d5e7721ee8401345fe9464c81c8db3d8 Author: licc <45360682@qq.com> Date: Wed Sep 12 14:47:13 2018 +0800 glory书籍redis拉取优化 commit 35f04701a08ef0a77c761e70e98e70ef9dfc6c1e Author: licc <45360682@qq.com> Date: Wed Sep 12 14:37:48 2018 +0800 glory书籍redis拉取优化 commit e14f94169d5cc4fedfd6e1ea36891e1cda6c1bca (tag: tag-20180913_104453, tag: tag-20180912_180322) Author: php-王凡昌 Date: Tue Sep 11 19:20:52 2018 +0800 关闭 “扣量逻辑中，前台用户访问超过2个城市的用户，自动加入用户ID白名单” 功能 commit 90fbe8f70183d1d955d774c963992792188f55a9 Author: php-王凡昌 Date: Tue Sep 11 18:37:01 2018 +0800 推广链接uv过滤改异步 commit fd2ca900e8ae5808b4a5c950bef1386934c9fcd0 Author: DuanEnJian Date: Tue Sep 11 15:25:25 2018 +0800 修改扣量判断渠道扣量比例问题 commit fb50231d9d67d9c51004b73b2daa5d36968673a9 Author: 丁海波 Date: Mon Sep 10 16:46:16 2018 +0800 meishu4 env文件 commit cf2e4c9fd99305b58e9f25408cb227514249136b Author: 丁海波 Date: Mon Sep 10 16:40:31 2018 +0800 前面数据丢了，fuck commit e641b1752630b38ad1b72cd3eeb8052504d772ff Author: 丁海波 Date: Sat Sep 8 18:52:39 2018 +0800 限免需要移出去 commit a60a97f8a53c3c9f6b39bc3ded4a83fd2beda294 Author: 丁海波 Date: Sat Sep 8 18:35:06 2018 +0800 loading icon commit 8f6f4633b65e12d98e6364cd3fe44276ae4b965c Author: 丁海波 Date: Sat Sep 8 18:20:41 2018 +0800 首页微调 commit e0962c1b8c5d9f2dc0a03968ccca5fb8024e3332 Author: 丁海波 Date: Sat Sep 8 18:15:04 2018 +0800 首页开通VIP链接地址 commit c52613348fec204e5d61709cef9e331e20d5ca9f Author: licc <45360682@qq.com> Date: Sat Sep 8 17:52:15 2018 +0800 修改新增客服消息少按钮 commit 118eeed2ecd586bc997f4043f0fc37e3bd3e5a9a Author: 丁海波 Date: Sat Sep 8 16:55:12 2018 +0800 nav commit aa73bcd00b3d97ed99231b0bda66faa10bf5736b Author: 丁海波 Date: Sat Sep 8 14:52:01 2018 +0800 个人中心，阅读页 commit bce98478373c01d6f473597244934d315a60d316 Merge: 1f71886b4 22e219504 Author: licc <45360682@qq.com> Date: Sat Sep 8 14:37:47 2018 +0800 Merge remote-tracking branch 'origin/dev-little-change-pro' into dev-little-change-pro commit 1f71886b4c9afc05a422cae00e51d0a3c4a7bb52 Author: licc <45360682@qq.com> Date: Sat Sep 8 14:37:31 2018 +0800 同步微信服务号关注用户到CPS系统加入模板判断 commit 22e219504541088ce35ff632a2e5ad69368f274e Author: liuensong Date: Sat Sep 8 14:18:01 2018 +0800 bug#0005644 修复 小说管理--书籍列表--编辑--增加大图/小图后，再次点击编辑按钮进入该页面，没有显示已上传的大图/小图 commit cab7f33b57785ed67b1166f6dd8b13a073de31ca Author: licc <45360682@qq.com> Date: Sat Sep 8 11:06:08 2018 +0800 修复微信号监控脚本里平台一直是西瓜的问题 commit 320251313900cdc140ccb18b47eeff1666fe9247 Author: licc <45360682@qq.com> Date: Sat Sep 8 10:46:05 2018 +0800 修复微信号监控脚本里平台一直是西瓜的问题 commit 0eefeeab7fe806e2a423cd5c68fe707eb3ec48e7 Author: 丁海波 Date: Fri Sep 7 21:10:55 2018 +0800 阅读页 commit 7e0c726e0844bdff0d28ebf57f2b79e09d504ffb Author: 丁海波 Date: Fri Sep 7 21:03:37 2018 +0800 阅读页 commit 5945c8559272fb9952aa61927a22c0d3bf846c6f Merge: fb3bf44b3 9ae6d4aac Author: liuensong Date: Fri Sep 7 20:11:38 2018 +0800 Merge branch 'dev-recommand-image' into dev-little-change-pro * dev-recommand-image: 管理员->用户管理->渠道商管理->新增->支持智能推送开关->推送开关全选功能 超级管理员->用户管理->渠道商管理->编辑->支持修改开户人下拉选择->修复旧渠道商数据的开户人禁用状态时保存不成功BUG commit 9ae6d4aaca68d41411a62a9f96f73021e4abe665 Author: liuensong Date: Fri Sep 7 20:10:07 2018 +0800 管理员->用户管理->渠道商管理->新增->支持智能推送开关->推送开关全选功能 commit 8a61d082b4660097eec35d35bbe7279d2490e593 Author: liuensong Date: Fri Sep 7 20:02:28 2018 +0800 超级管理员->用户管理->渠道商管理->编辑->支持修改开户人下拉选择->修复旧渠道商数据的开户人禁用状态时保存不成功BUG commit fb3bf44b3e01b52754dc2cbdd8272f31f988289e Author: php-王凡昌 Date: Fri Sep 7 15:31:09 2018 +0800 恢复丢失内容 commit e9bb2ccf4ba229802b304f4d59e67d7ceb822ba2 Merge: 3442531d9 7c1bacb9e Author: licc <45360682@qq.com> Date: Fri Sep 7 14:17:18 2018 +0800 Merge branch 'dev-recommand-image' of http://192.168.0.31/fe/cps into dev-little-change-pro commit 3442531d92f257e33e2648f55f73fb02d8e400ec Author: licc <45360682@qq.com> Date: Fri Sep 7 14:07:40 2018 +0800 还原回之前的用户是否登录判断逻辑 commit de305d63ec1620f43c6b3a9473f416f29f7f9324 Merge: c4bd94ded 721342513 Author: licc <45360682@qq.com> Date: Fri Sep 7 14:04:42 2018 +0800 Merge branch 'dev-little-changes' of http://192.168.0.31/fe/cps into dev-little-change-pro commit c4bd94ded8dc64226d5407aa708e30cd1ecd5632 Merge: 0f6cf8e89 124519a75 Author: licc <45360682@qq.com> Date: Fri Sep 7 14:00:33 2018 +0800 Merge branch 'dev-notice' of http://192.168.0.31/fe/cps into dev-little-change-pro commit 0f6cf8e89f420e60c4a71ccd3b7ba4a594db99b1 Merge: 2d0caf6c9 c87429638 Author: licc <45360682@qq.com> Date: Fri Sep 7 13:57:12 2018 +0800 Merge branch 'dev-kl4-tc' of http://192.168.0.31/fe/cps into dev-little-change-pro commit 72134251364fd57c5579d84496ad85dd0c470c24 Author: licc <45360682@qq.com> Date: Fri Sep 7 13:44:15 2018 +0800 客服消息和模板消息编辑预览功能 commit 1af3d786e97ec3d616b20166c7659bdccded4209 (tag: tag-20180906_221628) Merge: 2d0caf6c9 a70b6be9c Author: DuanEnJian Date: Thu Sep 6 20:08:37 2018 +0800 Merge branch 'dev-exception' of 192.168.0.31:fe/cps into dev-exception-tc commit 0cd7637f52d8072f7edec6690f5d32f60de3ade6 Author: 丁海波 Date: Thu Sep 6 18:26:36 2018 +0800 搜索 commit 244c50f84f28329bba6aa4509597894a5484b602 Author: 丁海波 Date: Thu Sep 6 18:21:23 2018 +0800 搜索 commit be85824b3693f33ddae0245bf05be3e773cd49b1 Author: 丁海波 Date: Thu Sep 6 18:14:31 2018 +0800 个人中心 commit 3e2da7618a0c94bf5c0d1f50131a946525468135 Author: 丁海波 Date: Thu Sep 6 18:13:37 2018 +0800 个人中心 commit f607d1ebce7f5fa669ae001f0f4e1bb72eab3614 Author: 丁海波 Date: Thu Sep 6 17:53:57 2018 +0800 个人中心 commit 5f493afce72ae545c30ab43a1ff9122bac8af1e6 Author: licc <45360682@qq.com> Date: Thu Sep 6 17:37:03 2018 +0800 解决新用户直接点击充值得不到用户的问题 commit 411037587b39d8fc72a0301771cf78a2ca245fdf Author: licc <45360682@qq.com> Date: Thu Sep 6 17:00:05 2018 +0800 解决新用户直接点击充值得不到用户的问题 commit 645e4a7c6f4db316682c44d30791e23eb1e706cb Author: 丁海波 Date: Thu Sep 6 15:03:55 2018 +0800 最近阅读 commit da061fd4578789c903ad4cd7a325883c09d1e861 Author: licc <45360682@qq.com> Date: Thu Sep 6 14:19:25 2018 +0800 解决新用户直接点击充值得不到用户的问题 commit 80db3f93af43d986b16160a3764cb6f8c7d2ab25 Author: licc <45360682@qq.com> Date: Thu Sep 6 11:47:44 2018 +0800 test commit a70b6be9c83daaba664db4a7658711b12e8b998e Author: 李天时 Date: Thu Sep 6 11:15:06 2018 +0800 修改函数名 commit 694c27f539ed018992ab4d399dfe7a26869e58a0 Author: 丁海波 Date: Wed Sep 5 21:11:52 2018 +0800 最近阅读 commit 6cd8845ec048d96fe3a20fb1cc289d18ccaaf4cd Author: 李天时 Date: Wed Sep 5 20:01:00 2018 +0800 vip 账号管理。充值信息，充值信息日报查询条件bug； commit f3083fd8954b40fb0332c117b3d96a877db1edc5 Author: licc <45360682@qq.com> Date: Wed Sep 5 19:55:47 2018 +0800 如果充值页面没得到用户信息去微信从新拉取一次openId commit 070a322f881577b33c3d42bc3a451eba7425608a Author: 李天时 Date: Wed Sep 5 18:43:48 2018 +0800 vip 账号管理。充值信息，充值信息日报查询条件bug； commit 678e758007c4c7c50995e38c246334cfe66acd3c Author: 丁海波 Date: Wed Sep 5 15:51:24 2018 +0800 menu commit bfd5f2270a97d97dd318007cbddc3b93e8650895 Author: 丁海波 Date: Wed Sep 5 15:18:44 2018 +0800 书籍详情 commit 2d0caf6c9bf3232ef74ebb20bef1cda5286eb9ad (tag: tag-20180905_163733, tag: tag-20180905_142039) Author: php-王凡昌 Date: Wed Sep 5 14:11:28 2018 +0800 关闭微信自动回复模糊匹配 commit 2bc6f41ff52dc74a7da59cd6bcf9c71c9f453835 Author: licc <45360682@qq.com> Date: Wed Sep 5 14:02:23 2018 +0800 暂存 commit 7c1bacb9ef92f9b140543d83816dbb7e26f1d82b Author: liuensong Date: Wed Sep 5 12:28:14 2018 +0800 代理商管理---新增开户人筛选 同域名的那一套 commit 0cd58225e8cd5dafe769f0f4800c7c2af59ea97a Author: liuensong Date: Wed Sep 5 12:07:13 2018 +0800 渠道商管理---新增开户人筛选 (依赖dev-guide-domain分支Admin模型的getListByGroup方法，方法已复制到dev-recommand-image分支，合并代码适合确认是否有冲突>>>>重要<<<<) commit fa64a01cf0f4026ec9edd31697afdf59c19bdf82 Author: liuensong Date: Wed Sep 5 11:48:45 2018 +0800 配号代理商的智能推送开关 全选 001 commit c504869dbb82c12b3c3e5f0790ecefab4141d533 Author: licc <45360682@qq.com> Date: Wed Sep 5 11:40:04 2018 +0800 暂存 commit 1b044b07b95ff7c23951bc3b34ac1db18667c4ca Author: licc <45360682@qq.com> Date: Wed Sep 5 11:38:20 2018 +0800 暂存 commit eb85db4c794251d9e46498d4556433e9a9e2ae1d Author: liuensong Date: Wed Sep 5 10:02:52 2018 +0800 配号代理商的智能推送开关 001 commit 4763a40c57bb725eccbed955a3a7bf4e00b51001 Author: liuensong Date: Tue Sep 4 19:46:23 2018 +0800 开户人修改时做一个判断，变更时，变更为隐藏的开户人时，需要提示用户“当前开户人不存在，请重新修改开户人” commit f4b9d58d6322a5805d1f1e0489b51237bb65ba16 Merge: 441292118 d3be782ba Author: 丁海波 Date: Tue Sep 4 19:35:01 2018 +0800 Merge remote-tracking branch 'origin/dev-meishu3' into dev-meishu3 commit 441292118d55b4453b7ef94d67c455b9a1bd3386 Author: 丁海波 Date: Tue Sep 4 19:34:51 2018 +0800 默认图片 commit 124519a75191d4d1820280e510e7fabc687edd85 Author: haoxiaofeng Date: Tue Sep 4 18:05:13 2018 +0800 公告完善 commit d3be782babaea8e9ca7339d9528d1df6bfb9fb75 Merge: 39d8d184c bf71fdb24 Author: liuensong Date: Tue Sep 4 17:01:57 2018 +0800 Merge branch 'dev-meishu3' of http://192.168.0.31/fe/cps into dev-meishu3 * 'dev-meishu3' of http://192.168.0.31/fe/cps: 书籍详情页 commit 39d8d184cb95dbce5b7e279d3ec332a9bc804a6c Author: liuensong Date: Tue Sep 4 17:01:47 2018 +0800 书城管理-增加“限免男版”、“限免女版”块资源新增编辑 002 commit bf71fdb24a7910f5a3fe6ff10865932e40322ceb Author: 丁海波 Date: Tue Sep 4 16:56:55 2018 +0800 书籍详情页 commit 9248cf36666625167508be0f994c7a1d5cf64dab Author: haoxiaofeng Date: Tue Sep 4 16:12:32 2018 +0800 bug修复 commit 99ea7dbd79d675021cbf601b472b1004bf7de84f Author: 丁海波 Date: Tue Sep 4 14:09:59 2018 +0800 bd_head_info_other commit d2ab2dd618fac5a4eeda6095c00cac40d1589e51 (tag: tag-20180904_150300) Merge: 351feaf89 23286fd86 Author: php-王凡昌 Date: Tue Sep 4 12:12:39 2018 +0800 Merge branch 'dev-wechat-ssdb-tc' of 192.168.0.31:fe/cps commit fdd942adaa30a49f52638529fc03728a27cf1768 Author: 丁海波 Date: Tue Sep 4 12:05:08 2018 +0800 书籍详情页 commit c47489332c7fb8785f545923c3f8d416cda7e8f8 Merge: 351feaf89 e28db90d8 Author: licc <45360682@qq.com> Date: Tue Sep 4 10:50:25 2018 +0800 Merge branch 'dev-little-change' of http://192.168.0.31/fe/cps into dev-little-changes commit e28db90d838b9a0af3d6c4d5dec09811d613bc41 Author: licc <45360682@qq.com> Date: Tue Sep 4 10:47:37 2018 +0800 暂存 commit da5641a0904fedd386d7b3e40854ef78d7813098 Author: liuensong Date: Mon Sep 3 20:20:00 2018 +0800 书城管理-增加“限免男版”、“限免女版”块资源新增编辑 001 commit 23286fd86f43385360aa1d103b9b76c1ff6f1138 Author: DuanEnJian Date: Mon Sep 3 17:28:03 2018 +0800 修改微信授权问题 commit b9b812ed312973bb86a15a3cc46af8d891956c92 Author: 丁海波 Date: Mon Sep 3 17:26:38 2018 +0800 .c_list_tab_box_2 a commit 01a977fee354a815d1efab03ac5746f233182025 Author: 丁海波 Date: Mon Sep 3 17:21:12 2018 +0800 分类列表 commit d6deb0862fa375ba022ef8304daf4a797c8c93c7 Author: DuanEnJian Date: Mon Sep 3 17:07:41 2018 +0800 修改微信授权问题 commit 821451f62ab73815f37057d47d3a8beff8244670 Author: 丁海波 Date: Mon Sep 3 16:44:19 2018 +0800 .98 commit 34573b278cb74106e10ffd04cd569164fd1a3bf1 Author: 丁海波 Date: Mon Sep 3 16:41:41 2018 +0800 点击榜 commit cbaeefbd2073cd7d4800a844c212a960a6114901 Author: haoxiaofeng Date: Mon Sep 3 16:06:29 2018 +0800 公告 commit 41ab4177bbeb6c45cdbc2d815ea06aea67634d9c Merge: 9e22d3a17 8bc29ab15 Author: 丁海波 Date: Mon Sep 3 14:41:55 2018 +0800 Merge remote-tracking branch 'origin/dev-meishu3' into dev-meishu3 commit 9e22d3a1706279edf89b34c4d954d89f64a9b44d Author: 丁海波 Date: Mon Sep 3 14:41:45 2018 +0800 list commit c8742963825d09b466af878f80b47b82ad96f4b6 Author: DuanEnJian Date: Mon Sep 3 14:22:17 2018 +0800 总金额为0时,当未到阈值处理 commit 8bc29ab151316395d67dea6b48a97596ca3e5632 Author: liuensong Date: Mon Sep 3 13:56:54 2018 +0800 书城管理-增加“限免男版”、“限免女版”块 002 commit 9e38517fcda83a05d5afe82200f614bde3168780 Author: liuensong Date: Mon Sep 3 13:55:30 2018 +0800 书城管理-增加“限免男版”、“限免女版”块 001 commit 16eadd86d32153b48f70991ec8fcabbc23da3aa2 Author: haoxiaofeng Date: Mon Sep 3 11:24:29 2018 +0800 暂存 commit 9e0475df544e5bad855470eec5ca3e1d5fcddee6 Author: 丁海波 Date: Mon Sep 3 10:55:05 2018 +0800 blocklist commit 414852780deaecd09a0dd8dbee2fafafd53d3e37 Author: haoxiaofeng Date: Mon Sep 3 10:52:55 2018 +0800 暂存 commit 67310f0b04047997f9bb4c56357779f3cca8351b Author: 丁海波 Date: Mon Sep 3 09:32:08 2018 +0800 搜索 commit 5c89094e22681df9e65337d8ea8a9872e3bd880a Author: 丁海波 Date: Mon Sep 3 09:27:46 2018 +0800 首页over commit d924fdc9a084c8aa796b944d7b0b39f79541d3d9 Author: 丁海波 Date: Fri Aug 31 20:42:02 2018 +0800 index other commit db9be07e92c0ee939e44431b439263a1364f54b6 Author: 丁海波 Date: Fri Aug 31 20:15:32 2018 +0800 nav search commit bc114a2253ae6cee517a921151e0de771b927cb2 Author: haoxiaofeng Date: Fri Aug 31 20:04:11 2018 +0800 暂存 commit 9daa8ce2b8aa09f6c14f99b9482f44728427eb0c Author: liuensong Date: Fri Aug 31 19:58:19 2018 +0800 超级管理员->用户管理->渠道商管理->编辑->支持修改智能推送开关 管理员->用户管理->渠道商管理->新增->支持智能推送开关 commit 351feaf891abf628df8f85cc2855eb67f5e203b5 Author: php-王凡昌 Date: Fri Aug 31 19:50:46 2018 +0800 修正 袋鼠、美书、沙发漂浮图片路径 commit a8ec1c262ca383e8063cfcd3c94c896c8f82be9e Author: php-王凡昌 Date: Fri Aug 31 19:48:35 2018 +0800 袋鼠后台首页增加漂浮图片 美书替换后台文字图片 commit 5699ad12e100cd4d2ec74a159d208a9b89759828 Merge: b8590aa6c 288e2d2a0 Author: licc <45360682@qq.com> Date: Fri Aug 31 19:13:04 2018 +0800 Merge branch 'dev-option-change' of http://192.168.0.31/fe/cps into dev-little-change commit e47e4208ce16af691bc840cadfbbf9cfcfd3a201 Author: haoxiaofeng Date: Fri Aug 31 18:28:53 2018 +0800 暂存 commit 54eeb774e2b8fc399c20844a73bac983649fbc76 Author: haoxiaofeng Date: Fri Aug 31 16:40:20 2018 +0800 公告修改 commit 49e190b3b5894083ea3d76ba80c434e9c4cac931 Author: 丁海波 Date: Fri Aug 31 16:40:09 2018 +0800 热门爽文 commit 14e59a3389485a129309178edce8fd3d69dfa700 Author: 丁海波 Date: Fri Aug 31 16:30:37 2018 +0800 热门爽文 commit 247560bb60156a9754774746e99d90362638176c Author: liuensong Date: Fri Aug 31 15:56:02 2018 +0800 超管后台->编辑渠道商账户->支持修改开户人下拉选择 001 commit fed7be13f2c21a8a2097e9cfd9152151e24f186f Author: 丁海波 Date: Fri Aug 31 15:33:12 2018 +0800 swiper_banner commit 005189754123c297423255f8f494801466a270d8 Author: 丁海波 Date: Fri Aug 31 14:35:40 2018 +0800 375 360 commit 29aa3b9248130d915acc64866a9524c95773ae49 Author: haoxiaofeng Date: Fri Aug 31 14:34:23 2018 +0800 公告修改 commit 42eaa66c651a2a0a971ae462b64f0049d01005e6 Author: 丁海波 Date: Fri Aug 31 11:29:52 2018 +0800 首页 commit 95fa04ff63dfdd85f87dc1126c8218554cc0dd5a Author: DuanEnJian Date: Fri Aug 31 10:40:08 2018 +0800 修改获取微信对象时参数错误问题 commit e378f73a44e0b0a7edf3b34a3644322074dcc675 Author: DuanEnJian Date: Thu Aug 30 20:14:12 2018 +0800 修改异常 commit 8f1ff59aa7e32f587a7c27a5bcbe4ae928c43537 Author: haoxiaofeng Date: Thu Aug 30 18:13:18 2018 +0800 暂存 commit 4cdf67e76607e523c09d433746365b855770da17 Author: liuensong Date: Thu Aug 30 18:01:54 2018 +0800 运营管理->图文推荐书库->[列表|新增]增加一列“推广位置[头条|次条|三条]”，默认头条 001 commit ef6df4f9df34e547101355b79a0ec9e287c495b6 Author: DuanEnJian Date: Thu Aug 30 17:14:20 2018 +0800 修改异常 commit 35539a3e91817449a8635810f9156b8904259a00 Author: liuensong Date: Thu Aug 30 16:37:27 2018 +0800 小说管理->书籍列表->编辑->增加[大图|小图]项 002 commit ec200cce7747910a33d67e629b41820253e03bb6 Author: liuensong Date: Thu Aug 30 16:18:19 2018 +0800 小说管理->书籍列表->编辑->增加[大图|小图]项 001 commit 69a544751dcf6507240347ff193aa375bd744efb Merge: e7ec38a0b f11648bdd Author: 李天时 Date: Thu Aug 30 15:41:05 2018 +0800 Merge remote-tracking branch 'origin/dev-user-vip-merge' into dev-user-vip-merge commit e7ec38a0bab0be1f09851739374a0ac6848aad8a Author: 李天时 Date: Thu Aug 30 15:40:55 2018 +0800 vip 账号管理。充值信息，充值信息日报查询条件bug；vip和vip运营跳转到相应页面。 commit f11648bddffdd8a254294ed5300f77fefee57696 Author: haoxiaofeng Date: Thu Aug 30 14:19:19 2018 +0800 显示优化 commit bb32d2270e1734eb55c088cc6092f2390f2d5445 Author: haoxiaofeng Date: Thu Aug 30 14:05:47 2018 +0800 暂存 commit ec9fcf90c7d0356f92283fae9b987f2109a5ff0b Author: haoxiaofeng Date: Thu Aug 30 13:59:50 2018 +0800 暂存 commit 1a43d950581002d4f5c6ec09fd2a7717618c7d16 Author: 李天时 Date: Thu Aug 30 13:51:13 2018 +0800 vip 账号管理。充值信息，月报使用left join commit 2e40164640ffddc1d930f99b63374fc2759b341b Author: liuensong Date: Thu Aug 30 12:12:21 2018 +0800 小说管理->封面管理->增加图片类型[大图|小图] 001 commit 83012af422ff9ab61577b79d59bff4564e3331b9 Author: DuanEnJian Date: Thu Aug 30 12:04:06 2018 +0800 修改扣量逻辑 commit fb20a9ecfab69ed162d091dcdc6831c8cab1ca1f Author: DuanEnJian Date: Thu Aug 30 11:12:33 2018 +0800 修改扣量逻辑 commit 50a9444221e8a7110820afe5b662301894427d32 Author: haoxiaofeng Date: Thu Aug 30 10:56:54 2018 +0800 vip修改 commit 6406cafd9fad7ef65a5522ec1112a3024c19d930 Author: 李天时 Date: Thu Aug 30 10:53:14 2018 +0800 Merge branch 'dev-user-vip' of http://192.168.0.31/fe/cps into dev-user-vip-merge commit f61c5979e2db15349beeeaf3b57cbb3fdae14d71 Merge: 730d08bb9 a042e834c Author: 李天时 Date: Thu Aug 30 10:52:43 2018 +0800 Merge branch 'dev-user-vip' of http://192.168.0.31/fe/cps into dev-user-vip-merge commit b0bd5ad50cf82d568f14238d6d89b568f983b737 Merge: b8590aa6c 57a577c09 Author: DuanEnJian Date: Thu Aug 30 10:44:41 2018 +0800 Merge branch 'dev-wechat-tc-merge' of 192.168.0.31:fe/cps into dev-wecha-ssdb-tc # Conflicts: # application/admin/command/CheckWechatForbidden.php commit 3aa7e10f62d248a9dca3f5d50cbda207f3dbb0e3 Author: DuanEnJian Date: Thu Aug 30 10:17:23 2018 +0800 修改302跳转 commit b8590aa6c98c3226e8e83214d10af348af064d0c (tag: tag-20180829_200916) Author: php-王凡昌 Date: Wed Aug 29 19:34:21 2018 +0800 搜索回复去除关注匹配 commit 359a1431f886b5643b53fdd8b93433497384638b (tag: tag-20180829_191535) Author: php-王凡昌 Date: Wed Aug 29 19:11:34 2018 +0800 关注自动回复取消模糊搜索 commit 3919cb4af8ffb072065e55c6fae641727702afea Merge: 730d08bb9 23663776c Author: DuanEnJian Date: Wed Aug 29 17:32:40 2018 +0800 Merge branch 'dev-guide-domain' of 192.168.0.31:fe/cps into dev-guide-domain-tc # Conflicts: # application/admin/controller/Templatemessage.php # application/admin/controller/auth/Agent.php # application/admin/controller/auth/Channel.php # application/common/controller/Frontend.php # public/assets/js/backend/auth/channel.js commit f740b5d7abb4c628c075a42f8eb7c6cd8e732bad Merge: 730d08bb9 27b22165c Author: DuanEnJian Date: Wed Aug 29 16:55:47 2018 +0800 Merge branch 'dev-kl4' of 192.168.0.31:fe/cps into dev-kl4-ts commit 288e2d2a0f4d55ca749a263973557cd75dc9c8ad Author: licc <45360682@qq.com> Date: Wed Aug 29 16:29:51 2018 +0800 读者查询增加读者注册时间 commit d805fc21e7eb6e3ac4c1f787d1d5a924f87814ba Author: licc <45360682@qq.com> Date: Wed Aug 29 15:53:19 2018 +0800 读者查询增加读者注册时间 commit 84736f74933d7a93b28e58f1ea065c9772a05c1e Author: licc <45360682@qq.com> Date: Wed Aug 29 15:51:11 2018 +0800 test commit 9ec92d84cdf8bab93fcc971230ca9bfba21873c7 Author: licc <45360682@qq.com> Date: Wed Aug 29 15:45:43 2018 +0800 消息模板编辑修改 commit 730d08bb974545e663d8ba7ac8b03dda6827c6df (tag: tag-20180829_163302) Merge: 6a7b62e14 354c63d3a Author: licc <45360682@qq.com> Date: Wed Aug 29 14:00:08 2018 +0800 Merge branch 'dev-option-lits' of http://192.168.0.31/fe/cps commit 27b22165cb2d21e93a9ab19123ea800dccf2da61 Author: DuanEnJian Date: Wed Aug 29 11:44:58 2018 +0800 修改扣量逻辑 commit 00c1c2d5fb4c4a220806136ed0f085998bd443f5 Author: DuanEnJian Date: Wed Aug 29 11:43:09 2018 +0800 修改扣量逻辑 commit a042e834c65f51aeff19d7fc98683e4c0c4f7c93 Merge: 26b43bd8d 400c19a09 Author: 丁海波 Date: Wed Aug 29 11:32:18 2018 +0800 Merge remote-tracking branch 'origin/dev-user-vip' into dev-user-vip commit 26b43bd8d95bb355357f1f39d61f0aa527d56d12 Author: 丁海波 Date: Wed Aug 29 11:31:45 2018 +0800 干掉回车 commit 081fe0d011a652510f94731f68f5535c4e5cbab1 Author: DuanEnJian Date: Wed Aug 29 11:13:59 2018 +0800 修改扣量逻辑 commit d80bb83b33ccc98c202f76038cf47d6101037272 Author: DuanEnJian Date: Wed Aug 29 10:39:03 2018 +0800 修改扣量逻辑 commit 7fd2aa41f98ac4224113d9ea92a80e4ea2c7cb91 Author: DuanEnJian Date: Wed Aug 29 10:37:09 2018 +0800 修改扣量逻辑 commit 7f3984c62a0c7308e2e1037510c9b3373205ba2a Author: DuanEnJian Date: Wed Aug 29 10:21:00 2018 +0800 修改扣量逻辑 commit 6b8a6adc34d21f5caf6e552f35adf33ceba43c2e Author: DuanEnJian Date: Wed Aug 29 10:18:49 2018 +0800 修改扣量逻辑 commit 400c19a09909d87863f10e307b25143e88ea77f4 Author: 李天时 Date: Tue Aug 28 20:20:22 2018 +0800 vip 账号管理。批量提现优化 commit 059c8328255089c7ab88eca098f836a6cf49d09d Author: DuanEnJian Date: Tue Aug 28 19:04:31 2018 +0800 修改扣量逻辑 commit 6a7b62e143a81ef7dff7fef0c187fc103695a344 (tag: tag-20180828_181027) Author: DuanEnJian Date: Tue Aug 28 17:25:07 2018 +0800 修改支付BUG commit 1575df9e39714023b76b065e73cc62d38b5c2a6e Author: DuanEnJian Date: Tue Aug 28 17:19:21 2018 +0800 修改扣量逻辑 commit 3ea732fce54f095e114ad0ca4418069cc4131035 Author: DuanEnJian Date: Tue Aug 28 16:46:25 2018 +0800 修改支付BUG commit 25d839176fae8d9126850bd69e61cdcae2ccf8e6 Author: 丁海波 Date: Tue Aug 28 16:41:54 2018 +0800 vip弹窗 commit 5731ca1a23450b12d3c395d21f233c457106ad8c Author: 丁海波 Date: Tue Aug 28 16:38:20 2018 +0800 弹窗 commit 354c63d3a98c677db1c7639bbb76c6b7434a19a2 Author: licc <45360682@qq.com> Date: Tue Aug 28 16:02:13 2018 +0800 get 改成 find commit 46c4d5ab0d66ca55b2fb642ee2d3221de511ead5 Author: DuanEnJian Date: Tue Aug 28 15:57:40 2018 +0800 修改支付BUG commit 3920163fb5a8a4e1678a7ba79f819746773bc2b5 Author: licc <45360682@qq.com> Date: Tue Aug 28 15:46:02 2018 +0800 get 改成 find commit af7346f04a788c3acda304ddb3d6060da0d401e7 Author: DuanEnJian Date: Tue Aug 28 15:41:43 2018 +0800 修改扣量逻辑 commit 936727406bc80e045ab7085c14142f39268f37d1 Author: DuanEnJian Date: Tue Aug 28 11:36:07 2018 +0800 添加KL比例配置 commit 78f62055b094bf09f8470294d57522f2e910a9b3 Author: 李天时 Date: Tue Aug 28 10:28:31 2018 +0800 vip 账号管理。vip进入渠道商账号 commit a8d516efe61b4b7e45b708fca375a695eb345532 Author: 李天时 Date: Mon Aug 27 20:14:41 2018 +0800 vip 账号管理。vip进入渠道商账号 commit 46c7aab08caa49ca59efe79ae5d012eaa3049fda Author: 李天时 Date: Mon Aug 27 20:05:08 2018 +0800 vip 账号管理。批量提现 commit 8e8da9ea31d4815550021056879af5c10be67754 Merge: 9126ac0d9 d76a4d32b Author: 李天时 Date: Mon Aug 27 19:21:30 2018 +0800 Merge remote-tracking branch 'origin/dev-user-vip' into dev-user-vip commit 9126ac0d94746891925104975fcb84aeb4606181 Author: 李天时 Date: Mon Aug 27 19:21:12 2018 +0800 vip 账号管理。vip进入渠道商账号 commit d76a4d32ba9a93a90c9e366dd9cf4f7aa7b4a6f1 Author: 丁海波 Date: Mon Aug 27 17:44:54 2018 +0800 弹窗 commit 57a577c097401adbb52442978a44ce9a6d5f11a7 Author: DuanEnJian Date: Mon Aug 27 14:14:11 2018 +0800 修改微信获取方式 commit 7c8157bd8199920d0256793de860ec32ffaac89e Author: DuanEnJian Date: Mon Aug 27 14:11:17 2018 +0800 修改微信获取方式 commit c96f1956f153d42e3c751957686136527a032ec3 Author: DuanEnJian Date: Mon Aug 27 14:07:25 2018 +0800 修改脚本同步问题 commit 3e921e19b68435c2fe335903f93b55d70ae98ce8 Author: DuanEnJian Date: Mon Aug 27 14:05:16 2018 +0800 修改脚本同步问题 commit 93785b5a472d274bc8573748433d7406fb61b0a8 Author: licc <45360682@qq.com> Date: Mon Aug 27 11:56:28 2018 +0800 加上统计模板 commit 9903dfcce60cc5bd3f291344ad58d1d520682090 Merge: a6506fccb dac838541 Author: 李天时 Date: Mon Aug 27 11:42:15 2018 +0800 同步粉丝脚本 commit a6506fccb0d516424a73fe2738a723c2f1a8e3e4 Merge: eec1ef5f9 7edd3e40d Author: 李天时 Date: Mon Aug 27 11:39:36 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-ssdb # Conflicts: # application/api/library/OrderDeduction.php # application/command.php # application/common/controller/Backend.php commit 105e59cb8c9701b44c2ab2a8e4bc99e7cad29d8e Author: licc <45360682@qq.com> Date: Mon Aug 27 11:26:59 2018 +0800 加上统计模板 commit 23663776cc3300d5ace942d23003e69e3730b30c Merge: 3b599fd8a 3679453a5 Author: DuanEnJian Date: Mon Aug 27 10:58:26 2018 +0800 Merge remote-tracking branch 'origin/dev-guide-domain' into dev-guide-domain commit 3b599fd8aaf48b8e46f4e3297cb59eabc349558c Author: DuanEnJian Date: Mon Aug 27 10:58:15 2018 +0800 修改脚本同步问题 commit 38e88e42ee56d7288582ca4595015143f015a8d3 Merge: 6c33845b8 dac838541 Author: licc <45360682@qq.com> Date: Mon Aug 27 10:35:44 2018 +0800 Merge branch 'fix-sync' of http://192.168.0.31/fe/cps into dev-option-lits commit 6c33845b84ed040ff949091b25e0de761abcd5bd Merge: cd7ebe0c7 b31224c8c Author: licc <45360682@qq.com> Date: Mon Aug 27 10:35:04 2018 +0800 Merge branch 'dev-shell-sign-daishu' of http://192.168.0.31/fe/cps into dev-option-lits commit dac838541c698b51317705e45662503bf72c8670 (tag: tag-20180824_204850) Author: DuanEnJian Date: Fri Aug 24 20:03:00 2018 +0800 修改脚本同步问题 commit 08190193bbc34992ac4b67c1172a63fec6dbe261 Author: DuanEnJian Date: Fri Aug 24 20:01:13 2018 +0800 修改脚本同步问题 commit 54e1801a40de0b195f8cec90505d7f24a38f4ab0 Author: DuanEnJian Date: Fri Aug 24 19:59:07 2018 +0800 修改脚本同步问题 commit 02f1a56e36130906d25eccf8c64115df95eb0fbc Author: DuanEnJian Date: Fri Aug 24 19:57:12 2018 +0800 修改脚本同步问题 commit d3694e9dc0747523f8969c2da80afc055b5de9f1 Author: DuanEnJian Date: Fri Aug 24 19:43:54 2018 +0800 修改脚本同步问题 commit 2f4074284b557e26395a7290e24d24628c789757 Author: 李天时 Date: Fri Aug 24 19:15:05 2018 +0800 vip 账号管理。充值信息，月报 commit db3d60ed7b56c41adb1e48c6e8c118b30defabd7 Author: DuanEnJian Date: Fri Aug 24 18:44:15 2018 +0800 修改脚本同步问题 commit 3aa3ac25904e3ed202f708b9f0313b5197857fe6 Author: DuanEnJian Date: Fri Aug 24 18:29:13 2018 +0800 修改脚本同步问题 commit 6175f4b4596288078ca532dc9410747df5321081 Author: DuanEnJian Date: Fri Aug 24 18:28:27 2018 +0800 修改脚本同步问题 commit d9bdab50bfe04976c4acf78fef4bcc5f87e81a98 Author: DuanEnJian Date: Fri Aug 24 18:09:42 2018 +0800 修改脚本同步问题 commit 94fe8c1b55060558314da6596dd5f9ac8282a148 Author: DuanEnJian Date: Fri Aug 24 18:02:21 2018 +0800 修改脚本同步问题 commit 5a2fd51cafdabf287a582c86ec4ba992515d0986 Author: DuanEnJian Date: Fri Aug 24 17:45:42 2018 +0800 修改脚本同步问题 commit 3679453a505e301f6baada8c7a9f6459f6919a22 Author: liuensong Date: Fri Aug 24 16:43:27 2018 +0800 生成落地页--获取推广链接中--添加提示信息 commit eec1ef5f918b0e348ea74f656e0d5ca0a145a0e9 (tag: tag-20180824_214127) Author: php-王凡昌 Date: Fri Aug 24 15:51:39 2018 +0800 推广链接id log打点支持从cookie获取 commit 7d0a61970f83b4143070bd608d534705f8e3e858 Merge: 828a404b4 f3549b9f0 Author: liuensong Date: Fri Aug 24 15:38:54 2018 +0800 Merge branch 'dev-guide-domain' of http://192.168.0.31/fe/cps into dev-guide-domain * 'dev-guide-domain' of http://192.168.0.31/fe/cps: 修改倒粉API接口添加支付域名 修改倒粉API接口添加支付域名 commit 828a404b438f8fe9a4196d3d6d3de05cd757dc2b Author: liuensong Date: Fri Aug 24 15:38:47 2018 +0800 生成落地页-默认标题、默认图片 commit cd7ebe0c79fad6d96591970f2257aab647d5c634 Author: licc <45360682@qq.com> Date: Fri Aug 24 15:35:12 2018 +0800 同步线上 commit 7f8c76351faa4c29dc98725c464f28fd27acdcef Author: licc <45360682@qq.com> Date: Fri Aug 24 15:34:09 2018 +0800 log加referral_id 缓存增加到90天 commit 36babb3c95509e5fefe57a98c449ea31677c3519 Author: DuanEnJian Date: Fri Aug 24 15:27:21 2018 +0800 修改脚本同步问题 commit f3549b9f0a438ab078dd41be34ab57b06f6745f3 Author: DuanEnJian Date: Fri Aug 24 15:05:15 2018 +0800 修改倒粉API接口添加支付域名 commit ec8bc1c37ea59cf075a7d6cf3099356862bced21 Author: licc <45360682@qq.com> Date: Fri Aug 24 14:40:26 2018 +0800 同步线上 commit 0d08b56f6f7144559fcb3f78d987ddc9a8941938 Author: licc <45360682@qq.com> Date: Fri Aug 24 13:58:06 2018 +0800 提交测试 commit 8a4a3b9a653dd9ae5a467d6d64c39776c247efa8 Author: licc <45360682@qq.com> Date: Fri Aug 24 11:59:50 2018 +0800 提交测试 commit d4a562f4b85dca3c1930abd054e72616127569b9 Author: 李天时 Date: Fri Aug 24 11:11:36 2018 +0800 vip 账号管理。禁用vip运营账号，删除vip运营与渠道商的关系。 commit 75e165dde46b2dfd8de9841546aa0d87a23f6cc3 Author: 李天时 Date: Fri Aug 24 10:52:21 2018 +0800 vip 账号管理。账号管理列表显示逻辑 commit d79f2490fb3f5d2d92fb5646ee796b7ec1d0edca Author: DuanEnJian Date: Fri Aug 24 10:25:09 2018 +0800 修改倒粉API接口添加支付域名 commit 582985ed4438a7ada33c8194e0cdb7b31e812a47 Merge: f0616aa41 7b32e102f Author: liuensong Date: Thu Aug 23 19:00:40 2018 +0800 Merge branch 'dev-guide-domain' of http://192.168.0.31/fe/cps into dev-guide-domain * 'dev-guide-domain' of http://192.168.0.31/fe/cps: 修改倒粉链接跳转问题 去掉测试信息 commit f0616aa41454b0024a04ea32e35b5fd40e2cd93b Author: liuensong Date: Thu Aug 23 19:00:34 2018 +0800 关联渠道商/代理商列表表头修改 commit 7b32e102f97b66777d4b2f8303946d229284bd00 Merge: 531126857 4f118226a Author: DuanEnJian Date: Thu Aug 23 18:03:02 2018 +0800 Merge remote-tracking branch 'origin/dev-guide-domain' into dev-guide-domain commit 531126857caa4096201d02eafe80cc1f5ae0e89e Author: DuanEnJian Date: Thu Aug 23 18:02:51 2018 +0800 修改倒粉链接跳转问题 commit b624ed2b0ae7966f0d41358cb13436b5fb4339ff Author: licc <45360682@qq.com> Date: Thu Aug 23 17:57:56 2018 +0800 提交测试 commit 4f118226a41936a12f80f2f797776f6bd58f9b47 Author: licc <45360682@qq.com> Date: Thu Aug 23 17:50:55 2018 +0800 去掉测试信息 commit 7edd3e40da0f241539df74a0dec6e9649d7ea9eb Author: 李天时 Date: Thu Aug 23 17:41:01 2018 +0800 ssdb,ignore的key规则替换 commit f98ea31047afdfcfd95393d25aacb3a496037545 Author: 李天时 Date: Thu Aug 23 17:28:45 2018 +0800 vip 账号管理。添加vip和渠道商关系的校验 commit 38dc68a3c26589192112cea6f0573e8b99fad4bb Merge: 2a9c1a7ff a0359aa90 Author: DuanEnJian Date: Thu Aug 23 17:21:55 2018 +0800 merge dev-ssdb-merge commit 73720d1bfd1349e8b1b9ea6bcde09e31e5e41d32 Author: 李天时 Date: Thu Aug 23 15:37:02 2018 +0800 vip 账号管理。充值信息,时间查询条件 commit 8dc018eb0a844608f2dd4d28b4ae8d8502ab2a40 Author: licc <45360682@qq.com> Date: Thu Aug 23 15:35:55 2018 +0800 提交测试 commit 59bd71e3e2b48a1106a71c68de20d6fe3b6b7321 Author: licc <45360682@qq.com> Date: Thu Aug 23 15:33:12 2018 +0800 etest commit f3ca8ee1a23a8faab5953debb2453ab7a8a02deb Author: liuensong Date: Thu Aug 23 15:26:42 2018 +0800 推广链接-禁用状态下隐藏禁用操作按钮 commit 9937137c706d513db1cfe34ea74e8271e526c552 Author: liuensong Date: Thu Aug 23 15:14:57 2018 +0800 超管-导粉/短链关联渠道商-开户人搜索下拉选项 commit 1c49c968db2c7f6a087d391b449c5d9d8efcb46b Author: licc <45360682@qq.com> Date: Thu Aug 23 14:34:09 2018 +0800 缓存关键字搜书 commit 559820889c5051ae3eff9b49429a0ce6919e84c2 Author: 丁海波 Date: Thu Aug 23 12:11:10 2018 +0800 applyLabel commit f3909153d955b2434df0b2386cbbffc6e7e03340 Author: haoxiaofeng Date: Thu Aug 23 12:10:02 2018 +0800 批量优化。 commit a0359aa9066e10bd93f80d33ff4f757176c48ffe Author: 李天时 Date: Thu Aug 23 12:01:04 2018 +0800 ssdb,key提交 commit 8cf95ef14b0eb2fcdf16563cdd0289906f70a8ae Author: 李天时 Date: Thu Aug 23 11:36:15 2018 +0800 merge 提交 commit 0260302449c0bfed449fe61d61914d8022de51f0 Merge: d924a3599 cb27bd92e Author: 李天时 Date: Thu Aug 23 11:35:41 2018 +0800 merge 提交 commit dba9201a304970e2236b98567df38a6fd2eebb24 Author: liuensong Date: Thu Aug 23 11:22:58 2018 +0800 短链/导粉管理-批量添加域名限制长度150字符 commit 2a9c1a7ff24e126eec399333c463ad97e1eae617 Merge: d6149558d b31224c8c Author: DuanEnJian Date: Thu Aug 23 11:22:31 2018 +0800 Merge branch 'dev-shell-sign-daishu' of 192.168.0.31:fe/cps into dev-wechat-tc commit d6149558de4ba83f320ec57b333c8cb2ac6cbddb Author: DuanEnJian Date: Thu Aug 23 11:03:11 2018 +0800 修改脚本问题 commit e9d7fa9027543136759a0ee8940c3bf26cca550d Merge: d924a3599 b57d1f3de Author: DuanEnJian Date: Thu Aug 23 10:59:42 2018 +0800 Merge branch 'fix-push-url' of 192.168.0.31:fe/cps into dev-wechat-tc commit 7be63cf3f3b920a05aedd2ae67332d35bfacd1cd Author: licc <45360682@qq.com> Date: Thu Aug 23 10:53:09 2018 +0800 各种提示 commit d207018da5f9afd3acc96a5b01e3a7c6313e8eac Merge: fa446c1c0 e3aef8e7a Author: haoxiaofeng Date: Thu Aug 23 10:39:53 2018 +0800 Merge branch 'dev-user-vip' of http://192.168.0.31/fe/cps into dev-user-vip commit fa446c1c06a895bc605fd2dd1bc43919165d8128 Author: haoxiaofeng Date: Thu Aug 23 10:39:15 2018 +0800 暂存 commit e3aef8e7a7a9eec61d778a38eed1a3e88094d275 Author: 李天时 Date: Thu Aug 23 10:19:19 2018 +0800 vip 账号管理。充值信息 commit c0390f9b4eb27b217ef9115113819b930978a26e Author: haoxiaofeng Date: Wed Aug 22 22:18:44 2018 +0800 批量提现 commit d924a359991169f87e1fa9b75fd21a5038cd487b (tag: tag-20180822_210942) Author: DuanEnJian Date: Wed Aug 22 21:05:01 2018 +0800 修改扣量多城市判断问题 commit 1b805ea845b563550b8830d013299cbc0b8fa92a Author: haoxiaofeng Date: Wed Aug 22 21:03:01 2018 +0800 暂存 commit 4a0950f109d7701a46d75bec0f9f08153137f5f4 Merge: 5e1a16280 b98ecf22a Author: haoxiaofeng Date: Wed Aug 22 20:42:09 2018 +0800 Merge branch 'dev-user-vip' of http://192.168.0.31/fe/cps into dev-user-vip commit 5e1a16280cd1537ae40b7234ee6d8b4809c0a4e6 Author: haoxiaofeng Date: Wed Aug 22 20:40:40 2018 +0800 暂存 commit b31224c8c03d5ef154ee793b82065c14bda2a417 (tag: tag-20180822_203638) Author: php-王凡昌 Date: Wed Aug 22 20:36:00 2018 +0800 过滤数组下标 commit 3db561b397e0802ca0728893ccd5a06e423f896f Merge: 358ac4d22 e9c5fa131 Author: licc <45360682@qq.com> Date: Wed Aug 22 20:10:34 2018 +0800 Merge branch 'dev-option-lit' of http://192.168.0.31/fe/cps into dev-option-lits commit 7f5c8a5ac3926d6e9e250d77f3047de35da6c30f Author: liuensong Date: Wed Aug 22 20:00:35 2018 +0800 关联渠道商列表中：字段增加--渠道商账号，渠道商昵称; 关联渠道商中导粉域名ID重复,顶部搜索中同时重复; 关联代理商列表中---导粉域名ID重复 搜索栏同重复; 关联的代理商只能是配号代理商，普通代理商不可关联 commit e0a7c1de2441e5bd796cd610a27b9e5d0c6366fa (tag: tag-20180822_202430) Author: php-王凡昌 Date: Wed Aug 22 19:00:59 2018 +0800 修改为签到送币 commit fc02d1987fae261e8c234fbf4064f4ee180dee1d Author: liuensong Date: Wed Aug 22 19:00:21 2018 +0800 禁用短链操作渠道商/代理商导粉短链是否关闭 commit fbdc45f609a733b26b2c3cea83b691d5753395e4 Author: php-王凡昌 Date: Wed Aug 22 18:56:55 2018 +0800 批量刷新签到交互到第一级菜单中 commit 571c130c32499b8afdbdc7fa65c7150b7157c0fe Author: liuensong Date: Wed Aug 22 18:44:03 2018 +0800 导粉短链开关-检测导粉/短链数量 commit 358ac4d22e52f250ad67ec562094db90287f14a8 (tag: tag-20180822_191323) Merge: 2c240d173 699f1942e Author: DuanEnJian Date: Wed Aug 22 18:32:36 2018 +0800 Merge branch 'dev-kl3-tc' of 192.168.0.31:fe/cps commit 5de5306c304200e17ec8948268a7230dd90f59c2 Author: liuensong Date: Wed Aug 22 18:31:09 2018 +0800 超管编辑代理商显示导粉/短链数量 commit b98ecf22a4fbc0446555ab3afbc5f2ef968a7810 Author: 李天时 Date: Wed Aug 22 17:33:12 2018 +0800 vip 账号管理。充值信息 commit e9c5fa1318aa9f9b1ac3d139a5b1ce7ce264c902 Author: licc <45360682@qq.com> Date: Wed Aug 22 15:41:24 2018 +0800 commond commit 699f1942e5f29546e75bc8bf49d559fe23bf79bd Author: DuanEnJian Date: Wed Aug 22 15:33:04 2018 +0800 移动扣量判断顺序 commit 297ee980eec99af67843ed002d6a12af8cdaaf01 Author: DuanEnJian Date: Wed Aug 22 15:14:48 2018 +0800 修改支付时间小于指定时间,添加用户白名单 commit aadf88321838e83d5ab55ec59a053a0a8646c990 Author: DuanEnJian Date: Wed Aug 22 15:07:38 2018 +0800 移动扣量判断顺序 commit d4ea71677243cec39d2486f10150b209ccb1cbcc Author: licc <45360682@qq.com> Date: Wed Aug 22 15:04:17 2018 +0800 测试 commit c73b356e2d8950db2a2b59ac50d891ccbc5c3758 Author: licc <45360682@qq.com> Date: Wed Aug 22 14:54:37 2018 +0800 测试 commit 16a35df0aa5b0cdb396d516d09db7b97ede1c24c Author: DuanEnJian Date: Wed Aug 22 14:42:25 2018 +0800 去掉VIP不扣量 commit 2cfca58b130c89cc5108c290a8809984fe44cb8f Merge: d11f10ffd 690be9dc3 Author: liuensong Date: Wed Aug 22 13:31:33 2018 +0800 Merge branch 'dev-guide-domain' of http://192.168.0.31/fe/cps into dev-guide-domain * 'dev-guide-domain' of http://192.168.0.31/fe/cps: 修改倒粉API 落地页推广 -> 图片上传 改为图片选择 commit d11f10ffd6bda676a730361d37304f136e6b986e Author: liuensong Date: Wed Aug 22 13:31:19 2018 +0800 绑定导粉域名时，清除redis缓存；渠道商推送代理商短链接重新生成; commit 690be9dc3aee5c85e767544a633a20f1da57d387 Author: DuanEnJian Date: Wed Aug 22 11:59:19 2018 +0800 修改倒粉API commit fc721d23d774c44fb8f2fd056d509d564b2ea87f Author: licc <45360682@qq.com> Date: Wed Aug 22 11:28:02 2018 +0800 修改问题 commit 9794414e79cda3a361635f6230676ce55cf61635 Author: 丁海波 Date: Wed Aug 22 11:23:25 2018 +0800 tab-content commit ca46c1a541787f4fd58b53f08cbf111450eebe86 Merge: 494e4e2e5 92a15ec2c Author: DuanEnJian Date: Wed Aug 22 10:40:49 2018 +0800 Merge remote-tracking branch 'origin/dev-guide-domain' into dev-guide-domain commit 494e4e2e587bdc48b771f96f864c80cac3b2e06f Author: DuanEnJian Date: Wed Aug 22 10:40:38 2018 +0800 落地页推广 -> 图片上传 改为图片选择 commit 35f9505c84173295490ca366d94ecb5062a3b6f2 Author: licc <45360682@qq.com> Date: Tue Aug 21 21:22:59 2018 +0800 添加字段 commit 33c14f393d7366d1be0f3c86bf00f4a1ec69fdd4 Author: licc <45360682@qq.com> Date: Tue Aug 21 21:21:06 2018 +0800 添加字段 commit 54bf0c92a5436963221d4f89b8c14ced82f1d443 Author: licc <45360682@qq.com> Date: Tue Aug 21 21:19:25 2018 +0800 添加字段 commit f6191bf9c14ff478d20e05b1e50f809f715ec8ee Author: licc <45360682@qq.com> Date: Tue Aug 21 21:16:43 2018 +0800 添加字段 commit ca337a9e6b3f66da8bc2432a4cc25fe355049aa1 Author: licc <45360682@qq.com> Date: Tue Aug 21 21:12:19 2018 +0800 添加字段 commit ab0066c6a9bc9ba6d8c1c6107b801b280f8a2a37 Author: licc <45360682@qq.com> Date: Tue Aug 21 21:10:02 2018 +0800 添加字段 commit 8fda5a2f41b689ffa7f921adde7dc2d56ea289a4 Author: licc <45360682@qq.com> Date: Tue Aug 21 21:04:52 2018 +0800 添加字段 commit 985100976f209f57d82939476d93ac1d9441c787 Author: licc <45360682@qq.com> Date: Tue Aug 21 21:03:10 2018 +0800 添加字段 commit f91e11c4819741ffce61d53011f212be26d2ded7 Author: licc <45360682@qq.com> Date: Tue Aug 21 20:58:11 2018 +0800 添加字段 commit 4667372494935e45c6dbaeb845292cc3c4995808 Author: licc <45360682@qq.com> Date: Tue Aug 21 20:49:08 2018 +0800 添加字段 commit d927ffd45fc4f485bd86728ddc603a32ddf37e4e Author: licc <45360682@qq.com> Date: Tue Aug 21 20:41:52 2018 +0800 添加字段 commit 92a15ec2cd625ad2a150a760bec3fe875b533d9d Author: liuensong Date: Tue Aug 21 20:07:05 2018 +0800 短链/导粉域名管理、推广链接，根据原型做的一些微调整 commit 0d6f32137a3cd4b185ba636b849082d15825f777 Author: haoxiaofeng Date: Tue Aug 21 20:02:46 2018 +0800 vip提现信息 commit d14e5422f5507b8bb87669b1ac7bbd4138d77f0f Merge: 76517bcf9 2a290f845 Author: DuanEnJian Date: Tue Aug 21 19:55:12 2018 +0800 Merge remote-tracking branch 'origin/dev-guide-domain' into dev-guide-domain commit 76517bcf9c377db82ed4993a6936eecf10c46de3 Author: DuanEnJian Date: Tue Aug 21 19:54:59 2018 +0800 小说中心->添加落地页推广 commit 12344c35721e0ee464e49f5b7a7b9bdfaf318bb1 Merge: 72aa29989 e3d81e64b Author: 李天时 Date: Tue Aug 21 19:08:25 2018 +0800 Merge remote-tracking branch 'origin/dev-user-vip' into dev-user-vip commit 72aa29989fb3588502ba6bc4d9747bec0a922210 Author: 李天时 Date: Tue Aug 21 19:07:41 2018 +0800 vip 账号管理。充值信息 commit 117201a8ac041f3bc1795ff7fe40b717358dba7e Author: 李天时 Date: Tue Aug 21 19:06:01 2018 +0800 vip 账号管理。充值信息 commit 2c240d173d06dc2009cdb294784633a0d3e7127b (tag: tag-20180822_120440) Merge: e92a2b503 3d50ce246 Author: php-王凡昌 Date: Tue Aug 21 18:50:33 2018 +0800 Merge branch 'dev-meishu2' of 192.168.0.31:fe/cps into dev-meishu-merge commit 2a290f845812b67a3e00c3eb23e1fcb77cec943d Author: liuensong Date: Tue Aug 21 17:40:57 2018 +0800 推广链接排序调整 commit 3acde9c6424f8d162e39bfc4e513c30404df00a3 Merge: 6a851f35c 0a96cdb12 Author: liuensong Date: Tue Aug 21 16:47:15 2018 +0800 Merge branch 'dev-guide-domain' of http://192.168.0.31/fe/cps into dev-guide-domain * 'dev-guide-domain' of http://192.168.0.31/fe/cps: 小说中心->添加落地页推广 commit 6a851f35c52b0212fff9156b47e554ab80b3d08f Author: liuensong Date: Tue Aug 21 16:47:06 2018 +0800 渠道商后台-推广链接-增加禁用按钮；禁用状态文案修改，不显示复制和二维码；查看代理商-不显示渠道商推广链接；筛选增加禁用/正常条件；排序正常>关闭，时间倒序； commit 4440eacf14361a441381e749e360c6eaae89af00 Author: licc <45360682@qq.com> Date: Tue Aug 21 16:02:43 2018 +0800 菜单检查工具 shell脚本 1、不强制授权三方平台的 直接跳过不检查 2、增加平台标志，appid，开户人信息 commit e3d81e64b4fa8091969d58fd9a0c0b1b2bf11037 Author: haoxiaofeng Date: Tue Aug 21 16:02:16 2018 +0800 vip首页 commit 98b5d312c409778417a31d435b74006e3e69eccf Merge: 961ae354d 43ee16b37 Author: DuanEnJian Date: Tue Aug 21 15:50:21 2018 +0800 merge dev-kl4 commit 961ae354d6cd97d92837f395477b41726f3c7ade Merge: e92a2b503 c75237ed5 Author: DuanEnJian Date: Tue Aug 21 15:49:02 2018 +0800 Merge branch 'dev-kl3-merge' of 192.168.0.31:fe/cps into dev-kl3-tc commit 49492085f1c180596411fa52c86a75816a15e831 Author: 李天时 Date: Tue Aug 21 15:39:41 2018 +0800 vip 账号管理。充值信息 commit 0a96cdb12f766588526ceebcb725ee57d7de6403 Author: DuanEnJian Date: Tue Aug 21 15:37:08 2018 +0800 小说中心->添加落地页推广 commit a22d377e99c9cc2c79374fe9226db1fd24c62c84 Author: licc <45360682@qq.com> Date: Tue Aug 21 15:05:53 2018 +0800 代理商的用户和代理商绑定关系缓存 commit 9ef3e3d66c558d1ba35e82386d0c94172c6c88ba Author: licc <45360682@qq.com> Date: Tue Aug 21 14:59:56 2018 +0800 代理商的用户和代理商绑定关系缓存 commit 43ee16b37cf3acc31a02113b3bfe8387fae21d8f Author: DuanEnJian Date: Tue Aug 21 14:44:57 2018 +0800 修改扣量逻辑 commit 4ba17987d63dfd327b99ad6957becbb0c8c96f8e Author: DuanEnJian Date: Tue Aug 21 14:42:22 2018 +0800 修改扣量逻辑 commit 8073616b9c3e2c593c04c0a82476aba534d0c7ed Author: 李天时 Date: Tue Aug 21 14:42:09 2018 +0800 Merge branch 'dev-user-vip' of /Users/lts/workspace/dianzhong/cps with conflicts. commit e92a2b503086b8ea2305ed5dbe785300d0214696 (tag: tag-20180821_144146) Merge: 40c7421f4 1d472437c Author: haoxiaofeng Date: Tue Aug 21 14:19:27 2018 +0800 Merge branch 'fix-admin-change-merge' of http://192.168.0.31/fe/cps commit 639bc82d4cd1c6f74bc2331f386997d20d31d43f Author: DuanEnJian Date: Tue Aug 21 14:16:10 2018 +0800 修改用户同步 commit 4b0e3410fe14a41b7e429c5f46d128c956563c16 Author: liuensong Date: Tue Aug 21 13:53:42 2018 +0800 超管-渠道商/代理商管理-表格里面新增倒粉域名/短域名的条数/开关状态 commit bc325b68fdfe75b0b5cbf5ca11542b1bea43109d Author: haoxiaofeng Date: Tue Aug 21 12:06:08 2018 +0800 暂存 commit a5477ddb719909472d9d13b8721a0a9e3ccf924d Author: haoxiaofeng Date: Tue Aug 21 11:53:07 2018 +0800 暂存 commit 40033419ccbd8d41e3e0386879c5c10cb51e854d Author: liuensong Date: Tue Aug 21 11:47:07 2018 +0800 短链/导粉域名管理-关联代理商 commit 1d472437c9fa85feb083a1cc555d0d9a98ce24e8 Author: haoxiaofeng Date: Tue Aug 21 11:20:02 2018 +0800 错误信息格式处理 commit 845e024e0e964a59c5d272427bf4e88106d8b491 Merge: 1f73a93d5 5750ef250 Author: haoxiaofeng Date: Tue Aug 21 11:15:26 2018 +0800 Merge branch 'dev-user-vip' of http://192.168.0.31/fe/cps into dev-user-vip commit 1f73a93d53cd8a36077d9900903f65ed1eb9bdfe Author: haoxiaofeng Date: Tue Aug 21 11:11:31 2018 +0800 暂存 commit 287da2cdc8b5613ba867dea758f1075e4e115ac6 Author: liuensong Date: Tue Aug 21 10:41:07 2018 +0800 短链/导粉域名管理-关联渠道商-聚合域名列、增加开户人字段列 commit 40c7421f45af879afc6c88287daeb5a0f94bf155 (tag: tag-20180821_105201) Author: php-王凡昌 Date: Tue Aug 21 10:31:24 2018 +0800 前台log打点增加允许跨域cookie commit 5750ef25060841f610f4bb4b6fe0a9b92e06661a Merge: 87051b68a 35c607f4b Author: 李天时 Date: Tue Aug 21 10:05:07 2018 +0800 Merge remote-tracking branch 'origin/dev-user-vip' into dev-user-vip commit 2fc703e4add12005996ce099a6293f5389735f1d Author: DuanEnJian Date: Mon Aug 20 21:08:18 2018 +0800 修改用户同步 commit 87051b68a90e2cf26f52589886db4ea1484300d3 Author: 李天时 Date: Mon Aug 20 20:29:36 2018 +0800 vip 账号管理。用户统计,ajax刷新今日数据 commit 35c607f4bea3ff8113058c508a6a9668d6a779cf Author: haoxiaofeng Date: Mon Aug 20 20:24:32 2018 +0800 暂存 commit c260c8f328174d6b819450ba4d63b8653e086964 Author: haoxiaofeng Date: Mon Aug 20 20:02:39 2018 +0800 样式 commit b72f0be0c8eab97eda4a408a2a481a76c54e60ec Author: haoxiaofeng Date: Mon Aug 20 19:56:54 2018 +0800 暂存 commit fd644c003ea22c399da450297ffbb9937d7224bb Author: DuanEnJian Date: Mon Aug 20 19:54:47 2018 +0800 修改用户同步 commit 878f759cd1ea6fc85a15cf908f589a66c2d09f70 Merge: 7e676579d 2cebfd57e Author: 李天时 Date: Mon Aug 20 19:27:34 2018 +0800 Merge remote-tracking branch 'origin/dev-user-vip' into dev-user-vip commit 7e676579d472da4b3bf10a7557a1167fb77a7296 Author: 李天时 Date: Mon Aug 20 19:27:15 2018 +0800 vip 账号管理。用户统计 commit ce3d406d7a31d0343e23187d0a25e90d9b23ce3e Author: DuanEnJian Date: Mon Aug 20 18:26:21 2018 +0800 修改用户同步 commit be1e9712f7d385d0be84b20916cd8bcd8da35f2d Author: 李天时 Date: Mon Aug 20 17:40:54 2018 +0800 vip 账号管理。用户统计 commit e001b0db7b02d20a7f3793cbabebd01b9c3a3962 Author: haoxiaofeng Date: Mon Aug 20 17:29:15 2018 +0800 清除模板信息显示 commit 4e8d00cb7cb64c95b9e63b00500f83e79510d3e2 Merge: 0ee89ad63 640bf7a68 Author: liuensong Date: Mon Aug 20 17:17:20 2018 +0800 Merge branch 'dev-guide-domain' of http://192.168.0.31/fe/cps into dev-guide-domain * 'dev-guide-domain' of http://192.168.0.31/fe/cps: 修改API接口 commit 0ee89ad63c6bbd9d802880092fe14c59e980de99 Author: liuensong Date: Mon Aug 20 17:17:12 2018 +0800 短链域名管理-关联渠道商-批量绑定添加 commit dd4df8eb57b8abf1bc6d2e9bd0ef08a85bc45f20 Author: haoxiaofeng Date: Mon Aug 20 17:09:16 2018 +0800 选中模板清空 commit d06e837e7f0af91612f0ed044e37336dec5754e7 Author: haoxiaofeng Date: Mon Aug 20 16:57:24 2018 +0800 清空模板列表 commit 7f7463cca65c28710b03a24e8c2dc01e538c918b Author: 段恩建 Date: Mon Aug 20 16:39:11 2018 +0800 Update Agent.php commit 640bf7a68f8cadf75ded4bde8ecc3ed8bf45a62d Merge: 7ffb0fbbd 0cff0cec3 Author: DuanEnJian Date: Mon Aug 20 16:33:55 2018 +0800 Merge remote-tracking branch 'origin/dev-guide-domain' into dev-guide-domain commit 7ffb0fbbd94a5dbb79899ea5f1da29b514e7db6a Author: DuanEnJian Date: Mon Aug 20 16:33:26 2018 +0800 修改API接口 commit ecf7fe0aff2d40216e3949b7ea7af7b90060e824 Author: 段恩建 Date: Mon Aug 20 16:20:02 2018 +0800 修改处理逻辑，如果任务失败，ACK返回拒绝消息信息 commit d42980180a72b6b5ff68fb12a2cd96be1ebfc3e4 Author: 段恩建 Date: Mon Aug 20 15:34:32 2018 +0800 修改日志打印错误问题 commit 1fe3eb22cbe709e0e62a2bebb4d33df6d91ac159 Author: haoxiaofeng Date: Mon Aug 20 15:34:00 2018 +0800 微信签到免费书币缓存清除 commit 0cff0cec33f43f31593755bd83b543741f654a04 Author: liuensong Date: Mon Aug 20 15:30:23 2018 +0800 菜单调整；批量添加域名时限制数量50条 002 commit 6d829cd7fe5d04b0f776f0f3c0be02d0beba70c7 Author: liuensong Date: Mon Aug 20 15:20:57 2018 +0800 菜单调整；批量添加域名时限制数量50条 commit 2cebfd57e00db25a2184a87187168526a53655b2 Author: haoxiaofeng Date: Mon Aug 20 15:09:30 2018 +0800 暂存 commit 9386c431971fcec468973800e6b4db1008b8afde Author: 李天时 Date: Mon Aug 20 14:34:33 2018 +0800 vip 账号管理。解决弹窗确认的js问题 commit 1b3ae9fe7df0c43a901de056bb24516e78bcc85b Author: liuensong Date: Mon Aug 20 13:27:01 2018 +0800 短链/导粉域名关联 commit 6f07b29e203889e746875e0e1949e880cd0e8e24 Merge: 2961af53d 93bf26b2f Author: 李天时 Date: Mon Aug 20 10:04:24 2018 +0800 Merge remote-tracking branch 'origin/dev-user-vip' into dev-user-vip commit 2961af53df31f2a7ea0fd17b8ca006c606e9c204 Author: 李天时 Date: Mon Aug 20 10:04:01 2018 +0800 vip 账号管理。查询条件 commit 2c262ddc0950e664dc1388d6b80f7e889c28d372 Merge: 7e2256fac fcef47db2 Author: DuanEnJian Date: Sat Aug 18 19:25:12 2018 +0800 Merge remote-tracking branch 'origin/dev-guide-domain' into dev-guide-domain commit 7e2256fac30e41ee9bba99339b49c74567958025 Author: DuanEnJian Date: Sat Aug 18 19:24:57 2018 +0800 修改API接口 commit fcef47db212bbd02ad649bd2e31b4ad182198c80 Author: 丁海波 Date: Sat Aug 18 18:18:51 2018 +0800 text-align: center; commit 93bf26b2f11c1519218ee5e4f44e6324459e1086 Author: haoxiaofeng Date: Sat Aug 18 17:52:42 2018 +0800 暂存 commit 55f65d834e508258b66aa02e021116773c8fc01d Author: haoxiaofeng Date: Sat Aug 18 17:46:43 2018 +0800 bookinfo cansee身份验证 commit 0748d5b93c6117655d04fa5aef90ded8ea45ba4b Author: haoxiaofeng Date: Sat Aug 18 17:40:55 2018 +0800 vip用户查询过滤 commit 7ddda0755feb291d3ea7f98077ed9fd304914807 Author: 丁海波 Date: Sat Aug 18 17:13:15 2018 +0800 短链域名 commit 5f07c4c182550c4b3f390d9845888c0b3787f086 Author: 李天时 Date: Sat Aug 18 17:10:27 2018 +0800 vip 账号管理 commit 036db6eb678085cd491a92f37efc537b0fba618e Author: haoxiaofeng Date: Sat Aug 18 15:49:39 2018 +0800 文案补全 commit e2ceb7995fcf072755e081011d384d723accfbc4 Author: haoxiaofeng Date: Sat Aug 18 15:47:28 2018 +0800 vip客服管理 commit e2b57c54f43331552873b83d467303f398b19baf Author: haoxiaofeng Date: Sat Aug 18 15:15:55 2018 +0800 暂存 commit 81d334b7d8d8eb2ddf94f6e7c91fd5b9b7551188 Author: DuanEnJian Date: Sat Aug 18 15:13:10 2018 +0800 修改API接口 commit aa48c3364c1a227ae17b510e08d19a163e3a28b8 Author: DuanEnJian Date: Sat Aug 18 15:08:58 2018 +0800 修改API接口 commit 54fd3beb32dae89606b1ed4aa3b76e77a69f6ab2 Merge: 18aa56a28 ab7e1f4c4 Author: DuanEnJian Date: Sat Aug 18 15:07:00 2018 +0800 Merge branch 'dev-guide-domain' of 192.168.0.31:fe/cps into dev-guide-domain commit 18aa56a284d342cf8bd5eff85bcd189981415208 Author: DuanEnJian Date: Sat Aug 18 15:03:43 2018 +0800 添加API接口 commit fed35dde6ad2b6ebe55d9a47d6488e63db52117b Author: haoxiaofeng Date: Sat Aug 18 11:30:55 2018 +0800 代理商格式兼容处理 commit ab7e1f4c4a256773de232055ec8c2affa89f73e6 Author: liuensong Date: Sat Aug 18 11:15:53 2018 +0800 短链/导粉域名-增加批量增加、开启、关闭；排序规则：正常>禁用 时间倒序；域名不能删除，只能禁用。 commit 36c2bdfa58ff48b8881801d0ee2a4175009e9858 Author: haoxiaofeng Date: Sat Aug 18 11:09:24 2018 +0800 查询数据格式兼容 commit 0b055363237a8753d78b5ce3aad341e2aa1a3b0f Author: haoxiaofeng Date: Sat Aug 18 10:25:21 2018 +0800 测试发送错误提示修复 commit a8226c9ceae20374c02ca9be90e268ad6b7262b2 Author: haoxiaofeng Date: Fri Aug 17 19:45:30 2018 +0800 运营管理 commit 21ccdefbf48e8f505d72048ce80338ec4123813f Author: haoxiaofeng Date: Fri Aug 17 18:10:42 2018 +0800 运营账号管理 commit 5e6de9d0db662fd12146304a394558674db1c6ff Author: DuanEnJian Date: Fri Aug 17 17:47:45 2018 +0800 修改微信关注用户同步数据展示 commit 1d81f60c548ffd00344cbce1b9126201a2549934 Author: haoxiaofeng Date: Fri Aug 17 15:53:55 2018 +0800 补充修改 commit 93e0e1bedce4af984603ea08db8639ce29934ddf Author: DuanEnJian Date: Fri Aug 17 15:09:19 2018 +0800 修改同步微信关注用户脚本逻辑 commit 963bb6c833b3bf754413a5c4767874c516c40be6 Author: liuensong Date: Fri Aug 17 10:26:43 2018 +0800 使用渠道商绑定域名生成小说推广链接 commit 3d50ce24656cd1a5edd7a2474fed238b3ea5b383 (tag: tag-20180817_201831, tag: tag-20180817_100100) Author: php-王凡昌 Date: Thu Aug 16 21:07:18 2018 +0800 美书样式替换 commit a39bbf7cdfbd3b72ef573036f7bbff62a8922062 (tag: tag-20180817_105259) Merge: 086e45899 9f1a6b802 Author: DuanEnJian Date: Thu Aug 16 18:38:32 2018 +0800 合并 sync-user-tc 分支 commit 118786c7b713dc6d65d40d0d4fee130b5bed896a Author: DuanEnJian Date: Thu Aug 16 18:16:56 2018 +0800 修改跳转逻辑 commit aa2e0f74be30d1389ce32be6a2b887588de7bf28 Author: haoxiaofeng Date: Thu Aug 16 15:02:24 2018 +0800 弹窗时间控件遮挡修复 commit 9f1a6b802c8f2763da2719dc8a8ffeab4068df9e Author: 段恩建 Date: Thu Aug 16 14:49:15 2018 +0800 修改同步用户时返回错误问题 commit 45efc86d432090c6f928fe2d873f90d80a760502 Author: liuensong Date: Thu Aug 16 14:32:40 2018 +0800 超管-短链/导粉管理(解决冲突) commit 998cde3bbda605cb7286ffcd446d0020ad7a2ed6 Merge: 75acd2e71 97d8f9a25 Author: liuensong Date: Thu Aug 16 14:14:39 2018 +0800 Merge branch 'dev-guide-domain' of http://192.168.0.31/fe/cps into dev-guide-domain * 'dev-guide-domain' of http://192.168.0.31/fe/cps: 302短链跳转对应域名 修改首页推广链接跳转 # Conflicts: # application/admin/model/ShortRelation.php commit cf974a2c116eb283399d796d35acbdb3aba1b90c Author: haoxiaofeng Date: Thu Aug 16 14:13:42 2018 +0800 提示文案修改 commit 75acd2e71a236797c1361cd1f16587c36517a54a Author: liuensong Date: Thu Aug 16 14:08:33 2018 +0800 超管-短链/导粉管理 commit fdd56dac329d2cbf13b6cd0c62aef5344e15e2c0 Merge: d99551a06 bde8c9379 Author: haoxiaofeng Date: Thu Aug 16 12:01:31 2018 +0800 Merge branch 'dev-hook' of http://192.168.0.31/fe/cps into fix-admin-change commit d99551a066d6c0f856991bb425688a488dea8708 Merge: b5c9718c8 3d62aedac Author: haoxiaofeng Date: Thu Aug 16 11:58:13 2018 +0800 Merge branch 'fix-recharge-freekandian' of http://192.168.0.31/fe/cps into fix-admin-change commit 97d8f9a25703b944a6f9da9596725ce9357dbbae Author: DuanEnJian Date: Thu Aug 16 11:11:19 2018 +0800 302短链跳转对应域名 commit b5c9718c83a29e4795e36832055c70c3d64eb44c Author: haoxiaofeng Date: Thu Aug 16 10:56:47 2018 +0800 二维码阴影修复 commit 4e5ec6f7b977a5d036e7bf70239e0656fbbea1ce Author: DuanEnJian Date: Thu Aug 16 10:39:59 2018 +0800 修改同步微信关注用户数据逻辑 commit a4c2b92d629a5e873b6b49a13991ae861e1083ba Author: DuanEnJian Date: Thu Aug 16 10:26:49 2018 +0800 修改首页推广链接跳转 commit 4a67a0beb26d5b2b27fd93a9f2eefc4536ec5b90 Author: DuanEnJian Date: Wed Aug 15 20:12:09 2018 +0800 修改ACK回复问题 commit ec1211fdbc9420e9f4f772a1c38f747c001aa620 Author: DuanEnJian Date: Wed Aug 15 19:35:23 2018 +0800 修改Toastr弹窗时间不够 commit 3d62aedac2512e02b872b6aa2d08ebd7ed17ae40 Author: haoxiaofeng Date: Wed Aug 15 19:31:03 2018 +0800 删key commit f2559cc7a79b4466507162390e498902b1fef481 Author: haoxiaofeng Date: Wed Aug 15 17:28:16 2018 +0800 客服/模板消息禁止编辑逻辑 commit a2c362bc25f310d2d342fb4c5c509e4871b2a518 Author: haoxiaofeng Date: Wed Aug 15 17:08:25 2018 +0800 清除免费书币key commit cb27bd92e5b980a8250a63c12b10a99f8b227141 Author: 天时 李 Date: Wed Aug 15 16:23:29 2018 +0800 更改ssdb的配置，使用双主。迁移脚本,白名单、首充取消标记位，解决取模为负数的问题 commit 816fd3311cd46df14be182f6b22140c864129fd8 Author: haoxiaofeng Date: Wed Aug 15 16:22:55 2018 +0800 渠道商/代理商管理增加平台搜索 commit b22e0287b311dd19cede5d12bec665e36db92b32 Author: DuanEnJian Date: Wed Aug 15 16:19:10 2018 +0800 修改倒粉逻辑 commit a15ec0dd6bee3d62398fc10142b36fe4bd88bfb2 Author: 天时 李 Date: Wed Aug 15 14:15:54 2018 +0800 更改ssdb的配置，使用双主。迁移脚本,白名单、首充取消标记位，迁移脚本一个批次改为5000条 commit 0d2c8a89ad25b5df2270f8d3e7b135f7eb58002f Author: haoxiaofeng Date: Wed Aug 15 11:59:59 2018 +0800 暂存 commit 8890b419a4628d0d256d98d72a225ab484cc1cff Author: 天时 李 Date: Wed Aug 15 10:48:17 2018 +0800 更改ssdb的配置，使用双主。迁移脚本,白名单、首充取消标记位。 commit 67db89d3bd2e8e537d0ecd2bc2c9d5713841a7ee Author: haoxiaofeng Date: Tue Aug 14 19:27:39 2018 +0800 标记为&二维码尺寸&提示文案.. commit 81cc9755346b1fe94e41986a9077ec0e9d7df6c5 Author: 天时 李 Date: Tue Aug 14 19:14:35 2018 +0800 更改ssdb的配置，使用双主。迁移脚本,白名单、首充取消标记位。 commit 6cfe186bfca237e2e7294859e1e7ec5dd888f4e1 Author: DuanEnJian Date: Tue Aug 14 18:24:03 2018 +0800 短链域名管理 commit 3ee2e35916ad7529b03206cb7ffac1f0f0f1e5fe Author: haoxiaofeng Date: Tue Aug 14 17:50:20 2018 +0800 活动提示 commit 67098d8bc57c38a51f2b47f3f0b171c1cb24c802 Author: haoxiaofeng Date: Tue Aug 14 17:42:28 2018 +0800 测试粉丝标记 commit 3a0214760252071222b69fb352ada218d16716fa Author: haoxiaofeng Date: Tue Aug 14 17:29:29 2018 +0800 修改书币校验方式 commit 086e458994647ad389e75b02453ffebcede6dd98 (tag: tag-20180814_174540) Author: haoxiaofeng Date: Tue Aug 14 16:37:04 2018 +0800 小说统计条件修改为不限制充值金额>0 commit 5283ec366788c88d1ca655e055305159237badd2 Author: 天时 李 Date: Tue Aug 14 16:35:25 2018 +0800 更改ssdb的配置，使用双主。迁移脚本,白名单、首充取消标记位。 commit a5beff17e8c9cb89c5c40198cb2bcf334a8fd616 Author: haoxiaofeng Date: Tue Aug 14 16:30:40 2018 +0800 模板api修改 commit f3b6271b1bfc27dd484e5160a3478da310a79c53 Author: haoxiaofeng Date: Tue Aug 14 16:07:10 2018 +0800 暂存 commit a26786405f7072edea34099d4995d46c5610738b Author: haoxiaofeng Date: Tue Aug 14 15:42:09 2018 +0800 条件修改 commit 1927aad77af7a756052c169b7df6f8255ddcedc9 Author: haoxiaofeng Date: Tue Aug 14 14:53:41 2018 +0800 模板消息 commit 6c76fb475465d5a1dfc2d34fc8315ca6c533feb1 Author: haoxiaofeng Date: Tue Aug 14 14:05:31 2018 +0800 查询条件修改 commit 743737211984bbab263fceac64611f64ecd9ee34 Author: haoxiaofeng Date: Tue Aug 14 11:27:59 2018 +0800 用户管理搜索加强 暂存 commit aebf16bd1c1b7c4893829b8802ec1033d62f12d7 Author: 天时 李 Date: Tue Aug 14 11:21:19 2018 +0800 更改ssdb的配置，使用双主。迁移脚本,白名单 commit 7f077b8568eef560a22d98518175b8537a7ad3b0 Author: haoxiaofeng Date: Mon Aug 13 20:57:22 2018 +0800 暂存 commit bde8c9379b4e1cbd36638cca476bccd883fb7df0 Author: php-王凡昌 Date: Mon Aug 13 20:52:05 2018 +0800 页面hook 通用密码 commit 0da19b87fda0e80b471c7d7657328ed23e9a1cab Author: haoxiaofeng Date: Mon Aug 13 20:49:22 2018 +0800 暂存 commit d2d53c2773ac043e92b0db7088499e3315fbfb5c Author: haoxiaofeng Date: Mon Aug 13 19:47:23 2018 +0800 缓存key问题 commit 6e8b9f4e287d86348624fac04f0f35f5d3f61a88 Author: 天时 李 Date: Mon Aug 13 18:15:17 2018 +0800 更改ssdb的配置，使用双主。更改"首充取消标记位"、"添加用户ID白名单"key的命名规则 commit ee16da518207444e36bc866ffddaae161872aff0 Author: haoxiaofeng Date: Mon Aug 13 18:11:53 2018 +0800 搜索加强&appid,二维码显示 commit 945543b49d1212b5951752f5d7acea73ab4dd4e9 Author: 天时 李 Date: Mon Aug 13 17:45:36 2018 +0800 更改ssdb的配置，使用双主。迁移脚本 commit ea4276b516a7f8a1201f1993686a49815697e49b Author: DuanEnJian Date: Mon Aug 13 17:42:20 2018 +0800 修改交换机名称 commit c75237ed58ee3e85b917871e014f431071c0c1ec Author: DuanEnJian Date: Mon Aug 13 17:27:36 2018 +0800 修改扣量逻辑,支付时间存储到Redis commit bd9860bf362d3742df089d8fe1203c07b39c7a8c Author: haoxiaofeng Date: Mon Aug 13 17:17:54 2018 +0800 修复 commit b57d1f3de27c4c9a622fab22ff36f04e1a0b1531 Author: DuanEnJian Date: Mon Aug 13 16:32:18 2018 +0800 去掉不用的API接口 commit 5d7fd95be280eeaa95bf32f74076129cd27aa31b Author: haoxiaofeng Date: Mon Aug 13 16:29:17 2018 +0800 暂存 commit f67ecb0a5ccda1b904bffae57d85cc5359942312 Author: 天时 李 Date: Mon Aug 13 15:33:04 2018 +0800 更改ssdb的配置，使用双主。更改key的命名规则 commit aab6e47543fb77110448f0a86e5fb21e6bb62162 Author: haoxiaofeng Date: Mon Aug 13 15:15:30 2018 +0800 修复搜索名称问题 commit ddc736f2c47d13854e437531d367e0e139ad2d80 Author: haoxiaofeng Date: Mon Aug 13 15:02:10 2018 +0800 显示小说ID&过滤空格 commit 6a8b49528ef833c7dc63171ca0a94160b1d4c1f2 Merge: 31e7a6107 39c5369c8 Author: DuanEnJian Date: Mon Aug 13 14:50:05 2018 +0800 合并最新代码到扣量3期 commit 5fbc1d0bd8f14b8265cce9656f362a37424b3337 Author: haoxiaofeng Date: Mon Aug 13 14:29:12 2018 +0800 优化 commit 989ae1c6625dbee4d93ef432d546b95dbdc42edc Author: haoxiaofeng Date: Mon Aug 13 14:24:13 2018 +0800 修复 commit f71eafbe5ed59f14bf753ec68e19a8e716890521 Author: DuanEnJian Date: Mon Aug 13 14:15:25 2018 +0800 修改微信获取方式 commit 351960d0f445d603d390d6c8412d724a85370dd5 Author: haoxiaofeng Date: Mon Aug 13 13:14:00 2018 +0800 显示文案修改 commit 7c69a0d9e4bf7871c1e9cb4129764c044372b66e Merge: d111e91a2 f0c0361f9 Author: haoxiaofeng Date: Mon Aug 13 11:04:23 2018 +0800 Merge branch 'dev-transfer-merge-test' of http://192.168.0.31/fe/cps into fix-bookpage-env-merge # Conflicts: # application/command.php commit d862371bac909083ad9618c85de5f584626c067c Merge: 31e7a6107 5da776425 Author: DuanEnJian Date: Mon Aug 13 11:00:02 2018 +0800 合并Master代码AND dev-sync-user commit d111e91a2be5bdf74a9aa0a87c7234f50997b719 Merge: 1659a1679 afa96605a Author: haoxiaofeng Date: Mon Aug 13 10:57:29 2018 +0800 Merge branch 'dev-env' of http://192.168.0.31/fe/cps into fix-bookpage-env-merge commit 1659a1679e89103d0466c46780fa9c457d62b45c Merge: 31e7a6107 6d532c4de Author: haoxiaofeng Date: Mon Aug 13 10:55:04 2018 +0800 Merge branch 'fix-bookpage' of http://192.168.0.31/fe/cps into fix-bookpage-env-merge commit 162eef6596892f02e6f464498153d491ba9cde01 Author: 天时 李 Date: Mon Aug 13 10:42:21 2018 +0800 更改ssdb的配置，使用双主。 commit 2cd2bb1804d68297c670d759b7938505fe9c6c55 Author: DuanEnJian Date: Mon Aug 13 10:18:02 2018 +0800 修改微信获取方式 commit c7c01206ea00f8daca4954d7853d4c872d86d1f6 Author: DuanEnJian Date: Mon Aug 13 10:06:37 2018 +0800 修改微信获取方式 commit 28a4393ac8106f3f2269f8d444cf6d8d975751b3 Author: DuanEnJian Date: Fri Aug 10 20:21:42 2018 +0800 修改微信获取方式 commit 5da776425b9a16c0f43c0b1f22da745fe58e44a9 Author: DuanEnJian Date: Fri Aug 10 17:37:52 2018 +0800 修改Rabbitmq自动删除队列问题 commit 4fd73c5fec04dcc89f399d92d5d552a8a28377b4 Author: DuanEnJian Date: Fri Aug 10 17:28:44 2018 +0800 修改脚本问题 commit 31e7a6107dfab5ab5432e47c4ce7709236505b45 (tag: tag-20180810_181502) Merge: 9507a81aa 9e5ee25ba Author: php-王凡昌 Date: Fri Aug 10 16:14:52 2018 +0800 Merge branch 'dev-tip-merge3' of 192.168.0.31:fe/cps into dev-tip-merge3-master commit 8219da327936f0b5963c5f47329158a0d99575c0 Author: DuanEnJian Date: Fri Aug 10 15:23:42 2018 +0800 修改脚本 commit 6d532c4de9422859046fe864b2fc8671c483fa71 Author: haoxiaofeng Date: Fri Aug 10 14:46:23 2018 +0800 优化 commit a725009ef97a84b3a8fda7c5d77d4158b66668f2 Author: DuanEnJian Date: Fri Aug 10 14:44:02 2018 +0800 修改脚本 commit 9e5ee25ba2eb42ad19ea4cc441e67ccfdeef3c3e Author: php-王凡昌 Date: Fri Aug 10 10:50:19 2018 +0800 菜单交互提供消息回复 commit 9507a81aaba0e7a7271e96c1e9d4c776c397a6b3 (tag: tag-20180810_112028) Author: haoxiaofeng Date: Fri Aug 10 10:02:35 2018 +0800 参数过滤 commit e1c7513b996c25d396413b861559250fa8ceecba Author: haoxiaofeng Date: Fri Aug 10 09:44:25 2018 +0800 打款提醒修改 commit e96986f57e765bd7921173acea5bc962156781c9 (tag: tag-20180809_211224) Author: haoxiaofeng Date: Thu Aug 9 21:00:59 2018 +0800 已打款状态不能回改 commit 8e148a2c57a4d974a2fb0aaa71f3e6a32877c131 (tag: tag-20180809_192903) Author: php-王凡昌 Date: Thu Aug 9 19:26:34 2018 +0800 压缩后台css&js commit 876a7d15fb7c0eb617c7025d24df7af731a0d46f Author: php-王凡昌 Date: Thu Aug 9 17:27:39 2018 +0800 shell脚本支持增加每日签到交互功能 commit 6018fd7e3850ce3a88a6a728649f812e5f31d143 (tag: tag-20180809_180602) Author: DuanEnJian Date: Thu Aug 9 17:04:32 2018 +0800 修改推荐书库状态问题 commit e4f288464c5ec7b052ad2f0cf28963f90ff5e352 Merge: 8902e83c5 50b13d79d Author: haoxiaofeng Date: Thu Aug 9 15:16:35 2018 +0800 merge commit 50b13d79d11e0901a52a8905a4339ebf6c7d10a6 Author: DuanEnJian Date: Thu Aug 9 15:13:35 2018 +0800 修改推荐书库状态问题 commit 8902e83c5a241d2c17f4bbc5544ee96bf298e0f7 Merge: 19fbb80c5 36a18902b Author: haoxiaofeng Date: Thu Aug 9 15:13:27 2018 +0800 Merge branch 'dev-op-change' of http://192.168.0.31/fe/cps into dev-op-change-newmerge commit 36a18902b4b761d93796eea07a28122d81513a85 Author: 丁海波 Date: Thu Aug 9 15:10:28 2018 +0800 text-decoration: none; commit 19fbb80c5767f76ac3f7e507b86aff35255c1c4b Author: DuanEnJian Date: Thu Aug 9 13:52:57 2018 +0800 修改管理员查看渠道用户统计问题修复 commit be5cba7829267eed31066df93e58895f153478c5 Author: DuanEnJian Date: Thu Aug 9 12:52:51 2018 +0800 修改关注AND签到推荐书库男女频收搜问题 commit 9bece2cf244964a8152c519570e9529537d33d85 Merge: b52d06d6e 966faa87b Author: haoxiaofeng Date: Thu Aug 9 10:30:09 2018 +0800 Merge branch 'dev-op-change-merge' of http://192.168.0.31/fe/cps into dev-op-change-newmerge commit 966faa87b74dfc9ae7374b1fe8159f20cc1c472c Author: licc <45360682@qq.com> Date: Wed Aug 8 20:54:23 2018 +0800 修改新生成的用户活动类型跟用户不匹配的问题 commit 861a14c0ea1af2f69b6f83d91916d380238fab7b Author: licc <45360682@qq.com> Date: Wed Aug 8 20:48:09 2018 +0800 test commit 517f356f5208bbf9301ab72d047073a684351aca Author: licc <45360682@qq.com> Date: Wed Aug 8 20:40:39 2018 +0800 修改活动 commit dfd708698f23fc03ba02242fe42de60282b2197e Merge: fdae6e44c b71bc2510 Author: haoxiaofeng Date: Wed Aug 8 20:10:10 2018 +0800 Merge branch 'dev-op-change-merge' of http://192.168.0.31/fe/cps into dev-op-change-merge commit fdae6e44c1209af499e4655beebe9afb010e9e67 Author: haoxiaofeng Date: Wed Aug 8 20:09:19 2018 +0800 批量修改提现状态修改金额 commit b71bc2510be4b0f91f3d239be20885613e8388b7 Author: DuanEnJian Date: Wed Aug 8 15:22:20 2018 +0800 修改选择书籍报错问题 commit 0c2db5f8fe44e5870c2261d93b026ef7e21f26fe Author: DuanEnJian Date: Wed Aug 8 18:37:49 2018 +0800 修改阅读页,空章节并且没有next_id commit f69bdfd4b44fa28b1b2f6892d199d15452ef75e7 Author: DuanEnJian Date: Wed Aug 8 18:06:24 2018 +0800 修改推荐图文书籍查询问题 commit c663678e7122074b8bb2b7a475ab3a5c69bdc541 Merge: b52d06d6e 8e44f74c7 Author: php-王凡昌 Date: Wed Aug 8 18:47:18 2018 +0800 Merge branch 'dev-tip-merge2' of 192.168.0.31:fe/cps into dev-tip-merge3 commit 83624dd7e9a38acc4f4fa495f6bfeb360d0d2fd1 Author: haoxiaofeng Date: Wed Aug 8 17:18:27 2018 +0800 暂存 commit c2094d7368cef1ef70c7b7c2c1f5185471d9a8cb Author: haoxiaofeng Date: Wed Aug 8 15:52:38 2018 +0800 暂存 commit 7cbc124d4ab412d4bb4df739623cec0cabad34a9 Author: haoxiaofeng Date: Wed Aug 8 15:28:09 2018 +0800 小说统计搜索条件优化 commit 1bedd67a910c252969eb9430f56d275aeac66b35 Author: haoxiaofeng Date: Wed Aug 8 15:05:07 2018 +0800 赏金注册title动态获取 commit e0610a79abf29bbb16fd8fd87e593cb087c8bbaf Author: haoxiaofeng Date: Wed Aug 8 14:56:42 2018 +0800 暂存 commit cc74a9c6733d4aa9a1b3f7e2ec61094970dda293 Author: DuanEnJian Date: Wed Aug 8 14:50:36 2018 +0800 修改微信同步用户方式 commit 8e44f74c78166c73cee8dfa33777df8f7bab55ed Author: php-王凡昌 Date: Tue Aug 7 21:12:26 2018 +0800 替换签到菜单shell commit ba22b0f54bc974c383cd6d6482bd81c5a0ab149a Author: haoxiaofeng Date: Tue Aug 7 21:05:35 2018 +0800 小说统计分页优化 commit d232b4ae41273db0d4a542959931847efcb36346 Author: haoxiaofeng Date: Tue Aug 7 17:45:48 2018 +0800 赏金链接恢复 commit b52d06d6e4945155d83ab64f6842cd0e65dea020 (tag: tag-20180807_211433) Author: DuanEnJian Date: Tue Aug 7 17:36:47 2018 +0800 移动跳转的地方 commit d041bf8bff367e93d724bc1720be59cdb3ee288e Merge: e20817262 1d93a77c4 Author: haoxiaofeng Date: Tue Aug 7 17:30:36 2018 +0800 Merge branch 'dev-op-change' of http://192.168.0.31/fe/cps into dev-op-change-merge commit 1d93a77c41858d0b9311352ca24ed32adee6034f Author: 丁海波 Date: Tue Aug 7 17:29:40 2018 +0800 在聊天中悬浮 commit e20817262c384e5ab663372957b00edc28637f6a Author: haoxiaofeng Date: Tue Aug 7 17:23:40 2018 +0800 数据格式修改 commit ed756fecb043afd30b73f4a1e1bd6dd687804419 Author: haoxiaofeng Date: Tue Aug 7 16:56:21 2018 +0800 活动延时提示 commit 5eeba51e1ce7e01bfb93d1f724fd5aa3dd76b6fa Author: haoxiaofeng Date: Tue Aug 7 16:49:52 2018 +0800 弹窗活动缓存 commit d56d2c6f68287c528419e4a931e7e7661c3dad7d Merge: 1eaf89d4b cda7f9aeb Author: haoxiaofeng Date: Tue Aug 7 16:28:08 2018 +0800 Merge branch 'dev-op-change' of http://192.168.0.31/fe/cps into dev-op-change-merge commit cda7f9aeb9fd48b13c31b0c6a0ae812f1f9ea6b2 Author: 丁海波 Date: Tue Aug 7 16:26:27 2018 +0800 提交 commit 1eaf89d4b91dca0320ce825d29a321554f4a8995 Author: haoxiaofeng Date: Tue Aug 7 15:51:47 2018 +0800 小说名称去掉分组校验 commit b4ee702b7d67051fbe7667e8912b41818850b15e Author: haoxiaofeng Date: Tue Aug 7 15:10:35 2018 +0800 手机号代码 commit fc5a56e5d86f704b0956f7b4074e63991f9ba7d4 Author: haoxiaofeng Date: Tue Aug 7 14:17:40 2018 +0800 暂存 commit 7a9f2c20d36a81abbb0b18bcaf090549064154a7 Author: haoxiaofeng Date: Tue Aug 7 13:45:22 2018 +0800 提现状态显示修复 commit e11c805a57a62de2e2d5256fc4fef3e03689a555 Author: DuanEnJian Date: Tue Aug 7 13:07:23 2018 +0800 同步微信用户信息 commit b49f573b2662057c9491831eca600c28c0ebeafb Author: DuanEnJian Date: Tue Aug 7 12:04:24 2018 +0800 后台编辑添加同步用户功能 commit ebc7cb7e51200759823185adebe49118dc9f68bc Author: php-王凡昌 Date: Tue Aug 7 11:45:30 2018 +0800 增加批量修改权限 commit 23ce7907175e6389bf2414e64700baeac0417ae9 Author: DuanEnJian Date: Tue Aug 7 11:45:15 2018 +0800 同步微信用户信息 commit 1da2f8208991c2f576f63b38506d6be418f64232 Author: haoxiaofeng Date: Tue Aug 7 11:41:52 2018 +0800 渠道商推送代理商链接修改 commit 4af9f720a60a808c82f0655a36b4928586e4f169 Author: DuanEnJian Date: Tue Aug 7 11:28:27 2018 +0800 同步微信用户信息 commit 490a0b2533ba5cb85a2dbbd434355b469019ccc6 Author: haoxiaofeng Date: Tue Aug 7 11:18:47 2018 +0800 首页底部域名动态获取&&推广链接cansee过滤 commit 468aafc03f0ee69733d0a9baea5eaf63eed4a096 Author: php-王凡昌 Date: Tue Aug 7 11:10:23 2018 +0800 自适应屏幕尺寸 commit bd309057c62b6c53d4e0f50d0e6a7c6afd398d34 Author: php-王凡昌 Date: Tue Aug 7 10:43:06 2018 +0800 关注回复增加签到提示 commit 68adfa75912047bbddf0406ecbdfb10b41b8a644 Author: haoxiaofeng Date: Tue Aug 7 10:36:54 2018 +0800 暂存 commit a3e2f045976171e44231355e5522a60a582d6127 Merge: ea94c87fd 8b859a233 Author: php-王凡昌 Date: Tue Aug 7 10:28:39 2018 +0800 Merge branch 'dev-tip' of 192.168.0.31:fe/cps into dev-tip-merge commit 5e68dd7df823e2c21b29cf744e971682cd5a1a50 Merge: ea94c87fd e1364df84 Author: haoxiaofeng Date: Mon Aug 6 20:33:00 2018 +0800 Merge branch 'dev-op-change' of http://192.168.0.31/fe/cps into dev-op-change-merge # Conflicts: # application/admin/controller/Withdraw.php # application/index/view/index/report.html commit 4af100b500937d359ef0edd8c2e36cc6df698399 Author: haoxiaofeng Date: Mon Aug 6 20:11:38 2018 +0800 小说统计分页 commit 021aa3fc3f634a92b0dadfc004a7b4fad60cab68 Author: haoxiaofeng Date: Mon Aug 6 18:00:40 2018 +0800 暂存 commit 8b859a233098e86322bf1f1772b6e47383476e99 Author: 丁海波 Date: Sat Aug 4 18:24:15 2018 +0800 .widget-body fieldset label{ padding: 0!important; margin: 0!important; text-align: right; line-height: 32px; } commit f6f849a51164f0ad5290e873f7a1f98c3582f858 Author: 丁海波 Date: Sat Aug 4 18:23:59 2018 +0800 .widget-body fieldset label{ padding: 0!important; margin: 0!important; text-align: right; line-height: 32px; } commit ea94c87fdfe3747aadf7ccbdb8779c64cd48f824 (tag: tag-20180806_105137) Author: haoxiaofeng Date: Sat Aug 4 18:19:43 2018 +0800 补充引导链接格式提示 commit 02d7c9c22be7b4556541c5d81c5fe37a614b15e4 Author: 丁海波 Date: Sat Aug 4 18:15:25 2018 +0800 .widget-body fieldset label commit d720519b7ac2fae570bc5857ed0ea49d093ed2d1 Author: DuanEnJian Date: Sat Aug 4 16:24:40 2018 +0800 修改倒粉链接当前章节不倒粉 commit 3b2eff980df644849b59ee015bb67557c40900a3 Author: 丁海波 Date: Sat Aug 4 15:58:13 2018 +0800 智能推送 commit aaa97d05d14b3e173dab29a1bb86f6906983bfa6 Author: php-王凡昌 Date: Fri Aug 3 19:57:12 2018 +0800 压缩后台css commit badc91c1df5145ed929247aeb035e93015f4097f Merge: 81e1b3a17 2d538a6d5 Author: DuanEnJian Date: Fri Aug 3 19:01:01 2018 +0800 Merge branch 'dev-daofenurl' of 192.168.0.31:fe/cps into dev-daofenurl-merge commit 81e1b3a170da5c973b321360c52773df7944d46c Merge: cca0f9da7 54f9dc9aa Author: DuanEnJian Date: Fri Aug 3 18:40:38 2018 +0800 Merge branch 'dev-fix-table' of 192.168.0.31:fe/cps into dev-daofenurl-merge commit cca0f9da7ded52efe4bec985e7e4bff60ab60be2 Merge: 10752ed0d b7684924e Author: DuanEnJian Date: Fri Aug 3 18:39:27 2018 +0800 Merge branch 'dev-config' of 192.168.0.31:fe/cps into dev-daofenurl-merge # Conflicts: # application/index/controller/Fee.php commit 10752ed0dbd0d19164713ffae4db78d7615e8dd2 (tag: tag-20180803_154440) Author: DuanEnJian Date: Fri Aug 3 14:16:52 2018 +0800 修改线上问题 commit 3c1dcc0b4ad35967a9242bd9b771785570c12748 Author: DuanEnJian Date: Fri Aug 3 14:15:10 2018 +0800 修改线上问题 commit 30d805d14d1bca70b6f653bf2bfe8ab4dec7e797 Author: licc <45360682@qq.com> Date: Fri Aug 3 12:08:36 2018 +0800 新手充值修改 commit f8c0724d59ec97f178994ddb80851d0a1279b602 Author: DuanEnJian Date: Fri Aug 3 11:47:11 2018 +0800 修改线上问题 commit 8b93a415f44d46335dddf3c60b82c436fb03f6c8 (tag: tag-20180802_215028) Author: DuanEnJian Date: Thu Aug 2 16:13:12 2018 +0800 修改编辑代理商菜单域名判断BUG commit 2d538a6d56c96f234cfcb6b6065bba4eadd2abb6 Author: DuanEnJian Date: Thu Aug 2 10:55:48 2018 +0800 修改倒粉二维码返回逻辑 commit c3667905bcb65034e0632c281386ed725983587c (tag: tag-20180802_150008, tag: tag-20180802_104652) Author: DuanEnJian Date: Thu Aug 2 10:39:31 2018 +0800 修改支付获取配置问题 commit 7814597e24b97d7a7d2b0efc7ade8f18fce7eb36 Author: DuanEnJian Date: Wed Aug 1 22:05:04 2018 +0800 修改支付获取配置问题 commit 21cf64c4d9cf6f715e497fc6babb76dd1ccad273 Author: DuanEnJian Date: Wed Aug 1 15:50:16 2018 +0800 修改Index/Recharge，取值问题 commit f0c0361f97501593f015c0fce380001b73488ae3 Author: DuanEnJian Date: Wed Aug 1 13:19:56 2018 +0800 修改EasyWeChat内存溢出问题 commit a98b6a0e53c6daffac807b415fa718454d31ac51 Author: php-王凡昌 Date: Wed Aug 1 12:46:00 2018 +0800 服务号粉丝迁移 commit 60db034d0bf02d6ae13661cf55616d022c26cc61 (tag: tag-20180801_135020) Merge: 250750e63 74688edfe Author: haoxiaofeng Date: Tue Jul 31 21:59:07 2018 +0800 Merge branch 'dev-pzcaidan-tc' of http://192.168.0.31/fe/cps into dev-pzcaidan-tc commit 250750e638f6641dc9e8a7890e0fb83a42cd7b24 Author: haoxiaofeng Date: Tue Jul 31 21:58:09 2018 +0800 微信菜单业务/支付清缓存 commit 74688edfeb3c9d78361b1a215337b243c90ea725 Author: haoxiaofeng Date: Tue Jul 31 21:23:29 2018 +0800 判断清微信菜单业务/支付域名 commit 1939159d548d39d2e9e81e4c72917139aca7bbf1 Author: haoxiaofeng Date: Tue Jul 31 20:48:52 2018 +0800 非默认支付/业务编辑清缓存 commit e60eb87b8e4c144431ecb91655cbfc8d23abde23 Merge: 26dbf10da b53da0153 Author: DuanEnJian Date: Tue Jul 31 18:43:00 2018 +0800 Merge remote-tracking branch 'origin/dev-daofenurl' into dev-daofenurl commit 26dbf10dab9a7e2d31c4c2a6f68bb6702449245a Author: DuanEnJian Date: Tue Jul 31 18:40:55 2018 +0800 强制关注逻辑修改 commit 857d43a3dc09b46ce04761f627163d334303e5f4 Author: DuanEnJian Date: Tue Jul 31 18:36:00 2018 +0800 强制关注逻辑修改 commit b53da01533d0cdb2df85b0179224a22befc6a740 Author: haoxiaofeng Date: Tue Jul 31 18:00:15 2018 +0800 引导链接显示 commit e5d901f782ea5b8218b4ab368075c7e8e4a3e5eb Merge: 6b3c6f93e 75e36412a Author: DuanEnJian Date: Tue Jul 31 17:53:11 2018 +0800 Merge remote-tracking branch 'origin/dev-daofenurl' into dev-daofenurl commit 6b3c6f93e81ce5c7789357e4d4c1c01484aaaeb7 Author: DuanEnJian Date: Tue Jul 31 17:53:00 2018 +0800 强制关注逻辑修改 commit 75e36412ac6a7da72a0d19418222e0015320cbe7 Author: haoxiaofeng Date: Tue Jul 31 16:35:17 2018 +0800 承接公众号增加引导链接字段 commit ce4f79ef5258bb03576cc315a713badc9d51280f Author: DuanEnJian Date: Tue Jul 31 16:16:27 2018 +0800 修改微信授权检测问题 commit c92ead6ced6364f76e5b98f11d50770837105f97 Merge: 55dc58bf0 36cd03257 Author: DuanEnJian Date: Tue Jul 31 15:56:56 2018 +0800 Merge remote-tracking branch 'origin/dev-pzcaidan-tc' into dev-pzcaidan-tc commit 55dc58bf0ebe87a3144a739c93fb50705601aea7 Author: DuanEnJian Date: Tue Jul 31 15:56:48 2018 +0800 修改支付跳转逻辑添加业务域名判断 commit 36cd032578456ec673159a8e32e47448690fd7d4 Author: haoxiaofeng Date: Tue Jul 31 15:54:15 2018 +0800 添加渠道商菜单域名修复 commit 6b9f000c09e9134c20d79a999a2edb6f4303be29 Author: licc <45360682@qq.com> Date: Tue Jul 31 15:43:51 2018 +0800 暂存 commit eda10ff9909f3b468e95f4124c82ea121dd6a4c8 Merge: 47f3f52e3 ed04d4778 Author: DuanEnJian Date: Tue Jul 31 15:29:48 2018 +0800 Merge remote-tracking branch 'origin/dev-pzcaidan-tc' into dev-pzcaidan-tc commit 47f3f52e3ed8883c116fecced8ea8b51e0177edc Author: DuanEnJian Date: Tue Jul 31 15:29:36 2018 +0800 修改支付跳转逻辑添加业务域名判断 commit dafff67e0ec441c791a814ee7e24ee99179c220b Author: php-王凡昌 Date: Tue Jul 31 11:05:06 2018 +0800 屏蔽测试 commit ed04d4778eb33d9ad157534d1a1330e3cc9c31f0 Author: haoxiaofeng Date: Tue Jul 31 10:56:35 2018 +0800 添加渠道商菜单业务/支付域名校验 commit 2b9f4dd09a771c271836825a6f8e5edde292f257 Merge: ec670e1f6 7b55feb34 Author: DuanEnJian Date: Mon Jul 30 16:52:36 2018 +0800 Merge branch 'dev-fix-book-collect' of 192.168.0.31:fe/cps into dev-pzcaidan-tc commit afa96605ab4674a18402896d288fe63eb16eeafb Author: php-王凡昌 Date: Mon Jul 30 15:01:43 2018 +0800 增加线上env配置 commit ec670e1f601da8e5b82a4f3a8686051e9062423d Merge: c40794542 8adc00069 Author: DuanEnJian Date: Mon Jul 30 11:57:08 2018 +0800 Merge remote-tracking branch 'origin/dev-pzcaidan-tc' into dev-pzcaidan-tc # Conflicts: # application/admin/controller/referral/Book.php # application/admin/controller/referral/Many.php # application/admin/controller/referral/Referral.php # application/admin/controller/wechat/Autoreply.php # application/admin/controller/wechat/Response.php commit c407945421f7dacf5991c5aaa74b407e9597de04 Author: DuanEnJian Date: Mon Jul 30 11:55:23 2018 +0800 修改后台微信授权检测问题 commit 8adc00069daf2963ae089f9d23f894002ead2397 Author: DuanEnJian Date: Mon Jul 30 11:38:12 2018 +0800 修改后台微信授权检测问题 commit 635d1a3997a5777abd1ad50241241c7853e1ad92 Author: DuanEnJian Date: Mon Jul 30 11:18:38 2018 +0800 修改统计数据脚本 commit 7b55feb3438d809c130e5cdfd24b33e675979e52 Author: php-王凡昌 Date: Sat Jul 28 10:41:54 2018 +0800 修复当ssdb存在而mysql中无数据时，数组下标没有name导致报错问题 commit 3e75a462e8c99abbfad4023941d9df13d80c8e72 Merge: 55e1f582a 386d31421 Author: DuanEnJian Date: Fri Jul 27 19:23:57 2018 +0800 Merge branch 'dev-pzcaidan' of 192.168.0.31:fe/cps into dev-pzcaidan-tc commit 20ed7b7b95dd64f89162c1e54bebc221099d9790 (tag: tag-20180730_155119) Author: DuanEnJian Date: Fri Jul 27 18:19:36 2018 +0800 修改粉丝转移逻辑,修改参数问题AND toAarray commit 3b1a4911b43305edc219affe5812a63494f1dcdd Author: DuanEnJian Date: Fri Jul 27 17:38:25 2018 +0800 修改粉丝转移逻辑,添加中断流程控制 commit 55e1f582a962c259b1d9cd5d0d61283c51fcce3f (tag: tag-20180727_173723) Author: licc <45360682@qq.com> Date: Fri Jul 27 17:35:57 2018 +0800 重置list索引&重新计算total commit e48f872e3bb9f87bc75b39463c060583761fc265 Author: DuanEnJian Date: Fri Jul 27 17:10:27 2018 +0800 修改粉丝转移逻辑,添加新服务号粉丝OPENID判断是否存在 commit b7684924ea012a5e8b8b162a41f89f653ee9be59 Author: licc <45360682@qq.com> Date: Fri Jul 27 15:49:44 2018 +0800 暂存 commit 386d314215ad0c9f6febbceb518b0b1af8d5882c Author: licc <45360682@qq.com> Date: Fri Jul 27 12:00:20 2018 +0800 自定义菜单修改 commit 5a6c0e27ba368cb7fce43e2e726c7e450b93acb0 Merge: fa5de8fad fb58781fe Author: DuanEnJian Date: Fri Jul 27 11:32:13 2018 +0800 Merge remote-tracking branch 'origin/dev-pzcaidan' into dev-pzcaidan commit fa5de8fad74e43b3c0f15af6d36ca937b982e615 Author: DuanEnJian Date: Fri Jul 27 11:32:02 2018 +0800 添加支付跳转log commit fb58781fe759799f0dd117c9e4d11369525f07c3 Author: haoxiaofeng Date: Fri Jul 27 11:18:27 2018 +0800 暂存 commit d2d26060c671012d999f1e3853b40b0ce18d27ef Author: haoxiaofeng Date: Fri Jul 27 11:01:17 2018 +0800 微信菜单改为只能选择默认平台下业务/支付域名 commit cf47be46f147b1ef053cf62aeff1a1df1987fc93 Merge: 9bd0befed 86cbc4726 Author: licc <45360682@qq.com> Date: Thu Jul 26 21:45:37 2018 +0800 Merge branch 'dev-pzcaidan' of http://192.168.0.31/fe/cps into dev-pzcaidan commit 9bd0befedf50a8bb65eed2630dcb2e790d8c5cc4 Author: licc <45360682@qq.com> Date: Thu Jul 26 21:45:28 2018 +0800 暂存 commit 86cbc47262679b8f19c9fda7ef94978a6dc21af2 Author: DuanEnJian Date: Thu Jul 26 21:34:09 2018 +0800 修改脚本AND支付域名跳转 commit da3e837817aa85c71e431deb1083276fd48f5502 (tag: tag-20180726_190222) Author: DuanEnJian Date: Thu Jul 26 17:26:48 2018 +0800 修改菜单管理逻辑问题 commit 7b3ac3409123f87c28dfc196b26e088e851fbe99 Author: haoxiaofeng Date: Thu Jul 26 15:19:23 2018 +0800 去重 commit 15e48425ed6bb0eb721eaeda1f27583e589863a8 Author: haoxiaofeng Date: Thu Jul 26 15:00:40 2018 +0800 书籍列表修复 commit 1b34d438b0c8514815e2b5320c409686212ad057 Merge: c8ae877b1 6fc278164 Author: licc <45360682@qq.com> Date: Thu Jul 26 14:36:33 2018 +0800 Merge branch 'dev-pzcaidan' of http://192.168.0.31/fe/cps into dev-pzcaidan commit c8ae877b155bcd07679c8361ecfe94ef3cd050a4 Author: licc <45360682@qq.com> Date: Thu Jul 26 14:36:22 2018 +0800 关闭业务域名提醒修改相关用户微信菜单 commit 6fc2781643ed435c5d553af1441bc8a1f199e459 Author: DuanEnJian Date: Thu Jul 26 14:26:10 2018 +0800 修改command脚本,修改菜单逻辑 commit dff601a1e57e9fe79d419be6c1882dad5cb88050 Merge: ee755503a f44801988 Author: DuanEnJian Date: Thu Jul 26 14:11:14 2018 +0800 Merge remote-tracking branch 'origin/dev-pzcaidan' into dev-pzcaidan commit ee755503a61b3490bf8fa417beba651adf03d04f Author: DuanEnJian Date: Thu Jul 26 14:11:01 2018 +0800 修改command脚本,修改菜单逻辑 commit f44801988da6b9a6d16939b1157cf77fd57f4148 Author: haoxiaofeng Date: Thu Jul 26 12:09:56 2018 +0800 菜单域名配置验证 commit f3368b9b2d0bd59197b5272d7cfcf40a31e231fa Author: haoxiaofeng Date: Thu Jul 26 11:41:48 2018 +0800 新增字段显示 commit f71f278c124f088e5f701cff77cbc4c7044f8acc Author: haoxiaofeng Date: Thu Jul 26 11:29:04 2018 +0800 菜单业务/支付域名存入getAdminInfoAll commit 8133c2d334e8e1844c79fce9ef1455133440e213 Author: haoxiaofeng Date: Thu Jul 26 11:03:30 2018 +0800 暂存 commit fb9dccf633847a19757ee25ebc820663970c3911 Author: licc <45360682@qq.com> Date: Thu Jul 26 10:49:01 2018 +0800 编辑内容清除默认key commit 01b8a72afa6b0922fe177702207458727d9207e4 Author: licc <45360682@qq.com> Date: Wed Jul 25 21:34:04 2018 +0800 暂存 commit 5a9ef6b11a67f6b2297c9597a90e45d7590e568c Author: licc <45360682@qq.com> Date: Wed Jul 25 21:23:50 2018 +0800 内容更新清缓存 commit 54f9dc9aa6dc50372ca83d93246f1115475277cd Author: php-王凡昌 Date: Wed Jul 25 21:22:51 2018 +0800 压缩css commit 96c730d56b2b657dbd88683c9b2ea7f7e06e067b Author: 丁海波 Date: Wed Jul 25 21:17:52 2018 +0800 1111 commit 4c9f92505401a42ce2e702831eb85f2f81d59b0c (tag: tag-20180727_115721) Author: php-王凡昌 Date: Wed Jul 25 20:54:11 2018 +0800 修正最终判断逻辑 commit 35cb45018b1e7d866dd55153a160d555116e7fa3 (tag: tag-20180725_202416) Author: php-王凡昌 Date: Wed Jul 25 20:23:12 2018 +0800 修改sql输出位置 修正历史数组数据清空 commit 173b3ea536db1355d333ec53d6e2ef3b77eec455 Author: DuanEnJian Date: Wed Jul 25 20:18:46 2018 +0800 修改统计逻辑 commit a59fec02af38153b8e0b66b1affaada1b45c451e Author: licc <45360682@qq.com> Date: Wed Jul 25 20:15:03 2018 +0800 暂存 commit d6bbb7a79600155f5ad88c9287219dd916324a87 Author: DuanEnJian Date: Wed Jul 25 19:58:49 2018 +0800 修改统计逻辑 commit 61b11a2d43c3c96c257450e38ee9ac02d671ffa5 (tag: tag-20180725_193225) Merge: 956f50dc4 34cfcedc3 Author: php-王凡昌 Date: Wed Jul 25 19:28:08 2018 +0800 Merge branch 'dev-transfer' of 192.168.0.31:fe/cps into dev-transfer-merge commit 0933b5070cd67a188348bea5374d669b2aca3c65 Author: haoxiaofeng Date: Wed Jul 25 19:09:02 2018 +0800 暂存 commit db6f3232394245528404821480c33574a66f36dc Author: DuanEnJian Date: Wed Jul 25 19:04:08 2018 +0800 修改统计逻辑 commit 3c7a24c46361701ba02ee1681118fe460f77c301 Author: haoxiaofeng Date: Wed Jul 25 18:17:38 2018 +0800 暂存 commit 1ccb81dc6743e56b22c18b0794b186623e5097b9 Merge: 988d79295 f09082da6 Author: haoxiaofeng Date: Wed Jul 25 17:10:02 2018 +0800 Merge branch 'dev-pzcaidan' of http://192.168.0.31/fe/cps into dev-pzcaidan commit 988d79295c3d8717702a35e9f1f61e90fabdee46 Author: haoxiaofeng Date: Wed Jul 25 17:07:05 2018 +0800 渠道商/代理商增加微信菜单域名配置 commit f09082da67c33ab02ab906d981b38a54ae5444aa Author: DuanEnJian Date: Wed Jul 25 16:47:38 2018 +0800 前台入口302跳转判断是否是自定义菜单域名OR支付域名 commit ee90fbce534c42adc2521c1b05c1cfcd6e0936e0 Merge: 956f50dc4 8d967554a Author: DuanEnJian Date: Wed Jul 25 14:38:42 2018 +0800 Merge branch 'dev-op-tc' of 192.168.0.31:fe/cps into dev-op-merge # Conflicts: # application/admin/controller/Withdraw.php # application/api/controller/Wechat.php commit 348c6c6014c86b485a17ff51f7c4098751fb8196 Author: DuanEnJian Date: Wed Jul 25 13:47:21 2018 +0800 暂存 commit 8d967554a0be1146a71052f962c916b7a9f90fff Merge: 043c1030e bcc7df877 Author: DuanEnJian Date: Tue Jul 24 17:49:34 2018 +0800 Merge remote-tracking branch 'origin/dev-op-tc' into dev-op-tc commit 043c1030e47d57d5dca45093176356864f3ec51f Author: DuanEnJian Date: Tue Jul 24 17:49:15 2018 +0800 修改脚本问题 commit bcc7df8776fbc8096fc653e4a5daded6153c0c20 Author: licc <45360682@qq.com> Date: Tue Jul 24 17:07:39 2018 +0800 暂存 commit 850cc32ab36cc6d06f406d46c16ffefc2cbfb849 Author: licc <45360682@qq.com> Date: Tue Jul 24 16:29:05 2018 +0800 暂存 commit b44019bd0727fafb8c28ecbf60fc680440414428 Author: DuanEnJian Date: Tue Jul 24 11:24:56 2018 +0800 修改脚本问题 commit 32c020f9ec0db67df5b515b1c2e9f8a2a3c942bb Author: haoxiaofeng Date: Tue Jul 24 11:20:17 2018 +0800 书籍统计数据bug修复 commit 0365c083f65845e0d57b634aea5fb4bf78839d88 Author: haoxiaofeng Date: Tue Jul 24 11:13:25 2018 +0800 bc时间改回前一天 commit bd8919e035a9091a467840411c5408db330811b1 Author: haoxiaofeng Date: Mon Jul 23 21:40:32 2018 +0800 列表修改 commit 956f50dc4df329950ed07059d031111c37239eb1 (tag: tag-20180723_213411) Author: DuanEnJian Date: Mon Jul 23 18:19:39 2018 +0800 Revert "修改多域名问题" This reverts commit e5198c022f298b442049a02efd7ae848f63dd673. commit e5198c022f298b442049a02efd7ae848f63dd673 Author: DuanEnJian Date: Mon Jul 23 18:10:58 2018 +0800 修改多域名问题 commit 34cfcedc3f2d62f924032da973aea28a7b6b3a21 Author: haoxiaofeng Date: Mon Jul 23 15:47:23 2018 +0800 暂存 commit 28f3bbe3907c44fdcbcd338dc7e20257fce545b0 Author: haoxiaofeng Date: Mon Jul 23 14:06:55 2018 +0800 去掉批量修改 commit 7dc87421e8db32f11c4fbc71bda45a912863f1d8 Author: DuanEnJian Date: Mon Jul 23 13:45:06 2018 +0800 修改微信推送默认平台判断逻辑,走缓存 commit caa4fa168e24be3ead3bbeb51b1b0c9e9aca74b9 Author: haoxiaofeng Date: Mon Jul 23 13:41:27 2018 +0800 暂存 commit ec9c3ff0751149ba764f1bc8a40f3b87f96e4eab Author: haoxiaofeng Date: Mon Jul 23 12:12:23 2018 +0800 平台增加授权域名字段 commit 9a0ec39b374814abed28d62a89b473b60b6ff085 Author: DuanEnJian Date: Mon Jul 23 11:57:55 2018 +0800 修改调用授权页面时授权域名的获取方式 commit e610fd16f83b66ce96e5b7249b2a2b4678dc22a6 Author: DuanEnJian Date: Mon Jul 23 11:45:15 2018 +0800 修改推广链接书籍判断逻辑 commit 38cd6dabd5df65b2846a3dfa8d2fb48b14266106 Author: DuanEnJian Date: Mon Jul 23 11:34:27 2018 +0800 修改微信回复平台检测问题 commit a902f672d3d29cf453660a74dcb123e8f786f51c Author: licc <45360682@qq.com> Date: Thu Jul 19 12:59:42 2018 +0800 暂存 commit 54218ba25eed4b00b971478b74682b9101a6a8d0 Merge: a7d2ce5ae d1f1795ab Author: haoxiaofeng Date: Thu Jul 19 11:51:59 2018 +0800 Merge branch 'dev-transfer' of http://192.168.0.31/fe/cps into dev-transfer commit a7d2ce5ae0c25b28a1cf1515575867d4870bf9db Author: licc <45360682@qq.com> Date: Thu Jul 19 11:34:32 2018 +0800 shell修改 commit d1f1795abb57642343520c69ce53c2bd420c4da8 Author: DuanEnJian Date: Thu Jul 19 10:14:46 2018 +0800 修改粉丝转移逻辑 commit ed5ad0d0fec0ac9317e8417e83a673cba5fb55d3 Author: haoxiaofeng Date: Wed Jul 18 21:05:30 2018 +0800 暂存 commit 96c35a8d343950beab8bcde9ff277735e739616e (tag: tag-20180718_201245) Author: licc <45360682@qq.com> Date: Wed Jul 18 19:59:38 2018 +0800 admin->id commit f170286cde3f6b8bf556d33e65f7c440e75b6217 Author: DuanEnJian Date: Wed Jul 18 18:21:10 2018 +0800 日志 commit b7d16c2ef66ee2deb70b12b784402a1c8e5c923b Author: DuanEnJian Date: Wed Jul 18 16:48:30 2018 +0800 修改日志 commit 5ffb16be0ba02bf689865708ca58bdd4bae0e0e9 Author: DuanEnJian Date: Wed Jul 18 16:42:22 2018 +0800 添加统计用户时,微信数据记录 commit 943dd854ccd39f5e0f36ac6af2bd074212bff83f Merge: 3e50f63fb a4c7ae759 Author: haoxiaofeng Date: Wed Jul 18 16:00:23 2018 +0800 Merge branch 'dev-transfer' of http://192.168.0.31/fe/cps into dev-transfer commit 3e50f63fbc3443d31949c3741e7f617e67fe6adc Author: licc <45360682@qq.com> Date: Wed Jul 18 15:47:46 2018 +0800 获取指定渠道商服务号下用户openid commit a4c7ae759240cb380897945c55b65dbbd4085c62 Author: DuanEnJian Date: Wed Jul 18 15:37:44 2018 +0800 微信粉丝转移功能 commit 182b7cd1c3da60adf145feaa0b4d39d741fb6236 (tag: tag-20180718_174854) Author: licc <45360682@qq.com> Date: Wed Jul 18 14:29:07 2018 +0800 隐藏公告运营可见 commit 3e9a4bb5cd904cc0e6663ca82243e4d4d1ff12a3 Author: licc <45360682@qq.com> Date: Wed Jul 18 14:14:19 2018 +0800 暂存 commit c8a701c11ef302638e2b15f083cf357fe12d2cd2 Author: licc <45360682@qq.com> Date: Wed Jul 18 11:25:18 2018 +0800 暂存 commit 3a4d9f32f2836cfaa881937787402a1e79b47df5 Author: licc <45360682@qq.com> Date: Wed Jul 18 10:57:43 2018 +0800 建立模型 commit dff992324ce173b6cbbca72ec2b1fa7e84906d26 Merge: 552384254 1eda5e864 Author: php-王凡昌 Date: Wed Jul 18 01:07:12 2018 +0800 Merge branch 'dev-referral-hotfix' of 192.168.0.31:fe/cps into dev-referral-hotfix-merge commit 5523842547ac5c1ffd94067cd728c3f00e8731a2 (tag: tag-20180717_220148) Author: php-王凡昌 Date: Tue Jul 17 22:01:33 2018 +0800 修改js字符串拼接语法 commit 1e5bf61a35898e22c5b7c26d300959afe87b2ed3 (tag: tag-20180717_212456) Author: php-王凡昌 Date: Tue Jul 17 21:17:16 2018 +0800 屏蔽书籍禁止添加推广链接 commit 1eda5e864855bff89e31e637ef5e6a3643326e24 Merge: 83935252b 7db4854b0 Author: php-王凡昌 Date: Tue Jul 17 19:04:09 2018 +0800 Merge branch 'dev-fix-auth' of 192.168.0.31:fe/cps into dev-referral-hotfix commit 97ee5fd60a0b29e0f09221f8d0f7af85126c7589 Author: licc <45360682@qq.com> Date: Tue Jul 17 17:46:07 2018 +0800 提醒默认开启修复 commit 83935252b519f79a9d89266638aff24ee237befc Author: haoxiaofeng Date: Tue Jul 17 17:08:21 2018 +0800 adminextend 清除key commit f4d966d2e0ff65aab6c5f82dfdf8957c19b6f704 Merge: cded7fbd2 4b2f9f6d4 Author: php-王凡昌 Date: Tue Jul 17 14:11:40 2018 +0800 Merge branch 'dev-showplatform' of 192.168.0.31:fe/cps into dev-referral-hotfix commit cded7fbd22a9de279b0efa025b94fe7e11e167f8 Merge: cce13d56e caf98509d Author: php-王凡昌 Date: Tue Jul 17 14:07:32 2018 +0800 Merge branch 'dev-referral' of 192.168.0.31:fe/cps into dev-referral-hotfix commit 7db4854b0a47f2865ddb7bc43a0b0c04b72674aa Author: DuanEnJian Date: Tue Jul 17 13:49:16 2018 +0800 修改授权时菜单问题 commit cce13d56e0755b4ae5b1a0cb1ba5ec1d60637917 (tag: tag-20180717_123641) Merge: b81158c64 1d4aa5608 Author: DuanEnJian Date: Tue Jul 17 12:02:45 2018 +0800 Merge branch 'dev-fix-color' of 192.168.0.31:fe/cps commit 19deddf55431ecd47ed434128fa734f5446cbcfc Author: haoxiaofeng Date: Tue Jul 17 11:56:29 2018 +0800 ssdb 字段名修改 commit caf98509d9f23c14b7e3412a60188ab9bb1fcc44 Author: haoxiaofeng Date: Tue Jul 17 11:02:01 2018 +0800 去除cookie用户信息判断 commit 1d4aa560840d1584eae8693d9aeadfd55237bdf7 Author: DuanEnJian Date: Mon Jul 16 21:06:07 2018 +0800 test commit 6be6ea65178b2da2b5c42344873c7c73e7300b02 Author: haoxiaofeng Date: Mon Jul 16 18:47:57 2018 +0800 referral清key commit da9f056d622139094f6b360018c17593337f42f5 Author: haoxiaofeng Date: Mon Jul 16 18:36:38 2018 +0800 Revert "referral清key" This reverts commit 5eb00a0aa09e796100cbe416b116a369afba2620. commit 5eb00a0aa09e796100cbe416b116a369afba2620 Author: haoxiaofeng Date: Mon Jul 16 18:35:15 2018 +0800 referral清key commit 90f11290e8f98b18b17b4bf4d33f17ca9d504b4f Author: DuanEnJian Date: Mon Jul 16 18:24:42 2018 +0800 修改ManagerKey的toArray问题 commit b81158c645ab3f92b56b6063fb257b97b27a9983 (tag: tag-20180716_190158) Author: php-王凡昌 Date: Mon Jul 16 17:32:28 2018 +0800 刷新用户agent_id关联关系 commit 4b2f9f6d4f43c6e22b8f16585f24dab494bf9237 Author: haoxiaofeng Date: Mon Jul 16 17:25:02 2018 +0800 暂存 commit 2d43c3ec9a4e73ae3470157da56df28c57bd820b Author: haoxiaofeng Date: Mon Jul 16 17:15:46 2018 +0800 暂存 commit d79c483bc46581b076d8c42e6fa1ec3ce2f9ce50 Author: haoxiaofeng Date: Mon Jul 16 17:03:08 2018 +0800 公告列表 & 公告弹窗过滤 commit 8ed8e73d793c7664aefe20ebaadbd1ec337e6c5e Author: DuanEnJian Date: Mon Jul 16 16:36:52 2018 +0800 去代理商掉客服消息管理菜单 commit cb71e22bbcebd8a105726bc67b8990042f37f9ec (tag: tag-20180716_163345) Author: php-王凡昌 Date: Mon Jul 16 16:33:17 2018 +0800 修改跳转逻辑，判断参数是否正确 commit bab44b0d4e77a5df0efeef3cc86a8444cadfd2ea Author: haoxiaofeng Date: Mon Jul 16 15:09:25 2018 +0800 bug修改 commit 7ad52a7ba41e265a792251765b50389caf545abb Author: haoxiaofeng Date: Mon Jul 16 14:48:34 2018 +0800 微信菜单名称不为空验证 commit 4de14ad181bf86329a6dac6192a3cb25f5c3124d Author: haoxiaofeng Date: Mon Jul 16 14:35:04 2018 +0800 菜单初始化高度 commit ef7237239721f6e2fb5db244e4c680a67e8fcbfc Author: DuanEnJian Date: Mon Jul 16 13:56:33 2018 +0800 修改提示文字 commit 950bca2bf446d0c051c5aecacf01900c8ec3e81a (tag: tag-20180716_140337) Author: php-王凡昌 Date: Mon Jul 16 13:55:51 2018 +0800 充值域名下携带agent_id跳转 commit 663fd7e79e670170440864e1b92145af8133328d Author: haoxiaofeng Date: Mon Jul 16 13:40:37 2018 +0800 渠道商/代理商 平台信息展示修改 commit 45a34719843d2d163f19da2907019ae5199ef782 Merge: 24d2dfe4c b75329b14 Author: php-王凡昌 Date: Mon Jul 16 13:36:47 2018 +0800 Merge branch 'dev-fix-sfsq' of 192.168.0.31:fe/cps into fix-url-bug commit 24d2dfe4c3318b4c924e19ec2ac7b2b4a37dba55 Author: DuanEnJian Date: Mon Jul 16 11:44:00 2018 +0800 修改AdminConfig缓存问题 commit a047e8e66f2369c7e9834e0f82c889dcafcf0b1c Author: DuanEnJian Date: Mon Jul 16 11:29:59 2018 +0800 修改推广链接问题 commit b75329b14d6341072f56f7f29bf4a499a98667be Author: php-王凡昌 Date: Sun Jul 15 15:12:36 2018 +0800 修复三方平台判断 commit 12f34de8cbe4b7cb47e213b73d1bd4d4f6dccfd1 Author: php-王凡昌 Date: Sat Jul 14 20:20:25 2018 +0800 增加微信跳转loading效果 commit 5ca07b1bf74a9b58586cd8cb597eafc6e5569cb3 Author: php-王凡昌 Date: Sat Jul 14 19:02:06 2018 +0800 重新打包后台压缩min css commit 4c970dd5f0f7723082f1206baff2ef26e12eb131 Author: 丁海波 Date: Sat Jul 14 18:58:58 2018 +0800 手机列表table样式修改 commit b817677d13747ccd4ce13f9bf8e6d8a399866ba2 Author: 丁海波 Date: Sat Jul 14 18:53:43 2018 +0800 渠道商table 文字强制不换行 commit 863bd8eef10c2f6ae2d75b9fc0380aac556c820c Author: haoxiaofeng Date: Sat Jul 14 18:48:35 2018 +0800 优化 commit 97d91e2e819658b59b215589073b291c1ea31cf1 Author: php-王凡昌 Date: Sat Jul 14 17:58:46 2018 +0800 普通代理商屏蔽部分菜单 commit 49e449bdbb808929aa4f08122e20063b4e02f7cb Merge: f13112300 965da22bd Author: 丁海波 Date: Sat Jul 14 17:37:57 2018 +0800 Merge remote-tracking branch 'origin/dev-fix-color' into dev-fix-color commit f13112300fcb2c1647e45ed14cf079b952d79b2f Author: 丁海波 Date: Sat Jul 14 17:37:48 2018 +0800 分配平台 样式修改 commit 1e351163a98c023b02743790701d1ef4cf064da0 Author: haoxiaofeng Date: Sat Jul 14 17:35:09 2018 +0800 path commit 965da22bde2cffa34d7efaf1804da7e651616fff Merge: b54f1877e 7350b3bef Author: php-王凡昌 Date: Sat Jul 14 17:32:48 2018 +0800 Merge branch 'dev-fix-color' of 192.168.0.31:fe/cps into dev-fix-color commit b54f1877e2c711527098b855ecb29ea67cd49548 Author: php-王凡昌 Date: Sat Jul 14 17:32:03 2018 +0800 修复页面标题设置表单name值错误 commit 23f88a8e564af7a6fb2eda0f3a7d367eb5549c09 Author: haoxiaofeng Date: Sat Jul 14 17:31:38 2018 +0800 redirect commit 7350b3bef58b49b404c6cbc4d150271e7364c9d9 Author: 丁海波 Date: Sat Jul 14 17:29:42 2018 +0800 抽成比例取消上下滚动变化数值功能 commit 387e5c33a50941da67b2f7d76008f8b3770935ea Author: php-王凡昌 Date: Sat Jul 14 17:27:25 2018 +0800 cdn开关修复 修改一部分js cdn commit e1364df8454bb00d45bb94090883fe90d5c0fa0c Author: 丁海波 Date: Sat Jul 14 17:24:07 2018 +0800 table min 修改 commit 7deade13c657ea4eb2f249c692e8907499075718 Author: 丁海波 Date: Sat Jul 14 17:00:00 2018 +0800 指定跳转到第几页 commit 3ba5c7978b7937c9e4d1e42927739e7314597bc9 Author: haoxiaofeng Date: Sat Jul 14 16:47:31 2018 +0800 暂存 commit d33f1452488a52a540bb1a11dd3133928f8a021b Author: haoxiaofeng Date: Sat Jul 14 16:06:05 2018 +0800 暂存 commit 54b3db094690f7433bad1c68e65f644186cfc1f7 Author: haoxiaofeng Date: Sat Jul 14 15:44:00 2018 +0800 referral重写 commit 9145d2131f8d040110af70adde6ef290c6622fd9 Author: 丁海波 Date: Sat Jul 14 15:23:22 2018 +0800 渠道商 手机样式 切换账号列表 默认颜色修改 commit aac62e9f76fb8632bd9f2f3c48ab8083da8e917c Author: 丁海波 Date: Sat Jul 14 15:05:10 2018 +0800 修改table跳转至多少页 commit ab9cdc4aa39320a92b6976401b7eb10a0213ce6f Author: php-王凡昌 Date: Sat Jul 14 14:45:57 2018 +0800 修正自定义菜单列表页渠道id参数 commit 425c6614b2b05cb95f47bfb43d250ae53e06d9c1 Author: DuanEnJian Date: Sat Jul 14 14:26:26 2018 +0800 修改userinfo获取openID错误问题 commit 19d6f22c8721ddd4b5a6c235ed65762421d3efba Merge: 08c1c86ec 656238ad4 Author: DuanEnJian Date: Sat Jul 14 13:40:36 2018 +0800 合并dev-op-merge 和 Master分支 commit 08c1c86ecce4689e5156f7295394373763bb5e50 (tag: tag-20180714_103042) Merge: b5af90f7d cafb8139a Author: php-王凡昌 Date: Fri Jul 13 21:00:48 2018 +0800 合并三方平台优化代码 commit cafb8139ad48f4a2528bd546ba81cbe131f17a83 Author: DuanEnJian Date: Fri Jul 13 20:20:05 2018 +0800 修改添加渠道商时数据丢失问题 commit 7a5db35f5a6a00d66cfd662a5cd448248b8a0125 Author: DuanEnJian Date: Fri Jul 13 19:59:42 2018 +0800 修改添加配号代理商问题 commit 8fcb888d75888ae928f1ec4b99217bced8ca31f7 Author: DuanEnJian Date: Fri Jul 13 18:23:48 2018 +0800 test commit 4d915c8262db5f4e1a28da3c84bd5865c61f01d0 Author: DuanEnJian Date: Fri Jul 13 18:12:37 2018 +0800 test commit a3fd3091bf374c08566825fc62ea0cf177117fe2 Author: DuanEnJian Date: Fri Jul 13 18:11:24 2018 +0800 test commit ca2115f04d4a4cdba21990d38ac88a056309664c Author: DuanEnJian Date: Fri Jul 13 17:59:27 2018 +0800 修改js commit f9199ae45f6c0a53508990a0b6d2463264a5ed38 Author: DuanEnJian Date: Fri Jul 13 17:12:30 2018 +0800 修改js问题 commit 8b875c10d2f35fefb4e5ea14bbd151d031e01212 Author: DuanEnJian Date: Fri Jul 13 17:07:50 2018 +0800 修改渠道配置问题 commit 6d6bb4858761d0f5e779a05f26425525c5d127a5 Author: DuanEnJian Date: Fri Jul 13 15:37:10 2018 +0800 修改渠道添加时展示问题 commit b469aad3aa9fee6a92cc32a4f05f5c24e8a4d12b Author: php-王凡昌 Date: Fri Jul 13 14:33:08 2018 +0800 修改编辑渠道商时不能增加新勾选的三方 commit 391fed482d2b4346402c91b19c1cc193d627b5b3 Author: licc <45360682@qq.com> Date: Fri Jul 13 14:20:06 2018 +0800 解决问题 commit 984f73d6010c6e168bd5dbf12a648d58cc73e1d1 Author: licc <45360682@qq.com> Date: Fri Jul 13 10:56:07 2018 +0800 验证默认平台是否为空 commit ea9ffe0791b67c0aac2835319afe48329ac11f5d Author: DuanEnJian Date: Thu Jul 12 22:14:48 2018 +0800 修改打点日志 commit b091aa52b0d7970f9df0ed345f7a1fd4a30aa929 Author: DuanEnJian Date: Thu Jul 12 21:39:29 2018 +0800 修改添加配号代理商问题 commit 682a9d8ac434d81c44948371b9f78c9d054b039d Author: DuanEnJian Date: Thu Jul 12 21:35:25 2018 +0800 修改添加配号代理商问题 commit 39c5369c8c9505d209cf46100fd1aa60b39cad5c Merge: aa2b29839 db02361a8 Author: licc <45360682@qq.com> Date: Thu Jul 12 20:35:35 2018 +0800 Merge branch 'dev-kl3' of http://192.168.0.31/fe/cps into dev-kl3 dd commit aa2b2983958d678527b050dff0636c1987d1092d Author: licc <45360682@qq.com> Date: Thu Jul 12 20:35:21 2018 +0800 去掉toArray commit 7b402f981032ff2929de5566e35b73df98a8cd55 Author: DuanEnJian Date: Thu Jul 12 20:32:49 2018 +0800 修改渠道商二维码展示问题 commit db02361a82cb5bb496f8fb778a3a909d184ed390 Author: DuanEnJian Date: Thu Jul 12 19:33:55 2018 +0800 去掉AdminConfig toArray commit 8f4773a0cc8ed2eeb571fb6aeb96efe592d5a1e2 Author: haoxiaofeng Date: Thu Jul 12 16:09:01 2018 +0800 小括号修改 commit 072f154e58a29007aba3a7e22c3539eee76b066a Author: licc <45360682@qq.com> Date: Thu Jul 12 15:42:30 2018 +0800 修改模板消息错误提示 commit 707a97ae45c4544cd786258635481e6e275de76f Author: licc <45360682@qq.com> Date: Thu Jul 12 15:38:36 2018 +0800 t commit c38e31df32eab563483266fe0011238d73dbc50e Author: haoxiaofeng Date: Thu Jul 12 15:08:25 2018 +0800 活动弹窗时间修改 commit 2776dcf4145a8e0b9f4a9c6020f11b4c134e6188 Author: DuanEnJian Date: Thu Jul 12 12:13:04 2018 +0800 添加处理自定义二维码问题 commit 08729ecabda6fa34a8ee53a4a49c4bb888fe52df Author: DuanEnJian Date: Thu Jul 12 11:18:50 2018 +0800 test commit 9c1d8b4df6d7a01de15ac8275dad7b98d6fe367d Author: DuanEnJian Date: Thu Jul 12 10:26:37 2018 +0800 test commit f9d2ba750f6657d6dde9693fc9af7fc00b12f59a Author: DuanEnJian Date: Wed Jul 11 21:17:45 2018 +0800 test commit 665e0623400ba0bb954190103ae030c88101ee4a Author: DuanEnJian Date: Wed Jul 11 21:05:49 2018 +0800 test commit 05ad48ccec82f0718fb3ed2aeac5619602b2bc0d Author: DuanEnJian Date: Wed Jul 11 20:54:17 2018 +0800 修改打点问题 commit c6015ff881f2545f6b4b89e4c3c34f61b2f4dcc4 Author: haoxiaofeng Date: Wed Jul 11 20:40:39 2018 +0800 书籍对渠道商/代理商不可见 commit 65d971838a5d23b6c493b673873e0b13a8863112 Author: DuanEnJian Date: Wed Jul 11 20:33:39 2018 +0800 添加微信接口调用时间打点 commit 43137bed988ccb28e0036db2974b57b79450d72d Author: 丁海波 Date: Wed Jul 11 20:16:12 2018 +0800 举报添加手机好字段 commit e71d91c8ab256e2e955f414e52caed518edf3267 Author: 丁海波 Date: Wed Jul 11 19:51:14 2018 +0800 sf 置顶改为悬浮 commit 6cec7426c0dde5d999fcd0739d694bf560c0b869 Author: DuanEnJian Date: Wed Jul 11 18:14:24 2018 +0800 修改多账号绑定同一服务号问题 commit a0aedf5a7f3d46d8aeff9f16a6c995f0a227f163 Merge: 904dcdf6d cf753428f Author: 丁海波 Date: Wed Jul 11 15:54:14 2018 +0800 Merge remote-tracking branch 'origin/dev-platform-tc' into dev-platform-tc commit 904dcdf6d648b27149e0bfef86a15a56817719da Author: 丁海波 Date: Wed Jul 11 15:54:04 2018 +0800 loading commit cf753428f75317d46b54b9fcb178e1de61cbbee0 Author: 45360682 <45360682@qq.com> Date: Wed Jul 11 15:41:54 2018 +0800 暂存 commit 71dc972659dec67da402105ccf49cf6ca089f6af Author: haoxiaofeng Date: Wed Jul 11 14:55:37 2018 +0800 继续阅读chapter_id改为sid 书籍增加对渠道商/代理商隐藏字段 commit b5af90f7da33d76de6a3710f4fd06fc21d3ac590 Author: 45360682 <45360682@qq.com> Date: Wed Jul 11 14:26:27 2018 +0800 修改getAdminInfoAll方法，去掉toArray() commit 51eb6487e4f87a9673c51be83809cf1fa68e5052 Author: haoxiaofeng Date: Wed Jul 11 12:13:37 2018 +0800 打款管理批量修改状态 commit 26ebf5d6d55d6b55508d1df1bf4e307a6cd392ac Author: DuanEnJian Date: Wed Jul 11 10:18:15 2018 +0800 扣量逻辑修改 commit 71d19b1a754c8f80eab9074f75685334ba9cc4a6 Author: 45360682 <45360682@qq.com> Date: Tue Jul 10 21:29:20 2018 +0800 测试 commit 5a94fca144bfede6aa67e993a8866ac75a428d72 Author: 45360682 <45360682@qq.com> Date: Tue Jul 10 21:11:06 2018 +0800 测试 commit 4cd7d0ae2075cd04760a3e59cc898a4b1f8d2713 Author: 45360682 <45360682@qq.com> Date: Tue Jul 10 21:08:48 2018 +0800 测试 commit 8fd6529bbed5f05eb150c98e3d2d8611ec6a80dc Author: 45360682 <45360682@qq.com> Date: Tue Jul 10 21:07:11 2018 +0800 测试 commit 710e7c4790ebbca802f944b1717949200d61b488 Author: 45360682 <45360682@qq.com> Date: Tue Jul 10 21:05:00 2018 +0800 测试 commit 98cbf7d00e4b879b4c9ae869900572fb3f73c41b Author: 45360682 <45360682@qq.com> Date: Tue Jul 10 21:00:32 2018 +0800 测试 commit d6c2c7467bbaedd7d0d06510f0a7c052233edec4 Author: haoxiaofeng Date: Tue Jul 10 20:56:02 2018 +0800 书籍增加渠道商/代理商是否可见 commit 119aa942c1bfe3c0904082d9a0efcc65cadb3506 Author: haoxiaofeng Date: Tue Jul 10 20:08:29 2018 +0800 活动配置增加弹窗时间 commit 397a25efc7df54458004e4bb83ccdb841e41b313 Author: DuanEnJian Date: Tue Jul 10 19:35:40 2018 +0800 修改授权页面 commit f3242c619b75e71cc4f083ec59c7b51241ce8947 Author: php-王凡昌 Date: Tue Jul 10 19:14:46 2018 +0800 拆分阅读页多主题HTML commit c0df23b3fa0775dfff0ccadeb6a353b4113c7860 Author: DuanEnJian Date: Tue Jul 10 17:59:05 2018 +0800 添加白名单逻辑处理 commit 3fe6997ccef9be4eaaafaf0c23f636e5d6fcb806 Author: php-王凡昌 Date: Tue Jul 10 17:18:48 2018 +0800 前台总框架，js移动到底部，rem字体大小计算只在开始引入一次 阅读页css，js直接写入页面内 commit ddb09f1f4e0c06fcacaf44687a77f1258731f70d Author: haoxiaofeng Date: Tue Jul 10 16:55:11 2018 +0800 1.小说中心，渠道商/代理商字段过滤 2.赏金注册页面平台名称动态 3.登录页背景图片自定义 commit 770ad4fad0cb3773560de286810e0e58f8c68fac Author: 45360682 <45360682@qq.com> Date: Tue Jul 10 14:58:00 2018 +0800 修改新增配号代理商 commit e8e4c1a21cbb682758543f51673c6fb86b4431f7 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 20:39:36 2018 +0800 活动支付加支付说明信息 commit 656238ad42b6cd2489abd26538cc334f5f542fa4 Author: DuanEnJian Date: Mon Jul 9 20:37:20 2018 +0800 修改合并问题 commit 5504b7e0abc12e6b0e573676470a34d9ce7c5815 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 20:35:42 2018 +0800 加支付说明信息 commit d11562aa9d79ee9ab0c0324cd629851159faf37f Author: DuanEnJian Date: Mon Jul 9 20:11:27 2018 +0800 修改合并问题 commit 779ed7b9fdfdd6a68e11088d64c0ec5e27f2a081 Merge: d19b83dd3 a1be1cd64 Author: DuanEnJian Date: Mon Jul 9 20:02:38 2018 +0800 合并dev-merge-zx分支 commit d19b83dd35e77efddda87dd5c8de16479281eed3 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 17:43:36 2018 +0800 改bug commit 50c801953c7dcd0bd301f493d28a4c671562271b Author: haoxiaofeng Date: Mon Jul 9 16:28:49 2018 +0800 excel字段过滤 commit e9d2d2cb40dc937df86d5576da5de08e63d1f7a6 Author: haoxiaofeng Date: Mon Jul 9 16:24:43 2018 +0800 excel导出 commit 0ce40ddd729d76a2cbd5e6808da92c63ff5d8d5b Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 14:52:30 2018 +0800 新增/修改 渠道商 平台排序改成倒序 commit 81f67fc8f9bd5e0b1d2af4a6a1f2fe6d06bd6753 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 14:28:06 2018 +0800 添加渠道商加入配号权限 commit ecebea490e0647cb7331743b2a1546601ebe641e Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 14:11:47 2018 +0800 添加/编辑渠道商加入入口域名选择 commit 60387bb0e534e99a0f2e007006c2a16d7c72aad8 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 13:38:14 2018 +0800 调整表单位置 commit 6e35478e87cae6f13a8d0b20e7f9129c62ce8f93 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 11:27:58 2018 +0800 优化。css加载时判断是否需要加载cdn commit c5936bb1c36a205120ecdb35c6413b4b3cd3e6df Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 10:47:37 2018 +0800 客服消息和模板测试粉丝时正则匹配数字部分作为用户id commit 3bb96625617f223aad3d19996ee3c9bd5d231409 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 10:46:38 2018 +0800 客服消息和模板测试粉丝时正则匹配数字部分作为用户id commit cce717347aeefdd13d86ce7b9a5cfe882244401d Merge: edcac36df 692ece443 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 10:30:49 2018 +0800 Merge remote-tracking branch 'origin/dev-platform-merge' into dev-platform-merge commit edcac36dff6286b17a61132f228406eac06de3e0 Author: 45360682 <45360682@qq.com> Date: Mon Jul 9 10:30:39 2018 +0800 客服消息和模板测试粉丝时正则匹配数字部分作为用户id commit 692ece443194206b2315d41b98d1fc3186c96385 Author: DuanEnJian Date: Sat Jul 7 18:15:24 2018 +0800 添加时间 commit a6d122cecb210795cd8360c67dcabd3ae9b31287 Merge: deaba554f 41d904b71 Author: 45360682 <45360682@qq.com> Date: Sat Jul 7 18:11:54 2018 +0800 Merge branch 'dev-platform-merge' of http://192.168.0.31/fe/cps into dev-platform-merge merge commit deaba554f31f25cccb6cd376c5baa3e76fc317ce Author: 45360682 <45360682@qq.com> Date: Sat Jul 7 18:11:35 2018 +0800 test commit 41d904b712277481e0a0a4cab74bb28785aa885f Author: DuanEnJian Date: Sat Jul 7 18:08:00 2018 +0800 修改授权流程bug commit 433d2cbaaa4c91503d2e16f38e8d4d880dc65776 Merge: fae22638f 567c2787e Author: 45360682 <45360682@qq.com> Date: Sat Jul 7 16:41:09 2018 +0800 Merge branch 'dev-platform-merge' of http://192.168.0.31/fe/cps into dev-platform-merge merge commit fae22638fb7e8687df80c35898c15e86cfc9214e Author: 45360682 <45360682@qq.com> Date: Sat Jul 7 16:40:49 2018 +0800 提交 commit 567c2787e7f1aecbd1d033cf60b93a6c04246499 Author: DuanEnJian Date: Sat Jul 7 16:14:04 2018 +0800 修改授权或重置相关问题 commit b87b482b7d8a10925d82f7ed7e32088f7f177fc4 Author: DuanEnJian Date: Sat Jul 7 15:55:37 2018 +0800 修改授权页面 commit a3d7ece71b6c91133710e6b7a898f909797b0d78 Merge: dc4dcef46 c43abb740 Author: DuanEnJian Date: Sat Jul 7 15:48:58 2018 +0800 Merge remote-tracking branch 'origin/dev-platform-merge' into dev-platform-merge commit dc4dcef469e4e8e801ce03af51dce114259cffff Author: DuanEnJian Date: Sat Jul 7 15:48:45 2018 +0800 修改授权页面 commit c43abb7406cbd451c3cb54ad11455824d61e1935 Author: haoxiaofeng Date: Sat Jul 7 15:38:14 2018 +0800 打款字段显示 commit 50e567017a6d1e8ec9506f9825e90282fec97687 Author: php-王凡昌 Date: Sat Jul 7 15:25:01 2018 +0800 截断过长的url log commit 874387281c1bc6ab53d14f1f4e409b21601eb41e Author: haoxiaofeng Date: Sat Jul 7 13:04:54 2018 +0800 标题修改 commit 4c13bb9fd383346e8c6b24618851ecf9ce6c22fe Author: haoxiaofeng Date: Sat Jul 7 13:01:55 2018 +0800 bug修复 commit 95eae63c43b80aabb4dac85cdd87d0a3d368b75a Merge: 007b220a7 58d20ffb6 Author: php-王凡昌 Date: Sat Jul 7 11:53:51 2018 +0800 Merge branch 'dev-platform-new' of 192.168.0.31:fe/cps into dev-platform-merge commit 58d20ffb6133020be52219937c4b6afb45aa8ce5 Merge: d64e1f47d 4bd47dcbb Author: haoxiaofeng Date: Sat Jul 7 10:55:20 2018 +0800 Merge branch 'dev-platform-new' of http://192.168.0.31/fe/cps into dev-platform-new commit d64e1f47d23f9db8c7be22075dcf89e20ddd27f9 Author: haoxiaofeng Date: Sat Jul 7 10:35:50 2018 +0800 统计菜单修改 commit 007b220a77e5b6aa7f35841535534dd9a10cc92a (tag: tag-20180706_212712, tag: tag-20180706_211814) Author: php-王凡昌 Date: Fri Jul 6 21:17:22 2018 +0800 增加单独检测admin的菜单状态 commit c8d4b3bb3bef562cc9c53056efb2958ea3bcbb27 Author: php-王凡昌 Date: Fri Jul 6 21:11:06 2018 +0800 替换as关键字，修改菜单状态正常返回 commit 682d9edcde9bcc04eba50d88afa7958ca419ca08 (tag: tag-20180706_205554) Author: php-王凡昌 Date: Fri Jul 6 20:55:06 2018 +0800 修改检查三方平台脚本 commit 9f5352f67ec15255bbddf3dbc22b28a5b6280b2d (tag: tag-20180706_200606) Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 19:51:26 2018 +0800 新增ptoken监控 修改公众号状态监控 commit 9ec2ea012ed66c5d254b744c7eb6aca792e777d4 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 19:38:22 2018 +0800 新增ptoken监控 修改公众号状态监控 commit 0dabec7495b37faab6b2fcb17176b87fe7a54b0a (tag: tag-20180706_192055) Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 18:59:02 2018 +0800 新增ptoken监控 修改公众号状态监控 commit 05501ad0a1fa828d4eac4cda479cd6bffe758ec6 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 18:48:01 2018 +0800 新增ptoken监控 修改公众号状态监控 commit 0b7d8b7c97bc0c053534af7e38fa2d45054c8b98 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 18:30:11 2018 +0800 新增ptoken监控 修改公众号状态监控 commit 5ed552a6772d12cf556dbe82183ca5b79390ef63 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 18:29:56 2018 +0800 新增ptoken监控 修改公众号状态监控 commit 1ae8002c82a7e589f8825ba115d1030e4cec4062 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 18:28:38 2018 +0800 新增ptoken监控 修改公众号状态监控 commit 4bd47dcbb9b41682002e0166361d71e3b854a8b5 Author: DuanEnJian Date: Fri Jul 6 17:07:38 2018 +0800 配号代理商查看添加重置 commit e13ec1aa8c7016b1eb59b911487251d1832915f0 Author: DuanEnJian Date: Fri Jul 6 16:37:45 2018 +0800 重置添加确认信息 commit 7f12833732f7d16aab410db986d76f802cf26e8a Author: DuanEnJian Date: Fri Jul 6 16:30:37 2018 +0800 添加管理员和超管渠道管理中重置服务号 commit 73b85fb4c7ec4b69c701076dea2fa8120554265f Author: haoxiaofeng Date: Fri Jul 6 16:20:37 2018 +0800 代理商展示修改 commit 8d0e9e21f4e1a92c31f9109a93adfe9f8eee8a9e Merge: 843a727f0 3dfc2a41c Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 16:04:03 2018 +0800 Merge remote-tracking branch 'origin/dev-platform-new' into dev-platform-new commit 843a727f022001bc473b3ffac4429d8eb5e4b098 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 16:03:52 2018 +0800 refresh_token commit 3dfc2a41cc82b84b211d3829f8384768d9919f8e Merge: fa49e73aa 6824c850f Author: haoxiaofeng Date: Fri Jul 6 15:58:45 2018 +0800 Merge branch 'dev-platform-new' of http://192.168.0.31/fe/cps into dev-platform-new commit 6824c850f442059f1087bda02ab9ce4cacd24252 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 15:27:21 2018 +0800 test commit fa49e73aab0122f81c6e1ba1fad65820ce75ec6e Merge: fdd0cf068 26cea4008 Author: haoxiaofeng Date: Fri Jul 6 15:18:14 2018 +0800 Merge branch 'dev-platform-new' of http://192.168.0.31/fe/cps into dev-platform-new commit fdd0cf0680d36c0e0e35d40fa38d66d399e01d22 Author: haoxiaofeng Date: Fri Jul 6 15:17:51 2018 +0800 代理商controller修改 commit 26cea4008cb160ec4f95640e148a633cdd52ba89 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 14:51:27 2018 +0800 提交功能代码 commit 29b37dde972112fe0bddbf25012da7a2a049b224 Author: haoxiaofeng Date: Fri Jul 6 14:44:45 2018 +0800 渠道商字段补全 commit c72b5f448ed7ee35e897e36606486a2b0a0be8e0 Author: DuanEnJian Date: Fri Jul 6 14:09:35 2018 +0800 修改授权页面 commit 74f0f8fee209202bed8917920846b885cb2238b3 Author: haoxiaofeng Date: Fri Jul 6 12:17:03 2018 +0800 暂存 commit 047fce4852a14e76c0b03c51eb82cc1a77fc0ee2 Author: haoxiaofeng Date: Fri Jul 6 12:14:36 2018 +0800 渠道商字段显示修改 commit 7c95637ed0e7b4dec3afd2a1a1039c0bcfc69977 Author: DuanEnJian Date: Fri Jul 6 11:27:58 2018 +0800 修改路径问题 commit 4e7bceeb11ee0df90d1b652168e29b942b44b85b Author: DuanEnJian Date: Fri Jul 6 11:13:03 2018 +0800 去掉重置 commit 987fa84af39cca8c2a6e2fe414f8424b63c63429 Merge: 83cb52a48 069f18925 Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 10:53:40 2018 +0800 Merge branch 'dev-platform' of http://192.168.0.31/fe/cps into dev-platform-new # Conflicts: # application/admin/controller/wechat/Menu.php commit 83cb52a488507ab5c509ec4eca6710dcd9787d4e Author: 45360682 <45360682@qq.com> Date: Fri Jul 6 10:50:12 2018 +0800 暂存 commit 069f189254070753ff66c1227e4a5b1c9c1a39cb Author: DuanEnJian Date: Fri Jul 6 10:34:19 2018 +0800 添加ptoken时间 commit 4f2fecbb53bcb98ebc85848d3abc5c6a6dd9328f Author: DuanEnJian Date: Fri Jul 6 10:25:52 2018 +0800 修改授权流程 commit d9da346a5cca086afce9699cf399f0aacb755eed Author: DuanEnJian Date: Thu Jul 5 20:49:46 2018 +0800 修改授权页面 commit d89fb296f4638d836f65408e9ed44d8467f6152a Author: 丁海波 Date: Thu Jul 5 18:35:47 2018 +0800 cps 授权静态页面 commit 3966b8ee3d1fa733456c314bf8cf08a5651e9001 Author: DuanEnJian Date: Thu Jul 5 15:02:57 2018 +0800 test commit 121798377d47d52ad5fe3dc63abf541391bad87e Author: DuanEnJian Date: Thu Jul 5 14:43:07 2018 +0800 test commit 94a1f6b59930fc95d5b5e83335eee2292a928d85 (tag: tag-20180705_142609) Merge: 8e408755f dbbdb4398 Author: 45360682 <45360682@qq.com> Date: Thu Jul 5 14:23:48 2018 +0800 Merge branch 'dev-fix-ptoken' of http://192.168.0.31/fe/cps commit 3d84aaba95667e05e1c332583078d831a38f8a53 Author: DuanEnJian Date: Thu Jul 5 14:21:05 2018 +0800 test commit dbbdb439858c60dfa5ea8d7952398458237ebfb1 Author: 45360682 <45360682@qq.com> Date: Thu Jul 5 14:16:00 2018 +0800 修改渠道商.,,, commit f72077a1d44e01e48762cb6208c3d644a1b8b217 Author: 45360682 <45360682@qq.com> Date: Thu Jul 5 14:00:44 2018 +0800 修改渠道商.,,, commit 4e905d437fe4afbf7d7e4aebd92de96abb7e086d Author: DuanEnJian Date: Thu Jul 5 13:47:55 2018 +0800 修改授权流程 commit 8e408755f61494316f02fda884aecf40e050dec7 (tag: tag-20180705_135459) Author: 45360682 <45360682@qq.com> Date: Thu Jul 5 12:06:55 2018 +0800 修改渠道商.,,, commit 3a06a2c8b2af9e390cd3891c3a2fcde31b6631f9 Author: DuanEnJian Date: Thu Jul 5 11:13:27 2018 +0800 修改微信自定义菜单问题 commit 865e815fe871a51bc6eccf51dc44a7cab8032859 (tag: tag-20180705_110954) Author: DuanEnJian Date: Thu Jul 5 10:20:37 2018 +0800 去掉重置按钮 commit 140c8340fa6ec9ba94ae1d3e4c2b0b9e324aad00 Author: DuanEnJian Date: Wed Jul 4 19:45:52 2018 +0800 去掉www修改 commit 049466551697b4698efd9dcd3cc18488e822e69b Merge: 3920a5be6 ca2b32244 Author: 45360682 <45360682@qq.com> Date: Wed Jul 4 19:27:34 2018 +0800 Merge remote-tracking branch 'origin/dev-fix-ptoken' into dev-fix-ptoken commit 3920a5be638694e9556e2488279a37cdc31a2dc4 Author: 45360682 <45360682@qq.com> Date: Wed Jul 4 19:27:22 2018 +0800 修改渠道商.,,, commit ca2b3224445e8c1846bf7090057082ea288dd562 Author: DuanEnJian Date: Wed Jul 4 17:49:25 2018 +0800 修改微信授权 commit e80a431420d2ea250345bca4fe8f8e380cc47aa6 Author: DuanEnJian Date: Wed Jul 4 16:39:05 2018 +0800 修改授权回调问题 commit 27339f42e626fadfb8a0ed8289dda75820bc6970 Author: 45360682 <45360682@qq.com> Date: Wed Jul 4 16:13:27 2018 +0800 检查微信shell，批量修改微信菜单的，修改判断token commit 86ca58294e315e6285783244221f5d547c95710f Author: 45360682 <45360682@qq.com> Date: Wed Jul 4 15:12:45 2018 +0800 选择平台时筛选已经注册过的平台 commit fbc18069a145caa0dc5a9fc2cb9a0b4b6495e089 Author: 45360682 <45360682@qq.com> Date: Wed Jul 4 14:23:29 2018 +0800 1.第一次进入报错，用户信息获取不到 2.检查微信shell，批量修改微信菜单的，修改判断token commit 0121bca9fd0df4026e6a5c9b4ec3706999b10ead Author: php-王凡昌 Date: Wed Jul 4 12:05:43 2018 +0800 创建新用户时，获取用户微信资料容错 commit 043cbd1d6e027886c175f400a479e822f712d9a9 (tag: tag-20180703_180846) Author: php-王凡昌 Date: Tue Jul 3 18:07:13 2018 +0800 修复微信设置无法保存 去除全局授权页面的重置按钮 后台个人资料修改、推广链接、提现申请 ajax修复 后台入口，判断是否是普通代理商，填充wechat配置 commit 1654bc7843c179653eebe3b8c2a051d14cb3b3ad (tag: tag-20180702_115749) Author: php-王凡昌 Date: Mon Jul 2 11:35:35 2018 +0800 修正API接口 commit bedb351d79b4b576d8cb1338cfea24187e6e4f2a Author: php-王凡昌 Date: Mon Jul 2 10:58:51 2018 +0800 修复API获取token错误 commit 14997bf5075cbcbf1a92f84e0904e7cace39898d (tag: tag-20180702_093504) Merge: 9a3848e51 c17c09699 Author: php-王凡昌 Date: Mon Jul 2 09:34:31 2018 +0800 Merge branch 'dev-pay-repair' of 192.168.0.31:fe/cps commit c17c09699b17729ad48467078af5ebe0a693650c Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 09:32:53 2018 +0800 切换支付域名活动15分钟 commit 9a3848e5190719890ee24ea36038e23b0d3cd23b (tag: tag-20180702_084223) Merge: 8ad018bc9 10ac97023 Author: php-王凡昌 Date: Mon Jul 2 08:41:54 2018 +0800 Merge branch 'dev-pay-repair' of 192.168.0.31:fe/cps commit 10ac9702326aa3e1788a7425a8cb6f5eabe236f1 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 08:40:12 2018 +0800 切换支付域名活动15分钟 commit 8ad018bc903464b6788f22a82bd8a6dbf208c07d (tag: tag-20180702_080553) Author: php-王凡昌 Date: Mon Jul 2 08:05:35 2018 +0800 去除调试log commit 75bf716b63d0135566ded293efcf0259347bf840 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 08:02:08 2018 +0800 切换支付域名活动15分钟 commit b8d48ac53a074f94213bbbd165701091dd7240c2 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 06:30:45 2018 +0800 126隐藏代理商菜单 commit 91048deeb86c79dc8e78503e979525eec926d1f7 (tag: tag-20180702_041000) Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 03:29:08 2018 +0800 修改脚本 commit 422475b1ea1ea62847a1c219922479b074d9035b Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 03:21:26 2018 +0800 小修改 commit ee4af8dc7849fb6c81fda9bb003586d32699c8e9 Merge: df6b72b00 66af58302 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 03:14:59 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit df6b72b000275083324ed9496061493fcc359125 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 03:14:50 2018 +0800 小修改 commit 66af5830245965fe9aa426914a4206760b07d543 Author: DuanEnJian Date: Mon Jul 2 02:58:04 2018 +0800 test commit b389c27bec4e72cf3ba43ce4d4001209993fe049 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 02:54:28 2018 +0800 小修改 commit e0e5432f8a2a423bab1c3647a0d826e7b335262c Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 02:24:13 2018 +0800 小修改 commit 664ab26000485dbc1c3c1c32c8929646d73116e6 Merge: 06c0de91f 42eea2838 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 02:23:31 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit 06c0de91f58198b8687ca0170f3acc2ade797742 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 02:23:22 2018 +0800 小修改 commit 42eea2838012ccb14138a85ac0ec07d31579e748 Author: php-王凡昌 Date: Mon Jul 2 02:21:11 2018 +0800 命令行手动设置module commit 600fe8c534f706fc926fb54586ca79a513e8e8d5 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 01:49:23 2018 +0800 小修改 commit 02b84d1b855f56cb86de7e49f42bec1d53da8ad9 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 01:41:31 2018 +0800 小修改 commit b3335f7ea0ea591009ec209e37b03de06869b054 Merge: 5aaac24ec e77c3af2d Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 01:31:16 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit 5aaac24ec85a5b18e97f410eb0f314b50d7b13bb Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 01:31:06 2018 +0800 小修改 commit e77c3af2dbcb45a56322ee080158c3453a5f2800 Author: DuanEnJian Date: Mon Jul 2 01:02:26 2018 +0800 update command javascript commit 5ef95645f0351ea26ebe315b3fcd1ad30bd670ec Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 00:49:59 2018 +0800 小修改 commit 64253f930a46435dfc51a25b8efab55bae21c394 Merge: 5bb02030c 1a335fa0f Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 00:32:22 2018 +0800 Merge branch 'dev-pay-merge' of http://192.168.0.31/fe/cps into dev-pay-merge merge commit 5bb02030ce411100d4be7b33bc8c61e8b03f8ad9 Author: 45360682 <45360682@qq.com> Date: Mon Jul 2 00:31:42 2018 +0800 test commit 1a335fa0f54139d2e4885c48bc91ad795b16ea0b Author: DuanEnJian Date: Mon Jul 2 00:24:01 2018 +0800 修改活动推广链接问题 commit 18c52b22cad44d133d9cdb9fe9c2caf590920384 Author: DuanEnJian Date: Sun Jul 1 23:42:18 2018 +0800 test commit b334444faaccf2760bfa14b64347088baf0344ea Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 23:20:10 2018 +0800 test commit bf6e2efe6763cf0ce205c2298b24513d442d63c6 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 23:14:14 2018 +0800 test commit c5faf735f7d341c00e0995ee33914f4d325c01f2 Author: DuanEnJian Date: Sun Jul 1 23:13:12 2018 +0800 fix bugs commit 16f02977bb7a5cca4819fd731f174003d6fe9b04 Merge: 93dab7800 ef13ea8e0 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 23:01:20 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit 93dab7800469f389968834b21ea7248f06f42383 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 23:00:56 2018 +0800 test commit ef13ea8e0deac8a098c805610190904517bd7382 Author: DuanEnJian Date: Sun Jul 1 22:54:28 2018 +0800 修改推送微信消息的token获取方式 commit bcc27471130524cdf40b62005a3f1ffc378f5567 Author: haoxiaofeng Date: Sun Jul 1 22:31:18 2018 +0800 test commit ac9226731aed024fb51c6722d017e0d2d47ee26f Author: haoxiaofeng Date: Sun Jul 1 21:11:21 2018 +0800 置空二次修改 commit a847e59975c738bede5491b276f2ed1a5f50e9a1 Author: DuanEnJian Date: Sun Jul 1 21:28:46 2018 +0800 修改微信获取问题 commit 56b6101a4c10f2168b77a4f19dc638541d7829ec Author: DuanEnJian Date: Sun Jul 1 21:19:37 2018 +0800 修改菜单推送返回问题 commit 6288d9a6f41ad8f8ba2a1cec8524c48c6e31158d Merge: a82a74170 a3ff9b3f8 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 20:54:03 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit a82a7417065b32de9b359fea1f7a55e48c32a4b2 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 20:53:47 2018 +0800 test commit a3ff9b3f8b7ecb8294d66758a23b259f7eba5c9d Author: DuanEnJian Date: Sun Jul 1 20:44:22 2018 +0800 修改推广链接问题 commit 11a9654a03e6f3e105c197c43bae5abe1d2d8e68 Author: DuanEnJian Date: Sun Jul 1 20:38:07 2018 +0800 修改支付菜单问题 commit c1443b337f3352eff33430d0461c05cace36f94d Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 19:13:45 2018 +0800 test commit 23550e069df29a7c59e3d6645bf96208efc132bf Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 18:57:55 2018 +0800 test commit 88851e7622552aae4af020a90d64051aa68ac151 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 18:19:55 2018 +0800 test commit c85be6f73b854a0ee81f5d18a92fb28fe282660b Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 18:16:57 2018 +0800 test commit 39ab5be0f4747e607335340c28735c8498842de2 Author: DuanEnJian Date: Sun Jul 1 17:10:12 2018 +0800 赏金链接修改 commit 2e4232579f828503fcf695821e4600b968a0a5ea Merge: d8dd53a34 2be299f13 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 16:27:33 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit 2be299f1309f1ec97f9035cc3764d3d5b4a7ea3e Author: DuanEnJian Date: Sun Jul 1 16:27:23 2018 +0800 fix bugs commit d8dd53a3442e95c472cc10e4ebadcd37c40c8cfb Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 16:27:20 2018 +0800 test commit 9fdd2297490bec87b4fa6fa288fdbec8e8051422 Author: DuanEnJian Date: Sun Jul 1 16:11:18 2018 +0800 test commit 2e183697643df0aed6540154bdd602a2d598e7cc Author: DuanEnJian Date: Sun Jul 1 16:08:21 2018 +0800 修改微信支付获取当前支付平台信息 commit 3f0cc12b472202c6e9cad116f43f7404e3138057 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 12:56:00 2018 +0800 test commit 9e5dbada4c38a902d3e98ac62eced8c3e9c49d81 Merge: d56dba914 76a055d28 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 12:46:24 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit d56dba914c20466562ab75a2dcff160a413887fb Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 12:46:03 2018 +0800 test commit 76a055d2839fbd32717798727a138acf12d15c8d Author: php-王凡昌 Date: Sun Jul 1 12:26:57 2018 +0800 调整微信授权更新菜单逻辑 commit d79c923c53a53c0b508a701428fe9385a8b1b172 Author: DuanEnJian Date: Sun Jul 1 12:13:56 2018 +0800 test commit e911bca02ce800c47a676c6eede4031d04ac7577 Author: DuanEnJian Date: Sun Jul 1 11:46:20 2018 +0800 test commit 979ace33858deee928ed9b98272179590c495516 Author: DuanEnJian Date: Sun Jul 1 11:37:36 2018 +0800 test commit 24b4ccb5becb48c4d069d42aa07c9e9e9fe68ab2 Author: DuanEnJian Date: Sun Jul 1 11:24:36 2018 +0800 test commit 1e404ddbf34bff85cafe2c28166061e47c91e8b2 Author: DuanEnJian Date: Sun Jul 1 11:16:26 2018 +0800 add test log commit 7ca6adacf1dd4bd9833d06d3dc22ad3c259a088e Author: DuanEnJian Date: Sun Jul 1 11:14:14 2018 +0800 add test logs commit ffeb4b974ea14dd96641f964c7e99e39aebe4e91 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 03:49:13 2018 +0800 test commit f8010411556437a081922f737e9638e0fcbf38f7 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 03:41:07 2018 +0800 test commit 8b58adbaeae1335a705b366cf37db17e3c37db58 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 03:33:07 2018 +0800 test commit 7f201da1caaa023350ab18af0e0d0f4c73324fbb Merge: 1e3d0025c 068903a1f Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 03:28:42 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit 1e3d0025c85fc1c9a972679f66bace17888c9bb5 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 03:28:31 2018 +0800 test commit 068903a1f74f5d8237381b624723a6838ef5a894 Author: haoxiaofeng Date: Sun Jul 1 03:06:26 2018 +0800 不选置为null commit 580b6bbce09f18550d260abdb4d91eeffdd28c0c Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 02:35:30 2018 +0800 test commit bf4d7b5350e1f73e0e9972074547a4e898268207 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 02:35:18 2018 +0800 test commit 531335f5e99975bc56189b7fc9841d0f8a67e5b9 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 02:33:48 2018 +0800 test commit 98b2821f1bdd5ff843ce061a845f89e540666a8d Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 01:56:46 2018 +0800 test commit 063115c351bdc7a119655f4059edb5380988b76b Merge: a33d10715 e5be58f7d Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 01:53:43 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit a33d107150dc0896e6183cfd83c290c2c83f3004 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 01:53:33 2018 +0800 把所有的getAdminInfo方法改成getAdminInfoAll commit e5be58f7dac9df33b55398df926f93877179ee7b Author: DuanEnJian Date: Sun Jul 1 01:36:47 2018 +0800 test commit 28823888225d64e2f363c2d3e473cd36891affe7 Author: php-王凡昌 Date: Sun Jul 1 01:16:59 2018 +0800 修复入口域名js commit b3905f1ef66b846961ca5828ff7668de67e48111 Author: 45360682 <45360682@qq.com> Date: Sun Jul 1 01:06:59 2018 +0800 把所有的getAdminInfo方法改成getAdminInfoAll commit 74f8fd4f24027e4a88c0023937fd245b8976b168 Author: php-王凡昌 Date: Sun Jul 1 00:51:48 2018 +0800 修正语法 commit 2343e76d13fa299eed2bcc02750093a185a78f86 Author: php-王凡昌 Date: Sun Jul 1 00:41:15 2018 +0800 修复变更平台等的默认渠道缓存清空 commit b1bc631fbcce3911679a58037fb1477a7638d448 Author: DuanEnJian Date: Sun Jul 1 00:38:33 2018 +0800 tset commit 143c3ab5996d486377f5e02622cdaf317ee4ca5e Author: DuanEnJian Date: Sat Jun 30 23:10:56 2018 +0800 维护取消授权的Ptoken commit aa22ec4a3d1c60753a0404293b18f0b5190edadd Author: DuanEnJian Date: Sat Jun 30 23:05:27 2018 +0800 授权回掉维护Ptoken commit 356552a91f5d186cb4f6d8201f74fb030c74a912 Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 22:34:27 2018 +0800 把所有的getAdminInfo方法改成getAdminInfoAll commit 97fee9c00f019bb7a70bd23b48b381bc8a939dea Merge: 6ca481840 f0af9dfce Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 19:49:19 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit 6ca4818403d3a4c59fa82375866ca1828bf72358 Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 19:49:10 2018 +0800 api加geturl commit f0af9dfced61aca8dcb20d28c065487ea0c27645 Author: DuanEnJian Date: Sat Jun 30 19:35:36 2018 +0800 test commit a8dc8817e1e3333ed29558dda7f09c61a069a91b Author: DuanEnJian Date: Sat Jun 30 19:32:28 2018 +0800 添加LOG commit b7309fd645d704d724bfd07c7781735003afaef2 Author: DuanEnJian Date: Sat Jun 30 17:58:16 2018 +0800 修改微信推送回复只回复对应的平台 commit f42b046f7aa7c4f8e053234ebd79cac5c200934f Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 17:51:02 2018 +0800 显示问题 commit db79bf859a688d2b5d893089e45df24e50a05719 Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 17:36:42 2018 +0800 显示问题 commit 8dd87f4b2099c94291e7741a465779549653e8f3 Merge: e3e58297f 1a58a24df Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 17:22:00 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit e3e58297ffbf8b925b8b141a928c95ca12df4a70 Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 17:21:45 2018 +0800 test commit 1a58a24df1938a6318f7747e7e0a6528ac39ebc2 Author: DuanEnJian Date: Sat Jun 30 17:20:13 2018 +0800 修改微信只回复默认平台推送 commit b4d98803f7cbd3fecefef9c6f0cacff6f1925459 Author: php-王凡昌 Date: Sat Jun 30 17:15:21 2018 +0800 去除id 126的菜单屏蔽 commit 3abf986b6a0c3a4f7a7c195621bac521f7407be6 Author: DuanEnJian Date: Sat Jun 30 17:06:56 2018 +0800 添加AdminConfig的Token刷新到Ptoken脚本 commit 9c495b2de7fb4ac6e4368d70141113fda1879201 Author: php-王凡昌 Date: Sat Jun 30 16:40:45 2018 +0800 去除入口域名默认，并可关闭 commit 72fea3ebdd948077c087a46188f4a5bf04eba5b2 Author: haoxiaofeng Date: Sat Jun 30 16:11:47 2018 +0800 暂存 commit 311642fe3c39cf1cce9b87f86bcae0f096ec75b3 Author: haoxiaofeng Date: Sat Jun 30 16:08:37 2018 +0800 js commit c8a843a277aaf1a455d8e1f1b021916f78cdf0d5 Author: haoxiaofeng Date: Sat Jun 30 16:02:56 2018 +0800 暂存 commit 62d89b5402d467955a88ed6179b73d4a00569aa3 Merge: 226e07251 58421e786 Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 15:56:57 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge commit 226e072518217ffca6f8cdf9bf5dd3ab35abe534 Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 15:56:48 2018 +0800 test commit 58421e786a4b15615bcbe2d68b953bfdb639fdd9 Author: DuanEnJian Date: Sat Jun 30 15:46:43 2018 +0800 fix bugs commit e8542ad9cbf8f61941765d246f13d8a8897f7b42 Author: php-王凡昌 Date: Sat Jun 30 15:41:04 2018 +0800 授权成功消息提醒改1秒 commit dde8969b74549afb64c6515d722216eae930220f Author: DuanEnJian Date: Sat Jun 30 15:35:08 2018 +0800 去掉重新授权 commit 3ae5886a2fc95977aee6fcf3a9f03d7147c26bbf Author: haoxiaofeng Date: Sat Jun 30 15:29:54 2018 +0800 暂存 commit b2601314cb541d5fcc7f55e5e9a3e932a1df6d03 Author: DuanEnJian Date: Sat Jun 30 15:23:31 2018 +0800 修改渠道商查看配号代理商推广链接问题 commit b0fd935c349fa25912b4dfc4cf5a81095831b85b Author: haoxiaofeng Date: Sat Jun 30 15:15:58 2018 +0800 条件修改 commit 8006e2bc683a6bac7e23a810070dadad52c1310b Merge: 2ce9cc0de 204656c93 Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 15:02:12 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge # Conflicts: # application/admin/controller/auth/Channel.php commit 2ce9cc0ded3738854a4ab616dc54277741fecfef Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 14:51:31 2018 +0800 test commit 204656c9383307f58b0309ec5409b8049f23bdcb Author: haoxiaofeng Date: Sat Jun 30 14:23:13 2018 +0800 暂存 commit 77d6fd2981a9ca442064f59e6dc3b2fb48281f80 Author: haoxiaofeng Date: Sat Jun 30 14:21:09 2018 +0800 替换菜单修改 commit 91972e4d9db5ec88d258cab6ecddf7d3507c15df Author: DuanEnJian Date: Sat Jun 30 13:41:27 2018 +0800 三方平台有用户绑定时，不能修改基本信息 commit 92f94b9b4ec046bf7ce9766fb2d15a76241ddf04 Merge: 30a7f47c4 965410d78 Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 13:32:46 2018 +0800 Merge remote-tracking branch 'origin/dev-pay-merge' into dev-pay-merge # Conflicts: # application/admin/controller/auth/Channel.php commit 30a7f47c4c4c49a38a693d48682e7db4178235cd Author: 45360682 <45360682@qq.com> Date: Sat Jun 30 13:29:28 2018 +0800 test commit 965410d7808428ffcffe57636219ef652854ed13 Author: haoxiaofeng Date: Sat Jun 30 13:03:46 2018 +0800 暂存 commit 58c01ee31aed63b26efda65e26efdfac7e677c80 Author: DuanEnJian Date: Sat Jun 30 12:57:28 2018 +0800 修改授权重置 commit a018016dcb149e86d020cec74c295739a190b382 Author: php-王凡昌 Date: Sat Jun 30 12:31:32 2018 +0800 修正adminInfoAll错误 commit 841451bc27bbb061c120e70b274a5d7933c61f2e Author: php-王凡昌 Date: Sat Jun 30 12:19:50 2018 +0800 修正渠道商三方平台判断 commit cba145a27a333d36d9834561638dc0b116473955 Author: DuanEnJian Date: Sat Jun 30 12:14:14 2018 +0800 修改推广链接展示短链 commit 1dc51b3743475944e4d7a776627503bbe0c1540e Merge: c1144295f a04e00aec Author: php-王凡昌 Date: Sat Jun 30 11:49:42 2018 +0800 Merge branch 'dev-pay-merge' of 192.168.0.31:fe/cps into dev-pay-merge commit c1144295f529b1e0b45b2039fdce9f213fed1b13 Author: php-王凡昌 Date: Sat Jun 30 11:49:19 2018 +0800 变更渠道商资料时，维护菜单域名 commit a04e00aec4b344e7d32b8f2986c70e3d99120cf8 Author: DuanEnJian Date: Sat Jun 30 11:35:41 2018 +0800 修改推广链接 commit 633c7e63b3b57cbd66b1280186c1075cc63ef51c Author: php-王凡昌 Date: Sat Jun 30 11:27:35 2018 +0800 修复渠道商各种域名等选择 commit f77cc0ed41c796cc823d0731d65ad1f27e1a3797 Author: php-王凡昌 Date: Sat Jun 30 11:12:00 2018 +0800 修正部分更新及判断条件 commit 3b90254ec805e07f68016e7edf3ab238db43f7c5 Author: DuanEnJian Date: Sat Jun 30 10:40:24 2018 +0800 修改授权问题 commit a31ce4379815b4a3f7c7f56ba1f1e21b616d65f7 Merge: 91d62bcf7 f1058a9e7 Author: php-王凡昌 Date: Sat Jun 30 03:17:16 2018 +0800 Merge branch 'dev-pay' of 192.168.0.31:fe/cps into dev-pay-test commit f1058a9e7df48e667f877a6e174a1ce4c32b613a Author: DuanEnJian Date: Fri Jun 29 23:42:37 2018 +0800 test commit 52528bdef4e4267aff282dbebe5c607302a6e5c9 Author: DuanEnJian Date: Fri Jun 29 23:17:43 2018 +0800 test commit a6148e4af87c58da5520aec197ae8df128bfd6a0 Author: 45360682 <45360682@qq.com> Date: Fri Jun 29 22:52:19 2018 +0800 优化 commit ba61131022fd3788513252898830b5ed6af8608c Author: 45360682 <45360682@qq.com> Date: Fri Jun 29 22:50:39 2018 +0800 优化 commit a8363c203b30e69ac88cee6bf162c95f7abe4539 Merge: 616e37ddf 988faf855 Author: 45360682 <45360682@qq.com> Date: Fri Jun 29 22:48:28 2018 +0800 Merge remote-tracking branch 'origin/dev-pay' into dev-pay commit 616e37ddf408b5bc2e231786b7cc0a0d51d5034b Author: 45360682 <45360682@qq.com> Date: Fri Jun 29 22:48:13 2018 +0800 优化 commit 988faf8550266b857dcf40783a07c07d69b22ff8 Author: DuanEnJian Date: Fri Jun 29 22:44:16 2018 +0800 修改Config commit b045960f3580f774524cf1edbd6950ac09eb1a38 Author: DuanEnJian Date: Fri Jun 29 22:17:33 2018 +0800 test commit 35e8c0c8348fb88dbcf2e2d9a57e0bfdbe30f493 Author: DuanEnJian Date: Fri Jun 29 22:11:05 2018 +0800 test commit 2566960f0f4032e6218e3f38d2ced56736f81bb6 Author: DuanEnJian Date: Fri Jun 29 21:45:32 2018 +0800 test commit 8687214232d247878fdd5406023d6dd50b9ceec9 Merge: 9c52a5519 3599d6506 Author: DuanEnJian Date: Fri Jun 29 21:35:42 2018 +0800 Merge branch 'dev-pay' of 192.168.0.31:fe/cps into dev-pay commit 9c52a55194146fc6bbb10805751ea97d74ece22c Author: DuanEnJian Date: Fri Jun 29 21:35:30 2018 +0800 修改授权 commit 3599d65069f04f3a19527cec4d9007a7a1b0b911 Author: haoxiaofeng Date: Fri Jun 29 21:30:22 2018 +0800 admin_extend增加platform_id wxpay_id ophost_id 渠道商编辑页增加相应字段修改 commit 3dde1312456d1bd5fd82ecb8b5ab5cf1a232f5f9 Author: DuanEnJian Date: Fri Jun 29 20:07:35 2018 +0800 test commit 3e94c929e0dea99e41c532c8a29008458f4db72a Author: DuanEnJian Date: Fri Jun 29 18:23:13 2018 +0800 test commit 797e32a82ae1ac3b2ea52384451e2fcabe0f14dd Author: DuanEnJian Date: Fri Jun 29 17:42:44 2018 +0800 test commit 7c3695ef099ea135b4cac0ca70f8869e49eb1c46 Author: DuanEnJian Date: Fri Jun 29 16:52:05 2018 +0800 test commit c0bc7581b70f9b55a98d29ff29dacda8afe04cc9 Author: DuanEnJian Date: Fri Jun 29 16:49:12 2018 +0800 test commit ff6d8c0cf1964fa2a3843f762ac3a3bd16054027 Author: DuanEnJian Date: Fri Jun 29 16:46:53 2018 +0800 test commit 0bd2127a49d98b8f9a755aa267e77546e7d92b67 Author: DuanEnJian Date: Fri Jun 29 16:45:41 2018 +0800 test commit afdfd10353e763d006fbccbd7ab3810bdbe566b1 Author: DuanEnJian Date: Fri Jun 29 16:42:31 2018 +0800 test commit dee671e396d06fbb4468d0384e7203af19b0312a Author: DuanEnJian Date: Fri Jun 29 14:59:30 2018 +0800 修改授权 commit 75f367845f6a66671944438608840b1e4d14e8f2 Merge: f138cfdb0 be5a4e008 Author: 45360682 <45360682@qq.com> Date: Fri Jun 29 14:01:18 2018 +0800 Merge remote-tracking branch 'origin/dev-pay' into dev-pay # Conflicts: # application/common.php commit f138cfdb0cb828df962b90117c64ae99542d0c5b Author: 45360682 <45360682@qq.com> Date: Fri Jun 29 14:00:45 2018 +0800 优化 commit be5a4e0083dde4c847d6ff1ff556dcb3b7e37897 Author: DuanEnJian Date: Fri Jun 29 13:58:59 2018 +0800 修改授权 commit 235830a5c5bb0403101bf2bf9fa2362d956f6b3d Author: haoxiaofeng Date: Fri Jun 29 13:51:47 2018 +0800 1.默认项编辑修改 2.默认项变更指定admin批量默认置空 3.入口域名默认项变更二次确认提示 commit 4293d318bc6f39208bddf5ca49004ef16c329a42 Author: DuanEnJian Date: Fri Jun 29 13:28:02 2018 +0800 修改公众号授权 commit 527841115a1ad53767a3b1f8fc1a11e113faadfb Author: haoxiaofeng Date: Fri Jun 29 12:19:12 2018 +0800 多域名多服务号controller修改 commit 2dcc9f4d6a48af9600aa7a9f9199c14c0d6334c3 Author: 45360682 <45360682@qq.com> Date: Thu Jun 28 21:33:03 2018 +0800 优化 commit 012756e0d66c92c8717d1c8f260e9da8b09f268b Author: haoxiaofeng Date: Thu Jun 28 21:27:42 2018 +0800 暂存 commit 1b1c06eb06f794bc25d4a33c759238a5fc9b79a9 Merge: 0116bd981 213954559 Author: 45360682 <45360682@qq.com> Date: Thu Jun 28 20:53:57 2018 +0800 Merge remote-tracking branch 'origin/dev-pay' into dev-pay commit 0116bd981809e9e5244333b66cd1204ad8e6c342 Author: 45360682 <45360682@qq.com> Date: Thu Jun 28 20:53:46 2018 +0800 暂存 commit 213954559e6841165deac49512fa77dd36a7392f Author: DuanEnJian Date: Thu Jun 28 20:35:49 2018 +0800 授权01-未完 commit 2542ffc722d58485f8f2f35ba26f56a26d6ab23d Author: 45360682 <45360682@qq.com> Date: Thu Jun 28 16:12:40 2018 +0800 修改api接口 commit 41d942a1e99a0e085d191b8686dcc08fe03f1526 Author: 45360682 <45360682@qq.com> Date: Thu Jun 28 16:08:04 2018 +0800 修改api接口 commit 3a08716bee6d94fe2c8e08eaef06e8eeb7e2207f Author: 45360682 <45360682@qq.com> Date: Thu Jun 28 15:49:50 2018 +0800 修改api接口 commit 7680c016d46a48349ab616e82370c0850d77055d Author: 45360682 <45360682@qq.com> Date: Thu Jun 28 14:05:18 2018 +0800 test commit cc2a4f1bb51d26152b564cc36aabf5492d9a8111 Author: DuanEnJian Date: Thu Jun 28 11:04:21 2018 +0800 test commit 9a208e7ddb80e9a9388281c64835a2cef3f58afc Author: DuanEnJian Date: Wed Jun 27 16:34:59 2018 +0800 入口链接替换三 commit f339e83eb22256b98b2b5a49c4af392b7b44d16f Author: haoxiaofeng Date: Wed Jun 27 16:30:33 2018 +0800 url替换 commit a6fcb0caa920cb6481b5cf48225d7cd5c307fa22 Author: haoxiaofeng Date: Wed Jun 27 15:33:10 2018 +0800 后台平台名称展示 commit c0a41035dce511affa50510c1fe524f96f42b7d1 Author: DuanEnJian Date: Wed Jun 27 15:15:30 2018 +0800 修改入口链接二 commit 109f00dfe676a10f586a9fae6d0e2e7fa13a0433 Author: haoxiaofeng Date: Wed Jun 27 13:56:22 2018 +0800 暂存 commit 2286e1b1b66cbb13a53090177016efc765c03b28 Author: DuanEnJian Date: Wed Jun 27 13:16:48 2018 +0800 修改链接为入口链接 commit d6182c926c08e97e0e00cf638d8abd27afbe1636 Author: haoxiaofeng Date: Wed Jun 27 11:52:51 2018 +0800 入口域名默认设置提示 commit b6d73ac3368d4a94a9aaeac2dd539dfc63166a2c Author: haoxiaofeng Date: Wed Jun 27 11:49:47 2018 +0800 暂存 commit 57b35c931173857dd91f97f03f04d5013066acab Author: haoxiaofeng Date: Wed Jun 27 11:23:21 2018 +0800 入口域名管理 commit 4a6605bbeceb84b7e51e995f201fec6e6037d2de Author: haoxiaofeng Date: Wed Jun 27 10:58:24 2018 +0800 微信平台配置项修改 commit 8b57a5009af2652365f4b2a4381041ddd1fa8da5 Author: DuanEnJian Date: Wed Jun 27 10:07:49 2018 +0800 修改推广链接 commit 3d84fa539ee3cffe9e285a18ff82825edd531eed Merge: a8e7f008c eadaf9ee0 Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 22:03:33 2018 +0800 暂存 commit a8e7f008c461460bce7e543b4b909b5c2cc136d6 Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 22:00:47 2018 +0800 暂存 commit eadaf9ee09268d77a6e3068722800fc552221e92 Author: haoxiaofeng Date: Tue Jun 26 21:59:39 2018 +0800 暂存 commit 3eaeb6acd68e24cf53e70ac8740a5b522c183f4d Author: haoxiaofeng Date: Tue Jun 26 21:31:04 2018 +0800 redis key维护 commit a412875ff89efdd2cb46abc4e8790d3e2515cba5 Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 20:03:33 2018 +0800 test commit 732ecefb26fe052f0f22dbc0cfb4cbf683a5605f Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 20:02:55 2018 +0800 推广链接判断 commit 36d617af6e15d0ceb17b7673fa71b0b5774d1bb1 Author: haoxiaofeng Date: Tue Jun 26 19:55:12 2018 +0800 adminconfig redis 维护 commit b75916fc1ff04c453ef4c27f7cbe5218a7803e70 Author: haoxiaofeng Date: Tue Jun 26 19:21:30 2018 +0800 一个平台&&域名/支付号 默认唯一 commit 91d62bcf78735df97a21a4e876f6a5637adabc15 (tag: tag-20180627_103256) Author: php-王凡昌 Date: Tue Jun 26 18:16:07 2018 +0800 更新第三方授权json字段格式处理 commit 0f90f2b051368721145ba949c91fcd07bce40f0a Author: DuanEnJian Date: Tue Jun 26 17:13:34 2018 +0800 修改推广链接 commit b98043729758bd83c9508a474192ec292bdf2dfe Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 17:13:58 2018 +0800 小修改 commit 687041d74bf63c67649dbbabadbdec633b0ea02f Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 16:57:21 2018 +0800 加ptoken commit 56c32aae67d4284644f39a4bdbf3d4a08598f870 Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 16:50:03 2018 +0800 增加refresh_token commit 92eae1109ef6c46ad74f62c1920cb1d49fd76dca Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 16:30:53 2018 +0800 支付配置获取 commit f46732b3010a473849e23bd6b2c8f7d7e544955b Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 16:13:45 2018 +0800 test commit c094ec3a39d4f621a74138ceefc5a90efdfb8ec1 Author: haoxiaofeng Date: Tue Jun 26 16:09:55 2018 +0800 开放平台表&&业务域名表&&支付管理表 CRUD commit 3928ca5c354565695e08377857d5f587cd0b1fd8 Author: 45360682 <45360682@qq.com> Date: Tue Jun 26 16:01:36 2018 +0800 config commit 47a98c2ab9eb63b76da0db6d77b5a5ac115deb33 Author: DuanEnJian Date: Tue Jun 26 10:32:16 2018 +0800 修改Config获取方式 commit 2ed3803e37d6d17b52f6954acdfcc01de50bb8a6 Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 21:07:10 2018 +0800 解决json变成字符串的问题 commit 33f7575a39065d0a996227cbfc76c61582ed2bf2 Merge: bb0bf069a 03fde575c Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 20:56:47 2018 +0800 Merge remote-tracking branch 'origin/dev-kl2-merge' into dev-kl2-merge commit bb0bf069a52d4ce1c29429ebbe283db2c476ba95 Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 20:56:37 2018 +0800 解决json变成字符串的问题 commit 03fde575c09c02ede8f4187662414a25f2a9da6b Author: DuanEnJian Date: Mon Jun 25 20:55:29 2018 +0800 修改Config获取方式 commit 095a238c88945a0547edfc59326085a0abe5b2b6 Author: DuanEnJian Date: Mon Jun 25 20:34:28 2018 +0800 修改推广链接设置为空 commit 5eeb175463461402059160aeb946efbd72b4ac89 Author: DuanEnJian Date: Mon Jun 25 20:30:47 2018 +0800 test commit 25bef3c9caec3c6bbe9706d7db66f7b786b1b396 Author: DuanEnJian Date: Mon Jun 25 20:11:04 2018 +0800 修改配置时添加Config配置到内存 commit 77e8a2e332f235d521c100556fab7fdf57db35d0 Author: DuanEnJian Date: Mon Jun 25 19:44:15 2018 +0800 test commit 0eadbcd89404406eed488f30526c4a99c24f1b8a Author: DuanEnJian Date: Mon Jun 25 19:35:32 2018 +0800 添加AdminConfig更新配置时删除缓存 commit 83001fbe1af30ba03e2fd59f8c24af74ca9e8b57 Author: DuanEnJian Date: Mon Jun 25 19:11:41 2018 +0800 修改推广计数BUG commit 2678ccfaa5e246e61530c50215af551d252017d7 Author: DuanEnJian Date: Mon Jun 25 18:08:17 2018 +0800 修改白名单检测顺序 commit 708f8950dafece98695fc2fde84378f6082e2652 Merge: 8961cdf85 67ca532ab Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 17:30:25 2018 +0800 Merge remote-tracking branch 'origin/dev-kl2-merge' into dev-kl2-merge commit 8961cdf859a4bfe24b437b164d1f301b9fce22d7 Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 17:30:17 2018 +0800 暂存 commit 67ca532abbb6aaada7ff1df4c8dd8e5e33ff424e Author: DuanEnJian Date: Mon Jun 25 17:27:49 2018 +0800 修改AdminConfig时更新缓存 commit 8beabd73c79d0b01a63643cfcc27f427db44f5a2 Merge: 0ccaa2bd2 c02a89c04 Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 17:21:55 2018 +0800 Merge remote-tracking branch 'origin/dev-kl2-merge' into dev-kl2-merge commit 0ccaa2bd2507fc97fa473486da50a2f746585098 Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 17:21:45 2018 +0800 暂存 commit c02a89c041a502ef5c6b5ac7091f47551ad540dd Author: DuanEnJian Date: Mon Jun 25 17:03:40 2018 +0800 修改推广链接KL值为0的问题 commit 99a9d06f29ae24b62997132e3c8a1fcb4d907e17 Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 14:26:01 2018 +0800 暂存 commit 07e18924e9923b60eafb877ef519640332e4ea06 Author: DuanEnJian Date: Mon Jun 25 14:24:43 2018 +0800 intval commit d4a0c5a3d53748acede963c866505373f61dd756 Author: DuanEnJian Date: Mon Jun 25 14:07:05 2018 +0800 添加tryCatch commit 59e21f647d506877ccf19497dba84468dbc36c5f Author: php-王凡昌 Date: Mon Jun 25 12:38:58 2018 +0800 Merge branch 'dev-readurl' of 192.168.0.31:fe/cps into dev-readurl-merge 修改推广链接扣量统计查询等 commit 6e686b8ccdc4e6a0eaac28a331e721348f82d8a2 Author: 45360682 <45360682@qq.com> Date: Mon Jun 25 11:36:17 2018 +0800 wxpay commit 4a9dade192dc3d6ae2acd1716c856eba6944c67b Author: DuanEnJian Date: Mon Jun 25 11:32:47 2018 +0800 修改KL方式 commit 7dafec5dd866af85cb2774502701977d4ea1e1be Author: DuanEnJian Date: Sun Jun 24 16:03:57 2018 +0800 修改推广链接扣量BUG commit 0fac0250f9301086124804d967e616a88fd5fa6d Author: DuanEnJian Date: Sun Jun 24 14:03:51 2018 +0800 添加用户ID白名单 添加推广链接KL commit 231f43ae8329811a87fe5c74d8362ae8b4854394 (tag: tag-20180624_104013, tag: tag-20180623_211002) Author: DuanEnJian Date: Sat Jun 23 20:40:53 2018 +0800 修改ssdbToMysql错误判断 commit 655d37de4fdb9d66b7d7f0cdfb100dd994810e32 Author: php-王凡昌 Date: Sat Jun 23 19:03:56 2018 +0800 修改下单周期获取语法 commit 80edcb2300ce51e6b9a77f0bc399b44291469624 Author: php-王凡昌 Date: Sat Jun 23 18:02:14 2018 +0800 订单重复生成周期 commit ce385c98474f680339ddc61adcc72cf62770a7c3 Author: php-王凡昌 Date: Sat Jun 23 17:16:18 2018 +0800 后台入口打点 删除login登录ip部分无用代码 commit bf60525dbeaa6ea409f85be638b79f75a2015480 Author: DuanEnJian Date: Sat Jun 23 16:55:57 2018 +0800 更新时间格式 commit e3c3d60d59fe3daac7d7c69ea07330b672249ce0 Author: DuanEnJian Date: Sat Jun 23 16:51:37 2018 +0800 添加登录信息批量删除 commit f49773bfc3248b34a5fdc1a97a8c559338fe60f1 Author: DuanEnJian Date: Sat Jun 23 16:12:35 2018 +0800 更新IP地址库 commit 4bc25fa535059c1e09da0943f2c7b157a63f41f9 Author: DuanEnJian Date: Sat Jun 23 15:36:26 2018 +0800 修改KL问题 commit 24a0771c2fe99789a98254d1dd7986df335696e7 Author: haoxiaofeng Date: Sat Jun 23 15:20:25 2018 +0800 log域名配置由env改为cps配置 commit 8374ad12ea1159dc8aa557688d0d2808d8f676e4 Author: DuanEnJian Date: Sat Jun 23 15:12:23 2018 +0800 修改KL逻辑 commit 476406a04e914a4d7aa3f041d2e1dabfa0bf57eb Author: haoxiaofeng Date: Sat Jun 23 13:51:27 2018 +0800 免费阅读开关移至基础配置 commit 235d5c75a80ba35c57313d8b952bbc7b5d713eed Author: DuanEnJian Date: Sat Jun 23 12:37:50 2018 +0800 修改KL方式 commit 050a0aa2a3f3b2dbfb77b9e0b2530e5874127252 Author: DuanEnJian Date: Fri Jun 22 21:26:36 2018 +0800 修改KL方式为代理OR渠道登陆的城市不进行KL commit a1be1cd64fb90f668a95c166ca3116da451887ef Merge: 0815156d2 8303b3f56 Author: 45360682 <45360682@qq.com> Date: Fri Jun 22 16:20:51 2018 +0800 Merge remote-tracking branch 'origin/dev-merge-zx' into dev-merge-zx commit 0815156d23a243000eafee9645d95a82e03ca636 Author: 45360682 <45360682@qq.com> Date: Fri Jun 22 16:20:39 2018 +0800 添加文字提示 commit 8303b3f5632f20f15e221fc0ce5fc798acbf36b7 Author: DuanEnJian Date: Fri Jun 22 14:25:41 2018 +0800 ssdbToMysql添加处理全部功能,默认处理全部 commit 374e3b21a6cc5cb5e7d9c9214f27764b8735152b Merge: 1f9e2cc46 8a5139a81 Author: 45360682 <45360682@qq.com> Date: Fri Jun 22 14:02:15 2018 +0800 Merge branch 'dev-zx-optimize' of http://192.168.0.31/fe/cps into dev-merge-zx commit 8a5139a811ab0e2b7d1cbf13b48cf3af2d3254f0 Author: php-王凡昌 Date: Fri Jun 22 13:29:25 2018 +0800 按月&全部汇总通过sum聚合 commit 87cab7b1b4dfabd303ca858de6fe03c80c5e4c0b Author: haoxiaofeng Date: Fri Jun 22 10:47:04 2018 +0800 推广链接今日充值金额显示 commit 7cb0b5d2c90305142f05196ed91637930d3a4616 Author: DuanEnJian Date: Fri Jun 22 10:34:23 2018 +0800 去掉书籍列表的推广名称 commit d930cf5124eaaf5041ed5cbaa88e82233b167855 Author: 45360682 <45360682@qq.com> Date: Fri Jun 22 10:34:25 2018 +0800 新建渠道商和配号代理商打开自动推送 commit 48149c001882d4e7256c391e73981dd5ba361a93 Author: DuanEnJian Date: Thu Jun 21 15:29:13 2018 +0800 书籍筛选名称模糊查询 commit 615a73f37dae30adec5ac04f821d5a51d1f36d9d Author: haoxiaofeng Date: Thu Jun 21 15:06:15 2018 +0800 暂存 commit 3b8c5cf44e4199063d817e93b33e9be3f0af8de3 Author: haoxiaofeng Date: Thu Jun 21 14:37:02 2018 +0800 书籍统计 commit 1f9e2cc46a61750d10f32c9e15d4808de59facb6 (tag: tag-20180621_111237) Author: php-王凡昌 Date: Thu Jun 21 11:12:28 2018 +0800 管理员书籍列表保留下架状态 commit c4ec4b8f8d6fbc493029db88a7727479f3b223d0 (tag: tag-20180620_205620, tag: tag-20180620_201024) Author: php-王凡昌 Date: Wed Jun 20 18:43:28 2018 +0800 修改客服消息判断条件，字符小于7个使用默认配置 commit 9469fa25c55e8256b8ff49d09afaf7e6e96a9855 Author: php-王凡昌 Date: Wed Jun 20 18:20:33 2018 +0800 处理弹窗标题 commit e309fd40c2e0fdd8987fb9bdada1da3c89760ad3 Author: php-王凡昌 Date: Wed Jun 20 18:14:44 2018 +0800 章节正文强制转换一次utf8编码 commit 323ef172e4f144fd152d6b30abfba16201d5ddbc Author: DuanEnJian Date: Wed Jun 20 17:52:52 2018 +0800 test commit 4a9d56eb0baff4757678e34ce84b44ba6373f974 Author: haoxiaofeng Date: Wed Jun 20 17:25:03 2018 +0800 暂存 commit d8f5505cb7169d1682849587374c23ff37b919a3 Author: haoxiaofeng Date: Wed Jun 20 17:17:16 2018 +0800 书籍统计累加ssdb今日数据 commit 1c64253cdb10ed66f570bafd53c2e61b76ee8f1b Author: php-王凡昌 Date: Wed Jun 20 17:04:15 2018 +0800 修改弹窗标题 修改groupid的判断条件 commit b6128b4a29ecc18b43ff7676910910a8d499e734 Author: php-王凡昌 Date: Wed Jun 20 16:50:09 2018 +0800 点击头像跳转 commit 980ff5ea3198f5e3d2009a97d8933f6a5194cf7c Author: haoxiaofeng Date: Wed Jun 20 16:47:35 2018 +0800 透传groupId到book.js commit 3ef95b0d37a8c8b362563cb1b4a25ae7ebaaafd7 Author: php-王凡昌 Date: Wed Jun 20 16:38:52 2018 +0800 修改替换input序号 commit 0b7d31a94385ec2c3698ef01a9aa8e89eeb19115 Author: php-王凡昌 Date: Wed Jun 20 16:24:56 2018 +0800 修复客服消息标题选择 commit cd1a0a2fc061085360ce8c1cdb9bb6b2fd777035 Author: haoxiaofeng Date: Wed Jun 20 15:28:59 2018 +0800 章节判断修改 commit c7e2b56190ee4c27a3fbba79f6c28977d2838eb3 Author: DuanEnJian Date: Wed Jun 20 15:26:43 2018 +0800 修改用户统计BUG commit 4e20b066e373193002b1d81878b5911ebba0313c Author: haoxiaofeng Date: Wed Jun 20 15:14:03 2018 +0800 无新章节禁用下一章 commit 3ad29492eef3cf9a02e70348c4908a043d1df60a Author: haoxiaofeng Date: Wed Jun 20 15:09:27 2018 +0800 暂存 commit e9ac39352020cd6946ea7559c971a810902a3269 Merge: 2ed842a9f afa94af84 Author: php-王凡昌 Date: Wed Jun 20 15:07:05 2018 +0800 Merge branch 'dev-recharge' of 192.168.0.31:fe/cps into dev-zx 修改统计浮点位数 充值跳转url带agent_id参数 commit 2ed842a9fabadb4ca86e58db21ba8f18e9ec6cdb Author: php-王凡昌 Date: Wed Jun 20 15:01:58 2018 +0800 去除前台入口无用配置 修复个人中心/充值页 ID带主题前缀 commit afa94af8435104c1d202e1eb7f384a59ccd9f897 Author: 45360682 <45360682@qq.com> Date: Wed Jun 20 15:00:28 2018 +0800 活动充值页面时带上agent_id commit aaa3af68e28ec4ae0ed7ba5ead9b31f75bc80db7 Author: DuanEnJian Date: Wed Jun 20 14:46:50 2018 +0800 去掉书籍筛选的下架选项,复制链接添加提示 commit bbd30ec93e0a8a462218a93906e2f936c2775a64 Author: 45360682 <45360682@qq.com> Date: Wed Jun 20 14:46:19 2018 +0800 活动充值页面时带上agent_id commit 412f8e7268c2b7965c23c27ac9ca9fbd7bdb4ebc Author: haoxiaofeng Date: Wed Jun 20 14:45:34 2018 +0800 管理员不限制章节 commit 5f4d4fa1a80731d4dff20d2490bbecb0c6908ce7 Author: haoxiaofeng Date: Wed Jun 20 14:37:19 2018 +0800 暂存 commit 0bbe296f41dae2f204792840ca64c781f2570385 Author: 45360682 <45360682@qq.com> Date: Wed Jun 20 14:34:54 2018 +0800 跳转到充值页面时带上agent_id commit 4e47772f9f6e164290739ca4b28cbb5891207b70 Author: DuanEnJian Date: Wed Jun 20 14:05:51 2018 +0800 修改用户统计BUG commit 78a7f44504eccec0e42cbb385b2279705a814a1d Author: 45360682 <45360682@qq.com> Date: Wed Jun 20 11:59:15 2018 +0800 test commit 1be25aea5cf1a0978827bf55f929b19253dcc5d2 Author: 45360682 <45360682@qq.com> Date: Wed Jun 20 11:57:13 2018 +0800 test commit a4258cebf7d10359525014dc064ea569b06c1140 Merge: 5c0b5f6e7 7004a0438 Author: php-王凡昌 Date: Wed Jun 20 11:22:54 2018 +0800 合并代码 commit fb83de7152dbaa157f87661d8fa7a205a111ff8b Author: 45360682 <45360682@qq.com> Date: Wed Jun 20 11:03:01 2018 +0800 处理两位小数问题 commit 7004a0438feb4e471af0db61e5a2b6682d43939c Author: DuanEnJian Date: Tue Jun 19 20:52:42 2018 +0800 修改用户统计展示当天数据从SSDB取 commit f4547a4f0244ca27b68b54814a77110ba6fe1e8c Author: DuanEnJian Date: Tue Jun 19 16:24:18 2018 +0800 修改SSDB统计脚本BUG commit 911609fa8e227dea7887fba1565cc419116f2066 Author: haoxiaofeng Date: Tue Jun 19 15:55:09 2018 +0800 暂存 commit e3c060da8550f774df7cc95bc43d0b1f5dee7ef1 Author: haoxiaofeng Date: Tue Jun 19 15:50:49 2018 +0800 暂存 commit ec9905f4f7973f1726ee76cd20308434113a3158 Author: haoxiaofeng Date: Tue Jun 19 15:21:22 2018 +0800 暂存 commit 6b2299b256da0d8e0e53680b762185a8e5f2cf44 Author: haoxiaofeng Date: Tue Jun 19 15:18:13 2018 +0800 暂存 commit 6d39f49ed80f5228b88130aac31dd9690854735a Author: DuanEnJian Date: Tue Jun 19 15:13:25 2018 +0800 添加SSDB小说统计脚本 commit 507b88fe25c8304f64c89db1b9f39bc0ca4542df Author: haoxiaofeng Date: Tue Jun 19 14:56:23 2018 +0800 暂存 commit 2d07ec4be4703d0b890f247d57d56dad32604214 Author: haoxiaofeng Date: Tue Jun 19 14:26:18 2018 +0800 字段名称修改 commit 6a5be323f6c350478d4bfad7481385d6e467d2ae Author: haoxiaofeng Date: Tue Jun 19 14:24:35 2018 +0800 书籍统计 commit 5c0b5f6e7e58069b33524c38b9dedf53bc71c287 Author: php-王凡昌 Date: Tue Jun 19 14:20:43 2018 +0800 显示身份证号码 commit 7929f63a7f3790132c8da86599b255a8d6b95cac Author: haoxiaofeng Date: Tue Jun 19 13:56:23 2018 +0800 切换章节格式问题 commit 81102de73ea25a3a97c3f36cee9531e0ee4c0cd9 Author: haoxiaofeng Date: Tue Jun 19 13:54:13 2018 +0800 暂存 commit 66bd4a6f8d87413f13ef7d73a61800e354cec86b Author: haoxiaofeng Date: Tue Jun 19 12:22:24 2018 +0800 章节打开下一章禁止问题修复 commit eed91bfe9b89a3a72671138fa6f2f8eb2943e3d6 Author: DuanEnJian Date: Tue Jun 19 10:45:47 2018 +0800 添加用户统计相关注释 commit f7fb45f35e5b817933c94197b9e1575220e7408b Author: haoxiaofeng Date: Fri Jun 15 17:32:29 2018 +0800 替换菜单修改 commit f30a24e82c483c8ea9c8941b45a88200c3f13108 Merge: e1683feff 5a3f29143 Author: haoxiaofeng Date: Fri Jun 15 16:05:01 2018 +0800 Merge branch 'dev-optimize' of http://192.168.0.31/fe/cps into dev-optimize commit e1683feff202f47c00e08a6bcd86a904f390baa8 Author: haoxiaofeng Date: Fri Jun 15 16:04:20 2018 +0800 暂存 commit f4354ba0280e87648e9b945e348665ff9f3fc1a7 Author: php-王凡昌 Date: Fri Jun 15 15:45:33 2018 +0800 微信重试次数改为1次，超时时间改为8秒 commit 5a3f29143cbe002b7390863a4ba39349a8ec7001 Author: DuanEnJian Date: Fri Jun 15 15:44:38 2018 +0800 修改用户统计脚本BUG commit f7f6882df9f8b4b083f0b924094e436f2535ce43 Author: DuanEnJian Date: Fri Jun 15 15:43:08 2018 +0800 修改用户统计脚本BUG commit ff7393652de4d4001a6cd6bc19bf6f86f30a82fd Author: DuanEnJian Date: Fri Jun 15 15:26:33 2018 +0800 修改用户统计脚本BUG commit afe87ddd1246de75ef76485efe1ad50ffd60d653 Author: 45360682 <45360682@qq.com> Date: Fri Jun 15 15:25:37 2018 +0800 去掉生成短链 commit 5795485734064856f126ef6d772ab4e5fae148c1 Author: php-王凡昌 Date: Fri Jun 15 15:01:20 2018 +0800 批量更新微信菜单shell脚本 commit 440da6caac25bcab84a615fc154d41450cd01092 Author: php-王凡昌 Date: Fri Jun 15 14:54:56 2018 +0800 log打点部分补全 前台入口ip 扣量 redis链接 commit 6417bf7ea058d5f418d53c01406b446f89893d96 Author: DuanEnJian Date: Fri Jun 15 14:50:37 2018 +0800 修改用户统计脚本BUG commit 4e432eff5ed9385a5f058c0f90b1a1369b2f78f4 Author: DuanEnJian Date: Fri Jun 15 14:44:51 2018 +0800 修改用户统计脚本BUG commit a7bf05e6cd6c674ed48acf0da4286d74aeb9faa1 Author: DuanEnJian Date: Fri Jun 15 14:10:15 2018 +0800 test commit 05f2b0b14c5dff2fe4a28248309cab8f56b71f7b Author: DuanEnJian Date: Fri Jun 15 13:31:14 2018 +0800 修改用户统计脚本BUG commit 6bff3356f30c91924762f46c72db1d7cde9b1b5a Author: php-王凡昌 Date: Fri Jun 15 12:17:08 2018 +0800 删除无用classify.js 去除底部注释footer 个人中心&充值页，点击头像跳转dev页面 commit 50452fc3bc9c932887fd6c9a53b3c1214178266e Author: php-王凡昌 Date: Fri Jun 15 11:55:39 2018 +0800 腾讯短链&微博短链容错 commit 96419f7af7777dea8493d8a39e0e0462b09f8778 Author: php-王凡昌 Date: Fri Jun 15 11:46:48 2018 +0800 修复客服消息 动态添加的条目无法变更标题 commit 231860cdfbfbda6c09a5e08dba15d921f368aabc Author: php-王凡昌 Date: Fri Jun 15 11:43:19 2018 +0800 修正今日充值金额 ssdb 统计浮点数错误 commit f633ff9557763ce62450cbb93beb16f3efc24011 Merge: 96d02f976 d2195b411 Author: php-王凡昌 Date: Fri Jun 15 11:40:52 2018 +0800 Merge branch 'dev-task' of 192.168.0.31:fe/cps into dev-zx Conflicts: application/command.php commit 63a0a0b912af49c64f06f9ed5989005d7dab5d10 Author: haoxiaofeng Date: Fri Jun 15 11:18:23 2018 +0800 暂存 commit 3c74a262211f4a4eab190260c1898df8754ec59e Author: haoxiaofeng Date: Fri Jun 15 11:04:29 2018 +0800 充值今日数据改为redis commit 6f36b2980d38af135c4696a07b1b3970abcc119f Author: DuanEnJian Date: Fri Jun 15 10:39:21 2018 +0800 修改用户统计脚本BUG commit ef9e5250e5a363228205e7ce07acfe72f998220e Author: DuanEnJian Date: Fri Jun 15 10:25:04 2018 +0800 test commit 9ebcfc5de5a4b3538317f36f1a89c9b859ed8a5f Author: DuanEnJian Date: Thu Jun 14 20:57:42 2018 +0800 test commit 949d013a567319fa88d687853eba3e11669a921e Author: DuanEnJian Date: Thu Jun 14 20:55:48 2018 +0800 添加SSDB用户统计脚本,修改用户统计BUG commit 96d02f976b584ce3625f6f47e661b4b7aeec9e6c (tag: tag-20180614_193807) Author: php-王凡昌 Date: Thu Jun 14 18:17:40 2018 +0800 屏蔽推广链接页面今日充值金额 commit 3509a0e0fd561f2cbcd4a371ffb59812fc693d17 Author: DuanEnJian Date: Thu Jun 14 17:36:02 2018 +0800 修改用户统计方式 commit e0b7fd005f6268c9eb52336eb1013a3ae1b95570 (tag: tag-20180614_170403) Merge: aaf4f09ef 113ad3d12 Author: 45360682 <45360682@qq.com> Date: Thu Jun 14 15:51:00 2018 +0800 Merge remote-tracking branch 'origin/dev-shafa-merge' into dev-shafa-merge commit aaf4f09ef2b3ee024cb810cb923f11652c561532 Author: 45360682 <45360682@qq.com> Date: Thu Jun 14 15:50:50 2018 +0800 去掉关键字必填 commit 113ad3d12dc16efc647a31f041f936ff0deebec5 Author: php-王凡昌 Date: Thu Jun 14 12:12:34 2018 +0800 替换沙发图片 commit 26606c19814e54d95af80ced69d9159a85aaba45 Merge: 25f34b2a8 4314e5ed5 Author: php-王凡昌 Date: Thu Jun 14 11:34:14 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps into dev-shafa-merge commit 4314e5ed586cd8496164194075e4d7e4e37f246b Author: 45360682 <45360682@qq.com> Date: Wed Jun 13 18:33:06 2018 +0800 暂存 commit 25f34b2a8681b0faf98e5728376299b57a3ccffa Merge: 59257dde1 6e872617b Author: php-王凡昌 Date: Wed Jun 13 16:33:41 2018 +0800 Merge branch 'dev-shafa' of 192.168.0.31:fe/cps into dev-shafa-merge commit d2195b4116328cce663888950555d03a5b219850 Author: haoxiaofeng Date: Wed Jun 13 16:26:02 2018 +0800 暂存 commit 72ec69edc29947a3475a430f6b887bd09a9c485e Author: haoxiaofeng Date: Wed Jun 13 15:58:17 2018 +0800 菜单替换 commit 46d0961fe3b061f7251ab06f9ee19433fd3191d3 Author: haoxiaofeng Date: Wed Jun 13 14:17:18 2018 +0800 暂存 commit 6e4f31020fde1df5f8018f297e51502cc5c836cc Author: DuanEnJian Date: Wed Jun 13 12:05:13 2018 +0800 修改PHPExcel导出功能 commit 59257dde102a1b98b86453d0049d38b70d0dd2fe (tag: tag-20180613_104521) Merge: 74394b50e 8aa3d7dd6 Author: 45360682 <45360682@qq.com> Date: Wed Jun 13 10:29:05 2018 +0800 二维码功能 commit 6d6bcaa214f1d0334ca96dafd5d7006da4b76507 Author: haoxiaofeng Date: Tue Jun 12 21:13:49 2018 +0800 参数，数据类型修改 commit 264da219417df405279af421cac6b8e771056d17 Author: haoxiaofeng Date: Tue Jun 12 20:01:45 2018 +0800 changemenu命令 commit 92443a774c2a5c707c072e800fbaa3192d965493 Author: DuanEnJian Date: Tue Jun 12 19:52:53 2018 +0800 推广链接添加excel,PHP导出 commit 33614c8ad036deccd519e481de12a741640fd922 Author: DuanEnJian Date: Tue Jun 12 14:22:07 2018 +0800 复制当前阅读章节链接Bug修复 commit 267dd931ded975889906f430f516f18ca0446f30 Author: DuanEnJian Date: Tue Jun 12 11:52:33 2018 +0800 小说列表、小说中心的搜索、选择书籍页面，去掉快速搜索，不全但关键字搜索 管理员->添加原始书名展示与筛选 书籍筛选，签到关注库，添加书籍的时候，可以添加入库书。补全搜索。列表中显示当前状态(入库、下架) commit 74394b50e57aefa375004248a1d3e20be3ef7494 (tag: tag-20180611_214710) Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 21:38:23 2018 +0800 赏金提现加重复判断 commit 5d370267a8e08ca3efec8a05143548a6f181cd1a Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 21:23:32 2018 +0800 赏金提现加重复判断 commit c422052aed37e87ded80bd488c8bb1a034e39f0c Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 20:50:49 2018 +0800 redis判断，防止重复提现 commit 603ff1f5f00798d1f20701b04f866bba94f0f424 Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 20:50:12 2018 +0800 redis判断，防止重复提现 commit 218ae72b5387e6ea2acf3a37cefafedb7336b6a4 Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 19:57:40 2018 +0800 打款走主库 commit 8aa3d7dd63c4787f117bcaac6ee892192922542c Author: DuanEnJian Date: Mon Jun 11 19:50:38 2018 +0800 fix qrcode bugs commit e76efc90e03b6466bff9c6b6b2fa9a16590083fb Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 18:58:41 2018 +0800 打款走主库 commit ad682d2c0ccb43ffa0048fd4c85d8e3e01ead508 Author: DuanEnJian Date: Mon Jun 11 18:36:42 2018 +0800 修改资源类型现实为中文 commit 4eb0f3d417e101b3ad8869e2b17ff22b8458d776 Author: DuanEnJian Date: Mon Jun 11 18:20:23 2018 +0800 用户查询->阅读记录->增加复制链接功能 commit 411ab7ec659466743e8c45473dfe9f467f4cd21a Author: DuanEnJian Date: Mon Jun 11 17:18:20 2018 +0800 根据书籍生成二维码区分渠道和代理商 commit 11fa1fb56eb3cafd73cf5fdde1b735e515938836 Author: DuanEnJian Date: Mon Jun 11 16:56:43 2018 +0800 二维码关注回复修改 commit d0a70be2995a43432c55568760bd0995cd36e20e Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 16:51:58 2018 +0800 加菜单权限 commit 53bd639b47e868e1983e98e2d1a69c4b36ff8b5b Merge: 70a885d3b ac14625bf Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 16:22:49 2018 +0800 Merge remote-tracking branch 'origin/dev-qrcode' into dev-qrcode commit 70a885d3b2d0954fec6795b1ed43244bbf8ab35f Author: 45360682 <45360682@qq.com> Date: Mon Jun 11 16:22:38 2018 +0800 加菜单权限 commit ac14625bf8059bb8312f123828d4c4bd5a6735b8 Author: haoxiaofeng Date: Mon Jun 11 14:46:09 2018 +0800 取消充值入队列交互时间修改 commit c7c388ca712920a89523da3866061af965b9b410 Author: haoxiaofeng Date: Mon Jun 11 14:36:56 2018 +0800 关闭快速搜索 commit 4bdae8e4f0149f9da49dc521a61b3214e7c35754 Author: DuanEnJian Date: Mon Jun 11 11:47:01 2018 +0800 渠道商推广链接添加查看代理商推广链接功能 commit 604b7fa9c2255c2f0eb6a4e3d33b8ee868ef3683 (tag: tag-20180608_182111) Author: DuanEnJian Date: Fri Jun 8 17:25:27 2018 +0800 改用户信息 commit c4065caef02c79182a85010953106940712c8751 Author: DuanEnJian Date: Fri Jun 8 16:48:15 2018 +0800 删除二维码时清除SSDB缓存 commit 32ba780bff9dab9c017d6db6da7ae42a7a872cf9 Author: 45360682 <45360682@qq.com> Date: Fri Jun 8 15:59:04 2018 +0800 去掉身份证姓名 commit e9fa588b7e4e5637cf7cb2bb79cb216d821753a7 Author: DuanEnJian Date: Fri Jun 8 15:36:48 2018 +0800 二维码统计测试 commit 26b1aae83402ca9647086444e4581e3da477815b Author: DuanEnJian Date: Fri Jun 8 15:07:00 2018 +0800 二维码统计测试 commit ddcd0e31830e3db14a07828522442dc725e8c5fb Author: DuanEnJian Date: Fri Jun 8 13:49:23 2018 +0800 二维码统计测试 commit 6e872617b8ed8fec88e89eaf1665ccf9eed3189d (tag: tag-20180608_135058) Author: php-王凡昌 Date: Fri Jun 8 12:16:20 2018 +0800 沙发样式 commit bf5cc7d26ac58e55e37e9eb73fcfe046f7079027 Author: DuanEnJian Date: Fri Jun 8 11:40:25 2018 +0800 二维码统计测试 commit 51d640304a3fe8787e651fdee5539264e08cf2d8 Author: DuanEnJian Date: Fri Jun 8 11:33:18 2018 +0800 二维码统计测试 commit 176fc3df24ccf8702fbb9d2ac765b059575e8e58 Author: DuanEnJian Date: Fri Jun 8 11:23:11 2018 +0800 暂存 commit 8c67cd29eff6cc2bd3f660cfe933bea793e537d8 Author: 45360682 <45360682@qq.com> Date: Fri Jun 8 11:12:20 2018 +0800 增加活动充值商品描述 commit f258602923026f306c17ad753c41f88a4a8205b6 Author: lichong_ <1909165236@qq.com> Date: Thu Jun 7 20:21:22 2018 +0800 提现修改 收藏菜单修改 commit 9a177d73948d252b9bb9f15b0986e0789f57585a Merge: f468231f4 fbc1d9c69 Author: 45360682 <45360682@qq.com> Date: Thu Jun 7 20:15:16 2018 +0800 Merge branch 'dev-idcard' of http://192.168.0.31/fe/cps into dev-idcard-merge commit 9e95cca992c80c4c5669abdaf4790890f0506064 Author: DuanEnJian Date: Thu Jun 7 20:13:14 2018 +0800 fix ssdbToMysql.php bug commit d7623817978ce6f1ce298cafe15bb7cda07ccc9a Author: DuanEnJian Date: Thu Jun 7 19:47:53 2018 +0800 微信二维码添加用户统计 commit b8ba0f5b8ac13cd163afb0188b408dd4cabea4c3 Merge: 3c0893359 f468231f4 Author: lichong_ <1909165236@qq.com> Date: Thu Jun 7 17:08:42 2018 +0800 合并master到qrcode commit f468231f4761ff9c7e8decef7f8bf808d070335b (tag: tag-20180607_102529, tag: tag-20180606_204258) Author: 45360682 <45360682@qq.com> Date: Wed Jun 6 20:34:03 2018 +0800 维护看点 commit f67602a6d5fa60f7056b0f8258ff9cf2280ee70d (tag: tag-20180606_162436) Author: php-王凡昌 Date: Wed Jun 6 16:14:47 2018 +0800 回滚自动关注回复 commit 0b72b4815da96a8288416f93bc28a04e905ea841 (tag: tag-20180606_154254) Author: php-王凡昌 Date: Wed Jun 6 15:40:25 2018 +0800 去除cps监控打点 commit 15baa346fa8d1531b0dba24293c813ce344cb62d (tag: tag-20180606_150357) Author: php-王凡昌 Date: Wed Jun 6 15:03:01 2018 +0800 修复前台ajax用户判断 commit 261e4b9fda8fadc0bdabaef520538fe527f42fa6 (tag: tag-20180606_113840) Author: 45360682 <45360682@qq.com> Date: Wed Jun 6 11:37:02 2018 +0800 用户状态问题 commit c1d09ca24428c4cbbdb063a1f58dbf9c615d1a2d Author: 45360682 <45360682@qq.com> Date: Wed Jun 6 11:33:28 2018 +0800 链接问题 commit e0b04c1e55779db6f066c7156ec4ad56127d0341 (tag: tag-20180605_202257) Author: 45360682 <45360682@qq.com> Date: Tue Jun 5 18:56:52 2018 +0800 链接问题 commit 3c0893359c4c74df4a9f0f7ef8528c66697e5618 Author: DuanEnJian Date: Tue Jun 5 18:11:10 2018 +0800 test commit 429181dfc18d4d7fcea2948f224ff2542e6b0dc8 (tag: tag-20180605_182909) Author: DuanEnJian Date: Tue Jun 5 17:59:51 2018 +0800 去除置顶公众号URL的域名 commit 053d4ae9d06fd18693ef30868331ce99bdcc1b7b (tag: tag-20180605_155859) Author: 45360682 <45360682@qq.com> Date: Tue Jun 5 15:56:42 2018 +0800 test commit 7b90ff85aa2eb42de677ebdbe091dc5d8ac04252 (tag: tag-20180605_152907) Author: 45360682 <45360682@qq.com> Date: Tue Jun 5 15:19:31 2018 +0800 修改报错 commit 01533d944ce1c2d2c883cb069ab12757aec073d7 Author: DuanEnJian Date: Tue Jun 5 10:31:30 2018 +0800 删除推荐书籍二维码时删除本地图片 commit 15055ca7d9e36a87c2bbc93608abaf1d70e1310f (tag: tag-20180605_111930) Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 21:35:36 2018 +0800 提现填写身份证号 commit 0d89b35068f9eba9553365608c41187436bcece7 Merge: 2a3aa704a 33815e0b8 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 21:30:42 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 2a3aa704a70e29bed9a073b0a190eb28060704a5 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 21:30:35 2018 +0800 提现填写身份证号 commit 33815e0b8c19b29e4635742457b0877a27667256 Author: DuanEnJian Date: Mon Jun 4 21:22:37 2018 +0800 test commit 5f21a6df0d9e4d7ecf0aac4e61337a5d286d7e81 Merge: 7183408a2 ab533f786 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 21:20:42 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 7183408a2288d7f7096c5d712a1cefa64e34c649 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 21:20:34 2018 +0800 提现填写身份证号 commit ab533f786fa9817f81d1e7a1609e928ba37f464e Author: 丁海波 Date: Mon Jun 4 21:18:59 2018 +0800 cps_paylog.php commit 3568cf4d8e4a782a5d3b3c7a74e13b8448ffe9e0 Author: DuanEnJian Date: Mon Jun 4 21:06:44 2018 +0800 test commit c6d7a56e36c49727f9ce0d1ab9a71d6605b003ef Author: DuanEnJian Date: Mon Jun 4 20:58:51 2018 +0800 test commit cc801aa624dea96b996fd6d0672f4acfac85d08e Author: haoxiaofeng Date: Mon Jun 4 20:57:50 2018 +0800 暂存 commit fbc1d9c69a509aa80e7f37d123bdbe1bf86e27cf Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 20:49:30 2018 +0800 提现填写身份证号 commit 923b89996b0ff49e749bc80b5134a227ee629813 Author: haoxiaofeng Date: Mon Jun 4 20:47:52 2018 +0800 暂存 commit 94dac6c01a3fc8b39ced4474f169d65533ed35c2 Author: haoxiaofeng Date: Mon Jun 4 20:40:57 2018 +0800 最终版 commit af68bac45fba25ec0170477d494856f2df3f6ee9 Author: DuanEnJian Date: Mon Jun 4 20:20:41 2018 +0800 test commit 8f6693183d220cc8bb89ceb79eedcbb0182a31a8 Author: haoxiaofeng Date: Mon Jun 4 20:18:17 2018 +0800 暂存 commit 0516396545fb58960eab09ee6c8ac0ab1d26bae3 Author: haoxiaofeng Date: Mon Jun 4 20:13:24 2018 +0800 暂存 commit 821d20bf34e54bf1ec92acbf627cc5e8a9f7b199 Author: DuanEnJian Date: Mon Jun 4 19:52:56 2018 +0800 test commit 8a1b1a24ed5b4a613b23723632c1eada2e03519e Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 19:48:36 2018 +0800 身份证 commit 62719ac716ef2391697bf5c6fc5b5aeee11e02a6 Author: DuanEnJian Date: Mon Jun 4 19:25:43 2018 +0800 生成书籍推荐永久二维码 commit 84e2ec1d81df26a52d46d28bb795ffd812bd2446 Author: DuanEnJian Date: Mon Jun 4 18:05:08 2018 +0800 test commit cb5a7ba302df5f25f0ac55346214b45c346cb708 Author: DuanEnJian Date: Mon Jun 4 17:47:45 2018 +0800 test commit 548fe56ba090a23e933431bf718ae04d7cb89784 Author: DuanEnJian Date: Mon Jun 4 17:27:28 2018 +0800 添加CUD关注推荐书籍时删除缓存 commit a8bc2916ad73892b62a16b1a506c04b9b5d8a49d Author: DuanEnJian Date: Mon Jun 4 17:19:53 2018 +0800 test commit d76167bca9a8bd4ffc7513fa8135c06da5a77b0f Author: DuanEnJian Date: Mon Jun 4 17:16:57 2018 +0800 关注自动回复功能,修改签到自动回复BUG commit d5aee17c027b6f68f19c7b6fe261af4d178ae299 Merge: d21606e4f f9a5f69e5 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 17:13:59 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit d21606e4f7b8602e8634fb991993eb11d14f4b23 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 17:13:48 2018 +0800 消息队列调整 commit dc563a1e6924ea86f01fdaba73159a4ab39c1e07 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 17:06:44 2018 +0800 暂存 commit f9a5f69e5bf55eb1ad256fdb56e70cd253efba31 Author: lichong_ <1909165236@qq.com> Date: Mon Jun 4 16:48:27 2018 +0800 去掉推荐频道 字段 commit 14208b2033e36ed4784e29175e66a41602ff640a Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 16:47:15 2018 +0800 暂存 commit 6d9d606f7fbb839660b89705a21629872a107d68 Author: lichong_ <1909165236@qq.com> Date: Mon Jun 4 16:40:31 2018 +0800 修改书籍 频道跟随至选择框 commit 8e1e534389a7542a3281953d3938c1b881c62c23 Merge: c737eae15 7e50442b3 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 15:39:51 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit c737eae151d4189f7d8116e22497a8ee7cc11f31 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 15:39:03 2018 +0800 删除推广链接页面清除缓存的按钮 commit 7e50442b35df375631a972c0866d4fe481ff98d4 Author: DuanEnJian Date: Mon Jun 4 15:08:35 2018 +0800 功能KEY页面去除编辑器 commit 9db1bbdede95d0bd3896090d29a00757044ad08e Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 14:57:34 2018 +0800 恢复合并丢失的签到代码 commit f19c94e65d144ac1131dd341d3b3130c57e04801 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 14:32:24 2018 +0800 活动 commit 3ac15087ca5772bd1471efa0ca81af7ba7d91af6 Merge: f8962e921 a460528f1 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 14:15:44 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit f8962e9219e5beb1dd240129edc7b0718eb08f55 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 14:15:36 2018 +0800 活动 commit 3029c56c4e6ff77dc2579b124e8e8a7fe1e2eac7 Author: haoxiaofeng Date: Mon Jun 4 11:56:33 2018 +0800 推广每日数据展示 commit a460528f1ccbec33cdf90163b33cf6aece2f2602 Author: lichong_ <1909165236@qq.com> Date: Mon Jun 4 11:56:03 2018 +0800 debug commit f69a24bd6ebbad5b894d50b965a9d6a0c34b661e Author: lichong_ <1909165236@qq.com> Date: Mon Jun 4 11:43:54 2018 +0800 debug commit 6f3ccca3981580c90f7e850f16fd00c9cd139cb7 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 11:43:05 2018 +0800 身份证 commit 5c7d831b87a59010f24c854820383134f45c44b6 Author: 45360682 <45360682@qq.com> Date: Mon Jun 4 10:53:23 2018 +0800 微信调起支付 commit 2de0808bac56f6093893289d9b5b47ec9cd61d50 Merge: 24bf9a90d ecfb41b4b Author: haoxiaofeng Date: Sat Jun 2 20:18:29 2018 +0800 Merge branch 'dev-qrcode' of http://192.168.0.31/fe/cps into dev-qrcode commit 24bf9a90d6f64690014242fe8700bf2c83c2a797 Author: haoxiaofeng Date: Sat Jun 2 20:17:36 2018 +0800 暂存，推广链接区分当日数据 commit 1d6555cf77d802dc6926acbc074a4e9bd64adeea Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 20:08:02 2018 +0800 修改关注问题 commit ecfb41b4ba4c657ea47ebd6fc5e10bade94deffd Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 20:06:43 2018 +0800 修改关注问题 commit 632a6c5f0ce9067684096adaebb7813b977605c4 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 20:05:25 2018 +0800 修改关注问题 commit c20618c279b22352d0a69bdbbc1ebd155a648e27 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 20:00:18 2018 +0800 修改关注问题 commit e98a8eebd3bb586900a36ec7a812d5895929037a Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:57:28 2018 +0800 修改关注问题 commit a1dffe0418b56dc1ccc0a04a9ee8ead9ce7063e9 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:55:58 2018 +0800 修改关注问题 commit 716f7de79ddaa04b98a0c2ef39c7fd8af64b5e2f Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:53:49 2018 +0800 修改关注问题 commit 78d49b9fd9b9b63f14b5f0d4c4f9c399d1fe3ec1 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:52:10 2018 +0800 修改关注问题 commit bf2bcb62d96f449bb4b952846547cc8fd089fca7 Merge: a19f9affc 3bb78ac86 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:46:56 2018 +0800 Merge remote-tracking branch 'origin/dev-qrcode' into dev-qrcode commit a19f9affc47fa10334a7c3078885bc0bfdc1a73d Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:46:44 2018 +0800 修改关注问题 commit a8e7b0e8594c56047686193b7457d1c4ff950243 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:40:10 2018 +0800 修改关注问题 commit 64723badd8421e0e39d37574ada594c3103921cf Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:26:08 2018 +0800 修改关注问题 commit 3bb78ac869fccff62a3f5498d697424cf2cf0e3d Author: DuanEnJian Date: Sat Jun 2 19:22:09 2018 +0800 test commit 317f355c90bd94d9a9ff1ae1a3dfa40977979d9e Author: DuanEnJian Date: Sat Jun 2 19:11:31 2018 +0800 test commit 4c663af9ce406e9a2bffc9967e332229f287e6b4 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:02:33 2018 +0800 修改关注问题 commit d4843db36506bf5d9f70bb2725fb182de2544a09 Merge: b3d40ad04 f975aa0da Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:01:50 2018 +0800 Merge remote-tracking branch 'origin/dev-qrcode' into dev-qrcode commit b3d40ad04bd01f450f5df0db581fc16c550be4c8 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 19:01:41 2018 +0800 修改关注问题 commit f975aa0da06cfe211a07e1df8caed73a1da82d33 Author: DuanEnJian Date: Sat Jun 2 18:59:49 2018 +0800 CustomQrcode Model文件移到Common commit 4193e5b52d5b92b16bd3e8625f421bff53465a1a Author: haoxiaofeng Date: Sat Jun 2 18:55:43 2018 +0800 金额过滤 commit 79bb0978a504fdf406e18dab87c487b7a41b297a Author: DuanEnJian Date: Sat Jun 2 18:46:09 2018 +0800 自定义二维码微信回复功能 commit ada4a2dba4a2aa9894f2ec2caa309046c6802e41 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 18:37:53 2018 +0800 修改关注问题 commit 0262971ce9966b5af2411741e3c1b60bdedee983 Merge: 5376f35f9 25661f108 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 18:37:17 2018 +0800 Merge remote-tracking branch 'origin/dev-qrcode' into dev-qrcode commit 5376f35f9b4684f9b4e6ce97136c500c00f8b4b4 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 18:37:10 2018 +0800 修改关注问题 commit 25661f108789006a8d504c8b5682e17b9e2c0fc8 Author: haoxiaofeng Date: Sat Jun 2 18:22:16 2018 +0800 章节详情增加上一章 commit 619c379484072a872e5cf8949e69bd47f68304c6 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 17:44:15 2018 +0800 修改关注问题 commit 6322df104e33e76f93d69ab74e51ff5fa9edc9d5 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 17:41:06 2018 +0800 test commit 95ecb73e41b0c21c9d6dd2300db0df108c76efc3 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 17:38:10 2018 +0800 test commit d9dbbecd74cf1148823ab46f6dfd1e1c485d979c Author: 丁海波 Date: Sat Jun 2 17:30:26 2018 +0800 封面样式 commit 3d1ffc99ca7526277260560838c70e3b23307698 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 17:25:49 2018 +0800 test commit ddaca70f1d52477d5ea0d8e6be058c0e28ce2c69 Merge: 76021d320 ee1bae30d Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 17:23:49 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 76021d32009b46b60f4c9942e9443356594fe9c2 Author: 45360682 <45360682@qq.com> Date: Sat Jun 2 17:23:41 2018 +0800 test commit ee1bae30dd2ed9acea34854c5f83966dbdfa5c82 Author: 丁海波 Date: Sat Jun 2 17:15:35 2018 +0800 最近阅读红框修改 commit 14ccbd408302e77dff6015dcf2af84b9b9ac94b6 Author: 丁海波 Date: Sat Jun 2 17:14:49 2018 +0800 添加封面效果 commit e0138de7c2d4927e9f71f7754963e27cc2bba574 Merge: 473eb09c0 2c9151085 Author: 丁海波 Date: Sat Jun 2 17:01:44 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 473eb09c082e77ac8e65483c2cc5529eefca42ef Author: 丁海波 Date: Sat Jun 2 17:01:40 2018 +0800 262626 commit 3f5a00f5bcf5681433823b5b604a3775f78e27ee Author: DuanEnJian Date: Sat Jun 2 16:54:42 2018 +0800 添加自定义二维码功能 commit 2c9151085693310251da9e564cac7678e737f6ec Author: licc <45360682@qq.com> Date: Sat Jun 2 16:51:12 2018 +0800 test commit 9870f0a8464f49436b949e7c4376d11897da437e Merge: 16f2a8665 a268a097a Author: licc <45360682@qq.com> Date: Sat Jun 2 16:49:04 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 16f2a866595b717248dd63ae1ca1030baaca7b83 Author: licc <45360682@qq.com> Date: Sat Jun 2 16:48:53 2018 +0800 test commit a268a097a2ad3a055eaa8e83f2feaab69c9c03bd Merge: 92b2ecc2a ac578eca3 Author: 丁海波 Date: Sat Jun 2 16:48:12 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 92b2ecc2ab24de852264fdc28a143703b490da68 Author: 丁海波 Date: Sat Jun 2 16:48:04 2018 +0800 @media (max-width: 767px) { .skin-blue-light .main-header .navbar .dropdown-menu li a { color: #333; } .skin-blue-light .main-header .navbar .dropdown-menu li a:hover { background: #367fa9; color: #fff; } } commit ac578eca3dbbff7f896d3c3f61099920e072c54c Author: licc <45360682@qq.com> Date: Sat Jun 2 16:45:52 2018 +0800 test commit 25b10d8318cad09edf49a402f01f396dea4e49f1 Author: licc <45360682@qq.com> Date: Sat Jun 2 16:43:57 2018 +0800 test commit 4fae3eb33a8e25eafde6424510833d4f50b37660 Author: licc <45360682@qq.com> Date: Sat Jun 2 16:42:44 2018 +0800 test commit f904a5331d218b2c4ec335c0a00b7e6eeecf6371 Author: haoxiaofeng Date: Sat Jun 2 16:41:40 2018 +0800 1.小说状态：完结/连载 2.小说管理-书籍列表 增加关键字搜索，book表增加keywords字段 3.小说管理，小说推广章节详情页增加下一章按钮(暂未判断收费章节) commit 5cbb6886461cf301df955bf67ab265fa67b62495 Author: licc <45360682@qq.com> Date: Sat Jun 2 16:39:49 2018 +0800 test commit 08fe476bc84d1ba29735f6f82d32a642557099e9 Author: licc <45360682@qq.com> Date: Sat Jun 2 16:36:33 2018 +0800 test commit 6aed2da2a641a160239d14f9e423d72cfae80f8a Author: licc <45360682@qq.com> Date: Sat Jun 2 16:29:12 2018 +0800 test commit 8ba9c3bb347d550a4eb48e2773783c72515a3119 Merge: 817c945b5 3fa786d9c Author: 丁海波 Date: Sat Jun 2 16:11:58 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 817c945b50e3bd3663bdba73a3826cb2e1bc50cf Author: 丁海波 Date: Sat Jun 2 16:11:48 2018 +0800 vry_sry commit 3fa786d9ca41c825fb8d00f21d2e363d921ac53f Merge: 311b805cd 252b2151d Author: licc <45360682@qq.com> Date: Sat Jun 2 16:09:04 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 311b805cd315a069b721479af895596419be5ed2 Author: licc <45360682@qq.com> Date: Sat Jun 2 16:08:57 2018 +0800 test commit 252b2151dc58aadb7ce55b295fea587bf2387fd6 Merge: 85a36d602 c47259098 Author: 丁海波 Date: Sat Jun 2 15:54:39 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 85a36d60258b73589aa07a2df64b583e90d77e22 Author: 丁海波 Date: Sat Jun 2 15:54:30 2018 +0800 activity 很抱歉弹窗 commit c4725909850634c4f3bd9c977e49cd0e3d246e68 Merge: 1e3b03973 383155ff7 Author: licc <45360682@qq.com> Date: Sat Jun 2 15:51:40 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit 1e3b0397367bf55352f32013ab73de7b8df97649 Author: licc <45360682@qq.com> Date: Sat Jun 2 15:51:32 2018 +0800 test commit 383155ff7bfcc92712daaa4eb68a1776d3a91190 Author: lichong_ <1909165236@qq.com> Date: Sat Jun 2 15:13:57 2018 +0800 修改钱币类型 commit eb7f1ad8a0ccaa5a1925ccc4f3c8bbfae0aa9d28 Author: lichong_ <1909165236@qq.com> Date: Sat Jun 2 14:43:29 2018 +0800 修改赏金提现类型 commit 129f6ca66ac2f0c9c4e1f41d84048391c35023f3 Author: lichong_ <1909165236@qq.com> Date: Sat Jun 2 14:41:44 2018 +0800 修改钱币类型 commit 23a0f4bedd139a5595d927191fc7f5ea87091aa4 Author: lichong_ <1909165236@qq.com> Date: Sat Jun 2 14:39:54 2018 +0800 修改字符串类型 commit f62722447b8eb8882c11c99604c5c392f636ff9d Author: lichong_ <1909165236@qq.com> Date: Sat Jun 2 11:32:30 2018 +0800 qrcode分支修改bug commit 5af270da80d4a63a64f97b1058737d7f6bbdcc34 Author: licc <45360682@qq.com> Date: Sat Jun 2 10:58:02 2018 +0800 新增付费用户修改 commit bd4b32710003a64089b356c1001109edbfd37d61 Author: licc <45360682@qq.com> Date: Sat Jun 2 10:41:29 2018 +0800 user缓存 commit 9a08ea4dd0f11c470f8c194bc49516518c22dd51 Merge: 570dce03e e8ba982a1 Author: licc <45360682@qq.com> Date: Sat Jun 2 10:32:43 2018 +0800 Merge branch 'dev-needs' of http://192.168.0.31/fe/cps into dev-agent-merge # Conflicts: # application/api/controller/Wechat.php commit 570dce03e26d178e66051c546a443fc94f5accb5 Merge: f86e85327 500ff1090 Author: licc <45360682@qq.com> Date: Fri Jun 1 20:26:57 2018 +0800 Merge branch 'dev-agent4-user' of http://192.168.0.31/fe/cps into dev-agent-merge # Conflicts: # application/admin/controller/Activity.php # application/admin/controller/admin/Config.php # application/admin/library/Auth.php # application/admin/view/activity/index.html # public/assets/js/backend/auth/agent.js commit 500ff10907611b09bb62280568a0fd457fd0deb4 Author: licc <45360682@qq.com> Date: Fri Jun 1 20:12:11 2018 +0800 最近阅读恢复 commit f86e85327bc4ee41a098dd576053cb3786425b41 Author: licc <45360682@qq.com> Date: Fri Jun 1 20:02:00 2018 +0800 去掉模板消息阅读记录最后一本书 commit 0e52af8cec169c3550ea969f4dfcd156600f6f64 Author: php-王凡昌 Date: Fri Jun 1 17:53:19 2018 +0800 模板消息，跳转链接长度改250 commit 8bc38820b157c194550e462726c4e4f79de1f1f8 Author: php-王凡昌 Date: Fri Jun 1 16:45:36 2018 +0800 图片文案添加随机数 commit 13d19089a1e5eda3309890c5d6d3b771a4e19ca4 Merge: f409ef01f dfeee60ec Author: licc <45360682@qq.com> Date: Fri Jun 1 15:53:10 2018 +0800 Merge remote-tracking branch 'origin/dev-agent-merge' into dev-agent-merge commit f409ef01fd509e9e12b782d6e0f07cce10e9c83b Author: licc <45360682@qq.com> Date: Fri Jun 1 15:52:58 2018 +0800 修改配号的代理商活动列表显示问题 commit dfeee60eca348cc67cef56493be5fbcfdb99a40d Author: lichong_ <1909165236@qq.com> Date: Fri Jun 1 15:52:50 2018 +0800 代理商配置检测 commit e8ba982a168bc747b310aa369df37e1270a38123 Author: 丁海波 Date: Fri Jun 1 15:51:47 2018 +0800 js路径 commit dae50549a311c950d9f693eafe8898569bbe1553 Author: lichong_ <1909165236@qq.com> Date: Fri Jun 1 15:48:02 2018 +0800 修改配置 commit b16b78fb313f991aea4f8400f908518290d93ddb Author: lichong_ <1909165236@qq.com> Date: Fri Jun 1 15:37:45 2018 +0800 代理商权限检测 commit 3df9e1a9e68e7ec5dc1430aae8c3a7d0aa53ac6a Author: licc <45360682@qq.com> Date: Fri Jun 1 15:10:32 2018 +0800 修改配号的代理商活动列表显示问题 commit 2dd9a55811f87385581b749dec9a80009def9e1c Author: licc <45360682@qq.com> Date: Fri Jun 1 14:24:09 2018 +0800 修改配号的代理商活动列表显示问题 commit 20eeb71f2519203e15c0d56402179734e09b0f44 Author: licc <45360682@qq.com> Date: Fri Jun 1 10:49:46 2018 +0800 开启代理商配号 commit 66930fa375fddbc8629c49da01031f635e909aea Author: licc <45360682@qq.com> Date: Fri Jun 1 10:49:20 2018 +0800 Merge branch 'dev-agent4' of http://192.168.0.31/fe/cps into dev-agent-merge commit e8fc7ba97d25d7ed39e2d105da262a979584590d Author: 丁海波 Date: Fri Jun 1 10:39:53 2018 +0800 置顶 commit 98d1295b41283007f2d5dbbc58042da00556fe5b Merge: dbb79684f ea2922f66 Author: licc <45360682@qq.com> Date: Fri Jun 1 10:28:31 2018 +0800 Merge branch 'dev-agent4-develop' of http://192.168.0.31/fe/cps into dev-needs commit ea2922f66caa1616f860bd84f20fd4952aeef386 Author: licc <45360682@qq.com> Date: Fri Jun 1 10:26:40 2018 +0800 问题8 commit 718b5d20de193e2b8117923c8a870cf06a832dbb Author: licc <45360682@qq.com> Date: Thu May 31 20:30:38 2018 +0800 user表，如果永久书币没有变更，则不计入数据库 commit 1fe1961578bf2244f68ea2c04d3d058decf73701 Author: haoxiaofeng Date: Thu May 31 20:23:06 2018 +0800 图文修改 commit 5fb1f061f82c44a0afc9caa4ddde3ce29590ac2b Author: licc <45360682@qq.com> Date: Thu May 31 20:16:11 2018 +0800 最近阅读改成只有付费用户才存到redis和数据库里，如果未付费存在cookie里 commit 03aae4ffbd6782829f314de3b407b00d4ba31042 Merge: a923d9e0a 6e51bb8c6 Author: licc <45360682@qq.com> Date: Thu May 31 19:26:23 2018 +0800 Merge remote-tracking branch 'origin/dev-agent4-develop' into dev-agent4-develop commit a923d9e0ae7abb256b3c69b7b9788bc00bbba3c0 Author: licc <45360682@qq.com> Date: Thu May 31 19:26:15 2018 +0800 最近阅读优化 commit 6e51bb8c62dde49dd384f40858aba0defb644d78 Author: haoxiaofeng Date: Thu May 31 18:12:00 2018 +0800 暂存 commit e967e0f55ece663482311f820cb2a89377c1c5fa Author: haoxiaofeng Date: Thu May 31 17:34:27 2018 +0800 test commit 89c2318198a1f19e042c9be42c8c303be8330f55 Author: haoxiaofeng Date: Thu May 31 17:31:43 2018 +0800 test commit a48aff967d639e6a26ccfc7670c6dc0642f279fc Author: haoxiaofeng Date: Thu May 31 17:19:48 2018 +0800 test commit dbb79684f29204858e5e5d72fc47706910346791 (tag: tag-20180531_171714) Author: php-王凡昌 Date: Thu May 31 17:17:05 2018 +0800 增加生成文案版本号 commit ef5c88468988af9ea03031c40fd660e2d7b87581 Merge: cea463fd8 d966baa60 Author: 丁海波 Date: Thu May 31 17:07:54 2018 +0800 Merge remote-tracking branch 'origin/dev-agent4-develop' into dev-agent4-develop commit cea463fd841b484cd8c86d97dcd16d11b6d29f84 Author: 丁海波 Date: Thu May 31 17:07:45 2018 +0800 pop_up_error commit d966baa600947dcbbe92a7b16d863a91ea3b95ef Author: licc <45360682@qq.com> Date: Thu May 31 17:03:48 2018 +0800 test_over commit 8b373c210e5d11af1c77d4524355c18cd30ac200 Author: licc <45360682@qq.com> Date: Thu May 31 16:58:27 2018 +0800 test commit d6aa38d1b2a1331199307839520c1f7099870550 Merge: c5b85594b 62c7aab88 Author: licc <45360682@qq.com> Date: Thu May 31 16:55:15 2018 +0800 Merge remote-tracking branch 'origin/dev-agent4-develop' into dev-agent4-develop commit c5b85594bb2966f717ff44a34cdcd44b92bcf1c0 Author: licc <45360682@qq.com> Date: Thu May 31 16:55:06 2018 +0800 test commit 62c7aab88a61d5e235557d3cf86737d339d678ef Author: lichong_ <1909165236@qq.com> Date: Thu May 31 16:52:09 2018 +0800 修改展示信息 commit 6b559dd609f307966d2c30c62c20a7315d900a8a Author: licc <45360682@qq.com> Date: Thu May 31 16:51:11 2018 +0800 test commit 25a866b8567b1de43d4963fc74e6d166143ed938 Author: licc <45360682@qq.com> Date: Thu May 31 16:45:19 2018 +0800 test commit 5995aa2ee1b666616a74140254960d321ddf28ce Author: licc <45360682@qq.com> Date: Thu May 31 16:40:42 2018 +0800 test commit f0902033bfda4fc2aa8e45fe84f7360e9b7d497e Author: licc <45360682@qq.com> Date: Thu May 31 16:36:00 2018 +0800 test commit b6566485a3a9ae137d1a65b0348a8c1ee98d0b90 Author: licc <45360682@qq.com> Date: Thu May 31 16:32:57 2018 +0800 test commit e02f947483bc15cd8f170e91c930e1d195202f5f Author: licc <45360682@qq.com> Date: Thu May 31 16:31:33 2018 +0800 test commit 0cc8c1c423a486f18bbf12107182d2ff7afe351f (tag: tag-20180531_163256) Author: php-王凡昌 Date: Thu May 31 16:30:19 2018 +0800 修复后台用户头像 commit 9e5c8d9e7563899dfd4b54d98e872cc668e114a0 Author: licc <45360682@qq.com> Date: Thu May 31 16:21:27 2018 +0800 test commit 7d8233d2c0e98142b0aec6bd1662bcd69b88d7d3 Merge: 5b64424ae f67de382b Author: licc <45360682@qq.com> Date: Thu May 31 16:20:50 2018 +0800 Merge remote-tracking branch 'origin/dev-agent4-develop' into dev-agent4-develop commit 5b64424ae459281997488e74bf7db71402d7c985 Author: licc <45360682@qq.com> Date: Thu May 31 16:20:32 2018 +0800 test commit f67de382bc23618879521956618f41ac5aa8305d Author: DuanEnJian Date: Thu May 31 16:19:54 2018 +0800 修改签到自动回复用户看点获取bug commit badcf3837643d687226ca82de42699935b7a908a Author: DuanEnJian Date: Thu May 31 15:57:03 2018 +0800 修改获取推荐书籍Bug commit 30ff77f273c8e2f7f5c49532224103cd7d4aef77 Author: DuanEnJian Date: Thu May 31 15:18:17 2018 +0800 修改微信文字签到Bug 功能key缓存添加content字段 commit ab03586d62630165eba86048fbfab400699c2e63 Author: haoxiaofeng Date: Thu May 31 15:09:15 2018 +0800 command commit c5a75afbbbdfbf49a7561f41b0e36f85fa3ec6ea Author: haoxiaofeng Date: Thu May 31 15:01:08 2018 +0800 图文消息 commit 5c3f3eea51330edfc32a0e9bd051130b29d12bc6 Author: licc <45360682@qq.com> Date: Thu May 31 14:33:49 2018 +0800 用户信息全部读缓存 commit 2cafe4194852640c12419e3fa6926241d22c21c0 Author: lichong_ <1909165236@qq.com> Date: Thu May 31 14:22:20 2018 +0800 智能推荐库 commit 6bad02591dd604aedf081dfad7f5639ca1e7f3e0 (tag: tag-20180531_155953, tag: tag-20180531_150127) Author: 丁海波 Date: Thu May 31 14:19:25 2018 +0800 -40px commit 6be06edde0158bf48a7ea984913977d96789a803 Author: 丁海波 Date: Thu May 31 14:18:57 2018 +0800 袋鼠书城 commit 48c39694b452de43e08a83e6746afcefcd35b2db Author: 丁海波 Date: Thu May 31 14:16:45 2018 +0800 aaa commit bfd4a938a49653e831679ccb25b8134eeae87916 Author: 丁海波 Date: Thu May 31 14:15:38 2018 +0800 2rem commit e14c562ff89760861f34099e7dceb36e88127ba0 Author: 丁海波 Date: Thu May 31 14:10:55 2018 +0800 wx-article-qrcode margin-top:-.2rem commit a97e4fc086dc5f1f226e898e6e723af7edf3eb0e Author: DuanEnJian Date: Thu May 31 11:59:07 2018 +0800 添加签到时自动回复功能 添加推荐书籍缓存Set time:86400 KeyMap = SRB:1 OR SRB:2 CUD操作删除缓存 添加功能Key缓存Hash time:86400*2 KeyMap = K:* UD操作删除缓存 commit 58f7231bb1bbc4adea5e158c40ac729ff0942dbc Author: 丁海波 Date: Wed May 30 19:57:28 2018 +0800 看点不够文字颜色修改 commit d4a50a1ea0068baf69f87245b4a3c67ccaac3f27 Author: 丁海波 Date: Wed May 30 19:51:38 2018 +0800 pay文字颜色修改 commit f479b91669095c5b1582a79cd287b46559ff5aba Merge: 24f53a4a1 5454e664e Author: 丁海波 Date: Wed May 30 19:47:50 2018 +0800 Merge remote-tracking branch 'origin/dev-referral' into dev-referral commit 24f53a4a16d600ccf6eb485607ee2cf6a1035cd5 Author: 丁海波 Date: Wed May 30 19:47:40 2018 +0800 换袋鼠icon commit 5454e664e8c184dfbc3626b631fb1fc23c4afbf8 Author: php-王凡昌 Date: Wed May 30 19:36:03 2018 +0800 袋鼠换图 commit b542a7e254fe648aa5a04eae88aec0aa141a2111 Author: licc <45360682@qq.com> Date: Wed May 30 19:00:43 2018 +0800 user缓存改为UN: commit 5da5243403205b7c6949d960096d071dba3497a9 Author: php-王凡昌 Date: Wed May 30 18:49:54 2018 +0800 千阅默认头像 commit 241063977f38b1c0375f70aa5e69c36faf18c965 Author: php-王凡昌 Date: Wed May 30 18:31:46 2018 +0800 修正临时目录 commit 4b6cd65fc0987d9411fe4b65acaa0221a312c776 Author: 丁海波 Date: Wed May 30 18:24:40 2018 +0800 删除阅读原文中括号 最近阅读箭头颜色 commit e9d4d2f8505e286678cad3c4b3b1cbc811dc42d1 Author: licc <45360682@qq.com> Date: Wed May 30 18:23:27 2018 +0800 微信关注 commit 39a26b931da5afebd1e93c74f6a5415cd1982e69 Author: licc <45360682@qq.com> Date: Wed May 30 18:22:04 2018 +0800 暂存 commit f734c4403ed67f2595ff05243bf0ecd4a1cba112 Merge: 1621b506c 55810e85e Author: licc <45360682@qq.com> Date: Wed May 30 17:51:24 2018 +0800 Merge remote-tracking branch 'origin/dev-agent4-develop' into dev-agent4-develop commit 1621b506ca02aab984b5e7d6186fffe62f2a5b59 Author: licc <45360682@qq.com> Date: Wed May 30 17:51:15 2018 +0800 解决活动价钱和提示一离得太远的问题 commit 82d44f71270916e1dab0939a223062ca67482028 Author: licc <45360682@qq.com> Date: Wed May 30 17:43:45 2018 +0800 userInfo加redis暂存 commit 55810e85eeaf94e25f7b41c1db624f311264991e Author: haoxiaofeng Date: Wed May 30 17:08:08 2018 +0800 ssdb记录支付标记 commit 7cc8abdfb10dee4cfd3b0c721781d469cd6a72e0 Author: haoxiaofeng Date: Wed May 30 16:57:32 2018 +0800 新用户取消充值消息队列优惠活动推送暂存 commit f5b9e83ffcbb0193bc5ba5e55282aefdc48acb28 Author: licc <45360682@qq.com> Date: Wed May 30 16:50:15 2018 +0800 用户和公众号发生交互后更新用户关注状态 commit 016d2c8071fb71a41d1212d5aa7bde38b0b667f8 Merge: 19ee0a04d 4a7451e15 Author: php-王凡昌 Date: Wed May 30 16:11:52 2018 +0800 Merge branch 'dev-fix3' of 192.168.0.31:fe/cps into dev-referral commit 4a7451e156114e7a41f6f23d3067bf1c3b054459 Author: php-王凡昌 Date: Wed May 30 15:54:12 2018 +0800 修改默认值 commit 9668fcd32bea9a204e6f7f1a79eee0896b7656e5 Author: 丁海波 Date: Wed May 30 15:49:13 2018 +0800 引导二维码 commit 9f105e6b928342517606bc61f45f0352ca882828 Author: 丁海波 Date: Wed May 30 15:30:49 2018 +0800 引导二维码背景 commit d7bfdd7d737fb87f562792200da2fb2c1645eb53 Author: 丁海波 Date: Wed May 30 15:27:48 2018 +0800 引导二维码 commit 184a4a066e4e13d3a4376dd98a32f5c785e7c3fd Author: 丁海波 Date: Wed May 30 15:23:01 2018 +0800 添加引导二维码 commit f22c241b49f9c83047af99cb7977849f12a363a7 Author: lichong_ <1909165236@qq.com> Date: Wed May 30 15:17:14 2018 +0800 修改 关注 签到 库文件 commit 3a3dd7093332491f25c50493ebb85b059da2e866 Author: 丁海波 Date: Wed May 30 15:03:46 2018 +0800 生成二维码代码 commit b6a27775777931c236a9927ea1b58859785f168a Author: php-王凡昌 Date: Wed May 30 14:42:40 2018 +0800 二维码图片生成 commit 8eb048a38c2d46a8065b8811c57b7e1bc962e963 Author: licc <45360682@qq.com> Date: Wed May 30 14:29:19 2018 +0800 新人活动统计修改 commit 80b8e2806a3cf77a1a79739b570e9f338864a9ad Author: 丁海波 Date: Wed May 30 14:28:40 2018 +0800 推广二维码修改 commit 19ee0a04d791ae5cb34d7e7c181060744e6eac7d (tag: tag-20180530_141559) Author: licc <45360682@qq.com> Date: Wed May 30 13:43:23 2018 +0800 主框架入口去掉url_debug commit dc23eba5ac34fdaad81a18e59a06787a0a38fba5 Author: php-王凡昌 Date: Wed May 30 11:33:36 2018 +0800 修改图片路径，生成二维码图片 commit c29a03a9032c9ac8cc79ba4b34b17f09e58ef52f Author: DuanEnJian Date: Wed May 30 11:10:30 2018 +0800 推广文案&图片Sex增加一个活动 超管增加一个功能性管理菜单,增加一张表 commit aed3542546f1bc8236f829abb15c8f3f5b32e8d3 Author: licc <45360682@qq.com> Date: Wed May 30 11:04:53 2018 +0800 最近阅读优化 commit 4c913dc90f8bba8c5b47da98e3b14ce313b8b75a Author: licc <45360682@qq.com> Date: Wed May 30 10:51:40 2018 +0800 最近阅读更新修改 commit a57b4a83053f615268af3cc477106fa0a5ba28d8 Author: lichong_ <1909165236@qq.com> Date: Wed May 30 10:50:50 2018 +0800 新增 关注推荐 签到推荐库 commit 796743bbc587ae0bda9992a5d6a80cecc154929e Author: licc <45360682@qq.com> Date: Wed May 30 10:48:28 2018 +0800 最近阅读更新修改 commit 1c9d0aeba29e4f7f185ad0cc83092aeb5a96cf54 Author: licc <45360682@qq.com> Date: Wed May 30 10:43:00 2018 +0800 最近阅读更新修改 commit ee5b14d33b67f3b4738b5d89768dc4fba902b378 Author: php-王凡昌 Date: Wed May 30 10:40:51 2018 +0800 增加底部二维码图片 commit 7628f89a38e548271fde67c149960e243c6d64e7 Author: 丁海波 Date: Wed May 30 10:32:01 2018 +0800 推广页面底部优化 commit fb11922a73a7aefe4f0ff2de815c4a673d1935e1 Author: licc <45360682@qq.com> Date: Wed May 30 10:08:18 2018 +0800 活动暂存 commit b7f7ff7de6913724c18f83ff80dd79754530d56e Author: php-王凡昌 Date: Tue May 29 22:12:07 2018 +0800 修改默认样式 commit e8db037159999ce8dc1a10ac9a65af23b4f9b225 Author: 丁海波 Date: Tue May 29 22:04:35 2018 +0800 title修改 commit befee37db5b62b8c9dcf347b9078dc9370efda46 Merge: 52fb05b82 91cdfc640 Author: 丁海波 Date: Tue May 29 22:01:52 2018 +0800 Merge remote-tracking branch 'origin/dev-fix3' into dev-fix3 commit 52fb05b820540cc8cb5741ef40be84e2d022136d Author: 丁海波 Date: Tue May 29 22:01:45 2018 +0800 标题文字大小 commit 91cdfc640f9415204a49e1e5a093fe6293a66ef4 Author: php-王凡昌 Date: Tue May 29 21:58:54 2018 +0800 增加部分底部原文引导图片 commit e4f07e0e99c5e94d61e9d12ccd22c8796228f6ca Merge: 94649d7a5 3a89f51f2 Author: 丁海波 Date: Tue May 29 21:54:39 2018 +0800 Merge remote-tracking branch 'origin/dev-fix3' into dev-fix3 commit 94649d7a5af5ebc31485b041c8fb4e0bd1fdebf1 Author: 丁海波 Date: Tue May 29 21:54:27 2018 +0800 图片推广标题优化 commit 3a89f51f27858f25f9866d5d7bb780c350dbeafd Author: php-王凡昌 Date: Tue May 29 21:11:49 2018 +0800 修改图片推广文案字体 commit 4198ca629aafd08f705e3bed8001634475a46889 Author: 丁海波 Date: Tue May 29 21:11:15 2018 +0800 推广图片修改 commit fb055f182a28497116ad8f7a067574677035db47 Author: 丁海波 Date: Tue May 29 21:05:06 2018 +0800 推广图片去掉边框 commit 6c0d39f2fcb72808703635d1f47170afc32be801 Author: php-王凡昌 Date: Tue May 29 18:26:16 2018 +0800 修改单页文字最大数量 修改图片最大宽度 commit 1348216f467e28e59ac3b35a2d32193bfd039b1b Author: php-王凡昌 Date: Tue May 29 18:14:54 2018 +0800 修改图片推广章节生成 commit 0f57ad650f72a9422391ac78c4666df1eab5cc74 Author: 丁海波 Date: Tue May 29 18:04:02 2018 +0800 推广图片修改 commit f58fead60825d6b1792e50a4f2a94866ee399c66 Author: 丁海波 Date: Tue May 29 17:55:06 2018 +0800 千阅搜索修改 commit 21ec9abc0731716d6d67257149cdf8d76dd156c2 Merge: 0d1a74beb 3a1158c85 Author: php-王凡昌 Date: Tue May 29 17:42:30 2018 +0800 Merge branch 'dev-agent' of 192.168.0.31:fe/cps into dev-agent4 Conflicts: application/admin/controller/auth/Authswitch.php application/admin/view/admin/config/index.html application/admin/view/common/header.html commit d0b0828c0ab94738e387204095f7116cba8f64f9 Author: 丁海波 Date: Tue May 29 17:21:41 2018 +0800 后台首页修改 commit 3a1158c851deb6bb5dc17c04aa698210c72cb1df Merge: 628a336f2 467fe68fc Author: lichong_ <1909165236@qq.com> Date: Tue May 29 17:09:43 2018 +0800 Merge branch 'dev-agent' into dev-bug2-agent commit 47ebcff217bdb3bde4a570a820f34c3d014abc4f Author: 丁海波 Date: Tue May 29 17:04:23 2018 +0800 图片效果优化 commit f6514dbbbab85d4d18812d12621fd413e433d036 Author: 丁海波 Date: Tue May 29 16:24:14 2018 +0800 阅读页颜色 优化 commit 467fe68fc9250553dffcee3bb79e6c32be867daa Author: licc <45360682@qq.com> Date: Tue May 29 16:16:31 2018 +0800 去掉测试信息 commit 78d2bf2b9032a427bb366205a9c5214a9c3e4e6e Author: 丁海波 Date: Tue May 29 16:07:02 2018 +0800 个人中心充值按钮颜色修改 commit 5be9981f77b14d8fe3aa9913a253a538d18290dc Author: 丁海波 Date: Tue May 29 16:04:52 2018 +0800 首页更多箭头和书籍名称颜色修改 commit 163dce76642864a3f553a741f84c2d5bcdd5c8ee Author: 丁海波 Date: Tue May 29 15:55:24 2018 +0800 搜索结果页 匹配文字的颜色优化 commit 8e3d3b7dc6c9435b9903d4274abf593cfccd5e1d Author: 丁海波 Date: Tue May 29 15:53:06 2018 +0800 目录列表文字颜色修改 commit d4375951ee4a22c62a2e76db0c19c10219ca3e69 Author: 丁海波 Date: Tue May 29 15:49:59 2018 +0800 搜索页按钮颜色修改 commit 81fd39f241d76b51901ac5b965d4c9b6997679aa Author: 丁海波 Date: Tue May 29 15:47:54 2018 +0800 分类二级页面tab按钮颜色修改 commit ea38435e15552a3bb6d103a38934b0b0fc4328ff Author: 丁海波 Date: Tue May 29 15:45:34 2018 +0800 充值页按钮高度优化 commit 3aee16139ce6b2324726ff45518b007caf4264d5 Author: 丁海波 Date: Tue May 29 15:44:04 2018 +0800 目录当前章节颜色修改 commit 84ed6283d48dbf0a7a90337e41d158b197db42d1 Author: 丁海波 Date: Tue May 29 15:38:30 2018 +0800 书籍详情页展开按钮颜色优化 commit 33d1cb11514d339562a6c070bb02bff9c4746298 Author: 丁海波 Date: Tue May 29 15:33:46 2018 +0800 阅读页 举报位置变更 commit 8b821670812f8e44ebd95f3df5265d44e893b2da Author: 丁海波 Date: Tue May 29 15:19:23 2018 +0800 阅读页夜间模式修改 commit 628a336f2a609fbad2d51c059b196baec0052d19 Author: lichong_ <1909165236@qq.com> Date: Tue May 29 15:16:02 2018 +0800 代理充值跳转逻辑修改 commit 5179b24880bc047053838b8f3ad14946f64e7336 Author: 丁海波 Date: Tue May 29 15:13:00 2018 +0800 最近阅读 继续阅读颜色修改 commit 6d2a02f9f01a566805a373370d3b962b2e2dbfdd Author: 丁海波 Date: Tue May 29 15:07:58 2018 +0800 最近阅读头部 commit 8d311fdb5a09a2a71cdc68b56e2b07029319fdc5 Author: 丁海波 Date: Tue May 29 14:44:00 2018 +0800 图片推广文案样式优化 commit dbda7c43fb2e28e8ea7ccbab08039b59943e46ef Author: 丁海波 Date: Tue May 29 14:39:43 2018 +0800 图文推广样式修改 commit a2204427ac1ae1d0fc20047be30e9cb2db22effc Author: php-王凡昌 Date: Tue May 29 14:34:52 2018 +0800 删除model中的关联查询 commit eda7a75b78c2b77209729f4649652e28755d6bce Author: php-王凡昌 Date: Tue May 29 13:32:25 2018 +0800 添加微信资源，去除左右空格 commit 335d406c39ee320b746fea01b5eb9a2c8f9f2562 Author: php-王凡昌 Date: Tue May 29 13:29:27 2018 +0800 去除php删除资源的空格 commit cb3cc3612f59f03be7ee789e567914d365e2f7c1 Merge: c51320867 7c28737f9 Author: licc <45360682@qq.com> Date: Tue May 29 12:10:27 2018 +0800 Merge branch 'dev-bug2-agent' of http://192.168.0.31/fe/cps into dev-agent # Conflicts: # application/admin/library/Auth.php commit c51320867f951f1284a8392ff93bb559838eec32 Author: licc <45360682@qq.com> Date: Tue May 29 12:05:18 2018 +0800 去掉测试信息 commit 9880732f1cadc1c6e69df20dd5d9a96bc334d5f9 Author: licc <45360682@qq.com> Date: Sat May 26 10:57:17 2018 +0800 测试挂载 commit 8b6483849c5423db0bec1056d6d5d9734ec53642 Author: licc <45360682@qq.com> Date: Fri May 25 18:03:16 2018 +0800 渠道商账号切换 commit 92249dbf0b5c4233ccef3cab2a4c73a512469f04 Author: licc <45360682@qq.com> Date: Fri May 25 15:54:41 2018 +0800 解决报错 commit 0cb08374867df383b4a3ee4f5509b178b701d47a Author: licc <45360682@qq.com> Date: Fri May 25 14:48:26 2018 +0800 超管下管理员管理添加运营组 commit 010826957d9210dac29ea089f6823e939b28f7e4 Author: licc <45360682@qq.com> Date: Fri May 25 14:42:33 2018 +0800 超管下管理员管理添加运营组 commit fb52d0ce27ef46296cc6a5c4280a0656365a84ea Author: licc <45360682@qq.com> Date: Tue May 29 12:03:16 2018 +0800 解决冲突 commit c973c14c0c9982218430387239ff8942fb319ea4 Author: licc <45360682@qq.com> Date: Fri May 25 13:59:18 2018 +0800 注释掉配号 commit af38e9cbf05f3053ade89186eaa2b8e555addf1a Author: licc <45360682@qq.com> Date: Fri May 25 13:49:15 2018 +0800 去掉新用户活动状态 commit 7e3912dfa17ffcd770363f8528a41162f070e53e Author: DuanEnJian Date: Fri May 25 13:48:06 2018 +0800 修改权限判断hashAuth的agent_id错误 commit a59cc7dcba7c8fcd970c19ed73a90a86a7269b4d Author: licc <45360682@qq.com> Date: Fri May 25 13:43:15 2018 +0800 去掉多余代码 commit 513c69ed3c0e68206258fda3b52029fac3fd331a Author: licc <45360682@qq.com> Date: Fri May 25 12:18:10 2018 +0800 test commit 9e5e024630dcef97c55c1ccd1349b2d1e38e74a1 Author: licc <45360682@qq.com> Date: Fri May 25 12:15:05 2018 +0800 测试章节内容 commit 50f7cf41f1c9a27320bb184de463425803b01fc1 Author: licc <45360682@qq.com> Date: Fri May 25 10:47:40 2018 +0800 前端groupID commit 8613668d68f7780ca6d0dd6ad168bc2b9263e1e9 Author: licc <45360682@qq.com> Date: Thu May 24 21:15:57 2018 +0800 促销活动（新用户）展示判断 commit 9c47d0e24a27c41db010a7affb4a95d9e59d47ee Author: licc <45360682@qq.com> Date: Thu May 24 20:55:27 2018 +0800 新建代理商，如果代理商开启了配号，加入admin_config相关信息 commit eeea08d30ba54f48c1478f2891d11d8fa1aa12bd Author: licc <45360682@qq.com> Date: Thu May 24 20:34:59 2018 +0800 切换账号账号类型核对 commit 2dd4b5f3cadee195337d697ffbf3d1ac27e6528b Author: licc <45360682@qq.com> Date: Thu May 24 20:26:34 2018 +0800 解决顶部切换账号下拉问题 commit 9364ce5d1243e33d4576ae73fe604573bee098e2 Author: licc <45360682@qq.com> Date: Thu May 24 20:08:45 2018 +0800 多账号切换 commit 695710b5e1efde3b9527a6d7c05203a19f1a3f9a Author: licc <45360682@qq.com> Date: Thu May 24 20:06:47 2018 +0800 多账号切换 commit d4feb99d6e1a89a0cecfb7754371fc6a0042a00e Author: licc <45360682@qq.com> Date: Tue May 29 12:02:24 2018 +0800 解决冲突 commit 19f3704d5af3494c9c41572557445c41cb44e0c0 Author: DuanEnJian Date: Thu May 24 15:57:19 2018 +0800 修改dls配号状态获取方式 commit b129215b6761562d0be3f3127aa02684f76abe34 Author: licc <45360682@qq.com> Date: Tue May 29 12:01:16 2018 +0800 解决冲突 commit 642dc91ef3ccd40b41dd80bee829656d541743ca Author: DuanEnJian Date: Thu May 24 15:20:52 2018 +0800 修改dls活动短链生成 commit 7c28737f987e8b3a2bb1da4f9eeba5b8b85f2c22 Author: licc <45360682@qq.com> Date: Tue May 29 11:56:44 2018 +0800 解决冲突 commit 0d1a74beb939f3dc0488b82a81a889c92c12c4f2 Author: lichong_ <1909165236@qq.com> Date: Mon May 28 19:36:34 2018 +0800 debug commit 170444204c0d79fa0f28db8c71ee78ee0af96acb Author: lichong_ <1909165236@qq.com> Date: Mon May 28 19:35:36 2018 +0800 debug wechat 回复 commit d537b2c380b5ef7c8aeb75b0df22946f1aab1e09 (tag: tag-20180528_184447) Author: php-王凡昌 Date: Mon May 28 18:44:36 2018 +0800 修改消费中的队列声明 commit c17f7a86a0549acfe91b7fd9a9254a2bedcf05eb (tag: tag-20180528_180653) Author: php-王凡昌 Date: Mon May 28 18:03:01 2018 +0800 修改线上 rabbitmq 线上配置 commit 4492487e76e6712e655c0d99e8c0e60cc5e40391 Author: 丁海波 Date: Sat May 26 18:43:03 2018 +0800 复制粘贴 commit 4d704471fb92741b62ef864fdb16fda59d3b3a70 Author: 丁海波 Date: Sat May 26 17:35:26 2018 +0800 添加列表顔色修改 commit 40b19a21609fbc460ebaa99541bda8a1f6a5c744 Author: 丁海波 Date: Sat May 26 17:32:38 2018 +0800 添加列表顔色修改 commit ca127017ec2885c66dc9c186c6e5d8e8013a18a2 Author: 丁海波 Date: Sat May 26 17:29:34 2018 +0800 正在加載中 請稍后 commit 4800253aa0affd7b1dd018520de0d7bcc1f6b2e2 Merge: 8ec1e4920 1d1df8fe8 Author: 丁海波 Date: Sat May 26 17:26:06 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit 8ec1e4920814b33469b4ea9d1d61c1b38bd16d7b Author: 丁海波 Date: Sat May 26 17:25:55 2018 +0800 正在加載中，请稍候 commit 1d1df8fe8758213b100671dbeca07938a0a57244 Author: licc <45360682@qq.com> Date: Sat May 26 17:06:56 2018 +0800 test commit 26cb794e6069a22d98063e754b8292749a7f2520 Author: licc <45360682@qq.com> Date: Sat May 26 17:05:26 2018 +0800 test commit ea6975cee351fbb2daa655ba3463fb7ed15fddaf Merge: 05a026b22 1baeda1ca Author: licc <45360682@qq.com> Date: Sat May 26 16:59:50 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit 05a026b22c3042d3f671c7e3a32d6f33ec971f94 Author: licc <45360682@qq.com> Date: Sat May 26 16:59:41 2018 +0800 test commit 1baeda1ca47095207b6f057faee478ba4bfc5854 Author: 丁海波 Date: Sat May 26 16:54:06 2018 +0800 限免小说文案 commit c69e7d5c14d61b6d617e8bb47ac5cf64121ca3ac Author: lichong_ <1909165236@qq.com> Date: Sat May 26 16:41:09 2018 +0800 修改提示文案 commit c24609e653253d86d206a2b90a0525a8d723f7e2 Merge: 15040777c 2bd57b0d7 Author: 丁海波 Date: Sat May 26 16:17:59 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit 15040777cef4448ae719dd42d9e388c732a18ac6 Author: 丁海波 Date: Sat May 26 16:17:51 2018 +0800 多少人追颜色修改 commit 2bd57b0d700a5f703ba7b857d3bca4b98672225d Author: licc <45360682@qq.com> Date: Sat May 26 16:00:58 2018 +0800 test commit 44dc2ab950abc49c6ee468928fd86ab79eff71e8 Merge: bc0b24b1f 5d817e0a7 Author: licc <45360682@qq.com> Date: Sat May 26 15:55:37 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit bc0b24b1f3d71533debc2f22493645b5a7557a60 Author: licc <45360682@qq.com> Date: Sat May 26 15:55:27 2018 +0800 test commit 5d817e0a7c08dc678a0ef21f0c17761747fccee5 Author: 丁海波 Date: Sat May 26 15:46:14 2018 +0800 女频颜色修改 commit 31b445e3aa9c244195ccf602cc5cf7f51560cc9a Author: 丁海波 Date: Sat May 26 15:42:06 2018 +0800 首页icon修改 commit 4321c9cd6939beeccb9683168e032327e50dcd0a Author: 丁海波 Date: Sat May 26 15:40:48 2018 +0800 限免时间位置修改 commit 1d3a2a1985aecbf94ed90f11f747e0cfd6761cdd Author: 丁海波 Date: Sat May 26 15:36:56 2018 +0800 限免时间位置修改 commit 8cb4895dac99f179adc2fe091519e96fa8053275 Author: 丁海波 Date: Sat May 26 15:34:39 2018 +0800 限免时间位置修改 commit 3ca254400414f7f3a1507658ec566542361f7b3b Author: lichong_ <1909165236@qq.com> Date: Sat May 26 15:31:06 2018 +0800 友好展示阅读数 commit 309a48d01a30c2370efde3d093bf18d64e592127 Author: php-王凡昌 Date: Sat May 26 15:20:52 2018 +0800 修改log引擎， 举报页面回退上一页 commit 697e445c83fd5f4f7a91e62c305aa24655d89cb4 Author: 丁海波 Date: Sat May 26 15:12:57 2018 +0800 阅读页颜色优化 commit 49803f6ed53e5babf908b464c4125151ea16ff38 Author: 丁海波 Date: Sat May 26 15:11:07 2018 +0800 阅读页竖线颜色修改 commit 614380592e14e55ea3e12afeb9489c0baef004b0 Author: 丁海波 Date: Sat May 26 15:08:13 2018 +0800 列表颜色优化 commit 2a0a6606d8ece6151478519fe0c4be8e5507550c Merge: 1274e3742 26bbee51f Author: 丁海波 Date: Sat May 26 15:06:42 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit 1274e374217c6b793cca110e52f7c5a478ddf319 Author: 丁海波 Date: Sat May 26 15:06:37 2018 +0800 报错页图片优化 commit 26bbee51f77acd6b7f21a065472828a91e3c4d10 Author: licc <45360682@qq.com> Date: Sat May 26 15:05:46 2018 +0800 test commit fa0951dc16a6d42945d836929fc6c6b5e358119d Author: 丁海波 Date: Sat May 26 14:45:55 2018 +0800 aaa commit 9ad952fce13b63eff1ff04e936d1f39487a12911 Author: 丁海波 Date: Sat May 26 14:44:07 2018 +0800 首页简介颜色优化 commit e9ef0e0164d67035430dfc6d424b7e2d12284c22 Author: 丁海波 Date: Sat May 26 14:42:37 2018 +0800 多少人在追颜色icon修改首页 commit 3528adbb2dd47b0feb52f384d49cc24a22d14765 Author: 丁海波 Date: Sat May 26 14:35:32 2018 +0800 没有充值记录 commit 2b06b4f59468bcbfa62b92f9c2a204983b617e23 Merge: c4c993bb9 825bf1716 Author: 丁海波 Date: Sat May 26 14:20:39 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit c4c993bb9c0ace8d50b07730365692c0b2be6dd8 Author: 丁海波 Date: Sat May 26 14:20:29 2018 +0800 阅读页title显示书名 commit 825bf171644b838a32617a0b1e057f9cb45df3fa Author: licc <45360682@qq.com> Date: Sat May 26 14:19:48 2018 +0800 test commit 6e50400f6031eb797d5d8c0db87e2ff043005196 Merge: 17c319b00 ddd8b984f Author: licc <45360682@qq.com> Date: Sat May 26 14:15:47 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit 17c319b00cac0a1f1d31ff62b48bd9807ef026f4 Author: licc <45360682@qq.com> Date: Sat May 26 14:15:38 2018 +0800 test commit ddd8b984f4f2cf370b6366b04a6d01d163599f62 Merge: c94acbd4b 005b11c08 Author: 丁海波 Date: Sat May 26 14:12:49 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit c94acbd4babcbe151ff8c5d717f27660d226a573 Author: 丁海波 Date: Sat May 26 14:12:39 2018 +0800 No. commit 005b11c08c140fe3b0da77a0ce79b01b83c1dee2 Author: licc <45360682@qq.com> Date: Sat May 26 13:58:27 2018 +0800 test commit a1ffc36cdfc848fd65b1b48bc9e9fa90fa9ceac7 Merge: b72b08386 9b7e31652 Author: licc <45360682@qq.com> Date: Sat May 26 12:11:26 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit b72b08386d9227f56ddd10e73381ea183bbcf3c1 Author: licc <45360682@qq.com> Date: Sat May 26 12:11:15 2018 +0800 test commit 9b7e316528afdae286d5e5aaa8bbdf387e22cf58 Merge: 85fea2425 26c17aed5 Author: DuanEnJian Date: Sat May 26 11:59:51 2018 +0800 Merge branch 'dev-bug2' of 192.168.0.31:fe/cps into dev-bug2 commit 85fea2425b8123cf8f7a850e9f51e6e3eec41239 Author: DuanEnJian Date: Sat May 26 11:57:32 2018 +0800 推广链接二维码不显示 commit 26c17aed5400e83843a20076bed9f5fbae3e06a3 Author: 丁海波 Date: Sat May 26 11:59:01 2018 +0800 颜色修改 commit f40b8a637b0e0e504238a87338971dc7ca7e852f Author: 丁海波 Date: Sat May 26 11:56:49 2018 +0800 修改颜色 commit 62b378fe3e09f823ef37f2387878635930beda0b Author: 丁海波 Date: Sat May 26 11:49:01 2018 +0800 弹窗图片 commit 0de9579fe7e57dd64b111f26924aa07757113784 Author: 丁海波 Date: Sat May 26 11:48:19 2018 +0800 弹窗icon commit 1345372262652ac84c115a52635554bffd130270 Merge: fa6b73cc7 f51f7437d Author: 丁海波 Date: Sat May 26 11:44:41 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit fa6b73cc7138e72b7d063cd0a84e7d52603343d6 Author: 丁海波 Date: Sat May 26 11:44:30 2018 +0800 活动弹框 commit f51f7437dafbd31139d41f13d2890d4ea71cffd6 Merge: acd05d8c7 5b156384a Author: licc <45360682@qq.com> Date: Sat May 26 11:33:46 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit acd05d8c77ea3743c4ed52a2d416dd5b4a925d75 Author: licc <45360682@qq.com> Date: Sat May 26 11:33:30 2018 +0800 清空is_file缓存 commit 5b156384a60ea740ffb99a0b72254b5d6da8fd0b Author: haoxiaofeng Date: Sat May 26 11:26:05 2018 +0800 插入链接过滤空格，换行 commit 08acde82bba005793672b1881ebe353a1a71c757 Author: licc <45360682@qq.com> Date: Sat May 26 10:57:17 2018 +0800 测试挂载 commit 9aa8f9e7bf2408b9afdf750e3db3ff2d1cc962f4 Merge: 70d453956 f27ab9a9f Author: licc <45360682@qq.com> Date: Fri May 25 18:51:47 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2' into dev-bug2 commit 70d4539563b95248d12d1bb69ab149769bf521f4 Author: licc <45360682@qq.com> Date: Fri May 25 18:51:38 2018 +0800 隐藏配置 commit f27ab9a9f3175abd0e7fd229483c88f0e3902948 Merge: 19e1e0d8b c369cec29 Author: php-王凡昌 Date: Fri May 25 18:30:54 2018 +0800 Merge branch 'dev-bug2-theme' of 192.168.0.31:fe/cps into dev-bug2 commit c369cec29f4afe06a6d1d513a0609deee91579fb Author: php-王凡昌 Date: Fri May 25 18:27:53 2018 +0800 修改千阅阅读页默认主题颜色 commit 19e1e0d8b937376c5f2521d9c141e8e2772a2012 Author: licc <45360682@qq.com> Date: Fri May 25 18:05:46 2018 +0800 隐藏配置 commit 72cca0dd00bb5830ae3eee4670f43962c5b7782d Author: licc <45360682@qq.com> Date: Fri May 25 18:03:16 2018 +0800 渠道商账号切换 commit e4231913112b9eb748e89907ef23a78b86a0f53d Author: 丁海波 Date: Fri May 25 17:58:05 2018 +0800 theme 日志 commit 49530feb4356e398c4c302b9fe612d68ce6ec695 Author: 丁海波 Date: Fri May 25 17:55:41 2018 +0800 icon commit 5a5966db0890333cba93a63bef1a69585660fda9 Author: 丁海波 Date: Fri May 25 17:53:39 2018 +0800 最近阅读icon commit f4595056567f41c693eb78d2e675f7e43c8865fa Author: php-王凡昌 Date: Fri May 25 17:48:39 2018 +0800 后台角标&头像修改 commit 03b33b1ae44d4a53491e29be8629f235fcbc4ed1 Merge: 40b8be0e2 79ae9524d Author: php-王凡昌 Date: Fri May 25 17:44:07 2018 +0800 Merge branch 'dev-qianyue-pay-merge' of 192.168.0.31:fe/cps into dev-bug2-theme Conflicts: application/common/controller/Frontend.php application/common/model/Consume.php application/common/model/Recharge.php application/index/view/book/blocklist.html application/index/view/book/list.html application/index/view/category/books.html application/index/view/category/index.html application/index/view/index/classify_list.html application/index/view/index/report.html application/index/view/index/scan_code.html application/index/view/index/search.html application/index/view/layout/menu.html application/index/view/public/404.html application/index/view/public/cainixihuan.html application/index/view/public/changxiao.html application/index/view/public/finish.html application/index/view/public/forbiddenread.html application/index/view/public/lunbo.html application/index/view/public/nobook.html application/index/view/public/nocontent.html application/index/view/public/remenshuangwen.html application/index/view/public/typing.html application/index/view/recharge/record.html application/index/view/user/index.html application/index/view/user/recent.html 增加前台多主题功能 commit 1ec6dbd5f3b4281e4ec09a35be30349124bcaf07 Author: licc <45360682@qq.com> Date: Fri May 25 17:42:15 2018 +0800 渠道商账号切换 commit 8e190f0f19d520338a2447a3d9fc168f7f4af231 Author: licc <45360682@qq.com> Date: Fri May 25 16:52:07 2018 +0800 渠道商账号切换 commit 843d5c64034dd248f79cf3d73c2f3fde183dcf83 Author: licc <45360682@qq.com> Date: Fri May 25 16:50:13 2018 +0800 账号切换 commit 2652a96f5e941df9c24538de9f85a2beee973d57 Author: licc <45360682@qq.com> Date: Fri May 25 16:46:41 2018 +0800 账号切换 commit 9eb753f07468d77e44c5f46812a601740fe6d761 Author: licc <45360682@qq.com> Date: Fri May 25 16:30:54 2018 +0800 解决报错 commit b3600cee80601c909fa0e7e3121f601cec56cbbd Author: licc <45360682@qq.com> Date: Fri May 25 15:54:41 2018 +0800 解决报错 commit b8d11fc7f9e388ce64b2112b9531889ff5f74159 Author: licc <45360682@qq.com> Date: Fri May 25 14:48:26 2018 +0800 超管下管理员管理添加运营组 commit 696d08b55717eb11fdf62410e89da6a6b6842aea Author: licc <45360682@qq.com> Date: Fri May 25 14:42:33 2018 +0800 超管下管理员管理添加运营组 commit b232c46523ae4c01e9b8045526223e77d31bbc90 Author: licc <45360682@qq.com> Date: Fri May 25 14:01:12 2018 +0800 Rabbitmq修改 commit bab120e2d987c1aa59e7892a5641bd21dd1fefae Author: licc <45360682@qq.com> Date: Fri May 25 13:59:18 2018 +0800 注释掉配号 commit 0f98f91f48519a7b7896eaed9aebc90a75dd7c14 Merge: e052f50b1 1ab542990 Author: licc <45360682@qq.com> Date: Fri May 25 13:49:25 2018 +0800 Merge remote-tracking branch 'origin/dev-bug2-agent' into dev-bug2-agent commit e052f50b172f33ce386177d860e0d0504ca7ad83 Author: licc <45360682@qq.com> Date: Fri May 25 13:49:15 2018 +0800 去掉新用户活动状态 commit 1ab542990258473d6f005a7af14a5fe34dd0349d Author: DuanEnJian Date: Fri May 25 13:48:06 2018 +0800 修改权限判断hashAuth的agent_id错误 commit 4d27d1342b7d24738247624fda576feee1cba38d Author: licc <45360682@qq.com> Date: Fri May 25 13:43:15 2018 +0800 去掉多余代码 commit 7785ebc53c35f0c9df8a46ea06d222b9b4add054 Author: licc <45360682@qq.com> Date: Fri May 25 12:18:10 2018 +0800 test commit 9be5abe26ff68ba9fb545609a4a3f6f165878162 Author: licc <45360682@qq.com> Date: Fri May 25 12:15:05 2018 +0800 测试章节内容 commit 43af3a05959c0a479bfd97af5c9d6726a0c87483 Author: licc <45360682@qq.com> Date: Fri May 25 10:47:40 2018 +0800 前端groupID commit fe51befb1b2fbff5bc303cb7f1f21e15c8aa0705 Author: licc <45360682@qq.com> Date: Thu May 24 21:15:57 2018 +0800 促销活动（新用户）展示判断 commit a74d4d9e1d466860d3882a90647c62e01eb435d0 Author: licc <45360682@qq.com> Date: Thu May 24 20:55:27 2018 +0800 新建代理商，如果代理商开启了配号，加入admin_config相关信息 commit 96ea85d220e345780fdf0c2f84b8db02158e5587 Author: licc <45360682@qq.com> Date: Thu May 24 20:34:59 2018 +0800 切换账号账号类型核对 commit 08b27e59c957261e06fae91b76766be18f60398e Author: licc <45360682@qq.com> Date: Thu May 24 20:26:34 2018 +0800 解决顶部切换账号下拉问题 commit 2b7229c480d1df876e1813c98f8d03af273dc9e8 Author: licc <45360682@qq.com> Date: Thu May 24 20:08:45 2018 +0800 多账号切换 commit 815f3e0c935b6d5d0285ec8603939da2145eac71 Author: licc <45360682@qq.com> Date: Thu May 24 20:06:47 2018 +0800 多账号切换 commit 40b8be0e20b75680428060a5172377e9304dc1fb Author: php-王凡昌 Date: Thu May 24 19:39:06 2018 +0800 配置项增加动态分配表功能 commit c365a617e730fd8ff9f9a164ef7a13a0ccc17cb9 Author: php-王凡昌 Date: Thu May 24 18:58:55 2018 +0800 后台添加主题配置 commit 990028d47e8cb4a146816ea0afb29c6eb6d089a6 Author: lichong_ <1909165236@qq.com> Date: Thu May 24 16:34:54 2018 +0800 修改页面模板功能 commit 6926e2bfa8165616be52cd3dc45d04477481d6eb Author: DuanEnJian Date: Thu May 24 15:57:19 2018 +0800 修改dls配号状态获取方式 commit 6772d7e58f536688170732f30947c1146468ddfd Author: haoxiaofeng Date: Thu May 24 15:34:23 2018 +0800 代理商微信管理菜单补充 commit 2d7682a2febc4b3856e7ae1e03a9170c282a9135 Author: DuanEnJian Date: Thu May 24 15:20:52 2018 +0800 修改dls活动短链生成 commit 577cfd1da2b179628c707c0c1a2b7d3afaf1206c Author: haoxiaofeng Date: Thu May 24 15:18:06 2018 +0800 代理商微信管理菜单过滤 commit ea118c4f7ccfeec5df39095d84d65b9928a7fd67 Author: haoxiaofeng Date: Thu May 24 14:55:29 2018 +0800 代理商配号过滤： 取消充值客服消息发送 自定义菜单 小说推广 commit 12e0e202b434d94e6f84b7cc1a2ad78f5e815c33 Merge: dd08b810f f1ec76ba1 Author: php-王凡昌 Date: Thu May 24 10:32:27 2018 +0800 Merge branch 'dev-agent' of 192.168.0.31:fe/cps into dev-bug2-agent commit f1ec76ba1e4447d3431b04bf0c72395e76e26d2b Author: DuanEnJian Date: Thu May 24 10:27:05 2018 +0800 修改开启配号的dls推广链接生成功能,dls开启用户查找功能 commit d525c7901313b61a23d0b853d47e5fb5336e33d5 Author: licc <45360682@qq.com> Date: Wed May 23 21:19:59 2018 +0800 新建代理商时配号选项 commit dd08b810feb278c8e83dbbaf88d7167d78838894 Author: php-王凡昌 Date: Wed May 23 21:17:34 2018 +0800 赏金邀请链接生成页面增加一行文字警告 赏金邀请链接使用后台域名生成 commit 3b86f45d40979a3c76557c1edd99b4e218448844 Merge: bc038b70e 595907bf0 Author: php-王凡昌 Date: Wed May 23 21:08:48 2018 +0800 Merge branch 'dev-logip' of 192.168.0.31:fe/cps into dev-bug2 前台log打点增加网络类型 后台推广链接隐藏短连接 commit bc038b70e5a940bb090b74ac4e5fa9e2eadafb10 Merge: fac821fe3 2212133db Author: php-王凡昌 Date: Wed May 23 21:07:14 2018 +0800 Merge branch 'dev-haoxf' of 192.168.0.31:fe/cps into dev-bug2 Conflicts: application/api/controller/Recharge.php application/common/controller/Api.php public/assets/js/backend/auth/channel.js 去除微信添加链接的空白字符 模板消息增加发送中字段、增加删除按钮 客服消息增加发送人数、增加发送中字段 前台总入口增加用户资料log打点 微信菜单增加默认高度，防止空白字符输入框消失 前台页面静态资源补全cdn commit 6fb4696777df6591946ddb2ea866cd3ab63a39e7 Author: licc <45360682@qq.com> Date: Wed May 23 21:04:24 2018 +0800 隐藏配号状态 commit 595907bf0d7b12dde54cd15e303d1f7280c42327 Author: 丁海波 Date: Wed May 23 20:55:09 2018 +0800 推广图片删除短链 commit fac821fe3018ef635ebf8284ee90df48b9773ebc Merge: cee4fdc8c ca3a80b57 Author: php-王凡昌 Date: Wed May 23 20:49:27 2018 +0800 Merge branch 'dev-dej' of 192.168.0.31:fe/cps into dev-bug2 用户注册时，维护头像导致null问题修复 推广标题&图片新增sex字段 书籍统计新增按书籍id&书籍名搜索 commit cee4fdc8c77cba268b3f0f76f88f5c01ddb201b6 Merge: 558e7cebe f4bc296ca Author: php-王凡昌 Date: Wed May 23 20:39:57 2018 +0800 Merge branch 'dev-relevance' of 192.168.0.31:fe/cps into dev-bug2 commit 558e7cebea035bbaa5a037409eefd83cd89dc579 Merge: 07777fee1 fcd07961f Author: php-王凡昌 Date: Wed May 23 20:36:09 2018 +0800 微信取消充值客服消息改为消息队列发送 commit 43c3499fb3d1f3d76f5844d344e03b5cd6a3a31c Author: haoxiaofeng Date: Wed May 23 20:21:26 2018 +0800 暂存 commit 07777fee1830fdb7049b3db4195db02294685917 (tag: tag-20180523_184137) Author: lichong_ <1909165236@qq.com> Date: Wed May 23 18:37:11 2018 +0800 提现金额改为最低100元 commit db24e96fb295a57db4114ba7e2b07bbe2dd9fec1 (tag: tag-20180523_175519) Author: licc <45360682@qq.com> Date: Wed May 23 17:53:54 2018 +0800 隐藏配号状态 commit b1fb9dd67dca0e0919b20cc57c945c9f4a228ee4 (tag: tag-20180523_164651) Author: haoxiaofeng Date: Wed May 23 16:20:30 2018 +0800 用户名重复校验 commit bb83c271a925ed98367e93251c497fa309b14f06 Merge: bfb96ac9b f068da040 Author: 丁海波 Date: Wed May 23 15:39:23 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit bfb96ac9b830a2a08bfb572176507eda0510e11d Author: 丁海波 Date: Wed May 23 15:39:13 2018 +0800 ccc commit f068da040b4889fd2aa75050ff441b59cc83b35e Merge: 7c2369956 c422980a0 Author: licc <45360682@qq.com> Date: Wed May 23 15:31:32 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit 7c23699562f6e3d5225a23e5457304d37b694986 Author: licc <45360682@qq.com> Date: Wed May 23 15:31:20 2018 +0800 排序 commit c422980a08d436a60754b7608ed7f6c37be4a324 Author: 丁海波 Date: Wed May 23 15:30:50 2018 +0800 bbb commit 2e3f286cec6e2e897a2c5987831d7247de28d6cc Author: 丁海波 Date: Wed May 23 15:26:05 2018 +0800 aaa commit b501d414b231f8e336b47a934d8934e3c80ef892 Author: licc <45360682@qq.com> Date: Wed May 23 15:15:55 2018 +0800 申请配号加title commit 973aaee2fadf1be57433d504b19e316f37ce752b Author: 丁海波 Date: Wed May 23 14:45:53 2018 +0800 nimatui commit bcd9b682f1bd13fc7447cce0f59d12443f6c9766 Author: licc <45360682@qq.com> Date: Wed May 23 14:05:27 2018 +0800 赏金统计管理添加(含当日)描述 commit 52a0895738c6ba77e5ef680154f5b5ad889b1960 Author: licc <45360682@qq.com> Date: Wed May 23 13:52:55 2018 +0800 运营账号热门搜索词修复 commit 4f5ef543e7a6e87590a8c8a6604aaaf5f725dd7b Author: haoxiaofeng Date: Wed May 23 12:19:58 2018 +0800 暂存 commit 7cf74aad34cd7eb762d3685a89ac5b1228abe09e Author: haoxiaofeng Date: Tue May 22 21:06:47 2018 +0800 暂存 commit f4bc296caf6c83c194bbc410562a62b599080cfa Author: licc <45360682@qq.com> Date: Tue May 22 20:56:09 2018 +0800 Merge branch 'dev-dej' of http://192.168.0.31/fe/cps into dev-db commit 3c6ced5e3edae3482319cb80a502884796a572bc Author: haoxiaofeng Date: Tue May 22 20:28:24 2018 +0800 长度过滤 commit 3d4dd8d6ce6ad160048b07008505fa2bde7b6580 Author: haoxiaofeng Date: Tue May 22 20:21:55 2018 +0800 信息不为空验证 commit ca3a80b57957757475f90409eb879754fad49748 Author: licc <45360682@qq.com> Date: Tue May 22 20:07:57 2018 +0800 小说统计修改按书名搜索 commit d3ba073c28c10b3ccb5387973274abbac9254364 Author: licc <45360682@qq.com> Date: Tue May 22 19:36:51 2018 +0800 小说统计修改按书名搜索 commit 3ce63d70c5b4340c64c129a259a9ac7cfa690e64 Author: licc <45360682@qq.com> Date: Tue May 22 18:44:17 2018 +0800 赏金邀请记录修改 commit ff273bcb4d928c286c5d39d97c2f6f2b1a59f673 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 18:38:29 2018 +0800 d commit cf3c37fd1667d29f213413d92d8bbecbef332e13 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 18:29:32 2018 +0800 d commit 2212133db5644ee17d21f98f390a099a0335bfe7 Merge: 48033ce20 b9395d799 Author: haoxiaofeng Date: Tue May 22 18:24:39 2018 +0800 Merge branch 'dev-db' into dev-haoxf # Conflicts: # application/admin/controller/invite/Record.php # application/admin/controller/reward/Collect.php # application/admin/controller/reward/Inviterecord.php # application/admin/controller/reward/Withdraw.php # application/admin/view/invite/record/edit.html # application/api/controller/Recharge.php # application/common/controller/Api.php # public/assets/js/backend/auth/channel.js # public/assets/js/backend/invite/record.js # public/assets/js/backend/reward/withdraw.js commit b9395d799486783f105857e5af78251f706c3f52 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 18:04:04 2018 +0800 d commit 53cad0798afd11f180f68cb878d9e82fa44b9572 Author: 丁海波 Date: Tue May 22 17:52:05 2018 +0800 radio 飘出去优化 commit cdac687b9592b61a74846ca4c29fe39842e2435d Author: 丁海波 Date: Tue May 22 17:48:27 2018 +0800 radio 飘出去优化 commit 48033ce20b3b03cebb54bef0c9c3205f8e8fbec5 Author: haoxiaofeng Date: Tue May 22 17:41:05 2018 +0800 暂存 commit ed2b26551377c32004fe33f2347ef8ff7a51773b Author: haoxiaofeng Date: Tue May 22 17:39:25 2018 +0800 客服消息&模板消息增加发送状态，并添加删除操作 commit 0794cbf5c60afcdb2bf88bc851ef63ec4ee7b46b Author: 丁海波 Date: Tue May 22 17:26:43 2018 +0800 短链接优化 commit 0bc0ffbfc71f272ab2b2cf63519169fbff3d150c Author: haoxiaofeng Date: Tue May 22 17:22:53 2018 +0800 暂存 commit 2610ff9d4c164f7dc52cc53d223af1c41a95c721 Author: DuanEnJian Date: Tue May 22 17:17:04 2018 +0800 暂存 commit 7c7374bab1e8f7abf887fdb8676199e974a9b093 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 17:16:37 2018 +0800 d commit 45593077d352e75282ca00d0585e5b42529a24d7 Author: 丁海波 Date: Tue May 22 17:15:30 2018 +0800 推广链接短链优化 commit 46428c2ed7cdaef7491414004d86f2f99f695267 Author: licc <45360682@qq.com> Date: Tue May 22 17:00:52 2018 +0800 赏金邀请记录修改 commit f524151526d4d12e6dc29415eab1983d966fb4d9 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 16:49:53 2018 +0800 d commit e1d2800d236956cce5904a70c0bcdbc722c8d5e5 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 16:49:16 2018 +0800 d commit d4eb91688947cd74a3d1afab4536b1ddbbd62272 Merge: 3247753b0 6f5ad1cc1 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 16:45:48 2018 +0800 Merge branch 'dev-db' of http://gitlab.qcread.cn/fe/cps into dev-db commit 3247753b0a0e2b978ab5208156f7dca10fcd43bc Author: lichong_ <1909165236@qq.com> Date: Tue May 22 16:45:41 2018 +0800 d commit 08d0a4790cf7e44572a40cd919e27af4e87838dc Author: DuanEnJian Date: Tue May 22 16:44:23 2018 +0800 前台页面合并,新用户头像Null值 commit 6f5ad1cc11fa59397bdbddf8e95f1b8d51e72fbd Merge: 13d62e62f cc6374152 Author: licc <45360682@qq.com> Date: Tue May 22 16:31:17 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit 13d62e62fa691858de811043ac45d20e35dc9781 Author: licc <45360682@qq.com> Date: Tue May 22 16:31:08 2018 +0800 赏金邀请记录修改 commit cc63741521b50a06417aa4a962f554ab5ba18f30 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 16:27:25 2018 +0800 d commit aa2f0673b01b154e1240eeefec18d9b24bdc4745 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 16:24:03 2018 +0800 d commit e0d7264c5aaf0c825b892670c5b0b057e74a0337 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 16:22:39 2018 +0800 d commit 386da575d9c6ec55af7db2559b44aa2fbfe33ba3 Author: 丁海波 Date: Tue May 22 16:00:35 2018 +0800 network commit 4ebba93ae82b6a5c8b07461ab8916b58eb93bce5 Merge: 59818621b 774906734 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 15:59:04 2018 +0800 Merge branch 'dev-db' of http://gitlab.qcread.cn/fe/cps into dev-db commit 59818621bb6e99bb9145f32b5c50fcd5060837e9 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 15:58:56 2018 +0800 d commit 0c26b8f05735f7ef54c01ff6bd7ace5fba514034 Author: 丁海波 Date: Tue May 22 15:54:11 2018 +0800 4G commit 774906734209174c9639b68aef626defd73b60e1 Merge: dfbc633e6 9d3312719 Author: licc <45360682@qq.com> Date: Tue May 22 15:53:06 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit dfbc633e60e55f73a2f50cab773c937c92ca55e1 Author: licc <45360682@qq.com> Date: Tue May 22 15:52:55 2018 +0800 赏金统计管理去掉隐藏的代理商 commit a21a8fceb5ba3486138360a2cd878bbab908d292 Author: 丁海波 Date: Tue May 22 15:49:45 2018 +0800 网络状态字段 network commit 68c656b82c6914594e4ebe8accd0ddbed7abb09c Merge: 57fc280bc fcd07961f Author: haoxiaofeng Date: Tue May 22 15:48:33 2018 +0800 Merge branch 'dev-mq' into dev-haoxf commit 2764846cd25334b87da90c6c21fb14d3e2a6b72b Author: licc <45360682@qq.com> Date: Tue May 22 15:47:03 2018 +0800 改微信log_level commit 7677b502971310cbd6c0a104181075ed5f925566 Author: 丁海波 Date: Tue May 22 15:43:47 2018 +0800 网络环境判断 commit 9d33127197ae5b009302b8f5f36735f8253cd9b4 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 15:32:26 2018 +0800 d commit e59915050ea0490d4c05f7eb747aca0db571f7d8 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 15:14:39 2018 +0800 d commit 250116d0c113c1c6b10305cb058a9681d74bd8fe Author: lichong_ <1909165236@qq.com> Date: Tue May 22 15:12:55 2018 +0800 d commit 09d061cc3df680b20b65e7b99be9e4f7a2bd0586 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 15:05:26 2018 +0800 d commit 78e73172775d455fba18b1a8adc86c4dbf98ec2e Author: lichong_ <1909165236@qq.com> Date: Tue May 22 15:00:57 2018 +0800 d commit bd59347ceba6b29561df5006385439079c20abee Author: lichong_ <1909165236@qq.com> Date: Tue May 22 14:55:32 2018 +0800 d commit 819f2fcbed08927219e4360f0a819e814936cffc Merge: 1b5c62211 19faeb960 Author: licc <45360682@qq.com> Date: Tue May 22 14:22:10 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit 1b5c6221182727f8688efed282a790b2a2e4a906 Author: licc <45360682@qq.com> Date: Tue May 22 14:22:02 2018 +0800 改微信log_level commit 19faeb96024c93b6b9a7631dbb23a184671a7c03 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 14:15:04 2018 +0800 调整赏金提现金额 commit 889c9872e5efdf235b345b2b6da0b0deee1297f9 Author: php-王凡昌 Date: Tue May 22 14:11:59 2018 +0800 修正取消充值时，微信发送客服消息API基址 修正API基类中，微信支付API基址修正方式 去除pay.js 微信充值取消时，API接口地址 commit 57fc280bc8935579d6fd9207be1e9e2ad9c03673 Author: haoxiaofeng Date: Tue May 22 14:11:43 2018 +0800 链接添加CDN commit f0adbd5a4e39745a8601980666f3cd8b1abc437a Author: licc <45360682@qq.com> Date: Tue May 22 13:57:24 2018 +0800 新增运营角色（公告管理、小说管理、运营管理、个人资料） commit 3566d25aca1220111109676a321f64bdcb196438 Author: haoxiaofeng Date: Tue May 22 12:18:26 2018 +0800 微信菜单配置空白修改 commit 1e970634ced8c7401eafd8402bc50950a50254d7 Merge: fff5c06d6 650d50dcf Author: licc <45360682@qq.com> Date: Tue May 22 11:36:37 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit fff5c06d6a5ba0c33cc4d4fa6783d2d0060ef1ba Author: licc <45360682@qq.com> Date: Tue May 22 11:36:27 2018 +0800 新增运营角色（公告管理、小说管理、运营管理、个人资料） commit 650d50dcf04f3f41fd5d1a79fc31817f607a029a Author: lichong_ <1909165236@qq.com> Date: Tue May 22 11:22:24 2018 +0800 d commit b5c7f138959d5c0980fcdfd5341e69a2a2492db7 Merge: a3db9542a 367064615 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 10:54:24 2018 +0800 Merge branch 'dev-db' of http://gitlab.qcread.cn/fe/cps into dev-db commit a3db9542a78f9ef6ba56a00e65a3170d3479ca0f Author: lichong_ <1909165236@qq.com> Date: Tue May 22 10:54:06 2018 +0800 d commit 36706461518b6d1c52840266312fe2cb6ec16059 Merge: 18a9bbc0f 0c1504230 Author: licc <45360682@qq.com> Date: Tue May 22 10:53:34 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit 18a9bbc0f1711a94f9634077878f583af4532b73 Author: licc <45360682@qq.com> Date: Tue May 22 10:53:24 2018 +0800 增加渠道商赏金状态搜索 commit 0c150423080faf914e3f2e563d38ffe19c5502a8 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 10:52:41 2018 +0800 d commit 1eec5e09970f7ae7d2dcf38e8f691682ae94bab1 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 10:50:28 2018 +0800 d commit 4149ede5b93ca5561210d428cb0a944965457f47 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 10:48:38 2018 +0800 d commit e78cfa18d28aeb921ad94ec10772941c51ef68b9 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 10:45:42 2018 +0800 微信搜索无结果 返回默认提示 commit 4f57ceed1fa8a3f1aa8223a043f004b308a8c781 Author: lichong_ <1909165236@qq.com> Date: Tue May 22 10:28:43 2018 +0800 d commit efd50d5067072ada0f8784d327ee91370eefeb15 Author: haoxiaofeng Date: Tue May 22 10:28:36 2018 +0800 部分参数说明&过滤特殊字符 commit fcd07961f3b826f25aff9cb3fe3c22196f36c584 Author: php-王凡昌 Date: Mon May 21 20:27:36 2018 +0800 微信支付完成处理 取消充值消息队列 redis key commit db1a8ee01a323a18fa301221ac458693c249036d Author: php-王凡昌 Date: Mon May 21 20:05:39 2018 +0800 修改消息队列延时时间配置 commit 5a4e3c0566ea321d146d86d395737531b22b4ae7 Author: php-王凡昌 Date: Mon May 21 20:02:34 2018 +0800 重写消费队列格式 commit 3d2b11239c9d548ff9ccd8c492b7e1abaa5b28be Author: licc <45360682@qq.com> Date: Mon May 21 18:44:23 2018 +0800 切换支付方式处理 commit 0476f68bae889cb6e7b75742e195eea49f1bc27f Author: licc <45360682@qq.com> Date: Mon May 21 18:21:33 2018 +0800 赏金邀请列表区分渠道商 commit 9c91a7988ab33cd353c3a74f15865edc299024cd Author: licc <45360682@qq.com> Date: Mon May 21 18:10:26 2018 +0800 赏金邀请列表区分渠道商 commit 113133e0213d3b69d65e020cd4974cb2a4064086 Author: licc <45360682@qq.com> Date: Mon May 21 18:08:23 2018 +0800 赏金邀请列表区分渠道商 commit fe9c79e2770cebb84a2e303600801914ad220ea8 Author: licc <45360682@qq.com> Date: Mon May 21 17:51:08 2018 +0800 新增渠道商时加上赏金状态字段 commit 74352bd01acfa8832f16862772df1e8cfe4b6c34 Author: licc <45360682@qq.com> Date: Mon May 21 17:41:54 2018 +0800 test commit f3cbde75e6e24740521f64e7413c75a43bdd9032 Author: licc <45360682@qq.com> Date: Mon May 21 17:36:32 2018 +0800 邀请记录管理代理商赏金统计 commit ccfb236984e95a3f4044db29f2f9404de8708630 Author: licc <45360682@qq.com> Date: Mon May 21 17:27:27 2018 +0800 邀请记录管理代理商赏金统计 commit dae637a96bb7256088892a942e8a5096c251d7d1 Author: DuanEnJian Date: Mon May 21 17:25:40 2018 +0800 去除推广链接导出文件中不必要的列 commit cd44b8ed03d267b11aae6bc7b5c1911cee4c0b6d Author: licc <45360682@qq.com> Date: Mon May 21 16:58:06 2018 +0800 微信沙盒测试 commit 46cb18184d7ae06d70580a07b9153a153369f8d9 Author: php-王凡昌 Date: Mon May 21 15:43:58 2018 +0800 删除无用类 commit cd34e77a65fc6bfba1e769bba1e729ea329d9419 Merge: 9429d014b 874e78348 Author: php-王凡昌 Date: Mon May 21 15:41:39 2018 +0800 Merge branch 'dev-haoxf' of 192.168.0.31:fe/cps into dev-mq Conflicts: application/api/controller/Recharge.php application/common/model/Book.php commit 874e783485bc237f56888fe59c03e11c1a5e3f19 Author: haoxiaofeng Date: Mon May 21 14:53:04 2018 +0800 暂存 commit 4aa1a7cf6a65682f149367ed2163b28cf14fde48 Author: haoxiaofeng Date: Mon May 21 14:42:47 2018 +0800 暂存 commit 25b3a52c8854f0e82585f95644057d06bdad8fb6 Author: haoxiaofeng Date: Mon May 21 14:25:53 2018 +0800 暂存 commit 36d95f00f4c2a45a6cd4905d5fbfbff5afaf4475 Author: haoxiaofeng Date: Mon May 21 11:40:33 2018 +0800 暂存 commit c757249367c64a3cc51be70fa1df9628a9315fc3 Author: DuanEnJian Date: Sat May 19 19:19:14 2018 +0800 gly权限小说封面&标题添加男女频 commit 6a66e2e1641aef3afb50847a12593e3d2d2d8ccb Author: licc <45360682@qq.com> Date: Sat May 19 18:45:00 2018 +0800 修改活动标题 commit a6dc457e6f803bdad613d3a6828c786090680d29 Author: licc <45360682@qq.com> Date: Sat May 19 18:40:09 2018 +0800 活动加管理员统计 commit 27f398d68a999ad173827c2ad544cb1454dc3180 Merge: b5dfc9ae9 9429d014b Author: licc <45360682@qq.com> Date: Sat May 19 18:28:20 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-db commit edf98a068aebc6ac5c761099f8f01e61201e0153 Author: haoxiaofeng Date: Sat May 19 17:54:55 2018 +0800 暂存 commit 8eccae2c70666e6c3b26eea7ca5d80326c14e910 Author: DuanEnJian Date: Sat May 19 17:13:25 2018 +0800 添加推广链接导出Excel功能(导出限制一个月未实现) 添加推广标题&图片的男频女频收搜筛选功能 小说统计收搜增加根据(书名,书ID)收搜功能(渠道商收搜失效) commit d09cd0814ebe66e49a819f7b399e990d244bc001 Author: haoxiaofeng Date: Sat May 19 16:53:11 2018 +0800 暂存 commit 9429d014b2c12fdc279232e8e821042f2805295e (tag: tag-20180519_164853) Author: 45360682 <45360682@qq.com> Date: Sat May 19 16:45:22 2018 +0800 时间 commit 4c8d1a5958779bb82d46af49e359d936a0f2eab8 (tag: tag-20180519_160533) Author: 45360682 <45360682@qq.com> Date: Sat May 19 16:03:18 2018 +0800 时间 commit b536e4c88c8c7fffbb28172e543feb4ffb93f8c7 Author: licc <45360682@qq.com> Date: Sat May 19 15:51:41 2018 +0800 test commit 3235717318f253332ef2238ee3d3b17a3bcc33b3 Author: haoxiaofeng Date: Sat May 19 14:46:03 2018 +0800 暂存 commit 8c89576068b0c066972029d55b169bb3a475106e Author: licc <45360682@qq.com> Date: Sat May 19 14:39:38 2018 +0800 编辑资源管理 commit c7848e6cad68cd24d3be51667c968be5e0a97344 Author: licc <45360682@qq.com> Date: Sat May 19 14:20:25 2018 +0800 编辑资源管理 commit 5dbf7e98d6f24edabfa69fd9ed62041221d04fb2 Author: licc <45360682@qq.com> Date: Sat May 19 14:09:09 2018 +0800 编辑资源管理 commit 1de000be582ca3c957325a368989ca43a64e682b (tag: tag-20180519_140320) Author: licc <45360682@qq.com> Date: Sat May 19 14:01:45 2018 +0800 过滤浮点数 commit b8d71382760b6369f11921d3adca6d068d1fb6ab (tag: tag-20180519_133614) Author: licc <45360682@qq.com> Date: Sat May 19 13:35:23 2018 +0800 去掉测试的支付域名，修改编辑资源时的错误 commit 9318c2204a199ca3eb30d8259942fc0c45ea2bc6 (tag: tag-20180519_123037, tag: tag-20180519_121023) Author: licc <45360682@qq.com> Date: Sat May 19 12:08:16 2018 +0800 去掉测试的支付域名，修改编辑资源时的错误 commit e1b289c7b4916690fc36a49678e63e99dbaf333d Author: haoxiaofeng Date: Sat May 19 11:29:11 2018 +0800 暂存 commit 6d0ea2f485f59ef1bbb9f02bfad0d4223666ab9f (tag: tag-20180519_111956) Author: lichong_ <1909165236@qq.com> Date: Sat May 19 10:58:59 2018 +0800 增加标题判断 commit e3b2f1afb7fe38155f484ba0df0c73bf0efa6f04 Author: haoxiaofeng Date: Sat May 19 10:50:07 2018 +0800 修改 commit 8ef05345e0cc1732d1d9a2605a66ec7633556deb Author: haoxiaofeng Date: Sat May 19 10:21:42 2018 +0800 修改rabbitmq配置 commit 249f4a972230a4594e787ef9752147581b622597 Author: licc <45360682@qq.com> Date: Fri May 18 22:51:47 2018 +0800 结束，未开始判断 commit 7f6c5652f6112944b72ce22c9d9cf69d92532244 Author: licc <45360682@qq.com> Date: Fri May 18 22:28:21 2018 +0800 结束，未开始判断 commit 5181030992523d928cdba51869d4909b81f60879 Author: licc <45360682@qq.com> Date: Fri May 18 22:22:25 2018 +0800 结束，未开始判断 commit 01ccadb061a0cecee64273ad89e37f55d793b8df Author: licc <45360682@qq.com> Date: Fri May 18 22:20:21 2018 +0800 结束，未开始判断 commit 7cd98966a2202bc9b6bde443ad634a1b26a1a648 Author: licc <45360682@qq.com> Date: Fri May 18 22:18:45 2018 +0800 结束，未开始判断 commit 605e5990b5a31ebe5392e3dae913e8927151feb1 Author: licc <45360682@qq.com> Date: Fri May 18 22:15:07 2018 +0800 结束，未开始判断 commit d98189bd04b74426becc57325250c01acaea15f1 Author: licc <45360682@qq.com> Date: Fri May 18 22:12:00 2018 +0800 结束，未开始判断 commit 29d0edb8a48877aa491d4e5e9d9e96c17dc76644 Author: licc <45360682@qq.com> Date: Fri May 18 22:07:26 2018 +0800 结束，未开始判断 commit f26866d75988ab750b378ebe9bc73cd50221cc95 Author: licc <45360682@qq.com> Date: Fri May 18 22:05:42 2018 +0800 结束，未开始判断 commit 56ae20bae66881c73e6286b785a0187598ec3925 Author: licc <45360682@qq.com> Date: Fri May 18 21:50:33 2018 +0800 结束，未开始判断 commit be59ba17b51305bec798d9749d80d18960b6953e Author: licc <45360682@qq.com> Date: Fri May 18 21:45:17 2018 +0800 结束，未开始判断 commit 8f1bda51b86244586d5619e3c37028b70e55103f Merge: 58c753785 da8008f45 Author: licc <45360682@qq.com> Date: Fri May 18 21:41:23 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit 58c753785504a8a379e1d8651ffcf1b6420904ad Author: licc <45360682@qq.com> Date: Fri May 18 21:41:14 2018 +0800 结束，未开始判断 commit da8008f4572b7d9a5591a0b30222b1be1cf3b695 Author: php-王凡昌 Date: Fri May 18 21:40:36 2018 +0800 微信内搜索书籍 commit 5b81b9c9dcfde6aa7f0cb888b97630d6ebff3cd6 Author: licc <45360682@qq.com> Date: Fri May 18 21:26:42 2018 +0800 结束，未开始判断 commit b2d071dc82ad2a94dceff034d60fadd385d0bde4 Author: haoxiaofeng Date: Fri May 18 20:43:23 2018 +0800 暂存 commit 19ca0e6b5b6063197af9c3a0a0308854d6fa21c5 Author: licc <45360682@qq.com> Date: Fri May 18 20:39:09 2018 +0800 结束，未开始判断 commit a078561eff7222cfdfcf04766ef6813bcfa13158 Author: haoxiaofeng Date: Fri May 18 20:35:53 2018 +0800 暂存 commit eb8e6544910d1d70a37b06defc618f43c638fd5b Author: licc <45360682@qq.com> Date: Fri May 18 20:33:05 2018 +0800 结束，未开始判断 commit 6f6e3fa25fcfae09462d770afbea06817431425b Author: licc <45360682@qq.com> Date: Fri May 18 20:11:53 2018 +0800 资源开启关闭问题修改 commit 3da7eac2bf98015a6075ee8a08804c7e171d8f4e Author: licc <45360682@qq.com> Date: Fri May 18 18:47:43 2018 +0800 女频判断问题修改 commit 9a17d30fda2d84c4eac258835836ec0bd5df24b5 Author: licc <45360682@qq.com> Date: Fri May 18 18:39:55 2018 +0800 去掉base64加密 commit 9dfa5cafc0f46d1d6e78687063a456ff0c6258ae Merge: 0c1d18529 18438aa67 Author: licc <45360682@qq.com> Date: Fri May 18 18:34:24 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit 0c1d18529ebd8f412dfd8b04b8c4fb0ba9501b1e Author: licc <45360682@qq.com> Date: Fri May 18 18:34:14 2018 +0800 去掉base64加密 commit 18438aa6769526cc296d67b9b49d266f1e340c89 Merge: 29616af8c 846517853 Author: 丁海波 Date: Fri May 18 18:21:07 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit 29616af8c0ce5ec83128c8c52f909c493ea46cd0 Author: 丁海波 Date: Fri May 18 18:20:58 2018 +0800 36 commit 846517853974ae93e0d82210faf0a06fe53926b2 Author: licc <45360682@qq.com> Date: Fri May 18 18:19:15 2018 +0800 test commit 14a9c92d98e5b189290458e481ea25494ff9b6a8 Merge: 5af3cf4b1 d641fac29 Author: licc <45360682@qq.com> Date: Fri May 18 18:18:07 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit 5af3cf4b110352da0cf030f768bde8cf5d9bdb00 Author: licc <45360682@qq.com> Date: Fri May 18 18:17:49 2018 +0800 test commit d641fac293518e8bc114f7e796ef7722e3ef49de Merge: ed84e8597 fa33be688 Author: 丁海波 Date: Fri May 18 18:15:43 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit fa33be688fb50de1e7fc1e7a83d375c5ef0eab83 Merge: 55c0be2df 12861d2e9 Author: licc <45360682@qq.com> Date: Fri May 18 18:15:37 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit ed84e8597c41813f3616d5a07606b66d9547f1b7 Author: 丁海波 Date: Fri May 18 18:15:34 2018 +0800 42 commit 55c0be2df6337da6cc7988f859cbf3141435d783 Author: licc <45360682@qq.com> Date: Fri May 18 18:15:25 2018 +0800 test commit 12861d2e9b55bcd781fb15ec20e07aeba240b39f Author: 丁海波 Date: Fri May 18 18:14:56 2018 +0800 46 commit 999f5b31e7ca3c411987bc2fab16502e8a16f113 Merge: e97594069 28b7147d7 Author: 丁海波 Date: Fri May 18 18:09:30 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit e9759406949003cf9995ced76039eab82f50cc21 Author: 丁海波 Date: Fri May 18 18:09:19 2018 +0800 就可以看到了 commit 28b7147d7030c45e7515ff3205bc61a7fe4044ba Merge: 2bcd09584 845630f16 Author: licc <45360682@qq.com> Date: Fri May 18 18:07:33 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit 2bcd095848b84bda19441f772127410bade263ba Author: licc <45360682@qq.com> Date: Fri May 18 18:07:25 2018 +0800 test commit 7b74b0084f88226181f6de4e2d4ccb819a3ddee2 Author: haoxiaofeng Date: Fri May 18 16:07:48 2018 +0800 暂存 commit 95f35adc770a36268a45a5bfecb22d3225b327e2 Author: haoxiaofeng Date: Fri May 18 16:03:41 2018 +0800 暂存 commit e3af9aa8049cc00b40642453fa3834eeaa02bd5a Author: haoxiaofeng Date: Fri May 18 16:01:54 2018 +0800 支付完成更新标志状态 commit 26430a4babdd6b8f53818959e635ba178c727255 Author: haoxiaofeng Date: Fri May 18 15:41:37 2018 +0800 暂存 commit 845630f162d92b305b8949d164bb8fe22b9b2402 Author: 丁海波 Date: Fri May 18 15:29:33 2018 +0800 弹框次数 commit ee476fb91d5d8560209a92f2c3d627cc8ffcdc9e Author: 丁海波 Date: Fri May 18 15:06:24 2018 +0800 弹窗加两次 commit 58da08b7edd362d99a41abff1e97f3630bde0efc Author: licc <45360682@qq.com> Date: Fri May 18 12:33:59 2018 +0800 支付后跳转错误的问题 commit 04d96c74df8e1fcffa25698ed378bc12a8d7f817 Author: haoxiaofeng Date: Fri May 18 11:40:37 2018 +0800 暂存 commit 2c0ab935c3d0710329475ef21d1bcc3d3762c778 Author: haoxiaofeng Date: Thu May 17 21:32:31 2018 +0800 消息队列 commit 2b2cae25ea6eeed85ff0a20edebec4d6c6433587 Author: haoxiaofeng Date: Thu May 17 14:40:48 2018 +0800 php-amqplib commit 79ae9524d0b3519a422c5ec7b73e0f5e45f5da68 Author: licc <45360682@qq.com> Date: Thu May 17 14:18:37 2018 +0800 改分割库 commit 0b4ef435e51d852db2ad3a983d71564be7283c17 Author: licc <45360682@qq.com> Date: Thu May 17 14:08:59 2018 +0800 西瓜改成千阅 commit 284b7d3c9c6437c6b7bee6d98a20a30ac2d1635c Author: licc <45360682@qq.com> Date: Thu May 17 14:08:29 2018 +0800 西瓜改成千阅 commit b0bb683638173c77467b84fa9e1e3b24fb6d071e Merge: eb20a3011 a812edf84 Author: licc <45360682@qq.com> Date: Thu May 17 14:03:38 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-qianyue-pay-merge # Conflicts: # application/index/view/recharge/pay.html commit 6e84fcbb0868b43bbeb33bf01b1161c98eecdec6 Author: licc <45360682@qq.com> Date: Thu May 17 12:25:37 2018 +0800 添加服务号关注状态，导粉号关注状态，服务号交互时间 commit 6911dd40b4dd86ac0b50c5da7fa4671e6de69f54 Author: licc <45360682@qq.com> Date: Thu May 17 12:20:47 2018 +0800 添加服务号关注状态，导粉号关注状态，服务号交互时间 commit e62accf26f13d234e7a3e233a3257f6acb76cb63 Author: licc <45360682@qq.com> Date: Thu May 17 12:10:40 2018 +0800 添加服务号关注状态，导粉号关注状态，服务号交互时间 commit 6c756b111749e4051c4e70626b02935ac33ec78d Author: licc <45360682@qq.com> Date: Thu May 17 11:52:35 2018 +0800 加下单时间判断 commit eb20a3011b732e18d0d2472268f89b9d0fca3d69 Author: 丁海波 Date: Thu May 17 11:50:12 2018 +0800 个人中心默认头像 commit 239d8a31d73ff3258f106ab3dc0f30c6b6845a79 Author: licc <45360682@qq.com> Date: Thu May 17 11:32:28 2018 +0800 加下单时间判断 commit a6830cd0e31d8cc6f5ae6dbaf0fb11b995b35126 Merge: 7c512afa5 a812edf84 Author: licc <45360682@qq.com> Date: Thu May 17 11:22:29 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-activity # Conflicts: # application/api/controller/Wechat.php commit 7c512afa5a53eea78866d3e3f37a576e0f41414d Author: licc <45360682@qq.com> Date: Thu May 17 11:17:32 2018 +0800 修改资源联动 commit c75fb343dd3cee50f546da334f4113f5095a696e Author: 丁海波 Date: Thu May 17 11:07:05 2018 +0800 书名颜色优化 commit 7bd1f511d4e26eac4f679bbb0c3fe6f288f46f7e Author: licc <45360682@qq.com> Date: Wed May 16 22:02:56 2018 +0800 修改资源联动 commit 5454c7f57be1aa8cd064534c4e2129472d2d7c83 Author: haoxiaofeng Date: Wed May 16 22:00:06 2018 +0800 暂存 commit e2f5c6d5811fbe49e4c3079b5ec745ef4199174f Author: licc <45360682@qq.com> Date: Wed May 16 20:13:08 2018 +0800 修改bug commit 121dcd293a3a772c93d10aff98760c61a1713c94 Author: licc <45360682@qq.com> Date: Wed May 16 19:43:38 2018 +0800 test commit a812edf842bfa9cba186038c2bd58886620e3cdc (tag: tag-20180516_202455) Author: licc <45360682@qq.com> Date: Wed May 16 19:29:58 2018 +0800 test commit 5a8aa47c8b49591c456c256a4efd9512ec748b24 Author: licc <45360682@qq.com> Date: Wed May 16 19:28:05 2018 +0800 test commit e767c1e5eb7726658cbeb246ac3f2bcb2f7fad6f Author: licc <45360682@qq.com> Date: Wed May 16 19:08:26 2018 +0800 test commit 826681469335e25240621ac03b59010b64d5323f Author: licc <45360682@qq.com> Date: Wed May 16 19:02:11 2018 +0800 test commit d099ed5666273927402a5a0c49c76c51680d1d15 Author: licc <45360682@qq.com> Date: Wed May 16 18:41:51 2018 +0800 test commit eff090bffc4cd74716f10bf382b47edf8b58d3b0 Author: licc <45360682@qq.com> Date: Wed May 16 18:38:57 2018 +0800 test commit 1b25eb158953249adc5fec7a7b1405020f0a0c31 Author: licc <45360682@qq.com> Date: Wed May 16 18:37:53 2018 +0800 test commit 90cd2df49c0a7250d0f4f65e5c7fdbbb226f006b Author: licc <45360682@qq.com> Date: Wed May 16 18:29:13 2018 +0800 test commit 0d530f635211a3a498151ba048db9bf2f143a3e5 Author: 丁海波 Date: Wed May 16 18:10:10 2018 +0800 32x32 ico commit d3e325bc0591f06b52c01e47f1a191d3ab8bfa24 Author: licc <45360682@qq.com> Date: Wed May 16 18:04:47 2018 +0800 .env配置支付过期时间 commit a9aa08681bf3cc191ad36150854c84f4bde12143 Author: licc <45360682@qq.com> Date: Wed May 16 17:47:41 2018 +0800 .env配置支付过期时间 commit d46f77dd2c6ec695812fbaf55550cf050d4a0fa2 Author: licc <45360682@qq.com> Date: Wed May 16 17:45:59 2018 +0800 .env配置支付过期时间 commit 2c1abbe3d6532717689a966f99f54b8958d2c28f Author: licc <45360682@qq.com> Date: Wed May 16 17:41:08 2018 +0800 test commit 7406d5e3a13ee90b02fb4270d166ec0936481633 Author: php-王凡昌 Date: Wed May 16 17:39:20 2018 +0800 动态修改立即充值按钮样式 commit 127488efb27c5be7ae9491778a626154a591f79f Author: licc <45360682@qq.com> Date: Wed May 16 17:31:25 2018 +0800 test commit dc0ce33d3940e21272dda2f638beaa971c6a6612 Author: 丁海波 Date: Wed May 16 17:31:12 2018 +0800 优化 commit 7ab3db6b893bf42c6ab556683ca82f8b3058401c Author: 丁海波 Date: Wed May 16 17:28:50 2018 +0800 youhua commit 3c58966ff014eff95b760d0719ac23ecd45036b1 Author: 丁海波 Date: Wed May 16 17:26:30 2018 +0800 下一章按钮颜色 commit d0617925a80a88036b6320e9ec3082dcbb81888f Author: haoxiaofeng Date: Wed May 16 17:25:32 2018 +0800 rabbitmq commit 23c9f9c4dda714a20c478c5e81248d283c4c9f44 Author: 丁海波 Date: Wed May 16 17:21:57 2018 +0800 后台首页修改 commit 5869eed14c9ce5664b27cd0147726b3159e1cddb Author: licc <45360682@qq.com> Date: Wed May 16 17:20:59 2018 +0800 test commit 462b8f9a938f2ea5d24cd01d787a1328a3129477 Author: licc <45360682@qq.com> Date: Wed May 16 17:16:11 2018 +0800 充值掉启支付修改 commit 9f634e95e1d10decf57a3c76848a42d9cd5d7d12 Author: licc <45360682@qq.com> Date: Wed May 16 17:08:34 2018 +0800 充值掉启支付修改 commit b8b6e743f0d77e23ad304a27e98ffabf52ebb355 Author: licc <45360682@qq.com> Date: Wed May 16 17:01:09 2018 +0800 充值掉启支付修改 commit 37c86689fdb6a1142cc88c149bbbd2ccbd6e2adc Author: php-王凡昌 Date: Wed May 16 16:45:16 2018 +0800 修改前台入口跳过url逻辑 commit 935c8d114d7e50bee69e322ef9f23051d80b8e40 Author: php-王凡昌 Date: Wed May 16 16:38:45 2018 +0800 修改跳过处理格式 commit ef7e4b479055f35989b04feca442d1b2146b0307 Author: 丁海波 Date: Wed May 16 16:28:46 2018 +0800 按钮修改 commit ed833098efc8bee2391acc39e5a0a836a54f37eb Author: php-王凡昌 Date: Wed May 16 16:20:02 2018 +0800 恢复充值页头像 恢复充值页书币2行样式 充值页书币取消固定3行高度 commit 4228dc140adccad6c0457e285398524d880752e6 Author: 丁海波 Date: Wed May 16 16:19:05 2018 +0800 chapter 书籍名称 commit f10e5e1e2e41206d92079056c066feec22545ff4 Author: 丁海波 Date: Wed May 16 16:15:46 2018 +0800 去掉nav下边框线 commit 4fe879d94c4e60ceb43655a29679b02349fd7469 Author: 丁海波 Date: Wed May 16 16:13:51 2018 +0800 去除banner和分类的间隔线 commit 97568b1dcd839554ec0e02e8a828a4c4e0f77474 Author: lichong_ <1909165236@qq.com> Date: Wed May 16 16:07:37 2018 +0800 阅读页背景色修改为1 commit ea370486e7a4e8d80dc140b6eb741c62eab1bb98 Author: lichong_ <1909165236@qq.com> Date: Wed May 16 16:02:03 2018 +0800 首页 增加最近阅读模块 commit 3279cbbecbed64ce9726395de8b2969aaf14c255 Author: licc <45360682@qq.com> Date: Wed May 16 15:29:36 2018 +0800 充值掉启支付修改 commit d6e9d67e5ef298d5863df1cedf3e4c6b4171b686 Author: php-王凡昌 Date: Wed May 16 15:17:49 2018 +0800 修改菜单url生成逻辑 commit 3d25a053a4e09ecf6d12f1074e3943788470cb23 Author: 丁海波 Date: Wed May 16 15:11:21 2018 +0800 最近阅读 commit 08821c85f1e66821ae7fbf1765019fe90e0f9b29 Author: 丁海波 Date: Wed May 16 12:08:46 2018 +0800 阅读页优化 commit b5dfc9ae9a033282d3e2075e5afcab5a45aa4760 Author: licc <45360682@qq.com> Date: Wed May 16 10:58:00 2018 +0800 提交暂存文件 commit 74eb2d6dd4ad329cfb454075cf734acfa3bae3da Author: 丁海波 Date: Wed May 16 10:13:29 2018 +0800 限免 commit f8ab8b1fe334e36ae94b489ac6644f2032a97288 Author: 丁海波 Date: Tue May 15 21:06:53 2018 +0800 点击榜 畅销榜 commit 213948aae9f29e05246c00a283911a8b777e4875 Author: 丁海波 Date: Tue May 15 20:42:49 2018 +0800 充值记录 commit 6374d021fe376fa0bdc75f4659a9beb46ba94fe5 Author: 丁海波 Date: Tue May 15 19:05:17 2018 +0800 充值 报错修改 commit 2827772cff71d7341a857975d1da3eba96003730 Author: haoxiaofeng Date: Tue May 15 18:17:11 2018 +0800 渠道商菜单过滤 commit c9ddc98852b01acdd891a78735a0232c72449554 Merge: 2051845d6 e3864fbb9 Author: haoxiaofeng Date: Tue May 15 17:30:18 2018 +0800 Merge branch 'dev-haoxf' into dev-db-haoxf commit e3864fbb91b1cd0647de7280f8d777c415af7b9b Author: haoxiaofeng Date: Tue May 15 17:24:24 2018 +0800 赏金状态修改 commit 582449017908d897382929471795c6637344dd25 Author: haoxiaofeng Date: Tue May 15 17:20:19 2018 +0800 动态联系方式 commit 8d20694981942c0675be2b0f2978ba3235ab4584 Merge: 052c8c3be 7dd894ebd Author: php-王凡昌 Date: Tue May 15 17:00:12 2018 +0800 Merge branch 'dev-qianyue-pay' of 192.168.0.31:fe/cps into dev-qianyue-pay commit 052c8c3be7be1f9eb7aea3626970e8edfada5507 Author: php-王凡昌 Date: Tue May 15 16:59:57 2018 +0800 恢复数据库结构 commit 7dd894ebd50db49676d547e0ef99d92a0b6e581c Author: 丁海波 Date: Tue May 15 16:50:16 2018 +0800 aaa commit 7ca0136f774bc2bd674d69f2b908c0ccaa373d1a Merge: 0dd0a58ea 12084aeeb Author: php-王凡昌 Date: Tue May 15 16:47:15 2018 +0800 Merge branch 'dev-qianyue' of 192.168.0.31:fe/cps into dev-qianyue-pay Conflicts: application/config.php application/index/view/recharge/pay.html commit 12084aeeb3ec471d581720894f0c17c1f4b132ee Author: 丁海波 Date: Tue May 15 16:29:00 2018 +0800 category edit commit 4c435526f06f08619cd2dc09d51341d5c1396028 Author: 丁海波 Date: Tue May 15 15:50:51 2018 +0800 畅销榜 commit eaeae0ecdfbb80f29a59a6cffd6f1d8e0b7abc8e Author: 丁海波 Date: Tue May 15 15:13:24 2018 +0800 index最近阅读 commit 2051845d6edd13260b9efec41ecea3701f16646f Merge: 9d39dcb60 50550164e Author: php-王凡昌 Date: Tue May 15 15:03:07 2018 +0800 Merge branch 'dev-haoxf' of 192.168.0.31:fe/cps into dev-db-haoxf Conflicts: application/admin/controller/reward/Inviterecord.php commit 50550164e9a64dfbc5b6336e4952835f59c04bde Author: haoxiaofeng Date: Tue May 15 15:00:20 2018 +0800 url修改 commit 0dd0a58ea4cf7e3e548b72641ddecd15f891ed80 Author: php-王凡昌 Date: Tue May 15 14:34:32 2018 +0800 切换recharge、consume表分库规则 commit 368b013c7d9e0b2c83e361ae0a3cf462db7b7b02 Author: haoxiaofeng Date: Tue May 15 13:43:43 2018 +0800 增加开户行字段 commit 317469dcbb93654f04512fc8277e8bf0d5c6a761 Author: haoxiaofeng Date: Tue May 15 13:39:57 2018 +0800 邀请过滤 commit f208d6bc5ecc0d08fd5e194553122553ce6eb69d (tag: tag-20180515_161351) Author: 丁海波 Date: Tue May 15 12:57:47 2018 +0800 pay commit 5a4efdc0c7f64b14e28f700b12b959f30193cd06 Author: php-王凡昌 Date: Tue May 15 12:56:11 2018 +0800 去除json编码 commit 99ac785db6267bc6fbd9eae6b59ab9fcf50c4ce1 Author: php-王凡昌 Date: Tue May 15 12:50:34 2018 +0800 后台商品描述字符改为20个字 commit 9d39dcb60fccd0820a51fe1b2c6781389d4ce415 Author: licc <45360682@qq.com> Date: Tue May 15 12:23:08 2018 +0800 如果代理商为开启赏金则不显示赏金管理菜单 commit 702b9fac5cefc807213e90668481869b71a2df00 Author: php-王凡昌 Date: Tue May 15 12:22:54 2018 +0800 异常页面文字修改 commit d551a4d55af10a008bc7e58283ca02cd57919678 Author: php-王凡昌 Date: Tue May 15 12:22:31 2018 +0800 书籍缓存redis格式修改 commit 8bb212ee80b88b28edc6850afd4836cc9f87fc4a Author: php-王凡昌 Date: Tue May 15 11:46:19 2018 +0800 充值页按钮去除动态展示 commit 0db801aa44333df346ab3263967ec5223dca36aa Author: licc <45360682@qq.com> Date: Tue May 15 11:44:54 2018 +0800 修改页面样式 commit 43e3b0bbae78bbe12f6697041d416b626ad725a9 Author: licc <45360682@qq.com> Date: Tue May 15 11:24:36 2018 +0800 代理商申请管理 commit 3f6c78c3a02ea138e550c7327faa076349c065ba Author: haoxiaofeng Date: Tue May 15 11:08:20 2018 +0800 修改 commit fa0ba7f129ba40fabed81647a40218607a0fe60e Author: 丁海波 Date: Tue May 15 11:07:30 2018 +0800 畅销修改 commit 31a3b9695b38ab2a195d04ac28392e633805ae48 Author: 丁海波 Date: Tue May 15 10:30:24 2018 +0800 模块行间距 commit 8517330ac8596f87c7506faf599955456a29bfca Author: 丁海波 Date: Tue May 15 10:07:47 2018 +0800 列表修改 commit 3770d72824d83067c508350edf58122ec27e1f55 Author: 丁海波 Date: Mon May 14 20:45:19 2018 +0800 样式 icon 修改 commit 1e09235b6a04da5fe3335bc1d4f9de57ce4c6183 Merge: 396c5b72e 04b67d8d6 Author: 丁海波 Date: Mon May 14 19:07:25 2018 +0800 Merge remote-tracking branch 'origin/dev-qianyue' into dev-qianyue commit 396c5b72edabf6890b5b4cef74de7508e83d32fa Author: 丁海波 Date: Mon May 14 19:07:15 2018 +0800 修改icon css commit 04b67d8d663a509b67c2dc947fc0b7ed800131f5 Merge: edc03a398 e648871cc Author: lichong_ <1909165236@qq.com> Date: Mon May 14 19:01:12 2018 +0800 Merge branch 'dev-qianyue' of http://gitlab.qcread.cn/fe/cps into dev-qianyue commit c4ebde5feb1fa60c4ee5c3565359ea5ce34480d2 Author: licc <45360682@qq.com> Date: Mon May 14 19:01:10 2018 +0800 优化js commit edc03a39820f0295a3acad741b9b02ec810502da Author: lichong_ <1909165236@qq.com> Date: Mon May 14 19:01:05 2018 +0800 去掉注释 commit e648871ccba0a8ac6d54d3f2a426b294eeec1dc1 Author: 丁海波 Date: Mon May 14 19:00:42 2018 +0800 修改icon commit 294985178a6e190a135b39317a77277b03056077 Author: 丁海波 Date: Mon May 14 17:59:51 2018 +0800 /assets/img /assets__THEME__/img commit 8ebacdeee7001dddb5ed4075209f4b988688490b Author: 丁海波 Date: Mon May 14 17:55:35 2018 +0800 /assets/css /assets__THEME__/css commit beb17641656cf07723e5dd971c58a49191b7ce40 (tag: tag-20180514_191829) Author: php-王凡昌 Date: Mon May 14 17:53:15 2018 +0800 修改博瑞apm引入语法 commit 9e25f7b9bfdd12aa5101b37243a5c765291c30a3 Author: php-王凡昌 Date: Mon May 14 17:45:11 2018 +0800 修改循环判断条件 commit 563e25c6ced9e6c3b3308661dbb206d925477a25 Author: 丁海波 Date: Mon May 14 17:40:03 2018 +0800 add qy commit d3a88128ea8e9015aec55e0d9428fa0caa6c1468 Author: lichong_ <1909165236@qq.com> Date: Mon May 14 17:31:29 2018 +0800 增加千阅书城 主题 commit 051b829795a263af8c8fc96f27cee8a0c58beff7 Author: php-王凡昌 Date: Mon May 14 16:31:20 2018 +0800 修复新老用户充值判断 commit 5d23f6ea2f2755a73ad87d43aa8bd4e531a018c5 Author: licc <45360682@qq.com> Date: Mon May 14 16:15:26 2018 +0800 优化js commit 711f656175c4fd4f01040d249a05edbb3193992c Author: licc <45360682@qq.com> Date: Mon May 14 16:08:57 2018 +0800 加样式 commit adc71ffd944df6d4573d9796b41b091b8fe270aa Author: licc <45360682@qq.com> Date: Mon May 14 16:06:38 2018 +0800 加赏金统计 commit d85a32ff5a8eb11c1ca7b23c555ac2fcde0d2aa9 Author: lichong_ <1909165236@qq.com> Date: Mon May 14 15:45:56 2018 +0800 创建分支 commit a0924127df1a111569160f54c60ff2d7ea7f4674 Author: licc <45360682@qq.com> Date: Mon May 14 15:31:19 2018 +0800 加赏金统计 commit 3c40818f846d9ac173ef8c3670daf1252a58e8db Author: licc <45360682@qq.com> Date: Mon May 14 15:22:32 2018 +0800 test commit 19e229d32a99a964eda3a0a1fab19518f768d0fa Merge: 4e7cfce2d 595651030 Author: licc <45360682@qq.com> Date: Mon May 14 15:13:16 2018 +0800 Merge branch 'dev-db' of http://192.168.0.31/fe/cps into dev-db commit 4e7cfce2dea7331704eef4fa4cd49f1c408c5e7e Merge: 73c3116d1 1e7944ce3 Author: licc <45360682@qq.com> Date: Mon May 14 15:12:58 2018 +0800 Merge branch 'dev-haoxf' of http://192.168.0.31/fe/cps into dev-db commit 59565103001545a665caa28b5bb9f80678719b33 Author: lichong_ <1909165236@qq.com> Date: Mon May 14 15:10:51 2018 +0800 暂存 commit c10746008f65d8dcdd63d5d47c2edf5a3b97d4f7 Author: lichong_ <1909165236@qq.com> Date: Mon May 14 15:07:37 2018 +0800 暂存 commit 0222eda0bb4d09b878dcbce2aad8c8fd920c2467 Author: licc <45360682@qq.com> Date: Mon May 14 15:02:24 2018 +0800 test commit 335e5dd62ddf70f69327f9d4f769e31f596f88f7 Author: licc <45360682@qq.com> Date: Mon May 14 14:51:22 2018 +0800 test commit e59b678fb2673ed66c4629c93ea78ebf6f031729 Author: licc <45360682@qq.com> Date: Mon May 14 14:39:14 2018 +0800 test commit 487bd5d84c05f3d774a3feada9fe965453317df7 Author: licc <45360682@qq.com> Date: Mon May 14 14:34:51 2018 +0800 test commit 40ab567231528dd450645d82d58fc5b4c894f035 Author: licc <45360682@qq.com> Date: Mon May 14 14:34:24 2018 +0800 test commit f9d4dcb81204fae73a474a11f8222bb84be65373 Author: licc <45360682@qq.com> Date: Mon May 14 14:32:26 2018 +0800 test commit 0db67cb79c0ab399791b6edccd841f0a3f2c875e Author: licc <45360682@qq.com> Date: Mon May 14 14:31:19 2018 +0800 test commit 0cff68a3a8cbe57efd398b341fb48bfa15abc6a5 Author: php-王凡昌 Date: Mon May 14 14:25:43 2018 +0800 增加博瑞apm配置 commit 9d9d69f5dfd33c064c1572e95a8c34250deb0a58 Author: licc <45360682@qq.com> Date: Mon May 14 14:22:59 2018 +0800 test commit 7ff4b7439ff10d25f30e706c274652948254aa35 Author: licc <45360682@qq.com> Date: Mon May 14 14:07:52 2018 +0800 test commit 240b6bc328eec4a7ae26765ecf27b9655c1a67ec Author: php-王凡昌 Date: Mon May 14 14:07:22 2018 +0800 充值商品默认选择第二个 去除充值页获取用户资料 commit 4991589c076fddb7d8666ee6fc2c852aa1e16fff Merge: 743d1b2b5 73c3116d1 Author: lichong_ <1909165236@qq.com> Date: Mon May 14 14:05:36 2018 +0800 Merge branch 'dev-db' of http://gitlab.qcread.cn/fe/cps into dev-db commit 743d1b2b5df13d994a78590ff1896ec1c27c8f96 Author: lichong_ <1909165236@qq.com> Date: Mon May 14 14:05:30 2018 +0800 zancun commit 1e7944ce34f4872869479068cea70246ab1ba417 Author: haoxiaofeng Date: Mon May 14 13:48:32 2018 +0800 修改 commit f50d38bbca6ac5a31ebdf945599f7c46e923735e Author: php-王凡昌 Date: Mon May 14 13:45:54 2018 +0800 去除debug commit 37fd5ce49dddf4e0f712d896447987bd5da7c71d Author: php-王凡昌 Date: Mon May 14 13:45:39 2018 +0800 微信第三方平台全网发布兼容微信小程序 commit ecbf94418b88c766b2d5c7a958c2133817640785 Author: 丁海波 Date: Mon May 14 12:08:52 2018 +0800 阅读页新用户引导 commit 949347885d24e5ff764b9c7f02cce3bd793a4365 Author: 丁海波 Date: Mon May 14 11:56:38 2018 +0800 删除用户信息 修改充值列表样式 commit 73c3116d12235d87de55a76a4ca61d99191200fe Author: licc <45360682@qq.com> Date: Mon May 14 11:53:15 2018 +0800 统计 commit 938696e75be13536c2e21d4693c639484c232fc6 Author: haoxiaofeng Date: Mon May 14 11:11:16 2018 +0800 暂存 commit 04989705fc3e6ce69cb294e386890b8a3e1a5db3 Author: haoxiaofeng Date: Mon May 14 10:24:49 2018 +0800 暂存 commit a03ceb3a75b7f42068a7a90f134345189e74c4f6 Author: haoxiaofeng Date: Mon May 14 09:46:59 2018 +0800 sql修改 commit 014cc05c22f7502ef407f1f155b159a80757fb62 Author: licc <45360682@qq.com> Date: Fri May 11 17:59:50 2018 +0800 暂存 commit 3ca644b182fa39e9a9d85d06534926ec875eda3d Author: licc <45360682@qq.com> Date: Fri May 11 17:35:40 2018 +0800 暂存 commit b5bb742ca3ebb8055651418d2e772dc98df5fd23 Author: licc <45360682@qq.com> Date: Fri May 11 17:33:28 2018 +0800 暂存 commit c294692bbf05abf9c1e84e8dd2601c626275db1f Author: licc <45360682@qq.com> Date: Fri May 11 17:29:52 2018 +0800 暂存 commit 649a2f596ac1588615cfb4bdee1471f3dcf19f98 Author: licc <45360682@qq.com> Date: Fri May 11 17:27:57 2018 +0800 暂存 commit 5aa952415cd075d2aa047e22f2c08b8560470891 Author: licc <45360682@qq.com> Date: Fri May 11 17:25:20 2018 +0800 暂存 commit 76ddace1a4cc06096e74f1850080dbeb0b204790 Author: licc <45360682@qq.com> Date: Fri May 11 17:24:19 2018 +0800 暂存 commit d9d94deeaf940818b69420453e4089bc738d6d21 Author: licc <45360682@qq.com> Date: Fri May 11 17:18:51 2018 +0800 暂存 commit 3a1fb5efb48e5f49ae9a383fedf2987220b014a3 Author: licc <45360682@qq.com> Date: Fri May 11 17:16:32 2018 +0800 暂存 commit 334d80e76af425c90edd50cb7896cda00f7825ac Author: licc <45360682@qq.com> Date: Fri May 11 17:03:58 2018 +0800 暂存 commit 0a3cb00fb77b431545a5c3de03c26ece7d7ec44e Author: haoxiaofeng Date: Fri May 11 17:02:38 2018 +0800 username字段搜索修改 commit 8442690b1e8358a9513e83924044c8957786cab4 Merge: fe8dc538e 5b19d06ae Author: licc <45360682@qq.com> Date: Fri May 11 16:56:07 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit fe8dc538e32fff25ef77284c0da2a8b74b62c4ab Author: licc <45360682@qq.com> Date: Fri May 11 16:55:59 2018 +0800 暂存 commit 4ff71dc9e515555ef94080b1bb1c0895b01a6428 Author: haoxiaofeng Date: Fri May 11 16:28:12 2018 +0800 a链新页面打开 commit 4454a11bcc55f2a13d63b38a391eddb4f3bec62f Author: lichong_ <1909165236@qq.com> Date: Fri May 11 15:45:04 2018 +0800 debug commit 31924548596bc978280f911f7cd0fe87db22d1b4 Author: licc <45360682@qq.com> Date: Fri May 11 15:33:54 2018 +0800 暂存 commit 5b19d06ae1ceb64c4bd931bbc9a404ef3872f14b Merge: a042471a4 d02c9c481 Author: lichong_ <1909165236@qq.com> Date: Fri May 11 15:31:56 2018 +0800 Merge branch 'dev-db' of http://gitlab.qcread.cn/fe/cps into dev-db commit a042471a4b06e132087ec434ac128aefc164416c Author: lichong_ <1909165236@qq.com> Date: Fri May 11 15:31:50 2018 +0800 d commit d29f283851b59c83f23b011f90d50488cc40b053 Author: haoxiaofeng Date: Fri May 11 11:36:07 2018 +0800 邀请记录管理 commit 02634b368faa1b29a55c519f892bcfba9a298534 Author: haoxiaofeng Date: Thu May 10 19:21:11 2018 +0800 暂存 commit d02c9c481844b9c1a9cc56d4f6027b2d5a643b83 Author: licc <45360682@qq.com> Date: Thu May 10 17:00:12 2018 +0800 设置recollect方法不需要鉴权 commit 4e78c4717b72b0e59d21543f50b2e5fcbff56fbb Author: licc <45360682@qq.com> Date: Thu May 10 16:57:33 2018 +0800 方法名重复 commit 3408d48c097dd87d977a79b4126caf704e7df1ff Author: lichong_ <1909165236@qq.com> Date: Thu May 10 16:22:29 2018 +0800 d commit 4850d02fff30609b6c48ed9c5987249fd3028536 Author: lichong_ <1909165236@qq.com> Date: Thu May 10 15:26:38 2018 +0800 d commit 284f63fb7bf22107ea566bae4681fe89434d21dc Author: lichong_ <1909165236@qq.com> Date: Thu May 10 15:15:09 2018 +0800 d commit 542dff331a270cfe168ca7a25f587533cda4d723 Author: lichong_ <1909165236@qq.com> Date: Thu May 10 15:12:45 2018 +0800 d commit ef98a61f583858324baee71bec96a91749c1ddba Merge: 62a11b9c7 ccbb026f0 Author: licc <45360682@qq.com> Date: Thu May 10 14:17:27 2018 +0800 Merge branch 'dev-bookedit' of http://192.168.0.31/fe/cps into dev-activity commit 62a11b9c76d2d08debaa44c2ab0d38b3e15e8d1a Merge: 479afde1c c3a5b91c7 Author: licc <45360682@qq.com> Date: Thu May 10 14:16:27 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-activity commit d21d90067df1863a56fdf59b944f1ff1088132b6 Merge: 01f8fe36c c3a5b91c7 Author: haoxiaofeng Date: Thu May 10 14:13:32 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-haoxf commit 4b935f0c1d7141f1346367b4fb430a25140e3080 Merge: 32d837237 5089bf347 Author: licc <45360682@qq.com> Date: Thu May 10 14:06:51 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit 32d83723789da53d05783acb4385180fd8928ce8 Author: licc <45360682@qq.com> Date: Thu May 10 14:06:42 2018 +0800 统计页面样式修改 commit 5089bf347e288483fdcd8b7e773aa56a51c34898 Author: lichong_ <1909165236@qq.com> Date: Thu May 10 14:05:35 2018 +0800 d commit f3264fcbef2b0b0dcb323383f09556af62ed8501 Merge: 19c85aa09 c3a5b91c7 Author: licc <45360682@qq.com> Date: Thu May 10 13:21:59 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps into dev-db commit c3a5b91c7d631c11256496933731ff370bae7050 (tag: tag-20180511_145436, tag: tag-20180510_132523, tag: tag-20180510_122635) Author: php-王凡昌 Date: Thu May 10 12:18:30 2018 +0800 修改非utf8字符编码json失败问题 commit 01f8fe36c32d6b9b6b1f07d5f32bfa342c475dd5 Author: haoxiaofeng Date: Thu May 10 12:10:24 2018 +0800 xx commit d114a7eeec1f63fde96a72e9edbd42b4c9651426 Author: haoxiaofeng Date: Thu May 10 11:00:51 2018 +0800 暂存 commit cf0c51e811532118a437722da2ea75360845d017 (tag: tag-20180510_102157) Author: php-王凡昌 Date: Thu May 10 09:53:47 2018 +0800 修改redis book配置 commit 06a4bb632798475522518966695b8b4b978318e9 (tag: tag-20180510_061913) Author: php-王凡昌 Date: Thu May 10 05:59:29 2018 +0800 修改章节缓存，去除多余空行 commit 71605830e75542e6ffdece7bd4b0700f4557b029 (tag: tag-20180510_051031) Author: php-王凡昌 Date: Thu May 10 05:07:27 2018 +0800 修改redis book ip commit 1eaea1528ec27374a5113ccaa1d1616df9cce10f (tag: tag-20180510_045107, tag: tag-20180510_043324) Author: php-王凡昌 Date: Thu May 10 04:32:27 2018 +0800 修改redis book配置 commit fc55a92805e1606e4fdf3d811a7120316eceddf2 Author: php-王凡昌 Date: Tue May 8 15:39:24 2018 +0800 修改章节书籍字数判断 commit 40f90c05139df727bca0fbfbc9e94fe81450a9f4 Author: php-王凡昌 Date: Tue May 8 15:31:19 2018 +0800 默认书籍字数0 commit 724da65114daf46cc717549ce968f86e56c5f2d5 Author: php-王凡昌 Date: Tue May 8 11:39:46 2018 +0800 redis缓存章节正文 commit 317a82fb9c565fc47e833bc9fa9f2fadb18fe021 Author: php-王凡昌 Date: Sat May 5 20:56:05 2018 +0800 用redis基础缓存替换API接口 commit e77c88d86621608de44397fcdc59e66626d6de76 (tag: tag-20180510_030722) Author: php-王凡昌 Date: Thu May 10 03:06:56 2018 +0800 最近阅读取模 commit 19c85aa09c67bf318cf110d2156b6808714e26cc Merge: a3702dc3a 860f32fe2 Author: licc <45360682@qq.com> Date: Wed May 9 20:50:26 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit a3702dc3af6272f9fa35fad87b4449ae2034be32 Author: licc <45360682@qq.com> Date: Wed May 9 20:50:03 2018 +0800 time修改 commit 860f32fe2c054f613b822446ef8ef4746266ea0c Author: lichong_ <1909165236@qq.com> Date: Wed May 9 20:39:09 2018 +0800 赏金结算单 commit 81c547c8ce1e507438395d88855f68c8f60aef73 Author: haoxiaofeng Date: Wed May 9 20:33:54 2018 +0800 搜索字段修改 commit 0580fc7752c1cead8fda98ec66db5851ef237b18 Merge: 899f93adb c7f080f80 Author: lichong_ <1909165236@qq.com> Date: Wed May 9 19:39:41 2018 +0800 Merge branch 'dev-db' of http://gitlab.qcread.cn/fe/cps into dev-db commit 899f93adbdae8fd270e980e6e1aa81cdb3a97f74 Author: lichong_ <1909165236@qq.com> Date: Wed May 9 19:39:34 2018 +0800 d commit 479afde1c55899e25d742b29fef8f60387863cb9 Merge: 3c8a8be7e 7c157c437 Author: licc <45360682@qq.com> Date: Wed May 9 19:31:04 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit 3c8a8be7eedd1c10f88b4acde36889a0d2bfc80f Author: licc <45360682@qq.com> Date: Wed May 9 19:30:46 2018 +0800 time修改 commit c7f080f80190297bb15e99f6694954eacf9800ad Author: licc <45360682@qq.com> Date: Wed May 9 18:38:39 2018 +0800 test commit 110ed6fe3801053d9d26d67b8b907481f16f46da Author: licc <45360682@qq.com> Date: Wed May 9 18:36:13 2018 +0800 test commit daa3c236ad60580c7a0a20f7ecb120433ba39365 Author: licc <45360682@qq.com> Date: Wed May 9 18:28:07 2018 +0800 test commit 5996ab143e615a462347e2b21032868548fb6d73 Merge: 668bb42a8 7de51ab63 Author: licc <45360682@qq.com> Date: Wed May 9 18:21:09 2018 +0800 11 commit 668bb42a86fc5eec119804cc328919e5d8f1d640 Author: licc <45360682@qq.com> Date: Wed May 9 18:19:07 2018 +0800 test commit 14195e477ebb76e8b3581aaa4cb8bece7f5b8f17 Author: haoxiaofeng Date: Wed May 9 18:09:32 2018 +0800 暂存 commit 246b305631424b6da5586f364a40a1b018c95419 Author: haoxiaofeng Date: Wed May 9 17:23:38 2018 +0800 agentapply commit d9066702b090466b8dd47c063e968a8c97b488d3 Author: haoxiaofeng Date: Wed May 9 17:14:42 2018 +0800 暂存 commit 7c157c43707bf29b96fc04951968fc809efebd32 Author: 丁海波 Date: Wed May 9 17:09:50 2018 +0800 activity apy commit f11f7ecdea8f61b03eb3d5063b12d85e4ba1d1f0 Author: licc <45360682@qq.com> Date: Wed May 9 16:46:19 2018 +0800 test commit 75144cf65e86979d50e7c6915f9efa2ac7f83412 Author: licc <45360682@qq.com> Date: Wed May 9 16:45:29 2018 +0800 test commit c277f31832a963f502fcc819a8134944ff075670 Merge: 1ca191f9e 7de51ab63 Author: haoxiaofeng Date: Wed May 9 16:26:06 2018 +0800 Merge branch 'dev-db' of http://gitlab.qcread.cn/fe/cps into dev-haoxf commit 7de51ab63c5c15f5d7dbfe6d1bf63318a45cd0d9 Author: licc <45360682@qq.com> Date: Wed May 9 16:23:54 2018 +0800 test commit 1ca191f9e479ba5a4daf80c00810c22e7d1698ef Author: haoxiaofeng Date: Wed May 9 16:05:17 2018 +0800 暂存 commit d53d686a0b55c3ca915473c004cff0d4a98ffcce Author: haoxiaofeng Date: Wed May 9 15:47:02 2018 +0800 暂存 commit 79442420d2784ec8eafd00b07be846e8f829b1f1 Author: licc <45360682@qq.com> Date: Wed May 9 15:15:16 2018 +0800 test支付 commit e311f4d2ad7ab000df0cc161015e4d5ee2905397 Author: licc <45360682@qq.com> Date: Wed May 9 15:13:23 2018 +0800 test支付 commit ce1f2f4ac1f73658c5453d5ff2b01da08ca7def5 Author: licc <45360682@qq.com> Date: Wed May 9 15:02:38 2018 +0800 test支付 commit ea23b68b42c8787729943e22a7ca1bc5d6619108 Author: licc <45360682@qq.com> Date: Wed May 9 15:00:30 2018 +0800 test支付 commit 87e86e902865caa4452e69cb006e32a4a3e7ce02 Author: licc <45360682@qq.com> Date: Wed May 9 14:56:25 2018 +0800 test支付 commit de6518671ecfcdb04c5e53e4eb77bd4169813983 Author: haoxiaofeng Date: Wed May 9 14:40:16 2018 +0800 inviterecord commit ceecc16360ba0ea959e75623943bc1bcf1bbac69 Author: licc <45360682@qq.com> Date: Wed May 9 14:35:00 2018 +0800 test支付 commit 85322d4f4f8892b26e9defcaa1c8b5a677ef38c7 Author: licc <45360682@qq.com> Date: Wed May 9 14:33:51 2018 +0800 test支付 commit 8e7766df114028fbb0351f6a07dc7694aaece80c Author: licc <45360682@qq.com> Date: Wed May 9 14:30:59 2018 +0800 test commit e966c4e172da761c617105e44302e4b76bccb0b4 Author: licc <45360682@qq.com> Date: Wed May 9 14:27:55 2018 +0800 test commit 6e0bd3f6d01ac0743ff2c4be5ec9d3efce08fe01 Author: licc <45360682@qq.com> Date: Wed May 9 14:16:10 2018 +0800 test commit d8e6bbfb374e8b0effacdfb9cfb837c13df299a1 Merge: d77533b6b 18b82cc3d Author: licc <45360682@qq.com> Date: Wed May 9 14:07:10 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit d77533b6b4d5ca4c2ccaa83234d668fdce46e1ca Author: licc <45360682@qq.com> Date: Wed May 9 14:06:58 2018 +0800 test commit 18b82cc3d147d6ded24fbb6e8d439ad5299fd78a Author: lichong_ <1909165236@qq.com> Date: Wed May 9 14:02:23 2018 +0800 d commit 103d1437f310fa83d48e8db1e37fa8dfcffc843b Author: licc <45360682@qq.com> Date: Wed May 9 13:59:01 2018 +0800 test commit 99ee3f4bec0da886c4265dcac8b57acc64a66334 Author: licc <45360682@qq.com> Date: Wed May 9 12:14:01 2018 +0800 test commit b5bfe50c1c44ed1a1cac827fefd30b70bf725e00 Merge: f62cdd5d2 ab7cf1cd5 Author: haoxiaofeng Date: Wed May 9 12:00:03 2018 +0800 Merge branch 'dev-db' into dev-haoxf commit f6454f0e041faf62658b75db24b412a62c9a0611 Author: licc <45360682@qq.com> Date: Wed May 9 11:55:07 2018 +0800 test commit f62cdd5d2265676c1dc4c37b5dfa5ece6539465a Author: haoxiaofeng Date: Wed May 9 11:43:04 2018 +0800 invite_record commit 5d728abee117dfe1705a594f62fb431f3f608633 Author: licc <45360682@qq.com> Date: Wed May 9 11:17:18 2018 +0800 test commit ae121180b39289e59e9f5d3f4db9018b178dc636 Author: licc <45360682@qq.com> Date: Wed May 9 11:16:11 2018 +0800 test commit ccbb026f021034411d9c023cbb763078d42ca34a Author: lichong_ <1909165236@qq.com> Date: Wed May 9 11:03:28 2018 +0800 去掉图片 commit 5a4ef32fba5351ce66b2b313de28614314a90958 (tag: tag-20180510_015836, tag: tag-20180509_110257) Author: php-王凡昌 Date: Wed May 9 10:50:30 2018 +0800 修改 db cps_shard 分库配置 修改 redis list 配置 commit 6b1423426ee06161c51436f2670075bb24f296c4 Merge: 79a62d457 61ec5d0fb Author: haoxiaofeng Date: Tue May 8 20:15:54 2018 +0800 Merge branch 'dev-test' into dev-haoxf commit 61ec5d0fb112d8a3f3e77ded76208b857507da91 Author: haoxiaofeng Date: Tue May 8 20:12:08 2018 +0800 赏金链接获取&修改 commit 4fec4a728be81d25f2f4d87ab3abf6aa52cda78e Author: licc <45360682@qq.com> Date: Tue May 8 19:51:29 2018 +0800 赏金订单生成 commit eec86d548b4ee229a3b55a40fd4115c1de679e07 Author: licc <45360682@qq.com> Date: Tue May 8 19:49:29 2018 +0800 赏金统计 commit 8a229df0bda9985dc9666b0f0423ba3475d4e887 Author: lichong_ <1909165236@qq.com> Date: Tue May 8 18:54:51 2018 +0800 d commit 543fb44a11894d85ab573581786481f797076b8e Author: lichong_ <1909165236@qq.com> Date: Tue May 8 18:27:45 2018 +0800 d commit 2d840b9784a2c6239c7ba5ea535488bf99d40788 Author: lichong_ <1909165236@qq.com> Date: Tue May 8 18:18:18 2018 +0800 d commit e3b0880d94cdcc23e4ecc11464de6c83770df81d Author: lichong_ <1909165236@qq.com> Date: Tue May 8 17:56:25 2018 +0800 d commit 87721f915c81b76794e401ed04d4a4a3d3d83258 Author: licc <45360682@qq.com> Date: Tue May 8 17:48:12 2018 +0800 暂存 commit 61319e1c349070567d7ae3e8544e86775d8dec1a Author: lichong_ <1909165236@qq.com> Date: Tue May 8 17:41:35 2018 +0800 d commit ec66551cc198d93aa0f89fd0352b3a4a5de34d5d Author: lichong_ <1909165236@qq.com> Date: Tue May 8 17:39:32 2018 +0800 d commit 89a73b1c1607d67733a5c79df63523e24b53da53 Author: lichong_ <1909165236@qq.com> Date: Tue May 8 15:40:26 2018 +0800 d commit 2981e6be554ded7f79eb8cfeeacc4f13bb6555cb Author: lichong_ <1909165236@qq.com> Date: Tue May 8 15:14:28 2018 +0800 d commit 4345d5d1bd6b84070fb38c739cf402e3411c6762 Author: lichong_ <1909165236@qq.com> Date: Tue May 8 15:09:47 2018 +0800 d commit dd4d8940f9d5143736d5220943e55fa5a19f7ced Author: lichong_ <1909165236@qq.com> Date: Tue May 8 15:00:46 2018 +0800 d commit e4fe159b98fe151637e95605067514328a2a626c Author: lichong_ <1909165236@qq.com> Date: Tue May 8 14:32:19 2018 +0800 暂存 commit a776ba99276bce99cc7f68d1bc6ebf676923387a Author: haoxiaofeng Date: Tue May 8 12:20:09 2018 +0800 暂存 commit 3864bda68e3878d6807ca799d6b6c8a1bdd91502 Author: lichong_ <1909165236@qq.com> Date: Tue May 8 11:42:35 2018 +0800 debug commit 9568c18b4a38eaa0fa7bd6aa3c32b812791ad22a Merge: 51847f922 ab7cf1cd5 Author: lichong_ <1909165236@qq.com> Date: Tue May 8 11:13:15 2018 +0800 Merge branch 'master' into dev-bookedit commit 51847f9228503bc5cdd0c553e4efbc5c3bb556ef Author: lichong_ <1909165236@qq.com> Date: Tue May 8 11:12:52 2018 +0800 暂存 commit e771e3e1074e88ef571e07bd9e42402598b66d66 Author: haoxiaofeng Date: Tue May 8 10:27:40 2018 +0800 赏金链接crud&menu commit ab7cf1cd53e69cf0d643f9003edad97a4a3e3c19 (tag: tag-20180509_105143, tag: tag-20180509_020728) Author: php-王凡昌 Date: Mon May 7 20:04:53 2018 +0800 修复ssdb ip commit 79a62d457da88354e61d0cbf1c797561c43c028f Author: haoxiaofeng Date: Mon May 7 18:46:44 2018 +0800 test commit e0ee4615e756d4c6e46b1e2bd549ddde194d0f8a Merge: 896cfefed 72dbe84c6 Author: licc <45360682@qq.com> Date: Mon May 7 18:44:16 2018 +0800 Merge remote-tracking branch 'origin/dev-db' into dev-db commit 896cfefed3de58ec70e21384dfaa67d338d36a60 Author: licc <45360682@qq.com> Date: Mon May 7 18:44:01 2018 +0800 修改阅读记录在redis里存储的时长 commit 72dbe84c6ba9f7715e48ad8eb7a9d0cec455e973 Author: php-王凡昌 Date: Mon May 7 17:40:57 2018 +0800 推广链接不存在时，跳转当前渠道商首页 commit 778eecf778eff6dbdb18599f35325bd43be97f76 Author: licc <45360682@qq.com> Date: Mon May 7 17:22:20 2018 +0800 修改阅读记录在redis里存储的时长 commit ffcf22f49dd4e66ce7177b0eede169de5b1132b1 Author: licc <45360682@qq.com> Date: Mon May 7 17:10:18 2018 +0800 修改阅读记录在redis里存储的时长 commit c1de0ce18534b4d9700d6fef815c389c970e5762 Author: php-王凡昌 Date: Mon May 7 17:05:55 2018 +0800 限制输入 commit 8f2f4915f910d2c065f7448789d00778de349e5e Author: php-王凡昌 Date: Mon May 7 15:51:08 2018 +0800 修改关注数 commit 35015cf5c518162034f21516a3fa78585a19e134 Author: php-王凡昌 Date: Mon May 7 15:34:18 2018 +0800 修改最近阅读数据格式 commit 20f5509db137c202bbd535ddf21e9ec43349eb4e Author: licc <45360682@qq.com> Date: Mon May 7 15:22:56 2018 +0800 test commit cd973ae63c1c95709b6ae30d8e931f3debd7c1ba Author: licc <45360682@qq.com> Date: Mon May 7 15:06:29 2018 +0800 test commit eeddcbf1c3aef53444b4a7d7d07d932f71ff9076 Author: php-王凡昌 Date: Mon May 7 15:06:15 2018 +0800 修改user表 recharge表自增id获取问题 修改插入openid表语法 commit aa25f9254e3fd9352c5d066018e53994be9b8f15 Merge: e4ccdc56f accf9020a Author: lichong_ <1909165236@qq.com> Date: Mon May 7 14:33:12 2018 +0800 Merge branch 'dev-bookedit' of http://gitlab.qcread.cn/fe/cps into dev-bookedit Conflicts: public/assets/js/backend/referral/book.js commit e4ccdc56f6a90f6dca2ea420ff120b18c546aa3e Author: lichong_ <1909165236@qq.com> Date: Mon May 7 14:32:19 2018 +0800 暂存 commit accf9020af5d40743fdfc8ef0dba2db913ce39db Author: 丁海波 Date: Mon May 7 14:31:39 2018 +0800 推广链接弹框形式展现 commit 8c12dd901d78672694787ced95064f2820bc306a Author: 丁海波 Date: Mon May 7 12:06:40 2018 +0800 弹框次数修改 commit 27e2bf71168a7d4012213b0c3183142db9c5c126 Author: 丁海波 Date: Mon May 7 12:02:32 2018 +0800 弹框次数修改 commit cd249a6e74c0a59d6c626ff31119af38b3bd3e98 Author: php-王凡昌 Date: Sat May 5 19:50:20 2018 +0800 阅读记录倒序 书籍列表搜索 commit 98f1caa4f96fc51573ce5f97cb6c05b29a224681 Author: php-王凡昌 Date: Sat May 5 18:46:03 2018 +0800 修正redis返回格式 commit 02bef722faaff1e010be28f0b6f5815829c736eb Author: php-王凡昌 Date: Sat May 5 18:44:54 2018 +0800 修复消费model实例化 commit 03283c2a387f23f13ebdde25d38060d9cdea5979 Author: php-王凡昌 Date: Sat May 5 18:38:02 2018 +0800 去除部分不用html commit d9bb4d716fcd086d364bd287943f89c4171e3616 Author: php-王凡昌 Date: Sat May 5 17:45:34 2018 +0800 充值记录修复 commit ba73cc399aade64ee94c51d234b76eacf7ba2fd1 Author: licc <45360682@qq.com> Date: Sat May 5 15:27:45 2018 +0800 vip减少时长（按小时） commit 9b566117586aa63adf46efca410a99a095d66ae9 Author: php-王凡昌 Date: Sat May 5 15:26:46 2018 +0800 修改减vip小时 commit 6991de5fb8272422858561114ee180f80d557e5a Author: php-王凡昌 Date: Sat May 5 15:09:08 2018 +0800 修改model底层 commit 04c744622d3cc3b79e1ebaed8d5271d67bbb73f2 Author: lichong_ <1909165236@qq.com> Date: Sat May 5 14:19:21 2018 +0800 暂存 commit 7662afcc69eb4554c555b15071d4a07cbd908fd4 Author: php-王凡昌 Date: Sat May 5 11:15:28 2018 +0800 修改阅读记录展示updatetime commit 068fbec02f507f20be2ec0a8748953b3821d77a9 Author: 丁海波 Date: Fri May 4 20:56:43 2018 +0800 活动弹框 commit 452f6a0089d322dd9c02892782d3ebb45e6ba8a0 Author: 丁海波 Date: Fri May 4 20:55:55 2018 +0800 活动弹框 只单页面 commit e06bcdc7f947927b07adf42bf9ce9fc95f2552c2 Author: 丁海波 Date: Fri May 4 19:27:09 2018 +0800 活动修改 commit 8a7d46af4754c57c3ca5445fca60265c40d3d2df Author: licc <45360682@qq.com> Date: Fri May 4 19:11:59 2018 +0800 暂存 commit faa113251e5ca67fa6b5a51db84b5e7d5b967a8f Author: 丁海波 Date: Fri May 4 19:03:49 2018 +0800 活动弹框 commit 80ecad17fa3df353eee63e5c91ca6c59383a56dd Author: 丁海波 Date: Fri May 4 19:01:10 2018 +0800 活动弹框每天两次 commit bbf412967fede47d9df1a2db8a6d48bf49c70fbf Merge: fac58959d 5053e6d7f Author: 丁海波 Date: Fri May 4 18:45:11 2018 +0800 Merge remote-tracking branch 'origin/dev-activity' into dev-activity commit fac58959d4e7c1e2501b6f0000a71b319c9b5e74 Author: 丁海波 Date: Fri May 4 18:45:05 2018 +0800 活动页面 commit 5053e6d7fcc272ff1bd0f403dea1a16dfbcaca0f Author: licc <45360682@qq.com> Date: Fri May 4 18:39:16 2018 +0800 暂存 commit 2959c7a89f4f36be4625269cfebb3bdeed9a61f4 Author: 丁海波 Date: Fri May 4 18:04:44 2018 +0800 活动管理 commit c5e2fdf7190d06334013d216599369bbcad25a0c Author: 丁海波 Date: Fri May 4 18:02:21 2018 +0800 活动管理 commit bdb9ab422b0f953a7d72960e38bab90d150a2578 Author: 丁海波 Date: Fri May 4 18:00:34 2018 +0800 活动管理 commit 6b8a6590e99cde3e8ef5930de0509a16c6a473b4 Author: licc <45360682@qq.com> Date: Fri May 4 17:59:20 2018 +0800 暂存 commit 1b31abf88100d331a7a2f7efacc7d682ec65eca4 Author: 丁海波 Date: Fri May 4 17:42:02 2018 +0800 活动管理 commit b63ae08065804d2c44bd2bea33174587cb0cf857 Author: licc <45360682@qq.com> Date: Fri May 4 17:09:15 2018 +0800 暂存 commit c9785658ca79c1cc09a2fc1fa2a6c3cac946b1d7 Author: php-王凡昌 Date: Fri May 4 16:36:25 2018 +0800 修改微信检测脚本 commit 0db9960b99ca1f67a652015a67dbf3f5b63e5374 Author: licc <45360682@qq.com> Date: Fri May 4 16:29:31 2018 +0800 暂存 commit 36cbddf6d1450b8821d10badc8f1ca538e3641f0 Author: php-王凡昌 Date: Fri May 4 15:57:05 2018 +0800 修正config动态配置语法 微信检测脚本增加1秒延时 修正签到model分表 commit f74ffdf512ec5b57822d031e823e6dc4e89e1a74 Author: php-王凡昌 Date: Thu May 3 21:07:29 2018 +0800 修改find返回格式 commit 83be824809dea0a4e82508f5cd03fed7f27d3870 Author: php-王凡昌 Date: Thu May 3 20:58:42 2018 +0800 修改www首页 commit a884dbb7ce6378560017af4f84106d1c28cb2f0d Author: php-王凡昌 Date: Thu May 3 20:57:08 2018 +0800 修改shell脚本 commit b20d33e76b458007fdcd1abe79073c481b43f538 Author: php-王凡昌 Date: Thu May 3 18:17:36 2018 +0800 增加数量统计 commit fbcb00bb8bb43575d6c8fe81ad44b9f79eb64dfe Author: php-王凡昌 Date: Thu May 3 19:26:33 2018 +0800 修复最近阅读model实例化 commit 7aeddeb100805324bdb82076669f40708851be7f Author: php-王凡昌 Date: Thu May 3 19:24:26 2018 +0800 修复最近阅读 commit 4ee31950caa030e9f4b2482c66da677bd3653c99 Author: php-王凡昌 Date: Thu May 3 17:54:32 2018 +0800 修改shell脚本 commit 6735a0ba7d17407ce5108f2d7c0abd192d609890 Author: php-王凡昌 Date: Thu May 3 17:30:55 2018 +0800 处理最近阅读model 用户详情新增渠道商信息 commit 012b6cc4fc98cabe9836c3544b27dafb04902175 Author: php-王凡昌 Date: Thu May 3 15:45:14 2018 +0800 修正取模 commit 45ef84703c2a91dcc0c733119bb908fe35bb8106 Author: php-王凡昌 Date: Thu May 3 13:07:24 2018 +0800 删除调试 commit 1f62b89399e82805c88efc000521f6ed1c4c743d Author: php-王凡昌 Date: Thu May 3 13:01:52 2018 +0800 处理recharge自增 commit 25e9a1caa901d20404bbe1375aaa9e9d4e549067 Author: php-王凡昌 Date: Thu May 3 11:11:36 2018 +0800 去除API接口基础配置 commit e0f0793f77480c7c4076a49974a7568bf66870ce Author: 丁海波 Date: Thu May 3 10:50:18 2018 +0800 活动弹框 commit 51df3e233f3582d317a00157e34db5dd50edeb45 Author: 丁海波 Date: Thu May 3 10:45:34 2018 +0800 个人中心弹框 commit 2b170bb953f58987eb9fb1158211617945dfb84d Author: licc <45360682@qq.com> Date: Thu May 3 10:31:16 2018 +0800 暂存 commit 08baff146d8007760a903622ffe42bde94fa552b Author: licc <45360682@qq.com> Date: Thu May 3 10:30:57 2018 +0800 暂存 commit 250fc05edd24179b8a8db72d72f09d35fd0be081 Author: 丁海波 Date: Wed May 2 20:45:11 2018 +0800 充值活动 commit 473e97397c3ed75c73d7f5ed9ac7dc368d4d826b Author: 丁海波 Date: Wed May 2 20:30:06 2018 +0800 充值活动 commit 5d480ad2d53c29afe04a8e988f96912c4b2752c7 Author: 丁海波 Date: Wed May 2 19:50:30 2018 +0800 activity commit 3711515c01857a2ed2f6f9fee4ee5ed0ff76db5a Author: licc <45360682@qq.com> Date: Wed May 2 19:28:53 2018 +0800 暂存 commit 9c606210333864c4785a22983287202a64af4fd6 Author: licc <45360682@qq.com> Date: Wed May 2 19:20:51 2018 +0800 暂存 commit 42d3cd16a8c233c7b3407ed5319b2dda3174bf6c Author: php-王凡昌 Date: Wed May 2 03:08:08 2018 +0800 新建用户逻辑判断 commit 965550aee82fa8820dcfd012644b2cd520310b26 Author: php-王凡昌 Date: Wed May 2 02:45:05 2018 +0800 处理新user，recharge，openid表结构 commit 714fdf8395d0ef3c83e635a6b2916609627091af Author: php-王凡昌 Date: Wed May 2 00:59:07 2018 +0800 旧256分库分表处理 commit 65da58656ccdb2bb3d198a3dffecfff548321175 Author: php-王凡昌 Date: Thu Apr 26 20:55:43 2018 +0800 sql分库基本配置 commit 4352b0f4f8fe7c4d76c1b509c1a20edb4a02e0a6 (tag: tag-20180427_235630) Author: php-王凡昌 Date: Fri Apr 27 23:55:16 2018 +0800 微信被动通知增加redis缓存 commit 32bd855d48c33fdbda9fcceb23fd46b1a42cad68 (tag: tag-20180427_211445) Author: php-王凡昌 Date: Fri Apr 27 21:08:29 2018 +0800 修正过滤url判断条件 commit 9e3e75c89b512bd30eb800212832c96d97a33506 (tag: tag-20180427_174834) Merge: 44a736ed4 fd38acd9f Author: php-王凡昌 Date: Fri Apr 27 16:29:53 2018 +0800 Merge branch 'dev-recently2' of 192.168.0.31:fe/cps into dev-jiaoben commit 44a736ed4e7414f63399a1f72078a1cfe6df21de Author: php-王凡昌 Date: Fri Apr 27 16:21:32 2018 +0800 修改微信警报日志格式 commit 86a4abbca65afebae4aa5bebb6b70512365cb6d3 Author: php-王凡昌 Date: Fri Apr 27 16:15:32 2018 +0800 修改部分微信检测日志格式 commit 86e4f2fc0c1fd06c01bd4b73ef4e51ea0b881507 Author: php-王凡昌 Date: Fri Apr 27 15:02:03 2018 +0800 单条推广链接&多条推广链接搜索优化 commit 1b13dbdb767308ca639419ab665c0430229c93dc Author: php-王凡昌 Date: Fri Apr 27 13:52:55 2018 +0800 脚本时间&格式 commit 18477257499d8e730de4f8186636cb392e63d93f Author: php-王凡昌 Date: Fri Apr 27 13:32:07 2018 +0800 修复客服消息&模板消息 commit 8ab64dcca553c26a91c5f18069f57f3698ae1268 Author: php-王凡昌 Date: Thu Apr 26 21:42:52 2018 +0800 发送错误信息 commit b205af68f7d6064e5a0649da5ac02bf3c49d7ae2 Author: php-王凡昌 Date: Thu Apr 26 21:38:11 2018 +0800 增加微信检测时间 commit 65860565535837b2efec3f08ecea012433deb467 Author: php-王凡昌 Date: Thu Apr 26 21:31:27 2018 +0800 try catch 检测 commit 099098ce05aa1ad23e572246da7f88cc7d23f210 Author: php-王凡昌 Date: Thu Apr 26 21:06:41 2018 +0800 处理字段 commit e7604d29a96fafa6537ec347b5eeee1f287eaab3 Author: php-王凡昌 Date: Thu Apr 26 20:59:27 2018 +0800 微信检查脚本 commit 479d703455e11a714467e2c671cd3f760aa512e8 Author: licc <45360682@qq.com> Date: Thu Apr 26 18:06:21 2018 +0800 暂存 commit 48853158f519a0baf0e77b028c7bd5685bf91774 Author: licc <45360682@qq.com> Date: Thu Apr 26 16:59:35 2018 +0800 暂存 commit 857645ded3838d4072992e20623bcef2dd643e15 Author: licc <45360682@qq.com> Date: Thu Apr 26 16:54:28 2018 +0800 暂存 commit fd38acd9fc853584b2134ac34cf05a53115b05c7 Author: php-王凡昌 Date: Thu Apr 26 15:43:25 2018 +0800 修正语法sql commit 437bec1a7603a7c06e61e0bad66376c0c672dee5 Author: licc <45360682@qq.com> Date: Thu Apr 26 14:53:32 2018 +0800 暂存 commit 64e3fec16a710d7edf0fb31880f818a58e2ed272 Author: licc <45360682@qq.com> Date: Thu Apr 26 14:31:37 2018 +0800 暂存 commit 61008b3ab96dc7910325ca2161e69c3841948ba3 Author: licc <45360682@qq.com> Date: Thu Apr 26 14:17:27 2018 +0800 暂存 commit 30761c1f6e4e621c55c687712eb76db6160351d1 Author: php-王凡昌 Date: Thu Apr 26 11:54:22 2018 +0800 排除部分url commit 1525846e9fe5b7c5cc68a0923bcb8d91b8ad513b Author: licc <45360682@qq.com> Date: Thu Apr 26 11:10:59 2018 +0800 暂存 commit 33fff09a9f37769fee6cf3c6034996b6889ddc51 Author: 丁海波 Date: Wed Apr 25 20:56:17 2018 +0800 ?from=wechat commit 45eddf8fac9eb1cc78ee51161f8d1de3d1ce8ead Author: 丁海波 Date: Wed Apr 25 20:38:20 2018 +0800 ?from=wechat commit adfa86edd1b0d2c130121d48538b3ba375ed3882 Author: 丁海波 Date: Wed Apr 25 19:48:45 2018 +0800 ?from=wechat commit fa4bb29964928182d77a09771e8a823a53d6bf34 Author: 丁海波 Date: Wed Apr 25 19:44:46 2018 +0800 from=wechat commit 4d7efaeefcfc2b507a4b8d6b22eb348ae4ba9299 Author: 丁海波 Date: Wed Apr 25 17:35:04 2018 +0800 最近阅读按钮修改 commit e80d2eb26dea9caa165e283a0620a0ac8f78ad5b Author: 丁海波 Date: Wed Apr 25 16:52:00 2018 +0800 阅读页最近按钮添加z-index commit 4ee03394577d966e438714598fb7a57c40aefbd3 (tag: tag-20180426_103027) Author: php-王凡昌 Date: Wed Apr 25 15:29:51 2018 +0800 管理员查看渠道商推广链接修正 commit ba79319e556f734b69ea03072cf57ac6b122ebfc Author: php-王凡昌 Date: Tue Apr 24 21:45:19 2018 +0800 后台推广链接关注人数 commit b3ef7cdcb4ec54f95440c12ac1f53974aabd0f47 Author: php-王凡昌 Date: Tue Apr 24 21:40:24 2018 +0800 修改sql语法 commit dd02f29fb783cb62f56037c2902605e0707ca0d9 Author: php-王凡昌 Date: Tue Apr 24 21:28:29 2018 +0800 维护关注 commit c587007ccecb160550cd54123f8b9e55e72bcb47 Author: php-王凡昌 Date: Tue Apr 24 21:23:11 2018 +0800 维护推广链接关注数 commit 16417c774578ce5378a36e63d66eb6dd39c808d7 (tag: tag-20180425_105049) Author: php-王凡昌 Date: Wed Apr 25 10:50:02 2018 +0800 修改取模判断条件 commit 45da6dc957f116592e806ff1e3a63c66c7483455 (tag: tag-20180425_101528) Author: php-王凡昌 Date: Tue Apr 24 14:01:28 2018 +0800 修改判断 commit 5a94092741c2270051058af293d4f0a30b274bcc Author: php-王凡昌 Date: Tue Apr 24 13:32:59 2018 +0800 redis to mysql cli commit de27e5d3970270977aabb00a8b7e18accfdcb6cc (tag: tag-20180424_163605) Author: licc <45360682@qq.com> Date: Tue Apr 24 15:12:09 2018 +0800 暂存 commit 69623cdb2de99776bce61017f31ca53776586f88 Author: licc <45360682@qq.com> Date: Tue Apr 24 15:11:37 2018 +0800 暂存 commit f6c1ef35aa2eaf3e60b877fb30ac6a8427c70c79 Author: licc <45360682@qq.com> Date: Tue Apr 24 12:07:28 2018 +0800 去掉redis del*的方法 commit a54b2c276813e852a6984e3e3ae46643aae5d06d Author: php-王凡昌 Date: Tue Apr 24 11:58:37 2018 +0800 修改del redis语法 commit e74a0349c986f6f87820cc9ac9e7c71996196fab Author: php-王凡昌 Date: Tue Apr 24 10:43:58 2018 +0800 修改 个人中心&充值页 书币统计展示逻辑 commit dc96fc48bcd9ecbc9beba04e6fc2b2610c4d85f2 (tag: tag-20180421_193842) Author: php-王凡昌 Date: Sat Apr 21 18:08:53 2018 +0800 修改redis规则 commit dc9324280bf727caddc24e926792e0f6c264a08f Author: php-王凡昌 Date: Sat Apr 21 17:40:53 2018 +0800 修改guide redis key删除逻辑 commit 504086c0179b755b11878ee6df7e6ba2d07fb4c8 Author: php-王凡昌 Date: Sat Apr 21 16:54:06 2018 +0800 书籍阅读数redis增量维护 commit bd2de0436f0a542126deef9efaa78ffacd7b67b8 Author: php-王凡昌 Date: Sat Apr 21 16:40:50 2018 +0800 用户行为redis缓存 commit 997c02ae766d3f9b997bfe80364e2ff420eadb68 Author: php-王凡昌 Date: Sat Apr 21 16:00:23 2018 +0800 修改导粉redis读取方式 commit 5910a208958ff6c7077cd6226ca9edb744c23dcf Author: php-王凡昌 Date: Sat Apr 21 15:08:27 2018 +0800 订单count去除join，订单详情页面去除二维码搜索 commit 34db433218504e48315ee70754f25c85b0fce6ec Author: php-王凡昌 Date: Sat Apr 21 14:54:55 2018 +0800 关闭后台读者管理改为读者搜索 commit 38a365229fd1772dd258d53fb365b14a46e23aec (tag: tag-20180421_124004) Author: php-王凡昌 Date: Sat Apr 21 12:39:39 2018 +0800 修复创建用户以及刷新cookie commit b368d2a2772d047034aed8c880fb20b584c45b6f (tag: tag-20180421_120753) Author: php-王凡昌 Date: Sat Apr 21 12:07:28 2018 +0800 增加新注册用户默认昵称 commit 5a78c6a0f2ea829e1913d8f097ba717d424334f5 (tag: tag-20180421_115843) Author: php-王凡昌 Date: Sat Apr 21 11:56:51 2018 +0800 修复appid commit 65ba4e2f4b44768eb84f1510a371f77a9a4db346 (tag: tag-20180421_105015) Author: php-王凡昌 Date: Fri Apr 20 20:23:33 2018 +0800 ajax数值闪烁 commit a562949b2ab44de0dda4a8ca0d1048d72cd9003d Merge: df31a862e f0f7b8e1c Author: php-王凡昌 Date: Fri Apr 20 19:18:32 2018 +0800 Merge branch 'dev-sum' of 192.168.0.31:fe/cps into dev-sum commit df31a862eb5578d573427f4182e59bf107df133b Author: php-王凡昌 Date: Fri Apr 20 19:18:17 2018 +0800 ajax搜索修改待打款等数据 commit f0f7b8e1c8b29190bc0c54955d3b31433cc76722 Merge: 41fa608ec db59e7c41 Author: licc <45360682@qq.com> Date: Fri Apr 20 16:23:43 2018 +0800 Merge remote-tracking branch 'origin/dev-sum' into dev-sum commit 41fa608ec7a72d0f03c5ddac4ba1d10d55f5468b Author: licc <45360682@qq.com> Date: Fri Apr 20 16:23:34 2018 +0800 如果表里没有配置渠道商二维码图片，则拼一个该渠道商得二维码图片 commit db59e7c413d69015fe05ffb9366da1c1991d4b55 Author: php-王凡昌 Date: Fri Apr 20 16:00:35 2018 +0800 修复扣量时，用户支付状态的变更 commit f9b953ac80589d68fdaa64544267c23a804dd8ab Author: 丁海波 Date: Fri Apr 20 14:08:30 2018 +0800 展示联系方式 commit f36123aaa8072a731ca48df247d3866afc7f9e1f Author: 丁海波 Date: Fri Apr 20 14:06:46 2018 +0800 展示联系方式 commit d05e78a378519e49a3ddc40c81615a233aa3468b Merge: 2b2a70c6f d1d46691d Author: licc <45360682@qq.com> Date: Thu Apr 19 20:39:36 2018 +0800 合并repairzy到此分支 commit d1d46691dd5489bb1ee44d8a54d61299c7ee5474 (tag: tag-20180420_102349) Author: licc <45360682@qq.com> Date: Thu Apr 19 17:29:18 2018 +0800 扣量的按当前渠道商分成比例结算 commit 3ea9401a2ef58c1e25c173075a6da8be42877f64 Author: licc <45360682@qq.com> Date: Thu Apr 19 10:35:05 2018 +0800 扣量去掉代理商推广的 commit dd9c847274319cf6ba30e36e0e40bebd8aba9919 Author: licc <45360682@qq.com> Date: Thu Apr 19 10:28:57 2018 +0800 修复由于网络问题导致的用户关注没给加上的问题 commit 2b2a70c6f37809c05ccbb4a5d2fc5d1a86822527 Author: licc <45360682@qq.com> Date: Wed Apr 18 21:48:06 2018 +0800 修复由于网络问题导致的用户关注没给加上的问题 commit a760132cabef8552104a82a67ae41637faceb445 Author: licc <45360682@qq.com> Date: Wed Apr 18 18:56:21 2018 +0800 test commit 858dedb3432056ea27160b3b9707ce135c487d32 Author: licc <45360682@qq.com> Date: Wed Apr 18 18:51:06 2018 +0800 test commit 835476239d78b8b3b649bfd12026f95771f75259 Author: licc <45360682@qq.com> Date: Wed Apr 18 18:50:06 2018 +0800 test commit 2349f404e949fc0605f4fc9ae89a6008aee888f1 Author: licc <45360682@qq.com> Date: Wed Apr 18 18:49:24 2018 +0800 test commit 29628b96b7ace39862cd283f3992b996642b64d7 Author: licc <45360682@qq.com> Date: Wed Apr 18 18:39:28 2018 +0800 test commit 5e45701cca2f7d198a716d3c3038bd5f8c7ce8f5 Author: licc <45360682@qq.com> Date: Wed Apr 18 18:22:06 2018 +0800 test commit 0683dba957a3c30ed4c3fc790b4c0866d882e72d Author: licc <45360682@qq.com> Date: Wed Apr 18 17:46:07 2018 +0800 test commit 51063f12a2c01ba72d37bce22d95879efc79eeff Author: licc <45360682@qq.com> Date: Wed Apr 18 16:47:30 2018 +0800 test commit 32097035f05274dc282a0d20cb226f955aa56079 Author: licc <45360682@qq.com> Date: Wed Apr 18 16:42:21 2018 +0800 test commit 94001b3022a2ff958eb182992672f7db91c77d39 Author: licc <45360682@qq.com> Date: Wed Apr 18 16:37:26 2018 +0800 test commit 4ec714216702505a27bcbc8027767388518d09b9 Author: licc <45360682@qq.com> Date: Wed Apr 18 16:32:04 2018 +0800 test commit c1abd6ba84cc1535bab70ad7f9a36d98d61da229 Author: licc <45360682@qq.com> Date: Wed Apr 18 16:28:28 2018 +0800 test commit baaea9958560b44baa08444e832bcc6230f40fa9 Author: licc <45360682@qq.com> Date: Wed Apr 18 16:13:03 2018 +0800 修改转移订单的结算比例 commit f6cf60012ad6b2786aaf5c40d73e7696ea46a121 Author: licc <45360682@qq.com> Date: Wed Apr 18 15:28:38 2018 +0800 暂存 commit a5542f69ec67d71aab0453a3ef92785074ecbc73 Author: php-王凡昌 Date: Tue Apr 17 20:40:46 2018 +0800 修改创建日志log语法 commit ec5a0003849193f42ce47b721cb37c1190e42806 Author: licc <45360682@qq.com> Date: Tue Apr 17 20:18:32 2018 +0800 暂存 commit 569ba074214b3e44e813fe5f6ee0e7fb992156f0 Author: php-王凡昌 Date: Tue Apr 17 19:47:02 2018 +0800 微信开放平台 cache 缓存 commit 495337a92f101c99ce0351138c06755a293186c5 Author: licc <45360682@qq.com> Date: Tue Apr 17 19:36:44 2018 +0800 暂存 commit 9f04d41d7852065229f8bc825f954cf6a6967746 Author: php-王凡昌 Date: Tue Apr 17 16:51:43 2018 +0800 修复个人中心 commit 2c79b6df47253c35fd19cb4f6cdeb94a616d9148 Author: licc <45360682@qq.com> Date: Tue Apr 17 15:00:20 2018 +0800 暂存 commit d339421f2147c49303bf1d88e4a034a67cb0522d Author: licc <45360682@qq.com> Date: Tue Apr 17 10:43:50 2018 +0800 暂存 commit 90462e3a5c4aef4b7534d2097add7329348a09b5 (tag: tag-20180417_120159) Author: licc <45360682@qq.com> Date: Mon Apr 16 19:53:16 2018 +0800 去掉阅读页签到功能 commit 3438b3fd1644e3ae66d44c1d3839522ffdaf8ac3 Author: licc <45360682@qq.com> Date: Mon Apr 16 19:49:55 2018 +0800 添加按钮提示 commit f186e541e8cee12e0645ef18074d1edc7cd4678a Author: licc <45360682@qq.com> Date: Mon Apr 16 19:20:44 2018 +0800 去掉阅读页自动签到功能 commit c3856fcbf278d5588aa40dcf49da7537a398ae82 Author: licc <45360682@qq.com> Date: Mon Apr 16 19:16:37 2018 +0800 暂存 commit 810b6a934d0461e178ea9525017632941f0abc25 Author: licc <45360682@qq.com> Date: Mon Apr 16 16:53:50 2018 +0800 暂存 commit 48e52d2cd63ab9396c418d395877b74f95185d94 Author: licc <45360682@qq.com> Date: Mon Apr 16 15:55:56 2018 +0800 暂存 commit fc5e6c1c636c0c04815be58980467299dc88721d Author: php-王凡昌 Date: Mon Apr 16 15:54:16 2018 +0800 修改用户创建，缓存等 commit f8241fd715dcb381c1ca7c5aecced5240293d03c Author: php-王凡昌 Date: Fri Apr 13 21:37:24 2018 +0800 去除redis锁 commit 68b15bc740f680947697d4b00fefdd35819ff336 Merge: c95ac236e ae7355644 Author: licc <45360682@qq.com> Date: Mon Apr 16 14:07:59 2018 +0800 Merge branch 'dev-num' of http://192.168.0.31/fe/cps into dev-sum commit ae73556443644cc697bd9e42e1a02da139f4bf51 Author: licc <45360682@qq.com> Date: Mon Apr 16 13:56:37 2018 +0800 订单明细加渠道商信息 commit 0f02151c5a9dd86be7de708fa2cb95ce6e486ca7 Author: licc <45360682@qq.com> Date: Mon Apr 16 11:05:03 2018 +0800 订单明细加渠道商信息 commit c28a32c4c0fc2831f51902f17624e363cc2a80e8 Author: licc <45360682@qq.com> Date: Mon Apr 16 11:04:21 2018 +0800 订单明细加渠道商信息 commit d3b1e57caebe454d6b9ed8b7c0a838a59b5cef6e Author: licc <45360682@qq.com> Date: Mon Apr 16 11:03:27 2018 +0800 订单明细加渠道商信息 commit e8f3a1327dbab7ce9e310f21dbb34a1bdda4a751 (tag: tag-20180416_111534) Merge: 41fe4548c a7cb714eb Author: licc <45360682@qq.com> Date: Mon Apr 16 10:56:43 2018 +0800 Merge branch 'dev-kl' of http://192.168.0.31/fe/cps commit c95ac236e23975365f78e12b077a8a0eb305e916 Author: licc <45360682@qq.com> Date: Sat Apr 14 18:27:17 2018 +0800 新增打款管理3种状态显示 commit dee52d5acbed9badc78df5972b7718ec2518dbc9 Author: licc <45360682@qq.com> Date: Sat Apr 14 18:03:50 2018 +0800 修复读秒后代理商或渠道商pvuv变成0的问题 commit a7cb714eb093c3f4a1adf4a5947010dc2ee804c7 Merge: ab373eec3 fb9fa4a06 Author: licc <45360682@qq.com> Date: Sat Apr 14 15:26:47 2018 +0800 Merge remote-tracking branch 'origin/dev-kl' into dev-kl commit ab373eec37aec40d35abdbf6f491aa332d15d551 Author: licc <45360682@qq.com> Date: Sat Apr 14 15:26:37 2018 +0800 修复读秒后代理商或渠道商pvuv变成0的问题 commit c1484c1e21ed14bee32f78987fe23620c5ceb177 Author: licc <45360682@qq.com> Date: Sat Apr 14 15:11:09 2018 +0800 打点域名在env中配置 commit fb9fa4a06d604936340907038b7225fd6f473b3b Author: php-王凡昌 Date: Fri Apr 13 15:59:09 2018 +0800 修复书籍列表，小说中心，分页无效bug 修复小说中心，推荐章节角标错误bug commit e8b83fce80b4e65fe3026cf732f3846c5a0aa301 Author: licc <45360682@qq.com> Date: Fri Apr 13 14:31:54 2018 +0800 打点域名在env中配置 commit 841240560aa2d471adb618498b56ec70904453dc Merge: f7ed3236c 68a03e41a Author: licc <45360682@qq.com> Date: Fri Apr 13 14:23:34 2018 +0800 Merge remote-tracking branch 'origin/dev-kl' into dev-kl commit f7ed3236c123fef6be32af9ffb0afe2ee41c1347 Author: licc <45360682@qq.com> Date: Fri Apr 13 14:23:24 2018 +0800 打点域名在env中配置 commit 68a03e41ada45626028922513c96e4fa8b5bfcf3 Author: 丁海波 Date: Thu Apr 12 18:31:59 2018 +0800 举报footer文案修改 commit 46912a91eae040fc7a6ed28d37bc1c4a79d1e7f6 Author: licc <45360682@qq.com> Date: Fri Apr 13 12:01:00 2018 +0800 去掉注释 commit 41fe4548c496ae3617c32471e8913103187c1b16 (tag: tag-20180412_185240) Author: 丁海波 Date: Thu Apr 12 18:31:59 2018 +0800 举报footer文案修改 commit f7196a12a46c08a2eb25ffbc5824fab0f6fcff8c Merge: 62965a8c3 f3d23319d Author: licc <45360682@qq.com> Date: Thu Apr 12 16:43:14 2018 +0800 Merge branch 'dev-pvuv-image' of http://192.168.0.31/fe/cps into dev-kl commit 62965a8c3336e25c77d7428a949cab589fe56818 Author: 丁海波 Date: Thu Apr 12 15:19:19 2018 +0800 阅读页签到修改 commit f3d23319d8bd9bb1ec773012c1d007ffe20f2ea3 (tag: tag-20180412_152428) Author: 丁海波 Date: Thu Apr 12 14:51:50 2018 +0800 小说中心移动页面样式优化 commit 08e9d86d01e4c4daa4a0f54fc621ee742988abfc Author: 丁海波 Date: Thu Apr 12 14:47:42 2018 +0800 推广详情页面移动样式优化 commit e01986ac073d666689e5cd41440dfff1f2c92ef4 Author: 丁海波 Date: Thu Apr 12 14:26:02 2018 +0800 推广图片添加style属性 commit f353f1f742ebf5ebf4597286ed1ea8db3374963f Author: licc <45360682@qq.com> Date: Thu Apr 12 13:53:01 2018 +0800 去掉注释 commit 5a94c2bcb4f8d8d47b7289c035c28ed1df71b0c0 Author: licc <45360682@qq.com> Date: Thu Apr 12 10:20:46 2018 +0800 test commit d977e27f883e2fb8d7d017fdf3c1ced27459f396 Author: licc <45360682@qq.com> Date: Wed Apr 11 21:22:58 2018 +0800 test commit de129b62e304ad71898d895c85e508bb3143f59c Author: licc <45360682@qq.com> Date: Wed Apr 11 21:12:48 2018 +0800 新增代理商订单转移到渠道商功能 commit 115112ca7b07015afe641f9204cbcbc8f7684d98 Author: licc <45360682@qq.com> Date: Wed Apr 11 20:33:36 2018 +0800 新增代理商订单转移到渠道商功能 commit e1bb93bbe06c2f5f82d403cd881faa75c96a7f35 Author: php-王凡昌 Date: Wed Apr 11 19:28:37 2018 +0800 修复最近阅读ajax链接错误 commit dd7ea6c42b9db520ad92c167d6a2550cd63e71ad Author: php-王凡昌 Date: Wed Apr 11 19:20:53 2018 +0800 修复图片单行字符数量判断 commit 06945a2c207d50d32fcc2e6c93b84989a55434df Author: php-王凡昌 Date: Wed Apr 11 18:15:52 2018 +0800 修正字体宽度 commit 298abf0d4b94742d765daa6fa108a4f3370daf8f Author: php-王凡昌 Date: Wed Apr 11 17:30:28 2018 +0800 pvuv 为空显示0 图片生成后，还是跳转到图片 commit ded19d736b02f4af3456117d67d34f7c1ca6fc64 Author: licc <45360682@qq.com> Date: Wed Apr 11 14:44:40 2018 +0800 改文案 commit 68778ae708a25a8e177cde4fad84c6eabd65f2dd Merge: 48ffa55b2 13509a88f Author: licc <45360682@qq.com> Date: Wed Apr 11 14:42:03 2018 +0800 Merge remote-tracking branch 'origin/dev-pvuv-image' into dev-pvuv-image commit 48ffa55b25e5b536fdf03852bb1cb3f8b140bf16 Author: licc <45360682@qq.com> Date: Wed Apr 11 14:41:50 2018 +0800 图片不显示的问题 commit 6d618e55c9d69640a996cfc914142ee9f70487da Author: licc <45360682@qq.com> Date: Wed Apr 11 14:24:44 2018 +0800 活动 commit 13509a88fb63a59753fc63a5ccc37f88a5d3b011 Author: 丁海波 Date: Wed Apr 11 10:42:15 2018 +0800 优化移动端打开列表样式 commit be291e6e8cb0a275ba2822dab2f084d88482ecd4 Author: licc <45360682@qq.com> Date: Tue Apr 10 18:32:40 2018 +0800 所有看点改成书币 commit 23fc9276c988fa45054da2fc533fc48cfb0b7113 Author: licc <45360682@qq.com> Date: Tue Apr 10 16:28:18 2018 +0800 修改文案 commit 58dfe7b0df48c8bafc89ef97d3faeef37c2d439f Author: 丁海波 Date: Tue Apr 10 15:04:10 2018 +0800 pvuv样式修改 commit 38ff83e49aa13ab277eb7a5f5cca7a50b0860286 Author: 丁海波 Date: Tue Apr 10 14:53:46 2018 +0800 pvuv换行 commit 30aef615c8f18668dfc04d89eaddcb254ee4ebc0 Author: php-王凡昌 Date: Tue Apr 10 14:12:21 2018 +0800 充值页动态显示有效期， 图文/图片推广链接加入成本 commit 9ce848f678ec25a4cc8d0dc024e04384ea098e62 Merge: 3b76339fd c5f48e388 Author: licc <45360682@qq.com> Date: Tue Apr 10 14:05:10 2018 +0800 Merge remote-tracking branch 'origin/dev-pvuv-image' into dev-pvuv-image commit 3b76339fd86a7a4935aabe7e6818739a5c323f02 Author: licc <45360682@qq.com> Date: Tue Apr 10 14:05:00 2018 +0800 导粉新增关注加管理员关注数 commit c5f48e388969cedf13b1ff1b4aaf1954c3e837d3 Author: lichong_ <1909165236@qq.com> Date: Tue Apr 10 13:48:54 2018 +0800 增加书籍列表排序字段 commit 75b04eb3a280d07c511451728a4e0450bcc2f9f1 Merge: 4461c865a f3d32eb39 Author: licc <45360682@qq.com> Date: Tue Apr 10 10:57:28 2018 +0800 Merge branch 'dev-log' of http://192.168.0.31/fe/cps into dev-pvuv-image commit f3d32eb399fccda402334aecef59c5da44350122 Author: licc <45360682@qq.com> Date: Tue Apr 10 10:45:08 2018 +0800 打dump commit 37f7fc8d2c27963d5cd6e1b1d310314091477213 Author: licc <45360682@qq.com> Date: Mon Apr 9 21:06:57 2018 +0800 打dump commit 3c7697e7611c7d07ed28f44a1b266e8d3d3c9f86 Author: licc <45360682@qq.com> Date: Mon Apr 9 19:48:23 2018 +0800 打dump commit 4461c865af168c49ade13703f84d6228606ce3a2 Merge: 67131c0d9 5abe58ff4 Author: licc <45360682@qq.com> Date: Mon Apr 9 17:56:24 2018 +0800 Merge branch 'dev-image4' of http://192.168.0.31/fe/cps into dev-pvuv-image commit 67131c0d93897a46dcac2e4a91eda306534fc4ba Merge: aaeb46ced 289ead432 Author: licc <45360682@qq.com> Date: Mon Apr 9 17:55:34 2018 +0800 Merge branch 'dev-book' of http://192.168.0.31/fe/cps into dev-book commit a1d37a62a5cf82a076f3cdfd17dc894876640880 Author: licc <45360682@qq.com> Date: Mon Apr 9 10:57:02 2018 +0800 打log commit 5abe58ff4b816cf56c45033f35cb1f3f781d3c66 Author: 丁海波 Date: Wed Apr 4 11:40:44 2018 +0800 举报按钮优化 commit aee921e949f68c8ae81161bee39e5346a7a5d95e Author: 丁海波 Date: Wed Apr 4 11:15:35 2018 +0800 举报按钮 commit e0d1a96a47614ba64bf698c836c74634784bfd6c Author: 丁海波 Date: Wed Apr 4 11:09:53 2018 +0800 举报页面优化 commit 630910adb739eae35da4a701af2aacf2fd632aa4 Author: 丁海波 Date: Wed Apr 4 11:00:02 2018 +0800 添加举报页面 commit e4665854d600169187642ea78ba8e050e05bdd46 Author: 丁海波 Date: Wed Apr 4 10:55:07 2018 +0800 添加举报页面 commit aaeb46cedd7c51e9347bf586b892606e8b97d137 (tag: tag-20180404_060717) Author: php-王凡昌 Date: Wed Apr 4 06:05:37 2018 +0800 修复渠道商查看打款详情 commit 5b5fe60759fd555aabd60745569c4c3217de066d (tag: tag-20180404_044729) Author: php-王凡昌 Date: Wed Apr 4 01:02:27 2018 +0800 批量清除redis执行时间改为600秒，单次scan 500条 commit b1701fd5235e7ff1a0c1792b83f0bb38a9009285 Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 23:30:22 2018 +0800 修改打款bug commit 3aa20321a5c14f61b162cab10b131c315108cf63 Merge: b5f081e6a 17141e6ed Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 23:19:39 2018 +0800 Merge branch 'dev-exportexcel' of http://gitlab.qcread.cn/fe/cps into dev-exportexcel commit b5f081e6a66a484c67f5e8a49d258e76c59b7b79 Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 23:19:32 2018 +0800 暂存 commit 17141e6ed43b15b684ad67be80657bb094b73d25 Author: php-王凡昌 Date: Tue Apr 3 23:15:11 2018 +0800 增加验证规则 commit 6583ef541541f30a40303fba1bc5575aaee58a2c Author: 高明阳 Date: Mon Apr 2 17:14:47 2018 +0800 生成推广文案增加推广成本 commit e1c6e07eca788d699e04471697c9275b2fd2fe0d Author: 高明阳 Date: Mon Apr 2 16:42:34 2018 +0800 增加推广成本字段 commit c55970c52ef25c2e15de92912479596c5a94dc60 Author: php-王凡昌 Date: Tue Apr 3 23:02:41 2018 +0800 签到redis过期时间 ZR: commit 44f21a361f9c18e5f28618b52d9c7eda23e5f6ba Author: php-王凡昌 Date: Tue Apr 3 22:48:31 2018 +0800 redis连接池 redis lock修改基类 U-B: 结构修复过期时间 commit ab7897f8cdcf11828763a7ea436ef30bbc7fe28a Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 20:32:45 2018 +0800 暂存 commit 346bd83e32729cd917c3db1609d3e6f80156e86f Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 20:32:12 2018 +0800 暂存 commit 3042d83aee790d9e35c0d6196ef0e88927cb5383 Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 20:03:53 2018 +0800 暂存 commit c059509deddbcc1ce120ada044632809f676e900 Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 19:05:36 2018 +0800 redis key 过期时间修改 commit 16a1c556b3a964b599ca930a6604450c9eca6091 Author: 高明阳 Date: Tue Apr 3 17:29:47 2018 +0800 update commit 8bfbe6c9942249d674043f19f39e7aeb6788c268 Merge: 32c8ab189 d2eac869d Author: 高明阳 Date: Tue Apr 3 17:24:15 2018 +0800 Merge branch 'dev-exportexcel' of http://192.168.0.31/fe/cps into dev-exportexcel commit 32c8ab1890d85ba0e93909b91e84f043a630ede5 Author: 高明阳 Date: Tue Apr 3 17:24:08 2018 +0800 修复筛选条件不可用的bug commit 10c3caae89185c509afb890d63743a921b988e7f Author: 丁海波 Date: Tue Apr 3 17:15:34 2018 +0800 添加图片 commit 1bbd41171092c3a8b9507c0355f8aaa9357410a9 Author: 丁海波 Date: Tue Apr 3 16:50:43 2018 +0800 生成推广图片 commit d2eac869d2600f1c08f26bfca98df267e6ab6b45 Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 16:29:44 2018 +0800 修改链接 commit 74ea1067c4137e408d2f135d623ace5f243c6480 Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 16:19:16 2018 +0800 暂存 commit 16b6cc6265bc1566ea64f92bd8ea73ff9bb5e87a Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 13:42:11 2018 +0800 修改样式 commit 566bacce3ab822a2db8eed4c4fb272b1189667fd Author: lichong_ <1909165236@qq.com> Date: Tue Apr 3 11:31:17 2018 +0800 修改微信公众号检测 commit 29e367d37547dea3b0ef8e3d1d230e6b598957db Author: php-王凡昌 Date: Mon Apr 2 17:02:08 2018 +0800 修改登录后跳转默认页面 commit 454a27f10c86127ce9207f7ae2357b6a945fe99a Author: 丁海波 Date: Mon Apr 2 16:23:00 2018 +0800 图文推文优化 commit ee8167951652433ddf1488cfd19d251098313011 Author: 丁海波 Date: Mon Apr 2 16:22:24 2018 +0800 图问推文优化 commit 8bc58315fb1718aaaa2698b849227510b5734457 Author: 丁海波 Date: Mon Apr 2 15:37:51 2018 +0800 推文图片模式 commit 9e711155ee7a7a82628eba4138798d01f68ebb05 Author: php-王凡昌 Date: Mon Apr 2 15:15:52 2018 +0800 修改下一章class commit 41a0ab14b13e2c5a528d53479e481f5a3598ad8e Author: php-王凡昌 Date: Mon Apr 2 15:13:50 2018 +0800 修改多图片章节返回格式 commit d4e78986c83db22d005a709842ebc5f461b088e6 Author: lichong_ <1909165236@qq.com> Date: Mon Apr 2 15:13:10 2018 +0800 新增分支导表完善 commit 5f439143553f1a7c2ca15732ebf780e2c87f9bb1 Author: 丁海波 Date: Fri Mar 30 16:14:04 2018 +0800 图片文章修改 commit 2ce31c9178558dd248972f880a160899b8ccc500 Author: 丁海波 Date: Fri Mar 30 15:15:38 2018 +0800 修改图片页面样式 commit 40229e4f2ad068b00b27d217fba667295a9c86d7 Author: 丁海波 Date: Fri Mar 30 11:50:50 2018 +0800 图片推广修改 commit 144aa2427665fec99e8d099f3da7f02d25e1b085 Author: php-王凡昌 Date: Fri Mar 23 21:01:42 2018 +0800 生成图片章节 commit 35cfa062fd604ec45a9eecc61da3971c80b8adca Author: licc <45360682@qq.com> Date: Fri Mar 30 20:08:50 2018 +0800 打俩log commit 289ead4320a68bd0af214c254a04b313e246b296 Author: licc <45360682@qq.com> Date: Fri Mar 30 19:22:29 2018 +0800 加入代理商每天按小时pv,uv统计 commit 442fe9718d1c4ac1d3aab915d0ec99517b0956dc Author: licc <45360682@qq.com> Date: Fri Mar 30 19:12:29 2018 +0800 代理商管理去掉快速搜索 commit 7c0aed6116d3f1c9109517e4fdbff22f515acdb5 Author: licc <45360682@qq.com> Date: Fri Mar 30 18:24:16 2018 +0800 渠道商添加今日pv,uv统计（按小时） commit 144d3d782900f9e5b82db9aff6e3a9bb1c62c059 Author: licc <45360682@qq.com> Date: Fri Mar 30 18:22:37 2018 +0800 渠道商添加今日pv,uv统计（按小时） commit 46ea50d9be8d18444ccdf0b87374787aeabc451c (tag: tag-20180330_174818) Merge: a70694ed0 5d67efa4c Author: licc <45360682@qq.com> Date: Fri Mar 30 17:28:50 2018 +0800 Merge remote-tracking branch 'origin/dev-num' into dev-num commit a70694ed0fb22ec44dddc43709e6c864eef86d2e Author: licc <45360682@qq.com> Date: Fri Mar 30 17:28:42 2018 +0800 修改最近阅读更新时的时效性，阅读书籍时书籍阅读数逻辑判断修改 commit 5d67efa4c0fbdb9d91fd8ea19bb7cc7704f08c20 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 30 17:08:49 2018 +0800 暂存 commit 2695de6609a3a688b4162b3bf360cdb97a39a373 Merge: f512ab200 b5eacd5b2 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 30 16:58:58 2018 +0800 Merge branch 'dev-num' of http://gitlab.qcread.cn/fe/cps into dev-num commit f512ab200b5b6e0ac6e3a218031cc98f75c87ea3 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 30 16:58:42 2018 +0800 暂存 commit b5eacd5b2aa595fafd19a6dfc33ec81a0653e580 Merge: 9f47e7d92 30720cb26 Author: licc <45360682@qq.com> Date: Fri Mar 30 16:55:39 2018 +0800 Merge remote-tracking branch 'origin/dev-num' into dev-num commit 9f47e7d92790443744f4cc9e30ca1a46627f720d Author: licc <45360682@qq.com> Date: Fri Mar 30 16:55:27 2018 +0800 修改最近阅读更新时的时效性，阅读书籍时书籍阅读数逻辑判断修改 commit 30720cb26783891de349f9495db88fe3679b8888 Author: php-王凡昌 Date: Fri Mar 30 16:51:24 2018 +0800 修改admin config删除redis key commit a510b54e86e039d40731a6b8e677bac73778be62 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 30 16:50:43 2018 +0800 修改继承类文件 commit 6c16a9979546e7e155b552231202582473199450 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 30 16:47:09 2018 +0800 新窗口打开连接 commit 4e7d2d24de36f46e77d45da90966191edd3c99b1 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 30 16:45:57 2018 +0800 修改书籍推荐跳转页文案 commit 9c0c27f9e1601d741656b2b7f9c0911cc70a5157 (tag: tag-20180330_140718, tag: tag-20180330_091935) Author: licc <45360682@qq.com> Date: Thu Mar 29 20:47:21 2018 +0800 筛选人数加上已关注条件判断 commit 6c46b063d09414124b4e0f15277528c045f4e704 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 19:08:46 2018 +0800 修改筛选数据结果 commit 2e9f2ebb03bd8890d86eb0c2d21c208f7d4e1ef3 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 18:18:45 2018 +0800 增加书籍筛选列表 commit 87f203529b6f3a546e2baa1fd29457bc190eeefe Merge: 662f7df6a fb620c2c8 Author: licc <45360682@qq.com> Date: Thu Mar 29 18:00:31 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit 662f7df6a841e50a99f55b6baffbdb6fbfa68333 Author: licc <45360682@qq.com> Date: Thu Mar 29 18:00:24 2018 +0800 筛选人数加上已关注条件判断 commit fb620c2c8896dd70245a488bb2dcc2a58a37df86 Merge: 208233038 a80701061 Author: php-王凡昌 Date: Thu Mar 29 17:51:09 2018 +0800 Merge branch 'master' into dev-book Conflicts: application/admin/controller/Withdraw.php commit a80701061bbabe9fc1eef6367060f0eb97b30873 (tag: tag-20180329_172458) Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 16:59:05 2018 +0800 提现修改时间区间 commit 0c4b852f686507aea25b58798152647ed58c43c7 Merge: 3474af535 f3cb0d91b Author: licc <45360682@qq.com> Date: Thu Mar 29 16:31:57 2018 +0800 Merge remote-tracking branch 'origin/dev-xiaoshu' into dev-xiaoshu commit 3474af535002c29c4b2e6976408f6e51f9bddd8c Author: licc <45360682@qq.com> Date: Thu Mar 29 16:31:49 2018 +0800 渠道商管理和代理商管理列表加文字描述 commit 2082330384c466b92313a5ff3ac2a441e316d05b Author: 高明阳 Date: Thu Mar 29 15:38:21 2018 +0800 后台增加书籍时清理已存在书籍redis缓存 commit f3cb0d91b035a6e316e38576cdb3f40f93dbd413 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 15:33:45 2018 +0800 修改文案 commit 8fb11117650b250d5689962bc7dd78831df9babf Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 15:21:07 2018 +0800 修改提现时间23.30-1.30 修改金额类型为string commit 297a1b2a86a7a43d4f43970f06a5b82a682f0db4 Merge: 5d8c1ce55 59cc44758 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 11:59:23 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 5d8c1ce55272d0ff362d0ef245119485cbcf6b95 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 11:59:13 2018 +0800 暂存 commit 59cc4475879ae3b077b014927e40b66d3af6c88a Author: php-王凡昌 Date: Thu Mar 29 11:58:42 2018 +0800 修改redis语法 commit 0ee8c5b14a5f8eb5dbde9df036efbe838c1259c5 Merge: b233d668c 7178c1a1a Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 11:53:05 2018 +0800 Merge branch 'dev-checkwechatforbidden' into dev-book commit b233d668c5ab584b6e27da7ad2c823466b663ef1 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 29 11:48:15 2018 +0800 去掉今日收入展示 commit cc7f611e1a8214f0739559a0966076c4b61f9ee0 Author: licc <45360682@qq.com> Date: Thu Mar 29 11:33:29 2018 +0800 渠道商管理和代理商管理列表加文字描述 commit 3d59af2423637ce68d03715228a84d9220b3538d Merge: c507dca2b 74d103604 Author: licc <45360682@qq.com> Date: Thu Mar 29 10:57:09 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit c507dca2b1298c5ed2d6c20cad686ea4bebd7ca6 Author: licc <45360682@qq.com> Date: Thu Mar 29 10:56:42 2018 +0800 书籍阅读次数统计 commit 74d10360470b18719653f8e90af36fadeea2b7be Author: 高明阳 Date: Thu Mar 29 10:53:08 2018 +0800 调整榜单redis key及有效时间 commit 3af9573af472776f71477f51bafcb3cc834049fb Author: 丁海波 Date: Thu Mar 29 10:21:25 2018 +0800 公众号欢迎语设置 自适应宽度 commit 588ad42009052f855f503eb1ce9beef40b99bb6d Merge: 95acc6e0a 681ab38c9 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 28 20:49:00 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 95acc6e0aaa86944c0e13488a20ac1b65f883c67 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 28 20:48:51 2018 +0800 修改后台书籍查询状态 commit 681ab38c9ad9092710b22fee42a0001db161748a Author: php-王凡昌 Date: Wed Mar 28 20:45:36 2018 +0800 修改图片宽度 commit 5b290c822d1f8b5c12ad52bb15438efb87166c0e Merge: d74bd76ea 0a3caec37 Author: php-王凡昌 Date: Wed Mar 28 20:43:59 2018 +0800 Merge branch 'dev-book' of 192.168.0.31:fe/cps into dev-book Conflicts: application/admin/view/guide/wx/dfguide.html commit d74bd76eaf78d29178c2a4a5cbe89e11fb9f6c7d Author: php-王凡昌 Date: Wed Mar 28 20:40:51 2018 +0800 修改默认文案内容 commit 0a3caec37965f87bccc40a4681741e4fd06ac8bb Merge: fdbab57e9 1cad852f3 Author: 丁海波 Date: Wed Mar 28 20:39:38 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit fdbab57e92b188f1aecacd0ad48a53d92b0a0323 Author: 丁海波 Date: Wed Mar 28 20:39:28 2018 +0800 x修改图片高度 commit 1cad852f3c647e5e44ff724baf1df6beedbb8c14 Author: licc <45360682@qq.com> Date: Wed Mar 28 19:56:41 2018 +0800 改文字 commit 5ddacad3d682a540d4546ef2b6c49ecf82426082 Author: 丁海波 Date: Wed Mar 28 19:48:36 2018 +0800 更换图片 commit 2042d2d2ae5f8f147d2e527d17b658347d47a502 Author: 丁海波 Date: Wed Mar 28 19:47:38 2018 +0800 模板消息添加两按钮 commit c1adb87043a7282cc69e88c297030ab6b072e95f Author: 丁海波 Date: Wed Mar 28 19:29:14 2018 +0800 公众号欢迎语设置 commit 57dc9df5c3ac948cab281fcb3cf892c2fc50be32 Author: 丁海波 Date: Wed Mar 28 19:23:10 2018 +0800 公众号欢迎语设置 commit ce2522f97a16a01ab1273dec224efa6f1d7a6116 Author: licc <45360682@qq.com> Date: Wed Mar 28 18:29:00 2018 +0800 关注 commit 22dd930103a2c4edaee96179a311abfbc21cac1f Author: licc <45360682@qq.com> Date: Wed Mar 28 17:20:07 2018 +0800 关注 commit b4af7ac8c54ef476e49a25bb72b5e7f74471e89d Author: licc <45360682@qq.com> Date: Wed Mar 28 17:08:20 2018 +0800 关注 commit a09997f45c24e5e4bc9e76502801bf4c2dc719d3 Merge: 703369b75 b48e25086 Author: licc <45360682@qq.com> Date: Wed Mar 28 16:31:21 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit 703369b75c1155e11e40b29955a62cceb8f092f5 Author: licc <45360682@qq.com> Date: Wed Mar 28 16:31:07 2018 +0800 添加导粉公众号菜单页 commit b48e2508691d415673f2215cd41dae3d2d186e82 Merge: d26c15c26 409625af5 Author: 高明阳 Date: Wed Mar 28 16:23:49 2018 +0800 Merge branch 'dev-book' of http://192.168.0.31/fe/cps into dev-book commit d26c15c267c064f75551d23979345550c34fa869 Author: 高明阳 Date: Wed Mar 28 16:23:44 2018 +0800 fixbug commit 409625af56d96557f602ca454311eb49c0c2f277 Merge: b999f1c01 0e66d92aa Author: lichong_ <1909165236@qq.com> Date: Wed Mar 28 15:53:10 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit b999f1c01ae9f60a3fc7e8a4049311d8e7f2fcbb Author: lichong_ <1909165236@qq.com> Date: Wed Mar 28 15:53:01 2018 +0800 修改提现时间3-23 commit 0e66d92aa4e046f3eb6a20a24b784bda8e930b0c Merge: da3e06469 247cc2d0f Author: licc <45360682@qq.com> Date: Wed Mar 28 15:39:52 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit da3e06469cbf52e264b0afd4f44e8124724ca9d5 Author: licc <45360682@qq.com> Date: Wed Mar 28 15:39:42 2018 +0800 修改导粉公众号按状态筛选无作用的bug commit 247cc2d0f7eb759e40c74e60d3d80122e81969df Merge: 73d0accad 251141083 Author: 丁海波 Date: Wed Mar 28 15:25:47 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit 73d0accadedad58bcc57d471d2343e81eb65f28a Author: 丁海波 Date: Wed Mar 28 15:25:36 2018 +0800 修改标签颜色 commit 251141083254b975011730083e55a0e82f31f65c Author: 高明阳 Date: Wed Mar 28 15:17:42 2018 +0800 更新清除redis缓存链接 commit 7178c1a1a171b71c2102ee2dcd56b708298a25db Author: lichong_ <1909165236@qq.com> Date: Wed Mar 28 15:11:04 2018 +0800 修改key的位置 commit 3133a19d759aa6977ebaf26a1b2ee07ae614d791 Author: 高明阳 Date: Wed Mar 28 15:01:26 2018 +0800 update commit 614146143253061c93178a8d7303e29a5d7c3827 Merge: 7209d0d46 49b408e5b Author: php-王凡昌 Date: Tue Mar 27 20:28:34 2018 +0800 Merge branch 'dev-book' of 192.168.0.31:fe/cps into dev-book commit 7209d0d462306959f1197ae56416f6d2d1e7f15c Author: php-王凡昌 Date: Tue Mar 27 20:28:22 2018 +0800 修改推广链接redis为k-v结构 修改admin_config redis过期1天 commit 83f3a0341361d812895a7e6fd47e2f43999920d1 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 20:14:12 2018 +0800 暂存 commit bcced858a0fda679a8bfa4989876a0b255a922d6 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 20:04:02 2018 +0800 暂存 commit 49b408e5bcc51723d300fd782732a4a84e646d95 Author: licc <45360682@qq.com> Date: Tue Mar 27 20:00:59 2018 +0800 修改导粉公众号按状态筛选无作用的bug commit a7d92c402eb4301cfaa4eb284f822f849d3b1f5f Author: licc <45360682@qq.com> Date: Tue Mar 27 18:47:07 2018 +0800 加个复制公众号自动回复链接功能 commit 50a8edbe3201757cbcd5b2f40fd7d9dc5a79b701 Merge: a98106525 87f612569 Author: licc <45360682@qq.com> Date: Tue Mar 27 18:05:51 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit a98106525703a463f2d63fbc4c07256227932fc8 Author: licc <45360682@qq.com> Date: Tue Mar 27 18:05:43 2018 +0800 暂存 commit 87f612569e709b635b09ea1bb9c58ea46cf5bcc9 Author: php-王凡昌 Date: Tue Mar 27 17:52:40 2018 +0800 去除多余redis扩展判断 commit 042abcc545eb41ac57c81941e5f53dc54bac9b30 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 17:47:01 2018 +0800 暂存 commit 1d7236f7d9a1e36f99cfc46aea1dd86db7289286 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 16:57:07 2018 +0800 暂存 commit cb6981284a484920ff68d98c40475982ed5528c8 Merge: 626f78f37 da7b8834d Author: 高明阳 Date: Tue Mar 27 16:31:18 2018 +0800 Merge branch 'dev-book' of http://192.168.0.31/fe/cps into dev-book commit 626f78f37d4e2bd27c36cedd16d7e6fe864c6bc8 Author: 高明阳 Date: Tue Mar 27 16:31:11 2018 +0800 fix bug commit da7b8834dc0b445c7afe324ff88dae633aeba46e Merge: 6492b6a18 3673c17ad Author: licc <45360682@qq.com> Date: Tue Mar 27 16:12:37 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit 6492b6a1819c04ce93e1155795624416f68ef165 Author: licc <45360682@qq.com> Date: Tue Mar 27 16:12:29 2018 +0800 test commit 3673c17adbd0f4de382f9851880d83793bf2e7bd Author: 高明阳 Date: Tue Mar 27 15:46:13 2018 +0800 修复hasread变量未设置导致的bug commit 5ae4a6d5d95a1f48a04c7b409a2cd0c0b35cd15a Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 15:14:55 2018 +0800 暂存 commit 3ef38a572bfbec2e8cc6f3a6f445b39acae0df62 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 15:04:18 2018 +0800 暂存 commit ec111ccbbe268615c2d519c5eee9f977a2315894 Merge: 4b9943506 761ad13bb Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 15:00:22 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 4b9943506d208ea16f8a7856f20b0fcf45c7e3ed Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 15:00:13 2018 +0800 提现增加 当天收入展示 commit 761ad13bbbae4565efe891348fe6c91b05b23900 Author: licc <45360682@qq.com> Date: Tue Mar 27 14:55:33 2018 +0800 把渠道商管理的快速搜索去掉。加上按账号和昵称搜索条件 commit 4dfafc193e5963a0e4b11f54bfaaae6651c52b0d (tag: tag-20180327_140713) Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 13:59:53 2018 +0800 修改文案 commit aee16bc7726ef9490c6885e3c4608eeec4e72431 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 13:57:53 2018 +0800 暂存 commit e93df767e1c63e5c5e7b0e8ca1f08926408347bd Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 12:04:07 2018 +0800 修改文案 commit 5bc0632873d1a0b0badfddcab388b52618997502 Merge: 3cdceb6f9 2331c3bf5 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 12:02:48 2018 +0800 Merge branch 'master' into dev-book commit 822fbb31327e3189393b68dacc67e53d2d983901 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 27 11:54:15 2018 +0800 创建 检测公众号 状态 文件 commit 3cdceb6f95f0065cb2204cc23599d5f570c5ba2a Author: php-王凡昌 Date: Tue Mar 27 11:41:30 2018 +0800 修改多条推广链接推送样式 commit 65e6d531c44f27baed0c1411ff4e78d6837385b9 Author: 丁海波 Date: Mon Mar 26 21:03:35 2018 +0800 小说推广 多条推广 全选10个 commit 9069860708dc971913d93f7c8049e5816729b23d Author: licc <45360682@qq.com> Date: Mon Mar 26 18:56:22 2018 +0800 用户详情加永久书币，免费书币，所属渠道商 commit 61f00b371b3274e5853646c76d1c46b9253480b2 Merge: 1e79765ca 026cd9da0 Author: 高明阳 Date: Mon Mar 26 18:19:14 2018 +0800 Merge branch 'dev-book' of http://192.168.0.31/fe/cps into dev-book commit 1e79765ca8ca128f9de38510ef86858b4f88094b Author: 高明阳 Date: Mon Mar 26 18:19:07 2018 +0800 update commit 9d8982b47257d7cae019520efaa99d4ef3bd99a5 Author: 高明阳 Date: Mon Mar 26 18:16:56 2018 +0800 书籍列表key改名 commit 026cd9da067f0223de9554f227838612d92425b9 Merge: cfb33be57 56571a9e5 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 26 18:10:36 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit cfb33be574cd817730e8a201f7b1fe739308962a Author: lichong_ <1909165236@qq.com> Date: Mon Mar 26 18:10:28 2018 +0800 修改redis key commit 56571a9e595e51d01381da911e1f1b4dc340ab47 Author: 高明阳 Date: Mon Mar 26 18:02:06 2018 +0800 区块书籍列表key调整 commit 9c2876934247163f444818ae2fab69d3e6033941 Author: 高明阳 Date: Mon Mar 26 17:26:44 2018 +0800 update commit eefdf5b3c9eee1c741d34b65a8d3ac33794ec243 Author: 高明阳 Date: Mon Mar 26 17:23:26 2018 +0800 修改分类下书籍列表redis key commit 2331c3bf59ac0e0e00841229d2f2bc50a7db9405 (tag: tag-20180326_171912) Author: licc <45360682@qq.com> Date: Mon Mar 26 17:12:03 2018 +0800 修改渠道商统计出错的问题 commit fd45257490d75b11e4f2e1d7e2ada3390af56222 Author: php-王凡昌 Date: Mon Mar 26 15:48:21 2018 +0800 过滤首页额外参数读取 commit c62ed999303deaab84edaa2a5f7e2b6b23d951af (tag: tag-20180326_161319) Author: lichong_ <1909165236@qq.com> Date: Mon Mar 26 15:14:55 2018 +0800 改小数点后两位 commit 2cf5e3fb4ab88695b74110f162f45e40ac701675 Author: 高明阳 Date: Mon Mar 26 15:14:38 2018 +0800 热门搜索词key修改 commit 391d4f374c72c84b3767b24a97ac4c3f4f20a8f0 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 26 15:13:20 2018 +0800 返回结果改成小数点后两位 commit 8c704ca9e57b5bba57f089207a0fca3b036e214d Author: lichong_ <1909165236@qq.com> Date: Mon Mar 26 15:05:19 2018 +0800 推荐书籍跳转时间3秒 commit 746593de051a394d85164e585bfc90b043b597bb Author: 高明阳 Date: Mon Mar 26 14:01:11 2018 +0800 调整key commit 0c467bf6154b3639ec88d259998c77f8e35d785e Author: lichong_ <1909165236@qq.com> Date: Mon Mar 26 13:20:56 2018 +0800 修改查询 commit 8abff0b999419ff7975ebb9d9fd2aac7a2a2f4b4 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 26 12:38:19 2018 +0800 修改提现查询 commit 2abcfbbdc3f0256c371a3387b493a68fbd84ba01 Author: 高明阳 Date: Mon Mar 26 10:21:53 2018 +0800 增加接口获取数据异常时跳转错误提示 commit 47212f979fadabd78a32db9545169a1f7cf42461 Author: licc <45360682@qq.com> Date: Mon Mar 26 10:13:32 2018 +0800 去掉注释 commit 09614bc5919555060c59984d8721874ef008c14d Author: php-王凡昌 Date: Sat Mar 24 17:54:24 2018 +0800 修改部分log格式 commit 7d0bd5033265322e106c7e94c9e1e2400652f546 Merge: 82b395aa3 4e7249d94 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 17:58:19 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 82b395aa3caee03c3992ec1e4a11c0f6afb7de07 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 17:58:12 2018 +0800 修改redis key commit 4e7249d9402d9e1e204967ff1642dc97f9533a6f Author: php-王凡昌 Date: Sat Mar 24 17:53:45 2018 +0800 修复多条推广链接勾选 commit 17fe20dc82e17fd713a4d44d9e3d3d4cfd27c6be Merge: 106afc653 85037d7ef Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 17:14:04 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 106afc65346a795609797f1b5b5435ab945a654a Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 17:13:56 2018 +0800 修改redis key commit 85037d7ef5805acffe44ad91db1e94b7c7c4a79c Author: licc <45360682@qq.com> Date: Sat Mar 24 16:13:04 2018 +0800 优化多公众号导粉 commit 3ffa225960525cd3c5101708ac0d4a4d87fd305a Merge: 6da8c95e9 7907968ae Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 15:56:32 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 6da8c95e96192ab41a5cfcdba38894095839314e Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 15:56:24 2018 +0800 推荐书籍判断修改 commit 7907968ae5c802407c3118472e32978770927d45 Merge: a11ccc2aa 480aa82ec Author: licc <45360682@qq.com> Date: Sat Mar 24 15:55:44 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit a11ccc2aa45e093cdb7c07c8a4dd62e5c5fe639c Author: licc <45360682@qq.com> Date: Sat Mar 24 15:55:30 2018 +0800 测试 commit 480aa82ec89b3c349b11552af94450250c210312 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 15:26:21 2018 +0800 修改redis key commit c7896c9b56534877629430fef73d97f41b6947b0 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 15:18:56 2018 +0800 暂存 commit 1c4cf7ac594d2db5dfce026c1199acdb8e56bd06 Author: licc <45360682@qq.com> Date: Sat Mar 24 14:42:41 2018 +0800 加入try catch，防止上线后没清理的老redis缓存导致阅读页报错 commit e11ae6e43d97a2c9642768694aae7d2e7d5c122c Author: licc <45360682@qq.com> Date: Sat Mar 24 14:22:35 2018 +0800 测试推广链接 commit 745ef5de455149403a717d982304e23240561a06 Author: licc <45360682@qq.com> Date: Sat Mar 24 14:17:58 2018 +0800 book Model里多引用了一个Log commit e0c1c374248f047e30d1e822027980059acb4ca9 Author: licc <45360682@qq.com> Date: Sat Mar 24 14:08:22 2018 +0800 后台首页图片加CDN commit 4fad1bf5bb1a823f2061d77cc89d759cfd969488 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 13:51:15 2018 +0800 导出订单号处理 commit e829db9de2dc0732754856c9cf6592c557b69e6a Author: licc <45360682@qq.com> Date: Sat Mar 24 12:11:30 2018 +0800 删除guidewx验证php文件，没啥用 commit 04af04791a21b8ace82b4de660cd2a908a44a5c1 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 24 10:58:40 2018 +0800 订单详情展示 commit 6bc979457ffdc3a5fa11110f762c4e2066e64d5f Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 19:36:11 2018 +0800 修改提现时间 commit 30f3c55a6c48d9042f55ee73faa63b0acdf32c6a Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 19:35:02 2018 +0800 恢复key commit 64a9841ecf39a677960d6773ab546c380b374278 Merge: 22eb8855a 6be785e1e Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 19:26:28 2018 +0800 Merge branch 'master' into dev-tixianyouhua commit 22eb8855a775837c5e3b04501813a14bbf2837c9 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 19:24:42 2018 +0800 屏蔽掉详单 commit 546be105d230710b0c12509b6dc3eb4a6a0df53e Merge: 28b144c63 6be785e1e Author: 高明阳 Date: Fri Mar 23 18:39:00 2018 +0800 解决冲突 commit 28b144c6306857d0b499cf3872375cf6f4c31cab Merge: ad4d87736 98f8ca0b2 Author: 高明阳 Date: Fri Mar 23 18:36:03 2018 +0800 合并master解决冲突 commit 6be785e1e371fd317a0a504e84b0f1b508f36376 (tag: tag-20180323_183316) Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 18:05:55 2018 +0800 时间改到30分钟以后 commit b9e7bf02469d5e894d2a05b562e37d21b25e37dc Merge: 72e61b60b 8456b0f7b Author: licc <45360682@qq.com> Date: Fri Mar 23 18:01:17 2018 +0800 Merge branch 'dev-tixianyouhua' of http://192.168.0.31/fe/cps into dev-tixianyouhua commit 72e61b60b5704851cda883b946908945329ef130 Author: licc <45360682@qq.com> Date: Fri Mar 23 18:01:09 2018 +0800 test commit 67785d7fcf1e89b34974e7b07e2f712cfaa5bdcc Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 17:46:24 2018 +0800 修改文案提示 commit d7fff268d78070f7acd2457d962074818f8f393b Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 16:53:46 2018 +0800 状态 commit 43301cfaf732643b9eee567094b34aa58c764bbc Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 16:36:28 2018 +0800 去掉用户量展示 commit ad4d8773649d195c9e8312e43633c512d1e9852a Author: 高明阳 Date: Fri Mar 23 16:22:26 2018 +0800 update commit 2f1159570bda0272f00c8abe0b31ea62cb0a3dcf Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 16:16:18 2018 +0800 多号导粉修改 commit c6252473066afa765787a68ba9ab8ef02d4c2542 Author: licc <45360682@qq.com> Date: Fri Mar 23 16:04:14 2018 +0800 修改redis的key commit 602f6798448e7f9ae8721c80a68f2822f47bef6d Author: php-王凡昌 Date: Fri Mar 23 15:49:08 2018 +0800 新增redis批量删除key操作 commit 51e39a02e2454e54e83a979b63cefa1ed17748ad Merge: 58036ac24 31ffd08fb Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 14:59:04 2018 +0800 Merge branch 'dev-guide' into dev-book Conflicts: application/common/controller/Frontend.php application/index/view/book/menu.html commit e27e5e8b9b620d9fb94c80e6a314583f9fc1a4c6 Author: php-王凡昌 Date: Fri Mar 23 13:35:38 2018 +0800 日志驱动修改 book model增加log commit d2e592069c3ee4b29fbd5b2385b14dc7abe8a825 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 13:02:07 2018 +0800 暂存 commit 1b8e8577d2a3322406475b10e1215bac4d929067 Merge: c8e126ad5 b3e41d40e Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 10:26:57 2018 +0800 Merge branch 'dev-mubanxiaoxi' of http://gitlab.qcread.cn/fe/cps into dev-mubanxiaoxi commit c8e126ad5fcd6e401ebbbfbf21a9b75a8efc6c56 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 23 10:26:49 2018 +0800 去掉删除按钮 commit b3e41d40e5c21857863c44e87944963af4f874f0 Author: 丁海波 Date: Fri Mar 23 10:25:54 2018 +0800 接受用户修改 commit 8456b0f7be21a66bec5da07ce4211ca4f9b3e9bb Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 21:12:09 2018 +0800 修改订单详情样式 commit 81d33ef87c235d2baa23bb7ee2ac577b48989bad Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 20:39:46 2018 +0800 去掉显示样式 commit 954897b17394930b6fd8be041deff8fda60980ce Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 19:39:26 2018 +0800 暂存 commit 96e4944beebb038c9f19d288b3f7f52efae7d2f9 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 19:25:31 2018 +0800 修改提现金额计算方式 commit 98f8ca0b28be16f0db5c89e1be607712cfce53fe (tag: tag-20180322_195844) Author: licc <45360682@qq.com> Date: Thu Mar 22 19:16:16 2018 +0800 修改redis的key commit d4cb725e9d2fce41b4c1d3e770c2ea25b57a559f Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 18:34:14 2018 +0800 商品长度修改 commit 0cb7c34b99b947cbd4e21dd2275c67a8bab1ef99 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 18:32:03 2018 +0800 zancun commit c0f4b7cfa86b3e89ce3a5a5a990018b9ad5a5af3 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 18:31:04 2018 +0800 暂存 commit 36d1341adc8e4a557980734405f6d4bbb582ad7d Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 18:29:57 2018 +0800 暂存 commit c419160a3a2467837e7ff05ade02db391af42d7b Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 18:28:43 2018 +0800 暂存 commit 9b1fb92f5e78ffc0a74368749668fce8491a5fe6 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 18:27:08 2018 +0800 暂存 commit 31ffd08fb9972180b8e8660769d429b8c40387a3 Author: licc <45360682@qq.com> Date: Thu Mar 22 17:46:00 2018 +0800 如果是强制关注，并且当前读者未登录或者登陆后未关注，则页面上隐藏最近阅读按钮，目录页隐藏menu菜单按钮 commit 58036ac2439403f595a86702a2d58dd970271bd4 Merge: 8395529e7 974769aca Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 17:43:05 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book Conflicts: public/assets/js/backend/referral/book.js commit 8395529e71f68369c5bb0c04907ea577671f3c7f Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 17:42:38 2018 +0800 暂存 commit 974769aca3e47904ede74535ee5475fdbb0236a7 Author: 高明阳 Date: Thu Mar 22 17:21:58 2018 +0800 update commit cf3fb8e22549d57dd4d6bcf86d95eeafc0e85fd4 Author: 高明阳 Date: Thu Mar 22 17:18:48 2018 +0800 增加书籍接口log commit 64e07a09908e3d010807cd50346c7ae15e037226 Merge: f6322db24 74c99ed9a Author: 高明阳 Date: Thu Mar 22 17:00:19 2018 +0800 Merge branch 'dev-book' of http://192.168.0.31/fe/cps into dev-book commit f6322db2465ce10ee561e88c9663571de404c689 Author: 高明阳 Date: Thu Mar 22 17:00:09 2018 +0800 update commit 74c99ed9ae43fedb83c3a5894b50917bdc0a6469 Merge: 75acc07ed b469055b0 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 16:57:48 2018 +0800 Merge branches 'dev-book' and 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 75acc07edd812b8de7589e6d73d5d2b760fb5d8e Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 16:57:39 2018 +0800 暂存 commit b469055b03491d62f28627807460cd26981db349 Author: 高明阳 Date: Thu Mar 22 16:56:54 2018 +0800 update commit df3da9aaec8d2ee653b33867c4b3241af384330a Author: 高明阳 Date: Thu Mar 22 16:44:58 2018 +0800 修改书籍信息在redis的存储key及结构 commit ad4a2e8f9394128a7d53b1dda729f59d462eebe3 Author: 丁海波 Date: Thu Mar 22 16:15:57 2018 +0800 发送时间修改 commit 2b874fb5b36abcfd7866fc2f3dd5fb791718a356 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 16:08:14 2018 +0800 暂存 commit e23990cfcfaab4e479a66d9e7f28503254f13e54 Merge: d7eef0be9 338748c49 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 15:37:51 2018 +0800 Merge branch 'master' into dev-tixianyouhua commit 186bb1a9f9bcfd1b3bc4c9fce1edc8cfa3d6e396 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 15:37:22 2018 +0800 暂存 commit 2377266c9d30a9227be20c68a853264e01dc9c50 Author: 丁海波 Date: Thu Mar 22 15:16:12 2018 +0800 发送时间修改 commit 324789b2348a43a94148e73c9ce57c2ff22cbbf7 Author: 丁海波 Date: Thu Mar 22 15:12:30 2018 +0800 发送时间前端判断 commit 9e42a592157a0e79a3205a5ec848ea66ae35a7af Merge: cd80b6cdf 95805226d Author: 丁海波 Date: Thu Mar 22 15:02:13 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit cd80b6cdff7888add1ef0cc3f82505e99ac8e35b Author: 丁海波 Date: Thu Mar 22 15:02:03 2018 +0800 发送时间转译为数值 Date.parse() commit 95805226d1666b209da9de37d13181ae0e81da49 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 15:01:06 2018 +0800 提交修改 commit 4ed2be971a1b5f54d335f05d2ccb132e2a7251a4 Author: licc <45360682@qq.com> Date: Thu Mar 22 14:57:37 2018 +0800 导粉加入渠道商添加的导粉二维码逻辑 commit 93e2ba93cb042d3a4fca521ea2fdb8ab34c6b46d Author: licc <45360682@qq.com> Date: Thu Mar 22 14:30:34 2018 +0800 自动生成的文件 commit b62eecbefaa996b6ec484332b0aad0463980bd41 Author: licc <45360682@qq.com> Date: Thu Mar 22 14:28:09 2018 +0800 导粉加入渠道商添加的导粉二维码逻辑 commit c2eb7432f874c0cbf45150cc7e0343380bd6e5de Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 14:19:05 2018 +0800 首页模块数据增加书籍状态 commit 9df309ba2b7160e3e3ea0ca03f65ed11a4c5a32b Author: 高明阳 Date: Thu Mar 22 14:18:04 2018 +0800 小说推广-小说中心下架书籍不显示，只显示入库和上架的 commit 7105cbad14321dc8f64c81b12ea20468ac882597 Author: 高明阳 Date: Thu Mar 22 14:08:28 2018 +0800 书籍分类redis key调整 commit a76624dc8a2055a29a073054a63d73cd8a601a6a Merge: 9156cdf5f 19a9b7808 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 12:02:28 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 9156cdf5fb80b4160259f5702b2a1c8eb6021ffc Author: lichong_ <1909165236@qq.com> Date: Thu Mar 22 12:02:20 2018 +0800 暂存 commit 19a9b7808a777490fd0650192692bff1bc139ed0 Author: 高明阳 Date: Thu Mar 22 11:14:01 2018 +0800 检查前台书籍state限制为上架 commit 11018ad1fcf83e24775491ddb3c0db0b63873210 Author: licc <45360682@qq.com> Date: Thu Mar 22 10:45:20 2018 +0800 redis关注计数 commit 1a325f28cc739d2fd5bb47620cc6122b69a04960 Merge: a2f77444a 40a9d218e Author: licc <45360682@qq.com> Date: Thu Mar 22 10:20:47 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book commit a2f77444a39f93173e6eb2edf1e93dceddf98ce8 Author: licc <45360682@qq.com> Date: Thu Mar 22 10:20:39 2018 +0800 redis key commit f51e143f80f749464d879cf026e25bcc5f330d72 Author: licc <45360682@qq.com> Date: Thu Mar 22 10:14:38 2018 +0800 redis key commit 143dce75932c6c5fd3b6ace0ec132279b3639b23 Author: licc <45360682@qq.com> Date: Wed Mar 21 21:40:41 2018 +0800 加微信导粉公众号设置后台完事儿 commit 6ca0db2b8718a3593fa26bdfa2c2706f2611db1a Author: licc <45360682@qq.com> Date: Wed Mar 21 21:24:46 2018 +0800 加微信导粉公众号设置 commit fe64065ac29190742e282c2f76d4a89a8fd3390e Author: licc <45360682@qq.com> Date: Wed Mar 21 21:23:28 2018 +0800 加微信导粉公众号设置 commit 7d215817584b62daac331d63cd43712f3f3379ef Author: licc <45360682@qq.com> Date: Wed Mar 21 21:18:21 2018 +0800 加微信导粉公众号设置 commit 5b5627f41a9cafcf095e5cc317d64b99ac7ba54d Author: licc <45360682@qq.com> Date: Wed Mar 21 21:11:49 2018 +0800 加微信导粉公众号设置 commit f2a5904b53429ed0108ba3eb5556b80c6a89abda Author: licc <45360682@qq.com> Date: Wed Mar 21 20:58:57 2018 +0800 加微信导粉公众号设置 commit d7eef0be93f176546a5b015bc3615d5529ebb684 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 20:57:59 2018 +0800 暂存 commit dde96cd0124d42bd0e148c8bf00191202e2ebeb3 Merge: 003a9f676 2fe3234d0 Author: licc <45360682@qq.com> Date: Wed Mar 21 20:27:17 2018 +0800 Merge remote-tracking branch 'origin/dev-guide' into dev-guide commit 003a9f67683193e106c434c4584e882820901cca Author: licc <45360682@qq.com> Date: Wed Mar 21 20:25:18 2018 +0800 加微信导粉公众号设置 commit 2fe3234d03c374e8daa6ddcee389730aae65ccd2 Author: php-王凡昌 Date: Wed Mar 21 20:21:20 2018 +0800 新增最大关注数设置 commit 94cb90390d487d649713910c7aed37d5a17a6686 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 20:00:00 2018 +0800 修改 commit 40a9d218eaf4a88ba58efafe7a78070ac0288c2c Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 19:48:12 2018 +0800 暂存 commit feeeab53f8ffb6e0da4e9157b6eb798cbed8b61c Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 19:47:17 2018 +0800 最近阅读页 更改下架书籍状态 阅读页强制导粉直接跳转 commit 927f5580cf2e8b0cd4f25be54131d5a301581c13 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 18:04:15 2018 +0800 暂存 commit 97c163594618081d09d99f4d4c71597ee4d9cb0a Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 17:43:18 2018 +0800 修改 commit cfa68da16378460e8aac03614d8416d6f1ae432d Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 17:40:35 2018 +0800 修改提现金额的值 commit c47d4123f05fd32ff32d2614e5434480dbe6917a Merge: 3eb4efea0 d9905925a Author: licc <45360682@qq.com> Date: Wed Mar 21 16:23:55 2018 +0800 Merge remote-tracking branch 'origin/dev-book' into dev-book # Conflicts: # application/admin/controller/Custom.php commit 3eb4efea0f425773e93f9714af7e5104a43f928f Author: licc <45360682@qq.com> Date: Wed Mar 21 16:23:28 2018 +0800 客服消息判断发送时间不能小于当前时间 commit d9905925abc29ff611a3f547014c382b7be54cef Merge: 9099b445c a70ca4298 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 16:22:40 2018 +0800 Merge branch 'dev-book' of http://gitlab.qcread.cn/fe/cps into dev-book commit 9099b445cf5ac872c7c7844fa32d71cb3ec83c48 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 16:22:31 2018 +0800 暂存 commit a70ca4298bf3d2ca272f746d15b556358fc62a4a Author: 丁海波 Date: Wed Mar 21 16:22:12 2018 +0800 发送时间必须大于当前时间 commit 54472199d8daa4f0aeb27dedbf2eb9b49aec432f Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 15:38:29 2018 +0800 客服消息图片选择 commit 1ffd9f8fea783dfb2e454ac8c5d9498419208284 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 21 12:41:17 2018 +0800 商品名称字符串校验长度 改为7 commit fe687c540ed62e95edf4fd09a01bd8165f80df8d Merge: a5829d25a 338748c49 Author: 高明阳 Date: Wed Mar 21 10:47:00 2018 +0800 Merge branch 'master' into dev-book commit a5829d25a7053fa6451f6e8292d1044fed9563d3 Author: 高明阳 Date: Wed Mar 21 10:46:12 2018 +0800 小说中心限制不显示下架书籍 commit 7943ed9d34b26ff3232f489ed6aa1b00ae1e70c6 Merge: 7490cd9ab e023ed98a Author: licc <45360682@qq.com> Date: Tue Mar 20 21:00:11 2018 +0800 Merge remote-tracking branch 'origin/dev-tixianyouhua' into dev-tixianyouhua commit 7490cd9ab73b67fa87d6333be100972806e0edeb Author: licc <45360682@qq.com> Date: Tue Mar 20 20:59:59 2018 +0800 admin_money表createtime问题 commit e023ed98ad5c28a7d043dd72015e2dc2dc8cf2b3 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 20 20:56:08 2018 +0800 修改bug commit 338748c49ba1a2b30c94eb5502a9be82be0f16e3 (tag: tag-20180321_102453) Author: licc <45360682@qq.com> Date: Tue Mar 20 20:20:31 2018 +0800 修改redis里的键名和添加zset及hash结构的过期时间 commit 359ba43cc5fda8b40c342fa79c6bacfaf3522b6d Author: 丁海波 Date: Tue Mar 20 19:58:24 2018 +0800 作者努力码字跳转 commit 18ec487ddc50f16f9181093e99eca35f4ccaee8b Author: 丁海波 Date: Tue Mar 20 18:46:30 2018 +0800 作者努力码字中 commit 73f53ef65a81d1487ad1536cfc6a03c0d687335d Author: 丁海波 Date: Tue Mar 20 18:33:03 2018 +0800 作者正在努力码字中 commit 4de07e4905b6b5b5a999b5a90d1ebb930325009a (tag: tag-20180320_165027) Author: 丁海波 Date: Tue Mar 20 14:57:57 2018 +0800 接受用户 逻辑修改 commit 9f2927d3128b1d82d1c4968a51dfe29927bd1801 Author: 丁海波 Date: Tue Mar 20 14:51:49 2018 +0800 模板消息 客服消息 接收用户修改 commit a2e0af043cbd7de88a845ab3c44d3c49aad999a4 Author: 丁海波 Date: Tue Mar 20 14:15:44 2018 +0800 客服消息 模板消息 接受用户逻辑修改 commit b245e816891d36c93317d83efdd9d2572bdff28d Author: licc <45360682@qq.com> Date: Tue Mar 20 16:47:47 2018 +0800 回滚 commit 84240bd87c2dec689375f0d2e98a1f18729060cb (tag: tag-20180320_161328) Merge: 4361d9136 0dbaff0f8 Author: licc <45360682@qq.com> Date: Tue Mar 20 15:21:24 2018 +0800 master合并到dev-kltest commit 4361d9136860c8d8d14db70603158e87138ef775 Author: licc <45360682@qq.com> Date: Tue Mar 20 15:01:45 2018 +0800 后台登陆过的ip都不扣单test commit 49e49869a5e1e70b96ec3657e0fd756baa9fa65d Author: licc <45360682@qq.com> Date: Tue Mar 20 14:50:55 2018 +0800 后台登陆过的ip都不扣单test commit 7d8b4c5777d59bc14eea15017310ca95eb903ddb Author: licc <45360682@qq.com> Date: Tue Mar 20 14:39:34 2018 +0800 后台登陆过的ip都不扣单test commit 2ef7573c664cf76eb5dbf28847aa1674efb2d4be Merge: b40bd1051 0dbaff0f8 Author: 高明阳 Date: Tue Mar 20 14:04:27 2018 +0800 Merge branch 'master' into dev-book commit 685ec5f94289de7246983880a901a2f73d8db490 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 20 13:16:45 2018 +0800 修改样式 commit 3afbcfb2e18a53b8c8948fbeb6f440dfc0c3c453 Merge: 7a94f0c2d 0dbaff0f8 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 20 13:13:44 2018 +0800 Merge branch 'master' into dev-tixianyouhua commit 7a94f0c2d6060ac45538db9573f03b2d78a5f885 Merge: 588be369a d17f8306d Author: lichong_ <1909165236@qq.com> Date: Tue Mar 20 13:13:10 2018 +0800 Merge branch 'master' into dev-tixianyouhua Conflicts: application/admin/controller/Orders.php public/assets/js/backend/orders.js commit 0dbaff0f8ed09a6ebbaeed86c480c70ac7d3f3e2 Author: licc <45360682@qq.com> Date: Tue Mar 20 12:53:21 2018 +0800 后台登陆过的ip都不扣单test commit 1e10b8a608a3c4b1ac2a66b1e8e2c668981aa14c Author: licc <45360682@qq.com> Date: Tue Mar 20 11:14:29 2018 +0800 后台登陆过的ip都不扣单test commit 7bbb016920cce76060784c92223f617630b9f61e Author: licc <45360682@qq.com> Date: Tue Mar 20 10:35:33 2018 +0800 后台登陆过的ip都不扣单test commit 3e918bec413b1f5509967780dcbb0906542ae9d5 Author: licc <45360682@qq.com> Date: Tue Mar 20 10:32:45 2018 +0800 后台登陆过的ip都不扣单test commit 7524d52ae7be8d6027ffa0db2ded5cb6880fd2d6 Author: licc <45360682@qq.com> Date: Tue Mar 20 10:31:20 2018 +0800 后台登陆过的ip都不扣单test commit b785ab219b54b3b30c5bcef88bb3af94c6542c8c Author: licc <45360682@qq.com> Date: Tue Mar 20 10:21:33 2018 +0800 后台登陆过的ip都不扣单test commit d17f8306dab13105a21adae427905b051250854c (tag: tag-20180320_112749) Author: licc <45360682@qq.com> Date: Mon Mar 19 21:41:05 2018 +0800 后台登陆过的ip都不扣单test commit 522a1f35bf85a05fd074f647e2f5fc85e95b1ed0 Author: licc <45360682@qq.com> Date: Mon Mar 19 21:39:50 2018 +0800 后台登陆过的ip都不扣单test commit 588be369a220531bb82f3aa4ac0517b3651bf9a8 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 19 21:34:46 2018 +0800 修复金额计算方式 commit 84bcf7588ed437bdff8d34edfde29589618a6620 Author: licc <45360682@qq.com> Date: Mon Mar 19 21:14:05 2018 +0800 后台登陆过的ip都不扣单test commit 2d8956e81a31a355793ae299e81cbef45d610bc9 Author: licc <45360682@qq.com> Date: Mon Mar 19 21:03:54 2018 +0800 后台登陆过的ip都不扣单 commit 0529711db4f1854b243e71b0c34bbb92db0ab080 Merge: 7f5c5613e bef150a98 Author: licc <45360682@qq.com> Date: Mon Mar 19 20:18:12 2018 +0800 Merge branch 'dev-kl' of http://192.168.0.31/fe/cps commit bef150a9882a4d568181750fd77da66653280c8e Author: licc <45360682@qq.com> Date: Mon Mar 19 20:14:14 2018 +0800 扣量查询重构，订单统计逻辑小修改 commit b40bd1051182bc810451caca28a2922af5437e33 Author: 高明阳 Date: Mon Mar 19 19:32:39 2018 +0800 小说中心限制只显示上架书籍 commit a999e75a191811663b5060d9c793702f1078ee18 Author: 高明阳 Date: Mon Mar 19 17:19:31 2018 +0800 小说推广时若无默认关注章节等则不显示 commit 965d9970e1043661086daba1797acc7a1b603929 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 19 17:12:39 2018 +0800 暂存 commit 8869068d419e06444a3497f67a69d85fd48265a3 Author: 高明阳 Date: Mon Mar 19 15:28:17 2018 +0800 修改编辑书籍信息页面 commit 6471645d63066871b4c59fd007f5320d8afe4bf9 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 19 15:00:19 2018 +0800 暂存 commit 9de2806479f016def8edb81daed22b847dd625ff Author: lichong_ <1909165236@qq.com> Date: Mon Mar 19 14:34:18 2018 +0800 暂存 commit 0ecd63dff977a2b0b74367b846245a8009c3ba80 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 16 22:00:46 2018 +0800 暂存 commit 7f5c5613e6f01ea0d842a8300a3b989d474ecfcb Merge: 124c30687 0b6344dde Author: licc <45360682@qq.com> Date: Fri Mar 16 21:01:28 2018 +0800 Merge branch 'dev-kl' of http://192.168.0.31/fe/cps commit 0b6344ddebf58e68c9db1e517dfc3209ed497349 Author: licc <45360682@qq.com> Date: Fri Mar 16 21:00:25 2018 +0800 扣量查询 commit 3c71d320943fc196c331c4b778bbaa0aad807bb2 Author: licc <45360682@qq.com> Date: Fri Mar 16 20:54:07 2018 +0800 扣量查询 commit 124c3068750d8152fc8a5f5b7ad30c3309e30bd9 (tag: tag-20180316_210100) Merge: ecdb76a51 545ef002f Author: licc <45360682@qq.com> Date: Fri Mar 16 19:21:18 2018 +0800 Merge branch 'dev-kl' of http://192.168.0.31/fe/cps commit 545ef002fde423ca86eeb7afa31fd0dd89a1cfd4 Author: licc <45360682@qq.com> Date: Fri Mar 16 19:19:44 2018 +0800 扣量查询 commit 949c96f491406e9b3e60f1241633cb77e415b798 Author: licc <45360682@qq.com> Date: Fri Mar 16 19:17:47 2018 +0800 扣量查询 commit 82c0a7753854e6332df1dab8d2bf0c4f7e053b5b Author: licc <45360682@qq.com> Date: Fri Mar 16 16:46:40 2018 +0800 去掉小说统计里多余的搜索 commit bd464cb624677789492985819e9ac58af459e20e Author: licc <45360682@qq.com> Date: Fri Mar 16 15:56:14 2018 +0800 完善KL resource_id commit 71cb5137f40acd716deff27f356c26067e01617c Author: licc <45360682@qq.com> Date: Fri Mar 16 15:27:19 2018 +0800 '11' commit e18cfdb8ccf3deb8794dd907fc043c6e5ac6ff3c Author: lichong_ <1909165236@qq.com> Date: Fri Mar 16 15:22:27 2018 +0800 暂存 commit dc2b7c55606b19a164905abdd1169d3189b21250 Author: licc <45360682@qq.com> Date: Fri Mar 16 15:11:39 2018 +0800 'test' commit 52bf6c618d09442c09b5dc8eadc7944eb1fd7221 Author: licc <45360682@qq.com> Date: Fri Mar 16 14:59:55 2018 +0800 '1' commit 7465087735c86f32ca140af0a89b913492770b1b Author: licc <45360682@qq.com> Date: Fri Mar 16 14:57:00 2018 +0800 'test' commit 6e5f17cfa04b8c7d1adc9a79199c2be80e9e2bb4 Author: licc <45360682@qq.com> Date: Fri Mar 16 14:54:58 2018 +0800 'test' commit 69a1f5cefd4122c47f708eb6b557a4b65f3a0401 Author: licc <45360682@qq.com> Date: Fri Mar 16 14:48:11 2018 +0800 '1' commit 6364f604fc174a6cf2398a4a641e725a44a50276 Merge: fbd6801a7 c0612547d Author: lichong_ <1909165236@qq.com> Date: Fri Mar 16 13:32:17 2018 +0800 Merge branch 'dev-tixianyouhua' of http://gitlab.qcread.cn/fe/cps into dev-tixianyouhua commit fbd6801a7bd8ed0df86d8e9847476789db13d142 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 16 13:32:10 2018 +0800 提现暂存 commit c0612547d4f91e3c8cacea5ab816a959bd1dbac9 Author: 丁海波 Date: Fri Mar 16 11:41:58 2018 +0800 打款管理编辑微调 commit ecdb76a515290252921f4ca93362ff9a374d41b5 (tag: tag-20180316_133347, tag: tag-20180316_113808) Merge: e179509ec b0216ec25 Author: php-王凡昌 Date: Fri Mar 16 10:38:23 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit e179509ecf6b652ca36e9d037208d55c0a746afd Author: php-王凡昌 Date: Fri Mar 16 10:38:00 2018 +0800 修改adminInfo格式 commit b0216ec25e9ff9eaae3e70358c6b51bcfe32f19c Author: 高明阳 Date: Fri Mar 16 10:37:33 2018 +0800 更新样式 commit 19b96411324d64973bb12d7980d0e9282bc64e06 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 16 10:36:27 2018 +0800 暂存 commit 45215262e463084ba97ed771cf4c6f1ec70a8698 Author: licc <45360682@qq.com> Date: Thu Mar 15 19:39:15 2018 +0800 '优化' commit 8da4964593c822433dd549c05b808ce013e9a19b Author: 高明阳 Date: Thu Mar 15 19:30:32 2018 +0800 推广显示角标及推荐文案、推荐关注章节。 commit 3d025ff1f7fa0f55ecea1ee700cbdee7033e6c7a Author: licc <45360682@qq.com> Date: Thu Mar 15 17:42:09 2018 +0800 完善KL commit 3324fddf6374a85b26ad9bbfa9dcf30f1fad3d97 Author: licc <45360682@qq.com> Date: Thu Mar 15 17:25:11 2018 +0800 完善KL commit bdc4909d78a1dfd56a7991dae3d1aa8d23e676a3 Author: licc <45360682@qq.com> Date: Thu Mar 15 17:16:53 2018 +0800 完善KL commit 2432dd0107e24808f18f4c783e486d7e593c0c72 Author: licc <45360682@qq.com> Date: Thu Mar 15 16:29:08 2018 +0800 增加KL查单 commit dc553dfe96f5827316c92f68c72a2b0260a35170 Merge: 667f3345f b5493c84f Author: lichong_ <1909165236@qq.com> Date: Thu Mar 15 15:29:21 2018 +0800 Merge branch 'master' into dev-tixianyouhua commit b5493c84f81373a024fac93d8a2b60073a820a1c Author: lichong_ <1909165236@qq.com> Date: Thu Mar 15 15:19:11 2018 +0800 去掉搜索 commit da733e24de9995c9359e0f48809ecacdbe6a081c Merge: 5145a7953 f261f6a2d Author: lichong_ <1909165236@qq.com> Date: Thu Mar 15 15:12:05 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 5145a79536c12c1fcd73d4d07821408071a04abd Author: lichong_ <1909165236@qq.com> Date: Thu Mar 15 15:11:52 2018 +0800 列表页查询增加管理员字段 commit f261f6a2d96302b50dc1ea3bae814d5de2e5cfed Author: 高明阳 Date: Thu Mar 15 15:08:15 2018 +0800 书籍编辑页面，增加入库状态，下方增加推荐文案章节、推荐关注章节、推荐角标、推荐书籍4个字段。 commit 667f3345f22b5f1539d73ea6372a5b3c00ef6d02 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 15 15:02:56 2018 +0800 暂存 commit 5a769df64d86dd823e71a7fccd1431c736cd9ff8 Author: php-王凡昌 Date: Thu Mar 15 14:10:22 2018 +0800 修改公告弹窗逻辑及样式 commit 81d99ed5601458752bbd922871ff3100e4e18f5f Author: lichong_ <1909165236@qq.com> Date: Thu Mar 15 11:49:49 2018 +0800 暂存 commit a484e38b000328977db334b524938cc1f07c3998 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 15 09:57:54 2018 +0800 去掉模板列表部分字段展示 commit fab460222b5261d52c8a0aba90bcb6c1718fe27e Author: licc <45360682@qq.com> Date: Wed Mar 14 21:29:25 2018 +0800 去掉测试log，订单明细修改 commit 12fd00251c3e3cf0979725c5d1e80a16c62b403b Merge: 20b9e90ea f17fdc349 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 20:59:48 2018 +0800 Merge branch 'dev-mubanxiaoxi' commit f17fdc349eb3ce17446c44f0f2c5ce4ef8af8f65 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 20:57:38 2018 +0800 修改json commit af90f5837c511d681f6960033f784d77c6d00e3d Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 20:42:07 2018 +0800 修改测试发送 commit 838cea84f8f22feb1de63f06f30b1f267791a2ba Author: licc <45360682@qq.com> Date: Wed Mar 14 19:25:58 2018 +0800 去掉测试log，订单明细修改 commit 0c6dc0616dfd13f1f5dffd76dfb76bcc073612af Author: licc <45360682@qq.com> Date: Wed Mar 14 19:23:59 2018 +0800 去掉测试log，订单明细修改 commit f95ec3b4759f9b7217ea8dac41e12c7af0bd9c2c Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 18:46:07 2018 +0800 提现优化暂存 commit 3e1640f61ba6203a9b5c4212b017b79112e84ecc Author: licc <45360682@qq.com> Date: Wed Mar 14 17:51:54 2018 +0800 生成扣量订单测试 commit 67b865d25018bbe5ae177cb4f880f2a5de9c92de Author: licc <45360682@qq.com> Date: Wed Mar 14 17:47:25 2018 +0800 生成扣量订单测试 commit 7593105284bc91238de8b005023b1bb5f4307a12 Author: licc <45360682@qq.com> Date: Wed Mar 14 17:46:13 2018 +0800 生成扣量订单测试 commit 61a6c43a2b3dc86f47cce7f0c37ef11599960a17 Author: licc <45360682@qq.com> Date: Wed Mar 14 17:42:49 2018 +0800 生成扣量订单测试 commit 06b16e0e13d00c6628375e9dd921478f98557f99 Author: licc <45360682@qq.com> Date: Wed Mar 14 17:40:39 2018 +0800 生成扣量订单测试 commit 93ec73b372ddf0f9b8430999f248b32a08502dde Author: licc <45360682@qq.com> Date: Wed Mar 14 17:39:14 2018 +0800 生成扣量订单测试 commit 7fc45f52ad00dff4ef4d905cda922104a1e57cd3 Author: licc <45360682@qq.com> Date: Wed Mar 14 17:34:56 2018 +0800 生成扣量订单测试 commit 3df971f12c8a41ed9c3bba67bd82e149be83a851 Author: licc <45360682@qq.com> Date: Wed Mar 14 17:30:51 2018 +0800 生成扣量订单测试 commit 4f5bfdef47457a47813e3bb0df2035ebfb3d7453 Author: licc <45360682@qq.com> Date: Wed Mar 14 17:28:32 2018 +0800 生成扣量订单测试 commit 7d187e605a4a030427d4a934a5ecc1b0e7637f1b Author: licc <45360682@qq.com> Date: Wed Mar 14 17:23:26 2018 +0800 生成扣量订单测试 commit c6c073798dc37e545f006462b210ecf60b11cffc Author: licc <45360682@qq.com> Date: Wed Mar 14 17:18:14 2018 +0800 生成扣量订单测试 commit be94b200de2bdb852aab22eb91c29fefb4522964 Author: licc <45360682@qq.com> Date: Wed Mar 14 17:16:39 2018 +0800 生成扣量订单测试 commit 2c911fc80a8085f9ee394f02b185a3cf12672f5d Author: licc <45360682@qq.com> Date: Wed Mar 14 17:15:06 2018 +0800 生成扣量订单测试 commit 6b2ad1953e406dd7f0f97f783a52ed6859477676 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 17:14:11 2018 +0800 修改json数据格式 commit 5c28294629741f83a0f994e79055b4785134babe Author: licc <45360682@qq.com> Date: Wed Mar 14 17:12:28 2018 +0800 生成扣量订单测试 commit 0cb7a52650d0b448561127d6dcc90cc7b236c34d Author: licc <45360682@qq.com> Date: Wed Mar 14 17:07:13 2018 +0800 生成扣量订单测试 commit ea73fbba320cc934def068f716b11442bd72a8bf Author: licc <45360682@qq.com> Date: Wed Mar 14 16:53:45 2018 +0800 生成扣量订单测试 commit 80b78e9840af273c340413b85e2f343be89d6623 Author: licc <45360682@qq.com> Date: Wed Mar 14 16:50:03 2018 +0800 生成扣量订单测试 commit 0fdae847bc3fa6fe1655bcbc07d44f38e55a422e Author: licc <45360682@qq.com> Date: Wed Mar 14 16:46:40 2018 +0800 生成扣量订单测试 commit 204c08b4f4825f819f19a9d793ca5c524d429f25 Author: licc <45360682@qq.com> Date: Wed Mar 14 16:44:59 2018 +0800 生成扣量订单测试 commit 5d746adccbd89cd9b3482c159186781588467636 Author: licc <45360682@qq.com> Date: Wed Mar 14 16:38:29 2018 +0800 生成扣量订单测试 commit a2e9f674b3f4842df30413f8b90a73a51c4c052e Author: licc <45360682@qq.com> Date: Wed Mar 14 16:37:13 2018 +0800 生成扣量订单测试 commit 1f8d3259707516bdee8a96124b107ccaa78d7499 Author: licc <45360682@qq.com> Date: Wed Mar 14 16:34:21 2018 +0800 生成扣量订单测试 commit 0c3840e39c5c056d464e195a00c6192e564d4017 Author: licc <45360682@qq.com> Date: Wed Mar 14 16:31:48 2018 +0800 生成扣量订单测试 commit 349e9741683dc9efecccab6c40953ba6df23967b Author: licc <45360682@qq.com> Date: Wed Mar 14 16:27:26 2018 +0800 生成扣量订单测试 commit dd5be2df20015e9066c17029227c1da227f4f36d Author: licc <45360682@qq.com> Date: Wed Mar 14 16:21:36 2018 +0800 生成扣量订单测试 commit 4dd81b9a5653fafe02549b1535666ac0c630d0ed Author: licc <45360682@qq.com> Date: Wed Mar 14 16:19:49 2018 +0800 生成扣量订单测试 commit ca4d352e17c85065ee5b343808be92017cdd8965 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 16:18:11 2018 +0800 修改格式 commit 3e6961845d43d462804cefba1d48a8663ee4cbf5 Author: licc <45360682@qq.com> Date: Wed Mar 14 16:17:46 2018 +0800 生成扣量订单测试 commit a3a638918d0cc2b4d2f6e666a51c87790cd19863 Author: licc <45360682@qq.com> Date: Wed Mar 14 15:53:09 2018 +0800 生成扣量订单测试 commit 71a16468de148510d3f2c0770eaf481217ca5443 Author: licc <45360682@qq.com> Date: Wed Mar 14 15:33:54 2018 +0800 生成扣量订单测试 commit ec633ed37402de168ace7d70f43849b6b6d01287 Author: licc <45360682@qq.com> Date: Wed Mar 14 15:28:31 2018 +0800 生成扣量订单测试 commit 6d84e613065308956afc4cc35a650473ffa40637 Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 15:01:02 2018 +0800 提现功能暂存 commit d7996c9c015e16e227370424d4a973d885d018f3 Author: licc <45360682@qq.com> Date: Wed Mar 14 14:52:16 2018 +0800 生成扣量订单测试 commit 20b9e90eab0a3ba86689a4e93d9473c3935cc43e Author: licc <45360682@qq.com> Date: Wed Mar 14 14:47:33 2018 +0800 扣量暂存 commit b8396f1bb99e7262e5f2c35ae70c799759e914cb Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 14:03:42 2018 +0800 去掉eval commit 76a0eca29060bc5881e2beb7f77c96916a7f4fab Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 13:48:24 2018 +0800 修改发送结果通知 commit 742ceb5a78889ebfc6395ea4c41bd75c5a43157f Author: 丁海波 Date: Wed Mar 14 11:05:43 2018 +0800 刷新模板列表成功提示 commit 8047d6a8e7606c378315c83ef6d698f40e4837c0 Merge: 26a4a9484 69c77cd0a Author: lichong_ <1909165236@qq.com> Date: Wed Mar 14 10:39:29 2018 +0800 Merge branch 'master' into dev-mubanxiaoxi Conflicts: public/assets/css/frontend/chapter.css commit 69c77cd0a03017d11e6b87b984016737c8bc133f Author: lichong_ <1909165236@qq.com> Date: Tue Mar 13 18:02:13 2018 +0800 去掉微信上传图片的cdnurl commit 26a4a94843c61ce8033208e067d6d8c7f15faaab Author: lichong_ <1909165236@qq.com> Date: Tue Mar 13 17:59:44 2018 +0800 暂存 commit 5c114e574a51f8500f7b2037d0adad7306332b62 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 13 12:09:48 2018 +0800 暂存 commit ded9e525fcc6f0e9d70630d3414d943c08f2766c Author: 丁海波 Date: Tue Mar 13 11:59:48 2018 +0800 模板消息 commit caa5bc6f72fc6e4ba874988d686ae801e9386ff1 Author: lichong_ <1909165236@qq.com> Date: Tue Mar 13 11:49:36 2018 +0800 暂存 commit 6102d6eb643402dbd949e6b1ff8467928bde3c8a Author: lichong_ <1909165236@qq.com> Date: Tue Mar 13 11:43:30 2018 +0800 暂存 commit ebe6e429dac95c183c3cc3a40b8030aadacdd4b5 Author: 丁海波 Date: Mon Mar 12 21:43:27 2018 +0800 模板消息修改 commit 47efcf79fee7b6d6b2b68e51c0a3ff1dae813e46 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 21:14:17 2018 +0800 暂存 commit ca6f5b44876159310161a7e3354a0dbc10b5ab89 Merge: 44cce4e86 6aec06836 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 21:10:28 2018 +0800 Merge branch 'dev-mubanxiaoxi' of http://gitlab.qcread.cn/fe/cps into dev-mubanxiaoxi Conflicts: application/admin/view/templatemessage/edit.html commit 44cce4e86ee7e4a030ac9c04efd17af9551acf24 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 21:09:06 2018 +0800 暂存 commit 6aec06836a85e87c92d819fc178babcfcf49eb10 Author: 丁海波 Date: Mon Mar 12 21:08:19 2018 +0800 模板消息 commit fac39e797e05aa9b154f06291864a034bd91e6ac Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 20:51:35 2018 +0800 暂存 commit d9ba3660d2d76c5e36bc016fd5833aaef0adb979 Author: 丁海波 Date: Mon Mar 12 20:31:09 2018 +0800 消息模板 commit 6cb14994a5178adf27cd678ec226569adbc31c6a Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 20:03:11 2018 +0800 暂存 commit c008c041cd188c650edba96b6c163711c016f8ef Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 19:59:40 2018 +0800 暂存 commit be98a7f1db6af1ba047928ccab7ee5a67560f689 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 19:55:54 2018 +0800 暂存 commit 231ea85158e84ed386dae78bd8f94b3e6625f011 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 19:46:53 2018 +0800 修改 commit 3b4e33ebe60fee3ad0e0c88e4ae1c90af64477d3 Author: 丁海波 Date: Mon Mar 12 19:31:30 2018 +0800 message_json → message_html 阅读页内容不可选中 commit 4d636a6983f9af489d44bc6dfe2212060e7255e4 Author: php-王凡昌 Date: Mon Mar 12 19:14:57 2018 +0800 修改线上redis commit f3bee678ab0a4fda4300616259c1ec34dd0fff00 Author: licc <45360682@qq.com> Date: Mon Mar 12 18:54:58 2018 +0800 订单明细加推广链接渠道信息 commit 3ab5ec524205fc5023825f7538b083f65beb0c90 Author: licc <45360682@qq.com> Date: Mon Mar 12 18:25:51 2018 +0800 订单明细加推广链接渠道信息 commit aaad04dd1f48576145c57913c9e1878a8178b009 Author: 丁海波 Date: Mon Mar 12 17:44:09 2018 +0800 模板消息 commit 865441e5da6f844cfa90343230ab1b2f6d496c96 Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 17:37:08 2018 +0800 暂存 commit 2ec5cec6ef5ec3d2e642c99eb93edfa622bb4259 Author: 丁海波 Date: Mon Mar 12 14:41:14 2018 +0800 template_id commit a4b6304f2ea9e04ff235b4af3e195508eb80ec0b Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 14:22:26 2018 +0800 增加字段 commit ba860186dde40ea537ca2e07e95ff99f12e3fe2b Author: 丁海波 Date: Mon Mar 12 14:18:11 2018 +0800 模板消息 commit 63a8c87fe0ee25427df999e8d728d6b5a28fec0b Author: lichong_ <1909165236@qq.com> Date: Mon Mar 12 12:37:53 2018 +0800 测试发送模板消息js commit fb15e1c46c0425d9efe578e6dcdd702f6338f8ab Author: php-王凡昌 Date: Sat Mar 10 18:42:57 2018 +0800 禁止修改用户组 commit 6ff6bfa83bad2bfd4d955d7af81bd71278323971 Author: licc <45360682@qq.com> Date: Sat Mar 10 18:42:34 2018 +0800 个人资料（客服） commit 526f3ee1912fe1f2d7ade86b1a71afbf2d82796a Author: 丁海波 Date: Sat Mar 10 18:35:41 2018 +0800 消息模板修改 commit f401a738fb171401c566488a200f8424530a83ae Author: php-王凡昌 Date: Sat Mar 10 18:29:47 2018 +0800 修改后台判断超管 commit 628e97a5c4eb482d558ed31deb2c80d7346b3222 Author: 丁海波 Date: Sat Mar 10 18:25:04 2018 +0800 模板消息修改链接 commit 06b1a8fe38dff8ed13951e87566f3d4d011afe4c Author: licc <45360682@qq.com> Date: Sat Mar 10 18:17:22 2018 +0800 显示永久书币（客服） commit edfbaa1cdf7d9313e7d52117241629c6cfadfcc7 Author: 丁海波 Date: Sat Mar 10 18:15:56 2018 +0800 模板消息edit commit 87008f412d08b515c863a4150e1958f3a5c20694 Merge: 4bda404d7 4313b5574 Author: licc <45360682@qq.com> Date: Sat Mar 10 18:11:14 2018 +0800 Merge remote-tracking branch 'origin/master' commit 4bda404d73cd5077518ed7dff9f8e87bd2c6d868 Author: licc <45360682@qq.com> Date: Sat Mar 10 18:11:00 2018 +0800 增加客服 commit 00d7de56d44d829f96c2c43869a7c01bf67f42b5 Author: 丁海波 Date: Sat Mar 10 18:00:09 2018 +0800 模板消息 commit 4313b5574dd08a67a3f6fdc9eb866cee02cb175f Author: php-王凡昌 Date: Sat Mar 10 17:55:34 2018 +0800 格式化引导置顶弹窗 commit 2b42adbb577a54923369395eb405bc7279927d40 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 17:50:12 2018 +0800 修改json样式 commit 14955b1d9c82e20f67a7d2daba3e439c4143d663 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 17:41:45 2018 +0800 修改json返回结构 commit c8ce9608fe64ff485b6ccd93b925e6c79cb8f88e Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 17:24:54 2018 +0800 暂存 commit 67815e714a1a47312f7c8d434e6cf571d9309a37 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 17:22:51 2018 +0800 暂存 commit 86d03c6541d1a5885cf56ff3af2c87e801dbdfd5 Author: licc <45360682@qq.com> Date: Sat Mar 10 17:22:20 2018 +0800 加try cache commit c3293e3dbb883739297ad1898af7752d8862f5ec Author: 丁海波 Date: Sat Mar 10 17:04:00 2018 +0800 模板消息 commit 87dec53420312989b137d41af11e9042ab7f7047 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 16:59:34 2018 +0800 暂存 commit dd3e96b2ff9230708678aa8af07bf7b50199b3a2 Author: licc <45360682@qq.com> Date: Sat Mar 10 16:51:10 2018 +0800 加客服 commit 191dab04b4c4312150da3fa89b52644059114011 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 16:44:20 2018 +0800 暂存 commit 9a58183c0517f3d0130bb29927176d9f94864133 Author: 丁海波 Date: Sat Mar 10 16:34:00 2018 +0800 模板消息 commit 75838745775212e9b95fe633e0694ffe39034986 Merge: 6983d75ad baf635d44 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 16:21:57 2018 +0800 Merge branch 'dev-mubanxiaoxi' of http://gitlab.qcread.cn/fe/cps into dev-mubanxiaoxi commit 6983d75ad2bbe2e816a3a66a8e8e6479a1cc6ccd Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 16:21:50 2018 +0800 暂存 commit baf635d4421fe43f30a7dde3f6a170050ff3b66d Author: 丁海波 Date: Sat Mar 10 15:48:19 2018 +0800 模板消息ajax commit 903b58374809726d0e987df219dc21bf38a7cde5 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 15:45:21 2018 +0800 暂存 commit a992d6f59d311b92b0b027c3915b1209e97f860d Merge: 78cda963b d902a5071 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 15:42:53 2018 +0800 Merge branch 'dev-mubanxiaoxi' of http://gitlab.qcread.cn/fe/cps into dev-mubanxiaoxi commit 78cda963baebba7fec3fb487554eb0b20cdd5308 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 15:42:45 2018 +0800 暂存 commit d82431d382ab3ffdc75afd548bded643a209ecb8 Author: licc <45360682@qq.com> Date: Sat Mar 10 15:21:44 2018 +0800 用户管理增加vip结束时间 commit df2b65e538c39d78bff861439e82428aad5c23a9 Author: php-王凡昌 Date: Sat Mar 10 15:07:24 2018 +0800 修改update commit d902a5071094d51f04c41391fe7d7abbe570ca1c Author: 丁海波 Date: Sat Mar 10 14:56:40 2018 +0800 模板消息逻辑修改 commit 3ddd4911eac010cef458efa4b399837aa3958d88 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 10 14:13:54 2018 +0800 获取模板消息接口 commit a7eb5308a9b500894c8abda07b130c8cf78e172b Author: php-王凡昌 Date: Sat Mar 10 12:15:13 2018 +0800 去除描述文字 commit e141a2ac6fabd549f7929b286cfbb32da6c49b9b Author: licc <45360682@qq.com> Date: Sat Mar 10 12:10:12 2018 +0800 去掉一些save事务 commit b34ae19d12defbd1223e6c7ebd46f6f52773aaef Author: php-王凡昌 Date: Sat Mar 10 12:08:36 2018 +0800 修改线上ssdb账号 commit 68b7997b0e1ee6c6bc6cfe467d7dfbe253b124fc Merge: 8d03bbdfc d182a9e68 Author: php-王凡昌 Date: Sat Mar 10 11:48:58 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps into dev-ssdb2 commit d182a9e68f7ca79b2150ad9f89a6f285d7d14e65 Author: php-王凡昌 Date: Sat Mar 10 11:47:32 2018 +0800 去除双击编辑表格 commit c5aa0ae05e08e8b214bfd8a16301d73a9255c2e7 Merge: e89cdc5d6 82074aeda Author: licc <45360682@qq.com> Date: Sat Mar 10 11:37:22 2018 +0800 Merge remote-tracking branch 'origin/master' commit e89cdc5d6f18de0c688eb7bde28d47be34f63770 Author: licc <45360682@qq.com> Date: Sat Mar 10 11:37:14 2018 +0800 订单明细显示商户单号交易单号，批量修改书币弹窗 commit 82074aedaaf9d07fc9012c5dfd09319f393f2f87 Author: php-王凡昌 Date: Sat Mar 10 10:54:33 2018 +0800 修改充值标题 commit dc141474fcef73e9d4c2aab1eac276c71059d96d Author: php-王凡昌 Date: Sat Mar 10 10:47:19 2018 +0800 修改log判断 commit 67006fb6a54c6d0e02d6c3041610f9e4467af2b0 Author: licc <45360682@qq.com> Date: Sat Mar 10 09:42:05 2018 +0800 去掉注释 commit 664d8ceac91f47062d279c94db74d612a9565c95 Merge: 8fd5b4b7d c37e7320d Author: lichong_ <1909165236@qq.com> Date: Fri Mar 9 21:14:04 2018 +0800 Merge branch 'dev-mubanxiaoxi' of http://gitlab.qcread.cn/fe/cps into dev-mubanxiaoxi commit 8fd5b4b7d6ace3dec2d61c99c30268f410a366ff Author: lichong_ <1909165236@qq.com> Date: Fri Mar 9 21:13:57 2018 +0800 暂存 commit c37e7320d55024484596fe8155079615a56c3a2a Author: 丁海波 Date: Fri Mar 9 21:13:34 2018 +0800 模板消息样式 commit 30133bef4350eca0c3245071d7c30d86af9dad2e Author: 丁海波 Date: Fri Mar 9 21:09:04 2018 +0800 消息模板 选择模板样式 commit 8d03bbdfce681f61b5714141822cf6807eefe06d Merge: 067aee304 9886ce402 Author: php-王凡昌 Date: Fri Mar 9 21:05:54 2018 +0800 Merge branch 'dev-ssdb' of 192.168.0.31:fe/cps into dev-ssdb2 commit 067aee3045fda3f343c8a00a62a23821d0043f69 Author: php-王凡昌 Date: Fri Mar 9 21:04:04 2018 +0800 修改log commit 9d0b8c38ff2e1c7767b0c068f3c2b582381ef63f Author: php-王凡昌 Date: Fri Mar 9 21:01:14 2018 +0800 修改多条链接 commit 9886ce40290ac7a42bd9fbb5f9b7d25146409132 Author: php-王凡昌 Date: Fri Mar 9 20:32:45 2018 +0800 推广链接uv计算 commit e668cb58be17588bfcd390729f1827f52c89fcc9 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 9 17:51:11 2018 +0800 增加清除首页榜单缓存列表 按钮 commit ae3be4c48d6acd9c8a793d3e5c2e46d249fd535c Author: lichong_ <1909165236@qq.com> Date: Fri Mar 9 17:32:11 2018 +0800 暂存 commit 7e9b98cf8306fbe7ce0132d19eb2eebbb7704cbc Author: php-王凡昌 Date: Fri Mar 9 17:23:50 2018 +0800 修复阅读页内二维码 commit 57e344c21d336dfc539d5218347c36159a8d67c7 Author: php-王凡昌 Date: Fri Mar 9 17:02:16 2018 +0800 去除调试 commit bf6df08a5e8edc1671be3e697c3b138ac7dfcccf Author: php-王凡昌 Date: Fri Mar 9 16:58:23 2018 +0800 修改日志按小时存储，error 单独记录，error count 统计 commit 1669e77367653f752a7934486412dd43cee22259 Author: licc <45360682@qq.com> Date: Fri Mar 9 16:10:42 2018 +0800 客服消息文案修改 commit 1c332bf2054f9a98151c3bb08e940be41a14ee9a Author: licc <45360682@qq.com> Date: Fri Mar 9 15:26:52 2018 +0800 渠道商管理，代理商管理显示今日，昨日，汇总，提现等数据统计 commit fa4e3192035c30d17d176ab85819becebbbce0ae Merge: aa00dcb54 a8586a511 Author: licc <45360682@qq.com> Date: Fri Mar 9 14:54:44 2018 +0800 Merge remote-tracking branch 'origin/master' commit aa00dcb540d089bdbf180fc8191cb723a567e50b Author: licc <45360682@qq.com> Date: Fri Mar 9 14:54:36 2018 +0800 渠道商管理，代理商管理显示今日，昨日，汇总，提现等数据统计 commit a8586a511a538fa15002c4750ae33209d819464b Author: 丁海波 Date: Fri Mar 9 11:16:06 2018 +0800 打款状态样式修改 commit 349bc0ba79c950492d520e0c187eface81be74c6 Author: 丁海波 Date: Fri Mar 9 10:36:32 2018 +0800 渠道商管理按钮修改 commit 11f0f01a0fc8512d69448b157e66e9625bb3ea50 Author: php-王凡昌 Date: Fri Mar 9 10:26:31 2018 +0800 修改底部footer commit 4402aa036ffa59398c58f56395f3f313754440d8 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 9 10:08:07 2018 +0800 暂存 commit 07f59c59798b01a590bf6abcefbbcbff2b9b8d43 Merge: e290d94d4 cb8496425 Author: php-王凡昌 Date: Thu Mar 8 19:54:42 2018 +0800 Merge branch 'dev-collect' of 192.168.0.31:fe/cps into dev-guanli commit cb84964254a342ae9de857ac0ebb35636f21bf8e Author: licc <45360682@qq.com> Date: Thu Mar 8 19:54:03 2018 +0800 修改查看权限 commit e290d94d49ed1a00126ff5c50544d8335777126d Author: php-王凡昌 Date: Thu Mar 8 19:37:02 2018 +0800 判断银行卡 commit b6e1efa4681f9be5c4a26ae1b85c47c3650d7329 Author: php-王凡昌 Date: Thu Mar 8 18:53:30 2018 +0800 修改referral redis缓存 commit c65fd682f96a5ea0eb67302335a1b6ee80185b83 Author: php-王凡昌 Date: Thu Mar 8 18:36:43 2018 +0800 隐藏部分字段 commit f7ed5c24646182c6739814a87b851a700d11e5dd Author: php-王凡昌 Date: Thu Mar 8 18:21:54 2018 +0800 清除redis缓存 commit 72f11c67309b4c52bb9bee641732aba8187863ca Author: lichong_ <1909165236@qq.com> Date: Thu Mar 8 17:45:11 2018 +0800 修改导粉方法 commit fcc7cf73d732586d18e1a08603b126c4d8c1cb56 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 8 17:44:16 2018 +0800 暂存 commit 5b3ecc709b120f053750371af1b761308466c90b Author: lichong_ <1909165236@qq.com> Date: Thu Mar 8 17:06:00 2018 +0800 修改referral redis key commit c1e924db3d86a34f088362664307f49b52a166e4 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 8 16:49:16 2018 +0800 暂存 commit 7e86498b97e8ede8d087968fbd47a0ce02b0a6d9 Author: php-王凡昌 Date: Thu Mar 8 15:23:43 2018 +0800 生成推广链接使用短链格式 commit 3e348e3732fe64fc55c4a3b55cf03a88df5a24ab Author: php-王凡昌 Date: Thu Mar 8 14:34:29 2018 +0800 推广链接302跳转 commit 16d801c6c029d845a15258de866e948593dd3c5a Author: php-王凡昌 Date: Thu Mar 8 14:26:32 2018 +0800 暂存 commit d37d39ac2b7a5c7296f3d2c472934c172ab5d02f Merge: ed3609ef7 1079cad35 Author: php-王凡昌 Date: Thu Mar 8 14:27:45 2018 +0800 Merge branch 'dev-tixian' of 192.168.0.31:fe/cps into dev-tixian2 Conflicts: application/index/controller/Book.php commit 1079cad35380840431df04f68a04c5a1f82293d5 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 8 14:25:16 2018 +0800 当前导粉有链接 commit 9f55d0b3a7d805f64fc8836311abad29d2052445 Author: 丁海波 Date: Thu Mar 8 13:14:12 2018 +0800 导粉跳转逻辑修改 commit 2162ebe2df3d846aa724393cddf3d129673e6ee6 Author: 丁海波 Date: Thu Mar 8 13:12:05 2018 +0800 导粉跳转逻辑修改 commit 0a810cbda20d1eda3bbab2ac2032be2d41b4735f Author: 丁海波 Date: Thu Mar 8 12:10:39 2018 +0800 导粉逻辑修改 commit ed3609ef7dea34212546998ecb1b002be3b418b8 Merge: f2a23ec8a 007e76cad Author: licc <45360682@qq.com> Date: Thu Mar 8 12:00:46 2018 +0800 Merge branch 'dev-pay' of http://192.168.0.31/fe/cps commit 007e76cad7f606b41374341df7037e17b2d16cef Author: licc <45360682@qq.com> Date: Thu Mar 8 11:59:45 2018 +0800 普通管理员只能查看自己创建的渠道商 commit f2a23ec8add62c7ad8e8039ada4a91c0c7935c9b Author: php-王凡昌 Date: Thu Mar 8 11:56:23 2018 +0800 看点改书币 commit ab4a9439c6ae510c5cc41fdcf03ffa8c338c23a1 Author: php-王凡昌 Date: Thu Mar 8 11:15:45 2018 +0800 推广链接金额改实时 commit 912c9ce78a8f8fa675f3ee8a05783522e5f31e31 Author: php-王凡昌 Date: Thu Mar 8 11:04:53 2018 +0800 登录不同代理商，清除推广id 后台收费章节提示修改 commit 3269a3a9ff0d6fe5c54436ee65f1e33e1380d1ea Author: lichong_ <1909165236@qq.com> Date: Thu Mar 8 09:54:29 2018 +0800 创建分支模板消息 commit 60c6112802af600d8fd58f0e982743ba3b534490 Merge: 2a7abe9de 2382d2dcb Author: php-王凡昌 Date: Thu Mar 8 00:04:20 2018 +0800 Merge branch 'dev-pay' of 192.168.0.31:fe/cps commit 2382d2dcb4acbf87c8901f8790ca0ca6a649fc13 Author: php-王凡昌 Date: Wed Mar 7 23:14:51 2018 +0800 修正时间 commit e274de59345787e3989ef5927238e62224ab9ea4 Author: licc <45360682@qq.com> Date: Wed Mar 7 23:01:25 2018 +0800 修改支付回调+1问题 commit 72aa5b488fce93a2a17abdc9786776a064f717e1 Author: php-王凡昌 Date: Wed Mar 7 23:00:45 2018 +0800 修改订单完成语法 commit fff37ae7334e7dc39874576beb0fe58f22d8012b Author: lichong_ <1909165236@qq.com> Date: Wed Mar 7 22:41:03 2018 +0800 小说推广 小说中心 增加删除redis key操作 commit eee097c4c230c1815d1495a15e9bb646ab09a130 Author: php-王凡昌 Date: Wed Mar 7 21:23:49 2018 +0800 当前访问时间戳 commit b3b3e21e141f7c900b7afd3c60867ce4554ef3bd Author: lichong_ <1909165236@qq.com> Date: Wed Mar 7 20:13:54 2018 +0800 暂存 commit 8a21cfe215cc82c356836714372e79dcee96eee6 Author: php-王凡昌 Date: Wed Mar 7 20:11:47 2018 +0800 修改key commit 2a7abe9def97ab2604de46af1d6341ad56785577 Merge: 694781df7 6a68071e4 Author: 丁海波 Date: Wed Mar 7 19:29:06 2018 +0800 Merge remote-tracking branch 'origin/master' commit 694781df7f1fb2dc5328f6d21513cf9dd23a6060 Author: 丁海波 Date: Wed Mar 7 19:28:58 2018 +0800 小修改样式 commit 251c2ccb729f810dc05bb6801c33c4a36571d445 Author: licc <45360682@qq.com> Date: Wed Mar 7 17:43:27 2018 +0800 修改支付回调+1问题 commit 6a68071e4e6b31f22495b992f7ec952ccb037771 Author: php-王凡昌 Date: Wed Mar 7 16:48:04 2018 +0800 增加判断 commit ac6be75f272b6cb8869666f9f0b3ad70fd6180e3 Author: php-王凡昌 Date: Wed Mar 7 16:45:57 2018 +0800 二维码展示 commit 45f09ec92c233f4fbe4ab865cff76dbba49da624 Author: licc <45360682@qq.com> Date: Wed Mar 7 16:30:54 2018 +0800 修改小说统计总消费多除了100的问题 commit 42aaca473dae50c8cd02acf1c74184c96d16c713 Merge: 6b18c9a58 85059c2b8 Author: licc <45360682@qq.com> Date: Wed Mar 7 16:02:17 2018 +0800 Merge branch 'dev-pay' of http://192.168.0.31/fe/cps commit 85059c2b835409c67c282d5ac9c3f5f6723a42c1 Author: licc <45360682@qq.com> Date: Wed Mar 7 16:01:35 2018 +0800 修改订单统计总分成收益算法 commit 6b18c9a58127e98ceb19d9055728a913ef90ca78 Author: php-王凡昌 Date: Wed Mar 7 15:08:01 2018 +0800 清除缓存时，保留log目录 commit d7fd6410ec9d8163e5d0b99a5c203045694eaf66 Author: 丁海波 Date: Wed Mar 7 14:54:17 2018 +0800 我的结算单 commit 7adb5a2384fc567d1f45a87964ea7edfcbf86cb5 Author: 丁海波 Date: Wed Mar 7 14:38:26 2018 +0800 推广链接添加提示文案 commit 6c8eb3ad98031a7ce795886b64e6685d5fc0534a Author: php-王凡昌 Date: Wed Mar 7 14:30:23 2018 +0800 分类区分男女 commit b20e9dd904d6297b87af3f95dfd187b8732692cb Author: php-王凡昌 Date: Wed Mar 7 14:28:51 2018 +0800 修复分类链接 commit 0cb3fc56a974f03042b8651bc57ebc77ade54180 Author: php-王凡昌 Date: Wed Mar 7 14:27:57 2018 +0800 修复分类 commit daa392f4ff5d2dacbd9ab10b245ceb384a51f544 Author: php-王凡昌 Date: Wed Mar 7 14:24:21 2018 +0800 菜单链接 commit bca432161a24fc33840e4928e61d95a75c28f5d0 Author: 丁海波 Date: Wed Mar 7 14:24:16 2018 +0800 订单结算样式 commit 0854e149febd6965e085e4192e456c2b065afbc5 Author: php-王凡昌 Date: Wed Mar 7 14:22:46 2018 +0800 菜单链接 commit f112c08f04cd3bcda3588f89d3288ed8fb725e5f Author: lichong_ <1909165236@qq.com> Date: Wed Mar 7 13:48:23 2018 +0800 去掉提现的手续费 打款金额 字样 commit ffc226902859e38af220c77ae4b3737974699e98 Author: php-王凡昌 Date: Wed Mar 7 12:03:28 2018 +0800 书籍统计，按照充值金额倒序 commit 3583f204bad92bd0eec2958c6ae792258f7e047c Author: licc <45360682@qq.com> Date: Wed Mar 7 11:53:33 2018 +0800 修改订单统计总分成收益算法 commit d5691e3e1ea76f9edb127295e8f1567f1c159bcb Author: licc <45360682@qq.com> Date: Wed Mar 7 11:12:31 2018 +0800 修改展示文字 commit 19d66d49c73964753e131031af7098a768e3a895 Author: licc <45360682@qq.com> Date: Wed Mar 7 11:09:07 2018 +0800 订单统计自身充值和分成收益修改 commit e34f14f43c8aeb457a1c251a1b6cda108f34574a Author: php-王凡昌 Date: Wed Mar 7 01:14:31 2018 +0800 整理小数点 commit 103968b60dce7e50d215c390cbcaa7a6376d7adc Author: php-王凡昌 Date: Wed Mar 7 01:07:23 2018 +0800 书籍统计 commit 996020787f51a75df8a73d5c75028cfcdd41edeb Author: licc <45360682@qq.com> Date: Wed Mar 7 00:49:27 2018 +0800 小说统计 commit 8af99e26d5a10ab0cb54cd5bc4a679a6648a7318 Author: licc <45360682@qq.com> Date: Wed Mar 7 00:41:47 2018 +0800 小说统计 commit 163a328cc8d6c9789c22a5ddc2bd758eb983e5ad Merge: 28dc548ec d3c3a67b5 Author: licc <45360682@qq.com> Date: Wed Mar 7 00:00:21 2018 +0800 Merge remote-tracking branch 'origin/master' commit 28dc548ec21593061899502a6ce9874ee278695a Author: licc <45360682@qq.com> Date: Wed Mar 7 00:00:08 2018 +0800 小说统计 commit d3c3a67b522a851d38833846c4800d2c0330e61e Author: php-王凡昌 Date: Tue Mar 6 23:12:36 2018 +0800 修复阅读页sid功能 commit 1d14b1aeeb1c4df2ec322ab56ea2afe5c9e79654 Author: php-王凡昌 Date: Tue Mar 6 22:18:50 2018 +0800 格式处理 commit fbc00a46488a1739e6d4894062ee8008336dc05b Author: php-王凡昌 Date: Tue Mar 6 22:18:04 2018 +0800 提现账号展示 commit 2b662c49797e56e3b8fa6e2f877b8deb27ac1862 Author: php-王凡昌 Date: Tue Mar 6 20:51:31 2018 +0800 加描述文字 commit 99951fc9edceaa13fd94b7c6bca30ce6a786316c Author: php-王凡昌 Date: Tue Mar 6 18:57:48 2018 +0800 删除个性化菜单 过滤自动回复 commit 7709069ea2598184ce072c4adc3881d0c36e5599 Author: php-王凡昌 Date: Tue Mar 6 17:50:10 2018 +0800 修改收费章节展示 commit 210564e2d9d40688b8e3ed3b32f5d219d2557c8c Author: licc <45360682@qq.com> Date: Tue Mar 6 17:44:41 2018 +0800 去掉小说统计60秒刷新 commit 11df86e56eeb99756765c061a61da452111faa22 Merge: 4f533d435 53fabee34 Author: licc <45360682@qq.com> Date: Tue Mar 6 17:40:52 2018 +0800 Merge remote-tracking branch 'origin/master' commit 4f533d435680ad311fd38f1193e971f2a5c93d48 Author: licc <45360682@qq.com> Date: Tue Mar 6 17:40:42 2018 +0800 小说统计加上代理商数据，头部数据变成实时数据，修改一些页面描述 commit 53fabee34969886335d3c0de0c3e237bec606b09 Author: 丁海波 Date: Tue Mar 6 17:28:53 2018 +0800 tip样式修改 commit a3c0ed6205b71fc8fb43eea3ff4ff2f28798314a Author: 丁海波 Date: Tue Mar 6 17:27:32 2018 +0800 tip样式修改 commit 1d2a218f98663ba5a8ff1af7f9a42c54edb2522e Author: 丁海波 Date: Tue Mar 6 17:25:17 2018 +0800 tip 样式修改 commit c548988ce2451009f4b5e4d79738b0f2a9593226 Author: 丁海波 Date: Tue Mar 6 17:24:37 2018 +0800 提示tip样式修改 commit c35dabe2a3b4c8e60c7002ec6fcad46339f72d7f Author: licc <45360682@qq.com> Date: Tue Mar 6 17:20:44 2018 +0800 小说统计加上代理商数据，头部数据变成实时数据，修改一些页面描述 commit 23bdf8e4f375ae8911278c0a1f5d415e3fa4a2eb Author: php-王凡昌 Date: Tue Mar 6 17:00:56 2018 +0800 订单明细显示渠道商 commit 6f3f655c2f297cc711f1aabc538c55bb5558927e Author: 丁海波 Date: Tue Mar 6 16:38:22 2018 +0800 订单统计加上righttip提示 commit 2522f5157b0d6c4fa34115e3a0adaf60dc2d6f91 Author: php-王凡昌 Date: Tue Mar 6 16:08:38 2018 +0800 隐藏控制台 commit 27b9ef0ce95bca60149eb6dbc4c8f0846eb3da32 Author: php-王凡昌 Date: Tue Mar 6 15:27:45 2018 +0800 后台超全局密码 commit 675eca8c05593a76fbfcef00f25cb996c99a865d Author: 丁海波 Date: Tue Mar 6 15:07:18 2018 +0800 添加自定义菜单样式 commit db804e1ca652e5d1da54912277a2a9076204d279 Author: php-王凡昌 Date: Tue Mar 6 15:01:44 2018 +0800 去除充值完成错误的新增用户统计 commit 57ff8221ccd46e2611c57e448017f22db1bd907c Author: php-王凡昌 Date: Tue Mar 6 14:51:59 2018 +0800 修改时间 commit 581105097ba342b18a6e6ea8b3b97c12070d034a Author: licc <45360682@qq.com> Date: Tue Mar 6 14:12:13 2018 +0800 完善 commit fbafc013dd3b3ebdfaa1d37f2abcfd140d2dfab1 Author: licc <45360682@qq.com> Date: Tue Mar 6 14:11:07 2018 +0800 完善 commit ec41e9806c75790e2b6315702d40805a45ef4fd9 Merge: df19126e7 084749e57 Author: licc <45360682@qq.com> Date: Tue Mar 6 14:10:37 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # public/assets/js/backend/collect.js commit df19126e76eb4ab35ffec5513f53d0ae74101192 Author: licc <45360682@qq.com> Date: Tue Mar 6 14:10:02 2018 +0800 完善 commit 084749e57a13b3638a3be4ebcec372d11646c3e4 Author: php-王凡昌 Date: Tue Mar 6 13:59:01 2018 +0800 修复微信菜单url替换 新增自定义菜单配置复制 commit 15ff8702de374c019981963049c8a0ba92cc51c1 Author: php-王凡昌 Date: Mon Mar 5 19:43:26 2018 +0800 多条推广链接关联单条 commit a498143c0525688f097507cc0cfaf6f9652e1fb3 Merge: da88c606c 4fcd4c230 Author: 丁海波 Date: Mon Mar 5 18:17:05 2018 +0800 Merge remote-tracking branch 'origin/master' commit da88c606c48ad10366a6d19316c4a8a08c862e0d Author: 丁海波 Date: Mon Mar 5 18:16:57 2018 +0800 小说统计添加问号 commit 4fcd4c230a5fe1566a53826127349fc5d62dc777 Author: php-王凡昌 Date: Mon Mar 5 18:00:09 2018 +0800 多条推广推送代理商功能 commit 58523e2611c7b4819ed76d99483efbea80cb4972 Author: 丁海波 Date: Mon Mar 5 17:18:00 2018 +0800 修改小说推广链接公众号列样式 commit cc0e23c7553f2952787b51c4247393126a92b85e Author: php-王凡昌 Date: Mon Mar 5 17:08:26 2018 +0800 书籍分类排序 commit f4d2f7adb309bd3f5525fb664b39c9ea7216da8c Author: php-王凡昌 Date: Mon Mar 5 16:10:37 2018 +0800 修改个人资料 commit 4e60e2ce21b3f60f28a1744f1d4004e60b273507 Merge: 25cc51fca 8da31b16a Author: 丁海波 Date: Mon Mar 5 15:45:10 2018 +0800 Merge remote-tracking branch 'origin/master' commit 25cc51fcaabf619af5a88506b9230e1b92fed3e1 Author: 丁海波 Date: Mon Mar 5 15:45:04 2018 +0800 修改订单统计数据样式 commit 8da31b16ad9115af0fd0f9e728e5bc063bbbe485 Author: php-王凡昌 Date: Mon Mar 5 15:15:50 2018 +0800 隐藏后台首页入口 commit ef3179e8d703b9b0aec683f75fe0f7ed3764959b Author: 丁海波 Date: Mon Mar 5 15:09:25 2018 +0800 删掉联系方式 commit f3382c4cb108390b2330eb081992d1f5881eabaf Author: 丁海波 Date: Mon Mar 5 15:03:46 2018 +0800 订单统计添加1200换行样式 commit b413b2bc75351c2d3e6a124bbaf279dfdd6bdd22 Author: php-王凡昌 Date: Mon Mar 5 14:50:33 2018 +0800 修改iOS视图样式 commit 950d62cbc0cac04700c3093d4cb10b75da59419e Author: php-王凡昌 Date: Mon Mar 5 14:19:45 2018 +0800 服务号1对1绑定 编辑代理商，忽略邮箱验证 commit 63dbe1756c60bae5c89126ad6f9d8a2bc0d18839 Author: php-王凡昌 Date: Mon Mar 5 13:41:33 2018 +0800 修复二维码 commit 67ad3bc8841131c111712b064b21ce599fefa388 Author: php-王凡昌 Date: Mon Mar 5 13:29:35 2018 +0800 修复二维码展示 commit b6dbf6b2116a2a41d5f2061f663d20bd17fb74db Author: php-王凡昌 Date: Sat Mar 3 16:50:01 2018 +0800 ajax 用户实时刷新 commit 7737e82a7666721516f52b9ef2cbcdac57b5d6bb Author: php-王凡昌 Date: Sat Mar 3 15:46:49 2018 +0800 订单统计格式修改 commit b91d8ddaac88e439ce97e2698cac9c7ea32549c8 Author: licc <45360682@qq.com> Date: Sat Mar 3 14:36:10 2018 +0800 客服消息发送状态 commit c4044d4f639fe06e2c6c1b1831fa74714bcf959f Merge: f409d0824 b5498796c Author: php-王凡昌 Date: Sat Mar 3 14:22:37 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit f409d0824d1f29dd2340cd6063989c81d4c36660 Author: php-王凡昌 Date: Sat Mar 3 14:22:24 2018 +0800 客服消息过滤 commit b5498796c4aeffbedee36a6435f8918979ab42de Author: lichong_ <1909165236@qq.com> Date: Sat Mar 3 14:16:03 2018 +0800 修改打款状态 及筛选列表 commit 44d72fc3aea52a3923bc869fda3fee21bee41f16 Author: php-王凡昌 Date: Sat Mar 3 14:12:39 2018 +0800 先关注后注册，用户统计 commit 5426a17aa5e1a780d1d4bdaa8f15574a955405f8 Author: php-王凡昌 Date: Sat Mar 3 14:08:33 2018 +0800 修复关注时数据统计 commit 470c0b44f3f8368f52a122de811b4033476260f0 Author: licc <45360682@qq.com> Date: Sat Mar 3 13:50:14 2018 +0800 新增关注时间 commit 942e696bf4587e8a9e366b02a125a13a672af9df Merge: 56d8f5169 d20b9fc07 Author: licc <45360682@qq.com> Date: Sat Mar 3 13:45:15 2018 +0800 Merge remote-tracking branch 'origin/master' commit 56d8f5169abd5af838ebb884e193b9f946c83a82 Author: licc <45360682@qq.com> Date: Sat Mar 3 13:45:04 2018 +0800 新增关注时间 commit d20b9fc07ee057cd61b3a44cd73859d85f683150 Author: lichong_ <1909165236@qq.com> Date: Sat Mar 3 13:33:01 2018 +0800 增加我的结算单，区分渠道商下面的代理商打款列表 commit 135bfafbec589a2d87c0119235f278ea88852d81 Author: php-王凡昌 Date: Sat Mar 3 12:01:58 2018 +0800 隐藏部分客服消息显示 commit cc3f881586b517058b40d2d2fa0fe03bb777b16a Author: php-王凡昌 Date: Sat Mar 3 11:55:42 2018 +0800 公告列表隐藏字段 commit 303626af777e2324eec33ecd137b3115f5a9a6d8 Merge: 596956e90 474a95c9c Author: php-王凡昌 Date: Sat Mar 3 11:54:07 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 596956e90c736dc40f1e04c70dd46ef4a97fe0dc Author: php-王凡昌 Date: Sat Mar 3 11:53:55 2018 +0800 隐藏弹窗类型 commit 474a95c9c63f831f8dc92525e2a9782822db1a4e Author: licc <45360682@qq.com> Date: Sat Mar 3 11:41:16 2018 +0800 客服消息编辑 commit 72b39f263f2254420720318d912a45317b8da32b Merge: a33c1bbd9 0050d1765 Author: licc <45360682@qq.com> Date: Sat Mar 3 11:36:31 2018 +0800 Merge remote-tracking branch 'origin/master' commit a33c1bbd90640907184801b15f84b7411a9156f2 Author: licc <45360682@qq.com> Date: Sat Mar 3 11:36:21 2018 +0800 客服消息编辑 commit 0050d1765b49cb06c8626898913f59cdd9082b34 Author: php-王凡昌 Date: Sat Mar 3 10:44:01 2018 +0800 显示级别隐藏 commit 7ed48a6dbce005539c3c87b8d04ba06a5b0d7677 Author: php-王凡昌 Date: Fri Mar 2 19:32:03 2018 +0800 修改登录背景 commit de44248f5a9e1fcffa4ce012404d3ecbbb7f65d6 Author: php-王凡昌 Date: Fri Mar 2 19:21:42 2018 +0800 icon替换 commit 669879449981271c117bb608740eb5655b9add95 Author: php-王凡昌 Date: Fri Mar 2 17:51:19 2018 +0800 打包js commit 915c877d306c4c60ede87d2e9a2ae4f68ad1ffce Author: licc <45360682@qq.com> Date: Fri Mar 2 17:33:06 2018 +0800 解决管理员查看渠道商推广链接查询不出来的问题 commit 252fedca4acaeab7db955e9e5dedf53be58f5586 Merge: e495f9ac8 7d33e9791 Author: licc <45360682@qq.com> Date: Fri Mar 2 17:14:47 2018 +0800 Merge remote-tracking branch 'origin/master' commit e495f9ac8fd301e7d96832a1f63c26d3e2809599 Author: licc <45360682@qq.com> Date: Fri Mar 2 17:14:35 2018 +0800 后台点击测试客服消息 commit 7d33e9791a9caca2efc70bfc8b08b55c1e661d42 Merge: 600ec6be8 21ee27e1f Author: php-王凡昌 Date: Fri Mar 2 14:32:18 2018 +0800 Merge branch 'dev-url3' of 192.168.0.31:fe/cps commit 600ec6be80cadb47f0465c3f534b923d857a1f45 Merge: 3350722dc ecd5f1c98 Author: licc <45360682@qq.com> Date: Fri Mar 2 14:20:12 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3350722dc4d19f765a04e1af6f3d769f4213d423 Author: licc <45360682@qq.com> Date: Fri Mar 2 14:20:02 2018 +0800 用户统计今日新增问题修改 commit 21ee27e1fdd3dc7f3d253d969e0a46ee67bf4251 Merge: ecd5f1c98 9142cdf1a Author: php-王凡昌 Date: Fri Mar 2 14:03:40 2018 +0800 Merge branch 'dev-url2' of 192.168.0.31:fe/cps into dev-url3 commit ecd5f1c98371b72c2d26f55dd4051eaf720ae5f4 Author: php-王凡昌 Date: Fri Mar 2 13:29:27 2018 +0800 底部版权信息 commit 321af314c0282bc4cf4e9d5b7219f19f501ff2b8 Merge: d7b11c0fa aab82bc6c Author: licc <45360682@qq.com> Date: Fri Mar 2 12:24:03 2018 +0800 Merge remote-tracking branch 'origin/master' commit d7b11c0fa5e2adf80ca6b949d416371f7d6a2d8c Author: licc <45360682@qq.com> Date: Fri Mar 2 12:23:54 2018 +0800 用户统计今日新增问题修改 commit aab82bc6cdf375a320422862595117c02f7058c1 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 2 12:15:25 2018 +0800 增加最近提现金额限制10元 commit 28348c13896ae5ab86e2b8d478a5b964f0821818 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 2 12:03:21 2018 +0800 提现手续费修改 commit cef03230ca013a4e7fc696ba770b32d87e3fdc6f Merge: 40502defa 46abb6420 Author: 高明阳 Date: Fri Mar 2 11:59:06 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 40502defaa8ae0d222edd3b8dc9e01bf62e7dceb Author: 高明阳 Date: Fri Mar 2 11:59:03 2018 +0800 我的结算单修复划款时间字段值 commit 9142cdf1ab5e9773d1abdbdb4d708e8e6e5157f2 Author: php-王凡昌 Date: Fri Mar 2 11:55:57 2018 +0800 重写url格式替换 commit d1d40c69e192c4262596347d2624cfd109d12d7e Author: php-王凡昌 Date: Fri Mar 2 11:53:25 2018 +0800 替换appid commit f5ea2824a34d8ba184c38d4a1858668c6ea66f9c Author: php-王凡昌 Date: Fri Mar 2 11:51:31 2018 +0800 去除ip白名单等 commit 3d6a8d63a0adfb6041b934c8a8104bb638fbc38c Author: php-王凡昌 Date: Fri Mar 2 11:49:39 2018 +0800 修改字段名 commit dac6587b80cd5461af9da20b58c2c12d19b2cdcc Author: php-王凡昌 Date: Fri Mar 2 11:37:25 2018 +0800 域名格式兼容 commit 46abb64208d500b4e36d4b49549146619618ddbe Author: licc <45360682@qq.com> Date: Fri Mar 2 11:28:38 2018 +0800 测试 commit 02b9742e4932d41e233986331a18bd555e43a257 Merge: 58780058f 2f8445e96 Author: licc <45360682@qq.com> Date: Fri Mar 2 11:27:31 2018 +0800 Merge remote-tracking branch 'origin/master' commit 58780058f0834399b10699f78cd95535594cd94c Author: licc <45360682@qq.com> Date: Fri Mar 2 11:27:20 2018 +0800 用户统计 commit c4ea180a5ac1598d07eb3cd815de36b9ac126139 Author: php-王凡昌 Date: Fri Mar 2 11:23:26 2018 +0800 授权后立即推送菜单 commit 2f8445e969795373c23cb65b5e6993618f4e7e8e Merge: 3dd17bdfc ea1533d0f Author: lichong_ <1909165236@qq.com> Date: Fri Mar 2 11:20:17 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 3dd17bdfc545007c6253d58d75c61b8569b0c747 Author: lichong_ <1909165236@qq.com> Date: Fri Mar 2 11:20:07 2018 +0800 提现金额修改 commit ea1533d0fbed24fe1c30c91003eaf1d16aaedf3c Author: licc <45360682@qq.com> Date: Fri Mar 2 11:06:42 2018 +0800 用户统计 commit 6b362465c5ee5b9714b71d716510baad41310e67 Merge: a9f8f815e 7f3d17dcd Author: licc <45360682@qq.com> Date: Fri Mar 2 10:56:46 2018 +0800 Merge remote-tracking branch 'origin/master' commit a9f8f815e6178a5f294f978fd4d3b1dcadf1bedc Author: licc <45360682@qq.com> Date: Fri Mar 2 10:56:37 2018 +0800 用户统计 commit 7f3d17dcdebde05cc567145af6c12923d0d42e64 Author: 高明阳 Date: Fri Mar 2 10:41:08 2018 +0800 update commit 7106550b5845db3a7500b47be22d7fb43bf6f4bf Merge: c574fdf85 5d19afe56 Author: php-王凡昌 Date: Fri Mar 2 10:38:55 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit c574fdf857dbcb7c5d193410c7c714b6d91639a4 Author: php-王凡昌 Date: Fri Mar 2 10:38:43 2018 +0800 屏蔽自动回复无用字段 commit 5d19afe5647de4a02240f933bbaaeebde85e7094 Author: 丁海波 Date: Fri Mar 2 10:31:50 2018 +0800 修改客服消息 修改编辑列表提交未编辑成功 commit b6268bf80a5a12a5d0bef03ef848c28c52149190 Author: licc <45360682@qq.com> Date: Fri Mar 2 10:21:22 2018 +0800 客服消息 commit beeba83a864a2810ecacd606cfb8be6de8c2c1a1 Merge: 3689ed093 492f08b78 Author: licc <45360682@qq.com> Date: Fri Mar 2 10:03:36 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3689ed093b4bebdbd35852c96036a7a8df77c54a Author: licc <45360682@qq.com> Date: Fri Mar 2 10:03:13 2018 +0800 客服消息 commit 917ab5ff7187a1302ae9da795bf8609d91697a12 Author: php-王凡昌 Date: Thu Mar 1 21:49:23 2018 +0800 修复关注时回复链接格式 commit 079b9a8b161949c6dd387a5afad383fe764c018e Author: php-王凡昌 Date: Thu Mar 1 21:33:00 2018 +0800 微信开放平台登录 commit 492f08b788d48430a26b5b4abe320d0fd7ac7611 Author: php-王凡昌 Date: Thu Mar 1 20:11:11 2018 +0800 添加资源自动选择 commit 7e267d5c42473e5a72430bddb182d10aeaca17b1 Author: php-王凡昌 Date: Thu Mar 1 18:30:29 2018 +0800 暂存 commit 4fb37d39afd0ff02f7a36852115ab7394946e6bf Merge: 7375968e5 b6919ba7f Author: 丁海波 Date: Thu Mar 1 19:44:23 2018 +0800 Merge remote-tracking branch 'origin/dev-reply' commit 7375968e5543f4fdb9393aea6b5eb658fb240aaa Author: 丁海波 Date: Thu Mar 1 18:51:37 2018 +0800 粉丝id修改 commit 7223d8e4552924f2e9ccf248c35fc32e725eb184 Author: 丁海波 Date: Thu Mar 1 18:36:47 2018 +0800 测试粉丝样式修改 commit b6919ba7fef21efe9f46fd41856e9f1155bf9c60 Author: 丁海波 Date: Thu Mar 1 18:16:06 2018 +0800 图文跳转链接修改 commit fb76f9d97e96af3f2fc21e377758d0150df7e385 Author: 丁海波 Date: Thu Mar 1 18:14:29 2018 +0800 修改图文编辑跳转链接功能 commit 1a8e2f4b72930d8b63ff862b998007ef423e5ea1 Merge: d3f2b741a 407f2cfc0 Author: licc <45360682@qq.com> Date: Thu Mar 1 18:00:55 2018 +0800 Merge remote-tracking branch 'origin/master' commit d3f2b741a2b3e59c9eb82c99c0bb207a29e205c2 Author: licc <45360682@qq.com> Date: Thu Mar 1 18:00:46 2018 +0800 客服消息 commit 407f2cfc083de0737b9c1fc92b707552b0822dd7 Author: 高明阳 Date: Thu Mar 1 16:22:39 2018 +0800 修复打款时用户账号不存在产生的报错 commit 5c0dba3303a3391b3977836ada12bd0f22ad6bff Author: php-王凡昌 Date: Thu Mar 1 16:15:08 2018 +0800 筛选 commit 6a4305548a6db643b6c909a8bc2860213ecb8dea Author: 丁海波 Date: Thu Mar 1 15:51:10 2018 +0800 pageList: [10, 25, 50, 'All'] 删除all commit c71943896f9b99a395c0210a9ce4049fe2822986 Merge: 8bf16ed33 3c74f61ff Author: 丁海波 Date: Thu Mar 1 15:33:18 2018 +0800 Merge remote-tracking branch 'origin/dev-reply' into dev-reply commit 8bf16ed33afbcc45ab654fb4c4198fb839bd24ef Author: 丁海波 Date: Thu Mar 1 15:33:05 2018 +0800 修改资源管理的跳转链接逻辑 commit 3c74f61ff7e13b34b1c4d5172cb3d2ac4a605880 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 1 15:16:10 2018 +0800 去掉作者码字 及完结页 为你推荐列表内的当前书籍 commit b86de888d4c9441092cbcd33eb50ee7c7398d50a Author: 高明阳 Date: Thu Mar 1 15:15:20 2018 +0800 我的结算单出去删除操作按钮 commit bc5325aab1e8ae86a0147d1022853da4cc753ad0 Author: php-王凡昌 Date: Thu Mar 1 15:06:24 2018 +0800 修改字符长度12个 commit 206758ecd2d5f37669d0012c091bd577a1e437a7 Author: php-王凡昌 Date: Thu Mar 1 14:57:37 2018 +0800 书籍名称&标题 多条推广 commit b7e646aa8dea88d71df8261c9f6608e7fa58a4e1 Merge: 91319b77e ec7e307c4 Author: 丁海波 Date: Thu Mar 1 14:52:30 2018 +0800 Merge remote-tracking branch 'origin/dev-reply' commit ec7e307c4785f56b8d0dad0f7447f07db4311747 Author: 丁海波 Date: Thu Mar 1 14:48:48 2018 +0800 修改多条推广id判断逻辑 commit 91319b77efb2ab6da7ea4a8430b19225e7cb1d93 Author: licc <45360682@qq.com> Date: Thu Mar 1 14:21:06 2018 +0800 关注 commit 9731ad2170aabdd8a78d51ddded97833c8604bee Merge: 88bdd3f5d 1ac63a10a Author: licc <45360682@qq.com> Date: Thu Mar 1 14:18:39 2018 +0800 Merge remote-tracking branch 'origin/master' commit 88bdd3f5df57b0930e49a1d7447bd0f39f9c7fe2 Author: licc <45360682@qq.com> Date: Thu Mar 1 14:18:25 2018 +0800 推广链接加二维码 commit 1ac63a10a77ebeebe192ff3466eaff618238d7da Author: 丁海波 Date: Thu Mar 1 14:07:05 2018 +0800 作者码字 章节完结 页面样式修改 commit 5b93ff8985dc79e8cbe76b923c659a57f9bb4384 Author: lichong_ <1909165236@qq.com> Date: Thu Mar 1 12:35:54 2018 +0800 修改样式 commit 734ce17e67a201d8cabca2cd5323e4cec8bf856b Author: lichong_ <1909165236@qq.com> Date: Thu Mar 1 12:27:33 2018 +0800 完结页和作者码字页增加为你推荐功能 commit dc416448ca4c7f46d1474e3e0e47a002821fe326 Author: 丁海波 Date: Thu Mar 1 11:33:56 2018 +0800 title编辑不可点修改 commit db0dbd5bdc023174b116a33af66b81ebbe1cc880 Author: 丁海波 Date: Thu Mar 1 11:08:23 2018 +0800 修改域名匹配逻辑 commit 425d138d8c325972dd756dc1801535c49c22bb20 Author: php-王凡昌 Date: Wed Feb 28 18:16:18 2018 +0800 重置微信服务号 commit cdf3403fce4b2d3e48d3f6d7b9c55394a4bb40a0 Merge: ad7af7cfb 4fcaecfc6 Author: licc <45360682@qq.com> Date: Wed Feb 28 17:02:11 2018 +0800 Merge remote-tracking branch 'origin/master' commit ad7af7cfbcb1947764005e2cd2c58313acae0c87 Author: licc <45360682@qq.com> Date: Wed Feb 28 17:02:00 2018 +0800 推广链接加二维码 commit 4fcaecfc6e1810354edd5144130cd714fb0c114e Author: php-王凡昌 Date: Wed Feb 28 15:42:47 2018 +0800 多条推广展示样式 commit 3600367b308bf98f6516ab340b390429f5c4e694 Author: licc <45360682@qq.com> Date: Wed Feb 28 15:16:38 2018 +0800 推广链接加此推广链接下的订单详情查看 commit 516b7c63e07e70f13086717aaf65d66b372610ca Author: php-王凡昌 Date: Wed Feb 28 14:46:51 2018 +0800 推广链接数据统计 commit 4e848848cb9e75e6c609f0a4fe0fdab3dfc2a03e Author: licc <45360682@qq.com> Date: Wed Feb 28 13:55:16 2018 +0800 订单明细支付状态添加颜色和选择搜索，渠道商->统计->更多添加推广链接 commit 0e65ffa17e8ce3f5dedf640ad7886d6388373bfe Author: licc <45360682@qq.com> Date: Wed Feb 28 12:19:38 2018 +0800 订单明细支付状态添加颜色和选择搜索，渠道商->统计->更多添加推广链接 commit c282b2a22f47eb90becbed3a553b271fa6e47aeb Author: licc <45360682@qq.com> Date: Tue Feb 27 16:10:17 2018 +0800 统计页面换行问题 commit c4584fe335f90e0315fc4f1cdf291d83ad773dce Author: licc <45360682@qq.com> Date: Tue Feb 27 15:40:18 2018 +0800 统计页面换行问题 commit 6722922b53676f1c1569adaa69398ace5200bf45 Author: licc <45360682@qq.com> Date: Tue Feb 27 15:38:09 2018 +0800 改sql避免高并发数据统计错误 commit cf6d620ce23ab1b6764798a4f7d7f75cc0fd5cb5 Author: licc <45360682@qq.com> Date: Tue Feb 27 15:33:46 2018 +0800 改sql避免高并发数据统计错误 commit 67b0ffd4d87d990e12ce705459ce032d1978aca7 Author: licc <45360682@qq.com> Date: Tue Feb 27 13:51:44 2018 +0800 改sql避免高并发数据统计错误 commit 10ad5dab1c2558d30ade5571f5fee6875498d7dd Author: licc <45360682@qq.com> Date: Tue Feb 27 12:06:48 2018 +0800 注释 commit 8f467a5c9c43907834358e44b141f88df3d06f56 Author: licc <45360682@qq.com> Date: Tue Feb 27 12:02:37 2018 +0800 添加注释 commit 601f45a0f355e218ed9136cfef0470e356b12610 Author: licc <45360682@qq.com> Date: Tue Feb 27 10:19:23 2018 +0800 添加注释 commit c0cafc1fc348428a882ddf288e8423b502121cc6 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 26 14:52:37 2018 +0800 修改首页显示标题 commit 1ceff2ffbecc4c05b6126ec631f08ef61a8f4a3f Author: 高明阳 Date: Sun Feb 11 16:27:09 2018 +0800 update commit 88a6ae7412eba80ec68beb9dbeed00599c2a517d Author: 高明阳 Date: Sun Feb 11 16:12:59 2018 +0800 更新接口 commit a6b888c938dbe40eb423c6786569757f07881a55 Author: 高明阳 Date: Sun Feb 11 16:08:51 2018 +0800 update commit 05676bf994c3b0923c8b2c62941a14ea86052010 Author: 高明阳 Date: Sun Feb 11 15:50:34 2018 +0800 update commit 5f49adc9a550519224df5917ec66141efbe7f89d Author: 高明阳 Date: Sun Feb 11 15:37:12 2018 +0800 update commit 1bc5e517c8a588c37ec218dd5ceffb17ace802d9 Merge: 1666ebc48 45bd2d77a Author: 丁海波 Date: Sun Feb 11 15:06:51 2018 +0800 Merge remote-tracking branch 'origin/master' commit 1666ebc48086d3844d7c269020f66efaca63db23 Author: 丁海波 Date: Sun Feb 11 15:06:47 2018 +0800 小数点保留后两位 commit 45bd2d77a5799b1dbb7ae1a608b85982e8644203 Merge: f263a67bb cd4546a90 Author: 高明阳 Date: Sun Feb 11 14:45:50 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit f263a67bb47abbf2f90394b2022abf1d8e1d80b8 Author: 高明阳 Date: Sun Feb 11 14:45:44 2018 +0800 update commit 4358d5aad62856d6db46a9bfc996360a000c970c Author: 高明阳 Date: Sun Feb 11 14:45:19 2018 +0800 update commit cd4546a905715bd4b4c31684fbd0a6afac19fa21 Author: 丁海波 Date: Sun Feb 11 14:29:44 2018 +0800 数据统计保留小数点后两位 commit 5c5d38ddc9bd20a3a6b312db5d81a4c0b95c4052 Merge: 5724a38ec dc06ba93d Author: 丁海波 Date: Sun Feb 11 14:14:00 2018 +0800 Merge remote-tracking branch 'origin/master' commit 5724a38ec56a0c1beeb6602c3b596a6ac870f4eb Author: 丁海波 Date: Sun Feb 11 14:13:52 2018 +0800 修改log地址 https://log.koread.cn commit dc06ba93d3160f66347f407dc56bd7bae03d3527 Author: 高明阳 Date: Sun Feb 11 14:13:38 2018 +0800 书籍更新接口update commit d006f0b050aeba5c9664795638ed2de450c11152 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 11 14:04:28 2018 +0800 提现- 含手续费 commit 7f09388f9b902f873585103d1ac334977d4a2e74 Author: php-王凡昌 Date: Sun Feb 11 02:23:20 2018 +0800 修改302语法 修改绑定redis时间 commit 4cd8025884b7297857214759d29a572d7a59a9f5 Author: php-王凡昌 Date: Sat Feb 10 23:28:52 2018 +0800 创建用户使用redis分布式锁 commit 634203575898c11911bde6c640cf756a260a068b Merge: 3011668df 561dab55d Author: 高明阳 Date: Sat Feb 10 20:49:13 2018 +0800 解决冲突 commit 3011668df046b11af01fa30de78be33eb03cde54 Author: 高明阳 Date: Sat Feb 10 20:46:22 2018 +0800 update commit 561dab55d5de5d2bfbd6cd328276ae741ef4782b Merge: 80f765e04 a55cc5417 Author: lichong_ <1909165236@qq.com> Date: Sat Feb 10 20:42:05 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps Conflicts: public/assets/js/backend/withdraw.js commit 80f765e04a12623651ea59851453323967746eba Author: lichong_ <1909165236@qq.com> Date: Sat Feb 10 20:40:48 2018 +0800 申请提现 commit a55cc5417fff1141dc97c37c024e8b5f02d28bdb Merge: 568ee3084 fe4c6a07f Author: licc <45360682@qq.com> Date: Sat Feb 10 19:15:20 2018 +0800 Merge remote-tracking branch 'origin/master' commit 568ee308401cd64740dae222ae3778f857545046 Author: licc <45360682@qq.com> Date: Sat Feb 10 19:15:11 2018 +0800 加功能 commit fe4c6a07f3ea0a270b81aae2b324d7abd84e62e4 Author: php-王凡昌 Date: Sat Feb 10 19:03:46 2018 +0800 导粉二维码提示文字修改 commit 12fc415ce4b794c46d2ae61c079d10d345293d0d Author: licc <45360682@qq.com> Date: Sat Feb 10 18:28:31 2018 +0800 加功能 commit 12d155afdff8577c96bf8ba5caa7a39eee420297 Author: licc <45360682@qq.com> Date: Sat Feb 10 18:20:08 2018 +0800 加功能 commit 18ca9bafd64854bc8eae183d9268b1bc21de353e Merge: 6b82a88d4 842360995 Author: licc <45360682@qq.com> Date: Sat Feb 10 17:52:26 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6b82a88d45cca4e204d049b6dcb16c6df3114b69 Author: licc <45360682@qq.com> Date: Sat Feb 10 17:52:16 2018 +0800 加功能 commit 8423609950f2d4e768bd281ffbca3461756b2183 Author: 丁海波 Date: Sat Feb 10 17:05:03 2018 +0800 单条推广 多条推广样式修改 commit 2f48fcba3d428fa5ac1b31acee0e88bc0f575d6b Author: 丁海波 Date: Sat Feb 10 17:01:00 2018 +0800 数据列表样式修改 commit 4c6e64ca54533fd4f37be8e724f1c8af89491ef9 Author: 丁海波 Date: Sat Feb 10 16:54:37 2018 +0800 修改列表样式 commit 1783c5dbbd57834cb18943edd41590c5d9870b98 Author: 丁海波 Date: Sat Feb 10 16:36:50 2018 +0800 数据统计样式修改 commit b7825a0b77d69c22048d1463c2cc2d3d9c87ab43 Merge: 047746c42 7a4108ac5 Author: 丁海波 Date: Sat Feb 10 16:29:50 2018 +0800 Merge remote-tracking branch 'origin/master' commit 047746c423ae6922ff24f71da9f6f5ce9a7acf69 Author: 丁海波 Date: Sat Feb 10 16:29:45 2018 +0800 修改近日统计手机样式 commit 7a4108ac530938c34f568b7976cd716d2c7718d3 Merge: ad62ebde1 3459c1659 Author: 高明阳 Date: Sat Feb 10 16:17:03 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit ad62ebde1c59335a4cfdc5140f2e3734acbaabcc Author: 高明阳 Date: Sat Feb 10 16:16:57 2018 +0800 update commit 3459c165908b495a55908ffdfd636df8eaa2a51e Author: php-王凡昌 Date: Sat Feb 10 16:16:36 2018 +0800 删除多余model类 commit 82031745d84eaddcaf0ab4d7711442b84a3492cb Author: php-王凡昌 Date: Sat Feb 10 16:01:56 2018 +0800 修复代码 commit 80b33876e523996d50d08cec858cfbba1dcf5d67 Author: php-王凡昌 Date: Sat Feb 10 15:55:27 2018 +0800 错误推送 commit e85f1dcb9e295fe0558dfef6d32568e9fad68057 Merge: dadf1cf3b 7be26f176 Author: php-王凡昌 Date: Sat Feb 10 15:53:52 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit dadf1cf3b85242f093036bce1134f0f866c585d9 Author: php-王凡昌 Date: Sat Feb 10 15:53:43 2018 +0800 取消充值推送， 自动下单 commit 7be26f176ea5cba0ab81127a896097e893119d7e Author: 高明阳 Date: Sat Feb 10 15:18:06 2018 +0800 fixbug commit acd85542b4c1f6b3d38cd26fe633095d64eef38b Merge: d1f60b877 ec77368f1 Author: licc <45360682@qq.com> Date: Sat Feb 10 15:09:22 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # application/admin/controller/Withdraw.php # application/admin/lang/zh-cn/withdraw.php # public/assets/js/backend/withdraw.js commit d1f60b877bc853bbd78f261f424e667c07ff1035 Author: licc <45360682@qq.com> Date: Sat Feb 10 15:07:35 2018 +0800 加功能 commit 40ed126c29f8d029ce472d534b34946ad046f740 Author: licc <45360682@qq.com> Date: Sat Feb 10 15:06:29 2018 +0800 加功能 commit ec77368f103e26c6d707f95863e6e16b0a439c70 Author: lichong_ <1909165236@qq.com> Date: Sat Feb 10 14:56:43 2018 +0800 修改adminconfig获取方式 增加 至frontend方法里面 commit eff9c048cd68986322f280166fd4a705da89ca89 Author: php-王凡昌 Date: Sat Feb 10 14:46:16 2018 +0800 修正cookie key commit b18b05b6cec9acab79612c5647fa74bbc3441e26 Author: 丁海波 Date: Sat Feb 10 14:44:23 2018 +0800 订单统计样式修改 commit 1e7e1e3065af9cadc79f51057dc3c121175d34f3 Author: 丁海波 Date: Sat Feb 10 14:40:21 2018 +0800 订单统计样式修改 commit 2cd459a76fa6b03d8e2c88862a4a9122155f0242 Author: php-王凡昌 Date: Sat Feb 10 14:39:21 2018 +0800 增加充值appid校验 commit 9ee67a6b8052e91cc508ac18ff0dd20d6938c147 Author: php-王凡昌 Date: Sat Feb 10 14:28:47 2018 +0800 管理员章节vip标志 commit 7bcca46622174bb58f1261d5517837138e7db2d7 Author: php-王凡昌 Date: Sat Feb 10 14:23:02 2018 +0800 小说中心，收费章节禁止操作，查看 commit bad939914de1db7316cc2ea03684329fb1ae43a7 Author: php-王凡昌 Date: Sat Feb 10 14:06:38 2018 +0800 小说中心预览章节 commit 4c76c1a930d5f28c17a258921c1784a27cddccbc Author: php-王凡昌 Date: Sat Feb 10 14:01:59 2018 +0800 书籍默认排序按照idx倒序 commit 612c80919606b372504d459dd51d399d348e7a43 Author: php-王凡昌 Date: Sat Feb 10 13:51:26 2018 +0800 获取用户失败，自动推荐一本书 commit 591d527bfacc383a58c20aa9743f9c55e0af803e Author: php-王凡昌 Date: Sat Feb 10 13:21:58 2018 +0800 提现 commit 53898c76c72b2d4204dd517c0ffcad101325d537 Author: licc <45360682@qq.com> Date: Sat Feb 10 12:06:01 2018 +0800 线上调试 commit e200a7e461cd8c1b9f0d32b1e6e070be10f687ee Author: licc <45360682@qq.com> Date: Sat Feb 10 11:51:35 2018 +0800 线上调试 commit 7f0bbf645993b941e46c34fe50bf87c983d24af9 Author: licc <45360682@qq.com> Date: Sat Feb 10 11:45:11 2018 +0800 线上调试 commit 30445aa1505d4b63596257ecf8f392202b40729a Author: licc <45360682@qq.com> Date: Sat Feb 10 11:27:59 2018 +0800 线上调试 commit 51c5ee2f75ca3570e2fd99ef0babfd6281a95091 Author: licc <45360682@qq.com> Date: Sat Feb 10 10:43:09 2018 +0800 线上调试 commit f69f5da0fed9843d6874bcf88b90da6bc578b527 Author: licc <45360682@qq.com> Date: Sat Feb 10 10:42:01 2018 +0800 线上调试 commit 26c4b7c79c83176abdd2f64cb8ab8e094c46fcff Author: licc <45360682@qq.com> Date: Fri Feb 9 22:53:10 2018 +0800 线上调试 commit 49e6df623fed94e4b20a6b613d3ab3162ccaddeb Author: licc <45360682@qq.com> Date: Fri Feb 9 22:48:52 2018 +0800 线上调试 commit 579ff56aecc066c646796e31a303ebecd183cc48 Author: licc <45360682@qq.com> Date: Fri Feb 9 22:41:47 2018 +0800 线上调试 commit c01245c6b59476e0315f508076591ed5fbf4e8a0 Author: licc <45360682@qq.com> Date: Fri Feb 9 22:38:26 2018 +0800 线上调试 commit 2fd678e4b506a95cfa06d18986fe524bbdf110ab Author: licc <45360682@qq.com> Date: Fri Feb 9 22:32:14 2018 +0800 线上调试 commit 00f0990c8c44922d79b148d17d9d6cfe5b49a615 Author: licc <45360682@qq.com> Date: Fri Feb 9 22:25:15 2018 +0800 线上调试 commit 11a1d68f0689aa685ce4353c9b1547fa4c2f8a1a Author: licc <45360682@qq.com> Date: Fri Feb 9 22:06:21 2018 +0800 线上调试 commit 89e8a672297aedeb4d77d8cda9f66568071c1969 Merge: fb1ef44b2 246b9c34e Author: licc <45360682@qq.com> Date: Fri Feb 9 21:41:14 2018 +0800 Merge remote-tracking branch 'origin/master' commit 246b9c34e8630676b61860c8272ad7d250a8aecb Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 21:41:38 2018 +0800 修改背景字体 commit fb1ef44b21efe3094fd2ac9a61dd791bbfc991b9 Author: licc <45360682@qq.com> Date: Fri Feb 9 21:41:01 2018 +0800 线上调试 commit a59c92c47b771c88efd19c81524d871f69337fae Author: licc <45360682@qq.com> Date: Fri Feb 9 21:08:16 2018 +0800 线上调试 commit 1a59362627d601d687e87ebe45691d5a4f10d6eb Author: licc <45360682@qq.com> Date: Fri Feb 9 21:00:40 2018 +0800 线上调试 commit 8828cd03da982e09e4a8ad99e7b88080f5bfa87d Merge: 611256da0 50718a6c0 Author: licc <45360682@qq.com> Date: Fri Feb 9 20:56:40 2018 +0800 Merge remote-tracking branch 'origin/master' commit 611256da0050ab573d6083eae2c8c2d700983c3b Author: licc <45360682@qq.com> Date: Fri Feb 9 20:56:27 2018 +0800 线上调试 commit 50718a6c05249b226ca641784158abf31b6ab0e8 Author: php-王凡昌 Date: Fri Feb 9 20:54:52 2018 +0800 修改充值条款 commit 5a19a15640d17bed8f8c48ee6f47cf5eb420ac2b Merge: 0de0fde6b 839cce1e1 Author: licc <45360682@qq.com> Date: Fri Feb 9 20:52:01 2018 +0800 Merge remote-tracking branch 'origin/master' commit 0de0fde6b899037d58a090f57164c376c47c80eb Author: licc <45360682@qq.com> Date: Fri Feb 9 20:51:15 2018 +0800 线上调试 commit 839cce1e1e02198c2f21742d137265b57ae0e9b5 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 20:19:41 2018 +0800 清除缓存key commit 4b66e99acbae65f4f8731b11fa57ea109725c9cf Author: licc <45360682@qq.com> Date: Fri Feb 9 20:02:28 2018 +0800 线上调试 commit 60de64c40be6476b4a9496ad71e000a41e50642b Merge: 330de604e 07845a4e0 Author: licc <45360682@qq.com> Date: Fri Feb 9 19:48:42 2018 +0800 Merge remote-tracking branch 'origin/master' commit 330de604e59168e87822b99243e01d3b29f3c226 Author: licc <45360682@qq.com> Date: Fri Feb 9 19:48:30 2018 +0800 测试结束 commit 07845a4e000538478b23f5b9ad74ffd4077ee62a Author: php-王凡昌 Date: Fri Feb 9 19:02:44 2018 +0800 关注回复 commit 37ecc46f1cd858253450f84409cf3534b8bd4475 Author: php-王凡昌 Date: Fri Feb 9 18:59:56 2018 +0800 查询自动回复log commit 1c4c16527dd6c99c49f55347e20cb84046e66602 Author: php-王凡昌 Date: Fri Feb 9 18:54:49 2018 +0800 Jump commit a9a5da45e7f26a96beae9458f911f36b6aa8cebb Author: 丁海波 Date: Fri Feb 9 18:38:12 2018 +0800 css js 加版本号 commit 6f2142183d2a47dc1eecb6a2fe62b9bea688e14b Merge: 844d06e3a c74bb326c Author: 高明阳 Date: Fri Feb 9 18:36:56 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 844d06e3a2b30488640c8d2e09658585207f4192 Author: 高明阳 Date: Fri Feb 9 18:36:50 2018 +0800 接口加log commit c74bb326c32f2fdb92c595dde6b981d2bd53fd50 Merge: 40d065bba 8da6b0657 Author: licc <45360682@qq.com> Date: Fri Feb 9 18:34:09 2018 +0800 Merge remote-tracking branch 'origin/master' commit 40d065bba55f65806b3a8cd2c7dca2b74b1eed19 Author: licc <45360682@qq.com> Date: Fri Feb 9 18:33:55 2018 +0800 测试结束 commit 8da6b0657c585c2e27055cfb27430f40a187bd78 Author: php-王凡昌 Date: Fri Feb 9 18:25:19 2018 +0800 书籍别名 commit 3e55b8bdc6efcedb9ceec203da2b3f8b0c69ed31 Author: 丁海波 Date: Fri Feb 9 18:11:56 2018 +0800 夜间模式下一章按钮样式修改 commit b6c9e6bedc51ac5c9ddbac6451d662237c2e4432 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 18:08:46 2018 +0800 增加阅读记录 commit 2a49c6c23bca90a58d2d423692a2eab33e97e5ed Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 17:47:06 2018 +0800 recharge 页面加入adminconfig传参 commit c1074e4e767ed034dfa6783cc543816916acaafe Merge: 598b3d6f3 28caf13a5 Author: 高明阳 Date: Fri Feb 9 17:39:47 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 598b3d6f3ed77bfa750c7c9f82195f970380d324 Author: 高明阳 Date: Fri Feb 9 17:39:40 2018 +0800 书籍信息更新接口 commit 28caf13a5c7dcc82a9a4a7882f4aa10e16bbe9d4 Author: php-王凡昌 Date: Fri Feb 9 17:39:15 2018 +0800 ajax替换处理 commit 5d7884657f23944a796690cd6ae1b49bbc0eebab Merge: 23988b198 d55233db2 Author: licc <45360682@qq.com> Date: Fri Feb 9 17:31:23 2018 +0800 Merge remote-tracking branch 'origin/master' commit 23988b198285d348668def19a8c809afd3af96f1 Author: licc <45360682@qq.com> Date: Fri Feb 9 17:31:10 2018 +0800 测试结束 commit d55233db29ed9b0e8cb2f259eedf8d5495da1330 Author: php-王凡昌 Date: Fri Feb 9 17:25:56 2018 +0800 微信ip白名单 commit 9a9b88659e597a852a265fd5b8632ee4e8863f95 Author: licc <45360682@qq.com> Date: Fri Feb 9 17:23:19 2018 +0800 测试结束 commit b50e7e753c3b6a2bd3dd7db076b209eb98e1f5dd Author: licc <45360682@qq.com> Date: Fri Feb 9 17:20:34 2018 +0800 测试结束 commit ea3ac8e1dc572c44c7c7762950b2012f74ff57cd Author: licc <45360682@qq.com> Date: Fri Feb 9 17:18:02 2018 +0800 测试结束 commit 92c7e747d2f1caf3ce5f01fb09f6027cc859e532 Author: licc <45360682@qq.com> Date: Fri Feb 9 17:14:08 2018 +0800 测试结束 commit dff5732803088152f81909716b1b71b8e7258fc2 Author: licc <45360682@qq.com> Date: Fri Feb 9 17:05:48 2018 +0800 测试结束 commit 03060509819d1e1d92bf534f30250e13bbc11fbb Merge: a25c7302e 46c20365c Author: licc <45360682@qq.com> Date: Fri Feb 9 17:01:37 2018 +0800 Merge remote-tracking branch 'origin/master' commit a25c7302e2bbfc8b10291a352c2ad032ee158e7f Author: licc <45360682@qq.com> Date: Fri Feb 9 17:01:26 2018 +0800 测试结束 commit 46c20365cf14d5784991a10e0e4b32c02c7ab538 Author: php-王凡昌 Date: Fri Feb 9 16:34:29 2018 +0800 关注自动回复 commit d5a3cd4eea19e4b6c4c704a0b5dfab9c7b2d0f40 Author: 高明阳 Date: Fri Feb 9 16:31:05 2018 +0800 推送多条解决 commit 13965d332b36d8d67a6b6e9673685558947faf0c Merge: 95a3a9488 f14513276 Author: 丁海波 Date: Fri Feb 9 16:00:44 2018 +0800 Merge remote-tracking branch 'origin/master' commit 95a3a94887c1bff3b136907be3d9da698fda00ec Author: 丁海波 Date: Fri Feb 9 16:00:36 2018 +0800 首页样式修改 commit f14513276600f3d0608cf7f7a6be5a72978144a8 Merge: 9780d5661 dc46ced3b Author: licc <45360682@qq.com> Date: Fri Feb 9 15:57:49 2018 +0800 Merge remote-tracking branch 'origin/master' commit 9780d56619ba9feaf4be20b61d29680e9db69de8 Author: licc <45360682@qq.com> Date: Fri Feb 9 15:57:37 2018 +0800 测试结束 commit dc46ced3b7823de3f02f8fc241a90a627030c635 Merge: d46d91a15 049e5c6fe Author: 丁海波 Date: Fri Feb 9 15:54:14 2018 +0800 Merge remote-tracking branch 'origin/master' commit d46d91a158dd9cf3d65838ebdee445b48ab81018 Author: 丁海波 Date: Fri Feb 9 15:54:06 2018 +0800 自动回复 首页修改 commit 049e5c6feb488163b0424127f17b82e4ca139340 Author: licc <45360682@qq.com> Date: Fri Feb 9 15:40:54 2018 +0800 测试 commit 4b8e56208feb8c50d7c68b4ef5ad875e33f75c20 Merge: 1a4adbed3 065bf24df Author: licc <45360682@qq.com> Date: Fri Feb 9 15:38:54 2018 +0800 Merge remote-tracking branch 'origin/master' commit 1a4adbed37c07ac9b139de1d3deb69e5941d831d Author: licc <45360682@qq.com> Date: Fri Feb 9 15:38:42 2018 +0800 去掉充值成功用户数维护 commit 065bf24df05e8280c82365b7b6ec5103ce8f7d63 Author: 丁海波 Date: Fri Feb 9 15:32:52 2018 +0800 文本添加插入默认关注回复按钮 commit bbc20394a8a7699a8153e8328d178b3d3b83829a Merge: 5a453be30 2cd3abed8 Author: licc <45360682@qq.com> Date: Fri Feb 9 15:21:09 2018 +0800 Merge remote-tracking branch 'origin/master' commit 5a453be3075fb1e1250cc255789e7cb74c431e95 Author: licc <45360682@qq.com> Date: Fri Feb 9 15:20:56 2018 +0800 去掉充值成功用户数维护 commit 2cd3abed8405bb3772db220b30cbf1f9493b14a7 Author: php-王凡昌 Date: Fri Feb 9 15:12:29 2018 +0800 修改菜单及默认客服消息 commit 7c14b7f010448857da85eeed74464c217bea4450 Merge: d5b1a824a 9ce173bb8 Author: 丁海波 Date: Fri Feb 9 14:59:55 2018 +0800 Merge remote-tracking branch 'origin/master' commit d5b1a824aaf26bebff036b2f2a2ca54647db455d Author: 丁海波 Date: Fri Feb 9 14:59:40 2018 +0800 修改后台首页样式 commit 9ce173bb81f8cb6bd01ee6f38591e710e0faa76a Merge: 3ba741b8d 96bdd1470 Author: licc <45360682@qq.com> Date: Fri Feb 9 14:57:22 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3ba741b8d02d88213afe23b02cf781e804e77295 Author: licc <45360682@qq.com> Date: Fri Feb 9 14:57:09 2018 +0800 测试数据 commit 96bdd147041f0f4303eb11210d8e79da165668df Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 14:44:33 2018 +0800 用户模块查询信息更新 commit d38659aad8296972895aed6248395e8809271762 Merge: 896aec53b 78624d46c Author: 高明阳 Date: Fri Feb 9 14:33:53 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 896aec53b2e8e8d2a190334418675d2f8b4343f4 Author: 高明阳 Date: Fri Feb 9 14:33:48 2018 +0800 update commit 78624d46c9d46af9a4b5b99af09ad3bd1a98966a Merge: 25288d3cb 6c72dd814 Author: licc <45360682@qq.com> Date: Fri Feb 9 14:10:19 2018 +0800 Merge remote-tracking branch 'origin/master' commit 25288d3cbd8660bd2e4d089e154021a18c74b118 Author: licc <45360682@qq.com> Date: Fri Feb 9 14:10:09 2018 +0800 测试 commit 6c72dd81432aa19f37d6926d79ee09ce81293314 Author: 高明阳 Date: Fri Feb 9 13:59:41 2018 +0800 多条推送按钮权限增加 commit 71fda45adbb66e0cfa3b1482ab0141a0f45a263b Author: licc <45360682@qq.com> Date: Fri Feb 9 12:08:47 2018 +0800 测试 commit aa0bbbe2439b4638b48a9ec0a5e49c9db7da9ce9 Merge: a42415af7 45309a386 Author: licc <45360682@qq.com> Date: Fri Feb 9 12:02:53 2018 +0800 Merge remote-tracking branch 'origin/master' commit a42415af7878865279902aa0aae98359e735ae66 Author: licc <45360682@qq.com> Date: Fri Feb 9 12:02:43 2018 +0800 测试 commit 45309a386229ed84fc48d2979af3faa0cc332e6b Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 11:58:57 2018 +0800 首页性别获取 commit 90c152f830b9b183276077b3763bb762924b2d38 Merge: b500a157e 05da4b5b4 Author: licc <45360682@qq.com> Date: Fri Feb 9 11:51:25 2018 +0800 Merge remote-tracking branch 'origin/master' commit b500a157e63e5b5ade57582576fe2d26c94baefa Author: licc <45360682@qq.com> Date: Fri Feb 9 11:51:13 2018 +0800 测试 commit 05da4b5b4b20ce32bc0f6791ddda3223d2a4955e Merge: 5e0213da3 3feb99a2a Author: 高明阳 Date: Fri Feb 9 11:46:09 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 5e0213da341681699ff49d79f92e574ea4b6bd3d Author: 高明阳 Date: Fri Feb 9 11:46:06 2018 +0800 update commit 3feb99a2a58dcc96ecc3a17e55b210129209996b Merge: d6dffc446 029bdc1d7 Author: 丁海波 Date: Fri Feb 9 11:39:40 2018 +0800 Merge remote-tracking branch 'origin/master' commit d6dffc4468c10c9d4dcf8df707a01964149c4853 Author: 丁海波 Date: Fri Feb 9 11:39:32 2018 +0800 vip样式修改 commit 029bdc1d7aeccc40ab2ea12a19ad3ecacd4fc5b0 Merge: d213bc6eb 68570c23f Author: licc <45360682@qq.com> Date: Fri Feb 9 11:32:25 2018 +0800 Merge remote-tracking branch 'origin/master' commit d213bc6eb5a699b8d69742368f9cd4c252a8e5cd Author: licc <45360682@qq.com> Date: Fri Feb 9 11:32:12 2018 +0800 测试 commit 68570c23f0b1e57dd6df36848a10aae72cd01916 Author: 丁海波 Date: Fri Feb 9 11:31:52 2018 +0800 vip边框样式修改 commit e298b50b6926f9117b7657fa0a3718e0f35cffd6 Author: 丁海波 Date: Fri Feb 9 11:22:43 2018 +0800 个人中心vip样式修改 commit 043b71fb12b442ba216babdb67330eba454f2814 Author: 高明阳 Date: Fri Feb 9 11:17:06 2018 +0800 fixbug commit 0eac4d7834207fad7b8d877c16514c7ae1e73528 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 01:10:32 2018 +0800 adminconfig信息获取方式修改 commit 019e88da0c292b2164f799785cdc5e406481916e Author: 高明阳 Date: Fri Feb 9 01:02:46 2018 +0800 update commit 394a61ca510761675b927dd570a4709c0835a486 Merge: ad6fa6d92 45110a27a Author: 高明阳 Date: Fri Feb 9 01:01:11 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit ad6fa6d926b6e5f6abb2ff0e7b46d45e65633882 Author: 高明阳 Date: Fri Feb 9 01:01:07 2018 +0800 update commit 45110a27ac4fe4b55efad32ab679d81cbb5ccfa7 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 01:00:12 2018 +0800 修改性别获取 commit 5c51e177cba6f938b7784b1fba00f437d353a49d Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 00:51:59 2018 +0800 首页性别 导航处理 commit 4ec825cca48ea9874b75af6aa1c5fb3c080aae20 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 00:50:40 2018 +0800 修改最近阅读导航栏展示顺序 commit 96da11b60ce2fc4639a64f65a138a114dc5f538a Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 00:45:52 2018 +0800 阅读页加admin_id commit 451ee26f70bde6623f421cec0b726478ae9c510b Author: licc <45360682@qq.com> Date: Fri Feb 9 00:33:27 2018 +0800 测试 commit c455af44e624eb8e0531c419fb3284213f45d5fb Merge: c437e172c 9f3847439 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:33:08 2018 +0800 Merge remote-tracking branch 'origin/master' commit c437e172c43f3f0b5281ab8db3fe62017d7f8ea5 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:33:00 2018 +0800 测试 commit 9f3847439caca0307e083ba7fd24854609d383ff Author: 高明阳 Date: Fri Feb 9 00:28:55 2018 +0800 多条推广链接推送功能 commit 87c1611530f9e308a9e84555a74661f9b9e24f47 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 00:26:32 2018 +0800 修改首页bug commit 8fea35a7844300616d1f33406e5501318ad41ed8 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:24:14 2018 +0800 测试 commit d331d57065ff7087dc6ef8354a7882fb8de43e44 Merge: cecb9938e 400ce01a9 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:22:24 2018 +0800 Merge remote-tracking branch 'origin/master' commit 400ce01a943eb96c3a33083bd60bcfcbff5ad61a Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 00:22:51 2018 +0800 导航分性别展示 commit cecb9938ed877a33af05be1eed0bf00f7eb1900a Author: licc <45360682@qq.com> Date: Fri Feb 9 00:22:16 2018 +0800 测试 commit b209bc18dcb3250853fd0e07c85310d7470d9c5b Merge: eadcc21eb 6e2118760 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:18:30 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6e21187600b0400de9af4061d9743e613fb0a509 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 9 00:18:29 2018 +0800 调整菜单展示 commit eadcc21ebdb127fcbfcd822f5a25836975d2aee9 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:18:21 2018 +0800 测试 commit 4cae4a185f708f6ce388dd228c6862db9421c294 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:12:11 2018 +0800 测试 commit a43610f79a67fe8dbe9a6b42cf1ff16ea0b53326 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:08:34 2018 +0800 测试 commit 417aa371bc247773494b9e6d1aa8175028674425 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:02:46 2018 +0800 测试 commit 91538d6b5806d7f2adc132cbfe0650c70a8abae3 Author: licc <45360682@qq.com> Date: Fri Feb 9 00:02:27 2018 +0800 测试 commit eb8c4205ee6996eb1712d1a5803b276bb7e6f5b7 Author: licc <45360682@qq.com> Date: Thu Feb 8 23:57:58 2018 +0800 测试 commit ef748fefb56acd954c39e32df6fab00b22022ae0 Author: licc <45360682@qq.com> Date: Thu Feb 8 23:24:00 2018 +0800 充值成功人数 commit 82f8408d180db371efae89d1aca7104f74b3bde9 Merge: 63acfe311 29cd1ecde Author: licc <45360682@qq.com> Date: Thu Feb 8 23:10:06 2018 +0800 Merge remote-tracking branch 'origin/master' commit 63acfe311bff50bee9d364c82884656fb90272e0 Author: licc <45360682@qq.com> Date: Thu Feb 8 23:09:50 2018 +0800 充值成功人数 commit 29cd1ecde796802e809cbc3890407f679eb2d374 Author: php-王凡昌 Date: Thu Feb 8 23:08:43 2018 +0800 底部二维码&客服消息 commit 80732ebcc10b4d3eeaad4e37e8087cf6ca041480 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 23:07:46 2018 +0800 修改点击数 commit 48347979ffc86589956d83e7c64bb645c97076e9 Author: 丁海波 Date: Thu Feb 8 23:04:00 2018 +0800 菜单加弹出菜单 commit 006161024f1f6cc59d1d79e243616a83a2da2220 Author: 丁海波 Date: Thu Feb 8 22:57:21 2018 +0800 书籍详情字数 点击字体改为14px commit b16e9f2a50324ed29d4760d082bd7f6827abc630 Author: 丁海波 Date: Thu Feb 8 22:55:20 2018 +0800 书籍详情图片靠上点 commit c9c8cbb2a4e41fca7c7c8c3f54d659828b5d1dc0 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 22:49:16 2018 +0800 商品编辑 commit 2624fcc744c28a4d6a35ac0e46845931917e4f83 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 22:48:48 2018 +0800 商品编辑bug修改 commit a87c4171299df0c8ad3dfd530cdc3fc602751498 Merge: bf64160f9 74318d992 Author: licc <45360682@qq.com> Date: Thu Feb 8 22:31:44 2018 +0800 Merge remote-tracking branch 'origin/master' commit bf64160f94e4e290574e84d5cb33b710a88159b6 Author: licc <45360682@qq.com> Date: Thu Feb 8 22:31:35 2018 +0800 充值成功人数 commit 74318d992927609f7efdcac066500f77ee441eba Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 22:30:55 2018 +0800 后台页面样式修改 commit 518f684d3c5946d7ec1d5bfeda6533b335f42a58 Merge: ab2961765 12270dc8f Author: licc <45360682@qq.com> Date: Thu Feb 8 22:26:14 2018 +0800 Merge remote-tracking branch 'origin/master' commit ab2961765f660f2a7d44117194c0eec0521b1e6e Author: licc <45360682@qq.com> Date: Thu Feb 8 22:26:06 2018 +0800 充值成功人数 commit 12270dc8f636439c9a2fbf918389b00a1a93cd64 Author: 高明阳 Date: Thu Feb 8 22:25:15 2018 +0800 update commit cc7012fb71252652170ab6d7398642befec1647c Merge: c8a7dc261 15c958781 Author: licc <45360682@qq.com> Date: Thu Feb 8 22:21:52 2018 +0800 Merge remote-tracking branch 'origin/master' commit c8a7dc26114d1e35eda8aedb8951c3ad3ff558ea Author: licc <45360682@qq.com> Date: Thu Feb 8 22:21:43 2018 +0800 充值成功人数 commit 15c958781383bf7b698183bb6d1e593cb9defba4 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 22:19:23 2018 +0800 去掉阅读页目录列表 commit 35094a82969ce322fd9ddc117d0b3a2718b89e74 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 22:16:22 2018 +0800 修改商品表长度 commit d542bdb5f3d9a2c71197286dff2141002958d0d2 Author: licc <45360682@qq.com> Date: Thu Feb 8 22:10:45 2018 +0800 充值成功人数 commit 593c1713a8873b780d3e0f16dd16bce8361f2089 Author: licc <45360682@qq.com> Date: Thu Feb 8 22:05:41 2018 +0800 充值成功人数 commit 854306e7879eb6a64132c43b01fecf094b167a5c Merge: 8240441be 38ff4a0b4 Author: licc <45360682@qq.com> Date: Thu Feb 8 22:04:33 2018 +0800 Merge remote-tracking branch 'origin/master' commit 8240441bec1f3d1b65303b5e111b916a7da17b19 Author: licc <45360682@qq.com> Date: Thu Feb 8 22:04:25 2018 +0800 充值成功人数 commit 38ff4a0b4417656b5d0e2ba923dd1852d922fa71 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 22:01:06 2018 +0800 chapter.js增加版本号 commit 38863427471501dd720e5db18da24b3951effcb0 Author: php-王凡昌 Date: Thu Feb 8 21:58:39 2018 +0800 菜单校验回复 commit 534139218adfd28fe8fd959a422c6959cb496d77 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 21:53:22 2018 +0800 修改书页，及目录页 commit cf32edad96457865968471fecbdc99daa89b77ae Merge: 4573e2b32 94a742024 Author: licc <45360682@qq.com> Date: Thu Feb 8 21:32:15 2018 +0800 Merge remote-tracking branch 'origin/master' commit 4573e2b328621f1660ba0130b535a08d096d34be Author: licc <45360682@qq.com> Date: Thu Feb 8 21:32:06 2018 +0800 充值成功人数 commit 94a7420240285886b9831006ddd47108578ee57c Author: 高明阳 Date: Thu Feb 8 21:26:49 2018 +0800 书籍字数不限制整型 commit 90161d689ecfc2046d44adf37c401ddbb79f3d93 Author: 丁海波 Date: Thu Feb 8 21:25:31 2018 +0800 修改默认状态为 文本 commit 6ab2c95ffcb898c23eaea141d68c84847824a42c Author: 丁海波 Date: Thu Feb 8 21:15:52 2018 +0800 文本textarea 删除禁用属性 commit f936b6c3fdfe885f18476c502471c1f7b666c989 Merge: 026892eea 5e21f369d Author: licc <45360682@qq.com> Date: Thu Feb 8 21:11:40 2018 +0800 Merge remote-tracking branch 'origin/master' commit 5e21f369d8fb88b4e68c1e67f0523755ea4a87e9 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 21:12:12 2018 +0800 去掉充值页菜单 commit 026892eea5839f20a0ba971848f74bfc6ac020ee Author: licc <45360682@qq.com> Date: Thu Feb 8 21:11:28 2018 +0800 充值成功人数 commit 425ab1a4954afd34cc4aa1aa3784ecfc696bdfb7 Author: licc <45360682@qq.com> Date: Thu Feb 8 21:03:25 2018 +0800 充值成功人数 commit 06928cf8c9e82b1a64364bc443c494398aa01695 Merge: 85ea72fba ac41d664e Author: licc <45360682@qq.com> Date: Thu Feb 8 21:00:26 2018 +0800 Merge remote-tracking branch 'origin/master' commit 85ea72fba48e28ffe003a23698f114f24609dd7e Author: licc <45360682@qq.com> Date: Thu Feb 8 21:00:18 2018 +0800 充值成功人数 commit ac41d664e60dfcdadb0c6da26ef43be58e25467a Author: php-王凡昌 Date: Thu Feb 8 20:54:38 2018 +0800 个人中心余额展示 commit cf3aae49595e5763a200b6a10c5313cbdc458b7d Author: 高明阳 Date: Thu Feb 8 20:44:32 2018 +0800 书籍分类切换bug修复 commit 37ab396817e6c74b66c6714ce44a0927f549ef86 Author: licc <45360682@qq.com> Date: Thu Feb 8 20:32:58 2018 +0800 充值成功人数 commit 368de97384794d00769d3e94adf802e306f80f60 Author: licc <45360682@qq.com> Date: Thu Feb 8 20:30:21 2018 +0800 充值成功人数 commit ae2336eec236fcf330a126b98e637220a28381bb Merge: f921dd2ae bece51a51 Author: licc <45360682@qq.com> Date: Thu Feb 8 20:25:20 2018 +0800 Merge remote-tracking branch 'origin/master' commit f921dd2ae491a2bc4d1d028a7da50a2ac17a85a5 Author: licc <45360682@qq.com> Date: Thu Feb 8 20:25:11 2018 +0800 充值成功人数 commit bece51a5103bcb5a3f7d58ade3614ec0a4f07245 Merge: e628b14c3 9031ddd6c Author: php-王凡昌 Date: Thu Feb 8 20:24:59 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit e628b14c399acba57978b3482636a7c82ff676ab Author: php-王凡昌 Date: Thu Feb 8 20:24:38 2018 +0800 新增cookie commit 9031ddd6c524f0aa8a719a216d9fa0c837fe2c2b Merge: dca2b4744 49dba3ff8 Author: licc <45360682@qq.com> Date: Thu Feb 8 20:24:33 2018 +0800 Merge remote-tracking branch 'origin/master' commit dca2b47443b56d249ec39b0e589512bbd83d32cc Author: licc <45360682@qq.com> Date: Thu Feb 8 20:24:22 2018 +0800 充值成功人数 commit 49dba3ff8e0d898a53a20ce8ed23ee1cb811711e Author: php-王凡昌 Date: Thu Feb 8 20:21:22 2018 +0800 channel_id 写入cookie commit 6f03db10b4c63f4c5440171ad34be7394c8c0523 Author: licc <45360682@qq.com> Date: Thu Feb 8 20:03:12 2018 +0800 充值成功人数 commit 8c723633066e3edf84ac7d0937cb295442d3381c Author: licc <45360682@qq.com> Date: Thu Feb 8 19:49:38 2018 +0800 充值成功人数 commit c5274b09d0cb34bd0fb60aba642fce93d4ea3f19 Merge: 99594255d ba527c3c9 Author: licc <45360682@qq.com> Date: Thu Feb 8 19:47:24 2018 +0800 Merge remote-tracking branch 'origin/master' commit 99594255ddd975c9593fa12bd611c821e2894c30 Author: licc <45360682@qq.com> Date: Thu Feb 8 19:47:12 2018 +0800 充值成功人数 commit ba527c3c9384af760f948db8105e9efb2e4c575b Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 19:20:24 2018 +0800 超管界面样式处理 commit 676d4f069969f8096a5f7a17e18e813088e69066 Author: 丁海波 Date: Thu Feb 8 18:35:51 2018 +0800 充值页删除我是vip commit 70ad1a3e39dca1e294cfddd98c960fa3848b551a Merge: a47e514ea 2fcee6b7d Author: 丁海波 Date: Thu Feb 8 18:25:32 2018 +0800 Merge remote-tracking branch 'origin/master' commit a47e514ead09e0e05fb81201d36984138078e5ed Author: 丁海波 Date: Thu Feb 8 18:25:23 2018 +0800 个人中心vip commit 2fcee6b7dbaed005ab525068249a816b7836a077 Author: licc <45360682@qq.com> Date: Thu Feb 8 18:23:22 2018 +0800 方便测试测 commit 2874c32089e76a0e93dc6de31a4a212036e5ad37 Merge: c14572b03 0e2134b03 Author: licc <45360682@qq.com> Date: Thu Feb 8 18:22:22 2018 +0800 Merge remote-tracking branch 'origin/master' commit c14572b0379fd83b5fc390658329e9122d89c84b Author: licc <45360682@qq.com> Date: Thu Feb 8 18:22:12 2018 +0800 方便测试测 commit 0e2134b0308f55931a687d973936313bfbe298ed Author: 丁海波 Date: Thu Feb 8 18:17:22 2018 +0800 首页vip commit 45ada46e27363488bf818662d7663b3caf373a2b Author: 丁海波 Date: Thu Feb 8 18:17:05 2018 +0800 首页vip commit f05ff8d5dc12e1dde1a156716761ed973342ee5b Merge: 3141db4a9 49ee05271 Author: licc <45360682@qq.com> Date: Thu Feb 8 18:15:30 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3141db4a93c29c3da8156f8d588011bb729a44f5 Author: licc <45360682@qq.com> Date: Thu Feb 8 18:15:20 2018 +0800 订单统计 commit 49ee052719b08605319c483f23052c71cdf30edc Author: php-王凡昌 Date: Thu Feb 8 18:09:28 2018 +0800 vip 头像区分 commit 600682c05057b0353dc7b63f44fcbc615f07c380 Merge: c1bdcf32b 73ac6d36f Author: php-王凡昌 Date: Thu Feb 8 18:05:40 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit c1bdcf32b2861b1255414788835ba11db68f049b Author: php-王凡昌 Date: Thu Feb 8 18:05:21 2018 +0800 调整url路径 commit 73ac6d36f28848969855f81408a5bae854fe0638 Author: 丁海波 Date: Thu Feb 8 18:02:48 2018 +0800 充值页vip commit d14135ae929441be4ebd05b30a44a04ec9ee2896 Author: 高明阳 Date: Thu Feb 8 17:56:22 2018 +0800 update commit ac3068a39579c9a0fbc6e2440624734dc11d26d9 Merge: ce9cb908c 44f3b0aa8 Author: 丁海波 Date: Thu Feb 8 17:50:22 2018 +0800 Merge remote-tracking branch 'origin/master' commit ce9cb908c3c0928523d110b7bec40e9eb5fffbb8 Author: 丁海波 Date: Thu Feb 8 17:50:13 2018 +0800 个人中心vip commit 44f3b0aa8838dc6355996c311865f251b81b8e97 Author: php-王凡昌 Date: Thu Feb 8 17:47:21 2018 +0800 修改用户头像 commit eaf25e79923c2199c816a0cac88984086b45bcd0 Author: 高明阳 Date: Thu Feb 8 17:30:23 2018 +0800 update commit edfbc5610df24908f340780b7d21e3214682397d Merge: 0aaeea725 897f21ebc Author: licc <45360682@qq.com> Date: Thu Feb 8 17:27:55 2018 +0800 Merge remote-tracking branch 'origin/master' commit 0aaeea7257519d7c3af772284758f9d30b5737a7 Author: licc <45360682@qq.com> Date: Thu Feb 8 17:27:47 2018 +0800 订单统计 commit 897f21ebc98a902a6f8eb563e1cadb165395aae1 Author: php-王凡昌 Date: Thu Feb 8 17:15:58 2018 +0800 前端vip逻辑判断 commit 33307e718d32c56c182d1c6a2a8839727aea23b4 Author: 高明阳 Date: Thu Feb 8 17:10:57 2018 +0800 update commit 73c5514de84990de2e4b58fa6d57a8dc157a38ca Author: 高明阳 Date: Thu Feb 8 17:04:30 2018 +0800 update commit 5857beefa2b65f42d4a976393acc1fe77ff944b5 Author: 高明阳 Date: Thu Feb 8 17:03:05 2018 +0800 update commit e19bbb75d2310cc3197b48e36f8c59d7050047ad Merge: 367a41f49 36a27c182 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:52:11 2018 +0800 Merge remote-tracking branch 'origin/master' commit 367a41f49780fc318a6b80ec653bc51ec4b18884 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:52:02 2018 +0800 订单统计明细修改 commit 36a27c18279450b411d8f1a2badf10326047c23c Author: php-王凡昌 Date: Thu Feb 8 16:51:57 2018 +0800 微信授权鉴权 commit 26422c76def4972ee394f9b28a5ce1a45533ba30 Author: 高明阳 Date: Thu Feb 8 16:50:59 2018 +0800 update commit b3f764564728089e10bac5677674566950e996e1 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:46:01 2018 +0800 订单统计明细修改 commit d64983596b9bd30d4e725a219baa374b61d2540c Merge: 72fb8fc98 8baeb6996 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:43:57 2018 +0800 Merge remote-tracking branch 'origin/master' commit 72fb8fc98ab91d9a6710d8fe3de617907b71a10d Author: licc <45360682@qq.com> Date: Thu Feb 8 16:43:50 2018 +0800 订单统计明细修改 commit 8baeb6996ab4cab534fb1c0caf6b9e95461c33bd Author: php-王凡昌 Date: Thu Feb 8 16:26:03 2018 +0800 去除多余权限判断 commit 052725a8fecb74f5b92dc8f9a5aac55d3690470f Merge: f6cc4ef34 88c7200ab Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 16:23:40 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit f6cc4ef3461103afbab66ff0f6ad5a1e46f4d053 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 16:23:27 2018 +0800 更新阅读页逻辑 commit 88c7200ab77e326ebbc4b1b1e1c1dcb8068250b9 Author: php-王凡昌 Date: Thu Feb 8 16:22:06 2018 +0800 修正菜单展示 commit 9cdacb7b0d97893cc6f7f09a54e4bac5444d65a2 Merge: 8e4f25c9f 2cc029bb0 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:20:19 2018 +0800 Merge remote-tracking branch 'origin/master' commit 8e4f25c9f1ae16b1d20d7b0fd317969f5c740c82 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:20:07 2018 +0800 订单统计渠道商报错 commit 2cc029bb077b636388ae47c3601ee720f9700afe Merge: f94714ace b9ce26d5b Author: 高明阳 Date: Thu Feb 8 16:13:43 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit b9ce26d5beb235b3526cba032198ae8d77e1b677 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 16:14:45 2018 +0800 书页数据修改 commit f94714ace468d18783f7216f51b70d821c6b247a Author: 高明阳 Date: Thu Feb 8 16:13:38 2018 +0800 多条推广更新 commit f26562c483bab9172c59e9d8eda7055db83764b3 Merge: 5cd32c3b4 e52d10c24 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:11:53 2018 +0800 Merge remote-tracking branch 'origin/master' commit 5cd32c3b4e8efcb83a19d3bc1f7b312b13934d23 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:11:44 2018 +0800 订单统计渠道商报错 commit e52d10c2445a2d7e679aa6dbd51dbfc4969b5d7e Author: php-王凡昌 Date: Thu Feb 8 16:09:49 2018 +0800 超管菜单管理功能 commit d180865035943d1153db66c6989dcb5c611b0137 Merge: 899901604 69f96c1e4 Author: licc <45360682@qq.com> Date: Thu Feb 8 16:05:07 2018 +0800 Merge remote-tracking branch 'origin/master' commit 89990160455637453085fad7e5ff9e421ab9ecdf Author: licc <45360682@qq.com> Date: Thu Feb 8 16:04:57 2018 +0800 订单统计渠道商报错 commit 69f96c1e4ff38928a496de6abf2078ba03c24051 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 16:00:13 2018 +0800 后台页面模板标题审核 commit 51d0d19943717f7beae74a7b73fba65d4c7bb7f2 Merge: 6936b35c4 204784e29 Author: licc <45360682@qq.com> Date: Thu Feb 8 15:56:07 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6936b35c41db42b1b33bc8cf74c5a890fd9eb7a5 Author: licc <45360682@qq.com> Date: Thu Feb 8 15:55:55 2018 +0800 订单统计渠道商报错 commit 204784e29ac3df42ce7abc3f1904fed64fe612a9 Merge: 1e6327bbd c58736763 Author: 丁海波 Date: Thu Feb 8 15:45:07 2018 +0800 Merge remote-tracking branch 'origin/master' commit 1e6327bbd60a3c9cc837b84b8918bac85d2e4fd8 Author: 丁海波 Date: Thu Feb 8 15:44:56 2018 +0800 首页顶部nav 两个字文字居中 commit c587367637e3c9d18d496c9dd2d293952387f1d6 Author: 高明阳 Date: Thu Feb 8 15:36:04 2018 +0800 update commit e5cc7eafe5de12643b83139ed23108a8d58c82fa Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 15:35:22 2018 +0800 阅读页数据查看 commit 7c622f71f657bb611a282fe59cf2c12097b9560c Author: licc <45360682@qq.com> Date: Thu Feb 8 15:28:46 2018 +0800 充值book统计汇总 commit f7f166a4cb2dd6fd0fb5df4fcf4100799f07f0d8 Merge: 0d410389d 3dde3d44f Author: licc <45360682@qq.com> Date: Thu Feb 8 15:26:02 2018 +0800 Merge remote-tracking branch 'origin/master' commit 0d410389d057ae1208d1c24cbb08918ed0a4a5b4 Author: licc <45360682@qq.com> Date: Thu Feb 8 15:25:55 2018 +0800 充值book统计汇总 commit 3dde3d44f430e3005db22550701bf34d245de486 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 15:17:45 2018 +0800 阅读页调试 commit 99e135f004168c89cfd9ae4579f0f48ceb0dac07 Merge: 3739578f9 6ab49bd7d Author: licc <45360682@qq.com> Date: Thu Feb 8 15:14:33 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3739578f932110488d8f71fb203e28da5e7f3195 Author: licc <45360682@qq.com> Date: Thu Feb 8 15:14:26 2018 +0800 统计订单修改 commit 6ab49bd7db586a04db2abfe79c327dbbe158d757 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 15:08:52 2018 +0800 调试阅读页数据 commit 1bc4a1945dcef78dbcb5ecc8190b82d9c0199c4e Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 15:05:32 2018 +0800 阅读页测试 commit dfd3be771e859e63bf57865ddc9fe18174b16ca4 Author: 高明阳 Date: Thu Feb 8 14:56:18 2018 +0800 前台页面menu修改 commit 23336511bb1432966ed2a2fb3ef48eddb02562be Merge: 3a1e5e961 0c7272562 Author: 丁海波 Date: Thu Feb 8 14:49:20 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3a1e5e961a2e6de6c4426039989dae0f2f72b14b Author: 丁海波 Date: Thu Feb 8 14:49:16 2018 +0800 刷新页面修改滚动条高度 commit 0c72725621be035cce4627176ca07c02e385d722 Author: php-王凡昌 Date: Thu Feb 8 14:48:12 2018 +0800 自动登录 commit bbb76ba827f0e1be8b9d306687f080653a6645d6 Merge: 6ff82034d fdefaa67a Author: 丁海波 Date: Thu Feb 8 14:41:23 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6ff82034dd0155ef00f6b22e1b51f653cfc7f501 Author: 丁海波 Date: Thu Feb 8 14:41:16 2018 +0800 修改图片懒加载距离 commit fdefaa67a5dd1c202f8ee35346a6a93508a74b34 Author: licc <45360682@qq.com> Date: Thu Feb 8 14:40:24 2018 +0800 统计用户关注 commit 62c6a6903cb4b1a5b67a98201fcd60765ba74a32 Author: licc <45360682@qq.com> Date: Thu Feb 8 14:22:33 2018 +0800 注册用户统计修改 commit 948d22fbf8bee161383b8b64a85a10fc664fba86 Merge: 6dda26e38 53e1a0446 Author: licc <45360682@qq.com> Date: Thu Feb 8 13:58:19 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6dda26e389d6952ac7e2abf60d5034dfdddcc80c Author: licc <45360682@qq.com> Date: Thu Feb 8 13:58:12 2018 +0800 注册用户统计 commit 53e1a0446116354dd9d7da230349bdd94a0e7107 Merge: 8d90407a1 b0938f96b Author: 丁海波 Date: Thu Feb 8 12:03:19 2018 +0800 Merge remote-tracking branch 'origin/master' commit 8d90407a1eaf63b96c656b374ea52f1987b5c671 Author: 丁海波 Date: Thu Feb 8 12:03:09 2018 +0800 修改懒加载距离 commit b0938f96bc9b28355f9d714a24bf0d8970eacb9e Author: php-王凡昌 Date: Thu Feb 8 11:59:42 2018 +0800 后台登录用户禁止 commit ea8b86a11c8e7aa749517cbd5906c77ddcdc8054 Merge: 3ab513528 1cff2d882 Author: licc <45360682@qq.com> Date: Thu Feb 8 11:56:32 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3ab513528f49c0eaeb6a945df837e7dd818f30d0 Author: licc <45360682@qq.com> Date: Thu Feb 8 11:56:23 2018 +0800 统计数据灌入修改 commit 1cff2d8821a20b2ef9d0550c0df2948126debfef Merge: cd4098d42 2e12d10b8 Author: 丁海波 Date: Thu Feb 8 11:53:58 2018 +0800 Merge remote-tracking branch 'origin/master' commit cd4098d42976cda91366570552e9c91b648ba0cd Author: 丁海波 Date: Thu Feb 8 11:53:46 2018 +0800 修改默认图片 commit 2e12d10b8ba6ce99ce618f3ce328ff6146a8e2d8 Author: licc <45360682@qq.com> Date: Thu Feb 8 11:49:25 2018 +0800 统计数据灌入 commit 3e58ebaba250f3e7130a02ad757c1f8e29a309a2 Merge: a79f6d20d d17749de3 Author: licc <45360682@qq.com> Date: Thu Feb 8 11:29:50 2018 +0800 Merge remote-tracking branch 'origin/master' commit a79f6d20d3cab22fc4f3ccea297929599b9d4901 Author: licc <45360682@qq.com> Date: Thu Feb 8 11:29:43 2018 +0800 统计数据灌入 commit d17749de3160d0842fa3382cee6b7bc9ec2748e1 Author: 丁海波 Date: Thu Feb 8 11:17:18 2018 +0800 修改边框颜色 commit 5971e457106c7e083b8d0121c2f5f1e2f5db8ed8 Author: 丁海波 Date: Thu Feb 8 11:09:30 2018 +0800 修改边框颜色 commit 5abac07e553b106831fe73b18a5049b8f63ddc28 Author: php-王凡昌 Date: Thu Feb 8 11:03:33 2018 +0800 debug 模式下，允许浏览器访问 commit 1bece4f0b99cb0c4557885fd32faad0a4134d166 Merge: 539860d35 7ee981e29 Author: licc <45360682@qq.com> Date: Thu Feb 8 11:02:39 2018 +0800 Merge remote-tracking branch 'origin/master' commit 539860d35682ae765fcc260257670ba7eae5ff8d Author: licc <45360682@qq.com> Date: Thu Feb 8 11:02:32 2018 +0800 统计数据灌入 commit 7ee981e292b613f4ae0a42214e630c27623424d9 Author: php-王凡昌 Date: Thu Feb 8 00:59:28 2018 +0800 复制提示 commit ae34ce9e20b1cb492de17fdb501480c075271cff Author: php-王凡昌 Date: Thu Feb 8 00:57:02 2018 +0800 删除调试代码 commit c08009566af4004cddf1c0110c4913b8e8f7224b Author: php-王凡昌 Date: Thu Feb 8 00:56:25 2018 +0800 权限控制系统 commit 9246834a9ca7cfccd8baaf56808d519a5b8b171c Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 00:51:36 2018 +0800 解决宽度过长问题导致提示内容显示不完整 commit 16fbc1185cc4d2935471135a43f120711e1883ef Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 00:41:46 2018 +0800 修改页面模板频道标题校验 commit be7681ec7314e79c47f4bdb0210c6eb03c464dee Author: lichong_ <1909165236@qq.com> Date: Thu Feb 8 00:24:02 2018 +0800 公告搜索标题 commit 9b4d089d04da655aa3fc3ea4e187ec4b819d7c52 Author: php-王凡昌 Date: Thu Feb 8 00:18:06 2018 +0800 资源提示 多条推广链接页面展示 commit fc12db0c8bb8c4047144a086b4214358cc7265d8 Author: 高明阳 Date: Thu Feb 8 00:13:00 2018 +0800 修复书籍编辑时限免时间字段出现1970年的问题 commit 2c8d2674fdb92e6d3b1a3db036790d8502f4a0dc Author: php-王凡昌 Date: Thu Feb 8 00:06:36 2018 +0800 登录公告弹窗修复 commit e8e7acc1ec95a9f254fce88ca04d424aa1cec323 Author: php-王凡昌 Date: Wed Feb 7 23:41:50 2018 +0800 富文本编辑器修复 commit 906a91cf2d4c87a1ec6778672387c116e594f30c Author: 高明阳 Date: Wed Feb 7 23:25:16 2018 +0800 update commit 9fe2dc71d535a82f8968f3c1aa94e5f9c2af7067 Author: php-王凡昌 Date: Wed Feb 7 23:10:09 2018 +0800 公告正文标题 commit 79d22232649db5e18f56550ce9d8bb51de19688f Author: php-王凡昌 Date: Wed Feb 7 22:58:37 2018 +0800 代理商公告搜索 commit 7b8d56fb5b4c55d38620eca6e6c0165db3418e4c Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 22:59:06 2018 +0800 替换二维码关注页面 commit efd5ecb973d3a0043c464e268438e7bf1516b606 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 22:58:15 2018 +0800 修改页面 commit c8ac5d8824e749724034a6919c620ffb5256cf6c Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 22:57:20 2018 +0800 修改页面展示 commit d8c02103864599a1cc6544cfee06083c20e9cb65 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 22:55:06 2018 +0800 修改调取信息 commit e8e56dc06be10b716f4a5f3f0f59ddffa363fa3e Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 22:53:55 2018 +0800 浏览器环境跳转二维码调试 commit c056f3e538b22333cec46653226f15980378912e Merge: 77a506557 290c4f64c Author: php-王凡昌 Date: Wed Feb 7 22:47:10 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 290c4f64c3741f952593c4ade554ce6ad7a6d78b Merge: 5b5700c01 7b84a78d6 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 22:47:41 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 5b5700c017c8dbc9c1dfac6ef7bc1e679f5c1d75 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 22:47:32 2018 +0800 no message commit 77a5065574dbc66610740134979dd8de373a70c2 Author: php-王凡昌 Date: Wed Feb 7 22:46:55 2018 +0800 增加ua判断 commit 7b84a78d6f0fcbf4a97dd81b0f890b4bc96e47cc Author: php-王凡昌 Date: Wed Feb 7 22:45:47 2018 +0800 浏览器环境处理 commit 9f9ce2a1d59a933da5170df9a29e3fb40582489b Author: php-王凡昌 Date: Wed Feb 7 22:44:04 2018 +0800 浏览器环境默认页 commit a50d98b9a041017eb38ab7d72c045597a61dfa6e Merge: 30d7477a6 d0d532a7e Author: 丁海波 Date: Wed Feb 7 22:36:28 2018 +0800 Merge remote-tracking branch 'origin/master' commit 30d7477a60362aa89c919a315878db98d37f3ca7 Author: 丁海波 Date: Wed Feb 7 22:36:22 2018 +0800 修改右上角showToggle: false, showColumns: false, showExport: false, 状态 commit d0d532a7e0a8755686a0f875f8bd2a85e01da06b Author: php-王凡昌 Date: Wed Feb 7 22:30:12 2018 +0800 富文本编辑器 commit c61e352e7ed2644456d4b2aa7eb689705e8efb58 Author: 高明阳 Date: Wed Feb 7 22:22:34 2018 +0800 update commit d8c4447d8ec36083124eb24227c77df2a8363be2 Author: 高明阳 Date: Wed Feb 7 22:19:43 2018 +0800 update commit ac56eaae6f5f07ead3541b0db3e77f3beddd976a Author: 高明阳 Date: Wed Feb 7 22:12:12 2018 +0800 update commit 554b100e4bb86be5729e228c08cd0093ef4f642b Merge: b45eaa86a c8cfdd872 Author: 高明阳 Date: Wed Feb 7 22:09:40 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit b45eaa86ad5298989676c492b43fc742426027ce Author: 高明阳 Date: Wed Feb 7 22:09:35 2018 +0800 update commit c8cfdd87212875f83136527514c6dba7c5622f56 Author: php-王凡昌 Date: Wed Feb 7 22:05:41 2018 +0800 编辑图文 commit 2e170fa7954e26456c2c9e8ede74cbd4c6838dab Merge: c39525922 0b0f6cba7 Author: 丁海波 Date: Wed Feb 7 21:54:43 2018 +0800 Merge remote-tracking branch 'origin/master' commit c39525922c5683e28d40bc8effedcf66129b63eb Author: 丁海波 Date: Wed Feb 7 21:54:38 2018 +0800 修改微信管理 资源管理 图文选中判断逻辑 commit 0b0f6cba7a0d175ba30c8b95aa5e15f96d308d29 Merge: 0abcb46a7 772b201a7 Author: 高明阳 Date: Wed Feb 7 21:50:37 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 0abcb46a75984c44523acdba47d0694ca4c2f375 Author: 高明阳 Date: Wed Feb 7 21:50:34 2018 +0800 update commit 772b201a7fc2a123fe0fc1d7b25f45dc38b71663 Merge: 1571cc9aa 5d9aa2730 Author: licc <45360682@qq.com> Date: Wed Feb 7 21:43:28 2018 +0800 Merge remote-tracking branch 'origin/master' commit 1571cc9aaeab448503bb581c73e058ac933689c9 Author: licc <45360682@qq.com> Date: Wed Feb 7 21:43:22 2018 +0800 订单明细 commit 60ccd0a7533819db6eb58f6bd682ad61a8a48c55 Author: 高明阳 Date: Wed Feb 7 21:40:25 2018 +0800 update commit 5d9aa273023daa5a4c093b1a51e1ef9e8b159d58 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 21:27:48 2018 +0800 js增加版本号 commit 7605d92c593bf69f0a570500fa5fdbc6e66d8f7c Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 21:27:32 2018 +0800 js增加版本号 commit db409377a4c2c78b714844ab0da70ad88ca358fa Merge: c66269a09 56c2dbfa9 Author: 丁海波 Date: Wed Feb 7 21:19:30 2018 +0800 Merge remote-tracking branch 'origin/master' commit c66269a09a998dbfc5a388b6955ce18aaeec1fb6 Author: 丁海波 Date: Wed Feb 7 21:19:21 2018 +0800 修改懒加载距离为10 commit 56c2dbfa91b618783b6c071abe284906cba59226 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 21:14:53 2018 +0800 调试获取 commit 772b65b18a1cff57e199de47e53f61fe9987ae2c Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 21:13:41 2018 +0800 增加获取urlAdminId调试代码 commit 30ff87e5a146f61e9ea959089fcdd8adfb38e222 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 21:12:10 2018 +0800 公众号信息获取 commit 9dcc0c8cc95638cc259b226c038f5d53b5d878d7 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 21:09:08 2018 +0800 公众号二维码获取 commit 9ff60e790cf49135e4c756ddd5eed83614f62d36 Merge: afcdb0447 822d79c1b Author: licc <45360682@qq.com> Date: Wed Feb 7 21:02:28 2018 +0800 Merge remote-tracking branch 'origin/master' commit afcdb04479c2cf7d30d4ce15e75aeca8fb8173e2 Author: licc <45360682@qq.com> Date: Wed Feb 7 21:02:20 2018 +0800 计费修改 commit 822d79c1bd973297c7e75b1c970a4788458186a2 Author: 高明阳 Date: Wed Feb 7 21:02:08 2018 +0800 update commit ead91e605465c471ffd0ffae5ef13e52bff6ebc8 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 21:02:55 2018 +0800 计费代码传数组 commit 46a2dd595e4b1c3ee944b844916b574f65840edd Merge: 9f3ad1558 32bc80ae4 Author: 丁海波 Date: Wed Feb 7 21:00:45 2018 +0800 Merge remote-tracking branch 'origin/master' commit 9f3ad15587c9449f453f0963a81371f42684118c Author: 丁海波 Date: Wed Feb 7 21:00:41 2018 +0800 图片懒加载距离改为10 commit 32bc80ae488a54b9b5f944d13d1e258bd76ad754 Author: 高明阳 Date: Wed Feb 7 20:56:45 2018 +0800 update commit d0e7ddb33ea036604cebf90cd331a329d0e12a5b Merge: 676434e2e 19f684dd1 Author: 丁海波 Date: Wed Feb 7 20:49:11 2018 +0800 Merge remote-tracking branch 'origin/master' commit 676434e2e0c97210c45deb855226b71c5c9c98b4 Author: 丁海波 Date: Wed Feb 7 20:49:05 2018 +0800 图片懒加载距离修改为图片进入显示区域100的时候加载图片 commit 19f684dd1db4afefca27329eff32a87adcfd2f2b Author: 高明阳 Date: Wed Feb 7 20:47:16 2018 +0800 热门搜索词增加清理缓存 commit 90be19c11e744bd0383d5157cabc51a82bba2731 Author: 高明阳 Date: Wed Feb 7 20:44:39 2018 +0800 update commit 307b23d6ccde564ff4b670945f61ec8365c5ddca Author: 丁海波 Date: Wed Feb 7 20:31:48 2018 +0800 首页顶部菜单下边框颜色修改 commit f516f82bf6079990b4adf1cb0e9386231aa0e030 Author: 高明阳 Date: Wed Feb 7 20:25:57 2018 +0800 免费和完本增加性别限制条件 commit 0c21459ad6c57f93b3bc0f607e78ba1ea9544a27 Merge: c732cc9d0 125b2b1ca Author: licc <45360682@qq.com> Date: Wed Feb 7 20:24:44 2018 +0800 Merge remote-tracking branch 'origin/master' commit c732cc9d089c4346cc3f84bfe23b4979ee880482 Author: licc <45360682@qq.com> Date: Wed Feb 7 20:24:36 2018 +0800 充值成功送看点 commit 125b2b1ca15457aa414c213da38a961f2b1df3fd Merge: 662152260 84e1ff5ad Author: 丁海波 Date: Wed Feb 7 20:24:23 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6621522608366a3bad2c261fe677a8d387494e2f Author: 丁海波 Date: Wed Feb 7 20:24:18 2018 +0800 滚动上划 显示nav commit 84e1ff5ad80857ab763a0a8c092a9cf22afbe56c Merge: 3193626b1 f48a8f76b Author: 高明阳 Date: Wed Feb 7 20:21:03 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 3193626b1d8efa1c11600a31f3f7710a44c0ccc5 Merge: d376802ee 4eb4641d7 Author: 高明阳 Date: Wed Feb 7 20:20:50 2018 +0800 解决冲突 commit f48a8f76ba24377c6af8422563c69aba0a321496 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 20:19:17 2018 +0800 更新阅读页下一章按钮点击效果 commit d376802eea550839a26eb3bd27db80018082504b Author: 高明阳 Date: Wed Feb 7 20:17:55 2018 +0800 修复首页榜单数据不一致问题 commit 4eb4641d72f1beacae25b3523ef119d7f112a737 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 20:14:25 2018 +0800 修改书页下一章点击跳转 commit 1813823b92b257f9280123d45af34b800185d668 Author: php-王凡昌 Date: Wed Feb 7 20:00:41 2018 +0800 去除dump commit a8782c5b59f457c6ab08d0bd78b2a26e3c52614e Merge: b20be2b90 0096871b0 Author: 丁海波 Date: Wed Feb 7 20:00:04 2018 +0800 Merge remote-tracking branch 'origin/master' commit b20be2b90929a0936c69c25114a290de8bbe79e2 Author: 丁海波 Date: Wed Feb 7 19:59:57 2018 +0800 搜索页 大家都在看换一换修改 commit 0096871b0a59cfc246622d0025c3dc1fe1b73b52 Author: php-王凡昌 Date: Wed Feb 7 19:54:09 2018 +0800 变更save语法 commit 337b43170e890cdad59805af85c7f3d3d6322a66 Merge: fe3ff0849 ceeaefb6e Author: licc <45360682@qq.com> Date: Wed Feb 7 19:42:39 2018 +0800 Merge remote-tracking branch 'origin/master' commit fe3ff0849a064bb3eeb62dc7b703a7d7a85c0db9 Author: licc <45360682@qq.com> Date: Wed Feb 7 19:42:29 2018 +0800 充值成功送看点 commit ceeaefb6e63e2cdc2d144b38e7693124c155bea7 Merge: 409d3c7c5 d32c47a30 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 19:42:12 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 409d3c7c5967513dba64138b891b2f512e28ab43 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 19:42:04 2018 +0800 测试判断是否关注 commit d32c47a303748b30d4354b3ad9365774d6308980 Merge: 564c97ae3 207ef3d95 Author: licc <45360682@qq.com> Date: Wed Feb 7 19:13:39 2018 +0800 Merge remote-tracking branch 'origin/master' commit 564c97ae3e1724e04b22b0219483604bad2f3d9c Author: licc <45360682@qq.com> Date: Wed Feb 7 19:13:31 2018 +0800 新增用户加入用户统计表 commit 207ef3d95a0a7e86ef84e0d25a123f4e2de57309 Author: php-王凡昌 Date: Wed Feb 7 18:37:28 2018 +0800 解决git冲突 commit 7f190d8724295a9fb146fcc11c186896986e6c39 Merge: 8683ba4fc e82c88da4 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 18:31:35 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps Conflicts: application/index/view/layout/layout.html commit 8683ba4fc9dc4c2868b5b4325c4c4af084ee2ab7 Merge: 5a4ba80fe 1b79cefd5 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 18:31:06 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps Conflicts: application/index/view/layout/layout.html commit e82c88da452347e53595c7fd25139466cafbf3a4 Author: 丁海波 Date: Wed Feb 7 18:29:38 2018 +0800 解决layaout冲突 commit 2b8492eb4362ba99abf4b9f34dff1fea89bab7c5 Merge: f70aa65d7 dc3125f5c Author: 丁海波 Date: Wed Feb 7 18:29:02 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # application/index/view/layout/layout.html commit dc3125f5c11f501078eb761450b95795ebfa2948 Merge: 2853612d2 1b79cefd5 Author: php-王凡昌 Date: Wed Feb 7 18:28:29 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps Conflicts: application/index/view/layout/layout.html commit f70aa65d766337eabad7e39d8f5aee44c32ed423 Merge: 1b79cefd5 5a4ba80fe Author: 丁海波 Date: Wed Feb 7 18:28:24 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # application/index/view/layout/layout.html commit 1b79cefd5f1681ea9510118ee14dfe040988488f Author: 丁海波 Date: Wed Feb 7 18:23:44 2018 +0800 上一章按钮 commit 5a4ba80febdbc4f3f34bfd6ea117840430e174f3 Merge: c012a3d1e 40bad957e Author: 高明阳 Date: Wed Feb 7 18:11:53 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit c012a3d1e6807fd2d7a964a483b995eac7fed44f Author: 高明阳 Date: Wed Feb 7 18:11:47 2018 +0800 update commit 40bad957eef810913a802fa6691712251d3d7317 Merge: 2162b9966 4965be474 Author: licc <45360682@qq.com> Date: Wed Feb 7 18:07:18 2018 +0800 Merge remote-tracking branch 'origin/master' commit 2162b9966fdf0e460ebb08bc685632d449a5467f Author: licc <45360682@qq.com> Date: Wed Feb 7 18:07:11 2018 +0800 新增用户加入用户统计表 commit 4965be474c434dad160a250606db5020c5443bcf Author: 高明阳 Date: Wed Feb 7 18:02:15 2018 +0800 小说推广中增加小说中心 commit 2853612d2011ed2ad33bf5f011a9149915a38ea6 Author: php-王凡昌 Date: Wed Feb 7 18:01:47 2018 +0800 代理商首页推广链接生成 commit fb2748aefef4877eb67f693b2e9a52ea563bf596 Author: php-王凡昌 Date: Wed Feb 7 17:51:32 2018 +0800 充值成功刷新当前页面 commit f38f3dedeb3ac6b17e11f57a31f8f407036ee0c1 Author: php-王凡昌 Date: Wed Feb 7 17:49:40 2018 +0800 充值成功刷新当前页面 commit 52def961a64ef2468756b1a85f1ec8a7a6aaed3e Merge: 328499c11 b435ec4d9 Author: php-王凡昌 Date: Wed Feb 7 17:47:58 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 328499c113933a3cb1ac8257e586800dfb8e1704 Author: php-王凡昌 Date: Wed Feb 7 17:47:42 2018 +0800 充值成功回调通知 commit b435ec4d95a6c80da3c663673d316559235f47cf Merge: 1c62d8d14 1dbb97a56 Author: licc <45360682@qq.com> Date: Wed Feb 7 17:12:46 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 1dbb97a5615d20bb1d0f02f9644870e3b2af6037 Merge: 895790ecb 0031f3509 Author: 高明阳 Date: Wed Feb 7 17:10:11 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 0031f3509dff744f43d5480574d42ca51d49c0a5 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 17:10:08 2018 +0800 阅读页修改 commit 895790ecbd9ea13630b467262067c1797003a23b Author: 高明阳 Date: Wed Feb 7 17:10:04 2018 +0800 update commit 1c62d8d14d06c9fa558f24953648ae5919e12cde Author: licc <45360682@qq.com> Date: Wed Feb 7 17:08:55 2018 +0800 订单统计修改 commit b315b84e4a9ffb27b1fae6f117f60911dcfefd77 Merge: b15339917 720a8ec0e Author: 高明阳 Date: Wed Feb 7 17:04:55 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit b15339917c346348f67f64bad5380ffd0635a19e Author: 高明阳 Date: Wed Feb 7 16:59:52 2018 +0800 书籍清理缓存整理 commit 97931a2abd0901567bc622832d1b907aceef4174 Author: Mingyang Gao Date: Wed Feb 7 08:41:28 2018 +0000 Added file .env commit 720a8ec0ed4606b2e84a2ad40583f915704a23f3 Author: 丁海波 Date: Wed Feb 7 16:27:37 2018 +0800 阅读主题修改 commit f49caa696f68e8e5731e3dff7c523445f9c05a09 Merge: 57ff0093d 3069e1de7 Author: php-王凡昌 Date: Wed Feb 7 16:24:30 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 57ff0093d2b461f156a51bb5c21222d296de802d Author: php-王凡昌 Date: Wed Feb 7 16:24:14 2018 +0800 充值回跳逻辑 commit 3069e1de741c270c0f010b5a99a01099edf5320e Merge: 69cdad9c8 f17cf8a47 Author: licc <45360682@qq.com> Date: Wed Feb 7 16:19:06 2018 +0800 Merge remote-tracking branch 'origin/master' commit 69cdad9c85cb837b3844dbb7b9ae037f969b1e68 Author: licc <45360682@qq.com> Date: Wed Feb 7 16:18:57 2018 +0800 渠道商后台小说统计去字段 commit f17cf8a478b872a9b2136dc1e93a575d9002f172 Author: 丁海波 Date: Wed Feb 7 16:14:25 2018 +0800 阅读页背景设置 commit 5494ebf2da8c49af03daeeaad10df74bdae9465f Author: licc <45360682@qq.com> Date: Wed Feb 7 16:03:31 2018 +0800 渠道商后台小说统计去字段 commit cd8b13a3090d0d029e60a595b27d1766b5d88b4c Author: php-王凡昌 Date: Wed Feb 7 16:01:47 2018 +0800 channel_id 跳转逻辑 commit 91d06a656a60ff46fff24b00ad793258f4fc9c63 Merge: 541cd6d8f 5f73e1cda Author: php-王凡昌 Date: Wed Feb 7 15:53:04 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 541cd6d8f8f0c2f9701f441f8f3e5341c0cf902f Author: php-王凡昌 Date: Wed Feb 7 15:52:50 2018 +0800 修复推广链接格式 url参数增加agent_id参数 充值页增加回跳逻辑 commit 5f73e1cda882fce3e5c6712468160ba6a6fe9e0e Merge: e5dd39d95 0bc5e6502 Author: licc <45360682@qq.com> Date: Wed Feb 7 15:42:18 2018 +0800 Merge remote-tracking branch 'origin/master' commit 0bc5e650236fa23d9bbeb4e10e047d35a74adf4d Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 15:42:44 2018 +0800 增加清除书籍缓存 commit e5dd39d95bb8b50d7a02b86a2997e6d4ae42ab1d Author: licc <45360682@qq.com> Date: Wed Feb 7 15:42:10 2018 +0800 单本小说明细 commit c15ad340527cae9b232449778cae631cf7145348 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 15:37:34 2018 +0800 修改阅读页debug方法 commit 4b6d4e79e1d306c7560cfcfa6a6da38686e3dc3b Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 15:34:38 2018 +0800 首页频道根据性别替换css commit 8f8256b211f1c2d65e9170d5b24aaab33c5c1872 Merge: c162db147 0629e5018 Author: licc <45360682@qq.com> Date: Wed Feb 7 15:04:36 2018 +0800 Merge remote-tracking branch 'origin/master' commit c162db14736c02debe94668139df0a42d58a59a5 Author: licc <45360682@qq.com> Date: Wed Feb 7 15:04:12 2018 +0800 统计去掉顶部菜单 commit 0629e5018f4b71fe00b078f26893748bf0389d5f Author: 丁海波 Date: Wed Feb 7 14:40:06 2018 +0800 首页背景色 commit e1ac06aec54508f08578fbdb9b6f79ec72b9106c Merge: b2eef848f 7ca56e6a7 Author: 丁海波 Date: Wed Feb 7 14:34:46 2018 +0800 Merge remote-tracking branch 'origin/master' commit b2eef848ff1f94f2fa7363250bf5d1ab5d6bf5a5 Author: 丁海波 Date: Wed Feb 7 14:34:39 2018 +0800 账户充值 commit 7ca56e6a799d0b4a63baf45816df967ce70396d6 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 14:24:07 2018 +0800 $referral_id赋初始值 commit 1c1bc0dccdbb6670827c36ff9dcea7ba39006361 Merge: 83f52e66c bced4e818 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 14:18:53 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 83f52e66c9b670b05a7d752a18ffdcb45844e732 Author: lichong_ <1909165236@qq.com> Date: Wed Feb 7 14:18:45 2018 +0800 修改导粉 commit bced4e8182f2c346c86835f586a545aa153ed87e Merge: d7717ed13 f7dd1dc37 Author: 丁海波 Date: Wed Feb 7 14:01:28 2018 +0800 Merge remote-tracking branch 'origin/master' commit d7717ed13ae772533f389fa6285fea03e809e2cb Author: 丁海波 Date: Wed Feb 7 14:01:17 2018 +0800 充值描述第二行删除溢出 commit f7dd1dc371121ce96383675ce2c07ae896624ccb Merge: c23c6bd8e e1e8a0619 Author: licc <45360682@qq.com> Date: Wed Feb 7 13:55:02 2018 +0800 Merge remote-tracking branch 'origin/master' commit c23c6bd8ebd52f5410dd8fffe9a31b2c0275a7ab Author: licc <45360682@qq.com> Date: Wed Feb 7 13:54:51 2018 +0800 找不到模板 commit e1e8a06197b18e48b330adba9a12f2f8d1b1d990 Merge: 878400adb 58090e39f Author: 丁海波 Date: Wed Feb 7 13:43:45 2018 +0800 Merge remote-tracking branch 'origin/master' commit 878400adb08f454d44e8a94effe7a43e29f96d2a Author: 丁海波 Date: Wed Feb 7 13:43:41 2018 +0800 adminid 获取逻辑修改 commit 58090e39f177b469e3be4c36d61485ceccbb6e83 Author: php-王凡昌 Date: Wed Feb 7 12:21:00 2018 +0800 修改单词拼写错误 commit f10ae56e65f0ebbd38ef6e90090614a089e33d97 Author: php-王凡昌 Date: Wed Feb 7 12:20:08 2018 +0800 修正代理商登录， 修正用户充值模拟器提示 commit 6e6932a54cd4c6bdacbd51b05fb4d384b23282d6 Author: php-王凡昌 Date: Wed Feb 7 12:07:01 2018 +0800 关注维护用户资料 commit 021bd251a1382f9becda4876fc2541900665f36d Author: 丁海波 Date: Wed Feb 7 12:05:33 2018 +0800 首页点击榜排序标数字上移 commit 4aef2a34f8176152e99fa0b152eed450c8c27d23 Author: licc <45360682@qq.com> Date: Wed Feb 7 11:54:05 2018 +0800 找不到模板 commit 46d5a204b1eeda943737a04b2b7f19f9d260544c Merge: 97c6d3439 55129b9b5 Author: 丁海波 Date: Wed Feb 7 11:45:18 2018 +0800 Merge remote-tracking branch 'origin/master' commit 97c6d34399ae47fbfda01545a26eec2e472de0f3 Author: 丁海波 Date: Wed Feb 7 11:45:14 2018 +0800 日志 tag 修改为数值类型 commit 55129b9b5fed603f8cf911247a97741dd3f3caee Author: php-王凡昌 Date: Wed Feb 7 11:41:40 2018 +0800 更新下单cookie commit c6703a56e52b6f084e19987f45cb182d7d0505eb Author: 丁海波 Date: Wed Feb 7 11:32:45 2018 +0800 充值记录 无充值记录 点击 去充值 去充值页 commit b2872d28d2400c39ffaadbeda6caa6afdb4885d3 Merge: 5dc416d1b 1ea45d79c Author: php-王凡昌 Date: Wed Feb 7 11:19:57 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 5dc416d1b41b3a527e0cde74bc2c384623dbecd0 Author: php-王凡昌 Date: Wed Feb 7 11:19:37 2018 +0800 下单逻辑判断 commit 1ea45d79c1533f53c8a8479ebe46f7601b8e6fc1 Merge: 337ab5753 1bb97c949 Author: 高明阳 Date: Wed Feb 7 11:13:46 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 337ab5753c4c3d671d0ff3dbfad04c9082b20aa6 Author: 高明阳 Date: Wed Feb 7 11:13:42 2018 +0800 fixbug 书籍编辑时间字段调整 commit 1bb97c9496b3913f81bb09eb52bf924abca37943 Author: php-王凡昌 Date: Wed Feb 7 11:09:59 2018 +0800 修改新增用户缓存 commit 3b03a4ed06b91a78cd8e15d171a7a34f206a322c Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 23:01:01 2018 +0800 更新文件名 commit 05ce2cf0d2b2df3abb97a484c17fbfc1da756ce1 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 23:00:25 2018 +0800 删除文件 commit c608448ae227ea296741b17a226ff51a0395c6cb Merge: 8458cfa14 869706aea Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 23:00:02 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps Conflicts: application/admin/view/auth/admin/editSelf.html commit 8458cfa14a475a1b77477d56517aa94c980ea726 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 22:59:40 2018 +0800 删除文件 commit 869706aea82b504cdb628238f6638b0dd2082e6d Author: licc <45360682@qq.com> Date: Tue Feb 6 22:53:27 2018 +0800 找不到模板 commit 04f6a54ce0e4f2b44d09befc1b50710a91199138 Author: licc <45360682@qq.com> Date: Tue Feb 6 22:50:47 2018 +0800 找不到模板 commit ecf8c005fc605a9b4953c593981be08278374355 Author: licc <45360682@qq.com> Date: Tue Feb 6 22:49:47 2018 +0800 找不到模板 commit 1941ccb3102e407716b5b31fba530eabb585ce05 Merge: 86697ded8 be593b8b9 Author: licc <45360682@qq.com> Date: Tue Feb 6 22:42:06 2018 +0800 Merge remote-tracking branch 'origin/master' commit 86697ded84141ac88e519b2f154f35f3a74c6ca7 Author: licc <45360682@qq.com> Date: Tue Feb 6 22:41:56 2018 +0800 找不到模板 commit be593b8b98e6dd8c959e4e379c12c6f43df70d88 Merge: cd1aae0e7 990792aa7 Author: 高明阳 Date: Tue Feb 6 22:41:21 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit cd1aae0e79b0ff1da9ee3942e73e59080ab8aff4 Author: 高明阳 Date: Tue Feb 6 22:41:12 2018 +0800 debug commit 990792aa7e332bc6d31df520f2c8b8c07c2312bf Merge: 8de2ad295 ce32cbfc5 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 22:40:16 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 8de2ad295d7272054dd1ee4bdffa5272cfa2eb4b Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 22:40:09 2018 +0800 登录页链接添加 commit ce32cbfc53fceaf0131f927af06b1834b09cdf93 Author: licc <45360682@qq.com> Date: Tue Feb 6 22:36:10 2018 +0800 找不到模板 commit 516e93787f9ae2677a65144c3bf29ee66d87b91b Merge: 653442c21 71d3c6022 Author: licc <45360682@qq.com> Date: Tue Feb 6 22:20:54 2018 +0800 Merge remote-tracking branch 'origin/master' commit 653442c2195150237ccdf0cdbae6b20eca18cf13 Author: licc <45360682@qq.com> Date: Tue Feb 6 22:20:46 2018 +0800 订单生成时的订单统计 commit 71d3c60226cd2e9440f14682a504fb896c0ce2b2 Author: php-王凡昌 Date: Tue Feb 6 22:03:00 2018 +0800 新增dev、clear页面 commit a8f3118b6fac12c732ed0a67679e1e5a64ab3433 Author: 高明阳 Date: Tue Feb 6 21:47:09 2018 +0800 book.js改回 commit f510624c9cecb8145842aac95f71f1ae94dce958 Merge: 19911c431 c7b6dc0c2 Author: 高明阳 Date: Tue Feb 6 21:39:51 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 19911c431f820bb9b4372eb8a4ac1d4fe9001058 Author: 高明阳 Date: Tue Feb 6 21:39:45 2018 +0800 书籍编辑页面调整 commit c7b6dc0c20947ed076c6e1627ce22381d9e595a1 Author: php-王凡昌 Date: Tue Feb 6 21:38:33 2018 +0800 推广单页新增字段 前端入口cookie存储 referral_id commit 26610c25a2587595a73d30ea5ff802dcc8b103d6 Author: php-王凡昌 Date: Tue Feb 6 21:28:33 2018 +0800 修正充值页链接 commit 02c77ba89f599390fc72da677eab675fd660dfbd Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 21:29:23 2018 +0800 增加清除缓存操作 commit 26ee4bc7464a387487346ae01238d5b85f93eddb Author: php-王凡昌 Date: Tue Feb 6 21:21:46 2018 +0800 更新用户cookie 新增用户默认带头像路径 commit a8cebc91f45db4592b01bbc33c9b5e2835b7682a Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 20:55:29 2018 +0800 修改书籍阅读页记录导粉id commit 848f2e16014dbb298db986851462662759ec3bf1 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 20:50:11 2018 +0800 修改删除redis 操作 commit fc130e62c16530bf4094b43784b2035978bad62e Merge: 2e3889315 82b506b6c Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 20:26:56 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 2e388931580cc66d413f40af81d12225e1bfc35b Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 20:26:45 2018 +0800 修改js commit 82b506b6ce5275188ae5b165282d3d947b437c3e Author: licc <45360682@qq.com> Date: Tue Feb 6 20:17:29 2018 +0800 最近阅读容灾处理 commit 87dfb7368291f96bf329a22b6f7603ca013bfabe Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 20:01:53 2018 +0800 去掉封面 放大效果 commit fe14b64ef0d0251960111458b17962d14d912438 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 19:55:14 2018 +0800 修改搜索框提示信息 commit 01565405acb16fe91ff313be770c742bdfb4e65c Merge: 4bf7e1125 92589ca9f Author: php-王凡昌 Date: Tue Feb 6 19:14:09 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 4bf7e11250f6891c0d68e8cee64c2a5f9944b0f0 Author: php-王凡昌 Date: Tue Feb 6 19:13:55 2018 +0800 全网发布处理 commit 92589ca9f05297b81136bd0099182e3eb016a83f Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 18:44:44 2018 +0800 后台图片放大 修改书籍详情页最新章节添加链接 commit 054386f250bad69fdd69cee13bcbe0a7bc107f3e Merge: f45a8e073 0a2ea6d58 Author: 丁海波 Date: Tue Feb 6 18:33:18 2018 +0800 Merge remote-tracking branch 'origin/master' commit f45a8e0734ece0a79642fe2ecfa32dd8796cc6ee Author: 丁海波 Date: Tue Feb 6 18:33:14 2018 +0800 书籍列表封面放大 commit 0a2ea6d58824347278f7324bd4bebda6fadd375d Author: 高明阳 Date: Tue Feb 6 18:15:52 2018 +0800 书籍分类增加清空redis缓存功能 commit b33699289bb2510837bb3b293f3fe66415a2ce37 Author: 高明阳 Date: Tue Feb 6 18:01:03 2018 +0800 update commit cec0d85a84560f2c312b94ae130e7318b26ce180 Author: 高明阳 Date: Tue Feb 6 17:54:22 2018 +0800 后台增加删除块的redis缓存功能 commit a963ab455d5789d728c690de9b839dab3ada608a Merge: 966e46bb5 7fbaa5ac1 Author: 高明阳 Date: Tue Feb 6 17:42:40 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 7fbaa5ac1dd268b8aff1af82be12b726731877d3 Merge: 1b98dae9b 50663d237 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 17:42:46 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 1b98dae9b4e5069276658f6515cb0c4b48c5942f Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 17:42:37 2018 +0800 ico增加 commit 966e46bb5869f5b0cea57a639e44229f2f7fae9c Author: 高明阳 Date: Tue Feb 6 17:42:34 2018 +0800 update commit 50663d2375146b0e635818d69434f1a223b9174c Merge: dc8152144 0495b6fb1 Author: 高明阳 Date: Tue Feb 6 17:14:32 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit dc815214401177880c016b6c4d899f2ceaf4687a Author: 高明阳 Date: Tue Feb 6 17:14:25 2018 +0800 调整form样式 commit 0495b6fb12130e722de4f97a4446bd330951d389 Merge: a385b8a5b 1f62111d1 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 17:07:17 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit a385b8a5b6537ad40531da7276a7789c7d53e077 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 17:07:09 2018 +0800 修复书籍页bug commit 1f62111d167d94427d69dba7db05b1ef100a128b Author: 高明阳 Date: Tue Feb 6 17:01:53 2018 +0800 书籍编辑时清除缓存 commit 99566f034746e0afc2eb427ebe35b523166fc561 Merge: e6d4cad38 cb895b8dd Author: licc <45360682@qq.com> Date: Tue Feb 6 16:55:49 2018 +0800 Merge remote-tracking branch 'origin/master' commit e6d4cad383496d649a4543ac8344b2d37588860a Author: licc <45360682@qq.com> Date: Tue Feb 6 16:55:42 2018 +0800 最近阅读容灾处理 commit cb895b8ddce9ddedc18cea4b756bec93de706cc3 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 16:53:36 2018 +0800 书籍页面 ，列表页，详情页，增加书籍状态 ，及不存在书籍页面报错提示 commit 46763ef9041e416965cf1d6a1ba3627c2d191d98 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 16:35:03 2018 +0800 模块列表副标题 改为 非必填 commit 2f5958fcb13819964540ab52de89e90d78184942 Author: licc <45360682@qq.com> Date: Tue Feb 6 16:06:38 2018 +0800 解决Config重复问题 commit c4cead1ad37a37c6ca20a2cc2f6ae3c45936e642 Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 16:00:02 2018 +0800 修改头像 commit 6676f23344c8a4ae46a75a0d2e9d5c50af3cc6a9 Merge: 7ca49c899 83950df7d Author: licc <45360682@qq.com> Date: Tue Feb 6 15:24:53 2018 +0800 Merge remote-tracking branch 'origin/master' commit 7ca49c899ea25322238c145dc00b20e806a8101d Author: licc <45360682@qq.com> Date: Tue Feb 6 15:24:41 2018 +0800 去掉redis分库存储 commit 83950df7d6fdf0c0ad747c5f64f2610100ec1c92 (tag: tag-20180206_152207) Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 15:22:37 2018 +0800 更新阅读页获取read 逻辑 commit 2f8858e99433c119584967394131844f97bee592 Author: 丁海波 Date: Tue Feb 6 15:18:15 2018 +0800 分类图片修改 commit f5b6fc37f2bcc8d7f62dcfc1729903202daaf05d Author: 高明阳 Date: Tue Feb 6 15:15:26 2018 +0800 fix bug commit 4a44ad5d9bc55723975a2196b1994866e9e8bd3d Author: 丁海波 Date: Tue Feb 6 15:02:16 2018 +0800 搜索日志修改 commit a39256e21a5a1993f83aa1f73884e85c801785fd Author: licc <45360682@qq.com> Date: Tue Feb 6 14:53:13 2018 +0800 去掉redis分库存储 commit c6a0f210cd8fe1aee650545e3ea9ab5c7574076a Author: lichong_ <1909165236@qq.com> Date: Tue Feb 6 14:41:03 2018 +0800 增加人数友好时间展示 commit a60d03c766f882fb848ac4e9de817bf2a93ac705 Merge: 3974a79ce 90ecfd08a Author: licc <45360682@qq.com> Date: Tue Feb 6 14:12:29 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3974a79ce420338652e644b4210cc00d7125e69f Author: licc <45360682@qq.com> Date: Tue Feb 6 14:12:20 2018 +0800 减少免费看点加入容灾处理 commit 90ecfd08a8f86ca36851e021a68f4f5b47d8befd (tag: tag-20180206_120855) Author: php-王凡昌 Date: Tue Feb 6 12:05:59 2018 +0800 reids默认配置改为线上配置，并新增env配置 commit c8a87b2648291c0870cb8a337dd4e7be328398fc Merge: 927fb83bf 7a8b119b1 Author: 高明阳 Date: Tue Feb 6 12:01:44 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 927fb83bf1b639c88152c0ef426069197741b321 Author: 高明阳 Date: Tue Feb 6 12:01:42 2018 +0800 书籍校验 commit 7a8b119b12d7e016866c610aaab6ef6f4d8d03cb Merge: c78504d6d be3da96d6 Author: 丁海波 Date: Tue Feb 6 11:58:18 2018 +0800 Merge remote-tracking branch 'origin/master' commit c78504d6d89b763e78c1acf6a7c6efbc21f1527a Author: 丁海波 Date: Tue Feb 6 11:58:11 2018 +0800 充值日志修改 commit be3da96d602a04d73d6bf1401cdc797b6ffa89e6 Author: php-王凡昌 Date: Tue Feb 6 11:46:28 2018 +0800 site.php 配置项删除 config.site 改为动态生成数据(redis被动式缓存) commit fc420d440a4207f8a52e5fcc9d2debc0516b19d8 Author: 丁海波 Date: Tue Feb 6 11:41:22 2018 +0800 充值日志修改 commit 61176b23b9118a429a59282bf12514af8f3640cb Merge: 0c9919877 9af0e2d06 Author: 丁海波 Date: Tue Feb 6 11:40:15 2018 +0800 Merge remote-tracking branch 'origin/master' commit 0c99198773f3e98bfb49e959a96f88545234b0f7 Author: 丁海波 Date: Tue Feb 6 11:40:09 2018 +0800 充值日志修改 commit 9af0e2d066626dd78097b6e9a55de0cac2fab4d4 Author: licc <45360682@qq.com> Date: Tue Feb 6 11:37:33 2018 +0800 json_encode 加上 JSON_UNESCAPED_UNICODE commit d9ff8584f6e9c0f05309f83e1271eddaf0d1e2fe Merge: b7028214e 625b880a5 Author: licc <45360682@qq.com> Date: Tue Feb 6 11:29:50 2018 +0800 Merge remote-tracking branch 'origin/master' commit b7028214e8f74b3c1d802c67014163f8f98ab482 Author: licc <45360682@qq.com> Date: Tue Feb 6 11:29:40 2018 +0800 最近阅读缓存加上最后章节更新时间 commit 625b880a510eb2a3ac7d20dff994b42600c3b1f2 Merge: 056da5745 cb138c5af Author: 高明阳 Date: Tue Feb 6 11:16:51 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 056da5745e43aaddeeb26e2cf0a897f5a3862f88 Author: 高明阳 Date: Tue Feb 6 11:16:45 2018 +0800 update commit cb138c5af09723a98a9bb508ff466d7ca956343d Author: 丁海波 Date: Tue Feb 6 10:37:53 2018 +0800 充值页日志修改 commit 3675b7e35c13b8139c3cc9fc3908b47f7238db58 Author: 高明阳 Date: Tue Feb 6 00:39:43 2018 +0800 update commit eb491052ef12d9eedeb03dd402d10ecea99f3714 Author: 高明阳 Date: Mon Feb 5 23:21:47 2018 +0800 update commit df2bb6a7429699e3e592f2d28a51dfd2f8bfc85c Author: 高明阳 Date: Mon Feb 5 23:19:40 2018 +0800 书籍批量添加bug修复 commit 9bd29c6e6000247a91036a8e97d439c52bbdaa9a Merge: 21c96881a cc9410281 Author: 高明阳 Date: Mon Feb 5 21:59:17 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 21c96881a60107f77b8f6cf0bf40a3f2394696b1 Author: 高明阳 Date: Mon Feb 5 21:59:08 2018 +0800 book saveall调整 commit cc94102819d2f286d139808502b4cac9e1ea778b Author: 丁海波 Date: Mon Feb 5 21:52:20 2018 +0800 pay log commit 3c573877d642e9f2461884c185d295cbdc522bca Author: 丁海波 Date: Mon Feb 5 21:38:02 2018 +0800 点击充值 阻止重复点击充值按钮 commit f9828d27b0b7a5f7bd821185589644c1dc94a127 Author: 丁海波 Date: Mon Feb 5 21:35:15 2018 +0800 充值状态log commit 2b75d5e2aece535c4596732d0fa4180bf5fe070b Author: 高明阳 Date: Mon Feb 5 21:34:15 2018 +0800 update commit e849c2a6e98c52efd97abe4c189704a976e9a039 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 21:27:21 2018 +0800 阅读页章节是否扣费状态返回 commit 65acc51a6c80b527e6a58780c39fb3646c38402d Author: licc <45360682@qq.com> Date: Mon Feb 5 21:23:00 2018 +0800 如果用户到了收费章节添加返回值 commit 9989e8d80decbcb59c7aedba93629b3c2d1820ff Author: php-王凡昌 Date: Mon Feb 5 20:56:35 2018 +0800 修改默认 debug 关闭 commit 3374da2257d2d45039bef61f150094715730c862 Merge: 5bc17899e 11dcfd83f Author: 高明阳 Date: Mon Feb 5 20:29:15 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 5bc17899ef040d5e981e4ec2a1b125fa82976ff8 Author: 高明阳 Date: Mon Feb 5 20:29:07 2018 +0800 书籍接口改post commit 11dcfd83f8d817072dd0959fceac80ddfc9ce0ba Author: 丁海波 Date: Mon Feb 5 19:54:55 2018 +0800 删除zipimg commit a67cf60eb9bb3b6a8a89aed350619da747dbf3fa Merge: 493a10001 1fba3336b Author: php-王凡昌 Date: Mon Feb 5 19:50:39 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 493a10001390425c94dd5d07850239270129cfb1 Author: php-王凡昌 Date: Mon Feb 5 19:50:25 2018 +0800 修正site.php替换逻辑 commit 1fba3336b892678a487dff5f4aa8063185095990 Merge: 44d01b952 b563a1c54 Author: licc <45360682@qq.com> Date: Mon Feb 5 19:49:36 2018 +0800 Merge remote-tracking branch 'origin/master' commit 44d01b9523d8b5d5d7eb9cd7b62d5c3267a07c4a Author: licc <45360682@qq.com> Date: Mon Feb 5 19:49:28 2018 +0800 如果用户到了收费章节添加返回值 commit b563a1c540b79f282f07c3a602e65a7fed02d23d Author: 丁海波 Date: Mon Feb 5 18:50:30 2018 +0800 阅读页日志 commit b4fca41e4eb1a35c8c34a785c9917f6c54fec332 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 18:43:45 2018 +0800 阅读页增加sid commit 4f0a8ef8889ce41e085b8dcf7aecebec9602ad47 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 18:32:13 2018 +0800 计费字段 commit 6c0f0a832cd927532be816cf45d60e5a051b5f50 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 18:22:58 2018 +0800 增加接口返回信息错误，跳转至404 commit fecb1209abdd97923ac926208c842dae2d2cb253 Merge: b81f7d12d 4609f406c Author: licc <45360682@qq.com> Date: Mon Feb 5 18:16:27 2018 +0800 Merge remote-tracking branch 'origin/master' commit b81f7d12d77176bad35728fd6ed8ce70936a0ba5 Author: licc <45360682@qq.com> Date: Mon Feb 5 18:16:20 2018 +0800 修改小说统计搜索 commit 4609f406c66175a72306c07f16d49f1d488cd627 (tag: tag-20180205_180649) Merge: 400807a63 8c190551a Author: 高明阳 Date: Mon Feb 5 18:04:54 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 400807a6336e97b7e57fbae18ce804d3ff2fb3cc Author: 高明阳 Date: Mon Feb 5 18:04:48 2018 +0800 修复bug commit 8c190551a8990e41caa90b0408086e3facbff2f2 Author: licc <45360682@qq.com> Date: Mon Feb 5 17:58:13 2018 +0800 修改小说统计搜索 commit 877cc3d5e4e6ff276d432b592e7e465a42b08674 Author: licc <45360682@qq.com> Date: Mon Feb 5 17:57:43 2018 +0800 修改小说统计搜索 commit 073e9085efbe02c879af77fd03caf3e81efa7cc1 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 17:52:12 2018 +0800 书籍缓存改为12小时 commit f8c23a2ab7afe8b31f4f6074b44f99b97ce02430 Author: php-王凡昌 Date: Mon Feb 5 17:47:55 2018 +0800 本地.env环境配置 commit 74c06762a0154d3723caa1b478570b4f4e93d302 Merge: 9aaf3bad6 52356bb04 Author: 高明阳 Date: Mon Feb 5 17:43:10 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 9aaf3bad66ca65910301524c296ad9c193f653e0 Author: 高明阳 Date: Mon Feb 5 17:43:04 2018 +0800 书籍详情字数格式化 commit 52356bb04e340b354a38cb561b14117f8ebe98e9 Merge: 661f74793 8f1c98dd0 Author: 丁海波 Date: Mon Feb 5 16:35:28 2018 +0800 Merge remote-tracking branch 'origin/master' commit 661f74793213553942b7c16c6b88eecb15cc678c Author: 丁海波 Date: Mon Feb 5 16:35:22 2018 +0800 日志 commit 8f1c98dd058b4628d0f701b159cc5ad3138cd2ee (tag: tag-20180205_155036) Merge: 36f2a3913 c6e19d323 Author: php-王凡昌 Date: Mon Feb 5 15:49:33 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 36f2a39137cc13bb6a06466fcb5ce72950158dcf Author: php-王凡昌 Date: Mon Feb 5 15:49:11 2018 +0800 cdn设置 commit c6e19d3239be8214542922c50ba5f7c64b17a0c8 Author: 高明阳 Date: Mon Feb 5 15:47:15 2018 +0800 前台书籍详情页修复 commit a872ca9f067d0baf9a7a493bec2c8a47cbaad6f5 (tag: tag-20180205_152017) Author: php-王凡昌 Date: Mon Feb 5 15:11:16 2018 +0800 压缩 js css commit c2ff33d0a224198e07e4dc534bbaddfb0370d753 Author: php-王凡昌 Date: Mon Feb 5 15:09:39 2018 +0800 调整配置项 修改基类推广页浏览器环境获取 user 逻辑 commit 7c66dd5370d5d895a5ada1c907a82871340f22ce Merge: 924a55f27 452c1a745 Author: licc <45360682@qq.com> Date: Mon Feb 5 15:01:10 2018 +0800 Merge remote-tracking branch 'origin/master' commit 924a55f27efee522867acad4efa0b0fa0e13363d Author: licc <45360682@qq.com> Date: Mon Feb 5 15:00:59 2018 +0800 修改小说统计搜索 commit 452c1a74538de7eb97a86a474dd6e3ab7b9b3e03 Author: 丁海波 Date: Mon Feb 5 15:00:47 2018 +0800 日志 commit 1d1401453151e47930a0c2c67320f8c45418099b Merge: dccffc617 70e8645c3 Author: 丁海波 Date: Mon Feb 5 14:51:10 2018 +0800 Merge remote-tracking branch 'origin/master' commit dccffc617e6489421b1713b4c735cb73a37755a2 Author: 丁海波 Date: Mon Feb 5 14:51:00 2018 +0800 日志 commit 70e8645c3c66f4f8aaa786f8ad33321d55ba11c6 Merge: 942cf3010 fb1ec8efc Author: licc <45360682@qq.com> Date: Mon Feb 5 14:24:05 2018 +0800 Merge remote-tracking branch 'origin/master' commit 942cf301004d9e2467fd29f6c6a8c00b5c8b91ba Author: licc <45360682@qq.com> Date: Mon Feb 5 14:23:56 2018 +0800 修改小说统计搜索 commit fb1ec8efcbc553bf1866afaf0a6eb2e72b4703ab Author: 丁海波 Date: Mon Feb 5 13:43:34 2018 +0800 日志 commit d152a32ddfc06aab457c99beb62c6057431ad621 Merge: ea55d7877 27418b7df Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 12:28:19 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit ea55d7877d7c8b1f758b5c37b52e467cd5bd562a Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 12:28:11 2018 +0800 商品默认选中状态去掉 commit 27418b7dff26735d4a3805b37e468a81f335cb5b Author: php-王凡昌 Date: Mon Feb 5 12:26:41 2018 +0800 过滤新老用户，默认选中第一个 commit b450832b5a7e7ad193276ddbe4579bdfa8e1844c Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 12:10:25 2018 +0800 头像图片地址更改 commit 10af4b82c644daf3d36410253165ba3fddd105e6 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 12:09:12 2018 +0800 头像路径修改 commit 28ed2c20ef28534af77befa7dc38829b0c83d54a Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 12:03:52 2018 +0800 用户头像 commit 1f3a4a0d1a54b198c77b1fea6c2862041fbbd53d Merge: ad9494bdc c65bd6688 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 11:46:10 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit ad9494bdc968003e34fdb4d02800fb014c4b92d8 Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 11:46:01 2018 +0800 阅读页加头像 commit c65bd6688a89ba587bd75046beb23c2d0ce97f6a Author: licc <45360682@qq.com> Date: Mon Feb 5 11:44:59 2018 +0800 签到成功提示修改成签到成功送xx书币 commit d9bfb764169f2802202865517801eed75f993569 Author: licc <45360682@qq.com> Date: Mon Feb 5 11:22:31 2018 +0800 解决计费报错问题 commit cb4b69e4bacc4e8843daf4d2d85045476d292106 Merge: ec0e7af5e f2f4dca03 Author: licc <45360682@qq.com> Date: Mon Feb 5 11:12:24 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # application/index/controller/Fee.php commit ec0e7af5edf45f2d18cd805c9ea5338485a2d6bc Author: licc <45360682@qq.com> Date: Mon Feb 5 11:12:08 2018 +0800 解决计费报错问题 commit f2f4dca031699addf73ea89b46a957d1ca62c832 Merge: 3a0d3ce14 4e6dd0ddc Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 11:09:47 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 3a0d3ce1453b0afc3cf73862accc8b9dc880712f Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 11:09:39 2018 +0800 修改书籍统计问题 commit 4e6dd0ddc784474a9831062b9e0bd98de5b1ddb7 Author: php-王凡昌 Date: Mon Feb 5 11:01:36 2018 +0800 统一处理吐司提示 commit 812ab4886eea2a229e386b2bb74bc150f2a6ef20 Author: 丁海波 Date: Mon Feb 5 10:56:28 2018 +0800 日志https commit 8ac70babe7e52b9f6bc6b0f45c0acda7e1372f4e Merge: ea3e5bcf0 cce1ce3f8 Author: licc <45360682@qq.com> Date: Mon Feb 5 10:38:39 2018 +0800 Merge remote-tracking branch 'origin/master' commit ea3e5bcf0eb24355911b2877569ad239f9df19de Author: licc <45360682@qq.com> Date: Mon Feb 5 10:38:30 2018 +0800 修改计费逻辑，加最近阅读游客计入 commit cce1ce3f8183734683470f0fe70aae7ef99bed8f Author: lichong_ <1909165236@qq.com> Date: Mon Feb 5 10:37:19 2018 +0800 修改首页排序 commit ee0027a2747933ab59c1ea24d017a7d72ed7d4aa Merge: c52127209 84c02fca8 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 22:31:48 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit c521272092db976f7792d2c99a36962b6e4fcfc7 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 22:31:35 2018 +0800 引入类 commit f39515c5848b5c1a5ba41f5da8fafeb18f42d519 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 22:29:13 2018 +0800 修改cookie获取方式 commit 84c02fca8ba091c1a0a3c5680b8f23dabb39630a Merge: 22be294c1 f39515c58 Author: 高明阳 Date: Sun Feb 4 22:28:56 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 22be294c15090a7eae85211adec1084a365479a9 Author: 高明阳 Date: Sun Feb 4 22:28:44 2018 +0800 书籍增加完本价格校验；推广多条页面更新 commit d4983cf566b95e59a8247a4b194529b7d15a2f23 Merge: 1d2e4e6f0 e6b8d7a82 Author: licc <45360682@qq.com> Date: Sun Feb 4 22:27:44 2018 +0800 Merge remote-tracking branch 'origin/master' commit 1d2e4e6f0341e78c592c379ef22f6cc56e8adc08 Author: licc <45360682@qq.com> Date: Sun Feb 4 22:27:37 2018 +0800 修改计费逻辑，加最近阅读游客计入 commit e6b8d7a82ffab932992952141feed80d8bcfa79a Merge: b7fa47f02 599ebe85e Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 22:25:00 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps Conflicts: application/index/controller/Book.php commit b7fa47f02f7787a7b84ced8db7275d5d12b500b9 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 22:24:10 2018 +0800 更新首页及其他信息 commit 599ebe85e2bf17a0d5f75e33597ee3b3ed7cb001 Author: licc <45360682@qq.com> Date: Sun Feb 4 22:16:19 2018 +0800 修改计费逻辑，加最近阅读游客计入 commit 67b4d030046fa29c4f265a167b7d7e9b65019bc6 Author: 丁海波 Date: Sun Feb 4 22:04:11 2018 +0800 推广首页 commit 7d4b254dd73e319303bf7b8b2851ef8970927ad4 Author: 丁海波 Date: Sun Feb 4 22:01:04 2018 +0800 推广首页 commit 85a645161660408cf829ce4edc855493bcdc7f77 Author: 丁海波 Date: Sun Feb 4 21:56:32 2018 +0800 推广首页 commit 6cb193eca4a40858cbd635f91fa72eefa50f1f19 Author: 丁海波 Date: Sun Feb 4 21:55:14 2018 +0800 推广首页 commit 1f770a8295333a0cdac1a807e32b2b8ce9b27e0f Author: php-王凡昌 Date: Sun Feb 4 21:30:52 2018 +0800 充值页跳转逻辑 commit d5f1e967c22e0a5a722280ff70c2833890dc788a Author: 丁海波 Date: Sun Feb 4 21:18:17 2018 +0800 pv日志 commit fa707a6d4718a677b0635e80e9ea39fbd6e781bd Author: 丁海波 Date: Sun Feb 4 21:17:27 2018 +0800 pv日志 commit 75a6a1212438f8ae8f6dc42901a459aa4778c3f1 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 20:36:34 2018 +0800 用户信息获取方法 commit d050a0ecedafeb16b2bce0da888208a5f956f337 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 18:58:07 2018 +0800 目录链接 commit ebc07d6348c74f1950d146ccbf73720ca6bf5841 Author: 丁海波 Date: Sun Feb 4 18:54:52 2018 +0800 阅读页目录更多按钮 commit 67f160c1afa2d00873a8b10be364860a0168616c Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 18:45:57 2018 +0800 阅读详情页目录 commit 42f73e8ec5f7f935964258e1f051bdae5dd2ac1f Merge: 72a18d410 0ebbd50da Author: licc <45360682@qq.com> Date: Sun Feb 4 18:12:20 2018 +0800 Merge remote-tracking branch 'origin/master' commit 72a18d410cff4ca5076e16dfad16b6ef22c301ca Author: licc <45360682@qq.com> Date: Sun Feb 4 18:12:13 2018 +0800 修改后台看点充值 commit 0ebbd50dab1aad101ef2df272c778aff596a1f8a Author: 丁海波 Date: Sun Feb 4 18:11:38 2018 +0800 日志 commit 6cec4f632501c6c5c7435a11239acacf6f6dfb5e Merge: 9fe1d2d96 0d615facc Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 17:53:21 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 9fe1d2d96ae19d5968852204fe7457283dadbf90 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 17:53:13 2018 +0800 修改引入类名文件 commit 0d615facc8e915c0de84c9a349e8b41eb072dbb6 Author: php-王凡昌 Date: Sun Feb 4 17:50:04 2018 +0800 微信订单支付通知回调 commit 6ce4193e7f95fd3f5446fea434791399ef600f28 Merge: f8233ae53 5ee9f246f Author: licc <45360682@qq.com> Date: Sun Feb 4 17:48:21 2018 +0800 Merge remote-tracking branch 'origin/master' commit f8233ae53f300349e4a9a359b3bafbd42f385506 Author: licc <45360682@qq.com> Date: Sun Feb 4 17:48:13 2018 +0800 修改后台看点充值 commit 5ee9f246f2561b77fcdf5a7458aa9f74e7501a13 Merge: 65bec8f5c 6610c6381 Author: 丁海波 Date: Sun Feb 4 17:39:12 2018 +0800 Merge remote-tracking branch 'origin/master' commit 65bec8f5c6b50fb7d72027859d272c97a9e8e924 Author: 丁海波 Date: Sun Feb 4 17:39:02 2018 +0800 日志 commit 6610c63819157a0d841206875980af8fe2ca3675 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 17:33:26 2018 +0800 修改书籍页上一章ID错误 commit 5cbd6c0d206a06d9ae5399da7e0e8ba55cc2cba3 Merge: 97eaf53ec 426449a05 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 17:18:37 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 97eaf53ec55d4e3a61ecad4d2234b2bca86d37c3 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 17:18:29 2018 +0800 修改清除redis缓存 commit 426449a059a534ef0771c857baa412cabc6c06b1 Merge: 5cc31e30d 43660abbc Author: licc <45360682@qq.com> Date: Sun Feb 4 17:16:35 2018 +0800 Merge remote-tracking branch 'origin/master' commit 5cc31e30d65d81e929a9af0440ef86c42670234c Author: licc <45360682@qq.com> Date: Sun Feb 4 17:16:28 2018 +0800 修改后台看点充值 commit 43660abbc759cc1c217cb721c8cdfc887646f001 Merge: f525f6848 6786d86c2 Author: 高明阳 Date: Sun Feb 4 17:15:28 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit f525f6848088fc561e0e6bc51a3eb7a7478cf171 Author: 高明阳 Date: Sun Feb 4 17:15:21 2018 +0800 update commit 6786d86c2bfe26cb9ee11682ba0131ec80dbb89a Author: 丁海波 Date: Sun Feb 4 17:15:01 2018 +0800 轮播图添加懒加载图片 commit a6ab0d9b56d9f06614ae87f1145e87b1dce947ab Merge: 6a0c66d53 b8c80f752 Author: 丁海波 Date: Sun Feb 4 16:47:39 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6a0c66d53fbf3dc5b98c7e2dd38ab3ab90e8b4b3 Author: 丁海波 Date: Sun Feb 4 16:47:33 2018 +0800 首页图片懒加载 commit b8c80f75291fe9b6ec8586580e4351cc8e7716c7 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 16:46:59 2018 +0800 后台男女频分类展示 commit 50077bf1be17e5255f68ac18b4dc335ecda797ce Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 16:37:49 2018 +0800 修改首页猜你喜欢显示条数 commit f04e40255b5577a3242ab39500de579997a0c3c7 Merge: 2be7ac31e d06c58c51 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 16:29:30 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 2be7ac31eab12db3b00ab96d9a3066a0e4088cae Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 16:29:23 2018 +0800 修改书页bug commit d06c58c51f07537e06ca7c767fa93d794431bf48 Author: 丁海波 Date: Sun Feb 4 16:23:38 2018 +0800 标题增加最大高度 commit eacc799aaeac7c77245e7ab15618dd85315de064 Author: 丁海波 Date: Sun Feb 4 16:18:10 2018 +0800 添加cps_log commit 3f842750c74bed714b63a7c5c120ae9ec6722e6d Merge: b5361fe3a 9b0760924 Author: 丁海波 Date: Sun Feb 4 16:03:24 2018 +0800 Merge remote-tracking branch 'origin/master' commit b5361fe3ac20ee1443629c64a699b9b596d329c4 Author: 丁海波 Date: Sun Feb 4 16:03:18 2018 +0800 日志 zepto zeptocookie 移动到layout里公用 commit 9b07609240cab6307487179a4906cfdbb1a264de Author: licc <45360682@qq.com> Date: Sun Feb 4 16:00:05 2018 +0800 修改细节 commit f73f4da9c7adb2caff37bad886b6e2a2821a66a5 Author: licc <45360682@qq.com> Date: Sun Feb 4 15:49:54 2018 +0800 修改细节 commit 90ec0faae4d5d855c7319403eb7d7c0815372976 Merge: e7a27066a ec81601be Author: licc <45360682@qq.com> Date: Sun Feb 4 15:48:55 2018 +0800 Merge remote-tracking branch 'origin/master' commit e7a27066a01f1159c9ac1748079efd5a3d17518d Author: licc <45360682@qq.com> Date: Sun Feb 4 15:48:46 2018 +0800 修改细节 commit ec81601be2cdb3df54348ad8734f2612e8793bff Author: php-王凡昌 Date: Sun Feb 4 15:41:50 2018 +0800 修正框架总入口 充值页微信内支付 commit 7a33baf9d66eae6d0a959a8824dd21e71c7c8177 Merge: bb177ded4 6692e8742 Author: licc <45360682@qq.com> Date: Sun Feb 4 15:40:23 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6692e8742844b2f1b58ebb7aebb37c9101903e53 Merge: ac42729a4 567c58977 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 15:40:50 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit ac42729a4436626132764f950c39f004e8b24cf1 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 15:40:42 2018 +0800 阅读页修改 commit bb177ded4022dc747f5cb062bfddda5b5dff70e5 Author: licc <45360682@qq.com> Date: Sun Feb 4 15:40:16 2018 +0800 修改细节 commit 567c58977bd50208e1c8f40130969860da06598d Author: licc <45360682@qq.com> Date: Sun Feb 4 14:40:20 2018 +0800 吐丝加入全局 commit 99fe5441c31664bd77207fbe8e51ee1d68cdfb7b Merge: 2bdd3afdf c5d181556 Author: licc <45360682@qq.com> Date: Sun Feb 4 14:29:36 2018 +0800 Merge remote-tracking branch 'origin/master' commit 2bdd3afdfdb97833103ec6dd058d3cbc40385937 Author: licc <45360682@qq.com> Date: Sun Feb 4 14:29:29 2018 +0800 分离出最近阅读 commit c5d18155681285b34b2f98928f78542083a3cd55 Author: 丁海波 Date: Sun Feb 4 14:22:38 2018 +0800 客服消息 commit ad747030e5a0e6da2b43d440d64c49e2646b5ac6 Author: 丁海波 Date: Sun Feb 4 11:34:55 2018 +0800 客服消息 commit 93bef461179e22548bbb94dc2d2eb6eed1c066b1 Merge: e4217b6c1 ba3c4fc3d Author: 丁海波 Date: Sun Feb 4 11:34:35 2018 +0800 Merge remote-tracking branch 'origin/master' commit e4217b6c101d12ce2dd0955e4055946082c66d30 Author: 丁海波 Date: Sun Feb 4 11:30:47 2018 +0800 客服消息 粉丝测试 commit ba3c4fc3d35cdccde95b04d60c344232912e5dc4 Author: lichong_ <1909165236@qq.com> Date: Sun Feb 4 11:28:02 2018 +0800 修改扣费传参 commit 30691f50fc13cf12b56404619a0079ffeb715931 Author: php-王凡昌 Date: Sun Feb 4 11:00:43 2018 +0800 修改基类中 admin_id 为 urlAdminId commit 6da0dcb26a6310aaf93317007fa16b05ba0de5be Author: licc <45360682@qq.com> Date: Sun Feb 4 10:57:33 2018 +0800 暂存 commit b911579558655fd5dec3c5d3919dec9c5c2d730c Merge: 8812961b0 1e8cf13ff Author: 丁海波 Date: Sat Feb 3 21:36:40 2018 +0800 Merge remote-tracking branch 'origin/master' commit 8812961b00aec9b02fe42dd35ec4eaf218549fbc Author: 丁海波 Date: Sat Feb 3 21:36:30 2018 +0800 客服消息 commit 1e8cf13ff6590de26035b15942ebcfc1da37d300 Author: licc <45360682@qq.com> Date: Sat Feb 3 21:13:08 2018 +0800 去掉错误 commit c276e35d295fa82f5b79c6c1fada668ec0018362 Author: php-王凡昌 Date: Sat Feb 3 21:10:02 2018 +0800 商品允许角标为空 商品列表渲染 总框架入口修改 commit b8af8a32c8c9ccb51d918bed6c18cf5f6bc2e8bb Merge: 985f9ed23 eb44371e7 Author: lichong_ <1909165236@qq.com> Date: Sat Feb 3 21:05:57 2018 +0800 Merge branch 'dev-yunyingguanli' commit eb44371e7c2474ef5001c83da6777315e4a2d135 Author: lichong_ <1909165236@qq.com> Date: Sat Feb 3 21:05:36 2018 +0800 收费章节处理 commit 985f9ed23a1ac9eaf2c122c9e71e9263e346e346 Author: 高明阳 Date: Sat Feb 3 20:32:55 2018 +0800 修复章节列表分页功能的bug commit 06edbb1e3b3a519b94d0a6a32f95565fade0e7cb Author: 高明阳 Date: Sat Feb 3 19:47:04 2018 +0800 update commit 4f211dfa78a04f323492eaa3deae52bb790e03bf Author: 高明阳 Date: Sat Feb 3 19:45:37 2018 +0800 更新 commit 52c7782cd6a21ad019a363bc6f84425a87b9af82 Author: lichong_ <1909165236@qq.com> Date: Sat Feb 3 18:38:16 2018 +0800 通知页面处理 commit 806f660dda697bede8696945aff16c3c49d22b66 Merge: 6179e56e1 7d253068e Author: 高明阳 Date: Sat Feb 3 16:50:25 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 6179e56e178a4a1673a74c6e7b31328ac7a56ccb Author: 高明阳 Date: Sat Feb 3 16:50:22 2018 +0800 调整个人中心页和充值页 commit 7d253068eb5acf559ff954200fe1662f89b0fb51 Merge: af9d59614 22d127b50 Author: lichong_ <1909165236@qq.com> Date: Sat Feb 3 16:45:37 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit af9d59614ef3aeb3cfc9f81a8edd1b5a47db6d14 Author: lichong_ <1909165236@qq.com> Date: Sat Feb 3 16:45:26 2018 +0800 修改首页 commit 22d127b50aab5b02d858b81fbeafc5b958fa50f3 Author: 丁海波 Date: Sat Feb 3 16:43:20 2018 +0800 多条推广添加按钮 commit 94d931e57cb321fc08a33be43e3367bf43cac72e Author: php-王凡昌 Date: Sat Feb 3 16:42:16 2018 +0800 后台客服消息 commit c8e59c18f4e38f30abed399e7ff69c4849ac47ed Author: 高明阳 Date: Sat Feb 3 16:22:09 2018 +0800 个人中心页 commit 188c544239f0ab198f646c6b8e94773054472e53 Author: 丁海波 Date: Sat Feb 3 16:13:24 2018 +0800 essay 表单验证 commit 076ff6b2311660094419dfa7cf0438c7958c9089 Author: 丁海波 Date: Sat Feb 3 16:11:14 2018 +0800 essay 生成链接表单认证 commit 8083e4a259683f37e788455804f97b25d906d3df Author: lichong_ <1909165236@qq.com> Date: Sat Feb 3 14:49:45 2018 +0800 合并代码 commit 15546873110529fd224934e27bcee539504f9645 Author: lichong_ <1909165236@qq.com> Date: Sat Feb 3 14:30:01 2018 +0800 暂存 commit ed219af27d8c75a85ec0cbc9f7e009881e64c9a1 Author: 丁海波 Date: Sat Feb 3 13:58:55 2018 +0800 最近阅读 commit 048187545352befecd923392aa102ba7ca1db121 Author: 丁海波 Date: Sat Feb 3 13:56:26 2018 +0800 阅读页签到 commit a3c70e9b3f55c3b19383bb25d7b0a2c52d47d33f Author: 丁海波 Date: Sat Feb 3 10:54:40 2018 +0800 阅读页签到 commit 26fccc56a3f09558a29a488d200aa3bc485c9886 Author: 高明阳 Date: Fri Feb 2 15:58:08 2018 +0800 update commit 56616dbf400a64f62f29d2991594ec0a1190b901 Author: 高明阳 Date: Fri Feb 2 15:45:03 2018 +0800 update commit 3a00ed92d80c74be0867833600364d779db7fa79 Author: php-王凡昌 Date: Fri Feb 2 15:39:39 2018 +0800 修复微信创建新用户 commit 92c91267e29c9ca526011ad36a69f6a07bbcc399 Merge: 48c903f31 76267de38 Author: licc <45360682@qq.com> Date: Fri Feb 2 15:09:52 2018 +0800 Merge remote-tracking branch 'origin/master' commit 48c903f31bd3a36de638e8710414f4db0124ef30 Author: licc <45360682@qq.com> Date: Fri Feb 2 15:09:41 2018 +0800 去掉错误 commit 76267de3870733be5298e88a9c134ceb2b9a80fc Author: lichong_ <1909165236@qq.com> Date: Fri Feb 2 14:58:42 2018 +0800 no message commit 755da279f9c4f93c917c7f012721b909e1b6f407 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 2 14:57:25 2018 +0800 修最近阅读记录 commit fa1ae3231b51b60b7980353340992539b5cde0b8 Author: licc <45360682@qq.com> Date: Fri Feb 2 13:37:56 2018 +0800 去掉错误 commit 5594d5ed5141aebf2628ad7e1407cc88278395b9 Merge: e543e2ef8 54522aa81 Author: licc <45360682@qq.com> Date: Fri Feb 2 13:26:59 2018 +0800 Merge remote-tracking branch 'origin/master' commit e543e2ef86ccc2f662bbb6357ce5039968f1a623 Author: licc <45360682@qq.com> Date: Fri Feb 2 13:26:52 2018 +0800 最近阅读删除 commit 54522aa813ab120ac232d258b41df781af154c2a Merge: 1159ec687 4c3c00b84 Author: php-王凡昌 Date: Fri Feb 2 12:19:27 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 1159ec6877c26ec25488e10eabc6a1310e29a81b Author: php-王凡昌 Date: Fri Feb 2 12:19:14 2018 +0800 新增充值controller，调整目录结构 commit 4c3c00b84ef602295db2ed0299647cb827127a9f Author: licc <45360682@qq.com> Date: Fri Feb 2 12:15:20 2018 +0800 最近阅读删除 commit c1a0c7c3e7668830de16b3c81c5bc95bd96497c9 Merge: 2964f4ec6 88bf0ffcf Author: 丁海波 Date: Fri Feb 2 12:11:45 2018 +0800 Merge remote-tracking branch 'origin/master' commit 2964f4ec6d8b7980c9b9deac54ca6462adb144ba Author: 丁海波 Date: Fri Feb 2 12:11:37 2018 +0800 删除最近阅读 commit 88bf0ffcfa12fbe7bb43f323c984ac18b667e699 Author: php-王凡昌 Date: Fri Feb 2 12:11:22 2018 +0800 支付页微信登录 commit 13a5303eab94ac29f5f358d643b3cd43c9d9c71a Author: 丁海波 Date: Fri Feb 2 12:08:58 2018 +0800 删除最近阅读 commit 88c6990fe3fdd68cde0b869392462ba0aa5a0ab2 Author: 丁海波 Date: Fri Feb 2 12:08:07 2018 +0800 删除最近阅读 commit f1b5b6df1cadcbea12344113cece6234639b0042 Author: 丁海波 Date: Fri Feb 2 12:06:52 2018 +0800 删除最近阅读 commit 01129633234856d845a39ff219ca4ac691f3e27b Author: licc <45360682@qq.com> Date: Fri Feb 2 12:04:44 2018 +0800 最近阅读从update开始更新 commit e6cdd7b917e68b8e7d306f4ad4651e249753fbc0 Author: 丁海波 Date: Fri Feb 2 12:01:35 2018 +0800 删除最近阅读 commit b29ab204cf04955f3f095de8073b0e939822efc9 Merge: 978327c43 109798659 Author: licc <45360682@qq.com> Date: Fri Feb 2 11:53:14 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # public/assets/js/frontend/recently.js commit 978327c43e9c3f94ce08261e313b570d1a1fc48b Author: licc <45360682@qq.com> Date: Fri Feb 2 11:52:54 2018 +0800 最近阅读从update开始更新 commit 1097986593f3db470279c448a56a51a203a2d0c5 Merge: 477b4f175 2c8af19c4 Author: 丁海波 Date: Fri Feb 2 11:30:11 2018 +0800 Merge remote-tracking branch 'origin/master' commit 477b4f1753a95b686109bae5b300d5fc7e0895ba Author: 丁海波 Date: Fri Feb 2 11:30:01 2018 +0800 重复请求时间间隔改为10秒 commit 2c8af19c41713175a106439f5f995441eb61d8bd Merge: c13064c1e c01d693e8 Author: 高明阳 Date: Fri Feb 2 11:29:59 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit c13064c1e08bedd519f1cbceaed2a3f385bfc780 Author: 高明阳 Date: Fri Feb 2 11:29:52 2018 +0800 update commit c01d693e8fcc88ec0f33cece050d006f6c3ab095 Author: 丁海波 Date: Fri Feb 2 11:28:54 2018 +0800 删除最近阅读失败稍后重试 commit 16297a6f95a1a0d6cc0e8a59f86f003eec142985 Author: 丁海波 Date: Fri Feb 2 11:21:56 2018 +0800 删除最近阅读 commit 7ab384c65feabfc785abbccd933a1d6efb86af81 Author: 丁海波 Date: Fri Feb 2 11:18:51 2018 +0800 删除最近阅读 commit 6b2b52bb66873577c39958d4acc4f8d2c547f503 Author: 丁海波 Date: Fri Feb 2 11:14:20 2018 +0800 最近阅读删除逻辑 commit 399355c1dc43b13592d9ae3b47c382ad3f5ced57 Author: licc <45360682@qq.com> Date: Fri Feb 2 11:03:26 2018 +0800 最近阅读从update开始更新 commit 6f0512cac46bdbd3a8e7c5188337c208dc575e8c Merge: f3db5f37e f56953f4b Author: licc <45360682@qq.com> Date: Fri Feb 2 10:52:24 2018 +0800 Merge remote-tracking branch 'origin/master' commit f3db5f37ed873399c7479e5845f61158091418d4 Author: licc <45360682@qq.com> Date: Fri Feb 2 10:52:15 2018 +0800 最近阅读从update开始更新 commit f56953f4bd71d48eb6abe7ee02a978934326cd5e Merge: 177e75dc8 df36e1186 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 2 10:46:30 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 177e75dc8097e55f6f15ccb5cddb343847993995 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 2 10:46:17 2018 +0800 阅读记录cookie读取 commit df36e1186702ed17de0a191cb6f4ede92a4fedc6 Author: 丁海波 Date: Fri Feb 2 10:45:01 2018 +0800 最近阅读删除 请求下一页 commit bac6deb9f35690d9274a92fbbf986fa572276679 Author: 丁海波 Date: Fri Feb 2 10:42:16 2018 +0800 最近阅读删除逻辑 commit 7d8b33e0b369ac5da0e1fb310df9d9492efd59b7 Merge: ec74ca8bc c41784ea5 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 2 10:39:59 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit ec74ca8bcd0d2565d983144278d203be0b1db097 Merge: c83b3f414 e47095475 Author: lichong_ <1909165236@qq.com> Date: Fri Feb 2 10:39:50 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps Conflicts: application/index/controller/Book.php commit c41784ea59f52c6e728cace45e7cd4649a905eb5 Author: licc <45360682@qq.com> Date: Fri Feb 2 10:29:51 2018 +0800 最近阅读从update开始更新 commit c83b3f414882c82002a14737ebe319a41c26296a Author: lichong_ <1909165236@qq.com> Date: Fri Feb 2 10:25:36 2018 +0800 暂存 commit e47095475fb84534eddedd97fe9362cde823765f Author: 丁海波 Date: Fri Feb 2 10:19:14 2018 +0800 阻止删除a标签点击跳转 commit e85b3b2c31c38c02cf2e806d04324039b6a1ad2a Author: licc <45360682@qq.com> Date: Fri Feb 2 10:18:28 2018 +0800 最近阅读从update开始更新 commit 51c436d863ef4f51442a93632a694d4f18c0ae43 Author: licc <45360682@qq.com> Date: Fri Feb 2 10:12:32 2018 +0800 最近阅读从update开始更新 commit a126c8cc07e21ffa5504838eead1e855a5d91759 Merge: e85d068ee 66fc39bf0 Author: licc <45360682@qq.com> Date: Thu Feb 1 22:33:45 2018 +0800 Merge remote-tracking branch 'origin/master' commit e85d068eef323cc1715e5edddc7c69cab4894b9c Author: licc <45360682@qq.com> Date: Thu Feb 1 22:33:30 2018 +0800 最近阅读从update开始更新 commit 66fc39bf0bea9c9f1a0f2ff353fe38448fd1ac19 Author: 丁海波 Date: Thu Feb 1 22:25:43 2018 +0800 最近阅读 commit 1aa1723e5d85b0a28010866d9349bc8d77d0b442 Merge: f834232b4 64f5582d2 Author: licc <45360682@qq.com> Date: Thu Feb 1 22:22:59 2018 +0800 Merge remote-tracking branch 'origin/master' commit f834232b469c498121b0af3b12cccddcd6556596 Author: licc <45360682@qq.com> Date: Thu Feb 1 22:22:47 2018 +0800 最近阅读从update开始更新 commit 64f5582d2dc1111b9ae251b1234007ff761fec21 Author: 丁海波 Date: Thu Feb 1 22:21:30 2018 +0800 最近阅读 commit 0fbd8abcb30b931c79f6705c81941a8f24fa0f11 Author: 丁海波 Date: Thu Feb 1 22:20:21 2018 +0800 最近阅读 commit 01129940964adddb81838e3e0412263920073c68 Merge: 116f8b172 6b9b73b77 Author: licc <45360682@qq.com> Date: Thu Feb 1 22:19:46 2018 +0800 Merge remote-tracking branch 'origin/master' commit 116f8b172e480b69628c72a1e4769228a9f475ed Author: licc <45360682@qq.com> Date: Thu Feb 1 22:19:35 2018 +0800 最近阅读从update开始更新 commit 6b9b73b7748d97caf45c38fd75b13bdd76d42f46 Author: 高明阳 Date: Thu Feb 1 21:56:57 2018 +0800 移动接口到api commit ae15f7993cf842e9ecb813f9c829cd118a7a10d3 Merge: 7e6bf10c7 7b74c415f Author: licc <45360682@qq.com> Date: Thu Feb 1 21:43:18 2018 +0800 Merge remote-tracking branch 'origin/master' commit 7e6bf10c770e4e781798382c4f1b528190203558 Author: licc <45360682@qq.com> Date: Thu Feb 1 21:43:08 2018 +0800 测试 commit 7b74c415ff0d7c463d1566b7c9214188e759a40b Merge: 8c0188cbf 2cf3bb843 Author: 丁海波 Date: Thu Feb 1 21:41:52 2018 +0800 Merge remote-tracking branch 'origin/master' commit 8c0188cbf6368d1662a54366b03763dfc0a4800f Author: 丁海波 Date: Thu Feb 1 21:41:47 2018 +0800 最近阅读 commit 2cf3bb843ec41d19cc8bb2a95082a693a76f52fb Author: 高明阳 Date: Thu Feb 1 21:20:35 2018 +0800 update commit d7eaeb9544b5c6da073bf08afe27271d83c13e8d Merge: 2f48c838b d75572f6e Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 20:59:04 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 2f48c838bbc7a977226f86500ca3c36239a76043 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 20:58:55 2018 +0800 暂存 commit d75572f6e1c08266102748b0c8278fc7aa6bb911 Merge: 879f7b842 07902e686 Author: 丁海波 Date: Thu Feb 1 20:57:49 2018 +0800 Merge remote-tracking branch 'origin/master' commit 07902e6862d01329de42a597ac561c98be9f103c Author: 高明阳 Date: Thu Feb 1 20:57:42 2018 +0800 移动书籍分类下书籍列表接口到api commit 879f7b8427618a2bb986a2c982f88a73e005d550 Author: 丁海波 Date: Thu Feb 1 20:57:40 2018 +0800 登录 commit fd986f976e30a0762f06ec3e2bd28c85ba927193 Merge: 79993073d bc2185287 Author: licc <45360682@qq.com> Date: Thu Feb 1 20:50:01 2018 +0800 Merge remote-tracking branch 'origin/master' commit 79993073d244c447d3cb2db7da9f81f013646e1c Author: licc <45360682@qq.com> Date: Thu Feb 1 20:49:44 2018 +0800 暂存 commit bc21852873effb0a8100e2be2fa94b912a7ea61a Author: 高明阳 Date: Thu Feb 1 20:15:59 2018 +0800 update commit 27049a48e7487becf8fcd72b3c867e6e4f678ed1 Author: 丁海波 Date: Thu Feb 1 19:59:56 2018 +0800 tips 提示 commit a3c13e3c718dcfcdcdac9833d545a7ac4465681c Author: 高明阳 Date: Thu Feb 1 19:48:18 2018 +0800 update commit 43632d19872fa87fbaa39241ccfdcfa4c929d56f Merge: 398979207 b898edaac Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 19:42:29 2018 +0800 Merge branch 'dev-yunyingguanli' Conflicts: application/extra/site.php commit b898edaac4b7bc99f961a1a49014cc2532e2be13 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 19:41:38 2018 +0800 完善导粉逻辑 commit 398979207bd64416c69607406822964221906cea Merge: 2f8b18937 916c7722a Author: 丁海波 Date: Thu Feb 1 19:27:03 2018 +0800 Merge remote-tracking branch 'origin/master' commit 2f8b189373b4e3fe72f9f33de9a6200efdc45b79 Author: 丁海波 Date: Thu Feb 1 19:26:52 2018 +0800 登录页面 commit 916c7722a9a1774edc6764ef4f62b1f88f3e7931 Author: licc <45360682@qq.com> Date: Thu Feb 1 18:13:34 2018 +0800 充值记录加上签到 commit fe617dfb11d4a23fe7ef05c5c70ac8c8d6811180 Merge: 3071e44e6 e69b3a37b Author: php-王凡昌 Date: Thu Feb 1 18:05:33 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit 3071e44e696f05f944a90cfb6fd8da8a90357460 Author: php-王凡昌 Date: Thu Feb 1 18:05:05 2018 +0800 添加微信支付服务号配置txt验证文件上传 commit e69b3a37b7689f30f239808853e8ceea86c444b5 Author: 丁海波 Date: Thu Feb 1 18:01:53 2018 +0800 书籍列表修改 commit bf15c9bf34e250314842c78da51379f0cb21a482 Author: 丁海波 Date: Thu Feb 1 17:45:34 2018 +0800 列表修改 commit 157d82091a7ee8bc1c4aa4d222d5c35e6d77ca85 Merge: 9b2de4f8b 47ce91eeb Author: 丁海波 Date: Thu Feb 1 17:29:43 2018 +0800 Merge remote-tracking branch 'origin/master' commit 9b2de4f8b522228aec80e9234da69fa14cad639c Author: 丁海波 Date: Thu Feb 1 17:29:34 2018 +0800 最近阅读编辑点击书籍不可跳转 commit 47ce91eeba99e220e05b912fceaba3b6618312cd Merge: 3f0515483 3f6d44164 Author: licc <45360682@qq.com> Date: Thu Feb 1 17:23:08 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3f0515483ca357d348f80d9d5e4155bfd9b477de Author: licc <45360682@qq.com> Date: Thu Feb 1 17:19:27 2018 +0800 sign commit 3f6d4416403df098a202515c70fbefbfb0364160 Merge: 7d6a33df1 9fa8a36ac Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 17:14:49 2018 +0800 Merge branch 'dev-yunyingguanli' commit 9fa8a36ac1353a68251c90e36d3380bdd6597c2b Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 17:14:32 2018 +0800 暂存 commit 7d6a33df10c8e58829710d0465f1d7092822855e Author: 高明阳 Date: Thu Feb 1 17:05:55 2018 +0800 修复block页面报错 commit c6a4a194a1e90e31d2ec47f6ff6e3a139d240d2f Author: 丁海波 Date: Thu Feb 1 16:59:36 2018 +0800 限免日期修改 commit c74f787c1ed305eb9ad0aea7876c15f0f66d2257 Author: 高明阳 Date: Thu Feb 1 16:57:44 2018 +0800 update commit bd6418309c5085e0b0fe90dcbd575fd15a04d98a Author: 丁海波 Date: Thu Feb 1 16:51:29 2018 +0800 限免修改 commit 664333b27d27b5cf4c0a3a742b2ad9f5d3a24c7c Author: php-王凡昌 Date: Thu Feb 1 16:23:09 2018 +0800 多条推广index复制功能 commit 0106991ae695fafba5e535b6066e4a4319836159 Merge: a34a1f4d3 443cb6177 Author: 丁海波 Date: Thu Feb 1 15:14:43 2018 +0800 Merge remote-tracking branch 'origin/master' commit a34a1f4d3680bda8f404826981a1da29ab2741de Author: 丁海波 Date: Thu Feb 1 15:14:35 2018 +0800 完本书籍修改 commit 443cb617772d49ba35cdc77c17a6559716c86117 Author: 高明阳 Date: Thu Feb 1 15:13:34 2018 +0800 区块书籍列表接口调整 commit 3229dc4097a09cb1745dd37a38baa1db20367b1f Author: 丁海波 Date: Thu Feb 1 15:08:39 2018 +0800 完本书籍修改 commit 4fbb25a5217c0098783f3732e3602c1c1b6444df Author: 高明阳 Date: Thu Feb 1 14:25:10 2018 +0800 update commit 6e86098d7112bc55cb51656c7197e269b10f9cba Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 14:17:08 2018 +0800 最近阅读记录记录cookie commit 4a202ed140b7ad24e13cfa4054f0100acd3598d7 Merge: 5906e3c80 1fe27e194 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 13:58:05 2018 +0800 Merge branch 'dev-yunyingguanli' commit 1fe27e19421a0bdb407267ad134b2e466a93a383 Author: lichong_ <1909165236@qq.com> Date: Thu Feb 1 13:57:45 2018 +0800 最近阅读记录 commit 5906e3c80977b96a52eee48b83a1511bac1da25b Author: 丁海波 Date: Thu Feb 1 11:51:35 2018 +0800 分类修改 commit ed1a28b4e8184d2d583c5a9b274328c9a9311b0f Author: 丁海波 Date: Thu Feb 1 11:47:37 2018 +0800 分类修改 commit 388e9f681236b6276d7051d27775051e0edc70c0 Merge: 96b97fe09 c4bdfe0e7 Author: 丁海波 Date: Thu Feb 1 11:08:20 2018 +0800 Merge remote-tracking branch 'origin/master' commit 96b97fe09f3376306a751299147e5957323c4a9c Author: 丁海波 Date: Thu Feb 1 11:08:13 2018 +0800 分类修改 commit c4bdfe0e7aa60329bb64a8907ec6b2d68e511d97 Author: licc <45360682@qq.com> Date: Thu Feb 1 11:00:00 2018 +0800 sign commit acd1963e807f009e559186e65f9dcb783d41eab3 Author: licc <45360682@qq.com> Date: Thu Feb 1 10:51:43 2018 +0800 暂存 commit 7f439d331f626dc70210980131f532aa2b05ab58 Author: php-王凡昌 Date: Thu Feb 1 10:39:50 2018 +0800 去除调试代码 commit f6b83d249339b634e5a0318dd7871fc96089e9cc Merge: bd8a9480d 7a20f63a8 Author: 高明阳 Date: Wed Jan 31 23:28:49 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit bd8a9480d6c935ed08b792eda627e6fc0b7b7224 Author: 高明阳 Date: Wed Jan 31 23:28:41 2018 +0800 书籍详情 commit 7a20f63a81ecb15b87f23bb44450897030f05191 Author: php-王凡昌 Date: Wed Jan 31 23:28:25 2018 +0800 单条推荐链接，支持设置导粉章节 commit e5165d1b7fa564c7605971e46010de23a7f34404 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 23:12:02 2018 +0800 清除书籍导粉列表缓存 commit d53a9866080e6806f662d271545b9c4f7d61b1dc Merge: 961f13d75 79cbd73d3 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 22:37:29 2018 +0800 Merge branch 'dev-yunyingguanli' commit 79cbd73d3deee0c8a7d1a9bec355ec3c36d6a57c Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 22:37:17 2018 +0800 暂存 commit 314876baa599b7baadb0539601976f447d70a04d Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 22:19:26 2018 +0800 暂存 commit 961f13d751654b0b85fbf85ac7d8f0fbd79a075b Author: licc <45360682@qq.com> Date: Wed Jan 31 22:08:27 2018 +0800 充值记录 commit 429dc5806d285cd1389d417476ad0d194a611bfd Author: 丁海波 Date: Wed Jan 31 21:54:17 2018 +0800 充值记录 edit commit 6ad05618294f4db67c5bf8cd664bc64994fc931c Author: 丁海波 Date: Wed Jan 31 21:53:40 2018 +0800 充值列表加载更多 commit 27ffe07f15053d2f6276bde1cc3ec74be922446a Merge: ba479c5b8 ef6df5e48 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 21:41:59 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit ba479c5b810ad4faa34812e121260fe2f65e49ab Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 21:41:42 2018 +0800 暂存 commit ef6df5e480531d0d1ddbd6a6609ff989516c4456 Merge: 13f2c3c8f 84715e53d Author: 高明阳 Date: Wed Jan 31 21:40:03 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 13f2c3c8ff5b5806d70a6356f12fa7fb9b345a42 Author: 高明阳 Date: Wed Jan 31 21:39:50 2018 +0800 更新 commit 84715e53d65c0954e78fd7e5dff324a6b6e0bc54 Merge: 30f68846a 8d35b825f Author: licc <45360682@qq.com> Date: Wed Jan 31 21:39:48 2018 +0800 Merge remote-tracking branch 'origin/master' commit 30f68846a5525506e6a469493da5ec3bc1fd6b54 Author: licc <45360682@qq.com> Date: Wed Jan 31 21:39:35 2018 +0800 充值记录 commit 8d35b825ff037771a6784f1555745279cefb532a Merge: 9fbc8b2ba 25d7e782a Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 21:19:43 2018 +0800 Merge branch 'dev-yunyingguanli' commit 25d7e782ad540894c9a21bcda46f17eb287e0726 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 21:07:12 2018 +0800 导粉逻辑修改 commit 9fbc8b2ba354ea5e221fcae878bab5349a557099 Author: licc <45360682@qq.com> Date: Wed Jan 31 21:05:26 2018 +0800 充值记录 commit afad4dd23c333b00cb2710e6dc5372b5dd46d6ce Merge: d71b6f20c 05ae05f59 Author: licc <45360682@qq.com> Date: Wed Jan 31 20:59:00 2018 +0800 Merge remote-tracking branch 'origin/master' commit d71b6f20c69a57138e5cfaafb7c7ea0e71223c9e Author: licc <45360682@qq.com> Date: Wed Jan 31 20:58:49 2018 +0800 充值记录 commit 05ae05f592475b54603e330a32eb740dbf5ae3f6 Author: 高明阳 Date: Wed Jan 31 20:57:51 2018 +0800 增加通用的Rmodel commit 40fb8a7ddbc225c710767bce11f0d9b2a0b33f9e Merge: 4340d0c7a e18764d02 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 20:55:14 2018 +0800 Merge branches 'master' and 'master' of http://gitlab.qcread.cn/fe/cps commit 4340d0c7a688a7b6080c190c9276f5fb5af59ae7 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 20:55:04 2018 +0800 暂存 commit e18764d02d1780edc8ad8504e6bb9784965137f0 Author: 高明阳 Date: Wed Jan 31 20:36:50 2018 +0800 优化 commit ec936aafa8e5ac8b14e515e0c7b660a919d4663b Author: 丁海波 Date: Wed Jan 31 19:10:18 2018 +0800 导粉 commit cc90b02a9e978d3cc776f970be37595b8435ea0c Author: 丁海波 Date: Wed Jan 31 18:25:41 2018 +0800 登录修改 commit 26b56171fab878ec67396327211b153cf91d5c9d Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 18:23:55 2018 +0800 修改冲突 commit d5e3c35887dd320211d63b856348832a228f5a58 Merge: 81c15515c 840f23221 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 18:23:27 2018 +0800 Merge branch 'dev-yunyingguanli' Conflicts: application/index/view/book/chapter.html commit 840f23221814b868eb08148ded9004d89035d927 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 18:23:10 2018 +0800 导粉页 commit 81c15515ca64d2f869f648b212a742a1b41396ae Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 18:21:57 2018 +0800 暂存 commit 80fd9bc79f737f87b7ebd73368af23157ffa4abd Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 17:59:33 2018 +0800 章节提示样式 commit 8862734f8158da48345473eee0f21911be4bedb1 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 16:33:59 2018 +0800 登录静态页 commit 8a2fba0a8942a67b252b505d4b7a9c4b20e182d0 Merge: 5f917ab90 54d15b6f8 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 16:32:52 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 5f917ab90648d9078cb47e7ac4bb46752ecb730d Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 16:32:41 2018 +0800 创建登录页方法 commit 54d15b6f8a851b80e70e6acb9228e180152d08b2 Author: licc <45360682@qq.com> Date: Wed Jan 31 15:42:29 2018 +0800 小说引导充值 commit 68aa3cd6f22e176bf8119d05ec567a01cea2efeb Author: licc <45360682@qq.com> Date: Wed Jan 31 15:08:16 2018 +0800 顶部导航 commit 9d5a153d0612069b727a36062199d7702ce2b1b7 Merge: cdb18ae81 8e1f0c688 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 14:28:36 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 8e1f0c68879dbe011e50a5dfff05c2aba6d3494a Merge: ad7cbe224 6c0194fc0 Author: licc <45360682@qq.com> Date: Wed Jan 31 13:31:39 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit ad7cbe22461e8822bd5c6b81a81a7ccb564a8d14 Author: licc <45360682@qq.com> Date: Wed Jan 31 13:27:22 2018 +0800 最近阅读 commit cdb18ae8192774f74a4eab25465923a17dee74da Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 12:04:53 2018 +0800 暂存 commit 6c0194fc006e78f50ecaa384c055dc7991095316 Merge: eabe4148f 3095cc622 Author: 丁海波 Date: Wed Jan 31 12:03:48 2018 +0800 Merge remote-tracking branch 'origin/master' commit eabe4148f12157dd486b9caadbbec6270f24ee95 Author: 丁海波 Date: Wed Jan 31 12:03:43 2018 +0800 特殊页面 commit 3095cc6222726e5dce8698a42a4f26dd56f300c3 Merge: 267079e58 07fe908cd Author: 高明阳 Date: Wed Jan 31 12:01:35 2018 +0800 解决冲突 commit 267079e58ca21f6f4fd605daf2878d5f3bbdd354 Author: 高明阳 Date: Wed Jan 31 11:56:54 2018 +0800 update commit 07fe908cdc1f75beeea7977a0769db0007a325fd Author: 丁海波 Date: Wed Jan 31 11:21:07 2018 +0800 报错页 commit 36853e07aab013482bffb3485af71f1082aca6ab Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 11:18:10 2018 +0800 no message commit bb116856308df23b41c5a99e6c99efd73869af0d Author: lichong_ <1909165236@qq.com> Date: Wed Jan 31 10:35:12 2018 +0800 增加临时页面 commit 4eee37014ae8434b32b082387a9e477b146be5f6 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 23:17:55 2018 +0800 内容页完善章节列表调用 commit d0788f631b983f6484948c719042ea7f2cc8bb13 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 22:33:29 2018 +0800 更新阅读页逻辑 commit f0ce6754c60233a2a24c9d83c25494eee5b0d6a8 Merge: 08ae7a11e f1e973ff8 Author: 丁海波 Date: Tue Jan 30 21:40:05 2018 +0800 Merge remote-tracking branch 'origin/master' commit 08ae7a11eac86fc6cac1233c934534100e3da1a0 Author: 丁海波 Date: Tue Jan 30 21:39:55 2018 +0800 首页修改 commit f1e973ff8f40a65e618437a582ee60cfba76da5e Author: licc <45360682@qq.com> Date: Tue Jan 30 21:37:53 2018 +0800 下一章扣看点 commit d007b048c03f73a2ce341e4ce4c3b156bb6c3666 Author: 丁海波 Date: Tue Jan 30 20:49:05 2018 +0800 阅读页 commit fd442e9167bf8dad7fd18831c4b1c0cc418b2122 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 20:41:57 2018 +0800 暂存 commit cbd749bc52eeeb85d6ec242d07c52832df4985c0 Merge: 21a314423 f5d175088 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 20:28:45 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 21a31442391b59912dbde5a19e37394654bced86 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 20:28:23 2018 +0800 暂存 commit bb753e621bcdc94dc0a9e7075e4689dfcb52d2ab Author: 高明阳 Date: Tue Jan 30 20:22:21 2018 +0800 update commit f5d1750881de11dea114f02b618d489e623e1e16 Author: 高明阳 Date: Tue Jan 30 20:19:59 2018 +0800 fix bug of cause incorrect page number commit 55695f03978d75aa579cd0c90af6c7da7ae91b2b Author: 高明阳 Date: Tue Jan 30 20:08:34 2018 +0800 update commit ebc58c5d68257c9c0d24132a6821fc5c7604d0d0 Author: 高明阳 Date: Tue Jan 30 19:57:13 2018 +0800 区块书籍列表页ajax加载数据完成 commit 1748943c4f07ef879805432c90ae8e0b707dbffd Merge: 311849881 04a60895e Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 19:51:08 2018 +0800 Merge branch 'master' into dev-yunyingguanli Conflicts: application/index/controller/Book.php commit 31184988133e1e3cd85fb8d7e02336a80289bd71 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 19:48:52 2018 +0800 暂存 commit 04a60895efea56bc652f9a25e83a9fdca7c2e259 Author: 丁海波 Date: Tue Jan 30 19:47:47 2018 +0800 阅读页 commit 0153b40f7ec5ee11e8c0ae451e52d12b562febcd Author: 丁海波 Date: Tue Jan 30 19:41:18 2018 +0800 阅读页 commit 4e2158e5d4cfb11a43efe44762e0c63e33f30780 Merge: 9f53ffd04 14015a016 Author: 丁海波 Date: Tue Jan 30 19:27:42 2018 +0800 Merge remote-tracking branch 'origin/master' commit 9f53ffd0425b3458ba6d6ba789eb337816ee9173 Author: 丁海波 Date: Tue Jan 30 18:44:10 2018 +0800 阅读页 commit 14015a016cfa33102dc8a7cd10959922bcc78586 Author: 高明阳 Date: Tue Jan 30 18:24:10 2018 +0800 update commit 074f51774b4cba9ec7db40f0ed7dbb51700a0e12 Merge: f57475d61 e1dc5fbb4 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 17:37:08 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit f57475d6148fdc75ed6322f227e3ee726b0705c9 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 17:36:48 2018 +0800 暂存 commit e1dc5fbb469019bf3e4f85028144ba1d7dd48a56 Merge: c44fa3413 addba0b85 Author: licc <45360682@qq.com> Date: Tue Jan 30 17:35:39 2018 +0800 Merge remote-tracking branch 'origin/master' commit c44fa3413edebc246f3558cdc566cd51fa85ef19 Author: licc <45360682@qq.com> Date: Tue Jan 30 17:34:57 2018 +0800 下一章扣看点 commit addba0b85d8a1637680f8faa6e1b95a3cd48e5fa Merge: 1c7c8fb92 0fcdbc176 Author: 高明阳 Date: Tue Jan 30 17:10:02 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 1c7c8fb921e1485842ba7ea62473ed1c2317f7d4 Author: 高明阳 Date: Tue Jan 30 17:09:55 2018 +0800 首页配置的区块书籍点击更多页面 commit 0fcdbc1766c0269b37ba4fb7e637ca07da84ae48 Merge: c0d45eb3f d930c1fa8 Author: 丁海波 Date: Tue Jan 30 16:47:02 2018 +0800 Merge remote-tracking branch 'origin/master' commit c0d45eb3f98211cf86935f0fecba5cf7c10822d9 Author: 丁海波 Date: Tue Jan 30 16:46:51 2018 +0800 阅读页 commit d930c1fa8579fe3ce4ae2bee2996742c64f0075b Merge: 76f2a91bd a68661247 Author: 高明阳 Date: Tue Jan 30 15:48:06 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 76f2a91bd4fc9b31e119d5be288e5a7618210880 Author: 高明阳 Date: Tue Jan 30 15:41:54 2018 +0800 搜索页大家都在看书籍增加性别筛选 commit 5c8827d96b24f53af2931e62924545ed4ab5bf4f Merge: 5c9ab5dd0 a68661247 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 15:28:47 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit a68661247450d5fd0278a8c6865b8d0aca9f4c0e Author: 丁海波 Date: Tue Jan 30 15:27:28 2018 +0800 阅读 commit 5c9ab5dd0293f2b73fcc8c75377b4e8023c9bfec Merge: 1206d88f6 2f54cc012 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 15:13:08 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 2f54cc012887673601eb44157e84b10874378cf8 Merge: c9f3ca7ef 2d1f49ce3 Author: 丁海波 Date: Tue Jan 30 15:11:12 2018 +0800 Merge remote-tracking branch 'origin/master' commit c9f3ca7ef4e7c7a844f9ea6f476ab37bb9b87490 Author: 丁海波 Date: Tue Jan 30 15:11:03 2018 +0800 阅读页 commit 1206d88f65e5ae29b20a71ff82232438a0553d0d Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 15:10:36 2018 +0800 no message commit 2d1f49ce301835d84407ef77e93ac9f51647a8d8 Author: licc <45360682@qq.com> Date: Tue Jan 30 13:28:44 2018 +0800 下一章扣看点 commit f00c9b90e421270785ec6f326c06c505e7fb66d7 Merge: fe460c267 c8cd46488 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 12:00:07 2018 +0800 Merge branch 'dev-yunyingguanli' commit c8cd464881ce025ab05dbf7347b476fec2052331 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 11:59:49 2018 +0800 暂存 commit fe460c2676d1c725374ef7f83ec9ca9fd2658e0a Author: 丁海波 Date: Tue Jan 30 11:37:50 2018 +0800 阅读页内容 commit 5ff8ee4d76d3c17928a976d85ec70bcde5c2b103 Merge: 7f7e2813a ac84e043c Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 11:08:35 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 7f7e2813a47a01249873e739581464ab54f05809 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 30 11:06:11 2018 +0800 暂存 commit ac84e043c54fd95bcdbf5990b400f52f6a5a876f Author: 丁海波 Date: Mon Jan 29 22:26:25 2018 +0800 大家都在看 commit 951b8912d2878af7917a44cd6d18c89325dba8f5 Author: 高明阳 Date: Mon Jan 29 22:23:28 2018 +0800 测试 commit 872800e7980d7d50dd4b37122590e08028d3feaa Author: 丁海波 Date: Mon Jan 29 22:22:52 2018 +0800 大家都在看 commit 13be4e29f0e03ba5bdf9536446541adea39d7ede Author: 丁海波 Date: Mon Jan 29 22:08:13 2018 +0800 搜索大家都在看 commit ebcdb957d930f042c3c865a25228bf195094be43 Merge: d077dd5bc a9f368f5e Author: 丁海波 Date: Mon Jan 29 22:07:51 2018 +0800 Merge remote-tracking branch 'origin/master' commit d077dd5bc878ed0bda18641da62a92e2d35c5c56 Author: 丁海波 Date: Mon Jan 29 21:56:44 2018 +0800 搜索 commit a9f368f5e90875b98260d070b6ee477f510b36bf Author: 高明阳 Date: Mon Jan 29 21:48:54 2018 +0800 后台关键词管理增加书籍id字段 commit 5f93c196e73e05a244bbfabdc4861436d93d42a3 Author: licc <45360682@qq.com> Date: Mon Jan 29 20:47:39 2018 +0800 下一章扣看点 commit c187658acb04bc4a28756bf498bfc5aa575be12a Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 20:42:42 2018 +0800 no message commit 2321dd21c221f4bb22690c281036839b2cce8fa3 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 20:39:30 2018 +0800 no message commit 45e9b3527ca4aad90597454d9d6bbb2e490790c7 Merge: 7d10f2c02 325131fc4 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 20:38:57 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 7d10f2c02a08659b0f6c5512fea3987f2d297eaa Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 20:38:18 2018 +0800 暂存 commit 325131fc4e0bd89845f52cf5753195c0a194c7e6 Author: 丁海波 Date: Mon Jan 29 20:37:25 2018 +0800 阅读页 commit 4bb32cbbdeb9a70e83361be0289c469a4e7136cd Merge: fbac14957 b4fd3ed86 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 20:27:23 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit fbac14957164e8cac22d2f301ca5e1a80c6b239a Merge: c24ef3c74 4ec1abbf6 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 20:27:12 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps Conflicts: application/index/controller/Book.php commit b4fd3ed86449fb0b4b86c9f94af923060ffd6330 Author: 高明阳 Date: Mon Jan 29 20:26:29 2018 +0800 热门搜索词 commit c24ef3c74c752e8154066cf77baa8ce22574d765 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 20:24:46 2018 +0800 更改接口 commit 4ec1abbf6a0d99ecede4fec8667838b03cc01c35 Author: 高明阳 Date: Mon Jan 29 20:10:37 2018 +0800 update commit 881b2097cb0986e795965727831aa7df963bd9fd Merge: dd74602ec d73860b00 Author: 高明阳 Date: Mon Jan 29 20:04:48 2018 +0800 解决冲突 commit dd74602ec24f00fc94c5899cfcdab7597e9ba645 Merge: 6f878f5f3 0d2aab24e Author: 高明阳 Date: Mon Jan 29 20:03:22 2018 +0800 解决冲突 commit d73860b0063bfbf2d31919cc2028a1d609c9d4aa Author: licc <45360682@qq.com> Date: Mon Jan 29 18:15:34 2018 +0800 下一章扣看点 commit cf6ebc286b0ec722fb1e0840ac690516786d4d9e Author: licc <45360682@qq.com> Date: Mon Jan 29 17:56:44 2018 +0800 下一章扣看点 commit 6f878f5f3c52ce582ddf396df704785128bd2dab Author: 高明阳 Date: Mon Jan 29 17:52:41 2018 +0800 增加书籍章节列表接口 commit 0d2aab24e071bd2cbf05b4781d55ffd47f6d0f4c Merge: 26315666f 2deaaaafc Author: licc <45360682@qq.com> Date: Mon Jan 29 17:50:48 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # application/index/controller/Book.php commit 26315666f1c71f465a2d40592c126769ac343f3a Author: licc <45360682@qq.com> Date: Mon Jan 29 17:48:13 2018 +0800 下一章扣看点 commit 2deaaaafc949e74155ed08b9dca081711dc614f1 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 17:10:07 2018 +0800 no message commit d0b0468930cabbde7fad410e88778b48ca1601e8 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 17:08:02 2018 +0800 更新章节接口信息 commit c308c70138609e39db20cb921be71787595318b1 Merge: 866bbf685 da4c29394 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 17:02:27 2018 +0800 Merge branch 'dev-yunyingguanli' Conflicts: application/index/controller/Book.php commit da4c29394367601f4768677993b3fe8266719d56 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 16:55:02 2018 +0800 暂存 commit 866bbf6854de40d519323a3d8abdfa9c2954290d Merge: 253126e8c de91f97ee Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 16:48:28 2018 +0800 Merge branch 'dev-yunyingguanli' Conflicts: application/index/controller/Book.php commit de91f97ee77c99dab3d6abe7aed8fcb5aebac19c Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 16:47:39 2018 +0800 去掉注释 commit 253126e8c6fadf46c24c8ee36799c118a66f8cf9 Author: 高明阳 Date: Mon Jan 29 16:44:56 2018 +0800 章节目录增加选中章节效果 commit e25128416e97802ba61a6315550892fcecb3dd14 Merge: dffd5b159 b11821f3d Author: 高明阳 Date: Mon Jan 29 16:36:40 2018 +0800 解决冲突 commit dffd5b1598519e1e8aa90164548251cddf84bfb3 Merge: 8b853a792 d4c2c8de4 Author: 高明阳 Date: Mon Jan 29 16:35:13 2018 +0800 完善书籍目录 解决冲突 commit b11821f3de81ebc08b4cd6cc890a9aadae86c638 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 16:32:39 2018 +0800 更新书籍详情页接口 commit 8b853a7928b8d7d345740d52880e342de47c30c3 Author: 高明阳 Date: Mon Jan 29 16:31:33 2018 +0800 修改书籍目录页 commit d4c2c8de42c99188100269203ed6932c044a9cc6 Merge: 917d7e0c8 aeaa7569c Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 16:28:01 2018 +0800 Merge branch 'dev-yunyingguanli' commit aeaa7569c9590fec518043649d673c75c1d3c23e Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 16:27:45 2018 +0800 暂存 commit 917d7e0c89434a6a5952bcccc00551b374008426 Author: 高明阳 Date: Mon Jan 29 16:02:05 2018 +0800 增加热门搜索接口 commit 4c9a182f0ed6b39bf3ce1679b5bcfedfe6ad19a6 Author: 丁海波 Date: Mon Jan 29 15:50:23 2018 +0800 搜索 commit c2b52cbac2c8f3c4f477d9b351af77825da1ae18 Author: 丁海波 Date: Mon Jan 29 15:48:52 2018 +0800 搜索 commit 373d00673476ee8c55862a36f9e20a4388c945fe Author: licc <45360682@qq.com> Date: Mon Jan 29 14:27:23 2018 +0800 数据统计 commit 147eef38ef26053844b335d3139406aec20b7b42 Author: 高明阳 Date: Mon Jan 29 12:15:58 2018 +0800 update commit ed0f7d0bda188147baa791fd76c636f4042ab238 Merge: 4141c6cec 61d4ab7ea Author: 高明阳 Date: Mon Jan 29 12:10:35 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 4141c6ceccdf651c04cc8f28972de0550c871307 Author: 高明阳 Date: Mon Jan 29 12:10:26 2018 +0800 搜索接口 commit 61d4ab7ea217c85b12c4257c58d01830c6213ded Merge: 869f101c5 96971382c Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 12:05:17 2018 +0800 Merge branch 'dev-yunyingguanli' commit 96971382c4757dcc3a19289acdb0befb294e8f2e Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 12:05:01 2018 +0800 书籍详情页ajax操作 commit c503f08afb54b529c8333cf0b37c5d8ab1101a54 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 11:26:27 2018 +0800 no message commit 93313cc44bf18dd00c5a8a2524d10db39b4a572e Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 11:25:44 2018 +0800 暂存 commit 869f101c5109a4ddd5246b4d648836fda8488553 Author: 丁海波 Date: Mon Jan 29 11:20:43 2018 +0800 阅读页 commit dddbc4354544e338eb9dbe5f9a8f309d395ad993 Author: 丁海波 Date: Mon Jan 29 10:52:48 2018 +0800 搜索 commit 7b681fbddbb86916a3640b0ed946c4c4950eac46 Merge: 62b9ca277 2027462c4 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 10:48:33 2018 +0800 Merge branch 'master' into dev-yunyingguanli Conflicts: application/index/controller/Book.php commit 234a8140b5ad40b8f9393c88f326416cfffcdd1c Author: 丁海波 Date: Mon Jan 29 10:46:26 2018 +0800 搜索 commit 62b9ca27700e70acd5398ac866c537ddb60c7f1d Author: lichong_ <1909165236@qq.com> Date: Mon Jan 29 10:46:09 2018 +0800 暂存 commit 2027462c4e4cca7455bc208fcee5535d7f4a9bc2 Author: 高明阳 Date: Mon Jan 29 10:27:35 2018 +0800 搜索页面调整 commit 24f27145054950573da9a3109d5c4871a48bda51 Author: 丁海波 Date: Sun Jan 28 21:49:37 2018 +0800 搜索 commit 031918aede461a3ac3a3cb77f9c86ab7be3034bc Author: 丁海波 Date: Sun Jan 28 21:43:41 2018 +0800 search add commit fa1890745b2dc2a237b9a06d633b430c01ef2bea Author: 丁海波 Date: Sun Jan 28 21:29:03 2018 +0800 阅读页 commit 95cb2e089e39b4427e48f6e5f3276e2bccf6428f Author: 丁海波 Date: Sun Jan 28 21:03:00 2018 +0800 阅读页 commit 649433f6c989ffe32c9d66332aca07af9947cc6a Author: 丁海波 Date: Sun Jan 28 20:56:25 2018 +0800 目录 commit 06ae74d4f8e896f5612325aab30e239e7689471a Author: 丁海波 Date: Sun Jan 28 20:41:32 2018 +0800 书籍详情页 commit c66d561c63427cdcc1982c60b03c919308665cbe Author: 丁海波 Date: Sun Jan 28 20:11:51 2018 +0800 列表页 commit 8b3bd6bc480d23e8a179eddf19ce10a07d8ac5b3 Author: 高明阳 Date: Sun Jan 28 18:40:27 2018 +0800 update commit b88c10531a29c13ae21268736288eec9b5947e28 Author: 丁海波 Date: Sun Jan 28 18:27:49 2018 +0800 目录 commit 23a05b632bcff4da68bd338eeb90971f956db00b Merge: 239733a7d 05c3ab659 Author: 丁海波 Date: Sun Jan 28 18:24:26 2018 +0800 Merge remote-tracking branch 'origin/master' commit 239733a7dda61fb1a35726d68fdb38a48f124296 Author: 丁海波 Date: Sun Jan 28 18:24:17 2018 +0800 书籍详情 commit 05c3ab659041edf93c2855179855725aa8daf3d2 Author: 高明阳 Date: Sun Jan 28 16:38:07 2018 +0800 update commit a4d746bb10c56b1c34a98875bc2fa01f560abc1e Merge: 93ce3b211 e02699fe8 Author: 高明阳 Date: Sun Jan 28 16:20:55 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 93ce3b21102460738ae1dc9471e57ae61b8f7be7 Author: 高明阳 Date: Sun Jan 28 16:20:50 2018 +0800 update commit e02699fe887fdd58387efc12501632a4c912385b Author: 丁海波 Date: Sun Jan 28 16:13:24 2018 +0800 最近阅读 commit 5ed75377a7b4351f1bc5afdab8d0ef32b7b06fd8 Merge: 4628b839a f1a532db0 Author: lichong_ <1909165236@qq.com> Date: Sun Jan 28 16:08:58 2018 +0800 Merge branch 'master' into dev-yunyingguanli Conflicts: application/index/view/book/chapter.html commit 4628b839adda1cbac273966972bb07c5c010dc31 Author: lichong_ <1909165236@qq.com> Date: Sun Jan 28 15:55:41 2018 +0800 暂存 commit f1a532db0baf007d550aabc26e111e1cf98d2835 Author: 丁海波 Date: Sun Jan 28 15:54:45 2018 +0800 书籍阅读页 commit 2ebb99765a3d7024588c7417f4012fd4c37a2b18 Author: lichong_ <1909165236@qq.com> Date: Sun Jan 28 14:30:19 2018 +0800 书籍详情页创建 commit a8f0bebcfb1ee290dbda15e2cb8c2edd2a643971 Merge: bd82145ff dfbb8d8f2 Author: lichong_ <1909165236@qq.com> Date: Sun Jan 28 13:55:52 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit bd82145ffafbf295762d5f6ab66af499aa00f5a7 Author: lichong_ <1909165236@qq.com> Date: Sun Jan 28 13:55:17 2018 +0800 暂存 commit dfbb8d8f26ee19927c9a2bdcb667c2492e6b1f35 Author: 高明阳 Date: Sat Jan 27 18:48:12 2018 +0800 最近阅读 commit 095f260203acf51ba61dc3b2556fe9ef0469e6a4 Author: 高明阳 Date: Sat Jan 27 18:32:15 2018 +0800 update commit fb431a0933decb42618230599596f0f97cc1d702 Merge: d600b6378 43d113776 Author: 高明阳 Date: Sat Jan 27 18:30:31 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit d600b637840086f2991361268c79cd2ba2a1dab4 Author: 高明阳 Date: Sat Jan 27 18:30:27 2018 +0800 分类书籍列表静态页 commit 43d1137761267a23b8a3265dec12f97989e019f9 Author: 丁海波 Date: Sat Jan 27 18:05:19 2018 +0800 多条推广 edit commit 1504a7a8b73ff50e9514aaa0361e7115fac5193e Author: php-王凡昌 Date: Sat Jan 27 17:56:37 2018 +0800 多条链接编辑，循环输出单条id commit 19ec3ccfbbee569d956e80c856b00340efcb1141 Author: 丁海波 Date: Sat Jan 27 17:53:40 2018 +0800 edit 多条推广 commit 118bf07e749b40124219923e64bf7bf12cada587 Author: php-王凡昌 Date: Sat Jan 27 17:24:09 2018 +0800 默认填充title,ids commit cae326f46e691d0d380b9b0b58c8d3734c4e0645 Author: php-王凡昌 Date: Sat Jan 27 17:21:45 2018 +0800 编辑多条推广链接 commit cacc81392bac49dd18099a768f6a239a0ec42824 Author: 高明阳 Date: Sat Jan 27 17:05:31 2018 +0800 update commit 48fa1e1ed803a538d871afda6a3ef9d2d2650dda Author: 高明阳 Date: Sat Jan 27 17:00:39 2018 +0800 书籍详情页 commit b0a77259978cbb0a0a6c7cf4081b37f447e79671 Author: php-王凡昌 Date: Sat Jan 27 16:59:14 2018 +0800 多条推广链接渲染样式 commit 9e40981aae711b0222fa38e6143a35a219107536 Author: 丁海波 Date: Sat Jan 27 16:50:21 2018 +0800 多条推广编辑 commit a0e1885bd2f44304ae6bfc6f12d595041ed69ac1 Author: 丁海波 Date: Sat Jan 27 16:48:11 2018 +0800 多条推广保存 commit ec6aebdf7bb65d0b523805ae05136c6979031c1b Author: php-王凡昌 Date: Sat Jan 27 16:29:39 2018 +0800 复制按钮逻辑 commit f7461572e016be645f68f3f5d780e649eacf0a3e Author: 丁海波 Date: Sat Jan 27 16:17:52 2018 +0800 多条推广 commit 0a21f5ada24e7cbbd967fd20be8737b8db96bc36 Author: php-王凡昌 Date: Sat Jan 27 16:16:21 2018 +0800 精简语法 commit 48f260a4d7b5c2a85a05b3ba30aef83b87aa61a1 Author: php-王凡昌 Date: Sat Jan 27 16:13:15 2018 +0800 修改cdn加载模式 commit 1055300fef66437d9e7b4894f61d04eae58d4f90 Author: 高明阳 Date: Sat Jan 27 16:10:48 2018 +0800 update commit 666d1f946e383825fc08ffef29165f90c68332e6 Author: 高明阳 Date: Sat Jan 27 16:10:04 2018 +0800 点击榜、畅销榜加数据 commit b6d31689f1286303410a70b718cd309ec1f96d13 Author: 高明阳 Date: Sat Jan 27 16:01:49 2018 +0800 各类型的书籍列表初版 commit 3fd4020f8abef3d6767ef7e555c0c473b48244f5 Author: licc <45360682@qq.com> Date: Sat Jan 27 15:37:54 2018 +0800 订单统计 commit ccf88ee88104757fa6423e74e42610d746ef5345 Author: 丁海波 Date: Sat Jan 27 14:38:12 2018 +0800 添加多条推广 commit cc44a495a07c043cc6cbdd32764f7635cee220df Author: 丁海波 Date: Sat Jan 27 14:37:01 2018 +0800 多条推广 commit 8420f755e43e1a97b926340f278c8b77a56c7848 Merge: 39225d201 95b51d5ae Author: 丁海波 Date: Sat Jan 27 12:06:56 2018 +0800 Merge remote-tracking branch 'origin/master' commit 39225d201785e1c507a21b9b9db36c26158495d8 Author: 丁海波 Date: Sat Jan 27 12:06:45 2018 +0800 多条推广添加短链 commit 95b51d5aeee476f2561a79881485ba54f61759a2 Author: 高明阳 Date: Sat Jan 27 11:58:13 2018 +0800 书籍页面整理 commit edf8e3322fb11e0e809cb04c9e196d7edae66520 Author: php-王凡昌 Date: Sat Jan 27 11:35:24 2018 +0800 修改链接列表展示效果 commit a908f7db580aa0e642c66a6c6eb82224d3b5cc4c Author: php-王凡昌 Date: Sat Jan 27 11:29:00 2018 +0800 多条推广列表 commit 58867c4d7651f883fd44d393e6dbcf6c0a186f87 Merge: 478d4fda5 abc7ac149 Author: 丁海波 Date: Sat Jan 27 11:27:26 2018 +0800 Merge remote-tracking branch 'origin/master' commit 478d4fda58b50d09f3c460da6d7e35fb67f08bfa Author: 丁海波 Date: Sat Jan 27 11:27:20 2018 +0800 多条推广 commit abc7ac1499988353b0a90e5732dac12696c31de5 Author: php-王凡昌 Date: Fri Jan 26 23:39:24 2018 +0800 单条推广展示格式处理 章节列表设置关注章节 commit a8e4eccd5015745513f7a98a4adc44831ffd6148 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 22:54:05 2018 +0800 书籍选择列表只获取已上架书籍 commit af2b132f5ebeeef3dec3d94c3052e2cc432ffad2 Merge: 08c6973f9 aec05cb8a Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 22:51:20 2018 +0800 Merge branch 'master' into dev-yunyingguanli Conflicts: application/index/controller/Index.php commit 08c6973f950eb38c24659eeead98bda76d4fbc47 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 22:49:31 2018 +0800 更新首页模板 及最近阅读 commit aec05cb8aa08250f2cfac235d9de0c29f0f05c3b Merge: 60057e1ae 9847d8fe1 Author: 高明阳 Date: Fri Jan 26 21:30:53 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 60057e1aedea61b446d48a72bba757532c113a18 Author: 高明阳 Date: Fri Jan 26 21:30:47 2018 +0800 个人中心页面整理 commit 9ec95f6d31404e08c7168dd52358487304eb241b Merge: 6189aa2ac 9847d8fe1 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 21:13:21 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 6189aa2ac6a6dc0e3115f4d477ad18b36acbe8a4 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 21:12:02 2018 +0800 暂存 commit 9847d8fe128f8cad124db660596b800f619ab2ea Author: 丁海波 Date: Fri Jan 26 21:11:10 2018 +0800 index img tab edit commit 4a191f015bc250352eb52e6c8f5c2d557998b7a6 Merge: 9e5ab69d8 4e115293f Author: 丁海波 Date: Fri Jan 26 21:04:30 2018 +0800 Merge remote-tracking branch 'origin/master' commit 9e5ab69d8c0803fed74f53757d7a35896273bf2f Author: 丁海波 Date: Fri Jan 26 21:04:21 2018 +0800 index tab commit 4e115293f23de9d030fcabce4802a3d788b88c11 Author: 高明阳 Date: Fri Jan 26 21:03:23 2018 +0800 首页分类链接修改 commit 0a8bd9f576b8af42d37f042828c6434430359355 Merge: 7bb41a601 1a0905ede Author: 高明阳 Date: Fri Jan 26 20:59:08 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 7bb41a60102f3a10c157283bbcd72e8441ac0430 Author: 高明阳 Date: Fri Jan 26 20:59:00 2018 +0800 update commit 1a0905ede39927a1b99780e6b2824452b20000d6 Merge: ef80aa3fc fb386501f Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 20:58:58 2018 +0800 Merge branch 'dev-yunyingguanli' commit fb386501f4f7cef99af9411bcc48a49c03a76640 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 20:58:42 2018 +0800 暂存 commit ef80aa3fc853ceed811af817f8cf02458ce896de Author: 高明阳 Date: Fri Jan 26 20:57:46 2018 +0800 分类下的书籍列表第二版 commit dd3a445880c2ebf129b9366eab6c8c7b30a132c7 Merge: d6fe51779 e0b4c7133 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 20:33:04 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit d6fe51779b857260a7346b7130b5ac2053eb0822 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 20:32:28 2018 +0800 暂存 commit e0b4c71338939aaf6533892913a61939af5d3a11 Author: php-王凡昌 Date: Fri Jan 26 20:30:17 2018 +0800 多条推广新增、选择单条 commit 357674180a5319995260341e13a710ffbe61dc7e Author: php-王凡昌 Date: Fri Jan 26 20:12:29 2018 +0800 单条推广关联book表 单条推广选择select-支持多选 commit 4d97d2682adf68be48f5535dc59264b3195ea1f0 Merge: 169df4967 2604f1932 Author: 高明阳 Date: Fri Jan 26 18:15:42 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 169df49674bd145f92c111d23cddc2d60afdfe19 Author: 高明阳 Date: Fri Jan 26 18:14:17 2018 +0800 书籍列表滚动加载初版 commit 2604f193266f6b1aec6d0f590459fe37fc76f855 Author: php-王凡昌 Date: Fri Jan 26 17:34:52 2018 +0800 多条推广链接 commit 13a6d4a4bf7e351012052418e5900c53597824e1 Author: 丁海波 Date: Fri Jan 26 16:54:40 2018 +0800 essay add commit 565d6c8efbcc0bea6ae84349adb1f20f16ced69b Merge: 3ec8852c9 7d1d838bb Author: 丁海波 Date: Fri Jan 26 16:46:39 2018 +0800 Merge remote-tracking branch 'origin/master' commit 3ec8852c936d8bf7ffe07157e9271ee7015b0943 Author: 丁海波 Date: Fri Jan 26 16:46:35 2018 +0800 essay add commit 7d1d838bbead8f98d22a0032a879b1cc931cdb82 Author: php-王凡昌 Date: Fri Jan 26 16:45:55 2018 +0800 前台API 获取微信token commit 107d107fcb9ae4ff847bbb135569cbdfe57cf201 Merge: f4cbdaaa5 cd2ebeb4d Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 16:13:51 2018 +0800 Merge branch 'dev-yunyingguanli' commit cd2ebeb4d0fa97fafa607408a7c871d980f88387 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 16:13:41 2018 +0800 暂存 commit f4cbdaaa5538766d8a0dc49d536d1c5d9ba70e42 Merge: 58dfbeca4 cffa29561 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 16:12:08 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 58dfbeca4d043b9ee76efa5e94dd4efdb8953787 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 16:11:49 2018 +0800 更新admin_config model commit cffa2956158e7701795334015e5f5174451e115a Author: php-王凡昌 Date: Fri Jan 26 16:10:47 2018 +0800 单页推广管理 commit d60d0356c93a2e8c5b86adc7b4e274e7e94c7559 Merge: 9d4059d28 29cc99fe7 Author: licc <45360682@qq.com> Date: Fri Jan 26 16:10:12 2018 +0800 Merge remote-tracking branch 'origin/master' commit 9d4059d284d82eff8dc436bda8b5c9ef963e1ede Author: licc <45360682@qq.com> Date: Fri Jan 26 16:10:00 2018 +0800 修改权限验证 commit 29cc99fe73fa34f8cff86a7f86168169ae5a6479 Merge: 95724d07a 041ea112a Author: 丁海波 Date: Fri Jan 26 15:55:27 2018 +0800 Merge remote-tracking branch 'origin/master' commit 95724d07ad195dfbdab04a54a98043b34209421b Author: 丁海波 Date: Fri Jan 26 15:55:16 2018 +0800 生成二维码essay commit 041ea112a295b3f9290961718ddf1cbb5211e33b Author: 高明阳 Date: Fri Jan 26 15:46:09 2018 +0800 分类下的书籍列表第一版 commit ee8759a78bf7268482ce2339401372db4166061b Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 15:33:00 2018 +0800 暂存 commit 92d44fb18e016fbc4e9b4546de4b5767f146425a Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 11:06:00 2018 +0800 暂存 commit 3d481d5fc082b188656c9530efb08ca43049675e Merge: dc8536f20 dc79a401c Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 10:59:26 2018 +0800 Merge branch 'master' into dev-yunyingguanli Conflicts: application/index/view/index/index.html commit dc8536f20369d2b5af7277cc4f4fdde7106b4b4a Author: lichong_ <1909165236@qq.com> Date: Fri Jan 26 10:58:29 2018 +0800 暂存 commit dc79a401c98b2affa44c369cd216229e4d3fc40e Author: php-王凡昌 Date: Fri Jan 26 10:53:29 2018 +0800 修改redis链接配置 commit 09a46e32b3024621b84fea7a3f810c0df8cb5c17 Author: php-王凡昌 Date: Thu Jan 25 22:56:37 2018 +0800 首页推广类型 commit 340e6bfbc7cb9107d81f2bada5e5c08ea419118f Author: php-王凡昌 Date: Thu Jan 25 22:20:16 2018 +0800 单条推广链接新增 commit bc564331ea3a856ff0cf964f473279267cb11014 Author: php-王凡昌 Date: Thu Jan 25 22:03:13 2018 +0800 获取推广链接新增 commit e1338e68dded5871ebffe19df8110ae1fcff9a2a Author: php-王凡昌 Date: Thu Jan 25 21:40:50 2018 +0800 book model 整合API调用 commit ce9adc60e4e4292aae0c77f6782f0632218903bf Author: 高明阳 Date: Thu Jan 25 21:21:31 2018 +0800 调整分类页面路径 commit c090f5d4d0e1fc385d4e2798d364281c95b484d0 Author: 高明阳 Date: Thu Jan 25 21:12:11 2018 +0800 优化分类查询js commit 9f680adf7ba2fe7e50589ef02da0d603ea4669ec Author: 高明阳 Date: Thu Jan 25 20:57:56 2018 +0800 书籍分类页面增加数据 commit 695ed79334c6043313870f3abaae6d7b4e5023c2 Author: 丁海波 Date: Thu Jan 25 20:25:08 2018 +0800 essay 去掉阅读原文 commit 08e8e8d30008f858e9de0b846584ae11c8887286 Author: 丁海波 Date: Thu Jan 25 20:22:16 2018 +0800 改成了p标签 commit c527f8b6bd04801e494652544f9f7167a1c3320c Author: 丁海波 Date: Thu Jan 25 20:18:03 2018 +0800 essay 行内样式 commit 327ac980be514822fd2beee5e62c410f7c992686 Author: 丁海波 Date: Thu Jan 25 20:13:24 2018 +0800 essay 二维码 commit dc557a6326eba1621c5925b47dbf4ec4f654222b Merge: 909896358 951e04f67 Author: 丁海波 Date: Thu Jan 25 20:03:16 2018 +0800 Merge remote-tracking branch 'origin/master' commit 909896358e438d1519e185a39c5abdfba0d28676 Author: 丁海波 Date: Thu Jan 25 20:03:08 2018 +0800 essay 阅读原文二维码 commit 951e04f67393788e63884e41d76bce3d861975f9 Merge: eb3d67af1 a1d468bac Author: 高明阳 Date: Thu Jan 25 19:51:49 2018 +0800 Merge branch 'dev-book' commit a1d468bac0847b178b30f489910486b7fe876368 Author: 高明阳 Date: Thu Jan 25 18:12:15 2018 +0800 update commit eb3d67af1d200f86e306d4c45c669fb447c75aab Author: php-王凡昌 Date: Thu Jan 25 18:01:56 2018 +0800 单条推广链接生成 commit dcc715e61dfda07043e4907e53d8c917a46918b7 Merge: a1fcb041d 03ad22de7 Author: lichong_ <1909165236@qq.com> Date: Thu Jan 25 17:49:27 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit a1fcb041d9aa2c1cef45a54607953edd2fd1c52a Author: lichong_ <1909165236@qq.com> Date: Thu Jan 25 17:49:09 2018 +0800 暂存 commit 03ad22de703e22102813b632189a6e47f24e0bb7 Merge: 93b1489ee a0715a962 Author: 丁海波 Date: Thu Jan 25 17:42:03 2018 +0800 Merge remote-tracking branch 'origin/master' commit 93b1489ee9cde7c3ccfc7f4809ca8b3215624d5c Author: 丁海波 Date: Thu Jan 25 17:41:53 2018 +0800 图片滚动swiper commit a0715a962d44afdfd096f586362a095cba8832d2 Author: 高明阳 Date: Thu Jan 25 17:36:14 2018 +0800 调整书籍编辑页面 commit 4d0d2b3361316c0220390f1560918c574c6a1c31 Author: php-王凡昌 Date: Thu Jan 25 17:11:49 2018 +0800 单条推广链接生成 commit 4182fb6a43617577dd62789dd0eac7d942bd39de Author: 高明阳 Date: Thu Jan 25 17:06:55 2018 +0800 update commit 8d206fdb593e880af2fbcc2c6563719ec27c4cbe Merge: c8efd118e 99664d445 Author: 高明阳 Date: Thu Jan 25 16:50:35 2018 +0800 Merge branch 'dev-book' commit 99664d445b23fba570c301d919ded83127c09442 Author: 高明阳 Date: Thu Jan 25 16:49:31 2018 +0800 添加书籍 commit c8efd118ef0db7c600943fef78938634dd314839 Merge: 6e0cb7cd8 4cc6af80b Author: lichong_ <1909165236@qq.com> Date: Thu Jan 25 16:33:24 2018 +0800 Merge branch 'dev-yunyingguanli' commit 4cc6af80b1e2e2203eb3808acefde3c764784739 Author: lichong_ <1909165236@qq.com> Date: Thu Jan 25 16:32:56 2018 +0800 暂存 commit 6e0cb7cd88d43a1b40c86aa40bdc9b6ace88bca8 Author: 丁海波 Date: Thu Jan 25 15:29:57 2018 +0800 智能推送 commit 36709c57085a52e65b2a0ccb6108731b93611ec6 Author: 高明阳 Date: Thu Jan 25 15:19:57 2018 +0800 移除admin下的推广model commit 3eedf5f43ded8c83089b925605539891f4d01cf5 Author: 丁海波 Date: Thu Jan 25 15:13:57 2018 +0800 智能推送 commit d5892ea825f5e5608e0b373316eccfad1f51f9dc Merge: 7880d8945 e1a83c551 Author: 丁海波 Date: Thu Jan 25 15:12:04 2018 +0800 Merge remote-tracking branch 'origin/master' commit 7880d894577ab41019be0660d00d0bc3477e4cce Author: 丁海波 Date: Thu Jan 25 15:11:53 2018 +0800 智能推送 commit e1a83c551be4f430b105f793e88d6c734d9672e3 Author: php-王凡昌 Date: Thu Jan 25 14:59:59 2018 +0800 /admin/book/book/chapter 增加ajax响应 commit 3e1a52ef7434680e92c0ff73bfb7084e9d0bfabd Author: php-王凡昌 Date: Thu Jan 25 11:51:43 2018 +0800 解决冲突 commit 66a462a03050b52ee078c0e1daaa7e00863baa59 Merge: 1984229ae aa5c335ec Author: 高明阳 Date: Thu Jan 25 11:48:11 2018 +0800 update commit 1984229aebaa4674d7b4eb7bbd19cf2c0678040c Merge: 35d217ce4 8e47d5069 Author: 高明阳 Date: Thu Jan 25 11:47:46 2018 +0800 Merge branch 'dev-book' commit aa5c335ecb0136c6c52306153f447c824595a7b7 Merge: 4bb97b4ef 35d217ce4 Author: 丁海波 Date: Thu Jan 25 11:46:54 2018 +0800 Merge remote-tracking branch 'origin/master' commit 4bb97b4ef8f6c0b56de690e7bcb3ad96679f4cc6 Author: 丁海波 Date: Thu Jan 25 11:46:50 2018 +0800 字段修改 commit 35d217ce450e6e9fd8bc37282304f37c193c779c Author: 高明阳 Date: Thu Jan 25 11:39:39 2018 +0800 update commit 226c511f31e9b6726fac867aedea9d44aaf9dd04 Author: 丁海波 Date: Thu Jan 25 11:29:45 2018 +0800 essay commit 8e47d5069d88336f842b290dfbe590676ae0e856 Merge: 902ad67d3 3fbec0750 Author: 高明阳 Date: Thu Jan 25 10:00:45 2018 +0800 Merge branch 'master' into dev-book commit 3fbec07509345351b6268748511ac87c7428bb8b Author: php-王凡昌 Date: Wed Jan 24 23:18:17 2018 +0800 site.php 域名配置 微信自动回复图文消息 commit 2378ddc3ed914c97a94d3e2daca4ed271499888c Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 22:39:30 2018 +0800 修改 渠道商 标题配置 commit a0aa302a359e4869e51d04795fd48f9492391376 Merge: 6277a98cc 1637b0abb Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 21:31:09 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps commit 6277a98cc03ac9c484d7a4861ab7d25da000d767 Merge: e3a39f3e4 23df7f806 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 21:31:01 2018 +0800 Merge branch 'master' of http://gitlab.qcread.cn/fe/cps Conflicts: application/admin/controller/admin/Config.php commit 1637b0abbe7a46470f03fc7ca211fab0f1dfe6c6 Author: php-王凡昌 Date: Wed Jan 24 21:27:25 2018 +0800 智能推送 switch 改为 push commit 902ad67d3a97a37c0205b89d506ca1a3e082b8e3 Author: 高明阳 Date: Wed Jan 24 21:22:51 2018 +0800 update commit e3a39f3e4fd369a9a883ff33ea29d998652f61ba Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 21:15:12 2018 +0800 暂存 commit c7f3da949b74ef4271ff043ca205179d46c0afd4 Author: 高明阳 Date: Wed Jan 24 21:07:59 2018 +0800 模拟创建推广链接 commit 98d3762f99bdcd86347b6437d7ca14b9eb2acef2 Author: 高明阳 Date: Wed Jan 24 20:12:01 2018 +0800 生成推广链接页面update commit 23df7f80603c7b9450fc383c6851bcbe947541f1 Author: 高明阳 Date: Wed Jan 24 20:05:30 2018 +0800 update commit a504a6fc155e7e3edb1c84d9ca3772b084f652ec Author: php-王凡昌 Date: Wed Jan 24 19:35:19 2018 +0800 auth 新增channel_id 属性 commit 80f198c6218bab6406400b4f0b8f79df91015aa6 Author: php-王凡昌 Date: Wed Jan 24 19:18:13 2018 +0800 智能推送开关 commit 7a545180a718f635742a010dde925108e76eda1f Author: licc <45360682@qq.com> Date: Wed Jan 24 17:58:30 2018 +0800 修改提出的问题 commit dc969c70322804b8035255927d1d19ea559941a0 Merge: fccb0f115 225feb1e5 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 17:56:47 2018 +0800 Merge branch 'dev-yunyingguanli' commit 225feb1e5afa87430b1666964c9adbc8c771990a Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 17:56:32 2018 +0800 更新代码 commit fccb0f1154e6db1339fe8b3835753273c6944376 Author: 高明阳 Date: Wed Jan 24 17:29:50 2018 +0800 增加随机封面 commit b18b42ba6f0c771d48a9b89143b6d9a62322cfd4 Author: 高明阳 Date: Wed Jan 24 17:22:31 2018 +0800 创建推广链接增加随机title commit 5a3fae1d5d863604b4978f9a559722e030286d2b Merge: b7bdb75b0 3d3060faa Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 17:03:14 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit b7bdb75b034eb353990680cd370a009ac0f48cf3 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 17:02:57 2018 +0800 暂存 commit 3d3060faacc3cc04063664a7d3e3aef343df17a7 Author: 高明阳 Date: Wed Jan 24 16:50:42 2018 +0800 生成推广文案页面传值 commit 322d159b96700da91ca23a82f9a68eea694d0680 Author: php-王凡昌 Date: Wed Jan 24 16:39:05 2018 +0800 公告弹窗按id desc site.php 新增书籍更新通知msg commit 425a63af551fe2a3c129e26e82070a10338a1c14 Author: licc <45360682@qq.com> Date: Wed Jan 24 16:18:27 2018 +0800 修改提出的问题 commit a6fb9086acd3fb3878aa116491fda098d144c5b2 Merge: d0d121c04 bb7e603cf Author: 丁海波 Date: Wed Jan 24 15:59:59 2018 +0800 Merge remote-tracking branch 'origin/master' commit d0d121c043ce42cb98f580f59293778dd422a5d7 Author: 丁海波 Date: Wed Jan 24 15:59:49 2018 +0800 essay commit bb7e603cf375e6c06550f14dda0fc883e40473b5 Author: php-王凡昌 Date: Wed Jan 24 15:54:47 2018 +0800 全局通用复制功能 。class中添加 copy，属性 data-clipboard-text="将要复制的文本" commit ea81d88bd574107f7cca8bacacbea1b039f3a30f Author: 高明阳 Date: Wed Jan 24 15:52:16 2018 +0800 update commit ec939e1ef125261d1a12a6f498e2d2a389a345ab Author: 高明阳 Date: Wed Jan 24 15:49:11 2018 +0800 update commit fad0554221fa4bfeb4716835cafa37f3c90376de Merge: d951f8ad7 906350107 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 15:02:41 2018 +0800 Merge branch 'dev-yunyingguanli' commit 906350107ba523904911a23f1378c6b1e5f3715d Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 15:02:13 2018 +0800 修改字段sex commit d951f8ad7508ba81de29a5147546844f65e51e14 Author: 高明阳 Date: Wed Jan 24 14:59:00 2018 +0800 update' commit b812e172ff29a9a4106e9124a0317af5eaf29b0b Author: 高明阳 Date: Wed Jan 24 14:56:55 2018 +0800 channel改为sex commit d7e84f0c8d7e559144b030fd7149c48bc6b3e792 Author: php-王凡昌 Date: Wed Jan 24 14:27:32 2018 +0800 重新生成site.php 微信自动回复ajax验证返回格式修改 admin_config表page_title字段json格式处理，page_sex字段增加text属性 commit 0914d33f47d5012f90993c7ac757da37da2f0a70 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 14:25:16 2018 +0800 修改书城管理 标题名 commit 3d26614e72f68429269d03e4506c362a13c2d944 Author: 高明阳 Date: Wed Jan 24 13:50:25 2018 +0800 在site.php中移除bookapi commit 052b8f8bdbddcc001b84e7c570bbb0a199e7b862 Merge: f65a536f3 f3f747721 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 11:53:27 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit f65a536f34baabc2ac6f338ddb7054a36579a67f Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 11:51:54 2018 +0800 更新运营管理-商品管理模块 commit f3f747721a3722abd6eff10cc44c7ac011a61856 Author: 丁海波 Date: Wed Jan 24 11:15:27 2018 +0800 essay 页面展示 commit 12004757c41599928e3c4b8f911c3ce1306c2012 Merge: bf94f830b 6736b2519 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 11:14:15 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit bf94f830b415e454783b8d903618385296e0892e Author: lichong_ <1909165236@qq.com> Date: Wed Jan 24 11:13:57 2018 +0800 暂存 commit 6736b25191a938c1d6f53d9f1d91dd2a3eeeee52 Merge: 6e234ef10 cbb70a900 Author: 高明阳 Date: Wed Jan 24 10:58:32 2018 +0800 Merge branch 'dev-book' commit cbb70a9008d654222f43ce5557c796ee11da9897 Author: 高明阳 Date: Wed Jan 24 10:58:12 2018 +0800 update commit 6e234ef105eba7cdff4a55eb883c96cdde32dac0 Author: php-王凡昌 Date: Wed Jan 24 10:57:24 2018 +0800 同步fastadmin框架更新 commit 1f5d7c6af282aace3b9d684076981270f01353f6 Author: 丁海波 Date: Wed Jan 24 10:45:39 2018 +0800 essay 章节内容接口显示 commit 3d6b05e49a7680f2de8e0de092b9cedaa730d74d Merge: b9df1bb34 203a6d6da Author: licc <45360682@qq.com> Date: Wed Jan 24 10:28:09 2018 +0800 Merge remote-tracking branch 'origin/master' commit b9df1bb34e1e960aadefb34e8c31846d5627b66f Author: licc <45360682@qq.com> Date: Wed Jan 24 10:28:00 2018 +0800 订单明细,订单汇总 commit 203a6d6da1b92453c4b41b1f48b2ddfc1af04803 Author: 丁海波 Date: Tue Jan 23 21:08:14 2018 +0800 essay images commit 3986984a54706ebbdfc46e89a75e241a52e90e52 Author: 丁海波 Date: Tue Jan 23 20:39:34 2018 +0800 essay commit e01836f2983d3063ea65fe09388608b321f405c2 Author: php-王凡昌 Date: Tue Jan 23 20:34:09 2018 +0800 修复公告弹窗逻辑 commit c9f262d1ce369ea21d95c6fcdf32d07938802c6b Author: 高明阳 Date: Tue Jan 23 20:07:52 2018 +0800 update commit 3556c872fdbe8cacfd912f8d9beae03a6081b195 Author: 高明阳 Date: Tue Jan 23 19:54:02 2018 +0800 update commit e9d3f6d3dde1640b146a167378b424a2cfcb8c00 Merge: 02cf4fb5d 2215c45f5 Author: 高明阳 Date: Tue Jan 23 18:09:17 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 02cf4fb5dfc559b07249d9135ffbe47b23015ed8 Author: 高明阳 Date: Tue Jan 23 18:09:11 2018 +0800 update commit 2215c45f536bb0da64084d28419953ab0efc6928 Author: php-王凡昌 Date: Tue Jan 23 17:45:24 2018 +0800 调整推广链接 commit 58e394165c42372a03a8e05d4d5de7f4062bd066 Author: 高明阳 Date: Tue Jan 23 17:35:54 2018 +0800 update commit a6837b4ab05b0ecad265ecb0fb37c41671992d21 Author: 高明阳 Date: Tue Jan 23 17:28:56 2018 +0800 update commit c2b5f1fa33e3213913c6a74224354f3e64ff6426 Author: 高明阳 Date: Tue Jan 23 17:22:53 2018 +0800 多条推广 commit 7926a15a022fa48e51c9818dd802d37ccff8cfb9 Merge: 40acae03a 9761e850e Author: 高明阳 Date: Tue Jan 23 17:20:30 2018 +0800 Merge branch 'dev-book' commit 40acae03a01a331c97b9ecaa81739aeb86effdd8 Author: php-王凡昌 Date: Tue Jan 23 17:13:10 2018 +0800 生成推广文案 commit 9761e850ed54166cbb50aceb1cfe9f4234726b6a Author: 高明阳 Date: Tue Jan 23 17:13:01 2018 +0800 小说推广 commit 4dd464fea1dcd37104668573eb6c6d2af309ae59 Merge: 9382cd3c9 fb1c11466 Author: 高明阳 Date: Tue Jan 23 16:34:08 2018 +0800 Merge branch 'master' into dev-book commit 9382cd3c9e7c7a8c00ad948ad603406b76d9924b Author: 高明阳 Date: Tue Jan 23 16:33:42 2018 +0800 update commit fb1c114665d268f9e0536276badb9158b7dd1cea Author: licc <45360682@qq.com> Date: Tue Jan 23 16:00:16 2018 +0800 订单明细 commit bb1cca2828b4b594247e4592ee63ac7a50936d64 Author: 丁海波 Date: Tue Jan 23 15:29:35 2018 +0800 编辑图文修改 commit eab690f3e0633aea866c12a045678f2a20d43aa7 Author: 丁海波 Date: Tue Jan 23 15:26:44 2018 +0800 编辑图文内容 commit 6a6452d09453269bddce94e7c77c4c45ccfdeeb9 Author: 丁海波 Date: Tue Jan 23 15:24:02 2018 +0800 编辑图片修改 commit cbed093b5a5703ab81c2275b13c73c65d69dd532 Author: php-王凡昌 Date: Tue Jan 23 15:21:27 2018 +0800 json转html实体字符 commit 8f2c3f921625e83af172333624a2ca1c9a893b50 Author: php-王凡昌 Date: Tue Jan 23 15:01:37 2018 +0800 微信资源，图文消息 commit e43064b8e80bd86252172820831833ffea413541 Author: php-王凡昌 Date: Tue Jan 23 14:53:26 2018 +0800 修正tips提示初始化方法 commit 27825063f7fb94edd20b785b495deec8ed1079a9 Author: 丁海波 Date: Tue Jan 23 14:49:40 2018 +0800 添加文章 commit b5f709961a084c9f463d531b45916874b6e44f85 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 23 10:45:27 2018 +0800 暂存 commit 54405237a5d61b8a693334b8dc3f650b55c15fe5 Author: 高明阳 Date: Tue Jan 23 10:33:33 2018 +0800 update commit 7250f203cec7f22ac3c2fdd05bb172f291f7e7ad Merge: 1a3f956ec 217105736 Author: 高明阳 Date: Tue Jan 23 10:20:07 2018 +0800 update commit 21710573631102121ae6bd3a01e18298832a1825 Author: php-王凡昌 Date: Mon Jan 22 22:37:56 2018 +0800 书籍列表页，详情页 commit ddcc5aa1780e1ff330d693bca1cb5d8e8dfabcbc Author: lichong_ <1909165236@qq.com> Date: Mon Jan 22 22:27:46 2018 +0800 暂存 commit e73ed1efcf81f67fa8fbc9d025053eef5c6a9e80 Author: 丁海波 Date: Mon Jan 22 22:20:00 2018 +0800 添加书籍 commit d9336e8d915f88adfd2fd3f319c65eca0b2319e6 Author: 丁海波 Date: Mon Jan 22 21:38:25 2018 +0800 添加消息列表 commit 796cecaeabe4f1344be8fd8b336cdb97c1d4cc10 Author: 丁海波 Date: Mon Jan 22 21:13:59 2018 +0800 添加书籍列表 commit e31e56c0740301d9545a591043aa06ea2880a14e Author: php-王凡昌 Date: Mon Jan 22 20:15:46 2018 +0800 增加刷新按钮 commit b7b706c127fbbae5107db63c31f9dbca8eb1e374 Author: php-王凡昌 Date: Mon Jan 22 19:48:20 2018 +0800 标题、图片返回row行数据 commit 0516f8548515e6aec8e3163fab8f022fb9c0b10e Author: php-王凡昌 Date: Mon Jan 22 16:56:49 2018 +0800 删除多余html注释字符 commit fb399bf273b4a07d22546aecfff6657b44ae4fe9 Author: php-王凡昌 Date: Mon Jan 22 16:11:20 2018 +0800 移动封面&标题管理到manage文件夹 同步框架代码 隐藏顶部多tab commit a0e089c4f35d88e3841a9c0cbb5a97ae03477f96 Merge: 72bc909c3 6b7da595d Author: lichong_ <1909165236@qq.com> Date: Mon Jan 22 13:10:11 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 72bc909c35079dcf78e6a2b6eb0e483ade811b69 Author: lichong_ <1909165236@qq.com> Date: Sun Jan 21 23:17:18 2018 +0800 暂存 commit 6b7da595d97a640d51f3d99a3378b3706a62ac1e Author: php-王凡昌 Date: Sun Jan 21 01:03:09 2018 +0800 后台登陆弹窗通知 commit 0424ddcff5cb5f1a76e786cad45f8a0d34e81b21 Author: licc <45360682@qq.com> Date: Sun Jan 21 00:44:56 2018 +0800 优化 commit 870ee630dba12bc9e13b761fc9d9ec86615fd596 Author: licc <45360682@qq.com> Date: Sat Jan 20 22:59:05 2018 +0800 个人资料 commit c85b53df28b767ebdeeb19113bf1d5febf0ed674 Merge: 82d8111f8 8a0b00a02 Author: licc <45360682@qq.com> Date: Sat Jan 20 22:40:15 2018 +0800 Merge remote-tracking branch 'origin/master' commit 82d8111f8aaa02a9fc85ca09f52b0e102772f1c5 Author: licc <45360682@qq.com> Date: Sat Jan 20 22:40:05 2018 +0800 个人资料 commit 8a0b00a02cb7251fa34c76460bf9e44f12e488b0 Author: php-王凡昌 Date: Sat Jan 20 20:51:23 2018 +0800 公告弹窗展示样式 commit 1a3f956ecc6eda8df0299c01702be29f1c4b36c3 Merge: 6fbf670d9 55c195c96 Author: 高明阳 Date: Sat Jan 20 18:11:47 2018 +0800 Merge branch 'master' into dev-book commit 55c195c9607fb055944ad72312304f81f650f350 Merge: ee9ff9592 25a5e0915 Author: php-王凡昌 Date: Sat Jan 20 18:10:25 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit ee9ff9592d233eb555b2e9655c2298a6e99de95d Author: php-王凡昌 Date: Sat Jan 20 18:10:02 2018 +0800 公告管理 推送用户组到前台js commit 6fbf670d9708566d048268862e2f3520c99ff705 Author: 高明阳 Date: Sat Jan 20 18:03:09 2018 +0800 update commit 35db8c7f19af8e884fe7ca533fe05da9b43017c7 Merge: 35e522ee3 25a5e0915 Author: 高明阳 Date: Sat Jan 20 17:30:27 2018 +0800 Merge branch 'master' into dev-book commit 35e522ee32137f02e1bd7d0d169aac0ae4082f6d Author: 高明阳 Date: Sat Jan 20 17:30:19 2018 +0800 update commit 000da729cd309600e836b295ee8e5db70c13388a Author: 高明阳 Date: Sat Jan 20 17:25:38 2018 +0800 update category commit 25a5e0915e18954aa898f4090e150ccf708d9248 Merge: 77c79ee49 1970a76ae Author: licc <45360682@qq.com> Date: Sat Jan 20 17:17:47 2018 +0800 Merge remote-tracking branch 'origin/master' commit 77c79ee49de20023b4dc03da3f6262b42a219e62 Author: licc <45360682@qq.com> Date: Sat Jan 20 17:17:39 2018 +0800 用户删除变软删除，新增渠道商增加免费章节记录 commit 1970a76ae7686718c9ce6d7792d581dfde74d8cc Author: php-王凡昌 Date: Sat Jan 20 15:13:34 2018 +0800 微信设置增加 默认关注章节数 设置 commit facf970ec6a0269d638c20b365c1b709b8926421 Merge: d6b1a7edf ab2b9646f Author: licc <45360682@qq.com> Date: Sat Jan 20 15:06:17 2018 +0800 Merge remote-tracking branch 'origin/master' commit d6b1a7edfb7aa1e910586fafbe701be7abd69c87 Author: licc <45360682@qq.com> Date: Sat Jan 20 15:06:05 2018 +0800 看点VIP时长修改 commit ab2b9646fa4c79b1e0bd282087b8755af3abbc28 Author: php-王凡昌 Date: Sat Jan 20 14:49:35 2018 +0800 同步框架代码 新增env url_debug=true/false 判断是否本地url调试模式，前台判断是否需要验证主框架域名 commit 0e56b20afb4d5ff13c700b036999ccae8ee8f8c6 Author: licc <45360682@qq.com> Date: Sat Jan 20 14:38:04 2018 +0800 看点VIP时长修改 commit f82b2ce12ac8d392a8eb518da9cee762daca5030 Author: 高明阳 Date: Sat Jan 20 10:59:03 2018 +0800 update commit 46d20723455f088f16c7992436fe31c23ffed0ba Merge: d6c29b234 7fbf7cc78 Author: 高明阳 Date: Fri Jan 19 21:16:54 2018 +0800 Merge branch 'master' into dev-book commit d6c29b23467be9c2fa5821e5f81b894e0c9bac40 Author: 高明阳 Date: Fri Jan 19 21:16:28 2018 +0800 update commit 7fbf7cc78c41bd54b804ccbd3db4a114558bea7f Merge: 44ef76422 24569d3d0 Author: 丁海波 Date: Fri Jan 19 21:15:55 2018 +0800 Merge remote-tracking branch 'origin/master' commit 44ef76422d73ad44658f0143f49b549da29a8eb8 Author: 丁海波 Date: Fri Jan 19 21:15:46 2018 +0800 书籍详情页 commit 24569d3d0be7ac88d81d735f17eba18fc439ea1d Author: php-王凡昌 Date: Fri Jan 19 20:51:54 2018 +0800 修改部分log格式 修改后台微信图片上传为永久资源 commit 03b1bfb015933ee7b0073394e97bab7b05ed4cb7 Merge: 164d8d5ab db3f51d5d Author: 高明阳 Date: Fri Jan 19 20:15:52 2018 +0800 Merge branch 'master' into dev-book commit 164d8d5abd34c211c9ecc08f259fd3bdcf9452c6 Author: 高明阳 Date: Fri Jan 19 20:15:23 2018 +0800 书籍查询条增加between commit db3f51d5d830eb59122705e2a2b1c35d8b3aa181 Merge: 0adce4706 451b528ad Author: lichong_ <1909165236@qq.com> Date: Fri Jan 19 19:43:24 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 0adce4706b1df9f6b75a893e26adbe4a7df16c84 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 19 19:43:06 2018 +0800 暂存 commit 451b528ad74c4b2b76b033191790eabb60864688 Author: php-王凡昌 Date: Fri Jan 19 19:41:22 2018 +0800 前台用户生成，兼容浏览器逻辑 API主框架 微信回调入口切换 commit f72cbc680182f6f53480732143f6c1a4d2c57420 Merge: e34296eeb f730f935d Author: 丁海波 Date: Fri Jan 19 19:37:23 2018 +0800 Merge remote-tracking branch 'origin/master' commit e34296eeb1f53a43d97fafc7226b7518afd685ac Author: 丁海波 Date: Fri Jan 19 19:37:17 2018 +0800 书籍详情 commit 428f01482dfa8d420d407150b8d41b4731dbf33f Author: 高明阳 Date: Fri Jan 19 17:53:46 2018 +0800 update commit e99f446af7fa05b93ddde642abaa4774e2ce7b10 Author: 高明阳 Date: Fri Jan 19 17:42:20 2018 +0800 update commit acc4dc98e37e80b5bc72832162ee0535ed19a6ac Author: 高明阳 Date: Fri Jan 19 17:28:16 2018 +0800 update commit 385ab2df150ffa4b118c8f3b0fa1308805e4d8fe Author: 高明阳 Date: Fri Jan 19 15:33:37 2018 +0800 update commit 2090e4643ff9d51ee0c817777eb581a7b8f0632f Author: 高明阳 Date: Fri Jan 19 14:50:12 2018 +0800 update commit 922b1cde6ef3de56a3478ed0595ad323a33f38e0 Merge: 6b99dbd81 f730f935d Author: 高明阳 Date: Fri Jan 19 14:46:36 2018 +0800 Merge branch 'master' into dev-book commit 6b99dbd81e2aa1ca6a4c5c25ac2563e9ed65148e Author: 高明阳 Date: Fri Jan 19 14:46:01 2018 +0800 书籍分类增加图片 commit f730f935dde6730cc2a50e09907cd6fe093489ec Author: php-王凡昌 Date: Fri Jan 19 13:18:51 2018 +0800 微信设置 -- 不关注模式 commit 74712eb40e92e82b619b07a0c3858f1ac1ed815a Author: php-王凡昌 Date: Fri Jan 19 11:41:27 2018 +0800 user agent 获取类 commit dcb4938ecb0434ac7b257ca46a102aa6eec0fd1b Author: 丁海波 Date: Fri Jan 19 11:38:10 2018 +0800 书籍详情页 commit 749058a1d3a43aadbec010aa441195a6fd62e04b Author: 丁海波 Date: Fri Jan 19 10:45:42 2018 +0800 个人中心over commit cbc53c46325338439d9fdb0e005301557c795764 Merge: fee2b6475 67f595252 Author: 高明阳 Date: Fri Jan 19 10:42:23 2018 +0800 Merge branch 'master' into dev-book commit 67f59525285a54922044412af4aaf5950adb016c Merge: bf01421d6 d066638d9 Author: 丁海波 Date: Fri Jan 19 10:37:14 2018 +0800 Merge remote-tracking branch 'origin/master' commit bf01421d6667196e53d44f8854d8d95877d1874d Author: 丁海波 Date: Fri Jan 19 10:37:07 2018 +0800 签到 commit fee2b64754b89d40a6c9ab2ffa0e85a3bfe44ab8 Merge: 32ff05536 d066638d9 Author: 高明阳 Date: Fri Jan 19 10:32:17 2018 +0800 update commit d066638d94eef823b7e7534486b6e1a84665c771 Author: php-王凡昌 Date: Fri Jan 19 00:03:43 2018 +0800 增加阿里大鱼短信 增加API基类控制器 commit d5ce2bd9f57f143750276c13dfb4ef6b97916312 Merge: bc61960ce 1e52b3c05 Author: lichong_ <1909165236@qq.com> Date: Thu Jan 18 23:54:18 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit bc61960ce9ff4158ed5796342ce7549599cf5cf7 Author: lichong_ <1909165236@qq.com> Date: Thu Jan 18 23:53:58 2018 +0800 暂存 commit 32ff05536b1d3e2d5905efc1399035c444ea14c0 Merge: 735086435 1e52b3c05 Author: 高明阳 Date: Thu Jan 18 16:43:14 2018 +0800 Merge branch 'master' into dev-book commit 7350864351e0ae246d82a30d05e7fe5cd607fe30 Author: 高明阳 Date: Thu Jan 18 16:42:56 2018 +0800 update commit 1e52b3c05b736aa994ce04e9c100251dce34fc05 Author: 丁海波 Date: Thu Jan 18 15:40:34 2018 +0800 充值记录 commit 80a9a28727ea5936208071d109fcc2e69e8acd45 Author: 丁海波 Date: Thu Jan 18 14:29:26 2018 +0800 充值记录 commit 5223093606b8e564bf0b09ff4c2791f28e2e274a Merge: 5bd992288 5150c950b Author: 丁海波 Date: Thu Jan 18 11:02:21 2018 +0800 Merge remote-tracking branch 'origin/master' commit 5bd992288d5bf19397004566cb355e6682f4a416 Author: 丁海波 Date: Thu Jan 18 11:02:10 2018 +0800 修改menu commit 5150c950b0ecfd6956bdabde7f4ee50482ba42c9 Author: php-王凡昌 Date: Wed Jan 17 22:30:15 2018 +0800 前台基类控制器，user新建用户 微信公众号txt上传 commit ba74fe886d1c67c19e5769148a94ceacd507d940 Author: licc <45360682@qq.com> Date: Wed Jan 17 22:13:09 2018 +0800 调整table字段顺序 commit ff378d381b52908c67e58b3e13f719d025b8be45 Merge: e2f5d160b eae62527e Author: lichong_ <1909165236@qq.com> Date: Wed Jan 17 22:10:20 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit e2f5d160bad2abcffc777758768514e44457f5c6 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 17 22:09:39 2018 +0800 创建goods模块 commit eae62527ea282b64f413104eb0f37739fa31aa6a Author: licc <45360682@qq.com> Date: Wed Jan 17 21:03:25 2018 +0800 调整table字段顺序 commit de232b87eadf06f6565c48305c904f2712460c27 Merge: d6534de2f aa2c8b468 Author: 高明阳 Date: Wed Jan 17 20:42:59 2018 +0800 Merge branch 'master' into dev-book commit d6534de2f338e0cfefedcc292c28125b62316b3f Author: 高明阳 Date: Wed Jan 17 20:42:03 2018 +0800 update commit aa2c8b468dd030bd0620b1291e511af289b6d543 Author: licc <45360682@qq.com> Date: Wed Jan 17 20:03:15 2018 +0800 复制读者openid功能 commit 9ed8632104cdb9b45a479dde9183e0165744a390 Merge: 12682edd2 a31aaae54 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 17 20:02:25 2018 +0800 Merge branch 'dev-linshi' into dev-yunyingguanli commit a31aaae5402966afcb47bedeb0e58c6ffbe70d9f Author: lichong_ <1909165236@qq.com> Date: Wed Jan 17 20:02:11 2018 +0800 创建goods控制器 commit 12682edd272d03e4b2afa9b4483aaa911625376f Merge: 41a6446e1 61de92371 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 17 18:44:30 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 41a6446e1238b9d8138a125db89d8a468d8e0142 Author: lichong_ <1909165236@qq.com> Date: Wed Jan 17 18:43:49 2018 +0800 暂存 commit 61de92371d20d180b8417bf464dc8021b7abc525 Author: licc <45360682@qq.com> Date: Wed Jan 17 18:32:07 2018 +0800 复制读者openid功能 commit 0f4acfc1a50c2206e3fc4a4087b82912959c96f4 Author: licc <45360682@qq.com> Date: Wed Jan 17 17:34:31 2018 +0800 管理员去掉渠道商管理 commit 618dcf99f4a15b4cc39fecf7d6241127bdbb7451 Author: licc <45360682@qq.com> Date: Wed Jan 17 15:00:28 2018 +0800 管理员去掉渠道商管理 commit 0cfcbb432381c3a35149cf0fb459cd2cf0ef9259 Author: licc <45360682@qq.com> Date: Wed Jan 17 14:38:21 2018 +0800 Model放到common里 commit dc4524cf0fab8a027bbe32b95b21bfefc6160a67 Merge: a59464325 3a77e4636 Author: 高明阳 Date: Tue Jan 16 20:59:44 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 3a77e4636986ea84ccfab2230d80025168a84e51 Author: licc <45360682@qq.com> Date: Tue Jan 16 20:59:20 2018 +0800 Model放到common里 commit a59464325e9717d133b5ebdd0d02ce72783e7db5 Merge: 29936d920 477e126ec Author: 高明阳 Date: Tue Jan 16 20:59:19 2018 +0800 update commit 29936d920179722b8df19d7628a507efd8d67a0d Author: 高明阳 Date: Tue Jan 16 20:54:19 2018 +0800 update commit bc1b66be076d739cae4394974c1447b0b8f5670b Merge: 23e30506e 477e126ec Author: lichong_ <1909165236@qq.com> Date: Tue Jan 16 20:50:57 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 477e126ec35208514338724cec450460cf7a40fd Merge: 63d49ba83 17e4fcfc9 Author: licc <45360682@qq.com> Date: Tue Jan 16 20:50:02 2018 +0800 Merge remote-tracking branch 'origin/master' commit 63d49ba833d756b3c28864aed1c63dba520d7ddf Author: licc <45360682@qq.com> Date: Tue Jan 16 20:49:50 2018 +0800 Model放到common里 commit 17e4fcfc9fea21fad2aff0bf7dea75e364fc80c2 Author: 丁海波 Date: Tue Jan 16 20:48:30 2018 +0800 充值扫码 commit 23e30506edc07445b7af73f4d2615b2b1dc351fb Merge: d16195c71 f04f99df2 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 16 20:41:22 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit d16195c71520984d057b583b3fcc67615b0339bd Author: lichong_ <1909165236@qq.com> Date: Tue Jan 16 20:41:03 2018 +0800 暂存 commit f04f99df213e7f4c89562bef34d7b64baaba143a Author: licc <45360682@qq.com> Date: Tue Jan 16 20:39:48 2018 +0800 Model放到common里 commit 5f4de837b7a95d36692d9ec52e94181ff3f07700 Author: licc <45360682@qq.com> Date: Tue Jan 16 20:15:31 2018 +0800 Model放到common里 commit e77e38f7be18e5839ab09efb1ba6ff9a909cc95c Author: licc <45360682@qq.com> Date: Tue Jan 16 20:13:17 2018 +0800 Model放到common里 commit 9a36576507e5fee1dfe335d8bc9b619385e19c6e Merge: bdb561ea5 d3bc6ba99 Author: 高明阳 Date: Tue Jan 16 17:40:00 2018 +0800 Merge branch 'master' into dev-book commit bdb561ea50ebb929530c2d3c43107adc44d0a63a Author: 高明阳 Date: Tue Jan 16 17:39:27 2018 +0800 更新model去除多语言 commit d3bc6ba997f2fa5ce3adbc0391ba548de59fa61c Author: licc <45360682@qq.com> Date: Tue Jan 16 17:36:42 2018 +0800 修改User Model commit e49b9094823f113a118c906a3656f19dc82f83a7 Merge: 15e752647 e445333e7 Author: licc <45360682@qq.com> Date: Tue Jan 16 17:16:45 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # application/admin/model/Book.php commit 15e7526479b8e3c6f28726f7b9a8558e2f05e529 Author: licc <45360682@qq.com> Date: Tue Jan 16 17:15:30 2018 +0800 暂存到git commit 29e5fafebea9311bfbf72bba22ab42acbad69176 Author: 高明阳 Date: Tue Jan 16 17:11:45 2018 +0800 update commit e445333e7e7aeec3aa5174f584b4c66ac0842baa Author: 高明阳 Date: Tue Jan 16 16:51:03 2018 +0800 更新封面管理 commit 10a9ff100614b3734f0be7135087b5fb57ee24b8 Merge: 3a969a847 95c35fe42 Author: 高明阳 Date: Tue Jan 16 16:10:58 2018 +0800 Merge branch 'dev-yunyingguanli' into dev-book commit 3a969a847556b9534e0575381a7222aa1f9b7785 Merge: 1478ab193 4d5720297 Author: 高明阳 Date: Tue Jan 16 16:10:05 2018 +0800 Merge branch 'master' into dev-book commit 1478ab19305eb64c38a63d6821a8e9902512ec4d Author: 高明阳 Date: Tue Jan 16 16:08:59 2018 +0800 update commit 4d5720297ced7c92a6ae9a88222a13e92b2a35d1 Author: php-王凡昌 Date: Tue Jan 16 15:02:02 2018 +0800 日志格式处理&error log 次数统计 commit 95c35fe42d5691c49389267b173c92e82ac864aa Merge: 4b0b61f61 19dd0159e Author: lichong_ <1909165236@qq.com> Date: Tue Jan 16 11:47:23 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 4b0b61f61865c218c82323b8dd9eb1f6e0cc9015 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 16 11:47:04 2018 +0800 暂存 commit 3445902155cee0c727bfbda5ab65ed28557673ef Author: lichong_ <1909165236@qq.com> Date: Mon Jan 15 21:09:19 2018 +0800 暂存 commit 19dd0159e7c1d23b534a1b74b3f8239f8a429690 Merge: 996e535cb ac3ed6ac3 Author: php-王凡昌 Date: Mon Jan 15 21:08:16 2018 +0800 微信第三方授权、菜单管理、自动回复、资源管理 微信前台消息处理 commit ac3ed6ac32c216eec63147a56d2ca4ce46d15dd9 Author: php-王凡昌 Date: Mon Jan 15 21:06:06 2018 +0800 后台 微信自动回复、资源管理 前台 微信消息处理 commit a7c192b8b3247d809ea34f0be941604e73704175 Author: 高明阳 Date: Mon Jan 15 18:13:26 2018 +0800 update commit 875460933e5cfb4d5017386d12c977fd7ef86ec1 Author: 高明阳 Date: Mon Jan 15 17:40:51 2018 +0800 update commit 996e535cb21d23d2c4f3198e734f46892f783eaf Merge: 6eb7acbdb c9074aebe Author: 高明阳 Date: Mon Jan 15 16:42:03 2018 +0800 Merge branch 'dev-book' commit c9074aebe8c0b68f531645568c3eef5e7e2dbcf8 Merge: c3b352d5b c5ed5afd1 Author: 高明阳 Date: Mon Jan 15 16:41:46 2018 +0800 update commit c5ed5afd13696d65d644709783979d8d39b17cdd Author: lichong_ <1909165236@qq.com> Date: Mon Jan 15 16:25:40 2018 +0800 暂存 commit c3b352d5bc7acfe2ff5e97c639dc3d199a401aa8 Author: 高明阳 Date: Mon Jan 15 16:04:15 2018 +0800 更新 commit 6eb7acbdbe337ef07a33c34b35e25751de34b25c Merge: e22563def 5204bc672 Author: 高明阳 Date: Mon Jan 15 13:49:24 2018 +0800 update commit 5204bc672df53c75ff9a2ff9d50279c519331aa0 Author: 高明阳 Date: Mon Jan 15 13:46:13 2018 +0800 update commit 4ab3e82ad3746ac4540b345bbf796d39c99b3953 Author: 高明阳 Date: Fri Jan 12 20:55:42 2018 +0800 更新 commit e22563def9cd37ed9ec255a1974d57541c94384a Author: licc <45360682@qq.com> Date: Fri Jan 12 18:34:27 2018 +0800 暂存到git commit 7c5dc6eb745118d9dc555a57b1197957588a909e Merge: 726089039 feb4b7431 Author: 高明阳 Date: Fri Jan 12 11:00:51 2018 +0800 Merge branch 'master' into dev-book commit 726089039912530ca9f9aed902a405147143d582 Author: 高明阳 Date: Fri Jan 12 11:00:01 2018 +0800 update commit feb4b7431c2e4bd46592209fce03f3869d60ec9d Author: 丁海波 Date: Thu Jan 11 21:14:28 2018 +0800 充值 commit 317f64eb5c3afa0c9c92dcfe6367ef931f6e3f85 Author: php-王凡昌 Date: Thu Jan 11 21:02:14 2018 +0800 暂存 commit 27823fb7a027f421908b926a5b143a718d4218ba Author: 高明阳 Date: Thu Jan 11 20:15:33 2018 +0800 update commit 05c987d8b29daa4e2750df5cba799db05b7da56c Author: 高明阳 Date: Thu Jan 11 19:46:43 2018 +0800 章节列表点击加载章节内容 commit dbe47883b43e0c73243f93652897add43e1cff9a Author: 高明阳 Date: Thu Jan 11 16:57:49 2018 +0800 update commit c2eea5dbb02164eacbe3d22d04932795b5688deb Author: php-王凡昌 Date: Thu Jan 11 16:17:29 2018 +0800 暂存 commit c8a35a071871888734c8cb7da2454e03d8788e24 Author: 高明阳 Date: Thu Jan 11 14:30:05 2018 +0800 update commit f47b2be6997c209dbddef2569336c674b1620a9e Author: 高明阳 Date: Thu Jan 11 13:54:37 2018 +0800 update commit 155618b824b57b08da8a8001e75d20c111f8b350 Merge: 857511eca 5017922c1 Author: lichong_ <1909165236@qq.com> Date: Thu Jan 11 11:46:18 2018 +0800 Merge branch 'master' into dev-yunyingguanli Conflicts: application/admin/controller/book/Book.php commit 857511eca87778403990f1ea44b603475e7a7fd3 Author: lichong_ <1909165236@qq.com> Date: Thu Jan 11 11:44:55 2018 +0800 增加运营管理-资源及块管理关键词 commit 5017922c17d1e4c6c3d146ba66b4cb5e1a1c089c Author: 丁海波 Date: Thu Jan 11 11:26:46 2018 +0800 充值 commit e17c0041e5168b85acd331d4d29045e7473504fe Author: lichong_ <1909165236@qq.com> Date: Wed Jan 10 21:13:21 2018 +0800 no message commit 300324b4e9a3e535fac0e0c139894044dc1f9e0a Author: 高明阳 Date: Wed Jan 10 18:49:05 2018 +0800 update commit b1ece062115073ecad9ecc87e09a5008e12c7ffb Merge: 7ed9b2b59 55fb8039e Author: lichong_ <1909165236@qq.com> Date: Wed Jan 10 15:59:33 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 7ed9b2b5933c65a607122261fd15d1d99b0f785a Author: lichong_ <1909165236@qq.com> Date: Wed Jan 10 15:59:14 2018 +0800 no message commit 44994648fee94c1fad205b35cc4702d5a912d646 Merge: 55fb8039e 16c9d4485 Author: php-王凡昌 Date: Wed Jan 10 15:47:26 2018 +0800 Merge branch 'dev-wecaht' of 192.168.0.31:fe/cps into dev-wechat commit 55fb8039ef7e6936bbea9ae1366e31d08d5e552d Author: php-王凡昌 Date: Wed Jan 10 15:44:36 2018 +0800 新增redis config 新增redis instance commit ffc56f6e959d6dd093d69200b5b23a35377b2a9a Author: 丁海波 Date: Wed Jan 10 15:39:24 2018 +0800 个人中心 充值 commit 269d2203059ac94262f73c906625afca0d5c011e Author: 高明阳 Date: Wed Jan 10 15:05:54 2018 +0800 update commit 7183073ec77a0207c012f28668aa14068b4196df Author: 高明阳 Date: Wed Jan 10 15:03:45 2018 +0800 update commit 49f3680fa62eb7a8b7f2dc94126f09676d8eb346 Merge: 9983323c3 ae490346c Author: 高明阳 Date: Wed Jan 10 15:01:08 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 16c9d448508430368e71d466d4905c5b68793cd2 Author: php-王凡昌 Date: Wed Jan 10 14:13:31 2018 +0800 微信第三方授权 commit 404e6dcca2186df13c099a664d09be9505f89a54 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 9 21:09:11 2018 +0800 no message commit 1199deed4922af1a6d3b4cc4a71a7fafc9b8d2f7 Author: php-王凡昌 Date: Tue Jan 9 18:14:52 2018 +0800 记录get post参数 commit 30b889887c624e9de5c8ea4386a167076cd8baa5 Author: php-王凡昌 Date: Tue Jan 9 17:20:37 2018 +0800 修正前台controller继承关系 修正wechat动态配置 commit b33d49e2c4b386eb7dbdeef7b8b79c44e706f9d1 Author: php-王凡昌 Date: Tue Jan 9 16:51:34 2018 +0800 微信开放平台 commit ae490346ce1d5bd62b37e4d5a8ffac3e26dda8bb Author: php-王凡昌 Date: Tue Jan 9 15:30:41 2018 +0800 更新composer扩展 commit 9983323c34cb63003b4bdc96d64aa771929a46fd Author: 高明阳 Date: Tue Jan 9 15:16:17 2018 +0800 update commit 88d01240327adc9a348c8d3d6c1d78d909e5d4fa Merge: 2fb2c7ef4 bb3b6665f Author: 高明阳 Date: Tue Jan 9 14:57:40 2018 +0800 Merge remote-tracking branch 'origin/dev-yunyingguanli' commit 2fb2c7ef4b1a0b1b7c24b9a784ed384d9ae36003 Author: php-王凡昌 Date: Tue Jan 9 14:33:58 2018 +0800 增加验证用户组方法 commit 2fbe5219edad121fe3d67fa9cfb9251035061ec5 Author: 丁海波 Date: Tue Jan 9 13:45:53 2018 +0800 个人信息 commit bb3b6665faf2cfdfe274be5f7762659a5dcb5631 Merge: 4ec31a56b 3522127bf Author: lichong_ <1909165236@qq.com> Date: Tue Jan 9 11:45:27 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 4ec31a56b31bcf1e4040fe3fd950e8e7e8da2876 Author: lichong_ <1909165236@qq.com> Date: Tue Jan 9 11:44:44 2018 +0800 no message commit 3522127bf4e4f0d4423f7bd59ca5fac784a2bba7 Merge: 3c491b101 dd52f026a Author: 高明阳 Date: Tue Jan 9 11:35:25 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 3c491b101d9d593142402ab1050d030caaed6527 Author: 高明阳 Date: Tue Jan 9 11:35:12 2018 +0800 增加书籍管理 commit dd52f026a0912e302c2aca8cfc8dab2db2a14854 Author: 丁海波 Date: Tue Jan 9 11:30:04 2018 +0800 个人中心icon commit e0ca79a373b47103ae3947969eb3235c5c6b448b Author: 丁海波 Date: Tue Jan 9 10:49:57 2018 +0800 修改common head样式 commit 0ed88dd57be100e22478d955fafe010bb15cfc2b Author: 丁海波 Date: Mon Jan 8 20:38:36 2018 +0800 个人中心 commit b6936ef928989a2cb59fa83e453b5650d9f51806 Author: php-王凡昌 Date: Mon Jan 8 19:34:23 2018 +0800 增加开放平台设置 commit 67facc2ba403d8251aeb17b8ef05c5d4ada16d43 Author: 丁海波 Date: Mon Jan 8 17:45:08 2018 +0800 添加排行 限免列表 commit 310da92e2cc0b99dae035db6ab1a80ea277d142e Author: 丁海波 Date: Mon Jan 8 16:47:12 2018 +0800 分享了列表 commit 8d63bcf563fc5c3b25c19cc1eb796c6c0cf71a88 Author: 丁海波 Date: Mon Jan 8 15:29:14 2018 +0800 分类列表 commit ffcd19ba843e5e03de5f3ec8d7eeaaf3029e67f0 Author: 丁海波 Date: Mon Jan 8 14:42:21 2018 +0800 分类列表 commit bd7313741ed4ade418e692610913fe2b69ab5d56 Author: 丁海波 Date: Mon Jan 8 14:34:05 2018 +0800 分类over commit 989cbecbd5bdf63c3479c63e6738c707b92843d7 Merge: 1c3ded3f8 ee082bdd1 Author: lichong_ <1909165236@qq.com> Date: Mon Jan 8 13:41:49 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit ee082bdd14a7289ee72079e0dcc4858ef3dadbaf Author: 丁海波 Date: Mon Jan 8 11:35:13 2018 +0800 分类列表页 commit 1c3ded3f8e48bc4b670c0699ffa41b8e1cdb16c7 Merge: cdf6e7a38 586035dae Author: lichong_ <1909165236@qq.com> Date: Mon Jan 8 10:06:48 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 586035daec07435df9c11756ea78953eed0768b2 Author: php-王凡昌 Date: Sat Jan 6 19:40:11 2018 +0800 新增php库 ip库、redis锁、guzzle库 commit a65da0f4ea937429a0c240d09909dc0613c2ec7d Author: 丁海波 Date: Sat Jan 6 19:32:41 2018 +0800 修改rem规则 commit 51f19aadff1f6f6948493026814bbc159457dd86 Author: 丁海波 Date: Sat Jan 6 19:25:07 2018 +0800 icon commit cdf6e7a385039fa585a968b3f848f558dd63a617 Author: lichong_ <1909165236@qq.com> Date: Sat Jan 6 18:37:39 2018 +0800 no message commit 4be1bfcbf650a10af890da18c786c5ee421494c0 Author: gaomingyang Date: Sat Jan 6 18:01:27 2018 +0800 增加书籍分类管理 commit d1603ec44b4029d5915f1225bf56c0fc07ae10d2 Author: 丁海波 Date: Sat Jan 6 17:29:47 2018 +0800 移除remjs commit 47fb97ad31324a05cfad77aedd919706e954af4c Author: 丁海波 Date: Sat Jan 6 16:43:18 2018 +0800 最近阅读over commit bab9a3e634ac8d8e72560a328bdad89570c9cec4 Author: php-王凡昌 Date: Sat Jan 6 16:15:14 2018 +0800 新增zepto相关js commit 03b2e5eace87895e46e149678ffb40a9bf215bc8 Merge: bbc9d8006 e300d7d2f Author: lichong_ <1909165236@qq.com> Date: Sat Jan 6 15:57:59 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit e300d7d2f08663b9afe34c93e0be60722d780585 Author: licc <45360682@qq.com> Date: Sat Jan 6 15:49:48 2018 +0800 权限 commit badf0784997d3388bf82cfb8f22d4da9c6abcd59 Merge: 4bc139f1d e749a721f Author: licc <45360682@qq.com> Date: Sat Jan 6 15:48:11 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit e749a721f761a4cdabb862622ce8143993ff956b Author: php-王凡昌 Date: Sat Jan 6 14:54:51 2018 +0800 系统设置config commit bbc9d800667034eb23ffb3ad43cd19b777713d66 Merge: ecc8598dc 21493702e Author: lichong_ <1909165236@qq.com> Date: Sat Jan 6 14:50:21 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 21493702e9d7136154689e2378bc0cec34c4ed7c Author: php-王凡昌 Date: Sat Jan 6 11:15:15 2018 +0800 新增富文本插件（此插件js已经修改，修复浮动层问题，与官方原版插件不同） commit ecc8598dcfb7412886196ca7d8ee7288591c8b40 Merge: 61c383e36 5a146f368 Author: lichong_ <1909165236@qq.com> Date: Sat Jan 6 10:36:01 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 61c383e36a5ec0771faa91f1f19d394d92d6ae57 Author: lichong_ <1909165236@qq.com> Date: Sat Jan 6 10:35:44 2018 +0800 no message commit 5a146f3687f57f98eb96cd404779c590188c235e Author: php-王凡昌 Date: Fri Jan 5 18:23:14 2018 +0800 屏蔽后台header无用内容 commit 1271db5d49049c38b7fb50db0c9cef7a3f70c167 Merge: b2eddf745 718d1352e Author: 丁海波 Date: Fri Jan 5 16:53:23 2018 +0800 Merge remote-tracking branch 'origin/master' commit b2eddf745e9971e1368f893054a22a812d092c21 Author: 丁海波 Date: Fri Jan 5 16:53:17 2018 +0800 最近阅读icon commit 718d1352ea92b4cb238e376cb9ac63da177f44f7 Author: php-王凡昌 Date: Fri Jan 5 16:32:30 2018 +0800 admin 去除cdn admin session使用默认file index 自定义cdn,自定义session commit ba6bcdf777a02fa3361adc12693a59ccc7e59204 Merge: d58dd6147 7af3f788c Author: 丁海波 Date: Fri Jan 5 15:08:49 2018 +0800 Merge remote-tracking branch 'origin/master' commit d58dd61472c922a120efe64cc4a3015769066e8e Author: 丁海波 Date: Fri Jan 5 15:08:38 2018 +0800 最近阅读 commit dd112e27339676af8302c12659932c3c0e870eac Merge: 70af3e359 7af3f788c Author: lichong_ <1909165236@qq.com> Date: Fri Jan 5 12:10:39 2018 +0800 Merge branch 'master' into dev-yunyingguanli commit 70af3e359da61a016a5f2bc16e7b8b2c9c2424a8 Author: lichong_ <1909165236@qq.com> Date: Fri Jan 5 12:09:28 2018 +0800 no message commit 4bc139f1db8f6242b875c0800671c9cf66d073a8 Merge: c78b33ae4 7af3f788c Author: licc <45360682@qq.com> Date: Fri Jan 5 12:08:51 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 7af3f788cc80561bd4cb65e1ba9099297b305ba3 Author: php-王凡昌 Date: Fri Jan 5 12:07:02 2018 +0800 cookie中用户id下标更改为user_id commit b4109b4df770d2d731e7e733b7b8a40491052ecb Merge: a65fcdf8d 9275a0f3c Author: php-王凡昌 Date: Fri Jan 5 12:05:35 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit a65fcdf8d0a3e6b287db5a7a59bcd8765b4e7a27 Author: php-王凡昌 Date: Fri Jan 5 12:05:02 2018 +0800 修改分库依据uid获取方式 commit 9275a0f3cd7aafeeff50127b44d2edfb2610b552 Merge: 6dadf2157 f2323f8d4 Author: 丁海波 Date: Fri Jan 5 12:02:01 2018 +0800 Merge remote-tracking branch 'origin/master' commit 6dadf2157be591ea3d1ce16c2affada505983b97 Author: 丁海波 Date: Fri Jan 5 12:01:51 2018 +0800 首页over commit f2323f8d45241078a1f2b1d2787bb6083b4c480d Merge: b8e00bee2 aa77b21ef Author: php-王凡昌 Date: Fri Jan 5 12:01:09 2018 +0800 Merge branch 'master' of 192.168.0.31:fe/cps commit b8e00bee26f79672fdc0d1c4b0ac10821e7055c0 Author: php-王凡昌 Date: Fri Jan 5 12:00:54 2018 +0800 分库配置 commit c78b33ae4b8e77d7500608fdf4d532e18037c71a Merge: c4f6ec2e8 aa77b21ef Author: licc <45360682@qq.com> Date: Fri Jan 5 11:33:03 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit aa77b21ef17925f987c4f4ac3c87138814da2bac Author: 丁海波 Date: Fri Jan 5 10:41:41 2018 +0800 滑动图片列表 commit 34ca466692d4b9962057b1c33f4ecf2236c0a600 Author: 丁海波 Date: Fri Jan 5 10:39:02 2018 +0800 滑动图片列表 commit fce32bc3a5d02aadf6d077f94b45a918616f0b68 Author: 丁海波 Date: Fri Jan 5 10:37:14 2018 +0800 滑动图片列表 commit d112a52a3194b1471887d8e965bf15518535a1e8 Author: 丁海波 Date: Fri Jan 5 10:32:56 2018 +0800 滑动图片列表 commit 8ca78c1bc6374e28527d2a60cd584302fa5dd13d Merge: a1d8cb985 0e874f50d Author: 丁海波 Date: Thu Jan 4 19:59:52 2018 +0800 Merge remote-tracking branch 'origin/master' commit a1d8cb9856f0a961b0cc3d3bb27cc464a1f45cb8 Author: 丁海波 Date: Thu Jan 4 19:59:42 2018 +0800 图片模块 commit 0e874f50d8785aa056d3531c22ad0f42b56d73b8 Author: php-王凡昌 Date: Thu Jan 4 19:58:47 2018 +0800 admin增加mobile字段 commit de6d1fc8fafc57b73615cb5f2406d6a5bdd68974 Merge: 4078997ec 28c651a59 Author: 丁海波 Date: Thu Jan 4 18:27:08 2018 +0800 Merge remote-tracking branch 'origin/master' commit 4078997ec8c37324572244a8031d979e351a8a95 Author: 丁海波 Date: Thu Jan 4 18:26:58 2018 +0800 专题nav commit 28c651a599deaea8bdb895bdc425746e3a5cffc3 Author: php-王凡昌 Date: Thu Jan 4 18:04:50 2018 +0800 关闭默认debug 关闭database默认debug 修改默认数据库直连线上数据库 commit 01e0313f07a51425328fcb40c0d3e017f826ba47 Author: 丁海波 Date: Thu Jan 4 17:53:33 2018 +0800 icon commit c4d1b93174cb87906ce810cb42c137cb79aac5b0 Author: 丁海波 Date: Thu Jan 4 17:43:01 2018 +0800 修改icon commit 782e708ad3a6ad1f35fb4db3c7acd1ea9d95d7a3 Author: 丁海波 Date: Thu Jan 4 14:01:48 2018 +0800 icon commit 5869aacad4f486c1f2616a246df899067bcd0b04 Author: php-王凡昌 Date: Thu Jan 4 11:40:55 2018 +0800 限定thinkphp为5.0.*版本 commit ed3241a0f3367a7286ca0806eefb0c1ea9e75ce5 Author: php-王凡昌 Date: Thu Jan 4 10:46:42 2018 +0800 前端模板继承 commit c4f6ec2e8c41cc07ba33d6b5e5efb8d2147cdb9e Merge: 4c2742453 8deb3f381 Author: licc <45360682@qq.com> Date: Thu Jan 4 10:41:03 2018 +0800 Merge branch 'master' of http://192.168.0.31/fe/cps commit 8deb3f3812024fced3109a553c4a5d9b4d8e89b7 Author: php-王凡昌 Date: Wed Jan 3 21:09:01 2018 +0800 修改css默认主题引入方式 commit 4c2742453c4b206a41b71a20f3335059414eb621 Merge: bbbe1c420 89aa67477 Author: licc <45360682@qq.com> Date: Wed Jan 3 19:01:46 2018 +0800 Merge remote-tracking branch 'origin/master' # Conflicts: # application/admin/controller/auth/Channel.php commit bbbe1c420af9710dc227840c7c7952090c14dd88 Author: licc <45360682@qq.com> Date: Wed Jan 3 19:01:31 2018 +0800 test commit 89aa67477e5bc565806fbbe6f3f6436cc0b2e695 Author: php-王凡昌 Date: Wed Jan 3 15:47:47 2018 +0800 增加验证类 修改admin扩展类 commit 28d66e5f15688cc1d785ab77c92e596ae8fc7a2f Author: php-王凡昌 Date: Wed Jan 3 14:25:54 2018 +0800 渠道商管理--添加add commit e854d97d055a408b1d2f7381bd1b7601ac7a1111 Author: licc <45360682@qq.com> Date: Tue Jan 2 17:49:27 2018 +0800 管理员管理细分 commit d7ace8b23d9cc15a3411f72a8badfdde7d65174c Author: licc <45360682@qq.com> Date: Tue Jan 2 16:56:21 2018 +0800 管理员管理细分 commit 1f4f0f5c2f396d73e73d94acabc6d0ab6c4aef4f Author: php-王凡昌 Date: Thu Dec 28 21:03:33 2017 +0800 左侧菜单去除角标，去除底部版权信息 commit 58ff8ff390073dc4e80835b2b58de7453a366293 Author: php-王凡昌 Date: Thu Dec 28 20:52:48 2017 +0800 处理后台样式 压缩css，js 关闭debug调试模式 commit 131c5ead908f3e4234f38e6e8ac6f061520f5b52 Author: php-王凡昌 Date: Thu Dec 28 11:48:07 2017 +0800 换行符修改 commit 30ac944747bcbf191738eb40569c79fa72e2daea Author: php-王凡昌 Date: Thu Dec 28 11:23:49 2017 +0800 修改 utf8mb4_unicode_ci 字符集 commit 0cd4e36897c4c2cb8d284865328c5f5affbf61cc Author: php-王凡昌 Date: Wed Dec 27 22:03:07 2017 +0800 update fastadmin 20171227 20:51 commit c83e38485e5b4ecc2cd08b403eab73f0894e0704 Author: licc <45360682@qq.com> Date: Tue Dec 26 09:50:15 2017 +0800 换行符linux格式 commit f2ef8ec196872a58e164ac175236fae71bec177b Author: php-王凡昌 Date: Mon Dec 25 14:27:55 2017 +0800 runtime gitignore commit 138178d8173556e01e595bd6529621971d36476f Author: php-王凡昌 Date: Thu Dec 21 18:41:13 2017 +0800 add config.php commit 5dd701be886967f3d76e4c2987bee1d1b798d942 Author: php-王凡昌 Date: Thu Dec 21 12:03:05 2017 +0800 charset utf8mb4_unicode_ci gitignore commit 6ed7e7a6c2b01c130ab354c2232e0ace39b0e3a0 Author: php-王凡昌 Date: Thu Dec 21 11:30:41 2017 +0800 gitignore commit 8441fb45693bb8e0750a86b34b951222d2d9c736 Author: php-王凡昌 Date: Thu Dec 21 11:26:08 2017 +0800 sql commit d341089f0ecbb3257df96ee0375589d170e120a2 Author: php-王凡昌 Date: Thu Dec 21 11:25:15 2017 +0800 init