update README.md.

Merge pull request !36 from xxmfl/master

.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -1,13 +0,0 @@
-### 该问题是怎么引起的？
-
-
-
-### 重现步骤
-
-
-
-### 报错信息
-
-
-
-

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

@@ -1,14 +0,0 @@
-### 相关的Issue
-
-
-### 原因（目的、解决的问题等）
-
-
-### 描述（做了什么，变更了什么）
-
-
-### 测试用例（新增、改动、可能影响的功能）
-
-
-
-

.workflow/pipeline-docker.yml

@@ -0,0 +1,95 @@
+version: '1.0'
+name: pipeline-docker
+displayName: 构建镜像
+triggers:
+  trigger: auto
+  push:
+    branches:
+      precise:
+        - master
+    commitMessages:
+      include:
+        - ^deploy-docker
+stages:
+  - name: stage-5ecf171c
+    displayName: 项目打包
+    strategy: naturally
+    trigger: auto
+    executor:
+      - kerwincui
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建后端
+        jdkVersion: '8'
+        mavenVersion: 3.6.1
+        commands:
+          - cd ./springboot
+          - mvn -B clean package -Dmaven.test.skip=true
+        artifacts:
+          - name: BUILD_JAVA
+            path:
+              - ./springboot/wumei-admin/target/wumei-admin.jar
+        settings: []
+        strategy:
+          retry: '0'
+      - step: build@nodejs
+        name: build_nodejs
+        displayName: Nodejs 构建前端
+        nodeVersion: 14.16.0
+        commands:
+          - cd ./vue
+          - npm install --registry=https://registry.npm.taobao.org \
+          - '&& rm -rf ./dist && npm run build:prod'
+        artifacts:
+          - name: BUILD_VUE
+            path:
+              - ./vue/dist
+        strategy:
+          retry: '0'
+  - name: stage-f5631c9e
+    displayName: 上传打包文件
+    strategy: naturally
+    trigger: auto
+    executor:
+      - kerwincui
+    steps:
+      - step: publish@general_artifacts
+        name: publish_general_artifacts_java
+        displayName: 上传后端制品
+        dependArtifact: BUILD_JAVA
+        artifactName: springboot
+        strategy:
+          retry: '0'
+      - step: publish@general_artifacts
+        name: publish_general_artifacts_vue
+        displayName: 上传前端制品
+        dependArtifact: BUILD_VUE
+        artifactName: vue
+        strategy:
+          retry: '0'
+  - name: stage-59a550ac
+    displayName: 构建镜像
+    strategy: naturally
+    trigger: auto
+    executor:
+      - kerwincui
+    steps:
+      - step: build@docker
+        name: build_docker
+        displayName: 镜像构建
+        type: cert
+        certificate: kerwincui-docker
+        tag: kerwincui/wumei-smart:1.01
+        dockerfile: ./docker/Dockerfile
+        context: ./docker
+        artifacts:
+          - ${BUILD_JAVA}
+          - ${BUILD_VUE}
+        isCache: true
+        strategy:
+          retry: '0'
+permissions:
+  - role: admin
+    members:
+      - kerwincui

.workflow/pipeline-java.yml

@@ -0,0 +1,64 @@
+version: '1.0'
+name: pipeline-java
+displayName: 部署后端
+triggers:
+  trigger: auto
+  push:
+    branches:
+      precise:
+        - master
+    commitMessages:
+      include:
+        - ^deploy-server
+stages:
+  - name: stage-2c3f9607
+    displayName: 构建后端
+    strategy: naturally
+    trigger: auto
+    executor:
+      - kerwincui
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        jdkVersion: '8'
+        mavenVersion: 3.6.1
+        commands:
+          - cd ./springboot
+          - mvn -B clean package -Dmaven.test.skip=true
+        artifacts:
+          - name: BUILD_JAVA
+            path:
+              - ./springboot/wumei-admin/target/wumei-admin.jar
+        settings: []
+        strategy:
+          retry: '0'
+  - name: stage-b6625c4a
+    displayName: 部署后端
+    strategy: naturally
+    trigger: auto
+    executor:
+      - kerwincui
+    steps:
+      - step: deploy@agent
+        name: deploy_agent
+        displayName: 主机部署
+        hostGroupID: alicloud
+        deployArtifact:
+          - source: build
+            name: springboot
+            target: ~/gitee_go/deploy
+            dependArtifact: BUILD_JAVA
+        script: |-
+          # 请在此输入部署脚本，如启动Java应用如下
+          # nohup java -jar test.jar > nohup.out &
+           echo 'Hello Gitee!'
+           touch springboot
+        strategy:
+          retry: '0'
+strategy:
+  blocking: true
+permissions:
+  - role: admin
+    members:
+      - kerwincui

.workflow/pipeline-vue.yml

@@ -0,0 +1,60 @@
+version: '1.0'
+name: pipeline-vue
+displayName: 部署前端
+triggers:
+  trigger: auto
+  push:
+    branches:
+      precise:
+        - master
+    commitMessages:
+      include:
+        - ^deploy-vue
+stages:
+  - name: stage-3761fd9a
+    displayName: 构建前端
+    strategy: naturally
+    trigger: auto
+    executor:
+      - kerwincui
+    steps:
+      - step: build@nodejs
+        name: build_nodejs
+        displayName: Nodejs 构建
+        nodeVersion: 14.16.0
+        commands:
+          - cd ./vue
+          - npm install --registry=https://registry.npm.taobao.org \
+          - '&& rm -rf ./dist && npm run build:prod'
+        artifacts:
+          - name: BUILD_VUE
+            path:
+              - ./vue/dist
+        strategy:
+          retry: '0'
+  - name: stage-79a96375
+    displayName: 部署前端
+    strategy: naturally
+    trigger: auto
+    executor:
+      - kerwincui
+    steps:
+      - step: deploy@agent
+        name: deploy_agent
+        displayName: 主机部署
+        hostGroupID: alicloud
+        deployArtifact:
+          - source: build
+            name: vue
+            target: ~/gitee_go/deploy
+            dependArtifact: BUILD_VUE
+        script: |-
+          # 请在此输入部署脚本，如启动Java应用如下
+          # nohup java -jar test.jar > nohup.out &
+           echo 'Hello Gitee!' && touch vuetest
+           touch vue
+        strategy:
+          retry: '0'
+permissions:
+  - role: admin
+    members: []

README.md

@@ -1,33 +1,32 @@
 
 ### 一、项目简介
 
-1. 物美智能 [wumei-smart](http://wumei.live/) 是一个简单易用的生活物联网平台。可用于搭建物联网平台以及二次开发和学习。
+#### 1. 物美智能 [wumei-smart](http://wumei.live/) 是一个简单易用的生活物联网平台。可用于搭建物联网平台以及二次开发和学习。
+
+#### 2. 设备接入使用EMQX消息服务器，加密认证；后端采用Spring boot；前端采用Vue；移动端采用Uniapp；数据库采用Mysql、TDengine和Redis；设备端支持ESP32、ESP8266、树莓派等；系统架构图如下：
+<img src="https://oscimg.oschina.net/oscnet/up-98eefff896394066a60d664b875a3d05d1d.png" max-width="800" />
+
+#### 3. 项目可用于个人学习和使用，商业用途需要赞助项目，获得授权。[查看详情 >>](https://wumei.live/doc/pages/sponsor/)
+
+#### 4. 参考设备
+|   [空气检测仪](https://item.taobao.com/item.htm?spm=a1z10.1-c.w4004-22657217218.2.355d14963FSV69&id=623332279126)  |   [Wifi通断器](https://item.taobao.com/item.htm?spm=a1z10.3-c.w4002-22657217231.57.74076af5XpmsRi&id=651305232489&qq-pf-to=pcqq.group)  |  [智能插座](https://item.taobao.com/item.htm?spm=a1z0d.6639537.1997196601.63.4cc47484zEjJ34&id=675275353501)  |  [智能开关](https://item.taobao.com/item.htm?spm=a1z0d.6639537.1997196601.72.4cc47484zEjJ34&id=675278061047) | [Wifi通断器](https://item.taobao.com/item.htm?spm=a1z0d.6639537.1997196601.31.4cc47484zEjJ34&id=662773208714)  |
+|  :----:  | :----------:  |:----------:  |:----------:  |:----------:  |
+| ![](https://oscimg.oschina.net/oscnet/up-ad98a81677e5e68d660866770e3266ca4cf.png) | ![](https://oscimg.oschina.net/oscnet/up-c38ce010e18349cfa526600c60e49792738.png)  | ![](https://oscimg.oschina.net/oscnet/up-4ce09be3599e3ff7ed91fe182572abd258b.jpg) | ![](https://oscimg.oschina.net/oscnet/up-c4a7971510127324d6566dd6ea95d571483.jpg)  | ![](https://oscimg.oschina.net/oscnet/up-e99eb758dc5abe387e880dbcb30ee21c063.jpg) |
 
-2. 设备接入使用EMQX消息服务器，认证采用EMQX内置的Http插件对称加密认证。后端采用Spring boot；前端采用Vue；移动端采用Uniapp；数据库采用Mysql、Redis和TDengine；设备端支持硬件SDK生成，例如ESP32、ESP8266、树莓派等；设备模拟器采用Android和WPF框架，不仅能模拟硬件设备，还可以控制和监测电脑、手机。
 
-3. 系统架构图
-![系统架构图](https://github.com/kerwincui/wumei-smart/blob/master/document/sys.png?raw=true)
-4. 使用流程
-![使用流程图](https://raw.githubusercontent.com/kerwincui/wumei-smart/master/document/process.png)
 
 
 ### 二、功能
 - 权限管理： 用户管理、部门管理、岗位管理、菜单管理、角色管理、字典和参数管理等
 - 系统监控： 操作日志、登录日志、系统日志、在线用户、服务监控、连接池监控、缓存监控等
-- 产品管理： 产品、产品物模型、产品分类、产品固件等
-- 设备管理： 控制、分组、定时、日志、统计、定位、OTA升级、影子模式、实时监测、加密认证等
-- EMQ管理： Mqtt客户端、监听器、消息主题、消息订阅、插件管理
+- 产品管理： 产品、产品物模型、产品分类、产品固件、授权码等
+- 设备管理： 控制、分组、定时、日志、统计、定位、分享、配置、OTA升级、影子模式、实时监测、加密认证等
+- EMQ管理： Mqtt客户端、监听器、消息主题、消息订阅、插件管理、规则引擎、资源
 - 硬件 SDK： 支持WIFI和MQTT连接、物模型响应、实时监测、定时上报监测数据、AES加密、NTP时间等
 - 物模型管理： 属性（设备状态和监测数据），功能（执行特定任务），事件（设备主动上报给云端）
-
-### 三、开发中功能
-- 设备分享、设备告警、场景联动（进度50%）
-- 智能音箱、多租户、APP界面自定义（进度40%）
-- 时序数据库、分布式集群部署、Granfa监控（进度30%）
-- 视频流处理（进度0%）
-- 桌面端模拟器/监控（进度5%）
-- 安卓端模拟器/监控（进度0%）
-- App和小程序（正在开发中......）
+- 其他功能：多租户、统计、新闻资讯、通知公告、支持TDengine时序数据库
+- 计划开发完善功能：设备告警、场景联动、云云对接智能音箱、设备配网、第三方登录、短信登录、APP界面自定义、视频流处理
+、
 
 ### 四、技术栈    
 * 服务端
@@ -36,20 +35,14 @@
 * Web端
     - 相关技术：ES6、Vue、Vuex、Vue-router、Vue-cli、Axios、Element-ui等 
     - 开发工具：Visual Studio Code    
-* 移动端（android / ios / 微信小程序）
-    - 相关技术：uniapp、smartconfig
+* 移动端（Android / Ios / 微信小程序 / H5）
+    - 相关技术：uniapp、[uView](https://www.uviewui.com/)、[uChart](https://www.ucharts.cn/)
     - 开发工具：HBuilder
 * 硬件端
     - 相关技术： ESP-IDF、Arduino、FreeRTOS等
     - 开发工具：Visual Studio Code 和 Arduino
-* 安卓端模拟器/监控
-    - 相关技术：android
-    - 开发工具：Android Studio
-* 电脑端模拟器/监控
-    - 相关技术：WPF
-    - 开发工具：Visual Studio
 
-### 五、硬件接入（具体参考文档，项目提供了示例SDK，使用ESP8266芯片，基于Arduino开发）
+### 五、硬件接入
 1. 设备认证
     * 加密认证（推荐）
     * 简单认证
@@ -58,31 +51,106 @@
     * 发布物模型、设备信息、时钟同步相关Mqtt主题
     * 订阅物模型、设备升级、时钟同步相关Mqtt主题
 
+###### 项目提供了示例SDK，使用ESP8266芯片，基于Arduino开发。设备烧录使用串口模块，例如Ch340，接线图如下：
+![烧录代码](https://oscimg.oschina.net/oscnet/up-ed61da9a62390de451715686d6a6b37c190.png)
+
+
 ### 六、项目目录
-&nbsp;&nbsp;&nbsp;&nbsp; spring-boot ---------------------------------------------------- 后端<br/>
-&nbsp;&nbsp;&nbsp;&nbsp; vue ------------------------------------------------------------- 前端<br />
-&nbsp;&nbsp;&nbsp;&nbsp; docker ---------------------------------------------------------- docker部署文件<br />
-&nbsp;&nbsp;&nbsp;&nbsp; sdk ------------------------------------------------------------- 硬件SDK<br />
-&nbsp;&nbsp;&nbsp;&nbsp; download ------------------------------------------------------- 工具下载<br />
+&nbsp;&nbsp;&nbsp;&nbsp; spring-boot --------------- 后端<br/>
+&nbsp;&nbsp;&nbsp;&nbsp; vue ----------------------- 前端<br />
+&nbsp;&nbsp;&nbsp;&nbsp; docker -------------------- docker部署文件<br />
+&nbsp;&nbsp;&nbsp;&nbsp; sdk ----------------------- 硬件SDK<br />
+&nbsp;&nbsp;&nbsp;&nbsp; app ----------------------- 移动端打包文件
+
+###### 移动端适配多端
+|安卓/Android|苹果/IOS|微信小程序| 网页/H5|Vue2.0
+| :---: | :---: | :---: | :---: |:---: |
+| √ | √| √ | √ | √ |
 
 
 ### 七、相关文档
 ##### 权限管理基于ruoyi-vue系统，Mqtt消息服务器基于EMQX4.0开源版，SDK示例使用ESP8266 Core For Arduino开发
-* [项目文档(编写中...)](http://wumei.live/kerwincui/document/wiki/)
+* [项目文档](https://wumei.live/doc/)
 * [物美智能官网](http://wumei.live/)
 * [权限管理系统ruoyi-vue](https://gitee.com/y_project/RuoYi-Vue)
 * [Mqtt消息服务器EMQX4.0](https://github.com/emqx/emqx)
 * [ESP8266 Core For Arduino](https://github.com/esp8266/Arduino)
+* [uCharts高性能跨平台图表库](https://www.ucharts.cn)
+* [TDengine时序数据库](https://www.taosdata.com/?zh)
+
+##### Docker快速安装
+* Mysql中创建wumei-smart数据库，[导入Sql脚本](https://gitee.com/kerwincui/wumei-smart/tree/master/springboot/sql)
+* 修改命令中的Mysql配置，并执行
+```
+docker run \
+--name wumei-smart \
+--env DB_HOST=localhost:3306 \
+--env DB_NAME=wumei-smart \
+--env DB_USER=root \
+--env DB_PASSWORD=wumei-smart \
+--publish 80:80 \
+--publish 1883:1883 \
+--publish 8083:8083 \
+--volume /var/wumei-smart/java/uploadPath:/var/wumei-smart/java/uploadPath \
+--restart unless-stopped \
+--detach \
+kerwincui/wumei-smart:1.1
+```
 
 
 ### 八、其他
 * 互助交流群：1073236354
 * [演示地址>>](https://iot.wumei.live/)
+* 小程序演示
+
+![](https://oscimg.oschina.net/oscnet/up-a6feaa7aa6ea54551bd9feb97ebfb0ff206.jpg)
+
+##### 项目贡献者 
+
+|[小驿物联](https://gitee.com/iot-xiaoyi) |[Guanshubiao](https://gitee.com/guanshubiao)|[CrazyDull](https://gitee.com/crazyDull) |[Kami0314](https://github.com/kami0314)|[YBZX](https://github.com/YBZX)
+|--|--|--|--|--|
+
+| [SXH](https://gitee.com/sixiaohu) | [Redamancy_zxp](https://gitee.com/redamancy-zxp) | [LEE](https://gitee.com/yueming188) | [LemonTree](https://gitee.com/fishhunterplus) | [Tang](https://gitee.com/mexiaotang)
+|--|--|--|--|--|
+
+| [xxmfl](https://gitee.com/xxmfl) |
+|--|
 
 
-### 九、界面图片
-* web端
-
+### 九、部分图片
+
+![](https://oscimg.oschina.net/oscnet/up-75a392de73aff6110e7345399aed1cc78fb.png)
+![](https://oscimg.oschina.net/oscnet/up-94aa4573358d29b485d71bb251964d2bfb3.png)
+
+<table>
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-60ff517f5362f4c7b98bb4cb3df543e4ecb.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-d9dd014cec34b6424eb6d768e362356a622.png"/></td>
+    </tr>
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-cefbaf28d2ea5438b17dbad53638852519b.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-20672c691106771f3a38168c0f6c6a7bf20.png"/></td>
+    </tr>
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-75e099216e1fa33f5e83989838ffd1b16fa.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-51d2ae913a83a542fc2c3b6f802dc34369f.png"/></td>
+    </tr>
+        <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-287864587ec8116ee8be115a94d1d6f9302.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-2b0a744a83f939b6694dc33c7b80193029b.png"/></td>
+    </tr>	 
+    <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-c8c388b20e70f6a668749aab94d214b8270.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-cc512e6367b55a3afa78bee7e1cd8c8cab9.png"/></td>
+    </tr>
+        <tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-457424f66db64e5e66d200d94a0d42358ad.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-bf47113b636fa96ceaf9607df795f8b3a17.png"/></td>
+    </tr>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-e05690366e11fb173cebafcba57b5567e38.png"/></td>
+        <td><img src="https://oscimg.oschina.net/oscnet/up-f7856cca6a3dd60afafd1cb0e1ae67c596e.png"/></td>
+    </tr>
+</table>
 
 
 

app/README.md

@@ -0,0 +1,47 @@
+<br />
+
+* 项目可用于个人学习；商业使用请赞助该项目，获得授权；
+* 赞助后还提供了小程序、APP源码和相关教程。[详情](https://wumei.live/doc/pages/sponsor/)
+
+
+#### 移动端介绍
+
+|安卓/Android|苹果/IOS|微信小程序| 网页/H5|Vue2.0
+| :---: | :---: | :---: | :---: |:---: |
+| √ | √| √ | √ | √ |
+
+
+1. 项目使用uniapp开发，适配小程序、安卓、苹果和H5，其他平台未测试。
+2. UI框架使用uView2.0
+3. 组件使用easycom模式，只要组件安装在项目的components目录下或uni_modules目录下，并符合components/组件名称/组件名称.vue目录结构。就可以不用引用、注册，直接在页面中使用。
+4. 开发工具为Hbuilder3.3版本，版本不易过低。
+
+
+###### 项目结构
+
+```
+├─apis                  // 接口管理
+│  ├─modules            // api模块化目录
+│  │  └─device.js       // 设备接口地址
+│  ├─http.api.js        // 接口定义文件
+│  └─http.interceptor   // 拦截器
+├─common                // 公共文件
+│  ├─config             // 环境配置 (设置baseurl等)
+│  ├─extend             // 扩展原型方法
+│  ├─filters            // 全局过滤器
+│  └─tools              // 全局公共方法
+├─components            // 项目组件库，组件放置这里，其他页面可直接使用
+│  ├─cl-test            // easycom测试组件
+│  └─cl-icon            // iconfont图标组件
+├─pages                 // 页面目录
+│  ├─public             // 公共页面
+│  └─tarbar             // 底部导航栏页面
+├─static                // 图片目录
+├─store                 // vuex
+│  ├─$u.mixin           // store全局混入方法
+│  └─index              // vuex 组件全局状态管理
+├─uni_modules           // 插件市场插件目录
+│  └─uview-ui           // uview-ui	
+```
+
+<br /><br />

docker/Dockerfile

@@ -0,0 +1,72 @@
+FROM openjdk:8u322-jre-slim-buster
+
+ENV VERSION     1.1
+ENV AUTHOR      kerwincui
+ENV INFO           wumei smart open source living iot platform
+ENV SERVERS     nginx:1.14.2, redis-server:5.0.14, emqx:4.0, openjdk:8u322-jre-slim-buster
+
+# mysql环境变量
+ENV DB_HOST             localhost
+ENV DB_NAME           wumei
+ENV DB_USER             root
+ENV DB_PASSWORD   admin
+
+RUN apt-get update && \
+	echo "1. 安装网络工具和设置时区 =====================" && \
+	apt-get install wget -y --no-install-recommends && \
+	ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+
+	echo "2. 更换国内源 =============================" && \
+	wget http://qiniu.xiwen.online/Debian10.list && \
+	mv Debian10.list /etc/apt/sources.list && \
+	apt update && apt upgrade -y && \
+
+	echo "3. 安装压缩工具 ============================" && \
+    apt install zip -y && \
+
+	echo "4. 安装nginx ==============================" && \
+	apt-get install nginx -y --no-install-recommends && \
+
+	echo "5. 安装redis ===============================" && \
+	apt-get install redis-server -y --no-install-recommends && \
+
+	echo "6. 修改redis配置 =============================" && \
+	sed -i "s/# requirepass foobared/requirepass wumei-smart/g" /etc/redis/redis.conf && \
+	sed -i "s/bind 127.0.0.1/# bind 127.0.0.1/g" /etc/redis/redis.conf
+
+	# echo "6. 安装 emqx =============================" && \
+	# apt update && apt install -y \
+    # 		apt-transport-https \
+    # 		ca-certificates \
+    # 		curl \
+    # 		gnupg-agent \
+    # 		software-properties-common && \
+	# echo "6.2 添加EMQX官方GPG秘钥 =============================" && \
+	# curl -fsSL https://repos.emqx.io/gpg.pub | apt-key add - && \
+	# echo "6.3 设置存储库 =============================" && \
+	# add-apt-repository \
+    # 		"deb [arch=amd64] https://repos.emqx.io/emqx-ce/deb/ubuntu/ \
+    # 		./bionic \
+    # 		stable" && \
+	# echo "6.4 更新apt包索引 =============================" && \
+	# apt update && \
+	# echo "6.5 安装4.0版本 =============================" && \
+	# apt install emqx=4.0.0 -y --no-install-recommends
+
+# 复制emqx和Nginx的配置文件
+# COPY ./emqx4.0/emqx.conf /etc/emqx/emqx.conf 
+# COPY ./emqx4.0/emqx_auth_http.conf /etc/emqx/plugins/emqx_auth_http.conf
+# COPY ./emqx4.0/emqx_web_hook.conf /etc/emqx/plugins/emqx_web_hook.conf
+# COPY ./emqx4.0/loaded_plugins /var/lib/emqx/loaded_plugins
+COPY ./nginx.conf /etc/nginx/nginx.conf
+
+
+# 解压前端和后端文件并放置到对应位置
+
+# 启动脚本
+COPY docker-entrypoint.sh /
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+# 映射端口
+EXPOSE 80 1883 8083
+

docker/description.txt

@@ -0,0 +1,48 @@
+# 服务启动
+service nginx start
+service redis-server start
+service mysql start
+emqx start
+java -jar /var/wumei-smart/app.jar
+
+# 镜像构建
+docker build -t wumei-smart:1.0 .
+# 复制文件到容器
+docker cp wumei-smart/* container:/var/wumei-smart/
+# 镜像导出导入
+docker export container| docker import - kerwincui/wumei-smart:1.0
+# 镜像推送
+阿里云镜像：registry.cn-chengdu.aliyuncs.com/kerwincui/wumei-smart:1.0
+docker tag wumei-smart kerwincui/wumei-smart:1.0
+docker push kerwinci/wumei-smart:1.0
+
+# 容器运行
+docker run \
+--name wumei-smart \
+--env DB_HOST=wumei.live:3306 \
+--env DB_NAME=wumei-smart \
+--env DB_USER=root \
+--env DB_PASSWORD=wumei-smart \
+--publish 80:80 \
+--publish 1883:1883 \
+--publish 8083:8083 \
+--volume /var/wumei-smart/java/uploadPath:/var/wumei-smart/java/uploadPath \
+--restart unless-stopped \
+--detach \
+kerwincui/wumei-smart:1.1
+
+--publish 18083:18083 \
+--publish 8084:8084 \
+--publish 8883:8883 \
+--publish 8081:8081 \
+--publish 6379:6379 \
+--publish 8080:8080 \
+
+--volume /var/wumei-smart/java/logs:/var/wumei-smart/java/logs \
+--volume /var/wumei-smart/nginx/nginx.conf:/etc/nginx/nginx.conf \
+--volume /var/wumei-smart/nginx/error.log:/var/log/nginx/error.log \
+--volume /var/wumei-smart/redis/redis.conf:/etc/redis/redis.conf \
+--volume /var/wumei-smart/redis/redis-server.log:/var/log/redis/redis-server.log \
+--volume /var/wumei-smart/emqx/emqx.conf:/etc/emqx/emqx.conf  \
+--volume /var/wumei-smart/emqx/log:/var/log/emqx  \
+

docker/docker-entrypoint.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# start service
+startTime=$(date "+%Y-%m-%d %H:%M:%S")
+echo $startTime : wumei-smart is starting, please waiting ...
+
+# 提取jar包配置文件
+cd /var/wumei-smart/java
+unzip app.jar BOOT-INF/classes/application-druid.yml
+# 修改mysql配置
+sed -i "s/{DB_HOST}/$DB_HOST/g" BOOT-INF/classes/application-druid.yml
+sed -i "s/{DB_NAME}/$DB_NAME/g" BOOT-INF/classes/application-druid.yml
+sed -i "s/{DB_USER}/$DB_USER/g" BOOT-INF/classes/application-druid.yml
+sed -i "s/{DB_PASSWORD}/$DB_PASSWORD/g" BOOT-INF/classes/application-druid.yml
+# 配置文件写入jar包，并删除提取的配置
+zip app.jar BOOT-INF/classes/application-druid.yml
+rm -rf BOOT-INF
+
+service nginx start
+service redis-server start
+emqx start
+java -jar /var/wumei-smart/java/app.jar
+
+
+while true
+do
+	time=$(date "+%Y-%m-%d %H:%M:%S")
+	echo $time : wumei-smart is running...
+	sleep 3600
+done
+
+

docker/emqx4.0/emqx_auth_http.conf

@@ -0,0 +1,133 @@
+##--------------------------------------------------------------------
+## HTTP Auth/ACL Plugin
+##--------------------------------------------------------------------
+
+
+##------------------------------------------------------------------------------
+## SSL options
+
+## Path to the file containing PEM-encoded CA certificates. The CA certificates
+## are used during server authentication and when building the client certificate chain.
+##
+## Value: File
+## auth.http.ssl.cacertfile = /etc/emqx/certs/ca.pem
+
+## The path to a file containing the client's certificate.
+##
+## Value: File
+## auth.http.ssl.certfile = /etc/emqx/certs/client-cert.pem
+
+## Path to a file containing the client's private PEM-encoded key.
+##
+## Value: File
+## auth.http.ssl.keyfile = /etc/emqx/certs/client-key.pem
+
+##--------------------------------------------------------------------
+## HTTP Request Headers
+##
+## Example: auth.http.header.Accept-Encoding = *
+##
+## Value: String
+## auth.http.header.Accept = */*
+
+##--------------------------------------------------------------------
+## Authentication request.
+##
+## Variables:
+##  - %u: username
+##  - %c: clientid
+##  - %a: ipaddress
+##  - %r: protocol
+##  - %P: password
+##  - %p: sockport of server accepted
+##  - %C: common name of client TLS cert
+##  - %d: subject of client TLS cert
+##
+## Value: URL
+auth.http.auth_req = http://localhost:8080/iot/tool/mqtt/auth
+## Value: post | get | put
+auth.http.auth_req.method = post
+## Value: Params
+auth.http.auth_req.params = clientid=%c,username=%u,password=%P
+
+##--------------------------------------------------------------------
+## Superuser request.
+##
+## Variables:
+##  - %u: username
+##  - %c: clientid
+##  - %a: ipaddress
+##  - %r: protocol
+##  - %P: password
+##  - %p: sockport of server accepted
+##  - %C: common name of client TLS cert
+##  - %d: subject of client TLS cert
+##
+## Value: URL
+# auth.http.super_req = http://127.0.0.1:8991/mqtt/superuser
+## Value: post | get | put
+# auth.http.super_req.method = post
+## Value: Params
+# auth.http.super_req.params = clientid=%c,username=%u
+
+##--------------------------------------------------------------------
+## ACL request.
+##
+## Variables:
+##  - %A: 1 | 2, 1 = sub, 2 = pub
+##  - %u: username
+##  - %c: clientid
+##  - %a: ipaddress
+##  - %r: protocol
+##  - %m: mountpoint
+##  - %t: topic
+##
+## Value: URL
+# auth.http.acl_req = http://127.0.0.1:8991/mqtt/acl
+## Value: post | get | put
+# auth.http.acl_req.method = get
+## Value: Params
+# auth.http.acl_req.params = access=%A,username=%u,clientid=%c,ipaddr=%a,topic=%t,mountpoint=%m
+
+##------------------------------------------------------------------------------
+## Http Reqeust options
+
+## Time-out time for the http request, 0 is never timeout.
+##
+## Value: Duration
+## -h: hour, e.g. '2h' for 2 hours
+## -m: minute, e.g. '5m' for 5 minutes
+## -s: second, e.g. '30s' for 30 seconds
+##
+## Default: 0
+## auth.http.request.timeout = 0
+
+## Connection time-out time, used during the initial request
+## when the client is connecting to the server
+##
+## Value: Duration
+##
+## Default is same with the timeout option
+## auth.http.request.connect_timout = 0
+
+## Re-send http reuqest times
+##
+## Value: integer
+##
+## Default: 3
+auth.http.request.retry_times = 3
+
+## The interval for re-sending the http request
+##
+## Value: Duration
+##
+## Default: 1s
+auth.http.request.retry_interval = 1s
+
+## The 'Exponential Backoff' mechanism for re-sending request. The actually
+## re-send time interval is `interval * backoff ^ times`
+##
+## Value: float
+##
+## Default: 2.0
+auth.http.request.retry_backoff = 2.0

docker/emqx4.0/emqx_web_hook.conf

@@ -0,0 +1,22 @@
+
+web.hook.api.url = http://localhost:8080/iot/tool/mqtt/webhook
+
+## Encode message payload field
+##
+## Value: base64 | base62
+##
+## Default: undefined
+## web.hook.encode_payload = base64
+
+# web.hook.rule.client.connect.1       = {"action": "on_client_connect"}
+# web.hook.rule.client.connack.1       = {"action": "on_client_connack"}
+web.hook.rule.client.connected.1     = {"action": "on_client_connected"}
+web.hook.rule.client.disconnected.1  = {"action": "on_client_disconnected"}
+# web.hook.rule.client.subscribe.1     = {"action": "on_client_subscribe"}
+# web.hook.rule.client.unsubscribe.1   = {"action": "on_client_unsubscribe"}
+# web.hook.rule.session.subscribed.1   = {"action": "on_session_subscribed"}
+# web.hook.rule.session.unsubscribed.1 = {"action": "on_session_unsubscribed"}
+# web.hook.rule.session.terminated.1   = {"action": "on_session_terminated"}
+# web.hook.rule.message.publish.1      = {"action": "on_message_publish"}
+# web.hook.rule.message.delivered.1    = {"action": "on_message_delivered"}
+# web.hook.rule.message.acked.1        = {"action": "on_message_acked"}

docker/emqx4.0/loaded_plugins

@@ -0,0 +1,8 @@
+{emqx_management,true}.
+{emqx_recon,true}.
+{emqx_retainer,true}.
+{emqx_dashboard,true}.
+{emqx_rule_engine,true}.
+{emqx_bridge_mqtt,false}.
+{emqx_auth_http,true}.
+{emqx_web_hook,true}.

docker/local_build/Dockerfile

@@ -0,0 +1,61 @@
+FROM openjdk:8u322-jre-slim-buster
+
+ENV VERSION     1.1
+ENV AUTHOR      kerwincui
+ENV INFO           wumei smart open source living iot platform
+ENV SERVERS     nginx:1.14.2, redis-server:5.0.14, emqx:4.0, openjdk:8u322-jre-slim-buster
+
+# mysql环境变量
+ENV DB_HOST             localhost
+ENV DB_NAME           wumei
+ENV DB_USER             root
+ENV DB_PASSWORD   admin
+
+RUN apt-get update && \
+	# 安装网络工具和设置时区
+	apt-get install wget -y --no-install-recommends && \
+	ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+	# 更换国内源
+	wget http://qiniu.xiwen.online/Debian10.list && \
+	mv Debian10.list /etc/apt/sources.list && \
+	apt update && apt upgrade -y && \
+                # 安装压缩工具
+                apt install zip -y && \
+	# 安装nginx和redis
+	apt-get install nginx -y --no-install-recommends && \
+	apt-get install redis-server -y --no-install-recommends && \
+	# 安装 emqx
+	apt update && apt install -y \
+    		apt-transport-https \
+    		ca-certificates \
+    		curl \
+    		gnupg-agent \
+    		software-properties-common && \
+	curl -fsSL https://repos.emqx.io/gpg.pub | apt-key add - && \
+	add-apt-repository \
+    		"deb [arch=amd64] https://repos.emqx.io/emqx-ce/deb/ubuntu/ \
+    		./bionic \
+    		stable" && \
+	apt update && \
+	apt install emqx=4.0.0 -y --no-install-recommends && \
+	# 修改redis配置
+	sed -i "s/# requirepass foobared/requirepass wumei-smart/g" /etc/redis/redis.conf && \
+	sed -i "s/bind 127.0.0.1/# bind 127.0.0.1/g" /etc/redis/redis.conf
+
+# 复制emqx和Nginx的配置文件
+COPY ./emqx4.0/emqx.conf /etc/emqx/emqx.conf 
+COPY ./emqx4.0/emqx_auth_http.conf /etc/emqx/plugins/emqx_auth_http.conf
+COPY ./emqx4.0/emqx_web_hook.conf /etc/emqx/plugins/emqx_web_hook.conf
+COPY ./emqx4.0/loaded_plugins /var/lib/emqx/loaded_plugins
+COPY ./nginx.conf /etc/nginx/nginx.conf
+# 拷贝前后端压缩文件到容器，容器内解压后删除
+COPY ./wumei-smart.tar /var/
+RUN cd /var && tar -xvf wumei-smart.tar && rm wumei-smart.tar
+
+# 启动脚本
+COPY docker-entrypoint.sh /
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+# 映射端口
+EXPOSE 80 1883 8083
+

docker/local_build/description.txt

@@ -0,0 +1,48 @@
+# 服务启动
+service nginx start
+service redis-server start
+service mysql start
+emqx start
+java -jar /var/wumei-smart/app.jar
+
+# 镜像构建
+docker build -t wumei-smart:1.0 .
+# 复制文件到容器
+docker cp wumei-smart/* container:/var/wumei-smart/
+# 镜像导出导入
+docker export container| docker import - kerwincui/wumei-smart:1.0
+# 镜像推送
+阿里云镜像：registry.cn-chengdu.aliyuncs.com/kerwincui/wumei-smart:1.0
+docker tag wumei-smart kerwincui/wumei-smart:1.0
+docker push kerwinci/wumei-smart:1.0
+
+# 容器运行
+docker run \
+--name wumei-smart \
+--env DB_HOST=wumei.live:3306 \
+--env DB_NAME=wumei-smart \
+--env DB_USER=root \
+--env DB_PASSWORD=wumei-smart \
+--publish 80:80 \
+--publish 1883:1883 \
+--publish 8083:8083 \
+--volume /var/wumei-smart/java/uploadPath:/var/wumei-smart/java/uploadPath \
+--restart unless-stopped \
+--detach \
+kerwincui/wumei-smart:1.1
+
+--publish 18083:18083 \
+--publish 8084:8084 \
+--publish 8883:8883 \
+--publish 8081:8081 \
+--publish 6379:6379 \
+--publish 8080:8080 \
+
+--volume /var/wumei-smart/java/logs:/var/wumei-smart/java/logs \
+--volume /var/wumei-smart/nginx/nginx.conf:/etc/nginx/nginx.conf \
+--volume /var/wumei-smart/nginx/error.log:/var/log/nginx/error.log \
+--volume /var/wumei-smart/redis/redis.conf:/etc/redis/redis.conf \
+--volume /var/wumei-smart/redis/redis-server.log:/var/log/redis/redis-server.log \
+--volume /var/wumei-smart/emqx/emqx.conf:/etc/emqx/emqx.conf  \
+--volume /var/wumei-smart/emqx/log:/var/log/emqx  \
+

docker/local_build/docker-entrypoint.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# start service
+startTime=$(date "+%Y-%m-%d %H:%M:%S")
+echo $startTime : wumei-smart is starting, please waiting ...
+
+# 提取jar包配置文件
+cd /var/wumei-smart/java
+unzip app.jar BOOT-INF/classes/application-druid.yml
+# 修改mysql配置
+sed -i "s/{DB_HOST}/$DB_HOST/g" BOOT-INF/classes/application-druid.yml
+sed -i "s/{DB_NAME}/$DB_NAME/g" BOOT-INF/classes/application-druid.yml
+sed -i "s/{DB_USER}/$DB_USER/g" BOOT-INF/classes/application-druid.yml
+sed -i "s/{DB_PASSWORD}/$DB_PASSWORD/g" BOOT-INF/classes/application-druid.yml
+# 配置文件写入jar包，并删除提取的配置
+zip app.jar BOOT-INF/classes/application-druid.yml
+rm -rf BOOT-INF
+
+service nginx start
+service redis-server start
+emqx start
+java -jar /var/wumei-smart/java/app.jar
+
+
+while true
+do
+	time=$(date "+%Y-%m-%d %H:%M:%S")
+	echo $time : wumei-smart is running...
+	sleep 3600
+done
+
+

docker/local_build/emqx4.0/emqx_auth_http.conf

@@ -0,0 +1,133 @@
+##--------------------------------------------------------------------
+## HTTP Auth/ACL Plugin
+##--------------------------------------------------------------------
+
+
+##------------------------------------------------------------------------------
+## SSL options
+
+## Path to the file containing PEM-encoded CA certificates. The CA certificates
+## are used during server authentication and when building the client certificate chain.
+##
+## Value: File
+## auth.http.ssl.cacertfile = /etc/emqx/certs/ca.pem
+
+## The path to a file containing the client's certificate.
+##
+## Value: File
+## auth.http.ssl.certfile = /etc/emqx/certs/client-cert.pem
+
+## Path to a file containing the client's private PEM-encoded key.
+##
+## Value: File
+## auth.http.ssl.keyfile = /etc/emqx/certs/client-key.pem
+
+##--------------------------------------------------------------------
+## HTTP Request Headers
+##
+## Example: auth.http.header.Accept-Encoding = *
+##
+## Value: String
+## auth.http.header.Accept = */*
+
+##--------------------------------------------------------------------
+## Authentication request.
+##
+## Variables:
+##  - %u: username
+##  - %c: clientid
+##  - %a: ipaddress
+##  - %r: protocol
+##  - %P: password
+##  - %p: sockport of server accepted
+##  - %C: common name of client TLS cert
+##  - %d: subject of client TLS cert
+##
+## Value: URL
+auth.http.auth_req = http://localhost:8080/iot/tool/mqtt/auth
+## Value: post | get | put
+auth.http.auth_req.method = post
+## Value: Params
+auth.http.auth_req.params = clientid=%c,username=%u,password=%P
+
+##--------------------------------------------------------------------
+## Superuser request.
+##
+## Variables:
+##  - %u: username
+##  - %c: clientid
+##  - %a: ipaddress
+##  - %r: protocol
+##  - %P: password
+##  - %p: sockport of server accepted
+##  - %C: common name of client TLS cert
+##  - %d: subject of client TLS cert
+##
+## Value: URL
+# auth.http.super_req = http://127.0.0.1:8991/mqtt/superuser
+## Value: post | get | put
+# auth.http.super_req.method = post
+## Value: Params
+# auth.http.super_req.params = clientid=%c,username=%u
+
+##--------------------------------------------------------------------
+## ACL request.
+##
+## Variables:
+##  - %A: 1 | 2, 1 = sub, 2 = pub
+##  - %u: username
+##  - %c: clientid
+##  - %a: ipaddress
+##  - %r: protocol
+##  - %m: mountpoint
+##  - %t: topic
+##
+## Value: URL
+# auth.http.acl_req = http://127.0.0.1:8991/mqtt/acl
+## Value: post | get | put
+# auth.http.acl_req.method = get
+## Value: Params
+# auth.http.acl_req.params = access=%A,username=%u,clientid=%c,ipaddr=%a,topic=%t,mountpoint=%m
+
+##------------------------------------------------------------------------------
+## Http Reqeust options
+
+## Time-out time for the http request, 0 is never timeout.
+##
+## Value: Duration
+## -h: hour, e.g. '2h' for 2 hours
+## -m: minute, e.g. '5m' for 5 minutes
+## -s: second, e.g. '30s' for 30 seconds
+##
+## Default: 0
+## auth.http.request.timeout = 0
+
+## Connection time-out time, used during the initial request
+## when the client is connecting to the server
+##
+## Value: Duration
+##
+## Default is same with the timeout option
+## auth.http.request.connect_timout = 0
+
+## Re-send http reuqest times
+##
+## Value: integer
+##
+## Default: 3
+auth.http.request.retry_times = 3
+
+## The interval for re-sending the http request
+##
+## Value: Duration
+##
+## Default: 1s
+auth.http.request.retry_interval = 1s
+
+## The 'Exponential Backoff' mechanism for re-sending request. The actually
+## re-send time interval is `interval * backoff ^ times`
+##
+## Value: float
+##
+## Default: 2.0
+auth.http.request.retry_backoff = 2.0

docker/local_build/emqx4.0/emqx_web_hook.conf

@@ -0,0 +1,22 @@
+
+web.hook.api.url = http://localhost:8080/iot/tool/mqtt/webhook
+
+## Encode message payload field
+##
+## Value: base64 | base62
+##
+## Default: undefined
+## web.hook.encode_payload = base64
+
+# web.hook.rule.client.connect.1       = {"action": "on_client_connect"}
+# web.hook.rule.client.connack.1       = {"action": "on_client_connack"}
+web.hook.rule.client.connected.1     = {"action": "on_client_connected"}
+web.hook.rule.client.disconnected.1  = {"action": "on_client_disconnected"}
+# web.hook.rule.client.subscribe.1     = {"action": "on_client_subscribe"}
+# web.hook.rule.client.unsubscribe.1   = {"action": "on_client_unsubscribe"}
+# web.hook.rule.session.subscribed.1   = {"action": "on_session_subscribed"}
+# web.hook.rule.session.unsubscribed.1 = {"action": "on_session_unsubscribed"}
+# web.hook.rule.session.terminated.1   = {"action": "on_session_terminated"}
+# web.hook.rule.message.publish.1      = {"action": "on_message_publish"}
+# web.hook.rule.message.delivered.1    = {"action": "on_message_delivered"}
+# web.hook.rule.message.acked.1        = {"action": "on_message_acked"}

docker/local_build/emqx4.0/loaded_plugins

@@ -0,0 +1,8 @@
+{emqx_management,true}.
+{emqx_recon,true}.
+{emqx_retainer,true}.
+{emqx_dashboard,true}.
+{emqx_rule_engine,true}.
+{emqx_bridge_mqtt,false}.
+{emqx_auth_http,true}.
+{emqx_web_hook,true}.

docker/local_build/nginx-ssl.conf

@@ -0,0 +1,97 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    gzip on;
+    gzip_min_length  1k;
+    gzip_buffers     16 64K;
+    gzip_http_version 1.1;
+    gzip_comp_level 5;
+    gzip_types     text/plain application/javascript application/x-javascript text/javascript text/css application/xml;
+    gzip_vary on;
+    gzip_proxied   expired no-cache no-store private auth;
+    gzip_disable   "MSIE [1-6]\.";
+
+    server {
+        listen 80;
+        server_name localhost;
+        location / {
+            rewrite ^(.*) https://$server_name$1 permanent;
+        }
+    }
+
+server {
+    # 侦听443端口
+    listen 443 ssl;
+    # 定义访问域名
+    server_name localhost;
+    #证书文件名称
+    ssl_certificate domain_bundle.crt; 
+    #私钥文件名称
+    ssl_certificate_key domain.key; 
+
+    #SSL-START SSL相关配置，请勿删除或修改下一行带注释的404规则
+    #error_page 404/404.html;
+    #HTTP_TO_HTTPS_START
+    if ($server_port !~ 443){
+        rewrite ^(/.*)$ https://$host$1 permanent;
+    }
+    ssl_session_timeout 10m;
+    #请按照以下协议配置
+    ssl_protocols TLSv1.2 TLSv1.3; 
+    #请按照以下套件配置，配置加密套件，写法遵循 openssl 标准。
+    ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+    ssl_prefer_server_ciphers on;
+
+    # web端
+    location / {
+        root   /var/wumei-smart/vue;
+        try_files $uri $uri/ /index.html;
+        index  index.html index.htm;
+    }
+
+    # 服务端接口
+    location /prod-api/{
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://localhost:8080/;
+    }
+
+    # emqx接口
+    location /api/v4/{
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://localhost:8081/api/v4/;  
+    }
+
+    # wss连接
+    location /mqtt {
+        proxy_pass http://localhost:8083/mqtt;
+        proxy_read_timeout 90s;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header X-Forwarded-for $remote_addr;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'Upgrade';
+    }
+
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   html;
+    }
+} 
+}

docker/local_build/nginx.conf

@@ -0,0 +1,55 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    gzip on;
+    gzip_min_length  1k;
+    gzip_buffers     16 64K;
+    gzip_http_version 1.1;
+    gzip_comp_level 5;
+    gzip_types     text/plain application/javascript application/x-javascript text/javascript text/css application/xml;
+    gzip_vary on;
+    gzip_proxied   expired no-cache no-store private auth;
+    gzip_disable   "MSIE [1-6]\.";
+
+    server {
+        listen       80;
+        server_name  localhost;
+        charset utf-8;
+
+        location / {
+            root   /var/wumei-smart/vue;
+            try_files $uri $uri/ /index.html;
+            index  index.html index.htm;
+        }
+		
+        location /prod-api/ {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://localhost:8080/;
+        }
+
+        location /api/v4/ {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://localhost:8081/api/v4/;
+        }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
+}

docker/nginx-ssl.conf

@@ -0,0 +1,97 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    gzip on;
+    gzip_min_length  1k;
+    gzip_buffers     16 64K;
+    gzip_http_version 1.1;
+    gzip_comp_level 5;
+    gzip_types     text/plain application/javascript application/x-javascript text/javascript text/css application/xml;
+    gzip_vary on;
+    gzip_proxied   expired no-cache no-store private auth;
+    gzip_disable   "MSIE [1-6]\.";
+
+    server {
+        listen 80;
+        server_name localhost;
+        location / {
+            rewrite ^(.*) https://$server_name$1 permanent;
+        }
+    }
+
+server {
+    # 侦听443端口
+    listen 443 ssl;
+    # 定义访问域名
+    server_name localhost;
+    #证书文件名称
+    ssl_certificate domain_bundle.crt; 
+    #私钥文件名称
+    ssl_certificate_key domain.key; 
+
+    #SSL-START SSL相关配置，请勿删除或修改下一行带注释的404规则
+    #error_page 404/404.html;
+    #HTTP_TO_HTTPS_START
+    if ($server_port !~ 443){
+        rewrite ^(/.*)$ https://$host$1 permanent;
+    }
+    ssl_session_timeout 10m;
+    #请按照以下协议配置
+    ssl_protocols TLSv1.2 TLSv1.3; 
+    #请按照以下套件配置，配置加密套件，写法遵循 openssl 标准。
+    ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+    ssl_prefer_server_ciphers on;
+
+    # web端
+    location / {
+        root   /var/wumei-smart/vue;
+        try_files $uri $uri/ /index.html;
+        index  index.html index.htm;
+    }
+
+    # 服务端接口
+    location /prod-api/{
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://localhost:8080/;
+    }
+
+    # emqx接口
+    location /api/v4/{
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header REMOTE-HOST $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_pass http://localhost:8081/api/v4/;  
+    }
+
+    # wss连接
+    location /mqtt {
+        proxy_pass http://localhost:8083/mqtt;
+        proxy_read_timeout 90s;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header X-Forwarded-for $remote_addr;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'Upgrade';
+    }
+
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   html;
+    }
+} 
+}

docker/nginx.conf

@@ -0,0 +1,55 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    gzip on;
+    gzip_min_length  1k;
+    gzip_buffers     16 64K;
+    gzip_http_version 1.1;
+    gzip_comp_level 5;
+    gzip_types     text/plain application/javascript application/x-javascript text/javascript text/css application/xml;
+    gzip_vary on;
+    gzip_proxied   expired no-cache no-store private auth;
+    gzip_disable   "MSIE [1-6]\.";
+
+    server {
+        listen       80;
+        server_name  localhost;
+        charset utf-8;
+
+        location / {
+            root   /var/wumei-smart/vue;
+            try_files $uri $uri/ /index.html;
+            index  index.html index.htm;
+        }
+		
+        location /prod-api/ {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://localhost:8080/;
+        }
+
+        location /api/v4/ {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://localhost:8081/api/v4/;
+        }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
+}

sdk/Arduino/Arduino-ESP32/.vscode/arduino.json

@@ -0,0 +1,7 @@
+{
+    "port": "COM3",
+    "configuration": "FlashFreq=80,UploadSpeed=921600",
+    "board": "esp32:esp32:nano32",
+    "output": "./build",
+    "sketch": "Arduino-Esp32.ino"
+}

sdk/Arduino/Arduino-ESP32/Arduino-ESP32.ino

@@ -0,0 +1,85 @@
+/***********************************************************
+ * author: LaoHuang
+ * create: 2022-04-14
+ * email：rememberyousaid@163.com
+ * source:https://github.com/kerwincui/wumei-smart
+ * board:esp32 版本 1.0.6
+ ***********************************************************/
+
+#include "Helper.h"
+
+long lastMqttConn;          // 上次mqtt连接时间
+long lastPublishMonitor;    // 上次发布监测数据时间
+long lastTimerMonitor;      // 上次定时发布监测数据
+
+/**
+ * 启动
+ */
+void setup()
+{
+  //打开串行端口：
+  Serial.begin(115200);
+  printMsg("wumei smart device starting...");
+  connectWifi();
+  connectMqtt();
+}
+
+/**
+ * 循环执行
+ */
+void loop()
+{
+  // Wifi掉线重连
+  if (WiFi.status() != WL_CONNECTED)
+  {
+    connectWifi();
+  }
+
+  // 非阻塞Mqtt重连，间隔30秒
+  if (WiFi.status() == WL_CONNECTED)
+  {
+    long now = millis();
+    if (!mqttClient.connected())
+    {
+      if (now - lastMqttConn > 30000)
+      {
+        lastMqttConn = now;
+        connectMqtt();
+      }
+    }
+    else
+    {
+      mqttClient.loop();
+    }
+  }
+
+  // 非阻塞发布实时监测数据,间隔默认1秒
+  if(WiFi.status() == WL_CONNECTED && monitorCount>0){
+    long now = millis();
+    if (now - lastPublishMonitor > monitorInterval)
+      {
+        lastPublishMonitor = now;
+        monitorCount--;
+        publishMonitor();
+      }
+  }
+
+  // 非阻塞定时上报，测试用，60秒发布一次
+  if(WiFi.status() == WL_CONNECTED){
+    long now = millis();
+    if (now - lastTimerMonitor > 60000)
+      {
+        lastTimerMonitor = now;
+        printMsg("执行定时上报");
+        // 发布事件
+        publishEvent();
+        // 发布时钟同步
+        publishNtp();
+
+        // 发布属性(监测值)
+        String msg=randomPropertyData();
+        publishProperty(msg);
+      }
+  }
+
+}

sdk/Arduino/Arduino-ESP32/Helper.cpp

@@ -0,0 +1,545 @@
+/***********************************************************
+ * author: LaoHuang
+ * create: 2022-04-14
+ * email：rememberyousaid@163.com
+ * source:https://github.com/kerwincui/wumei-smart
+ * board:esp32 版本1.0.6
+ ***********************************************************/
+
+#include "Helper.h"
+
+String g_time;
+WiFiClient wifiClient;
+PubSubClient mqttClient;
+float rssi = 0;
+char wumei_iv[17] = "wumei-smart-open";
+int monitorCount = 0;
+long monitorInterval = 1000;
+
+//==================================== 这是需要配置的项 ===============================
+// Wifi配置
+char *wifiSsid = "wifi-ssid";
+char *wifiPwd = "wifi-password";
+
+// 设备信息配置
+String deviceNum = "D6329VL54419L1Y0";
+String userId = "1";
+String productId = "2";
+float firmwareVersion = 1.0;
+// 经度和纬度可选，如果产品使用设备定位，则必须传
+float latitude=0;
+float longitude=0;
+
+// Mqtt配置
+char *mqttHost = "wumei.live";
+int mqttPort = 1883;
+char *mqttUserName = "wumei-smart";
+char *mqttPwd = "P5FJKZJHIR82GNB2";
+char mqttSecret[17] = "K63C4EA3AI5TER97";
+// 产品启用授权码，则授权码不能为空
+String authCode="";
+
+// NTP地址（用于获取时间,可选的修改为自己部署项目的地址）
+String ntpServer = "http://wumei.live:8080/iot/tool/ntp?deviceSendTime=";
+//====================================================================================
+
+// 订阅的主题
+String prefix = "/" + productId + "/" + deviceNum;
+String sOtaTopic = prefix + "/ota/get";
+String sNtpTopic = prefix + "/ntp/get";
+String sPropertyTopic = prefix + "/property/get";
+String sFunctionTopic = prefix + "/function/get";
+String sPropertyOnline = prefix + "/property-online/get";
+String sFunctionOnline = prefix + "/function-online/get";
+String sMonitorTopic = prefix + "/monitor/get";
+// 发布的主题
+String pInfoTopic = prefix + "/info/post";
+String pNtpTopic = prefix + "/ntp/post";
+String pPropertyTopic = prefix + "/property/post";
+String pFunctionTopic = prefix + "/function/post";
+String pMonitorTopic = prefix + "/monitor/post";
+String pEventTopic = prefix + "/event/post";
+
+// 物模型-属性处理
+void processProperty(String payload)
+{
+  StaticJsonDocument<1024> doc;
+  DeserializationError error = deserializeJson(doc, payload);
+  if (error)
+  {
+    Serial.print(F("deserializeJson() failed: "));
+    Serial.println(error.f_str());
+    return;
+  }
+  for (JsonObject object : doc.as<JsonArray>())
+  {
+    // 匹配云端定义的属性（不包含属性中的监测数据）
+    const char *id = object["id"];
+    const char *value = object["value"];
+    printMsg((String)id + "：" + (String)value);
+  }
+  // 最后发布属性，服务端订阅存储（重要）
+  publishProperty(payload);
+}
+
+// 物模型-功能处理
+void processFunction(String payload)
+{
+  StaticJsonDocument<1024> doc;
+  DeserializationError error = deserializeJson(doc, payload);
+  if (error)
+  {
+    Serial.print(F("deserializeJson() failed: "));
+    Serial.println(error.f_str());
+    return;
+  }
+  for (JsonObject object : doc.as<JsonArray>())
+  {
+    // 匹配云端定义的功能
+    const char *id = object["id"];
+    const char *value = object["value"];
+    if (strcmp(id, "switch") == 0)
+    {
+      printMsg("开关 switch：" + (String)value);
+    }
+    else if (strcmp(id, "gear") == 0)
+    {
+      printMsg("档位 gear：" + (String)value);
+    }
+    else if (strcmp(id, "light_color") == 0)
+    {
+      printMsg("灯光颜色 light_color：" + (String)value);
+    }
+    else if (strcmp(id, "message") == 0)
+    {
+      printMsg("屏显消息 message：" + (String)value);
+    }
+    else if (strcmp(id, "report_monitor") == 0)
+    {
+      String msg = randomPropertyData();
+      printMsg("订阅到上报监测数据指令，上报数据：");
+      printMsg(msg);
+      publishProperty(msg);
+    }
+  }
+  // 最后发布功能,服务端订阅存储（重要）
+  publishFunction(payload);
+}
+
+// Mqtt回调
+void callback(char *topic, byte *payload, unsigned int length)
+{
+  blink();
+  printMsg("接收数据：");
+  String data = "";
+  for (int i = 0; i < length; i++)
+  {
+    Serial.print((char)payload[i]);
+    data += (char)payload[i];
+  }
+
+  if (strcmp(topic, sOtaTopic.c_str()) == 0)
+  {
+    printMsg("订阅到设备升级指令...");
+    StaticJsonDocument<256> doc;
+    DeserializationError error = deserializeJson(doc, payload);
+    if (error)
+    {
+      Serial.print(F("deserializeJson() failed: "));
+      Serial.println(error.f_str());
+      return;
+    }
+    String newVersion = doc["version"];
+    String downloadUrl = doc["downloadUrl"];
+    printMsg("固件版本："+newVersion);
+    printMsg("下载地址："+downloadUrl);
+  }
+  else if (strcmp(topic, sNtpTopic.c_str()) == 0)
+  {
+    printMsg("订阅到NTP时间...");
+    StaticJsonDocument<256> doc;
+    DeserializationError error = deserializeJson(doc, payload);
+    if (error)
+    {
+      Serial.print(F("deserializeJson() failed: "));
+      Serial.println(error.f_str());
+      return;
+    }
+
+    float deviceSendTime = doc["deviceSendTime"];
+    float serverSendTime = doc["serverSendTime"];
+    float serverRecvTime = doc["serverRecvTime"];
+    float deviceRecvTime = millis();
+    float now = (serverSendTime + serverRecvTime + deviceRecvTime - deviceSendTime) / 2;
+    printMsg("当前时间：" + String(now, 0));
+  }
+  else if (strcmp(topic, sPropertyTopic.c_str()) == 0 || strcmp(topic, sPropertyOnline.c_str()) == 0)
+  {
+    printMsg("订阅到属性指令...");
+    processProperty(data);
+  }
+  else if (strcmp(topic, sFunctionTopic.c_str()) == 0 || strcmp(topic, sFunctionOnline.c_str()) == 0)
+  {
+    printMsg("订阅到功能指令...");
+    processFunction(data);
+  }
+  else if (strcmp(topic, sMonitorTopic.c_str()) == 0)
+  {
+    printMsg("订阅到实时监测指令...");
+    StaticJsonDocument<128> doc;
+    DeserializationError error = deserializeJson(doc, payload);
+    if (error)
+    {
+      Serial.print(F("deserializeJson() failed: "));
+      Serial.println(error.f_str());
+      return;
+    }
+    monitorCount = doc["count"];
+    monitorInterval = doc["interval"];
+  }
+}
+
+// 连接wifi
+void connectWifi()
+{
+  printMsg("连接 ");
+  Serial.print(wifiSsid);
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(wifiSsid, wifiPwd);
+  while (WiFi.status() != WL_CONNECTED)
+  {
+    delay(500);
+    Serial.print(".");
+  }
+  printMsg("WiFi连接成功");
+  printMsg("IP地址: ");
+  Serial.print(WiFi.localIP());
+}
+
+// 连接mqtt
+void connectMqtt()
+{
+  printMsg("连接Mqtt服务器...");
+  // 生成mqtt认证密码(设备加密认证，密码加密格式为：mqtt密码 & 过期时间 & 授权码，其中授权码为可选)
+  String password = generationPwd();
+  String encryptPassword = encrypt(password, mqttSecret, wumei_iv);
+  printMsg("密码(已加密)：" + encryptPassword);
+  mqttClient.setClient(wifiClient);
+  mqttClient.setServer(mqttHost, mqttPort);
+  mqttClient.setCallback(callback);
+  mqttClient.setBufferSize(1024);
+  mqttClient.setKeepAlive(10);
+  //连接 设备mqtt客户端Id格式为：认证类型(E=加密、S=简单) & 设备编号 & 产品ID & 用户ID
+  String clientId = "E&" + deviceNum + "&" + productId +"&" + userId;
+  bool connectResult = mqttClient.connect(clientId.c_str(), mqttUserName, encryptPassword.c_str());
+  if (connectResult)
+  {
+    printMsg("连接成功");
+    // 订阅(OTA、NTP、属性、功能、实时监测)
+    mqttClient.subscribe(sOtaTopic.c_str(), 1);
+    mqttClient.subscribe(sNtpTopic.c_str(), 1);
+    mqttClient.subscribe(sPropertyTopic.c_str(), 1);
+    mqttClient.subscribe(sFunctionTopic.c_str(), 1);
+    mqttClient.subscribe(sPropertyOnline.c_str(), 1);
+    mqttClient.subscribe(sFunctionOnline.c_str(), 1);
+    mqttClient.subscribe(sMonitorTopic.c_str(), 1);
+    printMsg("订阅主题：" + sOtaTopic);
+    printMsg("订阅主题：" + sNtpTopic);
+    printMsg("订阅主题：" + sPropertyTopic);
+    printMsg("订阅主题：" + sFunctionTopic);
+    printMsg("订阅主题：" + sPropertyOnline);
+    printMsg("订阅主题：" + sFunctionOnline);
+    printMsg("订阅主题：" + sMonitorTopic);
+    // 发布设备信息
+    publishInfo();
+  }
+  else
+  {
+    printMsg("连接失败, rc=");
+    Serial.print(mqttClient.state());
+  }
+}
+
+// 1.发布设备信息
+void publishInfo()
+{
+  StaticJsonDocument<256> doc;
+  doc["rssi"] = WiFi.RSSI();
+  doc["firmwareVersion"] = firmwareVersion;
+  doc["status"] = 3; // （1-未激活，2-禁用，3-在线，4-离线）
+  doc["userId"] = (String)userId;
+  doc["longitude"] = longitude;  //经度 可选
+  doc["latitude"] = latitude;    // 纬度 可选
+  // 设备摘要,可选（自定义配置信息,不限数量）
+  JsonObject summary = doc.createNestedObject("summary");
+  summary["name"]="wumei-smart";
+  summary["chip"]="esp8266";
+  summary["author"]="kerwincui";
+  summary["version"]=1.6;
+  summary["create"]="2022-06-06";
+
+  printMsg("发布设备信息:");
+  serializeJson(doc, Serial);
+  String output;
+  serializeJson(doc, output);
+  mqttClient.publish(pInfoTopic.c_str(), output.c_str());
+}
+
+// 2.发布时钟同步信，用于获取当前时间(可选)
+void publishNtp()
+{
+  StaticJsonDocument<128> doc;
+  doc["deviceSendTime"] = millis();
+
+  printMsg("发布NTP信息:");
+  serializeJson(doc, Serial);
+  String output;
+  serializeJson(doc, output);
+  mqttClient.publish(pNtpTopic.c_str(), output.c_str());
+}
+
+// 3.发布属性
+void publishProperty(String msg)
+{
+  printMsg("发布属性:" + msg);
+  mqttClient.publish(pPropertyTopic.c_str(), msg.c_str());
+}
+
+// 4.发布功能
+void publishFunction(String msg)
+{
+  printMsg("发布功能:" + msg);
+  mqttClient.publish(pFunctionTopic.c_str(), msg.c_str());
+}
+
+// 5.发布事件
+void publishEvent()
+{
+  // 匹配云端的事件
+  StaticJsonDocument<512> doc;
+  JsonObject objTmeperature = doc.createNestedObject();
+  objTmeperature["id"] = "height_temperature";
+  objTmeperature["value"] = "40";
+  objTmeperature["remark"] = "温度过高警告";
+
+  JsonObject objException = doc.createNestedObject();
+  objException["id"] = "exception";
+  objException["value"] = "异常消息，消息内容XXXXXXXX";
+  objException["remark"] = "设备发生错误";
+
+  printMsg("发布事件:");
+  serializeJson(doc, Serial);
+  String output;
+  serializeJson(doc, output);
+  mqttClient.publish(pEventTopic.c_str(), output.c_str());
+}
+
+// 6.发布实时监测数据
+void publishMonitor()
+{
+  String msg = randomPropertyData();
+  // 发布为实时监测数据，不会存储
+  printMsg("发布实时监测数据:" + msg);
+  mqttClient.publish(pMonitorTopic.c_str(), msg.c_str());
+}
+
+// 随机生成监测值
+String randomPropertyData()
+{
+  // 匹配云端定义的监测数据，随机数代替监测结果
+  float randFloat = 0;
+  int randInt = 0;
+  StaticJsonDocument<1024> doc;
+  JsonObject objTmeperature = doc.createNestedObject();
+  objTmeperature["id"] = "temperature";
+  randFloat = random(1000, 3000);
+  objTmeperature["value"] = (String)(randFloat / 100);
+  objTmeperature["remark"] = (String)millis();
+
+  JsonObject objHumidity = doc.createNestedObject();
+  objHumidity["id"] = "humidity";
+  randFloat = random(3000, 6000);
+  objHumidity["value"] = (String)(randFloat / 100);
+  objHumidity["remark"] = (String)millis();
+
+  JsonObject objCo2 = doc.createNestedObject();
+  objCo2["id"] = "co2";
+  randInt = random(400, 1000);
+  objCo2["value"] = (String)(randInt);
+  objCo2["remark"] = (String)millis();
+
+  JsonObject objBrightness = doc.createNestedObject();
+  objBrightness["id"] = "brightness";
+  randInt = random(1000, 10000);
+  objBrightness["value"] = (String)(randInt);
+  objBrightness["remark"] = (String)millis();
+
+  printMsg("随机生成监测数据值:");
+  serializeJson(doc, Serial);
+  String output;
+  serializeJson(doc, output);
+  return output;
+}
+
+// 生成密码
+String generationPwd()
+{
+  String jsonTime = getTime();
+  printMsg("getTime()= " + jsonTime);
+
+  // 128字节内存池容量
+  StaticJsonDocument<128> doc;
+  // 解析JSON
+  DeserializationError error = deserializeJson(doc, jsonTime);
+  if (error)
+  {
+    printMsg("Json解析失败：");
+    Serial.print(error.f_str());
+    return "";
+  }
+  // 获取当前时间
+  float deviceSendTime = doc["deviceSendTime"];
+  float serverSendTime = doc["serverSendTime"];
+  float serverRecvTime = doc["serverRecvTime"];
+  float deviceRecvTime = millis();
+  float now = (serverSendTime + serverRecvTime + deviceRecvTime - deviceSendTime) / 2;
+  // 过期时间 = 当前时间 + 1小时
+  float expireTime = now + 1 * 60 * 60 * 1000;
+  // 密码加密格式为：mqtt密码 & 过期时间 & 授权码（可选），如果产品启用了授权码就必须加上  
+  String password="";
+  if(authCode == ""){
+    password = (String)mqttPwd + "&" + String(expireTime, 0);
+  }else{
+    password = (String)mqttPwd + "&" + String(expireTime, 0) + "&" + authCode;
+  }
+  printMsg("密码(未加密):" + password);
+
+  return password;
+}
+
+//  HTTP获取时间
+String getTime()
+{
+  while (WiFi.status() == WL_CONNECTED)
+  {
+    HTTPClient http;
+    printMsg("获取时间...");
+
+    if (http.begin(wifiClient, (ntpServer + (String)millis()).c_str()))
+    {
+      // 发送请求
+      int httpCode = http.GET();
+      if (httpCode > 0)
+      {
+        if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_MOVED_PERMANENTLY)
+        {
+          g_time = http.getString();
+          printMsg("获取时间成功，data:");
+          Serial.print(g_time);
+          return g_time;
+        }
+      }
+      else
+      {
+        printMsg("获取时间失败，error:");
+        Serial.printf(http.errorToString(httpCode).c_str());
+      }
+      http.end();
+    }
+    else
+    {
+      printMsg("连接Http失败");
+    }
+    delay(500);
+  }
+}
+
+//打印提示信息
+void printMsg(String msg)
+{
+  Serial.print("\r\n[");
+  Serial.print(millis());
+  Serial.print("ms]");
+  Serial.print(msg);
+}
+
+// 控制指示灯闪烁
+void blink()
+{
+  printMsg("指示灯闪烁...");
+  pinMode(15, OUTPUT);
+  for (int i = 0; i < 2; i++)
+  {
+    digitalWrite(15, HIGH);
+    delay(200);
+    digitalWrite(15, LOW);
+    delay(200);
+  }
+}
+
+// 加密 (AES-CBC-128-pkcs5padding)
+String encrypt(String plain_data, char *wumei_key, char *wumei_iv)
+{
+  int i;
+  // pkcs7padding填充 Block Size : 16
+  int len = plain_data.length();
+
+  int n_blocks = len / 16 + 1;
+  uint8_t n_padding = n_blocks * 16 - len;
+  uint8_t data[n_blocks * 16];
+  memcpy(data, plain_data.c_str(), len);
+  for (i = len; i < n_blocks * 16; i++)
+  {
+    data[i] = n_padding;
+  }
+  uint8_t key[16], iv[16];
+  uint8_t crypt_data[3 * 16] = {0};
+
+  memcpy(key, wumei_key, 16);
+  memcpy(iv, wumei_iv, 16);
+
+  memset(crypt_data, 0, 48);
+
+  len = n_blocks * 16;
+  // 加密
+  mbedtls_aes_context aes_ctx;
+  mbedtls_aes_init(&aes_ctx);
+  mbedtls_aes_setkey_enc(&aes_ctx, key, 128);
+  mbedtls_aes_crypt_cbc(&aes_ctx, MBEDTLS_AES_ENCRYPT, len, iv, data, crypt_data);
+  
+  // Base64编码
+  char encoded_data[base64_enc_len(len)];
+  base64_encode(encoded_data, (char *)crypt_data, len);
+
+  return String(encoded_data);
+}
+
+// 解密 (AES-CBC-128-pkcs5padding)
+String decrypt(String encoded_data_str, char *wumei_key, char *wumei_iv)
+{
+  int input_len = encoded_data_str.length();
+  char *encoded_data = const_cast<char *>(encoded_data_str.c_str());
+  int len = base64_dec_len(encoded_data, input_len);
+  uint8_t data[len];
+  base64_decode((char *)data, encoded_data, input_len);
+  uint8_t key[16], iv[16];
+  memcpy(key, wumei_key, 16);
+  memcpy(iv, wumei_iv, 16);
+  int n_blocks = len / 16;
+
+  uint8_t n_padding = data[n_blocks * 16 - 1];
+  len = n_blocks * 16 - n_padding;
+  char plain_data[len + 1];
+
+  //密文空间
+  mbedtls_aes_context aes_ctx;
+  mbedtls_aes_init(&aes_ctx);
+
+  //设置解密密钥
+  mbedtls_aes_setkey_dec(&aes_ctx, key, 128);
+  mbedtls_aes_crypt_cbc(&aes_ctx, MBEDTLS_AES_DECRYPT, 48, iv, (unsigned char *)encoded_data, (unsigned char *)plain_data);
+  mbedtls_aes_free(&aes_ctx);
+  // PKCS#7 Padding 填充
+  plain_data[len] = '\0';
+  return String(plain_data);
+}

sdk/Arduino/Arduino-ESP32/Helper.h

@@ -0,0 +1,79 @@
+/***********************************************************
+ * author: LaoHuang
+ * create: 2022-04-14
+ * email：rememberyousaid@163.com
+ * source:https://github.com/kerwincui/wumei-smart
+ * board:esp32 版本1.0.6
+ ***********************************************************/
+#ifndef _HELPER_H
+#define _HELPER_H
+
+#include <mbedtls/aes.h>
+#include "Base64.h"
+#include <WiFiClient.h>
+//#include <Ethernet.h>
+#include <HTTPClient.h>
+#include <PubSubClient.h>      // 版本2.8.0
+#include <ArduinoJson.h>       // 版本6.19.4
+
+extern WiFiClient wifiClient;
+extern PubSubClient mqttClient;
+
+extern String deviceNum ;      // 设备编号（重要，同时是Mqtt的clientId）
+extern String userId;          // 用户ID
+extern String productId;       // 产品ID
+extern float rssi;             // 信号强度（信号极好4格[-55— 0]，信号好3格[-70— -55]，信号一般2格[-85— -70]，信号差1格[-100— -85]）
+extern float firmwareVersion; // 固件版本
+extern char *wifiSsid;         // WIFI的SSID
+extern char *wifiPwd;          // WIFI的密码
+extern char *mqttHost;         // Mqtt消息服务器地址
+extern int mqttPort;           // Mqtt消息服务器端口
+extern char *mqttUserName;     // Mqtt消息服务器账号
+extern char *mqttPwd;          // Mqtt消息服务器密码
+extern char mqttSecret[17];    // Mqtt秘钥,16位
+extern char wumei_iv[17];      // AES加密偏移量，固定值16位
+extern String ntpServer;       // NTP服务地址，用于获取当前时间
+extern int monitorCount;       // 发布监测数据的最大次数
+extern long monitorInterval;   // 发布监测数据的间隔，默认1000毫秒
+
+
+// 连接wifi
+void connectWifi();
+// 连接mqtt
+void connectMqtt();
+// Mqtt回调
+void callback(char *topic, byte *payload, unsigned int length);
+
+// 发布设备信息
+void publishInfo();
+// 发布时钟同步信息
+void publishNtp();
+// 发布事件
+void publishEvent();
+// 发布实时监测数据
+void publishMonitor();
+// 随机生成监测值
+String randomPropertyData();
+// 发布属性
+void publishProperty(String msg);
+// 发布功能
+void publishFunction(String msg);
+// 属性处理
+void processProperty(String payload);
+// 功能处理
+void processFunction(String payload);
+
+// 生成密码
+String generationPwd();
+// 获取时间
+String getTime();
+// AES加密
+String encrypt(String plain_data,char *wumei_key,char *wumei_iv);
+// AES解密
+String decrypt(String encoded_data_str,char *wumei_key,char *wumei_iv);
+//打印提示信息
+void printMsg(String tips);
+// 控制指示灯闪烁
+void blink();
+
+#endif 

sdk/Arduino/Arduino-ESP8266/Base64.cpp

@@ -0,0 +1,137 @@
+#include "Base64.h"
+
+#if (defined(__AVR__))
+#include <avr\pgmspace.h>
+#else
+#include <pgmspace.h>
+#endif
+
+const char PROGMEM b64_alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "abcdefghijklmnopqrstuvwxyz"
+    "0123456789+/";
+
+/* 'Private' declarations */
+inline void a3_to_a4(unsigned char * a4, unsigned char * a3);
+inline void a4_to_a3(unsigned char * a3, unsigned char * a4);
+inline unsigned char b64_lookup(char c);
+
+int base64_encode(char *output, char *input, int inputLen) {
+  int i = 0, j = 0;
+  int encLen = 0;
+  unsigned char a3[3];
+  unsigned char a4[4];
+
+  while(inputLen--) {
+    a3[i++] = *(input++);
+    if(i == 3) {
+      a3_to_a4(a4, a3);
+
+      for(i = 0; i < 4; i++) {
+        output[encLen++] = pgm_read_byte(&b64_alphabet[a4[i]]);
+      }
+
+      i = 0;
+    }
+  }
+
+  if(i) {
+    for(j = i; j < 3; j++) {
+      a3[j] = '\0';
+    }
+
+    a3_to_a4(a4, a3);
+
+    for(j = 0; j < i + 1; j++) {
+      output[encLen++] = pgm_read_byte(&b64_alphabet[a4[j]]);
+    }
+
+    while((i++ < 3)) {
+      output[encLen++] = '=';
+    }
+  }
+  output[encLen] = '\0';
+  return encLen;
+}
+
+int base64_decode(char * output, char * input, int inputLen) {
+  int i = 0, j = 0;
+  int decLen = 0;
+  unsigned char a3[3];
+  unsigned char a4[4];
+
+
+  while (inputLen--) {
+    if(*input == '=') {
+      break;
+    }
+
+    a4[i++] = *(input++);
+    if (i == 4) {
+      for (i = 0; i <4; i++) {
+        a4[i] = b64_lookup(a4[i]);
+      }
+
+      a4_to_a3(a3,a4);
+
+      for (i = 0; i < 3; i++) {
+        output[decLen++] = a3[i];
+      }
+      i = 0;
+    }
+  }
+
+  if (i) {
+    for (j = i; j < 4; j++) {
+      a4[j] = '\0';
+    }
+
+    for (j = 0; j <4; j++) {
+      a4[j] = b64_lookup(a4[j]);
+    }
+
+    a4_to_a3(a3,a4);
+
+    for (j = 0; j < i - 1; j++) {
+      output[decLen++] = a3[j];
+    }
+  }
+  output[decLen] = '\0';
+  return decLen;
+}
+
+int base64_enc_len(int plainLen) {
+  int n = plainLen;
+  return (n + 2 - ((n + 2) % 3)) / 3 * 4;
+}
+
+int base64_dec_len(char * input, int inputLen) {
+  int i = 0;
+  int numEq = 0;
+  for(i = inputLen - 1; input[i] == '='; i--) {
+    numEq++;
+  }
+
+  return ((6 * inputLen) / 8) - numEq;
+}
+
+inline void a3_to_a4(unsigned char * a4, unsigned char * a3) {
+  a4[0] = (a3[0] & 0xfc) >> 2;
+  a4[1] = ((a3[0] & 0x03) << 4) + ((a3[1] & 0xf0) >> 4);
+  a4[2] = ((a3[1] & 0x0f) << 2) + ((a3[2] & 0xc0) >> 6);
+  a4[3] = (a3[2] & 0x3f);
+}
+
+inline void a4_to_a3(unsigned char * a3, unsigned char * a4) {
+  a3[0] = (a4[0] << 2) + ((a4[1] & 0x30) >> 4);
+  a3[1] = ((a4[1] & 0xf) << 4) + ((a4[2] & 0x3c) >> 2);
+  a3[2] = ((a4[2] & 0x3) << 6) + a4[3];
+}
+
+inline unsigned char b64_lookup(char c) {
+  if(c >='A' && c <='Z') return c - 'A';
+  if(c >='a' && c <='z') return c - 71;
+  if(c >='0' && c <='9') return c + 4;
+  if(c == '+') return 62;
+  if(c == '/') return 63;
+  return -1;
+}

sdk/Arduino/Arduino-ESP8266/Base64.h

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2013 Adam Rudd.
+ * See LICENSE for more information
+ */
+#ifndef _BASE64_H
+#define _BASE64_H
+
+/* b64_alphabet:
+ *     Description: Base64 alphabet table, a mapping between integers
+ *           and base64 digits
+ *    Notes: This is an extern here but is defined in Base64.c
+ */
+extern const char b64_alphabet[];
+
+/* base64_encode:
+ *    Description:
+ *      Encode a string of characters as base64
+ *    Parameters:
+ *      output: the output buffer for the encoding, stores the encoded string
+ *      input: the input buffer for the encoding, stores the binary to be encoded
+ *      inputLen: the length of the input buffer, in bytes
+ *    Return value:
+ *      Returns the length of the encoded string
+ *    Requirements:
+ *      1. output must not be null or empty
+ *      2. input must not be null
+ *      3. inputLen must be greater than or equal to 0
+ */
+int base64_encode(char *output, char *input, int inputLen);
+
+/* base64_decode:
+ *    Description:
+ *      Decode a base64 encoded string into bytes
+ *    Parameters:
+ *      output: the output buffer for the decoding,
+ *          stores the decoded binary
+ *      input: the input buffer for the decoding,
+ *           stores the base64 string to be decoded
+ *      inputLen: the length of the input buffer, in bytes
+ *    Return value:
+ *      Returns the length of the decoded string
+ *    Requirements:
+ *      1. output must not be null or empty
+ *      2. input must not be null
+ *      3. inputLen must be greater than or equal to 0
+ */
+int base64_decode(char *output, char *input, int inputLen);
+
+/* base64_enc_len:
+ *    Description:
+ *      Returns the length of a base64 encoded string whose decoded
+ *      form is inputLen bytes long
+ *    Parameters:
+ *      inputLen: the length of the decoded string
+ *    Return value:
+ *      The length of a base64 encoded string whose decoded form
+ *      is inputLen bytes long
+ *    Requirements:
+ *      None
+ */
+int base64_enc_len(int inputLen);
+
+/* base64_dec_len:
+ *    Description:
+ *      Returns the length of the decoded form of a
+ *      base64 encoded string
+ *    Parameters:
+ *      input: the base64 encoded string to be measured
+ *      inputLen: the length of the base64 encoded string
+ *    Return value:
+ *      Returns the length of the decoded form of a
+ *      base64 encoded string
+ *    Requirements:
+ *      1. input must not be null
+ *      2. input must be greater than or equal to zero
+ */
+int base64_dec_len(char *input, int inputLen);
+
+#endif // _BASE64_H

sdk/Arduino/Arduino-ESP8266/Helper.cpp

@@ -17,21 +17,26 @@ long monitorInterval = 1000;
 
 //==================================== 这是需要配置的项 ===============================
 // Wifi配置
-char *wifiSsid = "wifi账号";
-char *wifiPwd = "wifi密码";
+char *wifiSsid = "wumei";
+char *wifiPwd = "wumei-smart";
 
 // 设备信息配置
-String deviceNum = "D6329VL54419L1Y0";
+String deviceNum = "D6329VL548866";
 String userId = "1";
-String productId = "2";
-String firmwareVersion = "1.0";
+String productId = "41";
+float firmwareVersion = 1.0;
+// 经度和纬度可选，如果产品使用设备定位，则必须传
+float latitude=0;
+float longitude=0;
 
 // Mqtt配置
 char *mqttHost = "wumei.live";
 int mqttPort = 1883;
 char *mqttUserName = "wumei-smart";
-char *mqttPwd = "P5FJKZJHIR82GNB2";
-char mqttSecret[17] = "K63C4EA3AI5TER97";
+char *mqttPwd = "PHYFED93WSFF1DAS";
+char mqttSecret[17] = "K2V5DE28XNUU3497";
+// 产品启用授权码，则授权码不能为空
+String authCode="";
 
 // NTP地址（用于获取时间,可选的修改为自己部署项目的地址）
 String ntpServer = "http://wumei.live:8080/iot/tool/ntp?deviceSendTime=";
@@ -131,6 +136,18 @@ void callback(char *topic, byte *payload, unsigned int length)
   if (strcmp(topic, sOtaTopic.c_str()) == 0)
   {
     printMsg("订阅到设备升级指令...");
+    StaticJsonDocument<256> doc;
+    DeserializationError error = deserializeJson(doc, payload);
+    if (error)
+    {
+      Serial.print(F("deserializeJson() failed: "));
+      Serial.println(error.f_str());
+      return;
+    }
+    String newVersion = doc["version"];
+    String downloadUrl = doc["downloadUrl"];
+    printMsg("固件版本："+newVersion);
+    printMsg("下载地址："+downloadUrl);
   }
   else if (strcmp(topic, sNtpTopic.c_str()) == 0)
   {
@@ -198,7 +215,7 @@ void connectWifi()
 void connectMqtt()
 {
   printMsg("连接Mqtt服务器...");
-  // 生成mqtt认证密码（密码 = mqtt密码 & 用户ID & 过期时间）
+  // 生成mqtt认证密码(设备加密认证，密码加密格式为：mqtt密码 & 过期时间 & 授权码，其中授权码为可选)
   String password = generationPwd();
   String encryptPassword = encrypt(password, mqttSecret, wumei_iv);
   printMsg("密码(已加密)：" + encryptPassword);
@@ -207,8 +224,8 @@ void connectMqtt()
   mqttClient.setCallback(callback);
   mqttClient.setBufferSize(1024);
   mqttClient.setKeepAlive(10);
-  //连接（客户端ID = 设备编号 & 产品ID）
-  String clientId = deviceNum + "&" + productId;
+  //连接 设备mqtt客户端Id格式为：认证类型(E=加密、S=简单) & 设备编号 & 产品ID & 用户ID
+  String clientId = "E&" + deviceNum + "&" + productId +"&" + userId;
   bool connectResult = mqttClient.connect(clientId.c_str(), mqttUserName, encryptPassword.c_str());
   if (connectResult)
   {
@@ -246,6 +263,15 @@ void publishInfo()
   doc["firmwareVersion"] = firmwareVersion;
   doc["status"] = 3; // （1-未激活，2-禁用，3-在线，4-离线）
   doc["userId"] = (String)userId;
+  doc["longitude"] = longitude;  //经度 可选
+  doc["latitude"] = latitude;    // 纬度 可选
+  // 设备摘要,可选（自定义配置信息）
+  JsonObject summary = doc.createNestedObject("summary");
+  summary["name"]="wumei-smart";
+  summary["chip"]="esp8266";
+  summary["author"]="kerwincui";
+  summary["version"]=1.6;
+  summary["create"]="2022-06-06";
 
   printMsg("发布设备信息:");
   serializeJson(doc, Serial);
@@ -371,7 +397,13 @@ String generationPwd()
   float now = (serverSendTime + serverRecvTime + deviceRecvTime - deviceSendTime) / 2;
   // 过期时间 = 当前时间 + 1小时
   float expireTime = now + 1 * 60 * 60 * 1000;
-  String password = (String)mqttPwd + "&" + userId + "&" + String(expireTime, 0);
+  // 密码加密格式为：mqtt密码 & 过期时间 & 授权码（可选），如果产品启用了授权码就必须加上
+  String password="";
+  if(authCode==""){
+    password = (String)mqttPwd + "&" + String(expireTime, 0);
+  }else{
+    password = (String)mqttPwd + "&" + String(expireTime, 0)+ "&" + authCode;
+  }
   printMsg("密码(未加密):" + password);
   return password;
 }

sdk/Arduino/Arduino-ESP8266/Helper.h

@@ -23,7 +23,7 @@ extern String deviceNum ;      // 设备编号（重要，同时是Mqtt的client
 extern String userId;          // 用户ID
 extern String productId;       // 产品ID
 extern float rssi;             // 信号强度（信号极好4格[-55— 0]，信号好3格[-70— -55]，信号一般2格[-85— -70]，信号差1格[-100— -85]）
-extern String firmwareVersion; // 固件版本
+extern float firmwareVersion;  // 固件版本
 extern char *wifiSsid;         // WIFI的SSID
 extern char *wifiPwd;          // WIFI的密码
 extern char *mqttHost;         // Mqtt消息服务器地址

sdk/RaspberryPi/README.md

@@ -0,0 +1,45 @@
+## 硬件端树莓派SDK说明
+
+#### 一、运行环境
+- Python 3.7.2 (其他python3的版本一般也可以)
+- 开发板：树莓派4b（没有加入硬件相关代码，安装好python3环境，win下，linux下都能运行）
+- 库 需要安装库
+
+1. mqtt库
+   
+   ```
+   pip install paho-mqtt
+   ```
+   
+2. ase加密库
+
+   ```
+   # 前面两个卸载命令是为了防止一些安装环境问题
+   pip uninstall crypto
+   pip uninstall pycryptodome 
+   pip install pycryptodome
+   ```
+
+
+3. 报错缺少xx库，命令
+
+   ```
+   pip install xx
+   ```
+
+
+#### 二、运行程序
+
+```
+python3 main_sdk.py
+
+# 备注：程序运行依赖aes.py文件，保证该文件和main_sdk.py在同一目录
+```
+
+
+
+#### 三、开发参考资料：
+
+- [Eclipse Paho MQTT Python Client 使用手册](https://www.cooooder.com/archives/20210303)
+- 更多参考资料，下载目录中的文本文件查看
+

sdk/RaspberryPi/aes.py

@@ -0,0 +1,210 @@
+from Crypto.Cipher import AES
+import base64
+import binascii
+
+
+# 数据类
+class MData():
+    def __init__(self, data = b"",characterSet='utf-8'):
+        # data肯定为bytes
+        self.data = data
+        self.characterSet = characterSet
+  
+    def saveData(self,FileName):
+        with open(FileName,'wb') as f:
+            f.write(self.data)
+
+    def fromString(self,data):
+        self.data = data.encode(self.characterSet)
+        return self.data
+
+    def fromBase64(self,data):
+        self.data = base64.b64decode(data.encode(self.characterSet))
+        return self.data
+
+    def fromHexStr(self,data):
+        self.data = binascii.a2b_hex(data)
+        return self.data
+
+    def toString(self):
+        return self.data.decode(self.characterSet)
+
+    def toBase64(self):
+        return base64.b64encode(self.data).decode() #decode()转成字符串形式，否则为字节型数据
+
+    def toHexStr(self):
+        return binascii.b2a_hex(self.data).decode()
+
+    def toBytes(self):
+        return self.data
+
+    def __str__(self):
+        try:
+            return self.toString()
+        except Exception:
+            return self.toBase64()
+
+
+### 封装类
+class AEScryptor():
+    def __init__(self,key,mode,iv = '',paddingMode= "NoPadding",characterSet ="utf-8"):
+        '''
+        构建一个AES对象
+        key: 秘钥，字节型数据
+        mode: 使用模式，只提供两种，AES.MODE_CBC, AES.MODE_ECB
+        iv： iv偏移量，字节型数据
+        paddingMode: 填充模式，默认为NoPadding, 可选NoPadding，ZeroPadding，PKCS5Padding，PKCS7Padding
+        characterSet: 字符集编码
+        '''
+        self.key = key
+        self.mode = mode
+        self.iv = iv
+        self.characterSet = characterSet
+        self.paddingMode = paddingMode
+        self.data = ""
+
+    def __ZeroPadding(self,data):
+        data += b'\x00'
+        while len(data) % 16 != 0:
+            data += b'\x00'
+        return data
+
+    def __StripZeroPadding(self,data):
+        data = data[:-1]
+        while len(data) % 16 != 0:
+            data = data.rstrip(b'\x00')
+            if data[-1] != b"\x00":
+                break
+        return data
+
+    def __PKCS5_7Padding(self,data):
+        needSize = 16-len(data) % 16
+        if needSize == 0:
+            needSize = 16
+        return data + needSize.to_bytes(1,'little')*needSize
+
+    def __StripPKCS5_7Padding(self,data):
+        paddingSize = data[-1]
+        return data.rstrip(paddingSize.to_bytes(1,'little'))
+
+    def __paddingData(self,data):
+        if self.paddingMode == "NoPadding":
+            if len(data) % 16 == 0:
+                return data
+            else:
+                return self.__ZeroPadding(data)
+        elif self.paddingMode == "ZeroPadding":
+            return self.__ZeroPadding(data)
+        elif self.paddingMode == "PKCS5Padding" or self.paddingMode == "PKCS7Padding":
+            return self.__PKCS5_7Padding(data)
+        else:
+            print("不支持Padding")
+
+    def __stripPaddingData(self,data):
+        if self.paddingMode == "NoPadding":
+            return self.__StripZeroPadding(data)
+        elif self.paddingMode == "ZeroPadding":
+            return self.__StripZeroPadding(data)
+
+        elif self.paddingMode == "PKCS5Padding" or self.paddingMode == "PKCS7Padding":
+            return self.__StripPKCS5_7Padding(data)
+        else:
+            print("不支持Padding")
+
+    def setCharacterSet(self,characterSet):
+        '''
+        设置字符集编码
+        characterSet: 字符集编码
+        '''
+        self.characterSet = characterSet
+
+    def setPaddingMode(self,mode):
+        '''
+        设置填充模式
+        mode: 可选NoPadding，ZeroPadding，PKCS5Padding，PKCS7Padding
+        '''
+        self.paddingMode = mode
+
+    def decryptFromBase64(self,entext):
+        '''
+        从base64编码字符串编码进行AES解密
+        entext: 数据类型str
+        '''
+        mData = MData(characterSet=self.characterSet)
+        self.data = mData.fromBase64(entext)
+        return self.__decrypt()
+
+    def decryptFromHexStr(self,entext):
+        '''
+        从hexstr编码字符串编码进行AES解密
+        entext: 数据类型str
+        '''
+        mData = MData(characterSet=self.characterSet)
+        self.data = mData.fromHexStr(entext)
+        return self.__decrypt()
+
+    def decryptFromString(self,entext):
+        '''
+        从字符串进行AES解密
+        entext: 数据类型str
+        '''
+        mData = MData(characterSet=self.characterSet)
+        self.data = mData.fromString(entext)
+        return self.__decrypt()
+
+    def decryptFromBytes(self,entext):
+        '''
+        从二进制进行AES解密
+        entext: 数据类型bytes
+        '''
+        self.data = entext
+        return self.__decrypt()
+
+    def encryptFromString(self,data):
+        '''
+        对字符串进行AES加密
+        data: 待加密字符串，数据类型为str
+        '''
+        self.data = data.encode(self.characterSet)
+        return self.__encrypt()
+
+    def __encrypt(self):
+        if self.mode == AES.MODE_CBC:
+            aes = AES.new(self.key,self.mode,self.iv) 
+        elif self.mode == AES.MODE_ECB:
+            aes = AES.new(self.key,self.mode) 
+        else:
+            print("不支持这种模式")  
+            return           
+
+        data = self.__paddingData(self.data)
+        enData = aes.encrypt(data)
+        return MData(enData)
+
+    def __decrypt(self):
+        if self.mode == AES.MODE_CBC:
+            aes = AES.new(self.key,self.mode,self.iv) 
+        elif self.mode == AES.MODE_ECB:
+            aes = AES.new(self.key,self.mode) 
+        else:
+            print("不支持这种模式")  
+            return           
+        data = aes.decrypt(self.data)
+        # mData = MData(self.__stripPaddingData(data),characterSet=self.characterSet)
+        # return mData()
+        return MData(self.__stripPaddingData(data),characterSet=self.characterSet)
+
+
+if __name__ == '__main__':
+    key = b"1234567812345678"
+    iv =  b"0000000000000000"
+    aes = AEScryptor(key,AES.MODE_CBC,iv,paddingMode= "ZeroPadding",characterSet='utf-8')
+    
+    data = "好好学习"
+    rData = aes.encryptFromString(data)
+    print("密文：",rData.toBase64())
+    rData = aes.decryptFromBase64(rData.toBase64())
+    print("明文：",rData)
+# ————————————————
+# 版权声明：本文为CSDN博主「Hello_wshuo」的原创文章，遵循CC 4.0 BY-SA版权协议，转载请附上原文出处链接及本声明。
+# 原文链接：https://blog.csdn.net/chouzhou9701/article/details/122019967

sdk/RaspberryPi/main_sdk.py

@@ -0,0 +1,345 @@
+# /***********************************************************
+#  * author: xiaoY [物美智能 wumei-smart]
+#  * create: 2022-05-10
+#  * email：qimint@outlook.com
+#  * source:https://github.com/kerwincui/wumei-smart
+#  * board:raspberry 4b
+#  ***********************************************************/
+
+import time
+import requests
+import json
+from aes import AEScryptor,AES
+import paho.mqtt.client as mqtt
+import random
+import threading #导入线程模块，用作定时器
+
+#################################################################
+# 需要连接好外部网络
+#################################################################
+
+# 作为python的AES的iv,应该为16位，字节型数据
+wumei_iv = b"wumei-smart-open"
+#发布监测数据的最大次数
+monitorCount =5
+#  发布监测数据的间隔，默认5秒。 使用esp8266单片机时，服务器传来的间隔单位为毫秒，本程序由于定时运行需要的是秒，将转化为秒，如需毫秒运行，自行更改程序
+monitorInterval  =5
+# NTP地址（用于获取时间,可选的修改为自己部署项目的地址）
+ntpServer = "http://120.24.218.158:8080/iot/tool/ntp?deviceSendTime="
+# 连接成功标志位
+g_rc=-1 
+#全局变量，管理定时监测
+global t2 
+
+# 设备信息配置
+deviceNum = "DW43CI6RM8GMG23H"
+userId = "1"
+productId = "4"
+firmwareVersion = "1.0"
+# 经度和纬度可选，如果产品使用设备定位，则必须传
+latitude=0
+longitude=0
+
+# Mqtt配置
+mqttHost = "120.24.218.158"
+mqttPort = 1883
+mqttUserName = "wumei-smart"
+mqttPwd = "P261I5G3RY3MCIGG"
+# 作为python的AES的key,应该为16位，字节型数据
+mqttSecret = b"K2IB784BM0O01GG6"
+# 产品启用授权码则authCode不能为空
+authCode=""
+
+# 订阅的主题
+prefix = "/" + productId + "/" + deviceNum
+sOtaTopic = prefix + "/ota/get"
+sNtpTopic = prefix + "/ntp/get"
+sPropertyTopic = prefix + "/property/get"
+sFunctionTopic = prefix + "/function/get"
+sPropertyOnline = prefix + "/property-online/get"
+sFunctionOnline = prefix + "/function-online/get"
+sMonitorTopic = prefix + "/monitor/get"
+# 发布的主题
+pInfoTopic = prefix + "/info/post"
+pNtpTopic = prefix + "/ntp/post"
+pPropertyTopic = prefix + "/property/post"
+pFunctionTopic = prefix + "/function/post"
+pMonitorTopic = prefix + "/monitor/post"
+pEventTopic = prefix + "/event/post"
+
+# 初始化，连接 设备mqtt客户端Id格式为：认证类型(E=加密、S=简单) & 设备编号 & 产品ID & 用户ID
+clientId = "E&" + deviceNum + "&" + productId +"&" + userId
+client=mqtt.Client(clientId)
+
+#加密 (AES-CBC-128-pkcs5padding)
+def encrypt(plain_data,wumei_key,wumei_iv):
+    aes=AEScryptor(wumei_key,AES.MODE_CBC,wumei_iv,paddingMode="PKCS5Padding",characterSet='utf-8')
+    rData=aes.encryptFromString(plain_data)
+    printMsg("密码(已加密)："+rData.toBase64())
+    return rData.toBase64()
+
+#回调函数。当尝试与MQTT broker 建立连接时，触发该函数。
+#client 是本次连接的客户端实例。
+#userdata 是用户的信息，一般为空。但如果有需要，也可以通过 user_data_set 函数设置。
+#flags 保存服务器响应标志的字典
+#rc 是响应码。
+# 0: 连接成功
+# 1: 连接失败-不正确的协议版本
+# 2: 连接失败-无效的客户端标识符
+# 3: 连接失败-服务器不可用
+# 4: 连接失败-错误的用户名或密码
+# 5: 连接失败-未授权
+# 6-255: 未定义.
+#一般情况下，我们只需要关注rc响应码是否为0就可以了。
+def on_connect(client,userdata,flags,rc):
+    if rc==0:
+        printMsg("连接成功")
+        # 放在on_connect下可以保证重连重新订阅
+        # 订阅(OTA、NTP、属性、功能、实时监测)
+
+        client.subscribe(sOtaTopic, 1)
+        client.subscribe(sNtpTopic, 1)
+        client.subscribe(sPropertyTopic, 1)
+        client.subscribe(sFunctionTopic, 1)
+        client.subscribe(sPropertyOnline, 1)
+        client.subscribe(sFunctionOnline, 1)
+        client.subscribe(sMonitorTopic, 1)
+
+        printMsg("订阅主题：" + sOtaTopic)
+        printMsg("订阅主题：" + sNtpTopic)
+        printMsg("订阅主题：" + sPropertyTopic)
+        printMsg("订阅主题：" + sFunctionTopic)
+        printMsg("订阅主题：" + sPropertyOnline)
+        printMsg("订阅主题：" + sFunctionOnline)
+        printMsg("订阅主题：" + sMonitorTopic)
+        # 发布设备信息
+        publishInfo()
+        global g_rc
+        g_rc=0
+    else:
+        printMsg("连接失败，rc="+str(rc))
+        printMsg("3秒后重连...")
+        time.sleep(3)
+        connectMqtt()
+
+#  物模型-属性处理
+def processProperty(payload):
+    data=json.loads(payload)
+    for item in data:
+        #  匹配云端定义的属性（不包含属性中的监测数据）
+        id = item["id"]
+        value=item["value"]
+        printMsg(str(id)+":"+str(value))
+    #  最后发布属性，服务端订阅存储（重要）
+    publishProperty(json.dumps(data))
+
+#  物模型-功能处理
+def processFunction(payload):
+    data=json.loads(payload)
+    for item in data:
+        # 匹配云端定义的功能
+        id = item["id"]
+        value=item["value"]
+        if(id=="switch"):
+            printMsg("开关 switch："+ str(value))
+        elif(id=="gear"):
+            printMsg("档位 gear："+ str(value))
+        elif(id=="light_color"):
+            printMsg("灯光颜色 light_color："+ str(value))
+        elif(id=="message"):
+            printMsg("屏显消息 message："+ str(value))
+        elif(id=="report_monitor"):
+            msg=randomPropertyData();
+            printMsg("订阅到上报监测数据指令，上报数据：")
+            printMsg(msg)
+            publishProperty(msg)
+    #  最后发布属性，服务端订阅存储（重要）
+    publishProperty(json.dumps(data))
+
+# 回调函数，在客户端订阅的主题上接收到消息时调用，“message”变量是一个MQTT消息描述所有消息特征
+def on_message(client,userdata,msg):
+    printMsg("接收数据:"+msg.topic+" "+str(msg.payload))
+    if(msg.topic==sOtaTopic):
+        printMsg("订阅到设备升级指令...")
+        jsonData=json.loads(msg.payload)
+        newVersion = jsonData["version"]
+        downloadUrl = jsonData["downloadUrl"]
+        printMsg("固件版本："+newVersion)
+        printMsg("下载地址："+downloadUrl)
+    elif(msg.topic==sNtpTopic):
+        printMsg("订阅到NTP时间..."); 
+        jsonData=json.loads(msg.payload)
+        deviceSendTime = jsonData["deviceSendTime"]
+        serverSendTime = jsonData["serverSendTime"]
+        serverRecvTime = jsonData["serverRecvTime"]
+        deviceRecvTime = round(time.time()*1000)
+        now = (serverSendTime + serverRecvTime + deviceRecvTime - deviceSendTime) / 2
+        printMsg("当前时间："+str(round(now)))
+    elif(msg.topic==sPropertyTopic or msg.topic==sPropertyOnline):
+        printMsg("订阅到属性指令...")
+        processProperty(msg.payload)
+    elif(msg.topic==sFunctionTopic or msg.topic==sFunctionOnline):
+        printMsg("订阅到功能指令...")
+        processFunction(msg.payload)
+    elif(msg.topic==sMonitorTopic):
+        # python全局变量的使用
+        global t2
+        global monitorCount
+        global monitorInterval
+        printMsg("订阅到实时监测指令...")
+        jsonData=json.loads(msg.payload)
+        monitorCount = jsonData["count"]
+        monitorInterval = jsonData["interval"]/1000
+        t2.cancel()
+        t2=threading.Timer(monitorInterval,timing_publishMonitor)
+        t2.start()
+
+# 1.发布设备信息
+def publishInfo():
+    # rssi值 树莓派中暂时不处理wifi信号问题
+    #  信号强度（信号极好4格[-55— 0]，信号好3格[-70— -55]，信号一般2格[-85— -70]，信号差1格[-100— -85]）
+    # status值 （1-未激活，2-禁用，3-在线，4-离线）
+    doc={"rssi":1,"firmwareVersion":firmwareVersion,"status":3,"userId":userId,"longitude":longitude,"latitude":latitude,"summary":{"name":"device","chip":"esp8266","author":"kerwincui","version":1.6,"create":"2022 - 06 - 06"}}
+    #     client.publish('raspberry/topic',payload=i,qos=0,retain=False) 
+    jsonData=json.dumps(doc)
+    printMsg("发布设备信息："+pInfoTopic+" "+jsonData)
+    client.publish(pInfoTopic,jsonData)
+
+#  2.发布时钟同步信，用于获取当前时间(可选) 
+def publishNtp():
+    data={"deviceSendTime":round(time.time()*1000)}
+    jsonData=json.dumps(data)
+    printMsg("发布NTP信息"+jsonData)
+    client.publish(pNtpTopic,jsonData)
+
+# 3.发布属性
+# msg 接收格式json
+def publishProperty(msg):
+    printMsg("发布属性:" + msg)
+    client.publish(pPropertyTopic, msg)
+
+#  4.发布功能
+def publishFunction( msg):
+    printMsg("发布功能:" + msg)
+    client.publish(pFunctionTopic, msg)
+
+# 5.发布事件
+def publishEvent():
+    objTmeperature={"id":"height_temperature","value":40,"remark":"温度过高警告"}
+    objException={"id":"exception","value":"异常消息，消息内容XXXXXXXX","remark":"设备发生错误"}
+    data=[objTmeperature,objException]
+    jsonData=json.dumps(data)
+    printMsg("发布事件:"+jsonData)
+    client.publish(pEventTopic,jsonData)
+
+# 6.发布实时监测数据
+def publishMonitor():
+    msg=randomPropertyData()
+    # 发布为实时监测数据，不会存储
+    printMsg("发布实时监测数据："+msg)
+    client.publish(pMonitorTopic,msg)
+
+# 随机生成监测值
+def randomPropertyData():
+    # 匹配云端定义的监测数据，随机数代替监测结果
+    # random.randint(0,10) #生成数据包括0,10 
+    # random.uniform(30,60)生成数据为浮点型
+    objTmeperature={"id":"temperature","value":str(round(random.uniform(10,30),2)),"remark":""}
+    objHumidity={"id":"humidity","value":str(round(random.uniform(30,60),2)),"remark":""}
+    objCo2={"id":"co2","value":str(random.randint(400,1000)),"remark":""}
+    objBrightness={"id":"brightness","value":str(random.randint(1000,10000)),"remark":""}
+    printMsg("随机生成监测数据值:")
+    data=[objTmeperature,objHumidity,objCo2,objBrightness]
+    print(json.dumps(data))
+    return json.dumps(data)
+
+#连接mqtt
+def connectMqtt():
+    printMsg("连接Mqtt服务器")
+    # 生成mqtt认证密码(设备加密认证，密码加密格式为：mqtt密码 & 过期时间 & 授权码，其中授权码为可选)
+    password = generationPwd()
+    encryptPassword=encrypt(password,mqttSecret,wumei_iv)
+    client.username_pw_set(mqttUserName,encryptPassword)
+    client.on_connect=on_connect
+    client.on_message=on_message
+    client.connect(mqttHost,mqttPort,10)
+
+#打印提示信息
+def printMsg(msg):
+    print("[{}] {}".format(time.strftime("%Y-%m-%d %H:%M:%S"),msg))
+
+# 生成密码
+def generationPwd():
+    try:
+        doc=json.loads(getTime())
+    except:
+        printMsg("Json解析失败")
+        exit()
+    deviceSendTime = doc["deviceSendTime"]
+    serverSendTime = doc["serverSendTime"]
+    serverRecvTime = doc["serverRecvTime"]
+    deviceRecvTime = round(time.time()*1000)
+    now = (serverSendTime + serverRecvTime + deviceRecvTime - deviceSendTime) / 2
+    expireTime = int(now + 1 * 60 * 60 * 1000)
+    # 密码加密格式为：mqtt密码 & 过期时间 & 授权码（可选），如果产品启用了授权码就必须加上
+    password=""
+    if(authCode == ""):
+        password = mqttPwd + "&" + str(expireTime, 0)
+    else:
+        password = mqttPwd + "&" + str(expireTime, 0) + "&" + authCode
+    printMsg("密码(未加密):" + password)
+    return password
+
+# HTTP获取时间
+def getTime():
+    try:
+        r=requests.get(ntpServer+str(round(time.time()*1000)))
+        if(r.status_code>0):
+            if(r.status_code==200 or r.status_code==301):
+                printMsg("获取时间成功，data:"+r.text)
+                return r.text
+        else:
+            printMsg("获取时间失败，error:"+r.status_code)
+    except:
+        printMsg("连接Http失败")
+        
+# 定时上报属性
+def timing_publishProperty():
+    printMsg("执行定时上报")
+    #发布事件
+    publishEvent()
+    #发布时钟同步
+    publishNtp()
+    #  发布属性(监测值)
+    msg=randomPropertyData()
+    publishProperty(msg)
+    t1=threading.Timer(60,timing_publishProperty)
+    t1.start()
+
+# 定时上报监测数据
+def timing_publishMonitor():
+    global monitorCount
+    monitorCount=monitorCount-1
+    printMsg("执行监测")
+    publishMonitor()
+    if(monitorCount>0):
+        t2=threading.Timer(monitorInterval,timing_publishMonitor)
+        t2.start()
+        
+if __name__ == '__main__':
+    connectMqtt()
+    client.loop_start()
+    printMsg("等待连接MQTT")
+    while(g_rc!=0):
+        print("-",end=" ")
+        time.sleep(1)
+    t1=threading.Timer(60,timing_publishProperty)
+    t1.setDaemon(True) #当主线程被关闭后，子线程也关闭
+    t1.start()
+    t2=threading.Timer(monitorInterval,timing_publishMonitor)
+    t2.setDaemon(True) #当主线程被关闭后，子线程也关闭
+    t2.start()
+
+    while True:
+        time.sleep(10) #定时上报、检测上报都是线程执行，主线程可以做自己的任务
+  

sdk/RaspberryPi/更多参考教程.txt

@@ -0,0 +1,26 @@
+Eclipse Paho MQTT Python Client 使用手册
+    https://www.cooooder.com/archives/20210303
+
+Python 实现AES加密
+    https://zhuanlan.zhihu.com/p/261694311
+
+python实现AES加密解密
+    https://blog.csdn.net/chouzhou9701/article/details/122019967
+
+使用python time()方法
+    http://www.py.cn/jishu/jichu/20424.html
+
+python 线程定时器Timer
+    https://zhuanlan.zhihu.com/p/91412537
+
+浅谈Python的格式化输出
+    https://www.jb51.net/article/225609.htm
+
+Python Request库入门
+    https://www.jianshu.com/p/d78982126318
+
+Python JSON 
+    https://www.runoob.com/python/python-json.html
+
+Python random() 函数 
+    https://www.runoob.com/python/func-number-random.html

sdk/arduino/wumei/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "C_Cpp.errorSquiggles": "Disabled"
-}

springboot/.gitignore

@@ -24,6 +24,7 @@ target/
 *.iws
 *.iml
 *.ipr
+../.idea
 
 ### NetBeans ###
 nbproject/private/
@@ -39,6 +40,8 @@ nbdist/
 *.xml.versionsBackup
 *.swp
 
+own-*
+
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml

springboot/pom.xml

@@ -3,7 +3,7 @@
          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.wumei</groupId>
     <artifactId>wumei</artifactId>
     <version>3.8.0</version>
@@ -11,7 +11,7 @@
     <name>wumei</name>
     <url>http://www.wumei.live</url>
     <description>物美智能开源生活物联网平台</description>
-    
+
     <properties>
         <wumei.version>3.8.0</wumei.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,8 +33,10 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
+        <justAuth.version>1.16.5</justAuth.version>
+        <forest.version>1.5.19</forest.version>
     </properties>
-	
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
@@ -206,6 +208,8 @@
                 <version>${wumei.version}</version>
             </dependency>
 
+
+
         </dependencies>
     </dependencyManagement>
 

springboot/wumei-admin/pom.xml

@@ -8,7 +8,7 @@
         <version>3.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <artifactId>wumei-admin</artifactId>
 
     <description>

springboot/wumei-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -1,15 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.io.IOException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.UserConstants;
@@ -22,34 +12,42 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.iot.service.IUserSocialProfileService;
 import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 
 /**
  * 个人信息 业务处理
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/system/user/profile")
-public class SysProfileController extends BaseController
-{
+public class SysProfileController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
     @Autowired
     private TokenService tokenService;
 
+    @Autowired
+    private IUserSocialProfileService iUserSocialProfileService;
+
     /**
      * 个人信息
      */
     @GetMapping
-    public AjaxResult profile()
-    {
+    public AjaxResult profile() {
         LoginUser loginUser = getLoginUser();
         SysUser user = loginUser.getUser();
         AjaxResult ajax = AjaxResult.success(user);
         ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
         ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+        ajax.put("socialGroup", iUserSocialProfileService.selectUserSocialProfile(loginUser.getUserId()));
         return ajax;
     }
 

springboot/wumei-admin/src/main/resources/application-druid.yml

@@ -1,57 +1,68 @@
 # 数据源配置
 spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://localhost/wumeismart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: admin
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter: 
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: admin
-                login-password: admin123
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://localhost/wumei-smart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: root
+        password: admin
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+
+      # TDengine数据库
+      tdengine-server:
+        # 默认不启用TDengine，true=启用，false=不启用
+        enabled: false
+        driverClassName: com.taosdata.jdbc.TSDBDriver
+        url: jdbc:TAOS://localhost:6030/wumei_smart_log?timezone=Asia/Beijing&charset=utf-8
+        username: root
+        password: taosdata
+        dbName: wumei_smart_log
+
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: wumei-smart
+        login-password: wumei-smart
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

springboot/wumei-admin/src/main/resources/application.yml

@@ -8,8 +8,8 @@ ruoyi:
   copyrightYear: 2021
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/wumei/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:\project\github\wumei-smart\springboot\uploadpath
+  # 文件路径，以uploadPath结尾 示例（ Windows配置 D:/uploadPath，Linux配置 /uploadPath）
+  profile: /uploadPath
   # 获取ip地址开关
   addressEnabled: true
   # 验证码类型 math 数组计算 char 字符验证
@@ -42,15 +42,15 @@ spring:
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles: 
+  profiles:
     active: druid
   # 文件上传
   servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
+    multipart:
+      # 单个文件大小
+      max-file-size:  10MB
+      # 设置总上传的文件大小
+      max-request-size:  20MB
   # 服务模块
   devtools:
     restart:
@@ -63,9 +63,9 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 1
+    database: 0
     # 密码
-    password: admin
+    password: wumei-smart
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -78,39 +78,46 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
-  # mqtt 配置  
+  # mqtt 配置
   mqtt:
-    username: wumei-smart                           # 账号
-    password: wumei-smart                        # 密码
-    host-url: tcp://localhost:1883           # mqtt连接tcp地址
-    client-id: ${random.value}                # 客户端Id，不能相同，采用随机数 ${random.value}
-    default-topic: test                       # 默认主题
-    timeout: 60000                           # 超时时间
-    keepalive: 30                            # 保持连接
+    username: wumei-smart                      # 账号
+    password: wumei-smart                      # 密码
+    host-url: tcp://localhost:1883             # mqtt连接tcp地址
+    client-id: ${random.int}                   # 客户端Id，不能相同，采用随机数 ${random.value}
+    default-topic: test                        # 默认主题
+    timeout: 30                                # 超时时间
+    keepalive: 30                              # 保持连接
+    clearSession: true                         # 清除会话(设置为false,断开连接，重连后使用原来的会话 保留订阅的主题，能接收离线期间的消息)
+  task:
+    execution:
+      pool:
+        core-size: 10         # 最小连接数
+        max-size: 30          # 最大连接数
+        queue-capacity: 3000  # 最大容量
 
 # token配置
 token:
-    # 令牌自定义标识
-    header: Authorization
-    # 令牌密钥
-    secret: abcdefghijklwumeismartrstuvwxyz
-    # 令牌有效期（默认30分钟）1440为一天
-    expireTime: 1440
-  
+  # 令牌自定义标识
+  header: Authorization
+  # 令牌密钥
+  secret: abcdefghijklwumeismartrstuvwxyz
+  # 令牌有效期（默认30分钟）1440为一天
+  expireTime: 1440
+
 # MyBatis配置
 mybatis:
-    # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain
-    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
-    # 加载全局的配置文件
-    configLocation: classpath:mybatis/mybatis-config.xml
+  # 搜索指定包别名
+  typeAliasesPackage: com.ruoyi.**.domain
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 加载全局的配置文件
+  configLocation: classpath:mybatis/mybatis-config.xml
 
 # PageHelper分页插件
-pagehelper: 
+pagehelper:
   helperDialect: mysql
   supportMethodsArguments: true
-  params: count=countSql 
+  params: count=countSql
 
 # Swagger配置
 swagger:
@@ -120,7 +127,7 @@ swagger:
   pathMapping: /dev-api
 
 # 防止XSS攻击
-xss: 
+xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）

springboot/wumei-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/wumei/logs" />
+	<property name="log.path" value="/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

springboot/wumei-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java

@@ -86,4 +86,9 @@ public class HttpStatus
      * 接口未实现
      */
     public static final int NOT_IMPLEMENTED = 501;
+
+    /**
+     * 不弹窗显示
+     */
+    public static final int NO_MESSAGE_ALERT = 502;
 }

springboot/wumei-common/src/main/java/com/ruoyi/common/core/domain/model/BindLoginBody.java

@@ -0,0 +1,22 @@
+package com.ruoyi.common.core.domain.model;
+
+/**
+ * 用户登录对象
+ * 
+ * @author ruoyi
+ */
+public class BindLoginBody extends LoginBody
+{
+    /**
+     * 绑定id
+     */
+   private String bindId;
+
+    public String getBindId() {
+        return bindId;
+    }
+
+    public void setBindId(String bindId) {
+        this.bindId = bindId;
+    }
+}

springboot/wumei-common/src/main/java/com/ruoyi/common/core/domain/model/BindRegisterBody.java

@@ -0,0 +1,21 @@
+package com.ruoyi.common.core.domain.model;
+
+/**
+ * 用户注册对象
+ *
+ * @author ruoyi
+ */
+public class BindRegisterBody extends RegisterBody {
+    /**
+     * 绑定id
+     */
+    private String bindId;
+
+    public String getBindId() {
+        return bindId;
+    }
+
+    public void setBindId(String bindId) {
+        this.bindId = bindId;
+    }
+}

springboot/wumei-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -213,7 +213,7 @@ public class RedisCache
      * 删除Hash中的数据
      * 
      * @param key
-     * @param mapkey
+     * @param hkey
      */
     public void delCacheMapValue(final String key, final String hkey)
     {
@@ -243,4 +243,15 @@ public class RedisCache
     {
         return redisTemplate.keys(pattern);
     }
+
+    /**
+     * 是否存在key
+     *
+     * @param key 缓存key
+     * @return true：存在key ；false：key不存在或者已过期
+     */
+    public boolean containsKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
 }

springboot/wumei-common/src/main/java/com/ruoyi/common/enums/SocialPlatformType.java

@@ -0,0 +1,10 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 第三方登录平台
+ *
+ * @author json
+ */
+public enum SocialPlatformType {
+    Wechat, QQ
+}

springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java

@@ -9,10 +9,13 @@ import javax.sql.DataSource;
 import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
@@ -21,12 +24,13 @@ import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.util.ClassUtils;
 import com.ruoyi.common.utils.StringUtils;
 
 /**
  * Mybatis支持*匹配扫描包
- * 
+ *
  * @author ruoyi
  */
 @Configuration
@@ -113,7 +117,8 @@ public class MyBatisConfig
         return resources.toArray(new Resource[resources.size()]);
     }
 
-    @Bean
+    @Bean(name = "mysqlSessionFactory")
+    @Primary
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
     {
         String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
@@ -129,4 +134,16 @@ public class MyBatisConfig
         sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
         return sessionFactory.getObject();
     }
+
+    @Bean(name = "mysqlTransactionManager")
+    @Primary
+    public DataSourceTransactionManager mysqlTransactionManager(@Qualifier("dynamicDataSource") DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    @Bean(name = "mysqlSqlSessionTemplate")
+    @Primary
+    public SqlSessionTemplate mysqlSqlSessionTemplate(@Qualifier("mysqlSessionFactory") SqlSessionFactory sqlSessionFactory)  {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
 }

springboot/wumei-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -93,14 +93,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // CSRF禁用，因为不使用session
                 .csrf().disable()
                 // 认证失败处理类 TODO 启用自定义认证会导致oauth授权地址不能访问
-                //.exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
+                .exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
                 // 基于token，所以不需要session
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/iot/tool/register","/iot/tool/ntp",
-                        "/iot/tool/mqtt/auth","/iot/tool/mqtt/webhook").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/iot/tool/register","/iot/tool/ntp","/iot/tool/download",
+                        "/iot/tool/mqtt/auth","/iot/tool/mqtt/webhook","/auth/**/**").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",
@@ -116,18 +116,18 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/*/api-docs").anonymous()
                 .antMatchers("/druid/**").anonymous()
                 /************ oauth ************************/
-                // 静态资源文件
-                .antMatchers("/oauth/logout/**","/oauth/css/**","/oauth/fonts/**").permitAll()
-                // 智能音箱控制器由资源服务器管理
-                .antMatchers("/oauth/speaker/**").permitAll()
+//                // 静态资源文件
+//                .antMatchers("/oauth/logout/**","/oauth/css/**","/oauth/fonts/**").permitAll()
+//                // 智能音箱控制器由资源服务器管理
+//                .antMatchers("/oauth/speaker/**").permitAll()
                 .anyRequest().authenticated()
-                .and()
-                .formLogin()
-                .loginPage("/oauth/login")
-                .permitAll()
-                .and()
-                .logout().logoutUrl("/oauth/logout")
-                .permitAll()
+//                .and()
+//                .formLogin()
+//                .loginPage("/oauth/login")
+//                .permitAll()
+//                .and()
+//                .logout().logoutUrl("/oauth/logout")
+//                .permitAll()
                 /************* oauth **************************/
                 .and()
                 .headers().frameOptions().disable();

springboot/wumei-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -27,8 +27,18 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
             throws IOException
     {
-        int code = HttpStatus.UNAUTHORIZED;
-        String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI());
-        ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
+//        if (isAjaxRequest(request)){
+            int code = HttpStatus.UNAUTHORIZED;
+            String msg = StringUtils.format("请求访问：{}，认证失败，无法访问系统资源", request.getRequestURI());
+            ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
+//        }else {
+//            response.sendRedirect("/oauth/login");
+//        }
+    }
+
+
+    public static boolean isAjaxRequest(HttpServletRequest request) {
+        String ajaxFlag = request.getHeader("X-Requested-With");
+        return ajaxFlag != null && "XMLHttpRequest".equals(ajaxFlag);
     }
 }

springboot/wumei-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -6,6 +6,7 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -47,6 +48,9 @@ public class SysLoginService
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private UserDetailsServiceImpl userDetailsServiceImpl;
+
     /**
      * 登录验证
      * 
@@ -64,6 +68,16 @@ public class SysLoginService
         {
             validateCaptcha(username, code, uuid);
         }
+        return socialLogin(username,password);
+    }
+
+    /**
+     * 第三方验证后，调用登录方法
+     * @param username 用户名
+     * @param password 密码
+     * @return token
+     */
+    public String socialLogin(String username, String password){
         // 用户验证
         Authentication authentication = null;
         try
@@ -92,6 +106,25 @@ public class SysLoginService
         return tokenService.createToken(loginUser);
     }
 
+    /**
+     * 跳转登录认证接口
+     * @param username
+     * @param encodePwd
+     * @return
+     */
+    public String redirectLogin(String username,String encodePwd){
+        UserDetails userDetails=userDetailsServiceImpl.loadUserByUsername(username);
+        if(!userDetails.getPassword().equals(encodePwd)){
+            throw new UserPasswordNotMatchException();
+        }
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+        LoginUser loginUser = (LoginUser) userDetails;
+        recordLoginInfo(loginUser.getUserId());
+        // 生成token
+        return tokenService.createToken(loginUser);
+
+    }
+
     /**
      * 校验验证码
      *