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

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

@@ -28,8 +28,8 @@ public class BaseRequestMapping {
        public static final String api_create="/function";
        public static final String api_update="/function";
        public static final String api_delete="/function/{codes}";
        public static final String api_getByCode="/function/{code}";
        public static final String api_delete="/function/{ids}";
        public static final String api_getById="/function/{id}";
        public static final String api_getListNoPage="/function/listNoPage";
        public static final String api_getList="/function/list";
        public static final String api_assignFunction="/assignFunction";
@@ -58,7 +58,7 @@ public class BaseRequestMapping {
        public static final String api_create="/module";
        public static final String api_update="/module";
        public static final String api_delete="/module/{codes}";
        public static final String api_getByCode="/module/{code}";
        public static final String api_getById="/module/{id}";
        public static final String api_getListNoPage="/module/listNoPage";
        public static final String api_getList="/module/list";
        public static final String api_getChildren="/module/children/{code}";
@@ -66,7 +66,7 @@ public class BaseRequestMapping {
    }
    public static class ModuleFun{
        public static final String api_getExistFun = "/moduleFun/existFunc/{code}";
        public static final String api_getExistFun = "/moduleFun/existFunc/{id}";
        public static final String api_changeFun="/moduleFun/changeFun";
@@ -93,7 +93,7 @@ public class BaseRequestMapping {
        public static final String api_create="/saas";
        public static final String api_update="/saas";
        public static final String api_delete="/saas";
        public static final String api_getByCode="/getByCode";
        public static final String api_getById="/getById";
        public static final String api_getSaass="/getSaass";
        public static final String api_getSaassNoPage="/getSaassNoPage";

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

@@ -49,7 +49,7 @@ public class BaseSmsRequestMapping {
        public static final String api_create="smsGateway";
        public static final String api_update="smsGateway";
        public static final String api_delete="smsGateway";
        public static final String api_getByCode="getSmsGatewayByCode";
        public static final String api_getById="getSmsGatewayById";
        public static final String api_getSmsGateways="getSmsGateways";
        public static final String api_getSmsGatewaysNoPage="getSmsGatewaysNoPage";

common/common-request-mapping/src/main/java/com/yihu/jw/rm/wx/WechatRequestMapping.java

@@ -22,15 +22,15 @@ public class WechatRequestMapping {
    public static class WxMenu{
        public static final String api_create="/menu";
        public static final String api_update="/menu";
        public static final String api_delete="/menu/{codes}/{userCode}";
        public static final String api_delete="/menu/{ids}/{userId}";
        public static final String api_getWxMenuNoPage="/menu/listNoPage";
        public static final String api_getWxMenus="/menu/list";
        public static final String api_getByCode="/menu/{code}";
        public static final String api_getParentMenu="/parentMenu/{wechatCode}";
        public static final String api_getById="/menu/{id}";
        public static final String api_getParentMenu="/parentMenu/{wechatId}";
        public static final String api_createMenu="/createMenu";
        public static final String api_getChildMenus="/childMenu/list/{parentCode}";
        public static final String api_getChildMenus="/childMenu/list/{parentId}";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_code_is_null="id is null";
        public static final String message_fail_name_is_null="name is null";
        public static final String message_fail_type_is_null="type is null";
        public static final String message_fail_key_is_null="key is null";
@@ -41,8 +41,8 @@ public class WechatRequestMapping {
        public static final String message_fail_url_is_toLong="url is to long";
        public static final String message_fail_sort_is_null="sort is null";
        public static final String message_fail_sort_is_repeat="sort is repeat";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String message_fail_supMenuCode_is_no_exist="supMenuCode is no exist";
        public static final String message_fail_code_no_exist="id no exist";
        public static final String message_fail_supMenuCode_is_no_exist="supMenuId is no exist";
        public static final String message_fail_mediaId_is_null="mediaId is null";
        public static final String message_fail_childMenu_is_to_much="childMenu is to much";//子菜单数目过多
        public static final String message_fail_parentMenu_is_to_much="parentMenu is to much";//子菜单数目过多
@@ -61,10 +61,10 @@ public class WechatRequestMapping {
    public static class WxTemplate {
        public static final String api_create="/template";
        public static final String api_update="/template";
        public static final String api_delete="/template/{codes}";
        public static final String api_delete="/template/{ids}";
        public static final String api_getWxTemplatesNoPage="/template/listNoPage";
        public static final String api_getWxTemplates="/template/list";
        public static final String api_getByCode="/template/{code}";
        public static final String api_getById="/template/{id}";
        public static final String api_sendTemplateMessage="/sendTemplateMessage";
        public static final String message_success_create="wxTemplate create success";
@@ -73,9 +73,9 @@ public class WechatRequestMapping {
        public static final String message_success_find_functions="wxTemplate find success";
        public static final String message_success_delete="wxTemplate delete success";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_code_no_exist="code no exist";
        public static final String message_fail_wechatCode_is_null="wechatCode is null";
        public static final String message_fail_code_is_null="id is null";
        public static final String message_fail_code_no_exist="id no exist";
        public static final String message_fail_wechatCode_is_null="wechatId is null";
        public static final String message_fail_templateid_is_null="templateid is null";
        public static final String message_fail_content_is_null="content is null";
        public static final String message_fail_content_format_is_not_right="content format is not right";
@@ -86,7 +86,7 @@ public class WechatRequestMapping {
        public static final String api_create="/wechatConfig";
        public static final String api_update="/wechatConfig";
        public static final String api_delete="/wechatConfig/{codes}";
        public static final String api_delete="/wechatConfig/{ids}";
        public static final String api_getWechatNoPage="/wechatConfig/listNoPage";
        public static final String api_getWechats="/wechatConfig/list";
        public static final String api_getById="/wechatConfig/{id}";
@@ -97,8 +97,8 @@ public class WechatRequestMapping {
        public static final String message_success_find_functions="wechat find success";
        public static final String message_success_delete="wechat delete success";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_code_no_exist="code not exist";
        public static final String message_fail_code_is_null="id is null";
        public static final String message_fail_code_no_exist="id not exist";
        public static final String message_fail_appSecret_is_null="appSecret is null";
        public static final String message_fail_appId_exist="wechat appId exist";
        public static final String message_fail_status_is_null="status is null";
@@ -113,10 +113,10 @@ public class WechatRequestMapping {
    public static class WxGraphicMessage {
        public static final String api_create="/graphicMessage";
        public static final String api_update="/graphicMessage";
        public static final String api_delete="/graphicMessage/{codes}";
        public static final String api_delete="/graphicMessage/{ids}";
        public static final String api_getWxGraphicMessageNoPage="/graphicMessage/listNoPage";
        public static final String api_getWxGraphicMessages="/graphicMessage/list";
        public static final String api_getByCode="/graphicMessage/{code}";
        public static final String api_getById="/graphicMessage/{id}";
        public static final String api_sendGraphicMessages="/sendGraphicMessages";
        public static final String message_success_create="wxGraphicMessage create success";
@@ -125,9 +125,9 @@ public class WechatRequestMapping {
        public static final String message_success_find_functions="wxGraphicMessage find success";
        public static final String message_success_delete="wxGraphicMessage delete success";
        public static final String message_fail_code_is_null="code is null";
        public static final String message_fail_code_no_exist="code not exist";
        public static final String message_fail_code_exist="code exist";
        public static final String message_fail_code_is_null="id is null";
        public static final String message_fail_code_no_exist="id not exist";
        public static final String message_fail_code_exist="id exist";
        public static final String message_fail_status_is_null="status is null";
        public static final String message_fail_title_is_null="title is null";
        public static final String message_fail_wxGraphicMessage_is_no_exist="wxGraphicMessage is not exist";

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

@@ -61,24 +61,24 @@ public class FunctionController extends EnvelopRestController {
    @DeleteMapping(value = BaseRequestMapping.Function.api_delete)
    @ApiOperation(value = "删除功能", notes = "删除功能")
    public Envelop deleteFunction(
            @ApiParam(name = "codes", value = "codes")
            @PathVariable(value = "codes", required = true) String codes) {
            @ApiParam(name = "ids", value = "ids")
            @PathVariable(value = "ids", required = true) String ids) {
        try {
            functionService.deleteFunction(codes);
            functionService.deleteFunction(ids);
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseRequestMapping.Function.api_getByCode)
    @GetMapping(value = BaseRequestMapping.Function.api_getById)
    @ApiOperation(value = "根据code查找功能", notes = "根据code查找功能")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_find, functionService.findByCode(code));
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_find, functionService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -158,12 +158,12 @@ public class FunctionController extends EnvelopRestController {
    @PutMapping(value = BaseRequestMapping.Function.api_assignFunction, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "给对应的模块分配功能")
    public Envelop assignModule(
            @ApiParam(name = "module_code", value = "module_code", defaultValue = "")
            @RequestParam String moduleCode,
            @ApiParam(name = "functionCodes", value = "功能的code，可以传多个，逗号分割", defaultValue = "")
            @RequestParam String functionCodes) {
            @ApiParam(name = "moduleId", value = "moduleId", defaultValue = "")
            @RequestParam String moduleId,
            @ApiParam(name = "functionIds", value = "功能的code，可以传多个，逗号分割", defaultValue = "")
            @RequestParam String functionIds) {
        try {
            functionService.assignFunction(moduleCode,functionCodes);
            functionService.assignFunction(moduleId,functionIds);
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_assign_function);
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
@@ -173,10 +173,10 @@ public class FunctionController extends EnvelopRestController {
    @GetMapping(value = BaseRequestMapping.Function.api_getModuleFunctions, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "查询saas的模块")
    public Envelop getModuleFunctions(
            @ApiParam(name = "saas_code", value = "saas_code", defaultValue = "")
            @RequestParam String saasCode) {
            @ApiParam(name = "saasId", value = "saasId", defaultValue = "")
            @RequestParam String saasId) {
        try {
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_find_functions_module,functionService.getModuleFunctions(saasCode));
            return Envelop.getSuccess(BaseRequestMapping.Function.message_success_find_functions_module,functionService.getModuleFunctions(saasId));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

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

@@ -69,14 +69,14 @@ public class ModuleController extends EnvelopRestController {
        }
    }
    @GetMapping(value = BaseRequestMapping.Module.api_getByCode)
    @GetMapping(value = BaseRequestMapping.Module.api_getById)
    @ApiOperation(value = "根据code查找模块", notes = "根据code查找模块")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(BaseRequestMapping.Module.message_success_find, moduleService.findByCode(code));
            return Envelop.getSuccess(BaseRequestMapping.Module.message_success_find, moduleService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

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

@@ -24,8 +24,8 @@ public class ModuleFunController extends EnvelopRestController {
    @GetMapping(value = BaseRequestMapping.ModuleFun.api_getExistFun)
    @ApiOperation(value="查找已存在的功能")
    public Envelop getExistFunc(@PathVariable String code){
        List<String> funcs = moduleFunService.getExistFun(code);
    public Envelop getExistFunc(@PathVariable String id){
        List<String> funcs = moduleFunService.getExistFun(id);
        return Envelop.getSuccess("查询成功",funcs);
    }

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

@@ -58,24 +58,24 @@ public class SaasController extends EnvelopRestController {
    @DeleteMapping(value = BaseRequestMapping.Saas.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除Saas配置", notes = "删除Saas配置")
    public Envelop deleteSaas(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id) {
        try {
            saasService.deleteSaas(code);
            saasService.deleteSaas(id);
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_delete);
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseRequestMapping.Saas.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @GetMapping(value = BaseRequestMapping.Saas.api_getById, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "根据code查找Saas配置", notes = "根据code查找Saas配置")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_find, saasService.findByCode(code));
            return Envelop.getSuccess(BaseRequestMapping.Saas.message_success_find, saasService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

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

@@ -15,6 +15,12 @@ public interface FunctionDao extends PagingAndSortingRepository<Function, String
    @Query("from Function f where f.name=?1 and f.status=1")
    Function findByName(String name);
    @Query("from Function f where f.id=?1 and f.status=1")
    Function findById(String id);
    @Query("from Function f where f.name=?1 and f.status=1 and f.id!=?2")
    Function findByNameExcludeId(String name,String id);
    @Query("from Function f where f.parentId=?1 and f.status=1")
    List<Function> getChildren(String parentId);

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

@@ -14,10 +14,13 @@ public interface ModuleDao extends PagingAndSortingRepository<Module, String>, J
    @Query("from Module f where f.name=?1 and f.status=1")
    Module findByName(String name);
    @Query("from Module f where f.name=?1 and f.status=1 and f.code != ?2")
    Module findByNameExcludeCode(String name, String code);
    @Query("from Module f where f.id=?1 and f.status=1")
    Module findById(String id);
    @Query("from Module f where f.parentCode=?1 and f.status=1")
    @Query("from Module f where f.name=?1 and f.status=1 and f.id != ?2")
    Module findByNameExcludeId(String name, String code);
    @Query("from Module f where f.parentId=?1 and f.status=1")
    List<Module> getChildren(String code);
    @Query("from Module f where f.status=1")

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

@@ -17,10 +17,10 @@ public interface ModuleFunctionDao extends PagingAndSortingRepository<ModuleFunc
    @Transactional
    @Modifying
    @Query("delete from ModuleFunction es where es.moduleId = ?1")
    int deleteByModuleCode(String moduleId);
    int deleteByModuleId(String moduleId);
    @Query("from ModuleFunction mf where mf.moduleId = ?1")
    List<ModuleFunction> findByModuleCode(String code);
    List<ModuleFunction> findByModuleId(String id);
    @Transactional
    @Modifying

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

@@ -12,9 +12,9 @@ public interface SaasDao extends PagingAndSortingRepository<Saas, String>, JpaSp
    @Query("from Saas f where f.name=?1 and f.status=1")
    Saas findByName(String name);
    @Query("from Saas f where f.name=?1 and f.status=1 and f.code != ?2")
    Saas findByNameExcludeCode(String name, String code);
    @Query("from Saas f where f.name=?1 and f.status=1 and f.id != ?2")
    Saas findByNameExcludeId(String name, String id);
    @Query("from Saas f where f.code=?1 and f.status=1")
    Saas findByCode(String code);
    @Query("from Saas f where f.id=?1 and f.status=1")
    Saas findById(String id);
}

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

@@ -60,15 +60,15 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
        if (StringUtils.isEmpty(function.getId())) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Function functionTmp = functionDao.findByNameExcludeCode(function.getName(), function.getId());
        Function functionTmp = functionDao.findByNameExcludeId(function.getName(), function.getId());
        if (functionTmp != null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return functionDao.save(function);
    }
    public Function findByCode(String code) {
        Function function = functionDao.findByCode(code);
    public Function findById(String id) {
        Function function = functionDao.findById(id);
        if (function == null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -76,8 +76,8 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
    }
    @Transactional
    public void deleteFunction(String code) {
        Function function = functionDao.findByCode(code);
    public void deleteFunction(String id) {
        Function function = functionDao.findById(id);
        if (function == null) {
            throw new ApiException(BaseRequestMapping.Function.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -85,24 +85,24 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
        functionDao.save(function);
    }
    @Transactional
    public void assignFunction(String moduleCode, String functionCodes) {
    public void assignFunction(String moduleId, String functionIds) {
        //先删除原来已经分配好的功能
        moduleFunctionDao.deleteByModuleCode(moduleCode);
        moduleFunctionDao.deleteByModuleId(moduleId);
        //分配新的功能
        String [] functionCodeArr=functionCodes.split(",");
        String [] functionCodeArr=functionIds.split(",");
        List<ModuleFunction> saasModuleList=new ArrayList<>();
        for(String functionCode:functionCodeArr){
        for(String functionId:functionCodeArr){
            ModuleFunction saasModule=new ModuleFunction();
            saasModule.setModuleId(moduleCode);
            saasModule.setFunctionId(functionCode);
            saasModule.setModuleId(moduleId);
            saasModule.setFunctionId(functionId);
            saasModuleList.add(saasModule);
        }
        moduleFunctionDao.save(saasModuleList);
    }
    public List<MFunction> getModuleFunctions(String saasCode) {
    public List<MFunction> getModuleFunctions(String saasId) {
        String sql=" select m.code,m.parent_code,m.name from base_function f,base_module_function mf where f.code=mf.function_id and f.status=1 and mf.module_id=?";
        return jdbcTemplate.queryForList(sql,MFunction.class,saasCode);
        return jdbcTemplate.queryForList(sql,MFunction.class,saasId);
    }
    /**
@@ -140,12 +140,12 @@ public class FunctionService extends BaseJpaService<Function, FunctionDao> {
    /**
     * 根据code获取所有子节点(包括孙节点,曾孙节点....)
     * @param code
     * @param id
     * @return
     */
    public Function getAllChildren(String code){
        Function function = functionDao.findByCode(code);
        List<Function> childrens = functionDao.getChildren(code);
    public Function getAllChildren(String id){
        Function function = functionDao.findById(id);
        List<Function> childrens = functionDao.getChildren(id);
        for(Function children:childrens){
            getAllChildren(children.getId());
        }

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

@@ -25,11 +25,11 @@ public class ModuleFunService extends BaseJpaService<ModuleFunction, ModuleFunct
    /**
     * 根据模块code,获取已存在的功能code
     * @param code
     * @param id
     * @return
     */
    public List<String> getExistFun(String code) {
        List<ModuleFunction> moduleFuns = moduleFunctionDao.findByModuleCode(code);
    public List<String> getExistFun(String id) {
        List<ModuleFunction> moduleFuns = moduleFunctionDao.findByModuleId(id);
        List<String> list = new ArrayList<>();
        for(ModuleFunction moduleFun:moduleFuns){
            list.add(moduleFun.getFunctionId());

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

@@ -62,15 +62,15 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
        if (StringUtils.isEmpty(module.getId())) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Module moduleTmp = moduleDao.findByNameExcludeCode(module.getName(), module.getId());
        Module moduleTmp = moduleDao.findByNameExcludeId(module.getName(), module.getId());
        if (moduleTmp != null) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return moduleDao.save(module);
    }
    public Module findByCode(String code) {
        Module module = moduleDao.findByCode(code);
    public Module findById(String Id) {
        Module module = moduleDao.findById(Id);
        if (module == null) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -78,8 +78,8 @@ public class ModuleService extends BaseJpaService<Module, ModuleDao> {
    }
    @Transactional
    public void deleteModule(String code) {
        Module module = moduleDao.findByCode(code);
    public void deleteModule(String Id) {
        Module module = moduleDao.findById(Id);
        if (module == null) {
            throw new ApiException(BaseRequestMapping.Module.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }

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

@@ -45,15 +45,15 @@ public class SaasService extends BaseJpaService<Saas, SaasDao> {
        if (StringUtils.isEmpty(saas.getId())) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_id_is_null, ExceptionCode.common_error_params_code);
        }
        Saas saasTmp = saasDao.findByNameExcludeCode(saas.getName(), saas.getId());
        Saas saasTmp = saasDao.findByNameExcludeId(saas.getName(), saas.getId());
        if (saasTmp != null) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_name_exist, ExceptionCode.common_error_params_code);
        }
        return saasDao.save(saas);
    }
    public Saas findByCode(String code) {
        Saas saas = saasDao.findByCode(code);
    public Saas findById(String id) {
        Saas saas = saasDao.findById(id);
        if (saas == null) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -61,8 +61,8 @@ public class SaasService extends BaseJpaService<Saas, SaasDao> {
    }
    @Transactional
    public void deleteSaas(String code) {
        Saas saas = saasDao.findByCode(code);
    public void deleteSaas(String id) {
        Saas saas = saasDao.findById(id);
        if (saas == null) {
            throw new ApiException(BaseRequestMapping.Saas.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }

svr/svr-base/src/main/java/com/yihu/jw/business/sms/controller/SmsGatewayController.java

@@ -57,24 +57,24 @@ public class SmsGatewayController extends EnvelopRestController {
    @DeleteMapping(value = BaseSmsRequestMapping.SmsGateway.api_delete, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "删除功能", notes = "删除功能")
    public Envelop deleteSmsGateway(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code) {
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id) {
        try {
            smsGatewayService.deleteSmsGateway(code);
            smsGatewayService.deleteSmsGateway(id);
            return Envelop.getSuccess(BaseSmsRequestMapping.SmsGateway.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = BaseSmsRequestMapping.SmsGateway.api_getByCode, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @GetMapping(value = BaseSmsRequestMapping.SmsGateway.api_getById, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "根据code查找功能", notes = "根据code查找功能")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    public Envelop findById(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(BaseSmsRequestMapping.SmsGateway.message_success_find, smsGatewayService.findByCode(code));
            return Envelop.getSuccess(BaseSmsRequestMapping.SmsGateway.message_success_find, smsGatewayService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

svr/svr-base/src/main/java/com/yihu/jw/business/sms/dao/SmsGatewayDao.java

@@ -15,6 +15,6 @@ public interface SmsGatewayDao extends PagingAndSortingRepository<BaseSmsGateway
    @Query("from BaseSmsGateway f where f.name=?1 and f.status=1 and f.code != ?2")
    BaseSmsGateway findByNameExcludeCode(String name, String code);
    @Query("from BaseSmsGateway f where f.code=?1 and f.status=1")
    BaseSmsGateway findByCode(String code);
    @Query("from BaseSmsGateway f where f.id=?1 and f.status=1")
    BaseSmsGateway findById(String id);
}

svr/svr-base/src/main/java/com/yihu/jw/business/sms/service/SmsGatewayService.java

@@ -52,8 +52,8 @@ public class SmsGatewayService extends BaseJpaService<BaseSmsGateway, SmsGateway
        return smsGatewayDao.save(smsGateway);
    }
    public BaseSmsGateway findByCode(String code) {
        BaseSmsGateway smsGateway = smsGatewayDao.findByCode(code);
    public BaseSmsGateway findById(String id) {
        BaseSmsGateway smsGateway = smsGatewayDao.findById(id);
        if (smsGateway == null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }
@@ -61,8 +61,8 @@ public class SmsGatewayService extends BaseJpaService<BaseSmsGateway, SmsGateway
    }
    @Transactional
    public void deleteSmsGateway(String code) {
        BaseSmsGateway smsGateway = smsGatewayDao.findByCode(code);
    public void deleteSmsGateway(String id) {
        BaseSmsGateway smsGateway = smsGatewayDao.findById(id);
        if (smsGateway == null) {
            throw new ApiException(BaseSmsRequestMapping.SmsGateway.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
        }

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

@@ -60,15 +60,15 @@ public class WechatConfigController extends EnvelopRestController {
    @DeleteMapping(value = WechatRequestMapping.WxConfig.api_delete)
    @ApiOperation(value = "删除微信配置", notes = "删除微信配置")
    public Envelop deleteWechat(
            @ApiParam(name = "codes", value = "codes")
            @RequestParam(value = "codes", required = true) String codes,
            @ApiParam(name = "userCode", value = "userCode")
            @RequestParam(value = "userCode", required = true) String userCode,
            @ApiParam(name = "ids", value = "ids")
            @RequestParam(value = "ids", required = true) String ids,
            @ApiParam(name = "userId", value = "userId")
            @RequestParam(value = "userId", required = true) String userId,
            @ApiParam(name = "userName", value = "userName")
            @RequestParam(value = "userName", required = true) String userName
            ) {
        try {
            wechatService.deleteWechat(codes,userCode,userName);
            wechatService.deleteWechat(ids,userId,userName);
            return Envelop.getSuccess(WechatRequestMapping.WxConfig.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());

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

@@ -28,17 +28,17 @@ public class WxAccessTokenController extends EnvelopRestController {
    /**
     * 根据wechatCode获取WxAccessToken
     * @param wechatCode
     * @param wechatId
     * @return MWxAccessToken
     * @throws Exception
     */
    @GetMapping(value = WechatRequestMapping.WxAccessToken.api_get)
    @ApiOperation(value = "根据wechatCode获取最新的WxAccessToken")
    @ApiOperation(value = "根据wechatId获取最新的WxAccessToken")
    public Envelop getWxAccessToken(
            @ApiParam(name = "wechatCode", value = "wechatCode")
            @RequestParam(value = "wechatCode") String wechatCode) {
            @ApiParam(name = "wechatId", value = "wechatId")
            @RequestParam(value = "wechatId") String wechatId) {
        try {
            WxAccessToken wxAccessToken = wxAccessTokenService.getWxAccessTokenByCode(wechatCode);
            WxAccessToken wxAccessToken = wxAccessTokenService.getWxAccessTokenById(wechatId);
            return Envelop.getSuccess(WechatRequestMapping.WxAccessToken.message_success_get, wxAccessToken);
        }catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());

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

@@ -76,14 +76,14 @@ public class WxGraphicMessageController extends EnvelopRestController {
        }
    }
    @GetMapping(value = WechatRequestMapping.WxGraphicMessage.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxGraphicMessage.api_getById)
    @ApiOperation(value = "根据code查找微信图文消息", notes = "根据code查找微信图文消息")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WechatRequestMapping.WxGraphicMessage.message_success_find, wxGraphicMessageService.findByCode(code));
            return Envelop.getSuccess(WechatRequestMapping.WxGraphicMessage.message_success_find, wxGraphicMessageService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -149,14 +149,14 @@ public class WxGraphicMessageController extends EnvelopRestController {
    @ApiOperation(value = "发送图文消息")
    @ResponseBody
    public String sendGraphicMessages(
            @ApiParam(name = "codes", value = "根据code发送微信图文消息,多个code用,分割")
            @RequestParam(value = "codes", required = true) String codes,
            @ApiParam(name = "ids", value = "根据code发送微信图文消息,多个code用,分割")
            @RequestParam(value = "ids", required = true) String ids,
            @ApiParam(name = "fromUserName", value = "用户openid")
            @RequestParam(value = "fromUserName", required = true) String fromUserName,
            @ApiParam(name = "toUserName", value = "公众号")
            @RequestParam(value = "toUserName", required = true) String toUserName
            ) throws Exception {
        String messages = wxGraphicMessageService.sendGraphicMessages(codes, fromUserName,toUserName);
        String messages = wxGraphicMessageService.sendGraphicMessages(ids, fromUserName,toUserName);
        return messages;
    }

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

@@ -70,29 +70,29 @@ public class WxMenuController extends EnvelopRestController {
    @DeleteMapping(value = WechatRequestMapping.WxMenu.api_delete)
    @ApiOperation(value = "删除微信菜单", notes = "删除微信菜单")
    public Envelop deleteWxMenu(
            @ApiParam(name = "codes", value = "codes")
            @RequestParam(value = "codes", required = true) String codes,
            @ApiParam(name = "userCode", value = "userCode")
            @RequestParam(value = "userCode", required = true) String userCode,
            @ApiParam(name = "ids", value = "ids")
            @RequestParam(value = "ids", required = true) String ids,
            @ApiParam(name = "userId", value = "userId")
            @RequestParam(value = "userId", required = true) String userId,
            @ApiParam(name = "userName", value = "userName")
            @RequestParam(value = "userName", required = true) String userName
    ) {
        try {
            wxMenuService.deleteWxMenu(codes, userCode, userName);
            wxMenuService.deleteWxMenu(ids, userId, userName);
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_delete );
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
    }
    @GetMapping(value = WechatRequestMapping.WxMenu.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxMenu.api_getById)
    @ApiOperation(value = "根据code查找微信菜单", notes = "根据code查找微信菜单")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_find, wxMenuService.findByCode(code));
            return Envelop.getSuccess(WechatRequestMapping.WxMenu.message_success_find, wxMenuService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }

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

@@ -83,14 +83,14 @@ public class WxTemplateController extends EnvelopRestController {
        }
    }
    @GetMapping(value = WechatRequestMapping.WxTemplate.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxTemplate.api_getById)
    @ApiOperation(value = "根据code查找微信模版", notes = "根据code查找微信模版")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @RequestParam(value = "code", required = true) String code
    public Envelop findById(
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) String id
    ) {
        try {
            return Envelop.getSuccess(WechatRequestMapping.WxTemplate.message_success_find, wxTemplateService.findByCode(code));
            return Envelop.getSuccess(WechatRequestMapping.WxTemplate.message_success_find, wxTemplateService.findById(id));
        } catch (ApiException e) {
            return Envelop.getError(e.getMessage(), e.getErrorCode());
        }
@@ -118,7 +118,7 @@ public class WxTemplateController extends EnvelopRestController {
        //得到微信列表数据
        List<WxWechat> wechats = wechatService.search(fields, filters, sorts, page, size);
        for(WxWechat wechat:wechats){
            List<WxTemplate> wxTemplates = wxTemplateService.findByWxCode(wechat.getId());
            List<WxTemplate> wxTemplates = wxTemplateService.findByWxId(wechat.getId());
            if (wxTemplates.size()>0){
                wechat.setState("closed");
            }else{

svr/svr-base/src/main/java/com/yihu/jw/business/wx/dao/WechatDao.java

@@ -17,7 +17,7 @@ public interface WechatDao extends PagingAndSortingRepository<WxWechat, String>,
    @Query("from WxWechat w where w.appId = ?1 and w.id!= ?2 and w.status!=-1")
    WxWechat findByAppIdExcludeId(String appId, String code);
    WxWechat findByAppIdExcludeId(String appId, String id);
    @Query("from WxWechat w where w.id = ?1 and w.status!=-1")
    WxWechat findById(String id);

svr/svr-base/src/main/java/com/yihu/jw/business/wx/dao/WxAccessTokenDao.java

@@ -12,6 +12,6 @@ import java.util.List;
 */
public interface WxAccessTokenDao extends PagingAndSortingRepository<WxAccessToken, String>, JpaSpecificationExecutor<WxAccessToken> {
    @Query("from WxAccessToken w where w.wechatCode =?1 order by w.addTimestamp desc")
    List<WxAccessToken> getWxAccessTokenByCode(String wechatCode);
    @Query("from WxAccessToken w where w.wechatId =?1 order by w.addTimestamp desc")
    List<WxAccessToken> getWxAccessTokenById(String wechatId);
}

svr/svr-base/src/main/java/com/yihu/jw/business/wx/dao/WxGraphicMessageDao.java

@@ -14,10 +14,6 @@ public interface WxGraphicMessageDao extends PagingAndSortingRepository<WxGraphi
    WxGraphicMessage findByAppId(String appId);
    @Query("from WxWechat w where w.appId = ?1 and w.code!= ?2 and w.status!=-1")
    WxGraphicMessage findByAppIdExcludeCode(String appId, String code);
    @Query("from WxGraphicMessage w where w.id =?1 and w.status!=-1")
    WxGraphicMessage findById(String id);
}

svr/svr-base/src/main/java/com/yihu/jw/business/wx/dao/WxMenuDao.java

@@ -16,32 +16,32 @@ public interface WxMenuDao  extends PagingAndSortingRepository<WxMenu, String>,
    @Query("from WxMenu m where m.id = ?1 and m.status = 1")
    WxMenu findById(String id);
    @Query("from WxMenu m where m.wechatCode =?1 and m.status = 1 order  by m.supMenucode ,m.sort")
    List<WxMenu> findByWechatCode(String wechatCode);
    @Query("from WxMenu m where m.wechatId =?1 and m.status = 1 order  by m.supMenuid ,m.sort")
    List<WxMenu> findByWechatId(String wechatId);
    @Query("from WxMenu m where m.wechatCode = ?1 and  m.supMenucode= ?2 and m.status =1 order by m.sort")
    List<WxMenu> findChildMenus(String wechatCode, String sup_menucode);
    @Query("from WxMenu m where m.wechatId = ?1 and  m.supMenuid= ?2 and m.status =1 order by m.sort")
    List<WxMenu> findChildMenus(String wechatId, String supMenuid);
    @Query("from WxMenu m where  m.supMenucode= ?1 and m.status =1 order by m.sort")
    List<WxMenu> findChildMenus( String parentCode);
    @Query("from WxMenu m where  m.supMenuid= ?1 and m.status =1 order by m.sort")
    List<WxMenu> findChildMenus( String supMenuid);
    /**
     * 根据wechatCode判断父菜单的sort是否重复
     * @param wechatCode
     * 根据wechatId判断父菜单的sort是否重复
     * @param wechatId
     * @param sort
     */
    @Query("from WxMenu m where m.wechatCode = ?1 and m.status =1 and m.sort =?2 and m.supMenucode ='0' and m.code != ?3")
    WxMenu findByWechatCodeExcludeSortFromParent(String wechatCode, Integer sort,String code);
    @Query("from WxMenu m where m.wechatId = ?1 and m.status =1 and m.sort =?2 and m.supMenuid ='0' and m.id != ?3")
    WxMenu findByWechatIdExcludeSortFromParent(String wechatId, Integer sort,String id);
    /**
     * 根据wechatCode,supMenucode判断子菜单的sort是否重复
     * @param wechatCode
     * 根据wechatId,supMenucode判断子菜单的sort是否重复
     * @param wechatId
     * @param sort
     */
    @Query("from WxMenu m where m.wechatCode = ?1 and m.status =1 and m.sort =?2 and m.supMenucode =?3 and m.code != ?4")
    WxMenu findByWechatCodeExcludeSortFromChild(String wechatCode, Integer sort,String supMenucode,String code);
    @Query("from WxMenu m where m.wechatId = ?1 and m.status =1 and m.sort =?2 and m.supMenuid =?3 and m.id != ?4")
    WxMenu findByWechatIdExcludeSortFromChild(String wechatId, Integer sort,String supMenuid,String id);
    @Query("from WxMenu m where m.wechatCode =?1 and m.status = 1 and  m.supMenucode = '0' order by m.supMenucode ,m.sort")
    List<WxMenu> findParentMenuByWechatCode(String wechatCode);
    @Query("from WxMenu m where m.wechatId =?1 and m.status = 1 and  m.supMenuid = '0' order by m.supMenuid ,m.sort")
    List<WxMenu> findParentMenuByWechatId(String wechatId);
}

svr/svr-base/src/main/java/com/yihu/jw/business/wx/dao/WxTemplateDao.java

@@ -17,5 +17,5 @@ public interface WxTemplateDao extends PagingAndSortingRepository<WxTemplate, St
    WxTemplate findById(String id);
    @Query("from WxTemplate w where w.wechatId = ?1 and w.status =1")
    List<WxTemplate> findByWxCode(String code);
    List<WxTemplate> findByWxId(String wechatId);
}

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WechatService.java

@@ -79,16 +79,16 @@ public class WechatService extends BaseJpaService<WxWechat, WechatDao> {
    }
    @Transient
    public void deleteWechat(String codes, String userCode, String userName) {
        if (!StringUtils.isEmpty(codes)) {
            String[] codeArray = codes.split(",");
    public void deleteWechat(String ids, String userId, String userName) {
        if (!StringUtils.isEmpty(ids)) {
            String[] codeArray = ids.split(",");
            for (String code : codeArray) {
                WxWechat wxWechat = wechatDao.findById(code);
                if (wxWechat == null) {
                    throw new ApiException(WechatRequestMapping.WxConfig.message_fail_code_no_exist, ExceptionCode.common_error_params_code);
                }
                wxWechat.setStatus(-1);
                wxWechat.setUpdateUser(userCode);
                wxWechat.setUpdateUser(userId);
                wxWechat.setUpdateUserName(userName);
                wechatDao.save(wxWechat);
            }

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxAccessTokenService.java

@@ -37,17 +37,17 @@ public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccess
    /**
     * 根据wechatCode查找最新一条
     * @param wechatCode
     * @param wechatId
     * @return
     */
    public WxAccessToken getWxAccessTokenByCode(String wechatCode) {
    public WxAccessToken getWxAccessTokenById(String wechatId) {
        try {
            //根据wechatCode查找出appid和appSecret
            WxWechat wxWechat = wechatDao.findById(wechatCode);
            WxWechat wxWechat = wechatDao.findById(wechatId);
            if(wxWechat==null){
                throw new ApiException(WechatRequestMapping.WxConfig.message_fail_wxWechat_is_no_exist, ExceptionCode.common_error_params_code);
            }
            List<WxAccessToken> wxAccessTokens =  wxAccessTokenDao.getWxAccessTokenByCode(wechatCode);
            List<WxAccessToken> wxAccessTokens =  wxAccessTokenDao.getWxAccessTokenById(wechatId);
            if(wxAccessTokens!=null&&wxAccessTokens.size()>0){
                for (WxAccessToken accessToken : wxAccessTokens) {
                    if ((System.currentTimeMillis() - accessToken.getAddTimestamp()) < (accessToken.getExpiresIn() * 1000)) {
@@ -82,7 +82,7 @@ public class WxAccessTokenService extends BaseJpaService<WxAccessToken, WxAccess
                newaccessToken.setAddTimestamp(System.currentTimeMillis());
                newaccessToken.setCzrq(new Date());
                newaccessToken.setCode(UUID.randomUUID().toString().replace("-",""));
                newaccessToken.setWechatId(wechatCode);
                newaccessToken.setWechatId(wechatId);
                wxAccessTokenDao.save(newaccessToken);
                return newaccessToken;
            } else {

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxGraphicMessageService.java

@@ -58,11 +58,6 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
        return wxGraphicMessageDao.save(wxGraphicMessage);
    }
    public WxGraphicMessage findByCode(String code) {
        WxGraphicMessage WxGraphicMessage = wxGraphicMessageDao.findById(code);
        return WxGraphicMessage;
    }
    public WxGraphicMessage findById(String id) {
      return wxGraphicMessageDao.findById(id);
    }
@@ -72,7 +67,7 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
        if(!StringUtils.isEmpty(codes)){
            String[] codeArray = codes.split(",");
            for(String code:codeArray){
                WxGraphicMessage wxGraphicMessage = findByCode(code);
                WxGraphicMessage wxGraphicMessage = findById(code);
                wxGraphicMessage.setStatus(-1);
                wxGraphicMessage.setUpdateUser(userCode);
                wxGraphicMessage.setUpdateUserName(userName);
@@ -131,7 +126,7 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
            if(codes!=null){
                String[] codeArray = codes.split(",");
                for(String code: codeArray){
                    WxGraphicMessage graphicMessage = findByCode(code);
                    WxGraphicMessage graphicMessage = findById(code);
                    Map<String,String> article = new HashMap<>();
                    article.put("Url",graphicMessage.getUrl());
                    article.put("Title", graphicMessage.getTitle());
@@ -150,19 +145,19 @@ public class WxGraphicMessageService extends BaseJpaService<WxGraphicMessage, Wx
    /**
     * 发送图文消息
     * @param codes
     * @param ids
     * @param fromUserName   用户的openId
     * @param toUserName
     * @return
     */
    public String sendGraphicMessages(String codes, String fromUserName,String toUserName) {
    public String sendGraphicMessages(String ids, String fromUserName,String toUserName) {
        try {
        // 图文信息
            List<Map<String,String>> articles =  new ArrayList<>();
            if(codes!=null){
                String[] codeArray = codes.split(",");
                for(String code: codeArray){
                    WxGraphicMessage graphicMessage = findByCode(code);
            if(ids!=null){
                String[] codeArray = ids.split(",");
                for(String id: codeArray){
                    WxGraphicMessage graphicMessage = findById(id);
                    Map<String,String> article = new HashMap<>();
                    article.put("Url",graphicMessage.getUrl());
                    article.put("Title", graphicMessage.getTitle());

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxMenuService.java

@@ -69,9 +69,9 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
    }
    @Transient
    public void deleteWxMenu(String codes, String userCode, String userName) {
        if(!StringUtils.isEmpty(codes)) {
            String[] codeArray = codes.split(",");
    public void deleteWxMenu(String ids, String userId, String userName) {
        if(!StringUtils.isEmpty(ids)) {
            String[] codeArray = ids.split(",");
            Date date = new Date();
            for (String code : codeArray) {
                WxMenu wxMenu = wxMenuDao.findById(code);
@@ -84,14 +84,14 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
                    if (childMenus != null) {
                        for (WxMenu wxmenu : childMenus) {
                            wxmenu.setStatus(-1);
                            wxmenu.setUpdateUser(userCode);
                            wxmenu.setUpdateUser(userId);
                            wxmenu.setUpdateUserName(userName);
                            wxMenuDao.save(wxmenu);
                        }
                    }
                }
                wxMenu.setStatus(-1);
                wxMenu.setUpdateUser(userCode);
                wxMenu.setUpdateUser(userId);
                wxMenu.setUpdateUserName(userName);
                wxMenuDao.save(wxMenu);
            }
@@ -125,52 +125,37 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        }
    }
    public WxMenu findByCode(String code) {
        return wxMenuDao.findById(code);
    }
    public WxMenu findById(String id) {
        return wxMenuDao.findById(id);
    }
    /**
     * 根据wechatCode查找所有菜单
     * @param wechatCode
     * @return
     */
    public List<WxMenu> findByWechatCode(String wechatCode){
        return wxMenuDao.findByWechatCode(wechatCode);
    }
    /**
     * 根据wechatCode查找所有父菜单
     * @param wechatCode
     * @return
     */
    public List<WxMenu> findParentMenuByWechatCode(String wechatCode){
        List<WxMenu> parentMenus = wxMenuDao.findParentMenuByWechatCode(wechatCode);
        List<WxMenu> parentMenus = wxMenuDao.findParentMenuByWechatId(wechatCode);
        return parentMenus;
    }
    /**
     * 根据wechatCode在微信公众号创建菜单
     * @param wechatCode
     * @param wechatId
     * @return JSONObject
     */
    public JSONObject createWechatMenu(String wechatCode) {
        WxWechat wechat = wechatService.findById(wechatCode);
    public JSONObject createWechatMenu(String wechatId) {
        WxWechat wechat = wechatService.findById(wechatId);
        if(wechat==null){
            throw new ApiException(WechatRequestMapping.WxConfig.message_fail_wxWechat_is_no_exist, ExceptionCode.common_error_params_code);
        }
        //首先根据wechatCode获取菜单,然后封装成json字符串
        List<WxMenu> menus = wxMenuDao.findByWechatCode(wechatCode);
        List<WxMenu> menus = wxMenuDao.findByWechatId(wechatId);
        if(menus==null){
            throw new ApiException(WechatRequestMapping.WxMenu.message_fail_WxMenu_is_no_exist, ExceptionCode.common_error_params_code);
        }
        String menuJsonString = getMenuToString(menus, wechatCode);
        String menuJsonString = getMenuToString(menus, wechatId);
        logger.info("-----------------微信菜单json字符串:"+ menuJsonString+"--------------------");
        WxAccessToken wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenByCode(wechatCode);
        WxAccessToken wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenById(wechatId);
        String token = wxAccessTokenByCode.getAccessToken();
        // 请求微信接口创建菜单
        String url = " https://api.weixin.qq.com/cgi-bin/menu/create?access_token=" + token;
@@ -261,7 +246,7 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        String wechatCode = wxMenu.getWechatId();
        String supMenucode = wxMenu.getSupMenuid();
        if(StringUtils.isEmpty(wechatCode)){
            WxMenu parentMenuCode = findByCode(supMenucode);
            WxMenu parentMenuCode = findById(supMenucode);
            wechatCode = parentMenuCode.getWechatId();
            wxMenu.setWechatId(wechatCode);
        }
@@ -283,7 +268,7 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        if (!"0".equals(supMenucode)) {//不为0,说明是子菜单,判断父菜单是否存在
            //说明是子菜单
            //判断父菜单是否存在
            WxMenu parentMenuCode = findByCode(supMenucode);
            WxMenu parentMenuCode = findById(supMenucode);
            if(parentMenuCode==null){
                throw new ApiException(WechatRequestMapping.WxMenu.message_fail_supMenuCode_is_no_exist, ExceptionCode.common_error_params_code);
            }
@@ -359,9 +344,9 @@ public class WxMenuService extends BaseJpaService<WxMenu, WxMenuDao> {
        WxMenu wxMenuTemp = null;
        if(StringUtils.isEmpty(wxMenu.getSupMenuid())){//如果是空,则为父菜单
            //判断sort是否重复
            wxMenuTemp = wxMenuDao.findByWechatCodeExcludeSortFromParent(wxMenu.getWechatId(), wxMenu.getSort(),wxMenu.getId());
            wxMenuTemp = wxMenuDao.findByWechatIdExcludeSortFromParent(wxMenu.getWechatId(), wxMenu.getSort(),wxMenu.getId());
        }else{//子菜单
            wxMenuTemp = wxMenuDao.findByWechatCodeExcludeSortFromChild(wxMenu.getWechatId(), wxMenu.getSort(), wxMenu.getSupMenuid(), wxMenu.getId());
            wxMenuTemp = wxMenuDao.findByWechatIdExcludeSortFromChild(wxMenu.getWechatId(), wxMenu.getSort(), wxMenu.getSupMenuid(), wxMenu.getId());
        }
        if(null!=wxMenuTemp){
            throw new ApiException(WechatRequestMapping.WxMenu.message_fail_sort_is_repeat, ExceptionCode.common_error_params_code);

svr/svr-base/src/main/java/com/yihu/jw/business/wx/service/WxTemplateService.java

@@ -89,22 +89,16 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
        }
    }
    public WxTemplate findByCode(String code) {
        WxTemplate wxTemplate = wxTemplateDao.findById(code);
        WxWechat wechat = wechatService.findById(wxTemplate.getWechatId());
        wxTemplate.setWechatName(wechat.getName());
        return wxTemplate;
    }
    public WxTemplate findById(String id) {
        WxTemplate wxTemplate = wxTemplateDao.findById(id);
        return wxTemplate;
    }
    public JSONObject sendTemplateMessage(String openid, String templateCode, String url, String data,Miniprogram miniprogram) {
    public JSONObject sendTemplateMessage(String openid, String templateId, String url, String data,Miniprogram miniprogram) {
        try {
            //首先根据wechatTemplate获取微信模版
            WxTemplate wxTemplate = findByCode(templateCode);
            WxTemplate wxTemplate = findById(templateId);
            if(wxTemplate==null){
                throw new ApiException(WechatRequestMapping.WxTemplate.message_fail_template_is_no_exist, ExceptionCode.common_error_params_code);
            }
@@ -142,7 +136,7 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
            String params = mapper.writeValueAsString(wechatTemplate);
            logger.info("----------------------模版消息json字符串:"+params+"------------------");
            WxAccessToken wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenByCode(wechatCode);
            WxAccessToken wxAccessTokenByCode = wxAccessTokenService.getWxAccessTokenById(wechatCode);
            String token = wxAccessTokenByCode.getAccessToken();
            String token_url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + token;
            String result = HttpUtil.sendPost(token_url, params);
@@ -157,7 +151,7 @@ public class WxTemplateService extends BaseJpaService<WxTemplate, WxTemplateDao>
        }
    }
    public List<WxTemplate> findByWxCode(String code) {
        return wxTemplateDao.findByWxCode(code);
    public List<WxTemplate> findByWxId(String code) {
        return wxTemplateDao.findByWxId(code);
    }
}

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/FunctionController.java

@@ -68,7 +68,7 @@ public class FunctionController {
        return envelop;
    }
    @GetMapping(value = BaseRequestMapping.Function.api_getByCode)
    @GetMapping(value = BaseRequestMapping.Function.api_getById)
    @ApiOperation(value = "根据code查找", notes = "根据code查找")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/base/ModuleController.java

@@ -68,7 +68,7 @@ public class ModuleController {
        return envelop;
    }
    @GetMapping(value = BaseRequestMapping.Module.api_getByCode)
    @GetMapping(value = BaseRequestMapping.Module.api_getById)
    @ApiOperation(value = "根据code查找", notes = "根据code查找")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/GraphicMessageController.java

@@ -61,13 +61,13 @@ public class GraphicMessageController {
        return envelop;
    }
    @GetMapping(value = WechatRequestMapping.WxGraphicMessage.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxGraphicMessage.api_getById)
    @ApiOperation(value = "根据code查找图文消息", notes = "根据code查找图文消息")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable String code
            @ApiParam(name = "id", value = "id")
            @PathVariable String id
    ) {
        Envelop envelop = graphicMessageService.findByCode(code);
        Envelop envelop = graphicMessageService.findByCode(id);
        return envelop;
    }

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/TemplateController.java

@@ -61,7 +61,7 @@ public class TemplateController {
        return envelop;
    }
    @GetMapping(value = WechatRequestMapping.WxTemplate.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxTemplate.api_getById)
    @ApiOperation(value = "根据code查找模板消息", notes = "根据code查找模板消息")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")

svr/svr-manage/src/main/java/com/yihu/jw/manage/controller/wechat/WechatMenuController.java

@@ -59,7 +59,7 @@ public class WechatMenuController {
        return envelop;
    }
    @GetMapping(value = WechatRequestMapping.WxMenu.api_getByCode)
    @GetMapping(value = WechatRequestMapping.WxMenu.api_getById)
    @ApiOperation(value = "根据code查找菜单", notes = "根据code查找菜单")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")

web-gateway/src/main/java/com/yihu/jw/commnon/base/base/BaseContants.java

@@ -12,8 +12,8 @@ public class BaseContants {
    public static class Function{
        public static final String api_create="/function";
        public static final String api_update="/function";
        public static final String api_delete="/function/{codes}";
        public static final String api_getByCode="/function/{code}";
        public static final String api_delete="/function/{id}";
        public static final String api_getById="/function/{id}";
        public static final String api_getListNoPage="/function/listNoPage";
        public static final String api_getList="/function/list";
        public static final String api_assignFunction="/assignFunction";
@@ -25,16 +25,16 @@ public class BaseContants {
    public static class Module{
        public static final String api_create="/module";
        public static final String api_update="/module";
        public static final String api_delete="/module/{codes}";
        public static final String api_getByCode="/module/{code}";
        public static final String api_delete="/module/{id}";
        public static final String api_getById="/module/{id}";
        public static final String api_getListNoPage="/module/listNoPage";
        public static final String api_getList="/module/list";
        public static final String api_getChildren="/module/children/{code}";
        public static final String api_getChildren="/module/children/{id}";
    }
    public static class ModuleFun{
        public static final String api_getExistFun = "/moduleFun/existFunc/{code}";
        public static final String api_getExistFun = "/moduleFun/existFunc/{id}";
        public static final String api_changeFun="/moduleFun/changeFun";
    }

web-gateway/src/main/java/com/yihu/jw/commnon/base/wx/WechatContants.java

@@ -18,23 +18,23 @@ public class WechatContants {
    public static class Menu{
        public static final String api_create="wxMenu";
        public static final String api_update="wxMenu";
        public static final String api_delete="wxMenu/{codes}/{userCode}";
        public static final String api_delete="wxMenu/{ids}/{userId}";
        public static final String api_getWxMenuNoPage="wxMenu/listNoPage";
        public static final String api_getWxMenus="wxMenu/list";
        public static final String api_getByCode="wxMenu/{code}";
        public static final String api_getParentMenu="parentMenu/{wechatCode}";
        public static final String api_getById="wxMenu/{id}";
        public static final String api_getParentMenu="parentMenu/{wechatId}";
        public static final String api_createMenu="createMenu";
        public static final String api_getChildMenus="childMenu/list/{parentCode}";
        public static final String api_getChildMenus="childMenu/list/{parentId}";
    }
    //微信模板消息
    public static class Template {
        public static final String api_create="template";
        public static final String api_update="template";
        public static final String api_delete="template/{codes}";
        public static final String api_delete="template/{ids}";
        public static final String api_getWxTemplatesNoPage="template/listNoPage";
        public static final String api_getWxTemplates="template/list";
        public static final String api_getByCode="template/{code}";
        public static final String api_getById="template/{id}";
        public static final String api_sendTemplateMessage="sendTemplateMessage";
    }
@@ -42,20 +42,20 @@ public class WechatContants {
    public static class Config {
        public static final String api_create="wechatConfig";
        public static final String api_update="wechatConfig";
        public static final String api_delete="wechatConfig/{codes}";
        public static final String api_delete="wechatConfig/{ids}";
        public static final String api_getWechatNoPage="wechatConfig/listNoPage";
        public static final String api_getWechats="wechatConfig/list";
        public static final String api_getByCode="wechatConfig/{code}";
        public static final String api_getById="wechatConfig/{id}";
    }
    //微信图文消息
    public static class GraphicMessage {
        public static final String api_create="graphicMessage";
        public static final String api_update="graphicMessage";
        public static final String api_delete="graphicMessage/{codes}";
        public static final String api_delete="graphicMessage/{ids}";
        public static final String api_getWxGraphicMessageNoPage="graphicMessage/listNoPage";
        public static final String api_getWxGraphicMessages="graphicMessage/list";
        public static final String api_getByCode="graphicMessage/{code}";
        public static final String api_getById="graphicMessage/{id}";
        public static final String api_sendGraphicMessages="sendGraphicMessages";
    }
}

web-gateway/src/main/java/com/yihu/jw/controller/base/base/FunctionController.java

@@ -74,25 +74,25 @@ public class FunctionController extends EnvelopRestController {
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    @GetMapping(value = BaseContants.Function.api_getByCode)
    @ApiOperation(value = "根据code查找", notes = "根据code查找")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
    @GetMapping(value = BaseContants.Function.api_getById)
    @ApiOperation(value = "根据Id查找", notes = "根据code查找")
    public Envelop findById(
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
        return fegin.findByCode(code);
        return fegin.findById(id);
    }
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    @GetMapping(value = BaseContants.Function.api_getChildren)
    @ApiOperation(value = "根据code查找子节点", notes = "根据code查找子节点")
    @ApiOperation(value = "根据id查找子节点", notes = "根据id查找子节点")
    public Envelop getChildren(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
        return fegin.getChildren(code);
        return fegin.getChildren(id);
    }
    @HystrixCommand(commandProperties = {

web-gateway/src/main/java/com/yihu/jw/controller/base/base/ModuleController.java

@@ -62,25 +62,25 @@ public class ModuleController extends EnvelopRestController {
    @DeleteMapping(value = BaseContants.Module.api_delete)
    @ApiOperation(value = "删除功能", notes = "删除功能")
    public Envelop deleteModule(
            @ApiParam(name = "codes", value = "codes")
            @PathVariable(value = "codes", required = true) String codes,
            @ApiParam(name = "userCode", value = "userCode")
            @RequestParam(value = "userCode", required = true) String userCode,
            @ApiParam(name = "ids", value = "ids")
            @PathVariable(value = "ids", required = true) String ids,
            @ApiParam(name = "userId", value = "userId")
            @RequestParam(value = "userId", required = true) String userId,
            @ApiParam(name = "userName", value = "userName")
            @RequestParam(value = "userName", required = true) String userName) throws JiWeiException {
        return fegin.delete(codes,userCode,userName);
        return fegin.delete(ids,userId,userName);
    }
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    @GetMapping(value = BaseContants.Module.api_getByCode)
    @ApiOperation(value = "根据code查找", notes = "根据code查找")
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
    @GetMapping(value = BaseContants.Module.api_getById)
    @ApiOperation(value = "根据id查找", notes = "根据id查找")
    public Envelop findById(
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
        return fegin.findByCode(code);
        return fegin.findById(id);
    }
    @HystrixCommand(commandProperties = {
@@ -89,10 +89,10 @@ public class ModuleController extends EnvelopRestController {
    @GetMapping(value = BaseContants.Module.api_getChildren)
    @ApiOperation(value = "根据code查找子节点", notes = "根据code查找子节点")
    public Envelop getChildren(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
        return fegin.getChildren(code);
        return fegin.getChildren(id);
    }
    @HystrixCommand(commandProperties = {
@@ -154,10 +154,10 @@ public class ModuleController extends EnvelopRestController {
    @GetMapping(value = BaseContants.ModuleFun.api_getExistFun)
    @ApiOperation(value = "根据模块code查找已有的功能")
    public Envelop getExistFun(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
        return fegin.getExistFunc(code);
        return fegin.getExistFunc(id);
    }
    @HystrixCommand(commandProperties = {

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatAccessTokenController.java

@@ -39,8 +39,8 @@ public class WechatAccessTokenController {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    public Envelop getWxAccessToken(
            @ApiParam(name = "wechatCode", value = "wechatCode")
            @RequestParam(value = "wechatCode") String wechatCode) {
        return accessTokenFegin.getWxAccessToken(wechatCode);
            @ApiParam(name = "wechatId", value = "wechatId")
            @RequestParam(value = "wechatId") String wechatId) {
        return accessTokenFegin.getWxAccessToken(wechatId);
    }
}

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatConfigController.java

@@ -74,16 +74,16 @@ public class WechatConfigController {
        return wechat;
    }
    @GetMapping(value = WechatContants.Config.api_getByCode)
    @GetMapping(value = WechatContants.Config.api_getById)
    @ApiOperation(value = "根据code查找微信配置", notes = "根据code查找微信配置")
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
       return wechatFegin.findByCode(code);
       return wechatFegin.findById(id);
    }
    @RequestMapping(value = WechatContants.Config.api_getWechats, method = RequestMethod.GET)

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatGraphicMessageController.java

@@ -74,16 +74,16 @@ public class WechatGraphicMessageController {
        return graphicMessageFegin.deleteWxGraphicMessage(codes,userCode,userName);
    }
    @GetMapping(value = WechatContants.GraphicMessage.api_getByCode)
    @GetMapping(value = WechatContants.GraphicMessage.api_getById)
    @ApiOperation(value = "根据code查找微信图文消息", notes = "根据code查找微信图文消息")
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
    public Envelop findById(
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
        return graphicMessageFegin.findByCode(code);
        return graphicMessageFegin.findById(id);
    }
    @RequestMapping(value = WechatContants.GraphicMessage.api_getWxGraphicMessages, method = RequestMethod.GET)
@@ -139,13 +139,13 @@ public class WechatGraphicMessageController {
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    @ResponseBody
    public String sendGraphicMessages(
            @ApiParam(name = "codes", value = "根据code发送微信图文消息,多个code用,分割")
            @RequestParam(value = "codes", required = true) String codes,
            @ApiParam(name = "ids", value = "根据id发送微信图文消息,多个id用,分割")
            @RequestParam(value = "ids", required = true) String ids,
            @ApiParam(name = "fromUserName", value = "用户openid")
            @RequestParam(value = "fromUserName", required = true) String fromUserName,
            @ApiParam(name = "toUserName", value = "公众号")
            @RequestParam(value = "toUserName", required = true) String toUserName
    ) throws Exception {
        return graphicMessageFegin.sendGraphicMessages(codes,fromUserName,toUserName);
        return graphicMessageFegin.sendGraphicMessages(ids,fromUserName,toUserName);
    }
}

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatMenuController.java

@@ -75,16 +75,16 @@ public class WechatMenuController {
        return wechatMenuFegin.deleteWxMenu(codes,userCode,userName);
    }
    @GetMapping(value = WechatContants.Menu.api_getByCode)
    @GetMapping(value = WechatContants.Menu.api_getById)
     @ApiOperation(value = "根据code查找微信菜单", notes = "根据code查找微信菜单")
     @HystrixCommand(commandProperties = {
             @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
             @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
     public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
        return wechatMenuFegin.findByCode(code);
        return wechatMenuFegin.findById(id);
    }
    @RequestMapping(value = WechatContants.Menu.api_getWxMenus, method = RequestMethod.GET)

web-gateway/src/main/java/com/yihu/jw/controller/base/wx/WechatTemplateControlle.java

@@ -77,16 +77,16 @@ public class WechatTemplateControlle {
        return wechatTemplateFegin.deleteWxTemplate(codes,userCode,userName);
    }
    @GetMapping(value = WechatContants.Template.api_getByCode)
    @GetMapping(value = WechatContants.Template.api_getById)
    @ApiOperation(value = "根据code查找微信模版", notes = "根据code查找微信模版")
    @HystrixCommand(commandProperties = {
            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "-1"),//超时时间
            @HystrixProperty(name = "execution.timeout.enabled", value = "false") })
    public Envelop findByCode(
            @ApiParam(name = "code", value = "code")
            @PathVariable(value = "code", required = true) String code
            @ApiParam(name = "id", value = "id")
            @PathVariable(value = "id", required = true) String id
    ) throws JiWeiException {
        return wechatTemplateFegin.findByCode(code);
        return wechatTemplateFegin.findById(id);
    }
    @RequestMapping(value = WechatContants.Template.api_getWxTemplates, method = RequestMethod.GET)

web-gateway/src/main/java/com/yihu/jw/feign/base/base/FunctionFeign.java

@@ -24,10 +24,10 @@ public interface FunctionFeign {
    Envelop update(@RequestBody String jsonData) throws JiWeiException;
    @DeleteMapping(value =BaseRequestMapping.Function.api_delete)
    Envelop delete(@PathVariable(value = "codes", required = true) String codes, @RequestParam(value = "userCode") String userCode, @RequestParam(value = "userName") String userName) throws JiWeiException;
    Envelop delete(@PathVariable(value = "ids", required = true) String ids, @RequestParam(value = "userId") String userId, @RequestParam(value = "userName") String userName) throws JiWeiException;
    @GetMapping(value = BaseRequestMapping.Function.api_getByCode)
    Envelop findByCode(@PathVariable(value = "code", required = true) String code) throws JiWeiException;
    @GetMapping(value = BaseRequestMapping.Function.api_getById)
    Envelop findById(@PathVariable(value = "id", required = true) String id) throws JiWeiException;
    @RequestMapping(value = BaseRequestMapping.Function.api_getList, method = RequestMethod.GET)
    Envelop getList(
@@ -44,5 +44,5 @@ public interface FunctionFeign {
            @RequestParam(value = "sorts", required = false) String sorts) throws JiWeiException;
    @GetMapping(value = BaseRequestMapping.Function.api_getChildren)
    Envelop getChildren(@PathVariable(value="code") String code) throws JiWeiException;
    Envelop getChildren(@PathVariable(value="id") String id) throws JiWeiException;
}

web-gateway/src/main/java/com/yihu/jw/feign/base/base/ModuleFeign.java

@@ -24,10 +24,10 @@ public interface ModuleFeign {
    Envelop update(@RequestBody String jsonData) throws JiWeiException;
    @DeleteMapping(value =BaseRequestMapping.Module.api_delete)
    Envelop delete(@PathVariable(value = "codes", required = true) String codes, @RequestParam(value = "userCode") String userCode, @RequestParam(value = "userName") String userName) throws JiWeiException;
    Envelop delete(@PathVariable(value = "ids", required = true) String ids, @RequestParam(value = "userId") String userId, @RequestParam(value = "userName") String userName) throws JiWeiException;
    @GetMapping(value = BaseRequestMapping.Module.api_getByCode)
    Envelop findByCode(@PathVariable(value = "code", required = true) String code) throws JiWeiException;
    @GetMapping(value = BaseRequestMapping.Module.api_getById)
    Envelop findById(@PathVariable(value = "id", required = true) String id) throws JiWeiException;
    @RequestMapping(value = BaseRequestMapping.Module.api_getList, method = RequestMethod.GET)
    Envelop getList(
@@ -44,10 +44,10 @@ public interface ModuleFeign {
            @RequestParam(value = "sorts", required = false) String sorts) throws JiWeiException;
    @GetMapping(value = BaseRequestMapping.Module.api_getChildren)
    Envelop getChildren(@PathVariable(value = "code") String code) throws JiWeiException;
    Envelop getChildren(@PathVariable(value = "id") String id) throws JiWeiException;
    @GetMapping(value = BaseRequestMapping.ModuleFun.api_getExistFun)
    Envelop getExistFunc(@PathVariable(value = "code") String code) throws JiWeiException;
    Envelop getExistFunc(@PathVariable(value = "id") String id) throws JiWeiException;
    @PutMapping(value =  BaseRequestMapping.ModuleFun.api_changeFun,consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    Envelop changeFun(@RequestBody String jsonData) throws JiWeiException;

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/AccessTokenFeign.java

@@ -20,6 +20,6 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface AccessTokenFeign {
    @RequestMapping(value = WechatRequestMapping.WxAccessToken.api_get, method = RequestMethod.GET)
    Envelop getWxAccessToken(@RequestParam(value = "wechatCode") String wechatCode) ;
    Envelop getWxAccessToken(@RequestParam(value = "wechatId") String wechatId) ;
}

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/GraphicMessageFeign.java

@@ -29,10 +29,10 @@ public interface GraphicMessageFeign {
    Envelop updateWxGraphicMessage( @RequestBody String jsonData) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxGraphicMessage.api_delete,method = RequestMethod.DELETE)
    Envelop deleteWxGraphicMessage(@RequestParam(value = "codes") String codes,@RequestParam(value = "userCode") String userCode,@RequestParam(value = "userName") String userName) throws JiWeiException;
    Envelop deleteWxGraphicMessage(@RequestParam(value = "ids") String ids,@RequestParam(value = "userId") String userId,@RequestParam(value = "userName") String userName) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxGraphicMessage.api_getByCode,method = RequestMethod.GET)
    Envelop findByCode(@RequestParam(value = "code") String code) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxGraphicMessage.api_getById,method = RequestMethod.GET)
    Envelop findById(@RequestParam(value = "id") String id) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxGraphicMessage.api_getWxGraphicMessages,method = RequestMethod.GET)
    Envelop getWxGraphicMessages(
@@ -50,7 +50,7 @@ public interface GraphicMessageFeign {
    @RequestMapping(value = WechatRequestMapping.WxGraphicMessage.api_sendGraphicMessages,method = RequestMethod.GET)
    String sendGraphicMessages(
            @RequestParam(value = "codes", required = true) String codes,
            @RequestParam(value = "ids", required = true) String ids,
            @RequestParam(value = "fromUserName", required = true) String fromUserName,
            @RequestParam(value = "toUserName", required = true) String toUserName
    );

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatFeign.java

@@ -27,10 +27,10 @@ public interface WechatFeign {
    Envelop updateWechat(String jsonData) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxConfig.api_delete,method = RequestMethod.DELETE)
    Envelop deleteWechat(@RequestParam(value = "codes") String codes,@RequestParam(value = "userCode") String userCode,@RequestParam(value = "userName") String userName) throws JiWeiException;
    Envelop deleteWechat(@RequestParam(value = "ids") String ids,@RequestParam(value = "userId") String userId,@RequestParam(value = "userName") String userName) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxConfig.api_getById,method = RequestMethod.GET)
    Envelop findByCode(@RequestParam(value = "code") String code) throws JiWeiException;
    Envelop findById(@RequestParam(value = "id") String id) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxConfig.api_getWechats ,method = RequestMethod.GET)
    Envelop getWechats(@RequestParam(value = "fields" ,required = false)String fields, @RequestParam(value = "filters",required = false) String filters, @RequestParam(value = "sorts" ,required = false)String sorts, @RequestParam(value = "size" ,required = false) int size,@RequestParam(value = "page" ,required = false)int page) throws JiWeiException;

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatMenuFeign.java

@@ -26,10 +26,10 @@ public interface WechatMenuFeign {
    Envelop updateWxMenu( @RequestBody String jsonData) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_delete,method = RequestMethod.DELETE)
    Envelop deleteWxMenu(@RequestParam(value="codes")String codes,@RequestParam(value = "userCode") String userCode,@RequestParam(value = "userName") String userName) throws JiWeiException;
    Envelop deleteWxMenu(@RequestParam(value="ids")String ids,@RequestParam(value = "userId") String userId,@RequestParam(value = "userName") String userName) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_getByCode,method = RequestMethod.GET)
    Envelop findByCode(@RequestParam(value="code")String code) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_getById,method = RequestMethod.GET)
    Envelop findById(@RequestParam(value="id")String id) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_getWxMenuNoPage,method = RequestMethod.GET)
    Envelop getWxMenuNoPage(
@@ -46,11 +46,11 @@ public interface WechatMenuFeign {
            @RequestParam(value = "page", required = false) int page) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_createMenu ,method = RequestMethod.GET)
    Envelop createWechatMenu(@RequestParam(value = "wechatCode", required = true)String wechatCode);
    Envelop createWechatMenu(@RequestParam(value = "wechatId", required = true)String wechatId);
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_getParentMenu,method = RequestMethod.GET)
    Envelop getParentMenu(@PathVariable(value = "wechatCode", required = true) String wechatCode) throws JiWeiException;
    Envelop getParentMenu(@PathVariable(value = "wechatId", required = true) String wechatId) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxMenu.api_getChildMenus,method = RequestMethod.GET)
    Envelop getChildMenus(@PathVariable(value = "parentCode", required = true) String parentCode) throws JiWeiException;
    Envelop getChildMenus(@PathVariable(value = "parentId", required = true) String parentId) throws JiWeiException;
}

web-gateway/src/main/java/com/yihu/jw/feign/base/wx/WechatTemplateFeign.java

@@ -26,10 +26,10 @@ public interface WechatTemplateFeign {
    Envelop updateWxTemplate(@RequestBody String jsonData) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxTemplate.api_delete ,method = RequestMethod.DELETE)
    Envelop deleteWxTemplate( @RequestParam(value = "codes", required = true) String codes,@RequestParam(value = "userCode") String userCode,@RequestParam(value = "userName") String userName) throws JiWeiException;
    Envelop deleteWxTemplate( @RequestParam(value = "ids", required = true) String ids,@RequestParam(value = "userId") String userId,@RequestParam(value = "userName") String userName) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxTemplate.api_getByCode ,method = RequestMethod.GET)
    Envelop findByCode( @RequestParam(value = "code", required = true) String code) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxTemplate.api_getById ,method = RequestMethod.GET)
    Envelop findById( @RequestParam(value = "id", required = true) String id) throws JiWeiException;
    @RequestMapping(value = WechatRequestMapping.WxTemplate.api_getWxTemplatesNoPage ,method = RequestMethod.GET)
    Envelop getWechatNoPage(
@@ -49,7 +49,7 @@ public interface WechatTemplateFeign {
    @ResponseBody
    Envelop sendTemplateMessage(
            @RequestParam(value="openid") String openid,
            @RequestParam(value="templateCode") String templateCode,
            @RequestParam(value="templateId") String templateId,
            @RequestParam(value="url",required = false) String url,
            @RequestParam(value="appid",required = false) String appid,
            @RequestParam(value="pagepath",required = false) String pagepath,

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/base/FunctionFeignFallbackFactory.java

@@ -43,7 +43,7 @@ public class FunctionFeignFallbackFactory implements FallbackFactory<FunctionFei
            }
            @Override
            public Envelop findByCode(String code) throws JiWeiException {
            public Envelop findById(String code) throws JiWeiException {
                tracer.getCurrentSpan().logEvent("查找功能失败:原因:"+e.getMessage());
                tracer.getCurrentSpan().logEvent("code:"+code);
                throw new JiWeiException(e);

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/base/ModuleFeignFallbackFactory.java

@@ -43,9 +43,9 @@ public class ModuleFeignFallbackFactory implements FallbackFactory<ModuleFeign>
            }
            @Override
            public Envelop findByCode(String code) throws JiWeiException {
            public Envelop findById(String id) throws JiWeiException {
                tracer.getCurrentSpan().logEvent("查找模块失败:原因:"+e.getMessage());
                tracer.getCurrentSpan().logEvent("code:"+code);
                tracer.getCurrentSpan().logEvent("id:"+id);
                throw new JiWeiException(e);
            }

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/GraphicMessageFeignFallbackFactory.java

@@ -44,9 +44,9 @@ public class GraphicMessageFeignFallbackFactory implements FallbackFactory<Graph
            }
            @Override
            public Envelop findByCode(String code) throws JiWeiException {
            public Envelop findById(String id) throws JiWeiException {
                tracer.getCurrentSpan().logEvent("根据code查找微信图文消息失败:原因:"+e.getMessage());
                tracer.getCurrentSpan().logEvent("code:"+code);
                tracer.getCurrentSpan().logEvent("id:"+id);
                throw new JiWeiException(e);
            }

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/WechatFeignFallbackFactory.java

@@ -37,9 +37,9 @@ public class WechatFeignFallbackFactory implements FallbackFactory<WechatFeign>
                throw new JiWeiException(e);
            }
            public Envelop findByCode(String code) throws JiWeiException {
            public Envelop findById(String id) throws JiWeiException {
                tracer.getCurrentSpan().logEvent("查找微信配置失败:原因:"+e.getMessage());
                tracer.getCurrentSpan().logEvent("code:"+code);
                tracer.getCurrentSpan().logEvent("id:"+id);
                throw new JiWeiException(e);
            }

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/WechatMenuFeignFallbackFactory.java

@@ -45,9 +45,9 @@ public class WechatMenuFeignFallbackFactory implements FallbackFactory<WechatMen
            @Override
            public Envelop findByCode(String code) throws JiWeiException {
            public Envelop findById(String id) throws JiWeiException {
                tracer.getCurrentSpan().logEvent("查找微信菜单失败:原因:"+e.getMessage());
                tracer.getCurrentSpan().logEvent("code:"+code);
                tracer.getCurrentSpan().logEvent("id:"+id);
                throw new JiWeiException(e);
            }

web-gateway/src/main/java/com/yihu/jw/feign/fallbackfactory/base/wx/WechatTemplateFeignFallbackFactory.java

@@ -42,9 +42,9 @@ public class WechatTemplateFeignFallbackFactory implements FallbackFactory<Wecha
            }
            @Override
            public Envelop findByCode(String code) throws JiWeiException {
            public Envelop findById(String id) throws JiWeiException {
                tracer.getCurrentSpan().logEvent("根据code查找微信模板消息失败:原因:"+e.getMessage());
                tracer.getCurrentSpan().logEvent("code:"+code);
                tracer.getCurrentSpan().logEvent("id:"+id);
                throw new JiWeiException(e);
            }