diff --git a/pom.xml b/pom.xml index 42b1ddf..53b3cb5 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,12 @@ spring-boot-starter-thymeleaf + + + net.logstash.logback + logstash-logback-encoder + 5.3 + diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b82b514..048f2e2 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,20 +9,19 @@ spring: connection-init-sql: SELECT 1 connection-test-query: SELECT 1 datasource: - master: - url: jdbc:mysql://#{ip}:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai + master: url: jdbc:mysql://120.48.109.209:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai username: root - password: #{密码} + password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver slave: - url: jdbc:mysql://#{ip}:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://120.48.109.209:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai username: root - password: #{密码} + password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver redis: port: 6379 #Redis服务器连接的端口 - host: #{ip} # Redis服务器的地址 - password: #{密码} # Redis服务器连接密码(默认为空) + host: 120.48.109.209 # Redis服务器的地址 + password: 123456 # Redis服务器连接密码(默认为空) timeout: 5000 # 连接超时时间(毫秒) lettuce: #参考博客 https://blog.csdn.net/weixin_43944305/article/details/124322595 pool: diff --git a/src/main/resources/docker/docker-compose.yml b/src/main/resources/docker/docker-compose.yml new file mode 100644 index 0000000..708c8ed --- /dev/null +++ b/src/main/resources/docker/docker-compose.yml @@ -0,0 +1,36 @@ +version: '3' +services: + elasticsearch: + image: elasticsearch:6.4.0 + container_name: elasticsearch + environment: + - "cluster.name=elasticsearch" #设置集群名称为elasticsearch + - "discovery.type=single-node" #以单一节点模式启动 + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" #设置使用jvm内存大小 + volumes: + - /mydata/elasticsearch/plugins:/usr/share/elasticsearch/plugins #插件文件挂载 + - /mydata/elasticsearch/data:/usr/share/elasticsearch/data #数据文件挂载 + ports: + - 9200:9200 + kibana: + image: kibana:6.4.0 + container_name: kibana + links: + - elasticsearch:es #可以用es这个域名访问elasticsearch服务 + depends_on: + - elasticsearch #kibana在elasticsearch启动之后再启动 + environment: + - "elasticsearch.hosts=http://es:9200" #设置访问elasticsearch的地址 + ports: + - 5601:5601 + logstash: + image: logstash:6.4.0 + container_name: logstash + volumes: + - /mydata/logstash/logstash-springboot.conf:/usr/share/logstash/pipeline/logstash.conf #挂载logstash的配置文件 + depends_on: + - elasticsearch #kibana在elasticsearch启动之后再启动 + links: + - elasticsearch:es #可以用es这个域名访问elasticsearch服务 + ports: + - 4560:4560 \ No newline at end of file diff --git a/src/main/resources/docker/logstash-springboot.conf b/src/main/resources/docker/logstash-springboot.conf new file mode 100644 index 0000000..a71e919 --- /dev/null +++ b/src/main/resources/docker/logstash-springboot.conf @@ -0,0 +1,14 @@ +input { + tcp { + mode => "server" + host => "0.0.0.0" + port => 4560 + codec => json_lines + } +} +output { + elasticsearch { + hosts => "es:9200" + index => "springboot-logstash-%{+YYYY.MM.dd}" + } +} \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..d13263e --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,32 @@ + + + + + + + + + + ${APP_NAME} + + + + ${LOG_FILE_PATH}/${APP_NAME}-%d{yyyy-MM-dd}.log + 30 + + + ${FILE_LOG_PATTERN} + + + + + + 120.48.109.209:4560 + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 880d0f8..3648628 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -54,7 +54,7 @@ var json = JSON.stringify(data); var cipher = this.encryptByPublicKey(json); console.log("密文 :" + cipher); - var url = "http://#{ip}:8088/user/login"; + var url = "http://localhost:8088/user/login"; axios.post(url, { encryptedData: cipher, })