Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -18,15 +18,19 @@
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;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.CustomerContentService;

import com.yeshi.fanli.service.inter.config.SystemClientParamsService;

import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.IOSPushService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.annotation.UserActive;



import net.sf.json.JSONObject;



@@ -52,8 +56,13 @@
   @Resource

   private CustomerContentService customerContentService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   @UserActive(uid="#uid")

   @RequestMapping("getsystemclientparams")

   public void getSystemClientParams(AcceptData acceptData, 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) {

@@ -81,7 +90,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之前的）

@@ -90,6 +99,12 @@
                  && Integer.parseInt(acceptData.getVersion()) < 44 && system.getId().longValue() != 5L)

               ssp.setValue("http://ec-1255749512.file.myqcloud.com/resource/weex/flq_index_v2.js");

         }

			
         // 同步管理config

         if (ssp.getKey().equalsIgnoreCase("inviteRules")) {

            ssp.setValue(configService.get(ConfigKeyEnum.inviteRules.getKey()) );

         }

			
         list.add(ssp);

      }



@@ -110,8 +125,19 @@
                     : 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);

            } catch (Exception e) {

               LogHelper.errorDetailInfo(e);

            }

         }

      });