授权登陆修改

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -55,6 +55,7 @@ import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import com.ylzinfo.onepay.sdk.domain.ext.WaitPayDetailVO;
import com.ylzinfo.onepay.sdk.utils.StringUtil;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -1411,7 +1412,6 @@ public class ImService {
		}
	}
	/**
	 * 添加复诊咨询
	 * @return
@@ -1588,7 +1588,6 @@ public class ImService {
		// 添加医生咨询日志
		addLogs(ct);
		JSONObject result = imUtil.getSingleSessionInfo(sessionId,doctorCode);
		//发送外层SOCKET消息 在线复诊
		if("1".equals(wlyyOutpatientDO.getOutpatientType())||"3".equals(wlyyOutpatientDO.getOutpatientType())){
			System.out.println("发送外层SOCKET消息:在线复诊");

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

@@ -1362,7 +1362,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        try {
            logger.info("authCode :"+authCode);
            Map<String,Object> rs = oauthSsoService.savePatient(code,appId,authCode);
            Map<String,Object> rs = oauthSsoService.savePatient(code,appId,authCode,wechatId);
            Integer c = (Integer) rs.get("code");
            if(c != 1){
                return ObjEnvelop.getError(rs.get("mes")+"");

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

@@ -86,7 +86,7 @@ public class OauthSsoService {
        return oauthRsaKeyDO.getPublicKey();
    }
    public Map<String,Object> savePatient(String code,String appId,String authCode)throws Exception{
    public Map<String,Object> savePatient(String code,String appId,String authCode,String wechatId)throws Exception{
        Map<String,Object> rs = new HashedMap();
        try{
@@ -128,7 +128,7 @@ public class OauthSsoService {
                    rs.put("mes","获取居民信息成功");
                    rs.put("patient",basePatientDO);
                    List<BasePatientWechatDo> wechatDos = basePatientWechatDao.findByWechatIdAndPatientId(appId,basePatientDO.getId());
                    List<BasePatientWechatDo> wechatDos = basePatientWechatDao.findByWechatIdAndPatientId(wechatId,basePatientDO.getId());
                    if(wechatDos!=null&&wechatDos.size()>0){
                        for(BasePatientWechatDo wechatDo:wechatDos){
                            wechatDo.setOpenid(openid);