diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmConfigBean.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmConfigBean.java index 454e6ff..b4871d1 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmConfigBean.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmConfigBean.java @@ -11,4 +11,5 @@ public class BpmConfigBean { // 是否debug模式 private boolean debug; private String codeJavaPath; + private int mode; } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/util/IdeaUtil.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/util/IdeaUtil.java index a30f431..8b0d2ba 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/util/IdeaUtil.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/util/IdeaUtil.java @@ -22,15 +22,18 @@ import java.util.Map; * 读取Idea信息的工具类 */ public class IdeaUtil { + private final static int MODE_POM = 1; //获取工程中的Module文件 - public static Map getModules(String ideaPath) { - File file = new File(ideaPath + "/pom.xml"); - if (file.exists()) { - return getModulesFromPom(ideaPath, file); + public static Map getModules(String ideaPath, int mode) { + if (mode == MODE_POM) { + File file = new File(ideaPath + "/pom.xml"); + if (file.exists()) { + return getModulesFromPom(ideaPath, file); + } + } else { + File file = new File(ideaPath + "/.idea/modules.xml"); + if (file.exists()) return getModulesFromModule(ideaPath, file); } - - file = new File(ideaPath + "/.idea/modules.xml"); - if (file.exists()) return getModulesFromModule(ideaPath, file); return null; } @@ -62,14 +65,6 @@ public class IdeaUtil { return map; } - - public static void main(String args[]) throws Exception { - Map list = getModules("e:/jujia/git/6.0/smtweb2/smtweb-framework"); - for (Map.Entry s : list.entrySet()) { - System.out.println(s.getKey() + "=" + s.getValue()); - } - } - @Data @JsonIgnoreProperties(ignoreUnknown = true) @JacksonXmlRootElement(localName = "project") diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java index 85388ad..bc56fa1 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/CodeBuildHandler.java @@ -99,7 +99,7 @@ public class CodeBuildHandler extends AbstractHandler { packageName = "cc.smtweb.biz." + moduleName + ".web"; } BpmConfigBean bpmConfigBean = SpringUtil.getBean(BpmConfigBean.class); - Map mapIdeaModules = IdeaUtil.getModules(bpmConfigBean.getCodeJavaPath()); + Map mapIdeaModules = IdeaUtil.getModules(bpmConfigBean.getCodeJavaPath(), bpmConfigBean.getMode()); if (mapIdeaModules == null || mapIdeaModules.isEmpty()) throw new BizException("没有定义idea项目的路径(smtweb.bpm.codeJavaPath)!"); codePath = mapIdeaModules.get(moduleName); if (StringUtils.isEmpty(codePath)) { diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java index 333fef1..efeed23 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java @@ -373,8 +373,8 @@ public class ModelFormHelper { if (StringUtils.isEmpty(moduleName)) return null; BpmConfigBean bpmConfigBean = SpringUtil.getBean(BpmConfigBean.class); - Map mapIdeaModules = IdeaUtil.getModules(bpmConfigBean.getCodeJavaPath()); - if (mapIdeaModules.isEmpty()) throw new BizException("没有定义idea项目的路径(smtweb.bpm.codeJavaPath)!"); + Map mapIdeaModules = IdeaUtil.getModules(bpmConfigBean.getCodeJavaPath(), bpmConfigBean.getMode()); + if (mapIdeaModules == null || mapIdeaModules.isEmpty()) throw new BizException("没有定义idea项目的路径(smtweb.bpm.codeJavaPath)!"); String codeJavaPath = mapIdeaModules.get(moduleName); if (StringUtils.isEmpty(codeJavaPath)) { throw new BizException("没有找到对应项目在idea中Module的路径(" + moduleName + ")!"); diff --git a/smtweb-framework/bpm/src/test/java/cc/smtweb/system/bpm/test/TestMain.java b/smtweb-framework/bpm/src/test/java/cc/smtweb/system/bpm/test/TestMain.java index cea6007..11e41ce 100644 --- a/smtweb-framework/bpm/src/test/java/cc/smtweb/system/bpm/test/TestMain.java +++ b/smtweb-framework/bpm/src/test/java/cc/smtweb/system/bpm/test/TestMain.java @@ -15,7 +15,7 @@ import java.util.Map; public class TestMain { public static void main(String[] args) throws Exception { - Map map = IdeaUtil.getModules("d:/work/smtweb2/smtweb-framework"); +// Map map = IdeaUtil.getModules("d:/work/smtweb2/smtweb-framework", 1); } }