config

Makefile

@@ -2,10 +2,10 @@ merge:
 	git checkout master;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v1.0.0;git push origin --tags;git checkout dev;
+	git checkout master;git tag v1.0.1;git push origin --tags;git checkout dev;
 
 remove-tag:
-	git tag -d v1.0.0;git push origin :refs/tags/v1.0.0;
+	git tag -d v1.0.1;git push origin :refs/tags/v1.0.1;
 
 gen-rsaprivatekey:
 	openssl genrsa -out rsaprivatekey.pem 1024

docker-compose.yml

@@ -10,8 +10,7 @@ services:
     container_name: tl_api
     environment:
       - SPRING_DATASOURCE_DYNAMIC_DATASOURCE_MASTER_URL=jdbc:mysql://172.28.175.70:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-      - SPRING-REDIS-HOST=219.153.208.35
-      - SPRING-REDIS-PASSWORD=huHJMucfC!tJ59Ri
+      - SPRING-REDIS-HOST=172.28.175.70
       - MQTT-SERVER=tcp://172.28.175.70:1883
     networks:
       - docker_networks_default

src/main/resources/application-prod.yml

@@ -60,6 +60,8 @@ xjrsoft:
     druid-account: admin # druid 监控账户
     druid-password: admin # druid 监控密码
     default-password: "000000" #默认密码（用户重置密码后为该密码）
+    domain-api: https://zhxy.cqtlzjzx.com/api #api域名地址
+    domain-web: https://zhxy.cqtlzjzx.com #web域名地址
     white-list:
       - 192.168.0.139
     exclude-urls: