diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 62e1a9860..2ee56f80c 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -3,13 +3,20 @@
     "pleaseSelect" : "Please select",
     "langSwitch" : "Language switched successfully!!",
     "operations" : "Operations",
+    "add" : "Add",
     "edit" : "Edit",
-    "cancel": "Cancel",
-    "sure" : "Sure",
     "delete" : "Delete",
+    "copy" : "Copy",
+    "cancel": "Cancel",
+    "confirm" : "Confirm",
     "close" : "Close",
     "selectAll" : "Select All",
     "copySuccess" : "Copy successfully!",
+    "deleteSuccess": "Deleted successfully!",
+    "date" : "Date",
+    "hint" : "Hint",
+    "warning" : "Warning",
+    "enable" : "Enable",
     "" : ""
   },
   "login": {
@@ -49,6 +56,47 @@
     "pleaseWait": "Initializing database, please wait",
     "" : ""
   },
+  "authority" : {
+    "authorityNote" : "Note: Pull down the avatar in the upper right corner to switch roles",
+    "addRole" : "Add Role",
+    "editRole" : "Edit Role",
+    "roleID" : "Role ID",
+    "roleName" : "Role Name",
+    "setPermissions" : "Set Permissions",
+    "parentRole" : "Parent Role",
+    "roleConfig" : "Role Configuration",
+    "roleMenu" : "Role Menu",
+    "roleAPI" : "Role Api",
+    "resourcePermissions" : "Resource Permissions",
+    "positiveIntNote" : "Please enter a positive integer",
+    "rootRole" : "Root Role",
+    "roleIdNote" : "Please enter role id",
+    "roleNameNote" : "Please enter role name",
+    "" : ""
+  },
+  "user": {
+    "addUser" : "Add User",
+    "avatar" : "Avatar",
+    "userName" : "Username",
+    "nickName" : "Nickname",
+    "userRole" : "User Role",
+    "deleteUserConfrim" : "Are you sure you want to delete this user",
+    "resetPassword" : "Reset Password",
+    "password" : "Password",
+    "mediaLibrary" : "Select from media library",
+    "userNameNote" : "Please enter username",
+    "userNameLenNote" : "Username should be 5 character at least.",
+    "passwordNote" : "Please enter password",
+    "passwordLenNote" : "Password should be 6 character at least.",
+    "nickNameNote" : "Please enter nickname",
+    "userRoleNote" : "Please select user role",
+    "resetPasswordConfrim" : "Do you want to reset current password to: 123456",
+    "anotherUserEdit" : "There is currently a user who is editing",
+    "setUserInfoNote" : "Set up successfully!!",
+    "userAddedNote" : "User added successfully!!",
+    "roleSetNote" : "Role set successfully!!",
+    "" : ""
+  },
   "autoCode": {
     "existDB" : "Click here to create code from an existing database",
     "dbName" : "Database Name",
@@ -70,7 +118,7 @@
     "autoMoveFilesTip" : "Note: Automatically migrate the generated files to the corresponding location of the ymal configuration",
     "autoMoveFiles" : "Automatically move files",
     "addField" : "Add Field",
-    "fieldIndex" : "Index",
+    "fieldIndex" : "Id",
     "fieldName" : "Name",
     "fieldDesc" : "Description",
     "fieldJson" : "Json Field",
@@ -120,5 +168,24 @@
     "entColumnName" : "Please enter the column name",
     "entFieldDataType" : "Please enter field datatype",
     "" : ""
+  },
+  "autoCodeAdmin" : {
+    "rollBackMark" : "Rollback mark",
+    "rolledBack" : "Rolled back",
+    "notRolledBack" : "Not Rolled Back",
+    "rollBack" : "Rollback",
+    "reuse" : "Reuse",
+    "deleteHistoryConfirm" : "This operation will delete this history, do you want to continue?",
+    "rollbackConfirm" : "This operation will delete the automatically created files and api, do you want to continue?",
+    "rollbackSuccess" : "Rollback successfully!",
+    "" : ""
+  },
+  "system" : {
+    "systemConfig" : "System Configuration",
+    "envValues" : "Environment values",
+    "portValue" : "Port Value",
+    "ossType": "Oss Type",
+    "multiLogin" : "Multi-login interception",
+    "" : ""
   }
 }
diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json
index 14942c5c0..cb940f8a6 100644
--- a/web/src/locales/zh.json
+++ b/web/src/locales/zh.json
@@ -3,13 +3,20 @@
     "pleaseSelect" : "请选择",
     "langSwitch" : "语言切换成功!!",
     "operations" : "操作",
+    "add" : "新增",
     "edit" : "编辑",
+    "delete" : "删除",
+    "copy" : "拷贝",
     "cancel" : "取消",
     "sure" : "确定",
-    "delete" : "删除",
     "close" : "取 消",
     "selectAll" : "全选",
     "copySuccess" : "复制成功",
+    "deleteSuccess": "删除成功",
+    "date" : "日期",
+    "hint" : "提示",
+    "warning" : "警告",
+    "enable" : "开启",
     "" : ""
   },
   "login": {
@@ -49,6 +56,48 @@
     "pleaseWait" : "正在初始化数据库，请稍候",
     "" : ""
   },
+  "authority" : {
+    "authorityNote" : "注：右上角头像下拉可切换角色",
+    "addRole" : "新增角色",
+    "editRole" : "编辑角色",
+    "roleID" : "角色ID",
+    "roleName" : "角色名称",
+    "setPermissions" : "设置权限",
+    "parentRole" : "父级角色",
+    "roleConfig" : "角色配置",
+    "roleMenu" : "角色菜单",
+    "roleAPI" : "角色api",
+    "resourcePermissions" : "资源权限",
+    "positiveIntNote" : "请输入正整数",
+    "rootRole" : "根角色",
+    "roleIdNote" : "请输入角色ID",
+    "roleNameNote" : "请输入角色名",
+    
+    "" : ""
+  },
+  "user": {
+    "addUser" : "新增用户",
+    "avatar" : "头像",
+    "userName" : "用户名",
+    "nickName" : "昵称",
+    "userRole" : "用户角色",
+    "deleteUserConfrim" : "确定要删除此用户吗",
+    "resetPassword" : "重置密码",
+    "password" : "密码",
+    "mediaLibrary" : "从媒体库选择",
+    "userNameNote" : "请输入用户名",
+    "userNameLenNote" : "最低5位字符",
+    "passwordNote" : "请输入用户密码",
+    "passwordLenNote" : "最低6位字符",
+    "nickNameNote" : "请输入用户昵称",
+    "userRoleNote" : "请选择用户角色",
+    "resetPasswordConfrim" : "是否将此用户密码重置为123456",
+    "anotherUserEdit" : "当前存在正在编辑的用户",
+    "setUserInfoNote" : "设置成功",
+    "userAddedNote" : "创建成功",
+    "roleSetNote" : "角色设置成功",
+    "" : ""
+  },
   "autoCode": {
     "existDB": "点这里从现有数据库创建代码",
     "dbName": "数据库名",
@@ -120,5 +169,24 @@
     "entColumnName" : "请输入数据库字段",
     "entFieldDataType" : "请选择field数据类型",
     "" : ""
+  },
+  "autoCodeAdmin" : {
+    "rollBackMark" : "回滚标记",
+    "rolledBack" : "已回滚",
+    "notRolledBack" : "未回滚",
+    "rollBack" : "回滚",
+    "reuse" : "复用",
+    "deleteHistoryConfirm" : "此操作将删除本历史, 是否继续?",
+    "rollbackConfirm" : "此操作将删除自动创建的文件和api, 是否继续?",
+    "rollbackSuccess" : "回滚成功",
+    "" : ""
+  },
+  "system" : {
+    "systemConfig" : "系统配置",
+    "envValues" : "环境值",
+    "portValue" : "端口值",
+    "ossType": "Oss类型",
+    "multiLogin" : "多点登录拦截",
+    "" : ""
   }
 }
diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index e1cbe154f..4f6d93a64 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -4,113 +4,113 @@ import { store } from '@/store'
 import { emitter } from '@/utils/bus.js'
 
 const service = axios.create({
-    baseURL: import.meta.env.VITE_BASE_API,
-    timeout: 99999
+  baseURL: import.meta.env.VITE_BASE_API,
+  timeout: 99999
 })
 let acitveAxios = 0
 let timer
 const showLoading = () => {
-    acitveAxios++
-    if (timer) {
-        clearTimeout(timer)
+  acitveAxios++
+  if (timer) {
+    clearTimeout(timer)
+  }
+  timer = setTimeout(() => {
+    if (acitveAxios > 0) {
+      emitter.emit('showLoading')
     }
-    timer = setTimeout(() => {
-        if (acitveAxios > 0) {
-            emitter.emit('showLoading')
-        }
-    }, 400)
+  }, 400)
 }
 
 const closeLoading = () => {
-        acitveAxios--
-        if (acitveAxios <= 0) {
-            clearTimeout(timer)
-            emitter.emit('closeLoading')
-        }
-    }
-    // http request 拦截器
+  acitveAxios--
+  if (acitveAxios <= 0) {
+    clearTimeout(timer)
+    emitter.emit('closeLoading')
+  }
+}
+// http request 拦截器
 service.interceptors.request.use(
-    config => {
-        if (!config.donNotShowLoading) {
-            showLoading()
-        }
-        const token = store.getters['user/token']
-        const user = store.getters['user/userInfo']
-        config.data = JSON.stringify(config.data)
-        config.headers = {
-            'Content-Type': 'application/json',
-            'x-token': token,
-            'x-user-id': user.ID
-        }
-        return config
-    },
-    error => {
-        closeLoading()
-        ElMessage({
-            showClose: true,
-            message: error,
-            type: 'error'
-        })
-        return error
+  config => {
+    if (!config.donNotShowLoading) {
+      showLoading()
     }
+    const token = store.getters['user/token']
+    const user = store.getters['user/userInfo']
+    config.data = JSON.stringify(config.data)
+    config.headers = {
+      'Content-Type': 'application/json',
+      'x-token': token,
+      'x-user-id': user.ID
+    }
+    return config
+  },
+  error => {
+    closeLoading()
+    ElMessage({
+      showClose: true,
+      message: error,
+      type: 'error'
+    })
+    return error
+  }
 )
 
 // http response 拦截器
 service.interceptors.response.use(
-    response => {
-        closeLoading()
-        if (response.headers['new-token']) {
-            store.commit('user/setToken', response.headers['new-token'])
-        }
-        if (response.data.code === 0 || response.headers.success === 'true') {
-            if (response.headers.msg) {
-                response.data.msg = decodeURI(response.headers.msg)
-            }
-            return response.data
-        } else {
-            ElMessage({
-                showClose: true,
-                message: response.data.msg,
-                type: 'error'
-            })
-            if (response.data.data && response.data.data.reload) {
-                store.commit('user/LoginOut')
-            }
-            return response.data.msg ? response.data : response
-        }
-    },
-    error => {
-        closeLoading()
-        switch (error.response.status) {
-            case 500:
-                ElMessageBox.confirm(`
+  response => {
+    closeLoading()
+    if (response.headers['new-token']) {
+      store.commit('user/setToken', response.headers['new-token'])
+    }
+    if (response.data.code === 0 || response.headers.success === 'true') {
+      if (response.headers.msg) {
+        response.data.msg = decodeURI(response.headers.msg)
+      }
+      return response.data
+    } else {
+      ElMessage({
+        showClose: true,
+        message: response.data.msg,
+        type: 'error'
+      })
+      if (response.data.data && response.data.data.reload) {
+        store.commit('user/LoginOut')
+      }
+      return response.data.msg ? response.data : response
+    }
+  },
+  error => {
+    closeLoading()
+    switch (error.response.status) {
+      case 500:
+        ElMessageBox.confirm(`
         <p>检测到接口错误${error}</p>
         <p>错误码<span style="color:red"> 500 </span>：此类错误内容常见于后台panic，请先查看后台日志，如果影响您正常使用可强制登出清理缓存</p>
         `, '接口报错', {
-                        dangerouslyUseHTMLString: true,
-                        distinguishCancelAndClose: true,
-                        confirmButtonText: '清理缓存',
-                        cancelButtonText: '取消'
-                    })
-                    .then(() => {
-                        store.commit('user/LoginOut')
-                    })
-                break
-            case 404:
-                ElMessageBox.confirm(`
+          dangerouslyUseHTMLString: true,
+          distinguishCancelAndClose: true,
+          confirmButtonText: '清理缓存',
+          cancelButtonText: this.$t('general.cancel')
+        })
+          .then(() => {
+            store.commit('user/LoginOut')
+          })
+        break
+      case 404:
+        ElMessageBox.confirm(`
           <p>检测到接口错误${error}</p>
           <p>错误码<span style="color:red"> 404 </span>：此类错误多为接口未注册（或未重启）或者请求路径（方法）与api路径（方法）不符--如果为自动化代码请检查是否存在空格</p>
           `, '接口报错', {
-                    dangerouslyUseHTMLString: true,
-                    distinguishCancelAndClose: true,
-                    confirmButtonText: '我知道了',
-                    cancelButtonText: '取消'
-                })
-                break
-        }
-
-        return error
+          dangerouslyUseHTMLString: true,
+          distinguishCancelAndClose: true,
+          confirmButtonText: '我知道了',
+          cancelButtonText: this.$t('general.cancel')
+        })
+        break
     }
+
+    return error
+  }
 )
 
-export default service
\ No newline at end of file
+export default service
diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue
index c7cc3adf9..8c43478bb 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -3,7 +3,7 @@
     <warning-bar title="在资源权限中将此角色的资源权限清空 或者不包含创建者的角色 即可屏蔽此客户资源的显示" />
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="openDialog">新增</el-button>
+        <el-button size="mini" type="primary" icon="plus" @click="openDialog">{{ $t('general.add') }}</el-button>
       </div>
       <el-table
         ref="multipleTable"
@@ -28,7 +28,7 @@
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">{{ $t('general.cancel') }}</el-button>
-                <el-button type="primary" size="mini" @click="deleteCustomer(scope.row)">{{ $t('general.sure') }}</el-button>
+                <el-button type="primary" size="mini" @click="deleteCustomer(scope.row)">{{ $t('general.confirm') }}</el-button>
               </div>
               <template #reference>
                 <el-button type="text" icon="delete" size="mini">{{ $t('general.delete') }}</el-button>
@@ -61,7 +61,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="closeDialog">{{ $t('general.close') }}</el-button>
-          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -119,7 +119,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: 'success',
-          message: '删除成功'
+          message: this.$t('general.deleteSuccess')
         })
         if (this.tableData.length === 1 && this.page > 1) {
           this.page--
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
index 3afd544a9..e7bd7ee46 100644
--- a/web/src/view/example/upload/upload.vue
+++ b/web/src/view/example/upload/upload.vue
@@ -28,7 +28,7 @@
             <CustomPic pic-type="file" :pic-src="scope.row.url" />
           </template>
         </el-table-column>
-        <el-table-column align="left" label="日期" prop="UpdatedAt" width="180">
+        <el-table-column align="left" :label="$t('general.date')" prop="UpdatedAt" width="180">
           <template #default="scope">
             <div>{{ formatDate(scope.row.UpdatedAt) }}</div>
           </template>
@@ -98,9 +98,9 @@ export default {
   },
   methods: {
     async deleteFile(row) {
-      this.$confirm('此操作将永久文件, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('此操作将永久文件, 是否继续?', this.$t('general.hint'), {
+        confirmButtonText: this.$t('general.confirm'),
+        cancelButtonText: this.$t('general.cancel'),
         type: 'warning'
       })
         .then(async() => {
diff --git a/web/src/view/person/person.vue b/web/src/view/person/person.vue
index c07682d88..a515c9243 100644
--- a/web/src/view/person/person.vue
+++ b/web/src/view/person/person.vue
@@ -121,7 +121,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="showPassword=false">{{ $t('general.close') }}</el-button>
-          <el-button size="small" type="primary" @click="savePassword">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="savePassword">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index 575274739..f22c330dd 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -29,12 +29,12 @@
     </div>
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="openDialog('addApi')">新增</el-button>
+        <el-button size="mini" type="primary" icon="plus" @click="openDialog('addApi')">{{ $t('general.add') }}</el-button>
         <el-popover v-model:visible="deleteVisible" placement="top" width="160">
           <p>确定要删除吗？</p>
           <div style="text-align: right; margin-top: 8px;">
             <el-button size="mini" type="text" @click="deleteVisible = false">{{ $t('general.cancel') }}</el-button>
-            <el-button size="mini" type="primary" @click="onDelete">{{ $t('general.sure') }}</el-button>
+            <el-button size="mini" type="primary" @click="onDelete">{{ $t('general.confirm') }}</el-button>
           </div>
           <template #reference>
             <el-button icon="delete" size="mini" :disabled="!apis.length" style="margin-left: 10px;">{{ $t('general.delete') }}</el-button>
@@ -115,7 +115,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="closeDialog">{{ $t('general.close') }}</el-button>
-          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -278,9 +278,9 @@ export default {
       this.openDialog('edit')
     },
     async deleteApi(row) {
-      this.$confirm('此操作将永久删除所有角色下该api, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('此操作将永久删除所有角色下该api, 是否继续?', this.$t('general.hint'), {
+        confirmButtonText: this.$t('general.confirm'),
+        cancelButtonText: this.$t('general.cancel'),
         type: 'warning'
       })
         .then(async() => {
diff --git a/web/src/view/superAdmin/authority/authority.vue b/web/src/view/superAdmin/authority/authority.vue
index 216dc1b24..cfe467a0f 100644
--- a/web/src/view/superAdmin/authority/authority.vue
+++ b/web/src/view/superAdmin/authority/authority.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="authority">
-    <warning-bar title="注：右上角头像下拉可切换角色" />
+    <warning-bar :title="$t('authority.authorityNote')" />
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="addAuthority('0')">新增角色</el-button>
+        <el-button size="mini" type="primary" icon="plus" @click="addAuthority('0')">{{ $t('authority.addRole') }}</el-button>
       </div>
       <el-table
         :data="tableData"
@@ -11,8 +11,8 @@
         row-key="authorityId"
         style="width: 100%"
       >
-        <el-table-column label="角色ID" min-width="180" prop="authorityId" />
-        <el-table-column align="left" label="角色名称" min-width="180" prop="authorityName" />
+        <el-table-column :label="$t('authority.roleID')" min-width="180" prop="authorityId" />
+        <el-table-column align="left" :label="$t('authority.roleName')" min-width="180" prop="authorityName" />
         <el-table-column align="left" :lable="$t('general.operations')" width="460">
           <template #default="scope">
             <el-button
@@ -20,19 +20,19 @@
               size="mini"
               type="text"
               @click="opdendrawer(scope.row)"
-            >设置权限</el-button>
+            >{{ $t('authority.setPermissions') }}</el-button>
             <el-button
               icon="plus"
               size="mini"
               type="text"
               @click="addAuthority(scope.row.authorityId)"
-            >新增子角色</el-button>
+            >{{ $t('general.add') }}</el-button>
             <el-button
               icon="copy-document"
               size="mini"
               type="text"
               @click="copyAuthority(scope.row)"
-            >拷贝</el-button>
+            >{{ $t('general.copy') }}</el-button>
             <el-button
               icon="edit"
               size="mini"
@@ -51,8 +51,8 @@
     </div>
     <!-- 新增角色弹窗 -->
     <el-dialog v-model="dialogFormVisible" :title="dialogTitle">
-      <el-form ref="authorityForm" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="父级角色" prop="parentId">
+      <el-form ref="authorityForm" :model="form" :rules="rules" label-width="100px">
+        <el-form-item :label="$t('authority.parentRole')" prop="parentId">
           <el-cascader
             v-model="form.parentId"
             style="width:100%"
@@ -63,30 +63,30 @@
             filterable
           />
         </el-form-item>
-        <el-form-item label="角色ID" prop="authorityId">
+        <el-form-item :label="$t('authority.roleID')" prop="authorityId">
           <el-input v-model="form.authorityId" :disabled="dialogType=='edit'" autocomplete="off" />
         </el-form-item>
-        <el-form-item label="角色姓名" prop="authorityName">
+        <el-form-item :label="$t('authority.roleName')" prop="authorityName">
           <el-input v-model="form.authorityName" autocomplete="off" />
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="closeDialog">{{ $t('general.close') }}</el-button>
-          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
 
-    <el-drawer v-if="drawer" v-model="drawer" :with-header="false" size="40%" title="角色配置">
+    <el-drawer v-if="drawer" v-model="drawer" :with-header="false" size="40%" :title="$t('authority.roleConfig')">
       <el-tabs :before-leave="autoEnter" class="role-box" type="border-card">
-        <el-tab-pane label="角色菜单">
+        <el-tab-pane :label="$t('authority.roleMenu')">
           <Menus ref="menus" :row="activeRow" @changeRow="changeRow" />
         </el-tab-pane>
-        <el-tab-pane label="角色api">
+        <el-tab-pane :label="$t('authority.roleAPI')">
           <Apis ref="apis" :row="activeRow" @changeRow="changeRow" />
         </el-tab-pane>
-        <el-tab-pane label="资源权限">
+        <el-tab-pane :label="$t('authority.resourcePermissions')">
           <Datas ref="datas" :authority="tableData" :row="activeRow" @changeRow="changeRow" />
         </el-tab-pane>
       </el-tabs>
@@ -123,7 +123,7 @@ export default {
   data() {
     var mustUint = (rule, value, callback) => {
       if (!/^[0-9]*[1-9][0-9]*$/.test(value)) {
-        return callback(new Error('请输入正整数'))
+        return callback(new Error(this.$t('authority.positiveIntNote')))
       }
       return callback()
     }
@@ -132,7 +132,7 @@ export default {
       AuthorityOption: [
         {
           authorityId: '0',
-          authorityName: '根角色'
+          authorityName: this.$t('authority.rootRole')
         }
       ],
       listApi: getAuthorityList,
@@ -140,7 +140,7 @@ export default {
       dialogType: 'add',
       activeRow: {},
       activeUserId: 0,
-      dialogTitle: '新增角色',
+      dialogTitle: this.$t('authority.addRole'),
       dialogFormVisible: false,
       apiDialogFlag: false,
       copyForm: {},
@@ -151,11 +151,11 @@ export default {
       },
       rules: {
         authorityId: [
-          { required: true, message: '请输入角色ID', trigger: 'blur' },
+          { required: true, message: this.$t('authority.roleIdNote'), trigger: 'blur' },
           { validator: mustUint, trigger: 'blur' }
         ],
         authorityName: [
-          { required: true, message: '请输入角色名', trigger: 'blur' }
+          { required: true, message: this.$t('authority.roleNameNote'), trigger: 'blur' }
         ],
         parentId: [
           { required: true, message: '请选择请求方式', trigger: 'blur' }
@@ -197,9 +197,9 @@ export default {
     },
     // 删除角色
     deleteAuth(row) {
-      this.$confirm('此操作将永久删除该角色, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('此操作将永久删除该角色, 是否继续?', this.$t('general.hint'), {
+        confirmButtonText: this.$t('general.confirm'),
+        cancelButtonText: this.$t('general.cancel'),
         type: 'warning'
       })
         .then(async() => {
@@ -348,7 +348,7 @@ export default {
     // 增加角色
     addAuthority(parentId) {
       this.initForm()
-      this.dialogTitle = '新增角色'
+      this.dialogTitle = this.$t('authority.addRole')
       this.dialogType = 'add'
       this.form.parentId = parentId
       this.setOptions()
@@ -357,7 +357,7 @@ export default {
     // 编辑角色
     editAuthority(row) {
       this.setOptions()
-      this.dialogTitle = '编辑角色'
+      this.dialogTitle = this.$t('authority.editRole')
       this.dialogType = 'edit'
       for (const key in this.form) {
         this.form[key] = row[key]
diff --git a/web/src/view/superAdmin/authority/components/apis.vue b/web/src/view/superAdmin/authority/components/apis.vue
index be5f01862..b79687db5 100644
--- a/web/src/view/superAdmin/authority/components/apis.vue
+++ b/web/src/view/superAdmin/authority/components/apis.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="clearflex">
-      <el-button class="fl-right" size="mini" type="primary" @click="authApiEnter">{{ $t('general.sure') }}</el-button>
+      <el-button class="fl-right" size="mini" type="primary" @click="authApiEnter">{{ $t('general.confirm') }}</el-button>
     </div>
     <el-tree
       ref="apiTree"
diff --git a/web/src/view/superAdmin/authority/components/datas.vue b/web/src/view/superAdmin/authority/components/datas.vue
index ce406f7a6..5dbdbe0b7 100644
--- a/web/src/view/superAdmin/authority/components/datas.vue
+++ b/web/src/view/superAdmin/authority/components/datas.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="clearflex" style="margin:18px">
-      <el-button class="fl-right" size="mini" type="primary" @click="authDataEnter">{{ $t('general.sure') }}</el-button>
+      <el-button class="fl-right" size="mini" type="primary" @click="authDataEnter">{{ $t('general.confirm') }}</el-button>
       <el-button class="fl-left" size="mini" type="primary" @click="all">{{ $t('general.selectAll') }}</el-button>
       <el-button class="fl-left" size="mini" type="primary" @click="self">本角色</el-button>
       <el-button class="fl-left" size="mini" type="primary" @click="selfAndChildren">本角色及子角色</el-button>
diff --git a/web/src/view/superAdmin/authority/components/menus.vue b/web/src/view/superAdmin/authority/components/menus.vue
index 04b98987b..91121140a 100644
--- a/web/src/view/superAdmin/authority/components/menus.vue
+++ b/web/src/view/superAdmin/authority/components/menus.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="clearflex">
-      <el-button class="fl-right" size="mini" type="primary" @click="relation">{{ $t('general.sure') }}</el-button>
+      <el-button class="fl-right" size="mini" type="primary" @click="relation">{{ $t('general.confirm') }}</el-button>
     </div>
     <el-tree
       ref="menuTree"
diff --git a/web/src/view/superAdmin/dictionary/sysDictionary.vue b/web/src/view/superAdmin/dictionary/sysDictionary.vue
index 2616bab53..57e752ba7 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionary.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionary.vue
@@ -28,7 +28,7 @@
     </div>
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="openDialog">新增</el-button>
+        <el-button size="mini" type="primary" icon="plus" @click="openDialog">{{ $t('general.add') }}</el-button>
       </div>
       <el-table
         ref="multipleTable"
@@ -38,7 +38,7 @@
         row-key="ID"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column align="left" label="日期" width="180">
+        <el-table-column align="left" :label="$t('general.date')" width="180">
           <template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
         </el-table-column>
 
@@ -60,7 +60,7 @@
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">{{ $t('general.cancel') }}</el-button>
-                <el-button type="primary" size="mini" @click="deleteSysDictionary(scope.row)">{{ $t('general.sure') }}</el-button>
+                <el-button type="primary" size="mini" @click="deleteSysDictionary(scope.row)">{{ $t('general.confirm') }}</el-button>
               </div>
               <template #reference>
                 <el-button type="text" icon="delete" size="mini" style="margin-left:10px">{{ $t('general.delete') }}</el-button>
@@ -101,7 +101,7 @@
           />
         </el-form-item>
         <el-form-item label="状态" prop="status" required>
-          <el-switch v-model="formData.status" active-text="开启" inactive-text="停用" />
+          <el-switch v-model="formData.status" :active-text="$t('general.enable')" inactive-text="停用" />
         </el-form-item>
         <el-form-item label="描述" prop="desc">
           <el-input v-model="formData.desc" placeholder="请输入描述" clearable :style="{width: '100%'}" />
@@ -110,7 +110,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="closeDialog">{{ $t('general.close') }}</el-button>
-          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -216,7 +216,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: 'success',
-          message: '删除成功'
+          message: this.$t('general.deleteSuccess')
         })
         if (this.tableData.length === 1 && this.page > 1) {
           this.page--
diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
index 12b5a2899..9806ec439 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
@@ -32,7 +32,7 @@
         row-key="ID"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column align="left" label="日期" width="180">
+        <el-table-column align="left" :label="$t('general.date')" width="180">
           <template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
         </el-table-column>
 
@@ -53,7 +53,7 @@
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">{{ $t('general.cancel') }}</el-button>
-                <el-button type="primary" size="mini" @click="deleteSysDictionaryDetail(scope.row)">{{ $t('general.sure') }}</el-button>
+                <el-button type="primary" size="mini" @click="deleteSysDictionaryDetail(scope.row)">{{ $t('general.confirm') }}</el-button>
               </div>
               <template #reference>
                 <el-button type="text" icon="delete" size="mini">{{ $t('general.delete') }}</el-button>
@@ -97,7 +97,7 @@
           />
         </el-form-item>
         <el-form-item label="启用状态" prop="status" required>
-          <el-switch v-model="formData.status" active-text="开启" inactive-text="停用" />
+          <el-switch v-model="formData.status" :active-text="$t('general.enable')" inactive-text="停用" />
         </el-form-item>
         <el-form-item label="排序标记" prop="sort">
           <el-input-number v-model.number="formData.sort" placeholder="排序标记" />
@@ -106,7 +106,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="closeDialog">{{ $t('general.close') }}</el-button>
-          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -203,7 +203,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: 'success',
-          message: '删除成功'
+          message: this.$t('general.deleteSuccess')
         })
         if (this.tableData.length === 1 && this.page > 1) {
           this.page--
diff --git a/web/src/view/superAdmin/menu/icon.vue b/web/src/view/superAdmin/menu/icon.vue
index 98fd16c51..1f53a50fc 100644
--- a/web/src/view/superAdmin/menu/icon.vue
+++ b/web/src/view/superAdmin/menu/icon.vue
@@ -1160,6 +1160,10 @@ export default {
   },
   created() {
     this.metaData = this.meta
+    // added by mohamed hassan - PR: Update icon.vue #865
+    if (this.metaData.icon === '') {
+      this.metaData.icon = this.options[0].label
+    }
   },
   methods: {}
 }
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index 0893a81e9..3418ef6e2 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -181,7 +181,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="closeDialog">{{ $t('general.close') }}</el-button>
-          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="enterDialog">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -311,9 +311,9 @@ export default {
     },
     // 删除菜单
     deleteMenu(ID) {
-      this.$confirm('此操作将永久删除所有角色下该菜单, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm('此操作将永久删除所有角色下该菜单, 是否继续?', this.$t('general.hint'), {
+        confirmButtonText: this.$t('general.confirm'),
+        cancelButtonText: this.$t('general.cancel'),
         type: 'warning'
       })
         .then(async() => {
diff --git a/web/src/view/superAdmin/operation/sysOperationRecord.vue b/web/src/view/superAdmin/operation/sysOperationRecord.vue
index 635e8c18f..23c7f5470 100644
--- a/web/src/view/superAdmin/operation/sysOperationRecord.vue
+++ b/web/src/view/superAdmin/operation/sysOperationRecord.vue
@@ -24,7 +24,7 @@
           <p>确定要删除吗？</p>
           <div style="text-align: right; margin-top: 8px;">
             <el-button size="mini" type="text" @click="deleteVisible = false">{{ $t('general.cancel') }}</el-button>
-            <el-button size="mini" type="primary" @click="onDelete">{{ $t('general.sure') }}</el-button>
+            <el-button size="mini" type="primary" @click="onDelete">{{ $t('general.confirm') }}</el-button>
           </div>
           <template #reference>
             <el-button icon="delete" size="mini" style="margin-left: 10px;" :disabled="!multipleSelection.length">{{ $t('general.delete') }}</el-button>
@@ -45,7 +45,7 @@
             <div>{{ scope.row.user.userName }}({{ scope.row.user.nickName }})</div>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="日期" width="180">
+        <el-table-column align="left" :label="$t('general.date')" width="180">
           <template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
         </el-table-column>
         <el-table-column align="left" label="状态码" prop="status" width="120">
@@ -95,7 +95,7 @@
               <p>确定要删除吗？</p>
               <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">{{ $t('general.cancel') }}</el-button>
-                <el-button size="mini" type="primary" @click="deleteSysOperationRecord(scope.row)">{{ $t('general.sure') }}</el-button>
+                <el-button size="mini" type="primary" @click="deleteSysOperationRecord(scope.row)">{{ $t('general.confirm') }}</el-button>
               </div>
               <template #reference>
                 <el-button icon="delete" size="mini" type="text">{{ $t('general.delete') }}</el-button>
@@ -175,7 +175,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: 'success',
-          message: '删除成功'
+          message: this.$t('general.deleteSuccess')
         })
         if (this.tableData.length === ids.length && this.page > 1) {
           this.page--
@@ -190,7 +190,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: 'success',
-          message: '删除成功'
+          message: this.$t('general.deleteSuccess')
         })
         if (this.tableData.length === 1 && this.page > 1) {
           this.page--
diff --git a/web/src/view/superAdmin/user/user.vue b/web/src/view/superAdmin/user/user.vue
index 5392265eb..87c4356f2 100644
--- a/web/src/view/superAdmin/user/user.vue
+++ b/web/src/view/superAdmin/user/user.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
-    <warning-bar title="注：右上角头像下拉可切换角色" />
+    <warning-bar :title="$t('authority.authorityNote')" />
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="addUser">新增用户</el-button>
+        <el-button size="mini" type="primary" icon="plus" @click="addUser">{{ $t('user.addUser') }}</el-button>
       </div>
       <el-table :data="tableData">
-        <el-table-column align="left" label="头像" min-width="50">
+        <el-table-column align="left" :label="$t('user.avatar')" min-width="50">
           <template #default="scope">
             <CustomPic style="margin-top:8px" :pic-src="scope.row.headerImg" />
           </template>
         </el-table-column>
         <el-table-column align="left" label="UUID" min-width="250" prop="uuid" />
-        <el-table-column align="left" label="用户名" min-width="150" prop="userName" />
-        <el-table-column align="left" label="昵称" min-width="100" prop="nickName">
+        <el-table-column align="left" :label="$t('user.userName')" min-width="150" prop="userName" />
+        <el-table-column align="left" :label="$t('user.nickName')" min-width="100" prop="nickName">
           <template #default="scope">
             <p v-if="!scope.row.editFlag" class="nickName">{{ scope.row.nickName }}
               <el-icon class="pointer" color="#66b1ff" @click="openEidt(scope.row)">
@@ -31,7 +31,7 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="用户角色" min-width="150">
+        <el-table-column align="left" :label="$t('user.userRole')" min-width="150">
           <template #default="scope">
             <el-cascader
               v-model="scope.row.authorityIds"
@@ -48,16 +48,16 @@
         <el-table-column align="left" :lable="$t('general.operations')" min-width="150">
           <template #default="scope">
             <el-popover :visible="scope.row.visible" placement="top" width="160">
-              <p>确定要删除此用户吗</p>
+              <p>{{ $t('user.deleteUserConfrim') }}</p>
               <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">{{ $t('general.cancel') }}</el-button>
-                <el-button type="primary" size="mini" @click="deleteUser(scope.row)">{{ $t('general.sure') }}</el-button>
+                <el-button type="primary" size="mini" @click="deleteUser(scope.row)">{{ $t('general.confirm') }}</el-button>
               </div>
               <template #reference>
                 <el-button type="text" icon="delete" size="mini">{{ $t('general.delete') }}</el-button>
               </template>
             </el-popover>
-            <el-button type="text" icon="magic-stick" size="mini" @click="resetPassword(scope.row)">重置密码</el-button>
+            <el-button type="text" icon="magic-stick" size="mini" @click="resetPassword(scope.row)">{{ $t('user.resetPassword') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -73,18 +73,18 @@
         />
       </div>
     </div>
-    <el-dialog v-model="addUserDialog" custom-class="user-dialog" title="新增用户">
-      <el-form ref="userForm" :rules="rules" :model="userInfo" label-width="80px">
-        <el-form-item label="用户名" prop="username">
+    <el-dialog v-model="addUserDialog" custom-class="user-dialog" :title="$t('user.addUser')">
+      <el-form ref="userForm" :rules="rules" :model="userInfo" label-width="90px">
+        <el-form-item :label="$t('user.userName')" prop="username">
           <el-input v-model="userInfo.username" />
         </el-form-item>
-        <el-form-item label="密码" prop="password">
+        <el-form-item :label="$t('user.password')" prop="password">
           <el-input v-model="userInfo.password" />
         </el-form-item>
-        <el-form-item label="别名" prop="nickName">
+        <el-form-item :label="$t('user.nickName')" prop="nickName">
           <el-input v-model="userInfo.nickName" />
         </el-form-item>
-        <el-form-item label="用户角色" prop="authorityId">
+        <el-form-item :label="$t('user.userRole')" prop="authorityId">
           <el-cascader
             v-model="userInfo.authorityIds"
             style="width:100%"
@@ -94,10 +94,10 @@
             :clearable="false"
           />
         </el-form-item>
-        <el-form-item label="头像" label-width="80px">
+        <el-form-item label="" label-width="80px">
           <div style="display:inline-block" @click="openHeaderChange">
             <img v-if="userInfo.headerImg" class="header-img-box" :src="(userInfo.headerImg && userInfo.headerImg.slice(0, 4) !== 'http')?path+userInfo.headerImg:userInfo.headerImg">
-            <div v-else class="header-img-box">从媒体库选择</div>
+            <div v-else class="header-img-box">{{ $t('user.mediaLibrary') }}</div>
           </div>
         </el-form-item>
 
@@ -105,7 +105,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button size="small" @click="closeAddUserDialog">{{ $t('general.close') }}</el-button>
-          <el-button size="small" type="primary" @click="enterAddUserDialog">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="enterAddUserDialog">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -150,18 +150,18 @@ export default {
       },
       rules: {
         username: [
-          { required: true, message: '请输入用户名', trigger: 'blur' },
-          { min: 5, message: '最低5位字符', trigger: 'blur' }
+          { required: true, message: this.$t('user.userNameNote'), trigger: 'blur' },
+          { min: 5, message: this.$t('user.userNameLenNote'), trigger: 'blur' }
         ],
         password: [
-          { required: true, message: '请输入用户密码', trigger: 'blur' },
-          { min: 6, message: '最低6位字符', trigger: 'blur' }
+          { required: true, message: this.$t('user.passwordNote'), trigger: 'blur' },
+          { min: 6, message: this.$t('user.passwordLenNote'), trigger: 'blur' }
         ],
         nickName: [
-          { required: true, message: '请输入用户昵称', trigger: 'blur' }
+          { required: true, message: this.$t('user.nickNameNote'), trigger: 'blur' }
         ],
         authorityId: [
-          { required: true, message: '请选择用户角色', trigger: 'blur' }
+          { required: true, message: this.$t('user.userRoleNote'), trigger: 'blur' }
         ]
       }
     }
@@ -182,11 +182,11 @@ export default {
   methods: {
     resetPassword(row) {
       this.$confirm(
-        '是否将此用户密码重置为123456?',
-        '警告',
+        this.$t('user.resetPasswordConfrim'),
+        this.$t('general.warning'),
         {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+          confirmButtonText: this.$t('general.confirm'),
+          cancelButtonText: this.$t('general.cancel'),
           type: 'warning',
         }
       ).then(async() => {
@@ -223,7 +223,7 @@ export default {
     },
     openEidt(row) {
       if (this.tableData.some(item => item.editFlag)) {
-        this.$message('当前存在正在编辑的用户')
+        this.$message(this.$t('user.anotherUserEdit'))
         return
       }
       this.backNickName = row.nickName
@@ -234,7 +234,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: 'success',
-          message: '设置成功'
+          message: this.$t('user.setUserInfoNote')
         })
       }
       this.backNickName = ''
@@ -268,7 +268,7 @@ export default {
     async deleteUser(row) {
       const res = await deleteUser({ id: row.ID })
       if (res.code === 0) {
-        this.$message.success('删除成功')
+        this.$message.success(this.$t('general.deleteSuccess'))
         await this.getTableData()
         row.visible = false
       }
@@ -279,7 +279,7 @@ export default {
         if (valid) {
           const res = await register(this.userInfo)
           if (res.code === 0) {
-            this.$message({ type: 'success', message: '创建成功' })
+            this.$message({ type: 'success', message: this.$t('user.userAddedNote') })
           }
           await this.getTableData()
           this.closeAddUserDialog()
@@ -305,7 +305,7 @@ export default {
           authorityIds: row.authorityIds
         })
         if (res.code === 0) {
-          this.$message({ type: 'success', message: '角色设置成功' })
+          this.$message({ type: 'success', message: this.$t('user.roleSetNote') })
         }
       })
     },
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index a3e953507..9a33d9aed 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -121,7 +121,7 @@
               <p>{{ $t('autoCode.confirmDelete') }}</p>
               <div style="text-align: right; margin-top: 8px;">
                 <el-button size="mini" type="text" @click="scope.row.visible = false">{{ $t('general.cancel') }}</el-button>
-                <el-button type="primary" size="mini" @click="deleteField(scope.$index)">{{ $t('general.sure') }}</el-button>
+                <el-button type="primary" size="mini" @click="deleteField(scope.$index)">{{ $t('general.confirm') }}</el-button>
               </div>
               <template #reference>
                 <el-button size="mini" type="text" icon="delete">{{ $t('general.delete') }}</el-button>
@@ -142,7 +142,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button size="mini" @click="closeDialog">{{ $t('general.close') }}</el-button>
-          <el-button size="mini" type="primary" @click="enterDialog">{{ $t('general.sure') }}</el-button>
+          <el-button size="mini" type="primary" @click="enterDialog">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -158,7 +158,7 @@
       <PreviewCodeDialog v-if="previewFlag" ref="preview" :preview-code="preViewCode" />
       <template #footer>
         <div class="dialog-footer" style="padding-top:14px;padding-right:14px">
-          <el-button size="small" type="primary" @click="previewFlag = false">{{ $t('general.sure') }}</el-button>
+          <el-button size="small" type="primary" @click="previewFlag = false">{{ $t('general.confirm') }}</el-button>
         </div>
       </template>
     </el-dialog>
diff --git a/web/src/view/systemTools/autoCodeAdmin/index.vue b/web/src/view/systemTools/autoCodeAdmin/index.vue
index 0a102d1a1..db1039d91 100644
--- a/web/src/view/systemTools/autoCodeAdmin/index.vue
+++ b/web/src/view/systemTools/autoCodeAdmin/index.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="gva-table-box">
       <div class="gva-btn-list">
-        <el-button size="mini" type="primary" icon="plus" @click="goAutoCode(null)">新增</el-button>
+        <el-button size="mini" type="primary" icon="plus" @click="goAutoCode(null)">{{ $t('general.add') }}</el-button>
       </div>
       <el-table :data="tableData">
         <el-table-column
@@ -10,13 +10,13 @@
           width="55"
         />
         <el-table-column align="left" label="id" width="60" prop="ID" />
-        <el-table-column align="left" label="日期" width="180">
+        <el-table-column align="left" :label="$t('general.date')" width="180">
           <template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
         </el-table-column>
-        <el-table-column align="left" label="结构体名" min-width="150" prop="structName" />
-        <el-table-column align="left" label="结构体描述" min-width="150" prop="structCNName" />
-        <el-table-column align="left" label="表名称" min-width="150" prop="tableName" />
-        <el-table-column align="left" label="回滚标记" min-width="150" prop="flag">
+        <el-table-column align="left" :label="$t('autoCode.structName')" min-width="150" prop="structName" />
+        <el-table-column align="left" :label="$t('autoCode.structChineseName')" min-width="150" prop="structCNName" />
+        <el-table-column align="left" :label="$t('autoCode.tableName')" min-width="150" prop="tableName" />
+        <el-table-column align="left" :label="$t('autoCodeAdmin.rollBackMark')" min-width="150" prop="flag">
           <template #default="scope">
             <el-tag
               v-if="scope.row.flag"
@@ -24,7 +24,7 @@
               size="mini"
               effect="dark"
             >
-              已回滚
+              {{ $t('autoCodeAdmin.rolledBack') }}
             </el-tag>
             <el-tag
               v-else
@@ -32,15 +32,15 @@
               type="success"
               effect="dark"
             >
-              未回滚
+              {{ $t('autoCodeAdmin.notRolledBack') }}
             </el-tag>
           </template>
         </el-table-column>
         <el-table-column align="left" :lable="$t('general.operations')" min-width="180">
           <template #default="scope">
             <div>
-              <el-button size="mini" type="text" :disabled="scope.row.flag === 1" @click="rollback(scope.row)">回滚</el-button>
-              <el-button size="mini" type="text" @click="goAutoCode(scope.row)">复用</el-button>
+              <el-button size="mini" type="text" :disabled="scope.row.flag === 1" @click="rollback(scope.row)">{{ $t('autoCodeAdmin.rollBack') }}</el-button>
+              <el-button size="mini" type="text" @click="goAutoCode(scope.row)">{{ $t('autoCodeAdmin.reuse') }}</el-button>
               <el-button size="mini" type="text" @click="deleteRow(scope.row)">{{ $t('general.delete') }}</el-button>
             </div>
           </template>
@@ -79,27 +79,27 @@ export default {
   },
   methods: {
     async deleteRow(row) {
-      this.$confirm('此操作将删除本历史, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(this.$t('autoCodeAdmin.deleteHistoryConfirm'), this.$t('general.hint'), {
+        confirmButtonText: this.$t('general.confirm'),
+        cancelButtonText: this.$t('general.cancel'),
         type: 'warning'
       }).then(async() => {
         const res = await delSysHistory({ id: Number(row.ID) })
         if (res.code === 0) {
-          this.$message.success('删除成功')
+          this.$message.success(this.$t('general.deleteSuccess'))
           this.getTableData()
         }
       })
     },
     async rollback(row) {
-      this.$confirm('此操作将删除自动创建的文件和api, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(this.$t('autoCodeAdmin.rollbackConfirm'), this.$t('general.hint'), {
+        confirmButtonText: this.$t('general.confirm'),
+        cancelButtonText: this.$t('general.cancel'),
         type: 'warning'
       }).then(async() => {
         const res = await rollback({ id: Number(row.ID) })
         if (res.code === 0) {
-          this.$message.success('回滚成功')
+          this.$message.success(this.$t('autoCodeAdmin.rollbackSuccess'))
           this.getTableData()
         }
       })
diff --git a/web/src/view/systemTools/system/system.vue b/web/src/view/systemTools/system/system.vue
index bd0e2e443..89cdaf427 100644
--- a/web/src/view/systemTools/system/system.vue
+++ b/web/src/view/systemTools/system/system.vue
@@ -3,21 +3,21 @@
     <el-form ref="form" :model="config" label-width="240px">
       <!--  System start  -->
       <el-collapse v-model="activeNames" @change="handleChange">
-        <el-collapse-item title="系统配置" name="1">
-          <el-form-item label="环境值">
+        <el-collapse-item :title="$t('system.systemConfig')" name="1">
+          <el-form-item :label="$t('system.envValues')">
             <el-input v-model="config.system.env" />
           </el-form-item>
-          <el-form-item label="端口值">
+          <el-form-item :label="$t('system.portValue')">
             <el-input v-model.number="config.system.addr" />
           </el-form-item>
-          <el-form-item label="数据库类型">
-            <el-select v-model="config.system.dbType" style="width:100%">
-              <el-option value="mysql" />
-              <el-option value="pgsql" />
+          <el-form-item :label="$t('init.dbType')">
+            <el-select v-model="config.system.dbType" style="width: 100%">
+              <el-option value="MySQL" />
+              <el-option value="PostgreSQL" />
             </el-select>
           </el-form-item>
-          <el-form-item label="Oss类型">
-            <el-select v-model="config.system.ossType" style="width:100%">
+          <el-form-item :label="$t('system.ossType')">
+            <el-select v-model="config.system.ossType" style="width: 100%">
               <el-option value="local" />
               <el-option value="qiniu" />
               <el-option value="tencent-cos" />
@@ -25,8 +25,8 @@
               <el-option value="huawei-obs" />
             </el-select>
           </el-form-item>
-          <el-form-item label="多点登录拦截">
-            <el-checkbox v-model="config.system.useMultipoint">开启</el-checkbox>
+          <el-form-item :label="$t('system.multiLogin')">
+            <el-checkbox v-model="config.system.useMultipoint">{{ $t('general.enable') }}</el-checkbox>
           </el-form-item>
           <el-form-item label="限流次数">
             <el-input-number v-model.number="config.system.iplimitCount" />
@@ -208,7 +208,7 @@
               <el-input v-model="config.qiniu.imgPath" />
             </el-form-item>
             <el-form-item label="是否使用https">
-              <el-checkbox v-model="config.qiniu.useHttps">开启</el-checkbox>
+              <el-checkbox v-model="config.qiniu.useHttps">{{ $t('general.enable') }}</el-checkbox>
             </el-form-item>
             <el-form-item label="accessKey">
               <el-input v-model="config.qiniu.accessKey" />
@@ -217,7 +217,7 @@
               <el-input v-model="config.qiniu.secretKey" />
             </el-form-item>
             <el-form-item label="上传是否使用CDN上传加速">
-              <el-checkbox v-model="config.qiniu.useCdnDomains">开启</el-checkbox>
+              <el-checkbox v-model="config.qiniu.useCdnDomains">{{ $t('general.enable') }}</el-checkbox>
             </el-form-item>
           </template>
           <template v-if="config.system.ossType === 'tencent-cos'">
@@ -277,7 +277,6 @@
               <el-input v-model="config.huaWeiObs.secretKey" />
             </el-form-item>
           </template>
-
         </el-collapse-item>
 
         <el-collapse-item title="Excel上传配置" name="11">
@@ -335,9 +334,9 @@
           <el-form-item label="Spec(CRON表达式)">
             <el-input v-model="config.timer.spec" />
           </el-form-item>
-          <template v-for="(item,k) in config.timer.detail">
-            <div v-for="(key,k2) in item" :key="k2">
-              <el-form-item :key="k+k2" :label="k2">
+          <template v-for="(item, k) in config.timer.detail">
+            <div v-for="(key, k2) in item" :key="k2">
+              <el-form-item :key="k + k2" :label="k2">
                 <el-input v-model="item[k2]" />
               </el-form-item>
             </div>
@@ -377,9 +376,9 @@ export default {
         local: {},
         email: {},
         timer: {
-          detail: {}
-        }
-      }
+          detail: {},
+        },
+      },
     }
   },
   async created() {
@@ -398,7 +397,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: 'success',
-          message: '配置文件设置成功'
+          message: '配置文件设置成功',
         })
         await this.initForm()
       }
@@ -408,24 +407,24 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: 'success',
-          message: '邮件发送成功'
+          message: '邮件发送成功',
         })
         await this.initForm()
       } else {
         this.$message({
           type: 'error',
-          message: '邮件发送失败'
+          message: '邮件发送失败',
         })
       }
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss">
 .system {
   background: #fff;
-  padding:36px;
+  padding: 36px;
   border-radius: 2px;
   h2 {
     padding: 10px;
@@ -433,11 +432,11 @@ export default {
     font-size: 16px;
     box-shadow: -4px 0px 0px 0px #e7e8e8;
   }
-  ::v-deep(.el-input-number__increase){
-    top:5px !important;
+  ::v-deep(.el-input-number__increase) {
+    top: 5px !important;
   }
-  .gva-btn-list{
-    margin-top:16px;
+  .gva-btn-list {
+    margin-top: 16px;
   }
 }
 </style>