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/PrescriptionService.java

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -890,7 +890,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
     */
    public BusinessOrderDO updatePayStatus(String traceNo) throws Exception {
        logger.info("入参："+traceNo);
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByTraceNo(traceNo);
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(traceNo);
        if (businessOrderDO==null){
            throw new Exception("查不到订单！");
        }
@@ -911,6 +911,9 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
               prescriptionLogService.addPrescriptionLog(businessOrderDO.getRelationCode(),30,1,businessOrderDO.getPatient(),businessOrderDO.getPatientName(),businessOrderDO.getDescription(),new Date());
           }
        }
        businessOrderDO.setUpdateTime(new Date());
        businessOrderDO.setStatus(1);
        businessOrderDao.save(businessOrderDO);
        return businessOrderDO;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/role/MenuDO.java

@@ -84,7 +84,7 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
		this.name = name;
	}
	@Column(name = "sort")
	@Column(name = "MENU_SORT")
	public Integer getSort() {
		return this.sort;
	}
@@ -129,7 +129,7 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
		this.icon = icon;
	}
	@Column(name = "method")
	@Column(name = "MENU_METHOD")
	public String getMethod() {
		return method;
	}
@@ -147,7 +147,7 @@ public class MenuDO extends UuidIdentityEntityWithOperator {
		this.show = show;
	}
	@Column(name = "level")
	@Column(name = "MENU_LEVEL")
	public Integer getLevel() {
		return level;
	}

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

@@ -226,7 +226,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        String wechatId = parameters.get("wechatId");
        //更新患者openId
        BaseLoginLogDO baseLoginLogDO = new BaseLoginLogDO();
        if (!StringUtils.isEmpty(openid) && !"undefined".equalsIgnoreCase(openid) && "3".equals(loginType)) {
        if (!StringUtils.isEmpty(openid) && !"undefined".equalsIgnoreCase(openid) && ("3".equals(loginType)||"4".equalsIgnoreCase(loginType))) {
            baseLoginLogDO.setOpenid(openid);
            userDetailsService.updateOpenId(openid, wlyyUserSimple.getId());
            if (!StringUtils.isEmpty(wechatId)&& !"undefined".equalsIgnoreCase(wechatId)){

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

@@ -75,7 +75,7 @@ spring:
  profiles: jwOracleProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.168.33.199:1221}
      uri: ${wlyy.spring.config.uri:http://192.168.33.197:1221}
      label: ${wlyy.spring.config.label:master}
---
spring:

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

@@ -84,7 +84,7 @@ spring:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      server:
        git:
          uri: ${wlyy.spring.config.git.uri:http://192.168.33.199:3001/jkzl/ehr.config.git}
          uri: ${wlyy.spring.config.git.uri:http://192.168.33.197:3001/jkzl/ehr.config.git}
          basedir: /usr/local/wlyy2.0-config
        default-label: ${wlyy.spring.config.git.label:master}
---

svr/svr-base/src/main/java/com/yihu/jw/base/service/role/RoleMenuService.java

@@ -29,14 +29,14 @@ public class RoleMenuService extends BaseJpaService<RoleMenuDO, RoleMenuDao> {
    public List<MenuVO> findMenuByRoleId(String roleId){
        String sql ="SELECT " +
                " m.id, " +
                " m.parent_id AS parentId, " +
                " m.name, " +
                " m.sort, " +
                " m.url, " +
                " m.`status`," +
                " m.icon," +
                " m.is_show AS 'show'" +
                " m.id as \"id\", " +
                " m.parent_id AS \"parentId\", " +
                " m.name as \"name\", " +
                " m.menu_sort AS  \"sort\", " +
                " m.url as \"url\", " +
                " m.status as \"status\"," +
                " m.icon as \"icon\"," +
                " m.is_show AS \"show\" " +
                " FROM " +
                " base_menu m " +
                " JOIN base_role_menu r ON m.id = r.menu_id " +

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

@@ -255,11 +255,11 @@ spring:
    username: normal
    password: normal
  jpa:
      properties:
        hibernate:
          dialect: org.hibernate.dialect.Oracle10gDialect
          show_sql: true
      database: oracle
    properties:
      hibernate:
        dialect: org.hibernate.dialect.Oracle10gDialect
        show_sql: true
    database: oracle
  elasticsearch:
    cluster-name: jkzl #集群名 默认elasticsearch
    cluster-nodes: 172.19.103.45:9300,172.19.103.68:9300 #配置es节点信息，逗号分隔，如果没有指定，则启动ClientNode
@@ -300,8 +300,8 @@ spring:
  datasource:
    driver-class-name: oracle.jdbc.driver.OracleDriver
    url: jdbc:oracle:thin:@10.10.10.16:1521/rac
    username: normal
    password: normal
    username: HLWYY
    password: Xmykzxhlwyy963
  jpa:
    properties:
      hibernate:

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

@@ -48,7 +48,7 @@ spring:
  profiles: jwOracleProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.168.33.199:1221}
      uri: ${wlyy.spring.config.uri:http://192.168.33.197:1221}
      label: ${wlyy.spring.config.label:master}
---
spring:

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

@@ -65,7 +65,7 @@ spring:
  profiles: jwOracleProd
  cloud:
    config:
      uri: ${wlyy.spring.config.uri:http://192.168.33.199:1221}
      uri: ${wlyy.spring.config.uri:http://192.168.33.197:1221}
      label: ${wlyy.spring.config.label:master}
---
spring: