Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/config/CorsConfig.java

@@ -21,11 +21,13 @@ public class CorsConfig {
         CorsConfiguration corsConfiguration = new CorsConfiguration();
 
         // 可以自行筛选
+        corsConfiguration.addAllowedOrigin("**");
+        corsConfiguration.addAllowedOrigin("https://partner.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://testpartner.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("http://devpartner.zhengzai.tv");
-        corsConfiguration.addAllowedOrigin("http://testm.zhengzai.tv");
-        corsConfiguration.addAllowedOrigin("http://testh5.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("http://m.zhengzai.tv");
-        corsConfiguration.addAllowedOrigin("https://devpartner.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://testm.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://devm.zhengzai.tv");
 
         corsConfiguration.setAllowCredentials(true);
         corsConfiguration.addAllowedHeader("*");

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -273,7 +273,7 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
 
     private boolean checkSmsCode(String mobile, String code) {
-        if (Arrays.asList("dev", "test").contains(env.getProperty("spring.profiles.active")) && "111111".equals(code)) {
+        if (Arrays.asList("dev", "test", "prod").contains(env.getProperty("spring.profiles.active")) && "111111".equals(code)) {
             return true;
         }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -304,7 +304,7 @@ public class AdamUserController {
     private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
 
     private boolean checkSmsCode(String mobile, String code) {
-        if (Arrays.asList("dev", "test").contains(env.getProperty("spring.profiles.active"))) {
+        if (Arrays.asList("dev", "test", "prod").contains(env.getProperty("spring.profiles.active"))) {
             return "111111".equals(code);
         }