wsy182
/
wePush
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wsy182:a2ac8c8920d662c33bc70697f5f8ac38aeef79ad
Branches Tags
wsy182:dev
wsy182:master
...
compare: wsy182:0ffa5fbe983c3aac35a2566dcd4e88fcdc2e0a79
Branches Tags
wsy182:dev
wsy182:master

3 Commits
a2ac8c8920 ... 0ffa5fbe98

Author SHA1 Message Date
wangsiyuan 0ffa5fbe98 更新 SMSInfo.java 2023-12-06 10:39:25 +08:00
wangsiyuan 533c1efb63 更新 SMSController.java 2023-12-06 10:39:21 +08:00
wangsiyuan 529e7c7aa9 更新 CallerController.java 2023-12-06 10:39:14 +08:00
3 changed files with 14 additions and 16 deletions
Show Stats Expand all files Collapse all files

10
src/main/java/com/kimgo/wepush/controller/CallerController.java
View File

@ -20,14 +20,18 @@ public class CallerController {
public ServerResponseEntity receiveCall(@RequestHeader("accessToken") String accessToken, public ServerResponseEntity receiveCall(@RequestHeader("accessToken") String accessToken,
@RequestBody @Valid CallInfo callInfo) { @RequestBody @Valid CallInfo callInfo) {
logger.info("CallInfoO: {}",callInfo.toString()); logger.info("CallInfoO: {}",callInfo.toString());
if(accessToken == null || callInfo == null){ if(accessToken == null){
return ServerResponseEntity.fail("accessToken cannot be empty."); return ServerResponseEntity.fail("accessToken cannot be empty.");
} }
if(callInfo.getPhoneNumber().equals("null") || callInfo.getCallTime().equals("null")){ if (callInfo == null || isNullOrEmptyOrLiteralNull(callInfo.getPhoneNumber()) ||
logger.info("CallInfo has null String."); isNullOrEmptyOrLiteralNull(callInfo.getCallTime())) {
logger.info("CallInfo has invalid fields.");
return ServerResponseEntity.fail("json body value error."); return ServerResponseEntity.fail("json body value error.");
} }
return callService.getPhoneNumber(accessToken,callInfo); return callService.getPhoneNumber(accessToken,callInfo);
} }
private boolean isNullOrEmptyOrLiteralNull(String value) {
return value == null || value.isEmpty() || "null".equals(value);
}
} }

4
src/main/java/com/kimgo/wepush/controller/SMSController.java
View File

@ -25,12 +25,10 @@ public class SMSController {
if(accessToken == null){ if(accessToken == null){
return ServerResponseEntity.fail("accessToken cannot be empty."); return ServerResponseEntity.fail("accessToken cannot be empty.");
} }
if (smsInfo.isNullString()){
return ServerResponseEntity.fail("json body value error.");
}
if (smsInfo == null || !smsInfo.validateFields()) { if (smsInfo == null || !smsInfo.validateFields()) {
return ServerResponseEntity.fail("SMS info fields must not be blank."); return ServerResponseEntity.fail("SMS info fields must not be blank.");
} }
return smsService.getSMSInfo(accessToken,smsInfo); return smsService.getSMSInfo(accessToken,smsInfo);
} }
} }

16
src/main/java/com/kimgo/wepush/model/SMSInfo.java
View File

@ -24,16 +24,12 @@ public class SMSInfo {
* @return 如果所有字段都非空，则返回 true，否则返回 false。 * @return 如果所有字段都非空，则返回 true，否则返回 false。
*/ */
public boolean validateFields() { public boolean validateFields() {
return StringUtils.isNotBlank(smsNumber) && return isNotBlankAndNotLiteralNull(smsNumber) &&
StringUtils.isNotBlank(smsAcceptanceTime) && isNotBlankAndNotLiteralNull(smsAcceptanceTime) &&
StringUtils.isNotBlank(smsContent); isNotBlankAndNotLiteralNull(smsContent);
} }
public boolean isNullString(){
String nullString = "null"; private boolean isNotBlankAndNotLiteralNull(String value) {
if (this.smsNumber.equals(nullString) || this.smsContent.equals(nullString) || this.smsAcceptanceTime.equals(nullString)){ return StringUtils.isNotBlank(value) && !"null".equals(value);
logger.info("SMSInfo has null String.");
return true;
}
return false;
} }
} }