| Server IP : 39.108.156.168 / Your IP : 216.73.216.104 Web Server : nginx/1.24.0 System : Linux e2.ksyuki.com 6.11.0-25-generic #25~24.04.1-Ubuntu SMP PREEMPT_DYNAMIC Tue Apr 15 17:20:50 UTC 2 x86_64 User : root ( 0) PHP Version : 8.3.6 Disable Function : NONE MySQL : OFF | cURL : OFF | WGET : ON | Perl : ON | Python : OFF | Sudo : ON | Pkexec : ON Directory : /git/repo/hwg.git/ |
Upload File : |
[33mcommit 6e9f0fb42f238c9254909307b637419800deca15[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 12 18:03:51 2019 +0800
修改了登录页自动跳转
[33mcommit dc5518a300de557230abee5d78605d9dcd12a6f9[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 12 17:36:05 2019 +0800
UserInfo切换SessionInfo成功
[33mcommit f7c8cb496286224878429cbd352a032278ba8423[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 12 16:52:39 2019 +0800
重定向UserInfo完成
[33mcommit dad5baa27394723862a37ddfb6ae1779bcaa483a[m
Merge: be6380a af82c60
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 12 16:23:07 2019 +0800
Merge remote-tracking branch 'origin/chong'
[33mcommit be6380ac6e54dc646e2ceba3dc91e256f32c5ab7[m
Merge: 471099b 5a75578
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 12 16:22:56 2019 +0800
Merge remote-tracking branch 'origin/bw-1.0'
[33mcommit 471099b699aac305950a46eb2f67c2b6155e26a7[m
Merge: 909d9c7 b169ee9
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 12 16:22:49 2019 +0800
Merge remote-tracking branch 'origin/hui-1.0'
[33mcommit af82c60d8d0965cab79ef2925a351d52e483a3b1[m
Author: shencong <173850470@qq.com>
Date: Fri Jul 12 15:49:48 2019 +0800
修改跨站登陆js
[33mcommit 909d9c7a8d3456522285847eab6b04d1718b564c[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 12 15:48:05 2019 +0800
新增了方便的用户登录信息判断
[33mcommit 71e0e8ae241df91f66b47bd6ddec90b7c0ca175e[m
Merge: d1cd622 5a75578
Author: shencong <173850470@qq.com>
Date: Fri Jul 12 14:44:50 2019 +0800
Merge remote-tracking branch 'remotes/origin/bw-1.0' into chong
[33mcommit 5a7557871fe62e584f1e3a014a8c2d8e6d95b1d8[m
Author: Biwu Shi <biwushi@qq.com>
Date: Fri Jul 12 14:43:41 2019 +0800
移除app的后台管理
[33mcommit d1cd6229dac01bf059c20a9642fe54fa8b14fa86[m
Merge: 2dce3b9 91b99a5
Author: shencong <173850470@qq.com>
Date: Fri Jul 12 13:10:26 2019 +0800
Merge remote-tracking branch 'remotes/origin/bw-1.0' into chong
[33mcommit 91b99a57a07510bf65f5ef40147e04b63a05a4ad[m
Author: Biwu Shi <biwushi@qq.com>
Date: Fri Jul 12 13:07:52 2019 +0800
删除app的后台管理
[33mcommit d9d84b413a896194406402c51770ff8873bebf89[m
Merge: 61c2794 02e5bc4
Author: Biwu Shi <biwushi@qq.com>
Date: Fri Jul 12 12:50:40 2019 +0800
Merge remote-tracking branch 'remotes/origin/chong' into bw-1.0
[33mcommit 2dce3b9c7c7366e8700ec119df4faf799cab4903[m
Merge: 02e5bc4 61c2794
Author: shencong <173850470@qq.com>
Date: Fri Jul 12 11:09:34 2019 +0800
Merge remote-tracking branch 'remotes/origin/bw-1.0' into chong
[33mcommit 02e5bc44d8d438f98365f71c2b0981ee1e085502[m
Author: shencong <173850470@qq.com>
Date: Fri Jul 12 11:08:06 2019 +0800
调整pc商品列表
[33mcommit 61c27947ea6d09fac133218509e5532fe700755a[m
Author: Biwu Shi <biwushi@qq.com>
Date: Fri Jul 12 11:08:00 2019 +0800
更新项目
[33mcommit 630801c3fbadd2641066192ebeedad0000f6dcd5[m
Merge: 5ed3a95 2b32c0a
Author: Biwu Shi <biwushi@qq.com>
Date: Thu Jul 11 18:06:14 2019 +0800
更新文件
[33mcommit 5ed3a95afcba436f7acb12362d74fd07743a7060[m
Author: Biwu Shi <biwushi@qq.com>
Date: Thu Jul 11 17:10:13 2019 +0800
。
[33mcommit 1853ced780c48996326f5cb90b3b2d0701f33691[m
Author: Biwu Shi <biwushi@qq.com>
Date: Thu Jul 11 17:08:14 2019 +0800
增加app登录模块
[33mcommit 2b32c0ac18a4e9bc4913f6f4cb1f886307e77f3c[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Thu Jul 11 17:06:53 2019 +0800
合并
[33mcommit 6ffa36ec0acf60ba4d31d97c60d6892af225167c[m
Author: shencong <173850470@qq.com>
Date: Thu Jul 11 17:05:33 2019 +0800
pc商品列表修改与制作
[33mcommit d1b05233aad6b55f7e250231030f2261b82c8d04[m
Merge: 5a1153f b169ee9
Author: shencong <173850470@qq.com>
Date: Wed Jul 10 17:39:05 2019 +0800
Merge branch 'hui-1.0' of ac.pgxyy.com:/git/repo/hwg into chong
[33mcommit 5a1153f45595faf9462867a4d8ddafcce35ccdeb[m
Merge: 4a5d4c8 05d720f
Author: shencong <173850470@qq.com>
Date: Wed Jul 10 17:37:14 2019 +0800
Merge branch 'master' of ac.pgxyy.com:/git/repo/hwg into chong
[33mcommit 4a5d4c83ea50998613800d5d356f342079a39f76[m
Merge: ba91bf7 acd407a
Author: shencong <173850470@qq.com>
Date: Wed Jul 10 17:36:51 2019 +0800
gengxin
[33mcommit ba91bf799d2b761cc6449f94e47769a796049717[m
Merge: ba6f460 9e95fe4
Author: shencong <173850470@qq.com>
Date: Wed Jul 10 17:31:18 2019 +0800
..
[33mcommit b169ee9814a898f4d2d11456e906d343e59ad48d[m
Author: Charles <624885175@qq.com>
Date: Wed Jul 10 17:26:09 2019 +0800
gengxin
[33mcommit ba6f46021978466d668e1b23bbb279f9957d9ffc[m
Author: shencong <173850470@qq.com>
Date: Wed Jul 10 17:24:24 2019 +0800
pc商品列表的制作
[33mcommit 99e34786c6f4fcc4f9e09bf3b6265293ca15a433[m
Merge: b128c29 9e95fe4
Author: Charles <624885175@qq.com>
Date: Wed Jul 10 16:50:05 2019 +0800
Merge branch 'wu-1.0' of ac.pgxyy.com:/git/repo/hwg into hui-1.0
[33mcommit b128c2937a3ec301bdc8b76b52c607fd2c69bee2[m
Merge: 0f621ae 05d720f
Author: Charles <624885175@qq.com>
Date: Wed Jul 10 16:49:48 2019 +0800
Merge branch 'master' of ac.pgxyy.com:/git/repo/hwg into hui-1.0
[33mcommit 0f621ae94e9bd79c1f5d8119e6f43c7c50ea560f[m
Merge: 87fc564 a54696e
Author: Charles <624885175@qq.com>
Date: Wed Jul 10 16:49:36 2019 +0800
Merge branch 'chong' of ac.pgxyy.com:/git/repo/hwg into hui-1.0
[33mcommit 87fc5644e9cbe192761fed202cecbb719d178716[m
Merge: bac0f90 acd407a
Author: Charles <624885175@qq.com>
Date: Wed Jul 10 16:49:08 2019 +0800
Merge branch 'bw-1.0' of ac.pgxyy.com:/git/repo/hwg into hui-1.0
[33mcommit bac0f906b4cf5e6495a78e8983de8bef52f54d28[m
Author: Charles <624885175@qq.com>
Date: Wed Jul 10 16:48:21 2019 +0800
gengxin
[33mcommit 05d720fa245394fe2dcaa773876ac7aa37bbde46[m
Merge: 35715e4 acd407a
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jul 10 10:40:50 2019 +0800
Merge remote-tracking branch 'origin/bw-1.0'
[33mcommit 35715e463a70373ecdf47ec1e918626b8e743b0f[m
Merge: 0b6ea80 7ab55d8
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jul 10 10:40:20 2019 +0800
合并
[33mcommit 0b6ea80286709333892bf8b2fd13a191e962a443[m
Merge: b4c4dc1 a54696e
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jul 10 10:38:56 2019 +0800
Merge remote-tracking branch 'origin/chong'
[33mcommit b4c4dc1bc925196a1942247c2c8e3c3d2295a0d6[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jul 10 09:13:44 2019 +0800
更换了域名
[33mcommit a54696ec2d74115233024157ef85566b96f0b1e4[m
Author: shencong <173850470@qq.com>
Date: Tue Jul 9 17:44:08 2019 +0800
添加管理中心
[33mcommit acd407a5a96428dd208d3d1e986b5a9c1c13724e[m
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 17:43:23 2019 +0800
修复后台
[33mcommit 417e135f61727d6c4d71e6eac9d8322b80551041[m
Merge: ca3f7c0 36c264c
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 17:30:39 2019 +0800
Merge remote-tracking branch 'remotes/origin/master' into bw-1.0
[33mcommit ca3f7c091298a1aaa7f87aa2a4d97be7aa786737[m
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 17:29:27 2019 +0800
总后台资源分离
[33mcommit 36c264c7d1c5d134aa254d112fc18ed51218e030[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Tue Jul 9 17:28:40 2019 +0800
可以查看原来的后台菜单
[33mcommit 9e95fe4a8091196d7c1e8c0842ad4abe4c00711f[m
Author: wu <395883856@qq.com>
Date: Tue Jul 9 17:27:19 2019 +0800
我的资料修改
[33mcommit ae1c2b36288f76eb1aaebb7cad9e0830ac389ba3[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Tue Jul 9 17:24:24 2019 +0800
移除了部分LocalStorage
[33mcommit c9a20bf2a19f27fde93f5b02ee0c69af49e05a21[m
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 17:17:02 2019 +0800
总后台资源分离
[33mcommit b2e5d7d5b03e1d2a0c5365ebc21bd56e5670b5ca[m
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 16:57:25 2019 +0800
总后台资源分离
[33mcommit 8eb9fb3c2624b18bc89bfedd7fadb7da1b487531[m
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 16:42:55 2019 +0800
总后台资源分离
[33mcommit c34fd9f7fed460d58e948e43b30517b0d3845082[m
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 16:34:37 2019 +0800
建立PC管理后台页面
[33mcommit d99644c2fe0a064d44ca40111eba8c0c6b831d45[m
Merge: 07dbd17 d0626bd
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 16:30:14 2019 +0800
Merge remote-tracking branch 'remotes/origin/wu-1.0' into bw-1.0
[33mcommit 07dbd17d45a5721d4f58969e4f8e911a7b64ed79[m
Merge: 502e14c 7ab55d8
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 16:29:50 2019 +0800
Merge remote-tracking branch 'remotes/origin/hui-1.0' into bw-1.0
[33mcommit 502e14c1df3527dffaab0ee294bb06eda3ba77d6[m
Merge: b2739f8 a9c5382
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 16:29:05 2019 +0800
更新login
[33mcommit a9c538299f0ca7464193528b7a6e27a7e1b964eb[m
Author: shencong <173850470@qq.com>
Date: Tue Jul 9 16:06:51 2019 +0800
会员中心
[33mcommit 7ab55d8e73f78509c36d878b62f7b8ebd1e6e8e7[m
Author: Charles <624885175@qq.com>
Date: Tue Jul 9 15:27:58 2019 +0800
gengxin
[33mcommit d0626bd6df56e3bf6bd1c8a203cebc7b3e0dc0dc[m
Author: wu <395883856@qq.com>
Date: Tue Jul 9 15:27:04 2019 +0800
我的资料修改(PC)
[33mcommit aa4bf82ed7c8a1b56e90514dba34510c94973f41[m
Author: Charles <624885175@qq.com>
Date: Tue Jul 9 15:19:12 2019 +0800
gengxin
[33mcommit 6106103266fd1a4af8400662e7776919c6dfaf0c[m
Merge: 3c35169 81f3e74
Author: shencong <173850470@qq.com>
Date: Tue Jul 9 14:58:58 2019 +0800
Merge remote-tracking branch 'remotes/origin/master' into chong
# Conflicts:
# Auth_Server/login.html
[33mcommit 99a77163be85a87b6ce2049c1a73d97aed43098d[m
Merge: 37a4d37 6d386d1
Author: Charles <624885175@qq.com>
Date: Tue Jul 9 13:06:13 2019 +0800
gengxin
[33mcommit 37a4d3744affff20348a27da304957014160d522[m
Merge: 73646ad 478f0b0
Author: Charles <624885175@qq.com>
Date: Tue Jul 9 12:39:55 2019 +0800
gengxin
[33mcommit b2739f84656ab2a67bc6b0d6516cdad521a47c43[m
Merge: edc08f8 478f0b0
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 12:07:21 2019 +0800
Merge remote-tracking branch 'remotes/origin/master' into bw-1.0
[33mcommit 73646ad0c0e16c16b030cb258789d1cd3d43b583[m
Merge: ca7a9d2 3c35169
Author: Charles <624885175@qq.com>
Date: Tue Jul 9 12:02:33 2019 +0800
gengxin
[33mcommit edc08f87002ca63a4ce605211cb853f68fd273b3[m
Merge: 3c35169 5aec94c
Author: Biwu Shi <biwushi@qq.com>
Date: Tue Jul 9 12:01:16 2019 +0800
合并
[33mcommit ca7a9d216cc883bd848d7656eea5dab8438b848b[m
Merge: b47a71f eccc3fc
Author: Charles <624885175@qq.com>
Date: Tue Jul 9 11:58:44 2019 +0800
gengxin
[33mcommit b47a71f0386e36116fea9c18a3744fa5929b21d8[m
Author: Charles <624885175@qq.com>
Date: Tue Jul 9 11:45:44 2019 +0800
gengxin
[33mcommit 478f0b0128edfa069ae1638ccf55b2a60c94bc4b[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Tue Jul 9 11:33:17 2019 +0800
新增登录信息获取Demo
[33mcommit 1370695d4c2587752af23238857316c25ea305f9[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Tue Jul 9 10:38:27 2019 +0800
修复了注册时无法同步数据的Bug
[33mcommit 6d386d168fc64d2e11c537304034f16e5ada096a[m
Author: wu <395883856@qq.com>
Date: Tue Jul 9 09:51:49 2019 +0800
浏览记录,我的收藏修改
[33mcommit 5aec94c04614c4d578a000c64191f27960e6adf4[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Tue Jul 9 09:22:06 2019 +0800
登录Cors限制
[33mcommit 2bd216d1890630ffeb9d3838d2fce658bccdca84[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Tue Jul 9 09:15:29 2019 +0800
修复了登录随机数SessionID
[33mcommit 81d4af5cc60c9a3aea8f7a9efb68523ccfe62665[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Mon Jul 8 18:37:04 2019 +0800
更新依赖,新增Session,移除Token
[33mcommit 12c6d0027d4123655f54ef989b91437d04f98b75[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Mon Jul 8 17:21:30 2019 +0800
新增了负载均衡测试脚本
[33mcommit 3c3516991b050d7ec67cf435ab002686e2794b14[m
Author: shencong <173850470@qq.com>
Date: Mon Jul 8 09:35:17 2019 +0800
修改pc中心
[33mcommit 02151abe627aa84c820b2e28e77e71c927eccd3c[m
Author: shencong <173850470@qq.com>
Date: Sun Jul 7 15:12:08 2019 +0800
修改
[33mcommit 1763be530cbbad714121a9c4af383b29cdd5824e[m
Author: shencong <173850470@qq.com>
Date: Sun Jul 7 15:00:22 2019 +0800
调整pc会员中心
[33mcommit 81f3e74fa61fd78930c741ce60342099d5bef527[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Sun Jul 7 09:42:27 2019 +0800
修复了登录
[33mcommit f0944d338d80e90850147184d49cf2fef6d0efed[m
Merge: eccc3fc 7559f09
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Sun Jul 7 09:09:28 2019 +0800
代码合并
[33mcommit 1f3c9d9b7d33783080b108f40511d95bd20e1246[m
Merge: b7f9386 7559f09
Author: shencong <173850470@qq.com>
Date: Sat Jul 6 20:15:40 2019 +0800
Merge remote-tracking branch 'remotes/origin/hui-1.0' into chong
# Conflicts:
# Auth_Server/login.html
[33mcommit b7f9386e9af47f9638b080d2540af32125c661c9[m
Merge: 24b1feb eccc3fc
Author: shencong <173850470@qq.com>
Date: Sat Jul 6 15:11:08 2019 +0800
Merge remote-tracking branch 'remotes/origin/bw-1.0' into chong
[33mcommit 7559f091cba6432c947482dfab5a1c3d772a95ee[m
Author: Charles <624885175@qq.com>
Date: Fri Jul 5 18:13:24 2019 +0800
gengxin
[33mcommit 24b1feb54c384be6f463098974af1dc6da86bd8d[m
Author: shencong <173850470@qq.com>
Date: Fri Jul 5 17:35:04 2019 +0800
新建收获地址
[33mcommit eccc3fcf8599a588a8111557389a3e094e06dda5[m
Merge: 5365d5d f0bc6cd
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 5 15:49:33 2019 +0800
Merge remote-tracking branch 'origin/master'
[33mcommit 5365d5de33e22bd99ab0454b3af4e9120d7258d4[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jul 5 15:48:21 2019 +0800
新增跨域Ajax智能判断
[33mcommit f0bc6cd8f86591c8bf9a37471b4d2033300f4324[m
Author: Biwu Shi <biwushi@qq.com>
Date: Fri Jul 5 15:39:39 2019 +0800
总后台资源分离
[33mcommit ca74dbf883534ad56888d1373bdb08c06382e7ac[m
Author: Biwu Shi <biwushi@qq.com>
Date: Fri Jul 5 15:36:31 2019 +0800
PC总后台管理添加页面
[33mcommit 39ca6d4f86e41f3134e108a0725e774602a2179d[m
Author: Biwu Shi <biwushi@qq.com>
Date: Fri Jul 5 15:18:34 2019 +0800
增加PC商户中心页面
[33mcommit 10ec69881d20c74d32ae832ca98b4a1e9228b083[m
Author: Biwu Shi <biwushi@qq.com>
Date: Fri Jul 5 11:29:56 2019 +0800
PC店铺相关页面路径
[33mcommit 64dd4a2900987b3c1e1dbf782440277c7a3288ee[m
Author: shencong <173850470@qq.com>
Date: Fri Jul 5 09:51:04 2019 +0800
新增个人中心收货地址
[33mcommit 84e3fa5704ebc2a999e49e96ec453ae87c04056a[m
Author: shencong <173850470@qq.com>
Date: Thu Jul 4 17:37:14 2019 +0800
完善会员中心
[33mcommit ef8000472162d1d54fc0daa93ccb37b73927a8b0[m
Author: shencong <173850470@qq.com>
Date: Thu Jul 4 17:03:13 2019 +0800
增加pc会员中心
[33mcommit b5aa7d405bcb796e84202815a2fdc8fdb4d83701[m
Author: shencong <173850470@qq.com>
Date: Wed Jul 3 17:39:02 2019 +0800
修改app会员中心
[33mcommit 1828bd3b4dc7bb3f098f7e030013ecade8b7af6a[m
Merge: 25a5193 9797640
Author: shencong <173850470@qq.com>
Date: Wed Jul 3 17:16:32 2019 +0800
Merge remote-tracking branch 'remotes/origin/master' into chong
[33mcommit 25a519340758bb013db368916203e46cd24bbea9[m
Merge: 60105ff b1cefb9
Author: shencong <173850470@qq.com>
Date: Wed Jul 3 17:16:12 2019 +0800
Merge remote-tracking branch 'remotes/origin/hui-1.0' into chong
[33mcommit 60105ff8bba8ce27d6218e237378e7c0fab84de8[m
Author: shencong <173850470@qq.com>
Date: Wed Jul 3 17:15:29 2019 +0800
读写分离的修改
[33mcommit 9797640e45a370baa1f52bac08f84980895f4b0d[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jul 3 16:40:30 2019 +0800
建立了项目相关的目录结构
[33mcommit 18cc73601a2ab895db1d2ebfa07be7ff5971ded8[m
Merge: 6b2660e 603a27c
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jul 3 10:40:29 2019 +0800
合并chong
[33mcommit 6b2660e721c0c67eb50a0690790957526dcbddf6[m
Merge: c0f716f b1cefb9
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jul 3 10:39:40 2019 +0800
合并hui
[33mcommit d2a43ca478f43bfabfce87d8d7685fb39bc27267[m
Merge: b1cefb9 603a27c
Author: Charles <624885175@qq.com>
Date: Wed Jul 3 10:37:03 2019 +0800
Merge branch 'chong' of ac.pgxyy.com:/git/repo/hwg into hui-1.0
[33mcommit 603a27c19a0e958f2180aedb7152483d421b1bd4[m
Author: shencong <173850470@qq.com>
Date: Wed Jul 3 10:30:02 2019 +0800
首页样式
[33mcommit b1cefb9461260ce4c6d6a0c8592fe13d0d842ecf[m
Author: Charles <624885175@qq.com>
Date: Wed Jul 3 10:24:55 2019 +0800
gengxin
[33mcommit c0f716f4441f22d5ea313f04c586664b35edd898[m
Merge: 611f707 43a6591
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Mon Jul 1 16:58:17 2019 +0800
Merge remote-tracking branch 'origin/hui-1.0'
[33mcommit 035d0d6bb89c92e6f77950e34d890cce87f39dde[m
Merge: 7887e5e 611f707
Author: shencong <173850470@qq.com>
Date: Mon Jul 1 14:46:45 2019 +0800
Merge remote-tracking branch 'remotes/origin/master' into chong
# Conflicts:
# Api_Site/Api_Site.csproj
[33mcommit 611f707b684a69027138befac1f37d27a4e9bcc1[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Mon Jul 1 14:34:11 2019 +0800
完成了新的注册登录逻辑
[33mcommit 7887e5eb7d109f1149bf3a9c8ae3dd7f1daa26c6[m
Author: shencong <173850470@qq.com>
Date: Mon Jul 1 08:56:44 2019 +0800
修改读写分离
[33mcommit c72fc3d3c4ef6ae97919470248b8a64a37f8c026[m
Merge: ac33bf2 43a6591
Author: shencong <173850470@qq.com>
Date: Thu Jun 27 17:33:48 2019 +0800
Merge branch 'hui-1.0' of ac.pgxyy.com:/git/repo/hwg into chong
[33mcommit 43a6591d01979afa5cefeaecd6695158be9e0f89[m
Author: Charles <624885175@qq.com>
Date: Thu Jun 27 17:29:58 2019 +0800
gengxin
[33mcommit ac33bf2b223a6fa98ad63de3d7c09878e9fb0331[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Thu Jun 27 15:05:21 2019 +0800
新增了短信单元测试
[33mcommit d55c578759d4f522ab9191ab9667d1c04b42f14f[m
Merge: 4d9b804 9d5b769
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Thu Jun 27 15:05:04 2019 +0800
合并
[33mcommit 9d5b769a37c6607a841d38a7448041eac870ade5[m
Author: Charles <624885175@qq.com>
Date: Thu Jun 27 11:09:08 2019 +0800
gengxin
[33mcommit 4d9b8040d8214480b845e231dffd54070d34d5ad[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Sat Jun 22 17:51:08 2019 +0800
注册页加入了初步的样式
[33mcommit 714b9996dfb422d10bb4be14040870390130db8c[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Sat Jun 22 16:57:42 2019 +0800
新增了空白的注册页样式
[33mcommit e7753d62189f7fa851c27c0bd5023e8923f938c5[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Sat Jun 22 16:50:10 2019 +0800
新增了空白注册页
[33mcommit da62510c21ab5cc51036f2a5f4f2bd2bfe3d0f61[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jun 19 17:29:36 2019 +0800
登录成功
[33mcommit 095d7b3be06753976314771b3a94b799f408d953[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jun 19 16:52:38 2019 +0800
新增了登录页
[33mcommit 5bb58b1ced90b84e10f3e3b0c6f2a94f6eb05b10[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Wed Jun 19 11:37:42 2019 +0800
添加了一些共享资源
[33mcommit 0cae3a5c2f128a967f4329f650e272b9cdf1e27e[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Fri Jun 14 10:12:49 2019 +0800
复制了原始项目
[33mcommit 02181d50453067418de9ef2f1de17945c05d1b86[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Thu Jun 13 17:08:51 2019 +0800
更新了项目
[33mcommit 5707b928d1a904479576127a6095ecfd1ffb6b24[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Thu Jun 13 16:48:40 2019 +0800
初始化代码
[33mcommit c1a91a35455a27ff83885505b740c2e2070dfb82[m
Author: Yuki Takeya <yuki@gakkougurashi.net>
Date: Thu Jun 13 16:48:02 2019 +0800
初始化仓库