朱兆平 / spring cloud基础开发框架 · 提交

转到一个项目

作者 朱兆平
提交 61b409201ddccb05276e803d6c7e7359e17da90d 2 个父辈 31d27861 442df95b

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/com/tianbo/warehouse/util/RedisUtils.java
#	src/main/resources/mapping/USERSMapper.xml
内嵌 并排对比
正在显示 2 个修改的文件 包含 11 行增加 和 230 行删除
@@ -34,6 +34,10 @@ @@ -34,6 +34,10 @@
34 <artifactId>mybatis-spring-boot-starter</artifactId> 34 <artifactId>mybatis-spring-boot-starter</artifactId>
35 <version>1.3.2</version> 35 <version>1.3.2</version>
36 </dependency> 36 </dependency>
  37 + <dependency>
  38 + <groupId>org.springframework.boot</groupId>
  39 + <artifactId>spring-boot-starter-data-redis</artifactId>
  40 + </dependency>
37 <!--<dependency>--> 41 <!--<dependency>-->
38 <!--<groupId>org.springframework.boot</groupId>--> 42 <!--<groupId>org.springframework.boot</groupId>-->
39 <!--<artifactId>spring-boot-devtools</artifactId>--> 43 <!--<artifactId>spring-boot-devtools</artifactId>-->
@@ -232,16 +236,16 @@ @@ -232,16 +236,16 @@
232 <version>1.2.16</version> 236 <version>1.2.16</version>
233 </dependency> 237 </dependency>
234 <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api --> 238 <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
235 - <dependency> 239 +<!-- <dependency>
236 <groupId>org.slf4j</groupId> 240 <groupId>org.slf4j</groupId>
237 <artifactId>slf4j-api</artifactId> 241 <artifactId>slf4j-api</artifactId>
238 <version>1.6.1</version> 242 <version>1.6.1</version>
239 - </dependency> 243 + </dependency> -->
240 <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-jdk14 --> 244 <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-jdk14 -->
241 <dependency> 245 <dependency>
242 <groupId>org.slf4j</groupId> 246 <groupId>org.slf4j</groupId>
243 <artifactId>slf4j-jdk14</artifactId> 247 <artifactId>slf4j-jdk14</artifactId>
244 - <version>1.6.1</version> 248 + <version>1.6.1</version><!--$NO-MVN-MAN-VER$-->
245 <scope>test</scope> 249 <scope>test</scope>
246 </dependency> 250 </dependency>
247 <!-- https://mvnrepository.com/artifact/org.apache.cxf.xjcplugins/cxf-xjc-boolean --> 251 <!-- https://mvnrepository.com/artifact/org.apache.cxf.xjcplugins/cxf-xjc-boolean -->
@@ -251,230 +255,7 @@ @@ -251,230 +255,7 @@
251 <version>3.2.3</version> 255 <version>3.2.3</version>
252 </dependency> 256 </dependency>
253 257
254 -  
255 -  
256 - <!--添加本地IMF包-->  
257 - <dependency>  
258 - <groupId>com.caac</groupId>  
259 - <artifactId>imf</artifactId>  
260 - <version>1.0.0</version>  
261 - <scope>system</scope>  
262 - <systemPath>${project.basedir}/lib/IMFClient.1.0.0.jar</systemPath>  
263 - </dependency>  
264 - <dependency>  
265 - <groupId>com.caac.imf</groupId>  
266 - <artifactId>imfmessage</artifactId>  
267 - <version>1.0.0</version>  
268 - <scope>system</scope>  
269 - <systemPath>${project.basedir}/lib/imfmsg.jar</systemPath>  
270 - </dependency>  
271 - <dependency>  
272 - <groupId>com.caac.imf</groupId>  
273 - <artifactId>process</artifactId>  
274 - <version>1.0.0</version>  
275 - <scope>system</scope>  
276 - <systemPath>${project.basedir}/lib/ProcessService.jar</systemPath>  
277 - </dependency>  
278 - <dependency>  
279 - <groupId>com.caac.imf</groupId>  
280 - <artifactId>apiconfig</artifactId>  
281 - <version>1.0.0</version>  
282 - <scope>system</scope>  
283 - <systemPath>${project.basedir}/lib/apiConfig.jar</systemPath>  
284 - </dependency>  
285 - <dependency>  
286 - <groupId>com.caac.imf</groupId>  
287 - <artifactId>upload</artifactId>  
288 - <version>1.0.0</version>  
289 - <scope>system</scope>  
290 - <systemPath>${project.basedir}/lib/UploadService.jar</systemPath>  
291 - </dependency>  
292 - <dependency>  
293 - <groupId>com.caac.imf</groupId>  
294 - <artifactId>heartbeat</artifactId>  
295 - <version>1.0.0</version>  
296 - <scope>system</scope>  
297 - <systemPath>${project.basedir}/lib/HeartbeatService.jar</systemPath>  
298 - </dependency>  
299 - <dependency>  
300 - <groupId>com.caac.imf</groupId>  
301 - <artifactId>returnxml</artifactId>  
302 - <version>1.0.0</version>  
303 - <scope>system</scope>  
304 - <systemPath>${project.basedir}/lib/returnXml.jar</systemPath>  
305 - </dependency>  
306 - <!-- https://mvnrepository.com/artifact/org.hyperic/sigar -->  
307 - <dependency>  
308 - <groupId>org.hyperic</groupId>  
309 - <artifactId>sigar</artifactId>  
310 - <version>1.6.4</version>  
311 - <scope>system</scope>  
312 - <systemPath>${project.basedir}/lib/sigar.jar</systemPath>  
313 - </dependency>  
314 - <dependency>  
315 - <groupId>org.apache</groupId>  
316 - <artifactId>cxf</artifactId>  
317 - <version>2.3.2</version>  
318 - <scope>system</scope>  
319 - <systemPath>${project.basedir}/lib/cxf-2.3.2.jar</systemPath>  
320 - </dependency>  
321 - <dependency>  
322 - <groupId>org.apache.cxf</groupId>  
323 - <artifactId>xjc</artifactId>  
324 - <version>2.3.2</version>  
325 - <scope>system</scope>  
326 - <systemPath>${project.basedir}/lib/cxf-xjc-bug671-2.3.2.jar</systemPath>  
327 - </dependency>  
328 - <dependency>  
329 - <groupId>maven.org.apache</groupId>  
330 - <artifactId>cxf</artifactId>  
331 - <version>2.0</version>  
332 - <scope>system</scope>  
333 - <systemPath>${project.basedir}/lib/cxf-manifest.jar</systemPath>  
334 - </dependency>  
335 - <dependency>  
336 - <groupId>org.apache.cxf.xjc</groupId>  
337 - <artifactId>dv</artifactId>  
338 - <version>2.3.2</version>  
339 - <scope>system</scope>  
340 - <systemPath>${project.basedir}/lib/cxf-xjc-dv-2.3.2.jar</systemPath>  
341 - </dependency>  
342 - <dependency>  
343 - <groupId>org.apache.cxf.xjc</groupId>  
344 - <artifactId>ts</artifactId>  
345 - <version>2.3.2</version>  
346 - <scope>system</scope>  
347 - <systemPath>${project.basedir}/lib/cxf-xjc-ts-2.3.2.jar</systemPath>  
348 - </dependency>  
349 - <dependency>  
350 - <groupId>org.apache.xml</groupId>  
351 - <artifactId>xmlsec</artifactId>  
352 - <version>1.4.4</version>  
353 - <scope>system</scope>  
354 - <systemPath>${project.basedir}/lib/xmlsec-1.4.4.jar</systemPath>  
355 - </dependency>  
356 - <dependency>  
357 - <groupId>com.ibm.disthub2.impl</groupId>  
358 - <artifactId>cl3e</artifactId>  
359 - <version>1.0.0</version>  
360 - <scope>system</scope>  
361 - <systemPath>${project.basedir}/lib/CL3Export.jar</systemPath>  
362 - </dependency>  
363 - <dependency>  
364 - <groupId>com.ibm.disthub2.impl</groupId>  
365 - <artifactId>cl3ne</artifactId>  
366 - <version>1.0.0</version>  
367 - <scope>system</scope>  
368 - <systemPath>${project.basedir}/lib/CL3Nonexport.jar</systemPath>  
369 - </dependency>  
370 - <dependency>  
371 - <groupId>com.ibm.mq</groupId>  
372 - <artifactId>axis2</artifactId>  
373 - <version>1.0.0</version>  
374 - <scope>system</scope>  
375 - <systemPath>${project.basedir}/lib/com.ibm.mq.axis2.jar</systemPath>  
376 - </dependency>  
377 - <dependency>  
378 - <groupId>com.ibm.mq</groupId>  
379 - <artifactId>commonservices</artifactId>  
380 - <version>1.0.0</version>  
381 - <scope>system</scope>  
382 - <systemPath>${project.basedir}/lib/com.ibm.mq.commonservices.jar</systemPath>  
383 - </dependency>  
384 - <dependency>  
385 - <groupId>com.ibm.mq</groupId>  
386 - <artifactId>defaultconfig</artifactId>  
387 - <version>1.0.0</version>  
388 - <scope>system</scope>  
389 - <systemPath>${project.basedir}/lib/com.ibm.mq.defaultconfig.jar</systemPath>  
390 - </dependency>  
391 - <dependency>  
392 - <groupId>com.ibm.mq</groupId>  
393 - <artifactId>fta</artifactId>  
394 - <version>1.0.0</version>  
395 - <scope>system</scope>  
396 - <systemPath>${project.basedir}/lib/com.ibm.mq.fta.jar</systemPath>  
397 - </dependency>  
398 - <dependency>  
399 - <groupId>com.ibm.mq</groupId>  
400 - <artifactId>headers</artifactId>  
401 - <version>1.0.0</version>  
402 - <scope>system</scope>  
403 - <systemPath>${project.basedir}/lib/com.ibm.mq.headers.jar</systemPath>  
404 - </dependency>  
405 - <dependency>  
406 - <groupId>com.ibm</groupId>  
407 - <artifactId>mq</artifactId>  
408 - <version>1.0.0</version>  
409 - <scope>system</scope>  
410 - <systemPath>${project.basedir}/lib/com.ibm.mq.jar</systemPath>  
411 - </dependency>  
412 - <dependency>  
413 - <groupId>com.ibm</groupId>  
414 - <artifactId>jmqi</artifactId>  
415 - <version>1.0.0</version>  
416 - <scope>system</scope>  
417 - <systemPath>${project.basedir}/lib/com.ibm.mq.jmqi.jar</systemPath>  
418 - </dependency>  
419 - <dependency>  
420 - <groupId>com.ibm.mq</groupId>  
421 - <artifactId>jms.nojndi</artifactId>  
422 - <version>1.0.0</version>  
423 - <scope>system</scope>  
424 - <systemPath>${project.basedir}/lib/com.ibm.mq.jms.Nojndi.jar</systemPath>  
425 - </dependency>  
426 - <dependency>  
427 - <groupId>com.ibm.mq</groupId>  
428 - <artifactId>pcf</artifactId>  
429 - <version>1.0.0</version>  
430 - <scope>system</scope>  
431 - <systemPath>${project.basedir}/lib/com.ibm.mq.pcf.jar</systemPath>  
432 - </dependency>  
433 - <dependency>  
434 - <groupId>com.ibm.mq</groupId>  
435 - <artifactId>postcard</artifactId>  
436 - <version>1.0.0</version>  
437 - <scope>system</scope>  
438 - <systemPath>${project.basedir}/lib/com.ibm.mq.postcard.jar</systemPath>  
439 - </dependency>  
440 - <dependency>  
441 - <groupId>com.ibm.mq</groupId>  
442 - <artifactId>soap</artifactId>  
443 - <version>1.0.0</version>  
444 - <scope>system</scope>  
445 - <systemPath>${project.basedir}/lib/com.ibm.mq.soap.jar</systemPath>  
446 - </dependency>  
447 - <dependency>  
448 - <groupId>com.ibm.mq</groupId>  
449 - <artifactId>tools.ras</artifactId>  
450 - <version>1.0.0</version>  
451 - <scope>system</scope>  
452 - <systemPath>${project.basedir}/lib/com.ibm.mq.tools.ras.jar</systemPath>  
453 - </dependency>  
454 - <dependency>  
455 - <groupId>com.ibm.mq</groupId>  
456 - <artifactId>etclient</artifactId>  
457 - <version>1.0.0</version>  
458 - <scope>system</scope>  
459 - <systemPath>${project.basedir}/lib/com.ibm.mqetclient.jar</systemPath>  
460 - </dependency>  
461 - <dependency>  
462 - <groupId>com.ibm</groupId>  
463 - <artifactId>mqjms</artifactId>  
464 - <version>1.0.0</version>  
465 - <scope>system</scope>  
466 - <systemPath>${project.basedir}/lib/com.ibm.mqjms.jar</systemPath>  
467 - <!-- https://mvnrepository.com/artifact/javax.resource/connector -->  
468 - </dependency>  
469 - <dependency>  
470 - <groupId>javax.resource</groupId>  
471 - <artifactId>connector</artifactId>  
472 - <version>1.0</version>  
473 - <scope>system</scope>  
474 - <systemPath>${project.basedir}/lib/connector.jar</systemPath>  
475 - </dependency>  
476 -  
477 - </dependencies> 258 + </dependencies>
478 259
479 <dependencyManagement> 260 <dependencyManagement>
480 <dependencies> 261 <dependencies>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 path, url, method, iconCls, component 20 path, url, method, iconCls, component
21 </sql> 21 </sql>
22 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > 22 <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
23 - select 23 + select
24 <include refid="Base_Column_List" /> 24 <include refid="Base_Column_List" />
25 from permission 25 from permission
26 where permission_id = #{permissionId,jdbcType=INTEGER} ORDER BY permission_order 26 where permission_id = #{permissionId,jdbcType=INTEGER} ORDER BY permission_order
@@ -121,7 +121,7 @@ where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order @@ -121,7 +121,7 @@ where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order
121 description, ismenu,hidden, parent_id, 121 description, ismenu,hidden, parent_id,
122 path, url, method, iconCls, 122 path, url, method, iconCls,
123 component) 123 component)
124 - values (#{permissionId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{permissionOrder,jdbcType=VARCHAR}, 124 + values (#{permissionId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{permissionOrder,jdbcType=VARCHAR},
125 #{description,jdbcType=VARCHAR}, #{ismenu,jdbcType=BOOLEAN},#{hidden,jdbcType=BOOLEAN},#{parentId,jdbcType=INTEGER}, 125 #{description,jdbcType=VARCHAR}, #{ismenu,jdbcType=BOOLEAN},#{hidden,jdbcType=BOOLEAN},#{parentId,jdbcType=INTEGER},
126 #{path,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{iconCls,jdbcType=VARCHAR}, 126 #{path,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{iconCls,jdbcType=VARCHAR},
127 #{component,jdbcType=VARCHAR}) 127 #{component,jdbcType=VARCHAR})
@@ -259,4 +259,4 @@ where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order @@ -259,4 +259,4 @@ where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order
259 component = #{component,jdbcType=VARCHAR} 259 component = #{component,jdbcType=VARCHAR}
260 where permission_id = #{permissionId,jdbcType=INTEGER} 260 where permission_id = #{permissionId,jdbcType=INTEGER}
261 </update> 261 </update>
262 -</mapper>  
  262 +</mapper>