Merge remote-tracking branch 'origin/master'

master
yuan 7 years ago
commit c9234149f1

@ -1175,9 +1175,13 @@ public class RetailAppServiceImp implements RetailAppService {
deviceSupport.findRegister(clientType); deviceSupport.findRegister(clientType);
JSONObject res = royalPayCMSSupport.listArticles("app_ad", false, true, 1, 10); JSONObject res = royalPayCMSSupport.listArticles("app_ad", false, true, 1, 10);
JSONArray acts = res.getJSONArray("data"); JSONArray acts = res.getJSONArray("data");
if (acts.size()>0){
int selectNo = RandomUtils.nextInt(0,acts.size()); int selectNo = RandomUtils.nextInt(0,acts.size());
return acts.getJSONObject(selectNo); return acts.getJSONObject(selectNo);
} }
return null;
}
private static boolean mathchLetterorNum(String str) { private static boolean mathchLetterorNum(String str) {
String regex = "[A-Za-z0-9]{8}"; String regex = "[A-Za-z0-9]{8}";

Loading…
Cancel
Save