Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
caopu16
whatsmars
提交
66616f21
W
whatsmars
项目概览
caopu16
/
whatsmars
与 Fork 源项目一致
Fork自
武汉红喜 / whatsmars
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
whatsmars
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
66616f21
编写于
6月 30, 2016
作者:
武汉红喜
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
whatsmars-spring
上级
788cbc6c
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
27 addition
and
22 deletion
+27
-22
whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/OrganizationDao.java
.../java/com/itlong/whatsmars/earth/dao/OrganizationDao.java
+2
-2
whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/impl/OrganizationDaoImpl.java
.../itlong/whatsmars/earth/dao/impl/OrganizationDaoImpl.java
+4
-4
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContext.java
.../com/itlong/whatsmars/earth/domain/misc/LoginContext.java
+4
-4
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContextHolder.java
...tlong/whatsmars/earth/domain/misc/LoginContextHolder.java
+2
-2
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/Organization.java
.../com/itlong/whatsmars/earth/domain/pojo/Organization.java
+1
-1
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/User.java
...ain/java/com/itlong/whatsmars/earth/domain/pojo/User.java
+1
-1
whatsmars-earth-service/src/main/java/com/itlong/whatsmars/earth/service/impl/OrganizationServiceImpl.java
...whatsmars/earth/service/impl/OrganizationServiceImpl.java
+3
-3
whatsmars-earth-web/src/main/java/com/itlong/whatsmars/earth/web/interceptor/LoginInterceptor.java
...ong/whatsmars/earth/web/interceptor/LoginInterceptor.java
+5
-5
whatsmars-spring/src/main/java/com/itlong/whatsmars/spring/TestSpring.java
...src/main/java/com/itlong/whatsmars/spring/TestSpring.java
+5
-0
未找到文件。
whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/OrganizationDao.java
浏览文件 @
66616f21
package
com.itlong.whatsmars.earth.dao
;
import
com.itlong.whatsmars.earth.domain.pojo.Organization
DO
;
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
<
Organization
DO
>
query
(
OrganizationQuery
query
);
public
QueryResult
<
Organization
>
query
(
OrganizationQuery
query
);
}
whatsmars-earth-dao/src/main/java/com/itlong/whatsmars/earth/dao/impl/OrganizationDaoImpl.java
浏览文件 @
66616f21
package
com.itlong.whatsmars.earth.dao.impl
;
import
com.itlong.whatsmars.earth.dao.OrganizationDao
;
import
com.itlong.whatsmars.earth.domain.pojo.Organization
DO
;
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
<
Organization
DO
>
query
(
OrganizationQuery
query
)
{
QueryResult
<
Organization
DO
>
qr
=
new
QueryResult
<
OrganizationDO
>();
public
QueryResult
<
Organization
>
query
(
OrganizationQuery
query
)
{
QueryResult
<
Organization
>
qr
=
new
QueryResult
<
Organization
>();
qr
.
setQuery
(
query
);
Map
<
String
,
Object
>
params
=
query
.
build
();
...
...
@@ -26,7 +26,7 @@ public class OrganizationDaoImpl extends BaseDao implements OrganizationDao {
return
qr
;
}
List
<
Organization
DO
>
organizations
=
this
.
sqlSession
.
selectList
(
"OrganizationMapper.query"
,
params
);
List
<
Organization
>
organizations
=
this
.
sqlSession
.
selectList
(
"OrganizationMapper.query"
,
params
);
qr
.
setResultList
(
organizations
);
return
qr
;
}
...
...
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContext.java
浏览文件 @
66616f21
package
com.itlong.whatsmars.earth.domain.misc
;
import
com.itlong.whatsmars.earth.domain.pojo.User
DO
;
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
User
DO
user
;
private
User
user
;
public
User
DO
getUser
()
{
public
User
getUser
()
{
return
user
;
}
public
void
setUser
(
User
DO
user
)
{
public
void
setUser
(
User
user
)
{
this
.
user
=
user
;
}
...
...
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/misc/LoginContextHolder.java
浏览文件 @
66616f21
package
com.itlong.whatsmars.earth.domain.misc
;
import
com.itlong.whatsmars.earth.domain.pojo.User
DO
;
import
com.itlong.whatsmars.earth.domain.pojo.User
;
/**
* Author: qing
...
...
@@ -23,7 +23,7 @@ public class LoginContextHolder {
holder
.
remove
();
}
public
static
User
DO
getLoginUser
()
{
public
static
User
getLoginUser
()
{
LoginContext
context
=
holder
.
get
();
return
context
==
null
?
null
:
context
.
getUser
();
}
...
...
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/Organization
DO
.java
→
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/Organization.java
浏览文件 @
66616f21
...
...
@@ -3,5 +3,5 @@ package com.itlong.whatsmars.earth.domain.pojo;
/**
* Created by shenhongxi on 2016/6/8.
*/
public
class
Organization
DO
{
public
class
Organization
{
}
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/User
DO
.java
→
whatsmars-earth-domain/src/main/java/com/itlong/whatsmars/earth/domain/pojo/User.java
浏览文件 @
66616f21
...
...
@@ -7,7 +7,7 @@ import java.util.Set;
/**
* Created by shenhongxi on 2016/4/29.
*/
public
class
User
DO
implements
Serializable
{
public
class
User
implements
Serializable
{
private
Integer
id
;
...
...
whatsmars-earth-service/src/main/java/com/itlong/whatsmars/earth/service/impl/OrganizationServiceImpl.java
浏览文件 @
66616f21
...
...
@@ -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.Organization
DO
;
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
<
Organization
DO
>
qr
=
this
.
organizationDao
.
query
(
query
);
Collection
<
Organization
DO
>
organizations
=
qr
.
getResultList
();
QueryResult
<
Organization
>
qr
=
this
.
organizationDao
.
query
(
query
);
Collection
<
Organization
>
organizations
=
qr
.
getResultList
();
result
.
addModel
(
"query"
,
query
);
result
.
addModel
(
"queryResult"
,
qr
);
result
.
addModel
(
"organizations"
,
organizations
);
...
...
whatsmars-earth-web/src/main/java/com/itlong/whatsmars/earth/web/interceptor/LoginInterceptor.java
浏览文件 @
66616f21
...
...
@@ -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.User
DO
;
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
());
User
DO
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
)
{
User
DO
user
=
LoginContextHolder
.
getLoginUser
();
User
user
=
LoginContextHolder
.
getLoginUser
();
modelAndView
.
addObject
(
"loginUser"
,
user
);
}
}
...
...
@@ -69,7 +69,7 @@ public class LoginInterceptor implements HandlerInterceptor{
}
protected
User
DO
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
;
}
User
DO
user
=
new
UserDO
();
User
user
=
new
User
();
user
.
setId
(
json
.
getInt
(
"id"
));
user
.
setName
(
json
.
getString
(
"name"
));
...
...
whatsmars-spring/src/main/java/com/itlong/whatsmars/spring/TestSpring.java
浏览文件 @
66616f21
...
...
@@ -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
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录