fix: update login/register failed msg

Author: msslulu

base/src/main/java/com/tinyengine/it/common/exception/ExceptionEnum.java

@@ -336,7 +336,23 @@ public enum ExceptionEnum implements IBaseError {
     /**
      * Cm 342 exception enum.
      */
-    CM342("CM342", "数字格式异常");
+    CM342("CM342", "数字格式异常"),
+
+
+    /**
+     * Cm 343 exception enum.
+     */
+    CM343("CM343", "该用户名已被注册，请尝试其他名称"),
+
+    /**
+     * Cm 344 exception enum.
+     */
+    CM344("CM344", "账户恢复代码无效"),
+
+    /**
+     * Cm 345 exception enum.
+     */
+    CM345("CM345", "用户名不存在,请重新输入"),;
     /**
      * 错误码
      */

base/src/main/java/com/tinyengine/it/login/service/impl/LoginServiceImpl.java

@@ -58,8 +58,8 @@ public User createUser(User user) throws Exception {
         userParam.setUsername(user.getUsername());
         List<User> users = baseMapper.queryUserByCondition(userParam);
         if (!users.isEmpty()) {
-            throw new ServiceException(ExceptionEnum.CM003.getResultCode(),
-                ExceptionEnum.CM003.getResultMsg());
+            throw new ServiceException(ExceptionEnum.CM343.getResultCode(),
+                ExceptionEnum.CM343.getResultMsg());
         }
         KeyPair keyPair = generateSM2KeyPair();
         PublicKey publicKey = keyPair.getPublic();
@@ -98,14 +98,19 @@ public Result forgotPassword(User user) throws Exception {
         userParam.setUsername(user.getUsername());
         List<User> users = baseMapper.queryUserByCondition(userParam);
         if (users.isEmpty()) {
-            return Result.failed(ExceptionEnum.CM002);
+            return Result.failed(ExceptionEnum.CM345);
         }
         User userResult = users.get(0);
-        PublicKey publicKey = getPublicKeyFromBase64(user.getPublicKey());
+        PublicKey publicKey;
+        try {
+            publicKey = getPublicKeyFromBase64(user.getPublicKey());
+        } catch (Exception e) {
+            return Result.failed(ExceptionEnum.CM344);
+        }
         PrivateKey privateKey = getPrivateKeyFromBase64(userResult.getPrivateKey());
         // 验证publickey
         if (!validatorPublicKey(userResult.getSalt(), publicKey, privateKey)) {
-            return Result.failed(ExceptionEnum.CM335);
+            return Result.failed(ExceptionEnum.CM344);
         }
         String cipherText = encrypt(user.getSalt(), publicKey);
         user.setSalt(cipherText);

base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java

@@ -180,11 +180,20 @@ public Result<App> updateAppById(App app) {
             appExtendConfig.remove("route");
             app.getExtendConfig().putAll(appExtendConfig);
         }
+        String tenantId = app.getTenantId();
+        if(tenantId == null) {
+            tenantId = loginUserContext.getTenantId();
+            app.setTenantId(tenantId);
+        }
+        App appselect = baseMapper.queryAppById(app.getId(), tenantId);
+        if(appselect == null) {
+            return Result.failed(ExceptionEnum.CM009);
+        }
         int result = baseMapper.updateAppById(app);
         if (result < 1) {
             return Result.failed(ExceptionEnum.CM001);
         }
-        App selectedApp = baseMapper.queryAppById(app.getId(), loginUserContext.getTenantId());
+        App selectedApp = baseMapper.queryAppById(app.getId(), tenantId);
         return Result.success(selectedApp);
     }