Merge branch 'master' of http://222.71.165.188:3000/yunxi/mes-heli

mes-server/src/main/resources/application.yaml

@@ -166,7 +166,7 @@ mes:
     license: MIT
     license-url: https://gitee.com/zhijiantianya/ruoyi-vue-pro/blob/master/LICENSE
   captcha:
-    enable: true # 验证码的开关，默认为 true
+    enable: false # 验证码的开关，默认为 true
   codegen:
     base-package: ${mes.info.base-package}
     db-schemas: ${spring.datasource.dynamic.datasource.master.name}

mes-ui/mes-ui-admin-vue3/.env

@@ -11,7 +11,7 @@ VITE_OPEN=true
 VITE_APP_TENANT_ENABLE=true
 
 # 验证码的开关
-VITE_APP_CAPTCHA_ENABLE=true
+VITE_APP_CAPTCHA_ENABLE=false
 
 # 百度统计
 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc

mes-ui/mes-ui-admin-vue3/src/components/Cropper/src/CropperAvatar.vue

@@ -18,7 +18,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
 import { useI18n } from 'vue-i18n'
 import CopperModal from './CopperModal.vue'
-import avatar from '@/assets/imgs/avatar.jpg'
+import avatar from '@/assets/imgs/smile.png'
 
 defineOptions({ name: 'CropperAvatar' })
 

mes-ui/mes-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue

@@ -3,7 +3,7 @@ import { ElMessageBox } from 'element-plus'
 
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { useDesign } from '@/hooks/web/useDesign'
-import avatarImg from '@/assets/imgs/avatar.gif'
+import avatarImg from '@/assets/imgs/smile.png'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 

mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue

@@ -167,7 +167,7 @@ import { formatTime } from '@/utils'
 
 import { useUserStore } from '@/store/modules/user'
 import { useWatermark } from '@/hooks/web/useWatermark'
-import avatarImg from '@/assets/imgs/avatar.gif'
+import avatarImg from '@/assets/imgs/smile.png'
 import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
 import { pieOptions, barOptions } from './echarts-data'