diff --git a/device-manager/src/main/java/com/mortals/xhx/base/login/web/StandaloneLoginController.java b/device-manager/src/main/java/com/mortals/xhx/base/login/web/StandaloneLoginController.java index c608c69b13c76345f2b9eeef85d5ce5f3539d10c..38d2dcaa79d066d1310b6a7464197c996de39e78 100644 --- a/device-manager/src/main/java/com/mortals/xhx/base/login/web/StandaloneLoginController.java +++ b/device-manager/src/main/java/com/mortals/xhx/base/login/web/StandaloneLoginController.java @@ -21,8 +21,6 @@ import com.mortals.xhx.base.system.user.model.UserEntity; import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.base.system.valid.service.ValidCodeService; import com.mortals.xhx.common.key.RedisKey; -import com.mortals.xhx.common.pdu.user.UserPdu; -import com.mortals.xhx.feign.user.IUserFeign; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; @@ -60,8 +58,6 @@ public class StandaloneLoginController extends BaseCRUDJsonBodyMappingController private ICacheService cacheService; @Autowired private IAuthTokenService authTokenService; - @Autowired - private IUserFeign userFeign; @RequestMapping("login") public String login(@RequestBody LoginForm loginForm) throws Exception { @@ -69,13 +65,6 @@ public class StandaloneLoginController extends BaseCRUDJsonBodyMappingController JSONObject ret = new JSONObject(); String loginName = loginForm.getLoginName(); String password = loginForm.getPassword(); -// -// UserPdu userPdu = new UserPdu(); -// userPdu.setLoginName(loginName); -// userPdu.setPassword(password); -// String resp = userFeign.portalLogin(userPdu); -// -// return resp; String securityCode = loginForm.getSecurityCode(); String ip = super.getRequestIP(request); diff --git a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java index 4aae104851e3cf1d94013096152bd195fada8799..070bf67dad1ef371cda6c6cce03dc7794fa5eae5 100644 --- a/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java +++ b/device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceComsumersRegisterService.java @@ -5,6 +5,7 @@ import com.mortals.xhx.base.framework.listener.DirectDynamicListener; import com.mortals.xhx.base.system.message.impl.MessageProducer; import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.QueueKey; +import com.mortals.xhx.common.utils.SendTaskThreadPool; import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.service.DeviceService; import com.mortals.xhx.module.platform.service.PlatformService; @@ -35,12 +36,15 @@ public class DeviceComsumersRegisterService implements IApplicationStartedServic private DirectMessageListenerContainer container; @Autowired private MessageProducer messageProducer; - + @Autowired + private SendTaskThreadPool sendTaskThreadPool; @Autowired private DirectDynamicListener directDynamicListener; @Override public void start() { + log.info("鍒濆鍖栧彂閫佺嚎绋嬫暟閲�"); + sendTaskThreadPool.init(20); log.info("鏈嶅姟绔秷鎭槦鍒楀垵濮嬪寲鏈嶅姟寮€濮�.."); deviceService.find(new DeviceEntity()) .stream()