增加统一数据返回和请求UA和异常枚举
This commit is contained in:
parent
682a432afe
commit
9c26896da3
12
pom.xml
12
pom.xml
@ -32,6 +32,18 @@
|
|||||||
<artifactId>spring-boot-starter-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- httpclient -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
|
<artifactId>httpclient</artifactId>
|
||||||
|
<version>4.5.13</version>
|
||||||
|
</dependency>
|
||||||
|
<!--Hutool utils-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>cn.hutool</groupId>
|
||||||
|
<artifactId>hutool-all</artifactId>
|
||||||
|
<version>5.7.12</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -0,0 +1,19 @@
|
|||||||
|
package com.dnslin.onemanagerjava.controller.api;
|
||||||
|
|
||||||
|
import org.springframework.web.bind.annotation.CrossOrigin;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServlet;
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/api")
|
||||||
|
@CrossOrigin
|
||||||
|
public class CallbackController {
|
||||||
|
@GetMapping("/auth")
|
||||||
|
public void authCallback(HttpServletRequest request){
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
24
src/main/java/com/dnslin/onemanagerjava/result/R.java
Normal file
24
src/main/java/com/dnslin/onemanagerjava/result/R.java
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
package com.dnslin.onemanagerjava.result;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Builder;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
|
@Builder
|
||||||
|
// 创建统一的返回格式
|
||||||
|
public class R<T> {
|
||||||
|
|
||||||
|
private String code;
|
||||||
|
private String message;
|
||||||
|
private T data;
|
||||||
|
|
||||||
|
public R(ResponseEnum responseEnum, T data) {
|
||||||
|
this.code = responseEnum.getCode();
|
||||||
|
this.message = responseEnum.getMessage();
|
||||||
|
this.data = data;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,38 @@
|
|||||||
|
package com.dnslin.onemanagerjava.result;
|
||||||
|
|
||||||
|
public enum ResponseEnum {
|
||||||
|
|
||||||
|
SUCCESS("200","success"),
|
||||||
|
SYSTEM_ERROR("500","发生未知异常。。。"),
|
||||||
|
SK_BUSY("4001","网络故障"),
|
||||||
|
ID_NOTFOUND("4002","状态错误"),
|
||||||
|
LIST_ERROR("4003","数据格式异常"),
|
||||||
|
Cookie_not_found("4004","Cookie获取失败"),
|
||||||
|
Token_invalid("4005","Token失效"),
|
||||||
|
PARAMETERS_ARE_MISSING("4006","参数缺失");
|
||||||
|
|
||||||
|
|
||||||
|
private String code;
|
||||||
|
private String message;
|
||||||
|
|
||||||
|
public String getCode() {
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCode(String code) {
|
||||||
|
this.code = code;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMessage() {
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMessage(String message) {
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
|
||||||
|
ResponseEnum(String code, String message) {
|
||||||
|
this.code = code;
|
||||||
|
this.message = message;
|
||||||
|
}
|
||||||
|
}
|
24
src/main/java/com/dnslin/onemanagerjava/result/UA.java
Normal file
24
src/main/java/com/dnslin/onemanagerjava/result/UA.java
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
package com.dnslin.onemanagerjava.result;
|
||||||
|
|
||||||
|
import lombok.ToString;
|
||||||
|
|
||||||
|
@ToString
|
||||||
|
public enum UA {
|
||||||
|
PC("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.92 Safari/537.36"),
|
||||||
|
MOBILE("Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.92 Mobile Safari/537.36"),
|
||||||
|
QQ("Mozilla/5.0 (Linux; Android 10; V1914A Build/QP1A.190711.020; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.126 MQQBrowser/6.2 TBS/045132 Mobile Safari/537.36 V1_AND_SQ_8.3.0_1362_YYB_D QQ/8.3.0.4480 NetType/4G WebP/0.3.0 Pixel/1080 StatusBarHeight/85 SimpleUISwitch/0 QQTheme/1000");
|
||||||
|
|
||||||
|
private String value;
|
||||||
|
|
||||||
|
public String getValue() {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setValue(String value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
UA(String value) {
|
||||||
|
this.value = value;
|
||||||
|
}
|
||||||
|
}
|
40
src/main/resources/application-dev.yaml
Normal file
40
src/main/resources/application-dev.yaml
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
druid:
|
||||||
|
url: jdbc:mysql://121.5.246.216:3309/tb_phone?useUnicode=true&characterEncoding=utf-8&useSSL=false
|
||||||
|
driver-class-name: com.mysql.jdbc.Driver
|
||||||
|
username: root
|
||||||
|
password: catchers.tech123
|
||||||
|
initial-size: 10
|
||||||
|
max-active: 50
|
||||||
|
min-idle: 10
|
||||||
|
max-wait: 60000
|
||||||
|
pool-prepared-statements: true
|
||||||
|
max-pool-prepared-statement-per-connection-size: 20
|
||||||
|
validation-query: SELECT 1 FROM DUAL
|
||||||
|
redis:
|
||||||
|
host: 121.5.246.216
|
||||||
|
port: 6379
|
||||||
|
database: 0
|
||||||
|
password: "catchers.tech"
|
||||||
|
lettuce:
|
||||||
|
pool:
|
||||||
|
max-active: 20 #最大连接数,负值表示没有限制,默认8
|
||||||
|
max-wait: -1 #最大阻塞等待时间,负值表示没限制,默认-1
|
||||||
|
max-idle: 8 #最大空闲连接,默认8
|
||||||
|
min-idle: 0 #最小空闲连接,默认0
|
||||||
|
devtools:
|
||||||
|
restart:
|
||||||
|
additional-paths: src/main/java
|
||||||
|
logging:
|
||||||
|
level:
|
||||||
|
root: info
|
||||||
|
com.dnslin.dnslin_api: debug
|
||||||
|
config:
|
||||||
|
amap:
|
||||||
|
key: "04f8bd06a2a5390ba589d6c0fb9bd3cf"
|
||||||
|
privateKey: "9acba11d0c58ea7c10cad6ecbe19880b"
|
||||||
|
Ipstack:
|
||||||
|
Ipstackkey: "b6a76bd77214348a9a60ad29b51cac9a"
|
||||||
|
server:
|
||||||
|
port: 5678
|
@ -1,2 +1,16 @@
|
|||||||
server:
|
spring:
|
||||||
port: 5678
|
profiles:
|
||||||
|
active: dev
|
||||||
|
|
||||||
|
# 显示名称
|
||||||
|
# onemanager
|
||||||
|
# 应用程序(客户端) ID
|
||||||
|
# 2ddd8ff9-1137-407b-91a0-58c4dc661968
|
||||||
|
# 对象 ID
|
||||||
|
# 92ad486a-276e-41c7-8ecd-009323079221
|
||||||
|
# 目录(租户) ID
|
||||||
|
# 621017da-95f3-45a6-a020-fbd90fdbdbbf
|
||||||
|
# value
|
||||||
|
# Txh7Q~AO2lgOqLCrjdB52k44LejSjGmJrr.6A
|
||||||
|
# 机密 ID
|
||||||
|
# ee1f9e72-73e8-4023-ab10-fd6ed212cb4b
|
7
src/main/resources/config.properties
Normal file
7
src/main/resources/config.properties
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
jdbc.driverClass=com.mysql.jdbc.Driver
|
||||||
|
jdbc.url=jdbc:mysql://121.5.246.216:3309/tb_phone?useUnicode=true&characterEncoding=utf-8&useSSL=false
|
||||||
|
jdbc.user=root
|
||||||
|
jdbc.password=catchers.tech123
|
||||||
|
|
||||||
|
group.package=com.dnslin.dnslin_api
|
||||||
|
catalog.name=tb_phone
|
57
src/main/resources/generatorConfig.xml
Normal file
57
src/main/resources/generatorConfig.xml
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE generatorConfiguration
|
||||||
|
PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
|
||||||
|
|
||||||
|
<generatorConfiguration>
|
||||||
|
<properties resource="config.properties"/>
|
||||||
|
<context id="testTables" targetRuntime="MyBatis3">
|
||||||
|
<property name="javaFileEncoding" value="UTF-8"></property>
|
||||||
|
<property name="beginningDelimiter" value="`"/>
|
||||||
|
<property name="endingDelimiter" value="`"/>
|
||||||
|
<property name="lombok" value="Getter,Setter,ToString,Accessors"/>
|
||||||
|
<commentGenerator>
|
||||||
|
<!-- 是否去除自动生成的注释 true:是 : false:否 -->
|
||||||
|
<property name="suppressAllComments" value="true" />
|
||||||
|
</commentGenerator>
|
||||||
|
<!--数据库连接的信息:驱动类、连接地址、用户名、密码 -->
|
||||||
|
<jdbcConnection driverClass="${jdbc.driverClass}"
|
||||||
|
connectionURL="${jdbc.url}"
|
||||||
|
userId="${jdbc.user}"
|
||||||
|
password="${jdbc.password}">
|
||||||
|
</jdbcConnection>
|
||||||
|
|
||||||
|
<!-- 默认false,把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer,为 true时把JDBC DECIMAL 和
|
||||||
|
NUMERIC 类型解析为java.math.BigDecimal -->
|
||||||
|
<javaTypeResolver>
|
||||||
|
<property name="forceBigDecimals" value="false" />
|
||||||
|
</javaTypeResolver>
|
||||||
|
|
||||||
|
<!-- targetProject:生成PO类的位置 -->
|
||||||
|
<javaModelGenerator targetPackage="${group.package}.pojo"
|
||||||
|
targetProject="src/main/java">
|
||||||
|
<!-- enableSubPackages:是否让schema作为包的后缀 -->
|
||||||
|
<property name="enableSubPackages" value="false" />
|
||||||
|
<!-- 从数据库返回的值被清理前后的空格 -->
|
||||||
|
<property name="trimStrings" value="true" />
|
||||||
|
</javaModelGenerator>
|
||||||
|
<!-- targetProject:mapper映射文件生成的位置 -->
|
||||||
|
<sqlMapGenerator targetPackage="mapper"
|
||||||
|
targetProject="src/main/resources">
|
||||||
|
<!-- enableSubPackages:是否让schema作为包的后缀 -->
|
||||||
|
<property name="enableSubPackages" value="false" />
|
||||||
|
</sqlMapGenerator>
|
||||||
|
<!-- targetPackage:mapper接口生成的位置 -->
|
||||||
|
<javaClientGenerator type="XMLMAPPER"
|
||||||
|
targetPackage="${group.package}.mapper"
|
||||||
|
targetProject="src/main/java">
|
||||||
|
<!-- enableSubPackages:是否让schema作为包的后缀 -->
|
||||||
|
<property name="enableSubPackages" value="false" />
|
||||||
|
</javaClientGenerator>
|
||||||
|
<!-- 指定数据库表 -->
|
||||||
|
<table schema="" tableName="%"></table>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</context>
|
||||||
|
</generatorConfiguration>
|
Loading…
Reference in New Issue
Block a user