fix:dev|test.smscode;

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -26,6 +26,8 @@ liquidnet:
     pay: http://testpay.zhengzai.tv
     check: http://testpay.zhengzai.tv/order/verify
     callback: http://devzuul.zhengzai.tv/adam/member/order/callback
+  url-service:
+    url: http://testservice.zhengzai.tv
   aliyun:
     accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
     accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -26,6 +26,8 @@ liquidnet:
     pay: http://testpay.zhengzai.tv
     check: http://testpay.zhengzai.tv/order/verify
     callback: http://zuul.zhengzai.tv/adam/member/order/callback
+  url-service:
+    url: http://testservice.zhengzai.tv
   aliyun:
     accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
     accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU

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

@@ -70,8 +70,8 @@ public class AdamLoginController {
 
 
 
-    private static final String PHP_API_SMS_CODE_SEND = "https://service.zhengzai.tv/smsCode";
-    private static final String PHP_API_SMS_CODE_VALID = "https://service.zhengzai.tv/smsValidation";
+    private static final String PHP_API_SMS_CODE_SEND = "/smsCode";
+    private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
 
     /*@ApiOperationSupport(order = 1)
     @ApiOperation(value = "手机号密码登录")
@@ -99,12 +99,10 @@ public class AdamLoginController {
 
         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
         paramsMap.add("mobile", mobile);
-        LinkedMultiValueMap<String, String> headersMap = new LinkedMultiValueMap<>();
-        headersMap.add("token", null);
 
         String respStr = null;
         try {
-            respStr = HttpUtil.post(PHP_API_SMS_CODE_SEND, paramsMap, headersMap);
+            respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_SMS_CODE_SEND, paramsMap);
             log.debug("###PHP.API[{}].RESP[{}]", PHP_API_SMS_CODE_SEND, respStr);
 
             Map respMap = JsonUtils.fromJson(respStr, Map.class);
@@ -240,9 +238,9 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
 
     private boolean checkSmsCode(String mobile, String code) {
-//        if (Arrays.asList("dev").contains(env.getProperty("spring.profiles.active"))) {
-//            return "111111".equals(code);
-//        }
+        if (Arrays.asList("dev", "test").contains(env.getProperty("spring.profiles.active")) && "111111".equals(code)) {
+            return true;
+        }
 
         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
         paramsMap.add("mobile", mobile);
@@ -250,8 +248,8 @@ public class AdamLoginController {
 
         String respStr = null;
         try {
-            respStr = HttpUtil.postToPhpApi(PHP_API_SMS_CODE_VALID, paramsMap);
-            log.debug("###PHP.API.RESP:{}", respStr);
+            respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_SMS_CODE_VALID, paramsMap);
+            log.debug("###PHP.API[{}].RESP:{}", PHP_API_SMS_CODE_VALID, respStr);
             Map respMap = JsonUtils.fromJson(respStr, Map.class);
             if (!CollectionUtils.isEmpty(respMap) && StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
                 return true;

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

@@ -23,6 +23,7 @@ import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -48,6 +49,8 @@ import java.util.Map;
 @Slf4j
 @Service
 public class AdamUserServiceImpl implements IAdamUserService {
+    @Autowired
+    Environment env;
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
@@ -63,7 +66,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
 
 
-    private static final String PHP_API_REAL_NAME = "http://testservice.zhengzai.tv/IdCardCheckVerification";
+    private static final String PHP_API_REAL_NAME = "/IdCardCheckVerification";
 
 //    @Override
 //    public AdamUserInfoVo queryByUid(String uid) {
@@ -321,8 +324,8 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
         String respStr = null;
         try {
-            respStr = HttpUtil.postToPhpApi(PHP_API_REAL_NAME, paramsMap);
-            log.debug("###PHP.API.RESP:{}", respStr);
+            respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
+            log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
             Map respMap = JsonUtils.fromJson(respStr, Map.class);
             if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
                 log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr);