From 66616f2163d48fc72ec263854326774c16fa0e8d Mon Sep 17 00:00:00 2001 From: javared Date: Thu, 30 Jun 2016 18:46:14 +0800 Subject: [PATCH] whatsmars-spring --- .../itlong/whatsmars/earth/dao/OrganizationDao.java | 4 ++-- .../whatsmars/earth/dao/impl/OrganizationDaoImpl.java | 8 ++++---- .../whatsmars/earth/domain/misc/LoginContext.java | 8 ++++---- .../earth/domain/misc/LoginContextHolder.java | 4 ++-- .../pojo/{OrganizationDO.java => Organization.java} | 2 +- .../earth/domain/pojo/{UserDO.java => User.java} | 2 +- .../earth/service/impl/OrganizationServiceImpl.java | 6 +++--- .../earth/web/interceptor/LoginInterceptor.java | 10 +++++----- .../java/com/itlong/whatsmars/spring/TestSpring.java | 5 +++++ 9 files changed, 27 insertions(+), 22 deletions(-) rename whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/{OrganizationDO.java => Organization.java} (76%) rename whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/{UserDO.java => User.java} (98%) diff --git a/whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/OrganizationDao.java b/whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/OrganizationDao.java index 633a9036..acecac79 100644 --- a/whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/OrganizationDao.java +++ b/whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/OrganizationDao.java @@ -1,6 +1,6 @@ package com.itlong.whatsmars.earth.dao; -import com.itlong.whatsmars.earth.domain.pojo.OrganizationDO; +import com.itlong.whatsmars.earth.domain.pojo.Organization; import com.itlong.whatsmars.earth.domain.query.OrganizationQuery; import com.itlong.whatsmars.earth.domain.query.QueryResult; @@ -9,5 +9,5 @@ import com.itlong.whatsmars.earth.domain.query.QueryResult; */ public interface OrganizationDao { - public QueryResult query(OrganizationQuery query); + public QueryResult query(OrganizationQuery query); } diff --git a/whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/impl/OrganizationDaoImpl.java b/whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/impl/OrganizationDaoImpl.java index a824f7d0..112bd25a 100644 --- a/whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/impl/OrganizationDaoImpl.java +++ b/whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/impl/OrganizationDaoImpl.java @@ -1,7 +1,7 @@ package com.itlong.whatsmars.earth.dao.impl; import com.itlong.whatsmars.earth.dao.OrganizationDao; -import com.itlong.whatsmars.earth.domain.pojo.OrganizationDO; +import com.itlong.whatsmars.earth.domain.pojo.Organization; import com.itlong.whatsmars.earth.domain.query.OrganizationQuery; import com.itlong.whatsmars.earth.domain.query.QueryResult; @@ -14,8 +14,8 @@ import java.util.Map; */ public class OrganizationDaoImpl extends BaseDao implements OrganizationDao { @Override - public QueryResult query(OrganizationQuery query) { - QueryResult qr = new QueryResult(); + public QueryResult query(OrganizationQuery query) { + QueryResult qr = new QueryResult(); qr.setQuery(query); Map params = query.build(); @@ -26,7 +26,7 @@ public class OrganizationDaoImpl extends BaseDao implements OrganizationDao { return qr; } - List organizations = this.sqlSession.selectList("OrganizationMapper.query", params); + List organizations = this.sqlSession.selectList("OrganizationMapper.query", params); qr.setResultList(organizations); return qr; } diff --git a/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContext.java b/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContext.java index e89da474..8867c2de 100644 --- a/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContext.java +++ b/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContext.java @@ -1,7 +1,7 @@ package com.itlong.whatsmars.earth.domain.misc; -import com.itlong.whatsmars.earth.domain.pojo.UserDO; +import com.itlong.whatsmars.earth.domain.pojo.User; /** * Author: qing @@ -10,14 +10,14 @@ import com.itlong.whatsmars.earth.domain.pojo.UserDO; */ public class LoginContext { - private UserDO user; + private User user; - public UserDO getUser() { + public User getUser() { return user; } - public void setUser(UserDO user) { + public void setUser(User user) { this.user = user; } diff --git a/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContextHolder.java b/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContextHolder.java index 0b40f12f..9c60df5a 100644 --- a/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContextHolder.java +++ b/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContextHolder.java @@ -1,7 +1,7 @@ package com.itlong.whatsmars.earth.domain.misc; -import com.itlong.whatsmars.earth.domain.pojo.UserDO; +import com.itlong.whatsmars.earth.domain.pojo.User; /** * Author: qing @@ -23,7 +23,7 @@ public class LoginContextHolder { holder.remove(); } - public static UserDO getLoginUser() { + public static User getLoginUser() { LoginContext context = holder.get(); return context == null ? null : context.getUser(); } diff --git a/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/OrganizationDO.java b/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/Organization.java similarity index 76% rename from whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/OrganizationDO.java rename to whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/Organization.java index 6381c26f..13e5d819 100644 --- a/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/OrganizationDO.java +++ b/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/Organization.java @@ -3,5 +3,5 @@ package com.itlong.whatsmars.earth.domain.pojo; /** * Created by shenhongxi on 2016/6/8. */ -public class OrganizationDO { +public class Organization { } diff --git a/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/UserDO.java b/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/User.java similarity index 98% rename from whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/UserDO.java rename to whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/User.java index f67383ca..4115fcf6 100644 --- a/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/UserDO.java +++ b/whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/User.java @@ -7,7 +7,7 @@ import java.util.Set; /** * Created by shenhongxi on 2016/4/29. */ -public class UserDO implements Serializable { +public class User implements Serializable { private Integer id; diff --git a/whatsmars-earth-service/src/main/java/com/itlong/whatsmars/earth/service/impl/OrganizationServiceImpl.java b/whatsmars-earth-service/src/main/java/com/itlong/whatsmars/earth/service/impl/OrganizationServiceImpl.java index 88f2a06e..ee10f7bc 100644 --- a/whatsmars-earth-service/src/main/java/com/itlong/whatsmars/earth/service/impl/OrganizationServiceImpl.java +++ b/whatsmars-earth-service/src/main/java/com/itlong/whatsmars/earth/service/impl/OrganizationServiceImpl.java @@ -4,7 +4,7 @@ import com.itlong.whatsmars.common.pojo.Result; import com.itlong.whatsmars.common.pojo.ResultCode; import com.itlong.whatsmars.earth.dao.OrganizationDao; import com.itlong.whatsmars.earth.service.OrganizationService; -import com.itlong.whatsmars.earth.domain.pojo.OrganizationDO; +import com.itlong.whatsmars.earth.domain.pojo.Organization; import com.itlong.whatsmars.earth.domain.query.OrganizationQuery; import com.itlong.whatsmars.earth.domain.query.QueryResult; import org.springframework.stereotype.Service; @@ -27,8 +27,8 @@ public class OrganizationServiceImpl implements OrganizationService { public Result list(OrganizationQuery query) { Result result = new Result(); try { - QueryResult qr = this.organizationDao.query(query); - Collection organizations = qr.getResultList(); + QueryResult qr = this.organizationDao.query(query); + Collection organizations = qr.getResultList(); result.addModel("query", query); result.addModel("queryResult", qr); result.addModel("organizations", organizations); diff --git a/whatsmars-earth-web/src/main/java/com/itlong/whatsmars/earth/web/interceptor/LoginInterceptor.java b/whatsmars-earth-web/src/main/java/com/itlong/whatsmars/earth/web/interceptor/LoginInterceptor.java index c235f860..70990179 100644 --- a/whatsmars-earth-web/src/main/java/com/itlong/whatsmars/earth/web/interceptor/LoginInterceptor.java +++ b/whatsmars-earth-web/src/main/java/com/itlong/whatsmars/earth/web/interceptor/LoginInterceptor.java @@ -4,7 +4,7 @@ import com.itlong.whatsmars.common.util.DESUtils; import com.itlong.whatsmars.earth.domain.misc.LoginContext; import com.itlong.whatsmars.earth.domain.misc.LoginContextHolder; import com.itlong.whatsmars.earth.domain.misc.SystemConfig; -import com.itlong.whatsmars.earth.domain.pojo.UserDO; +import com.itlong.whatsmars.earth.domain.pojo.User; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -45,7 +45,7 @@ public class LoginInterceptor implements HandlerInterceptor{ if(key.equalsIgnoreCase(cookieKey)) { if(StringUtils.isNotBlank(content)) { String source = DESUtils.decrypt(content, systemConfig.getCookieSecurityKey()); - UserDO user = this.decoder(source); + User user = this.decoder(source); LoginContext context = new LoginContext(); context.setUser(user); LoginContextHolder.set(context); @@ -58,7 +58,7 @@ public class LoginInterceptor implements HandlerInterceptor{ @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { if(modelAndView != null) { - UserDO user = LoginContextHolder.getLoginUser(); + User user = LoginContextHolder.getLoginUser(); modelAndView.addObject("loginUser", user); } } @@ -69,7 +69,7 @@ public class LoginInterceptor implements HandlerInterceptor{ } - protected UserDO decoder(String content){ + protected User decoder(String content){ if(StringUtils.isBlank(content)){ return null; } @@ -77,7 +77,7 @@ public class LoginInterceptor implements HandlerInterceptor{ if(json.isNullObject()){ return null; } - UserDO user = new UserDO(); + User user = new User(); user.setId(json.getInt("id")); user.setName(json.getString("name")); diff --git a/whatsmars-spring/src/main/java/com/itlong/whatsmars/spring/TestSpring.java b/whatsmars-spring/src/main/java/com/itlong/whatsmars/spring/TestSpring.java index 13f78bc7..e7403c3d 100644 --- a/whatsmars-spring/src/main/java/com/itlong/whatsmars/spring/TestSpring.java +++ b/whatsmars-spring/src/main/java/com/itlong/whatsmars/spring/TestSpring.java @@ -17,5 +17,10 @@ public class TestSpring { System.out.println(mars.getCnName()); //ServletContextListener contextListener = new ContextLoaderListener(); + String s = "http://jd.com"; + System.out.println(s.substring(5, s.length())); + + Integer n = 3; + System.out.println("3".equals(n)); } } -- GitLab