1、优化DockerFile 中Docker容器所需字体 2、增加kidgrow-mqcenter-rabbit 项目 3、修改kidgrow-log...

克 刘

2020-03-25 3911536f257fedba3703ff0f78b31c1849d4869f

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-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.*

 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.*

 kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/pom.xml

New file
@@ -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>

 kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/RabbitMqApplication.java

New file
@@ -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);
    }
}

 kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/controller/TopicController.java

New file
@@ -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";
    }
}

 kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/recieve/TopicReceive.java

New file
@@ -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();
            }
        }
    }
}

 kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/java/com/kidgrow/rabbitmq/send/TopicSender.java

New file
@@ -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);
        }
    }
}

 kidgrow-business/kidgrow-mqcenter/kidgrow-mqcenter-rabbit/src/main/resources/application.yml

New file
@@ -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

 kidgrow-business/kidgrow-mqcenter/pom.xml

@@ -13,5 +13,6 @@

    <modules>
        <module>kidgrow-mqcenter-rocket</module>
        <module>kidgrow-mqcenter-rabbit</module>
    </modules>
</project>

 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.*

 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>

 kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/properties/LogDbProperties.java

New file
@@ -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 {
}

 kidgrow-commons/kidgrow-log-spring-boot-starter/src/main/java/com/kidgrow/log/service/impl/DbAuditServiceImpl.java

New file
@@ -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());
    }
}


 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

 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>

 kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/pom.xml

New file
@@ -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>

 kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/config/RabbitConfig.java

New file
@@ -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);
    }
}

 kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/model/MqMessage.java

New file
@@ -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;
}

 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>



 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

 kidgrow-config/src/main/resources/application-fat.properties

@@ -1 +1,46 @@
# \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

 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=*

 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.*

 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.*

 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
    ###因为自己是注册中心， 不需要去检索服务信息

 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"]

 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;

 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:

 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包存放目录

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/32768no.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/7hours.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/ANGSTROM.TTF

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/BTTSOIEF.TTF

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/DOVES.TTF

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/DoctorAz.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/MAYQUEEN.TTF

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/PROTERON.TTF

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/SUBMERGD.TTF

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/TOMBATS1.TTF

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/actionj.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/antelope.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/antiblue.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/bboron.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/codon.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/colophon.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/constant.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/cosinek.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/cwisdom.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/davis.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/dis.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/dnahand.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/donner.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/dyspro.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/epilog.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/faraday.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/fresnel.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/gauss.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/geodesic.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/germs.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/gmt.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/guildof.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/headache.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/hydrogen.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/initial.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/levity.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/lexo.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/linear.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/melanie.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/metalang.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/musicdbz.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/natlog.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/nonblock.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/nullp.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/opticbot.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/pinball.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/prefix.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/progbot.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/px10.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/ransom.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/resurgen.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/robot.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/scandal.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/secret.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/signal.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/suckgolf.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/technet.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tetanus.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/thisprty.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/toast.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats3.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats4.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats6.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombats7.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tombots.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomhand.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tommys.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tomnr.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tsmiles.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/tuesday.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/valium.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/wolves.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/yikatu.ttf

Binary files differ

 kidgrow-uaa/kidgrow-uaa-server/dockerfont/zincboom.ttf

Binary files differ

 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>

 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);
        // 保存验证码

 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.*

 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>

 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/';
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/';


 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{

 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>