测试环境

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

@@ -892,15 +892,15 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
    }
        /**
         * 获取易联众授权码
         * @return
         */
    @RequestMapping(value = "/oauth/getOauthQRCode", method = RequestMethod.GET)
    public ObjEnvelop getOauthQRCode(){
        logger.info("/oauth/getOauthQRCode");
        return ObjEnvelop.getSuccess("success", oauthYlzConfigService.getOauthQRCode());
    }
//        /**
//         * 获取易联众授权码
//         * @return
//         */
//    @RequestMapping(value = "/oauth/getOauthQRCode", method = RequestMethod.GET)
//    public ObjEnvelop getOauthQRCode(){
//        logger.info("/oauth/getOauthQRCode");
//        return ObjEnvelop.getSuccess("success", oauthYlzConfigService.getOauthQRCode());
//    }
    @RequestMapping(value = "/oauth/getCaQRCode", method = RequestMethod.GET)
    public ObjEnvelop getCaQRCode(){

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

@@ -48,11 +48,11 @@ public class OauthYlzConfigService {
    @Autowired
    private BasePatientDao basePatientDao;
    @Value("${fastDFS.fastdfs_file_url}")
    private String fastdfs_file_url;
    @Value("${testPattern.sign}")
    private String isClose;
//    @Value("${fastDFS.fastdfs_file_url}")
//    private String fastdfs_file_url;
//
//    @Value("${testPattern.sign}")
//    private String isClose;
    @Value("${testPattern.remote_inner_url}")
    private String remote_inner_url;
@@ -60,75 +60,75 @@ public class OauthYlzConfigService {
    @Autowired
    private ObjectMapper objectMapper;
    public Map<String,Object> getOauthQRCode(){
        try {
            OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findOne("ylz_config");
            TransRequest e = new TransRequest();
            e.setMethod("ehc.ehealthcard.authurl");
            e.setApp_id(oauthYlzConfigDO.getAppId());
            e.setTerm_id(oauthYlzConfigDO.getTermId());
            e.setVersion(oauthYlzConfigDO.getVersion());
            e.setTimestamp(DateUtil.dateToStr(new Date(),"yyyyMMddHHmmss"));
            e.setSign_type(oauthYlzConfigDO.getSignType());
            e.setEnc_type(oauthYlzConfigDO.getEncType());
            com.alibaba.fastjson.JSONObject bizContent = new com.alibaba.fastjson.JSONObject();
            String no = UUID.randomUUID().toString().substring(0,30);
            bizContent.put("out_authorize_no", no);
            bizContent.put("out_authorize_time", DateUtils.getOutTradeTime());
            e.setBiz_content(JSON.toJSONString(bizContent));
            String param = com.alibaba.fastjson.JSONObject.toJSONString(e);
            logger.info("TransRequest :"+param);
            EhcHandler ehcHandler = new EhcHandler(oauthYlzConfigDO.getUrl(), oauthYlzConfigDO.getAppId(), oauthYlzConfigDO.getTermId(), oauthYlzConfigDO.getAppKey());
            TransResponse re = ehcHandler.execute(e);
            String rs = com.alibaba.fastjson.JSONObject.toJSONString(re);
            logger.info("TransResponse :"+rs);
            com.alibaba.fastjson.JSONObject json = (com.alibaba.fastjson.JSONObject) com.alibaba.fastjson.JSONObject.parse(rs);
            com.alibaba.fastjson.JSONObject biz = json.getJSONObject("biz_content");
            InputStream qrcode = QrcodeUtil.createQrcode(biz.getString("ehealth_authurl"),300,"jpg");
            Map<String,Object> map = new HashedMap();
            if(isClose.equals("2")){
                //内网上传
                MultipartFile file = new MockMultipartFile("qrcode.jpg","qrcode.jpg","qrcode.jpg",qrcode);
                String rsJson = fileUploadService.request(remote_inner_url,file,null);
                logger.info("内网上传"+rsJson);
                JSONObject uploadJson = JSON.parseObject(rsJson);
                UploadVO uploadVO = objectMapper.readValue(uploadJson.getJSONObject("obj").toJSONString(),UploadVO.class);
                map.put("fileName",uploadVO.getFileName());
                map.put("fileType",uploadVO.getFileType());
                map.put("fullUrl",uploadVO.getFullUrl());
                map.put("fullUri",uploadVO.getFullUri());
                map.put("out_authorize_no",no);
                logger.info("fileUploadService:"+map.toString());
            }else {
                // 得到文件的完整名称  xxx.txt
                logger.info("fastdfs_file_url:"+fastdfs_file_url);
                UploadVO uploadVO = fileUploadService.uploadStream(qrcode,"qrcode.jpg",fastdfs_file_url);
                map = new HashedMap();
                map.put("fileName",uploadVO.getFileName());
                map.put("fileType",uploadVO.getFileType());
                map.put("fullUrl",uploadVO.getFullUrl());
                map.put("fullUri",uploadVO.getFullUri());
                map.put("out_authorize_no",no);
                logger.info("fileUploadService:"+map.toString());
            }
            return map;
        } catch (Exception var5) {
            logger.info("获取电子健康卡图片异常");
            var5.printStackTrace();
        }
        return null;
    }
//    public Map<String,Object> getOauthQRCode(){
//        try {
//            OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findOne("ylz_config");
//            TransRequest e = new TransRequest();
//            e.setMethod("ehc.ehealthcard.authurl");
//            e.setApp_id(oauthYlzConfigDO.getAppId());
//            e.setTerm_id(oauthYlzConfigDO.getTermId());
//            e.setVersion(oauthYlzConfigDO.getVersion());
//            e.setTimestamp(DateUtil.dateToStr(new Date(),"yyyyMMddHHmmss"));
//            e.setSign_type(oauthYlzConfigDO.getSignType());
//            e.setEnc_type(oauthYlzConfigDO.getEncType());
//            com.alibaba.fastjson.JSONObject bizContent = new com.alibaba.fastjson.JSONObject();
//            String no = UUID.randomUUID().toString().substring(0,30);
//            bizContent.put("out_authorize_no", no);
//            bizContent.put("out_authorize_time", DateUtils.getOutTradeTime());
//            e.setBiz_content(JSON.toJSONString(bizContent));
//
//            String param = com.alibaba.fastjson.JSONObject.toJSONString(e);
//            logger.info("TransRequest :"+param);
//
//            EhcHandler ehcHandler = new EhcHandler(oauthYlzConfigDO.getUrl(), oauthYlzConfigDO.getAppId(), oauthYlzConfigDO.getTermId(), oauthYlzConfigDO.getAppKey());
//            TransResponse re = ehcHandler.execute(e);
//
//            String rs = com.alibaba.fastjson.JSONObject.toJSONString(re);
//            logger.info("TransResponse :"+rs);
//
//            com.alibaba.fastjson.JSONObject json = (com.alibaba.fastjson.JSONObject) com.alibaba.fastjson.JSONObject.parse(rs);
//            com.alibaba.fastjson.JSONObject biz = json.getJSONObject("biz_content");
//            InputStream qrcode = QrcodeUtil.createQrcode(biz.getString("ehealth_authurl"),300,"jpg");
//
//            Map<String,Object> map = new HashedMap();
//
//            if(isClose.equals("2")){
//                //内网上传
//                MultipartFile file = new MockMultipartFile("qrcode.jpg","qrcode.jpg","qrcode.jpg",qrcode);
//                String rsJson = fileUploadService.request(remote_inner_url,file,null);
//
//                logger.info("内网上传"+rsJson);
//                JSONObject uploadJson = JSON.parseObject(rsJson);
//
//                UploadVO uploadVO = objectMapper.readValue(uploadJson.getJSONObject("obj").toJSONString(),UploadVO.class);
//                map.put("fileName",uploadVO.getFileName());
//                map.put("fileType",uploadVO.getFileType());
//                map.put("fullUrl",uploadVO.getFullUrl());
//                map.put("fullUri",uploadVO.getFullUri());
//                map.put("out_authorize_no",no);
//
//                logger.info("fileUploadService:"+map.toString());
//            }else {
//                // 得到文件的完整名称  xxx.txt
//                logger.info("fastdfs_file_url:"+fastdfs_file_url);
//                UploadVO uploadVO = fileUploadService.uploadStream(qrcode,"qrcode.jpg",fastdfs_file_url);
//                map = new HashedMap();
//                map.put("fileName",uploadVO.getFileName());
//                map.put("fileType",uploadVO.getFileType());
//                map.put("fullUrl",uploadVO.getFullUrl());
//                map.put("fullUri",uploadVO.getFullUri());
//                map.put("out_authorize_no",no);
//                logger.info("fileUploadService:"+map.toString());
//            }
//
//            return map;
//        } catch (Exception var5) {
//            logger.info("获取电子健康卡图片异常");
//            var5.printStackTrace();
//        }
//
//        return null;
//    }
    public Map<String,Object> getOauthQRCodeImg(){
        try {

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

@@ -80,6 +80,30 @@ spring:
    port: 6379 # Redis server port.
  ##发现服务
## i健康用户信息接口，开放出来给互联网医院登录同步用户信息用
iHealth:
  user-info-uri: http://ehr.yihu.com/wlyy/iHealth/userInfo
zhongshanHospital:
  user-info-uri: http://laptop-u738dn2p:10023/mqsdk/getUserInfoByOpenid
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
---
spring:
  profiles: iottest
  datasource:
    url: jdbc:mysql://172.26.0.104/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
    username: root
    password: jkzlehr
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
  ##发现服务
## i健康用户信息接口，开放出来给互联网医院登录同步用户信息用
iHealth:
  user-info-uri: http://ehr.yihu.com/wlyy/iHealth/userInfo

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

@@ -22,6 +22,13 @@ spring:
      uri: ${wlyy.spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: iottest
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://172.26.0.109:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: qytest
  cloud:
@@ -76,4 +83,4 @@ spring:
  cloud:
    config:
      uri: ${wlyy.pring.config.uri:http://10.95.22.193:1221}
      label: ${wlyy.spring.config.label:master}
      label: ${wlyy.spring.config.label:master}

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

@@ -27,6 +27,18 @@ spring:
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:jwdev}
---
spring:
  profiles: iottest
##git配置
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.1.220:10080/Amoy2/wlyy2.0.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:jwdev}
---
spring:
  profiles: qytest
##git配置

svr/svr-base/src/main/resources/application.yml

@@ -163,6 +163,49 @@ testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
---
spring:
  profiles: iottest
  datasource:
    url: jdbc:mysql://172.26.0.104/iot-base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg@jkzl2019
#    url: jdbc:mysql://172.19.103.77/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
#    username: root
#    password: 123456
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
    client-transport-sniff: false
    jest:
      uris: http://172.19.103.45:9200,http://172.19.103.68:9200
      connection-timeout: 60000 # Connection timeout in milliseconds.
      multi-threaded: true # Enable connection requests from multiple execution threads.
  activemq:
    broker-url: tcp://172.19.103.87:61616
    user: admin
    password: admin
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
demo:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
wlyy:
  url: http://ehr.yihu.com/wlyy/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0
  remote_inner_url: 172.16.100.240:10023/open/fileUpload/upload_stream
---
spring:
  profiles: jwprod
  datasource:

svr/svr-base/src/main/resources/bootstrap.yml

@@ -22,7 +22,13 @@ spring:
    config:
      uri: ${wlyy.spring.config.uri:http://172.26.0.107:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: iottest
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://172.26.0.109:1221}
      label: ${wlyy.spring.config.label:jwdev}
---
spring:
  profiles: jwprod