diff --git a/cmdb-ui/public/cmdb-ci.jpeg b/cmdb-ui/public/cmdb-ci.jpeg index 4da2a1c..3521857 100644 Binary files a/cmdb-ui/public/cmdb-ci.jpeg and b/cmdb-ui/public/cmdb-ci.jpeg differ diff --git a/cmdb-ui/public/cmdb-preference.jpeg b/cmdb-ui/public/cmdb-preference.jpeg index 3efefb1..9e04e76 100644 Binary files a/cmdb-ui/public/cmdb-preference.jpeg and b/cmdb-ui/public/cmdb-preference.jpeg differ diff --git a/cmdb-ui/public/cmdb-relation-define.jpeg b/cmdb-ui/public/cmdb-relation-define.jpeg index 357c18a..b00b1a3 100644 Binary files a/cmdb-ui/public/cmdb-relation-define.jpeg and b/cmdb-ui/public/cmdb-relation-define.jpeg differ diff --git a/cmdb-ui/public/cmdb-relation.jpeg b/cmdb-ui/public/cmdb-relation.jpeg index 53deac8..6804bd4 100644 Binary files a/cmdb-ui/public/cmdb-relation.jpeg and b/cmdb-ui/public/cmdb-relation.jpeg differ diff --git a/cmdb-ui/public/cmdb-tree.jpeg b/cmdb-ui/public/cmdb-tree.jpeg index 61cfec3..9cdfe9f 100644 Binary files a/cmdb-ui/public/cmdb-tree.jpeg and b/cmdb-ui/public/cmdb-tree.jpeg differ diff --git a/cmdb-ui/public/cmdb01.jpeg b/cmdb-ui/public/cmdb01.jpeg deleted file mode 100644 index e939125..0000000 Binary files a/cmdb-ui/public/cmdb01.jpeg and /dev/null differ diff --git a/cmdb-ui/public/cmdb02.jpeg b/cmdb-ui/public/cmdb02.jpeg deleted file mode 100644 index 44cd216..0000000 Binary files a/cmdb-ui/public/cmdb02.jpeg and /dev/null differ diff --git a/cmdb-ui/src/config/defaultSettings.js b/cmdb-ui/src/config/defaultSettings.js index b9486e0..0617461 100644 --- a/cmdb-ui/src/config/defaultSettings.js +++ b/cmdb-ui/src/config/defaultSettings.js @@ -18,7 +18,7 @@ export default { showLocale: true, - defaultLang: 'zh-CN', + defaultLang: 'en-US', // zh-CN | en-US useSSO: false, primaryColor: '#1890ff', // primary color of ant design navTheme: 'dark', // theme for nav menu diff --git a/docker-compose.yml b/docker-compose.yml index 4ac7850..b6da5b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: MYSQL_PASSWORD: '123456' volumes: - db-data:/var/lib/mysql - - ./docs/cmdb.sql:/docker-entrypoint-initdb.d/cmdb.sql + - ./docs/cmdb_en.sql:/docker-entrypoint-initdb.d/cmdb.sql networks: new: aliases: @@ -54,7 +54,7 @@ services: - cmdb-search cmdb-api: - image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-api:2.0 + image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-api:2.1 # build: # context: . # target: cmdb-api @@ -83,7 +83,7 @@ services: - cmdb-api cmdb-ui: - image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-ui:2.0 + image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-ui:2.1 # build: # context: . # target: cmdb-ui