测试环境

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -2856,13 +2856,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            //医生角色
            String sql = "SELECT " +
                    " t. CODE AS roleCode, " +
                    " t. NAME AS roleName" +
                    " t.CODE AS \"roleCode\", " +
                    " t.NAME AS \"roleName\"" +
                    " FROM " +
                    " base_doctor_role r " +
                    " JOIN base_doctor_role_dict t ON t.`code` = r.role_code " +
                    " JOIN base_doctor_role_dict t ON t.code = r.role_code " +
                    " WHERE " +
                    " r.doctor_code = '"+doctor+"'";
            logger.info(sql);
            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
            if(list!=null&&list.size()>0){

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/XzzxEntranceService.java

@@ -75,7 +75,7 @@ public class XzzxEntranceService {
    private BasePatientWechatDao basePatientWechatDao;
    //发送微信模板消息
    public static String sendMessageUrl ="http://xzbh.xmheart.com:8090/hospitalPortal-sms/sms/sendMessage";
    public static String sendMessageUrl ="http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage";
    public String getXzzxWebServiceInfo(String api, Map<String,String> params)throws Exception{

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -19,13 +19,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)
//    @GeneratedValue(generator = "generator")
//    @GenericGenerator(name = "generator", strategy = "identity")
//    @Column(name = "id", unique = true, nullable = false)
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
   /* @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

readme.MD

@@ -1,5 +1,6 @@
项目结构
     common     公共依赖包
     business   核心业务service
     svr     业务微服务  
        svr-base 基础微服务
        svr-statistics 统计微服务
@@ -11,7 +12,8 @@
         svr-dashboard    监控服务 
            涉及主要技术 hystrix,hystrix-dashboard
         svr-logServer 分布式追踪
            涉及主要技术 zipkin 
            涉及主要技术 zipkin
         svr-authentication 认证服务
     wlyy-lib-parent-pom    common公共工程的maven父pom
     wlyy-parent-pom   jw业务公共工程的maven父pom
     ag-basic 对外的接口网关

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

@@ -1130,6 +1130,8 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        return data;
    }
    @RequestMapping(value = "/oauth/verifyCaptcha", method = RequestMethod.GET)
    @ApiOperation("验证图形验证码")
    public boolean verifyCaptcha(String key,String text){
        boolean pass = false;
        String captcha = redisTemplate.opsForValue().get(key);
@@ -1140,6 +1142,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        return pass;
    }
    @RequestMapping(value = "/oauth/getSsoPublicKey", method = RequestMethod.GET)
    @ApiOperation("获取通用公钥")
    public ObjEnvelop getSsoPublicKey(String code,String appId)throws Exception{