Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -304,6 +304,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.medicalState = medicalState;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
@@ -312,6 +313,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.cardType = cardType;
    }
    @Column(name = "openid_time")
    public Date getOpenidTime() {
        return openidTime;
    }
@@ -596,15 +598,16 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.del = del;
    }
    @Column(name = "remark")
    public String getRemark() {
        return remark;
    }
    @Column(name = "remark")
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "live_province_code")
    public String getLiveProvinceCode() {
        return liveProvinceCode;
    }
@@ -613,6 +616,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveProvinceCode = liveProvinceCode;
    }
    @Column(name = "live_province_name")
    public String getLiveProvinceName() {
        return liveProvinceName;
    }
@@ -621,6 +625,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveProvinceName = liveProvinceName;
    }
    @Column(name = "live_city_code")
    public String getLiveCityCode() {
        return liveCityCode;
    }
@@ -629,6 +634,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveCityCode = liveCityCode;
    }
    @Column(name = "live_city_name")
    public String getLiveCityName() {
        return liveCityName;
    }
@@ -637,6 +643,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveCityName = liveCityName;
    }
    @Column(name = "live_town_code")
    public String getLiveTownCode() {
        return liveTownCode;
    }
@@ -645,6 +652,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveTownCode = liveTownCode;
    }
    @Column(name = "live_town_name")
    public String getLiveTownName() {
        return liveTownName;
    }
@@ -671,6 +679,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.liveStreetName = liveStreetName;
    }
    @Column(name = "locked")
    public Integer getLocked() {
        return locked;
    }
@@ -679,6 +688,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.locked = locked;
    }
    @Column(name = "enabled")
    public Integer getEnabled() {
        return enabled;
    }
@@ -687,6 +697,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.enabled = enabled;
    }
    @Column(name = "login_failure_count")
    public Integer getLoginFailureCount() {
        return loginFailureCount;
    }
@@ -695,6 +706,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.loginFailureCount = loginFailureCount;
    }
    @Column(name = "locked_date")
    public Date getLockedDate() {
        return lockedDate;
    }
@@ -703,6 +715,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.lockedDate = lockedDate;
    }
    @Column(name = "login_date")
    public Date getLoginDate() {
        return loginDate;
    }
@@ -720,6 +733,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
        this.userId = userId;
    }
    @Column(name = "phone")
    public String getPhone() {
        return phone;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/patient/PatientDevice.java

@@ -301,6 +301,7 @@ public class PatientDevice extends IdEntity {
    public PatientDevice() {
    }
    @Column(name = "apply_status")
    public Integer getApplyStatus() {
        return applyStatus;
    }
@@ -309,6 +310,7 @@ public class PatientDevice extends IdEntity {
        this.applyStatus = applyStatus;
    }
    @Column(name = "apply_reason")
    public String getApplyReason() {
        return applyReason;
    }
@@ -317,6 +319,7 @@ public class PatientDevice extends IdEntity {
        this.applyReason = applyReason;
    }
    @Column(name = "refuse_reason")
    public String getRefuseReason() {
        return refuseReason;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/filter/XssAndHttpServletRequestWrapper.java

@@ -1,55 +1,55 @@
package com.yihu.jw.base.filter;
import com.yihu.jw.util.XssUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
/**
 * Created by yeshijie on 2020/8/27.
 */
public class XssAndHttpServletRequestWrapper extends HttpServletRequestWrapper {
    HttpServletRequest request;
    public XssAndHttpServletRequestWrapper(HttpServletRequest request) {
        super(request);
        this.request = request;
    }
    @Override
    public String getParameter(String name) {
        String value = super.getParameter(name);
        // System.out.println("name:" + name + "," + value);
        if (value != null) {
            // 转换Html
            value = XssUtil.cleanXss(value);
        }
        return value;
    }
    @Override
    public String getHeader(String name) {
        return XssUtil.cleanXss(super.getHeader(name));
    }
    @Override
    public String getQueryString() {
        return XssUtil.cleanXss(super.getQueryString());
    }
    @Override
    public String[] getParameterValues(String parameter) {
        String[] values = super.getParameterValues(parameter);
        if (values == null) {
            return null;
        }
        int count = values.length;
        String[] encodedValues = new String[count];
        for (int i = 0; i < count; i++) {
            encodedValues[i] = XssUtil.cleanXss(values[i]);
        }
        return encodedValues;
    }
}
//package com.yihu.jw.base.filter;
//
//
//import com.yihu.jw.util.XssUtil;
//
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletRequestWrapper;
//
///**
// * Created by yeshijie on 2020/8/27.
// */
//public class XssAndHttpServletRequestWrapper extends HttpServletRequestWrapper {
//    HttpServletRequest request;
//
//    public XssAndHttpServletRequestWrapper(HttpServletRequest request) {
//        super(request);
//        this.request = request;
//    }
//
//    @Override
//    public String getParameter(String name) {
//        String value = super.getParameter(name);
//        // System.out.println("name:" + name + "," + value);
//        if (value != null) {
//            // 转换Html
//            value = XssUtil.cleanXss(value);
//        }
//        return value;
//    }
//
//    @Override
//    public String getHeader(String name) {
//        return XssUtil.cleanXss(super.getHeader(name));
//    }
//
//    @Override
//    public String getQueryString() {
//        return XssUtil.cleanXss(super.getQueryString());
//    }
//
//    @Override
//    public String[] getParameterValues(String parameter) {
//        String[] values = super.getParameterValues(parameter);
//        if (values == null) {
//            return null;
//        }
//        int count = values.length;
//        String[] encodedValues = new String[count];
//        for (int i = 0; i < count; i++) {
//            encodedValues[i] = XssUtil.cleanXss(values[i]);
//        }
//        return encodedValues;
//    }
//
//}

svr/svr-base/src/main/java/com/yihu/jw/base/filter/XssFiter.java

@@ -1,25 +1,25 @@
package com.yihu.jw.base.filter;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
/**
 * Created by yeshijie on 2020/8/27.
 */
public class XssFiter implements Filter {
    public void init(FilterConfig filterConfig) throws ServletException {
    }
    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
            throws IOException, ServletException {
        HttpServletRequest req = (HttpServletRequest) request;
        XssAndHttpServletRequestWrapper xssRequestWrapper = new XssAndHttpServletRequestWrapper(req);
        chain.doFilter(xssRequestWrapper, response);
    }
    public void destroy() {
    }
}
//package com.yihu.jw.base.filter;
//
//import javax.servlet.*;
//import javax.servlet.http.HttpServletRequest;
//import java.io.IOException;
//
///**
// * Created by yeshijie on 2020/8/27.
// */
//public class XssFiter implements Filter {
//    public void init(FilterConfig filterConfig) throws ServletException {
//
//    }
//
//    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
//            throws IOException, ServletException {
//        HttpServletRequest req = (HttpServletRequest) request;
//        XssAndHttpServletRequestWrapper xssRequestWrapper = new XssAndHttpServletRequestWrapper(req);
//        chain.doFilter(xssRequestWrapper, response);
//    }
//
//    public void destroy() {
//
//    }
//}