Skip to content

李希虎 / ODM

Go to a project
Toggle navigation
Toggle navigation pinning
8f78e57c by 荆蔚杰
Options

电子证照接口

1 parent 5fe3bd99
Inline Side-by-side
Showing 38 changed files with 1442 additions and 1144 deletions
1 <?xml version="1.0" encoding="UTF-8"?> 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 3 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4 <modelVersion>4.0.0</modelVersion> 4 <modelVersion>4.0.0</modelVersion>
5 5
6 <groupId>com.thinkgem.jeesite</groupId> 6 <groupId>com.thinkgem.jeesite</groupId>
7 <artifactId>ODM</artifactId> 7 <artifactId>ODM</artifactId>
8 <version>1.0</version> 8 <version>1.0</version>
9 <packaging>war</packaging> 9 <packaging>war</packaging>
10 10
11 <name>ODM</name> 11 <name>ODM</name>
12 <url>#</url> 12 <url>#</url>
13 <inceptionYear>2015-2018</inceptionYear> 13 <inceptionYear>2015-2018</inceptionYear>
14 14
15 <!-- 项目属性 --> 15 <!-- 项目属性 -->
16 <properties> 16 <properties>
17 17
18 <!-- main version setting --> 18 <!-- main version setting -->
19 <spring.version>4.0.8.RELEASE</spring.version> 19 <spring.version>4.0.8.RELEASE</spring.version>
20 <validator.version>5.1.1.Final</validator.version> 20 <validator.version>5.1.1.Final</validator.version>
21 <mybatis.version>3.2.8</mybatis.version> 21 <mybatis.version>3.2.8</mybatis.version>
22 <mybatis-spring.version>1.2.2</mybatis-spring.version> 22 <mybatis-spring.version>1.2.2</mybatis-spring.version>
23 <druid.version>1.0.11</druid.version> 23 <druid.version>1.0.11</druid.version>
24 <ehcache.version>2.6.9</ehcache.version> 24 <ehcache.version>2.6.9</ehcache.version>
25 <ehcache-web.version>2.0.4</ehcache-web.version> 25 <ehcache-web.version>2.0.4</ehcache-web.version>
26 <shiro.version>1.2.3</shiro.version> 26 <shiro.version>1.2.3</shiro.version>
27 <sitemesh.version>2.4.2</sitemesh.version> 27 <sitemesh.version>2.4.2</sitemesh.version>
28 <activiti.version>5.15.1</activiti.version> 28 <activiti.version>5.15.1</activiti.version>
29 29
30 <!-- tools version setting --> 30 <!-- tools version setting -->
31 <slf4j.version>1.7.7</slf4j.version> 31 <slf4j.version>1.7.7</slf4j.version>
32 <commons-lang3.version>3.3.2</commons-lang3.version> 32 <commons-lang3.version>3.3.2</commons-lang3.version>
33 <commons-io.version>2.4</commons-io.version> 33 <commons-io.version>2.4</commons-io.version>
34 <commons-codec.version>1.9</commons-codec.version> 34 <commons-codec.version>1.9</commons-codec.version>
35 <commons-fileupload.version>1.3.1</commons-fileupload.version> 35 <commons-fileupload.version>1.3.1</commons-fileupload.version>
36 <commons-beanutils.version>1.9.1</commons-beanutils.version> 36 <commons-beanutils.version>1.9.1</commons-beanutils.version>
37 <jackson.version>2.2.3</jackson.version> 37 <jackson.version>2.2.3</jackson.version>
38 <fastjson.version>1.1.40</fastjson.version> 38 <fastjson.version>1.1.40</fastjson.version>
39 <xstream.version>1.4.7</xstream.version> 39 <xstream.version>1.4.7</xstream.version>
40 <guava.version>17.0</guava.version> 40 <guava.version>17.0</guava.version>
41 <dozer.version>5.5.1</dozer.version> 41 <dozer.version>5.5.1</dozer.version>
42 <poi.version>3.9</poi.version> 42 <poi.version>3.9</poi.version>
43 <freemarker.version>2.3.20</freemarker.version> 43 <freemarker.version>2.3.20</freemarker.version>
44 44
45 <!-- jdbc driver setting --> 45 <!-- jdbc driver setting -->
46 <mysql.driver.version>5.1.30</mysql.driver.version> 46 <mysql.driver.version>5.1.30</mysql.driver.version>
47 <oracle.driver.version>10.2.0.4.0</oracle.driver.version> 47 <oracle.driver.version>10.2.0.4.0</oracle.driver.version>
48 <mssql.driver.version>1.3.1</mssql.driver.version> 48 <mssql.driver.version>1.3.1</mssql.driver.version>
49 49
50 <!-- environment setting --> 50 <!-- environment setting -->
51 <jdk.version>1.7</jdk.version> 51 <jdk.version>1.7</jdk.version>
52 <tomcat.version>2.2</tomcat.version> 52 <tomcat.version>2.2</tomcat.version>
53 <jetty.version>7.6.14.v20131031</jetty.version> 53 <jetty.version>7.6.14.v20131031</jetty.version>
54 <webserver.port>8080</webserver.port> 54 <webserver.port>8080</webserver.port>
55 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 55 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56 <downloadSources>true</downloadSources> 56 <downloadSources>true</downloadSources>
57 57
58 </properties> 58 </properties>
59 59
60 <!-- 设定主仓库，按设定顺序进行查找。 --> 60 <!-- 设定主仓库，按设定顺序进行查找。 -->
61 <repositories> 61 <repositories>
62 62
63 <!-- 如有Nexus私服, 取消注释并指向正确的服务器地址. 63 <!-- 如有Nexus私服, 取消注释并指向正确的服务器地址.
64 <repository> 64 <repository>
65 <id>nexus-repos</id> 65 <id>nexus-repos</id>
66 <name>Team Nexus Repository</name> 66 <name>Team Nexus Repository</name>
67 <url>http://192.168.11.36:8888/nexus/content/groups/public</url> 67 <url>http://192.168.11.36:8888/nexus/content/groups/public</url>
68 </repository> --> 68 </repository> -->
69 69
70 <!--<repository>--> 70 <!--<repository>-->
71 <!-- <id>oschina-repos</id>--> 71 <!-- <id>oschina-repos</id>-->
72 <!-- <name>Oschina Releases</name>--> 72 <!-- <name>Oschina Releases</name>-->
73 <!-- <url>http://maven.oschina.net/content/groups/public</url>--> 73 <!-- <url>http://maven.oschina.net/content/groups/public</url>-->
74 <!--</repository>--> 74 <!--</repository>-->
75 75
76 <!--<repository>--> 76 <!--<repository>-->
77 <!-- <id>java-repos</id>--> 77 <!-- <id>java-repos</id>-->
78 <!-- <name>Java Repository</name>--> 78 <!-- <name>Java Repository</name>-->
79 <!-- <url>http://download.java.net/maven/2/</url>--> 79 <!-- <url>http://download.java.net/maven/2/</url>-->
80 <!--</repository>--> 80 <!--</repository>-->
81 81
82 <!--<repository>--> 82 <!--<repository>-->
83 <!-- <id>springsource-repos</id>--> 83 <!-- <id>springsource-repos</id>-->
84 <!-- <name>SpringSource Repository</name>--> 84 <!-- <name>SpringSource Repository</name>-->
85 <!-- <url>http://repo.spring.io/release/</url>--> 85 <!-- <url>http://repo.spring.io/release/</url>-->
86 <!--</repository>--> 86 <!--</repository>-->
87 87
88 <!--<repository>--> 88 <!--<repository>-->
89 <!-- <id>central-repos</id>--> 89 <!-- <id>central-repos</id>-->
90 <!-- <name>Central Repository</name>--> 90 <!-- <name>Central Repository</name>-->
91 <!-- <url>http://repo.maven.apache.org/maven2</url>--> 91 <!-- <url>http://repo.maven.apache.org/maven2</url>-->
92 <!--</repository>--> 92 <!--</repository>-->
93 93
94 <!--<repository>--> 94 <!--<repository>-->
95 <!-- <id>central-repos2</id>--> 95 <!-- <id>central-repos2</id>-->
96 <!-- <name>Central Repository 2</name>--> 96 <!-- <name>Central Repository 2</name>-->
97 <!-- <url>http://repo1.maven.org/maven2/</url>--> 97 <!-- <url>http://repo1.maven.org/maven2/</url>-->
98 <!--</repository>--> 98 <!--</repository>-->
99 99
100 <!--<repository>--> 100 <!--<repository>-->
101 <!-- <id>activiti-repos</id>--> 101 <!-- <id>activiti-repos</id>-->
102 <!-- <name>Activiti Repository</name>--> 102 <!-- <name>Activiti Repository</name>-->
103 <!-- <url>https://maven.alfresco.com/nexus/content/groups/public</url>--> 103 <!-- <url>https://maven.alfresco.com/nexus/content/groups/public</url>-->
104 <!--</repository>--> 104 <!--</repository>-->
105 105
106 <!--<repository>--> 106 <!--<repository>-->
107 <!-- <id>activiti-repos2</id>--> 107 <!-- <id>activiti-repos2</id>-->
108 <!-- <name>Activiti Repository 2</name>--> 108 <!-- <name>Activiti Repository 2</name>-->
109 <!-- <url>https://app.camunda.com/nexus/content/groups/public</url>--> 109 <!-- <url>https://app.camunda.com/nexus/content/groups/public</url>-->
110 <!--</repository>--> 110 <!--</repository>-->
111 111
112 <!--<repository> --> 112 <!--<repository> -->
113 <!-- <id>thinkgem-repos</id> --> 113 <!-- <id>thinkgem-repos</id> -->
114 <!-- <name>ThinkGem Repository</name>--> 114 <!-- <name>ThinkGem Repository</name>-->
115 <!-- <url>http://git.oschina.net/thinkgem/repos/raw/master</url>--> 115 <!-- <url>http://git.oschina.net/thinkgem/repos/raw/master</url>-->
116 <!--</repository>--> 116 <!--</repository>-->
117 117
118 <!--<repository> --> 118 <!--<repository> -->
119 <!-- <id>thinkgem-repos2</id> --> 119 <!-- <id>thinkgem-repos2</id> -->
120 <!-- <name>ThinkGem Repository 2</name>--> 120 <!-- <name>ThinkGem Repository 2</name>-->
121 <!-- <url>https://raw.github.com/thinkgem/repository/master</url>--> 121 <!-- <url>https://raw.github.com/thinkgem/repository/master</url>-->
122 <!--</repository>--> 122 <!--</repository>-->
123 123
124 </repositories> 124 </repositories>
125 125
126 <!-- 设定插件仓库 --> 126 <!-- 设定插件仓库 -->
127 <pluginRepositories> 127 <pluginRepositories>
128 128
129 <!-- 如有Nexus私服, 取消注释并指向正确的服务器地址. 129 <!-- 如有Nexus私服, 取消注释并指向正确的服务器地址.
130 <pluginRepository> 130 <pluginRepository>
131 <id>nexus-repos</id> 131 <id>nexus-repos</id>
132 <name>Team Nexus Repository</name> 132 <name>Team Nexus Repository</name>
133 <url>http://192.168.11.36:8888/nexus/content/groups/public</url> 133 <url>http://192.168.11.36:8888/nexus/content/groups/public</url>
134 </pluginRepository> --> 134 </pluginRepository> -->
135 135
136 <!--<pluginRepository>--> 136 <!--<pluginRepository>-->
137 <!-- <id>oschina-repos</id>--> 137 <!-- <id>oschina-repos</id>-->
138 <!-- <name>Oschina Releases</name>--> 138 <!-- <name>Oschina Releases</name>-->
139 <!-- <url>http://maven.oschina.net/content/groups/public</url>--> 139 <!-- <url>http://maven.oschina.net/content/groups/public</url>-->
140 <!--</pluginRepository>--> 140 <!--</pluginRepository>-->
141 141
142 </pluginRepositories> 142 </pluginRepositories>
143 143
144 <!-- 依赖项定义 --> 144 <!-- 依赖项定义 -->
145 <dependencies> 145 <dependencies>
146 <!-- config redis data and client jar--> 146 <!-- config redis data and client jar-->
147 <dependency> 147 <dependency>
148 <groupId>org.springframework.data</groupId> 148 <groupId>org.springframework.data</groupId>
149 <artifactId>spring-data-redis</artifactId> 149 <artifactId>spring-data-redis</artifactId>
150 <version>1.6.0.RELEASE</version> 150 <version>1.6.0.RELEASE</version>
151 </dependency> 151 </dependency>
152 152
153 <!-- SPRING begin --> 153 <!-- SPRING begin -->
154 <dependency> 154 <dependency>
155 <groupId>org.springframework</groupId> 155 <groupId>org.springframework</groupId>
156 <artifactId>spring-core</artifactId> 156 <artifactId>spring-core</artifactId>
157 <version>${spring.version}</version> 157 <version>${spring.version}</version>
158 <exclusions> 158 <exclusions>
159 <exclusion> 159 <exclusion>
160 <groupId>commons-logging</groupId> 160 <groupId>commons-logging</groupId>
161 <artifactId>commons-logging</artifactId> 161 <artifactId>commons-logging</artifactId>
162 </exclusion> 162 </exclusion>
163 </exclusions> 163 </exclusions>
164 </dependency> 164 </dependency>
165 <dependency> 165 <dependency>
166 <groupId>org.springframework</groupId> 166 <groupId>org.springframework</groupId>
167 <artifactId>spring-beans</artifactId> 167 <artifactId>spring-beans</artifactId>
168 <version>${spring.version}</version> 168 <version>${spring.version}</version>
169 </dependency> 169 </dependency>
170 <dependency> 170 <dependency>
171 <groupId>org.springframework</groupId> 171 <groupId>org.springframework</groupId>
172 <artifactId>spring-context</artifactId> 172 <artifactId>spring-context</artifactId>
173 <version>${spring.version}</version> 173 <version>${spring.version}</version>
174 </dependency> 174 </dependency>
175 <dependency> 175 <dependency>
176 <groupId>org.springframework</groupId> 176 <groupId>org.springframework</groupId>
177 <artifactId>spring-context-support</artifactId> 177 <artifactId>spring-context-support</artifactId>
178 <version>${spring.version}</version> 178 <version>${spring.version}</version>
179 </dependency> 179 </dependency>
180 <dependency> 180 <dependency>
181 <groupId>org.springframework</groupId> 181 <groupId>org.springframework</groupId>
182 <artifactId>spring-aop</artifactId> 182 <artifactId>spring-aop</artifactId>
183 <version>${spring.version}</version> 183 <version>${spring.version}</version>
184 <exclusions> 184 <exclusions>
185 <exclusion> 185 <exclusion>
186 <groupId>commons-logging</groupId> 186 <groupId>commons-logging</groupId>
187 <artifactId>commons-logging</artifactId> 187 <artifactId>commons-logging</artifactId>
188 </exclusion> 188 </exclusion>
189 </exclusions> 189 </exclusions>
190 </dependency> 190 </dependency>
191 <dependency> 191 <dependency>
192 <groupId>org.springframework</groupId> 192 <groupId>org.springframework</groupId>
193 <artifactId>spring-tx</artifactId> 193 <artifactId>spring-tx</artifactId>
194 <version>${spring.version}</version> 194 <version>${spring.version}</version>
195 </dependency> 195 </dependency>
196 196
197 <!-- spring orm --> 197 <!-- spring orm -->
198 <dependency> 198 <dependency>
199 <groupId>org.springframework</groupId> 199 <groupId>org.springframework</groupId>
200 <artifactId>spring-orm</artifactId> 200 <artifactId>spring-orm</artifactId>
201 <version>${spring.version}</version> 201 <version>${spring.version}</version>
202 </dependency> 202 </dependency>
203 <dependency> 203 <dependency>
204 <groupId>org.springframework</groupId> 204 <groupId>org.springframework</groupId>
205 <artifactId>spring-jdbc</artifactId> 205 <artifactId>spring-jdbc</artifactId>
206 <version>${spring.version}</version> 206 <version>${spring.version}</version>
207 </dependency> 207 </dependency>
208 208
209 <!-- bean validate --> 209 <!-- bean validate -->
210 <dependency> 210 <dependency>
211 <groupId>org.hibernate</groupId> 211 <groupId>org.hibernate</groupId>
212 <artifactId>hibernate-validator</artifactId> 212 <artifactId>hibernate-validator</artifactId>
213 <version>${validator.version}</version> 213 <version>${validator.version}</version>
214 </dependency> 214 </dependency>
215 <!-- SPRING end --> 215 <!-- SPRING end -->
216 216
217 <!-- AOP begin --> 217 <!-- AOP begin -->
218 <dependency> 218 <dependency>
219 <groupId>org.aspectj</groupId> 219 <groupId>org.aspectj</groupId>
220 <artifactId>aspectjrt</artifactId> 220 <artifactId>aspectjrt</artifactId>
221 <version>1.7.4</version> 221 <version>1.7.4</version>
222 </dependency> 222 </dependency>
223 <dependency> 223 <dependency>
224 <groupId>org.aspectj</groupId> 224 <groupId>org.aspectj</groupId>
225 <artifactId>aspectjweaver</artifactId> 225 <artifactId>aspectjweaver</artifactId>
226 <version>1.7.4</version> 226 <version>1.7.4</version>
227 </dependency> 227 </dependency>
228 <dependency> 228 <dependency>
229 <groupId>cglib</groupId> 229 <groupId>cglib</groupId>
230 <artifactId>cglib</artifactId> 230 <artifactId>cglib</artifactId>
231 <version>3.1</version> 231 <version>3.1</version>
232 </dependency> 232 </dependency>
233 <!-- AOP end --> 233 <!-- AOP end -->
234 234
235 <!-- PERSISTENCE begin --> 235 <!-- PERSISTENCE begin -->
236 236
237 <!-- MyBatis --> 237 <!-- MyBatis -->
238 <dependency> 238 <dependency>
239 <groupId>org.mybatis</groupId> 239 <groupId>org.mybatis</groupId>
240 <artifactId>mybatis</artifactId> 240 <artifactId>mybatis</artifactId>
241 <version>${mybatis.version}</version> 241 <version>${mybatis.version}</version>
242 </dependency> 242 </dependency>
243 <dependency> 243 <dependency>
244 <groupId>org.mybatis</groupId> 244 <groupId>org.mybatis</groupId>
245 <artifactId>mybatis-spring</artifactId> 245 <artifactId>mybatis-spring</artifactId>
246 <version>${mybatis-spring.version}</version> 246 <version>${mybatis-spring.version}</version>
247 </dependency> 247 </dependency>
248 248
249 <!-- connection pool --> 249 <!-- connection pool -->
250 <dependency> 250 <dependency>
251 <groupId>com.alibaba</groupId> 251 <groupId>com.alibaba</groupId>
252 <artifactId>druid</artifactId> 252 <artifactId>druid</artifactId>
253 <version>${druid.version}</version> 253 <version>${druid.version}</version>
254 </dependency> 254 </dependency>
255 255
256 <!-- jdbc driver --> 256 <!-- jdbc driver -->
257 <dependency> 257 <dependency>
258 <groupId>mysql</groupId> 258 <groupId>mysql</groupId>
259 <artifactId>mysql-connector-java</artifactId> 259 <artifactId>mysql-connector-java</artifactId>
260 <version>${mysql.driver.version}</version> 260 <version>${mysql.driver.version}</version>
261 <scope>runtime</scope> 261 <scope>runtime</scope>
262 </dependency> 262 </dependency>
263 <dependency> 263 <dependency>
264 <groupId>com.oracle</groupId> 264 <groupId>com.oracle</groupId>
265 <artifactId>ojdbc14</artifactId> 265 <artifactId>ojdbc14</artifactId>
266 <version>${oracle.driver.version}</version> 266 <version>${oracle.driver.version}</version>
267 <scope>runtime</scope> 267 <scope>runtime</scope>
268 </dependency> 268 </dependency>
269 <dependency> 269 <dependency>
270 <groupId>net.sourceforge.jtds</groupId> 270 <groupId>net.sourceforge.jtds</groupId>
271 <artifactId>jtds</artifactId> 271 <artifactId>jtds</artifactId>
272 <version>${mssql.driver.version}</version> 272 <version>${mssql.driver.version}</version>
273 <scope>runtime</scope> 273 <scope>runtime</scope>
274 </dependency> 274 </dependency>
275 <!-- PERSISTENCE end --> 275 <!-- PERSISTENCE end -->
276 276
277 <!-- WEB begin --> 277 <!-- WEB begin -->
278 <dependency> 278 <dependency>
279 <groupId>org.springframework</groupId> 279 <groupId>org.springframework</groupId>
280 <artifactId>spring-web</artifactId> 280 <artifactId>spring-web</artifactId>
281 <version>${spring.version}</version> 281 <version>${spring.version}</version>
282 </dependency> 282 </dependency>
283 <dependency> 283 <dependency>
284 <groupId>org.springframework</groupId> 284 <groupId>org.springframework</groupId>
285 <artifactId>spring-webmvc</artifactId> 285 <artifactId>spring-webmvc</artifactId>
286 <version>${spring.version}</version> 286 <version>${spring.version}</version>
287 </dependency> 287 </dependency>
288 <dependency> 288 <dependency>
289 <groupId>org.springframework</groupId> 289 <groupId>org.springframework</groupId>
290 <artifactId>spring-oxm</artifactId> 290 <artifactId>spring-oxm</artifactId>
291 <version>${spring.version}</version> 291 <version>${spring.version}</version>
292 </dependency> 292 </dependency>
293 <dependency> 293 <dependency>
294 <groupId>opensymphony</groupId> 294 <groupId>opensymphony</groupId>
295 <artifactId>sitemesh</artifactId> 295 <artifactId>sitemesh</artifactId>
296 <version>${sitemesh.version}</version> 296 <version>${sitemesh.version}</version>
297 </dependency> 297 </dependency>
298 <dependency> 298 <dependency>
299 <groupId>taglibs</groupId> 299 <groupId>taglibs</groupId>
300 <artifactId>standard</artifactId> 300 <artifactId>standard</artifactId>
301 <version>1.1.2</version> 301 <version>1.1.2</version>
302 <type>jar</type> 302 <type>jar</type>
303 </dependency> 303 </dependency>
304 <dependency> 304 <dependency>
305 <groupId>javax.servlet</groupId> 305 <groupId>javax.servlet</groupId>
306 <artifactId>jstl</artifactId> 306 <artifactId>jstl</artifactId>
307 <version>1.2</version> 307 <version>1.2</version>
308 <type>jar</type> 308 <type>jar</type>
309 </dependency> 309 </dependency>
310 <dependency> 310 <dependency>
311 <groupId>javax.servlet</groupId> 311 <groupId>javax.servlet</groupId>
312 <artifactId>servlet-api</artifactId> 312 <artifactId>servlet-api</artifactId>
313 <version>2.5</version> 313 <version>2.5</version>
314 <scope>provided</scope> 314 <scope>provided</scope>
315 </dependency> 315 </dependency>
316 <dependency> 316 <dependency>
317 <groupId>javax.servlet.jsp</groupId> 317 <groupId>javax.servlet.jsp</groupId>
318 <artifactId>jsp-api</artifactId> 318 <artifactId>jsp-api</artifactId>
319 <version>2.1</version> 319 <version>2.1</version>
320 <scope>provided</scope> 320 <scope>provided</scope>
321 </dependency> 321 </dependency>
322 <dependency> 322 <dependency>
323 <groupId>org.apache.axis</groupId> 323 <groupId>org.apache.axis</groupId>
324 <artifactId>axis</artifactId> 324 <artifactId>axis</artifactId>
325 <version>1.4</version> 325 <version>1.4</version>
326 <type>jar</type> 326 <type>jar</type>
327 <scope>compile</scope> 327 <scope>compile</scope>
328 </dependency> 328 </dependency>
329 <!-- <dependency> 329 <!-- <dependency>
330 <groupId>javax.servlet</groupId> 330 <groupId>javax.servlet</groupId>
331 <artifactId>javax.servlet-api</artifactId> 331 <artifactId>javax.servlet-api</artifactId>
332 <version>3.0.1</version> 332 <version>3.0.1</version>
...@@ -338,438 +338,438 @@ ...@@ -338,438 +338,438 @@
338 <version>2.2</version> 338 <version>2.2</version>
339 <scope>provided</scope> 339 <scope>provided</scope>
340 </dependency> --> 340 </dependency> -->
341 <!-- WEB end --> 341 <!-- WEB end -->
342 342
343 <!-- CACHE begin --> 343 <!-- CACHE begin -->
344 <dependency> 344 <dependency>
345 <groupId>net.sf.ehcache</groupId> 345 <groupId>net.sf.ehcache</groupId>
346 <artifactId>ehcache-core</artifactId> 346 <artifactId>ehcache-core</artifactId>
347 <version>${ehcache.version}</version> 347 <version>${ehcache.version}</version>
348 </dependency> 348 </dependency>
349 <dependency> 349 <dependency>
350 <groupId>net.sf.ehcache</groupId> 350 <groupId>net.sf.ehcache</groupId>
351 <artifactId>ehcache-web</artifactId> 351 <artifactId>ehcache-web</artifactId>
352 <version>${ehcache-web.version}</version> 352 <version>${ehcache-web.version}</version>
353 </dependency> 353 </dependency>
354 <dependency> 354 <dependency>
355 <groupId>redis.clients</groupId> 355 <groupId>redis.clients</groupId>
356 <artifactId>jedis</artifactId> 356 <artifactId>jedis</artifactId>
357 <version>2.5.1</version> 357 <version>2.5.1</version>
358 </dependency> 358 </dependency>
359 <!-- CACHE end --> 359 <!-- CACHE end -->
360 360
361 <!-- SECURITY begin --> 361 <!-- SECURITY begin -->
362 <dependency> 362 <dependency>
363 <groupId>org.apache.shiro</groupId> 363 <groupId>org.apache.shiro</groupId>
364 <artifactId>shiro-core</artifactId> 364 <artifactId>shiro-core</artifactId>
365 <version>${shiro.version}</version> 365 <version>${shiro.version}</version>
366 </dependency> 366 </dependency>
367 <dependency> 367 <dependency>
368 <groupId>org.apache.shiro</groupId> 368 <groupId>org.apache.shiro</groupId>
369 <artifactId>shiro-spring</artifactId> 369 <artifactId>shiro-spring</artifactId>
370 <version>${shiro.version}</version> 370 <version>${shiro.version}</version>
371 </dependency> 371 </dependency>
372 <dependency> 372 <dependency>
373 <groupId>org.apache.shiro</groupId> 373 <groupId>org.apache.shiro</groupId>
374 <artifactId>shiro-cas</artifactId> 374 <artifactId>shiro-cas</artifactId>
375 <version>${shiro.version}</version> 375 <version>${shiro.version}</version>
376 <exclusions> 376 <exclusions>
377 <exclusion> 377 <exclusion>
378 <groupId>commons-logging</groupId> 378 <groupId>commons-logging</groupId>
379 <artifactId>commons-logging</artifactId> 379 <artifactId>commons-logging</artifactId>
380 </exclusion> 380 </exclusion>
381 </exclusions> 381 </exclusions>
382 </dependency> 382 </dependency>
383 <dependency> 383 <dependency>
384 <groupId>org.apache.shiro</groupId> 384 <groupId>org.apache.shiro</groupId>
385 <artifactId>shiro-web</artifactId> 385 <artifactId>shiro-web</artifactId>
386 <version>${shiro.version}</version> 386 <version>${shiro.version}</version>
387 </dependency> 387 </dependency>
388 <dependency> 388 <dependency>
389 <groupId>org.apache.shiro</groupId> 389 <groupId>org.apache.shiro</groupId>
390 <artifactId>shiro-ehcache</artifactId> 390 <artifactId>shiro-ehcache</artifactId>
391 <version>${shiro.version}</version> 391 <version>${shiro.version}</version>
392 </dependency> 392 </dependency>
393 <!-- SECURITY end --> 393 <!-- SECURITY end -->
394 394
395 <!-- Activiti --> 395 <!-- Activiti -->
396 <dependency> 396 <dependency>
397 <groupId>org.activiti</groupId> 397 <groupId>org.activiti</groupId>
398 <artifactId>activiti-engine</artifactId> 398 <artifactId>activiti-engine</artifactId>
399 <version>${activiti.version}</version> 399 <version>${activiti.version}</version>
400 </dependency> 400 </dependency>
401 <dependency> 401 <dependency>
402 <groupId>org.activiti</groupId> 402 <groupId>org.activiti</groupId>
403 <artifactId>activiti-spring</artifactId> 403 <artifactId>activiti-spring</artifactId>
404 <version>${activiti.version}</version> 404 <version>${activiti.version}</version>
405 </dependency> 405 </dependency>
406 <dependency> 406 <dependency>
407 <groupId>org.activiti</groupId> 407 <groupId>org.activiti</groupId>
408 <artifactId>activiti-explorer</artifactId> 408 <artifactId>activiti-explorer</artifactId>
409 <version>${activiti.version}</version> 409 <version>${activiti.version}</version>
410 <exclusions> 410 <exclusions>
411 <exclusion> 411 <exclusion>
412 <artifactId>vaadin</artifactId> 412 <artifactId>vaadin</artifactId>
413 <groupId>com.vaadin</groupId> 413 <groupId>com.vaadin</groupId>
414 </exclusion> 414 </exclusion>
415 <exclusion> 415 <exclusion>
416 <artifactId>dcharts-widget</artifactId> 416 <artifactId>dcharts-widget</artifactId>
417 <groupId>org.vaadin.addons</groupId> 417 <groupId>org.vaadin.addons</groupId>
418 </exclusion> 418 </exclusion>
419 <exclusion> 419 <exclusion>
420 <artifactId>activiti-simple-workflow</artifactId> 420 <artifactId>activiti-simple-workflow</artifactId>
421 <groupId>org.activiti</groupId> 421 <groupId>org.activiti</groupId>
422 </exclusion> 422 </exclusion>
423 </exclusions> 423 </exclusions>
424 </dependency> 424 </dependency>
425 <dependency> 425 <dependency>
426 <groupId>org.activiti</groupId> 426 <groupId>org.activiti</groupId>
427 <artifactId>activiti-modeler</artifactId> 427 <artifactId>activiti-modeler</artifactId>
428 <version>${activiti.version}</version> 428 <version>${activiti.version}</version>
429 </dependency> 429 </dependency>
430 <dependency> 430 <dependency>
431 <groupId>org.activiti</groupId> 431 <groupId>org.activiti</groupId>
432 <artifactId>activiti-diagram-rest</artifactId> 432 <artifactId>activiti-diagram-rest</artifactId>
433 <version>${activiti.version}</version> 433 <version>${activiti.version}</version>
434 </dependency> 434 </dependency>
435 435
436 <!-- 支持activiti缓存 --> 436 <!-- 支持activiti缓存 -->
437 <!-- <dependency> 437 <!-- <dependency>
438 <groupId>org.infinispan</groupId> 438 <groupId>org.infinispan</groupId>
439 <artifactId>infinispan-core</artifactId> 439 <artifactId>infinispan-core</artifactId>
440 <version>5.1.7.Final</version> 440 <version>5.1.7.Final</version>
441 </dependency> --> 441 </dependency> -->
442 442
443 <!-- LOGGING begin --> 443 <!-- LOGGING begin -->
444 <dependency> 444 <dependency>
445 <groupId>org.slf4j</groupId> 445 <groupId>org.slf4j</groupId>
446 <artifactId>slf4j-api</artifactId> 446 <artifactId>slf4j-api</artifactId>
447 <version>${slf4j.version}</version> 447 <version>${slf4j.version}</version>
448 </dependency> 448 </dependency>
449 <dependency> 449 <dependency>
450 <groupId>org.slf4j</groupId> 450 <groupId>org.slf4j</groupId>
451 <artifactId>slf4j-log4j12</artifactId> 451 <artifactId>slf4j-log4j12</artifactId>
452 <version>${slf4j.version}</version> 452 <version>${slf4j.version}</version>
453 </dependency> 453 </dependency>
454 <!-- common-logging 实际调用slf4j --> 454 <!-- common-logging 实际调用slf4j -->
455 <dependency> 455 <dependency>
456 <groupId>org.slf4j</groupId> 456 <groupId>org.slf4j</groupId>
457 <artifactId>jcl-over-slf4j</artifactId> 457 <artifactId>jcl-over-slf4j</artifactId>
458 <version>${slf4j.version}</version> 458 <version>${slf4j.version}</version>
459 </dependency> 459 </dependency>
460 <!-- java.util.logging 实际调用slf4j --> 460 <!-- java.util.logging 实际调用slf4j -->
461 <dependency> 461 <dependency>
462 <groupId>org.slf4j</groupId> 462 <groupId>org.slf4j</groupId>
463 <artifactId>jul-to-slf4j</artifactId> 463 <artifactId>jul-to-slf4j</artifactId>
464 <version>${slf4j.version}</version> 464 <version>${slf4j.version}</version>
465 </dependency> 465 </dependency>
466 <!-- LOGGING end --> 466 <!-- LOGGING end -->
467 467
468 <!-- GENERAL UTILS begin --> 468 <!-- GENERAL UTILS begin -->
469 <dependency> 469 <dependency>
470 <groupId>org.apache.commons</groupId> 470 <groupId>org.apache.commons</groupId>
471 <artifactId>commons-lang3</artifactId> 471 <artifactId>commons-lang3</artifactId>
472 <version>${commons-lang3.version}</version> 472 <version>${commons-lang3.version}</version>
473 </dependency> 473 </dependency>
474 <dependency> 474 <dependency>
475 <groupId>commons-io</groupId> 475 <groupId>commons-io</groupId>
476 <artifactId>commons-io</artifactId> 476 <artifactId>commons-io</artifactId>
477 <version>${commons-io.version}</version> 477 <version>${commons-io.version}</version>
478 </dependency> 478 </dependency>
479 <dependency> 479 <dependency>
480 <groupId>commons-codec</groupId> 480 <groupId>commons-codec</groupId>
481 <artifactId>commons-codec</artifactId> 481 <artifactId>commons-codec</artifactId>
482 <version>${commons-codec.version}</version> 482 <version>${commons-codec.version}</version>
483 </dependency> 483 </dependency>
484 <dependency> 484 <dependency>
485 <groupId>commons-fileupload</groupId> 485 <groupId>commons-fileupload</groupId>
486 <artifactId>commons-fileupload</artifactId> 486 <artifactId>commons-fileupload</artifactId>
487 <version>${commons-fileupload.version}</version> 487 <version>${commons-fileupload.version}</version>
488 </dependency> 488 </dependency>
489 <dependency> 489 <dependency>
490 <groupId>commons-beanutils</groupId> 490 <groupId>commons-beanutils</groupId>
491 <artifactId>commons-beanutils</artifactId> 491 <artifactId>commons-beanutils</artifactId>
492 <version>${commons-beanutils.version}</version> 492 <version>${commons-beanutils.version}</version>
493 <exclusions> 493 <exclusions>
494 <exclusion> 494 <exclusion>
495 <groupId>commons-logging</groupId> 495 <groupId>commons-logging</groupId>
496 <artifactId>commons-logging</artifactId> 496 <artifactId>commons-logging</artifactId>
497 </exclusion> 497 </exclusion>
498 </exclusions> 498 </exclusions>
499 </dependency> 499 </dependency>
500 500
501 <!-- google java lib --> 501 <!-- google java lib -->
502 <dependency> 502 <dependency>
503 <groupId>com.google.guava</groupId> 503 <groupId>com.google.guava</groupId>
504 <artifactId>guava</artifactId> 504 <artifactId>guava</artifactId>
505 <version>${guava.version}</version> 505 <version>${guava.version}</version>
506 </dependency> 506 </dependency>
507 507
508 <!-- jackson json --> 508 <!-- jackson json -->
509 <dependency> 509 <dependency>
510 <groupId>com.fasterxml.jackson.core</groupId> 510 <groupId>com.fasterxml.jackson.core</groupId>
511 <artifactId>jackson-core</artifactId> 511 <artifactId>jackson-core</artifactId>
512 <version>${jackson.version}</version> 512 <version>${jackson.version}</version>
513 </dependency> 513 </dependency>
514 <dependency> 514 <dependency>
515 <groupId>com.fasterxml.jackson.core</groupId> 515 <groupId>com.fasterxml.jackson.core</groupId>
516 <artifactId>jackson-databind</artifactId> 516 <artifactId>jackson-databind</artifactId>
517 <version>${jackson.version}</version> 517 <version>${jackson.version}</version>
518 </dependency> 518 </dependency>
519 <dependency> 519 <dependency>
520 <groupId>com.fasterxml.jackson.core</groupId> 520 <groupId>com.fasterxml.jackson.core</groupId>
521 <artifactId>jackson-annotations</artifactId> 521 <artifactId>jackson-annotations</artifactId>
522 <version>${jackson.version}</version> 522 <version>${jackson.version}</version>
523 </dependency> 523 </dependency>
524 <dependency> 524 <dependency>
525 <groupId>com.fasterxml.jackson.module</groupId> 525 <groupId>com.fasterxml.jackson.module</groupId>
526 <artifactId>jackson-module-jaxb-annotations</artifactId> 526 <artifactId>jackson-module-jaxb-annotations</artifactId>
527 <version>${jackson.version}</version> 527 <version>${jackson.version}</version>
528 </dependency> 528 </dependency>
529 529
530 <!-- fastjson json 530 <!-- fastjson json
531 <dependency> 531 <dependency>
532 <groupId>com.alibaba</groupId> 532 <groupId>com.alibaba</groupId>
533 <artifactId>fastjson</artifactId> 533 <artifactId>fastjson</artifactId>
534 <version>${fastjson.version}</version> 534 <version>${fastjson.version}</version>
535 </dependency> --> 535 </dependency> -->
536 536
537 <!-- xstream xml --> 537 <!-- xstream xml -->
538 <dependency> 538 <dependency>
539 <groupId>com.thoughtworks.xstream</groupId> 539 <groupId>com.thoughtworks.xstream</groupId>
540 <artifactId>xstream</artifactId> 540 <artifactId>xstream</artifactId>
541 <version>${xstream.version}</version> 541 <version>${xstream.version}</version>
542 </dependency> 542 </dependency>
543 543
544 <!-- pojo copy --> 544 <!-- pojo copy -->
545 <dependency> 545 <dependency>
546 <groupId>net.sf.dozer</groupId> 546 <groupId>net.sf.dozer</groupId>
547 <artifactId>dozer</artifactId> 547 <artifactId>dozer</artifactId>
548 <version>${dozer.version}</version> 548 <version>${dozer.version}</version>
549 </dependency> 549 </dependency>
550 550
551 <!-- freemarker engine --> 551 <!-- freemarker engine -->
552 <dependency> 552 <dependency>
553 <groupId>org.freemarker</groupId> 553 <groupId>org.freemarker</groupId>
554 <artifactId>freemarker</artifactId> 554 <artifactId>freemarker</artifactId>
555 <version>${freemarker.version}</version> 555 <version>${freemarker.version}</version>
556 </dependency> 556 </dependency>
557 557
558 <!-- email --> 558 <!-- email -->
559 <dependency> 559 <dependency>
560 <groupId>javax.mail</groupId> 560 <groupId>javax.mail</groupId>
561 <artifactId>mail</artifactId> 561 <artifactId>mail</artifactId>
562 <version>1.4.7</version> 562 <version>1.4.7</version>
563 </dependency> 563 </dependency>
564 <dependency> 564 <dependency>
565 <groupId>javax.activation</groupId> 565 <groupId>javax.activation</groupId>
566 <artifactId>activation</artifactId> 566 <artifactId>activation</artifactId>
567 <version>1.1.1</version> 567 <version>1.1.1</version>
568 </dependency> 568 </dependency>
569 569
570 <!-- poi office --> 570 <!-- poi office -->
571 <dependency> 571 <dependency>
572 <groupId>org.apache.poi</groupId> 572 <groupId>org.apache.poi</groupId>
573 <artifactId>poi</artifactId> 573 <artifactId>poi</artifactId>
574 <version>${poi.version}</version> 574 <version>${poi.version}</version>
575 </dependency> 575 </dependency>
576 <dependency> 576 <dependency>
577 <groupId>org.apache.poi</groupId> 577 <groupId>org.apache.poi</groupId>
578 <artifactId>poi-ooxml</artifactId> 578 <artifactId>poi-ooxml</artifactId>
579 <version>${poi.version}</version> 579 <version>${poi.version}</version>
580 </dependency> 580 </dependency>
581 <dependency> 581 <dependency>
582 <groupId>org.apache.poi</groupId> 582 <groupId>org.apache.poi</groupId>
583 <artifactId>poi-ooxml-schemas</artifactId> 583 <artifactId>poi-ooxml-schemas</artifactId>
584 <version>${poi.version}</version> 584 <version>${poi.version}</version>
585 </dependency> 585 </dependency>
586 586
587 <!-- image util --> 587 <!-- image util -->
588 <dependency> 588 <dependency>
589 <groupId>com.drewnoakes</groupId> 589 <groupId>com.drewnoakes</groupId>
590 <artifactId>metadata-extractor</artifactId> 590 <artifactId>metadata-extractor</artifactId>
591 <version>2.6.2</version> 591 <version>2.6.2</version>
592 </dependency> 592 </dependency>
593 593
594 <!-- 条形码、二维码生成 --> 594 <!-- 条形码、二维码生成 -->
595 <dependency> 595 <dependency>
596 <groupId>com.google.zxing</groupId> 596 <groupId>com.google.zxing</groupId>
597 <artifactId>core</artifactId> 597 <artifactId>core</artifactId>
598 <version>2.2</version> 598 <version>2.2</version>
599 </dependency> 599 </dependency>
600 <dependency> 600 <dependency>
601 <groupId>com.google.zxing</groupId> 601 <groupId>com.google.zxing</groupId>
602 <artifactId>javase</artifactId> 602 <artifactId>javase</artifactId>
603 <version>2.2</version> 603 <version>2.2</version>
604 </dependency> 604 </dependency>
605 605
606 <!-- 中文分词 --> 606 <!-- 中文分词 -->
607 <dependency> 607 <dependency>
608 <groupId>org.wltea</groupId> 608 <groupId>org.wltea</groupId>
609 <artifactId>analyzer</artifactId> 609 <artifactId>analyzer</artifactId>
610 <version>2012_u6</version> 610 <version>2012_u6</version>
611 </dependency> 611 </dependency>
612 <!-- GENERAL UTILS end --> 612 <!-- GENERAL UTILS end -->
613 613
614 <!-- CKFinder begin --> 614 <!-- CKFinder begin -->
615 <dependency> 615 <dependency>
616 <groupId>net.coobird</groupId> 616 <groupId>net.coobird</groupId>
617 <artifactId>thumbnailator</artifactId> 617 <artifactId>thumbnailator</artifactId>
618 <version>0.4.2</version> 618 <version>0.4.2</version>
619 </dependency> 619 </dependency>
620 <dependency> 620 <dependency>
621 <groupId>com.ckfinder</groupId> 621 <groupId>com.ckfinder</groupId>
622 <artifactId>apache-ant-zip</artifactId> 622 <artifactId>apache-ant-zip</artifactId>
623 <version>2.3</version> 623 <version>2.3</version>
624 </dependency> 624 </dependency>
625 <dependency> 625 <dependency>
626 <groupId>com.ckfinder</groupId> 626 <groupId>com.ckfinder</groupId>
627 <artifactId>ckfinder</artifactId> 627 <artifactId>ckfinder</artifactId>
628 <version>2.3</version> 628 <version>2.3</version>
629 </dependency> 629 </dependency>
630 <dependency> 630 <dependency>
631 <groupId>com.ckfinder</groupId> 631 <groupId>com.ckfinder</groupId>
632 <artifactId>ckfinderplugin-fileeditor</artifactId> 632 <artifactId>ckfinderplugin-fileeditor</artifactId>
633 <version>2.3</version> 633 <version>2.3</version>
634 </dependency> 634 </dependency>
635 <dependency> 635 <dependency>
636 <groupId>com.ckfinder</groupId> 636 <groupId>com.ckfinder</groupId>
637 <artifactId>ckfinderplugin-imageresize</artifactId> 637 <artifactId>ckfinderplugin-imageresize</artifactId>
638 <version>2.3</version> 638 <version>2.3</version>
639 </dependency> 639 </dependency>
640 <!-- CKFinder end --> 640 <!-- CKFinder end -->
641 641
642 <!-- TEST begin --> 642 <!-- TEST begin -->
643 <dependency> 643 <dependency>
644 <groupId>junit</groupId> 644 <groupId>junit</groupId>
645 <artifactId>junit</artifactId> 645 <artifactId>junit</artifactId>
646 <version>4.11</version> 646 <version>4.11</version>
647 </dependency> 647 </dependency>
648 <dependency> 648 <dependency>
649 <groupId>org.springframework</groupId> 649 <groupId>org.springframework</groupId>
650 <artifactId>spring-test</artifactId> 650 <artifactId>spring-test</artifactId>
651 <version>${spring.version}</version> 651 <version>${spring.version}</version>
652 </dependency> 652 </dependency>
653 <!-- TEST end --> 653 <!-- TEST end -->
654 654
655 <!-- User Agent --> 655 <!-- User Agent -->
656 <dependency> 656 <dependency>
657 <groupId>eu.bitwalker</groupId> 657 <groupId>eu.bitwalker</groupId>
658 <artifactId>UserAgentUtils</artifactId> 658 <artifactId>UserAgentUtils</artifactId>
659 <version>1.14</version> 659 <version>1.14</version>
660 </dependency> 660 </dependency>
661 <!-- Cxf web Service --> 661 <!-- Cxf web Service -->
662 <dependency> 662 <dependency>
663 <groupId>org.apache.cxf</groupId> 663 <groupId>org.apache.cxf</groupId>
664 <artifactId>cxf</artifactId> 664 <artifactId>cxf</artifactId>
665 <version>2.7.0</version> 665 <version>2.7.0</version>
666 </dependency> 666 </dependency>
667 <dependency> 667 <dependency>
668 <groupId>org.apache.neethi</groupId> 668 <groupId>org.apache.neethi</groupId>
669 <artifactId>neethi</artifactId> 669 <artifactId>neethi</artifactId>
670 <version>3.0.3</version> 670 <version>3.0.3</version>
671 </dependency> 671 </dependency>
672 <dependency> 672 <dependency>
673 <groupId>wsdl4j</groupId> 673 <groupId>wsdl4j</groupId>
674 <artifactId>wsdl4j</artifactId> 674 <artifactId>wsdl4j</artifactId>
675 <version>1.6.3</version> 675 <version>1.6.3</version>
676 </dependency> 676 </dependency>
677 <dependency> 677 <dependency>
678 <groupId>org.apache.ws.xmlschema</groupId> 678 <groupId>org.apache.ws.xmlschema</groupId>
679 <artifactId>xmlschema-core</artifactId> 679 <artifactId>xmlschema-core</artifactId>
680 <version>2.0.3</version> 680 <version>2.0.3</version>
681 <type>jar</type> 681 <type>jar</type>
682 </dependency> 682 </dependency>
683 683
684 <!--<dependency>--> 684 <!--<dependency>-->
685 <!-- <groupId>org.apache.httpcomponents</groupId>--> 685 <!-- <groupId>org.apache.httpcomponents</groupId>-->
686 <!-- <artifactId>httpclient</artifactId>--> 686 <!-- <artifactId>httpclient</artifactId>-->
687 <!-- <version>4.2.1</version>--> 687 <!-- <version>4.2.1</version>-->
688 <!--</dependency>--> 688 <!--</dependency>-->
689 689
690 <!--<dependency>--> 690 <!--<dependency>-->
691 <!-- <groupId>org.apache.httpcomponents</groupId>--> 691 <!-- <groupId>org.apache.httpcomponents</groupId>-->
692 <!-- <artifactId>httpcore</artifactId>--> 692 <!-- <artifactId>httpcore</artifactId>-->
693 <!-- <version>4.2.2</version>--> 693 <!-- <version>4.2.2</version>-->
694 <!--</dependency>--> 694 <!--</dependency>-->
695 <dependency> 695 <dependency>
696 <groupId>org.apache.httpcomponents</groupId> 696 <groupId>org.apache.httpcomponents</groupId>
697 <artifactId>httpcore-nio</artifactId> 697 <artifactId>httpcore-nio</artifactId>
698 <version>4.2.2</version> 698 <version>4.2.2</version>
699 </dependency> 699 </dependency>
700 700
701 <dependency> 701 <dependency>
702 <groupId>org.apache.httpcomponents</groupId> 702 <groupId>org.apache.httpcomponents</groupId>
703 <artifactId>httpasyncclient</artifactId> 703 <artifactId>httpasyncclient</artifactId>
704 <version>4.0</version> 704 <version>4.0</version>
705 </dependency> 705 </dependency>
706 <!--<dependency>--> 706 <!--<dependency>-->
707 <!-- <groupId>javax.xml.ws</groupId>--> 707 <!-- <groupId>javax.xml.ws</groupId>-->
708 <!-- <artifactId>jaxws-api</artifactId>--> 708 <!-- <artifactId>jaxws-api</artifactId>-->
709 <!-- <version>2.2.11</version>--> 709 <!-- <version>2.2.11</version>-->
710 <!--</dependency>--> 710 <!--</dependency>-->
711 711
712 712
713 <!-- 数据上报 --> 713 <!-- 数据上报 -->
714 <dependency> 714 <dependency>
715 <groupId>org.apache.santuario</groupId> 715 <groupId>org.apache.santuario</groupId>
716 <artifactId>xmlsec</artifactId> 716 <artifactId>xmlsec</artifactId>
717 <version>1.5.2</version> 717 <version>1.5.2</version>
718 </dependency> 718 </dependency>
719 <dependency> 719 <dependency>
720 <groupId>com.thinkgem.jeesite</groupId> 720 <groupId>com.thinkgem.jeesite</groupId>
721 <artifactId>bdc-rsa</artifactId> 721 <artifactId>bdc-rsa</artifactId>
722 <version>1.0</version> 722 <version>1.0</version>
723 <scope>system</scope> 723 <scope>system</scope>
724 <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/bdc-rsa-1.0.jar</systemPath> 724 <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/bdc-rsa-1.0.jar</systemPath>
725 </dependency> 725 </dependency>
726 <dependency> 726 <dependency>
727 <groupId>com.thinkgem.jeesite</groupId> 727 <groupId>com.thinkgem.jeesite</groupId>
728 <artifactId>jaxen</artifactId> 728 <artifactId>jaxen</artifactId>
729 <version>1.1.6</version> 729 <version>1.1.6</version>
730 <scope>system</scope> 730 <scope>system</scope>
731 <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jaxen-1.1.6.jar</systemPath> 731 <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/jaxen-1.1.6.jar</systemPath>
732 </dependency> 732 </dependency>
733 <!-- 网路传输 --> 733 <!-- 网路传输 -->
734 734
735 <!--http接口--> 735 <!--http接口-->
736 <dependency> 736 <dependency>
737 <groupId>com.jcraft</groupId> 737 <groupId>com.jcraft</groupId>
738 <artifactId>jsch</artifactId> 738 <artifactId>jsch</artifactId>
739 <version>0.1.50</version> 739 <version>0.1.50</version>
740 </dependency> 740 </dependency>
741 741
742 <dependency> 742 <dependency>
743 <groupId>org.apache.httpcomponents</groupId> 743 <groupId>org.apache.httpcomponents</groupId>
744 <artifactId>httpclient</artifactId> 744 <artifactId>httpclient</artifactId>
745 <version>4.3.6</version> 745 <version>4.3.6</version>
746 </dependency> 746 </dependency>
747 747
748 <dependency> 748 <dependency>
749 <groupId>org.apache.httpcomponents</groupId> 749 <groupId>org.apache.httpcomponents</groupId>
750 <artifactId>httpcore</artifactId> 750 <artifactId>httpcore</artifactId>
751 <version>4.3.3</version> 751 <version>4.3.3</version>
752 </dependency> 752 </dependency>
753 753
754 <!-- 阿里云短信包 --> 754 <!-- 阿里云短信包 -->
755 <dependency> 755 <dependency>
756 <groupId>com.aliyun</groupId> 756 <groupId>com.aliyun</groupId>
757 <artifactId>aliyun-java-sdk-dysmsapi</artifactId> 757 <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
758 <version>1.0.0</version> 758 <version>1.0.0</version>
759 </dependency> 759 </dependency>
760 <dependency> 760 <dependency>
761 <groupId>com.aliyun</groupId> 761 <groupId>com.aliyun</groupId>
762 <artifactId>aliyun-java-sdk-core</artifactId> 762 <artifactId>aliyun-java-sdk-core</artifactId>
763 <version>3.3.0</version> 763 <version>3.3.0</version>
764 </dependency> 764 </dependency>
765 <!-- --> 765 <!-- -->
766 <dependency> 766 <dependency>
767 <groupId>net.sf.json-lib</groupId> 767 <groupId>net.sf.json-lib</groupId>
768 <artifactId>json-lib</artifactId> 768 <artifactId>json-lib</artifactId>
769 <version>2.4</version> 769 <version>2.4</version>
770 <classifier>jdk15</classifier> 770 <classifier>jdk15</classifier>
771 </dependency> 771 </dependency>
772 <!-- 自定义jar依赖包 772 <!-- 自定义jar依赖包
773 <dependency> 773 <dependency>
774 <groupId>com.thinkgem.jeesite</groupId> 774 <groupId>com.thinkgem.jeesite</groupId>
775 <artifactId>test-core</artifactId> 775 <artifactId>test-core</artifactId>
...@@ -778,7 +778,7 @@ ...@@ -778,7 +778,7 @@
778 <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/test-core-1.0.jar</systemPath> 778 <systemPath>${project.basedir}/src/main/webapp/WEB-INF/lib/test-core-1.0.jar</systemPath>
779 </dependency> --> 779 </dependency> -->
780 780
781 <!-- 使用 Jetty JSP引擎 781 <!-- 使用 Jetty JSP引擎
782 <dependency> 782 <dependency>
783 <groupId>org.eclipse.jetty</groupId> 783 <groupId>org.eclipse.jetty</groupId>
784 <artifactId>jetty-jsp</artifactId> 784 <artifactId>jetty-jsp</artifactId>
...@@ -795,86 +795,167 @@ ...@@ -795,86 +795,167 @@
795 </exclusions> 795 </exclusions>
796 </dependency> --> 796 </dependency> -->
797 797
798 <dependency> 798 <dependency>
799 <groupId>javax.xml.ws</groupId> 799 <groupId>javax.xml.ws</groupId>
800 <artifactId>jaxws-api</artifactId> 800 <artifactId>jaxws-api</artifactId>
801 <version>2.2.11</version> 801 <version>2.2.11</version>
802 <type>jar</type> 802 <type>jar</type>
803 <scope>compile</scope> 803 <scope>compile</scope>
804 </dependency> 804 </dependency>
805 <dependency> 805 <dependency>
806 <groupId>javax.xml.rpc</groupId> 806 <groupId>javax.xml.rpc</groupId>
807 <artifactId>javax.xml.rpc-api</artifactId> 807 <artifactId>javax.xml.rpc-api</artifactId>
808 <version>1.1.1</version> 808 <version>1.1.1</version>
809 <type>jar</type> 809 <type>jar</type>
810 <scope>compile</scope> 810 <scope>compile</scope>
811 </dependency> 811 </dependency>
812 812
813 <dependency> 813 <dependency>
814 <groupId>commons-net</groupId> 814 <groupId>commons-net</groupId>
815 <artifactId>commons-net</artifactId> 815 <artifactId>commons-net</artifactId>
816 <version>3.6</version> 816 <version>3.6</version>
817 </dependency> 817 </dependency>
818 818
819 <!--生成pdf --> 819 <!--生成pdf -->
820 <!-- <dependency> --> 820 <!-- <dependency> -->
821 <!-- <groupId>com.itextpdf</groupId> --> 821 <!-- <groupId>com.itextpdf</groupId> -->
822 <!-- <artifactId>itextpdf</artifactId> --> 822 <!-- <artifactId>itextpdf</artifactId> -->
823 <!-- <version>5.5.10</version> --> 823 <!-- <version>5.5.10</version> -->
824 <!-- </dependency> --> 824 <!-- </dependency> -->
825 825
826 <!-- <dependency> --> 826 <!-- <dependency> -->
827 <!-- <groupId>com.itextpdf</groupId> --> 827 <!-- <groupId>com.itextpdf</groupId> -->
828 <!-- <artifactId>itext-asian</artifactId> --> 828 <!-- <artifactId>itext-asian</artifactId> -->
829 <!-- <version>5.2.0</version> --> 829 <!-- <version>5.2.0</version> -->
830 <!-- </dependency> --> 830 <!-- </dependency> -->
831 831
832 <dependency> 832 <dependency>
833 <groupId>javax.jws</groupId> 833 <groupId>javax.jws</groupId>
834 <artifactId>javax.jws-api</artifactId> 834 <artifactId>javax.jws-api</artifactId>
835 <version>1.1</version> 835 <version>1.1</version>
836 </dependency> 836 </dependency>
837 837
838 <dependency> 838 <dependency>
839 <groupId>javax.annotation</groupId> 839 <groupId>javax.annotation</groupId>
840 <artifactId>javax.annotation-api</artifactId> 840 <artifactId>javax.annotation-api</artifactId>
841 <version>1.3.2</version> 841 <version>1.3.2</version>
842 </dependency> 842 </dependency>
843 843
844 <dependency> 844 <dependency>
845 <groupId>javax.xml.bind</groupId> 845 <groupId>javax.xml.bind</groupId>
846 <artifactId>jaxb-api</artifactId> 846 <artifactId>jaxb-api</artifactId>
847 <version>2.2.11</version> 847 <version>2.2.11</version>
848 </dependency> 848 </dependency>
849 <dependency> 849 <dependency>
850 <groupId>com.sun.xml.bind</groupId> 850 <groupId>com.sun.xml.bind</groupId>
851 <artifactId>jaxb-core</artifactId> 851 <artifactId>jaxb-core</artifactId>
852 <version>2.2.11</version> 852 <version>2.2.11</version>
853 </dependency> 853 </dependency>
854 <dependency> 854 <dependency>
855 <groupId>com.sun.xml.bind</groupId> 855 <groupId>com.sun.xml.bind</groupId>
856 <artifactId>jaxb-impl</artifactId> 856 <artifactId>jaxb-impl</artifactId>
857 <version>2.2.11</version> 857 <version>2.2.11</version>
858 </dependency> 858 </dependency>
859 859
860 </dependencies> 860 <!--电子证照-->
861 861 <dependency>
862 <build> 862 <groupId>com.thinkgem.jeesite</groupId>
863 <outputDirectory>${project.basedir}/src/main/webapp/WEB-INF/classes/</outputDirectory> 863 <artifactId>agent-boot</artifactId>
864 <plugins> 864 <version>1.0.20.0527</version>
865 <!-- Compiler 插件, 设定JDK版本 --> 865 <scope>system</scope>
866 <plugin> 866 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/agent-boot-1.0.20.0527.jar</systemPath>
867 <groupId>org.apache.maven.plugins</groupId> 867 </dependency>
868 <artifactId>maven-compiler-plugin</artifactId> 868
869 <version>2.5.1</version> 869 <dependency>
870 <configuration> 870 <groupId>com.thinkgem.jeesite</groupId>
871 <source>8</source> 871 <artifactId>ofd-utils-convert</artifactId>
872 <target>8</target> 872 <version>1.0.0</version>
873 <showWarnings>true</showWarnings> 873 <scope>system</scope>
874 </configuration> 874 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/ofd-utils-convert.jar</systemPath>
875 </plugin> 875 </dependency>
876 876
877 <!-- JSP 预编译插件 jspweb.xml 877 <dependency>
878 <groupId>com.thinkgem.jeesite</groupId>
879 <artifactId>suwell-agent-http</artifactId>
880 <version>1.4.191210</version>
881 <scope>system</scope>
882 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/suwell-agent-http-1.4.191210.jar</systemPath>
883 </dependency>
884
885 <dependency>
886 <groupId>com.thinkgem.jeesite</groupId>
887 <artifactId>suwell-agent-wrapper</artifactId>
888 <version>1.6.191210</version>
889 <scope>system</scope>
890 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/suwell-agent-wrapper-1.6.191210.jar</systemPath>
891 </dependency>
892
893 <dependency>
894 <groupId>com.thinkgem.jeesite</groupId>
895 <artifactId>suwell-api-base</artifactId>
896 <version>1.4.200512</version>
897 <scope>system</scope>
898 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/suwell-api-base-1.4.200512.jar</systemPath>
899 </dependency>
900
901 <dependency>
902 <groupId>com.thinkgem.jeesite</groupId>
903 <artifactId>suwell-api-rpc-base</artifactId>
904 <version>1.8.201027</version>
905 <scope>system</scope>
906 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/suwell-api-rpc-base-1.8.201027.jar</systemPath>
907 </dependency>
908
909 <dependency>
910 <groupId>com.thinkgem.jeesite</groupId>
911 <artifactId>suwell-local-rpc</artifactId>
912 <version>1.8.20.1027</version>
913 <scope>system</scope>
914 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/suwell-local-rpc-1.8.20.1027.jar</systemPath>
915 </dependency>
916
917 <dependency>
918 <groupId>com.thinkgem.jeesite</groupId>
919 <artifactId>suwell-ofd-api-rpc</artifactId>
920 <version>1.0.0</version>
921 <scope>system</scope>
922 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/suwell-ofd-api-rpc-1.0.0.jar</systemPath>
923 </dependency>
924
925 <dependency>
926 <groupId>com.thinkgem.jeesite</groupId>
927 <artifactId>suwell-ofd-base</artifactId>
928 <version>1.3.18.0803</version>
929 <scope>system</scope>
930 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/suwell-ofd-base-1.3.18.0803.jar</systemPath>
931 </dependency>
932
933 <dependency>
934 <groupId>com.thinkgem.jeesite</groupId>
935 <artifactId>suwell-packet-wrapper</artifactId>
936 <version>1.16.210414</version>
937 <scope>system</scope>
938 <systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/suwell-packet-wrapper-1.16.210414.jar</systemPath>
939 </dependency>
940
941 </dependencies>
942
943 <build>
944 <outputDirectory>${project.basedir}/src/main/webapp/WEB-INF/classes/</outputDirectory>
945 <plugins>
946 <!-- Compiler 插件, 设定JDK版本 -->
947 <plugin>
948 <groupId>org.apache.maven.plugins</groupId>
949 <artifactId>maven-compiler-plugin</artifactId>
950 <version>2.5.1</version>
951 <configuration>
952 <source>8</source>
953 <target>8</target>
954 <showWarnings>true</showWarnings>
955 </configuration>
956 </plugin>
957
958 <!-- JSP 预编译插件 jspweb.xml
878 <plugin> 959 <plugin>
879 <groupId>org.jasig.mojo.jspc</groupId> 960 <groupId>org.jasig.mojo.jspc</groupId>
880 <artifactId>jspc-maven-plugin</artifactId> 961 <artifactId>jspc-maven-plugin</artifactId>
...@@ -898,7 +979,7 @@ ...@@ -898,7 +979,7 @@
898 </dependencies> 979 </dependencies>
899 </plugin>--> 980 </plugin>-->
900 981
901 <!-- Jetty JSP 预编译插件 web.xml6 982 <!-- Jetty JSP 预编译插件 web.xml6
902 <plugin> 983 <plugin>
903 <groupId>org.mortbay.jetty</groupId> 984 <groupId>org.mortbay.jetty</groupId>
904 <artifactId>jetty-jspc-maven-plugin</artifactId> 985 <artifactId>jetty-jspc-maven-plugin</artifactId>
...@@ -915,34 +996,34 @@ ...@@ -915,34 +996,34 @@
915 </executions> 996 </executions>
916 </plugin>--> 997 </plugin>-->
917 998
918 <!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 --> 999 <!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
919 <plugin> 1000 <plugin>
920 <groupId>org.apache.maven.plugins</groupId> 1001 <groupId>org.apache.maven.plugins</groupId>
921 <artifactId>maven-jar-plugin</artifactId> 1002 <artifactId>maven-jar-plugin</artifactId>
922 <version>2.4</version> 1003 <version>2.4</version>
923 <configuration> 1004 <configuration>
924 <encoding>${project.build.sourceEncoding}</encoding> 1005 <encoding>${project.build.sourceEncoding}</encoding>
925 </configuration> 1006 </configuration>
926 <executions> 1007 <executions>
927 <execution> 1008 <execution>
928 <phase>prepare-package</phase> 1009 <phase>prepare-package</phase>
929 <goals> 1010 <goals>
930 <goal>jar</goal> 1011 <goal>jar</goal>
931 </goals> 1012 </goals>
932 <configuration> 1013 <configuration>
933 <classesDirectory>${project.outputDirectory}</classesDirectory> 1014 <classesDirectory>${project.outputDirectory}</classesDirectory>
934 <finalName>odm-webservice</finalName> 1015 <finalName>odm-webservice</finalName>
935 <outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib 1016 <outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib
936 </outputDirectory> 1017 </outputDirectory>
937 <includes> 1018 <includes>
938 <include>com/thinkgem/jeesite/modules/restws/**</include> 1019 <include>com/thinkgem/jeesite/modules/restws/**</include>
939 </includes> 1020 </includes>
940 </configuration> 1021 </configuration>
941 </execution> 1022 </execution>
942 </executions> 1023 </executions>
943 </plugin> 1024 </plugin>
944 1025
945 <!-- 混淆代码 1026 <!-- 混淆代码
946 <plugin> 1027 <plugin>
947 <groupId>com.github.wvengen</groupId> 1028 <groupId>com.github.wvengen</groupId>
948 <artifactId>proguard-maven-plugin</artifactId> 1029 <artifactId>proguard-maven-plugin</artifactId>
...@@ -983,244 +1064,244 @@ ...@@ -983,244 +1064,244 @@
983 </dependencies> 1064 </dependencies>
984 </plugin> --> 1065 </plugin> -->
985 1066
986 <!-- war 打包插件, 设定war包名称不带版本号 --> 1067 <!-- war 打包插件, 设定war包名称不带版本号 -->
987 <plugin> 1068 <plugin>
988 <groupId>org.apache.maven.plugins</groupId> 1069 <groupId>org.apache.maven.plugins</groupId>
989 <artifactId>maven-war-plugin</artifactId> 1070 <artifactId>maven-war-plugin</artifactId>
990 <version>2.4</version> 1071 <version>2.4</version>
991 <configuration> 1072 <configuration>
992 <packagingExcludes> 1073 <packagingExcludes>
993 <!-- WEB-INF/classes/com/thinkgem/jeesite/** --> 1074 <!-- WEB-INF/classes/com/thinkgem/jeesite/** -->
994 WEB-INF/classes/org/apache/ibatis/**, 1075 WEB-INF/classes/org/apache/ibatis/**,
995 WEB-INF/classes/org/mybatis/spring/** 1076 WEB-INF/classes/org/mybatis/spring/**
996 </packagingExcludes> 1077 </packagingExcludes>
997 <warSourceExcludes> 1078 <warSourceExcludes>
998 static/bootstrap/2.3.1/docs/**, 1079 static/bootstrap/2.3.1/docs/**,
999 static/ckeditor/_samples/**, 1080 static/ckeditor/_samples/**,
1000 static/ckeditor/_source/**, 1081 static/ckeditor/_source/**,
1001 static/ckfinder/_samples/**, 1082 static/ckfinder/_samples/**,
1002 static/ckfinder/help/**, 1083 static/ckfinder/help/**,
1003 static/compressor*/**, 1084 static/compressor*/**,
1004 static/jquery-jbox/2.3/docs/**, 1085 static/jquery-jbox/2.3/docs/**,
1005 static/jquery-jbox/2.3/Skins2/**, 1086 static/jquery-jbox/2.3/Skins2/**,
1006 static/jquery-validation/1.11.0/demo/**, 1087 static/jquery-validation/1.11.0/demo/**,
1007 static/jquery-ztree/3.5.12/demo/**, 1088 static/jquery-ztree/3.5.12/demo/**,
1008 static/My97DatePicker/docs/**, 1089 static/My97DatePicker/docs/**,
1009 static/supcan/doc/**, 1090 static/supcan/doc/**,
1010 static/SuperSlide/demo/**, 1091 static/SuperSlide/demo/**,
1011 static/treeTable/demo/**<!-- , --> 1092 static/treeTable/demo/**<!-- , -->
1012 <!-- userfiles/** --><!-- ,/**/*.jsp -->, 1093 <!-- userfiles/** --><!-- ,/**/*.jsp -->,
1013 test/** 1094 test/**
1014 </warSourceExcludes> 1095 </warSourceExcludes>
1015 <webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory><!-- 1096 <webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory><!--
1016 <webXml>${project.basedir}/target/jspweb.xml</webXml> --> 1097 <webXml>${project.basedir}/target/jspweb.xml</webXml> -->
1017 <warName>${project.artifactId}</warName> 1098 <warName>${project.artifactId}</warName>
1018 </configuration> 1099 </configuration>
1019 </plugin> 1100 </plugin>
1020 1101
1021 <!-- Eclipse 插件 --> 1102 <!-- Eclipse 插件 -->
1022 <plugin> 1103 <plugin>
1023 <groupId>org.apache.maven.plugins</groupId> 1104 <groupId>org.apache.maven.plugins</groupId>
1024 <artifactId>maven-eclipse-plugin</artifactId> 1105 <artifactId>maven-eclipse-plugin</artifactId>
1025 <version>2.9</version> 1106 <version>2.9</version>
1026 <configuration> 1107 <configuration>
1027 <downloadSources>${downloadSources}</downloadSources> 1108 <downloadSources>${downloadSources}</downloadSources>
1028 <downloadJavadocs>false</downloadJavadocs> 1109 <downloadJavadocs>false</downloadJavadocs>
1029 <wtpversion>2.0</wtpversion> 1110 <wtpversion>2.0</wtpversion>
1030 <jeeversion>5.0</jeeversion> 1111 <jeeversion>5.0</jeeversion>
1031 <!-- <jeeversion>6.0</jeeversion> --> 1112 <!-- <jeeversion>6.0</jeeversion> -->
1032 <additionalConfig> 1113 <additionalConfig>
1033 <file> 1114 <file>
1034 <name>.settings/org.eclipse.core.resources.prefs</name> 1115 <name>.settings/org.eclipse.core.resources.prefs</name>
1035 <content> 1116 <content>
1036 <![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]> 1117 <![CDATA[eclipse.preferences.version=1${line.separator}encoding/<project>=${project.build.sourceEncoding}${line.separator}]]>
1037 </content> 1118 </content>
1038 </file> 1119 </file>
1039 </additionalConfig> 1120 </additionalConfig>
1040 <additionalProjectnatures> 1121 <additionalProjectnatures>
1041 <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature> 1122 <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
1042 </additionalProjectnatures> 1123 </additionalProjectnatures>
1043 </configuration> 1124 </configuration>
1044 </plugin> 1125 </plugin>
1045 1126
1046 <!-- tomcat6插件 --> 1127 <!-- tomcat6插件 -->
1047 <plugin> 1128 <plugin>
1048 <groupId>org.apache.tomcat.maven</groupId> 1129 <groupId>org.apache.tomcat.maven</groupId>
1049 <artifactId>tomcat6-maven-plugin</artifactId> 1130 <artifactId>tomcat6-maven-plugin</artifactId>
1050 <version>${tomcat.version}</version> 1131 <version>${tomcat.version}</version>
1051 <configuration> 1132 <configuration>
1052 <port>${webserver.port}</port> 1133 <port>${webserver.port}</port>
1053 <path>/${project.artifactId}</path> 1134 <path>/${project.artifactId}</path>
1054 <uriEncoding>${project.build.sourceEncoding}</uriEncoding> 1135 <uriEncoding>${project.build.sourceEncoding}</uriEncoding>
1055 </configuration> 1136 </configuration>
1056 </plugin> 1137 </plugin>
1057 1138
1058 <!-- tomcat7插件 --> 1139 <!-- tomcat7插件 -->
1059 <plugin> 1140 <plugin>
1060 <groupId>org.apache.tomcat.maven</groupId> 1141 <groupId>org.apache.tomcat.maven</groupId>
1061 <artifactId>tomcat7-maven-plugin</artifactId> 1142 <artifactId>tomcat7-maven-plugin</artifactId>
1062 <version>${tomcat.version}</version> 1143 <version>${tomcat.version}</version>
1063 <configuration> 1144 <configuration>
1064 <port>${webserver.port}</port> 1145 <port>${webserver.port}</port>
1065 <path>/${project.artifactId}</path> 1146 <path>/${project.artifactId}</path>
1066 <uriEncoding>${project.build.sourceEncoding}</uriEncoding> 1147 <uriEncoding>${project.build.sourceEncoding}</uriEncoding>
1067 </configuration> 1148 </configuration>
1068 </plugin> 1149 </plugin>
1069 1150
1070 <!-- jetty插件 --> 1151 <!-- jetty插件 -->
1071 <plugin> 1152 <plugin>
1072 <groupId>org.mortbay.jetty</groupId> 1153 <groupId>org.mortbay.jetty</groupId>
1073 <artifactId>jetty-maven-plugin</artifactId> 1154 <artifactId>jetty-maven-plugin</artifactId>
1074 <version>${jetty.version}</version> 1155 <version>${jetty.version}</version>
1075 <configuration> 1156 <configuration>
1076 <connectors> 1157 <connectors>
1077 <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> 1158 <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
1078 <port>${webserver.port}</port> 1159 <port>${webserver.port}</port>
1079 </connector> 1160 </connector>
1080 </connectors> 1161 </connectors>
1081 <webAppConfig> 1162 <webAppConfig>
1082 <contextPath>/${project.artifactId}</contextPath> 1163 <contextPath>/${project.artifactId}</contextPath>
1083 </webAppConfig> 1164 </webAppConfig>
1084 <systemProperties> 1165 <systemProperties>
1085 <systemProperty> 1166 <systemProperty>
1086 <name>org.mortbay.util.URI.charset</name> 1167 <name>org.mortbay.util.URI.charset</name>
1087 <value>${project.build.sourceEncoding}</value> 1168 <value>${project.build.sourceEncoding}</value>
1088 </systemProperty> 1169 </systemProperty>
1089 </systemProperties> 1170 </systemProperties>
1090 </configuration> 1171 </configuration>
1091 </plugin> 1172 </plugin>
1092 1173
1093 <!-- resource插件 --> 1174 <!-- resource插件 -->
1094 <plugin> 1175 <plugin>
1095 <groupId>org.apache.maven.plugins</groupId> 1176 <groupId>org.apache.maven.plugins</groupId>
1096 <artifactId>maven-resources-plugin</artifactId> 1177 <artifactId>maven-resources-plugin</artifactId>
1097 <version>2.6</version> 1178 <version>2.6</version>
1098 </plugin> 1179 </plugin>
1099 1180
1100 <!-- install插件 --> 1181 <!-- install插件 -->
1101 <plugin> 1182 <plugin>
1102 <groupId>org.apache.maven.plugins</groupId> 1183 <groupId>org.apache.maven.plugins</groupId>
1103 <artifactId>maven-install-plugin</artifactId> 1184 <artifactId>maven-install-plugin</artifactId>
1104 <version>2.4</version> 1185 <version>2.4</version>
1105 </plugin> 1186 </plugin>
1106 1187
1107 <!-- clean插件 --> 1188 <!-- clean插件 -->
1108 <plugin> 1189 <plugin>
1109 <groupId>org.apache.maven.plugins</groupId> 1190 <groupId>org.apache.maven.plugins</groupId>
1110 <artifactId>maven-clean-plugin</artifactId> 1191 <artifactId>maven-clean-plugin</artifactId>
1111 <version>2.5</version> 1192 <version>2.5</version>
1112 </plugin> 1193 </plugin>
1113 1194
1114 <!-- ant插件 --> 1195 <!-- ant插件 -->
1115 <plugin> 1196 <plugin>
1116 <groupId>org.apache.maven.plugins</groupId> 1197 <groupId>org.apache.maven.plugins</groupId>
1117 <artifactId>maven-antrun-plugin</artifactId> 1198 <artifactId>maven-antrun-plugin</artifactId>
1118 <version>1.7</version> 1199 <version>1.7</version>
1119 </plugin> 1200 </plugin>
1120 1201
1121 <!-- dependency插件 --> 1202 <!-- dependency插件 -->
1122 <plugin> 1203 <plugin>
1123 <groupId>org.apache.maven.plugins</groupId> 1204 <groupId>org.apache.maven.plugins</groupId>
1124 <artifactId>maven-dependency-plugin</artifactId> 1205 <artifactId>maven-dependency-plugin</artifactId>
1125 <version>2.5.1</version> 1206 <version>2.5.1</version>
1126 </plugin> 1207 </plugin>
1127 </plugins> 1208 </plugins>
1128 </build> 1209 </build>
1129 1210
1130 <profiles> 1211 <profiles>
1131 <!-- 初始化数据库 --> 1212 <!-- 初始化数据库 -->
1132 <profile> 1213 <profile>
1133 <id>init-db</id> 1214 <id>init-db</id>
1134 <dependencies> 1215 <dependencies>
1135 <dependency> 1216 <dependency>
1136 <groupId>org.dbunit</groupId> 1217 <groupId>org.dbunit</groupId>
1137 <artifactId>dbunit</artifactId> 1218 <artifactId>dbunit</artifactId>
1138 <version>2.4.8</version> 1219 <version>2.4.8</version>
1139 </dependency> 1220 </dependency>
1140 <dependency> 1221 <dependency>
1141 <groupId>org.apache.poi</groupId> 1222 <groupId>org.apache.poi</groupId>
1142 <artifactId>poi</artifactId> 1223 <artifactId>poi</artifactId>
1143 <version>3.2-FINAL</version> 1224 <version>3.2-FINAL</version>
1144 </dependency> 1225 </dependency>
1145 </dependencies> 1226 </dependencies>
1146 <build> 1227 <build>
1147 <plugins> 1228 <plugins>
1148 <plugin> 1229 <plugin>
1149 <groupId>org.apache.maven.plugins</groupId> 1230 <groupId>org.apache.maven.plugins</groupId>
1150 <artifactId>maven-antrun-plugin</artifactId> 1231 <artifactId>maven-antrun-plugin</artifactId>
1151 <version>1.7</version> 1232 <version>1.7</version>
1152 <configuration> 1233 <configuration>
1153 <target> 1234 <target>
1154 1235
1155 <!-- mysql --> 1236 <!-- mysql -->
1156 <property name="dbunit.datatype" value="org.dbunit.ext.mysql.MySqlDataTypeFactory"/> 1237 <property name="dbunit.datatype" value="org.dbunit.ext.mysql.MySqlDataTypeFactory"/>
1157 1238
1158 <!-- mssql 1239 <!-- mssql
1159 <property name="dbunit.datatype" value="org.dbunit.ext.mssql.MsSqlDataTypeFactory" /> --> 1240 <property name="dbunit.datatype" value="org.dbunit.ext.mssql.MsSqlDataTypeFactory" /> -->
1160 1241
1161 <!-- oracle 1242 <!-- oracle
1162 <property name="dbunit.datatype" value="org.dbunit.ext.oracle.Oracle10DataTypeFactory" /> --> 1243 <property name="dbunit.datatype" value="org.dbunit.ext.oracle.Oracle10DataTypeFactory" /> -->
1163 1244
1164 <property file="src/main/resources/jeesite.properties"/> 1245 <property file="src/main/resources/jeesite.properties"/>
1165 <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" 1246 <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}"
1166 password="${jdbc.password}" 1247 password="${jdbc.password}"
1167 onerror="continue" encoding="${project.build.sourceEncoding}"> 1248 onerror="continue" encoding="${project.build.sourceEncoding}">
1168 <classpath refid="maven.test.classpath"/> 1249 <classpath refid="maven.test.classpath"/>
1169 <transaction src="db/sys/jeesite_${jdbc.type}.sql"/> 1250 <transaction src="db/sys/jeesite_${jdbc.type}.sql"/>
1170 <transaction src="db/cms/jeesite_${jdbc.type}.sql"/> 1251 <transaction src="db/cms/jeesite_${jdbc.type}.sql"/>
1171 <transaction src="db/oa/jeesite_${jdbc.type}.sql"/> 1252 <transaction src="db/oa/jeesite_${jdbc.type}.sql"/>
1172 <transaction src="db/gen/jeesite_${jdbc.type}.sql"/> 1253 <transaction src="db/gen/jeesite_${jdbc.type}.sql"/>
1173 <transaction src="db/gen/example_${jdbc.type}.sql"/> 1254 <transaction src="db/gen/example_${jdbc.type}.sql"/>
1174 <transaction src="db/test/jeesite_${jdbc.type}.sql"/> 1255 <transaction src="db/test/jeesite_${jdbc.type}.sql"/>
1175 <transaction src="db/act/drop/activiti.${jdbc.type}.drop.engine.sql"/> 1256 <transaction src="db/act/drop/activiti.${jdbc.type}.drop.engine.sql"/>
1176 <transaction src="db/act/drop/activiti.${jdbc.type}.drop.history.sql"/> 1257 <transaction src="db/act/drop/activiti.${jdbc.type}.drop.history.sql"/>
1177 <transaction src="db/act/drop/activiti.${jdbc.type}.drop.identity.sql"/> 1258 <transaction src="db/act/drop/activiti.${jdbc.type}.drop.identity.sql"/>
1178 <transaction src="db/act/create/activiti.${jdbc.type}.create.engine.sql"/> 1259 <transaction src="db/act/create/activiti.${jdbc.type}.create.engine.sql"/>
1179 <transaction src="db/act/create/activiti.${jdbc.type}.create.history.sql"/> 1260 <transaction src="db/act/create/activiti.${jdbc.type}.create.history.sql"/>
1180 <transaction src="db/act/create/activiti.${jdbc.type}.create.identity.sql"/> 1261 <transaction src="db/act/create/activiti.${jdbc.type}.create.identity.sql"/>
1181 </sql> 1262 </sql>
1182 1263
1183 <taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask" 1264 <taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask"
1184 classpathref="maven.test.classpath"/> 1265 classpathref="maven.test.classpath"/>
1185 1266
1186 <!-- mysql、mssql --> 1267 <!-- mysql、mssql -->
1187 <dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" 1268 <dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}"
1188 password="${jdbc.password}"> 1269 password="${jdbc.password}">
1189 1270
1190 <!-- oracle 1271 <!-- oracle
1191 <dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" 1272 <dbunit driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}"
1192 password="${jdbc.password}" schema="${jdbc.username}" > --> 1273 password="${jdbc.password}" schema="${jdbc.username}" > -->
1193 1274
1194 <dbconfig> 1275 <dbconfig>
1195 <property name="datatypeFactory" value="${dbunit.datatype}"/> 1276 <property name="datatypeFactory" value="${dbunit.datatype}"/>
1196 </dbconfig> 1277 </dbconfig>
1197 <classpath refid="maven.test.classpath"/> 1278 <classpath refid="maven.test.classpath"/>
1198 <operation type="INSERT" src="db/sys/jeesite_data.xls" format="xls" 1279 <operation type="INSERT" src="db/sys/jeesite_data.xls" format="xls"
1199 transaction="true"/> 1280 transaction="true"/>
1200 <operation type="INSERT" src="db/cms/jeesite_data.xls" format="xls" 1281 <operation type="INSERT" src="db/cms/jeesite_data.xls" format="xls"
1201 transaction="true"/> 1282 transaction="true"/>
1202 1283
1203 </dbunit> 1284 </dbunit>
1204 1285
1205 </target> 1286 </target>
1206 </configuration> 1287 </configuration>
1207 </plugin> 1288 </plugin>
1208 </plugins> 1289 </plugins>
1209 </build> 1290 </build>
1210 </profile> 1291 </profile>
1211 </profiles> 1292 </profiles>
1212 1293
1213 <!-- 开发者信息 --> 1294 <!-- 开发者信息 -->
1214 <developers> 1295 <developers>
1215 <developer> 1296 <developer>
1216 <id>thinkgem</id> 1297 <id>thinkgem</id>
1217 <name>WangZhen</name> 1298 <name>WangZhen</name>
1218 <email>thinkgem at 163.com</email> 1299 <email>thinkgem at 163.com</email>
1219 <roles> 1300 <roles>
1220 <role>Project lead</role> 1301 <role>Project lead</role>
1221 </roles> 1302 </roles>
1222 <timezone>+8</timezone> 1303 <timezone>+8</timezone>
1223 </developer> 1304 </developer>
1224 </developers> 1305 </developers>
1225 1306
1226 </project> 1307 </project>
......
...@@ -22,6 +22,7 @@ public interface ElecLicenseInfoDao extends CrudDao<ElecLicenseInfo> { ...@@ -22,6 +22,7 @@ public interface ElecLicenseInfoDao extends CrudDao<ElecLicenseInfo> {
22 22
23 /** 23 /**
24 * 更新合同ID和状态 24 * 更新合同ID和状态
25 *
25 * @param waitForCreateContract 26 * @param waitForCreateContract
26 * @return 27 * @return
27 */ 28 */
...@@ -68,4 +69,6 @@ public interface ElecLicenseInfoDao extends CrudDao<ElecLicenseInfo> { ...@@ -68,4 +69,6 @@ public interface ElecLicenseInfoDao extends CrudDao<ElecLicenseInfo> {
68 69
69 70
70 List<ElecLicenseInfo> selectZsbs(@Param("zsbs") String zsbs); 71 List<ElecLicenseInfo> selectZsbs(@Param("zsbs") String zsbs);
72
73 Integer updateJpgWjdzAndStatus(@Param("jpgPath") String jpgPath, @Param("bizId") String bizId);
71 } 74 }
......
1 package com.thinkgem.jeesite.modules.eci.entity;
2
3 import java.io.Serializable;
4
5 /**
6 * 模板参数
7 */
8 public class BdcqzsTemplate implements Serializable {
9
10 private static final long serialVersionUID = 1L;
11
12 /**
13 * 二维码
14 */
15 private String ewm;
16
17 /**
18 * 登记时间
19 */
20 private String djsj;
21
22 /**
23 * 不动产权证号
24 */
25 private String bdcqzh;
26
27 /**
28 * 权利人
29 */
30 private String qlr;
31
32 /**
33 * 共有情况
34 */
35 private String gyqk;
36
37 /**
38 * 坐落
39 */
40 private String zl;
41
42 /**
43 * 不动产单元号
44 */
45 private String bdcdyh;
46
47 /**
48 * 权利类型
49 */
50 private String qllx;
51
52 /**
53 * 权利性质
54 */
55 private String qlxz;
56
57 /**
58 * 用途
59 */
60 private String yt;
61
62 /**
63 * 面积
64 */
65 private String mj;
66
67 /**
68 * 使用期限
69 */
70 private String syqx;
71
72 /**
73 * 权力其他状况
74 */
75 private String qlqtzk;
76
77 /**
78 * 附记
79 */
80 private String fj;
81
82 public String getEwm() {
83 return ewm;
84 }
85
86 public void setEwm(String ewm) {
87 this.ewm = ewm;
88 }
89
90 public String getDjsj() {
91 return djsj;
92 }
93
94 public void setDjsj(String djsj) {
95 this.djsj = djsj;
96 }
97
98 public String getBdcqzh() {
99 return bdcqzh;
100 }
101
102 public void setBdcqzh(String bdcqzh) {
103 this.bdcqzh = bdcqzh;
104 }
105
106 public String getQlr() {
107 return qlr;
108 }
109
110 public void setQlr(String qlr) {
111 this.qlr = qlr;
112 }
113
114 public String getGyqk() {
115 return gyqk;
116 }
117
118 public void setGyqk(String gyqk) {
119 this.gyqk = gyqk;
120 }
121
122 public String getZl() {
123 return zl;
124 }
125
126 public void setZl(String zl) {
127 this.zl = zl;
128 }
129
130 public String getBdcdyh() {
131 return bdcdyh;
132 }
133
134 public void setBdcdyh(String bdcdyh) {
135 this.bdcdyh = bdcdyh;
136 }
137
138 public String getQllx() {
139 return qllx;
140 }
141
142 public void setQllx(String qllx) {
143 this.qllx = qllx;
144 }
145
146 public String getQlxz() {
147 return qlxz;
148 }
149
150 public void setQlxz(String qlxz) {
151 this.qlxz = qlxz;
152 }
153
154 public String getYt() {
155 return yt;
156 }
157
158 public void setYt(String yt) {
159 this.yt = yt;
160 }
161
162 public String getMj() {
163 return mj;
164 }
165
166 public void setMj(String mj) {
167 this.mj = mj;
168 }
169
170 public String getSyqx() {
171 return syqx;
172 }
173
174 public void setSyqx(String syqx) {
175 this.syqx = syqx;
176 }
177
178 public String getQlqtzk() {
179 return qlqtzk;
180 }
181
182 public void setQlqtzk(String qlqtzk) {
183 this.qlqtzk = qlqtzk;
184 }
185
186 public String getFj() {
187 return fj;
188 }
189
190 public void setFj(String fj) {
191 this.fj = fj;
192 }
193 }
...@@ -104,7 +104,7 @@ public class CreateContractRequest { ...@@ -104,7 +104,7 @@ public class CreateContractRequest {
104 * 否 104 * 否
105 * 模板参数 105 * 模板参数
106 */ 106 */
107 private List<T> documentParams; 107 private List<BdcqzsTemplate> documentParams;
108 108
109 /** 109 /**
110 * 否 110 * 否
...@@ -280,11 +280,11 @@ public class CreateContractRequest { ...@@ -280,11 +280,11 @@ public class CreateContractRequest {
280 this.signatories = signatories; 280 this.signatories = signatories;
281 } 281 }
282 282
283 public List<T> getDocumentParams() { 283 public List<BdcqzsTemplate> getDocumentParams() {
284 return documentParams; 284 return documentParams;
285 } 285 }
286 286
287 public void setDocumentParams(List<T> documentParams) { 287 public void setDocumentParams(List<BdcqzsTemplate> documentParams) {
288 this.documentParams = documentParams; 288 this.documentParams = documentParams;
289 } 289 }
290 290
......
1 package com.thinkgem.jeesite.modules.eci.entity;
2
3 /**
4 * 模板参数
5 */
6 public class DocumentParam {
7
8 private static final long serialVersionUID = 1L;
9
10 /**
11 * 是
12 * 模板参数名称
13 */
14 private String name;
15
16 /**
17 * 是
18 * 模板参数值
19 */
20 private String value;
21
22 public String getName() {
23 return name;
24 }
25
26 public void setName(String name) {
27 this.name = name;
28 }
29
30 public String getValue() {
31 return value;
32 }
33
34 public void setValue(String value) {
35 this.value = value;
36 }
37 }
...@@ -25,7 +25,7 @@ public class ElecLicenseInfo { ...@@ -25,7 +25,7 @@ public class ElecLicenseInfo {
25 /** 25 /**
26 * 合同文档ID 26 * 合同文档ID
27 */ 27 */
28 private Long documentId; 28 private String documentId;
29 29
30 /** 30 /**
31 * 合同类型.1:不动产登记证明.2:不动产权证书.3:不动产查询证明 31 * 合同类型.1:不动产登记证明.2:不动产权证书.3:不动产查询证明
...@@ -116,11 +116,11 @@ public class ElecLicenseInfo { ...@@ -116,11 +116,11 @@ public class ElecLicenseInfo {
116 this.documentParam = documentParam; 116 this.documentParam = documentParam;
117 } 117 }
118 118
119 public Long getDocumentId() { 119 public String getDocumentId() {
120 return documentId; 120 return documentId;
121 } 121 }
122 122
123 public void setDocumentId(Long documentId) { 123 public void setDocumentId(String documentId) {
124 this.documentId = documentId; 124 this.documentId = documentId;
125 } 125 }
126 126
......
...@@ -3,6 +3,7 @@ package com.thinkgem.jeesite.modules.eci.method; ...@@ -3,6 +3,7 @@ package com.thinkgem.jeesite.modules.eci.method;
3 import com.thinkgem.jeesite.common.config.Global; 3 import com.thinkgem.jeesite.common.config.Global;
4 import com.thinkgem.jeesite.common.utils.JsonUtil; 4 import com.thinkgem.jeesite.common.utils.JsonUtil;
5 import com.thinkgem.jeesite.modules.eci.dao.ElecLicenseInfoDao; 5 import com.thinkgem.jeesite.modules.eci.dao.ElecLicenseInfoDao;
6 import com.thinkgem.jeesite.modules.eci.entity.BdcqzsTemplate;
6 import com.thinkgem.jeesite.modules.eci.entity.CreateContractRequest; 7 import com.thinkgem.jeesite.modules.eci.entity.CreateContractRequest;
7 import com.thinkgem.jeesite.modules.eci.entity.CreateContractResponse; 8 import com.thinkgem.jeesite.modules.eci.entity.CreateContractResponse;
8 import com.thinkgem.jeesite.modules.eci.entity.ElecLicenseInfo; 9 import com.thinkgem.jeesite.modules.eci.entity.ElecLicenseInfo;
...@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Component; 15 import org.springframework.stereotype.Component;
15 import org.springframework.transaction.annotation.Transactional; 16 import org.springframework.transaction.annotation.Transactional;
16 17
18 import java.util.ArrayList;
17 import java.util.HashMap; 19 import java.util.HashMap;
18 import java.util.List; 20 import java.util.List;
19 import java.util.Map; 21 import java.util.Map;
...@@ -62,13 +64,17 @@ public class CreateContractRest { ...@@ -62,13 +64,17 @@ public class CreateContractRest {
62 request.setBizId(waitForCreateContract.getBizId()); 64 request.setBizId(waitForCreateContract.getBizId());
63 65
64 // TODO: 2022/2/14/0014 获取模板参数json字符串,处理方式待定 66 // TODO: 2022/2/14/0014 获取模板参数json字符串,处理方式待定
65 // request.setDocumentParams(waitForCreateContract.getDocumentParam()); 67 String bdcqzsTemplateStr = waitForCreateContract.getDocumentParam();
68 BdcqzsTemplate bdcqzsTemplate = JsonUtil.fromJson(bdcqzsTemplateStr, BdcqzsTemplate.class);
69 List<BdcqzsTemplate> templates = new ArrayList(){{
70 add(bdcqzsTemplate);
71 }};
72 request.setDocumentParams(templates);
66 73
67 //提交参数入库 74 //提交参数入库
68 String tjcs = JsonUtil.toJsonString(request); 75 String tjcs = JsonUtil.toJsonString(request);
69 logger.info("提交参数:" + tjcs); 76 logger.info("提交参数:" + tjcs);
70 waitForCreateContract.setTjcs(tjcs); 77 waitForCreateContract.setTjcs(tjcs);
71 // licenseInfoDao.updateTjcs(waitForCreateContract);
72 78
73 try { 79 try {
74 Map map = new HashMap(); 80 Map map = new HashMap();
......
...@@ -15,7 +15,7 @@ import java.util.List; ...@@ -15,7 +15,7 @@ import java.util.List;
15 @Component 15 @Component
16 public class DownloadContractRest { 16 public class DownloadContractRest {
17 17
18 private static final String DOCUMENT_DOWNLOAD = "/document/download"; 18 // private static final String DOCUMENT_DOWNLOAD = "/document/download";
19 19
20 @Autowired 20 @Autowired
21 ElecLicenseInfoDao licenseInfoDao; 21 ElecLicenseInfoDao licenseInfoDao;
...@@ -30,10 +30,10 @@ public class DownloadContractRest { ...@@ -30,10 +30,10 @@ public class DownloadContractRest {
30 30
31 for (ElecLicenseInfo waitForDownload : waitForDownloads) { 31 for (ElecLicenseInfo waitForDownload : waitForDownloads) {
32 String bizId = waitForDownload.getBizId(); 32 String bizId = waitForDownload.getBizId();
33 Long documentId = waitForDownload.getDocumentId(); 33 String documentId = waitForDownload.getDocumentId();
34 String url = Global.ECI_HOST + DOCUMENT_DOWNLOAD + "?documentId=" + documentId; 34 // String url = Global.ECI_HOST + DOCUMENT_DOWNLOAD + "?documentId=" + documentId;
35 35
36 String ofdPath = EciHttpUtil.download(url); 36 String ofdPath = EciHttpUtil.download(documentId);
37 if (ofdPath != null) { 37 if (ofdPath != null) {
38 //入库ofd文件地址 38 //入库ofd文件地址
39 licenseInfoDao.updateOfdWjdz(bizId, ofdPath); 39 licenseInfoDao.updateOfdWjdz(bizId, ofdPath);
......
1 package com.thinkgem.jeesite.modules.eci.method; 1 package com.thinkgem.jeesite.modules.eci.method;
2 2
3 import com.suwell.ofd.custom.agent.ConvertException;
4 import com.suwell.ofd.custom.agent.HTTPAgent;
5 import com.suwell.ofd.custom.wrapper.PackException;
3 import com.thinkgem.jeesite.modules.eci.dao.ElecLicenseInfoDao; 6 import com.thinkgem.jeesite.modules.eci.dao.ElecLicenseInfoDao;
4 import com.thinkgem.jeesite.modules.eci.entity.ElecLicenseInfo; 7 import com.thinkgem.jeesite.modules.eci.entity.ElecLicenseInfo;
5 import org.slf4j.Logger; 8 import org.slf4j.Logger;
...@@ -7,6 +10,9 @@ import org.slf4j.LoggerFactory; ...@@ -7,6 +10,9 @@ import org.slf4j.LoggerFactory;
7 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
9 12
13 import java.io.*;
14 import java.text.SimpleDateFormat;
15 import java.util.Date;
10 import java.util.List; 16 import java.util.List;
11 17
12 /** 18 /**
...@@ -17,6 +23,8 @@ public class OfdConvertRest { ...@@ -17,6 +23,8 @@ public class OfdConvertRest {
17 23
18 private Logger logger = LoggerFactory.getLogger(OfdConvertRest.class); 24 private Logger logger = LoggerFactory.getLogger(OfdConvertRest.class);
19 25
26 HTTPAgent ha = new HTTPAgent("http://172.16.56.42:8090");
27
20 @Autowired 28 @Autowired
21 ElecLicenseInfoDao licenseInfoDao; 29 ElecLicenseInfoDao licenseInfoDao;
22 30
...@@ -25,8 +33,42 @@ public class OfdConvertRest { ...@@ -25,8 +33,42 @@ public class OfdConvertRest {
25 List<ElecLicenseInfo> waitForConverts = licenseInfoDao.getWaitForConvert(); 33 List<ElecLicenseInfo> waitForConverts = licenseInfoDao.getWaitForConvert();
26 34
27 for (ElecLicenseInfo waitForConvert : waitForConverts) { 35 for (ElecLicenseInfo waitForConvert : waitForConverts) {
28 String ofdPath = waitForConvert.getOfdWjdz(); 36 OutputStream out = null;
29 // TODO: 2022/2/16/0016 ofd文件转换 37
38 //转换后文件输出路径
39 try {
40 String bizId = waitForConvert.getBizId();
41 String ofdPath = waitForConvert.getOfdWjdz();
42 // TODO: 2022/2/16/0016 ofd文件转换
43 File ofdFile = new File(ofdPath);
44
45 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dddd");
46 String dateDir = simpleDateFormat.format(new Date());
47
48 String documentId = waitForConvert.getDocumentId();
49
50 File tiffDir = new File("E:\\ECI\\TIFF" + dateDir + "\\");
51 if (!tiffDir.exists()) {
52 tiffDir.mkdirs();
53 }
54 File tiffFile = new File(tiffDir + documentId + ".tiff");
55 if (!tiffFile.exists()) {
56 tiffFile.createNewFile();
57 }
58
59 out = new FileOutputStream(tiffFile);
60 //输出格式。true输出格式为zip ；false输出格式为tiff
61 ha.OFDToImge(ofdFile, out, -1, false);
62 licenseInfoDao.updateJpgWjdzAndStatus(tiffFile.getAbsolutePath(), bizId);
63 } catch (PackException | ConvertException | IOException e) {
64 e.printStackTrace();
65 } finally {
66 try {
67 ha.close();
68 } catch (IOException e) {
69 e.printStackTrace();
70 }
71 }
30 72
31 } 73 }
32 } 74 }
......
...@@ -138,12 +138,13 @@ public class EciHttpUtil { ...@@ -138,12 +138,13 @@ public class EciHttpUtil {
138 public static String download(String documentId) { 138 public static String download(String documentId) {
139 139
140 String url = Global.ECI_HOST + "/document/download" + "?documentId=" + documentId; 140 String url = Global.ECI_HOST + "/document/download" + "?documentId=" + documentId;
141
141 HttpGet httpGet = new HttpGet(url); 142 HttpGet httpGet = new HttpGet(url);
142 CloseableHttpClient client = HttpClientBuilder.create().build(); 143 CloseableHttpClient client = HttpClientBuilder.create().build();
143 CloseableHttpResponse response = null; 144 CloseableHttpResponse response = null;
144 OutputStream out = null; 145 OutputStream out = null;
145 InputStream in = null; 146 InputStream in = null;
146 String path = null; 147 String absolutePath = null;
147 try { 148 try {
148 httpGet.setHeader("Content-Type", "application/json;charset=utf-8"); 149 httpGet.setHeader("Content-Type", "application/json;charset=utf-8");
149 //x-qys-signature生成方式：Md5(AppToken + AppSecret + timestamp)，获取32位小写值 150 //x-qys-signature生成方式：Md5(AppToken + AppSecret + timestamp)，获取32位小写值
...@@ -159,12 +160,17 @@ public class EciHttpUtil { ...@@ -159,12 +160,17 @@ public class EciHttpUtil {
159 if (length > 0) { 160 if (length > 0) {
160 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dddd"); 161 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dddd");
161 String dateDir = simpleDateFormat.format(new Date()); 162 String dateDir = simpleDateFormat.format(new Date());
162 File file = new File("E:\\ECI\\" + dateDir + "\\" + documentId + ".ofd"); 163 // File file = new File("E:\\ECI\\OFD\\" + dateDir + "\\" + documentId + ".ofd");
163 if (!file.exists()) { 164 File savePath = new File("E:\\ECI\\OFD\\" + dateDir);
164 file.createNewFile(); 165 if (!savePath.exists()) {
166 savePath.mkdirs();
167 }
168 File filePath = new File(savePath + "\\" + documentId+".ofd");
169 if (!filePath.exists()){
170 filePath.createNewFile();
165 } 171 }
166 172
167 out = new FileOutputStream(file); 173 out = new FileOutputStream(filePath);
168 byte[] buffer = new byte[4096]; 174 byte[] buffer = new byte[4096];
169 int readLength = 0; 175 int readLength = 0;
170 while ((readLength = in.read(buffer)) != -1) { 176 while ((readLength = in.read(buffer)) != -1) {
...@@ -172,7 +178,7 @@ public class EciHttpUtil { ...@@ -172,7 +178,7 @@ public class EciHttpUtil {
172 // System.arraycopy(buffer, 0, bytes, 0, readLength); 178 // System.arraycopy(buffer, 0, bytes, 0, readLength);
173 out.write(buffer, 0, readLength); 179 out.write(buffer, 0, readLength);
174 } 180 }
175 path = file.getAbsolutePath(); 181 absolutePath = filePath.getAbsolutePath();
176 out.flush(); 182 out.flush();
177 } 183 }
178 184
...@@ -188,7 +194,7 @@ public class EciHttpUtil { ...@@ -188,7 +194,7 @@ public class EciHttpUtil {
188 e.printStackTrace(); 194 e.printStackTrace();
189 } 195 }
190 } 196 }
191 return path; 197 return absolutePath;
192 } 198 }
193 199
194 } 200 }
......
...@@ -57,14 +57,18 @@ ...@@ -57,14 +57,18 @@
57 </update> 57 </update>
58 58
59 <insert id="insert"> 59 <insert id="insert">
60 INSERT INTO ELEC_LICENSE_INFO( 60 INSERT INTO ELEC_LICENSE_INFO(BIZ_ID, YWH, HTLX, ZSBS, DOCUMENT_PARAM)
61 BIZ_ID,YWH,HTLX,ZSBS,DOCUMENT_PARAM 61 VALUES (#{bizId},
62 ) VALUES ( 62 #{ywh},
63 #{bizId}, 63 #{htlx},
64 #{ywh}, 64 #{zsbs},
65 #{htlx}, 65 #{documentParam})
66 #{zsbs},
67 #{documentParam}
68 )
69 </insert> 66 </insert>
67
68 <update id="updateJpgWjdzAndStatus">
69 update ELEC_LICENSE_INFO
70 set JPG_WJDZ = #{jpgPath,jdbcType=VARCHAR},
71 SFZH = '1'
72 where BIZ_ID = #{bizId,jdbcType=VARCHAR}
73 </update>
70 </mapper> 74 </mapper>
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type