一些改动

com.sharemao.core.task/src/main/java/com/sharemao/core/task/iot2/ct/CTAPI.java

@@ -103,7 +103,7 @@ public class CTAPI
 			log.info(url);
 			token= HttpUtil.get(url);
 		}
-		if(index==55)//科锋湖南
+		if(index==55 || index==85)//科锋湖南 文航湖南移动
 		{
 			String url = "http://ww.kfkj8021.com/index/index/ydToken?appid=C5010731A731J165925&chl_id=64";
 			log.info(url);

com.sharemao.core.task/src/main/java/com/sharemao/core/task/iot2/ct/RealName.java

@@ -26,6 +26,7 @@ public class RealName {
 		realname(54);	//科锋4G移动（广东移动）
 
 		realname(55);	//科锋4G移动（湖南移动）
+		realname(85);	//文航湖南移动
 
 		realname(57);	//科锋4G移动（河南移动）
 		realname(60);	//科锋4G河南移动（关闭二次认证）

com.sharemao.web.fe/src/main/java/ink/mifi/fe/tools/CTAPI.java

@@ -31,7 +31,9 @@ public class CTAPI
 
 	public static void main(String[] args)
 	{
-        bwquicksm("89860441192580181043");
+        String token = CTAPI.getToken(85);
+        String cturl = CTAPI.quicksm(token, "89860887182580414012", 85, "1");
+        System.out.println(cturl);
 	}
 	
 	public static String getToken(int index)
@@ -93,7 +95,7 @@ public class CTAPI
 			log.info(url);
 			token= HttpUtil.get(url);
 		}
-		if(index==55)//科锋湖南
+		if(index==55 || index==85)//科锋湖南 文航湖南移动
 		{
 			String url = "http://ww.kfkj8021.com/index/index/ydToken?appid=C5010731A731J165925&chl_id=64";
 			log.info(url);

com.sharemao.web.manager/src/main/java/com/sharemao/manager/service/impl/UfiServiceImpl.java

@@ -374,16 +374,18 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
 		//保存订单
 		int devorg=orgid;
 		int devgrpid=0;
-		String devsql="select orgid,devgrpid from "+ProjectTools.getTableNameBySN(devid)+" where devid = '"+devid+"'";
+		int appuid=0;
+		String devsql="select orgid,devgrpid,appuid from "+ProjectTools.getTableNameBySN(devid)+" where devid = '"+devid+"'";
 		Map<String,Object> devmap=RCPService.getMifiService().getMap(devsql);
 		if(devmap!=null)
 		{
 			devorg=Integer.parseInt(devmap.get("orgid").toString());
 			devgrpid=Integer.parseInt(devmap.get("devgrpid").toString());
+			appuid=Integer.parseInt(devmap.get("appuid").toString());
 		}
 		
 		String rcdSql = "INSERT INTO allorder(onum,appuid,orgid,packid,oprice,otype,ptype,ostat,crttm,mdftm,devid,acid,opt) VALUES("
-				+ "	'"+orderid+"',0,"+devorg+","+pkgid+",'"+price+"',0,6,2,'"+nowTime+"','"+nowTime+"','"+devid+"',"+accid+",'"+uname+"')";
+				+ "	'"+orderid+"',"+ appuid+","+devorg+","+pkgid+",'"+price+"',0,6,2,'"+nowTime+"','"+nowTime+"','"+devid+"',"+accid+",'"+uname+"')";
 		//sqlList.add(rcdSql);
 		//baseDao.excuBatch(sqlList);
 		logger.info(rcdSql);
@@ -556,7 +558,7 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
             if (phonenumList != null && phonenumList.size() > 0) {
                 Map<String, Object> phonenumMap = phonenumList.get(0);
                 String phonenum = String.valueOf(phonenumMap.get("phonenum"));
-                if (!ProjectTools.isEmpty(phonenum)) {
+                if (!ProjectTools.isEmpty(phonenum) && !pkgName.contains("赠送")) {
                     Map<String, String> varsMap = new HashMap<String, String>();
                     varsMap.put("pkgName", pkgName);
                     String vars = JSONObject.toJSONString(varsMap);
@@ -808,7 +810,13 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
 			if (!ProjectTools.isEmpty(mode)) {
 				String[] modearr = { "", "云卡", "内置卡1", "外插卡", "内置卡2", "自动", "eSim移动", "eSim联通", "eSim电信", "终端设置" };
 				try {
-					logMap.put("运行模式", modearr[Integer.parseInt(mode)]);
+                    String m;
+                    if (mode.equals("23")){
+                        m = "指定电信";
+                    } else {
+                        m = modearr[Integer.parseInt(mode)];
+                    }
+					logMap.put("运行模式", m);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logMap.put("运行模式", mode);
@@ -1014,7 +1022,7 @@ public class UfiServiceImpl extends DevBaseService implements UfiService{
 		//DAOHelper.execute("ufidevice", sql);
 		RCPService.getMifiService().execSql(sql);
 		sql = "UPDATE appuser SET defaultdev = 0 WHERE devid = '"+devid+"'";
-		sql = "INSERT INTO oplog (accid,orgid,optype,content,appuid,crttm,devid) VALUES("+ account.getId()+","+account.getOrgid()+",3,'设备解除绑定>>>设备ID："+devid+","+DateTimeUtil.longtime()+",'"+devid+"')";
+		sql = "INSERT INTO oplog (accid,orgid,optype,content,appuid,crttm,devid) VALUES("+ account.getId()+","+account.getOrgid()+",3,'设备解除绑定>>>设备ID："+devid+"',0,"+DateTimeUtil.longtime()+",'"+devid+"')";
 		logger.info("设备解除绑定>>>设备ID："+devid);
 		baseDao.excuSql(sql);
 		return 0;

com.shuhaiwifi.task/src/main/java/com/shuhaiwifi/task/DelNoRealnameSMD.java

@@ -64,7 +64,7 @@ public class DelNoRealnameSMD
                 List<Map<String,Object>> smdlist=RCPService.getBaseService().getMapList(sql);
                 if (smdlist != null && !smdlist.isEmpty()) {
                     String sn = String.valueOf(smdlist.get(0).get("sn"));
-                    long sevenDays = 7 * 24 * 60 * 60 * 1000;
+                    long sevenDays = 3 * 24 * 60 * 60 * 1000;
                     sql = "select devid,lastcntm from device" + Long.parseLong(sn) % 32 + " where devid='" + sn + "' ";
 
                     List<Map<String, Object>> devlist = RCPService.getMifiService().getMapList(sql);
@@ -81,7 +81,7 @@ public class DelNoRealnameSMD
                 }
             }
         }
-        logger.info("未实名的卡数："+norealnamesimsize+"==>需要删除一周没有上线的设备卡数量："+delsmdsize);
+        logger.info("未实名的卡数："+norealnamesimsize+"==>需要删除3天没有上线的设备卡数量："+delsmdsize);
         if (iccidbuilder.length()>0){
             String delsql = "delete from smd where iccid in ("+iccidbuilder.substring(0,iccidbuilder.length()-1)+")";
             logger.info(delsmdsize+"==>"+delsql);

com.shuhaiwifi.task/src/main/java/com/shuhaiwifi/task/DistributeSMD.java

@@ -18,7 +18,7 @@ public class DistributeSMD {
 	public static void main(String[] args) 
 	{
 		List<Map<String,Object>> devlists = new ArrayList<Map<String,Object>>();
-        long sevenDaysAgo = System.currentTimeMillis() - (7 * 24 * 60 * 60 * 1000);
+        long sevenDaysAgo = System.currentTimeMillis() - (3 * 24 * 60 * 60 * 1000);
         for (int i = 0; i < 32; i++) {
 			String devsql = "SELECT * from device"+i+" where devgrpid=1 and lastcntm > "+sevenDaysAgo;
 			List<Map<String,Object>> devlist=RCPService.getMifiService().getMapList(devsql);