Browse Source

取消内存限制

wuxw 6 years ago
parent
commit
22b958dfc6

+ 1 - 1
Api/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/Api.jar:/root/target/Api.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 2 - 5
Api/src/main/java/com/java110/api/rest/GetPhotoByInst.java

@@ -26,9 +26,6 @@ public class GetPhotoByInst {
 
     public static void main(String[] args) {
         //读取文件
-
-
-
         Reader reader = null;
         String sb = "";
         try {
@@ -67,7 +64,7 @@ public class GetPhotoByInst {
         String instId = tmpPhotoPaths[0];
         String photoUrl = tmpPhotoPaths[1];
 
-        downloadFromUrl(photoUrl,DEFAULTE_PHOTO_DIR,"qhdx_"+instId+"_47.jpg");
+        downloadFromUrl(photoUrl,DEFAULTE_PHOTO_DIR,"qhdx_"+instId+"_17.jpg");
     }
 
 
@@ -93,4 +90,4 @@ public class GetPhotoByInst {
         }
         return fileName;
     }
-}
+}

+ 111 - 0
Api/src/main/java/com/java110/api/rest/PicTest.java

@@ -0,0 +1,111 @@
+package com.java110.api.rest;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+
+import javax.imageio.ImageIO;
+import javax.imageio.stream.FileImageOutputStream;
+
+public class PicTest {
+    public static void main(String[] args) throws IOException {
+        long timeStart = System.currentTimeMillis();
+        String imgLocalUrl = "E:\\tp\\abc.jpg";
+
+        byte[] imgBytes = getByteByPic(imgLocalUrl);
+        byte[] resultImg = compressUnderSize(imgBytes,800 * 1024);
+        byte2image(resultImg,"E:\\tp\\timga.jpg");
+        long timeEnd = System.currentTimeMillis();
+        System.out.println("耗时:"+ (timeEnd - timeStart));
+    }
+
+    public static byte[] getByteByPic(String imageUrl) throws IOException{
+        File imageFile = new File(imageUrl);
+        InputStream inStream = new FileInputStream(imageFile);
+        BufferedInputStream bis = new BufferedInputStream(inStream);
+        BufferedImage bm = ImageIO.read(bis);
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        String type = imageUrl.substring(imageUrl.length() - 3);
+        ImageIO.write(bm, type, bos);
+        bos.flush();
+        byte[] data = bos.toByteArray();
+        return data;
+    }
+    /**
+     * 将图片压缩到指定大小以内
+     *
+     * @param srcImgData 源图片数据
+     * @param maxSize 目的图片大小
+     * @return 压缩后的图片数据
+     */
+    public static byte[] compressUnderSize(byte[] srcImgData, long maxSize) {
+        double scale = 0.9;
+        byte[] imgData = Arrays.copyOf(srcImgData, srcImgData.length);
+
+        if (imgData.length > maxSize) {
+            do {
+                try {
+                    imgData = compress(imgData, scale);
+
+                } catch (IOException e) {
+                    throw new IllegalStateException("压缩图片过程中出错,请及时联系管理员!", e);
+                }
+
+            } while (imgData.length > maxSize);
+        }
+
+        return imgData;
+    }
+
+    /**
+     * 按照 宽高 比例压缩
+     *
+     * @param imgIs 待压缩图片输入流
+     * @param scale 压缩刻度
+     * @param out 输出
+     * @return 压缩后图片数据
+     * @throws IOException 压缩图片过程中出错
+     */
+    public static byte[] compress(byte[] srcImgData, double scale) throws IOException {
+        BufferedImage bi = ImageIO.read(new ByteArrayInputStream(srcImgData));
+        int width = (int) (bi.getWidth() * scale); // 源图宽度
+        int height = (int) (bi.getHeight() * scale); // 源图高度
+
+        Image image = bi.getScaledInstance(width, height, Image.SCALE_SMOOTH);
+        BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+
+        Graphics g = tag.getGraphics();
+        g.setColor(Color.RED);
+        g.drawImage(image, 0, 0, null); // 绘制处理后的图
+        g.dispose();
+
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        ImageIO.write(tag, "JPEG", bOut);
+
+        return bOut.toByteArray();
+    }
+
+    //byte数组到图片
+    public static void byte2image(byte[] data,String path){
+        if(data.length<3||path.equals("")) return;
+        try{
+            FileImageOutputStream imageOutput = new FileImageOutputStream(new File(path));
+            imageOutput.write(data, 0, data.length);
+            imageOutput.close();
+            System.out.println("Make Picture success,Please find image in " + path);
+        } catch(Exception ex) {
+            System.out.println("Exception: " + ex);
+            ex.printStackTrace();
+        }
+    }
+
+}

+ 129 - 10
Api/src/main/resources/photoInfo.txt

@@ -1,10 +1,129 @@
-1231231223|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-12321313213|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-213123123213|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-343454353545|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-345345353535|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-3452324666|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-7767866555|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-7890876543333|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-45645676876|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
-243456576765|https://photo.zastatic.com/images/photo/11751/47002203/1343913361860.jpg?scrop=1&crop=1&cpos=north&w=200&h=200
+713039780971|http://135.192.50.148:7500/v1/crmappkey0001/T1zyATBCLT1RXrhCrK
+713039976392|http://135.192.50.148:7500/v1/crmappkey0001/T18zJTB5DT1RXrhCrK
+713039997387|http://135.192.50.148:7500/v1/crmappkey0001/T1QabTB5hT1RXrhCrK
+713040006717|http://135.192.50.148:7500/v1/crmappkey0001/T1NRVTBvd_1RXrhCrK
+713040078002|http://135.192.50.148:7500/v1/crmappkey0001/T1htVTBQVb1RXrhCrK
+713040066641|http://135.192.50.148:7500/v1/crmappkey0001/T1XXZTBjDQ1RXrhCrK
+713040117755|http://135.192.50.148:7500/v1/crmappkey0001/T1pXdTBmDC1RXrhCrK
+713040106986|http://135.192.50.148:7500/v1/crmappkey0001/T1ltATBQWm1RXrhCrK
+713040140517|http://135.192.50.148:7500/v1/crmappkey0001/T1uybTBCdm1RXrhCrK
+713040265790|http://135.192.50.148:7500/v1/crmappkey0001/T1sRbTBjhW1RXrhCrK
+713040380070|http://135.192.50.148:7500/v1/crmappkey0001/T1bVVgBmDv1RXrhCrK
+713040402676|http://135.192.50.148:7500/v1/crmappkey0001/T1mk_gBbJT1RXrhCrK
+713040452404|http://135.192.50.148:7500/v1/crmappkey0001/T1E.DgB7d_1RXrhCrK
+713040461591|http://135.192.50.148:7500/v1/crmappkey0001/T1C6CgBvbT1RXrhCrK
+713040443108|http://135.192.50.148:7500/v1/crmappkey0001/T1.khgBCL_1RXrhCrK
+713040492312|http://135.192.50.148:7500/v1/crmappkey0001/T15U_gBXKv1RXrhCrK
+713040246676|http://135.192.50.148:7500/v1/crmappkey0001/T1V6hgBQLT1RXrhCrK
+713040534246|http://135.192.50.148:7500/v1/crmappkey0001/T1qoJgB7xg1RXrhCrK
+713040538258|http://135.192.50.148:7500/v1/crmappkey0001/T14oxgBKYg1RXrhCrK
+713040592876|http://135.192.50.148:7500/v1/crmappkey0001/T1B.ZgB5_j1RXrhCrK
+713040790871|http://135.192.50.148:7500/v1/crmappkey0001/T1PaxTBKb91RXrhCrK
+713040786042|http://135.192.50.148:7500/v1/crmappkey0001/T1t6VgBy_s1RXrhCrK
+713040779146|http://135.192.50.148:7500/v1/crmappkey0001/T1JRZTBvD91RXrhCrK
+713040772213|http://135.192.50.148:7500/v1/crmappkey0001/T1PmbgBvCQ1RXrhCrK
+713040136201|http://135.192.50.148:7500/v1/crmappkey0001/T1DXLTBjdS1RXrhCrK
+713040855740|http://135.192.50.148:7500/v1/crmappkey0001/T1cohgByK41RXrhCrK
+713040936071|http://135.192.50.148:7500/v1/crmappkey0001/T1kchgBbWs1RXrhCrK
+713041022095|http://135.192.50.148:7500/v1/crmappkey0001/T1V6bgByWb1RXrhCrK
+713040959132|http://135.192.50.148:7500/v1/crmappkey0001/T1NcDgBmCs1RXrhCrK
+713041138341|http://135.192.50.148:7500/v1/crmappkey0001/T1OkbgBmWs1RXrhCrK
+713041246981|http://135.192.50.148:7500/v1/crmappkey0001/T1sZbgB_ds1RXrhCrK
+713041255419|http://135.192.50.148:7500/v1/crmappkey0001/T1sZbgBQxs1RXrhCrK
+713041240318|http://135.192.50.148:7500/v1/crmappkey0001/T1hCLgBsVb1RXrhCrK
+713040981460|http://135.192.50.148:7500/v1/crmappkey0001/T1A.AgBKbX1RXrhCrK
+713041272320|http://135.192.50.148:7500/v1/crmappkey0001/T1G6JgByKm1RXrhCrK
+713041335082|http://135.192.50.148:7500/v1/crmappkey0001/T1kUdgBj_s1RXrhCrK
+713041110867|http://135.192.50.148:7500/v1/crmappkey0001/T1RCKgBQbX1RXrhCrK
+713041330246|http://135.192.50.148:7500/v1/crmappkey0001/T1zcdgBQbs1RXrhCrK
+713041348303|http://135.192.50.148:7500/v1/crmappkey0001/T1iUAgB5Cs1RXrhCrK
+713041384395|http://135.192.50.148:7500/v1/crmappkey0001/T1q0CgBmLQ1RXrhCrK
+713041472301|http://135.192.50.148:7500/v1/crmappkey0001/T1Qk_gB5xC1RXrhCrK
+713041538189|http://135.192.50.148:7500/v1/crmappkey0001/T1A5KgBjKC1RXrhCrK
+713041774093|http://135.192.50.148:7500/v1/crmappkey0001/T1zUAgBQEb1RXrhCrK
+713041833366|http://135.192.50.148:7500/v1/crmappkey0001/T1j.WgBTbX1RXrhCrK
+713041815076|http://135.192.50.148:7500/v1/crmappkey0001/T1bZKgByVX1RXrhCrK
+713042069292|http://135.192.50.148:7500/v1/crmappkey0001/T1rzCTB4ES1RXrhCrK
+713042071969|http://135.192.50.148:7500/v1/crmappkey0001/T132YgBvds1RXrhCrK
+713042129527|http://135.192.50.148:7500/v1/crmappkey0001/T17oAgBTEX1RXrhCrK
+713042140286|http://135.192.50.148:7500/v1/crmappkey0001/T1IUVgB7Zb1RXrhCrK
+753040937722|http://135.192.50.148:7500/v1/crmappkey0001/T1Y7LgB4xT1RXrhCrK
+713042187191|http://135.192.50.148:7500/v1/crmappkey0001/T1k2bgB4LT1RXrhCrK
+713042327534|http://135.192.50.148:7500/v1/crmappkey0001/T1d7hgBKdQ1RXrhCrK
+713042335814|http://135.192.50.148:7500/v1/crmappkey0001/T1m2EgB4Ks1RXrhCrK
+713042342652|http://135.192.50.148:7500/v1/crmappkey0001/T11OdgB5VQ1RXrhCrK
+713042440563|http://135.192.50.148:7500/v1/crmappkey0001/T1I6EgB7Aj1RXrhCrK
+713042493945|http://135.192.50.148:7500/v1/crmappkey0001/T1boAgBQ_X1RXrhCrK
+713042460687|http://135.192.50.148:7500/v1/crmappkey0001/T1xkZgBsds1RXrhCrK
+713042500971|http://135.192.50.148:7500/v1/crmappkey0001/T1CUZgBvL41RXrhCrK
+713042486657|http://135.192.50.148:7500/v1/crmappkey0001/T1c6CgBsbX1RXrhCrK
+713042514320|http://135.192.50.148:7500/v1/crmappkey0001/T1t.KgBCb41RXrhCrK
+713042586556|http://135.192.50.148:7500/v1/crmappkey0001/T1.EWgBCWC1RXrhCrK
+713042663331|http://135.192.50.148:7500/v1/crmappkey0001/T1hcLgBvCQ1RXrhCrK
+713042662911|http://135.192.50.148:7500/v1/crmappkey0001/T1Q6ZgBQbs1RXrhCrK
+713042703695|http://135.192.50.148:7500/v1/crmappkey0001/T1LUAgBCJX1RXrhCrK
+713042678838|http://135.192.50.148:7500/v1/crmappkey0001/T1j6VgB_Lb1RXrhCrK
+713042664876|http://135.192.50.148:7500/v1/crmappkey0001/T1ZcJgBmZy1RXrhCrK
+713042656558|http://135.192.50.148:7500/v1/crmappkey0001/T1P.dgB_A41RXrhCrK
+713042645610|http://135.192.50.148:7500/v1/crmappkey0001/T1NcZgB_Ks1RXrhCrK
+713042668757|http://135.192.50.148:7500/v1/crmappkey0001/T1hU_gBQAs1RXrhCrK
+713042766439|http://135.192.50.148:7500/v1/crmappkey0001/T1S5WgBsLX1RXrhCrK
+713042773211|http://135.192.50.148:7500/v1/crmappkey0001/T18oDgBTbs1RXrhCrK
+713042869667|http://135.192.50.148:7500/v1/crmappkey0001/T1t.WgBTC41RXrhCrK
+713042836800|http://135.192.50.148:7500/v1/crmappkey0001/T18chgB5Lb1RXrhCrK
+713042873517|http://135.192.50.148:7500/v1/crmappkey0001/T1IZAgBCJX1RXrhCrK
+713042890457|http://135.192.50.148:7500/v1/crmappkey0001/T1nchgBgVX1RXrhCrK
+713042952681|http://135.192.50.148:7500/v1/crmappkey0001/T18mAgBsKb1RXrhCrK
+713042946062|http://135.192.50.148:7500/v1/crmappkey0001/T1xEWgBgWX1RXrhCrK
+713043053593|http://135.192.50.148:7500/v1/crmappkey0001/T1DkxgBsJs1RXrhCrK
+713043042066|http://135.192.50.148:7500/v1/crmappkey0001/T1eZVgBC_y1RXrhCrK
+713043070701|http://135.192.50.148:7500/v1/crmappkey0001/T1J2DgBX_X1RXrhCrK
+713043097285|http://135.192.50.148:7500/v1/crmappkey0001/T15ECgBvDy1RXrhCrK
+713043223356|http://135.192.50.148:7500/v1/crmappkey0001/T1W7xgBv_C1RXrhCrK
+713043202839|http://135.192.50.148:7500/v1/crmappkey0001/T1FZAgBXDm1RXrhCrK
+713043187864|http://135.192.50.148:7500/v1/crmappkey0001/T1SkxgBgCs1RXrhCrK
+713043413273|http://135.192.50.148:7500/v1/crmappkey0001/T1rUdgBgbX1RXrhCrK
+713043382161|http://135.192.50.148:7500/v1/crmappkey0001/T1f2_gBTLT1RXrhCrK
+713043256769|http://135.192.50.148:7500/v1/crmappkey0001/T1j5EgBgxy1RXrhCrK
+713043473099|http://135.192.50.148:7500/v1/crmappkey0001/T1SkEgB7Y41RXrhCrK
+713043469218|http://135.192.50.148:7500/v1/crmappkey0001/T1s0EgByLX1RXrhCrK
+713043495025|http://135.192.50.148:7500/v1/crmappkey0001/T1emhgB5_b1RXrhCrK
+713043436669|http://135.192.50.148:7500/v1/crmappkey0001/T1aVVgB7EX1RXrhCrK
+713043525963|http://135.192.50.148:7500/v1/crmappkey0001/T1_U_gBsJb1RXrhCrK
+713043581038|http://135.192.50.148:7500/v1/crmappkey0001/T1QkYgBsK41RXrhCrK
+713043491049|http://135.192.50.148:7500/v1/crmappkey0001/T19UEgBjh41RXrhCrK
+713043627563|http://135.192.50.148:7500/v1/crmappkey0001/T1T7AgBgAT1RXrhCrK
+713043633685|http://135.192.50.148:7500/v1/crmappkey0001/T1V5ZgBmh41RXrhCrK
+713043577649|http://135.192.50.148:7500/v1/crmappkey0001/T1e2bgBTVT1RXrhCrK
+713043579749|http://135.192.50.148:7500/v1/crmappkey0001/T1ccbgBbAb1RXrhCrK
+713043638372|http://135.192.50.148:7500/v1/crmappkey0001/T1nUZgBjAQ1RXrhCrK
+713043640366|http://135.192.50.148:7500/v1/crmappkey0001/T1DoZgB5CX1RXrhCrK
+713043643934|http://135.192.50.148:7500/v1/crmappkey0001/T1AcxgBbWQ1RXrhCrK
+713043654194|http://135.192.50.148:7500/v1/crmappkey0001/T18cYgBCWX1RXrhCrK
+713043737085|http://135.192.50.148:7500/v1/crmappkey0001/T1hU_gBXLX1RXrhCrK
+713043717610|http://135.192.50.148:7500/v1/crmappkey0001/T1KCCgBQYX1RXrhCrK
+713043754780|http://135.192.50.148:7500/v1/crmappkey0001/T1e6DgByV41RXrhCrK
+713043795513|http://135.192.50.148:7500/v1/crmappkey0001/T1eOLgBv_T1RXrhCrK
+713043861117|http://135.192.50.148:7500/v1/crmappkey0001/T1ZkWgBvY41RXrhCrK
+713043818869|http://135.192.50.148:7500/v1/crmappkey0001/T1ikJgBj_y1RXrhCrK
+713044318496|http://135.192.50.148:7500/v1/crmappkey0001/T1a7ZgBCWX1RXrhCrK
+713043780618|http://135.192.50.148:7500/v1/crmappkey0001/T1wUEgBXKX1RXrhCrK
+713044332117|http://135.192.50.148:7500/v1/crmappkey0001/T1Jc_gBCDy1RXrhCrK
+713044483607|http://135.192.50.148:7500/v1/crmappkey0001/T1.CWgBKxX1RXrhCrK
+713044678147|http://135.192.50.148:7500/v1/crmappkey0001/T1r6EgB7dm1RXrhCrK
+713044329689|http://135.192.50.148:7500/v1/crmappkey0001/T1n2hgBgKX1RXrhCrK
+713044492032|http://135.192.50.148:7500/v1/crmappkey0001/T1o0JgBvEX1RXrhCrK
+713044270240|http://135.192.50.148:7500/v1/crmappkey0001/T1S5CgBTVX1RXrhCrK
+713043954224|http://135.192.50.148:7500/v1/crmappkey0001/T17OJgBCYX1RXrhCrK
+713044266033|http://135.192.50.148:7500/v1/crmappkey0001/T1rC_gBgxX1RXrhCrK
+713044521077|http://135.192.50.148:7500/v1/crmappkey0001/T1YdEgBKWT1RXrhCrK
+713044517301|http://135.192.50.148:7500/v1/crmappkey0001/T1a5JgB7dX1RXrhCrK
+713043814765|http://135.192.50.148:7500/v1/crmappkey0001/T1LkbgB5_y1RXrhCrK
+713043953413|http://135.192.50.148:7500/v1/crmappkey0001/T1IOAgBQdT1RXrhCrK
+713043966119|http://135.192.50.148:7500/v1/crmappkey0001/T19mbgBmxX1RXrhCrK
+713044183408|http://135.192.50.148:7500/v1/crmappkey0001/T1X0CgBbKX1RXrhCrK
+713044085230|http://135.192.50.148:7500/v1/crmappkey0001/T1o7VgBsLT1RXrhCrK
+713043985364|http://135.192.50.148:7500/v1/crmappkey0001/T1lOVgB_dT1RXrhCrK
+713044103672|http://135.192.50.148:7500/v1/crmappkey0001/T1tZCgBgbX1RXrhCrK
+713043976633|http://135.192.50.148:7500/v1/crmappkey0001/T1LZ_gB_CX1RXrhCrK
+713043967833|http://135.192.50.148:7500/v1/crmappkey0001/T1vO_gBQZT1RXrhCrK

+ 1 - 1
CommunityService/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/CommunityService.jar:/root/target/CommunityService.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 1
FeeService/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/FeeService.jar:/root/target/FeeService.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 1
OrderService/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/OrderService.jar:/root/target/OrderService.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 1
ShopService/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/ShopService.jar:/root/target/ShopService.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 1
StoreService/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/StoreService.jar:/root/target/StoreService.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 1
UserService/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/UserService.jar:/root/target/UserService.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 1
WebService/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/WebService.jar:/root/target/WebService.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 1 - 1
eureka/docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
        - ../target/eureka.jar:/root/target/eureka.jar
        networks:
        - java110-net
-       mem_limit: 1024m
+#       mem_limit: 1024m
 #       extra_hosts:
 #       - "dev.java110.com:192.168.1.18"
 #       - "dev.db.java110.com:192.168.1.18"

+ 4 - 0
java110-utils/src/main/java/com/java110/utils/util/Base64Convert.java

@@ -35,8 +35,12 @@ public class Base64Convert {
         return strBase64;
     }
 
+
+   
+
     /**
      * 将base64 转为字节
+     *
      * @param strBase64
      * @return
      * @throws IOException