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

Conflicts:
	svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/servicePackage/ServicePackageEndpoint.java

common/common-exception/src/main/java/com/yihu/jw/exception/code/BaseErrorCode.java

@@ -14,11 +14,11 @@ public class BaseErrorCode {
     */
    public static class Common{
        public static final String fail_upload = "-1";//上传失败
        public static final String fail_update = "-2";//修改失败
        public static final String fail_create = "-3";//新增失败
        public static final String fail_delete = "-4";//删除失败
        public static final String id_is_null = "-5";//ID不能为空
        public static final String FAIL_UPLOAD = "-1";//上传失败
        public static final String FAIL_UPDATE = "-2";//修改失败
        public static final String FAIL_CREATE = "-3";//新增失败
        public static final String FAIL_DELETE = "-4";//删除失败
        public static final String ID_IS_NULL = "-5";//ID不能为空
    }
@@ -26,13 +26,55 @@ public class BaseErrorCode {
     * 错误码模块
     */
    public static class ErrorCode{
        public static final String is_exist = "-10000";
        public static final String IS_EXIST = "-10000";
    }
    /**
     * 租户模块
     */
    public static class Saas{
        public static final String SAAS = "-101000";
    }
    /**
     * 菜单模块
     */
    public static class Menu{
        public static final String findDictByCode = "findDictByCode";
        public static final String FINDDICTBYCODE = "-102000";
    }
    /**
     * 业务模块
     */
    public static class Module{
        public static final String FINDDICTBYCODE = "-103000";
    }
    /**
     * 字典模块
     */
    public static class Dict{
        public static final String FINDDICTBYCODE = "-104000";
    }
    /**
     * 通知公告模块
     */
    public static class Notice{
        public static final String FINDDICTBYCODE = "-105000";
    }
    /**
     * 接口模块
     */
    public static class Interface{
        public static final String FINDDICTBYCODE = "-106000";
    }
    /**
     * 微信模块
     */
    public static class Wechat{
        public static final String WECHAT = "-1000000";
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/errorCode/ErrorCodeEndpoint.java

@@ -38,7 +38,7 @@ public class ErrorCodeEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        ErrorCodeDO errorCodeDO = toEntity(jsonData, ErrorCodeDO.class);
        if(errorCodeService.isExistsErrorCode(errorCodeDO.getErrorCode())>0){
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.ErrorCode.is_exist), ObjEnvelop.class);
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.ErrorCode.IS_EXIST), ObjEnvelop.class);
        }
        errorCodeDO = errorCodeService.save(errorCodeDO);
        return success(errorCodeDO, ErrorCodeVO.class);
@@ -53,7 +53,7 @@ public class ErrorCodeEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "errorMsg", required = true) String errorMsg) throws Exception {
        if (null == id) {
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Common.id_is_null), ObjEnvelop.class);
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Common.ID_IS_NULL), ObjEnvelop.class);
        }
        ErrorCodeDO errorCodeDO = errorCodeService.updateMsg(id, errorMsg);
        return success(errorCodeDO, ErrorCodeVO.class);

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

@@ -62,7 +62,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            @RequestBody String jsonData) throws Exception {
        MenuDO menuDO = toEntity(jsonData, MenuDO.class);
        if (null == menuDO.getId()) {
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Common.id_is_null), Envelop.class);
            return failed(errorCodeUtil.getErrorMsg(BaseErrorCode.Common.ID_IS_NULL), Envelop.class);
        }
        menuDO = menuService.save(menuDO);
        return success(menuDO);

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

@@ -25,7 +25,7 @@ public class ErrorCodeService extends BaseJpaService<ErrorCodeDO, ErrorCodeDao>
     * 初始化错误码，如果redis没有则查询数据库导入到redis中
     */
    public void initErrorCode(){
        String msg = redisTemplate.opsForValue().get(BaseErrorCode.PREFIX + BaseErrorCode.Common.fail_create);
        String msg = redisTemplate.opsForValue().get(BaseErrorCode.PREFIX + BaseErrorCode.Common.FAIL_CREATE);
        if(StringUtils.isBlank(msg)){
            Iterable<ErrorCodeDO> list = errorCodeDao.findAll();
            list.forEach(code->{