update

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -97,7 +97,9 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		password = new BCryptPasswordEncoder().encode(password);
-		sysUserService.updatePassword(mobile, password);
+		sysUser.setPassword(password);
+		sysUser.setUpdateTime(new Date());
+		sysUserService.update(sysUser);
 		return succeed();
 	}
 
@@ -115,7 +117,10 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		if (smsCodeService.verifyValidCode(mobile, authCode)) {
-			sysUserService.updatePassword(mobile, new BCryptPasswordEncoder().encode(newPassword));
+			String password = new BCryptPasswordEncoder().encode(newPassword);
+			sysUser.setPassword(password);
+			sysUser.setUpdateTime(new Date());
+			sysUserService.update(sysUser);
 			return succeed();
 		} else {
 			return failed("验证码错误");

mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestAttributeHystrixConcurrencyStrategy.java

@@ -23,7 +23,7 @@ import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
 import com.netflix.hystrix.strategy.properties.HystrixPropertiesStrategy;
 import com.netflix.hystrix.strategy.properties.HystrixProperty;
 
-@Component
+//@Component
 public class RequestAttributeHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy {
 	private static final Logger log = LoggerFactory.getLogger(RequestAttributeHystrixConcurrencyStrategy.class);
 

mec-student/src/main/resources/application.yml

@@ -78,10 +78,12 @@ management:
     health:
       show-details: ALWAYS
   
-feign:
-  hystrix:
-    enabled: true
 
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000
+    
 logging:
   level:
-    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG
+    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG
+