From b0fa943e2b3558a8bb5e7fc9efc69875021cb6dd Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Thu, 13 Apr 2023 08:49:43 +0800
Subject: [PATCH] 更新数据库配置文件
---
ant-design-vue-jeecg/src/components/lang/en-US.js | 5 ++++-
ant-design-vue-jeecg/src/components/lang/zh-CN.js | 3 +++
ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue | 23 +++++++++++------------
huaheng-wms-core/src/main/resources/application-test.yml | 2 +-
huaheng-wms-core/src/main/resources/application.yml | 2 +-
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/ant-design-vue-jeecg/src/components/lang/en-US.js b/ant-design-vue-jeecg/src/components/lang/en-US.js
index 505be1b..d5b56f0 100644
--- a/ant-design-vue-jeecg/src/components/lang/en-US.js
+++ b/ant-design-vue-jeecg/src/components/lang/en-US.js
@@ -1,9 +1,12 @@
export default {
lang: 'English',
announcement: {
- typeDict:{
+ typeDict: {
'1': 'System Announcement',
'2': 'Maintain Announcement',
}
+ },
+ system: {
+ languageSetting: 'Language Setting',
}
}
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/components/lang/zh-CN.js b/ant-design-vue-jeecg/src/components/lang/zh-CN.js
index cde9e8f..733d3f3 100644
--- a/ant-design-vue-jeecg/src/components/lang/zh-CN.js
+++ b/ant-design-vue-jeecg/src/components/lang/zh-CN.js
@@ -5,5 +5,8 @@ export default {
'1': '系统公告',
'2': '维护公告',
}
+ },
+ system: {
+ languageSetting: '语言设置',
}
}
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue b/ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
index 109864a..9c0f925 100644
--- a/ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
+++ b/ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
@@ -10,6 +10,17 @@
>
<div class="setting-drawer-index-content">
<div :style="{ marginBottom: '24px' }">
+ <a-list-item>
+ <a-list-item-meta>
+ <div slot="title">{{ $t('system.languageSetting') }}</div>
+ </a-list-item-meta>
+ <a-select size="small" style="width: 80px;" :defaultValue="$t('lang')" @change="handleLanguageChange">
+ <a-select-option value="zh-CN">中文</a-select-option>
+ <a-select-option value="en-US">English</a-select-option>
+ </a-select>
+ </a-list-item>
+ </div>
+ <div :style="{ marginBottom: '24px' }">
<h3 class="setting-drawer-index-title">整体风格设置{{ $t('lang') }}</h3>
<div class="setting-drawer-index-blockChecbox">
<a-tooltip>
@@ -23,7 +34,6 @@
</div>
</div>
</a-tooltip>
-
<a-tooltip>
<template slot="title">
亮色菜单风格
@@ -38,17 +48,6 @@
</div>
</div>
<div :style="{ marginBottom: '24px' }">
- <a-list-item>
- <a-list-item-meta>
- <div slot="title">语言设置</div>
- </a-list-item-meta>
- <a-select size="small" style="width: 80px;" :defaultValue="$t('lang')" @change="handleLanguageChange">
- <a-select-option value="zh-CN">中文</a-select-option>
- <a-select-option value="en-US">English</a-select-option>
- </a-select>
- </a-list-item>
- </div>
- <div :style="{ marginBottom: '24px' }">
<h3 class="setting-drawer-index-title">主题色</h3>
<div style="height: 20px">
diff --git a/huaheng-wms-core/src/main/resources/application-test.yml b/huaheng-wms-core/src/main/resources/application-test.yml
index 4884398..7a3c666 100644
--- a/huaheng-wms-core/src/main/resources/application-test.yml
+++ b/huaheng-wms-core/src/main/resources/application-test.yml
@@ -137,7 +137,7 @@ spring:
datasource:
master:
# mysql数据源配置
- url: jdbc:log4jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+ url: jdbc:log4jdbc:mysql://172.16.29.45:3306/wms4_wcs?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
username: root
password: hhsoftware
driver-class-name: net.sf.log4jdbc.DriverSpy
diff --git a/huaheng-wms-core/src/main/resources/application.yml b/huaheng-wms-core/src/main/resources/application.yml
index fe3c122..07010fe 100644
--- a/huaheng-wms-core/src/main/resources/application.yml
+++ b/huaheng-wms-core/src/main/resources/application.yml
@@ -2,7 +2,7 @@ spring:
application:
name: huaheng-wcs-core
profiles:
- active: dev
+ active: test
huaheng:
system:
--
libgit2 0.22.2