zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:插件上传默认停止

V0.5.x
xiwa 2023-10-29 12:57:43 +08:00
parent b0ef14f731
commit baea6416f4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/impl/PluginServiceImpl.java
View File

@ -92,10 +92,7 @@ public class PluginServiceImpl implements IPluginService {
log.info("script:{}", script); log.info("script:{}", script);
} }
PluginState pluginState = pluginInfo.getPluginState(); plugin.setState(PluginInfo.STATE_STOPPED);
if (pluginState == PluginState.STARTED) {
plugin.setState(PluginInfo.STATE_RUNNING);
}
plugin.setPluginId(pluginInfo.getPluginId()); plugin.setPluginId(pluginInfo.getPluginId());
plugin.setFile(file.getOriginalFilename()); plugin.setFile(file.getOriginalFilename());
plugin.setConfigSchema(configJson); plugin.setConfigSchema(configJson);
@ -105,6 +102,9 @@ public class PluginServiceImpl implements IPluginService {
plugin.setVersion(pluginDescriptor.getPluginVersion()); plugin.setVersion(pluginDescriptor.getPluginVersion());
plugin.setDescription(pluginDescriptor.getDescription()); plugin.setDescription(pluginDescriptor.getDescription());
pluginInfoData.save(plugin); pluginInfoData.save(plugin);
//默认停止
pluginOperator.stop(pluginId);
} catch (Exception e) { } catch (Exception e) {
throw new BizException(ErrCode.PLUGIN_INSTALL_FAILED, e); throw new BizException(ErrCode.PLUGIN_INSTALL_FAILED, e);
} }
@ -166,14 +166,15 @@ public class PluginServiceImpl implements IPluginService {
} }
String pluginId = old.getPluginId(); String pluginId = old.getPluginId();
com.gitee.starblues.core.PluginInfo pluginInfo = pluginOperator.getPluginInfo(pluginId); com.gitee.starblues.core.PluginInfo pluginInfo = pluginOperator.getPluginInfo(pluginId);
if (state.equals(PluginInfo.STATE_RUNNING) && pluginInfo != null && pluginInfo.getPluginState() != PluginState.STARTED) { if (pluginInfo != null) {
//停止插 if (state.equals(PluginInfo.STATE_RUNNING) && pluginInfo.getPluginState() != PluginState.STARTED) {
pluginOperator.start(pluginId); //启动插件
} else if (state.equals(PluginInfo.STATE_STOPPED) && pluginInfo != null && pluginInfo.getPluginState() == PluginState.STARTED) { pluginOperator.start(pluginId);
//停止插件 } else if (state.equals(PluginInfo.STATE_STOPPED) && pluginInfo.getPluginState() == PluginState.STARTED) {
pluginOperator.stop(pluginId); //停止插件
pluginOperator.stop(pluginId);
}
} }
old.setState(state); old.setState(state);