seg_yinzy
/
iotadmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

...

dev
kale 2023-05-14 18:42:01 +08:00
parent 4f38626837
commit 9dcc80d579
6 changed files with 491 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

474
pom.xml Normal file
View File

@ -0,0 +1,474 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.seginfo</groupId>
<artifactId>iot</artifactId>
<version>1.1</version>
<name>segiot</name>
<properties>
<java-version>1.8</java-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.springframework-version>4.0.1.RELEASE</org.springframework-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0</version>
</dependency>
<!-- json-lib -->
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<!-- jackson -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.7.1</version>
</dependency>
<!-- spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
<version>${org.springframework-version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<!-- spring-websocket -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-websocket</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId> spring-messaging</artifactId>
<version>${org.springframework-version}</version>
</dependency>
<!-- logging -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
<!-- slf4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.2</version>
</dependency>
<!-- log4j -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
</dependency>
<!-- mybatis -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>3.1.1</version>
</dependency>
<!-- mybatis-spring -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.4.2</version>
</dependency>
<!-- postgresql -->
<!-- <dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.1-901.jdbc4</version>
</dependency> -->
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.18</version>
</dependency>-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.22</version>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.directory.studio</groupId>
<artifactId>org.apache.commons.collections</artifactId>
<version>3.2.1</version>
</dependency>
<!-- quartz -->
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>1.8.4</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.6.11</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.14.8</version>
<scope>provided</scope>
</dependency>
<!-- dom4j -->
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.6</version>
</dependency>
<!-- dom4j -->
<!-- fileupload -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.2.2</version>
</dependency>
<!-- fileupload -->
<!-- echcache -->
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>2.10.0</version>
</dependency>
<!-- ehcache -->
<!-- 微信公众号 -->
<dependency>
<groupId>me.chanjar</groupId>
<artifactId>weixin-java-mp</artifactId>
<version>1.1.2</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.7</version>
</dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
<version>2.0</version>
</dependency>
<!-- javacv -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.12</version>
</dependency>
<dependency>
<groupId>org.jxls</groupId>
<artifactId>jxls</artifactId>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.jxls</groupId>
<artifactId>jxls-poi</artifactId>
<version>1.0.9</version>
</dependency>
<!-- mqtt依赖 开始 -->
<dependency>
<groupId>org.fusesource.mqtt-client</groupId>
<artifactId>mqtt-client</artifactId>
<version>1.12</version>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.2</version>
</dependency>
<!-- 二维码生成与解析 -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.56</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.0.3</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
</dependency>
<!--dependency>
<groupId>visual</groupId>
<artifactId>visual</artifactId>
<version>1.0.4</version>
<scope>system</scope>
<systemPath>${project.basedir}/libs/visual-1.0.4.jar</systemPath>
</dependency -->
<!-- ES HTTP 客户端 -->
<!-- <dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>6.2.2</version>
</dependency> -->
</dependencies>
<repositories>
<repository>
<id>public</id>
<name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public</url>
<!-- <url>http://maven.aliyun.com/nexus/content/groups/public/</url>-->
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<build>
<directory>./build</directory>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<excludes>
<!-- <exclude>**/log4j.properties</exclude>-->
<!--<exclude>**/config/*</exclude-->
<exclude>**/code/*.sql</exclude>
</excludes>
<includes>
<include>**/*</include>
</includes>
</resource>
<resource>
<directory>src/main/webapp</directory>
<targetPath>META-INF/resources</targetPath>
<excludes>
<exclude>WEB-INF/web.xml</exclude>
</excludes>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>${java-version}</source>
<target>${java-version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<packaging>war</packaging>
</project>

8
src/main/resources/config/config.properties
View File

@ -7,16 +7,10 @@ jdbc.defaultAutoCommit=true
#\u6D4B\u8BD5 1 #\u6D4B\u8BD5 1
#jdbc.url=jdbc:mysql://192.168.3.5:35007/easyiot?characterEncoding=utf8&serverTimezone=Asia/Shanghai #jdbc.url=jdbc:mysql://192.168.3.5:35007/easyiot?characterEncoding=utf8&serverTimezone=Asia/Shanghai
#\u6D4B\u8BD5 2
jdbc.url=jdbc:mysql://192.168.1.222:3306/easyiot?characterEncoding=utf8&serverTimezone=Asia/Shanghai
jdbc.username=easyiot jdbc.username=easyiot
# \u6D4B\u8BD5 1 # \u6D4B\u8BD5 1
#jdbc.password=easyiot jdbc.password=easyiot
#\u6D4B\u8BD5 2
jdbc.password=nnSf2aySKrt7xe6z
#\u8FDE\u63A5\u521D\u59CB\u503C\uFF0C\u8FDE\u63A5\u6C60\u542F\u52A8\u65F6\u521B\u5EFA\u7684\u8FDE\u63A5\u6570\u91CF\u7684\u521D\u59CB\u503C \u9ED8\u8BA4\u503C\u662F0 #\u8FDE\u63A5\u521D\u59CB\u503C\uFF0C\u8FDE\u63A5\u6C60\u542F\u52A8\u65F6\u521B\u5EFA\u7684\u8FDE\u63A5\u6570\u91CF\u7684\u521D\u59CB\u503C \u9ED8\u8BA4\u503C\u662F0
jdbc.initialSize=10 jdbc.initialSize=10

2
src/main/resources/config/mqtt.config.properties
View File

@ -6,5 +6,5 @@ mqtt.autoReconnect=true
mqtt.keepalive=3600 mqtt.keepalive=3600
mqtt.timeout=30 mqtt.timeout=30
mqtt.serverURI1=tcp://192.168.3.5:35883 mqtt.serverURI1=tcp://192.168.3.5:35883
mqtt.simpleURI=wss://iot.hy-ec.cn/mqtt mqtt.simpleURI=wss://iotadmin.segsvip.com/mqtt
mqtt.service.topic=/dev/coo/+,/edge/+,/sys/update/+ mqtt.service.topic=/dev/coo/+,/edge/+,/sys/update/+

19
src/main/resources/config/weixin.config.properties
View File

@ -1,24 +1,17 @@
#------------------------- mp config ------------------------- #------------------------- mp config -------------------------
#mp \u516C\u4F17\u53F7\u914D\u7F6E #mp \u516C\u4F17\u53F7\u914D\u7F6E
#weixin.mp.appid=wxcda55f09127119f9 weixin.mp.appid=wxcda55f09127119f9
#weixin.mp.appid=wxff7e4d874e52241a weixin.mp.secret=f126999b83b902b697aaee8c7128839c
weixin.mp.appid=wx00b6998a595762a0
#weixin.mp.secret=f126999b83b902b697aaee8c7128839c
#weixin.mp.secret=acb909da964498dc9b1b76c1031aaca9
weixin.mp.secret=c6700a2962dae167ef4dac3b9494357e
weixin.mp.token=iotadmin weixin.mp.token=iotadmin
#weixin.mp.aesKey=71AJPXUTBFje7YctbndixEoNrUfQxyHH56EWoRlY8Cd weixin.mp.aesKey=71AJPXUTBFje7YctbndixEoNrUfQxyHH56EWoRlY8Cd
#weixin.mp.aesKey=7MhltzJjl4J7E9YbY5lk3azXBx4LmuZX9Cl7lkLyaH5
weixin.mp.aesKey=o0EXvGbPWG4F24WiibiiUw0Sn7su3FrOfOjNg9i3JFL
#mch \u5546\u6237 \u4FE1\u606F #mch \u5546\u6237 \u4FE1\u606F
weixin.mp.mch.id=1523933151 weixin.mp.mch.id=1523933151
weixin.mp.mch.key= weixin.mp.mch.key=
#\u8BF7\u6C42URL #\u8BF7\u6C42URL
#local.domain=https://iotadmin.segsvip.com local.domain=https://iotadmin.segsvip.com
local.domain=https://iot.hy-ec.cn
# #
# local.domain=http://127.0.0.1:8080/lpro # local.domain=http://127.0.0.1:8080/lpro
@ -30,8 +23,8 @@ weixin.mp.oauth2.redirect_uri=/service/oauth2/authorize/weixin/mp
#----------------------\u5FAE\u4FE1\u6D88\u606F\u6A21\u677F\u53F7---------------------------- #----------------------\u5FAE\u4FE1\u6D88\u606F\u6A21\u677F\u53F7----------------------------
weixin.msg.tpl.NOTICE_1=2xuSdxuFrfJidejIEYSVA7nXDC0PYU2bwow0Gm90pnU weixin.msg.tpl.NOTICE_1=2xuSdxuFrfJidejIEYSVA7nXDC0PYU2bwow0Gm90pnU
weixin.msg.tpl.NOTICE_2=hjtAb8aVxzsC6c-ZpuZ47F3AC-2txpUxHOrUdewsCPU weixin.msg.tpl.NOTICE_2=
weixin.msg.tpl.NOTICE_3=JyO2orI0NMHU2wVfNnHP0jeiaR1XXLJXDJ3snNpwa9U weixin.msg.tpl.NOTICE_3=
weixin.msg.tpl.NOTICE_4= weixin.msg.tpl.NOTICE_4=
weixin.msg.tpl.NOTICE_5= weixin.msg.tpl.NOTICE_5=
weixin.msg.tpl.NOTICE_6= weixin.msg.tpl.NOTICE_6=

8
src/main/resources/log4j.properties
View File

@ -47,7 +47,7 @@ log4j.appender.CONSOLE.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
#FileAppender #FileAppender
log4j.appender.LOG_FILE=org.apache.log4j.RollingFileAppender log4j.appender.LOG_FILE=org.apache.log4j.RollingFileAppender
log4j.appender.LOG_FILE.Threshold=DEBUG log4j.appender.LOG_FILE.Threshold=DEBUG
log4j.appender.LOG_FILE.File=/data/hyiot/logs/hyiot.log log4j.appender.LOG_FILE.File=/data/lpro/logs/lpro.log
log4j.appender.LOG_FILE.MaxFileSize=4096KB log4j.appender.LOG_FILE.MaxFileSize=4096KB
log4j.appender.LOG_FILE.Append=true log4j.appender.LOG_FILE.Append=true
log4j.appender.LOG_FILE.MaxBackupIndex=40 log4j.appender.LOG_FILE.MaxBackupIndex=40
@ -59,7 +59,7 @@ log4j.appender.LOG_FILE.layout.ConversionPattern=%d %p [%t] %C.%M(%F:%L) - %m%n
# SQL\u65E5\u5FD7 # SQL\u65E5\u5FD7
log4j.logger.sql=DEBUG,sql log4j.logger.sql=DEBUG,sql
log4j.appender.sql=org.apache.log4j.DailyRollingFileAppender log4j.appender.sql=org.apache.log4j.DailyRollingFileAppender
log4j.appender.sql.File=/data/hyiot/logs/sql.log log4j.appender.sql.File=/data/lpro/logs/sql.log
log4j.appender.sql.DatePattern='_'yyyy-MM-dd'.log' log4j.appender.sql.DatePattern='_'yyyy-MM-dd'.log'
log4j.appender.sql.layout=org.apache.log4j.PatternLayout log4j.appender.sql.layout=org.apache.log4j.PatternLayout
log4j.appender.sql.layout.ConversionPattern=%d %p [%c %L %l] - %m%n log4j.appender.sql.layout.ConversionPattern=%d %p [%c %L %l] - %m%n
@ -68,7 +68,7 @@ log4j.additivity.sql=false
#\u5176\u4ED6\u884C\u4E3A\u7684\u65E5\u5FD7\u6587\u4EF6\uFF0C\u5982\u652F\u4ED8\u8BB0\u5F55\u7B49 #\u5176\u4ED6\u884C\u4E3A\u7684\u65E5\u5FD7\u6587\u4EF6\uFF0C\u5982\u652F\u4ED8\u8BB0\u5F55\u7B49
log4j.logger.other=DEBUG,other log4j.logger.other=DEBUG,other
log4j.appender.other=org.apache.log4j.DailyRollingFileAppender log4j.appender.other=org.apache.log4j.DailyRollingFileAppender
log4j.appender.other.File=/data/hyiot/logs/other.log log4j.appender.other.File=/data/lpro/logs/other.log
log4j.appender.other.DatePattern='_'yyyy-MM-dd'.log' log4j.appender.other.DatePattern='_'yyyy-MM-dd'.log'
log4j.appender.other.layout=org.apache.log4j.PatternLayout log4j.appender.other.layout=org.apache.log4j.PatternLayout
log4j.appender.other.layout.ConversionPattern=%d %p %C.%M(%F:%L) - %m%n log4j.appender.other.layout.ConversionPattern=%d %p %C.%M(%F:%L) - %m%n
@ -79,7 +79,7 @@ log4j.additivity.other=false
#\u5176\u4ED6\u884C\u4E3A\u7684\u65E5\u5FD7\u6587\u4EF6\uFF0C\u5982\u652F\u4ED8\u8BB0\u5F55\u7B49 #\u5176\u4ED6\u884C\u4E3A\u7684\u65E5\u5FD7\u6587\u4EF6\uFF0C\u5982\u652F\u4ED8\u8BB0\u5F55\u7B49
log4j.logger.debug=DEBUG, debug log4j.logger.debug=DEBUG, debug
log4j.appender.debug=org.apache.log4j.DailyRollingFileAppender log4j.appender.debug=org.apache.log4j.DailyRollingFileAppender
log4j.appender.debug.File=/data/hyiot/logs/debug.log log4j.appender.debug.File=/data/lpro/logs/debug.log
log4j.appender.debug.DatePattern='_'yyyy-MM-dd'.log' log4j.appender.debug.DatePattern='_'yyyy-MM-dd'.log'
log4j.appender.debug.layout=org.apache.log4j.PatternLayout log4j.appender.debug.layout=org.apache.log4j.PatternLayout
log4j.appender.debug.layout.ConversionPattern=%d %p %C.%M(%F:%L) - %m%n log4j.appender.debug.layout.ConversionPattern=%d %p %C.%M(%F:%L) - %m%n

5
src/main/webapp/WEB-INF/oss/iot/index.jsp
View File

@ -119,6 +119,11 @@
<a lay-href="<%=basePath%>/service/iot/device_list"> <a lay-href="<%=basePath%>/service/iot/device_list">
<i class="layui-icon layui-icon-right"></i> 列表监控</a> <i class="layui-icon layui-icon-right"></i> 列表监控</a>
</dd> </dd>
<dd data-name="button2">
<a lay-href="<%=basePath%>/service/iot/visual_list">
<i class="layui-icon layui-icon-right"></i> 组态监控</a>
</dd>
<dd data-name="nav"> <dd data-name="nav">
<a lay-href="<%=basePath%>/page/hkvideo/index.html"> <a lay-href="<%=basePath%>/page/hkvideo/index.html">
<i class="layui-icon layui-icon-right"></i>视频监控</a> <i class="layui-icon layui-icon-right"></i>视频监控</a>