diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index b0fc496..164d825 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -13,7 +13,7 @@ spring: # url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # username: ${DB_USER:root} # password: ${DB_PWD:123456} - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:rtmg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lanzhouhailiang_two}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} password: ${DB_PWD:12356} type: com.alibaba.druid.pool.DruidDataSource diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml index add0608..228d369 100644 --- a/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/lms/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -42,7 +42,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev3 + active: dev jackson: time-zone: GMT+8 data: @@ -129,3 +129,23 @@ mybatis-plus: global-config: db-config: id-type: INPUT +jetcache: + statIntervalMinutes: 15 + areaInCacheName: false + local: + default: + type: linkedhashmap + keyConvertor: fastjson + remote: + default: + type: redis + keyConvertor: fastjson2 + broadcastChannel: projectA + valueEncoder: java + valueDecoder: java + poolConfig: + minIdle: 5 + maxIdle: 20 + maxTotal: 50 + host: 127.0.0.1 + port: 6379 diff --git a/lms/nladmin-ui/src/components/TopNav/index.vue b/lms/nladmin-ui/src/components/TopNav/index.vue index c3b10a2..575b102 100644 --- a/lms/nladmin-ui/src/components/TopNav/index.vue +++ b/lms/nladmin-ui/src/components/TopNav/index.vue @@ -17,7 +17,7 @@ - + diff --git a/lms/nladmin-ui/src/layout/components/TagsView/index.vue b/lms/nladmin-ui/src/layout/components/TagsView/index.vue index 031e96f..c2dd4ed 100644 --- a/lms/nladmin-ui/src/layout/components/TagsView/index.vue +++ b/lms/nladmin-ui/src/layout/components/TagsView/index.vue @@ -17,12 +17,12 @@ diff --git a/lms/nladmin-ui/src/views/system/user/center.vue b/lms/nladmin-ui/src/views/system/user/center.vue index 39e6768..84c3bae 100644 --- a/lms/nladmin-ui/src/views/system/user/center.vue +++ b/lms/nladmin-ui/src/views/system/user/center.vue @@ -51,23 +51,23 @@ - - + {{ $t('common.sex_male') }} + {{ $t('common.sex_female') }} - 保存配置 + {{ $t('common.Save_settings') }} - + - + - - - + + +