Skip to content

Commit 2d4ce4e

Browse files
diyhidiyhi
committed
更新
1 parent fadaf7f commit 2d4ce4e

29 files changed

+642
-118
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>bbs</groupId>
44
<artifactId>bbs</artifactId>
5-
<version>6.7</version>
5+
<version>6.8</version>
66
<packaging>war</packaging>
77
<name>bbs</name>
88
<description/>

‎src/main/java/cms/bean/setting/EmailSetting.java‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
package cms.bean.setting;
2+
3+
import java.io.Serializable;
4+
import java.util.ArrayList;
5+
import java.util.HashMap;
6+
import java.util.LinkedHashMap;
7+
import java.util.List;
8+
import java.util.Map;
9+
10+
import javax.persistence.Entity;
11+
import javax.persistence.Id;
12+
import javax.persistence.Lob;
13+
import javax.persistence.Transient;
14+
15+
/**
16+
* 邮箱设置
17+
* @author Gao
18+
*
19+
*/
20+
@Entity
21+
public class EmailSetting implements Serializable{
22+
private static final long serialVersionUID = 6319218594788894261L;
23+
24+
/** Id **/
25+
@Id
26+
private Integer id;
27+
28+
/** 发送邮件SMTP服务器 **/
29+
private String host;
30+
/** 邮件服务器端口 **/
31+
private Integer port;
32+
/** 邮箱账号 **/
33+
private String account;
34+
/** 邮箱密码 **/
35+
private String password;
36+
/** 支持收信的邮箱 存储JSON格式的List<String>类型 **/
37+
@Lob
38+
private String supportedMailboxes;
39+
/** 支持收信的邮箱 List<String> **/
40+
@Transient
41+
private List<String> supportedMailboxesList = new ArrayList<String>();
42+
43+
/** 邮件 存储JSON格式的LinkedHashMap<Integer,Mail>类型 **/
44+
@Lob
45+
private String mail;
46+
/** 邮件 key:类型(10、验证码 20、注册完成消息) value: Mail **/
47+
@Transient
48+
private Map<Integer,Mail> mailMap = new LinkedHashMap<Integer,Mail>();
49+
50+
51+
/** 版本 **/
52+
private Long version = 0L;
53+
54+
55+
public Integer getId() {
56+
return id;
57+
}
58+
59+
60+
public void setId(Integer id) {
61+
this.id = id;
62+
}
63+
64+
65+
public String getHost() {
66+
return host;
67+
}
68+
69+
70+
public void setHost(String host) {
71+
this.host = host;
72+
}
73+
74+
75+
public Integer getPort() {
76+
return port;
77+
}
78+
79+
80+
public void setPort(Integer port) {
81+
this.port = port;
82+
}
83+
84+
85+
public String getAccount() {
86+
return account;
87+
}
88+
89+
90+
public void setAccount(String account) {
91+
this.account = account;
92+
}
93+
94+
95+
public String getPassword() {
96+
return password;
97+
}
98+
99+
100+
public void setPassword(String password) {
101+
this.password = password;
102+
}
103+
104+
105+
public String getMail() {
106+
return mail;
107+
}
108+
109+
110+
public void setMail(String mail) {
111+
this.mail = mail;
112+
}
113+
114+
115+
public Map<Integer, Mail> getMailMap() {
116+
return mailMap;
117+
}
118+
119+
120+
public void setMailMap(Map<Integer, Mail> mailMap) {
121+
this.mailMap = mailMap;
122+
}
123+
124+
125+
public Long getVersion() {
126+
return version;
127+
}
128+
129+
130+
public void setVersion(Long version) {
131+
this.version = version;
132+
}
133+
134+
135+
public String getSupportedMailboxes() {
136+
return supportedMailboxes;
137+
}
138+
139+
140+
public void setSupportedMailboxes(String supportedMailboxes) {
141+
this.supportedMailboxes = supportedMailboxes;
142+
}
143+
144+
145+
public List<String> getSupportedMailboxesList() {
146+
return supportedMailboxesList;
147+
}
148+
149+
150+
public void setSupportedMailboxesList(List<String> supportedMailboxesList) {
151+
this.supportedMailboxesList = supportedMailboxesList;
152+
}
153+
154+
155+
156+
157+
158+
}

‎src/main/java/cms/bean/setting/Mail.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package cms.bean.setting;
2+
3+
import java.io.Serializable;
4+
import java.util.HashMap;
5+
import java.util.Map;
6+
7+
/**
8+
* 邮件
9+
* @author Gao
10+
*
11+
*/
12+
public class Mail implements Serializable{
13+
private static final long serialVersionUID = 8481168977115985562L;
14+
15+
/** 类型 10：验证码 20：注册完成消息 **/
16+
private Integer type;
17+
/** 标题 **/
18+
private String title;
19+
/** 模板 **/
20+
private String template;
21+
22+
/** 多语言扩展 key:字段-语言（例如：name-en_US） value:内容**/
23+
private Map<String,String> multiLanguageExtensionMap = new HashMap<String,String>();
24+
25+
26+
public Integer getType() {
27+
return type;
28+
}
29+
public void setType(Integer type) {
30+
this.type = type;
31+
}
32+
public String getTitle() {
33+
return title;
34+
}
35+
public void setTitle(String title) {
36+
this.title = title;
37+
}
38+
public String getTemplate() {
39+
return template;
40+
}
41+
public void setTemplate(String template) {
42+
this.template = template;
43+
}
44+
public Map<String, String> getMultiLanguageExtensionMap() {
45+
return multiLanguageExtensionMap;
46+
}
47+
public void setMultiLanguageExtensionMap(Map<String, String> multiLanguageExtensionMap) {
48+
this.multiLanguageExtensionMap = multiLanguageExtensionMap;
49+
}
50+
51+
52+
53+
}

‎src/main/java/cms/bean/setting/MailModule.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package cms.bean.setting;
2+
3+
import java.io.Serializable;
4+
import java.util.LinkedHashMap;
5+
import java.util.Map;
6+
7+
/**
8+
* 邮件模块
9+
* @author Gao
10+
*
11+
*/
12+
public class MailModule implements Serializable{
13+
private static final long serialVersionUID = -5846097613553150990L;
14+
15+
/** 类型 10：验证码 20：注册完成消息 **/
16+
private Integer type;
17+
/** 名称 **/
18+
private String name;
19+
/** 支持变量 key:变量字段 value:备注 **/
20+
private Map<String,String> variableMap = new LinkedHashMap<String,String>();
21+
22+
public void addVariable(String key, String value) {
23+
variableMap.put(key, value);
24+
}
25+
26+
public Integer getType() {
27+
return type;
28+
}
29+
public void setType(Integer type) {
30+
this.type = type;
31+
}
32+
public String getName() {
33+
return name;
34+
}
35+
public void setName(String name) {
36+
this.name = name;
37+
}
38+
public Map<String, String> getVariableMap() {
39+
return variableMap;
40+
}
41+
public void setVariableMap(Map<String, String> variableMap) {
42+
this.variableMap = variableMap;
43+
}
44+
}

‎src/main/java/cms/bean/user/User.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
@Table(name="user",uniqueConstraints = {
3131
@UniqueConstraint(columnNames={"account"}),
3232
@UniqueConstraint(columnNames={"platformUserId"}
33-
)},indexes = {@Index(name="user_idx", columnList="state"),@Index(name="user_2_idx", columnList="userName")}
33+
)},indexes = {@Index(name="user_idx", columnList="state"),@Index(name="user_2_idx", columnList="userName"),@Index(name="user_3_idx", columnList="nickname"),@Index(name="user_4_idx", columnList="mobile"),@Index(name="user_5_idx", columnList="email")}
3434
)//给user字段添加唯一性约束
3535
public class User implements Serializable{
3636
private static final long serialVersionUID = 3692366870616346904L;

‎src/main/java/cms/service/help/impl/HelpTypeServiceBean.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public Integer deleteHelpType(HelpType helpType){
207207

208208
if(helpType.getParentId() >0L){
209209
//将父类计数减一
210-
Query query = em.createQuery("update HelpType o set o.childNodeNumber=childNodeNumber-1 where o.id=?1")
210+
Query query = em.createQuery("update HelpType o set o.childNodeNumber=o.childNodeNumber-1 where o.id=?1")
211211
.setParameter(1, helpType.getParentId());
212212
query.executeUpdate();
213213
}
@@ -320,7 +320,7 @@ public Integer mergerHelpType(Long helpTypeId,HelpType mergerHelpType){
320320
if(i_delete>0){
321321
if(mergerHelpType.getParentId() >0L){
322322
//将父类计数减一
323-
Query query_ = em.createQuery("update HelpType o set o.childNodeNumber=childNodeNumber-1 where o.id=?1")
323+
Query query_ = em.createQuery("update HelpType o set o.childNodeNumber=o.childNodeNumber-1 where o.id=?1")
324324
.setParameter(1, mergerHelpType.getParentId());
325325
query_.executeUpdate();
326326
}

‎src/main/java/cms/service/question/impl/AnswerServiceBean.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,11 +599,11 @@ public Integer updateReply(Long answerReplyId,String content,String userName,Int
599599
* @return
600600
*/
601601
public Integer updateReply(Long replyId,String content,String userName,Integer status,Date lastUpdateTime){
602-
Query query = em.createQuery("update AnswerReply o set o.content=?1,o.userName=?2,o.status=?3,o.status=?4 where o.id=?5")
602+
Query query = em.createQuery("update AnswerReply o set o.content=?1,o.userName=?2,o.status=?3,o.lastUpdateTime=?4 where o.id=?5")
603603
.setParameter(1, content)
604604
.setParameter(2, userName)
605605
.setParameter(3, status)
606-
.setParameter(4, status)
606+
.setParameter(4, lastUpdateTime)
607607
.setParameter(5, replyId);
608608
int i = query.executeUpdate();
609609
return i;

‎src/main/java/cms/utils/StringUtil.java‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -135,26 +135,17 @@ public static String deleteWhitespace(String txt){
135135
}
136136

137137
/**
138-
* 转义like语句中的
139-
* <code>'_'</code><code>'%'</code>
140-
* 将<code>'?'</code>转成sql的<code>'/_'</code>
141-
* 将<code>'%'</code>转成sql的<code>'/%'</code>
142-
* <p>
143-
* 例如搜索<code>?aa*bb?c_d%f</code>将转化成<br/>
144-
* <code>_aa%bb_c/_d/%f</code>
145-
* </p>
138+
* 转义like语句中的通配符
146139
* @param likeStr
147-
* @return
148-
* @author <a href="http://jdkcn.com" mce_href="http://jdkcn.com">somebody</a>
140+
* @return
149141
*/
150142
public static String escapeSQLLike(String likeStr) {
151-
String str = StringUtils.replace(likeStr, "_", "/_");
152-
str = StringUtils.replace(str, "%", "/%");
153-
str = StringUtils.replace(str, "?", "_");
154-
str = StringUtils.replace(str, "*", "%");
143+
String str = StringUtils.replace(likeStr, "/", "//");
144+
str = StringUtils.replace(str, "%", "/%");
145+
str = StringUtils.replace(str, "_", "/_");
146+
str = StringUtils.replace(str, "[", "/[");
147+
str = StringUtils.replace(str, "]", "/]");
155148
return str;
156149
}
157150

158-
159-
160151
}

‎src/main/java/cms/utils/WebUtil.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,25 @@ public class WebUtil {
5757

5858
/**
5959
* 添加cookie
60+
* @param request
6061
* @param response
6162
* @param name cookie的名称
6263
* @param value cookie的值
6364
* @param maxAge cookie存放的时间(以秒为单位,假如存放三天,即3*24*60*60; 如果值为0,cookie将随浏览器关闭而清除)
6465
*/
65-
public static void addCookie(HttpServletResponse response, String name, String value, int maxAge) {
66-
addCookie(response,name,value,maxAge,true);
66+
public static void addCookie(HttpServletRequest request,HttpServletResponse response, String name, String value, int maxAge) {
67+
addCookie(request,response,name,value,maxAge,true);
6768
}
6869
/**
6970
* 添加cookie
71+
* @param request
7072
* @param response
7173
* @param name cookie的名称
7274
* @param value cookie的值
7375
* @param maxAge cookie存放的时间(以秒为单位,假如存放三天,即3*24*60*60; 如果值为0,cookie将随浏览器关闭而清除)
7476
* @param httpOnly 标记是否对Cookie使用 HttpOnly 标志。如果设置为true，客户端的 JavaScript 将无法访问Cookie
7577
*/
76-
public static void addCookie(HttpServletResponse response, String name, String value, int maxAge,boolean httpOnly) {
78+
public static void addCookie(HttpServletRequest request,HttpServletResponse response, String name, String value, int maxAge,boolean httpOnly) {
7779

7880
if(value != null && !"".equals(value.trim())){
7981
try {
@@ -92,6 +94,8 @@ public static void addCookie(HttpServletResponse response, String name, String v
9294
cookie.setPath("/");//根目录下的所有程序都可以访问cookie
9395
if (maxAge>0) cookie.setMaxAge(maxAge);
9496

97+
cookie.setSecure(StringUtils.startsWithIgnoreCase(request.getScheme(), "https") || request.isSecure());
98+
9599
response.addCookie(cookie); ;
96100
}
97101

‎src/main/java/cms/web/action/AdminManageAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public String login(ModelMap model,String username,String password,String captch
285285
}else{//登录失败
286286

287287
if(username != null && !"".equals(username.trim())){
288-
WebUtil.addCookie(response, "cms_staffName", username, 120);
288+
WebUtil.addCookie(request,response, "cms_staffName", username, 120);
289289
Integer original = staffManage.getLoginFailureCount(username);//原来总次数
290290
if(original != null){
291291
staffManage.addLoginFailureCount(username,original+1);

0 commit comments

Comments
 (0)