fix: 登陆 改为 登陆

im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java

@@ -6,9 +6,9 @@ import lombok.AllArgsConstructor;
 public enum IMCmdType {
 
     /**
-     * 登陆
+     * 登录
      */
-    LOGIN(0, "登陆"),
+    LOGIN(0, "登录"),
     /**
      * 心跳
      */

im-platform/src/main/java/com/bx/implatform/controller/LoginController.java

@@ -13,7 +13,7 @@ import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-@Tag(name = "注册登陆")
+@Tag(name = "注册登录")
 @RestController
 @RequiredArgsConstructor
 public class LoginController {
@@ -21,7 +21,7 @@ public class LoginController {
     private final UserService userService;
 
     @PostMapping("/login")
-    @Operation(summary = "用户登陆", description = "用户登陆")
+    @Operation(summary = "用户登录", description = "用户登录")
     public Result<LoginVO> login(@Valid @RequestBody LoginDTO dto) {
         LoginVO vo = userService.login(dto);
         return ResultUtils.success(vo);

im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java

@@ -32,7 +32,7 @@ public class AuthInterceptor implements HandlerInterceptor {
         //从 http 请求头中取出 token
         String token = request.getHeader("accessToken");
         if (StrUtil.isEmpty(token)) {
-            log.error("未登陆，url:{}", request.getRequestURI());
+            log.error("未登录，url:{}", request.getRequestURI());
             throw new GlobalException(ResultCode.NO_LOGIN);
         }
         String strJson = JwtUtil.getInfo(token);

im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java

@@ -81,7 +81,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public LoginVO refreshToken(String refreshToken) {
         //验证 token
         if (!JwtUtil.checkSign(refreshToken, jwtProperties.getRefreshTokenSecret())) {
-            throw new GlobalException("您的登陆信息已过期，请重新登陆");
+            throw new GlobalException("您的登录信息已过期，请重新登录");
         }
         String strJson = JwtUtil.getInfo(refreshToken);
         Long userId = JwtUtil.getUserId(refreshToken);

im-server/src/main/java/com/bx/imserver/netty/processor/LoginProcessor.java

@@ -49,7 +49,7 @@ public class LoginProcessor extends AbstractMessageProcessor<IMLoginInfo> {
             // 不允许多地登录,强制下线
             IMSendInfo<Object> sendInfo = new IMSendInfo<>();
             sendInfo.setCmd(IMCmdType.FORCE_LOGUT.code());
-            sendInfo.setData("您已在其他地方登陆，将被强制下线");
+            sendInfo.setData("您已在其他地方登录，将被强制下线");
             context.channel().writeAndFlush(sendInfo);
             log.info("异地登录，强制下线,userId:{}", userId);
         }

im-uniapp/App.vue

@@ -47,7 +47,7 @@ export default {
 				if (cmd == 2) {
 					// 异地登录，强制下线
 					uni.showModal({
-						content: '您已在其他地方登陆，将被强制下线',
+						content: '您已在其他地方登录，将被强制下线',
 						showCancel: false,
 					})
 					this.exit();

im-uniapp/manifest.json

@@ -1,32 +1,32 @@
 {
-    "name": "盒子IM",
+    "name" : "盒子IM",
-    "appid": "__UNI__69DD57A",
+    "appid" : "__UNI__69DD57A",
-    "description": "",
+    "description" : "",
-    "versionName": "3.1.0",
+    "versionName" : "3.1.0",
-    "versionCode": 3100,
+    "versionCode" : 3100,
-    "transformPx": false,
+    "transformPx" : false,
     /* 5+App特有相关 */
-    "app-plus": {
+    "app-plus" : {
-        "usingComponents": true,
+        "usingComponents" : true,
-        "nvueStyleCompiler": "uni-app",
+        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion": 3,
+        "compilerVersion" : 3,
-        "splashscreen": {
+        "splashscreen" : {
-            "alwaysShowBeforeRender": true,
+            "alwaysShowBeforeRender" : true,
-            "waiting": true,
+            "waiting" : true,
-            "autoclose": true,
+            "autoclose" : true,
-            "delay": 0
+            "delay" : 0
         },
         /* 模块配置 */
-        "modules": {
+        "modules" : {
-            "Camera": {},
+            "Camera" : {},
-            "Record": {},
+            "Record" : {},
-            "Bluetooth": {}
+            "Bluetooth" : {}
         },
         /* 应用发布信息 */
-        "distribute": {
+        "distribute" : {
             /* android打包配置 */
-            "android": {
+            "android" : {
-                "permissions": [
+                "permissions" : [
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -45,90 +45,87 @@
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\" />",
                     "<uses-permission android:name=\"android.permission.RECORD_AUDIO\" />"
                 ],
-                "abiFilters": [
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                    "armeabi-v7a",
+                "minSdkVersion" : 21
-                    "arm64-v8a",
-                    "x86"
-                ],
-                "minSdkVersion": 21
             },
             /* ios打包配置 */
-            "ios": {
+            "ios" : {
-                "dSYMs": false,
+                "dSYMs" : false,
-                "privacyDescription": {
+                "privacyDescription" : {
-                    "NSMicrophoneUsageDescription": "",
+                    "NSMicrophoneUsageDescription" : "",
-                    "NSCameraUsageDescription": ""
+                    "NSCameraUsageDescription" : ""
                 },
-                "idfa": false
+                "idfa" : false
             },
             /* SDK配置 */
-            "sdkConfigs": {
+            "sdkConfigs" : {
-                "ad": {},
+                "ad" : {},
-                "speech": {}
+                "speech" : {}
             },
-            "icons": {
+            "icons" : {
-                "android": {
+                "android" : {
-                    "xhdpi": "unpackage/res/icons/96x96.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "hdpi": "unpackage/res/icons/72x72.png",
+                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xxhdpi": "unpackage/res/icons/144x144.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi": "unpackage/res/icons/192x192.png"
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
-                "ios": {
+                "ios" : {
-                    "appstore": "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad": {
+                    "ipad" : {
-                        "app": "unpackage/res/icons/76x76.png",
+                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x": "unpackage/res/icons/152x152.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification": "unpackage/res/icons/20x20.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x": "unpackage/res/icons/167x167.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings": "unpackage/res/icons/29x29.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight": "unpackage/res/icons/40x40.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png"
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
-                    "iphone": {
+                    "iphone" : {
-                        "app@2x": "unpackage/res/icons/120x120.png",
+                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x": "unpackage/res/icons/180x180.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x": "unpackage/res/icons/60x60.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x": "unpackage/res/icons/87x87.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x": "unpackage/res/icons/120x120.png"
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             }
         }
     },
     /* 快应用特有相关 */
-    "quickapp": {},
+    "quickapp" : {},
     /* 小程序特有相关 */
-    "mp-weixin": {
+    "mp-weixin" : {
-        "appid": "wxda94f40bfad0262c",
+        "appid" : "wxda94f40bfad0262c",
-        "libVersion": "latest",
+        "libVersion" : "latest",
-        "setting": {
+        "setting" : {
-            "urlCheck": false
+            "urlCheck" : false
         },
-        "usingComponents": true
+        "usingComponents" : true
     },
-    "mp-alipay": {
+    "mp-alipay" : {
-        "usingComponents": true
+        "usingComponents" : true
     },
-    "mp-baidu": {
+    "mp-baidu" : {
-        "usingComponents": true
+        "usingComponents" : true
     },
-    "mp-toutiao": {
+    "mp-toutiao" : {
-        "usingComponents": true
+        "usingComponents" : true
     },
-    "uniStatistics": {
+    "uniStatistics" : {
-        "enable": false
+        "enable" : false
     },
-    "vueVersion": "3",
+    "vueVersion" : "3",
-    "h5": {
+    "h5" : {
-        "title": "盒子IM",
+        "title" : "盒子IM",
-        "router": {
+        "router" : {
-            "base": "/h5/"
+            "base" : "/h5/"
         }
     }
 }
-/* ios打包配置 */ /* SDK配置 */
+/* ios打包配置 *//* SDK配置 */
+

im-uniapp/pages/mine/mine.vue

@@ -40,7 +40,7 @@
 			<arrow-bar title="修改密码" @click="onModifyPassword()"></arrow-bar>
 		</bar-group>
 		<bar-group>
-			<btn-bar title="退出登陆" type="danger" @click="onQuit()"></btn-bar>
+			<btn-bar title="退出登录" type="danger" @click="onQuit()"></btn-bar>
 		</bar-group>
 	</view>
 </template>

im-uniapp/pages/register/register.vue

@@ -14,10 +14,10 @@
 			<uni-forms-item name="corfirmPassword" label="确认密码">
 				<uni-easyinput type="password" v-model="dataForm.corfirmPassword" placeholder="确认密码" />
 			</uni-forms-item>
-			<button class="btn-submit" @click="submit" type="primary">注册并登陆</button>
+			<button class="btn-submit" @click="submit" type="primary">注册并登录</button>
 		</uni-forms>
 		<navigator class="nav-login" url="/pages/login/login">
-			返回登陆页面
+			返回登录页面
 		</navigator>
 	</view>
 </template>

im-web/src/view/Home.vue

@@ -107,7 +107,7 @@ export default {
             // 关闭ws
             this.$wsApi.close(3000)
             // 异地登录，强制下线
-            this.$alert("您已在其他地方登陆，将被强制下线", "强制下线通知", {
+            this.$alert("您已在其他地方登录，将被强制下线", "强制下线通知", {
               confirmButtonText: '确定',
               callback: action => {
                 location.href = "/";

im-web/src/view/Login.vue

@@ -5,7 +5,7 @@
 				@keyup.enter.native="submitForm('loginForm')">
 				<div class="login-brand">
 					<img class="logo" src="../../public/logo.png" />
-					<div>登陆盒子IM</div>
+					<div>登录盒子IM</div>
 				</div>
 				<el-form-item label="终端" prop="userName" v-show="false">
 					<el-input type="terminal" v-model="loginForm.terminal" autocomplete="off"></el-input>
@@ -19,7 +19,7 @@
 						placeholder="密码"></el-input>
 				</el-form-item>
 				<el-form-item>
-					<el-button type="primary" @click="submitForm('loginForm')">登陆</el-button>
+					<el-button type="primary" @click="submitForm('loginForm')">登录</el-button>
 					<el-button @click="resetForm('loginForm')">清空</el-button>
 				</el-form-item>
 				<div class="register">
@@ -86,7 +86,7 @@ export default {
 							// 保存token
 							sessionStorage.setItem("accessToken", data.accessToken);
 							sessionStorage.setItem("refreshToken", data.refreshToken);
-							this.$message.success("登陆成功");
+							this.$message.success("登录成功");
 							this.$router.push("/home/chat");
 						})