diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index 39d6a11..7713d0b 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.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:123456} + password: ${DB_PWD:ykn123456} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/eladmin-web/.env.production b/eladmin-web/.env.production index 66da123..850a6d8 100644 --- a/eladmin-web/.env.production +++ b/eladmin-web/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http -VUE_APP_BASE_API = 'https://eladmin.vip' +VUE_APP_BASE_API = 'http://182.254.242.199' # 如果接口是 http 形式, wss 需要改为 ws -VUE_APP_WS_API = 'wss://eladmin.vip' +VUE_APP_WS_API = 'ws://182.254.242.199' diff --git a/eladmin-web/src/assets/images/kashi2.jpg b/eladmin-web/src/assets/images/kashi2.jpg new file mode 100644 index 0000000..fa6def1 Binary files /dev/null and b/eladmin-web/src/assets/images/kashi2.jpg differ diff --git a/eladmin-web/src/settings.js b/eladmin-web/src/settings.js index 9f68922..fe0f5f6 100644 --- a/eladmin-web/src/settings.js +++ b/eladmin-web/src/settings.js @@ -38,7 +38,7 @@ module.exports = { /** * 底部文字,支持html语法 */ - footerTxt: '© 2018-2022 Zheng Jie Apache License 2.0', + // footerTxt: '© 2018-2022 Zheng Jie Apache License 2.0', /** * 备案号 */ diff --git a/eladmin-web/src/views/login.vue b/eladmin-web/src/views/login.vue index b7f134c..b50fc18 100644 --- a/eladmin-web/src/views/login.vue +++ b/eladmin-web/src/views/login.vue @@ -47,7 +47,7 @@ import Config from '@/settings' import { getCodeImg } from '@/api/login' import Cookies from 'js-cookie' import qs from 'qs' -import Background from '@/assets/images/background.webp' +import Background from '@/assets/images/kashi2.jpg' export default { name: 'Login', data() { diff --git a/eladmin-web/src/views/system/purchase/index.vue b/eladmin-web/src/views/system/purchase/index.vue index f2bc9a4..005ee44 100644 --- a/eladmin-web/src/views/system/purchase/index.vue +++ b/eladmin-web/src/views/system/purchase/index.vue @@ -2,45 +2,46 @@