Compare commits
12 Commits
e83fc68d9e
...
c03b2790f8
| Author | SHA1 | Date | |
|---|---|---|---|
| c03b2790f8 | |||
| 9e6aa75c6c | |||
| 42f5eac34f | |||
| d8cdb08133 | |||
| ee1c31bb23 | |||
| 754d380fda | |||
| 3c0f66f638 | |||
| ce49f19858 | |||
| db1af9e569 | |||
| 95a24edc40 | |||
| e8dfcb23a6 | |||
| 90d4378919 |
@@ -23,6 +23,10 @@ public class CallerController {
|
|||||||
if(accessToken == 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")){
|
||||||
|
logger.info("CallInfo has null String.");
|
||||||
|
return ServerResponseEntity.fail("json body value error.");
|
||||||
|
}
|
||||||
return callService.getPhoneNumber(accessToken,callInfo);
|
return callService.getPhoneNumber(accessToken,callInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,9 @@ 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.");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +1,19 @@
|
|||||||
package com.kimgo.wepush.model;
|
package com.kimgo.wepush.model;
|
||||||
|
|
||||||
|
import com.kimgo.wepush.controller.SMSController;
|
||||||
import io.micrometer.common.util.StringUtils;
|
import io.micrometer.common.util.StringUtils;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@ToString
|
@ToString
|
||||||
public class SMSInfo {
|
public class SMSInfo {
|
||||||
|
private final Logger logger = LoggerFactory.getLogger(SMSInfo.class);
|
||||||
private String smsNumber;
|
private String smsNumber;
|
||||||
private String smsAcceptanceTime;
|
private String smsAcceptanceTime;
|
||||||
private String smsContent;
|
private String smsContent;
|
||||||
@@ -24,4 +28,12 @@ public class SMSInfo {
|
|||||||
StringUtils.isNotBlank(smsAcceptanceTime) &&
|
StringUtils.isNotBlank(smsAcceptanceTime) &&
|
||||||
StringUtils.isNotBlank(smsContent);
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -35,12 +35,8 @@ public class CallService {
|
|||||||
if (!correctAccessToken.equals(accessToken)){
|
if (!correctAccessToken.equals(accessToken)){
|
||||||
return ServerResponseEntity.fail("Invalid accessToken");
|
return ServerResponseEntity.fail("Invalid accessToken");
|
||||||
}
|
}
|
||||||
PhoneNumberValidation phoneNumberValidation = new PhoneNumberValidation();
|
|
||||||
String phoneNumber = callInfo.getPhoneNumber();
|
String phoneNumber = callInfo.getPhoneNumber();
|
||||||
String callTime = callInfo.getCallTime();
|
String callTime = callInfo.getCallTime();
|
||||||
if (!phoneNumberValidation.isValidPhoneNumber(callInfo.getPhoneNumber())){
|
|
||||||
return ServerResponseEntity.fail("Invalid phoneNumber");
|
|
||||||
}
|
|
||||||
String qyAccessToken = tokenService.getAccessToken();
|
String qyAccessToken = tokenService.getAccessToken();
|
||||||
QyWeChatSendMessageApiResponse qyWeChatSendMessageApiResponse = requestWithOkhttp(qyAccessToken,phoneNumber,callTime);
|
QyWeChatSendMessageApiResponse qyWeChatSendMessageApiResponse = requestWithOkhttp(qyAccessToken,phoneNumber,callTime);
|
||||||
int code = qyWeChatSendMessageApiResponse.getErrcode();
|
int code = qyWeChatSendMessageApiResponse.getErrcode();
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
server:
|
||||||
|
address: 127.0.0.1
|
||||||
|
port: 8080
|
||||||
custom:
|
custom:
|
||||||
phoneNumber: "18281561650"
|
phoneNumber: "18281561650"
|
||||||
spring:
|
spring:
|
||||||
@@ -7,3 +10,6 @@ spring:
|
|||||||
password: JSckhtke1wFdzq3E
|
password: JSckhtke1wFdzq3E
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
mybatis-plus:
|
mybatis-plus:
|
||||||
|
|
||||||
|
logging:
|
||||||
|
config: classpath:logback-dev.xml
|
||||||
@@ -1,3 +1,6 @@
|
|||||||
|
server:
|
||||||
|
address: 127.0.0.1
|
||||||
|
port: 8090
|
||||||
custom:
|
custom:
|
||||||
phoneNumber: "18281561650"
|
phoneNumber: "18281561650"
|
||||||
spring:
|
spring:
|
||||||
@@ -7,3 +10,6 @@ spring:
|
|||||||
password: JSckhtke1wFdzq3E
|
password: JSckhtke1wFdzq3E
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
mybatis-plus:
|
mybatis-plus:
|
||||||
|
|
||||||
|
logging:
|
||||||
|
config: classpath:logback-prod.xml
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
server:
|
||||||
|
address: 127.0.0.1
|
||||||
|
port: 8080
|
||||||
custom:
|
custom:
|
||||||
phoneNumber: "18281561650"
|
phoneNumber: "18281561650"
|
||||||
spring:
|
spring:
|
||||||
@@ -7,3 +10,6 @@ spring:
|
|||||||
password: JSckhtke1wFdzq3E
|
password: JSckhtke1wFdzq3E
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
mybatis-plus:
|
mybatis-plus:
|
||||||
|
|
||||||
|
logging:
|
||||||
|
config: classpath:logback-dev.xml
|
||||||
@@ -1,6 +1,3 @@
|
|||||||
server:
|
|
||||||
address: 127.0.0.1
|
|
||||||
port: 8090
|
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: prod
|
active: prod
|
||||||
@@ -1,20 +1,19 @@
|
|||||||
<configuration>
|
<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">
|
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||||
<encoder>
|
<encoder>
|
||||||
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
|
<pattern>%date %level [%thread] %logger{10} [%file:%line] %msg%n</pattern>
|
||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</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">
|
<root level="info">
|
||||||
<!-- 移除了对STDOUT的引用 -->
|
<appender-ref ref="STDOUT"/>
|
||||||
<!-- <appender-ref ref="STDOUT"/>-->
|
|
||||||
<appender-ref ref="FILE"/>
|
<appender-ref ref="FILE"/>
|
||||||
</root>
|
</root>
|
||||||
</configuration>
|
</configuration>
|
||||||
11
src/main/resources/logback-prod.xml
Normal file
11
src/main/resources/logback-prod.xml
Normal 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>
|
||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user