iidi
/
bocloud.cloud.plugin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: iidi:afa51ad6e5475ea07df8711734173e67634e9fbe
Branches Tags
iidi:develop
..
compare: iidi:387a702d177c0a76628e22720992f54357846da5
Branches Tags
iidi:develop

No commits in common. "afa51ad6e5475ea07df8711734173e67634e9fbe" and "387a702d177c0a76628e22720992f54357846da5" have entirely different histories.
afa51ad6e5 ... 387a702d17

1 changed files with 1 additions and 11 deletions
Show Stats Expand all files Collapse all files

12
bocloud.ctstack.plugin/src/main/java/com/bocloud/ctstack/plugin/service/impl/VMExtendServiceImpl.java
View File

@ -12,7 +12,6 @@ import com.bocloud.cmp.enums.BocloudStatus;
import com.bocloud.cmp.enums.OrderItemStatus;
import com.bocloud.cmp.enums.ResourceCategory;
import com.bocloud.cmp.internal.CosInternalService;
import com.bocloud.cmp.internal.SmsSystemConfigService;
import com.bocloud.cmp.repository.CloudVendorRepository;
import com.bocloud.cmp.repository.ServerRepository;
import com.bocloud.cmp.util.ResourceEventPublisher;
@ -165,8 +164,6 @@ public class VMExtendServiceImpl implements VMExtendService {
private ButlerConfig butlerConfig;
@Autowired
private VpcRepository vpcRepository;
@Autowired
private SmsSystemConfigService smsSystemConfigService;
@Override
public GeneralResult stats(String range, Long hostId, RequestContext context) {
@ -308,14 +305,7 @@ public class VMExtendServiceImpl implements VMExtendService {
Assert.notNull(vendor, "云平台不存在");
TianyiServerProvider serverProvider = new TianyiServerProvider(butlerConfig.regionButler(vendor.getUuid(), region));
GeneralResult result = serverProvider.vncConsole(serverId, server.getRegionId());
String token = (String) result.getData();
String protocol = smsSystemConfigService.getByCode("vncProtocol");
String host = smsSystemConfigService.getByCode("vncHost");
String port = smsSystemConfigService.getByCode("vncPort");
if (StringUtils.isNotBlank(protocol) && StringUtils.isNotBlank(host) && StringUtils.isNotBlank(port)) {
token = protocol + "://" + host + ":" + port + token;
}
return new GeneralResult<>(result.isSuccess(), token, "success");
return result.isSuccess() ? result : new GeneralResult<>(false, "vnc链接失败！");
} catch (Exception e) {
log.error("查询数据失败：{}", e.getMessage());
return new GeneralResult<>(false, e.getMessage());