Merge branch 'dev' of http://192.168.1.220:10080/chenweida/jw2.0 into dev

svr/svr-manage/pom.xml

@@ -88,7 +88,6 @@
            <groupId>org.json</groupId>
            <artifactId>json</artifactId>
        </dependency>
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>

svr/svr-manage/src/main/java/com/yihu/jw/manage/config/MvcConfig.java

@@ -2,11 +2,12 @@ package com.yihu.jw.manage.config;
import com.yihu.jw.manage.interceptors.UserInterceptor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import org.springframework.web.servlet.config.annotation.*;
/**
 * Created by chenweida on 2017/6/8.
@@ -36,7 +37,9 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
     * 判断是否登陆的拦截器
     * @param registry
     */
    @Override
    public void addInterceptors(InterceptorRegistry registry) {
        registry.addInterceptor(userInterceptor).addPathPatterns("/**");
    }
}

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/login/LoginController.java

@@ -5,6 +5,7 @@ import com.yihu.jw.manage.service.login.LoginService;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

svr/svr-manage/src/main/java/com/yihu/jw/manage/interceptors/UserInterceptor.java

@@ -6,9 +6,12 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * Created by chenweida on 2017/6/9.
@@ -16,12 +19,22 @@ import java.util.Date;
@Component
public class UserInterceptor implements HandlerInterceptor {
    private static Integer NOT_LOGIN=-1000;
    List<String> unFilters=new ArrayList<>();
    @PostConstruct
    public void addUnFilterURI(){
        //添加不需要过滤的路径
        unFilters.add("/login");
        unFilters.add("/error");
    }
    @Override
    public boolean preHandle(HttpServletRequest requset, HttpServletResponse response, Object o) throws Exception {
        boolean flag = true;
        try {
            //判断路径是否要过滤
            String uri=requset.getRequestURI();
            if (unFilters.contains(uri)){
                return true;
            }
            Object obj= requset.getParameterMap().get("userCode");
            if(org.springframework.util.StringUtils.isEmpty(obj)){
                // 未登录

svr/svr-manage/src/main/java/com/yihu/jw/manage/model/IdEntity.java

@@ -0,0 +1,38 @@
/*******************************************************************************
 * Copyright (c) 2005, 2014 springside.github.io
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 *******************************************************************************/
package com.yihu.jw.manage.model;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import java.io.Serializable;
/**
 * 统一定义id的entity基类.
 * 
 * 基类统一定义id的属性名称、数据类型、列名映射及生成策略.
 * Oracle需要每个Entity独立定义id的SEQUCENCE时，不继承于本类而改为实现一个Idable的接口。
 * 
 * @author calvin
 */
// JPA 基类的标识
@MappedSuperclass
public abstract class IdEntity implements Serializable {
	private static final long serialVersionUID = 3673803562328635206L;
	protected Long id;  // 非业务主键
	@Id
	@GeneratedValue(strategy = GenerationType.IDENTITY)
	public Long getId() {
		return id;
	}
	public void setId(Long id) {
		this.id = id;
	}
}

svr/svr-manage/src/main/java/com/yihu/jw/manage/model/login/ManageLoginLog.java

@@ -1,5 +1,7 @@
package com.yihu.jw.manage.model.login;// default package
import com.yihu.jw.manage.model.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.Column;
@@ -14,12 +16,11 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "manage_login_log")
public class ManageLoginLog implements java.io.Serializable {
public class ManageLoginLog extends IdEntity implements java.io.Serializable {
	public static Integer type_error=0;
	public static Integer type_success=1;
	// Fields
	private Integer id;
	private Date loginTime;
	private String loginAccount;
	private String loginUser;
@@ -48,17 +49,6 @@ public class ManageLoginLog implements java.io.Serializable {
		this.errorMessage = errorMessage;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "login_time", nullable = false, length = 0)
	public Date getLoginTime() {

svr/svr-manage/src/main/java/com/yihu/jw/manage/model/system/ManageMenu.java

@@ -1,5 +1,7 @@
package com.yihu.jw.manage.model.system;// default package
import com.yihu.jw.manage.model.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.*;
@@ -11,11 +13,10 @@ import static javax.persistence.GenerationType.IDENTITY;
 */
@Entity
@Table(name = "manage_menu")
public class ManageMenu implements java.io.Serializable {
public class ManageMenu extends IdEntity implements java.io.Serializable {
	// Fields
	private Integer id;
	private String code;
	private String parentCode;
	private String name;
@@ -60,17 +61,6 @@ public class ManageMenu implements java.io.Serializable {
		this.remark = remark;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "code", length = 100)
	public String getCode() {

svr/svr-manage/src/main/java/com/yihu/jw/manage/model/system/ManageRole.java

@@ -1,5 +1,7 @@
package com.yihu.jw.manage.model.system;// default package
import com.yihu.jw.manage.model.IdEntity;
import java.sql.Timestamp;
import java.util.Date;
import javax.persistence.*;
@@ -11,11 +13,10 @@ import static javax.persistence.GenerationType.IDENTITY;
 */
@Entity
@Table(name = "manage_role")
public class ManageRole implements java.io.Serializable {
public class ManageRole extends IdEntity implements java.io.Serializable {
	// Fields
	private Integer id;
	private String code;
	private String name;
	private Integer status;
@@ -56,17 +57,6 @@ public class ManageRole implements java.io.Serializable {
		this.remark = remark;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "code", length = 100)
	public String getCode() {

svr/svr-manage/src/main/java/com/yihu/jw/manage/model/system/ManageRoleMenu.java

@@ -1,5 +1,7 @@
package com.yihu.jw.manage.model.system;// default package
import com.yihu.jw.manage.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -12,7 +14,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "manage_role_menu")
public class ManageRoleMenu implements java.io.Serializable {
public class ManageRoleMenu  extends IdEntity implements java.io.Serializable {
	// Fields
@@ -32,17 +34,6 @@ public class ManageRoleMenu implements java.io.Serializable {
		this.menuCode = menuCode;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "role_code", length = 100)
	public String getRoleCode() {

svr/svr-manage/src/main/java/com/yihu/jw/manage/model/system/ManageUser.java

@@ -1,5 +1,7 @@
package com.yihu.jw.manage.model.system;// default package
import com.yihu.jw.manage.model.IdEntity;
import java.util.Date;
import javax.persistence.*;
@@ -8,11 +10,10 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "manage_user")
public class ManageUser implements java.io.Serializable {
public class ManageUser  extends IdEntity implements java.io.Serializable {
	// Fields
	private Integer id;
	private String code;
	private String name;
	private String password;//密码  密码是 密码+salt MD5加密
@@ -36,7 +37,6 @@ public class ManageUser implements java.io.Serializable {
	/** minimal constructor */
	public ManageUser(Integer id, Date createTime, Date updateTime) {
		this.id = id;
		this.createTime = createTime;
		this.updateTime = updateTime;
	}
@@ -47,7 +47,6 @@ public class ManageUser implements java.io.Serializable {
			Date createTime, String createUser, String createUserName,
			Date updateTime, String updateUser, String updateUserName,
			String remark) {
		this.id = id;
		this.code = code;
		this.name = name;
		this.password = password;
@@ -64,16 +63,6 @@ public class ManageUser implements java.io.Serializable {
		this.remark = remark;
	}
	// Property accessors
	@Id
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "code", length = 100)
	public String getCode() {

svr/svr-manage/src/main/java/com/yihu/jw/manage/model/system/ManageUserRole.java

@@ -1,5 +1,7 @@
package com.yihu.jw.manage.model.system;// default package
import com.yihu.jw.manage.model.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -10,11 +12,10 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "manage_user_role")
public class ManageUserRole implements java.io.Serializable {
public class ManageUserRole  extends IdEntity implements java.io.Serializable {
	// Fields
	private Integer id;
	private String roleCode;
	private String userCode;
@@ -24,29 +25,6 @@ public class ManageUserRole implements java.io.Serializable {
	public ManageUserRole() {
	}
	/** minimal constructor */
	public ManageUserRole(Integer id) {
		this.id = id;
	}
	/** full constructor */
	public ManageUserRole(Integer id, String roleCode, String userCode) {
		this.id = id;
		this.roleCode = roleCode;
		this.userCode = userCode;
	}
	// Property accessors
	@Id
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "role_code", length = 100)
	public String getRoleCode() {
		return this.roleCode;

svr/svr-manage/src/main/resources/webapp/common/js/common.js

@@ -1,2 +1,2 @@
var server="localhost:8080/";
var server="localhost:8081/";
var not_login=-1000;

svr/svr-manage/src/main/resources/webapp/common/js/util/util.js

@@ -117,7 +117,7 @@ function getUserCode() {
    var code = window.localStorage.getItem("userCode");
    if (!code) {
        alert("请重新登陆")
        window.location.href = server+'/login/login.html';
        window.location.href = '/login/login.html';
    }
    return code
}
@@ -133,6 +133,6 @@ function setUserCode(code) {
function isLogin(data){
    if(data.errorCode==not_login){
         alert("请重新登陆")
         window.location.href = server+'/login/login.html';
         window.location.href = '/login/login.html';
    }
}

svr/svr-manage/src/main/resources/webapp/html/login/login.html

@@ -54,7 +54,7 @@
        var password=$("#password").val();
        $.ajax({
            type: "GET",
            url: server+"/login",
            url: "/login",
            data: {
                "username":username,
                "password":password
@@ -64,8 +64,7 @@
                if(data.successFlg){
                    //保存用户信息到缓存中
                    window.localStorage.setItem("usercode",data.obj.code);//用户code
                    console.info(data)
                    window.location.href=server+'/index/index.html?u='+data.obj.id;
                    window.location.href='/index/index.html?u='+data.obj.id;
                }else{
                    alert("账号或密码错误")
                }