diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..29f81d812f3e768fa89638d1f72920dbfd1413a8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000000000000000000000000000000000000..b308bda52a4dc8c8dae7e305f73c243680ca2644 --- /dev/null +++ b/NOTICE @@ -0,0 +1,8 @@ +OPEN SOURCE SOFTWARE NOTICE + +Please note we provide an open source software notice for the third party open source software along with this software and/or this software component (in the following just “this SOFTWARE”). The open source software licenses are granted by the respective right holders. + +Warranty Disclaimer +THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + +Copyright Notice and License Texts \ No newline at end of file diff --git a/README.en.md b/README.en.md new file mode 100644 index 0000000000000000000000000000000000000000..f9caa0b2eccc930a9d0bb7b40e29c5699a959cc8 --- /dev/null +++ b/README.en.md @@ -0,0 +1,36 @@ +# ui-model + +#### Description +前端UI模型。 + +#### Software Architecture +Software architecture description + +#### Installation + +1. xxxx +2. xxxx +3. xxxx + +#### Instructions + +1. xxxx +2. xxxx +3. xxxx + +#### Contribution + +1. Fork the repository +2. Create Feat_xxx branch +3. Commit your code +4. Create Pull Request + + +#### Gitee Feature + +1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md +2. Gitee blog [blog.gitee.com](https://blog.gitee.com) +3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) +4. The most valuable open source project [GVP](https://gitee.com/gvp) +5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) +6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..cf13806a63d83103d4c6a98003cfb8d0866b5f5b --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# ui-model + +#### 介绍 +前端UI模型。 + +支撑设计器的后端交互； +支持脚本负载同步； + + diff --git a/form-process/pom.xml b/form-process/pom.xml index 7e3ac47213804c2a03b343b81d02e7883fd9c136..f333cbdc7b5f8d8d79ed343b4c0aee11e862a517 100644 --- a/form-process/pom.xml +++ b/form-process/pom.xml @@ -15,7 +15,6 @@ ${custom.version} web-form-process - web-form-process-api \ No newline at end of file diff --git a/form-process/web-form-process-api/pom.xml b/form-process/web-form-process-api/pom.xml deleted file mode 100644 index 472d0f741f3e561b89d359bb16fbaaa1842364de..0000000000000000000000000000000000000000 --- a/form-process/web-form-process-api/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - form-process - com.inspur.edp - ${custom.version} - - 4.0.0 - - web-form-process-api - jar - ${custom.version} - - \ No newline at end of file diff --git a/form-process/web-form-process-api/src/main/java/com/inspur/edp/web/form/process/api/service/FormProcessService.java b/form-process/web-form-process-api/src/main/java/com/inspur/edp/web/form/process/api/service/FormProcessService.java deleted file mode 100644 index 72cb06440d9f9f0da3f42097aa21e23ffddda896..0000000000000000000000000000000000000000 --- a/form-process/web-form-process-api/src/main/java/com/inspur/edp/web/form/process/api/service/FormProcessService.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.inspur.edp.web.form.process.api.service; - -public interface FormProcessService { - void publishFormFormatForNoCode(String formId, String boId, String microAppCode, String deviceType); -} diff --git a/form-process/web-form-process/pom.xml b/form-process/web-form-process/pom.xml index 8678da14df169a31eaa364f006d3dfc99507a078..18ba3de69aa879f6890ff969018a339d6e64c25b 100644 --- a/form-process/web-form-process/pom.xml +++ b/form-process/web-form-process/pom.xml @@ -58,7 +58,7 @@ com.inspur.edp wf-bizprocess-api - 0.1.9 + 0.3.2 io.iec.edp diff --git a/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/config/FormProcessConfiguration.java b/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/config/FormProcessConfiguration.java old mode 100644 new mode 100755 index 24a3ed4e60a6764819be1a38dfd189e5eea8dcd2..42c62ec837378e9262ffcffd8bf3e9403a99d072 --- a/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/config/FormProcessConfiguration.java +++ b/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/config/FormProcessConfiguration.java @@ -1,36 +1,15 @@ -/* - * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.inspur.edp.web.form.process.config; - -import com.inspur.edp.web.form.process.service.FormProcessServiceImpl; -import com.inspur.edp.web.form.process.service.FormProcessWebService; -import io.iec.edp.caf.rest.RESTEndpoint; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration("com.inspur.ed.web.form.process.config.FormProcessConfiguration") -public class FormProcessConfiguration { - @Bean - public RESTEndpoint formProcessWebapiEndPoint() { - return new RESTEndpoint("/dev/main/v1.0/form/form-process", new FormProcessWebService()); - } - - @Bean - public FormProcessServiceImpl getFormProcessService() { - return new FormProcessServiceImpl(); - } -} +package com.inspur.edp.web.form.process.config; + +import com.inspur.edp.web.form.process.service.FormProcessWebService; +import io.iec.edp.caf.rest.RESTEndpoint; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration("com.inspur.ed.web.form.process.config.FormProcessConfiguration") +public class FormProcessConfiguration { + @Bean + public RESTEndpoint formProcessWebapiEndPoint() { + return new RESTEndpoint("/dev/main/v1.0/form/form-process", new Object[]{new FormProcessWebService()}); + } +} + diff --git a/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessServiceImpl.java b/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessManager.java old mode 100644 new mode 100755 similarity index 44% rename from form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessServiceImpl.java rename to form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessManager.java index 152f1eaf546ddc5a8cdacb571014d8bdd4877930..1123ae3bf4667cdcc44dc58562bbd8cb23abe769 --- a/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessServiceImpl.java +++ b/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessManager.java @@ -1,135 +1,80 @@ -/* - * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.inspur.edp.web.form.process.service; - -import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; -import com.inspur.edp.lcm.metadata.api.entity.GspProject; -import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; -import com.inspur.edp.lcm.metadata.api.service.MetadataService; -import com.inspur.edp.lcm.metadata.api.service.NoCodeService; -import com.inspur.edp.metadata.businesstype.api.MdBizTypeMappingService; -import com.inspur.edp.web.form.process.api.service.FormProcessService; -import com.inspur.edp.wf.bizprocess.entity.FormFormat; -import com.inspur.edp.wf.bizprocess.entity.UrlParameter; -import com.inspur.edp.wf.bizprocess.service.FormFormatRpcService; -import io.iec.edp.caf.businessobject.api.entity.DevBasicBoInfo; -import io.iec.edp.caf.businessobject.api.service.DevBasicInfoService; -import io.iec.edp.caf.commons.utils.SpringBeanUtils; -import io.iec.edp.caf.rpc.client.RpcClassHolder; - -import java.util.Arrays; -import java.util.List; - -public class FormProcessServiceImpl implements FormProcessService { - - private static class LazyHolder { - private static final FormProcessServiceImpl INSTANCE = new FormProcessServiceImpl(); - } - public FormProcessServiceImpl() {} - - public static final FormProcessServiceImpl getInstance() { - return LazyHolder.INSTANCE; - } - - public void publishFormFormat(String formId, String formPath) { - if (formPath == null || formPath.equals("")) { - throw new RuntimeException("参数path不允许为空。"); - } - - String unifiedPath = formPath.replace('\\', '/'); - if (unifiedPath.startsWith("/")) { - unifiedPath = unifiedPath.substring(1); // 去掉开头的/ - } - - MetadataService metadataService = SpringBeanUtils.getBean(MetadataService.class); - - List mdList = metadataService.getMetadataList(unifiedPath); - GspMetadata md = mdList.stream().filter(item -> item.getHeader().getId().equals(formId)).findFirst().orElse(null); - if (md == null) { - throw new RuntimeException("找不到表单元数据: " + formId + "。文件路径:" + unifiedPath + "。"); - } - MetadataHeader header = md.getHeader(); - GspProject project = metadataService.getGspProjectInfo(unifiedPath); - String deploymentPath = project.getSuDeploymentPath(); - String projectName = project.getMetadataProjectName().toLowerCase(); - String url = "/" + deploymentPath + "/web/" + projectName + "/" + "index.html#/" + header.getCode(); - String boId = project.getBizobjectID(); - - pushFormFormat(formId, md, url, boId); - } - - @Override - public void publishFormFormatForNoCode(String formId, String boId, String microAppCode, String deviceType) { - - - // 获取表单 - NoCodeService noCodeService =SpringBeanUtils.getBean(NoCodeService.class); - GspMetadata formMetadata = noCodeService.getMetadata(formId); - - // 根据bo获取app/su路径 - DevBasicInfoService devBasicInfoService = SpringBeanUtils.getBean(DevBasicInfoService.class); - DevBasicBoInfo boInfo = devBasicInfoService.getDevBasicBoInfo(boId); - String deploymentPath = boInfo.getAppCode() + "/" + boInfo.getSuCode(); - - // \web\apps\scm\sd\web\bo-salesorder2103front - String devicePath = "mobile".equals(deviceType) ? "mob" : "web"; - String url = "/" + deploymentPath + "/" + devicePath + "/" + microAppCode + "/" + "index.html#/" + formMetadata.getHeader().getCode(); - - pushFormFormat(formId, formMetadata, url, boId); - } - - private void pushFormFormat(String formId, GspMetadata formMetadta, String url, String boId) { - // 组织参数，调用工作流接口。 - FormFormat ff = new FormFormat(); - ff.setId(formId); - ff.setCode(formMetadta.getHeader().getCode()); - ff.setName(formMetadta.getHeader().getName()); - ff.setUrlType("url"); - ff.setFormUrl(url); - - UrlParameter actionParam = new UrlParameter(); - actionParam.setCode("action"); - actionParam.setName("动作"); - actionParam.setValue("LoadAndView1"); - UrlParameter idParam = new UrlParameter(); - idParam.setCode("id"); - idParam.setName("内码"); - idParam.setValue("{\"expr\":\"DefaultFunction.GetContextParameter(\\\"dataId\\\")\",\"sexpr\":\"\"}\n"); - List list = Arrays.asList(actionParam, idParam); - // UrlParameter param1 = new UrlParameter(); - // param1.setCode("expr"); - // param1.setValue("DefaultFunction.GetContextParameter(\\\"dataId\\\")"); - // UrlParameter param2 = new UrlParameter(); - // param2.setCode("sexpr"); - // param2.setValue(""); - // List list = Arrays.asList(param1, param2); - ff.setUrlParameters(list); - ff.setFormatType("wf"); - - ff.setBizCategory(getBizTypeId(boId)); - - RpcClassHolder rpcHelper = SpringBeanUtils.getBean(RpcClassHolder.class); - FormFormatRpcService service = rpcHelper.getRpcClass(FormFormatRpcService.class); - service.addFormFormat(ff); - } - - private String getBizTypeId(String bizObjectId) { - MdBizTypeMappingService service = SpringBeanUtils.getBean(MdBizTypeMappingService.class); - List bizTypeIds = service.getBizTypeIdsByBoId(bizObjectId); - return bizTypeIds == null || bizTypeIds.size() == 0 ? "" : bizTypeIds.get(0); - } -} +package com.inspur.edp.web.form.process.service; + +import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; +import com.inspur.edp.lcm.metadata.api.entity.GspProject; +import com.inspur.edp.lcm.metadata.api.entity.MetadataHeader; +import com.inspur.edp.lcm.metadata.api.service.MetadataService; +import com.inspur.edp.metadata.businesstype.api.MdBizTypeMappingService; +import com.inspur.edp.wf.bizprocess.entity.FormFormat; +import com.inspur.edp.wf.bizprocess.entity.UrlParameter; +import com.inspur.edp.wf.bizprocess.service.FormFormatRpcService; +import io.iec.edp.caf.commons.utils.SpringBeanUtils; +import io.iec.edp.caf.rpc.client.RpcClassHolder; + +import java.util.Arrays; +import java.util.List; + +public class FormProcessManager { + private static class LazyHolder { + private static final FormProcessManager INSTANCE = new FormProcessManager(); + } + + private FormProcessManager() { + } + + public static final FormProcessManager getInstance() { + /* 25 */ + return LazyHolder.INSTANCE; + } + + public void publishFormFormat(String formId, String formPath) { + if (formPath == null || formPath.equals("")) { + throw new RuntimeException("参数path不允许为空。"); + } + String unifiedPath = formPath.replace('\\', '/'); + if (unifiedPath.startsWith("/")) { + unifiedPath = unifiedPath.substring(1); + } + MetadataService metadataService = (MetadataService) SpringBeanUtils.getBean(MetadataService.class); + List mdList = metadataService.getMetadataList(unifiedPath); + GspMetadata md = mdList.stream().filter(item -> item.getHeader().getId().equals(formId)).findFirst().orElse(null); + if (md == null) { + throw new RuntimeException("找不到表单元数据: " + formId + "。文件路径:" + unifiedPath + "。"); + } + MetadataHeader header = md.getHeader(); + GspProject project = metadataService.getGspProjectInfo(unifiedPath); + String deploymentPath = project.getSuDeploymentPath(); + String projectName = project.getMetadataProjectName().toLowerCase(); + String url = "/" + deploymentPath + "/web/" + projectName + "/index.html#/" + header.getCode(); + FormFormat ff = new FormFormat(); + ff.setId(formId); + ff.setCode(header.getCode()); + ff.setName(header.getName()); + ff.setUrlType("url"); + ff.setFormUrl(url); + UrlParameter actionParam = new UrlParameter(); + actionParam.setCode("action"); + actionParam.setName("动作"); + actionParam.setValue("LoadAndView1"); + UrlParameter idParam = new UrlParameter(); + idParam.setCode("id"); + idParam.setName("内码"); + idParam.setValue("{\"expr\":\"DefaultFunction.GetContextParameter(\\\"dataId\\\")\",\"sexpr\":\"\"}\n"); + List list = Arrays.asList(new UrlParameter[]{actionParam, idParam}); + ff.setUrlParameters(list); + ff.setFormatType("wf"); + String boId = project.getBizobjectID(); + ff.setBizCategory(getBizTypeId(boId)); + ff.setTerminal("PC"); + RpcClassHolder rpcHelper = (RpcClassHolder) SpringBeanUtils.getBean(RpcClassHolder.class); + FormFormatRpcService service = (FormFormatRpcService) rpcHelper.getRpcClass(FormFormatRpcService.class); + service.addFormFormat(ff); + } + + private String getBizTypeId(String bizObjectId) { + MdBizTypeMappingService service = (MdBizTypeMappingService) SpringBeanUtils.getBean(MdBizTypeMappingService.class); + List bizTypeIds = service.getBizTypeIdsByBoId(bizObjectId); + return (bizTypeIds == null || bizTypeIds.size() == 0) ? "" : bizTypeIds.get(0); + } +} + diff --git a/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessWebService.java b/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessWebService.java new file mode 100755 index 0000000000000000000000000000000000000000..9fe63fdac8ea44c195f34f19249c489c46d43641 --- /dev/null +++ b/form-process/web-form-process/src/main/java/com/inspur/edp/web/form/process/service/FormProcessWebService.java @@ -0,0 +1,14 @@ + package com.inspur.edp.web.form.process.service; + import javax.ws.rs.*; + + @Path("/") + @Consumes({"application/json"}) + @Produces({"application/json"}) + public class FormProcessWebService { + @Path("/form-format") + @PUT + public void publishFormFormat(@QueryParam("id") String formId, @QueryParam("path") String path) { + FormProcessManager.getInstance().publishFormFormat(formId, path); + } + } + diff --git a/metadata/pom.xml b/metadata/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..2c93a6a948d1c62a98e41691f4b3a2427b31a3ea --- /dev/null +++ b/metadata/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + com.inspur.edp + web + 0.1.9-SNAPSHOT + + + metadata + pom + ${custom.version} + + + web-pageflow-metadata + web-sourcecode-metadata + web-statemachine + + + \ No newline at end of file diff --git a/web-pageflow-metadata/pom.xml b/metadata/web-pageflow-metadata/pom.xml similarity index 97% rename from web-pageflow-metadata/pom.xml rename to metadata/web-pageflow-metadata/pom.xml index de910635902a90dbd71631bc51bf59020363a1c7..bdedf19a8de484307edc1395546aaba900d73d72 100644 --- a/web-pageflow-metadata/pom.xml +++ b/metadata/web-pageflow-metadata/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - web + metadata com.inspur.edp ${custom.version} diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPage.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPage.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPage.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPage.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPageFlowMetadataEntity.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPageFlowMetadataEntity.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPageFlowMetadataEntity.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPageFlowMetadataEntity.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPageFlowMetadataEntityService.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPageFlowMetadataEntityService.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPageFlowMetadataEntityService.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedPageFlowMetadataEntityService.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedRoute.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedRoute.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedRoute.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/AdaptedRoute.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Page.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Page.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Page.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Page.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntity.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntity.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntity.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntity.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntityManager.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntityManager.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntityManager.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntityManager.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PagePublish.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PagePublish.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PagePublish.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/PagePublish.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Project.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Project.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Project.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Project.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Route.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Route.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Route.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/entity/Route.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/listener/PageFlowMetadataEventListener.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/listener/PageFlowMetadataEventListener.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/listener/PageFlowMetadataEventListener.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/listener/PageFlowMetadataEventListener.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/manager/PageFlowMetadataEntityManager.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/manager/PageFlowMetadataEntityManager.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/manager/PageFlowMetadataEntityManager.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/manager/PageFlowMetadataEntityManager.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/serializer/PageFlowMetadataEntitySerializer.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/serializer/PageFlowMetadataEntitySerializer.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/serializer/PageFlowMetadataEntitySerializer.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/serializer/PageFlowMetadataEntitySerializer.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/serializer/PageFlowMetadataTransferSerializer.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/serializer/PageFlowMetadataTransferSerializer.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/serializer/PageFlowMetadataTransferSerializer.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/serializer/PageFlowMetadataTransferSerializer.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/PageFlowMetadataUpdateService.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/PageFlowMetadataUpdateService.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/PageFlowMetadataUpdateService.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/PageFlowMetadataUpdateService.java diff --git a/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/RouteMetadataService.java b/metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/RouteMetadataService.java similarity index 100% rename from web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/RouteMetadataService.java rename to metadata/web-pageflow-metadata/src/main/java/com/inspur/edp/web/pageflow/metadata/service/RouteMetadataService.java diff --git a/web-pageflow-metadata/src/test/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntityTest.java b/metadata/web-pageflow-metadata/src/test/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntityTest.java similarity index 100% rename from web-pageflow-metadata/src/test/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntityTest.java rename to metadata/web-pageflow-metadata/src/test/java/com/inspur/edp/web/pageflow/metadata/entity/PageFlowMetadataEntityTest.java diff --git a/web-sourcecode-metadata/pom.xml b/metadata/web-sourcecode-metadata/pom.xml similarity index 97% rename from web-sourcecode-metadata/pom.xml rename to metadata/web-sourcecode-metadata/pom.xml index 377db5aba300aee0b697775fd5aedd72c5cb835e..16afe90817b56148eb87e304bc8d149cbb5e9566 100644 --- a/web-sourcecode-metadata/pom.xml +++ b/metadata/web-sourcecode-metadata/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - web + metadata com.inspur.edp ${custom.version} diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/RelativePathEnumEntity.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/RelativePathEnumEntity.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/RelativePathEnumEntity.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/RelativePathEnumEntity.java diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/SourceCodeItemEntity.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/SourceCodeItemEntity.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/SourceCodeItemEntity.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/SourceCodeItemEntity.java diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/SourceCodeMetadataEntity.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/SourceCodeMetadataEntity.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/SourceCodeMetadataEntity.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/entity/SourceCodeMetadataEntity.java diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/listener/SourceCodeMetadataEventListener.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/listener/SourceCodeMetadataEventListener.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/listener/SourceCodeMetadataEventListener.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/listener/SourceCodeMetadataEventListener.java diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/manager/SourceCodeMetadataManager.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/manager/SourceCodeMetadataManager.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/manager/SourceCodeMetadataManager.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/manager/SourceCodeMetadataManager.java diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/serializer/SourceCodeMetadataEntitySerializer.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/serializer/SourceCodeMetadataEntitySerializer.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/serializer/SourceCodeMetadataEntitySerializer.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/serializer/SourceCodeMetadataEntitySerializer.java diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/serializer/SourceCodeMetadataTransferSerializer.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/serializer/SourceCodeMetadataTransferSerializer.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/serializer/SourceCodeMetadataTransferSerializer.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/serializer/SourceCodeMetadataTransferSerializer.java diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/FileOperationExtensions.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/FileOperationExtensions.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/FileOperationExtensions.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/FileOperationExtensions.java diff --git a/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/SourceCodeMetadataUtility.java b/metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/SourceCodeMetadataUtility.java similarity index 100% rename from web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/SourceCodeMetadataUtility.java rename to metadata/web-sourcecode-metadata/src/main/java/com/inspur/edp/web/sourcecode/metadata/utility/SourceCodeMetadataUtility.java diff --git a/web-statemachine/pom.xml b/metadata/web-statemachine/pom.xml similarity index 97% rename from web-statemachine/pom.xml rename to metadata/web-statemachine/pom.xml index 2a4ee12933e23ea61493c3fa7129c9cd5cebe46d..09fa7a4edb0fcbd9f22bbec70f5ddf16fee3e114 100644 --- a/web-statemachine/pom.xml +++ b/metadata/web-statemachine/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - web + metadata com.inspur.edp ${custom.version} diff --git a/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/manager/StateMachineMetadataManager.java b/metadata/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/manager/StateMachineMetadataManager.java similarity index 100% rename from web-statemachine/src/main/java/com/inspur/edp/web/statemachine/manager/StateMachineMetadataManager.java rename to metadata/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/manager/StateMachineMetadataManager.java diff --git a/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/metadata/StateMachineMetadataContent.java b/metadata/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/metadata/StateMachineMetadataContent.java similarity index 100% rename from web-statemachine/src/main/java/com/inspur/edp/web/statemachine/metadata/StateMachineMetadataContent.java rename to metadata/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/metadata/StateMachineMetadataContent.java diff --git a/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/serializer/StateMachineSerializer.java b/metadata/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/serializer/StateMachineSerializer.java similarity index 100% rename from web-statemachine/src/main/java/com/inspur/edp/web/statemachine/serializer/StateMachineSerializer.java rename to metadata/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/serializer/StateMachineSerializer.java diff --git a/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/serializer/StateMachineTransferSerializer.java b/metadata/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/serializer/StateMachineTransferSerializer.java similarity index 100% rename from web-statemachine/src/main/java/com/inspur/edp/web/statemachine/serializer/StateMachineTransferSerializer.java rename to metadata/web-statemachine/src/main/java/com/inspur/edp/web/statemachine/serializer/StateMachineTransferSerializer.java diff --git a/web-statemachine/src/test/java/com/inspur/edp/web/statemachine/metadata/StateMachineMetadataContentTest.java b/metadata/web-statemachine/src/test/java/com/inspur/edp/web/statemachine/metadata/StateMachineMetadataContentTest.java similarity index 100% rename from web-statemachine/src/test/java/com/inspur/edp/web/statemachine/metadata/StateMachineMetadataContentTest.java rename to metadata/web-statemachine/src/test/java/com/inspur/edp/web/statemachine/metadata/StateMachineMetadataContentTest.java diff --git a/npmpackage/pom.xml b/npmpackage/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..beafd794239c5b9d9fb008ccabdcab41e29b1b3e --- /dev/null +++ b/npmpackage/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + com.inspur.edp + web + ${custom.version} + + + npmpackage + pom + ${custom.version} + + + web-npmpackage-api + web-npmpackage-core + web-npmpackage-patch + + + \ No newline at end of file diff --git a/web-npmpackage-api/pom.xml b/npmpackage/web-npmpackage-api/pom.xml similarity index 97% rename from web-npmpackage-api/pom.xml rename to npmpackage/web-npmpackage-api/pom.xml index abf57fbeeb50643148cb9c73a234364bb5b96215..7067fc863f06dd8a7b287b1218e6afe7538dd7b0 100644 --- a/web-npmpackage-api/pom.xml +++ b/npmpackage/web-npmpackage-api/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - web + npmpackage com.inspur.edp ${custom.version} diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallPackageParameter.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallPackageParameter.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallPackageParameter.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallPackageParameter.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallParameter.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallParameter.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallParameter.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmInstallParameter.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageCheckUpdateOptions.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageCheckUpdateOptions.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageCheckUpdateOptions.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageCheckUpdateOptions.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageConstants.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageConstants.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageConstants.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageConstants.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageResponse.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageResponse.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageResponse.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageResponse.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageResponseLevel.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageResponseLevel.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageResponseLevel.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/NpmPackageResponseLevel.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/packagejson/NpmPackageJsonDependencyInfo.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/packagejson/NpmPackageJsonDependencyInfo.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/packagejson/NpmPackageJsonDependencyInfo.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/packagejson/NpmPackageJsonDependencyInfo.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/packagejson/NpmPackageJsonInfo.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/packagejson/NpmPackageJsonInfo.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/packagejson/NpmPackageJsonInfo.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/packagejson/NpmPackageJsonInfo.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmRepository.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmRepository.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmRepository.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmRepository.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettingConfig.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettingConfig.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettingConfig.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettingConfig.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettingMode.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettingMode.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettingMode.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettingMode.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettings.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettings.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettings.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmSettings.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmUpdatePolicy.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmUpdatePolicy.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmUpdatePolicy.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/entity/settings/NpmUpdatePolicy.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/service/NpmPackageInstallService.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/service/NpmPackageInstallService.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/service/NpmPackageInstallService.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/service/NpmPackageInstallService.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/service/NpmPackageService.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/service/NpmPackageService.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/service/NpmPackageService.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/service/NpmPackageService.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackageInstallWebService.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackageInstallWebService.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackageInstallWebService.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackageInstallWebService.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackagePublishWebService.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackagePublishWebService.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackagePublishWebService.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackagePublishWebService.java diff --git a/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackageWebService.java b/npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackageWebService.java similarity index 100% rename from web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackageWebService.java rename to npmpackage/web-npmpackage-api/src/main/java/com/inspur/edp/web/npmpackage/api/webservice/NpmPackageWebService.java diff --git a/web-npmpackage-core/pom.xml b/npmpackage/web-npmpackage-core/pom.xml similarity index 97% rename from web-npmpackage-core/pom.xml rename to npmpackage/web-npmpackage-core/pom.xml index eee153a087e5cbe948a2f0e39dae83027312f655..fc752b6adc57c9396c4d671dfa1f8dab2f78bf86 100644 --- a/web-npmpackage-core/pom.xml +++ b/npmpackage/web-npmpackage-core/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - web + npmpackage com.inspur.edp ${custom.version} diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/cacheclean/NpmCacheCleanCommandExecutor.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/config/NpmPackageConfiguration.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/config/NpmPackageConfiguration.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/config/NpmPackageConfiguration.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/config/NpmPackageConfiguration.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/config/NpmPackageInstallConfiguration.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/config/NpmPackageInstallConfiguration.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/config/NpmPackageInstallConfiguration.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/config/NpmPackageInstallConfiguration.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NodeModulesPathGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NodeModulesPathGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NodeModulesPathGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NodeModulesPathGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandExecutor.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandExecutor.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandExecutor.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandExecutor.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandParameterGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandParameterGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandParameterGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandParameterGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallLockFilePathGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallLockFilePathGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallLockFilePathGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallLockFilePathGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallManager.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallManager.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallManager.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallManager.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallParameterValidator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallParameterValidator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallParameterValidator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallParameterValidator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallingParameter.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallingParameter.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallingParameter.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallingParameter.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallingTagManager.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallingTagManager.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallingTagManager.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallingTagManager.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmRepositoryConnection.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmRepositoryConnection.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmRepositoryConnection.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/NpmRepositoryConnection.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/PackageJsonCopyManager.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/PackageJsonCopyManager.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/PackageJsonCopyManager.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/PackageJsonCopyManager.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/PackageJsonPathGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/PackageJsonPathGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/PackageJsonPathGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/PackageJsonPathGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmDeployPathGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmDeployPathGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmDeployPathGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmDeployPathGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandExecutor.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandExecutor.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandExecutor.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandExecutor.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandParameterGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandParameterGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandParameterGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalNpmInstallCommandParameterGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalPackageJsonPathGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalPackageJsonPathGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalPackageJsonPathGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/GlobalPackageJsonPathGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/NpmInstallGlobalManager.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/NpmInstallGlobalManager.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/NpmInstallGlobalManager.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npminstall/global/NpmInstallGlobalManager.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandExecutor.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandExecutor.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandExecutor.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandExecutor.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandParameterGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandParameterGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandParameterGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogin/NpmLoginCommandParameterGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandExecutor.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandExecutor.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandExecutor.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandExecutor.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandParameterGenerator.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandParameterGenerator.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandParameterGenerator.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmlogout/NpmLogoutCommandParameterGenerator.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmpackagecheck/NpmPackageCheck.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmpackagecheck/NpmPackageCheck.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmpackagecheck/NpmPackageCheck.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmpackagecheck/NpmPackageCheck.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConstant.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConstant.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConstant.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConstant.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConvertor.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConvertor.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConvertor.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingConvertor.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingEncryptService.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingEncryptService.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingEncryptService.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingEncryptService.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingInitialization.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingInitialization.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingInitialization.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingInitialization.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingManager.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingManager.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingManager.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingManager.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingPathManager.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingPathManager.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingPathManager.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingPathManager.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingReader.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingReader.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingReader.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingReader.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingWriter.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingWriter.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingWriter.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/npmsetting/NpmSettingWriter.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/service/NpmPackageInstallServiceImpl.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/service/NpmPackageInstallServiceImpl.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/service/NpmPackageInstallServiceImpl.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/service/NpmPackageInstallServiceImpl.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/service/NpmPackageServiceImpl.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/service/NpmPackageServiceImpl.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/service/NpmPackageServiceImpl.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/service/NpmPackageServiceImpl.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPackageInstallWebServiceImpl.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPackageInstallWebServiceImpl.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPackageInstallWebServiceImpl.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPackageInstallWebServiceImpl.java diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPackageWebServiceImpl.java b/npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPackageWebServiceImpl.java similarity index 100% rename from web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPackageWebServiceImpl.java rename to npmpackage/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/webservice/NpmPackageWebServiceImpl.java diff --git a/web-npmpackage-core/src/main/resources/META-INF/spring.factories b/npmpackage/web-npmpackage-core/src/main/resources/META-INF/spring.factories similarity index 100% rename from web-npmpackage-core/src/main/resources/META-INF/spring.factories rename to npmpackage/web-npmpackage-core/src/main/resources/META-INF/spring.factories diff --git a/web-npmpackage-core/src/test/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandParameterGeneratorTest.java b/npmpackage/web-npmpackage-core/src/test/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandParameterGeneratorTest.java similarity index 100% rename from web-npmpackage-core/src/test/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandParameterGeneratorTest.java rename to npmpackage/web-npmpackage-core/src/test/com/inspur/edp/web/npmpackage/core/npminstall/NpmInstallCommandParameterGeneratorTest.java diff --git a/web-npmpackage-core/src/test/com/inspur/edp/web/npmpackage/core/npmpackagecheck/NpmPackageCheckTest.java b/npmpackage/web-npmpackage-core/src/test/com/inspur/edp/web/npmpackage/core/npmpackagecheck/NpmPackageCheckTest.java similarity index 100% rename from web-npmpackage-core/src/test/com/inspur/edp/web/npmpackage/core/npmpackagecheck/NpmPackageCheckTest.java rename to npmpackage/web-npmpackage-core/src/test/com/inspur/edp/web/npmpackage/core/npmpackagecheck/NpmPackageCheckTest.java diff --git a/web-npmpackage-patch/pom.xml b/npmpackage/web-npmpackage-patch/pom.xml similarity index 96% rename from web-npmpackage-patch/pom.xml rename to npmpackage/web-npmpackage-patch/pom.xml index 9e86df9c24a8fc4ce33dd60650e106c3d0db7cf5..390d01abd87f2fd829767a974bac475081ffbd62 100644 --- a/web-npmpackage-patch/pom.xml +++ b/npmpackage/web-npmpackage-patch/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - web + npmpackage com.inspur.edp ${custom.version} diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/FileOperation.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/FileOperation.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/FileOperation.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/FileOperation.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/MyPropertyNamingStrategy.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/MyPropertyNamingStrategy.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/MyPropertyNamingStrategy.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/MyPropertyNamingStrategy.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/NpmPackagePatchService.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/NpmPackagePatchService.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/NpmPackagePatchService.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/NpmPackagePatchService.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/PackageJsonFileManager.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/PackageJsonFileManager.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/PackageJsonFileManager.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/PackageJsonFileManager.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/PatchConstants.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/PatchConstants.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/PatchConstants.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/PatchConstants.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/README.md b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/README.md similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/README.md rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/README.md diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/RescureReadFiles.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/RescureReadFiles.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/RescureReadFiles.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/RescureReadFiles.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/SerializePackageJson.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/SerializePackageJson.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/SerializePackageJson.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/SerializePackageJson.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/PackageJsonDependencyInfo.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/PackageJsonDependencyInfo.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/PackageJsonDependencyInfo.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/PackageJsonDependencyInfo.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/PackageJsonInfo.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/PackageJsonInfo.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/PackageJsonInfo.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/PackageJsonInfo.java diff --git a/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/SerializedPackageJson.java b/npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/SerializedPackageJson.java similarity index 100% rename from web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/SerializedPackageJson.java rename to npmpackage/web-npmpackage-patch/src/main/java/com/inspur/edp/web/npmpackagepatch/packagejson/SerializedPackageJson.java diff --git a/pom.xml b/pom.xml index bc7d1da2d6cc1dccd0826386ed9e221da3931e1d..5108f4575f74829bd12216053126c4d34b569593 100644 --- a/pom.xml +++ b/pom.xml @@ -22,25 +22,18 @@ web-common web-form-metadata-api web-form-metadata - web-sourcecode-metadata - web-pageflow-metadata web-frontendproject web-frontendproject-api web-form-jitengine web-designschema web-designschema-api - web-statemachine - web-tsfile-api - web-tsfile-core + web-ide-api web-ide-webapi jitengine-web-api jitengine-web-core - web-npmpackage-core - web-npmpackage-api - web-npmpackage-patch web-dynamic-form-api web-dynamic-form-core web-formconfig-api @@ -49,6 +42,10 @@ scriptcache appconfig approval-format + npmpackage + form-process + metadata + tsfile diff --git a/tsfile/pom.xml b/tsfile/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..778f91847d70113f73bce691c5c6a2465a290fc3 --- /dev/null +++ b/tsfile/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.inspur.edp + web + ${custom.version} + + + tsfile + pom + ${custom.version} + + web-tsfile-api + web-tsfile-core + + + \ No newline at end of file diff --git a/web-tsfile-api/pom.xml b/tsfile/web-tsfile-api/pom.xml similarity index 97% rename from web-tsfile-api/pom.xml rename to tsfile/web-tsfile-api/pom.xml index a949eaa6d5fd324f384d30050f593dc8a30ddbb5..0ce2e32fe479b4b3e612c33f6a7f22be806d1566 100644 --- a/web-tsfile-api/pom.xml +++ b/tsfile/web-tsfile-api/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - web + tsfile com.inspur.edp ${custom.version} diff --git a/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/entity/FileObject.java b/tsfile/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/entity/FileObject.java similarity index 100% rename from web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/entity/FileObject.java rename to tsfile/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/entity/FileObject.java diff --git a/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/service/TsFileService.java b/tsfile/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/service/TsFileService.java similarity index 94% rename from web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/service/TsFileService.java rename to tsfile/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/service/TsFileService.java index 63c3d761efef881b8c3889fd4c4a0c0a74406617..387cbe9224354657111968481e06213fe1cf65f1 100644 --- a/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/service/TsFileService.java +++ b/tsfile/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/service/TsFileService.java @@ -17,9 +17,12 @@ package com.inspur.edp.web.tsfile.api.service; import java.util.ArrayList; +import java.util.List; -/* -ts文件对外暴露service +/** + * ts文件对外暴露service + * + * @author noah */ public interface TsFileService { @@ -49,6 +52,7 @@ public interface TsFileService { /** * 依据ts文件路径构造对应的ts 中class名称 + * * @param tsFilePath * @return */ @@ -74,7 +78,7 @@ public interface TsFileService { * * @param path 文件相对于开发根目录的路径，不含文件名 */ - ArrayList getTsFileList(String path); + List getTsFileList(String path); /** diff --git a/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/webservice/TsFileWebService.java b/tsfile/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/webservice/TsFileWebService.java similarity index 100% rename from web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/webservice/TsFileWebService.java rename to tsfile/web-tsfile-api/src/main/java/com/inspur/edp/web/tsfile/api/webservice/TsFileWebService.java diff --git a/web-tsfile-core/pom.xml b/tsfile/web-tsfile-core/pom.xml similarity index 98% rename from web-tsfile-core/pom.xml rename to tsfile/web-tsfile-core/pom.xml index d0f68a0538617bf07c45df4bc18e344675144872..7eabcd8c71bb9d7ed2f349c4b9e6544363652365 100644 --- a/web-tsfile-core/pom.xml +++ b/tsfile/web-tsfile-core/pom.xml @@ -19,7 +19,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - web + tsfile com.inspur.edp ${custom.version} diff --git a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/TsFileWebServiceImpl.java b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/TsFileWebServiceImpl.java similarity index 73% rename from web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/TsFileWebServiceImpl.java rename to tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/TsFileWebServiceImpl.java index c87f0c3e7a4df9b228aa72f8977965a568646ce5..7126efc354802a362e629cd0b3ba35b23155ebab 100644 --- a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/TsFileWebServiceImpl.java +++ b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/TsFileWebServiceImpl.java @@ -18,8 +18,9 @@ package com.inspur.edp.web.tsfile.core; import com.inspur.edp.web.tsfile.api.entity.FileObject; import com.inspur.edp.web.tsfile.api.webservice.TsFileWebService; -import com.inspur.edp.web.tsfile.core.service.TsFileService4WebApi; +import com.inspur.edp.web.tsfile.core.service.TsFileManagerService; +import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; @@ -32,34 +33,30 @@ import java.util.Map; */ public class TsFileWebServiceImpl implements TsFileWebService { + @Resource + private TsFileManagerService tsFileManagerService; @Override public Object loadTsFileContent(String path) { - - TsFileService4WebApi service = new TsFileService4WebApi(); - Map map = new HashMap<>(); map.put("success", true); - map.put("content", service.loadTsFile(path)); + map.put("content", this.tsFileManagerService.loadTsFile(path)); return map; } @Override public void saveTsFile(String path, FileObject fileObject) { - TsFileService4WebApi service = new TsFileService4WebApi(); - service.saveTsFile(path, fileObject.content); + this.tsFileManagerService.saveTsFile(path, fileObject.content); } @Override public void createTypescriptFile(String path) { - TsFileService4WebApi service = new TsFileService4WebApi(); - service.createTypescriptFile(path); + this.tsFileManagerService.createTypescriptFile(path); } @Override public void createMobileTsFile(String path) { - TsFileService4WebApi service = new TsFileService4WebApi(); - service.createMobileTsFile(path); + this.tsFileManagerService.createMobileTsFile(path); } } diff --git a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/config/TsFileConfiguration.java b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/config/TsFileConfiguration.java similarity index 86% rename from web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/config/TsFileConfiguration.java rename to tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/config/TsFileConfiguration.java index b752ae8684dcf4a57cdfa9549708953cf3dc2ecb..c2386bae0c7beabdbc2b3d8d094b7502b9328964 100644 --- a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/config/TsFileConfiguration.java +++ b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/config/TsFileConfiguration.java @@ -18,6 +18,7 @@ package com.inspur.edp.web.tsfile.core.config; import com.inspur.edp.web.tsfile.api.service.TsFileService; import com.inspur.edp.web.tsfile.core.TsFileWebServiceImpl; +import com.inspur.edp.web.tsfile.core.service.TsFileManagerService; import com.inspur.edp.web.tsfile.core.service.TsFileServiceImpl; import io.iec.edp.caf.rest.RESTEndpoint; import org.springframework.context.annotation.Bean; @@ -33,7 +34,12 @@ import org.springframework.context.annotation.Configuration; public class TsFileConfiguration { @Bean public TsFileService tsFileService() { - return TsFileServiceImpl.getNewInstance(); + return new TsFileServiceImpl(); + } + + @Bean + public TsFileManagerService tsFileManagerService() { + return new TsFileManagerService(); } @Bean() diff --git a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileService4WebApi.java b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileManagerService.java similarity index 90% rename from web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileService4WebApi.java rename to tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileManagerService.java index af2295f8d122765ba58a0372fce01a4888594f75..6e8f9b0d2962e1a50a1c57ad0801699760e3816f 100644 --- a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileService4WebApi.java +++ b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileManagerService.java @@ -18,20 +18,26 @@ package com.inspur.edp.web.tsfile.core.service; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.tsfile.api.service.TsFileService; +import io.iec.edp.caf.commons.utils.SpringBeanUtils; -import java.util.ArrayList; +import javax.annotation.Resource; +import java.util.List; /** * @author guozhiqi */ -public class TsFileService4WebApi { - private final TsFileService service = TsFileServiceImpl.getNewInstance(); +public class TsFileManagerService { + /** + * 注入TsFileService + */ + @Resource + private TsFileService service; public final void deleteTsFile(String fullPath) { service.deleteTsFile(fullPath); } - public final ArrayList getTsFileList(String path) { + public final List getTsFileList(String path) { return service.getTsFileList(path); } diff --git a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImpl.java b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImpl.java similarity index 71% rename from web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImpl.java rename to tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImpl.java index 91598253d2aa7430d2a6e2a310d9abc9ea198741..9158bbc68a85d2b45262aaec70ab0a724ccd6956 100644 --- a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImpl.java +++ b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImpl.java @@ -20,6 +20,7 @@ import com.inspur.edp.lcm.metadata.api.entity.GspMetadata; import com.inspur.edp.lcm.metadata.api.entity.MetadataProject; import com.inspur.edp.lcm.metadata.api.service.MetadataProjectService; import com.inspur.edp.lcm.metadata.api.service.MetadataService; +import com.inspur.edp.web.common.customexception.WebCustomException; import com.inspur.edp.web.common.io.FileUtility; import com.inspur.edp.web.common.metadata.MetadataUtility; import com.inspur.edp.web.tsfile.api.service.TsFileService; @@ -30,6 +31,7 @@ import org.apache.commons.io.FilenameUtils; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; +import java.util.Optional; /** * ts文件服务实现 @@ -38,16 +40,6 @@ import java.util.List; */ public class TsFileServiceImpl implements TsFileService { - /** - * 私有构造函数 避免外部私自实例化 提供统一返回实例方法 - */ - private TsFileServiceImpl() { - - } - - public static TsFileServiceImpl getNewInstance() { - return new TsFileServiceImpl(); - } @Override public final void deleteTsFile(String fullPath) { @@ -55,7 +47,7 @@ public class TsFileServiceImpl implements TsFileService { } @Override - public final ArrayList getTsFileList(String path) { + public final List getTsFileList(String path) { throw new UnsupportedOperationException(); } @@ -72,26 +64,18 @@ public class TsFileServiceImpl implements TsFileService { @Override public final String loadTsFileContentByWebCmp(String formRelativePath, String webCmpId) { - String fileStr = ""; - MetadataProjectService metadataProjectService = SpringBeanUtils.getBean(MetadataProjectService.class); - MetadataProject projInfo = metadataProjectService.getMetadataProjInfo(formRelativePath); - MetadataService metadataService = SpringBeanUtils.getBean(MetadataService.class); - List metadataList = metadataService.getMetadataList(projInfo.getProjectPath()); - - GspMetadata webcmpMeta = null; - for (GspMetadata item : metadataList) { - if (webCmpId.equals(item.getHeader().getId())) { - webcmpMeta = item; - break; - } + Optional optionalProjInfo = MetadataUtility.getInstance().getMetadataProject(formRelativePath); + if (!optionalProjInfo.isPresent()) { + throw new WebCustomException("获取工程路径信息为空，对应工程路径为：" + formRelativePath); } + List metadataList = MetadataUtility.getInstance().getMetadataListWithDesign(optionalProjInfo.get().getProjectPath()); + + GspMetadata webcmpMeta = metadataList.stream().filter(item -> webCmpId.equals(item.getHeader().getId())).findFirst() + .orElseThrow(() -> new WebCustomException(String.format("没有找到表单对应的web构件。表单路径：｛%1$s｝，web构件id：｛%2$s｝", formRelativePath, webCmpId))); - if (webcmpMeta == null) { - throw new RuntimeException(String.format("没有找到表单对应的web构件。表单路径：｛%1$s｝，web构件id：｛%2$s｝", formRelativePath, webCmpId)); - } String fileName = webcmpMeta.getHeader().getFileName(); - String fullPath = webcmpMeta.getRelativePath() + "/" + fileName.substring(0, fileName.lastIndexOf(".")) + ".ts"; + String fullPath = FileUtility.combine(webcmpMeta.getRelativePath(), fileName.substring(0, fileName.lastIndexOf(".")) + ".ts"); return loadTsFileContent(fullPath); } diff --git a/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/util/NameUtil.java b/tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/util/NameUtil.java similarity index 100% rename from web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/util/NameUtil.java rename to tsfile/web-tsfile-core/src/main/java/com/inspur/edp/web/tsfile/core/util/NameUtil.java diff --git a/web-tsfile-core/src/main/resources/META-INF/spring.factories b/tsfile/web-tsfile-core/src/main/resources/META-INF/spring.factories similarity index 100% rename from web-tsfile-core/src/main/resources/META-INF/spring.factories rename to tsfile/web-tsfile-core/src/main/resources/META-INF/spring.factories diff --git a/web-tsfile-core/src/test/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImplTest.java b/tsfile/web-tsfile-core/src/test/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImplTest.java similarity index 90% rename from web-tsfile-core/src/test/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImplTest.java rename to tsfile/web-tsfile-core/src/test/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImplTest.java index 3bdb20d54d2280db9e2e4f189431e9231b5b09f6..9ff93af48bacdd8dbe301538db7ab2292ba0174a 100644 --- a/web-tsfile-core/src/test/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImplTest.java +++ b/tsfile/web-tsfile-core/src/test/java/com/inspur/edp/web/tsfile/core/service/TsFileServiceImplTest.java @@ -25,14 +25,14 @@ public class TsFileServiceImplTest { @Test public void testClassName() { - TsFileService tsFileService = TsFileServiceImpl.getNewInstance(); + TsFileService tsFileService = new TsFileServiceImpl(); String tsClassName = tsFileService.getTsClassNameByPath("ddd.ts"); System.out.printf(tsClassName); } @Test public void replaceTsClassName() { - TsFileService tsFileService = TsFileServiceImpl.getNewInstance(); + TsFileService tsFileService = new TsFileServiceImpl(); String oldTsClassName = tsFileService.getTsClassNameByPath("ddd.ts"); assertEquals(oldTsClassName, "DddService"); diff --git a/web-common/src/test/java/com/inspur/edp/web/common/io/sourcefile/package.json b/web-common/src/test/java/com/inspur/edp/web/common/io/sourcefile/package.json deleted file mode 100644 index d74c41ca1feea5b2bfe5015cd8347366e7c0786b..0000000000000000000000000000000000000000 --- a/web-common/src/test/java/com/inspur/edp/web/common/io/sourcefile/package.json +++ /dev/null @@ -1,212 +0,0 @@ -{ - "name": "@farris/jit-engine", - "version": "0.0.1", - "description": "npm auto install", - "engines": { - "node": ">= 6.9.0", - "npm": ">= 3.0.0" - }, - "keywords": [ - "node_modules" - ], - "author": "Noah", - "license": "ISC1", - "dependencies": { - "@angular-devkit/core": "7.3.9", - "@angular/compiler-cli": "7.2.15", - "@angular/common": "7.2.13", - "@angular/core": "7.2.13", - "@angular/forms": "7.2.13", - "@angular/router": "7.2.13", - "@ant-design/icons-angular": "2.1.0", - "@ecp-caf/caf-common": "^2.0.5", - "@edp-aif/common-api": "^0.6.1", - "@edp-aif/runtime-api": "^0.6.0", - "@edp-bif/common-api": "^0.7.1", - "@edp-bif/runtime-api": "^0.7.2", - "@farris/bef": "0.0.12-20210428112135-dev", - "@farris/command-services": "0.0.12-20210508093120-dev", - "@farris/component-querycondition": "^0.1.46", - "@farris/devkit": "0.0.12-20210428112050-dev", - "@farris/discussion-group": "0.0.22", - "@farris/dynamic-control-group": "^0.1.11", - "@farris/extend-file-upload": "^0.1.9", - "@farris/extend-fileupload-adapt-unifile": "^0.1.4", - "@farris/farris-rollup": "^1.0.80", - "@farris/header-group-editor": "0.0.15", - "@farris/ide-devkit": "^1.0.33", - "@farris/ide-enum-editor": "0.0.3", - "@farris/ide-publish-menu": "0.0.17", - "@farris/kendo-binding": "0.0.12-20210428112252-dev", - "@farris/mobile-bef": "0.0.6", - "@farris/mobile-business-ui": "0.0.27", - "@farris/mobile-cli": "latest", - "@farris/mobile-command-services": "0.0.16", - "@farris/mobile-devkit": "0.0.5", - "@farris/mobile-ui": "0.0.19", - "@farris/mobile-vue-adapter": "0.0.10", - "@farris/tags": "0.0.9", - "@farris/ui-area-response": "0.0.2", - "@farris/ui-avatar": "0.0.17", - "@farris/ui-batch-edit-dialog": "0.0.12", - "@farris/ui-button": "0.0.16", - "@farris/ui-calculator": "0.0.1", - "@farris/ui-calendar": "0.0.5", - "@farris/ui-combo-list": "^0.1.37", - "@farris/ui-combo-lookup": "^0.1.21", - "@farris/ui-common": "^0.2.6", - "@farris/ui-datagrid": "^0.8.21", - "@farris/ui-datagrid-editors": "^0.2.43", - "@farris/ui-datagrid-filter": "0.0.15", - "@farris/ui-datagrid-settings": "0.0.16", - "@farris/ui-datalist": "0.0.16", - "@farris/ui-datatable": "^0.1.25", - "@farris/ui-datepicker": "^0.3.7", - "@farris/ui-dialog": "0.0.13", - "@farris/ui-draggable": "0.0.4", - "@farris/ui-dropdown": "0.0.12", - "@farris/ui-editor": "0.0.10", - "@farris/ui-enum-editor": "0.0.3", - "@farris/ui-field-group": "0.0.21", - "@farris/ui-filter": "0.0.8", - "@farris/ui-filter-editor": "^0.1.15", - "@farris/ui-filter-panel": "0.0.10", - "@farris/ui-flex-layout": "0.0.3", - "@farris/ui-footer": "0.0.2", - "@farris/ui-forms": "0.0.35", - "@farris/ui-html-editor": "0.0.23", - "@farris/ui-input-group": "^0.2.5", - "@farris/ui-language-textbox": "^0.1.14", - "@farris/ui-layout": "0.0.6", - "@farris/ui-list-filter": "0.0.63", - "@farris/ui-list-nav": "0.0.12", - "@farris/ui-list-view": "0.0.26", - "@farris/ui-loading": "^0.1.9", - "@farris/ui-locale": "0.2.12", - "@farris/ui-lookup": "^0.4.7", - "@farris/ui-messager": "^0.2.10", - "@farris/ui-modal": "^0.1.3", - "@farris/ui-multi-select": "^0.2.1", - "@farris/ui-nav": "0.0.4", - "@farris/ui-notify": "^0.1.6", - "@farris/ui-number-spinner": "^0.2.32", - "@farris/ui-pagination": "^0.1.10", - "@farris/ui-panel": "0.0.4", - "@farris/ui-perfect-scrollbar": "0.0.7", - "@farris/ui-popover": "0.0.4", - "@farris/ui-progress": "0.0.2", - "@farris/ui-progress-step": "0.0.23", - "@farris/ui-property-panel": "0.0.7", - "@farris/ui-response-toolbar": "^0.1.15", - "@farris/ui-responsive": "0.0.2", - "@farris/ui-scrollspy": "0.0.24", - "@farris/ui-section": "^0.1.2", - "@farris/ui-shortcuts": "0.0.4", - "@farris/ui-sidebar": "^0.1.4", - "@farris/ui-sort-editor": "^0.1.7", - "@farris/ui-splitter": "0.0.2", - "@farris/ui-switch": "0.0.6", - "@farris/ui-tabs": "^0.2.12", - "@farris/ui-tag": "0.0.2", - "@farris/ui-text": "^0.1.28", - "@farris/ui-time-picker": "^0.1.4", - "@farris/ui-time-spinner": "0.0.9", - "@farris/ui-tooltip": "0.0.17", - "@farris/ui-tree": "0.0.4", - "@farris/ui-treetable": "^0.3.4", - "@farris/ui-verify-detail": "0.0.6", - "@farris/ui-view-change": "0.0.5", - "@farris/ui-wizard": "0.0.29", - "@gsp-aif/common-api": "0.0.10", - "@gsp-aif/runtime-api": "0.0.11", - "@gsp-bef/gsp-be-metadata": "0.0.25", - "@gsp-bef/gsp-cm-metadata": "0.0.22", - "@gsp-bef/gsp-udt-metadata": "0.0.13", - "@gsp-bef/gsp-vo-metadata": "0.0.17", - "@gsp-cmp/chgdr": "0.0.2", - "@gsp-cmp/querysolution": "^0.1.28", - "@gsp-cmp/webcommand": "0.0.15", - "@gsp-dip/data-imp-exp": "^1.1.48", - "@gsp-lcm/bo-dt-service": "0.0.7", - "@gsp-lcm/bo-rt-service": "0.0.7", - "@gsp-lcm/bo-tree": "0.0.26", - "@gsp-lcm/dbo-selector": "0.0.4", - "@gsp-lcm/dbo-selectrt": "0.0.1", - "@gsp-lcm/metadata-selector": "0.0.50", - "@gsp-lcm/metadatart-selector": "0.0.6", - "@gsp-lcm/metadatart-selector4biztype": "0.0.12", - "@gsp-svc/cloudprint": "^0.4.19", - "@gsp-svc/expression": "0.0.53", - "@gsp-svc/file-load": "0.0.1", - "@gsp-svc/file-viewer": "0.0.74", - "@gsp-svc/filtercondition": "0.0.30", - "@gsp-svc/formdoc-upload": "^0.1.8", - "@gsp-sys/rtf-apphelp": "^1.0.9", - "@gsp-sys/rtf-common": "^2.0.8", - "@gsp-sys/rtf-ui": "0.0.7", - "@gsp-sys/sysmgr-common": "0.0.8", - "@gsp-sys/sysmgr-ui": "0.0.94", - "@gsp-wf/rtdevkit": "^1.0.5", - "@gsp-wf/task-action-impl": "0.0.17", - "@gsp-wf/task-impl-api": "0.0.8", - "@gsp-wf/ui-comment": "^0.1.8", - "@gsp-wf/ui-flowchart": "^1.1.1", - "@gsp-wf/wf-approval-logs": "^0.2.0", - "@gsp-wf/wf-process-editor": "^0.1.8", - "@gsp-wf/wf-sign": "0.0.5", - "@gsp-wf/wf-task-handler": "0.0.26", - "@gspwidget/portlet": "^1.5.0", - "@gspwidget/util": "^1.5.0", - "@gspwidget/widget-core": "^1.5.0", - "@gspwidget/widget-devkit": "^1.5.0", - "@progress/kendo-angular-buttons": "^4.4.0", - "@progress/kendo-angular-dateinputs": "^3.7.3", - "@progress/kendo-angular-dropdowns": "^3.5.3", - "@progress/kendo-angular-grid": "^3.14.1", - "@progress/kendo-angular-inputs": "^4.2.1", - "@progress/kendo-angular-intl": "^1.7.0", - "@progress/kendo-angular-l10n": "^1.4.0", - "@progress/kendo-angular-label": "^1.3.0", - "@progress/kendo-angular-layout": "^3.3.0", - "@progress/kendo-angular-pdf-export": "^1.3.1", - "@progress/kendo-angular-resize-sensor": "^3.2.0", - "@progress/kendo-angular-treeview": "^3.1.1", - "@progress/kendo-data-query": "^1.5.1", - "@progress/kendo-drawing": "^1.5.11", - "@progress/kendo-theme-default": "^2.57.1", - "@progress/kendo-theme-bootstrap": "^2.14.2", - "@progress/kendo-angular-dialog": "3.12.0", - "@qdp/command-services": "0.0.1-0.0.16dev", - "@qdp/common": "0.0.1-0.0.37dev", - "@qdp/condition-schema": "0.0.1-0.0.14dev", - "@qdp/echarts": "0.0.1-0.0.18dev", - "@qdp/formular": "0.0.1-0.0.19dev", - "@qdp/ide-cmp": "0.0.1-0.0.44dev", - "@qdp/localize": "0.0.1-0.0.14dev", - "@qdp/query-framework": "0.0.1-0.0.27dev", - "@qdp/search-join": "0.0.1-0.0.20dev", - "@qdp/spread": "0.0.1-0.0.34dev", - "bignumber.js": "^9.0.1", - "chalk": "2.4.2", - "date-fns": "2.6.0", - "lodash": "^4.17.10", - "moment": "^2.29.1", - "moment-timezone": "^0.5.33", - "prettier": "^1.18.2", - "rxjs": "~6.3.3", - "signature_pad": "^3.0.0-beta.4", - "dayjs": "1.10.3", - "vant": "3.0.3", - "vue": "3.0.5", - "vue-router": "4.0.3", - "reflect-metadata": "0.1.13", - "typescript": "3.2.4", - "tslib": "1.9.3" - }, - "devDependencies": { - "@babel/core": "^7.12.9", - "@babel/preset-env": "^7.12.7", - "@babel/preset-typescript": "^7.12.7", - "cross-env": "^7.0.3" - } -} \ No newline at end of file diff --git a/web-common/src/test/java/com/inspur/edp/web/common/io/targetfile/package.json b/web-common/src/test/java/com/inspur/edp/web/common/io/targetfile/package.json deleted file mode 100644 index d74c41ca1feea5b2bfe5015cd8347366e7c0786b..0000000000000000000000000000000000000000 --- a/web-common/src/test/java/com/inspur/edp/web/common/io/targetfile/package.json +++ /dev/null @@ -1,212 +0,0 @@ -{ - "name": "@farris/jit-engine", - "version": "0.0.1", - "description": "npm auto install", - "engines": { - "node": ">= 6.9.0", - "npm": ">= 3.0.0" - }, - "keywords": [ - "node_modules" - ], - "author": "Noah", - "license": "ISC1", - "dependencies": { - "@angular-devkit/core": "7.3.9", - "@angular/compiler-cli": "7.2.15", - "@angular/common": "7.2.13", - "@angular/core": "7.2.13", - "@angular/forms": "7.2.13", - "@angular/router": "7.2.13", - "@ant-design/icons-angular": "2.1.0", - "@ecp-caf/caf-common": "^2.0.5", - "@edp-aif/common-api": "^0.6.1", - "@edp-aif/runtime-api": "^0.6.0", - "@edp-bif/common-api": "^0.7.1", - "@edp-bif/runtime-api": "^0.7.2", - "@farris/bef": "0.0.12-20210428112135-dev", - "@farris/command-services": "0.0.12-20210508093120-dev", - "@farris/component-querycondition": "^0.1.46", - "@farris/devkit": "0.0.12-20210428112050-dev", - "@farris/discussion-group": "0.0.22", - "@farris/dynamic-control-group": "^0.1.11", - "@farris/extend-file-upload": "^0.1.9", - "@farris/extend-fileupload-adapt-unifile": "^0.1.4", - "@farris/farris-rollup": "^1.0.80", - "@farris/header-group-editor": "0.0.15", - "@farris/ide-devkit": "^1.0.33", - "@farris/ide-enum-editor": "0.0.3", - "@farris/ide-publish-menu": "0.0.17", - "@farris/kendo-binding": "0.0.12-20210428112252-dev", - "@farris/mobile-bef": "0.0.6", - "@farris/mobile-business-ui": "0.0.27", - "@farris/mobile-cli": "latest", - "@farris/mobile-command-services": "0.0.16", - "@farris/mobile-devkit": "0.0.5", - "@farris/mobile-ui": "0.0.19", - "@farris/mobile-vue-adapter": "0.0.10", - "@farris/tags": "0.0.9", - "@farris/ui-area-response": "0.0.2", - "@farris/ui-avatar": "0.0.17", - "@farris/ui-batch-edit-dialog": "0.0.12", - "@farris/ui-button": "0.0.16", - "@farris/ui-calculator": "0.0.1", - "@farris/ui-calendar": "0.0.5", - "@farris/ui-combo-list": "^0.1.37", - "@farris/ui-combo-lookup": "^0.1.21", - "@farris/ui-common": "^0.2.6", - "@farris/ui-datagrid": "^0.8.21", - "@farris/ui-datagrid-editors": "^0.2.43", - "@farris/ui-datagrid-filter": "0.0.15", - "@farris/ui-datagrid-settings": "0.0.16", - "@farris/ui-datalist": "0.0.16", - "@farris/ui-datatable": "^0.1.25", - "@farris/ui-datepicker": "^0.3.7", - "@farris/ui-dialog": "0.0.13", - "@farris/ui-draggable": "0.0.4", - "@farris/ui-dropdown": "0.0.12", - "@farris/ui-editor": "0.0.10", - "@farris/ui-enum-editor": "0.0.3", - "@farris/ui-field-group": "0.0.21", - "@farris/ui-filter": "0.0.8", - "@farris/ui-filter-editor": "^0.1.15", - "@farris/ui-filter-panel": "0.0.10", - "@farris/ui-flex-layout": "0.0.3", - "@farris/ui-footer": "0.0.2", - "@farris/ui-forms": "0.0.35", - "@farris/ui-html-editor": "0.0.23", - "@farris/ui-input-group": "^0.2.5", - "@farris/ui-language-textbox": "^0.1.14", - "@farris/ui-layout": "0.0.6", - "@farris/ui-list-filter": "0.0.63", - "@farris/ui-list-nav": "0.0.12", - "@farris/ui-list-view": "0.0.26", - "@farris/ui-loading": "^0.1.9", - "@farris/ui-locale": "0.2.12", - "@farris/ui-lookup": "^0.4.7", - "@farris/ui-messager": "^0.2.10", - "@farris/ui-modal": "^0.1.3", - "@farris/ui-multi-select": "^0.2.1", - "@farris/ui-nav": "0.0.4", - "@farris/ui-notify": "^0.1.6", - "@farris/ui-number-spinner": "^0.2.32", - "@farris/ui-pagination": "^0.1.10", - "@farris/ui-panel": "0.0.4", - "@farris/ui-perfect-scrollbar": "0.0.7", - "@farris/ui-popover": "0.0.4", - "@farris/ui-progress": "0.0.2", - "@farris/ui-progress-step": "0.0.23", - "@farris/ui-property-panel": "0.0.7", - "@farris/ui-response-toolbar": "^0.1.15", - "@farris/ui-responsive": "0.0.2", - "@farris/ui-scrollspy": "0.0.24", - "@farris/ui-section": "^0.1.2", - "@farris/ui-shortcuts": "0.0.4", - "@farris/ui-sidebar": "^0.1.4", - "@farris/ui-sort-editor": "^0.1.7", - "@farris/ui-splitter": "0.0.2", - "@farris/ui-switch": "0.0.6", - "@farris/ui-tabs": "^0.2.12", - "@farris/ui-tag": "0.0.2", - "@farris/ui-text": "^0.1.28", - "@farris/ui-time-picker": "^0.1.4", - "@farris/ui-time-spinner": "0.0.9", - "@farris/ui-tooltip": "0.0.17", - "@farris/ui-tree": "0.0.4", - "@farris/ui-treetable": "^0.3.4", - "@farris/ui-verify-detail": "0.0.6", - "@farris/ui-view-change": "0.0.5", - "@farris/ui-wizard": "0.0.29", - "@gsp-aif/common-api": "0.0.10", - "@gsp-aif/runtime-api": "0.0.11", - "@gsp-bef/gsp-be-metadata": "0.0.25", - "@gsp-bef/gsp-cm-metadata": "0.0.22", - "@gsp-bef/gsp-udt-metadata": "0.0.13", - "@gsp-bef/gsp-vo-metadata": "0.0.17", - "@gsp-cmp/chgdr": "0.0.2", - "@gsp-cmp/querysolution": "^0.1.28", - "@gsp-cmp/webcommand": "0.0.15", - "@gsp-dip/data-imp-exp": "^1.1.48", - "@gsp-lcm/bo-dt-service": "0.0.7", - "@gsp-lcm/bo-rt-service": "0.0.7", - "@gsp-lcm/bo-tree": "0.0.26", - "@gsp-lcm/dbo-selector": "0.0.4", - "@gsp-lcm/dbo-selectrt": "0.0.1", - "@gsp-lcm/metadata-selector": "0.0.50", - "@gsp-lcm/metadatart-selector": "0.0.6", - "@gsp-lcm/metadatart-selector4biztype": "0.0.12", - "@gsp-svc/cloudprint": "^0.4.19", - "@gsp-svc/expression": "0.0.53", - "@gsp-svc/file-load": "0.0.1", - "@gsp-svc/file-viewer": "0.0.74", - "@gsp-svc/filtercondition": "0.0.30", - "@gsp-svc/formdoc-upload": "^0.1.8", - "@gsp-sys/rtf-apphelp": "^1.0.9", - "@gsp-sys/rtf-common": "^2.0.8", - "@gsp-sys/rtf-ui": "0.0.7", - "@gsp-sys/sysmgr-common": "0.0.8", - "@gsp-sys/sysmgr-ui": "0.0.94", - "@gsp-wf/rtdevkit": "^1.0.5", - "@gsp-wf/task-action-impl": "0.0.17", - "@gsp-wf/task-impl-api": "0.0.8", - "@gsp-wf/ui-comment": "^0.1.8", - "@gsp-wf/ui-flowchart": "^1.1.1", - "@gsp-wf/wf-approval-logs": "^0.2.0", - "@gsp-wf/wf-process-editor": "^0.1.8", - "@gsp-wf/wf-sign": "0.0.5", - "@gsp-wf/wf-task-handler": "0.0.26", - "@gspwidget/portlet": "^1.5.0", - "@gspwidget/util": "^1.5.0", - "@gspwidget/widget-core": "^1.5.0", - "@gspwidget/widget-devkit": "^1.5.0", - "@progress/kendo-angular-buttons": "^4.4.0", - "@progress/kendo-angular-dateinputs": "^3.7.3", - "@progress/kendo-angular-dropdowns": "^3.5.3", - "@progress/kendo-angular-grid": "^3.14.1", - "@progress/kendo-angular-inputs": "^4.2.1", - "@progress/kendo-angular-intl": "^1.7.0", - "@progress/kendo-angular-l10n": "^1.4.0", - "@progress/kendo-angular-label": "^1.3.0", - "@progress/kendo-angular-layout": "^3.3.0", - "@progress/kendo-angular-pdf-export": "^1.3.1", - "@progress/kendo-angular-resize-sensor": "^3.2.0", - "@progress/kendo-angular-treeview": "^3.1.1", - "@progress/kendo-data-query": "^1.5.1", - "@progress/kendo-drawing": "^1.5.11", - "@progress/kendo-theme-default": "^2.57.1", - "@progress/kendo-theme-bootstrap": "^2.14.2", - "@progress/kendo-angular-dialog": "3.12.0", - "@qdp/command-services": "0.0.1-0.0.16dev", - "@qdp/common": "0.0.1-0.0.37dev", - "@qdp/condition-schema": "0.0.1-0.0.14dev", - "@qdp/echarts": "0.0.1-0.0.18dev", - "@qdp/formular": "0.0.1-0.0.19dev", - "@qdp/ide-cmp": "0.0.1-0.0.44dev", - "@qdp/localize": "0.0.1-0.0.14dev", - "@qdp/query-framework": "0.0.1-0.0.27dev", - "@qdp/search-join": "0.0.1-0.0.20dev", - "@qdp/spread": "0.0.1-0.0.34dev", - "bignumber.js": "^9.0.1", - "chalk": "2.4.2", - "date-fns": "2.6.0", - "lodash": "^4.17.10", - "moment": "^2.29.1", - "moment-timezone": "^0.5.33", - "prettier": "^1.18.2", - "rxjs": "~6.3.3", - "signature_pad": "^3.0.0-beta.4", - "dayjs": "1.10.3", - "vant": "3.0.3", - "vue": "3.0.5", - "vue-router": "4.0.3", - "reflect-metadata": "0.1.13", - "typescript": "3.2.4", - "tslib": "1.9.3" - }, - "devDependencies": { - "@babel/core": "^7.12.9", - "@babel/preset-env": "^7.12.7", - "@babel/preset-typescript": "^7.12.7", - "cross-env": "^7.0.3" - } -} \ No newline at end of file diff --git a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/deploy/AbstractDeployOperation.java b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/deploy/AbstractDeployOperation.java index 680928bb57043f95ca45d15e0f06a03ecffa8df7..546e7b980899ecbe7a57456c5a32c6c013a2f4a4 100644 --- a/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/deploy/AbstractDeployOperation.java +++ b/web-frontendproject/src/main/java/com/inspur/edp/web/frontendproject/zerocode/operation/deploy/AbstractDeployOperation.java @@ -25,11 +25,11 @@ import com.inspur.edp.web.jitruntimebuild.scriptcache.api.service.ScriptCacheSer import com.inspur.edp.web.jitruntimebuild.scriptcache.localserver.LocalServerPathGenerator; import io.iec.edp.caf.commons.utils.SpringBeanUtils; - abstract class AbstractDeployOperation implements IDeployOperation { +abstract class AbstractDeployOperation implements IDeployOperation { private final TerminalType terminalType; private final ScriptCacheService scriptCacheServiceInstance; - public AbstractDeployOperation(TerminalType terminalType) { + AbstractDeployOperation(TerminalType terminalType) { this.terminalType = terminalType; this.scriptCacheServiceInstance = SpringBeanUtils.getBean(ScriptCacheService.class); } diff --git a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/packagejsonfile/package.json b/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/packagejsonfile/package.json deleted file mode 100644 index 8e2af028db79b9c63ee8dc067b87a5c0ad940e34..0000000000000000000000000000000000000000 --- a/web-npmpackage-core/src/main/java/com/inspur/edp/web/npmpackage/core/packagejsonfile/package.json +++ /dev/null @@ -1,216 +0,0 @@ -{ - "name": "@farris/jit-engine", - "version": "0.0.1", - "description": "npm auto install", - "engines": { - "node": ">= 6.9.0", - "npm": ">= 3.0.0" - }, - "keywords": [ - "node_modules", - "jit" - ], - "author": "Noah", - "license": "ISC", - "dependencies": { - "@angular-devkit/core": "7.3.9", - "@angular/compiler-cli": "7.2.15", - "@angular/common": "7.2.13", - "@angular/core": "7.2.13", - "@angular/forms": "7.2.13", - "@angular/router": "7.2.13", - "@ant-design/icons-angular": "2.1.0", - "@ecp-caf/caf-common": "^2.0.5", - "@edp-aif/common-api": "^0.6.1", - "@edp-aif/runtime-api": "^0.6.0", - "@edp-bif/common-api": "^0.7.1", - "@edp-bif/runtime-api": "^0.7.2", - "@farris/bef": "0.0.12-20210428112135-dev", - "@farris/command-services": "0.0.12-20210508093120-dev", - "@farris/component-querycondition": "^0.1.46", - "@farris/devkit": "0.0.12-20210428112050-dev", - "@farris/discussion-group": "0.0.22", - "@farris/dynamic-control-group": "^0.1.11", - "@farris/extend-file-upload": "^0.1.9", - "@farris/extend-fileupload-adapt-unifile": "^0.1.4", - "@farris/farris-rollup": "1.0.80", - "@farris/header-group-editor": "0.0.15", - "@farris/ide-devkit": "^1.0.33", - "@farris/ide-enum-editor": "0.0.3", - "@farris/ide-publish-menu": "0.0.17", - "@farris/kendo-binding": "0.0.12-20210428112252-dev", - "@farris/mobile-bef": "0.0.6", - "@farris/mobile-business-ui": "0.0.27", - "@farris/mobile-cli": "latest", - "@farris/mobile-command-services": "0.0.16", - "@farris/mobile-devkit": "0.0.5", - "@farris/mobile-ui": "0.0.19", - "@farris/mobile-vue-adapter": "0.0.10", - "@farris/tags": "0.0.9", - "@farris/ui-area-response": "0.0.2", - "@farris/ui-avatar": "0.0.17", - "@farris/ui-batch-edit-dialog": "0.0.12", - "@farris/ui-button": "0.0.16", - "@farris/ui-calculator": "0.0.1", - "@farris/ui-calendar": "0.0.5", - "@farris/ui-combo-list": "^0.1.37", - "@farris/ui-combo-lookup": "^0.1.21", - "@farris/ui-common": "^0.2.6", - "@farris/ui-datagrid": "^0.8.21", - "@farris/ui-datagrid-editors": "^0.2.43", - "@farris/ui-datagrid-filter": "0.0.15", - "@farris/ui-datagrid-settings": "0.0.16", - "@farris/ui-datalist": "0.0.16", - "@farris/ui-datatable": "^0.1.25", - "@farris/ui-datepicker": "^0.3.7", - "@farris/ui-dialog": "0.0.13", - "@farris/ui-draggable": "0.0.4", - "@farris/ui-dropdown": "0.0.12", - "@farris/ui-editor": "0.0.10", - "@farris/ui-enum-editor": "0.0.3", - "@farris/ui-field-group": "0.0.21", - "@farris/ui-filter": "0.0.8", - "@farris/ui-filter-editor": "^0.1.15", - "@farris/ui-filter-panel": "0.0.10", - "@farris/ui-flex-layout": "0.0.3", - "@farris/ui-footer": "0.0.2", - "@farris/ui-forms": "0.0.35", - "@farris/ui-html-editor": "0.0.23", - "@farris/ui-input-group": "^0.2.5", - "@farris/ui-language-textbox": "^0.1.14", - "@farris/ui-layout": "0.0.6", - "@farris/ui-list-filter": "0.0.63", - "@farris/ui-list-nav": "0.0.12", - "@farris/ui-list-view": "0.0.26", - "@farris/ui-loading": "^0.1.9", - "@farris/ui-locale": "0.2.12", - "@farris/ui-lookup": "^0.4.7", - "@farris/ui-messager": "^0.2.10", - "@farris/ui-modal": "^0.1.3", - "@farris/ui-multi-select": "^0.2.1", - "@farris/ui-nav": "0.0.4", - "@farris/ui-notify": "^0.1.6", - "@farris/ui-number-spinner": "^0.2.32", - "@farris/ui-pagination": "^0.1.10", - "@farris/ui-panel": "0.0.4", - "@farris/ui-perfect-scrollbar": "0.0.7", - "@farris/ui-popover": "0.0.4", - "@farris/ui-progress": "0.0.2", - "@farris/ui-progress-step": "0.0.23", - "@farris/ui-property-panel": "0.0.7", - "@farris/ui-response-toolbar": "^0.1.15", - "@farris/ui-responsive": "0.0.2", - "@farris/ui-scrollspy": "0.0.24", - "@farris/ui-section": "^0.1.2", - "@farris/ui-shortcuts": "0.0.4", - "@farris/ui-sidebar": "^0.1.4", - "@farris/ui-sort-editor": "^0.1.7", - "@farris/ui-splitter": "0.0.2", - "@farris/ui-switch": "0.0.6", - "@farris/ui-tabs": "^0.2.12", - "@farris/ui-tag": "0.0.2", - "@farris/ui-text": "^0.1.28", - "@farris/ui-time-picker": "^0.1.4", - "@farris/ui-time-spinner": "0.0.9", - "@farris/ui-tooltip": "0.0.17", - "@farris/ui-tree": "0.0.4", - "@farris/ui-treetable": "^0.3.4", - "@farris/ui-verify-detail": "0.0.6", - "@farris/ui-view-change": "0.0.5", - "@farris/ui-wizard": "0.0.29", - "@gsp-aif/common-api": "0.0.10", - "@gsp-aif/runtime-api": "0.0.11", - "@gsp-bef/gsp-be-metadata": "0.0.25", - "@gsp-bef/gsp-cm-metadata": "0.0.22", - "@gsp-bef/gsp-udt-metadata": "0.0.13", - "@gsp-bef/gsp-vo-metadata": "0.0.17", - "@gsp-cmp/chgdr": "0.0.2", - "@gsp-cmp/querysolution": "^0.1.28", - "@gsp-cmp/webcommand": "0.0.15", - "@gsp-dip/data-imp-exp": "^1.1.48", - "@gsp-lcm/bo-dt-service": "0.0.7", - "@gsp-lcm/bo-rt-service": "0.0.7", - "@gsp-lcm/bo-tree": "0.0.26", - "@gsp-lcm/dbo-selector": "0.0.4", - "@gsp-lcm/dbo-selectrt": "0.0.1", - "@gsp-lcm/metadata-selector": "0.0.50", - "@gsp-lcm/metadatart-selector": "0.0.6", - "@gsp-lcm/metadatart-selector4biztype": "0.0.12", - "@gsp-svc/cloudprint": "^0.4.19", - "@gsp-svc/expression": "0.0.53", - "@gsp-svc/file-load": "0.0.1", - "@gsp-svc/file-viewer": "0.0.74", - "@gsp-svc/filtercondition": "0.0.30", - "@gsp-svc/formdoc-upload": "^0.1.8", - "@gsp-sys/rtf-apphelp": "^1.0.9", - "@gsp-sys/rtf-common": "^2.0.8", - "@gsp-sys/rtf-ui": "0.0.7", - "@gsp-sys/sysmgr-common": "0.0.8", - "@gsp-sys/sysmgr-ui": "0.0.94", - "@gsp-wf/rtdevkit": "^1.0.5", - "@gsp-wf/task-action-impl": "0.0.17", - "@gsp-wf/task-impl-api": "0.0.8", - "@gsp-wf/ui-comment": "^0.1.8", - "@gsp-wf/ui-flowchart": "^1.1.1", - "@gsp-wf/wf-approval-logs": "^0.2.0", - "@gsp-wf/wf-process-editor": "^0.1.8", - "@gsp-wf/wf-sign": "0.0.5", - "@gsp-wf/wf-task-handler": "0.0.26", - "@gspwidget/portlet": "^1.5.0", - "@gspwidget/util": "^1.5.0", - "@gspwidget/widget-core": "^1.5.0", - "@gspwidget/widget-devkit": "^1.5.0", - "@progress/kendo-angular-buttons": "^4.4.0", - "@progress/kendo-angular-dateinputs": "^3.7.3", - "@progress/kendo-angular-dropdowns": "^3.5.3", - "@progress/kendo-angular-grid": "^3.14.1", - "@progress/kendo-angular-inputs": "^4.2.1", - "@progress/kendo-angular-intl": "^1.7.0", - "@progress/kendo-angular-l10n": "^1.4.0", - "@progress/kendo-angular-label": "^1.3.0", - "@progress/kendo-angular-layout": "^3.3.0", - "@progress/kendo-angular-pdf-export": "^1.3.1", - "@progress/kendo-angular-resize-sensor": "^3.2.0", - "@progress/kendo-angular-treeview": "^3.1.1", - "@progress/kendo-data-query": "^1.5.1", - "@progress/kendo-drawing": "^1.5.11", - "@progress/kendo-theme-default": "^2.57.1", - "@progress/kendo-theme-bootstrap": "^2.14.2", - "@progress/kendo-angular-dialog": "3.12.0", - "@progress/kendo-angular-excel-export": "2.3.0", - "primeng": "9.0.0", - "@qdp/command-services": "0.0.1-0.0.16dev", - "@qdp/common": "0.0.1-0.0.37dev", - "@qdp/condition-schema": "0.0.1-0.0.14dev", - "@qdp/echarts": "0.0.1-0.0.18dev", - "@qdp/formular": "0.0.1-0.0.19dev", - "@qdp/ide-cmp": "0.0.1-0.0.44dev", - "@qdp/localize": "0.0.1-0.0.14dev", - "@qdp/query-framework": "0.0.1-0.0.27dev", - "@qdp/search-join": "0.0.1-0.0.20dev", - "@qdp/spread": "0.0.1-0.0.34dev", - "bignumber.js": "^9.0.1", - "ngx-cookie-service": "^2.2.0", - "chalk": "2.4.2", - "date-fns": "2.6.0", - "lodash": "^4.17.10", - "moment": "^2.29.1", - "moment-timezone": "^0.5.33", - "prettier": "^1.18.2", - "rxjs": "~6.3.3", - "signature_pad": "^3.0.0-beta.4", - "dayjs": "1.10.3", - "vant": "3.0.3", - "vue": "3.0.5", - "vue-router": "4.0.3", - "reflect-metadata": "0.1.13", - "typescript": "3.2.4", - "tslib": "1.9.3" - }, - "devDependencies": { - "@babel/core": "^7.12.9", - "@babel/preset-env": "^7.12.7", - "@babel/preset-typescript": "^7.12.7", - "cross-env": "^7.0.3" - } -}