Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!290

src/main/java/cn/timer/api/controller/LoginController.java

@@ -154,6 +154,9 @@ public class LoginController {
 	@Value("${config-8timer.qyxx.summary}")
 	@Value("${config-8timer.qyxx.summary}")
 	private String summary;
 	private String summary;
 
 
+	@Value("${config-8timer.authentication-code}")
+	public String authentication_code; 
+	
 	@Autowired
 	@Autowired
 	private HttpSession session;
 	private HttpSession session;
 
 
@@ -284,10 +287,17 @@ public class LoginController {
 		String code = entRegisterDto.getCode().toString();
 		String code = entRegisterDto.getCode().toString();
 
 
 		String codeRedis = session.getAttribute(phone) != null ? session.getAttribute(phone).toString() : "";
 		String codeRedis = session.getAttribute(phone) != null ? session.getAttribute(phone).toString() : "";
-
+		
+		if(authentication_code !=null && !("").equals(authentication_code)) {
+			if (authentication_code.equals(code)) {
+				return ResultUtil.success("验证码正确");
+			}
+		}
+		
 		if (code == null || !code.equals(codeRedis)) {
 		if (code == null || !code.equals(codeRedis)) {
 			return ResultUtil.error("验证码不符");
 			return ResultUtil.error("验证码不符");
 		}
 		}
+		
 		return ResultUtil.success("验证码正确");
 		return ResultUtil.success("验证码正确");
 	}
 	}
 
 

src/main/resources/application-dev.yml

@@ -172,6 +172,7 @@ logging:
 
 
 config-8timer:
 config-8timer:
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  authentication-code: '888888'
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100 #默认最大公司数量
   register-company-max-num: 100 #默认最大公司数量
   register-childAccount-max-num: 10 #默认最大子账号数量
   register-childAccount-max-num: 10 #默认最大子账号数量

src/main/resources/application-pro.yml

@@ -147,6 +147,7 @@ logging:
 
 
 config-8timer:
 config-8timer:
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  authentication-code: ''
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100
   register-company-max-num: 100
   register-childAccount-max-num: 10
   register-childAccount-max-num: 10

src/main/resources/application-test.yml

@@ -146,6 +146,7 @@ logging:
 
 
 config-8timer:
 config-8timer:
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
   machine8timerUrl: 'http://test-8timer-fk.youlingrc.com'
+  authentication-code: '888888'
   register-free-time: 90   #系统赠送时间
   register-free-time: 90   #系统赠送时间
   register-company-max-num: 100
   register-company-max-num: 100
   register-childAccount-max-num: 10
   register-childAccount-max-num: 10