Commit b274d6c521c6fbe7d7cd15c0f0839500a1a2bdbb
1 parent
47a71b949c
Exists in
master
and in
6 other branches
还原
Showing 2 changed files with 14 additions and 187 deletions
platform-operate-api/pom.xml
View file @
b274d6c
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |
| 2 | +<project xmlns="http://maven.apache.org/POM/4.0.0" | |
| 3 | + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |
| 3 | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 4 | 5 | <parent> |
| 5 | - <groupId>com.lyms.core</groupId> | |
| 6 | 6 | <artifactId>regional-platform</artifactId> |
| 7 | + <groupId>com.lyms.core</groupId> | |
| 7 | 8 | <version>1.0.1</version> |
| 8 | 9 | </parent> |
| 9 | 10 | <modelVersion>4.0.0</modelVersion> |
| 10 | - <packaging>war</packaging> | |
| 11 | - <artifactId>platform-operate-api</artifactId> | |
| 11 | + <packaging>jar</packaging> | |
| 12 | + <artifactId>platform-reportData</artifactId> | |
| 12 | 13 | |
| 13 | 14 | <dependencies> |
| 14 | - <!--<dependency>--> | |
| 15 | - <!--<groupId>org.apache.httpcomponents</groupId>--> | |
| 16 | - <!--<artifactId>httpclient</artifactId>--> | |
| 17 | - <!--<version>4.5.2</version>--> | |
| 18 | - <!--</dependency>--> | |
| 19 | - | |
| 20 | - <!--<dependency>--> | |
| 21 | - <!--<groupId>commons-httpclient</groupId>--> | |
| 22 | - <!--<artifactId>commons-httpclient</artifactId>--> | |
| 23 | - <!--</dependency>--> | |
| 24 | 15 | <dependency> |
| 25 | - <groupId>com.aspose</groupId> | |
| 26 | - <artifactId>aspose-words</artifactId> | |
| 27 | - </dependency> | |
| 28 | - | |
| 29 | - <dependency> | |
| 30 | - <groupId>net.java.dev.jna</groupId> | |
| 31 | - <artifactId>jna</artifactId> | |
| 32 | - </dependency> | |
| 33 | - | |
| 34 | - <dependency> | |
| 35 | 16 | <groupId>com.lyms.core</groupId> |
| 36 | 17 | <artifactId>platform-common</artifactId> |
| 37 | - <version>${project.version}</version> | |
| 18 | + <version>1.0.1</version> | |
| 38 | 19 | </dependency> |
| 39 | 20 | <dependency> |
| 40 | - <groupId>com.lyms.core</groupId> | |
| 41 | - <artifactId>platform-dal</artifactId> | |
| 42 | - <version>${project.version}</version> | |
| 21 | + <groupId>com.oracle</groupId> | |
| 22 | + <artifactId>ojdbc14</artifactId> | |
| 23 | + <version>11.2.0.1.0</version> | |
| 43 | 24 | </dependency> |
| 44 | - <dependency> | |
| 45 | - <groupId>com.lyms.core</groupId> | |
| 46 | - <artifactId>platform-biz-service</artifactId> | |
| 47 | - <version>${project.version}</version> | |
| 48 | - </dependency> | |
| 49 | - <dependency> | |
| 50 | - <groupId>com.lyms.core</groupId> | |
| 51 | - <artifactId>platform-biz-patient-service</artifactId> | |
| 52 | - <version>${project.version}</version> | |
| 53 | - </dependency> | |
| 54 | - <dependency> | |
| 55 | - <groupId>com.lyms.core</groupId> | |
| 56 | - <artifactId>platform-reportData</artifactId> | |
| 57 | - <version>${project.version}</version> | |
| 58 | - </dependency> | |
| 59 | - <dependency> | |
| 60 | - <groupId>org.apache.activemq</groupId> | |
| 61 | - <artifactId>activemq-all</artifactId> | |
| 62 | - <version>${org.activemq.version}</version> | |
| 63 | - </dependency> | |
| 64 | - <dependency> | |
| 65 | - <groupId>javax.jms</groupId> | |
| 66 | - <artifactId>javax.jms-api</artifactId> | |
| 67 | - <version>2.0.1</version> | |
| 68 | - </dependency> | |
| 69 | - <dependency> | |
| 70 | - <groupId>org.springframework</groupId> | |
| 71 | - <artifactId>spring-jms</artifactId> | |
| 72 | - <version>${org.springframework.version}</version> | |
| 73 | - </dependency> | |
| 74 | - <dependency> | |
| 75 | - <groupId>org.apache.activemq</groupId> | |
| 76 | - <artifactId>activemq-core</artifactId> | |
| 77 | - <version>${org.activemq.version}</version> | |
| 78 | - </dependency> | |
| 79 | - <dependency> | |
| 80 | - <groupId>org.apache.activemq</groupId> | |
| 81 | - <artifactId>activemq-pool</artifactId> | |
| 82 | - <version>${org.activemq.version}</version> | |
| 83 | - </dependency> | |
| 84 | - <dependency> | |
| 85 | - <groupId>org.apache.commons</groupId> | |
| 86 | - <artifactId>commons-lang3</artifactId> | |
| 87 | - <version>3.4</version> | |
| 88 | - </dependency> | |
| 89 | - <dependency> | |
| 90 | - <groupId>org.eclipse.jetty</groupId> | |
| 91 | - <artifactId>jetty-servlets</artifactId> | |
| 92 | - <version>9.3.8.v20160314</version> | |
| 93 | - </dependency> | |
| 94 | - | |
| 95 | - <dependency> | |
| 96 | - <groupId>net.sourceforge.jexcelapi</groupId> | |
| 97 | - <artifactId>jxl</artifactId> | |
| 98 | - <version>2.6.12</version> | |
| 99 | - </dependency> | |
| 100 | - | |
| 101 | - <!-- https://mvnrepository.com/artifact/freemarker/freemarker --> | |
| 102 | - <!-- <dependency> | |
| 103 | - <groupId>freemarker</groupId> | |
| 104 | - <artifactId>freemarker</artifactId> | |
| 105 | - <version>2.3.9</version> | |
| 106 | - </dependency>--> | |
| 107 | - | |
| 108 | - | |
| 109 | - <!-- https://mvnrepository.com/artifact/ro.pippo/pippo-freemarker --> | |
| 110 | - <!-- <dependency> | |
| 111 | - <groupId>ro.pippo</groupId> | |
| 112 | - <artifactId>pippo-freemarker</artifactId> | |
| 113 | - <version>1.12.0</version> | |
| 114 | - </dependency>--> | |
| 115 | - | |
| 116 | 25 | </dependencies> |
| 117 | 26 | <build> |
| 118 | - <resources> | |
| 119 | - <resource> | |
| 120 | - <directory>../platform-resource/resources</directory> | |
| 121 | - <excludes> | |
| 122 | - <exclude> | |
| 123 | - **/* | |
| 124 | - </exclude> | |
| 125 | - </excludes> | |
| 126 | - <filtering>true</filtering> | |
| 127 | - </resource> | |
| 128 | - <resource> | |
| 129 | - <directory>src/main/resources</directory> | |
| 130 | - <includes> | |
| 131 | - <include>**/*</include> | |
| 132 | - </includes> | |
| 133 | - | |
| 134 | - </resource> | |
| 135 | - <!-- 设置对auto-config.properties，jdbc.properties进行过虑，即这些文件中的${key}会被替换掉为真正的值 --> | |
| 136 | - <!-- --> | |
| 137 | - <resource> | |
| 138 | - <directory>src/main/resources</directory> | |
| 139 | - <includes> | |
| 140 | - <include>database.properties</include> | |
| 141 | - </includes> | |
| 142 | - <filtering>true</filtering> | |
| 143 | - </resource> | |
| 144 | - </resources> | |
| 145 | 27 | <plugins> |
| 146 | 28 | <plugin> |
| 147 | 29 | <groupId>org.apache.maven.plugins</groupId> |
| 148 | 30 | |
| 149 | 31 | |
| 150 | 32 | |
| 151 | 33 | |
| ... | ... | @@ -149,66 +31,11 @@ |
| 149 | 31 | <configuration> |
| 150 | 32 | <source>1.7</source> |
| 151 | 33 | <target>1.7</target> |
| 152 | - <encoding>${maven.compiler.encoding}</encoding> | |
| 153 | 34 | </configuration> |
| 154 | 35 | </plugin> |
| 155 | - <plugin> | |
| 156 | - <groupId>org.apache.maven.plugins</groupId> | |
| 157 | - <artifactId>maven-resources-plugin</artifactId> | |
| 158 | - <version>2.6</version> | |
| 159 | - <configuration> | |
| 160 | - <encoding>${project.build.sourceEncoding}</encoding> | |
| 161 | - <!-- 指定编码格式，否则在DOS下运行mvn命令时当发生文件资源copy时将使用系统默认使用GBK编码 --> | |
| 162 | - </configuration> | |
| 163 | - </plugin> | |
| 164 | - | |
| 165 | - <!-- jetty插件 --> | |
| 166 | - <plugin> | |
| 167 | - <groupId>org.eclipse.jetty</groupId> | |
| 168 | - <artifactId>jetty-maven-plugin</artifactId> | |
| 169 | - <version>9.3.8.v20160314</version> | |
| 170 | - <configuration> | |
| 171 | - <httpConnector> | |
| 172 | - <port>9091</port> | |
| 173 | - </httpConnector> | |
| 174 | - <webAppConfig> | |
| 175 | - <contextPath>/</contextPath> | |
| 176 | - </webAppConfig> | |
| 177 | - </configuration> | |
| 178 | - </plugin> | |
| 179 | 36 | </plugins> |
| 180 | - <finalName>platform-operate-api</finalName> | |
| 37 | + <finalName>platform-mommyData</finalName> | |
| 181 | 38 | </build> |
| 182 | - <profiles> | |
| 183 | - <profile> | |
| 184 | - <id>dev</id> | |
| 185 | 39 | |
| 186 | - <!-- 默认激活开发配制，使用config-dev.properties来替换设置过虑的资源文件中的${key} --> | |
| 187 | - <activation> | |
| 188 | - <activeByDefault>true</activeByDefault> | |
| 189 | - </activation> | |
| 190 | - <build> | |
| 191 | - <filters> | |
| 192 | - <filter>../platform-resource/resources/config-dev.properties</filter> | |
| 193 | - </filters> | |
| 194 | - </build> | |
| 195 | - </profile> | |
| 196 | - <profile> | |
| 197 | - <id>test</id> | |
| 198 | - <build> | |
| 199 | - <filters> | |
| 200 | - <filter>../platform-resource/resources/config-test.properties</filter> | |
| 201 | - </filters> | |
| 202 | - </build> | |
| 203 | - </profile> | |
| 204 | - <profile> | |
| 205 | - <id>prod</id> | |
| 206 | - <build> | |
| 207 | - <filters> | |
| 208 | - <filter>../platform-resource/resources/config-product.properties</filter> | |
| 209 | - </filters> | |
| 210 | - </build> | |
| 211 | - </profile> | |
| 212 | - </profiles> | |
| 213 | 40 | </project> |
platform-reportData/pom.xml
View file @
b274d6c
| ... | ... | @@ -18,10 +18,10 @@ |
| 18 | 18 | <version>1.0.1</version> |
| 19 | 19 | </dependency> |
| 20 | 20 | <dependency> |
| 21 | - <groupId>com.oracle</groupId> | |
| 22 | - <artifactId>ojdbc14</artifactId> | |
| 23 | - <version>10.2.0.3.0</version> | |
| 24 | - </dependency> | |
| 21 | + <groupId>com.oracle</groupId> | |
| 22 | + <artifactId>ojdbc14</artifactId> | |
| 23 | + <version>11.2.0.1.0</version> | |
| 24 | + </dependency> | |
| 25 | 25 | </dependencies> |
| 26 | 26 | <build> |
| 27 | 27 | <plugins> |