From a70f203701075284b74ca1290c2479ff7e7dfa41 Mon Sep 17 00:00:00 2001
From: caoyang <caoyy_ios@163.com>
Date: Tue, 12 Nov 2019 17:08:34 +0800
Subject: [PATCH] 百度接口回调封装，切图接口调试完成

---
 .idea/javassm.iml                                                              |   9 +++++++++
 .idea/misc.xml                                                                 |   4 ++++
 .idea/modules.xml                                                              |   8 ++++++++
 .idea/vcs.xml                                                                  |   6 ++++++
 .idea/workspace.xml                                                            | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 springboot.iml                                                                 |  10 +++++-----
 springboot/pom.xml                                                             |  22 ++++++++++++++++------
 springboot/src/main/java/com/sincre/springboot/ApiModel/BaiduResult.java       |  50 +++++++++++++-------------------------------------
 springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java |  58 ++++++++++++++++++++++++----------------------------------
 springboot/src/main/java/com/sincre/springboot/utils/ResultUtils.java          |  25 ++++++++-----------------
 springboot/src/main/resources/application.properties                           |   6 +++---
 11 files changed, 265 insertions(+), 102 deletions(-)
 create mode 100644 .idea/javassm.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/javassm.iml b/.idea/javassm.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/javassm.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..99ae653
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..2b479d4
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/javassm.iml" filepath="$PROJECT_DIR$/.idea/javassm.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..ab26eff
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="3d777fc9-3797-4a37-8968-b32bb87dfc27" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/.idea/javassm.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/springboot/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/springboot/pom.xml" afterDir="false" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="DefaultGradleProjectSettings">
+    <option name="testRunner" value="GRADLE" />
+    <option name="delegatedBuild" value="true" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/springboot/src/main/resources/application.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="180">
+              <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/springboot/src/main/java/com/sincre/springboot/SpringbootApplication.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="210">
+              <caret line="26" selection-start-line="26" selection-end-line="26" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="y" value="23" />
+    <option name="width" value="1280" />
+    <option name="height" value="777" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="javassm" type="b2602c69:ProjectViewProjectNode" />
+              <item name="javassm" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="javassm" type="b2602c69:ProjectViewProjectNode" />
+              <item name="javassm" type="462c0819:PsiDirectoryNode" />
+              <item name="springboot" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="SvnConfiguration">
+    <configuration>$USER_HOME$/.subversion</configuration>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="3d777fc9-3797-4a37-8968-b32bb87dfc27" name="Default Changelist" comment="" />
+      <created>1573119911506</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1573119911506</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="23" width="1280" height="777" extended-state="0" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3206785" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Image Layers" order="2" />
+      <window_info id="Designer" order="3" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Terminal" order="7" visible="true" weight="0.329927" />
+      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.329927" />
+      <window_info anchor="bottom" id="Messages" order="10" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Maven" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+    </layout>
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/springboot/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="40" selection-start-line="12" selection-start-column="40" selection-end-line="12" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/springboot/src/main/java/com/sincre/springboot/SpringbootApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
+        </state>
+      </provider>
+    </entry>
+  </component>
+  <component name="masterDetails">
+    <states>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+    </states>
+  </component>
+</project>
\ No newline at end of file
diff --git a/springboot.iml b/springboot.iml
index 7ef7640..2e84804 100644
--- a/springboot.iml
+++ b/springboot.iml
@@ -21,11 +21,16 @@
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.16" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.16" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
@@ -39,11 +44,6 @@
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.16" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.16" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.3.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.3.RELEASE" level="project" />
diff --git a/springboot/pom.xml b/springboot/pom.xml
index 340cbae..9fc4f3b 100644
--- a/springboot/pom.xml
+++ b/springboot/pom.xml
@@ -11,7 +11,7 @@
     <groupId>com.sincre</groupId>
     <artifactId>springboot</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>springboot</name>
     <description>Demo project for Spring Boot</description>
 
@@ -37,11 +37,11 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-tomcat</artifactId>-->
+<!--            <scope>provided</scope>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -135,6 +135,16 @@
             <groupId>com.baidu.aip</groupId>
             <artifactId>java-sdk</artifactId>
             <version>4.12.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/springboot/src/main/java/com/sincre/springboot/ApiModel/BaiduResult.java b/springboot/src/main/java/com/sincre/springboot/ApiModel/BaiduResult.java
index 7b50884..b2781cd 100644
--- a/springboot/src/main/java/com/sincre/springboot/ApiModel/BaiduResult.java
+++ b/springboot/src/main/java/com/sincre/springboot/ApiModel/BaiduResult.java
@@ -1,53 +1,29 @@
 package com.sincre.springboot.ApiModel;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-
-public class BaiduResult <T>{
-
-    public Boolean getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
+import java.util.List;
 
-    public T getResult() {
-        return result;
-    }
 
-    public void setResult(T result) {
-        this.result = result;
-    }
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 
-    public String getCode() {
-        return code;
-    }
+public class BaiduResult <T>{
 
-    public void setCode(String code) {
-        this.code = code;
-    }
+    private int error_code;
+    private String error_msg;
 
-    public String getMsg() {
-        return msg;
+    public String getError_msg() {
+        return error_msg;
     }
 
-    public void setMsg(String msg) {
-        this.msg = msg;
+    public void setError_msg(String error_msg) {
+        this.error_msg = error_msg;
     }
 
-    public Long getT() {
-        return t;
+    public int getError_code() {
+        return error_code;
     }
 
-    public void setT(Long t) {
-        this.t = t;
+    public void setError_code(int error_code) {
+        this.error_code = error_code;
     }
-
-    private Boolean success;
-    private String code;
-    private String msg;
-    private Long t;
-    private T result;
 }
diff --git a/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java b/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java
index 8cf2b31..a6e3710 100644
--- a/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java
+++ b/springboot/src/main/java/com/sincre/springboot/controller/BaiduController.java
@@ -2,9 +2,7 @@ package com.sincre.springboot.controller;
 
 
 import com.alibaba.fastjson.JSON;
-import com.baidu.aip.util.Base64Util;
 import com.sincre.springboot.ApiModel.BaiduResult;
-import com.sincre.springboot.ApiModel.TuYaResResult;
 import com.sincre.springboot.common.ServerResponse;
 import com.sincre.springboot.utils.ApiHelper;
 import com.sincre.springboot.utils.CacheHelper;
@@ -12,11 +10,9 @@ import com.sincre.springboot.utils.ResultUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
 
-import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,35 +21,29 @@ import java.util.Map;
 @Api(tags = "百度云服务API调用")
 public class BaiduController {
 
-    @ApiOperation("根据上传的图片二进制数据进行切图")
-    @ApiImplicitParam(name="imgPostData",value = "图片二进制数据",required = true)
-    @GetMapping("general")
-    public static ServerResponse general(byte[] imgPostData) {
+    @ApiOperation("根据上传的图片进行切图")
+    @ApiImplicitParam(name = "imgUrl",value = "图片地址url",required = true)
+    @PostMapping("cutPicture")
+    public ServerResponse cutPicture( String imgUrl) {
         // 请求url
         String url = "https://aip.baidubce.com/rest/2.0/ocr/v1/general";
-        try {
-            byte[] imgData = imgPostData;
-            String imgStr = Base64Util.encode(imgData);
-            String imgParam = URLEncoder.encode(imgStr, "UTF-8");
-            String param = "image=" + imgParam;
-            // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间， 客户端可自行缓存，过期后重新获取。
-            String accessToken = CacheHelper.getBaiDuToken();
-            Long t = System.currentTimeMillis();
-
-            Map<String,String> headMap = new HashMap<>();
-            headMap.put("Content-Type","application/x-www-form-urlencoded");
-
-            Map<String,Object> bodyMap = new HashMap<>();
-            bodyMap.put("image",param);
-            bodyMap.put("t",t.toString());
-
-            String result = ApiHelper.doPost(url+accessToken,headMap,bodyMap);
-            BaiduResult baiduResult = JSON.parseObject(result,BaiduResult.class);
-            return ResultUtils.getInstance().returnResultBaidu(baiduResult);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 
+        String param = imgUrl;
+        // 注意这里仅为了简化编码每一次请求都去获取access_token，线上环境access_token有过期时间， 客户端可自行缓存，过期后重新获取。
+        String accessToken = CacheHelper.getBaiDuToken();
+
+        String postToken = "?access_token=" + accessToken;
+
+        Map<String, String> headMap = new HashMap<>();
+        headMap.put("Content-Type", "application/x-www-form-urlencoded");
+
+        Map<String,Object> body = new HashMap<>();
+        body.put("url",param);
+
+        String result = ApiHelper.doPost(url+postToken,headMap,body);
+
+        BaiduResult baiduResult = JSON.parseObject(result, BaiduResult.class);
+
+        return ResultUtils.getInstance().returnResult_Baidu(baiduResult,result);
+    }
 }
diff --git a/springboot/src/main/java/com/sincre/springboot/utils/ResultUtils.java b/springboot/src/main/java/com/sincre/springboot/utils/ResultUtils.java
index fdd7a4c..9e6aeb9 100644
--- a/springboot/src/main/java/com/sincre/springboot/utils/ResultUtils.java
+++ b/springboot/src/main/java/com/sincre/springboot/utils/ResultUtils.java
@@ -96,31 +96,22 @@ public class ResultUtils {
 
     /**
      * 百度云返回结果
-     * @param
+     * @param baiduResult
      * @return
      */
-    public ServerResponse returnResultBaidu(BaiduResult baiduResResult) {
+    public ServerResponse returnResult_Baidu(BaiduResult baiduResult,String data) {
         try {
-            boolean success = baiduResResult.getSuccess();
+            int code = baiduResult.getError_code();
+            String msg = baiduResult.getError_msg();
 
-            if (success) {
-                //data 返回的是数组
-                if(JSON.isValidArray(baiduResResult.getResult().toString())){
-                    int total;
-                    JSONArray  jsonArray = JSON.parseArray(baiduResResult.getResult().toString());
-                    total = jsonArray.size();
-                    return ServerResponse.createBySuccess(String.valueOf(total), ResponseCode.SUCCESS.getDesc(), baiduResResult.getResult());
-                }
-                //data 返回的是对象
-                return ServerResponse.createBySuccess(ResponseCode.SUCCESS.getDesc(), baiduResResult.getResult());
+            if (msg == null) {
+                return ServerResponse.createBySuccess(data);
+            }else{
+                return ServerResponse.createByErrorCodeMessage(code,msg);
             }
-
-            int code = Integer.valueOf(baiduResResult.getCode());
-            return ServerResponse.createByErrorCodeMessage(code, baiduResResult.getMsg());
         }
         catch (Exception ex){
             return  ServerResponse.createByErrorMessage("服务器内部处理出错!");
         }
     }
-
 }
diff --git a/springboot/src/main/resources/application.properties b/springboot/src/main/resources/application.properties
index f355cd6..818fd37 100644
--- a/springboot/src/main/resources/application.properties
+++ b/springboot/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 spring.application.name=iot-api
 #server.port=8088
-# �������ݿ��������
+
 spring.datasource.username=thd
 spring.datasource.password=pmd19930415A
 spring.datasource.url=jdbc:sqlserver://60.190.202.57:14333;database=test
@@ -9,5 +9,5 @@ mybatis.config-location=classpath:mybatis-config.xml
 mybatis.mapper-locations=classpath:/mapper/*.xml
 mybatis.type-aliases-package=com.sincre.springboot.model
 
-#��Ӧ����ע�����ĵ��������ݣ�ָ������ע�����ĵ�λ�á�
-eureka.client.serviceUrl.defaultZone=http://localhost:8001/eureka/
\ No newline at end of file
+
+eureka.client.serviceUrl.defaultZone=http://121.40.109.21:8761/eureka/
\ No newline at end of file
--
libgit2 0.21.0