rosss定制需求/iplog

src/main/java/com/caimei/controller/wechat/SDKApi.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 @Api(tags = "微信SDKAPI")
@@ -29,8 +30,8 @@ public class SDKApi {
             @ApiImplicitParam(name = "url", required = false, value = "公众号链接")
     })
     @GetMapping("/config/data")
-    public ResponseJson<Map<String, String>> getConfigData(String appId, String url) throws Exception {
-        return sdkService.getConfigData(appId, url);
+    public ResponseJson<Map<String, String>> getConfigData(HttpServletRequest request,String appId, String url) throws Exception {
+        return sdkService.getConfigData(request,appId, url);
     }
 
 

src/main/java/com/caimei/service/auth/impl/AuthClubServiceImpl.java

@@ -105,6 +105,12 @@ public class AuthClubServiceImpl implements AuthClubService {
     @Override
     public ResponseJson<PageInfo<WxClubListVo>> getWxClubList(Integer authUserId, String appId, String lngAndLat, String authParty, Integer provinceId,
                                                               Integer cityId, Integer townId, Integer pageNum, Integer pageSize) {
+        /**
+         * ross特殊需求认证通前台首页不搜索不展示机构
+         */
+        if (null != authUserId && 12 == authUserId && StringUtils.isEmpty(authParty)) {
+            return ResponseJson.success(null);
+        }
         if (null == authUserId && StringUtils.isNotEmpty(appId)) {
             authUserId = shopMapper.getUserIdByAppId(appId);
         }

src/main/java/com/caimei/service/wechat/SDKService.java

@@ -2,6 +2,7 @@ package com.caimei.service.wechat;
 
 import com.caimei.model.ResponseJson;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -18,7 +19,7 @@ public interface SDKService {
      * @param url           公众号url
      * @return
      */
-    ResponseJson<Map<String, String>> getConfigData(String appId, String url) throws Exception;
+    ResponseJson<Map<String, String>> getConfigData(HttpServletRequest request,String appId, String url) throws Exception;
 
     /**
      * 获取公众号类型

src/main/java/com/caimei/service/wechat/impl/SDKServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -36,7 +37,24 @@ public class SDKServiceImpl implements SDKService {
     }
 
     @Override
-    public ResponseJson<Map<String, String>> getConfigData(String appId, String url) throws Exception {
+    public ResponseJson<Map<String, String>> getConfigData(HttpServletRequest request, String appId, String url) throws Exception {
+        String clientIp = request.getHeader("x-forwarded-for");
+        if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
+            clientIp = request.getHeader("Proxy-Client-IP");
+        }
+        if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
+            clientIp = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
+            clientIp = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
+            clientIp = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+        if (clientIp == null || clientIp.isEmpty() || "unknown".equalsIgnoreCase(clientIp)) {
+            clientIp = request.getRemoteAddr();
+        }
+        log.info("clientIp--------->" + clientIp);
         if (StringUtils.isEmpty(appId)) {
             return ResponseJson.error("参数异常，请输入appId", null);
         }
@@ -51,7 +69,7 @@ public class SDKServiceImpl implements SDKService {
         // 获取accessToken
         String accessToken = null == redisService.get("token:" + appId) ? null : String.valueOf(redisService.get("token:" + appId));
         if (StringUtils.isEmpty(accessToken)) {
-            Map<String,String> tokenMap = WxUtils.getAccessToken(appId, appSecret);
+            Map<String, String> tokenMap = WxUtils.getAccessToken(appId, appSecret);
             if ("-1".equals(tokenMap.get("code"))) {
                 return ResponseJson.error(tokenMap.get("errmsg"), null);
             }
@@ -60,7 +78,7 @@ public class SDKServiceImpl implements SDKService {
         // 获取jsapiTicket
         String ticket = null == redisService.get("ticket:" + appId) ? null : String.valueOf(redisService.get("ticket:" + appId));
         if (StringUtils.isEmpty(ticket)) {
-            Map<String, String> ticketMap = WxUtils.getJsapiTicket(appId,accessToken);
+            Map<String, String> ticketMap = WxUtils.getJsapiTicket(appId, accessToken);
             if ("-1".equals(ticketMap.get("code"))) {
                 return ResponseJson.error(ticketMap.get("errmsg"), null);
             }
@@ -77,7 +95,7 @@ public class SDKServiceImpl implements SDKService {
         map.put("ticket", ticket);
         map.put("noncestr", noncestr);
         map.put("signature", signature);
-        log.info("生成签名:>>>>"+signature);
+        log.info("生成签名:>>>>" + signature);
         return ResponseJson.success(map);
     }
 
@@ -85,7 +103,7 @@ public class SDKServiceImpl implements SDKService {
     public ResponseJson<Integer> getWxAccountType(String appId) {
         Integer wxAccountType = shopMapper.getWxAccountTypeByAppId(appId);
         if (null == wxAccountType) {
-            return ResponseJson.success(3,"公众号不存在", null);
+            return ResponseJson.success(3, "公众号不存在", null);
         }
         return ResponseJson.success(wxAccountType);
     }