From 3911536f257fedba3703ff0f78b31c1849d4869f Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Wed, 25 Mar 2020 17:31:56 +0800
Subject: [PATCH] 1、优化DockerFile 中Docker容器所需字体 2、增加kidgrow-mqcenter-rabbit 项目 3、修改kidgrow-logcenter项目名 4、优化kidgrow-log-spring-boot-starter 扩展point 日志 5、完善kidgrow-config中fat、dev 环境application.properties 6、优化Docker基础容器，优化Docker容器中对于验证码所需字体 7、优化kidgrow-web-manager 增加zuul 网关URL配置
---
kidgrow-uaa/kidgrow-uaa-server/dockerfont/scandal.ttf | 0
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/config.js | 2
kidgrow-uaa/kidgrow-uaa-server/dockerfont/ransom.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/ValidateCodeController.java | 5
kidgrow-uaa/kidgrow-uaa-server/dockerfont/cwisdom.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomhand.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/Dockerfile | 80 ++++++
kidgrow-uaa/kidgrow-uaa-server/dockerfont/BTTSOIEF.TTF | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/progbot.ttf | 0
kidgrow-config/src/main/resources/application-dev.properties | 3
kidgrow-uaa/kidgrow-uaa-server/dockerfont/7hours.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/SUBMERGD.TTF | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/pinball.ttf | 0
kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/send/TopicSender.java | 26 ++
kidgrow-uaa/kidgrow-uaa-server/dockerfont/technet.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/musicdbz.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/wolves.ttf | 0
kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/properties/LogDbProperties.java | 19 +
kidgrow-uaa/kidgrow-uaa-server/dockerfont/TOMBATS1.TTF | 0
kidgrow-web/kidgrow-web-manager/pom.xml | 2
kidgrow-uaa/kidgrow-uaa-server/dockerfont/donner.ttf | 0
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 4
kidgrow-uaa/kidgrow-uaa-server/dockerfont/constant.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombots.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/32768no.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/guildof.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/prefix.ttf | 0
pom.xml | 8
kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml | 2
kidgrow-uaa/kidgrow-uaa-server/dockerfont/initial.ttf | 0
kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/model/MqMessage.java | 31 ++
kidgrow-demo/kidgrow-demo-product/src/main/resources/application.yml | 2
kidgrow-uaa/kidgrow-uaa-server/dockerfont/zincboom.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/gauss.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats3.ttf | 0
kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/META-INF/spring.factories | 3
kidgrow-uaa/kidgrow-uaa-server/dockerfont/antelope.ttf | 0
kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/pom.xml | 30 ++
kidgrow-uaa/kidgrow-uaa-server/dockerfont/colophon.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/davis.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/DoctorAz.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/actionj.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/resurgen.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/lexo.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/suckgolf.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/headache.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats7.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/toast.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/secret.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/DOVES.TTF | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/yikatu.ttf | 0
kidgrow-business/kidgrow-mqcenter/pom.xml | 1
kidgrow-uaa/kidgrow-uaa-server/dockerfont/geodesic.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/gmt.ttf | 0
kidgrow-commons/kidgrow-log-spring-boot-starter/pom.xml | 12 +
kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile | 2
kidgrow-uaa/kidgrow-uaa-server/dockerfont/melanie.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/pom.xml | 6
kidgrow-uaa/kidgrow-uaa-server/dockerfont/dnahand.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/fresnel.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/natlog.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/antiblue.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/bboron.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/dyspro.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/hydrogen.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/faraday.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tetanus.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/linear.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/thisprty.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/dis.ttf | 0
kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/controller/TopicController.java | 30 ++
kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/RabbitMqApplication.java | 19 +
kidgrow-uaa/kidgrow-uaa-server/dockerfont/metalang.ttf | 0
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/service/AccessLogService.java | 6
kidgrow-uaa/kidgrow-uaa-server/dockerfont/ANGSTROM.TTF | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/opticbot.ttf | 0
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml | 2
kidgrow-uaa/kidgrow-uaa-server/dockerfont/signal.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tsmiles.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/PROTERON.TTF | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/nullp.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/robot.ttf | 0
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml | 2
kidgrow-uaa/kidgrow-uaa-server/dockerfont/cosinek.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/codon.ttf | 0
kidgrow-springcloud/kidgrow-springcloud-eureka/src/main/resources/application.yml | 4
kidgrow-config/src/main/resources/bootstrap.properties | 2
kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/config/RabbitConfig.java | 133 +++++++++++
kidgrow-config/src/main/resources/application-fat.properties | 47 +++
kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/recieve/TopicReceive.java | 38 +++
kidgrow-uaa/kidgrow-uaa-server/dockerfont/levity.ttf | 0
kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml | 2
kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml | 36 ++
kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/service/impl/DbAuditServiceImpl.java | 70 +++++
kidgrow-uaa/kidgrow-uaa-server/dockerfont/MAYQUEEN.TTF | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats4.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/germs.ttf | 0
kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/pom.xml | 22 +
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tuesday.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/px10.ttf | 0
kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/resources/application.yml | 23 +
kidgrow-uaa/kidgrow-uaa-server/dockerfont/nonblock.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats6.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tommys.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/epilog.ttf | 0
kidgrow-commons/pom.xml | 1
kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomnr.ttf | 0
kidgrow-uaa/kidgrow-uaa-server/dockerfont/valium.ttf | 0
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 5
kidgrow-business/kidgrow-code-generator/src/main/resources/application.yml | 2
110 files changed, 655 insertions(+), 27 deletions(-)
diff --git a/kidgrow-business/kidgrow-code-generator/src/main/resources/application.yml b/kidgrow-business/kidgrow-code-generator/src/main/resources/application.yml
index 217a228..51d6b15 100644
--- a/kidgrow-business/kidgrow-code-generator/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-code-generator/src/main/resources/application.yml
@@ -7,7 +7,7 @@
url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
- driver-class-name: com.mysql.jdbc.Driver
+# driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
aop-patterns: com.kidgrow.generator.controller.*,com.kidgrow.generator.mapper.*
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
index b0ec04d..e7c6109 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
@@ -13,7 +13,7 @@
url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
- driver-class-name: com.mysql.jdbc.Driver
+# driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
aop-patterns: com.kidgrow.filecenter.controller.*
diff --git a/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/pom.xml b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/pom.xml
new file mode 100644
index 0000000..0b3b65f
--- /dev/null
+++ b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>kidgrow-mqcenter</artifactId>
+ <groupId>com.kidgrow</groupId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>kidgrow-mqcenter-rabbit</artifactId>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>com.kidgrow</groupId>
+ <artifactId>kidgrow-rabbitmq-spring-boot-starter</artifactId>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.kidgrow</groupId>-->
+<!-- <artifactId>kidgrow-common-spring-boot-starter</artifactId>-->
+<!-- </dependency>-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/RabbitMqApplication.java b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/RabbitMqApplication.java
new file mode 100644
index 0000000..c7b66c7
--- /dev/null
+++ b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/RabbitMqApplication.java
@@ -0,0 +1,19 @@
+package com.kidgrow;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: <br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/3/23 18:56 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@SpringBootApplication
+public class RabbitMqApplication {
+ public static void main(String[] args) {
+ SpringApplication.run(RabbitMqApplication.class,args);
+ }
+}
diff --git a/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/controller/TopicController.java b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/controller/TopicController.java
new file mode 100644
index 0000000..a770d8a
--- /dev/null
+++ b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/controller/TopicController.java
@@ -0,0 +1,30 @@
+package com.kidgrow.rabbitmq.controller;
+
+import com.kidgrow.rabbitmq.send.TopicSender;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: <br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/3/23 18:51 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@Slf4j
+@RestController
+@RequestMapping("/topic")
+public class TopicController {
+
+ @Autowired
+ private TopicSender topicSender;
+
+ @RequestMapping("/send")
+ public String send(){
+ topicSender.send();
+ return "OK";
+ }
+}
diff --git a/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/recieve/TopicReceive.java b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/recieve/TopicReceive.java
new file mode 100644
index 0000000..b655ac1
--- /dev/null
+++ b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/recieve/TopicReceive.java
@@ -0,0 +1,38 @@
+package com.kidgrow.rabbitmq.recieve;
+
+import com.rabbitmq.client.Channel;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: <br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/3/23 18:49 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@Component
+@RabbitListener(queues = "test_queue")
+public class TopicReceive {
+ @RabbitHandler
+ public void process(String messages, Message message, Channel channel) {
+ // 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
+ final long deliveryTag = message.getMessageProperties().getDeliveryTag();
+ try {
+ System.out.println("Topic Receiver : " + messages);
+ // 通知 MQ 消息已被成功消费,可以ACK了
+ channel.basicAck(deliveryTag, false);
+ }
+ catch (Exception e) {
+ try {
+ // 处理失败,重新压入MQ
+ channel.basicRecover();
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+}
diff --git a/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/send/TopicSender.java b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/send/TopicSender.java
new file mode 100644
index 0000000..d977f48
--- /dev/null
+++ b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/send/TopicSender.java
@@ -0,0 +1,26 @@
+package com.kidgrow.rabbitmq.send;
+
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: <br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/3/23 18:45 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@Component
+public class TopicSender {
+ @Autowired
+ private AmqpTemplate rabbitTemplate;
+
+ public void send() {
+ for(int i=1;i<10000;i++) {
+ String context = "hi, i am message:"+i;
+ this.rabbitTemplate.convertAndSend("test_exchange", "test_routingKey", context);
+ }
+ }
+}
diff --git a/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/resources/application.yml b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/resources/application.yml
new file mode 100644
index 0000000..4b045ff
--- /dev/null
+++ b/kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/resources/application.yml
@@ -0,0 +1,23 @@
+server:
+ port: 9909
+spring:
+ rabbitmq:
+ host: 182.92.99.224
+ port: 5672
+ username: liuke
+ password: kidgrow2020
+ #交换机名称
+ exchangeName: test_exchange
+ #队列名称
+ queueName: test_queue
+ #routingKeyName
+ routingKeyName: test_routingKey
+ virtual-host: my_vhost
+ #开启重试机制
+ listener:
+ simple:
+ #采用手动应答
+ acknowledge-mode: manual
+ retry:
+ enabled: true
+ max-attempts: 5
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-mqcenter/pom.xml b/kidgrow-business/kidgrow-mqcenter/pom.xml
index 9a02e2d..b96cf1c 100644
--- a/kidgrow-business/kidgrow-mqcenter/pom.xml
+++ b/kidgrow-business/kidgrow-mqcenter/pom.xml
@@ -13,5 +13,6 @@
<modules>
<module>kidgrow-mqcenter-rocket</module>
+ <module>kidgrow-mqcenter-rabbit</module>
</modules>
</project>
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
index c4801ad..5a5429e 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
@@ -13,7 +13,7 @@
url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
- driver-class-name: com.mysql.jdbc.Driver
+# driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
aop-patterns: com.kidgrow.usercenter.controller.*,com.kidgrow.usercenter.mapper.*
diff --git a/kidgrow-commons/kidgrow-log-spring-boot-starter/pom.xml b/kidgrow-commons/kidgrow-log-spring-boot-starter/pom.xml
index fd0e25e..6ee9461 100644
--- a/kidgrow-commons/kidgrow-log-spring-boot-starter/pom.xml
+++ b/kidgrow-commons/kidgrow-log-spring-boot-starter/pom.xml
@@ -32,5 +32,17 @@
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/properties/LogDbProperties.java b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/properties/LogDbProperties.java
new file mode 100644
index 0000000..2b7f2c0
--- /dev/null
+++ b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/properties/LogDbProperties.java
@@ -0,0 +1,19 @@
+package com.kidgrow.log.properties;
+
+import com.zaxxer.hikari.HikariConfig;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: 日志数据源配置
+ * logType=db时生效(非必须)，如果不配置则使用当前数据源<br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/3/25 17:01 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@Data
+@ConfigurationProperties(prefix = "kidgrow.audit-log.datasource")
+public class LogDbProperties extends HikariConfig {
+}
diff --git a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/service/impl/DbAuditServiceImpl.java b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/service/impl/DbAuditServiceImpl.java
new file mode 100644
index 0000000..dd63124
--- /dev/null
+++ b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/service/impl/DbAuditServiceImpl.java
@@ -0,0 +1,70 @@
+package com.kidgrow.log.service.impl;
+
+import com.kidgrow.log.model.Audit;
+import com.kidgrow.log.properties.LogDbProperties;
+import com.kidgrow.log.service.IAuditService;
+import com.zaxxer.hikari.HikariDataSource;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.scheduling.annotation.Async;
+
+import javax.annotation.PostConstruct;
+import javax.sql.DataSource;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: 审计日志实现类-数据库<br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/3/25 16:58 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@Slf4j
+@ConditionalOnProperty(name = "kidgrow.audit-log.log-type", havingValue = "db")
+@ConditionalOnClass(JdbcTemplate.class)
+public class DbAuditServiceImpl implements IAuditService {
+ private static final String INSERT_SQL = " insert into sys_logger " +
+ " (application_name, class_name, method_name, user_id, user_name, client_id, operation, timestamp) " +
+ " values (?,?,?,?,?,?,?,?)";
+
+ private final JdbcTemplate jdbcTemplate;
+
+ public DbAuditServiceImpl(@Autowired(required = false) LogDbProperties logDbProperties, DataSource dataSource) {
+ //优先使用配置的日志数据源，否则使用默认的数据源
+ if (logDbProperties != null && StringUtils.isNotEmpty(logDbProperties.getJdbcUrl())) {
+ dataSource = new HikariDataSource(logDbProperties);
+ }
+ this.jdbcTemplate = new JdbcTemplate(dataSource);
+ }
+
+ @PostConstruct
+ public void init() {
+ String sql = "CREATE TABLE IF NOT EXISTS `sys_logger` (\n" +
+ " `id` int(11) NOT NULL AUTO_INCREMENT,\n" +
+ " `application_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '应用名',\n" +
+ " `class_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类名',\n" +
+ " `method_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '方法名',\n" +
+ " `user_id` int(11) NULL COMMENT '用户id',\n" +
+ " `user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '用户名',\n" +
+ " `client_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '租户id',\n" +
+ " `operation` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '操作信息',\n" +
+ " `timestamp` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建时间',\n" +
+ " PRIMARY KEY (`id`) USING BTREE\n" +
+ ") ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;";
+ this.jdbcTemplate.execute(sql);
+ }
+
+ @Async
+ @Override
+ public void save(Audit audit) {
+ this.jdbcTemplate.update(INSERT_SQL
+ , audit.getApplicationName(), audit.getClassName(), audit.getMethodName()
+ , audit.getUserId(), audit.getUserName(), audit.getClientId()
+ , audit.getOperation(), audit.getTimestamp());
+ }
+}
+
diff --git a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/META-INF/spring.factories b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/META-INF/spring.factories
index a0fe053..2a2cfa5 100644
--- a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/META-INF/spring.factories
+++ b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -3,3 +3,6 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.kidgrow.log.config.LogAutoConfigure
+com.kidgrow.log.service.impl.LoggerAuditServiceImpl,\
+com.kidgrow.log.service.impl.DbAuditServiceImpl,\
+com.kidgrow.log.aspect.AuditLogAspect
diff --git a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml
index 7eee33f..3fe6552 100644
--- a/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml
+++ b/kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/resources/logback-spring.xml
@@ -4,6 +4,7 @@
<springProperty name="APP_NAME" scope="context" source="spring.application.name"/>
<springProperty name="LOG_FILE" scope="context" source="logging.file" defaultValue="../logs/application/${APP_NAME}"/>
<springProperty name="LOG_POINT_FILE" scope="context" source="logging.file" defaultValue="../logs/point"/>
+ <springProperty name="LOG_AUDIT_FILE" scope="context" source="logging.file" defaultValue="../logs/audit"/>
<springProperty name="LOG_MAXFILESIZE" scope="context" source="logback.filesize" defaultValue="50MB"/>
<springProperty name="LOG_FILEMAXDAY" scope="context" source="logback.filemaxday" defaultValue="7"/>
<springProperty name="ServerIP" scope="context" source="spring.cloud.client.ip-address" defaultValue="0.0.0.0"/>
@@ -64,21 +65,46 @@
<maxFileSize>${LOG_MAXFILESIZE}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>INFO</level>
- </filter>
+ </appender>
+
+ <appender name="audit_log" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${LOG_AUDIT_FILE}/audit.log</file>
+ <encoder>
+ <pattern>%msg%n</pattern>
+ <charset>UTF-8</charset>
+ </encoder>
+ <!-- 基于时间的分包策略 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${LOG_AUDIT_FILE}/audit.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!--保留时间,单位:天-->
+ <maxHistory>${LOG_FILEMAXDAY}</maxHistory>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>${LOG_MAXFILESIZE}</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
</appender>
<appender name="point_log_async" class="ch.qos.logback.classic.AsyncAppender">
<discardingThreshold>0</discardingThreshold>
<appender-ref ref="point_log"/>
</appender>
- <logger name="com.kidgrow.log.monitor" level="debug" addtivity="false">
+ <appender name="file_async" class="ch.qos.logback.classic.AsyncAppender">
+ <discardingThreshold>0</discardingThreshold>
+ <appender-ref ref="FileAppender"/>
+ </appender>
+ <appender name="audit_log_async" class="ch.qos.logback.classic.AsyncAppender">
+ <discardingThreshold>0</discardingThreshold>
+ <appender-ref ref="audit_log"/>
+ </appender>
+ <logger name="com.central.log.monitor" level="debug" addtivity="false">
<appender-ref ref="point_log_async" />
+ </logger>
+ <logger name="com.central.log.service.impl.LoggerAuditServiceImpl" level="debug" addtivity="false">
+ <appender-ref ref="audit_log_async" />
</logger>
<root level="INFO">
<appender-ref ref="StdoutAppender"/>
- <appender-ref ref="FileAppender"/>
+ <appender-ref ref="file_async"/>
</root>
</configuration>
diff --git a/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/pom.xml b/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/pom.xml
new file mode 100644
index 0000000..f6e1267
--- /dev/null
+++ b/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>kidgrow-commons</artifactId>
+ <groupId>com.kidgrow</groupId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>kidgrow-rabbitmq-spring-boot-starter</artifactId>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-amqp</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/config/RabbitConfig.java b/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/config/RabbitConfig.java
new file mode 100644
index 0000000..bcf5d4f
--- /dev/null
+++ b/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/config/RabbitConfig.java
@@ -0,0 +1,133 @@
+package com.kidgrow.rabbitmq.config;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.*;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: RabbitMQ连接基本配置<br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/3/23 17:14 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@ConfigurationProperties(prefix = "spring.rabbitmq")
+@Slf4j
+@Data
+@Configuration
+public class RabbitConfig {
+
+ /**
+ * RabbitMq服务器IP
+ */
+ private String host;
+ /**
+ * 端口
+ */
+ private int port;
+ /**
+ * 用户名
+ */
+ private String username;
+ /**
+ * 密码
+ */
+ private String password;
+ /**
+ * Virtual Hosts权限管理
+ */
+ private String virtualHost;
+ /**
+ * 交换机名称
+ */
+ private String exchangeName;
+ /**
+ * 队列名称
+ */
+ private String queueName;
+ /**
+ * routingKeyName名称
+ */
+ private String routingKeyName;
+
+ @Bean
+ public ConnectionFactory connectionFactory() {
+ CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host,port);
+ connectionFactory.setUsername(username);
+ connectionFactory.setPassword(password);
+ connectionFactory.setVirtualHost(virtualHost);
+ connectionFactory.setPublisherConfirms(true);
+ connectionFactory.setPublisherReturns(true);
+ //当Channel数量大于缓存数量时，多出来没法放进缓存的会被关闭。
+ connectionFactory.setChannelCacheSize(10);
+ //2、CHANNEL模式，程序运行期间ConnectionFactory会维护着一个Connection，
+ // 所有的操作都会使用这个Connection，但一个Connection中可以有多个Channel，
+ // 操作rabbitmq之前都必须先获取到一个Channel，
+ // 否则就会阻塞（可以通过setChannelCheckoutTimeout()设置等待时间），
+ // 这些Channel会被缓存（缓存的数量可以通过setChannelCacheSize()设置）；
+ connectionFactory.setCacheMode(CachingConnectionFactory.CacheMode.CONNECTION); //设置CONNECTION模式，可创建多个Connection连接
+ //单位：毫秒；配合channelCacheSize不仅是缓存数量，而且是最大的数量。
+ // 从缓存获取不到可用的Channel时，不会创建新的Channel，会等待这个值设置的毫秒数
+ //同时，在CONNECTION模式，这个值也会影响获取Connection的等待时间，
+ // 超时获取不到Connection也会抛出AmqpTimeoutException异常。
+ connectionFactory.setChannelCheckoutTimeout(600);
+ //仅在CONNECTION模式使用，设置Connection的缓存数量。
+ connectionFactory.setConnectionCacheSize(3);
+ //setConnectionLimit：仅在CONNECTION模式使用，设置Connection的数量上限。
+ connectionFactory.setConnectionLimit(10);
+ return connectionFactory;
+ }
+
+
+ @Bean
+ public RabbitAdmin rabbitAdmin(@Autowired ConnectionFactory connectionFactory) {
+ return new RabbitAdmin(connectionFactory);
+ }
+
+
+ @Bean
+ public RabbitTemplate rabbitTemplate(@Autowired ConnectionFactory connectionFactory) {
+ RabbitTemplate template = new RabbitTemplate(connectionFactory);
+ template.setExchange(exchangeName);
+ //客户端开启confirm模式
+ template.setMandatory(true);
+ template.setConfirmCallback(new RabbitTemplate.ConfirmCallback() {
+ @Override
+ public void confirm(CorrelationData correlationData, boolean ack, String cause) {
+ log.info("消息发送成功:correlationData({}),ack({}),cause({})", correlationData, ack, cause);
+ }
+ });
+ template.setReturnCallback(new RabbitTemplate.ReturnCallback() {
+ @Override
+ public void returnedMessage(Message message, int replyCode, String replyText, String exchange, String routingKey) {
+ log.info("消息丢失:exchange({}),route({}),replyCode({}),replyText({}),message:{}", exchange, routingKey, replyCode, replyText, message);
+ }
+ });
+ return template;
+ }
+
+ @Bean
+ public TopicExchange exchange() {
+ return new TopicExchange(exchangeName);
+ }
+
+ @Bean
+ public Queue KidgrowQueue() {
+ return new Queue(queueName);
+ }
+
+ @Bean
+ Binding bindingExchangeMessage(Queue kidgrowQueue, TopicExchange exchange) {
+ return BindingBuilder.bind(kidgrowQueue).to(exchange).with(routingKeyName);
+ }
+}
diff --git a/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/model/MqMessage.java b/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/model/MqMessage.java
new file mode 100644
index 0000000..bba8936
--- /dev/null
+++ b/kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/model/MqMessage.java
@@ -0,0 +1,31 @@
+package com.kidgrow.rabbitmq.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @Description: 消息主体信息<br>
+ * @Project: <br>
+ * @CreateDate: Created in 2020/3/23 17:08 <br>
+ * @Author: <a href="4345453@kidgrow.com">liuke</a>
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class MqMessage {
+ /**
+ * 交换机
+ */
+ private String topic;
+ /**
+ * 匹配路由key，*匹配一个，#匹配多个
+ */
+ private String tags;
+ /**
+ * 消息主体对象内容
+ */
+ private Object body;
+}
diff --git a/kidgrow-commons/pom.xml b/kidgrow-commons/pom.xml
index 490f1a6..5096ebd 100644
--- a/kidgrow-commons/pom.xml
+++ b/kidgrow-commons/pom.xml
@@ -21,6 +21,7 @@
<module>kidgrow-authclient-spring-boot-starter</module>
<module>kidgrow-ribbon-spring-boot-starter</module>
<module>kidgrow-sentinel-spring-boot-starter</module>
+ <module>kidgrow-rabbitmq-spring-boot-starter</module>
</modules>
diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index 485ad70..fbe91e5 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -1,9 +1,10 @@
+#\u5F00\u53D1\u73AF\u5883
########################## \u7EDF\u4E00\u53D8\u91CF\u914D\u7F6E ##########################
##### \u6570\u636E\u5E93\u914D\u7F6E
kidgrow.datasource.ip=192.168.2.240
kidgrow.datasource.username=root
kidgrow.datasource.password=kidgrow2020
-
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
##### Redis\u914D\u7F6E
# \u662F\u5426\u5F00\u542FRedis\u7F13\u5B58 true\u5F00\u542F false \u5173\u95ED
spring.redis.open=true
diff --git a/kidgrow-config/src/main/resources/application-fat.properties b/kidgrow-config/src/main/resources/application-fat.properties
index 158c74c..4c18ec2 100644
--- a/kidgrow-config/src/main/resources/application-fat.properties
+++ b/kidgrow-config/src/main/resources/application-fat.properties
@@ -1 +1,46 @@
-# \u6D4B\u8BD5\u73AF\u5883
\ No newline at end of file
+# \u6D4B\u8BD5\u73AF\u5883
+########################## \u7EDF\u4E00\u53D8\u91CF\u914D\u7F6E ##########################
+##### \u6570\u636E\u5E93\u914D\u7F6E
+kidgrow.datasource.ip=rm-2ze84sb2l40k33a034o.mysql.rds.aliyuncs.com
+kidgrow.datasource.username=yingdawangluo
+kidgrow.datasource.password=Yingdawangluo2020
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+##### Redis\u914D\u7F6E
+# \u662F\u5426\u5F00\u542FRedis\u7F13\u5B58 true\u5F00\u542F false \u5173\u95ED
+spring.redis.open=true
+spring.redis.host=182.92.99.224
+spring.redis.port=6379
+spring.redis.password=kidgrow
+spring.redis.timeout=5000
+
+#\u963F\u91CCDruid\u914D\u7F6E
+kidgrow.druid.loginname=admin
+kidgrow.druid.loginpwd=123456
+
+#eureka \u6CE8\u518C\u4E2D\u5FC3Url
+kidgrow.eureka.client.serviceUrl.defaultZone=http://172.17.97.143:9001/eureka/
+kidgrow.eureka.instance.hostname=172.17.97.143
+##eureka client\u53D1\u9001\u5FC3\u8DF3\u7ED9server\u7AEF\u7684\u9891\u7387
+eureka.instance.lease-renewal-interval-in-seconds=30
+#eureka client\u95F4\u9694\u591A\u4E45\u53BB\u62C9\u53D6\u670D\u52A1\u6CE8\u518C\u4FE1\u606F\uFF0C\u9ED8\u8BA4\u4E3A30\u79D2\uFF0C\u5BF9\u4E8Eapi-gateway\uFF0C\u5982\u679C\u8981\u8FC5\u901F\u83B7\u53D6\u670D\u52A1\u6CE8\u518C\u72B6\u6001\uFF0C\u53EF\u4EE5\u7F29\u5C0F\u8BE5\u503C\uFF0C\u6BD4\u59825\u79D2
+eureka.instance.lease-expiration-duration-in-seconds=30
+
+##### elasticsearch\u914D\u7F6E
+kidgrow.elasticsearch.cluster-name=kidgrow-es
+kidgrow.elasticsearch.cluster-nodes=123.57.164.62
+
+##### sentinel\u914D\u7F6E
+kidgrow.sentinel.dashboard=127.0.0.1:6999
+
+##### fastDFS\u914D\u7F6E
+kidgrow.fdfs.web-url=127.0.0.1
+kidgrow.fdfs.trackerList=${kidgrow.fdfs.web-url}:22122
+
+##### \u65E5\u5FD7\u94FE\u8DEF\u8FFD\u8E2A
+kidgrow.trace.enable=true
+
+##### \u8D1F\u8F7D\u5747\u8861\u9694\u79BB(version\u9694\u79BB\uFF0C\u53EA\u9002\u7528\u4E8E\u5F00\u53D1\u73AF\u5883)
+kidgrow.ribbon.isolation.enabled=false
+
+##### mybatis-plus\u6253\u5370\u5B8C\u6574sql(\u53EA\u9002\u7528\u4E8E\u5F00\u53D1\u73AF\u5883)
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file
diff --git a/kidgrow-config/src/main/resources/bootstrap.properties b/kidgrow-config/src/main/resources/bootstrap.properties
index 9eed521..971d7b5 100644
--- a/kidgrow-config/src/main/resources/bootstrap.properties
+++ b/kidgrow-config/src/main/resources/bootstrap.properties
@@ -1,6 +1,6 @@
########################## bootstrap\u7EA7\u522B\u901A\u7528\u914D\u7F6E ##########################
# \u9ED8\u8BA4\u5F00\u53D1\u73AF\u5883
-spring.profiles.active=dev
+spring.profiles.active=fat
##### spring-boot-actuator\u914D\u7F6E
management.endpoints.web.exposure.include=*
diff --git a/kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml b/kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml
index 77b0393..e27a54f 100644
--- a/kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml
+++ b/kidgrow-demo/kidgrow-demo-order/src/main/resources/application.yml
@@ -14,7 +14,7 @@
url: jdbc:mysql://${kidgrow.datasource.ip}:3306/demo_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
- driver-class-name: com.mysql.jdbc.Driver
+# driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
aop-patterns: com.kidgrow.order.controller.*,com.kidgrow.order.mapper.*
diff --git a/kidgrow-demo/kidgrow-demo-product/src/main/resources/application.yml b/kidgrow-demo/kidgrow-demo-product/src/main/resources/application.yml
index bd9cd39..9ed8fe8 100644
--- a/kidgrow-demo/kidgrow-demo-product/src/main/resources/application.yml
+++ b/kidgrow-demo/kidgrow-demo-product/src/main/resources/application.yml
@@ -12,7 +12,7 @@
url: jdbc:mysql://${kidgrow.datasource.ip}:3306/demo_order?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
- driver-class-name: com.mysql.jdbc.Driver
+# driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
aop-patterns: com.kidgrow.order.controller.*,com.kidgrow.order.mapper.*
diff --git a/kidgrow-springcloud/kidgrow-springcloud-eureka/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-eureka/src/main/resources/application.yml
index 8df6b78..1e490c2 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-eureka/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-eureka/src/main/resources/application.yml
@@ -14,7 +14,7 @@
eureka:
instance:
###注册中心ip地址
- hostname: 192.168.1.103
+ hostname: 172.17.97.143
lease-renewal-interval-in-seconds: 30
lease-expiration-duration-in-seconds: 30
instance-id: ${spring.cloud.client.ip-address}:${spring.application.name}:${server.port}
@@ -24,7 +24,7 @@
##注册地址
#defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:9002/eureka/,http://${spring.security.user.name}:${spring.security.user.password}@${eureka.instance.hostname}:9003/eureka/
#defaultZone: http://${eureka.instance.hostname}:9002/eureka/,http://${eureka.instance.hostname}:9003/eureka/
- defaultZone: http://192.168.1.103:9001/eureka/,http://192.168.1.202:9001/eureka/
+ defaultZone: http://172.17.97.143:9001/eureka/,http://192.168.1.202:9001/eureka/
####因为自己是注册中心，是否需要将自己注册给自己的注册中心（集群的时候是需要是为true）
register-with-eureka: false
###因为自己是注册中心， 不需要去检索服务信息
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile b/kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile
index fef5f1e..535cbca 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/Dockerfile
@@ -10,5 +10,7 @@
ARG JAR_FILE
# copy当前工程jar包至容器内
COPY ${JAR_FILE} /usr/local/kidgrow/app.jar
+# 接收指定内存
+ENV JAVA_OPTS=$JAVA_OPTS
# 运行jar包
ENTRYPOINT ["java","-jar","/usr/local/kidgrow/app.jar"]
\ No newline at end of file
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/service/AccessLogService.java b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/service/AccessLogService.java
index 1f41dd4..25b3e37 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/service/AccessLogService.java
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/service/AccessLogService.java
@@ -5,6 +5,8 @@
import com.google.common.collect.Maps;
import com.kidgrow.common.utils.WebUtils;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
import org.springframework.http.HttpHeaders;
@@ -32,8 +34,8 @@
public class AccessLogService {
private ExecutorService executorService;
-// @Autowired
-// private AmqpTemplate amqpTemplate;
+ @Autowired
+ private AmqpTemplate amqpTemplate;
@Value("${spring.application.name}")
private String defaultServiceId;
diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
index f62507f..dc61444 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -1,12 +1,12 @@
spring:
application:
- name: zull-server
+ name: zuul-server
server:
tomcat:
uri-encoding: UTF-8
max-threads: 1000
min-spare-threads: 30
- port: 8888
+ port: 8887
eureka:
diff --git a/kidgrow-uaa/kidgrow-uaa-server/Dockerfile b/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
index fef5f1e..ad8dab4 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
+++ b/kidgrow-uaa/kidgrow-uaa-server/Dockerfile
@@ -1,7 +1,85 @@
# 基础镜像
-FROM openjdk:8-jdk-alpine
+FROM 182.92.99.224:8081/kidgrow/docker.private/openjdk:fonts
+#FROM openjdk:8-jdk-alpine
# 作者（可选）
MAINTAINER kidgrow
+##时区
+RUN echo "Asia/Shanghai" > /etc/timezone
+#captcher 字体包
+COPY dockerfont/32768no.ttf /usr/share/fonts/32768no.ttf
+COPY dockerfont/7hours.ttf /usr/share/fonts/7hours.ttf
+COPY dockerfont/actionj.ttf /usr/share/fonts/actionj.ttf
+COPY dockerfont/ANGSTROM.TTF /usr/share/fonts/ANGSTROM.ttf
+COPY dockerfont/antelope.ttf /usr/share/fonts/antelope.ttf
+COPY dockerfont/antiblue.ttf /usr/share/fonts/antiblue.ttf
+COPY dockerfont/bboron.ttf /usr/share/fonts/bboron.ttf
+COPY dockerfont/BTTSOIEF.TTF /usr/share/fonts/BTTSOIEF.ttf
+COPY dockerfont/codon.ttf /usr/share/fonts/codon.ttf
+COPY dockerfont/colophon.ttf /usr/share/fonts/colophon.ttf
+COPY dockerfont/constant.ttf /usr/share/fonts/constant.ttf
+COPY dockerfont/cosinek.ttf /usr/share/fonts/cosinek.ttf
+COPY dockerfont/cwisdom.ttf /usr/share/fonts/cwisdom.ttf
+COPY dockerfont/davis.ttf /usr/share/fonts/davis.ttf
+COPY dockerfont/dis.ttf /usr/share/fonts/dis.ttf
+COPY dockerfont/dnahand.ttf /usr/share/fonts/dnahand.ttf
+COPY dockerfont/DoctorAz.ttf /usr/share/fonts/DoctorAz.ttf
+COPY dockerfont/donner.ttf /usr/share/fonts/donner.ttf
+COPY dockerfont/DOVES.TTF /usr/share/fonts/DOVES.ttf
+COPY dockerfont/dyspro.ttf /usr/share/fonts/dyspro.ttf
+COPY dockerfont/epilog.ttf /usr/share/fonts/epilog.ttf
+COPY dockerfont/faraday.ttf /usr/share/fonts/faraday.ttf
+COPY dockerfont/fresnel.ttf /usr/share/fonts/fresnel.ttf
+COPY dockerfont/gauss.ttf /usr/share/fonts/gauss.ttf
+COPY dockerfont/geodesic.ttf /usr/share/fonts/geodesic.ttf
+COPY dockerfont/germs.ttf /usr/share/fonts/germs.ttf
+COPY dockerfont/gmt.ttf /usr/share/fonts/gmt.ttf
+COPY dockerfont/guildof.ttf /usr/share/fonts/guildof.ttf
+COPY dockerfont/headache.ttf /usr/share/fonts/headache.ttf
+COPY dockerfont/hydrogen.ttf /usr/share/fonts/hydrogen.ttf
+COPY dockerfont/initial.ttf /usr/share/fonts/initial.ttf
+COPY dockerfont/levity.ttf /usr/share/fonts/levity.ttf
+COPY dockerfont/lexo.ttf /usr/share/fonts/lexo.ttf
+COPY dockerfont/linear.ttf /usr/share/fonts/linear.ttf
+COPY dockerfont/MAYQUEEN.TTF /usr/share/fonts/MAYQUEEN.ttf
+COPY dockerfont/melanie.ttf /usr/share/fonts/melanie.ttf
+COPY dockerfont/metalang.ttf /usr/share/fonts/metalang.ttf
+COPY dockerfont/musicdbz.ttf /usr/share/fonts/musicdbz.ttf
+COPY dockerfont/natlog.ttf /usr/share/fonts/natlog.ttf
+COPY dockerfont/nonblock.ttf /usr/share/fonts/nonblock.ttf
+COPY dockerfont/nullp.ttf /usr/share/fonts/nullp.ttf
+COPY dockerfont/opticbot.ttf /usr/share/fonts/opticbot.ttf
+COPY dockerfont/pinball.ttf /usr/share/fonts/pinball.ttf
+COPY dockerfont/prefix.ttf /usr/share/fonts/prefix.ttf
+COPY dockerfont/progbot.ttf /usr/share/fonts/progbot.ttf
+COPY dockerfont/PROTERON.TTF /usr/share/fonts/PROTERON.ttf
+COPY dockerfont/px10.ttf /usr/share/fonts/px10.ttf
+COPY dockerfont/ransom.ttf /usr/share/fonts/ransom.ttf
+COPY dockerfont/resurgen.ttf /usr/share/fonts/resurgen.ttf
+COPY dockerfont/robot.ttf /usr/share/fonts/robot.ttf
+COPY dockerfont/scandal.ttf /usr/share/fonts/scandal.ttf
+COPY dockerfont/secret.ttf /usr/share/fonts/secret.ttf
+COPY dockerfont/signal.ttf /usr/share/fonts/signal.ttf
+COPY dockerfont/SUBMERGD.TTF /usr/share/fonts/SUBMERGD.ttf
+COPY dockerfont/suckgolf.ttf /usr/share/fonts/suckgolf.ttf
+COPY dockerfont/technet.ttf /usr/share/fonts/technet.ttf
+COPY dockerfont/tetanus.ttf /usr/share/fonts/tetanus.ttf
+COPY dockerfont/thisprty.ttf /usr/share/fonts/thisprty.ttf
+COPY dockerfont/toast.ttf /usr/share/fonts/toast.ttf
+COPY dockerfont/TOMBATS1.TTF /usr/share/fonts/TOMBATS1.ttf
+COPY dockerfont/tombats3.ttf /usr/share/fonts/tombats3.ttf
+COPY dockerfont/tombats4.ttf /usr/share/fonts/tombats4.ttf
+COPY dockerfont/tombats6.ttf /usr/share/fonts/tombats6.ttf
+COPY dockerfont/tombats7.ttf /usr/share/fonts/tombats7.ttf
+COPY dockerfont/tombots.ttf /usr/share/fonts/tombots.ttf
+COPY dockerfont/tomhand.ttf /usr/share/fonts/tomhand.ttf
+COPY dockerfont/tommys.ttf /usr/share/fonts/tommys.ttf
+COPY dockerfont/tomnr.ttf /usr/share/fonts/tomnr.ttf
+COPY dockerfont/tsmiles.ttf /usr/share/fonts/tsmiles.ttf
+COPY dockerfont/tuesday.ttf /usr/share/fonts/tuesday.ttf
+COPY dockerfont/valium.ttf /usr/share/fonts/valium.ttf
+COPY dockerfont/wolves.ttf /usr/share/fonts/wolves.ttf
+COPY dockerfont/yikatu.ttf /usr/share/fonts/yikatu.ttf
+COPY dockerfont/zincboom.ttf /usr/share/fonts/zincboom.ttf
# 删除无用组件 优化容器体积（可选）
RUN rm -rf /var/lib/apt/lists/*
# 创建jar包存放目录
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/32768no.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/32768no.ttf
new file mode 100644
index 0000000..e8d9ef6
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/32768no.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/7hours.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/7hours.ttf
new file mode 100644
index 0000000..68bffef
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/7hours.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/ANGSTROM.TTF b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/ANGSTROM.TTF
new file mode 100644
index 0000000..a93cc4d
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/ANGSTROM.TTF
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/BTTSOIEF.TTF b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/BTTSOIEF.TTF
new file mode 100644
index 0000000..f9792d9
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/BTTSOIEF.TTF
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/DOVES.TTF b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/DOVES.TTF
new file mode 100644
index 0000000..90d0f15
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/DOVES.TTF
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/DoctorAz.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/DoctorAz.ttf
new file mode 100644
index 0000000..d363f18
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/DoctorAz.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/MAYQUEEN.TTF b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/MAYQUEEN.TTF
new file mode 100644
index 0000000..91b5059
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/MAYQUEEN.TTF
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/PROTERON.TTF b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/PROTERON.TTF
new file mode 100644
index 0000000..5fe4fea
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/PROTERON.TTF
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/SUBMERGD.TTF b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/SUBMERGD.TTF
new file mode 100644
index 0000000..4d4ef60
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/SUBMERGD.TTF
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/TOMBATS1.TTF b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/TOMBATS1.TTF
new file mode 100644
index 0000000..a045271
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/TOMBATS1.TTF
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/actionj.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/actionj.ttf
new file mode 100644
index 0000000..8439247
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/actionj.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/antelope.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/antelope.ttf
new file mode 100644
index 0000000..b74aab5
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/antelope.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/antiblue.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/antiblue.ttf
new file mode 100644
index 0000000..234f205
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/antiblue.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/bboron.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/bboron.ttf
new file mode 100644
index 0000000..c326b0f
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/bboron.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/codon.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/codon.ttf
new file mode 100644
index 0000000..54cd982
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/codon.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/colophon.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/colophon.ttf
new file mode 100644
index 0000000..2089b6f
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/colophon.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/constant.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/constant.ttf
new file mode 100644
index 0000000..59e8b18
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/constant.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/cosinek.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/cosinek.ttf
new file mode 100644
index 0000000..332de3a
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/cosinek.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/cwisdom.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/cwisdom.ttf
new file mode 100644
index 0000000..2e020e7
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/cwisdom.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/davis.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/davis.ttf
new file mode 100644
index 0000000..6b5ab07
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/davis.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dis.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dis.ttf
new file mode 100644
index 0000000..41826a3
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dis.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dnahand.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dnahand.ttf
new file mode 100644
index 0000000..adf846f
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dnahand.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/donner.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/donner.ttf
new file mode 100644
index 0000000..2594f38
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/donner.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dyspro.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dyspro.ttf
new file mode 100644
index 0000000..e673259
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/dyspro.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/epilog.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/epilog.ttf
new file mode 100644
index 0000000..bd9614a
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/epilog.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/faraday.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/faraday.ttf
new file mode 100644
index 0000000..e44f0db
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/faraday.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/fresnel.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/fresnel.ttf
new file mode 100644
index 0000000..7e32a51
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/fresnel.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/gauss.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/gauss.ttf
new file mode 100644
index 0000000..add69d8
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/gauss.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/geodesic.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/geodesic.ttf
new file mode 100644
index 0000000..72f3ca6
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/geodesic.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/germs.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/germs.ttf
new file mode 100644
index 0000000..5182be9
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/germs.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/gmt.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/gmt.ttf
new file mode 100644
index 0000000..b1d7f7a
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/gmt.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/guildof.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/guildof.ttf
new file mode 100644
index 0000000..c23a822
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/guildof.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/headache.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/headache.ttf
new file mode 100644
index 0000000..26fa0af
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/headache.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/hydrogen.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/hydrogen.ttf
new file mode 100644
index 0000000..202be8f
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/hydrogen.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/initial.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/initial.ttf
new file mode 100644
index 0000000..439cddd
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/initial.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/levity.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/levity.ttf
new file mode 100644
index 0000000..2aa5fef
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/levity.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/lexo.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/lexo.ttf
new file mode 100644
index 0000000..411af54
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/lexo.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/linear.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/linear.ttf
new file mode 100644
index 0000000..12f367c
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/linear.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/melanie.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/melanie.ttf
new file mode 100644
index 0000000..5ee012c
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/melanie.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/metalang.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/metalang.ttf
new file mode 100644
index 0000000..52c62c0
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/metalang.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/musicdbz.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/musicdbz.ttf
new file mode 100644
index 0000000..ecaa9b8
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/musicdbz.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/natlog.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/natlog.ttf
new file mode 100644
index 0000000..254b959
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/natlog.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/nonblock.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/nonblock.ttf
new file mode 100644
index 0000000..09087aa
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/nonblock.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/nullp.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/nullp.ttf
new file mode 100644
index 0000000..b465300
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/nullp.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/opticbot.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/opticbot.ttf
new file mode 100644
index 0000000..04bd183
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/opticbot.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/pinball.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/pinball.ttf
new file mode 100644
index 0000000..cd0ff01
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/pinball.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/prefix.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/prefix.ttf
new file mode 100644
index 0000000..a1aeed0
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/prefix.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/progbot.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/progbot.ttf
new file mode 100644
index 0000000..c98d122
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/progbot.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/px10.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/px10.ttf
new file mode 100644
index 0000000..e19ffca
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/px10.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/ransom.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/ransom.ttf
new file mode 100644
index 0000000..779ab8e
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/ransom.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/resurgen.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/resurgen.ttf
new file mode 100644
index 0000000..383bf28
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/resurgen.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/robot.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/robot.ttf
new file mode 100644
index 0000000..09e2de0
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/robot.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/scandal.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/scandal.ttf
new file mode 100644
index 0000000..22e3a7e
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/scandal.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/secret.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/secret.ttf
new file mode 100644
index 0000000..9a1be38
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/secret.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/signal.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/signal.ttf
new file mode 100644
index 0000000..3826ed0
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/signal.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/suckgolf.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/suckgolf.ttf
new file mode 100644
index 0000000..21b388a
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/suckgolf.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/technet.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/technet.ttf
new file mode 100644
index 0000000..bac29e1
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/technet.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tetanus.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tetanus.ttf
new file mode 100644
index 0000000..925f758
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tetanus.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/thisprty.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/thisprty.ttf
new file mode 100644
index 0000000..1ce3aa3
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/thisprty.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/toast.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/toast.ttf
new file mode 100644
index 0000000..1217bfe
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/toast.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats3.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats3.ttf
new file mode 100644
index 0000000..fb5416f
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats3.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats4.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats4.ttf
new file mode 100644
index 0000000..7e383db
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats4.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats6.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats6.ttf
new file mode 100644
index 0000000..ac556d8
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats6.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats7.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats7.ttf
new file mode 100644
index 0000000..74aee37
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats7.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombots.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombots.ttf
new file mode 100644
index 0000000..a9313cd
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombots.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomhand.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomhand.ttf
new file mode 100644
index 0000000..75a8004
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomhand.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tommys.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tommys.ttf
new file mode 100644
index 0000000..8b4fc06
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tommys.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomnr.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomnr.ttf
new file mode 100644
index 0000000..ae62af1
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomnr.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tsmiles.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tsmiles.ttf
new file mode 100644
index 0000000..27c4b7b
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tsmiles.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tuesday.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tuesday.ttf
new file mode 100644
index 0000000..8ad3dd1
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/tuesday.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/valium.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/valium.ttf
new file mode 100644
index 0000000..75bc431
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/valium.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/wolves.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/wolves.ttf
new file mode 100644
index 0000000..7155f5d
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/wolves.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/yikatu.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/yikatu.ttf
new file mode 100644
index 0000000..9facf99
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/yikatu.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/dockerfont/zincboom.ttf b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/zincboom.ttf
new file mode 100644
index 0000000..a4c683c
--- /dev/null
+++ b/kidgrow-uaa/kidgrow-uaa-server/dockerfont/zincboom.ttf
Binary files differ
diff --git a/kidgrow-uaa/kidgrow-uaa-server/pom.xml b/kidgrow-uaa/kidgrow-uaa-server/pom.xml
index 1b9e64c..4fd6f53 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/pom.xml
+++ b/kidgrow-uaa/kidgrow-uaa-server/pom.xml
@@ -24,6 +24,10 @@
<groupId>com.kidgrow</groupId>
<artifactId>kidgrow-uaa-biz</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -54,7 +58,7 @@
<dockerfile>Dockerfile</dockerfile>
<repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository>
<!-- 生成镜像标签 如不指定 默认为latest -->
- <tag>1.0.1</tag>
+ <tag>1.0.10</tag>
<!--<tag>${project.version}</tag>-->
<buildArgs>
<JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE>
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/ValidateCodeController.java b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/ValidateCodeController.java
index 03d9e5d..0c72720 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/ValidateCodeController.java
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/controller/ValidateCodeController.java
@@ -7,6 +7,7 @@
import com.wf.captcha.base.Captcha;
import com.wf.captcha.utils.CaptchaUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,13 +34,15 @@
*
* @throws Exception
*/
- @GetMapping(SecurityConstants.DEFAULT_VALIDATE_CODE_URL_PREFIX + "/{deviceId}")
+ @GetMapping(value=SecurityConstants.DEFAULT_VALIDATE_CODE_URL_PREFIX + "/{deviceId}",produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
public void createCode(@PathVariable String deviceId, HttpServletResponse response) throws Exception {
Assert.notNull(deviceId, "机器码不能为空");
// 设置请求头为输出图片类型
CaptchaUtil.setHeader(response);
// 三个参数分别为宽、高、位数
+// GifCaptcha gifCaptcha = new GifCaptcha(100, 35, 4,new Font("actionj", 1, 32));
GifCaptcha gifCaptcha = new GifCaptcha(100, 35, 4);
+// gifCaptcha.setFont(Captcha.FONT_1);
// 设置类型：字母数字混合
gifCaptcha.setCharType(Captcha.TYPE_DEFAULT);
// 保存验证码
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml b/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
index 58af5e9..aa4e85d 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
@@ -17,7 +17,7 @@
url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
- driver-class-name: com.mysql.jdbc.Driver
+# driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
aop-patterns: com.kidgrow.oauth2.controller.*
diff --git a/kidgrow-web/kidgrow-web-manager/pom.xml b/kidgrow-web/kidgrow-web-manager/pom.xml
index 9407d69..621195c 100644
--- a/kidgrow-web/kidgrow-web-manager/pom.xml
+++ b/kidgrow-web/kidgrow-web-manager/pom.xml
@@ -83,7 +83,7 @@
<dockerfile>Dockerfile</dockerfile>
<repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository>
<!-- 生成镜像标签 如不指定 默认为latest -->
- <tag>1.0.1</tag>
+ <tag>1.0.5</tag>
<!--<tag>${project.version}</tag>-->
<buildArgs>
<JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index 3ec1084..f28f115 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1 +1,4 @@
-var my_api_server_url = 'http://192.168.2.240:8888/';
\ No newline at end of file
+var my_api_server_url = 'http://zuul.kidgrow.com/';
+// var my_api_server_url = 'http://192.168.2.240:8888/';
+// var my_api_server_url = 'http://127.0.0.1:8888/';
+
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/config.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/config.js
index 743653e..f0447e7 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/config.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/config.js
@@ -3,7 +3,7 @@
* 用于动态切换环境地址
*/
//默认地址
- var defUrl = 'http://192.168.1.103:8888/';
+ var defUrl = 'http://182.92.99.224:8887/';
//当前环境的api地址
var apiUrl;
try{
diff --git a/pom.xml b/pom.xml
index 7051a0a..1c6858c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,8 @@
<spring-cloud-dependencies.version>Greenwich.SR5</spring-cloud-dependencies.version>
<spring-boot-dependencies.version>2.1.12.RELEASE</spring-boot-dependencies.version>
<spring-boot-maven-plugin.version>2.1.12.RELEASE</spring-boot-maven-plugin.version>
- <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
+<!-- <mysql-connector-java.version>5.1.38</mysql-connector-java.version>-->
+ <mysql-connector-java.version>8.0.13</mysql-connector-java.version>
<aliyun-sdk-oss>3.4.2</aliyun-sdk-oss>
<qiniu-java-sdk>7.2.18</qiniu-java-sdk>
<fastdfs-client.version>1.26.7</fastdfs-client.version>
@@ -256,6 +257,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>com.kidgrow</groupId>
+ <artifactId>kidgrow-rabbitmq-spring-boot-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-resource-server</artifactId>
<version>${oauth2-resource.version}</version>
--
Gitblit v1.8.0