IP获取测试代码添加,,,.

发送验证码请求体添加device_token（设备id）

server/pom.xml

@@ -164,6 +164,18 @@
             <version>1.0.1</version>
         </dependency>
 
+        <!-- apple identifyToken校验 -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>jwks-rsa</artifactId>
+            <version>0.9.0</version>
+        </dependency>
+
 
     </dependencies>
 

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

@@ -216,12 +216,11 @@ public class LoginController extends AccountBaseController {
 
     @ApiOperation(value = "苹果授权登录")
     @GetMapping("/login/apple")
-    public PicaResponse appleAuth(HttpServletRequest req) throws Exception{
-        //@RequestBody EncryptEntity entity
-        BaseRequest request = new BaseRequest();//CryptoUtil.decrypt(entity, BaseRequest.class);
-        //request.setProductType(super.getProductType());
-        //request.setSourceType(super.getSourceType());
-        return PicaResponse.toResponse(loginService.loginByApple(req, request));
+    public PicaResponse appleAuth(@RequestBody EncryptEntity entity) throws Exception{
+        BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
+        request.setProductType(super.getProductType());
+        request.setSourceType(super.getSourceType());
+        return PicaResponse.toResponse(loginService.loginByApple(request));
     }
 
     @ApiOperation(value = "苹果登录绑定手机号")

server/src/main/java/com/pica/cloud/account/account/server/req/BaseRequest.java

@@ -36,6 +36,8 @@ public class BaseRequest {
     private String captchaAnswer;
     @ApiModelProperty("业务类型，1-新老业务区分标识，2-手机号格式校验业务，3-密码登录校验业务")
     private Integer bizType;
+    @ApiModelProperty("设备id")
+    private String device_token;
     @ApiModelProperty("苹果身份token")
     private String identifyToken;
     @ApiModelProperty("苹果用户id")
@@ -196,4 +198,12 @@ public class BaseRequest {
     public void setInfo(String info) {
         this.info = info;
     }
+
+    public String getDevice_token() {
+        return device_token;
+    }
+
+    public void setDevice_token(String device_token) {
+        this.device_token = device_token;
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/service/LoginService.java

@@ -76,7 +76,7 @@ public interface LoginService {
      * @Params [baseRequest]
      * @Return com.pica.cloud.account.account.server.entity.LoginResult
      */
-    LoginResult loginByApple(HttpServletRequest req, BaseRequest baseRequest);
+    LoginResult loginByApple(BaseRequest baseRequest);
 
     /**
      * @Description 苹果登录绑定手机号

server/src/main/java/com/pica/cloud/account/account/server/util/IPUtil.java

+package com.pica.cloud.account.account.server.util;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
+
+public class IPUtil {
+
+    /**
+     * @Description 获取请求的外网ip
+     * @Author Chongwen.jiang
+     * @Date 2020/2/25 9:34
+     * @ModifyDate 2020/2/25 9:34
+     * @Params [request]
+     * @Return java.lang.String
+     */
+    public static String getIpAdrress(HttpServletRequest request) {
+        String ip = null;
+
+        //X-Forwarded-For：Squid 服务代理
+        String ipAddresses = request.getHeader("X-Forwarded-For");
+        Enumeration<String> headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+            //打印所有头信息
+            String s = headerNames.nextElement();
+            String header = request.getHeader(s);
+//            System.out.println(s+"::::"+header);
+        }
+
+//        System.out.println("headerNames:"+ JSON.toJSONString(headerNames));
+//        System.out.println("RemoteHost:"+request.getRemoteHost());
+//        System.out.println("RemoteAddr:"+request.getRemoteAddr());
+
+        String unknown = "unknown";
+        if (ipAddresses == null || ipAddresses.length() == 0 || unknown.equalsIgnoreCase(ipAddresses)) {
+            //Proxy-Client-IP：apache 服务代理
+            ipAddresses = request.getHeader("Proxy-Client-IP");
+        }
+
+        if (ipAddresses == null || ipAddresses.length() == 0 || unknown.equalsIgnoreCase(ipAddresses)) {
+            //WL-Proxy-Client-IP：weblogic 服务代理
+            ipAddresses = request.getHeader("WL-Proxy-Client-IP");
+        }
+
+        if (ipAddresses == null || ipAddresses.length() == 0 || unknown.equalsIgnoreCase(ipAddresses)) {
+            //HTTP_CLIENT_IP：有些代理服务器
+            ipAddresses = request.getHeader("HTTP_CLIENT_IP");
+        }
+
+        if (ipAddresses == null || ipAddresses.length() == 0 || unknown.equalsIgnoreCase(ipAddresses)) {
+            //X-Real-IP：nginx服务代理
+            ipAddresses = request.getHeader("X-Real-IP");
+        }
+
+        //有些网络通过多层代理，那么获取到的ip就会有多个，一般都是通过逗号（,）分割开来，并且第一个ip为客户端的真实IP
+        if (ipAddresses != null && ipAddresses.length() != 0) {
+            ip = ipAddresses.split(",")[0];
+        }
+
+        //还是不能获取到，最后再通过request.getRemoteAddr();获取
+        if (ip == null || ip.length() == 0 || unknown.equalsIgnoreCase(ipAddresses)) {
+            ip = request.getRemoteAddr();
+        }
+
+        if("0:0:0:0:0:0:0:1".equalsIgnoreCase(ip)){
+            ip = "127.0.0.1";
+        }
+        return ip;
+    }
+
+}