udate

pom.xml

@@ -44,6 +44,11 @@
         </dependency>
         <dependency>
             <groupId>com.dliyun</groupId>
+            <artifactId>framework-sdk</artifactId>
+            <version>${framework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.dliyun</groupId>
             <artifactId>framework-docs</artifactId>
             <version>${framework.version}</version>
         </dependency>

src/main/java/com/zhiqiyun/open/router/apis/Oauth2Api.java

@@ -41,8 +41,10 @@ public class Oauth2Api {
         paramValues.put("grant_type", "password");
         paramValues.put("username", request.getUserName());
         paramValues.put("password", DigestUtils.md5Hex(request.getPassword()));
+        paramValues.put("login_type", "tenant");
         paramValues.put("scope", "all");
-        paramValues.put("tenantId", tenantId);
+        paramValues.put("type", "account");
+
         FormBody.Builder formBuilder = new FormBody.Builder();
         paramValues.forEach(formBuilder::add);
 
@@ -62,9 +64,11 @@ public class Oauth2Api {
         } else {
             try {
                 String result = Objects.requireNonNull(resp.body()).string();
+                log.error(result);
                 JSONObject jsonObject = JSON.parseObject(result);
                 return OapResponse.fail(jsonObject.getString("error"), jsonObject.getString("error_description"));
             } catch (Exception e) {
+                log.error("", e);
                 return OapResponse.fail("NETWORK_ERROR", "网络异常" + resp.message());
             }
         }

src/main/resources/application.properties

@@ -6,9 +6,9 @@ logger.root.level=DEBUG
 logger.root.path=/tmp/
 ####################### mysql ###############################
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://192.168.0.200/liucheng_open?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.username=app
-spring.datasource.password=!@qwaszx
+spring.datasource.url=jdbc:mysql://rm-bp1e2451m5olnc4g6qo.mysql.rds.aliyuncs.com/liucheng_open?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.username=liucheng
+spring.datasource.password=liucheng123@
 #######################mybatis###############################
 mybatis-plus.config-location=classpath:mybatis/sqlMapConfig.xml
 mybatis-plus.mapper-locations=classpath:mybatis/mappers/*.xml

src/main/resources/db/migration/V1.0.3__bz.sql

@@ -11,7 +11,6 @@ CREATE TABLE `bz_weather_info`
     `windpower`     VARCHAR(50)  NOT NULL COMMENT '风力级别，单位：级',
     `humidity`      VARCHAR(50)  NOT NULL COMMENT '空气湿度',
     `pm25`          INT(11) NOT NULL COMMENT '空气湿度',
-    `humidity`      INT(11) NOT NULL COMMENT 'PM2.5',
     `aqi`           INT(11) NOT NULL COMMENT 'AQI',
     `air_quality`   VARCHAR(50)  NOT NULL COMMENT '空气质量',
     `reporttime`    DATETIME     NOT NULL COMMENT '发布的时间',
@@ -35,7 +34,7 @@ CREATE TABLE `bz_hotel_info`
 (
     `id`               BIGINT(30) NOT NULL COMMENT 'ID',
     `name`             VARCHAR(50)  NOT NULL COMMENT '名称',
-    `hotel_type`       INT(2) NOT NULL COMMENT '1、酒店;2、民宿',
+    `hotel_type`       INT(2) NOT NULL COMMENT '1、酒店,2、民宿',
     `address`          VARCHAR(50)  NOT NULL COMMENT '地址',
     `summary`          VARCHAR(500) NOT NULL COMMENT '简介',
     `total_rooms`      INT(11) NOT NULL COMMENT '房间总数',

src/test/java/Test.java

@@ -0,0 +1,23 @@
+import com.alibaba.fastjson.JSON;
+import com.dliyun.AlgorithmType;
+import com.dliyun.DefaultClient;
+import com.dliyun.Response;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Test {
+    public static void main(String[] args) throws Exception {
+        DefaultClient client = new DefaultClient(
+                "http://47.114.32.188:9800/router",
+                "220118010040",
+                "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDAqp2UEIDsV/cfm0TUvZ4oE7jwQpk6Im+P95IcqF/tIs+oSNjgXydATkcP2fZ1HdM25Uv1X8aoKr/8UuPdm2h3eODEeb3whcrMpNJ4M33FRD+3jZdg57UO6zX1P6omYRBRJDI1FI6ktpts+UYvcLvRv+pGiZmqsllwsptWriCeQQIDAQAB",
+                AlgorithmType.RSA
+        );
+        Map<String, Object> form1 = new HashMap<>();
+        form1.put("userName", "13666666666");
+        form1.put("password", "admin");
+        Response<Map<String, Object>> response = client.execute("oauth2.login", "1.0.0", form1);
+        System.out.println(JSON.toJSONString(response));
+    }
+}