Skip to content

Commit 46b40a7

Browse files
author
BG317958
committed
directory content clean.
1 parent ff34792 commit 46b40a7

File tree

633 files changed

+72160
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

633 files changed

+72160
-98
lines changed

‎pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,23 @@
120120

121121

122122
</dependencies>
123+
124+
<build>
125+
<finalName>horizon_build</finalName>
126+
<plugins>
127+
<plugin>
128+
<groupId>org.apache.tomcat.maven</groupId>
129+
<artifactId>tomcat7-maven-plugin</artifactId>
130+
<version>2.1</version>
131+
<configuration>
132+
<port>8088</port>
133+
<path>/</path>
134+
<uriEncoding>UTF-8</uriEncoding>
135+
<server>tomcat7</server>
136+
</configuration>
137+
</plugin>
138+
</plugins>
139+
</build>
140+
141+
123142
</project>

‎rainbow.iml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
</sourceRoots>
1616
</configuration>
1717
</facet>
18+
<facet type="Spring" name="Spring">
19+
<configuration />
20+
</facet>
1821
</component>
19-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
22+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
2023
<output url="file://$MODULE_DIR$/target/classes" />
2124
<output-test url="file://$MODULE_DIR$/target/test-classes" />
2225
<content url="file://$MODULE_DIR$">

‎src/main/java/controller/LoginController.java

Lines changed: 63 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,99 @@
11
package controller;
22

3+
import com.alibaba.fastjson.JSON;
34
import domain.UserInfo;
45
import org.apache.log4j.Logger;
6+
import org.springframework.beans.factory.annotation.Autowired;
57
import org.springframework.stereotype.Controller;
68
import org.springframework.ui.ModelMap;
7-
import org.springframework.web.bind.annotation.ModelAttribute;
8-
import org.springframework.web.bind.annotation.RequestMapping;
9-
import org.springframework.web.bind.annotation.RequestMethod;
10-
import org.springframework.web.bind.annotation.RequestParam;
11-
import org.springframework.web.servlet.ModelAndView;
9+
import org.springframework.web.bind.annotation.*;
10+
import org.springframework.web.bind.support.SessionStatus;
11+
import service.LoginService;
12+
13+
import javax.servlet.http.HttpSession;
1214

1315
/**
1416
* Created by pengfei on 2017/9/22.
1517
*/
1618
@Controller
19+
@SessionAttributes("user")
1720
public class LoginController {
1821

19-
private final static Logger logger=Logger.getLogger(LoginController.class);
22+
private final static Logger logger = Logger.getLogger(LoginController.class);
23+
24+
@Autowired
25+
private LoginService loginService;
2026

21-
@RequestMapping(value = "/login", method = RequestMethod.GET)
22-
public String get(){
27+
@RequestMapping(value = "/homePage")
28+
public String get(HttpSession session) {
2329
logger.info("Inside login get method");
24-
return "home";
30+
31+
UserInfo currentUser = (UserInfo) session.getAttribute("user");
32+
logger.info("Current User:" + currentUser.getName());
33+
34+
return "homePage";
2535
}
2636

2737
//public String login(@RequestParam("name") String name, String password, ModelMap model){
2838
//public String login(String name, String password, ModelMap model){
2939

30-
@RequestMapping(value = "/loginHere",method=RequestMethod.POST)
31-
public String login(@RequestParam("name") String name, String password, ModelMap model){
40+
@RequestMapping(value = "/loginHere")
41+
public String login(@RequestParam("name") String name, String password, ModelMap model) {
3242
logger.info("Login controller begin service");
3343

34-
model.addAttribute("password",password);
35-
model.addAttribute("name",name);
44+
UserInfo user = new UserInfo();
45+
user.setName(name);
46+
user.setPassword(password);
3647

37-
if(password==null)
38-
throw new RuntimeException("Password should not be null!");
48+
model.addAttribute("bean", user);
3949

40-
logger.info("Login controller end service!");
50+
if (loginService.checkUserAccess(name, password)) {
51+
logger.info("Login controller end service!");
4152

42-
return "homePage";
53+
user.setPassword("");
54+
model.addAttribute("user", user);
55+
56+
return "redirect:/homePage";
57+
} else {
58+
return "login";
59+
}
4360
}
4461

45-
@RequestMapping(value="/toLoginPage",method = RequestMethod.GET)
46-
public String redirect(){
62+
@RequestMapping(value = "/toLoginPage", method = RequestMethod.GET)
63+
public String redirect() {
4764
return "redirect:login";
4865
}
4966

50-
@RequestMapping(value = "/visitStaticPage",method = RequestMethod.GET)
51-
public String visitStaticPage(){
67+
@RequestMapping(value = "/visitStaticPage", method = RequestMethod.GET)
68+
public String visitStaticPage() {
5269

5370
return "redirect:/pages/static.html";
5471
}
5572

5673

74+
//Return to previous path
75+
@ResponseBody
76+
@RequestMapping(value = "/getUserSession")
77+
public String getUserSession( HttpSession session) {
78+
String result="";
79+
80+
Object obj=session.getAttribute("user");
81+
if (obj instanceof String){
82+
result= (String) obj;
83+
}else if (obj instanceof UserInfo){
84+
result=((UserInfo) obj).getName();
85+
}
86+
87+
result= JSON.toJSONString(result);
88+
89+
return result;
90+
}
91+
92+
@RequestMapping("/logOut")
93+
@ResponseBody
94+
public String logout( SessionStatus status){
95+
status.setComplete();
96+
return "logout";
97+
}
98+
5799
}

‎src/main/java/dao/UserDao.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ public interface UserDao {
1212

1313
public Object findUser(int userID);
1414

15+
public Object findUser(String userName);
16+
1517
public List findAllUser();
1618
}

‎src/main/java/dao/UserDaoImpl.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package dao;
22

3-
import com.alibaba.fastjson.JSON;
43
import domain.UserInfo;
54
import org.mybatis.spring.support.SqlSessionDaoSupport;
65
import org.springframework.stereotype.Component;
@@ -32,6 +31,12 @@ public Object findUser(int userID) {
3231

3332
}
3433

34+
public Object findUser(String userName) {
35+
UserInfo user = this.getSqlSession().selectOne("USER.findUserByName", userName);
36+
return user;
37+
38+
}
39+
3540
public List findAllUser() {
3641
int cnt = this.getSqlSession().selectOne("USER.count");
3742

‎src/main/java/domain/UserInfo.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ public class UserInfo {
1010
private String comment;
1111
private String password;
1212
private String email;
13+
private String create;
14+
private String update;
1315

1416
public UserInfo() {
1517

@@ -69,4 +71,21 @@ public void setEmail(String email) {
6971
}
7072

7173

74+
public String getCreate() {
75+
return create;
76+
}
77+
78+
public void setCreate(String create) {
79+
this.create = create;
80+
}
81+
82+
public String getUpdate() {
83+
return update;
84+
}
85+
86+
public void setUpdate(String update) {
87+
this.update = update;
88+
}
89+
90+
7291
}

‎src/main/java/service/LoginService.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package service;
2+
3+
import domain.UserInfo;
4+
5+
import java.util.Map;
6+
7+
/**
8+
* Created by pengfei on 2017/9/12.
9+
*/
10+
public interface LoginService {
11+
12+
public void addUser(UserInfo info);
13+
14+
public void deleteUser(UserInfo info);
15+
16+
public UserInfo queryUser(UserInfo info);
17+
18+
public boolean checkUserAccess(String userName, String pwd);
19+
}

‎src/main/java/service/LoginServiceImpl.java

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
package service;
2+
3+
import Utility.RedisCache;
4+
import com.alibaba.fastjson.JSON;
5+
import dao.UserDao;
6+
import domain.UserInfo;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.stereotype.Service;
9+
import org.springframework.util.StringUtils;
10+
11+
/**
12+
* Created by pengfei on 2017/9/12.
13+
*/
14+
15+
@Service("LoginService")
16+
public class LoginServiceImpl implements LoginService {
17+
18+
@Autowired
19+
private RedisCache redisCache;
20+
21+
@Autowired
22+
private UserDao userDao;
23+
24+
public void addUser(UserInfo info) {
25+
this.userDao.saveUserData(info);
26+
System.out.println("Service:add user");
27+
}
28+
29+
public void deleteUser(UserInfo info) {
30+
this.userDao.delUser(info);
31+
System.out.println("Service:delete user");
32+
}
33+
34+
public UserInfo queryUser(UserInfo info) {
35+
36+
//First check Redis redisCache.
37+
String userJsonValue = (String) this.redisCache.get("user:" + info.getId());
38+
if (!StringUtils.isEmpty(userJsonValue)) {
39+
UserInfo result = JSON.parseObject(userJsonValue, UserInfo.class);
40+
System.out.println("Cache got");
41+
return result;
42+
}
43+
44+
//If redis not found, check Database.
45+
UserInfo user = (UserInfo) this.userDao.findUser(info.getId());
46+
47+
//Save in Redis.
48+
this.redisCache.set("user:" + info.getId(), user);
49+
System.out.println("DB got");
50+
return user;
51+
}
52+
53+
public boolean checkUserAccess(String userName, String pwd){
54+
UserInfo user=(UserInfo) userDao.findUser(userName);
55+
56+
if (user ==null ||!user.getPassword().equals(pwd)){
57+
return false;
58+
}else{
59+
return true;
60+
}
61+
}
62+
}

‎src/main/java/service/UserService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/**
1111
* Created by pengfei on 2017/9/2.
1212
*/
13+
@Service("UserService")
1314
public class UserService {
1415

1516
private UserDao userDao;

‎src/main/resources/mybatis/application.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
</tx:advice>
2929

3030
<aop:config>
31-
<aop:pointcut id="createOperation"
32-
expression="execution(* dao.StudentDaoImpl.declarativeTxTest(..))"/>
31+
<aop:pointcut id="createOperation" expression="execution(* dao.StudentDaoImpl.declarativeTxTest(..))"/>
3332

3433
<aop:advisor advice-ref="txAdvice" pointcut-ref="createOperation"/>
3534
</aop:config>
@@ -38,7 +37,7 @@
3837
<property name="driverClassName" value="com.mysql.jdbc.Driver"></property>
3938
<property name="url" value="jdbc:mysql://localhost:3306/rainbow"></property>
4039
<property name="username" value="root"></property>
41-
<property name="password" value="mysql"></property>
40+
<property name="password" value="jack_bai"></property>
4241
</bean>
4342

4443
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
@@ -51,9 +50,6 @@
5150
</bean>
5251

5352
<bean id="userDAO" class="dao.UserDaoImpl" parent="abstractDAO"/>
54-
<bean id="userService" class="service.UserService">
55-
<property name="userDao" ref="userDAO"></property>
56-
</bean>
5753

5854
<bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig">
5955
<property name="maxIdle" value="25"/>
@@ -65,7 +61,7 @@
6561

6662
<bean id="pool" class="redis.clients.jedis.JedisPool">
6763
<constructor-arg index="0" ref="poolConfig"/>
68-
<constructor-arg index="1" value="localhost"/>
64+
<constructor-arg index="1" value="10.45.4.45"/>
6965
<constructor-arg index="2" value="6379"/>
7066
<constructor-arg index="3" value="2000"/>
7167
</bean>

‎src/main/resources/mybatis/user-mapper.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
select * from userinfo where id= #{id}
2121
</select>
2222

23+
<select id="findUserByName" resultType="domain.UserInfo" >
24+
select * from userinfo where name = #{name}
25+
</select>
26+
2327
<insert id="insertUser" parameterType="domain.UserInfo" useGeneratedKeys="true" keyProperty="id">
2428
insert into userinfo (name,salary,comment) values (#{name},#{salary},#{comment})
2529
</insert>

‎src/main/webapp/WEB-INF/errorPage/404.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<head>
66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
<link rel="stylesheet" href="/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
8+
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css">
99
<script src="http://cdn.static.runoob.com/libs/jquery/2.1.1/jquery.min.js"></script>
1010
<script src="http://cdn.static.runoob.com/libs/bootstrap/3.3.7/js/bootstrap.min.js"></script>
1111

‎src/main/webapp/WEB-INF/errorPage/405.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<head>
66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
<link rel="stylesheet" href="/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
8+
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css">
99
<script src="http://cdn.static.runoob.com/libs/jquery/2.1.1/jquery.min.js"></script>
1010
<script src="http://cdn.static.runoob.com/libs/bootstrap/3.3.7/js/bootstrap.min.js"></script>
1111

‎src/main/webapp/WEB-INF/errorPage/500.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<head>
66
<meta charset="utf-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
<link rel="stylesheet" href="/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
8+
<link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css">
99
<script src="http://cdn.static.runoob.com/libs/jquery/2.1.1/jquery.min.js"></script>
1010
<script src="http://cdn.static.runoob.com/libs/bootstrap/3.3.7/js/bootstrap.min.js"></script>
1111

‎src/main/webapp/WEB-INF/js/common.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
function checkrst(data) {
2+
dataobj=JSON.parse(data);
3+
if(dataobj.rst_code === 0){
4+
return dataobj.rst_data;
5+
}
6+
$.messager.alert('Warning', dataobj.rst_msg);
7+
return false;
8+
}

0 commit comments

Comments
 (0)