Merge branch 'master' into WJ-ZS

.idea/workspace.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="31161848-0613-49b6-9f79-2729ad5c4973" name="默认的" comment="正式代码提交" />
+    <list default="true" id="31161848-0613-49b6-9f79-2729ad5c4973" name="默认的" comment="正式代码提交">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -18,6 +21,11 @@
     </findStrings>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="WJ-ZS" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
@@ -118,6 +126,7 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\桌面常用文件\线上代码\04-PHP\104\USKYOF" />
       <recent name="D:\phpStudy\PHPTutorial\WWW\USKYOF\USKYOF\Home\Controller" />
     </key>
   </component>
@@ -138,7 +147,8 @@
       <workItem from="1639037787232" duration="145000" />
       <workItem from="1645605376518" duration="696000" />
       <workItem from="1656470242194" duration="2345000" />
-      <workItem from="1656474154778" duration="129000" />
+      <workItem from="1656474154778" duration="984000" />
+      <workItem from="1656486370554" duration="3986000" />
     </task>
     <task id="LOCAL-00001" summary="正式代码提交">
       <created>1656472536515</created>
@@ -147,7 +157,28 @@
       <option name="project" value="LOCAL" />
       <updated>1656472536515</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="正式代码提交">
+      <created>1656474430950</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1656474430951</updated>
+    </task>
+    <task id="LOCAL-00003" summary="正式代码提交">
+      <created>1656487080411</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1656487080411</updated>
+    </task>
+    <task id="LOCAL-00004" summary="正式代码提交">
+      <created>1656487117149</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1656487117149</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TimeTrackingManager">

README.md

@@ -0,0 +1,19 @@
+# 简要说明
+- 伍继智能公众号2.0版本，后端代码。
+
+——————————————————————————————
+# 要求环境
+- 参考 https://www.kancloud.cn/manual/thinkphp
+
+——————————————————————————————
+# 安装步骤
+- 下载本项目并解压
+- 创建数据库smart_electricity，并导入根目录下的datatable.sql文件
+- 更改数据库相关信息
+- 根目录下api_sdk文件，复制到服务器/php目录下
+- 根目录下sign.php复制一份到项目的同级目录
+- 该项目接口访问路径：域名/项目名/USKYOF.php/Home/控制器/方法
+
+——————————————————————————————
+
+