替换 sun.* 包为 java api

.gitignore

@@ -58,7 +58,6 @@ repo/
 # NodeJS Vue
 dist/
 node_modules/
-!/sso-manage-console-web/build/
 sso-manage-console/src/main/resources/public/
 
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)

sso-manage-console-web/package.json

@@ -5,10 +5,10 @@
   "author": "huxz <huxz@usoftchina.com>",
   "private": true,
   "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "dev": "webpack-dev-server --inline --progress --config webpack/webpack.dev.conf.js",
     "start": "npm run dev",
     "lint": "eslint --ext .js,.vue src",
-    "build": "node build/build.js"
+    "build": "node webpack/build.js"
   },
   "dependencies": {
     "axios": "^0.17.1",

sso-server/build.gradle

@@ -38,5 +38,10 @@ dependencies {
 
     compile("com.belerweb:pinyin4j:2.5.1")
 
+    compile("commons-fileupload:commons-fileupload:1.3.2")
+    compile("org.apache.httpcomponents:httpmime:4.4")
+    compile("org.apache.httpcomponents:httpcore:4.4.5")
+    compile("org.apache.httpcomponents:httpclient:4.4")
+
     testCompile("org.springframework.boot:spring-boot-starter-test")
 }

sso-server/src/main/java/com/uas/sso/controller/AppealController.java

@@ -4,6 +4,7 @@ import com.uas.sso.entity.ResetPwdAppeal;
 import com.uas.sso.entity.Token;
 import com.uas.sso.service.ResetPwdAppealService;
 import com.uas.sso.service.UserService;
+import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,10 +12,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
-import static com.sun.xml.internal.ws.api.message.Packet.Status.Request;
-
 /**
  * @author wangmh
  * @create 2018-01-16 8:50

sso-server/src/main/java/com/uas/sso/service/impl/ChangeAdminServiceImpl.java

@@ -1,10 +1,10 @@
 package com.uas.sso.service.impl;
 
-import com.sun.istack.internal.NotNull;
 import com.uas.sso.core.Status;
 import com.uas.sso.dao.ChangeAdminDao;
 import com.uas.sso.entity.ChangeAdmin;
 import com.uas.sso.service.ChangeAdminService;
+import javax.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

sso-server/src/main/java/com/uas/sso/util/CaptchaUtil.java

@@ -1,16 +1,15 @@
 package com.uas.sso.util;
 
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.Random;
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 图片验证码工具类
@@ -39,7 +38,7 @@ public class CaptchaUtil {
      */
     private static String getRandomString()
     {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         for(int i = 0; i < 4; i++)
         {
             buffer.append(CHARS[random.nextInt(CHARS.length)]);
@@ -69,11 +68,10 @@ public class CaptchaUtil {
      * @param request
      * @param response
      * @param key 放到session中的key值
-     * @throws ServletException
      * @throws IOException
      */
     public static void outputCaptcha(HttpServletRequest request, HttpServletResponse response, String key)
-            throws ServletException, IOException
+            throws IOException
     {
 
         response.setContentType("image/jpeg");
@@ -98,8 +96,7 @@ public class CaptchaUtil {
 
         // 转成JPEG格式
         ServletOutputStream out = response.getOutputStream();
-        JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
-        encoder.encode(bi);
+        ImageIO.write(bi, "jpeg", out);
         out.flush();
     }
 }