Commit b0fa943e2b3558a8bb5e7fc9efc69875021cb6dd
1 parent
d2fe1ebc
更新数据库配置文件
Signed-off-by: TanYibin <5491541@qq.com>
Showing
5 changed files
with
20 additions
and
15 deletions
ant-design-vue-jeecg/src/components/lang/en-US.js
ant-design-vue-jeecg/src/components/lang/zh-CN.js
ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
| ... | ... | @@ -10,6 +10,17 @@ |
| 10 | 10 | > |
| 11 | 11 | <div class="setting-drawer-index-content"> |
| 12 | 12 | <div :style="{ marginBottom: '24px' }"> |
| 13 | + <a-list-item> | |
| 14 | + <a-list-item-meta> | |
| 15 | + <div slot="title">{{ $t('system.languageSetting') }}</div> | |
| 16 | + </a-list-item-meta> | |
| 17 | + <a-select size="small" style="width: 80px;" :defaultValue="$t('lang')" @change="handleLanguageChange"> | |
| 18 | + <a-select-option value="zh-CN">中文</a-select-option> | |
| 19 | + <a-select-option value="en-US">English</a-select-option> | |
| 20 | + </a-select> | |
| 21 | + </a-list-item> | |
| 22 | + </div> | |
| 23 | + <div :style="{ marginBottom: '24px' }"> | |
| 13 | 24 | <h3 class="setting-drawer-index-title">整体风格设置{{ $t('lang') }}</h3> |
| 14 | 25 | <div class="setting-drawer-index-blockChecbox"> |
| 15 | 26 | <a-tooltip> |
| ... | ... | @@ -23,7 +34,6 @@ |
| 23 | 34 | </div> |
| 24 | 35 | </div> |
| 25 | 36 | </a-tooltip> |
| 26 | - | |
| 27 | 37 | <a-tooltip> |
| 28 | 38 | <template slot="title"> |
| 29 | 39 | 亮色菜单风格 |
| ... | ... | @@ -38,17 +48,6 @@ |
| 38 | 48 | </div> |
| 39 | 49 | </div> |
| 40 | 50 | <div :style="{ marginBottom: '24px' }"> |
| 41 | - <a-list-item> | |
| 42 | - <a-list-item-meta> | |
| 43 | - <div slot="title">语言设置</div> | |
| 44 | - </a-list-item-meta> | |
| 45 | - <a-select size="small" style="width: 80px;" :defaultValue="$t('lang')" @change="handleLanguageChange"> | |
| 46 | - <a-select-option value="zh-CN">中文</a-select-option> | |
| 47 | - <a-select-option value="en-US">English</a-select-option> | |
| 48 | - </a-select> | |
| 49 | - </a-list-item> | |
| 50 | - </div> | |
| 51 | - <div :style="{ marginBottom: '24px' }"> | |
| 52 | 51 | <h3 class="setting-drawer-index-title">主题色</h3> |
| 53 | 52 | |
| 54 | 53 | <div style="height: 20px"> |
| ... | ... |
huaheng-wms-core/src/main/resources/application-test.yml
| ... | ... | @@ -137,7 +137,7 @@ spring: |
| 137 | 137 | datasource: |
| 138 | 138 | master: |
| 139 | 139 | # mysql数据源配置 |
| 140 | - 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 | |
| 140 | + 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 | |
| 141 | 141 | username: root |
| 142 | 142 | password: hhsoftware |
| 143 | 143 | driver-class-name: net.sf.log4jdbc.DriverSpy |
| ... | ... |