-
Notifications
You must be signed in to change notification settings - Fork 0
Permalink
Choose a base ref
{{ refName }}
default
Choose a head ref
{{ refName }}
default
Checking mergeability…
Don’t worry, you can still create the pull request.
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
base repository: zhantaojava/Web_System
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev_1.0
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: zhantaojava/Web_System
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
- 20 commits
- 17 files changed
- 4 contributors
Commits on Sep 23, 2015
-
Configuration menu - View commit details
-
Copy full SHA for 8920c73 - Browse repository at this point
Copy the full SHA 8920c73View commit details
Commits on Sep 24, 2015
-
Configuration menu - View commit details
-
Copy full SHA for 1403bd6 - Browse repository at this point
Copy the full SHA 1403bd6View commit details -
2.UserBeanProcess增加了AddUser method 3.HibernateDao 增加了Add method 用modelandview 实现了传递参数,并且在wel.jsp里用占位符把传递的参数显示出来
zhantaojava committedSep 24, 2015 Configuration menu - View commit details
-
Copy full SHA for 11f1126 - Browse repository at this point
Copy the full SHA 11f1126View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3656fa3 - Browse repository at this point
Copy the full SHA 3656fa3View commit details
Commits on Sep 25, 2015
-
zhantaojava committed
Sep 25, 2015 Configuration menu - View commit details
-
Copy full SHA for 58a5871 - Browse repository at this point
Copy the full SHA 58a5871View commit details -
zhantaojava committed
Sep 25, 2015 Configuration menu - View commit details
-
Copy full SHA for 28e1502 - Browse repository at this point
Copy the full SHA 28e1502View commit details
Commits on Sep 27, 2015
-
2.dispatcher—servlet 中, component scan 添加需要扫描的包 3.userbeanProcess 用annotation标注为component 4.LoginController中用autowired装配bean
zhantaojava committedSep 27, 2015 Configuration menu - View commit details
-
Copy full SHA for 0449692 - Browse repository at this point
Copy the full SHA 0449692View commit details
Commits on Sep 29, 2015
-
2.getUser从前端拿到username, 通过返回一个跳转把值传给 另一个controller getUserProfile。 3.getUserProfile拿到值以后处理,把返回值封装到modelAndView里返回给jsp页面 4.RetrieveUser(int pageSize, int pageNow)则是拿到参数,并到数据库调取相应的data 5.新增loginValidation控制器,若用户名密码验证成功,则跳转到RetrieveUser控制器 6.同时保留login控制器。共有两种登陆方式,一种是直接从login验证密码后,跳到jsp页面, 数据由jsp页面调用hibernateDao的方法得到,另一种是在RetrieveUser控制器中把数据准备好, 通过ModelAndView 传值给jsp页面。jsp页面直接把数据显示出来
zhantaojava committedSep 29, 2015 Configuration menu - View commit details
-
Copy full SHA for 310f090 - Browse repository at this point
Copy the full SHA 310f090View commit details -
zhantaojava committed
Sep 29, 2015 Configuration menu - View commit details
-
Copy full SHA for f4e479d - Browse repository at this point
Copy the full SHA f4e479dView commit details -
1. 在addUser 的 ModelAndView中 更改
mv = new ModelAndView("redirect:retrieveUser"); 可以实现跳转,retrieveUser的requestMethod必须为GETzhantaojava committedSep 29, 2015 Configuration menu - View commit details
-
Copy full SHA for 5dea638 - Browse repository at this point
Copy the full SHA 5dea638View commit details -
2.<a href="${user.getName()}/edit">Edit Profile</a> 需使用通配符 ${user.getName()} 才能把用户名传到控制器 建议用 ${user.getId()}以保证不拿到重名的用户zhantaojava committedSep 29, 2015 Configuration menu - View commit details
-
Copy full SHA for aee4724 - Browse repository at this point
Copy the full SHA aee4724View commit details -
1.built editUserProfile.jsp fetch data from EditUserProfile Controller,
and display it. 2.add EditUserProfile controller,handle http request from userProfile.jsp , then call the UserBeanProcess,do the business procedure
zhantaojava committedSep 29, 2015 Configuration menu - View commit details
-
Copy full SHA for 49be1aa - Browse repository at this point
Copy the full SHA 49be1aaView commit details
Commits on Sep 30, 2015
-
2.Jsp 表单中的参数必须跟model类中的属性名一样, User class中: private String name; private String pw; ---> Username:<input type="text" name="name"> name=必须为name ---> Password:<input type="text" name="pw"> name= 为 pw 3.新增UpdateUser controller 用于去数据库更新用户
zhantaojava committedSep 30, 2015 Configuration menu - View commit details
-
Copy full SHA for 82d0d55 - Browse repository at this point
Copy the full SHA 82d0d55View commit details -
1.Update Function upgreade ( 基于HQL)
2.HiberanteDao add new update method 3.UserBeanProcess add new update method 4.controller add new UpdateUser, get ModelAttribute from jsp page, then redirect to "redirect:user/" + user.getName() 5.use {name} to redirectzhantaojava committedSep 30, 2015 Configuration menu - View commit details
-
Copy full SHA for 905de7c - Browse repository at this point
Copy the full SHA 905de7cView commit details -
zhantaojava committed
Sep 30, 2015 Configuration menu - View commit details
-
Copy full SHA for 37e2c0e - Browse repository at this point
Copy the full SHA 37e2c0eView commit details
Commits on Oct 1, 2015
-
Merge branch 'dev_updateUser_copy'
zhantaojava authored and zhantaojava committedOct 1, 2015 Configuration menu - View commit details
-
Copy full SHA for 2a6d84f - Browse repository at this point
Copy the full SHA 2a6d84fView commit details
Commits on Oct 7, 2015
-
2.更改了登录方式,主页-login.jsp-loginValidation Controller 3.添加了邮件条目 4.User model,user hbm.xml,HibernateDao的update方法里都要添加email相关方法和属性
Configuration menu - View commit details
-
Copy full SHA for c71810d - Browse repository at this point
Copy the full SHA c71810dView commit details
Commits on Oct 8, 2015
-
Configuration menu - View commit details
-
Copy full SHA for 7a84a21 - Browse repository at this point
Copy the full SHA 7a84a21View commit details -
1.增加了testPage.jsp & TestController
2.用于测试数据绑定 3.dispatcher-servlet.xml 需要把component scan 加入 test包,mvc才能找到controller
Configuration menu - View commit details
-
Copy full SHA for b5c8912 - Browse repository at this point
Copy the full SHA b5c8912View commit details
Commits on Oct 9, 2015
-
Configuration menu - View commit details
-
Copy full SHA for 498ee57 - Browse repository at this point
Copy the full SHA 498ee57View commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff dev_1.0...master