developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
张善主
3427dcda 2 parents bc84b8f0 05e1d21e

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 4 changed files with 105 additions and 22 deletions
... ... @@ -22,6 +22,11 @@ export class Logger {
private static domain: number = 0xFF00;
private static prefix: string = 'SightApp';
private static format: string = `%{public}s, %{public}s`;
private static format_ext: string = `%{public}s`;
/**
* 暂时没找到限制大小相关文档，尝试4000是不行的，3500可以。可以后续优化
*/
private static CHUNK_SIZE: number = 3500;
static isDebug: boolean = true;
/**
... ... @@ -36,46 +41,113 @@ export class Logger {
}
static debug(...args: string[]) {
if(!Logger.isDebug){
if (!Logger.isDebug) {
return
}
hilog.debug(Logger.domain, Logger.prefix, Logger.format, args);
Logger.logContent(LogLevel.DEBUG, ...args)
}
static info(...args: string[]) {
if(!Logger.isDebug){
if (!Logger.isDebug) {
return
}
hilog.info(Logger.domain, Logger.prefix, Logger.format, args);
Logger.logContent(LogLevel.INFO, ...args)
}
static warn(...args: string[]) {
if(!Logger.isDebug){
if (!Logger.isDebug) {
return
}
hilog.warn(Logger.domain, Logger.prefix, Logger.format, args);
Logger.logContent(LogLevel.WARN, ...args)
}
static error(...args: string[]) {
if(!Logger.isDebug){
if (!Logger.isDebug) {
return
}
hilog.error(Logger.domain, Logger.prefix, Logger.format, args);
Logger.logContent(LogLevel.ERROR, ...args)
}
static fatal(...args: string[]) {
if(!Logger.isDebug){
if (!Logger.isDebug) {
return
}
hilog.fatal(Logger.domain, Logger.prefix, Logger.format, args);
Logger.logContent(LogLevel.FATAL, ...args)
}
static isLoggable(level: LogLevel) {
if(!Logger.isDebug){
if (!Logger.isDebug) {
return
}
// 判断是否打印 TODO
hilog.isLoggable(Logger.domain, Logger.prefix, level);
}
static logContent(level: LogLevel, ...args: string[]) {
let msg = Logger.getMsg(...args)
let length = msg.length
if (length < Logger.CHUNK_SIZE) {
// 不超限，保持原来的打印
Logger.print(level, ...args)
} else {
// 超限，分段打印
for (let i = 0; i < length; i += Logger.CHUNK_SIZE) {
let count = Math.min(length - i, Logger.CHUNK_SIZE);
Logger.printExt(level, msg.substring(i, i + count));
}
}
}
static print(level: LogLevel, ...msg: string[]) {
switch (level) {
case LogLevel.DEBUG:
hilog.debug(Logger.domain, Logger.prefix, Logger.format, msg);
break
case LogLevel.INFO:
hilog.info(Logger.domain, Logger.prefix, Logger.format, msg);
break
case LogLevel.WARN:
hilog.warn(Logger.domain, Logger.prefix, Logger.format, msg);
break
case LogLevel.ERROR:
hilog.error(Logger.domain, Logger.prefix, Logger.format, msg);
break
case LogLevel.FATAL:
hilog.fatal(Logger.domain, Logger.prefix, Logger.format, msg);
break
}
}
static printExt(level: LogLevel, msg: string) {
switch (level) {
case LogLevel.DEBUG:
hilog.debug(Logger.domain, Logger.prefix, Logger.format_ext, msg);
break
case LogLevel.INFO:
hilog.info(Logger.domain, Logger.prefix, Logger.format_ext, msg);
break
case LogLevel.WARN:
hilog.warn(Logger.domain, Logger.prefix, Logger.format_ext, msg);
break
case LogLevel.ERROR:
hilog.error(Logger.domain, Logger.prefix, Logger.format_ext, msg);
break
case LogLevel.FATAL:
hilog.fatal(Logger.domain, Logger.prefix, Logger.format_ext, msg);
break
}
}
static getMsg(...args: string[]): string {
if (args == null || args.length <= 0) {
return '';
}
let msg = ''
args.forEach((v) => {
msg = msg.concat(', ').concat(v)
})
return msg.substring(2, msg.length);
}
}
export default new Logger('SightApp', 0xFF00)
\ No newline at end of file
... ...
... ... @@ -12,8 +12,17 @@ export interface ResponseDTO<T = string> {
// 响应结果
data?: T;
/**
* @deprecated
*/
totalCount?: number;
meta?: MetaDTO;
// 请求响应时间戳（unix格式）
timestamp?: number;
}
export interface MetaDTO {
md5: string;
}
\ No newline at end of file
... ...
... ... @@ -38,6 +38,7 @@ instance.interceptors.request.use(
}
// 公共请求参数
// config.params.key = key
Logger.debug('HttpRequest', 'request: ' + config.url)
return config;
},
(error: AxiosError) => {
... ... @@ -85,9 +86,9 @@ instance.interceptors.response.use(// 响应拦截器response类型就是Axios.r
// return Promise.reject(new Error(message))
// }
// const data: ResponseBean<any> = response.data
Logger.debug('HttpRequest', 'response ======start======= ')
Logger.debug('HttpRequest', 'response ==============start=================')
Logger.debug('HttpRequest', 'response: ' + JSON.stringify(response.data))
Logger.debug('HttpRequest', 'response ======end======= ')
Logger.debug('HttpRequest', 'response ==============end=================')
// 改造返回的数据，即将AxiosResponse的data返回,服务端返回的数据
return response.data;
} else {
... ... @@ -102,7 +103,7 @@ instance.interceptors.response.use(// 响应拦截器response类型就是Axios.r
// console.log(error.request)
// console.log(error.response)
// 这里用来处理http常见错误，进行全局提示
if(error!=null && error.response!=null ){
if (error != null && error.response != null) {
let message = buildErrorMsg(error.response.status);
// 错误消息可以使用全局弹框展示出来
console.log(`httpStatus:${error.response?.status}-${message}，请检查网络或联系管理员！`)
... ...
... ... @@ -125,14 +125,15 @@ export struct PageComponent {
this.pageModel.groupId = this.pageId;
this.pageModel.channelId = this.channelId;
this.pageModel.currentPage = 1;
let pageInfo = await PageViewModel.getPageInfo(this.pageModel.pageId);
if (pageInfo == null) {
this.pageModel.viewType = ViewType.EMPTY;
return;
}
this.pageModel.pageInfo = pageInfo;
this.pageModel.loadStrategy = 1
PageHelper.parseGroup(this.pageModel)
PageHelper.getInitData(this.pageModel)
// let pageInfo = await PageViewModel.getPageInfo(this.pageModel.pageId);
// if (pageInfo == null) {
// this.pageModel.viewType = ViewType.EMPTY;
// return;
// }
// this.pageModel.pageInfo = pageInfo;
// this.pageModel.loadStrategy = 1
// PageHelper.parseGroup(this.pageModel)
}
}
... ...