Cloud of li by Cloud-Of-Li · Pull Request #3 · luyongbiao/Shop

Cloud-Of-Li · 2017-05-25T15:44:12Z

No description provided.

commit 4a871ba Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf7 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f6253 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed01 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb69 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a2 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d974 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75 Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 7528275 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543fe Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # .settings/org.skyway.core.prefs # .tern-project # WebRoot/WEB-INF/lib/javax.servlet.jsp.jstl-1.2.1.jar # WebRoot/WEB-INF/web.xml # WebRoot/css/index.css # WebRoot/css/login.css # WebRoot/css/register.css # WebRoot/good.html # WebRoot/goods.jsp # WebRoot/image/fruit/kiwi.jpg # WebRoot/image/fruit/lemon.jpg # WebRoot/image/fruit/mango.jpg # WebRoot/image/fruit/orange.jpg # WebRoot/image/fruit/pear.jpg # WebRoot/image/meat/sirloin.jpg # WebRoot/image/meat/steak.jpg # WebRoot/index.html # WebRoot/js/index.js # WebRoot/login.html # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java

…loudOfLi

commit c0d152c Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:44:05 2017 +0800 解决冲突 commit 2d6054f Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:34:28 2017 +0800 Squashed commit of the following: commit d2d02f6 Author: Eric5959 <593964613@qq.com> Date: Fri Jun 2 13:11:23 2017 +0800 version3.7 # Conflicts: # WebRoot/css/good.css # WebRoot/goods.jsp # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/IndexServlet.java commit 5de903f Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:14:17 2017 +0800 fddjdjn commit 2bd768a Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:41:26 2017 +0800 更新数据库文件 commit 06c3826 Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:40:02 2017 +0800 地址功能初步实现 commit bdcd2a8 Merge: 1df8b5c 9a6d79a Author: luyongbiao <1565442611@qq.com> Date: Sun May 28 16:41:03 2017 +0800 注册功能实现 commit 1df8b5c Author: luyongbiao <1565442611@qq.com> Date: Sat May 27 03:09:24 2017 +0800 分页功能，页面链接补齐 commit 4a871ba Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf7 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f6253 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed01 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb69 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a2 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d974 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75 Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 7528275 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543fe Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # WebRoot/WEB-INF/classes/.gitignore # WebRoot/cart.jsp # WebRoot/css/address.css # WebRoot/css/comfirm_order.css # WebRoot/css/good.css # WebRoot/css/orders.css # WebRoot/css/ordersDetail.css # WebRoot/css/register.css # WebRoot/goods.jsp # WebRoot/index.jsp # WebRoot/js/cart.js # WebRoot/js/goods.js # WebRoot/js/index.js # WebRoot/js/register.js # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java # src/org/bqj/shopping/servlet/IndexServlet.java # test/org/bqj/shopping/dao/impl/BaseDAOTest.java

commit a711e0a Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:59:09 2017 +0800 新 commit 500d813 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:37:25 2017 +0800 Squashed commit of the following: commit c0d152c Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:44:05 2017 +0800 解决冲突 commit 2d6054f Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:34:28 2017 +0800 Squashed commit of the following: commit d2d02f6 Author: Eric5959 <593964613@qq.com> Date: Fri Jun 2 13:11:23 2017 +0800 version3.7 # Conflicts: # WebRoot/css/good.css # WebRoot/goods.jsp # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/IndexServlet.java commit 5de903f Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:14:17 2017 +0800 fddjdjn commit 2bd768a Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:41:26 2017 +0800 更新数据库文件 commit 06c3826 Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:40:02 2017 +0800 地址功能初步实现 commit bdcd2a8 Merge: 1df8b5c 9a6d79a Author: luyongbiao <1565442611@qq.com> Date: Sun May 28 16:41:03 2017 +0800 注册功能实现 commit 1df8b5c Author: luyongbiao <1565442611@qq.com> Date: Sat May 27 03:09:24 2017 +0800 分页功能，页面链接补齐 commit 4a871ba Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf7 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f6253 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed01 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb69 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a2 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d974 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75 Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 7528275 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543fe Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # WebRoot/WEB-INF/classes/.gitignore # WebRoot/cart.jsp # WebRoot/css/address.css # WebRoot/css/comfirm_order.css # WebRoot/css/good.css # WebRoot/css/orders.css # WebRoot/css/ordersDetail.css # WebRoot/css/register.css # WebRoot/goods.jsp # WebRoot/index.jsp # WebRoot/js/cart.js # WebRoot/js/goods.js # WebRoot/js/index.js # WebRoot/js/register.js # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java # src/org/bqj/shopping/servlet/IndexServlet.java # test/org/bqj/shopping/dao/impl/BaseDAOTest.java commit 86e885c Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:28:24 2017 +0800 搜索 commit 24a281a Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:22:54 2017 +0800 111 commit abe6eb7 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:42:32 2017 +0800 删除Shopping文件夹 commit 006e481 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:35:29 2017 +0800 222 commit 3bc6a87 Merge: 6d39956 7c80385 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:31:37 2017 +0800 Merge branch 'CloudOfLi' of https://github.com/luyongbiao/Shop into CloudOfLi commit 6d39956 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:23:06 2017 +0800 改了Orders commit 7c80385 Author: Cloud <1224479869@qq.com> Date: Thu May 25 14:58:06 2017 +0800 Create 仓库分支说明 commit fa59f72 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:55:00 2017 +0800 添加了register.html的动态数据检查样式（一部分） commit 4ce058f Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:09:38 2017 +0800 222 commit b197539 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:00:03 2017 +0800 更名字Myshopping为Shopping commit f871f69 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:54:39 2017 +0800 333 commit 55db5bd Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:47:56 2017 +0800 333 commit 9491333 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:34:09 2017 +0800 修改为5-24之前最新版的系统 commit f73cf40 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:28:45 2017 +0800 增加了一行注释 commit e239b56 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:21:55 2017 +0800 测试 commit fb678e9 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:18:30 2017 +0800 5-25 commit 0f5614d Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:39:16 2017 +0800 在GoodServlet中增加了一个空行进行github的测试 commit e9cf3cc Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:26:40 2017 +0800 5-24 commit fbc0c09 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 01:16:39 2017 +0800 Squashed commit of the following: commit 4a871ba Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf7 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f6253 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed01 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb69 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a2 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d974 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75 Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 7528275 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543fe Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # .settings/org.skyway.core.prefs # .tern-project # WebRoot/WEB-INF/lib/javax.servlet.jsp.jstl-1.2.1.jar # WebRoot/WEB-INF/web.xml # WebRoot/css/index.css # WebRoot/css/login.css # WebRoot/css/register.css # WebRoot/good.html # WebRoot/goods.jsp # WebRoot/image/fruit/kiwi.jpg # WebRoot/image/fruit/lemon.jpg # WebRoot/image/fruit/mango.jpg # WebRoot/image/fruit/orange.jpg # WebRoot/image/fruit/pear.jpg # WebRoot/image/meat/sirloin.jpg # WebRoot/image/meat/steak.jpg # WebRoot/index.html # WebRoot/js/index.js # WebRoot/login.html # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java commit dccc177 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 19 22:23:54 2017 +0800 5-19 commit 4d72886 Merge: 27aaa87 58791a7 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 19 21:26:31 2017 +0800 Merge remote-tracking branch 'refs/remotes/origin/master' into CloudOfLi commit 58791a7 Merge: 90d264e 0738e09 Author: Eric5959 <593964613@qq.com> Date: Wed May 17 23:50:48 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' commit 90d264e Author: Eric5959 <593964613@qq.com> Date: Wed May 17 23:49:01 2017 +0800 3.3 # Conflicts: # .classpath # WebRoot/cart.jsp # WebRoot/css/comfirm_order.css # WebRoot/css/orders.css # WebRoot/css/ordersDetail.css # WebRoot/js/cart.js # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/servlet/AddGoodsServlet.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CommoditySaveServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java

commit 472a9c871d21c9e1455ba3450481f510bb4029f9 Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 16:04:34 2017 +0800 Squashed commit of the following: commit a711e0aa7bf4380bff65f4ec4817d51649ce8847 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:59:09 2017 +0800 新 commit 500d8131a3f96e37e4324bb03c30b49a7608a022 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:37:25 2017 +0800 Squashed commit of the following: commit c0d152c28e2cb4dcba4338c183954f18ce2b4de4 Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:44:05 2017 +0800 解决冲突 commit 2d6054f573257d1f4eca86ad8940201927ba4774 Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:34:28 2017 +0800 Squashed commit of the following: commit d2d02f6647c009ba1531c93766fd015f7f7044a7 Author: Eric5959 <593964613@qq.com> Date: Fri Jun 2 13:11:23 2017 +0800 version3.7 # Conflicts: # WebRoot/css/good.css # WebRoot/goods.jsp # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/IndexServlet.java commit 5de903f055f118fd99fce3f4a0c6e9065c8aba5e Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:14:17 2017 +0800 fddjdjn commit 2bd768a8b4dff4e0fd085622a8094c7a6e4f1bb7 Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:41:26 2017 +0800 更新数据库文件 commit 06c38261ad00daebdd8bae09991cb11dad06e49d Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:40:02 2017 +0800 地址功能初步实现 commit bdcd2a853f2b74a745df836a62a8b945ad7e2fab Merge: 1df8b5c 9a6d79a Author: luyongbiao <1565442611@qq.com> Date: Sun May 28 16:41:03 2017 +0800 注册功能实现 commit 1df8b5ccafc16ab98c8650dd3ff9611a1ffe21fa Author: luyongbiao <1565442611@qq.com> Date: Sat May 27 03:09:24 2017 +0800 分页功能，页面链接补齐 commit 4a871badfe8bc0e3d646eba87c471f109405e5ca Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79af7eac872503e74b243f950455d62ad1e9 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83c090df8b840c3efcbd57691d7c48f29b0 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f17226f56b709e922239f3a484c2af1fce3 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16ea1a1ae89a83378013854cb51752a29c33 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit 9a6d79af7eac872503e74b243f950455d62ad1e9 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83c090df8b840c3efcbd57691d7c48f29b0 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f17226f56b709e922239f3a484c2af1fce3 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16ea1a1ae89a83378013854cb51752a29c33 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf70760df4cd6cca5aec8041caae347d9a74 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f62534b332035d36b310de10399bb75a2ea42d Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed0172a592c8ee332122709be92468c391ce9 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb6943a0100721d5f15cb5eb5cf26f37a6a58 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86f8dc7399dbe201eff4486e665f29cdd4d Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a22a8b0661a1893af0df7cc253b254bc663 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121539432c95aa604c59c8f4dd287881cd09 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8cba4d0e001b3512787b9665667735863c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030cf17d0f1625b9ce0046c322547a34ad957 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb5a2fa7e130df90ef1459dc9f6f72cf86c Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb667e6689b6ffd9ce3b827c24a1ccf55ff00 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3b0219057d0ae8cb893b6370ab0f18cc7b Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170576759ab08582a8582cca27fcfb53a601 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1c8e19f6e63f07893fb2fce608f9d365a6 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565e177a932000520b1c24b855e5e989bef9 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c568630c99d2db6bc5d61f38091589d0777 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d9742a11d20cdbaf797d9596f9fef413cb805 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75ec3bfe708060315efed0189fbcd9439fc Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe06275e6777ffb43dd4f5711ddab8d2ebbd Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5f73f672aa325cc6eb8b6a043df0a7f3fa Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 752827538a2ec5d17d079cd6241bffff8cef02e7 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732bb10d6400488b36bef0c4b9ea77217ffb Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543feabeb80b1f6bf75e0967236046a3e19b5e Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a01ca0bec321e79e7d9409fb1351ab5681c Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d3beceded2c4ff353f17add6a9c4dd81df Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d351363b9e99eb387bb6a7c0503439df61f33a4 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1ebc7907751f0fdb40bd34d04939adcf46 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad22017d8936162b9868ab78bd4c94fdb74e Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff05f4c5da0a293d96168521bfc0f6dd770 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # WebRoot/WEB-INF/classes/.gitignore # WebRoot/cart.jsp # WebRoot/css/address.css # WebRoot/css/comfirm_order.css # WebRoot/css/good.css # WebRoot/css/orders.css # WebRoot/css/ordersDetail.css # WebRoot/css/register.css # WebRoot/goods.jsp # WebRoot/index.jsp # WebRoot/js/cart.js # WebRoot/js/goods.js # WebRoot/js/index.js # WebRoot/js/register.js # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java # src/org/bqj/shopping/servlet/IndexServlet.java # test/org/bqj/shopping/dao/impl/BaseDAOTest.java commit 86e885ca9754eb218cae29a2afa57ada9e04944a Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:28:24 2017 +0800 搜索 commit 24a281ac64169dc4d54806ba9d5d933c73fe1a1d Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:22:54 2017 +0800 111 commit abe6eb7fda8505fcb09ae15d85d675309907ab92 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:42:32 2017 +0800 删除Shopping文件夹 commit 006e481766b539e58358e8e9f756f51e9af2d2a2 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:35:29 2017 +0800 222 commit 3bc6a871869adacd580bfb32c879204ac79d590c Merge: 6d39956 7c80385 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:31:37 2017 +0800 Merge branch 'CloudOfLi' of https://github.com/luyongbiao/Shop into CloudOfLi commit 6d39956889582eb460d42395ff1531c310c0ca80 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:23:06 2017 +0800 改了Orders commit 7c80385ec17a831c0284aac8646c9779b3936d3b Author: Cloud <1224479869@qq.com> Date: Thu May 25 14:58:06 2017 +0800 Create 仓库分支说明 commit fa59f723cd6ab8fe19bed0f98d8c9f0a473640b6 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:55:00 2017 +0800 添加了register.html的动态数据检查样式（一部分） commit 4ce058fad426d5cfc8b1309c2bd4a64f72a04c06 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:09:38 2017 +0800 222 commit b19753927fd071ac7d943cc9c3ed4510184ef64d Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:00:03 2017 +0800 更名字Myshopping为Shopping commit f871f69fda26d980ab4ab68d5cc10c9c3fa3f3a9 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:54:39 2017 +0800 333 commit 55db5bd93de77e799dca70b622e30f1137de01d4 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:47:56 2017 +0800 333 commit 94913337f17160f53b78c12aafe7f476b04cddd8 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:34:09 2017 +0800 修改为5-24之前最新版的系统 commit f73cf40bbb6ec39d160136c2bba284b11ea9a624 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:28:45 2017 +0800 增加了一行注释 commit e239b561e777af54fadabd9935b4a99abcf01b89 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:21:55 2017 +0800 测试 commit fb678e96e00caf4fd014848a4a212dc37f1c0b7d Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:18:30 2017 +0800 5-25 commit 0f5614d0e650db751aaf1e138fabd935b0bfa849 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:39:16 2017 +0800 在GoodServlet中增加了一个空行进行github的测试 commit e9cf3cc8090fa19581b087f3c4e619ccc5d112f8 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:26:40 2017 +0800 5-24 commit fbc0c09ec93167a22696687ad4f26409f65cdc89 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 01:16:39 2017 +0800 Squashed commit of the following: commit 4a871badfe8bc0e3d646eba87c471f109405e5ca Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79af7eac872503e74b243f950455d62ad1e9 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83c090df8b840c3efcbd57691d7c48f29b0 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f17226f56b709e922239f3a484c2af1fce3 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16ea1a1ae89a83378013854cb51752a29c33 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf70760df4cd6cca5aec8041caae347d9a74 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f62534b332035d36b310de10399bb75a2ea42d Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed0172a592c8ee332122709be92468c391ce9 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb6943a0100721d5f15cb5eb5cf26f37a6a58 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86f8dc7399dbe201eff4486e665f29cdd4d Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a22a8b0661a1893af0df7cc253b254bc663 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121539432c95aa604c59c8f4dd287881cd09 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8cba4d0e001b3512787b9665667735863c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030cf17d0f1625b9ce0046c322547a34ad957 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb5a2fa7e130df90ef1459dc9f6f72cf86c Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb667e6689b6ffd9ce3b827c24a1ccf55ff00 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3b0219057d0ae8cb893b6370ab0f18cc7b Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170576759ab08582a8582cca27fcfb53a601 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1c8e19f6e63f07893fb2fce608f9d365a6 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565e177a932000520b1c24b855e5e989bef9 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c568630c99d2db6bc5d61f38091589d0777 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d9742a11d20cdbaf797d9596f9fef413cb805 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75ec3bfe708060315efed0189fbcd9439fc Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe06275e6777ffb43dd4f5711ddab8d2ebbd Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5f73f672aa325cc6eb8b6a043df0a7f3fa Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 752827538a2ec5d17d079cd6241bffff8cef02e7 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732bb10d6400488b36bef0c4b9ea77217ffb Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543feabeb80b1f6bf75e0967236046a3e19b5e Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a01ca0bec321e79e7d9409fb1351ab5681c Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d3beceded2c4ff353f17add6a9c4dd81df Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d351363b9e99eb387bb6a7c0503439df61f33a4 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1ebc7907751f0fdb40bd34d04939adcf46 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad22017d8936162b9868ab78bd4c94fdb74e Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff05f4c5da0a293d96168521bfc0f6dd770 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # .settings/org.skyway.core.prefs # .tern-project # WebRoot/WEB-INF/lib/javax.servlet.jsp.jstl-1.2.1.jar # WebRoot/WEB-INF/web.xml # WebRoot/css/index.css # WebRoot/css/login.css # WebRoot/css/register.css # WebRoot/good.html # WebRoot/goods.jsp # WebRoot/image/fruit/kiwi.jpg # WebRoot/image/fruit/lemon.jpg # WebRoot/image/fruit/mango.jpg # WebRoot/image/fruit/orange.jpg # WebRoot/image/fruit/pear.jpg # WebRoot/image/meat/sirloin.jpg # WebRoot/image/meat/steak.jpg # WebRoot/index.html # WebRoot/js/index.js # WebRoot/login.html # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java commit dccc1776c4e1cd530753d2730e452018d2bad6c4 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 19 22:23:54 2017 +0800 5-19 commit 4d72886042c8d1ca1d171b7e6289cbb722198f68 Merge: 27aaa87 58791a7 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 19 21:26:31 2017 +0800 Merge remote-tracking branch 'refs/remotes/origin/master' into CloudOfLi commit 58791a73837676c9749a1673b71cfade439371ed Merge: 90d264e 0738e09 Author: Eric5959 <593964613@qq.com> Date: Wed May 17 23:50:48 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' commit 90d264e1dfe76a99353d084e17a84e919fcc2368 Author: Eric5959 <593964613@qq.com> Date: Wed May 17 23:49:01 2017 +0800 3.3 # Conflicts: # .classpath # WebRoot/cart.jsp # WebRoot/css/comfirm_order.css # WebRoot/css/orders.css # WebRoot/css/ordersDetail.css # WebRoot/js/cart.js # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/servlet/AddGoodsServlet.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CommoditySaveServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java commit e3e49470fb4c2c59eff5b485a5bae9d81d783100 Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 16:03:24 2017 +0800 Squashed commit of the following: commit a711e0aa7bf4380bff65f4ec4817d51649ce8847 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:59:09 2017 +0800 新 commit 500d8131a3f96e37e4324bb03c30b49a7608a022 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:37:25 2017 +0800 Squashed commit of the following: commit c0d152c28e2cb4dcba4338c183954f18ce2b4de4 Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:44:05 2017 +0800 解决冲突 commit 2d6054f573257d1f4eca86ad8940201927ba4774 Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:34:28 2017 +0800 Squashed commit of the following: commit d2d02f6647c009ba1531c93766fd015f7f7044a7 Author: Eric5959 <593964613@qq.com> Date: Fri Jun 2 13:11:23 2017 +0800 version3.7 # Conflicts: # WebRoot/css/good.css # WebRoot/goods.jsp # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/IndexServlet.java commit 5de903f055f118fd99fce3f4a0c6e9065c8aba5e Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:14:17 2017 +0800 fddjdjn commit 2bd768a8b4dff4e0fd085622a8094c7a6e4f1bb7 Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:41:26 2017 +0800 更新数据库文件 commit 06c38261ad00daebdd8bae09991cb11dad06e49d Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:40:02 2017 +0800 地址功能初步实现 commit bdcd2a853f2b74a745df836a62a8b945ad7e2fab Merge: 1df8b5c 9a6d79a Author: luyongbiao <1565442611@qq.com> Date: Sun May 28 16:41:03 2017 +0800 注册功能实现 commit 1df8b5ccafc16ab98c8650dd3ff9611a1ffe21fa Author: luyongbiao <1565442611@qq.com> Date: Sat May 27 03:09:24 2017 +0800 分页功能，页面链接补齐 commit 4a871badfe8bc0e3d646eba87c471f109405e5ca Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79af7eac872503e74b243f950455d62ad1e9 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83c090df8b840c3efcbd57691d7c48f29b0 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f17226f56b709e922239f3a484c2af1fce3 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16ea1a1ae89a83378013854cb51752a29c33 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit 9a6d79af7eac872503e74b243f950455d62ad1e9 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83c090df8b840c3efcbd57691d7c48f29b0 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f17226f56b709e922239f3a484c2af1fce3 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16ea1a1ae89a83378013854cb51752a29c33 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf70760df4cd6cca5aec8041caae347d9a74 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f62534b332035d36b310de10399bb75a2ea42d Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed0172a592c8ee332122709be92468c391ce9 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb6943a0100721d5f15cb5eb5cf26f37a6a58 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86f8dc7399dbe201eff4486e665f29cdd4d Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a22a8b0661a1893af0df7cc253b254bc663 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121539432c95aa604c59c8f4dd287881cd09 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8cba4d0e001b3512787b9665667735863c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030cf17d0f1625b9ce0046c322547a34ad957 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb5a2fa7e130df90ef1459dc9f6f72cf86c Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb667e6689b6ffd9ce3b827c24a1ccf55ff00 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3b0219057d0ae8cb893b6370ab0f18cc7b Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170576759ab08582a8582cca27fcfb53a601 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1c8e19f6e63f07893fb2fce608f9d365a6 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565e177a932000520b1c24b855e5e989bef9 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c568630c99d2db6bc5d61f38091589d0777 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d9742a11d20cdbaf797d9596f9fef413cb805 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75ec3bfe708060315efed0189fbcd9439fc Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe06275e6777ffb43dd4f5711ddab8d2ebbd Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5f73f672aa325cc6eb8b6a043df0a7f3fa Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 752827538a2ec5d17d079cd6241bffff8cef02e7 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732bb10d6400488b36bef0c4b9ea77217ffb Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543feabeb80b1f6bf75e0967236046a3e19b5e Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a01ca0bec321e79e7d9409fb1351ab5681c Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d3beceded2c4ff353f17add6a9c4dd81df Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d351363b9e99eb387bb6a7c0503439df61f33a4 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1ebc7907751f0fdb40bd34d04939adcf46 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad22017d8936162b9868ab78bd4c94fdb74e Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff05f4c5da0a293d96168521bfc0f6dd770 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # WebRoot/WEB-INF/classes/.gitignore # WebRoot/cart.jsp # WebRoot/css/address.css # WebRoot/css/comfirm_order.css # WebRoot/css/good.css # WebRoot/css/orders.css # WebRoot/css/ordersDetail.css # WebRoot/css/register.css # WebRoot/goods.jsp # WebRoot/index.jsp # WebRoot/js/cart.js # WebRoot/js/goods.js # WebRoot/js/index.js # WebRoot/js/register.js # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java # src/org/bqj/shopping/servlet/IndexServlet.java # test/org/bqj/shopping/dao/impl/BaseDAOTest.java commit 86e885ca9754eb218cae29a2afa57ada9e04944a Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:28:24 2017 +0800 搜索 commit 24a281ac64169dc4d54806ba9d5d933c73fe1a1d Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:22:54 2017 +0800 111 commit abe6eb7fda8505fcb09ae15d85d675309907ab92 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:42:32 2017 +0800 删除Shopping文件夹 commit 006e481766b539e58358e8e9f756f51e9af2d2a2 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:35:29 2017 +0800 222 commit 3bc6a871869adacd580bfb32c879204ac79d590c Merge: 6d39956 7c80385 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:31:37 2017 +0800 Merge branch 'CloudOfLi' of https://github.com/luyongbiao/Shop into CloudOfLi commit 6d39956889582eb460d42395ff1531c310c0ca80 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:23:06 2017 +0800 改了Orders commit 7c80385ec17a831c0284aac8646c9779b3936d3b Author: Cloud <1224479869@qq.com> Date: Thu May 25 14:58:06 2017 +0800 Create 仓库分支说明 commit fa59f723cd6ab8fe19bed0f98d8c9f0a473640b6 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:55:00 2017 +0800 添加了register.html的动态数据检查样式（一部分） commit 4ce058fad426d5cfc8b1309c2bd4a64f72a04c06 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:09:38 2017 +0800 222 commit b19753927fd071ac7d943cc9c3ed4510184ef64d Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:00:03 2017 +0800 更名字Myshopping为Shopping commit f871f69fda26d980ab4ab68d5cc10c9c3fa3f3a9 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:54:39 2017 +0800 333 commit 55db5bd93de77e799dca70b622e30f1137de01d4 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:47:56 2017 +0800 333 commit 94913337f17160f53b78c12aafe7f476b04cddd8 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:34:09 2017 +0800 修改为5-24之前最新版的系统 commit f73cf40bbb6ec39d160136c2bba284b11ea9a624 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:28:45 2017 +0800 增加了一行注释 commit e239b561e777af54fadabd9935b4a99abcf01b89 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:21:55 2017 +0800 测试 commit fb678e96e00caf4fd014848a4a212dc37f1c0b7d Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:18:30 2017 +0800 5-25 commit 0f5614d0e650db751aaf1e138fabd935b0bfa849 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:39:16 2017 +0800 在GoodServlet中增加了一个空行进行github的测试 commit e9cf3cc8090fa19581b087f3c4e619ccc5d112f8 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:26:40 2017 +0800 5-24 commit fbc0c09ec93167a22696687ad4f26409f65cdc89 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 01:16:39 2017 +0800 Squashed commit of the following: commit 4a871badfe8bc0e3d646eba87c471f109405e5ca Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79af7eac872503e74b243f950455d62ad1e9 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83c090df8b840c3efcbd57691d7c48f29b0 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f17226f56b709e922239f3a484c2af1fce3 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16ea1a1ae89a83378013854cb51752a29c33 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e21155842bce9c6b129c9d96f9cb499381cd31f5 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775472b13dff415a3152ce0e0c1a31c96c84 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918281f34a0b5c51641a286d7d6fba77a9f4 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8c445e4e8c0262de4c4a2c06329ff83702 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a31ea23e73e1cbc92ff516d9d5ebdb2c29 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e0e8c32747d2d1faeca8a6a94c727dd995 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c1de7cd8fa08ccbce62afe8541502657bc Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973b946502053964541ffc1df7b810e78506 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814cc6c03988b9672b25f89e2064029b2496 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf70760df4cd6cca5aec8041caae347d9a74 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f62534b332035d36b310de10399bb75a2ea42d Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed0172a592c8ee332122709be92468c391ce9 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb6943a0100721d5f15cb5eb5cf26f37a6a58 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86f8dc7399dbe201eff4486e665f29cdd4d Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a22a8b0661a1893af0df7cc253b254bc663 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121539432c95aa604c59c8f4dd287881cd09 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8cba4d0e001b3512787b9665667735863c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030cf17d0f1625b9ce0046c322547a34ad957 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb5a2fa7e130df90ef1459dc9f6f72cf86c Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb667e6689b6ffd9ce3b827c24a1ccf55ff00 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3b0219057d0ae8cb893b6370ab0f18cc7b Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170576759ab08582a8582cca27fcfb53a…

commit a711e0a Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:59:09 2017 +0800 新 commit 500d813 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:37:25 2017 +0800 Squashed commit of the following: commit c0d152c Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:44:05 2017 +0800 解决冲突 commit 2d6054f Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:34:28 2017 +0800 Squashed commit of the following: commit d2d02f6 Author: Eric5959 <593964613@qq.com> Date: Fri Jun 2 13:11:23 2017 +0800 version3.7 # Conflicts: # WebRoot/css/good.css # WebRoot/goods.jsp # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/IndexServlet.java commit 5de903f Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:14:17 2017 +0800 fddjdjn commit 2bd768a Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:41:26 2017 +0800 更新数据库文件 commit 06c3826 Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:40:02 2017 +0800 地址功能初步实现 commit bdcd2a8 Merge: 1df8b5c 9a6d79a Author: luyongbiao <1565442611@qq.com> Date: Sun May 28 16:41:03 2017 +0800 注册功能实现 commit 1df8b5c Author: luyongbiao <1565442611@qq.com> Date: Sat May 27 03:09:24 2017 +0800 分页功能，页面链接补齐 commit 4a871ba Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf7 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f6253 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed01 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb69 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a2 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d974 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75 Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 7528275 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543fe Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # WebRoot/WEB-INF/classes/.gitignore # WebRoot/cart.jsp # WebRoot/css/address.css # WebRoot/css/comfirm_order.css # WebRoot/css/good.css # WebRoot/css/orders.css # WebRoot/css/ordersDetail.css # WebRoot/css/register.css # WebRoot/goods.jsp # WebRoot/index.jsp # WebRoot/js/cart.js # WebRoot/js/goods.js # WebRoot/js/index.js # WebRoot/js/register.js # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java # src/org/bqj/shopping/servlet/IndexServlet.java # test/org/bqj/shopping/dao/impl/BaseDAOTest.java commit 86e885c Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:28:24 2017 +0800 搜索 commit 24a281a Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:22:54 2017 +0800 111 commit abe6eb7 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:42:32 2017 +0800 删除Shopping文件夹 commit 006e481 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:35:29 2017 +0800 222 commit 3bc6a87 Merge: 6d39956 7c80385 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:31:37 2017 +0800 Merge branch 'CloudOfLi' of https://github.com/luyongbiao/Shop into CloudOfLi commit 6d39956 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:23:06 2017 +0800 改了Orders commit 7c80385 Author: Cloud <1224479869@qq.com> Date: Thu May 25 14:58:06 2017 +0800 Create 仓库分支说明 commit fa59f72 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:55:00 2017 +0800 添加了register.html的动态数据检查样式（一部分） commit 4ce058f Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:09:38 2017 +0800 222 commit b197539 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:00:03 2017 +0800 更名字Myshopping为Shopping commit f871f69 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:54:39 2017 +0800 333 commit 55db5bd Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:47:56 2017 +0800 333 commit 9491333 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:34:09 2017 +0800 修改为5-24之前最新版的系统 commit f73cf40 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:28:45 2017 +0800 增加了一行注释 commit e239b56 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:21:55 2017 +0800 测试 commit fb678e9 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:18:30 2017 +0800 5-25 commit 0f5614d Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:39:16 2017 +0800 在GoodServlet中增加了一个空行进行github的测试 commit e9cf3cc Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:26:40 2017 +0800 5-24 commit fbc0c09 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 01:16:39 2017 +0800 Squashed commit of the following: commit 4a871ba Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf7 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f6253 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed01 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb69 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a2 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d974 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75 Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 7528275 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543fe Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # .settings/org.skyway.core.prefs # .tern-project # WebRoot/WEB-INF/lib/javax.servlet.jsp.jstl-1.2.1.jar # WebRoot/WEB-INF/web.xml # WebRoot/css/index.css # WebRoot/css/login.css # WebRoot/css/register.css # WebRoot/good.html # WebRoot/goods.jsp # WebRoot/image/fruit/kiwi.jpg # WebRoot/image/fruit/lemon.jpg # WebRoot/image/fruit/mango.jpg # WebRoot/image/fruit/orange.jpg # WebRoot/image/fruit/pear.jpg # WebRoot/image/meat/sirloin.jpg # WebRoot/image/meat/steak.jpg # WebRoot/index.html # WebRoot/js/index.js # WebRoot/login.html # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java commit dccc177 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 19 22:23:54 2017 +0800 5-19 commit 4d72886 Merge: 27aaa87 58791a7 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 19 21:26:31 2017 +0800 Merge remote-tracking branch 'refs/remotes/origin/master' into CloudOfLi commit 58791a7 Merge: 90d264e 0738e09 Author: Eric5959 <593964613@qq.com> Date: Wed May 17 23:50:48 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' commit 90d264e Author: Eric5959 <593964613@qq.com> Date: Wed May 17 23:49:01 2017 +0800 3.3 # Conflicts: # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java

commit 086497c Author: Cloud-Of-Li <1224479869@qq.com> Date: Sat Jun 3 02:21:16 2017 +0800 V4.0.1 commit 462e09e Author: Cloud-Of-Li <1224479869@qq.com> Date: Sat Jun 3 01:23:42 2017 +0800 version 4.0.1 commit a711e0a Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:59:09 2017 +0800 新 commit 500d813 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:37:25 2017 +0800 Squashed commit of the following: commit c0d152c Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:44:05 2017 +0800 解决冲突 commit 2d6054f Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:34:28 2017 +0800 Squashed commit of the following: commit d2d02f6 Author: Eric5959 <593964613@qq.com> Date: Fri Jun 2 13:11:23 2017 +0800 version3.7 # Conflicts: # WebRoot/css/good.css # WebRoot/goods.jsp # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/IndexServlet.java commit 5de903f Author: luyongbiao <1565442611@qq.com> Date: Fri Jun 2 13:14:17 2017 +0800 fddjdjn commit 2bd768a Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:41:26 2017 +0800 更新数据库文件 commit 06c3826 Author: luyongbiao <1565442611@qq.com> Date: Mon May 29 01:40:02 2017 +0800 地址功能初步实现 commit bdcd2a8 Merge: 1df8b5c 9a6d79a Author: luyongbiao <1565442611@qq.com> Date: Sun May 28 16:41:03 2017 +0800 注册功能实现 commit 1df8b5c Author: luyongbiao <1565442611@qq.com> Date: Sat May 27 03:09:24 2017 +0800 分页功能，页面链接补齐 commit 4a871ba Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf7 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f6253 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed01 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb69 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a2 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d974 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75 Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 7528275 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543fe Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # WebRoot/WEB-INF/classes/.gitignore # WebRoot/cart.jsp # WebRoot/css/address.css # WebRoot/css/comfirm_order.css # WebRoot/css/good.css # WebRoot/css/orders.css # WebRoot/css/ordersDetail.css # WebRoot/css/register.css # WebRoot/goods.jsp # WebRoot/index.jsp # WebRoot/js/cart.js # WebRoot/js/goods.js # WebRoot/js/index.js # WebRoot/js/register.js # WebRoot/login.html # WebRoot/register.html # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/service/GoodsCategoryService.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java # src/org/bqj/shopping/servlet/IndexServlet.java # test/org/bqj/shopping/dao/impl/BaseDAOTest.java commit 86e885c Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:28:24 2017 +0800 搜索 commit 24a281a Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri Jun 2 15:22:54 2017 +0800 111 commit abe6eb7 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:42:32 2017 +0800 删除Shopping文件夹 commit 006e481 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:35:29 2017 +0800 222 commit 3bc6a87 Merge: 6d39956 7c80385 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:31:37 2017 +0800 Merge branch 'CloudOfLi' of https://github.com/luyongbiao/Shop into CloudOfLi commit 6d39956 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 23:23:06 2017 +0800 改了Orders commit 7c80385 Author: Cloud <1224479869@qq.com> Date: Thu May 25 14:58:06 2017 +0800 Create 仓库分支说明 commit fa59f72 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:55:00 2017 +0800 添加了register.html的动态数据检查样式（一部分） commit 4ce058f Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:09:38 2017 +0800 222 commit b197539 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 14:00:03 2017 +0800 更名字Myshopping为Shopping commit f871f69 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:54:39 2017 +0800 333 commit 55db5bd Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:47:56 2017 +0800 333 commit 9491333 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:34:09 2017 +0800 修改为5-24之前最新版的系统 commit f73cf40 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:28:45 2017 +0800 增加了一行注释 commit e239b56 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:21:55 2017 +0800 测试 commit fb678e9 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 13:18:30 2017 +0800 5-25 commit 0f5614d Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:39:16 2017 +0800 在GoodServlet中增加了一个空行进行github的测试 commit e9cf3cc Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 12:26:40 2017 +0800 5-24 commit fbc0c09 Author: Cloud-Of-Li <1224479869@qq.com> Date: Thu May 25 01:16:39 2017 +0800 Squashed commit of the following: commit 4a871ba Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 23:31:28 2017 +0800 Squashed commit of the following: commit 9a6d79a Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:09:16 2017 +0800 3.6.7 commit f2aad83 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:07:39 2017 +0800 Squashed commit of the following: commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa # Conflicts: # build/classes/org/bqj/shopping/dao/impl/GoodsDAOImpl.class # build/classes/org/bqj/shopping/servlet/GoodsCategoryServlet.class # build/classes/org/bqj/shopping/servlet/GoodsServlet.class commit 789a6f1 Author: Eric5959 <593964613@qq.com> Date: Wed May 24 23:01:23 2017 +0800 3.6.6 classpath commit 773d16e Author: Eric5959 <593964613@qq.com> Date: Wed May 24 22:52:47 2017 +0800 3.6.6 index.jsp & goods.jsp update new Servlet commit e211558 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:54:40 2017 +0800 加了个空格 commit 81ae775 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 19:38:25 2017 +0800 333 commit fa15918 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:44:17 2017 +0800 实现购物车商品删除功能 commit 0358cb8 Author: luyongbiao <1565442611@qq.com> Date: Wed May 24 04:42:25 2017 +0800 删除购物车商品功能 commit 3ded71a Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:40:27 2017 +0800 删除编译后的文件 commit 9f8148e Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:37:48 2017 +0800 更新购物车功能 commit 30a3d9c Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:33:01 2017 +0800 加入jstl包 commit 374e973 Author: luyongbiao <1565442611@qq.com> Date: Tue May 23 22:32:16 2017 +0800 购物车添加与展示 commit 556e814 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 23:40:24 2017 +0800 aa commit d163bf7 Merge: 15f6253 1dde121 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:32:05 2017 +0800 3.6.4 commit 15f6253 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:17:03 2017 +0800 3.6.3 commit a60ed01 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:11:39 2017 +0800 3.6.2 commit 109eb69 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 23:05:06 2017 +0800 3.6.1 commit 207dc86 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:56:15 2017 +0800 3.6 commit a0281a2 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 22:30:47 2017 +0800 同步 commit 1dde121 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:24:32 2017 +0800 增加.gitignore文件 commit a94dff8 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:23:14 2017 +0800 删除.gitignore文件 commit 724030c Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 22:16:24 2017 +0800 去除类中不存在的包名 commit 092f5cb Merge: 27aaa87 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:52:50 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' into EricWork # Conflicts: # .classpath # .tern-project # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/entity/Goods.java # src/org/bqj/shopping/service/GoodsService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/GoodsServlet.java commit 6ecfb66 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:27:24 2017 +0800 3.5 commit b10a8d3 Author: Eric5959 <593964613@qq.com> Date: Mon May 22 21:26:50 2017 +0800 3.5 commit b256170 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 20:36:55 2017 +0800 修改文件路径 commit f938ae1 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 19:59:07 2017 +0800 添加前端页面 commit 4ac7565 Merge: f72d974 dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 18:29:06 2017 +0800 本地仓库branch1提交 commit dd5d0c5 Author: luyongbiao <1565442611@qq.com> Date: Mon May 22 17:43:38 2017 +0800 修改4111 commit f72d974 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:45:06 2017 +0800 Delete java4JSF commit d0e7c75 Merge: 68aecf5 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:43:14 2017 +0800 Merge pull request #5 from Cloud-Of-Li/Cloud-Of-Li-patch-1 Update java4JSF commit 3cf2fe0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:40:29 2017 +0800 Update java4JSF commit 68aecf5 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:38:56 2017 +0800 Update java4JSF commit 7528275 Merge: 4f543fe 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:35:27 2017 +0800 Merge pull request #4 from Cloud-Of-Li/revert-2-revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Revert "Create java4JSF"" at 13:36 commit 7a57732 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:34:51 2017 +0800 Revert "Revert "Create java4JSF"" commit 4f543fe Merge: 37e3d7d 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:25:08 2017 +0800 Merge pull request #3 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Delete java4JSF commit 66957a0 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:21:29 2017 +0800 Delete java4JSF commit 37e3d7d Merge: ad0b2b1 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:28 2017 +0800 Merge pull request #2 from Cloud-Of-Li/revert-1-Cloud-Of-Li-2017-5-5-patch-1 Revert "Create java4JSF" commit 6d35136 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:18:01 2017 +0800 Revert "Create java4JSF" commit ad0b2b1 Merge: 57d93ff 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:17:36 2017 +0800 Merge pull request #1 from Cloud-Of-Li/Cloud-Of-Li-2017-5-5-patch-1 Create java4JSF commit 1eb0ad2 Author: Cloud <1224479869@qq.com> Date: Fri May 5 13:15:08 2017 +0800 Create java4JSF commit 57d93ff Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 5 13:00:10 2017 +0800 :tada: Added .gitattributes & .gitignore files # Conflicts: # .classpath # .settings/org.eclipse.wst.common.component # .settings/org.skyway.core.prefs # .tern-project # WebRoot/WEB-INF/lib/javax.servlet.jsp.jstl-1.2.1.jar # WebRoot/WEB-INF/web.xml # WebRoot/css/index.css # WebRoot/css/login.css # WebRoot/css/register.css # WebRoot/good.html # WebRoot/goods.jsp # WebRoot/image/fruit/kiwi.jpg # WebRoot/image/fruit/lemon.jpg # WebRoot/image/fruit/mango.jpg # WebRoot/image/fruit/orange.jpg # WebRoot/image/fruit/pear.jpg # WebRoot/image/meat/sirloin.jpg # WebRoot/image/meat/steak.jpg # WebRoot/index.html # WebRoot/js/index.js # WebRoot/login.html # src/org/bqj/shopping/dao/BaseDAO.java # src/org/bqj/shopping/dao/GoodsDAO.java # src/org/bqj/shopping/dao/impl/BaseDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Admin.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/servlet/AdminServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java commit dccc177 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 19 22:23:54 2017 +0800 5-19 commit 4d72886 Merge: 27aaa87 58791a7 Author: Cloud-Of-Li <1224479869@qq.com> Date: Fri May 19 21:26:31 2017 +0800 Merge remote-tracking branch 'refs/remotes/origin/master' into CloudOfLi commit 58791a7 Merge: 90d264e 0738e09 Author: Eric5959 <593964613@qq.com> Date: Wed May 17 23:50:48 2017 +0800 Merge remote-tracking branch 'remotes/origin/branch1' commit 90d264e Author: Eric5959 <593964613@qq.com> Date: Wed May 17 23:49:01 2017 +0800 3.3 # Conflicts: # .gitignore # WebRoot/cart.jsp # WebRoot/comfirm_order.jsp # WebRoot/commodityManage.jsp # WebRoot/css/comfirm_order.css # WebRoot/css/orders.css # WebRoot/index.jsp # WebRoot/js/address.js # WebRoot/js/comfirm_order.js # WebRoot/js/commodityManage.js # WebRoot/login.html # WebRoot/orders.jsp # WebRoot/ordersDetail.jsp # WebRoot/register.html # bin/.gitignore # src/org/bqj/shopping/dao/CartDAO.java # src/org/bqj/shopping/dao/CartDetailDAO.java # src/org/bqj/shopping/dao/OrdersDAO.java # src/org/bqj/shopping/dao/OrdersDetailDAO.java # src/org/bqj/shopping/dao/impl/CartDAOImpl.java # src/org/bqj/shopping/dao/impl/CartDetailDAOImpl.java # src/org/bqj/shopping/dao/impl/CustomerAddressDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsCategoryDAOImpl.java # src/org/bqj/shopping/dao/impl/GoodsDAOImpl.java # src/org/bqj/shopping/dao/impl/OrdersDAOImpl.java # src/org/bqj/shopping/dao/impl/OrdersDetailDAOImpl.java # src/org/bqj/shopping/db/DB.java # src/org/bqj/shopping/entity/Customer.java # src/org/bqj/shopping/service/AdminService.java # src/org/bqj/shopping/service/CartService.java # src/org/bqj/shopping/service/CustomerAddressService.java # src/org/bqj/shopping/service/CustomerService.java # src/org/bqj/shopping/service/OrdersService.java # src/org/bqj/shopping/servlet/AddressServlet.java # src/org/bqj/shopping/servlet/CartServlet.java # src/org/bqj/shopping/servlet/CustomerServlet.java # src/org/bqj/shopping/servlet/GoodsCategoryServlet.java # src/org/bqj/shopping/servlet/IndexServlet.java # src/org/bqj/shopping/servlet/OrdersDetailServlet.java # src/org/bqj/shopping/servlet/OrdersServlet.java

Eric5959 and others added 21 commits May 17, 2017 23:49

3.3

90d264e

Merge remote-tracking branch 'remotes/origin/branch1'

58791a7

Merge remote-tracking branch 'refs/remotes/origin/master' into CloudOfLi

4d72886

5-19

dccc177

5-24

e9cf3cc

在GoodServlet中增加了一个空行进行github的测试

0f5614d

5-25

fb678e9

测试

e239b56

增加了一行注释

f73cf40

修改为5-24之前最新版的系统

9491333

333

55db5bd

333

f871f69

更名字Myshopping为Shopping

b197539

222

4ce058f

添加了register.html的动态数据检查样式（一部分）

fa59f72

Create 仓库分支说明

7c80385

改了Orders

6d39956

Merge branch 'CloudOfLi' of https://github.com/luyongbiao/Shop into C…

3bc6a87

…loudOfLi

222

006e481

删除Shopping文件夹

abe6eb7

Cloud-Of-Li closed this May 25, 2017

Cloud-Of-Li reopened this May 25, 2017

Cloud-Of-Li added 4 commits June 2, 2017 15:22

111

24a281a

搜索

86e885c

新

a711e0a

Cloud-Of-Li added 2 commits June 3, 2017 01:23

version 4.0.1

462e09e

V4.0.1

086497c

Cloud-Of-Li added 3 commits June 3, 2017 13:11

v4.1.1

f83e1bb

修改 OrdersServlet

cd3b672

更改OrdersDetailServlet

9af5139

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cloud of li#3

Cloud of li#3
Cloud-Of-Li wants to merge 30 commits into
masterfrom
CloudOfLi

Cloud-Of-Li commented May 25, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Cloud-Of-Li commented May 25, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants