Compare commits

...

12 Commits

11 changed files with 72 additions and 16 deletions

View File

@ -23,6 +23,10 @@ public class CallerController {
if(accessToken == null){
return ServerResponseEntity.fail("accessToken cannot be empty.");
}
if(callInfo.getPhoneNumber().equals("null") || callInfo.getCallTime().equals("null")){
logger.info("CallInfo has null String.");
return ServerResponseEntity.fail("json body value error.");
}
return callService.getPhoneNumber(accessToken,callInfo);
}
}

View File

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

View File

@ -1,15 +1,19 @@
package com.kimgo.wepush.model;
import com.kimgo.wepush.controller.SMSController;
import io.micrometer.common.util.StringUtils;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Getter
@Setter
@ToString
public class SMSInfo {
private final Logger logger = LoggerFactory.getLogger(SMSInfo.class);
private String smsNumber;
private String smsAcceptanceTime;
private String smsContent;
@ -24,4 +28,12 @@ public class SMSInfo {
StringUtils.isNotBlank(smsAcceptanceTime) &&
StringUtils.isNotBlank(smsContent);
}
public boolean isNullString(){
String nullString = "null";
if (this.smsNumber.equals(nullString) || this.smsContent.equals(nullString) || this.smsAcceptanceTime.equals(nullString)){
logger.info("SMSInfo has null String.");
return false;
}
return true;
}
}

View File

@ -35,12 +35,8 @@ public class CallService {
if (!correctAccessToken.equals(accessToken)){
return ServerResponseEntity.fail("Invalid accessToken");
}
PhoneNumberValidation phoneNumberValidation = new PhoneNumberValidation();
String phoneNumber = callInfo.getPhoneNumber();
String callTime = callInfo.getCallTime();
if (!phoneNumberValidation.isValidPhoneNumber(callInfo.getPhoneNumber())){
return ServerResponseEntity.fail("Invalid phoneNumber");
}
String qyAccessToken = tokenService.getAccessToken();
QyWeChatSendMessageApiResponse qyWeChatSendMessageApiResponse = requestWithOkhttp(qyAccessToken,phoneNumber,callTime);
int code = qyWeChatSendMessageApiResponse.getErrcode();

View File

@ -1,3 +1,6 @@
server:
address: 127.0.0.1
port: 8080
custom:
phoneNumber: "18281561650"
spring:
@ -7,3 +10,6 @@ spring:
password: JSckhtke1wFdzq3E
driver-class-name: com.mysql.cj.jdbc.Driver
mybatis-plus:
logging:
config: classpath:logback-dev.xml

View File

@ -1,3 +1,6 @@
server:
address: 127.0.0.1
port: 8090
custom:
phoneNumber: "18281561650"
spring:
@ -7,3 +10,6 @@ spring:
password: JSckhtke1wFdzq3E
driver-class-name: com.mysql.cj.jdbc.Driver
mybatis-plus:
logging:
config: classpath:logback-prod.xml

View File

@ -1,3 +1,6 @@
server:
address: 127.0.0.1
port: 8080
custom:
phoneNumber: "18281561650"
spring:
@ -7,3 +10,6 @@ spring:
password: JSckhtke1wFdzq3E
driver-class-name: com.mysql.cj.jdbc.Driver
mybatis-plus:
logging:
config: classpath:logback-dev.xml

View File

@ -1,6 +1,3 @@
server:
address: 127.0.0.1
port: 8090
spring:
profiles:
active: prod

View File

@ -1,20 +1,19 @@
<configuration>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/wePush.log</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
</encoder>
</appender>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
</encoder>
</appender>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/wePush_dev.log</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
</encoder>
</appender>
<root level="info">
<!-- 移除了对STDOUT的引用 -->
<!-- <appender-ref ref="STDOUT"/>-->
<appender-ref ref="STDOUT"/>
<appender-ref ref="FILE"/>
</root>
</configuration>

View File

@ -0,0 +1,11 @@
<configuration>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/wePush_prod.log</file>
<encoder>
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
</encoder>
</appender>
<root level="info">
<appender-ref ref="FILE"/>
</root>
</configuration>

View File

@ -0,0 +1,16 @@
package com.kimgo.wepush;
import com.kimgo.wepush.common.PhoneNumberValidation;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
public class PhoneNumberValidationTest {
@Test
public void testPhoneNumber(){
String phoneNumber = "1008611";
PhoneNumberValidation phoneNumberValidation = new PhoneNumberValidation();
phoneNumberValidation.isValidPhoneNumber(phoneNumber);
}
}