Skip to content

Commit d254e8a

Browse files
author
shimingxy
committed
v1.3 RC
1 parent d10d444 commit d254e8a

File tree

6 files changed

+417
-432
lines changed

6 files changed

+417
-432
lines changed
Lines changed: 68 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,83 @@
1-
/**
2-
*
3-
*/
41
package org.maxkey.config;
52

63
import java.io.UnsupportedEncodingException;
7-
84
import org.springframework.beans.factory.annotation.Value;
95
import org.springframework.context.annotation.Configuration;
106
import org.springframework.context.annotation.PropertySource;
117

128
/**
13-
* 字符集转换及转换配置
9+
* 字符集转换及转换配置.
10+
*
1411
* @author Crystal.Sea
1512
*
1613
*/
1714
@Configuration
1815
@PropertySource("classpath:/config/applicationConfig.properties")
1916
public class CharacterEncodingConfig {
20-
21-
/**
22-
* 源字符集
23-
*/
24-
@Value("${config.characterencoding.charset.from}")
25-
String fromCharSet;
26-
27-
/**
28-
* 目标字符集
29-
*/
30-
@Value("${config.characterencoding.charset.to}")
31-
String toCharSet;
32-
33-
/**
34-
* 转换标志
35-
*/
36-
@Value("${config.characterencoding.encoding}")
37-
boolean encoding = false;
38-
39-
40-
public CharacterEncodingConfig() {
41-
42-
}
43-
44-
/**
45-
* @return the fromCharSet
46-
*/
47-
public String getFromCharSet() {
48-
return fromCharSet;
49-
}
50-
51-
/**
52-
* @param fromCharSet the fromCharSet to set
53-
*/
54-
public void setFromCharSet(String fromCharSet) {
55-
this.fromCharSet = fromCharSet;
56-
}
57-
58-
/**
59-
* @return the toCharSet
60-
*/
61-
public String getToCharSet() {
62-
return toCharSet;
63-
}
64-
65-
/**
66-
* @param toCharSet the toCharSet to set
67-
*/
68-
public void setToCharSet(String toCharSet) {
69-
this.toCharSet = toCharSet;
70-
}
71-
72-
/**
73-
* @return the encoding
74-
*/
75-
public boolean isEncoding() {
76-
return encoding;
77-
}
78-
79-
/**
80-
* @param encoding the encoding to set
81-
*/
82-
public void setEncoding(boolean encoding) {
83-
this.encoding = encoding;
84-
}
85-
86-
/**
87-
* 字符集转换
88-
* @param encodingString 源字符串
89-
* @return encoded目标字符串
90-
*/
91-
public String encoding(String encodingString){
92-
if(!this.encoding||encodingString==null) {
93-
return encodingString;
94-
}
95-
96-
try {
97-
return new String(encodingString.getBytes(this.fromCharSet),this.toCharSet);
98-
} catch (UnsupportedEncodingException e) {
99-
e.printStackTrace();
100-
}
101-
return null;
102-
}
103-
17+
18+
/**
19+
* 源字符集.
20+
*/
21+
@Value("${config.characterencoding.charset.from}")
22+
String fromCharSet;
23+
24+
/**
25+
* 目标字符集.
26+
*/
27+
@Value("${config.characterencoding.charset.to}")
28+
String toCharSet;
29+
30+
/**
31+
* 转换标志.
32+
*/
33+
@Value("${config.characterencoding.encoding}")
34+
boolean encoding = false;
35+
36+
public CharacterEncodingConfig() {
37+
38+
}
39+
40+
public String getFromCharSet() {
41+
return fromCharSet;
42+
}
43+
44+
public void setFromCharSet(String fromCharSet) {
45+
this.fromCharSet = fromCharSet;
46+
}
47+
48+
public String getToCharSet() {
49+
return toCharSet;
50+
}
51+
52+
public void setToCharSet(String toCharSet) {
53+
this.toCharSet = toCharSet;
54+
}
55+
56+
public boolean isEncoding() {
57+
return encoding;
58+
}
59+
60+
public void setEncoding(boolean encoding) {
61+
this.encoding = encoding;
62+
}
63+
64+
/**
65+
* 字符集转换.
66+
*
67+
* @param encodingString 源字符串
68+
* @return encoded目标字符串
69+
*/
70+
public String encoding(String encodingString) {
71+
if (!this.encoding || encodingString == null) {
72+
return encodingString;
73+
}
74+
75+
try {
76+
return new String(encodingString.getBytes(this.fromCharSet), this.toCharSet);
77+
} catch (UnsupportedEncodingException e) {
78+
e.printStackTrace();
79+
}
80+
return null;
81+
}
82+
10483
}

0 commit comments

Comments
 (0)