cofig

yujian

2020-01-07 1b3856e8f5431508d944a3b9c7a444dac3536bb6

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/SystemClientController.java

@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.system.CustomerContent;

import com.yeshi.fanli.entity.system.SystemClientParams;

import com.yeshi.fanli.log.LogHelper;

@@ -53,13 +54,13 @@


   @Resource

   private CustomerContentService customerContentService;

	


   @Resource

   private UserInfoExtraService userInfoExtraService;

	


   @RequestMapping("getsystemclientparams")

   public void getSystemClientParams(AcceptData acceptData, Long uid, HttpServletRequest request, PrintWriter out) {

   public void getSystemClientParams(AcceptData acceptData, Long uid, String mac, HttpServletRequest request,

         PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

@@ -87,7 +88,7 @@
         if (ssp.getKey().equalsIgnoreCase("iosonling") && "ios".equalsIgnoreCase(acceptData.getPlatform())

               && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

            ssp.setValue("1");

         } else if (ssp.getKey().equalsIgnoreCase("home_weex_url")) {

         } else if (ssp.getKey().equalsIgnoreCase(ConfigKeyEnum.homeWeexUrl.getKey())) {

            if (("android".equalsIgnoreCase(acceptData.getPlatform())

                  && Integer.parseInt(acceptData.getVersion()) < 36)) {

               // 老版本weex（1.5.1之前的）

@@ -116,10 +117,14 @@
                     : DeviceActive.PLATFORM_IOS);

               da.setVersionCode(Integer.parseInt(acceptData.getVersion()));

               da.setIpInfo(ipInfo);

               da.setChannel(acceptData.getChannel());

               da.setImei(acceptData.getImei());

               da.setMac(mac);

               deviceActiveService.addDeviceActive(da);

            } catch (Exception e) {

               e.printStackTrace();

            }

				


            // 用户等级更新

            try {

               userInfoExtraService.updateUserRankByUid(uid);