Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

chenghua 4 лет назад
Родитель
Сommit
918e086299
2 измененных файлов с 9 добавлено и 10 удалено
  1. 5 5
      manager/src/main/resources/application.yml
  2. 4 5
      web-app/package.json

+ 5 - 5
manager/src/main/resources/application.yml

@@ -27,9 +27,9 @@ spring:
       on-profile: prod
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: wang1027
-    url: jdbc:mysql://121.40.113.44:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false
+    username: admin
+    password: admin
+    url: jdbc:mysql://localhost:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false
     platform: mysql
     hikari:
       max-lifetime: 120000
@@ -38,8 +38,8 @@ spring:
 
   mail:
     host: smtp.exmail.qq.com
-    username: gongchao@tancloud.cn
-    password: C7Roz9Qe3eGkiVM9
+    username: example@tancloud.cn
+    password: example
     port: 465
     default-encoding: UTF-8
     properties:

+ 4 - 5
web-app/package.json

@@ -41,7 +41,6 @@
     "@delon/util": "^12.4.2",
     "ajv": "^8.6.2",
     "ajv-formats": "^2.1.1",
-    "ajv-keywords": "^5.1.0",
     "echarts": "^5.2.2",
     "ng-alain": "^12.4.2",
     "ng-zorro-antd": "^12.0.2",
@@ -85,12 +84,12 @@
     "ng-alain-plugin-theme": "^12.0.0",
     "prettier": "^2.2.1",
     "source-map-explorer": "^2.5.2",
-    "stylelint": "^14.5.1",
+    "stylelint": "^13.13.1",
     "stylelint-config-prettier": "^8.0.2",
-    "stylelint-config-rational-order": "^0.0.4",
-    "stylelint-config-standard": "^25.0.0",
+    "stylelint-config-rational-order": "^0.1.2",
+    "stylelint-config-standard": "^22.0.0",
     "stylelint-declaration-block-no-ignored-properties": "^2.4.0",
-    "stylelint-order": "^5.0.0",
+    "stylelint-order": "^4.1.0",
     "typescript": "~4.3.5"
   },
   "lint-staged": {