Merge branch 'dev' of yeshijie/wlyy2.0 into dev

server/svr-authentication/src/main/java/com/yihu/jw/security/service/YkyyService.java

@@ -19,15 +19,15 @@ public class YkyyService {
    @Autowired
    private HttpClientUtil httpClientUtil;
    private static String yktUrl = "http://www.yanketong.com:133/api/";
    private static String yktUrl = "http://www.yanketong.com:90/";
    /**
     * 眼科医院单点登录接口
     * @return
     */
    public String getDoctorInfoByVerifycode(String verifyCode){
        String url = "Doctor/GetDoctorInfoByverifycode";
        return httpClientUtil.get(url,"GBK");
        String url = "api/Doctor/GetDoctorInfoByverifycode";
        return httpClientUtil.get(yktUrl+url+"?verifyCode="+verifyCode,"GBK");
    }
}

server/svr-authentication/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-authentication-ysj
    name: svr-authentication
  cloud:
    config:
      failFast: true