diff --git a/flask-consul/views/login.py b/flask-consul/views/login.py index 843e4e2..c9813b0 100644 --- a/flask-consul/views/login.py +++ b/flask-consul/views/login.py @@ -64,15 +64,13 @@ class Logo(Resource): try: b64img = base64.b64encode(img.read()).decode('utf-8') consul_kv.put_kv(consul_kv_path,b64img) - return {"code": 20000, "data": "导入成功!"} + return {"code": 20000, "data": "LOGO设置成功!"} except Exception as e: logger.error(f"【logo】导入失败,{e}\n{traceback.format_exc()}") - return {"code": 50000, "data": "导入失败!"} + return {"code": 50000, "data": "LOGO导入失败!"} def get(self, logo_opt): if logo_opt == 'logo': isbig = consul_kv.get_value('ConsulManager/img/isbig') - if isbig == {}: - isbig = True if isbig: consul_kv_path = 'ConsulManager/img/biglogo' else: diff --git a/install/docker-compose/all_install.sh b/install/docker-compose/all_install.sh index ad60bb7..b7506ae 100755 --- a/install/docker-compose/all_install.sh +++ b/install/docker-compose/all_install.sh @@ -1,4 +1,5 @@ #!/bin/bash +export PATH=$PATH:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin tsspath="/opt/tensuns" uuid=`uuidgen` adminpwd=`uuidgen|awk -F- '{print $1}'` diff --git a/vue-consul/src/assets/login_images/bg.png b/vue-consul/src/assets/login_images/bg.png index f9bdf23..4037db9 100644 Binary files a/vue-consul/src/assets/login_images/bg.png and b/vue-consul/src/assets/login_images/bg.png differ diff --git a/vue-consul/src/main.js b/vue-consul/src/main.js index 16b9604..6b77a6e 100644 --- a/vue-consul/src/main.js +++ b/vue-consul/src/main.js @@ -46,7 +46,7 @@ Object.keys(filters).forEach(key => { }) Vue.config.productionTip = false -Vue.prototype.VER = 'v1.0.0' +Vue.prototype.VER = 'v1.0.1' new Vue({ el: '#app', diff --git a/vue-consul/src/settings.js b/vue-consul/src/settings.js index 33f1840..13c3baa 100644 --- a/vue-consul/src/settings.js +++ b/vue-consul/src/settings.js @@ -1,6 +1,6 @@ module.exports = { - title: '后羿 - TenSunS', + title: 'TenSunS', /** * @type {boolean} true | false diff --git a/vue-consul/src/settings.js.tensuns b/vue-consul/src/settings.js.tensuns deleted file mode 100644 index 33f1840..0000000 --- a/vue-consul/src/settings.js.tensuns +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - - title: '后羿 - TenSunS', - - /** - * @type {boolean} true | false - * @description Whether fix the header - */ - fixedHeader: false, - - /** - * @type {boolean} true | false - * @description Whether show the logo in sidebar - */ - sidebarLogo: false -} diff --git a/vue-consul/src/views/ldap/logo.vue b/vue-consul/src/views/ldap/logo.vue index 35e53b1..5231979 100644 --- a/vue-consul/src/views/ldap/logo.vue +++ b/vue-consul/src/views/ldap/logo.vue @@ -1,7 +1,7 @@