合并bug处理

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/LoginController.java

@@ -17,7 +17,6 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import com.yeejoin.amos.feign.privilege.util.DesUtil;
 
 import com.yeejoin.amos.feign.privilege.util.PwdUtil;
 import io.swagger.annotations.Api;
@@ -108,7 +107,7 @@ public class LoginController {
         ReginParams reginParams = new ReginParams();
         IdPasswordAuthModel  dPasswordAuthModel = new IdPasswordAuthModel();
         dPasswordAuthModel.setLoginId(userId);
-        dPasswordAuthModel.setPassword(DesUtil.encode(password, "qaz"));
+        dPasswordAuthModel.setPassword(PwdUtil.encode(password));
         RequestContext.setProduct(product);
         FeignClientResult feignClientResult = Privilege.authClient.idpassword(dPasswordAuthModel);
         if (ObjectUtils.isEmpty(feignClientResult.getResult())){

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EquipmentFireEquipmentServiceImpl.java

@@ -21,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;