Skip to content

C
cneeds-server
Commit bbb9fd9e by zzrdark
Options

1.修复 7198 7251

parent 993f725b
Showing with 1194 additions and 96 deletions
.idea/compiler.xml
......@@ -11,12 +11,12 @@
<module name="cneeds-common-utils" />
<module name="cneeds-common-data" />
<module name="cneeds-server-eureka" />
<module name="cneeds-common-hadoop-dfs" />
<module name="cneeds-common-pojo" />
<module name="cneeds-server-device_activate" />
<module name="cneeds-server-logupload" />
<module name="cneeds-server-authorization" />
<module name="cneeds-server-user" />
<module name="cneeds-server-logupload" />
<module name="cneeds-common-hadoop-dfs" />
<module name="cneeds-server-device" />
</profile>
</annotationProcessing>
......
.idea/leetcode/editor.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="LeetcodeEditor">
<option name="projectConfig">
<map>
<entry key="$USER_HOME$/AppData/Local/Temp/leetcode/editor/cn/[1]两数之和.java">
<value>
<LeetcodeEditor>
<option name="path" value="$USER_HOME$/AppData/Local/Temp/leetcode/editor/cn/[1]两数之和.java" />
<option name="questionId" value="1" />
</LeetcodeEditor>
</value>
</entry>
<entry key="$USER_HOME$/AppData/Local/Temp/leetcode/editor/cn/[2]两数相加.java">
<value>
<LeetcodeEditor>
<option name="path" value="$USER_HOME$/AppData/Local/Temp/leetcode/editor/cn/[2]两数相加.java" />
<option name="questionId" value="2" />
</LeetcodeEditor>
</value>
</entry>
</map>
</option>
</component>
</project>
\ No newline at end of file
.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.netty websocket 模块">
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/css/chunk-19adc003.9d63d053.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/app.31e1b5d6.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-19adc003.dd20cd1f.js" afterDir="false" />
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.add 产线上传 查询产线数据">
<change afterPath="$PROJECT_DIR$/.idea/leetcode/editor.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/0/f/0f846b31ca075cea150a1164a269febb2e94d3ef" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/2/6/26748573f7adb67a99e6f19dccf9ec93c8f6b200" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/3/7/37104f6cfa2fd072028699970aac712ed1742370" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/5/1/51ae46e4d4b61b83209244512f2052b12c27cfd3" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/8/6/867d4da6be62b547c36d573132c7c69049aff577" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/d/b/dbdd4cf95b6a44fd946821123d041ac236e05c4d" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/e/1/e1a0b505acf09d2635ce37a1ad46d831fab19d36" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" 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/DeviceInfoEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/DeviceInfoDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceInfoDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DeviceInfoDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceInfoVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceInfoVo.java" 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-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/wechat/WechatController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/wechat/WechatController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/json/WechatJsonMessage.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/json/WechatJsonMessage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageRequest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageResponse.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/message/pojo/wechat/WechatMessageResponse.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/app.cd456023.js" beforeDir="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-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/LogFlieController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/LogFlieController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/codec/MessageToWebSocketEncoder.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/codec/MessageToWebSocketEncoder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/config/NettyChannelManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/config/NettyChannelManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceChannelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceChannelController.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-logupload/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-logupload/src/main/resources/application.yml" 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.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
......@@ -115,7 +112,7 @@
<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="preferences.pluginManager" />
<property name="settings.editor.selected.configurable" value="bigdataide_conn_settings" />
<property name="settings.editor.splitter.proportion" value="0.20898877" />
</component>
<component name="RecentsManager">
......@@ -151,7 +148,7 @@
<select />
</treeState>
</component>
<component name="RunManager" selected="Spring Boot.DeviceApplication">
<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" />
......@@ -417,14 +414,17 @@
<workItem from="1593653979285" duration="17198000" />
<workItem from="1593741949055" duration="4797000" />
<workItem from="1594004568927" duration="6634000" />
<workItem from="1594102134824" duration="1918000" />
</task>
<task id="LOCAL-00003" summary="1.add 依赖 common-io">
<created>1578576270648</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1578576270648</updated>
<workItem from="1594102134824" duration="3809000" />
<workItem from="1594177914907" duration="8088000" />
<workItem from="1594260745177" duration="3765000" />
<workItem from="1594294066327" duration="88000" />
<workItem from="1594346229289" duration="8558000" />
<workItem from="1594607180064" duration="566000" />
<workItem from="1594607762707" duration="628000" />
<workItem from="1594690167610" duration="582000" />
<workItem from="1594696698323" duration="598000" />
<workItem from="1594709307156" duration="2266000" />
<workItem from="1594711598182" duration="8165000" />
</task>
<task id="LOCAL-00004" summary="添加数据库表文档">
<created>1583218011528</created>
......@@ -762,7 +762,14 @@
<option name="project" value="LOCAL" />
<updated>1593343266600</updated>
</task>
<option name="localTasksCounter" value="52" />
<task id="LOCAL-00052" summary="1.add 产线上传 查询产线数据">
<created>1594109117998</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1594109117998</updated>
</task>
<option name="localTasksCounter" value="53" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -813,7 +820,6 @@
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="1.fix DeviceLog" />
<MESSAGE value="1.add logging&#10;2.增加 查询设备信息" />
<MESSAGE value="1.日志更改&#10;2.修改前端代码&#10;3.更改黑白名单编码&#10;4.增加logMedia 的fileSize" />
<MESSAGE value="修改bug 设备可以添加多个相同的IMEI 产品系列可以添加多个相同的系列" />
......@@ -838,13 +844,10 @@
<MESSAGE value="1.修改渠道号统计模块Bug" />
<MESSAGE value="1.netty websocket 模块" />
<MESSAGE value="1. 修改netty websocket 模块&#10;2. 修复渠道号管理" />
<option name="LAST_COMMIT_MESSAGE" value="1. 修改netty websocket 模块&#10;2. 修复渠道号管理" />
<MESSAGE value="1.add 产线上传 查询产线数据" />
<option name="LAST_COMMIT_MESSAGE" value="1.add 产线上传 查询产线数据" />
</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="1592914381569">
<screen x="0" y="0" width="1920" height="1040" />
</state>
......@@ -865,106 +868,114 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="598" y="445" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1592897576506" />
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2" timestamp="1594108919055">
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2" timestamp="1594351435004">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1594108919055" />
<state x="150" y="103" key="DiffContextDialog" timestamp="1594108901013">
<state x="463" y="112" width="953" height="816" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1594351435004" />
<state x="150" y="103" key="DiffContextDialog" timestamp="1594351433899">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="150" y="103" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594108901013" />
<state x="150" y="103" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594351433899" />
<state x="740" y="275" key="FileChooserDialogImpl" timestamp="1588922129570">
<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="1588922129570" />
<state width="1877" height="278" key="GridCell.Tab.0.bottom" timestamp="1593773130220">
<state width="1699" height="262" key="GridCell.Tab.0.bottom" timestamp="1594378518803">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1699" height="262" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1594378518803" />
<state width="1699" height="262" key="GridCell.Tab.0.center" timestamp="1594378518803">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="278" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1593773130220" />
<state width="1877" height="278" key="GridCell.Tab.0.center" timestamp="1593773130220">
<state width="1699" height="262" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1594378518803" />
<state width="1699" height="262" key="GridCell.Tab.0.left" timestamp="1594378518803">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="278" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1593773130220" />
<state width="1877" height="278" key="GridCell.Tab.0.left" timestamp="1593773130220">
<state width="1699" height="262" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1594378518803" />
<state width="1699" height="262" key="GridCell.Tab.0.right" timestamp="1594378518803">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="278" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1593773130220" />
<state width="1877" height="278" key="GridCell.Tab.0.right" timestamp="1593773130220">
<state width="1699" height="262" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1594378518803" />
<state width="1340" height="287" key="GridCell.Tab.1.bottom" timestamp="1594213942323">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="278" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1593773130220" />
<state width="1877" height="305" key="GridCell.Tab.1.bottom" timestamp="1593697471153">
<state width="1340" height="287" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1594213942323" />
<state width="1340" height="287" key="GridCell.Tab.1.center" timestamp="1594213942323">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="305" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.1.center" timestamp="1593697471153">
<state width="1340" height="287" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1594213942323" />
<state width="1340" height="287" key="GridCell.Tab.1.left" timestamp="1594213942322">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="305" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.1.left" timestamp="1593697471153">
<state width="1340" height="287" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1594213942322" />
<state width="1340" height="287" key="GridCell.Tab.1.right" timestamp="1594213942323">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="305" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.1.right" timestamp="1593697471153">
<state width="1340" height="287" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1594213942323" />
<state width="1340" height="287" key="GridCell.Tab.2.bottom" timestamp="1594213942323">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="305" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.2.bottom" timestamp="1593697471153">
<state width="1340" height="287" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1594213942323" />
<state width="1340" height="287" key="GridCell.Tab.2.center" timestamp="1594213942323">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="305" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.2.center" timestamp="1593697471153">
<state width="1340" height="287" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1594213942323" />
<state width="1340" height="287" key="GridCell.Tab.2.left" timestamp="1594213942323">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="305" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.2.left" timestamp="1593697471153">
<state width="1340" height="287" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1594213942323" />
<state width="1340" height="287" key="GridCell.Tab.2.right" timestamp="1594213942323">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="305" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state width="1877" height="305" key="GridCell.Tab.2.right" timestamp="1593697471153">
<state width="1340" height="287" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1594213942323" />
<state x="459" y="267" key="IDE.errors.dialog" timestamp="1594362483788">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="1877" height="305" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1593697471153" />
<state x="438" y="166" width="1352" height="708" key="SettingsEditor" timestamp="1591693189478">
<state x="459" y="267" key="IDE.errors.dialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594362483788" />
<state x="513" y="230" key="NewModule_or_Project.wizard" timestamp="1594354844978">
<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="1591693189478" />
<state x="681" y="261" width="540" height="524" key="StructurePopup" timestamp="1594032962346">
<state x="513" y="230" key="NewModule_or_Project.wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1594354844978" />
<state x="253" y="151" width="1352" height="708" key="SettingsEditor" timestamp="1594712598376">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="681" y="261" width="540" height="524" key="StructurePopup/0.0.1920.1040@0.0.1920.1040" timestamp="1594032962346" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1593343268370">
<state x="253" y="151" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1594712598376" />
<state x="681" y="261" width="582" height="524" key="StructurePopup" timestamp="1594720994895">
<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="1593343268370" />
<state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1585818529449">
<state x="681" y="261" width="582" height="524" key="StructurePopup/0.0.1920.1040@0.0.1920.1040" timestamp="1594720994895" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1594109119773">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<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">
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1594109119773" />
<state x="634" y="377" key="cloudConfig.SelfSettingsDialog" timestamp="1594712301243">
<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="634" y="377" key="cloudConfig.SelfSettingsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1594712301243" />
<state x="92" y="92" width="1736" height="856" key="dock-window-1" timestamp="1589447713987">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="92" y="92" width="1736" height="856" key="dock-window-1/0.0.1920.1040@0.0.1920.1040" timestamp="1589447713987" />
<state x="636" y="253" width="786" height="600" key="find.popup" timestamp="1591705280055">
<state x="636" y="253" width="836" height="600" key="find.popup" timestamp="1594351618627">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="636" y="253" width="786" height="600" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1591705280055" />
<state x="636" y="253" width="836" height="600" key="find.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1594351618627" />
<state x="511" y="210" key="new project wizard" timestamp="1587463523363">
<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="1587463523363" />
<state x="389" y="259" key="org.sonarlint.intellij.config.global.wizard.SQServerWizard$SonarQubeWizard" timestamp="1594712080355">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="389" y="259" key="org.sonarlint.intellij.config.global.wizard.SQServerWizard$SonarQubeWizard/0.0.1920.1040@0.0.1920.1040" timestamp="1594712080355" />
<state x="616" y="240" key="run.anything.popup" timestamp="1588144418613">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="616" y="240" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1588144418613" />
<state x="72" y="301" width="672" height="676" key="search.everywhere.popup" timestamp="1594039843081">
<state x="72" y="301" width="672" height="676" key="search.everywhere.popup" timestamp="1594361316807">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="72" y="301" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1594039843081" />
<state x="72" y="301" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1594361316807" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......
cneeds-common-data/db/cneeds_server.sql
......@@ -352,4 +352,11 @@ ADD COLUMN `ca_certificate_status` varchar(255) COMMENT 'ca证书状态 -1 未
ALTER TABLE `cneeds_server`.`device_info`
CHANGE COLUMN `status` `active_status` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci
DEFAULT NULL COMMENT '状态0未激活，1已激活' AFTER `iccid`;
\ No newline at end of file
DEFAULT NULL COMMENT '状态0未激活，1已激活' AFTER `iccid`;
-- 2020-07-14
ALTER TABLE `cneeds_server`.`device_info`
MODIFY COLUMN `active_status` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT 0 COMMENT '状态0未激活，1已激活' AFTER `iccid`,
MODIFY COLUMN `channel_rules` int(255) DEFAULT 1 COMMENT '0:白名单，1:黑名单' AFTER `channel_nums_message`,
MODIFY COLUMN `ca_certificate_status` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT -1 COMMENT 'ca证书状态 -1 未下载，0 已下载 类型：非量产 1 已下载 类型：量产，2 已下载 类型：非量产，未验证 3 已下载 类型：量产，未验证' AFTER `sn`;
\ No newline at end of file
cneeds-server-authorization/src/main/resources/application.yml
spring:
profiles:
active: prod
active: dev
application:
name: cneeds-server-authorization
server:
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java
......@@ -52,7 +52,7 @@ public class DeviceController {
try {
deviceInfoDto = deviceClient.queryDeviceByImei(imei);
if (deviceInfoDto == null){
log.debug("ResultCode:"+ResultCode.NOTFOUND_IMEI);
// log.debug("ResultCode:"+ResultCode.NOTFOUND_IMEI);
return R.error(ResultCode.NOTFOUND_IMEI,"没有该imei的设备");
}
}catch (Exception e) {
......@@ -307,6 +307,11 @@ public class DeviceController {
return R.ok().put("data",deviceChannelDtos);
}
/**
* 删除(还原)设置的渠道号
* @param deviceId
* @return
*/
@PreAuthorize("hasRole('configManagement:deviceChannel:delete') or hasRole('admin')")
@PostMapping("/deviceChannel/deleteSettingDeviceChannel")
public R deleteSettingDeviceChannel(Long deviceId){
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/LogFlieController.java
......@@ -125,13 +125,13 @@ public class LogFlieController {
DeviceInfoDto deviceInfoDto = deviceClient.queryDeviceByImei(dto.getImei());
if (deviceInfoDto == null){
log.debug("ResultCode: "+ResultCode.NOTFOUND_IMEI);
// log.debug("ResultCode: "+ResultCode.NOTFOUND_IMEI);
return R.error(ResultCode.NOTFOUND_IMEI,"没有该imei");
}
DeviceLogDto deviceLogDto = logFileClient.queryLogFileByLogAcceptId(vo.getLogAcceptId());
if ( deviceLogDto == null ){
log.debug("ResultCode: "+ResultCode.NOTFOUNDLOG);
// log.debug("ResultCode: "+ResultCode.NOTFOUNDLOG);
return R.error(ResultCode.NOTFOUNDLOG,"没找到对应的Log日志信息");
}
return R.ok();
......@@ -147,13 +147,13 @@ public class LogFlieController {
DeviceInfoDto deviceInfoDto = deviceClient.queryDeviceByImei(dto.getImei());
if (deviceInfoDto == null){
log.debug("ResultCode: "+ResultCode.NOTFOUND_IMEI);
// log.debug("ResultCode: "+ResultCode.NOTFOUND_IMEI);
return R.error(ResultCode.NOTFOUND_IMEI,"没有该imei");
}
DeviceLogDto deviceLogDto = logFileClient.queryLogFileByLogAcceptId(vo.getLogAcceptId());
if ( deviceLogDto == null ){
log.debug("ResultCode: "+ResultCode.NOTFOUNDLOG);
// log.debug("ResultCode: "+ResultCode.NOTFOUNDLOG);
return R.error(ResultCode.NOTFOUNDLOG,"没找到对应的Log日志信息");
}
......
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/common/codec/MessageToWebSocketEncoder.java
package com.mx.cneeds.server.wechat.common.codec;
import com.alibaba.fastjson.JSON;
import com.mx.cneeds.server.wechat.websocket.config.NettyChannelManager;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageEncoder;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
......@@ -19,7 +20,7 @@ public class MessageToWebSocketEncoder extends MessageToMessageEncoder<Invocatio
@Override
protected void encode(ChannelHandlerContext ctx, Invocation invocation, List<Object> list) throws Exception {
// String toJsonString = JSON.toJSONString(invocation.getMessage());
log.debug("发出一条消息({})",invocation.getMessage());
log.debug("用户：["+ctx.channel().attr(NettyChannelManager.CHANNEL_ATTR_KEY_USER).get() + "]发出一条消息({})",invocation.getMessage());
list.add(new TextWebSocketFrame(invocation.getMessage()));
}
}
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/wechat/websocket/config/NettyChannelManager.java
......@@ -23,7 +23,7 @@ public class NettyChannelManager {
/**
* {@link Channel#attr(AttributeKey)} 属性中，表示 Channel 对应的用户
*/
private static final AttributeKey<String> CHANNEL_ATTR_KEY_USER = AttributeKey.newInstance("user");
public static final AttributeKey<String> CHANNEL_ATTR_KEY_USER = AttributeKey.newInstance("user");
private Logger logger = LoggerFactory.getLogger(getClass());
......@@ -91,11 +91,13 @@ public class NettyChannelManager {
// 获得用户对应的 Channel
Channel channel = userChannels.get(user);
if (channel == null) {
logger.error("[send][连接不存在]");
logger.debug("[send]用户：["+user+"][连接不存在]");
logger.error("[send]用户：["+user+"][连接不存在]");
return;
}
if (!channel.isActive()) {
logger.error("[send][连接({})未激活]", channel.id());
logger.debug("[send]用户：["+user+"][连接({})未激活]", channel.id());
logger.error("[send]用户：["+user+"][连接({})未激活]", channel.id());
return;
}
......
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceChannelController.java
......@@ -135,6 +135,7 @@ public class DeviceChannelController {
DeviceInfoEntity deviceInfoEntity = new DeviceInfoEntity();
deviceInfoEntity.setDeviceId(deviceId);
deviceInfoEntity.setChannelRules(1);
deviceInfoEntity.setChannelNumsMessage("未设置");
deviceInfoService.updateById(deviceInfoEntity);
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
stringObjectHashMap.put("device_id",deviceId);
......
cneeds-server-device/src/main/resources/application.yml
spring:
profiles:
active: prod
active: dev
application:
name: cneeds-server-device
......
cneeds-server-logupload/src/main/resources/application.yml
spring:
profiles:
active: prod
active: dev
application:
name: cneeds-server-logupload
......
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java
......@@ -54,6 +54,10 @@ public class SysUserController {
@RequestMapping("/list")
public PageUtils list(@RequestParam Map<String, Object> params){
PageUtils page = sysUserService.queryPage(params);
page.getList().forEach(sysUser -> {
// 不暴露密码
((SysUserEntity)sysUser).setPassword(null);
});
return page;
}
......@@ -64,13 +68,16 @@ public class SysUserController {
// @RequestMapping("/info/{userId}")
public R info(@PathVariable("userId") Long userId){
SysUserEntity sysUser = sysUserService.getById(userId);
// 不暴露密码
sysUser.setPassword(null);
return R.ok().put("sysUser", sysUser);
}
@PostMapping("/userinfo")
public UserDto infoByUsername(@RequestParam("username") String username){
SysUserEntity sysUser = sysUserService.queryUserByUsername(username);
// 不暴露密码
sysUser.setPassword(null);
Long roleId = sysUserRoleService.queryRoleId(sysUser.getUserId());
UserDto userDto = new UserDto();
BeanUtils.copyProperties(sysUser,userDto);
......
cneeds-server-user/src/main/resources/application.yml
spring:
profiles:
active: prod
active: dev
application:
name: cneeds-server-user
......
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