修改关键字配置失效时,关联的已失效的配置再次失效的bug
增加分割删除nginx access.log的脚本 志总量,登陆用户名密码提示国际化文件修改 张微's avatar 修改proxy帮助文档,配置操作日志,增加音视频样例剪切工具下载 修正特定服务ajax动态新增的时候没有将编译ID获取的bug
This commit is contained in:
@@ -23,6 +23,9 @@ public class LogSearchController extends BaseController{
|
||||
* searchService: serviceId
|
||||
*/
|
||||
// 获取相应日志检索菜单URL
|
||||
if(entity.getFunctionId()!=null && entity.getFunctionId().equals(635)){
|
||||
entity.setFunctionId(8);//关键字配置的日志查询定位至http日志
|
||||
}
|
||||
String logUrl = menuService.getLogUrl(entity.getFunctionId());
|
||||
// Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());
|
||||
|
||||
|
||||
@@ -674,7 +674,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
|
||||
}
|
||||
}
|
||||
//只有审核通过的配置需要下发失效动作
|
||||
if(cfgIndexInfo.getIsAudit().equals(3)){
|
||||
if(cfgIndexInfo.getIsAudit().equals(1)){
|
||||
maatCfg.setCompileId(cfgIndexInfo.getCompileId());
|
||||
maatCfg.setServiceId(cfgIndexInfo.getServiceId());
|
||||
maatCfg.setIsValid(0);//无效
|
||||
|
||||
@@ -87,6 +87,10 @@ public class SpecificServiceCfgService extends BaseService{
|
||||
group.setGroupName(specificServiceCfg.getSpecServiceName());
|
||||
group.setIsIssued(0);
|
||||
group.setGroupType(1);
|
||||
if(specificServiceCfg.getCfgType()==1) {
|
||||
Integer compileId = ConfigServiceUtil.getId(1, 1).get(0);
|
||||
group.setCompileId(compileId);
|
||||
}
|
||||
configGroupInfoDao.insertConfigGroupInfo(group);
|
||||
}
|
||||
if(specificServiceCfg.getSpecServiceId()==null){//新增
|
||||
|
||||
Reference in New Issue
Block a user