朱兆平 / 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 @@
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-devtools</artifactId>-->
... ... @@ -232,16 +236,16 @@
<version>1.2.16</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
<dependency>
<!-- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
</dependency> -->
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-jdk14 -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.6.1</version>
<version>1.6.1</version><!--$NO-MVN-MAN-VER$-->
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.cxf.xjcplugins/cxf-xjc-boolean -->
... ... @@ -251,230 +255,7 @@
<version>3.2.3</version>
</dependency>
<!--添加本地IMF包-->
<dependency>
<groupId>com.caac</groupId>
<artifactId>imf</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/IMFClient.1.0.0.jar</systemPath>
</dependency>
<dependency>
<groupId>com.caac.imf</groupId>
<artifactId>imfmessage</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/imfmsg.jar</systemPath>
</dependency>
<dependency>
<groupId>com.caac.imf</groupId>
<artifactId>process</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/ProcessService.jar</systemPath>
</dependency>
<dependency>
<groupId>com.caac.imf</groupId>
<artifactId>apiconfig</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/apiConfig.jar</systemPath>
</dependency>
<dependency>
<groupId>com.caac.imf</groupId>
<artifactId>upload</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/UploadService.jar</systemPath>
</dependency>
<dependency>
<groupId>com.caac.imf</groupId>
<artifactId>heartbeat</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/HeartbeatService.jar</systemPath>
</dependency>
<dependency>
<groupId>com.caac.imf</groupId>
<artifactId>returnxml</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/returnXml.jar</systemPath>
</dependency>
<!-- https://mvnrepository.com/artifact/org.hyperic/sigar -->
<dependency>
<groupId>org.hyperic</groupId>
<artifactId>sigar</artifactId>
<version>1.6.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/sigar.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache</groupId>
<artifactId>cxf</artifactId>
<version>2.3.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/cxf-2.3.2.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>xjc</artifactId>
<version>2.3.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/cxf-xjc-bug671-2.3.2.jar</systemPath>
</dependency>
<dependency>
<groupId>maven.org.apache</groupId>
<artifactId>cxf</artifactId>
<version>2.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/cxf-manifest.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjc</groupId>
<artifactId>dv</artifactId>
<version>2.3.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/cxf-xjc-dv-2.3.2.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjc</groupId>
<artifactId>ts</artifactId>
<version>2.3.2</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/cxf-xjc-ts-2.3.2.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.xml</groupId>
<artifactId>xmlsec</artifactId>
<version>1.4.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/xmlsec-1.4.4.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.disthub2.impl</groupId>
<artifactId>cl3e</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/CL3Export.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.disthub2.impl</groupId>
<artifactId>cl3ne</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/CL3Nonexport.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>axis2</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.axis2.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>commonservices</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.commonservices.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>defaultconfig</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.defaultconfig.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>fta</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.fta.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>headers</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.headers.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm</groupId>
<artifactId>mq</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm</groupId>
<artifactId>jmqi</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.jmqi.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>jms.nojndi</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.jms.Nojndi.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>pcf</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.pcf.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>postcard</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.postcard.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>soap</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.soap.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>tools.ras</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mq.tools.ras.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm.mq</groupId>
<artifactId>etclient</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mqetclient.jar</systemPath>
</dependency>
<dependency>
<groupId>com.ibm</groupId>
<artifactId>mqjms</artifactId>
<version>1.0.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/com.ibm.mqjms.jar</systemPath>
<!-- https://mvnrepository.com/artifact/javax.resource/connector -->
</dependency>
<dependency>
<groupId>javax.resource</groupId>
<artifactId>connector</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/connector.jar</systemPath>
</dependency>
</dependencies>
</dependencies>
<dependencyManagement>
<dependencies>
... ...
... ... @@ -20,7 +20,7 @@
path, url, method, iconCls, component
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
select
select
<include refid="Base_Column_List" />
from permission
where permission_id = #{permissionId,jdbcType=INTEGER} ORDER BY permission_order
... ... @@ -121,7 +121,7 @@ where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order
description, ismenu,hidden, parent_id,
path, url, method, iconCls,
component)
values (#{permissionId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{permissionOrder,jdbcType=VARCHAR},
values (#{permissionId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{permissionOrder,jdbcType=VARCHAR},
#{description,jdbcType=VARCHAR}, #{ismenu,jdbcType=BOOLEAN},#{hidden,jdbcType=BOOLEAN},#{parentId,jdbcType=INTEGER},
#{path,jdbcType=VARCHAR}, #{url,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{iconCls,jdbcType=VARCHAR},
#{component,jdbcType=VARCHAR})
... ... @@ -259,4 +259,4 @@ where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order
component = #{component,jdbcType=VARCHAR}
where permission_id = #{permissionId,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
</mapper>
... ...