From c8339d6bcd5b9b0151cd33c0985282ec90ed2269 Mon Sep 17 00:00:00 2001 From: ronger Date: Tue, 7 Feb 2023 09:39:35 +0800 Subject: [PATCH 1/4] :art: update application-dev.yml --- src/main/resources/application-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d2f1bea..13f4372 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,7 +9,7 @@ spring: content-type: text/html cache: false redis: - host: 192.168.31.200 + host: 127.0.0.1 port: 6379 password: d9d2j9w2 database: 1 @@ -22,7 +22,7 @@ spring: min-idle: 0 datasource: druid: - url: jdbc:mysql://192.168.31.200:3306/forest?characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true + url: jdbc:mysql://127.0.0.1:3306/forest?characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true username: root password: Ldh1NrsXJntz5nTXeO0nPh+8s1FMe+JHCfXy2Zj3egqqjegN+mNe+53ZmduUlVdE4ZqKuUho7T9yftc6AYYKog== driver-class-name: com.mysql.cj.jdbc.Driver From a6bb3cee817e16d6eebc884a38270e5e2e9ba28f Mon Sep 17 00:00:00 2001 From: ronger Date: Tue, 7 Feb 2023 09:40:37 +0800 Subject: [PATCH 2/4] :hammer: add dev docker-compose.yml --- docker/dev/docker-compose.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 docker/dev/docker-compose.yml diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml new file mode 100644 index 0000000..8f36a13 --- /dev/null +++ b/docker/dev/docker-compose.yml @@ -0,0 +1,29 @@ +version: '2.1' +services: + redis: + image: redis:5.0.14 + container_name: forest-ce-redis + sysctls: + - net.core.somaxconn=1024 + ports: + - "6379:6379" + volumes: + - "redis-volume:/data" + command: redis-server --requirepass d9d2j9w2 --appendonly yes + environment: + - TZ=Asia/Shanghai + mysql: + image: mysql:5.7.8 + container_name: forest-ce-mysql + ports: + - "3306:3306" + volumes: + - "mysql-volume:/etc/mysql/conf.d" + - "mysql-volume:/var/lib/mysql" + - "mysql-volume:/logs" + environment: + - MYSQL_ROOT_PASSWORD=XzHvhX4CDaN696oQAXdmlcsrqgWbkxRl + - TZ=Asia/Shanghai +volumes: + mysql-volume: + redis-volume: From d3f427f7872fc9801a19aba1402359329f5d7d6c Mon Sep 17 00:00:00 2001 From: ronger Date: Tue, 7 Feb 2023 09:44:08 +0800 Subject: [PATCH 3/4] :art: update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b8c42e9..8ebe283 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,4 @@ build/ ### lucene ### index -userDic \ No newline at end of file +userDic!/src/main/resources/application-dev.yml From f6a551b56072d4174cbca904f203429f5f0afad5 Mon Sep 17 00:00:00 2001 From: ronger Date: Tue, 7 Feb 2023 01:48:01 +0000 Subject: [PATCH 4/4] Edit application-dev.yml --- src/main/resources/application-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 13f4372..d2f1bea 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,7 +9,7 @@ spring: content-type: text/html cache: false redis: - host: 127.0.0.1 + host: 192.168.31.200 port: 6379 password: d9d2j9w2 database: 1 @@ -22,7 +22,7 @@ spring: min-idle: 0 datasource: druid: - url: jdbc:mysql://127.0.0.1:3306/forest?characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true + url: jdbc:mysql://192.168.31.200:3306/forest?characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true username: root password: Ldh1NrsXJntz5nTXeO0nPh+8s1FMe+JHCfXy2Zj3egqqjegN+mNe+53ZmduUlVdE4ZqKuUho7T9yftc6AYYKog== driver-class-name: com.mysql.cj.jdbc.Driver