Merge remote-tracking branch 'origin/dev' into docker_package
This commit is contained in:
commit
1a538c24c3
|
@ -204,7 +204,7 @@ public class TbFuseServiceImpl extends CrudServiceImpl<TbFuseDao, TbFuseEntity,
|
|||
List<TbFuseResourceEntity> list = fuseResourceDao.selectList(wrapper);
|
||||
Map<String, List<TbFuseResourceEntity>> resourceMap = list.stream().filter(index -> index.getType() != null).collect(Collectors.groupingBy(TbFuseResourceEntity::getType));
|
||||
if (resourceMap.containsKey("数据资源")) {
|
||||
dataResourceMap.putAll(getDataResource());
|
||||
//dataResourceMap.putAll(getDataResource());
|
||||
}
|
||||
resourceMap.forEach((type, value) -> {
|
||||
if ("组件服务".equals(type)) {
|
||||
|
|
|
@ -9,6 +9,7 @@ import io.renren.modules.gateway.dao.ApiCountHistoryDao;
|
|||
import io.renren.modules.gateway.entity.ApiCountHistoryEntity;
|
||||
import io.renren.modules.gateway.service.MonitorServiceV2;
|
||||
import io.renren.modules.monitor.entity.Result;
|
||||
import io.renren.modules.monitor.service.MonitorService;
|
||||
import io.renren.modules.notice.dto.SysNoticeDTO;
|
||||
import io.renren.modules.notice.service.impl.SysNoticeServiceImpl;
|
||||
import io.renren.modules.resource.dao.AttrDao;
|
||||
|
@ -80,6 +81,8 @@ public class MonitorControllerV2 {
|
|||
|
||||
@Autowired
|
||||
private SysNoticeServiceImpl sysNoticeService;
|
||||
@Autowired
|
||||
private MonitorService monitorService;
|
||||
|
||||
public List queryMetricCount(String queryFormat, Long start, Long end, String metricElement, int limit) throws InterruptedException, ExecutionException, TimeoutException {
|
||||
String url = gatewayDomain + "/juapi/metrics/api/v1/query?query={query}&time={time}";
|
||||
|
@ -332,11 +335,20 @@ public class MonitorControllerV2 {
|
|||
}
|
||||
|
||||
@GetMapping("/sendMsg")
|
||||
@ApiOperation("查询总api调用总量")
|
||||
public void sendMsg(){
|
||||
SysNoticeDTO sysNoticeDTO = new SysNoticeDTO();
|
||||
sysNoticeDTO.setTitle("请审批yyyy的流程申请");
|
||||
sysNoticeService.sendToYaweiUser(sysNoticeDTO, Lists.newArrayList(1513432847327199233L));
|
||||
}
|
||||
|
||||
@GetMapping("/expireVideoToken")
|
||||
public void expireVideoToken(){
|
||||
monitorService.expireToken();
|
||||
}
|
||||
|
||||
@GetMapping("/getVideoToken")
|
||||
public String getVideoToken(String code) throws IOException {
|
||||
return monitorService.fileCode(code);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1539,6 +1539,10 @@ public class MonitorService {
|
|||
}
|
||||
return childs;
|
||||
}
|
||||
|
||||
public void expireToken(){
|
||||
token = "expire";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
package io.renren.modules.sys.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import io.renren.common.constant.Constant;
|
||||
import io.renren.common.page.PageData;
|
||||
import io.renren.common.service.impl.BaseServiceImpl;
|
||||
|
@ -406,6 +408,16 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
|
|||
newUser.setDeptId(id);
|
||||
sysUserDao.insert(newUser);
|
||||
}
|
||||
}else if(user != null || userById != null){
|
||||
UpdateWrapper<SysUserEntity> updateWrapper = Wrappers.update();
|
||||
updateWrapper.eq("username",userName).eq("real_name",m.get("real_name") == null ? "" : m.get("real_name").toString());
|
||||
|
||||
SysUserEntity newUser2 = new SysUserEntity();
|
||||
newUser2.setGuid(m.get("guid") == null ? "" : m.get("guid").toString());
|
||||
newUser2.setMobile(m.get("mobile") == null ? "" : m.get("mobile").toString());
|
||||
newUser2.setYwMobile(m.get("ywMobile") == null ? "" : m.get("ywMobile").toString());
|
||||
|
||||
sysUserDao.update(newUser2,updateWrapper);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue