更改上传文件大小限制

common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java

@@ -28,7 +28,7 @@ public interface IUserFeign extends IFeign {
      * @param userPdu
      * @return
      */
-    @PostMapping(value = "/user/list")
+    @PostMapping(value = "/user/listPage")
     Rest<RespData<List<UserPdu>>> list(@RequestBody UserPdu userPdu);
 
 

device-manager/pom.xml

@@ -53,6 +53,8 @@
 				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
 				<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
+				<package.environment>build</package.environment>
+				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>
 		<profile>
@@ -90,6 +92,7 @@
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
 				<package.environment>build:stage</package.environment>
+				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>
 		<profile>
@@ -127,6 +130,7 @@
 				<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
 				<profiles.log.path>/mortals/app/logs</profiles.log.path>
 				<package.environment>build:prod</package.environment>
+				<skipDeploy>false</skipDeploy>
 			</properties>
 		</profile>
 	</profiles>
@@ -275,14 +279,16 @@
 				</executions>
 			</plugin>
 
-<!--
+
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.6.0</version>
+				<configuration>
+					<skip>${skipDeploy}</skip>
+				</configuration>
 
 				<executions>
-					&lt;!&ndash;执行npm install&ndash;&gt;
 					<execution>
 						<id>exec-npm-install</id>
 						<phase>generate-resources</phase>
@@ -297,7 +303,7 @@
 							<workingDirectory>${project.parent.basedir}/device-manager-ui/admin</workingDirectory>
 						</configuration>
 					</execution>
-					&lt;!&ndash;执行npm build&ndash;&gt;
+
 					<execution>
 						<id>exec-npm-run-build</id>
 						<phase>generate-resources</phase>
@@ -315,7 +321,7 @@
 					</execution>
 				</executions>
 			</plugin>
--->
+
 
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>

device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/RabbitMsgComsumerStartedService.java

 package com.mortals.xhx.daemon.applicationservice;
 
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.ap.GlobalSysInfo;
-import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.springcloud.service.IApplicationStartedService;
 import com.mortals.xhx.base.framework.listener.SimpleDynamicListener;
-import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.common.key.Constant;
-import com.mortals.xhx.common.key.RedisKey;
-import com.mortals.xhx.common.utils.SendTask;
-import com.mortals.xhx.common.utils.SendTaskThreadPool;
 import com.mortals.xhx.module.device.model.DeviceEntity;
-import com.mortals.xhx.module.device.model.DeviceLogEntity;
-import com.mortals.xhx.module.device.service.DeviceLogService;
 import com.mortals.xhx.module.device.service.DeviceService;
-import com.mortals.xhx.module.platform.model.PlatformEntity;
 import com.mortals.xhx.module.platform.service.PlatformService;
-import com.mortals.xhx.module.product.model.ProductEntity;
 import com.mortals.xhx.module.product.service.ProductService;
-import com.mortals.xhx.queue.DefaultTbCoreConsumerService;
-import com.mortals.xhx.queue.TbQueueConsumer;
-import com.mortals.xhx.queue.TbQueueMsg;
-import com.mortals.xhx.queue.TopicPartitionInfo;
-import com.mortals.xhx.utils.IotThreadFactory;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.listener.DirectMessageListenerContainer;
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import static com.mortals.xhx.common.model.MessageHeader.DEVICECODE;
-import static com.mortals.xhx.common.model.MessageHeader.MESSAGETYPE;
-
 
 //@Component
 @Slf4j
@@ -54,8 +26,6 @@ public class RabbitMsgComsumerStartedService implements IApplicationStartedServi
     private PlatformService platformService;
     @Autowired
     private SimpleDynamicListener simpleDynamicListener;
-    @Autowired
-    private DirectMessageListenerContainer directMessageListenerContainer;
 
     @Autowired
     @Qualifier("simpleMessageListenerContainer")

device-manager/src/main/java/com/mortals/xhx/daemon/task/SyncUserTaskImpl.java

 package com.mortals.xhx.daemon.task;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ITask;
@@ -10,19 +8,10 @@ import com.mortals.framework.service.ITaskExcuteService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
-import com.mortals.xhx.common.code.SendStatusEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.pdu.RespData;
-import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.common.utils.SendSmsTask;
-import com.mortals.xhx.common.utils.SendTaskThreadPool;
 import com.mortals.xhx.feign.user.IUserFeign;
-import com.mortals.xhx.module.alarm.model.AlarmSmsSendEntity;
-import com.mortals.xhx.module.alarm.model.AlarmSmsSendQuery;
-import com.mortals.xhx.module.alarm.service.AlarmSmsSendService;
-import lombok.extern.apachecommons.CommonsLog;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,7 +48,8 @@ public class SyncUserTaskImpl implements ITaskExcuteService {
                 UserEntity tempEntity = userService.selectOne(new UserQuery().loginName(user.getLoginName()));
                 if (ObjectUtils.isEmpty(tempEntity)) {
                     UserEntity userEntity = new UserEntity();
-                    BeanUtils.copyProperties(user, userEntity, new String[]{"lastLoginTime", "lastLoginAddress"});
+                    BeanUtils.copyProperties(user, userEntity, new String[]{"id","lastLoginTime", "lastLoginAddress"});
+                    log.info("新增:{}", JSON.toJSONString(userEntity));
                     userService.getUserDao().insert(userEntity);
                 }
             });