Merge branch 'yingdesai' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into lvleigang

 Conflicts:
	service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java
This commit is contained in:
lvleigang 2024-05-15 08:36:59 +08:00
commit 7ea7351c33
6 changed files with 179 additions and 0 deletions

View File

@ -69,6 +69,18 @@
<profile.active>llg</profile.active>
</properties>
</profile>
<profile>
<id>xel</id> <!--相二林-->
<properties>
<profile.active>xel</profile.active>
</properties>
</profile>
<profile>
<id>ydc</id> <!--英德赛-->
<properties>
<profile.active>ydc</profile.active>
</properties>
</profile>
</profiles>
<build>
<finalName>kangarooDataCenterV3</finalName>

View File

@ -0,0 +1,21 @@
#######################本地环境#######################
logging:
#日志级别 指定目录级别
level:
root: info
encodings: UTF-8
file:
# 日志保存路径
path: /Users/xiangerlin/work/app/logs/ydc
spring:
datasource:
dynamic:
datasource:
master:
url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
username: root
password: bd993088e8a7c3dc5f44441617f9b4bf
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
savefile:
# 文件保存路径
path: /Users/xiangerlin/work/app/logs/ydc

View File

@ -0,0 +1,21 @@
#######################本地环境#######################
logging:
#日志级别 指定目录级别
level:
root: info
encodings: UTF-8
file:
# 日志保存路径
path: /Users/xiangerlin/work/app/logs/ydc
spring:
datasource:
dynamic:
datasource:
master:
url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
username: root
password: bd993088e8a7c3dc5f44441617f9b4bf
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
savefile:
# 文件保存路径
path: /Users/xiangerlin/work/app/logs/ydc

View File

@ -72,4 +72,6 @@ mybatis-plus:
global-config:
db-config:
id-type: auto # 主键策略
ax:
url:

View File

@ -0,0 +1,89 @@
package com.hzya.frame.u8.dto;
import com.alibaba.fastjson.annotation.JSONField;
/**
* @Description u8返回对象
* @Author xiangerlin
* @Date 2024/5/14 15:40
**/
public class U8ResponseDTO {
@JSONField(name = "Flag")
private String flag;
@JSONField(name = "DataOne")
private String dataOne;
@JSONField(name = "DataTwo")
private String dataTwo;
@JSONField(name = "Msg")
private String msg;
//如果co初始化失败或者token不对的时候会返回这些信息
private String code;
private String success;
private String message;
private String data;
public String getFlag() {
return flag;
}
public void setFlag(String flag) {
this.flag = flag;
}
public String getDataOne() {
return dataOne;
}
public void setDataOne(String dataOne) {
this.dataOne = dataOne;
}
public String getDataTwo() {
return dataTwo;
}
public void setDataTwo(String dataTwo) {
this.dataTwo = dataTwo;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getSuccess() {
return success;
}
public void setSuccess(String success) {
this.success = success;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getData() {
return data;
}
public void setData(String data) {
this.data = data;
}
}

View File

@ -0,0 +1,34 @@
package com.hzya.frame.u8.util;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import com.hzya.frame.u8.dto.U8ResponseDTO;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
/**
* @Description
* @Author xiangerlin
* @Date 2024/5/14 15:30
**/
public class U8Util {
static Logger logger = LogManager.getLogger(U8Util.class);
//获取token
public static String getToken() {
String url = "/Api/Base/GetToken";
JSONObject jsonObject = new JSONObject();
jsonObject.put("secretkey", "L1NhkDrQhtBDzTxFxPI0jxWcBzTBSPvaI5xZusRRi9ofS9d6ngxrj1erwbdjxtUT");
logger.info("获取U8token参数:{}", jsonObject.toJSONString());
String token = HttpRequest.post( url).body(jsonObject.toJSONString()).timeout(60000).execute().body();
logger.info("token返回参数:{}", jsonObject.toJSONString());
if (StrUtil.isNotEmpty(token)) {
U8ResponseDTO u8ResponseDTO = JSONObject.parseObject(token, U8ResponseDTO.class);
return u8ResponseDTO.getMessage();
}
return token;
}
}