Commit 28b54d3c authored by suhuiguang's avatar suhuiguang

1.修改mqsql驱动版本,原因liubase无法使用高版本8.0.22之上

2.增加调用jcs服务
parent 256c7f83
...@@ -94,6 +94,11 @@ ...@@ -94,6 +94,11 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId> <artifactId>spring-boot-starter-mail</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
<version>3.8.9</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
<artifactId>amos-boot-module-maintenance-biz</artifactId> <artifactId>amos-boot-module-maintenance-biz</artifactId>
<version>${amos-biz-boot.version}</version> <version>${amos-biz-boot.version}</version>
</dependency> </dependency>
<dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
...@@ -12,7 +12,7 @@ logging.config=classpath:logback-${spring.profiles.active}.xml ...@@ -12,7 +12,7 @@ logging.config=classpath:logback-${spring.profiles.active}.xml
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone = Asia/Shanghai spring.jackson.time-zone = Asia/Shanghai
#DB properties: #DB properties:
spring.datasource.driver-class-name = com.mysql.jdbc.Driver spring.datasource.driver-class-name = com.mysql.cj.jdbc.Driver
spring.datasource.hikari.maxLifetime = 1765000 spring.datasource.hikari.maxLifetime = 1765000
spring.datasource.hikari.maximum-pool-size = 10 spring.datasource.hikari.maximum-pool-size = 10
spring.datasource.testWhileIdle = true spring.datasource.testWhileIdle = true
...@@ -26,7 +26,7 @@ mybatis.mapper-locations = classpath:db/mapper/*.xml ...@@ -26,7 +26,7 @@ mybatis.mapper-locations = classpath:db/mapper/*.xml
mybatis-plus.mapper-locations=classpath:db/mapper/*.xml mybatis-plus.mapper-locations=classpath:db/mapper/*.xml
mybatis.type-aliases-package = com.yeejoin.amos.maintenance.business.entity.mybatis mybatis.type-aliases-package = com.yeejoin.amos.maintenance.business.entity.mybatis
mybatis.configuration.mapUnderscoreToCamelCase=true mybatis.configuration.mapUnderscoreToCamelCase=true
spring.liquibase.change-log=classpath:/db/changelog/changelog-master.xml spring.liquibase.changeLog=classpath:db/changelog/changelog-master.xml
spring.liquibase.enabled=true spring.liquibase.enabled=true
mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
...@@ -35,7 +35,7 @@ equip.feign.name=AMOS-EQUIPMANAGE ...@@ -35,7 +35,7 @@ equip.feign.name=AMOS-EQUIPMANAGE
equip.feign.prefix=/equip equip.feign.prefix=/equip
input.custom.prefix = QYZD input.custom.prefix = QYZD
input.statute.prefix = FG input.statute.prefix = FG
jcs.fegin.name=JCS-GJQ
Security.fegin.name=AMOS-API-PRIVILEGE Security.fegin.name=AMOS-API-PRIVILEGE
......
...@@ -6,4 +6,5 @@ ...@@ -6,4 +6,5 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
<include file="mt-1.0.0.xml" relativeToChangelogFile="true"/> <include file="mt-1.0.0.xml" relativeToChangelogFile="true"/>
<include file="mt-sql-task.xml" relativeToChangelogFile="true"/>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
<changeSet author="suhuiguang" id="1628836692856-1" runOnChange="true"> <changeSet author="suhuiguang" id="1628836692856-1" runOnChange="true">
<createProcedure procedureName="updatePlanTask" > <sql endDelimiter="#">
DROP PROCEDURE IF EXISTS `updatePlanTask`; DROP PROCEDURE IF EXISTS `updatePlanTask`#
CREATE PROCEDURE `updatePlanTask`(IN `planTaskId` int,IN `pointId` int,IN `planTaskDetailId` int,IN `executorId` bigint) CREATE PROCEDURE `updatePlanTask`(IN `planTaskId` int,IN `pointId` int,IN `planTaskDetailId` int,IN `executorId` bigint)
BEGIN BEGIN
declare num int ; declare num int ;
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
ELSE ELSE
update p_plan_task set finish_num = (num + 1), finish_status = 2 where id = planTaskId; update p_plan_task set finish_num = (num + 1), finish_status = 2 where id = planTaskId;
end if; end if;
END END#
</createProcedure> </sql>
</changeSet> </changeSet>
<changeSet author="suhuiguang" id="1629352951339-1" runOnChange="true"> <changeSet author="suhuiguang" id="1629352951339-1" runOnChange="true">
<sql> <sql>
......
...@@ -231,9 +231,18 @@ ...@@ -231,9 +231,18 @@
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId> <artifactId>mybatis-plus-boot-starter</artifactId>
</exclusion> </exclusion>
<exclusion>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<artifactId>mysql-connector-java</artifactId>
<groupId>mysql</groupId>
<version>8.0.22</version>
</dependency>
<dependency>
<groupId>org.typroject</groupId> <groupId>org.typroject</groupId>
<artifactId>tyboot-core-auth</artifactId> <artifactId>tyboot-core-auth</artifactId>
<version>${tyboot-version}</version> <version>${tyboot-version}</version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment