wangzhinan 1 ano atrás
pai
commit
2b0ea4fc28

+ 6 - 2
gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/BasicZuulFilter.java

@ -110,7 +110,9 @@ public class BasicZuulFilter extends ZuulFilter {
                url.contains("/prescription/pushListWrite")||
                url.contains("/prescription/pushListDrug")||
                url.contains("/open/noLogin/pushYkCardCharge")||
                url.contains("/prescription/searchRecordWrite"))){
                url.contains("/prescription/searchRecordWrite"))||
                url.contains("/open/noEntry")||
                url.contains("/open/noLogin/findDictById")){
            logger.info("入参"+ctx.getRequestQueryParams());
            try {
                decrypt(ctx,request);
@ -140,7 +142,9 @@ public class BasicZuulFilter extends ZuulFilter {
                || url.contains("/cloudCare/noLogin/")//医疗云开放接口
                || url.contains("/image/")//获取默认图片
                ||url.contains("/weixin")||
                url.contains("/excelControl")) {
                url.contains("/excelControl")||
                url.contains("/open/noEntry")||
                url.contains("/open/noLogin/findDictById")) {
            return true;
        }
        System.out.println("进入token验证");

+ 6 - 2
gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/PostFilter.java

@ -63,7 +63,9 @@ public class PostFilter extends ZuulFilter {
        if (url.contains("/excelControl")||url.contains("/prescription/pushListWrite")||
                url.contains("/prescription/pushListDrug")||
                url.contains("/open/noLogin/pushYkCardCharge")||
                url.contains("/prescription/searchRecordWrite")){
                url.contains("/prescription/searchRecordWrite")||
                url.contains("/open/noEntry")||
                url.contains("/open/noLogin/findDictById")){
            return true;
        }
        InputStream stream = RequestContext.getCurrentContext().getResponseDataStream();
@ -140,7 +142,9 @@ public class PostFilter extends ZuulFilter {
                url.contains("/prescription/pushListWrite")||
                url.contains("/prescription/pushListDrug")||
                url.contains("/open/noLogin/pushYkCardCharge")||
                url.contains("/prescription/searchRecordWrite"))){
                url.contains("/prescription/searchRecordWrite")||
                url.contains("/open/noEntry")||
                url.contains("/open/noLogin/findDictById"))){
            RequestContext.getCurrentContext().setResponseBody(object.toJSONString());
        }else {
            RequestContext.getCurrentContext().setResponseBody(body);

+ 2 - 2
svr/svr-base/pom.xml

@ -11,7 +11,7 @@
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-base-yg</artifactId>
    <artifactId>svr-base</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
@ -232,7 +232,7 @@
    </dependencies>
    <build>
        <finalName>svr-base-yg</finalName>
        <finalName>svr-base</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

+ 2 - 2
svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@ -516,7 +516,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    public JSONObject updateOrderToWaitOut(String orderId,String userId){
        JSONObject result = new JSONObject();
        String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='updateOrderToWaitOut' " +
        /*String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='updateOrderToWaitOut' " +
                " and dict_code='updateOrderToWaitOut' " +
                " and dict_value='"+userId+"' ";
        Integer total = jdbcTemplate.queryForObject(sql,Integer.class);
@ -524,7 +524,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            result.put("msg", "当前操作无权限");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        }*/
        if (StringUtils.isEmpty(orderId)) {
            result.put("msg", "orderId is empty");
            result.put("response", ConstantUtils.FAIL);