diff --git a/eladmin-common/pom.xml b/eladmin-common/pom.xml
index 49018491..c7467180 100644
--- a/eladmin-common/pom.xml
+++ b/eladmin-common/pom.xml
@@ -10,5 +10,6 @@
4.0.0
eladmin-common
+ 公共模块
\ No newline at end of file
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
index 5872c46c..34a488a9 100644
--- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -1,13 +1,12 @@
package me.zhengjie.utils;
+import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter;
import me.zhengjie.exception.BadRequestException;
import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Encoder;
-
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
@@ -187,7 +186,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
byte[] buffer = new byte[(int)file.length()];
inputFile.read(buffer);
inputFile.close();
- base64=new BASE64Encoder().encode(buffer);
+ base64=new Base64().encode(buffer);
String encoded = base64.replaceAll("[\\s*\t\n\r]", "");
return encoded;
}
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java
new file mode 100644
index 00000000..1f34b54c
--- /dev/null
+++ b/eladmin-common/src/main/java/me/zhengjie/utils/TranslatorUtil.java
@@ -0,0 +1,52 @@
+package me.zhengjie.utils;
+
+import cn.hutool.json.JSONArray;
+import lombok.var;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+
+public class TranslatorUtil {
+
+ public static String translate(String word){
+ try {
+ String url = "https://translate.googleapis.com/translate_a/single?" +
+ "client=gtx&" +
+ "sl=en" +
+ "&tl=zh-CN" +
+ "&dt=t&q=" + URLEncoder.encode(word, "UTF-8");
+
+ URL obj = new URL(url);
+ HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+ con.setRequestProperty("User-Agent", "Mozilla/5.0");
+
+ BufferedReader in = new BufferedReader(
+ new InputStreamReader(con.getInputStream()));
+ String inputLine;
+ StringBuffer response = new StringBuffer();
+
+ while ((inputLine = in.readLine()) != null) {
+ response.append(inputLine);
+ }
+ in.close();
+ return parseResult(response.toString());
+ }catch (Exception e){
+ return word;
+ }
+ }
+
+ private static String parseResult(String inputJson) throws Exception {
+ JSONArray jsonArray = new JSONArray(inputJson);
+ JSONArray jsonArray2 = (JSONArray) jsonArray.get(0);
+ String result ="";
+
+ for(var i = 0; i < jsonArray2.size(); i ++){
+ result += ((JSONArray) jsonArray2.get(i)).get(0).toString();
+ }
+ return result;
+ }
+
+}
diff --git a/eladmin-generator/pom.xml b/eladmin-generator/pom.xml
index bf69a3a4..7ced1116 100644
--- a/eladmin-generator/pom.xml
+++ b/eladmin-generator/pom.xml
@@ -10,6 +10,7 @@
4.0.0
eladmin-generator
+ 代码生成模块
1.9
diff --git a/eladmin-logging/pom.xml b/eladmin-logging/pom.xml
index d899d23b..e58fe26a 100644
--- a/eladmin-logging/pom.xml
+++ b/eladmin-logging/pom.xml
@@ -10,6 +10,7 @@
4.0.0
eladmin-logging
+ 日志模块
diff --git a/eladmin-system/pom.xml b/eladmin-system/pom.xml
index 62691647..d2d4f5f9 100644
--- a/eladmin-system/pom.xml
+++ b/eladmin-system/pom.xml
@@ -10,6 +10,7 @@
4.0.0
eladmin-system
+ 核心模块
0.9.1
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java
index 372bfe09..9480bb60 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DictController.java
@@ -4,7 +4,6 @@ import me.zhengjie.aop.log.Log;
import me.zhengjie.exception.BadRequestException;
import me.zhengjie.modules.system.domain.Dict;
import me.zhengjie.modules.system.service.DictService;
-import me.zhengjie.modules.system.service.dto.DictDTO;
import me.zhengjie.modules.system.service.dto.DictQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
diff --git a/eladmin-tools/pom.xml b/eladmin-tools/pom.xml
index dbefcd2b..3247ae41 100644
--- a/eladmin-tools/pom.xml
+++ b/eladmin-tools/pom.xml
@@ -10,6 +10,7 @@
4.0.0
eladmin-tools
+ 工具模块
1.4.7
diff --git a/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java
index f6aa8164..2c128ca5 100644
--- a/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java
+++ b/eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java
@@ -37,7 +37,7 @@ public class PictureServiceImpl implements PictureService {
public static final String CODE = "code";
- public static final String MSG = "msg";
+ public static final String MSG = "message";
@Override
public Object queryAll(PictureQueryCriteria criteria, Pageable pageable){
@@ -56,7 +56,7 @@ public class PictureServiceImpl implements PictureService {
JSONObject jsonObject = JSONUtil.parseObj(result);
Picture picture = null;
if(!jsonObject.get(CODE).toString().equals(SUCCESS)){
- throw new BadRequestException(jsonObject.get(MSG).toString());
+ throw new BadRequestException(TranslatorUtil.translate(jsonObject.get(MSG).toString()));
}
//转成实体类
picture = JSON.parseObject(jsonObject.get("data").toString(), Picture.class);
diff --git a/pom.xml b/pom.xml
index c80bbf20..85b798a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
eladmin-generator
- el-admin
+ EL-ADMIN后台管理系统
http://auauz.net