日志丰富功能 #20

Open
huaijin wants to merge 53 commits from qinxinqi/reposync:huaijin into master
12 changed files with 36 additions and 33 deletions
Showing only changes of commit 5707198c7b - Show all commits

View File

@ -1,5 +1,10 @@
FROM centos:7
RUN yum install -y wget && \
mv /etc/yum.repos.d/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo.bak && \
wget -O /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-7.repo && \
yum clean all && yum makecache
RUN yum update -y && \
yum install -y wget gcc make openssl-devel bzip2-devel libffi-devel zlib-devel
RUN wget -P /data/ob-tool https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tgz

View File

@ -1,4 +1,3 @@
--
CREATE TABLE IF NOT EXISTS `sync_repo_mapping` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
@ -13,7 +12,6 @@ CREATE TABLE IF NOT EXISTS `sync_repo_mapping` (
UNIQUE KEY (`repo_name`)
) DEFAULT CHARACTER SET = utf8mb4 COMMENT = '同步仓库映射表';
--
CREATE TABLE IF NOT EXISTS `sync_branch_mapping`(
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
@ -26,7 +24,6 @@ CREATE TABLE IF NOT EXISTS `sync_branch_mapping`(
PRIMARY KEY (`id`)
) DEFAULT CHARACTER SET = utf8mb4 COMMENT = '同步分支映射表';
--
CREATE TABLE IF NOT EXISTS `repo_sync_log`(
`id` bigint unsigned NOT NULL AUTO_INCREMENT,

View File

@ -33,18 +33,18 @@ buc_key and ConfigsUtil.set_obfastapi_config('buc_key', buc_key)
DB_ENV = getenv('DB_ENV', 'test_env')
DB = {
'test_env': {
'host': getenv('CEROBOT_MYSQL_HOST', ''),
'port': getenv('CEROBOT_MYSQL_PORT', 2883, int),
'user': getenv('CEROBOT_MYSQL_USER', ''),
'passwd': getenv('CEROBOT_MYSQL_PWD', ''),
'dbname': getenv('CEROBOT_MYSQL_DB', '')
'host': getenv('CEROBOT_MYSQL_HOST', 'localhost'),
'port': getenv('CEROBOT_MYSQL_PORT', 3306, int),
'user': getenv('CEROBOT_MYSQL_USER', 'root'),#就在这里配置数据库
'passwd': getenv('CEROBOT_MYSQL_PWD', '200915qxq'),
'dbname': getenv('CEROBOT_MYSQL_DB', 'reposyncer')
},
'local': {
'host': getenv('CEROBOT_MYSQL_HOST', ''),
'port': getenv('CEROBOT_MYSQL_PORT', 2881, int),
'user': getenv('CEROBOT_MYSQL_USER', ''),
'passwd': getenv('CEROBOT_MYSQL_PWD', ''),
'dbname': getenv('CEROBOT_MYSQL_DB', '')
'host': getenv('CEROBOT_MYSQL_HOST', 'localhost'),
'port': getenv('CEROBOT_MYSQL_PORT', 3306, int),
'user': getenv('CEROBOT_MYSQL_USER', 'root'),
'passwd': getenv('CEROBOT_MYSQL_PWD', '200915qxq'),
'dbname': getenv('CEROBOT_MYSQL_DB', 'reposyncer')
}
}

View File

@ -1,5 +1,5 @@
// @ts-nocheck
import { createBrowserHistory, History } from '/root/ob-repository-synchronize/web/node_modules/umi/node_modules/@umijs/runtime';
import { createBrowserHistory, History } from 'D:/SEM/reposync/web/node_modules/umi/node_modules/@umijs/runtime';
let options = {
"basename": "/"

View File

@ -1,5 +1,5 @@
// @ts-nocheck
import { Plugin } from '/root/ob-repository-synchronize/web/node_modules/umi/node_modules/@umijs/runtime';
import { Plugin } from 'D:/SEM/reposync/web/node_modules/umi/node_modules/@umijs/runtime';
const plugin = new Plugin({
validKeys: ['modifyClientRenderOpts','patchRoutes','rootContainer','render','onRouteChange','__mfsu','getInitialState','initialStateConfig','request',],

View File

@ -1,6 +1,6 @@
// @ts-nocheck
import React from 'react';
import { ApplyPluginsType } from '/root/ob-repository-synchronize/web/node_modules/umi/node_modules/@umijs/runtime';
import { ApplyPluginsType, dynamic } from 'D:/SEM/reposync/web/node_modules/umi/node_modules/@umijs/runtime';
import * as umiExports from './umiExports';
import { plugin } from './plugin';
@ -8,7 +8,7 @@ export function getRoutes() {
const routes = [
{
"path": "/",
"component": require('@/layouts/index').default,
"component": dynamic({ loader: () => import(/* webpackChunkName: 'layouts__index' */'@/layouts/index')}),
"routes": [
{
"path": "/",
@ -18,28 +18,28 @@ export function getRoutes() {
{
"name": "同步工程管理",
"path": "/obrobot/project",
"component": require('@/pages/project/index').default,
"component": dynamic({ loader: () => import(/* webpackChunkName: 'p__project__index' */'@/pages/project/index')}),
"exact": true,
"icon": "project"
},
{
"name": "同步流",
"path": "/obrobot/project/process",
"component": require('@/pages/process/index').default,
"component": dynamic({ loader: () => import(/* webpackChunkName: 'p__process__index' */'@/pages/process/index')}),
"exact": true,
"hideInMenu": true
},
{
"name": "Pull Request",
"path": "/obrobot/project/pull_request",
"component": require('@/pages/pullRequest/index').default,
"component": dynamic({ loader: () => import(/* webpackChunkName: 'p__pullRequest__index' */'@/pages/pullRequest/index')}),
"exact": true,
"hideInMenu": true
},
{
"name": "Github 关联账号管理",
"path": "/obrobot/account",
"component": require('@/pages/account/index').default,
"component": dynamic({ loader: () => import(/* webpackChunkName: 'p__account__index' */'@/pages/account/index')}),
"exact": true,
"icon": "account"
}

View File

@ -1,3 +1,3 @@
// @ts-nocheck
// @ts-ignore
export { Helmet } from '/root/ob-repository-synchronize/web/node_modules/react-helmet';
export { Helmet } from 'D:/SEM/reposync/web/node_modules/react-helmet';

View File

@ -1,7 +1,7 @@
// @ts-nocheck
// @ts-ignore
import { InitialState as InitialStateType } from '../plugin-initial-state/models/initialState';
import { InitialState as InitialStateType } from '../plugin-initial-state\models\initialState';
export type InitialState = InitialStateType;
export const __PLUGIN_INITIAL_STATE = 1;

View File

@ -1,7 +1,7 @@
// @ts-nocheck
import React from 'react';
import initialState from '/root/ob-repository-synchronize/web/src/.umi/plugin-initial-state/models/initialState';
import model0 from "/root/ob-repository-synchronize/web/src/models/global";
import initialState from 'D:/SEM/reposync/web/src/.umi/plugin-initial-state/models/initialState';
import model0 from "D:/SEM/reposync/web/src/models/global";
// @ts-ignore
import Dispatcher from './helpers/dispatcher';
// @ts-ignore

View File

@ -1,7 +1,7 @@
// @ts-nocheck
import { useState, useEffect, useContext, useRef } from 'react';
// @ts-ignore
import isEqual from '/root/ob-repository-synchronize/web/node_modules/@umijs/plugin-model/node_modules/fast-deep-equal/index.js';
import isEqual from 'D:/SEM/reposync/web/node_modules/@umijs/plugin-model/node_modules/fast-deep-equal/index.js';
// @ts-ignore
import { UmiContext } from './helpers/constant';
import { Model, models } from './Provider';

View File

@ -1,6 +1,6 @@
// @ts-nocheck
/**
* Base on https://github.com/umijs//root/ob-repository-synchronize/web/node_modules/umi-request
* Base on https://github.com/umijs/D:/SEM/reposync/web/node_modules/umi-request
*/
import {
extend,
@ -13,7 +13,7 @@ import {
RequestResponse,
RequestInterceptor,
ResponseInterceptor,
} from '/root/ob-repository-synchronize/web/node_modules/umi-request';
} from 'D:/SEM/reposync/web/node_modules/umi-request';
// @ts-ignore
import { ApplyPluginsType } from 'umi';
@ -22,7 +22,7 @@ import { history, plugin } from '../core/umiExports';
// decoupling with antd UI library, you can using `alias` modify the ui methods
// @ts-ignore
import { message, notification } from '@umijs/plugin-request/lib/ui';
import useUmiRequest, { UseRequestProvider } from '/root/ob-repository-synchronize/web/node_modules/@ahooksjs/use-request';
import useUmiRequest, { UseRequestProvider } from 'D:/SEM/reposync/web/node_modules/@ahooksjs/use-request';
import {
BaseOptions,
BasePaginatedOptions,
@ -38,7 +38,7 @@ import {
PaginatedOptionsWithFormat,
PaginatedParams,
PaginatedResult,
} from '/root/ob-repository-synchronize/web/node_modules/@ahooksjs/use-request/lib/types';
} from 'D:/SEM/reposync/web/node_modules/@ahooksjs/use-request/lib/types';
type ResultWithData<T = any> = { data?: T; [key: string]: any };

View File

@ -1,11 +1,11 @@
// @ts-nocheck
import './core/polyfill';
import '@@/core/devScripts';
import { plugin } from './core/plugin';
import './core/pluginRegister';
import { createHistory } from './core/history';
import { ApplyPluginsType } from '/root/ob-repository-synchronize/web/node_modules/umi/node_modules/@umijs/runtime';
import { renderClient } from '/root/ob-repository-synchronize/web/node_modules/@umijs/renderer-react/dist/index.js';
import { ApplyPluginsType } from 'D:/SEM/reposync/web/node_modules/umi/node_modules/@umijs/runtime';
import { renderClient } from 'D:/SEM/reposync/web/node_modules/@umijs/renderer-react/dist/index.js';
import { getRoutes } from './core/routes';
@ -23,6 +23,7 @@ const getClientRender = (args: { hot?: boolean; routes?: any[] } = {}) => plugin
plugin,
history: createHistory(args.hot),
isServer: process.env.__IS_SERVER,
dynamicImport: true,
rootElement: 'root',
defaultTitle: ``,
},