Merge branch 'dev' of chenweida/jw2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/base/login/BaseLoginAccountDO.java

@@ -19,6 +19,7 @@ import java.util.Date;
@Table(name = "base_login_account")
public class BaseLoginAccountDO extends IdEntity implements java.io.Serializable {
	private String userName;//'账号
	private String userType;//'用户类型 1居民 2医生 或者行政管理员'
	private String password;//'密码'
	private String salt;//'盐值'
@@ -26,7 +27,14 @@ public class BaseLoginAccountDO extends IdEntity implements java.io.Serializable
	private String saasId;//'saas配置id'
	private String email;//'邮箱'
	@Column(name = "user_name", length = 50)
	public String getUserName() {
		return userName;
	}
	public void setUserName(String userName) {
		this.userName = userName;
	}
	@CreatedDate
	@Column(name = "create_time", nullable = false, length = 0,updatable = false)

common/common-entity/src/main/java/com/yihu/jw/base/user/BaseEmployDO.java

@@ -17,24 +17,24 @@ public class BaseEmployDO extends IdEntityWithOperation implements java.io.Seria
	// Fields
	private String saasId;
	private String name;
	private String pyCode;
	private String sex;
	private String photo;
	private String skill;
	private String workPortal;
	private String email;
	private String phone;
	private String secondPhone;
	private String familyTel;
	private String officeTel;
	private String introduction;
	private String jxzc;
	private String lczc;
	private String xlzc;
	private String xzzc;
	private Integer status;
	private String saasId; //saasIDF
	private String name; //名字
	private String pyCode; //拼音
	private String sex; //性别
	private String photo; //头像
	private String skill;//专长
	private String workPortal;//医生门户首页
	private String email;//邮箱
	private String phone;//联系电话
	private String secondPhone;//备用电话
	private String familyTel;//家庭电话（固）
	private String officeTel;//办公电话（固）
	private String introduction;//简介
	private String jxzc;//教学职称
	private String lczc;//临床职称
	private String xlzc;//学历职称
	private String xzzc;//行政职称
	private Integer status;//-1 删除 0 禁用 1可用
	// Constructors

common/common-entity/src/main/java/com/yihu/jw/base/user/BaseMenuDO.java

@@ -17,7 +17,8 @@ import javax.persistence.Table;
public class BaseMenuDO extends IdEntityWithOperation implements java.io.Serializable {
	// Fields
	private String url;//请求路径
	private String method;//请求方式 get post
	private String saasId;
	private String parentId;
	private String name;
@@ -104,4 +105,21 @@ public class BaseMenuDO extends IdEntityWithOperation implements java.io.Seriali
		this.remark = remark;
	}
	@Column(name = "url", length = 255)
	public String getUrl() {
		return url;
	}
	public void setUrl(String url) {
		this.url = url;
	}
	@Column(name = "method", length = 255)
	public String getMethod() {
		return method;
	}
	public void setMethod(String method) {
		this.method = method;
	}
}

web-gateway/pom.xml

@@ -35,6 +35,10 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-security</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-jpa</artifactId>

web-gateway/src/main/java/com/yihu/jw/controller/login/LoginController.java

@@ -19,47 +19,15 @@ public class LoginController {
    private Tracer tracer;
    @GetMapping(value = "/doctorlogin", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "医生登陆", notes = "医生登陆")
    public Envelop doctorlogin(
            @ApiParam(name = "account", value = "账号", defaultValue = "") @RequestParam(name = "account", required = true) String account,
            @ApiParam(name = "password", value = "密码", defaultValue = "") @RequestParam(name = "password", required = true) String password,
            @ApiParam(name = "type", value = "登陆方式(默认1)：1账号密码 2账号验证码", defaultValue = "") @RequestParam(name = "type", required = true, defaultValue = "1") Integer type) throws Exception {
        //获取用户信息
        //判断用户是否存在
        //判断密码是否正确
        //获取用户的版本信息
        //获取用户的模块信息
        //用户登陆的信息放入缓存中
        //保存登陆日志
        return null;
    }
    @GetMapping(value = "/employLogin", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "患者登陆", notes = "患者登陆")
    public Envelop employLogin(
            @ApiParam(name = "account", value = "账号", defaultValue = "") @RequestParam(name = "account", required = true) String account,
            @ApiParam(name = "password", value = "密码", defaultValue = "") @RequestParam(name = "password", required = true) String password,
            @ApiParam(name = "type", value = "登陆方式(默认1)：1账号密码 2账号验证码", defaultValue = "") @RequestParam(name = "type", required = true, defaultValue = "1") Integer type) throws Exception {
        //获取用户信息
        //判断用户是否存在
        //判断密码是否正确
        //获取用户的版本信息
        //用户登陆的信息放入缓存中
        //保存登陆日志
            @ApiParam(name = "account", value = "账号", defaultValue = "")
            @RequestParam(name = "account", required = true) String account,
            @ApiParam(name = "password", value = "密码", defaultValue = "")
            @RequestParam(name = "password", required = true) String password,
            @ApiParam(name = "type", value = "登陆方式(默认1)：1账号密码 2账号验证码", defaultValue = "")
            @RequestParam(name = "type", required = false, defaultValue = "1") Integer type) throws Exception {
        return null;
    }

web-gateway/src/main/java/com/yihu/jw/interceptors/PatientInterceptor.java

@@ -1,33 +0,0 @@
package com.yihu.jw.interceptors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
 * Created by chenweida on 2017/5/23.
 */
@Component
public class PatientInterceptor implements HandlerInterceptor {
    private Logger logger = LoggerFactory.getLogger(PatientInterceptor.class);
    @Override
    public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
        return false;
    }
    @Override
    public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception {
    }
    @Override
    public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
    }
}