Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java
#	svr/svr-internet-hospital-entrance/src/main/java/com/yihu/jw/entrance/controller/XzzxCotroller.java

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -935,8 +935,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            String sys ="JKZLHLWYLJKGLPT";
            return ObjEnvelop.getSuccess("success", oauthCaConfigSerivce.getQRCode(sys));
        }else if (wechatId.equalsIgnoreCase("xm_xzzx_wx")){
            String sys ="2017070411003376";
            return ObjEnvelop.getSuccess("success", xzzxService.getQRCode(sys));
            return ObjEnvelop.getSuccess("success", xzzxService.getQRCode());
        }else {
            return ObjEnvelop.getSuccess("success", null);
        }

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

@@ -40,13 +40,13 @@ public class XzzxService {
     * @param sys
     * @return
     */
    public String getQRCode(String sys) {
    public String getQRCode() {
        try {
            logger.info("生成二维码 getQRCode :"+sys);
            logger.info("生成二维码 getQRCode :");
            OauthCaConfigDO oauthCaConfigDO = oauthCaConfigDao.findOne("oauth_ca_config");
            String url = "";
            if (oauthCaConfigDO!=null){
                url=oauthCaConfigDO.getUrl()+"/gateway/oauth/authorize?responseType=code&clientId="+sys;
                url=oauthCaConfigDO.getUrl()+"/gateway/oauth/authorize?responseType=code&clientId="+oauthCaConfigDO.getClientId();
            }
            String response = httpClientUtil.get(url,"utf-8");
            JSONObject rs = new JSONObject();

svr/svr-internet-hospital/src/main/resources/application.yml

@@ -668,6 +668,8 @@ es:
  tHost: 172.16.100.240:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern: