Merge branch 'master' of http://nonxin.cn:8090/r/project/xnfg

354798ggg

2023-08-29 fd0c7c174d7b7313aa49061df05350405a3c1bf1

 product-server-web/pom.xml

@@ -21,29 +21,46 @@
            <activation>

                <activeByDefault>true</activeByDefault>

            </activation>



        </profile>



        <profile>

            <id>test</id>

            <properties>

                <profileActive>test</profileActive>

            </properties>

        </profile>



        <profile>

            <id>prod</id>

            <properties>

                <profileActive>prod</profileActive>

            </properties>

        </profile>



    </profiles>

    <dependencies>

        <!--西宁房管局业务模块-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-xining</artifactId>

        </dependency>

        <!--通用模块（util)-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-common</artifactId>

        </dependency>

        <!--数据源-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-datasource</artifactId>

        </dependency>

        <!--打印（word替换）-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-print</artifactId>

        </dependency>

        <!--util-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-util</artifactId>

@@ -69,59 +86,57 @@
            <groupId>com.lx</groupId>

            <artifactId>product-server-mq</artifactId>

        </dependency>

        <!--附件管理、文档管理-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-file</artifactId>

        </dependency>



        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-email</artifactId>

        </dependency>

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-lucene</artifactId>

        </dependency>

        <!-- release -->

        <!-- releases -->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-core</artifactId>

            <version>2.0.1</version>

        </dependency>

        <dependency>

            <groupId>com.sendgrid</groupId>

            <artifactId>sendgrid-java</artifactId>

            <version>4.0.1</version>

        </dependency>

        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-collections4</artifactId>

            <version>4.1</version>

        </dependency>

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-report</artifactId>

        </dependency>

        <!--数据导入导出-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-data-export-import</artifactId>

        </dependency>



        <!--开发工具-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-tool-dev</artifactId>

        </dependency>

        <!--流程建模-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-tool-flow</artifactId>

        </dependency>

        <!--功能建模-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-tool-mvc</artifactId>

        </dependency>

        <!-- 表单建模-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-tool-face</artifactId>

        </dependency>

        <!--数据建模-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-tool-table</artifactId>

        </dependency>

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-data-sync</artifactId>

        </dependency>

        <dependency>

            <groupId>com.lx</groupId>

@@ -143,11 +158,18 @@
            <groupId>com.lx</groupId>

            <artifactId>product-server-data-center</artifactId>

        </dependency>

        <dependency>

            <groupId>org.spring</groupId>

            <artifactId>spring-server-master</artifactId>

            <version>1.2.6.6</version>

        </dependency>



        <!--项目管理模块-->

        <!--   <dependency>-->

        <!--      <groupId>com.lx</groupId>-->

        <!--      <artifactId>product-project-server-base</artifactId>-->

        <!--      <version>1.0.0-SNAPSHOT</version>-->

        <!--   </dependency>-->

        <!--   <dependency>-->

        <!--      <groupId>com.lx</groupId>-->

        <!--      <artifactId>product-project-server-contract</artifactId>-->

        <!--      <version>1.0.0-SNAPSHOT</version>-->

        <!--   </dependency>-->

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-customer</artifactId>

@@ -157,8 +179,19 @@
            <artifactId>product-server-task</artifactId>

        </dependency>

        <dependency>

            <groupId>com.lx</groupId>

            <artifactId>product-server-xining</artifactId>

            <groupId>org.spring</groupId>

            <artifactId>spring-server-master</artifactId>

        </dependency>



        <dependency>

            <groupId>com.sendgrid</groupId>

            <artifactId>sendgrid-java</artifactId>

            <version>4.0.1</version>

        </dependency>

        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-collections4</artifactId>

            <version>4.1</version>

        </dependency>

    </dependencies>

    <build>

@@ -276,12 +309,12 @@
                            <goal>run</goal>

                        </goals>

                        <configuration>

                            <target description="run the bat">

                            <!-- <target description="run the bat">

                                <echo>开始运行packed.bat命令行</echo>

                                <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe">

                               <exec dir="D:/product/lxworkspaces/product-web" executable="cmd.exe">

                                    <arg line="packed.bat"></arg>

                                </exec>

                            </target>

                            </target> -->

                        </configuration>

                    </execution>

                </executions>

@@ -295,15 +328,15 @@
                        <id>copy</id>

                        <phase>package</phase>

                        <configuration>

                        <!--

                            <tasks>

                                <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/lib">

                                <copy todir="D:/product/workspace/product-server-install/resources/product-server/lib">

                                    <fileset dir="${project.build.directory}/lib">

                                        <include name="*.jar"/>

                                        <exclude name="product-server-core-1.0.0-SNAPSHOT.jar"/>

                                        <exclude name="product-server-core-2.0.0-SNAPSHOT.jar"/>

                                    </fileset>

                                </copy>

                                <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/resources">

                                <copy todir="D:/product/workspace/product-server-install/resources/product-server/resources">

                                    <fileset dir="${project.build.directory}/resources">

                                        <include name="application-prod.properties"/>

                                        <include name="cache-prod.properties"/>

@@ -311,16 +344,16 @@
                                        <include name="*.xml"/>

                                    </fileset>

                                </copy>

                                <copy todir="D:/product/lxworkspaces/product-server-install/resources/product-server/web">

                                    <fileset dir="D:/product/lxworkspaces/product-web/dist">

                                        <include name="*.*"/>

                                    </fileset>

                                </copy>

                                <copy file="${project.build.directory}/product-server-web-1.0.0-SNAPSHOT.jar"

                                      tofile="D:/product/lxworkspaces/product-server-install/resources/product-server/product-server-web-1.0.0-SNAPSHOT.jar"

                                <!--                                <copy todir="D:/product/workspace/product-server-install/resources/product-server/webapp/web">-->

                                <!--                                    <fileset dir="D:/product/workspace3.0/WEB/V3.0.0/dist">-->

                                <!--                                        <include name="*.*"/>-->

                                <!--                                    </fileset>-->

                                <!--                                </copy>-->

                                <copy file="${project.build.directory}/product-server-web-2.0.0-release.jar"

                                      tofile="D:/product/workspace/product-server-install/resources/product-server/product-server-web-2.0.0-release.jar"

                                      overwrite="true"/>

                            </tasks>

                     -->



                        </configuration>

                        <goals>

                            <goal>run</goal>