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

gateway/ag-basic/src/main/resources/application.yml

@@ -45,7 +45,7 @@ zuul:
      serviceId: svr-base
    svr-authentication:
      path: /cityihealth/auth/**
      serviceId: svr-authentication-lyx
      serviceId: svr-authentication
    svr-healthy-house:
      path: /cityihealth/healthyHouse/**
      serviceId: svr-healthy-house
@@ -54,7 +54,7 @@ zuul:
      serviceId: svr-patient
    svr-internet-hospital:
      path: /hospital/**
      serviceId: svr-internet-hospital-lyx
      serviceId: svr-internet-hospital
    svr-internet-hospital-entrance:
      path: /hospitalEntrance/**
      serviceId: svr-internet-hospital-entrance

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

@@ -119,7 +119,7 @@ public class OauthYlzConfigService {
            String QRCodeImg = ByteToInputStream.getBase64FromInputStream(qrcode);
            Map<String,Object> map = new HashedMap();
            map.put("QRCodeImg",QRCodeImg);
            map.put("QRCodeImg","data:image/png;base64,"+ QRCodeImg);
            map.put("out_authorize_no",no);
            return map;