fix:修改部署方式

yt-ios-lemon/lemon-ios-feign/src/main/java/com/ytpm/lemonios/feign/GollumIosFeign.java

@@ -0,0 +1,9 @@
+package com.ytpm.lemonios.feign;
+
+import com.ytpm.lemonios.feign.base.BaseFeign;
+import org.springframework.cloud.openfeign.FeignClient;
+
+@FeignClient(name = "gollumios-service")
+public interface GollumIosFeign extends BaseFeign {
+
+}

yt-ios-lemon/lemon-ios-feign/src/main/java/com/ytpm/lemonios/feign/LemonIosFeign.java

@@ -1,140 +1,9 @@
 package com.ytpm.lemonios.feign;
 
-import com.ytpm.agent.model.YtApp;
-import com.ytpm.agent.model.YtDitch;
-import com.ytpm.agent.param.AdRecordListParam;
-import com.ytpm.agent.param.AuditCheckParam;
-import com.ytpm.agent.param.DitchListForIosParam;
-import com.ytpm.agent.view.AgentAdGroupStaticsVO;
-import com.ytpm.agent.view.AgentDitchView;
-import com.ytpm.agent.view.AgentTopCountView;
-import com.ytpm.app.model.YtAppDefaultConfig;
-import com.ytpm.app.model.YtDyzAdRecord;
-import com.ytpm.app.model.YtDyzUser;
-import com.ytpm.app.param.*;
-import com.ytpm.app.view.WxDefaultConfig;
-import com.ytpm.app.view.YtAppUserListView;
-import com.ytpm.general.Result;
-import com.ytpm.general.ResultTable;
-import com.ytpm.middle.view.DashboardRankingListVO;
-import com.ytpm.middle.view.DashboardRevenueVO;
-import com.ytpm.middle.view.DashboardRiskVO;
+import com.ytpm.lemonios.feign.base.BaseFeign;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
 
 @FeignClient(name = "lemonios-service")
-public interface LemonIosFeign {
-    @GetMapping("/visitor/getLoginDitchCount")
-    int getLoginDitchCount(@RequestParam("deviceId")String deviceId,@RequestParam("hours")Integer hours);
-    @GetMapping("/visitor/getDitchCount")
-    int getDitchCount(@RequestParam("deviceId")String deviceId,@RequestParam("hours")Integer hours);
-    @GetMapping("/user/getMonthRegistryUser")
-    List<YtDyzUser> getMonthRegistryUser(@RequestParam("appIds")String appIds, @RequestParam("type")Integer type);
-    @PostMapping("/user/queryAll")
-    ResultTable<YtAppUserListView> queryAll(@RequestBody YtAppUserListParam param);
-    @GetMapping("/user/getUserInfo")
-    Result<YtDyzUser> getUserInfo(@RequestParam("userId") String userId);
-    @PostMapping("/user/getUserList")
-    ResultTable<YtDyzUser> getUserList(@RequestBody AppUserParam param);
-
-    @PostMapping("/user/getUserAll")
-    ResultTable<YtDyzUser> getUserAll(@RequestBody AppUserParam param);
-
-    @PostMapping("/user/updateUserInfo")
-    Result<?> updateUserInfo(@RequestBody YtDyzUser dyzUser);
-    @GetMapping("/user/adRecords")
-    ResultTable<YtDyzAdRecord> adRecords(@RequestParam(name = "userId",required = true) String userId, @RequestParam(name = "adsourceType",required = false)Integer adsourceType);
-
-    @PostMapping("/user/adRecords/page")
-    ResultTable<YtDyzAdRecord> adRecordsPage(@RequestBody AdRecordListParam param);
-
-    @GetMapping("/user/adRecords/count/month")
-    Result<Integer> queryRecordMonthCount(@RequestParam(name = "userId") String userId,
-                                          @RequestParam(name = "adSourceType", required = false) Integer adSourceType,
-                                          @RequestParam(name = "startTime", required = false) String startTime);
-
-    @PostMapping("/user/queryUserByTime")
-    List<YtDyzUser> queryUserByTime(@RequestBody AppUserQueryParam appUserQueryParam);
-
-    @PostMapping("/user/queryUserByTodayTime")
-    int[] queryUserByTodayTime(@RequestBody AppQueryUserTodayTimeParam appQueryUserTodayTimeParam);
-
-    @PostMapping("/user/queryLoginRecords")
-    List<String> queryLoginRecords(@RequestBody AppUserQueryParam appUserQueryParam);
-
-    @GetMapping("/user/queryByOpenid")
-    List<YtDyzUser> queryByOpenid(@RequestParam("openid") String openid);
-
-    @GetMapping("/user/queryByIosId")
-    List<YtDyzUser> queryByIosId(@RequestParam("iosId") String iosId);
-
-    @PostMapping("/wx/saveAppConfig")
-    Result<String> saveAppConfig(@RequestBody YtAppDefaultConfig defaultConfig);
-
-    @PostMapping("/wx/updateAppsConfig")
-    void updateAppsConfig(@RequestBody AppConfigUpdateParam param);
-
-    @PostMapping("/wx/updateAppConfig")
-    Result<String> updateAppConfig(@RequestBody YtAppDefaultConfig defaultConfig);
-
-    @GetMapping("/wx/getConfigs")
-    List<WxDefaultConfig> getConfigs(@RequestParam(name = "appIds")String appIds);
-
-    @PostMapping("/wx/getLastOne")
-    WxDefaultConfig getLastOne(@RequestBody YtDitch param);
-
-    @PostMapping("/ditch/getDitchList")
-    Result<List<AgentDitchView>> queryDitchList(@RequestBody DitchListForIosParam param);
-
-    @PostMapping("/ditch/addDitch")
-    Result<?> addDitch(@RequestBody YtApp app);
-
-    @PostMapping("/user/queryTodayBanned")
-    List<YtDyzUser> queryTodayBanned(@RequestBody AppUserTodayBannedParam appUserTodayBannedParam);
-
-    @GetMapping("/ad/getAdCount")
-    Map<String, BigDecimal> getAdCount(@RequestParam(name = "appIds")String appIds);
-
-    @GetMapping("/ad/getAppTopCount")
-    AgentTopCountView getAppTopCount(@RequestParam(name = "appIds")String appIds);
-
-    @GetMapping("/ad/getAppRankingList")
-    DashboardRankingListVO queryRankingList(@RequestParam(name = "sortBy") Integer sortBy, @RequestParam(name = "limit") Integer limit);
-
-    @GetMapping("/ad/revenueStatics")
-    DashboardRevenueVO revenueStatics(@RequestParam(name = "apkIds") String apkIds);
-
-    @GetMapping("/ad/userStatics")
-    DashboardRiskVO userStatics(@RequestParam(name = "appId") String appId);
-
-    @GetMapping("/ad/getAgentProfit")
-    List<AgentAdGroupStaticsVO> getAgentProfit(@RequestParam(name = "appIds")String appIds);
-
-    @PostMapping("/user/getRevenueByTime")
-    BigDecimal getRevenueByTime(@RequestBody YtAppUserListParam param);
-
-    @PostMapping("/wx/delDefaultConfig")
-    void delAppConfig(@RequestParam("appId") String appId);
-
-    @PostMapping("/user/unLockUser")
-    void unLockUser(@RequestParam("userIds")String userIds);
-
-    /**
-     * 锁定用户
-     */
-    @GetMapping("/user/lockUser")
-    YtDyzUser lockUser(@RequestParam(name="userId")String userId,@RequestParam("userStatus")Integer userStatus);
+public interface LemonIosFeign extends BaseFeign {
 
-    /**
-     * 批量审核用户
-     */
-    @PostMapping("/user/batchAudit")
-    void batchAudit(@RequestBody AuditCheckParam auditCheckParam);
 }

yt-ios-lemon/lemon-ios-feign/src/main/java/com/ytpm/lemonios/feign/base/BaseFeign.java

@@ -0,0 +1,138 @@
+package com.ytpm.lemonios.feign.base;
+
+import com.ytpm.agent.model.YtApp;
+import com.ytpm.agent.model.YtDitch;
+import com.ytpm.agent.param.AdRecordListParam;
+import com.ytpm.agent.param.AuditCheckParam;
+import com.ytpm.agent.param.DitchListForIosParam;
+import com.ytpm.agent.view.AgentAdGroupStaticsVO;
+import com.ytpm.agent.view.AgentDitchView;
+import com.ytpm.agent.view.AgentTopCountView;
+import com.ytpm.app.model.YtAppDefaultConfig;
+import com.ytpm.app.model.YtDyzAdRecord;
+import com.ytpm.app.model.YtDyzUser;
+import com.ytpm.app.param.*;
+import com.ytpm.app.view.WxDefaultConfig;
+import com.ytpm.app.view.YtAppUserListView;
+import com.ytpm.general.Result;
+import com.ytpm.general.ResultTable;
+import com.ytpm.middle.view.DashboardRankingListVO;
+import com.ytpm.middle.view.DashboardRevenueVO;
+import com.ytpm.middle.view.DashboardRiskVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+public interface BaseFeign {
+    @GetMapping("/visitor/getLoginDitchCount")
+    int getLoginDitchCount(@RequestParam("deviceId")String deviceId, @RequestParam("hours")Integer hours);
+    @GetMapping("/visitor/getDitchCount")
+    int getDitchCount(@RequestParam("deviceId")String deviceId,@RequestParam("hours")Integer hours);
+    @GetMapping("/user/getMonthRegistryUser")
+    List<YtDyzUser> getMonthRegistryUser(@RequestParam("appIds")String appIds, @RequestParam("type")Integer type);
+    @PostMapping("/user/queryAll")
+    ResultTable<YtAppUserListView> queryAll(@RequestBody YtAppUserListParam param);
+    @GetMapping("/user/getUserInfo")
+    Result<YtDyzUser> getUserInfo(@RequestParam("userId") String userId);
+    @PostMapping("/user/getUserList")
+    ResultTable<YtDyzUser> getUserList(@RequestBody AppUserParam param);
+
+    @PostMapping("/user/getUserAll")
+    ResultTable<YtDyzUser> getUserAll(@RequestBody AppUserParam param);
+
+    @PostMapping("/user/updateUserInfo")
+    Result<?> updateUserInfo(@RequestBody YtDyzUser dyzUser);
+    @GetMapping("/user/adRecords")
+    ResultTable<YtDyzAdRecord> adRecords(@RequestParam(name = "userId",required = true) String userId, @RequestParam(name = "adsourceType",required = false)Integer adsourceType);
+
+    @PostMapping("/user/adRecords/page")
+    ResultTable<YtDyzAdRecord> adRecordsPage(@RequestBody AdRecordListParam param);
+
+    @GetMapping("/user/adRecords/count/month")
+    Result<Integer> queryRecordMonthCount(@RequestParam(name = "userId") String userId,
+                                          @RequestParam(name = "adSourceType", required = false) Integer adSourceType,
+                                          @RequestParam(name = "startTime", required = false) String startTime);
+
+    @PostMapping("/user/queryUserByTime")
+    List<YtDyzUser> queryUserByTime(@RequestBody AppUserQueryParam appUserQueryParam);
+
+    @PostMapping("/user/queryUserByTodayTime")
+    int[] queryUserByTodayTime(@RequestBody AppQueryUserTodayTimeParam appQueryUserTodayTimeParam);
+
+    @PostMapping("/user/queryLoginRecords")
+    List<String> queryLoginRecords(@RequestBody AppUserQueryParam appUserQueryParam);
+
+    @GetMapping("/user/queryByOpenid")
+    List<YtDyzUser> queryByOpenid(@RequestParam("openid") String openid);
+
+    @GetMapping("/user/queryByIosId")
+    List<YtDyzUser> queryByIosId(@RequestParam("iosId") String iosId);
+
+    @PostMapping("/wx/saveAppConfig")
+    Result<String> saveAppConfig(@RequestBody YtAppDefaultConfig defaultConfig);
+
+    @PostMapping("/wx/updateAppsConfig")
+    void updateAppsConfig(@RequestBody AppConfigUpdateParam param);
+
+    @PostMapping("/wx/updateAppConfig")
+    Result<String> updateAppConfig(@RequestBody YtAppDefaultConfig defaultConfig);
+
+    @GetMapping("/wx/getConfigs")
+    List<WxDefaultConfig> getConfigs(@RequestParam(name = "appIds")String appIds);
+
+    @PostMapping("/wx/getLastOne")
+    WxDefaultConfig getLastOne(@RequestBody YtDitch param);
+
+    @PostMapping("/ditch/getDitchList")
+    Result<List<AgentDitchView>> queryDitchList(@RequestBody DitchListForIosParam param);
+
+    @PostMapping("/ditch/addDitch")
+    Result<?> addDitch(@RequestBody YtApp app);
+
+    @PostMapping("/user/queryTodayBanned")
+    List<YtDyzUser> queryTodayBanned(@RequestBody AppUserTodayBannedParam appUserTodayBannedParam);
+
+    @GetMapping("/ad/getAdCount")
+    Map<String, BigDecimal> getAdCount(@RequestParam(name = "appIds")String appIds);
+
+    @GetMapping("/ad/getAppTopCount")
+    AgentTopCountView getAppTopCount(@RequestParam(name = "appIds")String appIds);
+
+    @GetMapping("/ad/getAppRankingList")
+    DashboardRankingListVO queryRankingList(@RequestParam(name = "sortBy") Integer sortBy, @RequestParam(name = "limit") Integer limit);
+
+    @GetMapping("/ad/revenueStatics")
+    DashboardRevenueVO revenueStatics(@RequestParam(name = "apkIds") String apkIds);
+
+    @GetMapping("/ad/userStatics")
+    DashboardRiskVO userStatics(@RequestParam(name = "appId") String appId);
+
+    @GetMapping("/ad/getAgentProfit")
+    List<AgentAdGroupStaticsVO> getAgentProfit(@RequestParam(name = "appIds")String appIds);
+
+    @PostMapping("/user/getRevenueByTime")
+    BigDecimal getRevenueByTime(@RequestBody YtAppUserListParam param);
+
+    @PostMapping("/wx/delDefaultConfig")
+    void delAppConfig(@RequestParam("appId") String appId);
+
+    @PostMapping("/user/unLockUser")
+    void unLockUser(@RequestParam("userIds")String userIds);
+
+    /**
+     * 锁定用户
+     */
+    @GetMapping("/user/lockUser")
+    YtDyzUser lockUser(@RequestParam(name="userId")String userId,@RequestParam("userStatus")Integer userStatus);
+
+    /**
+     * 批量审核用户
+     */
+    @PostMapping("/user/batchAudit")
+    void batchAudit(@RequestBody AuditCheckParam auditCheckParam);
+}

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/config/interceptor/HttpInterceptor.java

@@ -1,5 +1,7 @@
 package com.ytpm.lemonios.config.interceptor;
 
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -8,16 +10,19 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 
+@Slf4j
 @Component
 public class HttpInterceptor implements HandlerInterceptor {
 
+    @Value("${spring.application.name-zh:}")
+    private String applicationNameZh;
+
     @Override
     public boolean preHandle(HttpServletRequest request,
                              HttpServletResponse response, Object obj) throws Exception {
         // 获取客户端IP地址
         String clientIp = getClientIp(request);
-        System.out.println("青柠檬IOS接收客户端" + clientIp + "发起用户请求");
-        // 可以在这里添加更多的逻辑，比如记录日志等
+        log.info("{}收到来自客户端[{}]的用户请求", applicationNameZh, clientIp);
         return true;
     }
 
@@ -28,6 +33,7 @@ public class HttpInterceptor implements HandlerInterceptor {
         }
         return xfHeader.split(",")[0]; // 可能会有多个IP，这里取第一个逗号前的IP
     }
+
     /**
      * 请求处理之后调用；在视图渲染之前，controller处理之后。
      */

yt-ios-lemon/lemon-ios-service/src/main/java/com/ytpm/lemonios/controller/WxController.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,6 +47,7 @@ import java.util.Objects;
 @Slf4j
 @Api(tags = "微信开放能力模块")
 @RestController
+@RefreshScope
 @RequestMapping("/wx")
 public class WxController {
     private final static String GRANT_TYPE = "authorization_code";
@@ -58,6 +61,8 @@ public class WxController {
     private AppUserService appUserService;
     @Autowired
     private DitchMapper ditchMapper;
+    @Value("${yt.ios.appid:}")
+    private String appId;
 
     @PostMapping("/login")
     @ApiOperation("微信登录")
@@ -138,7 +143,7 @@ public class WxController {
         List<YtDyzAdRecord> adRecordList = recordMapper.getByIosIdBeforeLogin(param.getIosId());
         user.setPreAdRecordList(adRecordList);
         user.setLoginType(LoginType.VISITOR);
-        user.setAppId("a689ab630d3e62");
+        user.setAppId(appId);
         Result<?> result = riskFeign.checkLoginRisk(user);
         if (result.getCode() != 200) {
             String errorMessage = result.getMessage();

yt-ios-lemon/lemon-ios-service/src/main/resources/bootstrap.yml

@@ -4,7 +4,8 @@ spring:
   main:
     allow-bean-definition-overriding: true
   application:
-    name: lemonios-service
+    name: gollumios-service
+    name-zh: '咕噜记账IOS'
   profiles:
     active: local
 yt: