phase 2 translation

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -114,18 +114,18 @@ public class UserServiceImpl implements UserService {
         if (user3 != null && !user.getId().equals(user3.getId())) {
             throw new EntityExistException(User.class, "phone", resources.getPhone());
         }
-        // 如果用户的角色改变
+        // If the user's role changes
         if (!resources.getRoles().equals(user.getRoles())) {
             redisUtils.del(CacheKey.DATA_USER + resources.getId());
             redisUtils.del(CacheKey.MENU_USER + resources.getId());
             redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
             redisUtils.del(CacheKey.ROLE_USER + resources.getId());
         }
-        // 修改部门会影响 数据权限
+        // Modifying the department will affect data permissions
         if (!Objects.equals(resources.getDept(),user.getDept())) {
             redisUtils.del(CacheKey.DATA_USER + resources.getId());
         }
-        // 如果用户被禁用，则清除用户登录信息
+        // If the user is disabled, clear the user's login information
         if(!resources.getEnabled()){
             onlineUserService.kickOutForUsername(resources.getUsername());
         }
@@ -138,7 +138,7 @@ public class UserServiceImpl implements UserService {
         user.setNickName(resources.getNickName());
         user.setGender(resources.getGender());
         userRepository.save(user);
-        // 清除缓存
+        // Clear cache
         delCaches(user.getId(), user.getUsername());
     }
 
@@ -154,7 +154,7 @@ public class UserServiceImpl implements UserService {
         user.setPhone(resources.getPhone());
         user.setGender(resources.getGender());
         userRepository.save(user);
-        // 清理缓存
+        // Clear cache
         delCaches(user.getId(), user.getUsername());
     }
 
@@ -162,7 +162,7 @@ public class UserServiceImpl implements UserService {
     @Transactional(rollbackFor = Exception.class)
     public void delete(Set<Long> ids) {
         for (Long id : ids) {
-            // 清理缓存
+            // Clear cache
             UserDto user = findById(id);
             delCaches(user.getId(), user.getUsername());
         }
@@ -200,27 +200,27 @@ public class UserServiceImpl implements UserService {
     @Transactional(rollbackFor = Exception.class)
     public void resetPwd(Set<Long> ids, String pwd) {
         List<User> users = userRepository.findAllById(ids);
-        // 清除缓存
+        // Clear cache
         users.forEach(user -> {
-            // 清除缓存
+            // Clear cache
             flushCache(user.getUsername());
-            // 强制退出
+            // Force logout
             onlineUserService.kickOutForUsername(user.getUsername());
         });
-        // 重置密码
+        // Reset password
         userRepository.resetPwd(ids, pwd);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, String> updateAvatar(MultipartFile multipartFile) {
-        // 文件大小验证
+        // File size validation
         FileUtil.checkSize(properties.getAvatarMaxSize(), multipartFile.getSize());
-        // 验证文件上传的格式
+        // Validate file upload format
         String image = "gif jpg png jpeg";
         String fileType = FileUtil.getExtensionName(multipartFile.getOriginalFilename());
         if(fileType != null && !image.contains(fileType)){
-            throw new BadRequestException("文件格式错误！, 仅支持 " + image +" 格式");
+            throw new BadRequestException("File format error! Only supports " + image + " format");
         }
         User user = userRepository.findByUsername(SecurityUtils.getCurrentUsername());
         String oldPath = user.getAvatarPath();
@@ -264,7 +264,7 @@ public class UserServiceImpl implements UserService {
     }
 
     /**
-     * 清理缓存
+     * Clear cache
      *
      * @param id /
      */
@@ -274,7 +274,7 @@ public class UserServiceImpl implements UserService {
     }
 
     /**
-     * 清理 登陆时 用户缓存信息
+     * Clear user cache information at login
      *
      * @param username /
      */

eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java

@@ -66,13 +66,12 @@ public class AliPayServiceImpl implements AliPayService {
         }
         AlipayClient alipayClient = new DefaultAlipayClient(alipay.getGatewayUrl(), alipay.getAppId(), alipay.getPrivateKey(), alipay.getFormat(), alipay.getCharset(), alipay.getPublicKey(), alipay.getSignType());
 
-        // 创建API对应的request(电脑网页版)
+        // Create API request (desktop web version)
         AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
-
-        // 订单完成后返回的页面和异步通知地址
+        // Return page and asynchronous notification address after order completion
         request.setReturnUrl(alipay.getReturnUrl());
         request.setNotifyUrl(alipay.getNotifyUrl());
-        // 填充订单参数
+        // Fill order parameters
         request.setBizContent("{" +
                 "    \"out_trade_no\":\""+trade.getOutTradeNo()+"\"," +
                 "    \"product_code\":\"FAST_INSTANT_TRADE_PAY\"," +
@@ -82,10 +81,9 @@ public class AliPayServiceImpl implements AliPayService {
                 "    \"extend_params\":{" +
                 "    \"sys_service_provider_id\":\""+alipay.getSysServiceProviderId()+"\"" +
                 "    }"+
-                "  }");//填充业务参数
-        // 调用SDK生成表单, 通过GET方式，口可以获取url
+                "  }");//Fill business parameters
+        // Call SDK to generate form, can get URL through GET method
         return alipayClient.pageExecute(request, "GET").getBody();
-
     }
 
     @Override
@@ -98,9 +96,9 @@ public class AliPayServiceImpl implements AliPayService {
         double money = Double.parseDouble(trade.getTotalAmount());
         double maxMoney = 5000;
         if(money <= 0 || money >= maxMoney){
-            throw new BadRequestException("测试金额过大");
+            throw new BadRequestException("Test amount too large");
         }
-        // 创建API对应的request(手机网页版)
+        // Create API request (mobile web version)
         AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest();
         request.setReturnUrl(alipay.getReturnUrl());
         request.setNotifyUrl(alipay.getNotifyUrl());

sport/src/main/java/com/srr/service/ClubService.java

@@ -36,46 +36,46 @@ public interface ClubService {
     /**
     * Query data with pagination
     * @param criteria criteria
-    * @param pageable 分页参数
+    * @param pageable pagination parameters
     * @return Map<String,Object>
     */
     PageResult<ClubDto> queryAll(ClubQueryCriteria criteria, Pageable pageable);
 
     /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
+    * Query all data without pagination
+    * @param criteria criteria parameters
     * @return List<ClubDto>
     */
     List<ClubDto> queryAll(ClubQueryCriteria criteria);
 
     /**
-     * 根据ID查询
+     * Query by ID
      * @param id ID
      * @return ClubDto
      */
     ClubDto findById(Long id);
 
     /**
-    * 创建
+    * Create
     * @param resources /
     */
     void create(Club resources);
 
     /**
-    * 编辑
+    * Edit
     * @param resources /
     */
     void update(Club resources);
 
     /**
-    * 多选删除
+    * Multiple selection delete
     * @param ids /
     */
     void deleteAll(Long[] ids);
 
     /**
-    * 导出数据
-    * @param all 待导出的数据
+    * Export data
+    * @param all data to be exported
     * @param response /
     * @throws IOException /
     */