Subversion Repositories SmartDukaan

Rev

Rev 26822 | Rev 27425 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 26822 Rev 26870
Line 78... Line 78...
78
import com.spice.profitmandi.dao.repository.user.PromoterRepository;
78
import com.spice.profitmandi.dao.repository.user.PromoterRepository;
79
import com.spice.profitmandi.service.AuthService;
79
import com.spice.profitmandi.service.AuthService;
80
import com.spice.profitmandi.service.authentication.RoleManager;
80
import com.spice.profitmandi.service.authentication.RoleManager;
81
import com.spice.profitmandi.service.user.RetailerService;
81
import com.spice.profitmandi.service.user.RetailerService;
82
import com.spice.profitmandi.service.user.UserService;
82
import com.spice.profitmandi.service.user.UserService;
-
 
83
import com.spice.profitmandi.web.controller.checkout.OrderController;
83
import com.spice.profitmandi.web.enumuration.UserStatus;
84
import com.spice.profitmandi.web.enumuration.UserStatus;
84
import com.spice.profitmandi.web.processor.GoogleLoginProcessor;
85
import com.spice.profitmandi.web.processor.GoogleLoginProcessor;
85
import com.spice.profitmandi.web.req.RefferalEarning;
86
import com.spice.profitmandi.web.req.RefferalEarning;
86
import com.spice.profitmandi.web.req.RefferalEarningModel;
87
import com.spice.profitmandi.web.req.RefferalEarningModel;
87
import com.spice.profitmandi.web.req.UserRequest;
88
import com.spice.profitmandi.web.req.UserRequest;
Line 502... Line 503...
502
		final String uri = "http://192.168.158.89/mobileappsettings?t=" + timestamp + "&imeinumber=" + imeinumber;
503
		final String uri = "http://192.168.158.89/mobileappsettings?t=" + timestamp + "&imeinumber=" + imeinumber;
503
		final String BASIC_AUTH = "Basic " + Base64.getEncoder().encodeToString("dtr:dtr18Feb2015".getBytes());
504
		final String BASIC_AUTH = "Basic " + Base64.getEncoder().encodeToString("dtr:dtr18Feb2015".getBytes());
504
		Map<String, String> headers = new HashMap<>();
505
		Map<String, String> headers = new HashMap<>();
505
		Map<String, String> params = new HashMap<>();
506
		Map<String, String> params = new HashMap<>();
506
		headers.put("Authorization", BASIC_AUTH);
507
		headers.put("Authorization", BASIC_AUTH);
-
 
508
		if(timestamp==0) {
-
 
509
			return responseSender.ok(OrderController.APP_SETTINGS);
-
 
510
		} else {
507
		return responseSender.ok(restClient.post(uri, params, headers));
511
			return responseSender.ok(OrderController.APP_SETTINGS_BLANK);
-
 
512
		}
508
	}
513
	}
509
 
514
 
510
	@RequestMapping(value = "/mobileappsettings1", method = RequestMethod.POST)
515
	@RequestMapping(value = "/mobileappsettings1", method = RequestMethod.POST)
511
	public ResponseEntity<?> mobileAppSettings1(HttpServletRequest request, @RequestParam(name = "t") int timestamp,
516
	public ResponseEntity<?> mobileAppSettings1(HttpServletRequest request, @RequestParam(name = "t") int timestamp,
512
			@RequestParam(name = "imeinumber") String imeinumber)
517
			@RequestParam(name = "imeinumber") String imeinumber)