Merge branch 'master' of lizhiqi/control-projects into master

.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

package.json

@@ -36,5 +36,6 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  }
+  },
+  "proxy":"http://192.168.0.224:8899"
 }

src/control.js

@@ -22,7 +22,7 @@ export default class Control extends PureComponent {
 
     // 获取数据
     getData = () =>{
-        axios.get("/api/api/v1/status").then(res => {
+        axios.get("/api/v1/status").then(res => {
             const datas = res?.data;
             if(datas && datas.code === 0){
                 this.setState({
@@ -57,7 +57,7 @@ export default class Control extends PureComponent {
     add = () =>{
         const { temperature } = this.state;
         if(temperature < 30){
-            axios.post("/api/api/v1/set_temp",{temp : temperature + 1}).then(res => {
+            axios.post("/api/v1/set_temp",{temp : temperature + 1}).then(res => {
                 const data = res?.data;
                 if(data && data.code === 0){
                     this.setState((prevState)=>{
@@ -85,7 +85,7 @@ export default class Control extends PureComponent {
     down = () =>{
         const { temperature } = this.state;
         if(temperature > 16){
-            axios.post("/api/api/v1/set_temp",{temp : temperature - 1}).then(res => {
+            axios.post("/api/v1/set_temp",{temp : temperature - 1}).then(res => {
                 const data = res?.data;
                 if(data && data.code === 0){
                     this.setState((prevState)=>{
@@ -107,7 +107,7 @@ export default class Control extends PureComponent {
 
     // 选择模式
     patternSelect = item =>{
-        axios.post("/api/api/v1/mode",{mode : item}).then(res => {
+        axios.post("/api/v1/mode",{mode : item}).then(res => {
             const data = res?.data;
             if(data && data.code === 0){
                 this.setState({ pattern : item});
@@ -119,7 +119,7 @@ export default class Control extends PureComponent {
 
     // 选择风速
     speedSelect = item =>{
-        axios.post("/api/api/v1/fan_speed",{speed : item}).then(res => {
+        axios.post("/api/v1/fan_speed",{speed : item}).then(res => {
             const data = res?.data;
             if(data && data.code === 0){
                 this.setState({ windSpeed : item});
@@ -143,7 +143,7 @@ export default class Control extends PureComponent {
     onOpen = () =>{
         const { openVisible } = this.state;
         if(openVisible){
-            axios.post("/api/api/v1/power",{power : 2}).then(res => {
+            axios.post("/api/v1/power",{power : 2}).then(res => {
                 const data = res?.data;
                 if(data && data.code === 0){
                     this.setState({ openVisible : false });
@@ -152,7 +152,7 @@ export default class Control extends PureComponent {
                 this.toast(err.message,2000);
             })
         }else {
-            axios.post("/api/api/v1/power",{power : 1}).then(res => {
+            axios.post("/api/v1/power",{power : 1}).then(res => {
                 const data = res?.data;
                 if(data && data.code === 0){
                     this.setState({ openVisible : true });

src/setupProxy.js

@@ -1,10 +0,0 @@
-const { createProxyMiddleware } = require('http-proxy-middleware');
-module.exports = function(app) {
-    app.use(
-        createProxyMiddleware('/api',{ //遇见/api前缀的请求，就会触发该代理配置
-            target:'http://192.168.0.224:8899', //请求转发给谁
-            changeOrigin:true,//控制服务器收到的请求头中Host的值
-            pathRewrite:{'^/api':''} //重写请求路径
-        }),
-    )
-};