Skip to content

C
cneeds-server
Commit 5cd8a518 by zzrdark
Options

1.mqttBean

parent 3694c093
Showing with 458 additions and 124 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.fix设备模块&#10;2.生产配置">
<change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceInfoDto.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-logupload/src/main/resources/application-dev.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-logupload/src/main/resources/application.yml" afterDir="false" />
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.日志上传模块&#10;2.修改数据库">
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/CleanLogBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/DeviceBehaviorBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/DeviceLogStartBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/DeviceLogStopBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/DeviceRebootBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/LogSettingBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/MobileNetworkSwitchBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/ReductionDeviceBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/UploadInformationDeviceBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/UserActivationDeviceBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/UserBaseDataBean.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/WiFiSwitchBean.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/db/cneeds_server.sql" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/db/cneeds_server.sql" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysUserEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/SysUserEntity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/UserDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/UserDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserVo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-utils/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-utils/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-authorization/build.sh" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/build.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-authorization/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-authorization/src/test/java/utils/PasswordEncode.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/test/java/utils/PasswordEncode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/UserController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-eureka/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application-prod.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysFuncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysFuncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserFuncService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserFuncService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysFuncServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/BaseMqttBean.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/BaseMqttBean.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/RemoteControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/RemoteControlBean.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -111,6 +86,9 @@
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="MyBatisLogPluginparameters" value="Parameters:" />
<property name="MyBatisLogPluginpreparing" value="Preparing:" />
<property name="MyBatisLogPluginrunning" value="true" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
......@@ -118,30 +96,30 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-logupload/src/main/resources" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2916053" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="settings.github" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
<property name="settings.editor.splitter.proportion" value="0.20898877" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\java\com\mx\cneeds\server\user\mqtt" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-logupload\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-eureka\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-device\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.server.device.common" />
<recent name="com.mx.cneeds.common.dto" />
<recent name="com.mx.cneeds.server.device.config" />
<recent name="com.mx.cneeds.server.datashow.web.device" />
<recent name="com.mx.cneeds.common.vo" />
<recent name="com.mx.cneeds.common.generate" />
<recent name="com.mx.cneeds.common.dto" />
<recent name="com.mx.cneeds.server.logupload.config" />
<recent name="com.mx.cneeds.server.user.mqtt.server" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\test" />
......@@ -151,7 +129,37 @@
<recent name="E:\mx_project\cneeds-server\src" />
</key>
</component>
<component name="RunManager" selected="Spring Boot.UserServerApplication">
<component name="RestServicesNavigator">
<treeState>
<expand>
<path>
<item name="Found 125 services " type="fcff1e1b:RestServiceStructure$RootNode" />
</path>
</expand>
<select />
</treeState>
</component>
<component name="RunManager" selected="Spring Boot.DatashowApplication">
<configuration name="EurekaServerApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.mx.cneeds.server.eureka.EurekaServerApplication" />
<module name="cneeds-server-eureka" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="PasswordEncode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="utils.PasswordEncode" />
<module name="cneeds-server-authorization" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="utils.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
<module name="cneeds-server-advice-control" />
<option name="VM_PARAMETERS" />
......@@ -199,26 +207,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="EurekaServerApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="com.mx.cneeds.server.eureka.EurekaServerApplication" />
<module name="cneeds-server-eureka" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="PasswordEncode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="utils.PasswordEncode" />
<module name="cneeds-server-authorization" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="utils.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="AuthorizaitonApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="cneeds-server-authorization" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.mx.cneeds.server.anthorization.AuthorizaitonApplication" />
......@@ -247,6 +235,20 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="LogUploadApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
<module name="cneeds-server-logupload" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.mx.cneeds.server.logupload.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="SPRING_BOOT_MAIN_CLASS" value="com.mx.cneeds.server.logupload.LogUploadApplication" />
<option name="ALTERNATIVE_JRE_PATH" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="UserServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="cneeds-server-user" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.mx.cneeds.server.user.UserServerApplication" />
......@@ -262,6 +264,7 @@
<item itemvalue="Spring Boot.DeviceApplication" />
<item itemvalue="Spring Boot.EurekaServerApplication" />
<item itemvalue="Spring Boot.UserServerApplication" />
<item itemvalue="Spring Boot.LogUploadApplication" />
</list>
<recent_temporary>
<list>
......@@ -321,7 +324,24 @@
<workItem from="1584927645789" duration="18154000" />
<workItem from="1585014666194" duration="17976000" />
<workItem from="1585101859853" duration="17933000" />
<workItem from="1585188207827" duration="22574000" />
<workItem from="1585188207827" duration="22661000" />
<workItem from="1585275729198" duration="9600000" />
<workItem from="1585533799619" duration="4847000" />
<workItem from="1585621139422" duration="18378000" />
<workItem from="1585650606774" duration="2675000" />
<workItem from="1585706370248" duration="27846000" />
<workItem from="1585793169216" duration="16541000" />
<workItem from="1585879987384" duration="10474000" />
<workItem from="1586225568635" duration="24065000" />
<workItem from="1586310824729" duration="20752000" />
<workItem from="1586396541572" duration="10040000" />
<workItem from="1586485205675" duration="4705000" />
<workItem from="1586742903366" duration="7437000" />
<workItem from="1586830459627" duration="4253000" />
<workItem from="1586927616699" duration="1790000" />
<workItem from="1587004158743" duration="26712000" />
<workItem from="1587088050691" duration="17519000" />
<workItem from="1587347151961" duration="19235000" />
</task>
<task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload">
<created>1578451117064</created>
......@@ -442,7 +462,42 @@
<option name="project" value="LOCAL" />
<updated>1585056865041</updated>
</task>
<option name="localTasksCounter" value="18" />
<task id="LOCAL-00018" summary="1.fix设备模块 生产配置&#10;2.个人信息">
<created>1585230295688</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1585230295688</updated>
</task>
<task id="LOCAL-00019" summary="1.mqtt&#10;2.日志上传模块">
<created>1585654298928</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1585654298928</updated>
</task>
<task id="LOCAL-00020" summary="1.日志上传模块&#10;2.修改数据库">
<created>1585748047095</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1585748047095</updated>
</task>
<task id="LOCAL-00021" summary="1.add日志上传模块">
<created>1586347694788</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1586347694788</updated>
</task>
<task id="LOCAL-00022" summary="1.修改渠道管理&#10;2.增加测试环境配置">
<created>1587121319426</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1587121319426</updated>
</task>
<option name="localTasksCounter" value="23" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -479,21 +534,32 @@
<MESSAGE value="1.增加页面&#10;2.系统管理大模块的修改&#10;3. 产品系列" />
<MESSAGE value="1.增加页面&#10;2.系统管理大模块的修改&#10;3.设备控制模块" />
<MESSAGE value="1.fix设备模块&#10;2.生产配置" />
<option name="LAST_COMMIT_MESSAGE" value="1.fix设备模块&#10;2.生产配置" />
<MESSAGE value="1.fix设备模块 生产配置&#10;2.个人信息" />
<MESSAGE value="1.mqtt&#10;2.日志上传模块" />
<MESSAGE value="1.日志上传模块" />
<MESSAGE value="1.日志上传模块&#10;2.修改数据库" />
<MESSAGE value="1.日志上传文件上传" />
<MESSAGE value="1.add日志上传模块" />
<MESSAGE value="1.修改渠道管理&#10;2.增加测试环境配置" />
<option name="LAST_COMMIT_MESSAGE" value="1.修改渠道管理&#10;2.增加测试环境配置" />
</component>
<component name="WindowStateProjectService">
<state x="590" y="156" key="#LogUploadApplication" timestamp="1585894479679">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="590" y="156" key="#LogUploadApplication/0.0.1920.1040@0.0.1920.1040" timestamp="1585894479679" />
<state x="552" y="178" key="#Project_Structure" timestamp="1585133454018">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="178" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1585133454018" />
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1583824373022">
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1585894458539">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583824373022" />
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1584673670733">
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1585894458539" />
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1585635266398">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1584673670733" />
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1585635266398" />
<state x="640" y="246" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog" timestamp="1582697117117">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -510,10 +576,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="703" y="356" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1583822701848" />
<state x="463" y="112" key="CommitChangelistDialog2" timestamp="1585230288165">
<state x="463" y="112" key="CommitChangelistDialog2" timestamp="1587121315998">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1585230288165" />
<state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1587121315998" />
<state x="150" y="103" key="DiffContextDialog" timestamp="1585117146381">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -522,54 +588,54 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1585025839953" />
<state width="1877" height="297" key="GridCell.Tab.0.bottom" timestamp="1585230269912">
<state width="1877" height="299" key="GridCell.Tab.0.bottom" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269912" />
<state width="1877" height="297" key="GridCell.Tab.0.center" timestamp="1585230269912">
<state width="1877" height="299" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.0.center" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269912" />
<state width="1877" height="297" key="GridCell.Tab.0.left" timestamp="1585230269912">
<state width="1877" height="299" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.0.left" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269912" />
<state width="1877" height="297" key="GridCell.Tab.0.right" timestamp="1585230269912">
<state width="1877" height="299" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.0.right" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269912" />
<state width="1877" height="297" key="GridCell.Tab.1.bottom" timestamp="1585230269913">
<state width="1877" height="299" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.1.bottom" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269913" />
<state width="1877" height="297" key="GridCell.Tab.1.center" timestamp="1585230269913">
<state width="1877" height="299" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.1.center" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269913" />
<state width="1877" height="297" key="GridCell.Tab.1.left" timestamp="1585230269913">
<state width="1877" height="299" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.1.left" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269913" />
<state width="1877" height="297" key="GridCell.Tab.1.right" timestamp="1585230269913">
<state width="1877" height="299" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.1.right" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269913" />
<state width="1877" height="297" key="GridCell.Tab.2.bottom" timestamp="1585230269913">
<state width="1877" height="299" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.2.bottom" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269913" />
<state width="1877" height="297" key="GridCell.Tab.2.center" timestamp="1585230269913">
<state width="1877" height="299" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.2.center" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269913" />
<state width="1877" height="297" key="GridCell.Tab.2.left" timestamp="1585230269913">
<state width="1877" height="299" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.2.left" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269913" />
<state width="1877" height="297" key="GridCell.Tab.2.right" timestamp="1585230269913">
<state width="1877" height="299" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state width="1877" height="299" key="GridCell.Tab.2.right" timestamp="1587121326779">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="297" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1585230269913" />
<state width="1877" height="299" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1587121326779" />
<state x="490" y="175" key="Maven.ArtifactSearchDialog" timestamp="1583320014926">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -578,34 +644,38 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="600" y="217" key="NewModule_or_Project.wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1582699806601" />
<state x="438" y="166" width="1352" height="708" key="SettingsEditor" timestamp="1585203134051">
<state x="438" y="166" width="1352" height="708" key="SettingsEditor" timestamp="1586417305565">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="438" y="166" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1585203134051" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1585056867102">
<state x="438" y="166" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1586417305565" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1587121320768">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1585056867102" />
<state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1583724603426">
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1587121320768" />
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1585818529449">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1583724603426" />
<state width="968" height="528" key="XDebugger.FullValuePopup/0.0.1920.1040@0.0.1920.1040" timestamp="1585818529449" />
<state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1585564640710">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1920.1040@0.0.1920.1040" timestamp="1585564640710" />
<state x="690" y="284" key="extract.method.dialog" timestamp="1584010366958">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="690" y="284" key="extract.method.dialog/0.0.1920.1040@0.0.1920.1040" timestamp="1584010366958" />
<state x="636" y="253" width="659" height="534" key="find.popup" timestamp="1585209389354">
<state x="636" y="253" width="659" height="534" key="find.popup" timestamp="1587380184212">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="636" y="253" width="659" height="534" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1585209389354" />
<state x="636" y="253" width="659" height="534" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1587380184212" />
<state x="511" y="210" key="new project wizard" timestamp="1583318693876">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583318693876" />
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1585209477222">
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1587373120148">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1585209477222" />
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1587373120148" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -616,15 +686,30 @@
<option name="timeStamp" value="3" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-core/5.0.9.RELEASE/spring-security-core-5.0.9.RELEASE-sources.jar!/org/springframework/security/authentication/dao/DaoAuthenticationProvider.java</url>
<line>75</line>
<option name="timeStamp" value="10" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java</url>
<line>166</line>
<line>180</line>
<option name="timeStamp" value="17" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/system/SystemController.java</url>
<line>359</line>
<option name="timeStamp" value="18" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/springframework/security/spring-security-web/5.0.9.RELEASE/spring-security-web-5.0.9.RELEASE-sources.jar!/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilter.java</url>
<line>211</line>
<option name="timeStamp" value="29" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/springframework/security/oauth/spring-security-oauth2/2.0.15.RELEASE/spring-security-oauth2-2.0.15.RELEASE-sources.jar!/org/springframework/security/oauth2/client/filter/OAuth2ClientAuthenticationProcessingFilter.java</url>
<line>102</line>
<option name="timeStamp" value="31" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$MAVEN_REPOSITORY$/org/springframework/security/oauth/spring-security-oauth2/2.0.15.RELEASE/spring-security-oauth2-2.0.15.RELEASE-sources.jar!/org/springframework/security/oauth2/provider/token/RemoteTokenServices.java</url>
<line>102</line>
<option name="timeStamp" value="32" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/BaseMqttBean.java
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
/**
* @ClassName BaseMqttBean
* @Author zzrdark
* @Date 2020-04-16 21:01
* @Description TODO
**/
@Data
public class BaseMqttBean {
String command;
private String command;
String serialNum;
private String serialNum;
String imei;
private String imei;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/CleanLogBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName CleanLogBean
* @Author zzrdark
* @Date 2020-04-20 17:37
* @Description B2协议
**/
@Data
public class CleanLogBean extends BaseMqttBean {
private Date time;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/DeviceBehaviorBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName DeviceBehavior
* @Author zzrdark
* @Date 2020-04-20 16:56
* @Description A3协议
**/
@Data
public class DeviceBehaviorBean extends BaseMqttBean {
private String activeStatus;
private Date time;
private Date activeTime;
private String operation;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/DeviceLogStartBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName DeviceLogStartBean
* @Author zzrdark
* @Date 2020-04-20 18:16
* @Description B6协议
**/
@Data
public class DeviceLogStartBean extends BaseMqttBean {
private String logAcceptId;
private Date time;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/DeviceLogStopBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName DeviceLogStopBean
* @Author zzrdark
* @Date 2020-04-20 18:18
* @Description B7协议
**/
@Data
public class DeviceLogStopBean {
private String logAcceptId;
private Date time;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/DeviceRebootBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName DeviceRebootBean
* @Author zzrdark
* @Date 2020-04-20 17:47
* @Description B3协议
**/
@Data
public class DeviceRebootBean extends BaseMqttBean {
private Date time;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/LogSettingBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName LogSettingBean
* @Author zzrdark
* @Date 2020-04-20 18:02
* @Description B5协议
**/
@Data
public class LogSettingBean {
private Date time;
private Integer mobileLogSize;
private Integer modemLogSize;
private Integer networkLogSize;
private Integer GPSLogSize;
private String saveLocation;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/MobileNetworkSwitchBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName MobileNetworkBean
* @Author zzrdark
* @Date 2020-04-20 18:25
* @Description B8协议
**/
@Data
public class MobileNetworkSwitchBean extends BaseMqttBean {
private Date time;
private String operation;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/ReductionDeviceBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName ReductionDevice
* @Author zzrdark
* @Date 2020-04-20 17:52
* @Description B4协议
**/
@Data
public class ReductionDeviceBean extends BaseMqttBean {
private Date time;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/RemoteControl.java → cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/RemoteControlBean.java
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
/**
* @ClassName RemoteControl
* @Author zzrdark
* @Date 2020-04-16 20:53
* @Description TODO
* @Description B1协议
**/
@Data
public class RemoteControlBean extends BaseMqttBean{
public class RemoteControl extends BaseMqttBean{
String shell;
private String shell;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/UploadInformationDeviceBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName UploadInformationDevice
* @Author zzrdark
* @Date 2020-04-20 16:24
* @Description A1协议
**/
@Data
public class UploadInformationDeviceBean extends BaseMqttBean {
private String iccid;
private String versionNum;
private String activeStatus;
private Date time;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/UserActivationDeviceBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName UserActivationDevice
* @Author zzrdark
* @Date 2020-04-20 16:52
* @Description A2协议
**/
@Data
public class UserActivationDeviceBean extends BaseMqttBean {
private String activeStatus;
private Date activeTime;
private String versionNum;
private Date time;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/UserBaseDataBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName UserBaseData
* @Author zzrdark
* @Date 2020-04-20 17:18
* @Description TODO
**/
@Data
public class UserBaseDataBean extends BaseMqttBean {
private String iccid;
private Date time;
}
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/mqtt/bean/WiFiSwitchBean.java 0 → 100644
package com.mx.cneeds.server.user.mqtt.bean;
import lombok.Data;
import java.util.Date;
/**
* @ClassName WiFiSwitchBean
* @Author zzrdark
* @Date 2020-04-20 18:33
* @Description B9协议
**/
@Data
public class WiFiSwitchBean extends BaseMqttBean {
private Date time;
private String operation;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment