running all ok

pull/64/head
陈云志 5 years ago
parent b4d580ab79
commit 81715fc717

@ -20,13 +20,9 @@ apply from: "../build-config/build-all.gradle"
apply from: "../build-config/build-base.gradle" apply from: "../build-config/build-base.gradle"
apply from: "../build-config/build-boot-jar.gradle" apply from: "../build-config/build-boot-jar.gradle"
archivesBaseName = "project-${project.name}"
dependencies { dependencies {
implementation "com.ruoyi:ruoyi-api-system:${devVersion}"
implementation "com.ruoyi:ruoyi-common-core:${devVersion}" implementation "com.ruoyi:ruoyi-common-core:${devVersion}"
implementation "com.ruoyi:ruoyi-common-redis:${devVersion}" implementation "com.ruoyi:ruoyi-common-redis:${devVersion}"
implementation "com.ruoyi:ruoyi-common-security:${devVersion}"
implementation "com.github.penggle:kaptcha:2.3.2" implementation "com.github.penggle:kaptcha:2.3.2"
implementation "io.springfox:springfox-swagger2:2.9.2" implementation "io.springfox:springfox-swagger2:2.9.2"
@ -35,22 +31,19 @@ dependencies {
implementation "com.alibaba.csp:sentinel-datasource-nacos:1.8.0" implementation "com.alibaba.csp:sentinel-datasource-nacos:1.8.0"
// compile "com.alibaba.cloud:spring-cloud-alibaba-dependencies:${alibabaCloud}" // implementation "org.springframework:spring-context-support:5.2.9.RELEASE"
// implementation "org.springframework:spring-web:5.2.9.RELEASE"
implementation "com.alibaba.cloud:spring-cloud-alibaba-sentinel-gateway:${alibabaCloud}" implementation "com.alibaba.cloud:spring-cloud-alibaba-sentinel-gateway:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:${alibabaCloud}" implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:${alibabaCloud}" implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:${alibabaCloud}" implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:${alibabaCloud}"
implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-actuator:${springBoot}" implementation "org.springframework.boot:spring-boot-starter-actuator:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-data-redis:${springBoot}" implementation "org.springframework.boot:spring-boot-starter-data-redis:${springBoot}"
implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}" // implementation "org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR8"
implementation "org.springframework.cloud:spring-cloud-starter-gateway:${springCloud}"
// compile "org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR8"
implementation("org.springframework.cloud:spring-cloud-starter-gateway:${springCloud}") {
exclude group: "org.springframework.boot", module: "spring-boot-starter-web"
exclude group: "org.springframework.boot", module: "spring-boot-starter-webflux"
}
// implementation "org.springframework.boot:spring-boot-starter-webflux:${springBoot}"
} }
static def getGitVersion() { static def getGitVersion() {

@ -18,14 +18,6 @@
-- --
-- Table structure for table `gen_table` -- Table structure for table `gen_table`
-- --
DROP DATABASE IF EXISTS `pscada_online_config`;
CREATE DATABASE `pscada_online_config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
USE `pscada_online_config`;
DROP TABLE IF EXISTS `gen_table`; DROP TABLE IF EXISTS `gen_table`;
/*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET @saved_cs_client = @@character_set_client */;
@ -646,6 +638,10 @@ INSERT INTO `sys_user_role` VALUES (1,1),(2,2);
/*!40000 ALTER TABLE `sys_user_role` ENABLE KEYS */; /*!40000 ALTER TABLE `sys_user_role` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
--
-- Dumping events for database 'pscada_online'
--
-- --
-- Dumping routines for database 'pscada_online' -- Dumping routines for database 'pscada_online'
-- --
@ -659,4 +655,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2020-12-16 17:55:17 -- Dump completed on 2020-12-18 13:31:02

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save