diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index 8413bd0..ffba3a1 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -4,9 +4,9 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:182.254.242.199}:${DB_PORT:3306}/${DB_NAME:admin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false username: ${DB_USER:root} - password: ${DB_PWD:password} + password: ${DB_PWD:ykn123456} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/eladmin-web/package.json b/eladmin-web/package.json index 689e255..aba7b86 100644 --- a/eladmin-web/package.json +++ b/eladmin-web/package.json @@ -9,7 +9,7 @@ "build:prod": "vue-cli-service build", "build:stage": "vue-cli-service build --mode staging", "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src", + "lint": "eslint --ext --fix .js,.vue src", "test:unit": "jest --clearCache && vue-cli-service test:unit", "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml", "new": "plop" diff --git a/eladmin-web/public/favicon.ico b/eladmin-web/public/favicon.ico index fcb6999..e632281 100644 Binary files a/eladmin-web/public/favicon.ico and b/eladmin-web/public/favicon.ico differ