Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ryanxhl
spring-mvc-mini
提交
8a06a060
S
spring-mvc-mini
项目概览
Ryanxhl
/
spring-mvc-mini
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-mvc-mini
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
8a06a060
编写于
6月 09, 2015
作者:
H
hot13399
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactro accroding to inspire
上级
c006f432
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
70 addition
and
80 deletion
+70
-80
pom.xml
pom.xml
+5
-0
src/main/java/com/spring/mvc/mini/json/RequestStatusJsonParser.java
...ava/com/spring/mvc/mini/json/RequestStatusJsonParser.java
+1
-1
src/main/java/com/spring/mvc/mini/mail/MailSender.java
src/main/java/com/spring/mvc/mini/mail/MailSender.java
+3
-3
src/main/java/com/spring/mvc/mini/pojo/ObjectClass.java
src/main/java/com/spring/mvc/mini/pojo/ObjectClass.java
+8
-11
src/main/java/com/spring/mvc/mini/pojo/ObjectClassesType.java
...main/java/com/spring/mvc/mini/pojo/ObjectClassesType.java
+1
-1
src/main/java/com/spring/mvc/mini/pojo/RequestStatus.java
src/main/java/com/spring/mvc/mini/pojo/RequestStatus.java
+8
-8
src/main/java/com/spring/mvc/mini/pojo/RequestStatusListType.java
.../java/com/spring/mvc/mini/pojo/RequestStatusListType.java
+2
-2
src/main/java/com/spring/mvc/mini/pojo/StatusType.java
src/main/java/com/spring/mvc/mini/pojo/StatusType.java
+1
-1
src/main/java/com/spring/mvc/mini/pojo/UserInfo.java
src/main/java/com/spring/mvc/mini/pojo/UserInfo.java
+3
-3
src/main/java/com/spring/mvc/mini/schedule/ScheduleFileUpdator.java
...ava/com/spring/mvc/mini/schedule/ScheduleFileUpdator.java
+5
-6
src/main/java/com/spring/mvc/mini/svn/SVNHandler.java
src/main/java/com/spring/mvc/mini/svn/SVNHandler.java
+3
-3
src/main/java/com/spring/mvc/mini/validation/ObjectClassDataValidator.java
.../spring/mvc/mini/validation/ObjectClassDataValidator.java
+2
-2
src/main/java/com/spring/mvc/mini/web/ObjectClassFormController.java
...va/com/spring/mvc/mini/web/ObjectClassFormController.java
+6
-6
src/main/java/com/spring/mvc/mini/web/ObjectClassXmlController.java
...ava/com/spring/mvc/mini/web/ObjectClassXmlController.java
+1
-1
src/main/java/com/spring/mvc/mini/web/ObjectClassesController.java
...java/com/spring/mvc/mini/web/ObjectClassesController.java
+6
-10
src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
...java/com/spring/mvc/mini/web/RequestStatusController.java
+4
-4
src/main/java/com/spring/mvc/mini/web/UserInfoFormController.java
.../java/com/spring/mvc/mini/web/UserInfoFormController.java
+3
-3
src/main/java/com/spring/mvc/mini/xml/ObjectClassXMLPaser.java
...ain/java/com/spring/mvc/mini/xml/ObjectClassXMLPaser.java
+6
-9
src/main/java/org/springframework/mvc/extensions/ajax/AjaxUtils.java
...va/org/springframework/mvc/extensions/ajax/AjaxUtils.java
+1
-5
src/test/java/com/spring/mvc/mini/json/RequestStatusJsonParserTest1.java
...om/spring/mvc/mini/json/RequestStatusJsonParserTest1.java
+1
-1
未找到文件。
pom.xml
浏览文件 @
8a06a060
...
@@ -191,6 +191,11 @@
...
@@ -191,6 +191,11 @@
<version>
2.3
</version>
<version>
2.3
</version>
</dependency>
</dependency>
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
4.12
</version>
</dependency>
</dependencies>
</dependencies>
<repositories>
<repositories>
<!-- For testing against latest Spring snapshots -->
<!-- For testing against latest Spring snapshots -->
...
...
src/main/java/com/spring/mvc/mini/json/RequestStatusJsonParser.java
浏览文件 @
8a06a060
...
@@ -18,7 +18,7 @@ import com.spring.mvc.mini.properties.Properties;
...
@@ -18,7 +18,7 @@ import com.spring.mvc.mini.properties.Properties;
@Component
@Component
public
class
RequestStatusJsonParser
{
public
class
RequestStatusJsonParser
{
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
RequestStatusJsonParser
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
RequestStatusJsonParser
.
class
);
@Autowired
@Autowired
private
Properties
properties
;
private
Properties
properties
;
...
...
src/main/java/com/spring/mvc/mini/mail/MailSender.java
浏览文件 @
8a06a060
...
@@ -20,8 +20,8 @@ import com.spring.mvc.mini.properties.Properties;
...
@@ -20,8 +20,8 @@ import com.spring.mvc.mini.properties.Properties;
@Component
@Component
public
class
MailSender
{
public
class
MailSender
{
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
MailSender
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
MailSender
.
class
);
@Autowired
@Autowired
private
Properties
properties
;
private
Properties
properties
;
...
@@ -41,7 +41,7 @@ public class MailSender {
...
@@ -41,7 +41,7 @@ public class MailSender {
message
.
setRecipients
(
Message
.
RecipientType
.
TO
,
toAddress
);
message
.
setRecipients
(
Message
.
RecipientType
.
TO
,
toAddress
);
Transport
.
send
(
message
);
Transport
.
send
(
message
);
LOG
.
info
(
"Send Mail Done: "
+
fromAddress
+
" to"
+
toAddress
);
LOG
.
info
(
"Send Mail Done: "
+
fromAddress
+
" to"
+
toAddress
.
toString
()
);
}
}
...
...
src/main/java/com/spring/mvc/mini/pojo/ObjectClass.java
浏览文件 @
8a06a060
...
@@ -12,21 +12,21 @@ public class ObjectClass implements Serializable {
...
@@ -12,21 +12,21 @@ public class ObjectClass implements Serializable {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
@NotNull
@NotNull
String
id
;
private
String
id
;
@NotNull
@NotNull
int
intclass
;
private
int
intclass
;
@NotNull
@NotNull
String
abbreviation
;
private
String
abbreviation
;
@NotNull
@NotNull
String
packageName
;
private
String
packageName
;
@NotNull
@NotNull
String
name
;
private
String
name
;
@NotNull
@NotNull
String
parents
;
private
String
parents
;
String
comment
;
private
String
comment
;
public
String
getId
()
{
public
String
getId
()
{
return
id
;
return
id
;
...
@@ -114,9 +114,6 @@ public class ObjectClass implements Serializable {
...
@@ -114,9 +114,6 @@ public class ObjectClass implements Serializable {
if
(
this
.
parents
.
contains
(
searchcritical
))
{
if
(
this
.
parents
.
contains
(
searchcritical
))
{
return
true
;
return
true
;
}
}
if
(
String
.
valueOf
(
this
.
intclass
).
contains
(
searchcritical
))
{
return
String
.
valueOf
(
this
.
intclass
).
contains
(
searchcritical
);
return
true
;
}
return
false
;
}
}
}
}
src/main/java/com/spring/mvc/mini/pojo/ObjectClassesType.java
浏览文件 @
8a06a060
...
@@ -4,7 +4,7 @@ import java.util.ArrayList;
...
@@ -4,7 +4,7 @@ import java.util.ArrayList;
public
class
ObjectClassesType
{
public
class
ObjectClassesType
{
ArrayList
<
ObjectClass
>
objectClasses
;
private
ArrayList
<
ObjectClass
>
objectClasses
;
public
ArrayList
<
ObjectClass
>
getObjectClasses
()
{
public
ArrayList
<
ObjectClass
>
getObjectClasses
()
{
return
objectClasses
;
return
objectClasses
;
...
...
src/main/java/com/spring/mvc/mini/pojo/RequestStatus.java
浏览文件 @
8a06a060
...
@@ -4,14 +4,14 @@ import java.util.Date;
...
@@ -4,14 +4,14 @@ import java.util.Date;
public
class
RequestStatus
{
public
class
RequestStatus
{
int
id
;
private
int
id
;
Date
submitDate
;
private
Date
submitDate
;
Date
commitDate
;
private
Date
commitDate
;
Date
holdDate
;
private
Date
holdDate
;
ObjectClassesType
objectClassesType
;
private
ObjectClassesType
objectClassesType
;
UserInfo
userinfo
;
private
UserInfo
userinfo
;
StatusType
status
;
private
StatusType
status
;
String
comments
;
private
String
comments
;
public
Date
getSubmitDate
()
{
public
Date
getSubmitDate
()
{
return
submitDate
;
return
submitDate
;
...
...
src/main/java/com/spring/mvc/mini/pojo/RequestStatusListType.java
浏览文件 @
8a06a060
...
@@ -3,8 +3,8 @@ package com.spring.mvc.mini.pojo;
...
@@ -3,8 +3,8 @@ package com.spring.mvc.mini.pojo;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
public
class
RequestStatusListType
{
public
class
RequestStatusListType
{
ArrayList
<
RequestStatus
>
requestStatuses
;
private
ArrayList
<
RequestStatus
>
requestStatuses
;
public
ArrayList
<
RequestStatus
>
getRequestStatuses
()
{
public
ArrayList
<
RequestStatus
>
getRequestStatuses
()
{
return
requestStatuses
;
return
requestStatuses
;
...
...
src/main/java/com/spring/mvc/mini/pojo/StatusType.java
浏览文件 @
8a06a060
package
com.spring.mvc.mini.pojo
;
package
com.spring.mvc.mini.pojo
;
public
enum
StatusType
{
public
enum
StatusType
{
ongoing
,
hold
,
commited
,
withdraw
;
ongoing
,
hold
,
commited
,
withdraw
}
}
\ No newline at end of file
src/main/java/com/spring/mvc/mini/pojo/UserInfo.java
浏览文件 @
8a06a060
...
@@ -6,11 +6,11 @@ import com.spring.mvc.mini.password.PasswordJasypter;
...
@@ -6,11 +6,11 @@ import com.spring.mvc.mini.password.PasswordJasypter;
public
class
UserInfo
{
public
class
UserInfo
{
@NotNull
@NotNull
String
username
;
private
String
username
;
@NotNull
@NotNull
String
email
;
private
String
email
;
@NotNull
@NotNull
String
password
;
private
String
password
;
public
String
getUsername
()
{
public
String
getUsername
()
{
return
username
;
return
username
;
...
...
src/main/java/com/spring/mvc/mini/schedule/ScheduleFileUpdator.java
浏览文件 @
8a06a060
...
@@ -25,19 +25,19 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
...
@@ -25,19 +25,19 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
public
class
ScheduleFileUpdator
{
public
class
ScheduleFileUpdator
{
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
ScheduleFileUpdator
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
ScheduleFileUpdator
.
class
);
@Autowired
@Autowired
RequestStatusJsonParser
jsonParser
;
private
RequestStatusJsonParser
jsonParser
;
@Autowired
@Autowired
SVNHandler
svnHandler
;
private
SVNHandler
svnHandler
;
@Autowired
@Autowired
ObjectClassXMLPaser
objectClassXMLPaser
;
private
ObjectClassXMLPaser
objectClassXMLPaser
;
@Autowired
@Autowired
MailSender
mailSender
;
private
MailSender
mailSender
;
public
void
commitObjectClassXml
()
{
public
void
commitObjectClassXml
()
{
Calendar
calendar
=
Calendar
.
getInstance
();
Calendar
calendar
=
Calendar
.
getInstance
();
...
@@ -47,7 +47,6 @@ public class ScheduleFileUpdator {
...
@@ -47,7 +47,6 @@ public class ScheduleFileUpdator {
ArrayList
<
RequestStatus
>
requestStatuses
=
jsonParser
.
readStatus
();
ArrayList
<
RequestStatus
>
requestStatuses
=
jsonParser
.
readStatus
();
int
requestStatusIndex
=
0
;
for
(
RequestStatus
status
:
requestStatuses
)
{
for
(
RequestStatus
status
:
requestStatuses
)
{
int
daysBetweenSubmitAndCurrent
=
Days
.
daysBetween
(
new
DateTime
(
status
.
getSubmitDate
()),
new
DateTime
(
currentTime
)).
getDays
();
int
daysBetweenSubmitAndCurrent
=
Days
.
daysBetween
(
new
DateTime
(
status
.
getSubmitDate
()),
new
DateTime
(
currentTime
)).
getDays
();
...
...
src/main/java/com/spring/mvc/mini/svn/SVNHandler.java
浏览文件 @
8a06a060
...
@@ -26,14 +26,14 @@ import com.spring.mvc.mini.properties.Properties;
...
@@ -26,14 +26,14 @@ import com.spring.mvc.mini.properties.Properties;
@Component
@Component
public
class
SVNHandler
{
public
class
SVNHandler
{
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
SVNHandler
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
SVNHandler
.
class
);
@Autowired
@Autowired
private
Properties
properties
;
private
Properties
properties
;
public
void
svnCheckin
()
{
public
void
svnCheckin
()
{
SVNRepository
repository
=
null
;
SVNRepository
repository
;
SVNClientManager
ourClientManager
=
SVNClientManager
.
newInstance
();
SVNClientManager
ourClientManager
=
SVNClientManager
.
newInstance
();
...
@@ -91,7 +91,7 @@ public class SVNHandler {
...
@@ -91,7 +91,7 @@ public class SVNHandler {
return
;
return
;
}
}
SVNRepository
repository
=
null
;
SVNRepository
repository
;
try
{
try
{
//initiate the reporitory from the url
//initiate the reporitory from the url
...
...
src/main/java/com/spring/mvc/mini/validation/ObjectClassDataValidator.java
浏览文件 @
8a06a060
...
@@ -14,7 +14,7 @@ public class ObjectClassDataValidator {
...
@@ -14,7 +14,7 @@ public class ObjectClassDataValidator {
@Autowired
@Autowired
private
ObjectClassXMLPaser
ocxp
;
private
ObjectClassXMLPaser
ocxp
;
public
void
checkData
(
ArrayList
<
ObjectClass
>
objclsListFormIn
)
throws
ObjectClassDataValidationException
,
Exception
{
public
void
checkData
(
ArrayList
<
ObjectClass
>
objclsListFormIn
)
throws
Exception
{
ArrayList
<
ObjectClass
>
objclsListXmlIn
=
ocxp
.
objectClassMapping
();
ArrayList
<
ObjectClass
>
objclsListXmlIn
=
ocxp
.
objectClassMapping
();
...
@@ -52,7 +52,7 @@ public class ObjectClassDataValidator {
...
@@ -52,7 +52,7 @@ public class ObjectClassDataValidator {
}
}
public
void
checkmocrid
(
String
mocrid
,
int
latestmocrid
)
throws
ObjectClassDataValidationException
,
Exception
{
public
void
checkmocrid
(
String
mocrid
,
int
latestmocrid
)
throws
Exception
{
if
(
Integer
.
parseInt
(
mocrid
)
<=
latestmocrid
){
if
(
Integer
.
parseInt
(
mocrid
)
<=
latestmocrid
){
throw
new
ObjectClassDataValidationException
(
"FAILED:MO CR ID:\""
+
mocrid
+
"\" is not valid anymore, please refresh and recommit again."
);
throw
new
ObjectClassDataValidationException
(
"FAILED:MO CR ID:\""
+
mocrid
+
"\" is not valid anymore, please refresh and recommit again."
);
}
}
...
...
src/main/java/com/spring/mvc/mini/web/ObjectClassFormController.java
浏览文件 @
8a06a060
...
@@ -35,19 +35,19 @@ import com.spring.mvc.mini.validation.ObjectClassDataValidator;
...
@@ -35,19 +35,19 @@ import com.spring.mvc.mini.validation.ObjectClassDataValidator;
@SessionAttributes
({
"ojbclslisttype"
,
"userinfo"
,
"mocrid"
})
@SessionAttributes
({
"ojbclslisttype"
,
"userinfo"
,
"mocrid"
})
public
class
ObjectClassFormController
{
public
class
ObjectClassFormController
{
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
ObjectClassFormController
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
ObjectClassFormController
.
class
);
@Autowired
@Autowired
RequestStatusJsonParser
requestStatusJsonParser
;
private
RequestStatusJsonParser
requestStatusJsonParser
;
@Autowired
@Autowired
ObjectClassDataValidator
objectClassDataValidator
;
private
ObjectClassDataValidator
objectClassDataValidator
;
@Autowired
@Autowired
Properties
properties
;
private
Properties
properties
;
@Autowired
@Autowired
MailSender
mailSender
;
private
MailSender
mailSender
;
@ModelAttribute
@ModelAttribute
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
...
@@ -139,7 +139,7 @@ public class ObjectClassFormController {
...
@@ -139,7 +139,7 @@ public class ObjectClassFormController {
String
message
=
"MO CR:"
+
mocrid
+
" committed. System will send mail to reviewers."
;
String
message
=
"MO CR:"
+
mocrid
+
" committed. System will send mail to reviewers."
;
if
(
ajaxRequest
)
{
if
(
ajaxRequest
)
{
model
.
addAttribute
(
"message"
,
message
.
toString
()
);
model
.
addAttribute
(
"message"
,
message
);
return
null
;
return
null
;
}
else
{
}
else
{
redirectAttrs
.
addFlashAttribute
(
"message"
,
message
);
redirectAttrs
.
addFlashAttribute
(
"message"
,
message
);
...
...
src/main/java/com/spring/mvc/mini/web/ObjectClassXmlController.java
浏览文件 @
8a06a060
...
@@ -26,7 +26,7 @@ public class ObjectClassXmlController {
...
@@ -26,7 +26,7 @@ public class ObjectClassXmlController {
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
ObjectClassXmlController
.
class
);
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
ObjectClassXmlController
.
class
);
@Autowired
@Autowired
ObjectClassXMLPaser
objectClassXMLPaser
;
private
ObjectClassXMLPaser
objectClassXMLPaser
;
@ModelAttribute
@ModelAttribute
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
...
...
src/main/java/com/spring/mvc/mini/web/ObjectClassesController.java
浏览文件 @
8a06a060
...
@@ -25,10 +25,10 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
...
@@ -25,10 +25,10 @@ import com.spring.mvc.mini.xml.ObjectClassXMLPaser;
@SessionAttributes
(
"productList"
)
@SessionAttributes
(
"productList"
)
public
class
ObjectClassesController
{
public
class
ObjectClassesController
{
static
Logger
LOG
=
LoggerFactory
.
getLogger
(
ObjectClassesController
.
class
);
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
ObjectClassesController
.
class
);
@Autowired
@Autowired
ObjectClassXMLPaser
objectClassXMLPaser
;
private
ObjectClassXMLPaser
objectClassXMLPaser
;
@ModelAttribute
@ModelAttribute
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
...
@@ -42,7 +42,7 @@ public class ObjectClassesController {
...
@@ -42,7 +42,7 @@ public class ObjectClassesController {
ArrayList
<
ObjectClass
>
ojbclslist
=
getObjectClasses
();
ArrayList
<
ObjectClass
>
ojbclslist
=
getObjectClasses
();
Collections
.
reverse
(
ojbclslist
);
Collections
.
reverse
(
ojbclslist
);
PagedListHolder
<
ArrayList
<
ObjectClass
>>
productList
=
new
PagedListHolder
(
ojbclslist
);
PagedListHolder
productList
=
new
PagedListHolder
(
ojbclslist
);
productList
.
setPageSize
(
100
);
productList
.
setPageSize
(
100
);
model
.
addAttribute
(
"productList"
,
productList
);
model
.
addAttribute
(
"productList"
,
productList
);
...
@@ -64,9 +64,7 @@ public class ObjectClassesController {
...
@@ -64,9 +64,7 @@ public class ObjectClassesController {
public
String
handleObjectClassPagination
(
Model
model
,
@ModelAttribute
(
"jumppage"
)
String
jumppage
,
@ModelAttribute
(
"productList"
)
PagedListHolder
<
ArrayList
<
ObjectClass
>>
productList
)
{
public
String
handleObjectClassPagination
(
Model
model
,
@ModelAttribute
(
"jumppage"
)
String
jumppage
,
@ModelAttribute
(
"productList"
)
PagedListHolder
<
ArrayList
<
ObjectClass
>>
productList
)
{
LOG
.
info
(
"@RequestMapping(params={\"jumppage\"}, method = RequestMethod.GET)"
);
LOG
.
info
(
"@RequestMapping(params={\"jumppage\"}, method = RequestMethod.GET)"
);
if
(
jumppage
==
null
)
{
if
(
jumppage
!=
null
)
{
}
else
{
if
(
"next"
.
equals
(
jumppage
))
{
if
(
"next"
.
equals
(
jumppage
))
{
productList
.
nextPage
();
productList
.
nextPage
();
...
@@ -86,9 +84,7 @@ public class ObjectClassesController {
...
@@ -86,9 +84,7 @@ public class ObjectClassesController {
LOG
.
info
(
"@RequestMapping(params={\"searchcritical\"}, method = RequestMethod.GET)"
);
LOG
.
info
(
"@RequestMapping(params={\"searchcritical\"}, method = RequestMethod.GET)"
);
ArrayList
<
ObjectClass
>
searchOjbclslist
=
null
;
ArrayList
<
ObjectClass
>
searchOjbclslist
=
null
;
if
(
searchcritical
==
null
)
{
if
(
searchcritical
!=
null
)
{
}
else
{
ArrayList
<
ObjectClass
>
ojbclslist
=
getObjectClasses
();
ArrayList
<
ObjectClass
>
ojbclslist
=
getObjectClasses
();
...
@@ -126,7 +122,7 @@ public class ObjectClassesController {
...
@@ -126,7 +122,7 @@ public class ObjectClassesController {
}
}
}
}
p
ublic
int
isInteger
(
String
s
)
{
p
rivate
int
isInteger
(
String
s
)
{
int
i
;
int
i
;
try
{
try
{
i
=
Integer
.
parseInt
(
s
);
i
=
Integer
.
parseInt
(
s
);
...
...
src/main/java/com/spring/mvc/mini/web/RequestStatusController.java
浏览文件 @
8a06a060
...
@@ -27,14 +27,14 @@ import com.spring.mvc.mini.pojo.UserInfo;
...
@@ -27,14 +27,14 @@ import com.spring.mvc.mini.pojo.UserInfo;
@Controller
@Controller
@RequestMapping
(
"/requeststatus"
)
@RequestMapping
(
"/requeststatus"
)
public
class
RequestStatusController
{
public
class
RequestStatusController
{
static
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
RequestStatusController
.
class
);
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
RequestStatusController
.
class
);
@Autowired
@Autowired
RequestStatusJsonParser
requestStatusJsonParser
;
private
RequestStatusJsonParser
requestStatusJsonParser
;
@Autowired
@Autowired
MailSender
ms
;
private
MailSender
ms
;
@ModelAttribute
@ModelAttribute
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
...
...
src/main/java/com/spring/mvc/mini/web/UserInfoFormController.java
浏览文件 @
8a06a060
...
@@ -25,7 +25,7 @@ import com.spring.mvc.mini.pojo.UserInfo;
...
@@ -25,7 +25,7 @@ import com.spring.mvc.mini.pojo.UserInfo;
public
class
UserInfoFormController
{
public
class
UserInfoFormController
{
@Autowired
@Autowired
MailSender
ms
;
private
MailSender
ms
;
@ModelAttribute
@ModelAttribute
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
public
void
ajaxAttribute
(
WebRequest
request
,
Model
model
)
{
...
@@ -67,8 +67,8 @@ public class UserInfoFormController {
...
@@ -67,8 +67,8 @@ public class UserInfoFormController {
return
"redirect:/"
;
return
"redirect:/"
;
}
}
}
}
p
ublic
void
loginAndSendMail
(
UserInfo
userinfo
)
throws
Exception
{
p
rivate
void
loginAndSendMail
(
UserInfo
userinfo
)
throws
Exception
{
String
subject
=
"Login successfully to mvc mini"
;
String
subject
=
"Login successfully to mvc mini"
;
String
text
=
"Welcome you,"
+
userinfo
.
getUsername
()+
"!\r\nYou can reserve the object classes now."
;
String
text
=
"Welcome you,"
+
userinfo
.
getUsername
()+
"!\r\nYou can reserve the object classes now."
;
...
...
src/main/java/com/spring/mvc/mini/xml/ObjectClassXMLPaser.java
浏览文件 @
8a06a060
...
@@ -30,7 +30,7 @@ import com.spring.mvc.mini.svn.SVNHandler;
...
@@ -30,7 +30,7 @@ import com.spring.mvc.mini.svn.SVNHandler;
@Component
@Component
public
class
ObjectClassXMLPaser
{
public
class
ObjectClassXMLPaser
{
static
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ObjectClassXMLPaser
.
class
);
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ObjectClassXMLPaser
.
class
);
@Autowired
@Autowired
private
Properties
properties
;
private
Properties
properties
;
...
@@ -88,15 +88,12 @@ public class ObjectClassXMLPaser {
...
@@ -88,15 +88,12 @@ public class ObjectClassXMLPaser {
}
}
private
void
setElementToObject
(
ObjectClass
objectClass
,
Element
node
)
{
private
void
setElementToObject
(
ObjectClass
objectClass
,
Element
node
)
{
objectClass
.
setId
(
node
.
getAttribute
(
"id"
).
toString
());
objectClass
.
setId
(
node
.
getAttribute
(
"id"
));
objectClass
.
setAbbreviation
(
node
.
getAttribute
(
"abbrev"
)
objectClass
.
setAbbreviation
(
node
.
getAttribute
(
"abbrev"
));
.
toString
());
objectClass
.
setIntclass
(
Integer
.
parseInt
(
node
.
getAttribute
(
"intclass"
)));
objectClass
.
setIntclass
(
Integer
.
parseInt
(
node
.
getAttribute
(
"intclass"
)));
objectClass
.
setName
(
node
.
getAttribute
(
"name"
).
toString
());
objectClass
.
setName
(
node
.
getAttribute
(
"name"
));
objectClass
.
setParents
(
node
.
getAttribute
(
"parents"
)
objectClass
.
setParents
(
node
.
getAttribute
(
"parents"
));
.
toString
());
objectClass
.
setPackageName
(
node
.
getAttribute
(
"adaID"
));
objectClass
.
setPackageName
(
node
.
getAttribute
(
"adaID"
)
.
toString
());
}
}
public
void
AddObjectClass
(
ObjectClass
objectClass
)
{
public
void
AddObjectClass
(
ObjectClass
objectClass
)
{
...
...
src/main/java/org/springframework/mvc/extensions/ajax/AjaxUtils.java
浏览文件 @
8a06a060
...
@@ -6,13 +6,9 @@ public class AjaxUtils {
...
@@ -6,13 +6,9 @@ public class AjaxUtils {
public
static
boolean
isAjaxRequest
(
WebRequest
webRequest
)
{
public
static
boolean
isAjaxRequest
(
WebRequest
webRequest
)
{
String
requestedWith
=
webRequest
.
getHeader
(
"X-Requested-With"
);
String
requestedWith
=
webRequest
.
getHeader
(
"X-Requested-With"
);
return
requestedWith
!=
null
?
"XMLHttpRequest"
.
equals
(
requestedWith
)
:
false
;
return
requestedWith
!=
null
&&
"XMLHttpRequest"
.
equals
(
requestedWith
)
;
}
}
public
static
boolean
isAjaxUploadRequest
(
WebRequest
webRequest
)
{
return
webRequest
.
getParameter
(
"ajaxUpload"
)
!=
null
;
}
private
AjaxUtils
()
{}
private
AjaxUtils
()
{}
}
}
src/test/java/com/spring/mvc/mini/json/RequestStatusJsonParserTest1.java
浏览文件 @
8a06a060
...
@@ -18,7 +18,7 @@ import java.util.Date;
...
@@ -18,7 +18,7 @@ import java.util.Date;
public
class
RequestStatusJsonParserTest1
{
public
class
RequestStatusJsonParserTest1
{
@Resource
@Resource
RequestStatusJsonParser
requestStatusJsonParser
;
private
RequestStatusJsonParser
requestStatusJsonParser
;
@Test
@Test
public
void
test_writeStatus
(){
public
void
test_writeStatus
(){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录