角色模块功能等接口

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

@@ -1,11 +1,11 @@
package com.yihu.jw.entity.base.user;
package com.yihu.jw.entity.base.role;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import java.sql.Timestamp;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.sql.Timestamp;
/**
 * BaseRole entity. @author MyEclipse Persistence Tools
@@ -55,15 +55,6 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
		this.name = name;
	}
	@Column(name = "remark", length = 1000)
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "code", length = 50)
	public String getCode() {
		return code;
@@ -72,4 +63,14 @@ public class RoleDO extends UuidIdentityEntityWithOperator {
	public void setCode(String code) {
		this.code = code;
	}
	@Column(name = "remark")
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
}

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

@@ -1,7 +1,8 @@
package com.yihu.jw.entity.base.user;
package com.yihu.jw.entity.base.role;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -15,9 +16,8 @@ public class RoleModuleFunctionDO extends UuidIdentityEntity {
    private String roleId; //角色ID
    private String moduleId; //模块ID
    private String functionId; //功能ID
    private String access; //访问权限
    @Column(name = "role_id", length = 50)
    public String getRoleId() {
        return roleId;
    }
@@ -26,6 +26,7 @@ public class RoleModuleFunctionDO extends UuidIdentityEntity {
        this.roleId = roleId;
    }
    @Column(name = "module_id", length = 50)
    public String getModuleId() {
        return moduleId;
    }
@@ -33,4 +34,13 @@ public class RoleModuleFunctionDO extends UuidIdentityEntity {
    public void setModuleId(String moduleId) {
        this.moduleId = moduleId;
    }
    @Column(name = "function_id", length = 50)
    public String getFunctionId() {
        return functionId;
    }
    public void setFunctionId(String functionId) {
        this.functionId = functionId;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasModuleDO.java

@@ -10,14 +10,14 @@ import javax.persistence.*;
 */
@Entity
@Table(name = "base_saas_module")
public class SaasModuleDO extends UuidIdentityEntity implements java.io.Serializable {
public class SaasModuleDO extends UuidIdentityEntity {
	private String saasId; //关联WlyySaas code
	private String moduleId; //关联 WlyyModule code
	// Constructors
	@Column(name = "saas_id", length = 100)
	@Column(name = "saas_id", length = 50)
	public String getSaasId() {
		return saasId;
	}
@@ -26,7 +26,7 @@ public class SaasModuleDO extends UuidIdentityEntity implements java.io.Serializ
		this.saasId = saasId;
	}
	@Column(name = "module_id", length = 100)
	@Column(name = "module_id", length = 50)
	public String getModuleId() {
		return this.moduleId;
	}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -28,6 +28,14 @@ public class BaseRequestMapping {
        public static final String AUDIT  = "/audit";
    }
    /**
     * SAAS
     */
    public static class SaasModule extends Basic {
        public static final String PREFIX  = "/saas_module";
    }
    /**
     * 模块
     */
@@ -71,11 +79,24 @@ public class BaseRequestMapping {
        public static final String PREFIX  = "/system_dict_entry";
    }
    public static class ModuleFun{
        public static final String api_getExistFun = "/moduleFun/existFunc/{id}";
        public static final String api_changeFun="/moduleFun/changeFun";
        public static final String moduleId_is_null="moduleId is null";
        public static final String funIds_is_null="funIds is null";
    /**
     * 角色
     */
    public static class Role extends Basic {
        public static final String PREFIX  = "/role";
    }
    /**
     * 角色模块功能
     */
    public static class RoleModuleFunction extends Basic {
        public static final String PREFIX  = "/role_module_function";
    }
    /**
     * 微信
     */
    public static class WeChat extends Basic {
        public static final String PREFIX  = "/wechat";
    }
}

gateway/basic-gateway/src/main/resources/application.yml

@@ -8,6 +8,9 @@ zuul:
    svr-iot:
      path: /iot/**
      serviceId: svr-iot
    svr-base:
      path: /base/**
      serviceId: svr-base
    demo:
      path: /baidu/**
      url: https://www.baidu.com

svr/svr-base/src/main/java/com/yihu/jw/base/dao/RoleDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.role.RoleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/17.
 */
public interface RoleDao extends PagingAndSortingRepository<RoleDO, String>, JpaSpecificationExecutor<RoleDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/RoleModuleFunctionDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.role.RoleModuleFunctionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/17.
 */
public interface RoleModuleFunctionDao extends PagingAndSortingRepository<RoleModuleFunctionDO, String>, JpaSpecificationExecutor<RoleModuleFunctionDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/SaasModuleDao.java

@@ -0,0 +1,12 @@
package com.yihu.jw.base.dao;
import com.yihu.jw.entity.base.saas.SaasModuleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by progr1mmer on 2018/8/17.
 */
public interface SaasModuleDao extends PagingAndSortingRepository<SaasModuleDO, String>, JpaSpecificationExecutor<SaasModuleDO> {
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleEndpoint.java

@@ -0,0 +1,94 @@
package com.yihu.jw.base.endpoint.role;
import com.yihu.jw.base.service.RoleService;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Created by progr1mmer on 2018/8/16.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.Role.PREFIX)
@Api(value = "角色管理", description = "角色管理服务接口", tags = {"wlyy基础服务 - 角色管理服务接口"})
public class RoleEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private RoleService roleService;
    @PostMapping(value = BaseRequestMapping.Module.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<RoleDO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        RoleDO roleDO = toEntity(jsonData, RoleDO.class);
        roleDO = roleService.save(roleDO);
        return success(roleDO);
    }
    @PostMapping(value = BaseRequestMapping.Module.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        roleService.delete(ids);
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.Module.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        RoleDO roleDO = toEntity(jsonData, RoleDO.class);
        if (null == roleDO.getId()) {
            return failed("ID不能为空");
        }
        roleDO = roleService.save(roleDO);
        return success(roleDO);
    }
    @GetMapping(value = BaseRequestMapping.Module.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<RoleDO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<RoleDO> roleDOS = roleService.search(fields, filters, sorts, page, size);
        int count = (int)roleService.getCount(filters);
        return success(roleDOS, count, page, size);
    }
    @GetMapping(value = BaseRequestMapping.Module.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<RoleDO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<RoleDO> roleDOS = roleService.search(fields, filters, sorts);
        return success(roleDOS);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/RoleModuleFunctionEndpoint.java

@@ -0,0 +1,94 @@
package com.yihu.jw.base.endpoint.role;
import com.yihu.jw.base.service.RoleModuleFunctionService;
import com.yihu.jw.entity.base.role.RoleModuleFunctionDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Created by progr1mmer on 2018/8/16.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.RoleModuleFunction.PREFIX)
@Api(value = "角色模块功能管理", description = "角色模块功能管理服务接口", tags = {"wlyy基础服务 - 角色模块功能管理服务接口"})
public class RoleModuleFunctionEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private RoleModuleFunctionService roleModuleFunctionService;
    @PostMapping(value = BaseRequestMapping.RoleModuleFunction.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<RoleModuleFunctionDO> create (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        RoleModuleFunctionDO roleModuleFunctionDO = toEntity(jsonData, RoleModuleFunctionDO.class);
        roleModuleFunctionDO = roleModuleFunctionService.save(roleModuleFunctionDO);
        return success(roleModuleFunctionDO);
    }
    @PostMapping(value = BaseRequestMapping.RoleModuleFunction.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        roleModuleFunctionService.delete(ids);
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.RoleModuleFunction.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json_data", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        RoleModuleFunctionDO roleModuleFunctionDO = toEntity(jsonData, RoleModuleFunctionDO.class);
        if (null == roleModuleFunctionDO.getId()) {
            return failed("ID不能为空");
        }
        roleModuleFunctionDO = roleModuleFunctionService.save(roleModuleFunctionDO);
        return success(roleModuleFunctionDO);
    }
    @GetMapping(value = BaseRequestMapping.RoleModuleFunction.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<RoleModuleFunctionDO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<RoleModuleFunctionDO> roleModuleFunctionDOS = roleModuleFunctionService.search(fields, filters, sorts, page, size);
        int count = (int)roleModuleFunctionService.getCount(filters);
        return success(roleModuleFunctionDOS, count, page, size);
    }
    @GetMapping(value = BaseRequestMapping.RoleModuleFunction.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<RoleModuleFunctionDO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<RoleModuleFunctionDO> roleModuleFunctionDOS = roleModuleFunctionService.search(fields, filters, sorts);
        return success(roleModuleFunctionDOS);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasEndpoint.java

@@ -33,9 +33,9 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
    public ObjEnvelop<SaasDO> create (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SaasDO saas = toEntity(jsonData, SaasDO.class);
        saas = saasService.save(saas);
        return success(saas);
        SaasDO saasDO = toEntity(jsonData, SaasDO.class);
        saasDO = saasService.save(saasDO);
        return success(saasDO);
    }
    @PostMapping(value = BaseRequestMapping.Saas.DELETE)
@@ -52,12 +52,12 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
    public Envelop update (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SaasDO saas = toEntity(jsonData, SaasDO.class);
        if (null == saas.getId()) {
        SaasDO saasDO = toEntity(jsonData, SaasDO.class);
        if (null == saasDO.getId()) {
            return failed("ID不能为空");
        }
        saas = saasService.save(saas);
        return success(saas);
        saasDO = saasService.save(saasDO);
        return success(saasDO);
    }
    @GetMapping(value = BaseRequestMapping.Saas.PAGE)
@@ -73,9 +73,9 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<SaasDO> saas = saasService.search(fields, filters, sorts, page, size);
        List<SaasDO> saasDOS = saasService.search(fields, filters, sorts, page, size);
        int count = (int)saasService.getCount(filters);
        return success(saas, count, page, size);
        return success(saasDOS, count, page, size);
    }
    @GetMapping(value = BaseRequestMapping.Saas.LIST)
@@ -87,8 +87,8 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<SaasDO> themes = saasService.search(fields, filters, sorts);
        return success(themes);
        List<SaasDO> saasDOS = saasService.search(fields, filters, sorts);
        return success(saasDOS);
    }
    @PostMapping(value = BaseRequestMapping.Saas.AUDIT)
@@ -98,12 +98,12 @@ public class SaasEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "id") String id,
            @ApiParam(name = "status", value = "状态", required = true)
            @RequestParam(value = "status") SaasDO.Status status) throws Exception {
        SaasDO saas = saasService.retrieve(id);
        if (null == saas) {
        SaasDO saasDO = saasService.retrieve(id);
        if (null == saasDO) {
            return failed("无相关SAAS配置");
        }
        saas.setStatus(status);
        saasService.save(saas);
        saasDO.setStatus(status);
        saasService.save(saasDO);
        return success("操作成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasModuleEndpoint.java

@@ -0,0 +1,94 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.service.SaasModuleService;
import com.yihu.jw.entity.base.saas.SaasModuleDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
 * Created by progr1mmer on 2018/8/16.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.SaasModule.PREFIX)
@Api(value = "Saas模块管理", description = "Saas模块管理服务接口", tags = {"wlyy基础服务 - Saas模块管理服务接口"})
public class SaasModuleEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private SaasModuleService saasModuleService;
    @PostMapping(value = BaseRequestMapping.SaasModule.CREATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<SaasModuleDO> create (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SaasModuleDO saasModuleDO = toEntity(jsonData, SaasModuleDO.class);
        saasModuleDO = saasModuleService.save(saasModuleDO);
        return success(saasModuleDO);
    }
    @PostMapping(value = BaseRequestMapping.SaasModule.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        saasModuleService.delete(ids);
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.SaasModule.UPDATE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "更新")
    public Envelop update (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SaasModuleDO saasModuleDO = toEntity(jsonData, SaasModuleDO.class);
        if (null == saasModuleDO.getId()) {
            return failed("ID不能为空");
        }
        saasModuleDO = saasModuleService.save(saasModuleDO);
        return success(saasModuleDO);
    }
    @GetMapping(value = BaseRequestMapping.SaasModule.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<SaasModuleDO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<SaasModuleDO> saasModuleDOS = saasModuleService.search(fields, filters, sorts, page, size);
        int count = (int)saasModuleService.getCount(filters);
        return success(saasModuleDOS, count, page, size);
    }
    @GetMapping(value = BaseRequestMapping.SaasModule.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<SaasModuleDO> list (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<SaasModuleDO> saasModuleDOS = saasModuleService.search(fields, filters, sorts);
        return success(saasModuleDOS);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEndpoint.java

@@ -33,9 +33,9 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
    public ObjEnvelop<SystemDictDO> create (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SystemDictDO systemDict = toEntity(jsonData, SystemDictDO.class);
        systemDict = systemDictService.save(systemDict);
        return success(systemDict);
        SystemDictDO systemDictDO = toEntity(jsonData, SystemDictDO.class);
        systemDictDO = systemDictService.save(systemDictDO);
        return success(systemDictDO);
    }
    @PostMapping(value = BaseRequestMapping.SystemDict.DELETE)
@@ -52,12 +52,12 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
    public Envelop update (
            @ApiParam(name = "json", value = "Json数据", required = true)
            @RequestBody String jsonData) throws Exception {
        SystemDictDO systemDict = toEntity(jsonData, SystemDictDO.class);
        if (null == systemDict.getId()) {
        SystemDictDO systemDictDO = toEntity(jsonData, SystemDictDO.class);
        if (null == systemDictDO.getId()) {
            return failed("ID不能为空");
        }
        systemDict = systemDictService.save(systemDict);
        return success(systemDict);
        systemDictDO = systemDictService.save(systemDictDO);
        return success(systemDictDO);
    }
    @GetMapping(value = BaseRequestMapping.SystemDict.PAGE)
@@ -73,9 +73,9 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        List<SystemDictDO> systemDict = systemDictService.search(fields, filters, sorts, page, size);
        List<SystemDictDO> systemDictDOS = systemDictService.search(fields, filters, sorts, page, size);
        int count = (int)systemDictService.getCount(filters);
        return success(systemDict, count, page, size);
        return success(systemDictDOS, count, page, size);
    }
    @GetMapping(value = BaseRequestMapping.SystemDict.LIST)
@@ -87,7 +87,7 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<SystemDictDO> themes = systemDictService.search(fields, filters, sorts);
        return success(themes);
        List<SystemDictDO> systemDictDOS = systemDictService.search(fields, filters, sorts);
        return success(systemDictDOS);
    }
}

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

@@ -0,0 +1,16 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.RoleModuleFunctionDao;
import com.yihu.jw.entity.base.role.RoleModuleFunctionDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/17.
 */
@Service
public class RoleModuleFunctionService extends BaseJpaService<RoleModuleFunctionDO, RoleModuleFunctionDao> {
}

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

@@ -0,0 +1,13 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.RoleDao;
import com.yihu.jw.entity.base.role.RoleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/17.
 */
@Service
public class RoleService extends BaseJpaService<RoleDO, RoleDao> {
}

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

@@ -0,0 +1,15 @@
package com.yihu.jw.base.service;
import com.yihu.jw.base.dao.SaasModuleDao;
import com.yihu.jw.entity.base.saas.SaasModuleDO;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
/**
 * Created by progr1mmer on 2018/8/17.
 */
@Service
public class SaasModuleService extends BaseJpaService<SaasModuleDO, SaasModuleDao> {
}

svr/svr-base/src/main/java/com/yihu/jw/business/wx/controller/WechatCoreController.java

@@ -3,6 +3,7 @@ package com.yihu.jw.business.wx.controller;
import com.yihu.jw.business.wx.service.WechatCoreService;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.rm.base.WechatRequestMapping;
import io.swagger.annotations.Api;
import org.apache.commons.lang.StringUtils;
@@ -26,7 +27,7 @@ import java.util.List;
 * Created by Trick on 2018/8/16.
 */
@RestController
@RequestMapping(WechatRequestMapping.api_common)
@RequestMapping(BaseRequestMapping.WeChat.PREFIX)
@Api(value = "微信回调及事件处理", description = "微信回调及事件处理")
public class WechatCoreController extends EnvelopRestEndpoint {
@@ -43,24 +44,20 @@ public class WechatCoreController extends EnvelopRestEndpoint {
     */
    @RequestMapping(method = RequestMethod.GET)
    @ResponseBody
    public void checkSignature(HttpServletRequest request, HttpServletResponse response) {
        try {
            String signature = request.getParameter("signature").toString();
            String timestamp = request.getParameter("timestamp").toString();
            String nonce = request.getParameter("nonce").toString();
            String echostr = request.getParameter("echostr").toString();
            if (validate(signature, timestamp, nonce)) {
                // 验证成功，返回验证码
                response.getWriter().print(echostr);
            } else {
                // 验证失败
                response.setStatus(401);
            }
        } catch (Exception e) {
            // 服务器错误
            response.setStatus(500);
    public void checkSignature(HttpServletRequest request, HttpServletResponse response) throws Exception {
        String signature = request.getParameter("signature").toString();
        String timestamp = request.getParameter("timestamp").toString();
        String nonce = request.getParameter("nonce").toString();
        String echostr = request.getParameter("echostr").toString();
        if (validate(signature, timestamp, nonce)) {
            // 验证成功，返回验证码
            response.getWriter().print(echostr);
        } else {
            // 验证失败
            response.setStatus(401);
        }
    }
    /**