wenhongquan 3 роки тому
батько
коміт
fb4e2e2c69

+ 1 - 1
ruoyi-admin/pom.xml

@@ -96,7 +96,7 @@
                 <configuration>
                     <!--from节点用来设置镜像的基础镜像,相当于Docerkfile中的FROM关键字-->
                     <from>
-                        <image>anapsix/alpine-java:8_server-jre_unlimited</image>
+                        <image>huanwei/alpine-oraclejdk8</image>
                     </from>
                     <to>
                         <!--镜像名称和tag,使用了mvn内置变量${project.version},表示当前工程的version-->

+ 1 - 0
ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,6 +7,7 @@ spring:
             # 主库数据源
             master:
                 url: jdbc:mysql://${DATABASE_HOST:localhost}:${DATABASE_PORT:3306}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://${DATABASE_HOST:xt.wenhq.top}:${DATABASE_PORT:8583}/nnbp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: ${DATABASE_USER:root}
                 password: ${DATABASE_PWD:root}
             # 从库数据源

+ 2 - 1
ruoyi-common/src/main/java/com/ruoyi/common/utils/JSUtils.java

@@ -12,7 +12,7 @@ public class JSUtils {
         try{
             if(js==null) return "";
 
-            ScriptEngine engine = new ScriptEngineManager().getEngineByName("javascript");
+            ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript");
             Compilable compilable = (Compilable) engine;
             Bindings bindings = engine.createBindings(); //Local级别的Binding
             String script ="var JSON = com.alibaba.fastjson.JSON; "+ js+";run();"; //定义函数并调用
@@ -21,6 +21,7 @@ public class JSUtils {
             Object result = JSFunction.eval(bindings);
             return result;
         }catch (Exception e){
+            System.out.println(e.getMessage());
             JSUtils.logger.error(e.getMessage());
         }
         return "";

+ 0 - 4
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java

@@ -1,13 +1,10 @@
 package com.ruoyi.common.utils.file;
 
-import java.awt.*;
-import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Arrays;
 
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
 import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +12,6 @@ import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
 
-import javax.imageio.ImageIO;
 
 /**
  * 图片处理工具类