campsite bug 修复

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/AuthBootstrap.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.auth;
 
 
 import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
+import com.github.wxiaoqi.security.auth.feign.IUserService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/configuration/ClientConfiguration.java

@@ -12,7 +12,7 @@ public class ClientConfiguration {
     private String clientId;
     @Value("${client.secret}")
     private String clientSecret;
-    @Value("${client.token-header}")
+    @Value("${client.token-header:Authorization}")
     private String clientTokenHeader;
 
     public String getClientTokenHeader() {

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -141,14 +141,7 @@ public class AuthController {
                             @RequestParam(value="password",defaultValue="")String  password,
                             @RequestParam(value="type",defaultValue="1")Integer  type)throws Exception{
         log.info(username+"----require login...");
-        if(log.isDebugEnabled()){
-            ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-            String clientIp = IpUtil.getClientIp(requestAttributes.getRequest());
-            log.debug("*******************************************");
-            log.debug("当前IPUtil获取访问的ip地址【{}】",clientIp);
-            log.debug("当前EntityUtils获取访问的IP地址【{}】", ClientUtil.getClientIp(requestAttributes.getRequest()));
-            log.debug("*******************************************");
-        }
+
         JSONObject data=appAuthService.tlogin(username,password,mobilecode,type);
         if(data!=null&&data.getInteger("status")== ResultCode.SUCCESS_CODE){
             JSONObject result=data.getJSONObject("data");

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/interceptor/ClientTokenInterceptor.java

@@ -2,11 +2,15 @@ package com.github.wxiaoqi.security.auth.interceptor;
 
 import com.github.wxiaoqi.security.auth.configuration.ClientConfiguration;
 import com.github.wxiaoqi.security.auth.service.AuthClientService;
+import com.github.wxiaoqi.security.common.util.ClientUtil;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 /**
  * Created by ace on 2017/9/12.
@@ -21,7 +25,9 @@ public class ClientTokenInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate requestTemplate) {
         try {
+            ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
             requestTemplate.header(clientConfiguration.getClientTokenHeader(), authClientService.apply(clientConfiguration.getClientId(), clientConfiguration.getClientSecret()));
+            requestTemplate.header("userHost", ClientUtil.getClientIp(requestAttributes.getRequest()));
         } catch (Exception e) {
             e.printStackTrace();
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -148,6 +148,7 @@ public class AppUserRest {
             @RequestParam(value="password",defaultValue="")String  password,
             @RequestParam(value="type",defaultValue="1")Integer  type
     ){
+
         return appPermissionService.login(username,password,mobilecode,type);
     }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -314,8 +314,12 @@ public class AppPermissionService {
 //                AppUserLogin userLoign= new AppUserLogin();
 //                EntityUtils.setCreateInfo(userLoign);
                 ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-                HttpServletRequest request = requestAttributes.getRequest();
-                String clientIp = IpUtil.getClientIp(request);
+                String clientIp = requestAttributes.getRequest().getHeader("userHost");
+                if(log.isDebugEnabled()){
+                    log.debug("*******************************************");
+                    log.debug("当前EntityUtils获取访问的IP地址【{}】",clientIp);
+                    log.debug("*******************************************");
+                }
                 appUserLoginBiz.updateLoginInfo(userid,clientIp);
             }