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

admin

2019-09-27 6b75391e97aa770e12965ec6e542856df79e6de0

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

@@ -58,7 +58,8 @@
   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) {

@@ -117,6 +118,7 @@
               da.setIpInfo(ipInfo);

               da.setChannel(acceptData.getChannel());

               da.setImei(acceptData.getImei());

               da.setMac(mac);

               deviceActiveService.addDeviceActive(da);

            } catch (Exception e) {

            }