Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Cairry authored Jun 1, 2024
2 parents 05c317f + 7671c5c commit a33816d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<p align="center">
<a href="https://github.com/Cairry/WatchAlert">
<a href="https://github.com/w8t-io/WatchAlert">
<img src="WatchAlert.png" alt="cloud native monitoring" width="200" height="auto" /></a>
</p>

Expand All @@ -9,12 +9,12 @@
</p>

<p align="center">
<a href="https://github.com/cairry/WatchAlert/graphs/contributors">
<img alt="GitHub contributors" src="https://img.shields.io/github/contributors-anon/cairry/WatchAlert"/></a>
<img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/cairry/WatchAlert">
<img alt="GitHub forks" src="https://img.shields.io/github/forks/cairry/WatchAlert">
<br/><img alt="GitHub Repo issues" src="https://img.shields.io/github/issues/cairry/WatchAlert">
<img alt="GitHub Repo issues closed" src="https://img.shields.io/github/issues-closed/cairry/WatchAlert">
<a href="https://github.com/w8t-io/WatchAlert/graphs/contributors">
<img alt="GitHub contributors" src="https://img.shields.io/github/contributors-anon/w8t-io/WatchAlert"/></a>
<img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/w8t-io/WatchAlert">
<img alt="GitHub forks" src="https://img.shields.io/github/forks/w8t-io/WatchAlert">
<br/><img alt="GitHub Repo issues" src="https://img.shields.io/github/issues/w8t-io/WatchAlert">
<img alt="GitHub Repo issues closed" src="https://img.shields.io/github/issues-closed/w8t-io/WatchAlert">
<img alt="License" src="https://img.shields.io/badge/license-Apache--2.0-blue"/>

- - -
Expand Down
6 changes: 3 additions & 3 deletions config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ Server:
recoverWait: 1

MySQL:
host: 127.0.0.1
host: w8t-mysql
port: 3306
user: root
pass: w8t.123
dbName: watchalert
timeout: 10s

Redis:
host: 127.0.0.1
host: w8t-redis
port: 6379
pass: ""

Jwt:
# 失效时间
expire: 18000
expire: 18000
3 changes: 2 additions & 1 deletion deploy/sql/tenants.sql
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
INSERT INTO `tenants` (`id`, `name`, `create_at`, `create_by`, `manager`, `description`, `user_number`, `rule_number`, `duty_number`, `notice_number`, `remove_protection`) VALUES ('tid-co4iic3adq7a2jjeas90', 'default', 1711876400, 'system', 'admin', 'default 租户', 999, 999, 999, 999, 1);
INSERT INTO `tenants` (`id`, `name`, `create_at`, `create_by`, `manager`, `description`, `user_number`, `rule_number`, `duty_number`, `notice_number`, `remove_protection`) VALUES ('tid-co4iic3adq7a2jjeas90', 'default', 1711876400, 'system', 'admin', 'default 租户', 999, 999, 999, 999, 1);

0 comments on commit a33816d

Please sign in to comment.