| 
					
				 | 
			
			
				@@ -46,8 +46,7 @@ public class CaptchaController 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public AjaxResult getCode(HttpServletResponse response) throws IOException 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         AjaxResult ajax = AjaxResult.success(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //boolean captchaEnabled = configService.selectCaptchaEnabled(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        boolean captchaEnabled = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        boolean captchaEnabled = configService.selectCaptchaEnabled(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ajax.put("captchaEnabled", captchaEnabled); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (!captchaEnabled) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return ajax; 
			 |