aa

6b208de8 · wudepeng · 77ce6d0d · 0b6bcdff · 6b208de8 · 6b208de8
--- a/exit
+++ b/exit
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m Merge remote-tracking branch 'origin/test'
+[33m0abf52e[m[33m ([m[1;31morigin/test[m[33m, [m[1;32mtest[m[33m)[m test
+[33mc499608[m Merge remote-tracking branch 'origin/dev'
+[33mcdd6641[m test
+[33m591a756[m Merge remote-tracking branch 'origin/test'
+[33m89292ee[m 注释
+[33m757233a[m Merge branch 'dev'
+[33m3ec4bd1[m sql格式化
+[33maee36e6[m Merge branch 'dev'
+[33mc57c423[m 修改登录bug
+[33m2eee2f9[m 优化
+[33mbd571c9[m 查询用户最后一笔订单
+[33m3f90a68[m 修改数据库密码
+[33mb533e6f[m Merge branch 'dev'
+[33me20fbe3[m 社区图片压缩
+[33m12ad62a[m 修改bug
+[33m22c9027[m Merge branch 'dev'
+[33m431b018[m 支付配置
+[33mfed2f28[m Merge branch 'dev'
+[33ma673b8a[m 修改购物车bug
+[33maed74af[m Merge branch 'dev'
+[33me1b497c[m 修改订单倒计时bug
+[33mf623940[m 同步
+[33m88eb6b6[m 修改订单时间
+[33m375bb8d[m 修改订单时间
+[33m20b3dea[m 修改订单时间
+[33mdb789a1[m 修改订单时间
+[33m3b7873a[m 去除sku 前后分号
+[33m1f6a511[m Merge branch 'dev'
+[33m62b17fd[m 加购时校验商品状态
+[33m41fcad9[m Merge branch 'dev'
+[33m096ec77[m Merge branch 'function-1.01' into dev
+[33m9ee505e[m 新增是否强制更新
+[33m630da10[m 修改购物车bug
+[33m7ca7840[m 修改购物车bug
+[33m31e34b8[m Merge branch 'dev'
+[33mb056080[m 修复一个小bug
+[33m26aec25[m Merge branch 'dev'
+[33mfd949d1[m Merge branch 'test-001' into dev
+[33m0ccafeb[m Merge branch 'dev'
+[33m6caf5af[m Merge branch 'function-1.01' into dev
+[33m43901a1[m 购物车bug修复
+[33m6347c98[m test001
+[33m34cd118[m Merge branch 'dev'
+[33m8ae04d3[m Merge branch 'test-02' into dev
+[33m53eae08[m Merge branch 'test-01' into dev
+[33m9739f38[m test02
+[33m97955d0[m test-01
+[33m5dab374[m Merge branch 'dev'
+[33m164fdaa[m test
+[33mf08dd32[m test
+[33m06addce[m test branch
+[33m3f76395[m Merge branch 'master' into dev
+[33m114bb32[m Merge branch 'fixbug-1.0'
+[33m6606804[m Merge branch 'fixbug-1.0' into dev
+[33m03f89ab[m 购物车商品库存为0时取消勾选
+[33m753ce2e[m Merge branch 'dev'
+[33m27de11e[m Merge branch 'function-1.0' into dev
+[33mb69dd43[m test bug
+[33m8981093[m 新增购物车库存校验
+[33m30aa79a[m 购物车分页
+[33mf271e5a[m 优化权限，设置token失效时间为1年
+[33m3661ae7[m 搜索优化
+[33me4d6de3[m 订单设置永不关闭，营运需求
+[33m3aa5ac4[m 优化
+[33m7295a93[m 修改一个小bug
+[33m2e0d182[m 修改一个小bug
+[33m7a6d106[m 开屏图管理
+[33mefbfe6f[m 提交
+[33maeb7639[m 提交
+[33m9492167[m 订单倒计时
+[33m712f3cf[m Braintree支付
+[33m0819643[m Braintree支付
+[33m9522739[m Braintree支付
+[33me06c27d[m Braintree支付
+[33mf062e53[m 完整提交
+[33mf14b056[m 结算金额提交
+[33m4a69220[m 结算金额提交
+[33m9a7ea9d[m 地址优化
+[33mc3d30f3[m 提交
+[33md1dcb77[m 修改地址
+[33m32fb07f[m 修改地址
+[33m6b3724e[m 优化评论
+[33m7302763[m 图片压缩
+[33m2452911[m 优化
+[33m4f9a754[m 优化
+[33m3f9f916[m 评论
+[33m8ed34da[m 评论
+[33m7a13fd8[m 一级分类查询
+[33md820997[m 提交
+[33m5582869[m 评论
+[33m90a9971[m 图片上传
+[33m565c33b[m 评论
+[33md53fd96[m 评论
+[33me4a175f[m 评论
+[33md906ccb[m 商品优化
+[33m8cb32c8[m 评论优化
+[33meb5f8f8[m 评论优化
+[33mcee3ccc[m 评论新增图片、视频
+[33m4f6eaa0[m 评论优化
+[33m7fe49d9[m 商品评论优化
+[33mb2a953c[m 属性优化
+[33m8f36163[m 地址优化
+[33mfc31613[m 地址优化
+[33m3fdfed2[m 地址优化
+[33mfcb9904[m Merge remote-tracking branch 'origin/master'
+[33m59b7a1f[m 地址优化
+[33m6fe7ec5[m redis 配置
+[33mf05c8e3[m redis 配置
+[33m51695fc[m 国家管理
+[33m00dfe04[m 国家管理
+[33m70f7dc6[m 国家管理
+[33m08d8bf9[m 商品列表排序
+[33m5e66ece[m 识别注册用户的国家
+[33mc53e053[m 修改购物车逻辑
+[33mc5be25b[m 区分注册用户来源
+[33mac9f49f[m 区分注册用户来源
+[33md8d13b3[m 提交
+[33m65ea4a8[m 优化
+[33mc14cc3d[m 修改佣金bug
+[33m0fed986[m stripe
+[33m66dcb7b[m stripe 支付
+[33mdbb5234[m stripe 支付
+[33m88ae2fe[m 优化
+[33m8c910ac[m stripe支付
+[33m6541ea5[m stripe 支付
+[33m101303c[m 购物车批量添加
+[33m92f560c[m 购物车批量添加
+[33m244f87d[m 批量添加购物车时间处理
+[33mcafa215[m 购物车批量添加
+[33m778028a[m 购物车批量添加
+[33m8b0d9e0[m 收藏商品按时间降序
+[33m31a32c1[m 商品属性
+[33mf6229c6[m 商品属性
+[33m066cf45[m 修复优惠券不失效bug
+[33m0ab8081[m 购物车
+[33md46b3ec[m 购物车
+[33mc955034[m paypal token
+[33m28c2fd6[m paypal token
+[33me00c1dd[m paypal token
+[33m43c33a4[m address 回滚
+[33m55e11c1[m update
+[33ma3a797e[m update
+[33mc5c7204[m update
+[33m1632dfd[m paypal
+[33m2942fc0[m paypal 日志
+[33m085f3fb[m update
+[33m174f691[m update paypal
+[33md13a75e[m update paypal
+[33m369cc62[m update address
+[33mf838cbc[m update adress|| order
+[33mc673e85[m update
+[33ma09d76a[m update
+[33m420a90b[m Commenting important notes
+[33mf5a8d59[m improvements
+[33m7da7888[m improvements
+[33m7e3d1a0[m improvements
+[33m0a65c02[m improvements
+[33mdb8a132[m improvements
+[33m4122a09[m Merge remote-tracking branch 'origin/master'
+[33ma420700[m improvements
+[33m94bfa5f[m Free Shipping Threshold
+[33m69e88d1[m update bonus
+[33m78d81ff[m update activity
+[33mc7afa48[m update activity
+[33m8b2ad21[m full activity
+[33m27a516a[m full activity
+[33m3d70b70[m update activity
+[33m16a2ebe[m 首页分类栏、海报排序
+[33m49c0f47[m update activity
+[33m9c05d23[m update activity
+[33m93491ab[m update activity
+[33mca4e151[m update activity
+[33m05a2be6[m update activity
+[33m538fa7d[m update activity
+[33mf7594bb[m update activity
+[33mfe9b18f[m Merge branch 'master' of D:\work\afrishop-refactored-project with conflicts.
+[33ma449b9c[m update activity
+[33m2cffbc9[m improvements
+[33m60348b2[m improvements
+[33m1c99dbd[m improvements
+[33m29013f4[m improvements
+[33ma9008ec[m improvements
+[33m50c78a7[m Merge remote-tracking branch 'origin/master'
+[33m5dc6e29[m improvements
+[33m916d435[m full activity
+[33mc1b7676[m update activity
+[33m7f1bb22[m update activity
+[33mbab3516[m update activity
+[33m5e4662b[m update activity
+[33m38c47df[m update activity
+[33me9ae179[m update activity
+[33m1374b5a[m full activity
+[33md5ad152[m update
+[33mbb9dd46[m full activity
+[33mc06b69a[m full activity
+[33m472551b[m update
+[33m1451405[m 活动
+[33m788ec25[m 活动
+[33m6264234[m 活动
+[33mf24368a[m update bonus
+[33m644fb90[m update dpo
+[33md7101e7[m 提交
+[33mc5560c5[m changes and add more comments
+[33m4e812bd[m Merge branch 'master' of http://code.diaosaas.com/Whispa/afrishop-refactored-project
+[33mc7aef37[m commit commit
+[33m53caae7[m 提交
+[33m43d87ed[m 提交
+[33mf454b5d[m 修改订单来源bug
+[33mcf6a7e8[m 优化登录逻辑
+[33m036a152[m dpo设置
+[33m5e4f30b[m 更新
+[33m0282e82[m 提交
+[33mc18231d[m 提交
+[33mc3e70a5[m 提交
+[33mbac2bb4[m 修改佣金规则
+[33m5101fc5[m 修改优惠券bug
+[33ma0e9859[m update
+[33m5034925[m  test
+[33m7f7b6ce[m Traffic statistics
+[33md4a2384[m commit commit
+[33mc71f576[m commit commit
+[33m4013950[m commit commit
+[33me56a68a[m commit commit
+[33m12a58c9[m commit commit
+[33m92fcc06[m commit commit
+[33m755be80[m commit commit
+[33md386f12[m Merge remote-tracking branch 'origin/master'
+[33mefb2061[m commit commit
+[33mb286ac3[m Modify shopping cart to remove bugs
+[33m0893892[m Modify shopping cart to remove bugs
+[33m75cbdd0[m Optimized coupons
+[33m3799d74[m commit commit
+[33m1552f5d[m Merge remote-tracking branch 'origin/master'
+[33mb2662cc[m commit commit
+[33mb36b571[m update
+[33mf428b33[m commit commit
+[33m3c35729[m commit commit
+[33m7aba425[m commit commit
+[33m144ad48[m commit commit
+[33m90907e6[m commit c
\ No newline at end of file
--- a/shutdown
+++ b/shutdown
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{0}: checkout: moving from function_wu to master
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{1}: checkout: moving from test to function_wu
+[33m0abf52e[m[33m ([m[1;31morigin/test[m[33m, [m[1;32mtest[m[33m)[m HEAD@{2}: checkout: moving from master to test
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{3}: checkout: moving from dev to master
+[33mca3d37c[m[33m ([m[1;31morigin/dev[m[33m, [m[1;32mdev[m[33m)[m HEAD@{4}: commit (merge): test
+[33mcdd6641[m HEAD@{5}: checkout: moving from test to dev
+[33m0abf52e[m[33m ([m[1;31morigin/test[m[33m, [m[1;32mtest[m[33m)[m HEAD@{6}: checkout: moving from master to test
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{7}: checkout: moving from test to master
+[33m0abf52e[m[33m ([m[1;31morigin/test[m[33m, [m[1;32mtest[m[33m)[m HEAD@{8}: checkout: moving from master to test
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{9}: checkout: moving from dev to master
+[33mcdd6641[m HEAD@{10}: checkout: moving from master to dev
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{11}: checkout: moving from dev to master
+[33mcdd6641[m HEAD@{12}: checkout: moving from test to dev
+[33m0abf52e[m[33m ([m[1;31morigin/test[m[33m, [m[1;32mtest[m[33m)[m HEAD@{13}: checkout: moving from dev to test
+[33mcdd6641[m HEAD@{14}: checkout: moving from dev to dev
+[33mcdd6641[m HEAD@{15}: branch: Reset to origin/dev
+[33mcdd6641[m HEAD@{16}: checkout: moving from dev to dev
+[33mcdd6641[m HEAD@{17}: branch: Reset to origin/dev
+[33mcdd6641[m HEAD@{18}: checkout: moving from master to dev
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{19}: checkout: moving from test to master
+[33m0abf52e[m[33m ([m[1;31morigin/test[m[33m, [m[1;32mtest[m[33m)[m HEAD@{20}: checkout: moving from master to test
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{21}: checkout: moving from hello to master
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{22}: checkout: moving from master to hello
+[33m0de0dc7[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m HEAD@{23}: commit (merge): Merge remote-tracking branch 'origin/test'
+[33mc499608[m HEAD@{24}: checkout: moving from test to master
+[33m0abf52e[m[33m ([m[1;31morigin/test[m[33m, [m[1;32mtest[m[33m)[m HEAD@{25}: commit: test
+[33m89292ee[m HEAD@{26}: checkout: moving from master to test
+[33mc499608[m HEAD@{27}: merge origin/dev: Merge made by the 'recursive' strategy.
+[33m591a756[m HEAD@{28}: checkout: moving from dev to master
+[33mcdd6641[m HEAD@{29}: commit: test
+[33m89292ee[m HEAD@{30}: checkout: moving from master to dev
+[33m591a756[m HEAD@{31}: checkout: moving from pro_wu to master
+[33m591a756[m HEAD@{32}: checkout: moving from master to pro_wu
+[33m591a756[m HEAD@{33}: merge origin/test: Merge made by the 'recursive' strategy.
+[33m757233a[m HEAD@{34}: checkout: moving from dev to master
+[33m89292ee[m HEAD@{35}: merge origin/test: Fast-forward
+[33m3ec4bd1[m HEAD@{36}: checkout: moving from test to dev
+[33m89292ee[m HEAD@{37}: commit: 注释
+[33m3ec4bd1[m HEAD@{38}: checkout: moving from dev to test
+[33m3ec4bd1[m HEAD@{39}: checkout: moving from master to dev
+[33m757233a[m HEAD@{40}: merge dev: Merge made by the 'recursive' strategy.
+[33maee36e6[m HEAD@{41}: pull: Fast-forward
+[33m2eee2f9[m HEAD@{42}: checkout: moving from dev to master
+[33m3ec4bd1[m HEAD@{43}: commit: sql格式化
+[33mc57c423[m HEAD@{44}: merge origin/dev: Fast-forward
+[33mbd571c9[m HEAD@{45}: checkout: moving from master to dev
+[33m2eee2f9[m HEAD@{46}: checkout: moving from dev to master
+[33mbd571c9[m HEAD@{47}: checkout: moving from dev to dev
+[33mbd571c9[m HEAD@{48}: branch: Reset to origin/dev
+[33mbd571c9[m HEAD@{49}: checkout: moving from dev to dev
+[33mbd571c9[m HEAD@{50}: checkout: moving from master to dev
+[33m2eee2f9[m HEAD@{51}: merge origin/master: Fast-forward
+[33m2e0d182[m HEAD@{52}: reset: moving to HEAD
+[33m2e0d182[m HEAD@{53}: merge origin/master: Fast-forward
+[33maeb7639[m HEAD@{54}: merge origin/master: Fast-forward
+[33mf062e53[m HEAD@{55}: reset: moving to HEAD
+[33mf062e53[m HEAD@{56}: merge origin/master: Fast-forward
+[33m7a13fd8[m HEAD@{57}: reset: moving to HEAD
+[33m7a13fd8[m HEAD@{58}: commit: 一级分类查询
+[33md820997[m HEAD@{59}: merge origin/master: Fast-forward
+[33m3fdfed2[m HEAD@{60}: reset: moving to HEAD
+[33m3fdfed2[m HEAD@{61}: merge origin/master: Fast-forward
+[33m6fe7ec5[m HEAD@{62}: commit: redis 配置
+[33mf05c8e3[m HEAD@{63}: reset: moving to HEAD
+[33mf05c8e3[m HEAD@{64}: commit: redis 配置
+[33m51695fc[m HEAD@{65}: merge origin/master: Fast-forward
+[33m08d8bf9[m HEAD@{66}: reset: moving to HEAD
+[33m08d8bf9[m HEAD@{67}: merge origin/master: Fast-forward
+[33m244f87d[m HEAD@{68}: reset: moving to HEAD
+[33m244f87d[m HEAD@{69}: commit: 批量添加购物车时间处理
+[33mcafa215[m HEAD@{70}: merge origin/master: Fast-forward
+[33m1632dfd[m HEAD@{71}: reset: moving to HEAD
+[33m1632dfd[m HEAD@{72}: commit: paypal
+[33m2942fc0[m HEAD@{73}: commit: paypal 日志
+[33m085f3fb[m HEAD@{74}: merge origin/master: Fast-forward
+[33m174f691[m HEAD@{75}: merge origin/master: Fast-forward
+[33mf5a8d59[m HEAD@{76}: reset: moving to HEAD
+[33mf5a8d59[m HEAD@{77}: merge origin/master: Fast-forward
+[33m78d81ff[m HEAD@{78}: merge origin/master: Fast-forward
+[33m8b2ad21[m HEAD@{79}: commit: full activity
+[33m27a516a[m HEAD@{80}: commit: full activity
+[33m3d70b70[m HEAD@{81}: merge origin/master: Fast-forward
+[33mca4e151[m HEAD@{82}: reset: moving to HEAD
+[33mca4e151[m HEAD@{83}: merge origin/master: Fast-forward
+[33m916d435[m HEAD@{84}: reset: moving to HEAD
+[33m916d435[m HEAD@{85}: commit: full activity
+[33mc1b7676[m HEAD@{86}: merge origin/master: Fast-forward
+[33m7f1bb22[m HEAD@{87}: merge origin/master: Fast-forward
+[33m1374b5a[m HEAD@{88}: reset: moving to HEAD
+[33m1374b5a[m HEAD@{89}: commit: full activity
+[33md5ad152[m HEAD@{90}: merge origin/master: Fast-forward
+[33mbb9dd46[m HEAD@{91}: commit: full activity
+[33mc06b69a[m HEAD@{92}: commit: full activity
+[33m472551b[m HEAD@{93}: merge origin/master: Fast-forward
+[33mf24368a[m HEAD@{94}: reset: moving to HEAD
+[33mf24368a[m HEAD@{95}: commit: update bonus
+[33m644fb90[m HEAD@{96}: commit: update dpo
+[33md7101e7[m HEAD@{97}: merge origin/master: Fast-forward
+[33m5101fc5[m HEAD@{98}: reset: moving to HEAD
+[33m5101fc5[m HEAD@{99}: merge origin/master: Fast-forward
+[33mb286ac3[m HEAD@{100}: clone: from http://code.diaosaas.com/Whispa/afrishop-refactored-project.git
--- a/src/main/java/com/example/afrishop_v3/AfrishopV3Application.java
+++ b/src/main/java/com/example/afrishop_v3/AfrishopV3Application.java
@@ -23,8 +23,6 @@ public class AfrishopV3Application {
                " \\__,_|_| |_|  |_|___/_| |_|\\___/| .__/ \n" +
                "                                 |_|\n");
        logger.info("afrishop项目启动成功!");
-        System.out.println("feature_1.0");
-        System.out.println("feature_2.0");
    }