diff --git a/1 b/1 new file mode 100644 index 0000000..dec4ab3 --- /dev/null +++ b/1 @@ -0,0 +1 @@ +dfadfadf 123:21 diff --git a/README.md b/README.md index 7ad7cb2..9f0163e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # test-notify -test-notify description +test-notify description天翻地覆的奋斗换个身份回到三国花果山党纪国法的舒服的设计风格聚合多个设计规范建设的风刀霜剑更好的水果富含多少股份公司的华国锋黄金时代个风华绝代是个很过分 +xcdvsdfs diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..9a1559f --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,21 @@ +# Security 12313 Policy + +## Supported Versions + +Use this section to tell people about which versions of your project are +currently being supported with security updates. + +| Version | Supported | +| ------- | ------------------ | +| 5.1.x | :white_check_mark: | +| 5.0.x | :x: | +| 4.0.x | :white_check_mark: | +| < 4.0 | :x: | + +## Reporting a Vulnerability + +Use this section to tell people how to report a vulnerability. + +Tell them where to go, how often they can expect to get an update on a +reported vulnerability, what to expect if the vulnerability is accepted or +declined, etc. diff --git a/a b/a new file mode 100644 index 0000000..c9d0893 --- /dev/null +++ b/a @@ -0,0 +1,11 @@ + +1 +q +q +q + +q212312312313123423423411111 +123123123 +123123123 +qqweqweq + diff --git a/addT b/addT new file mode 100644 index 0000000..b4144d2 --- /dev/null +++ b/addT @@ -0,0 +1 @@ +qweqweqwe diff --git a/b b/b new file mode 100644 index 0000000..4fc7fc6 --- /dev/null +++ b/b @@ -0,0 +1,8 @@ +12312313123 +a +a +a +a +a +a + diff --git a/c b/c new file mode 100644 index 0000000..0ac3866 --- /dev/null +++ b/c @@ -0,0 +1 @@ +123123123 diff --git a/cba b/cba new file mode 100644 index 0000000..bf814ea --- /dev/null +++ b/cba @@ -0,0 +1 @@ +1231231:w11231231 diff --git a/cy-1 b/cy-1 new file mode 100644 index 0000000..726d6c4 --- /dev/null +++ b/cy-1 @@ -0,0 +1 @@ +1weqweqweqwewerwer diff --git a/cy-b-2 b/cy-b-2 new file mode 100644 index 0000000..56e948a --- /dev/null +++ b/cy-b-2 @@ -0,0 +1 @@ +adfasdfwerwer diff --git a/cy-c b/cy-c new file mode 100644 index 0000000..959fb2a --- /dev/null +++ b/cy-c @@ -0,0 +1 @@ +werwe diff --git a/d b/d new file mode 100644 index 0000000..3d4db09 --- /dev/null +++ b/d @@ -0,0 +1 @@ +123123 diff --git a/dssfs b/dssfs new file mode 100644 index 0000000..d63d82e --- /dev/null +++ b/dssfs @@ -0,0 +1,3 @@ +dsfsdfsd + +sdfsdfs diff --git a/fdfdshfgdsgfdhfdsghfdsghfsdgfgfgdsgdssdhhgsdgsdhgsddshgfdsgfdsgfdsfdsfdsfds b/fdfdshfgdsgfdhfdsghfdsghfsdgfgfgdsgdssdhhgsdgsdhgsddshgfdsgfdsgfdsfdsfdsfds new file mode 100644 index 0000000..4a263b3 --- /dev/null +++ b/fdfdshfgdsgfdhfdsghfdsghfsdgfgfgdsgdssdhhgsdgsdhgsddshgfdsgfdsgfdsfdsfdsfds @@ -0,0 +1,3 @@ +fdsfdsfdsf +sdfsdfds +sdfdsfds diff --git a/interface b/interface new file mode 100644 index 0000000..4998547 --- /dev/null +++ b/interface @@ -0,0 +1,571 @@ +[ +"a +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804111, +"is_award": false, +"labelRecords": [], +"line_code": "8f090150ed9150567bd030d259864f00fbaab42f_3560_3592", +"new_path": "src/storage/ob_partition_service.cpp", +"note": "3575行先写建partition的，这个后写pg的？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62581, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "123123132", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804112, +"is_award": false, +"labelRecords": [], +"line_code": "67acc69e003957a146846e9493cee96e1aa5c402_487_488", +"new_path": "src/storage/ob_partition_store.cpp", +"note": "改成强制打印把", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62583, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804113, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_148_155", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "强制打印", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62590, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804114, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_179_183", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "为啥加写锁？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62593, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804115, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_378_511", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "FLOG_INFO就可以了", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62609, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804116, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_490_633", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "replay是不是别上锁了？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62610, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804117, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_889_1053", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "memtable这个单个partition还留着？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62613, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804118, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_1108_1277", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "下面还在push memtable的话，这里读锁不够吧？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62616, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804119, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_1154_1323", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "同上，等明天和惟学对下", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62618, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804120, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_1488_1689", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "得找惟学了解下mutex、bucket_lock、lock的关系。", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62623, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804121, +"is_award": false, +"labelRecords": [], +"line_code": "9f9161a3e4189c4d499cf703210b9fe1cef60fc5_372_412", +"new_path": "src/storage/ob_pg_storage.h", +"note": "mutex和bucket_lock是不是留一个？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62626, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804122, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_2947_3339", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "不要的删了吧？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62629, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804123, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_3036_3475", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "第一个会不会可能偏大？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62630, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804124, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_3117_3690", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "什么时候需要parittion_store的log_seq", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62633, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", +"author_extern_uid": "61382", +"author_id": 920, +"author_name": "永乐", +"author_state": "active", +"author_username": "yongle.xh", +"closed": 1, +"created_at": "2019-03-21T22:47:19+08:00", +"id": 20804125, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_907_1071", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "bucket guard是不是加下？", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62634, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-21T22:47:19+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/109030.jpg", +"author_extern_uid": "109030", +"author_id": 37482, +"author_name": "惟学", +"author_state": "active", +"author_username": "weixue.cx", +"closed": 0, +"created_at": "2019-03-22T12:02:45+08:00", +"id": 20815251, +"is_award": false, +"labelRecords": [], +"line_code": "8f090150ed9150567bd030d259864f00fbaab42f_3560_3592", +"new_path": "src/storage/ob_partition_service.cpp", +"note": "是的，这个其实是写的pg_meta", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62843, +"parent_note_id": 20804111, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-22T12:02:45+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/109030.jpg", +"author_extern_uid": "109030", +"author_id": 37482, +"author_name": "惟学", +"author_state": "active", +"author_username": "weixue.cx", +"closed": 0, +"created_at": "2019-03-22T12:02:45+08:00", +"id": 20815252, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_907_1071", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "是的，主要是为了判断is_removed，否则是不用加的", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62854, +"parent_note_id": 20804125, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-22T12:02:45+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/109030.jpg", +"author_extern_uid": "109030", +"author_id": 37482, +"author_name": "惟学", +"author_state": "active", +"author_username": "weixue.cx", +"closed": 0, +"created_at": "2019-03-22T12:02:45+08:00", +"id": 20815253, +"is_award": false, +"labelRecords": [], +"line_code": "9f9161a3e4189c4d499cf703210b9fe1cef60fc5_372_412", +"new_path": "src/storage/ob_pg_storage.h", +"note": "是的", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62855, +"parent_note_id": 20804121, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-22T12:02:45+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/109030.jpg", +"author_extern_uid": "109030", +"author_id": 37482, +"author_name": "惟学", +"author_state": "active", +"author_username": "weixue.cx", +"closed": 0, +"created_at": "2019-03-22T12:02:45+08:00", +"id": 20815254, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_179_183", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "typo", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62858, +"parent_note_id": 20804114, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-22T12:02:45+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/109030.jpg", +"author_extern_uid": "109030", +"author_id": 37482, +"author_name": "惟学", +"author_state": "active", +"author_username": "weixue.cx", +"closed": 0, +"created_at": "2019-03-22T12:02:45+08:00", +"id": 20815255, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_378_511", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "好的", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62859, +"parent_note_id": 20804115, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-22T12:02:45+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/109030.jpg", +"author_extern_uid": "109030", +"author_id": 37482, +"author_name": "惟学", +"author_state": "active", +"author_username": "weixue.cx", +"closed": 0, +"created_at": "2019-03-22T12:02:45+08:00", +"id": 20815256, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_490_633", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "感觉是不用，不过看partition_store都上了，就也上了", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62863, +"parent_note_id": 20804116, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-22T12:02:45+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/109030.jpg", +"author_extern_uid": "109030", +"author_id": 37482, +"author_name": "惟学", +"author_state": "active", +"author_username": "weixue.cx", +"closed": 0, +"created_at": "2019-03-22T12:02:45+08:00", +"id": 20815257, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_889_1053", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "这个后面再改", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 62870, +"parent_note_id": 20804117, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-22T12:02:45+08:00" +}, +{ +"author_avatar_url": "https://work.alibaba-inc.com/photo/109030.jpg", +"author_extern_uid": "109030", +"author_id": 37482, +"author_name": "惟学", +"author_state": "active", +"author_username": "weixue.cx", +"closed": 0, +"created_at": "2019-03-22T15:41:01+08:00", +"id": 20824530, +"is_award": false, +"labelRecords": [], +"line_code": "7cc2afc0210cc910d5fb9e50f774b4d16f00157b_3117_3690", +"new_path": "src/storage/ob_pg_storage.cpp", +"note": "建完pg partition需要设一下", +"noteable_id": 1208048, +"noteable_type": "MergeRequest", +"notes_draft_id": 63082, +"parent_note_id": 20804124, +"project_id": 38321, +"range_context": "0 425781", +"system": false, +"updated_at": "2019-03-22T15:41:01+08:00" +} +] +// 20190322170922 +// https://code.aone.alibaba-inc.com/api/v3/projects/38321/merge_request/1208048/inline_comments?_input_charset=utf-8 +​ +[ + { + "author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", + "author_extern_uid": "61382", + "author_id": 920, + "author_name": "永乐", + "author_state": "active", + "author_username": "yongle.xh", + "closed": 1, + "created_at": "2019-03-21T22:47:19+08:00", + "id": 20804111, + "is_award": false, + "labelRecords": [ + + ], + "line_code": "8f090150ed9150567bd030d259864f00fbaab42f_3560_3592", + "new_path": "src/storage/ob_partition_service.cpp", + "note": "3575行先写建partition的，这个后写pg的？", + "noteable_id": 1208048, + "noteable_type": "MergeRequest", + "notes_draft_id": 62581, + "project_id": 38321, + "range_context": "0 425781", + "system": false, + "updated_at": "2019-03-21T22:47:19+08:00" + }, + { + "author_avatar_url": "https://work.alibaba-inc.com/photo/61382.jpg", + "author_extern_uid": "61382", + "author_id": 920, + "author_name": "永乐", + "author_state": "active", + "author_username": "yongle.xh", + "closed": 1, + "created_at": "2019-03-21T22:47:19+08:00", + "id": 20804112, diff --git a/new1 b/new1 new file mode 100644 index 0000000..67a376d --- /dev/null +++ b/new1 @@ -0,0 +1,12 @@ +isdfaf23123 +123131 +123123123 +1231231 +1231231 + +123 +a +a +a +a +a diff --git a/new2 b/new2 new file mode 100644 index 0000000..5178d38 --- /dev/null +++ b/new2 @@ -0,0 +1,2 @@ +12312321312 +123123 diff --git a/pom.xml b/pom.xml index 78e2f0c..be202f2 100644 --- a/pom.xml +++ b/pom.xml @@ -2,11 +2,46 @@ - 4.0.0 + 4.0.1 chenyan19209219 test-notify 1.0-SNAPSHOT + + + + org.mybatis + mybatis + ${mybatis.version} + provided + + + org.springframework + spring-context + ${spring.version} + provided + + + org.springframework + spring-jdbc + ${spring.version} + provided + + + org.springframework.batch + spring-batch-infrastructure + ${spring-batch.version} + provided + + + + javax.servlet + javax.servlet-api + 4.0.1 + test + - \ No newline at end of file + + + diff --git a/src/main/java/20190130160210.png b/src/main/java/20190130160210.png new file mode 100644 index 0000000..c768a44 Binary files /dev/null and b/src/main/java/20190130160210.png differ diff --git a/src/main/java/AddFile b/src/main/java/AddFile index fda3502..dd4dff7 100644 --- a/src/main/java/AddFile +++ b/src/main/java/AddFile @@ -3,3 +3,4 @@ t e s t +123123 diff --git a/src/main/java/AddFile.java b/src/main/java/AddFile.java new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/java/AddFile.java @@ -0,0 +1 @@ + diff --git a/src/main/java/dsfds b/src/main/java/dsfds new file mode 100644 index 0000000..a7f0c40 --- /dev/null +++ b/src/main/java/dsfds @@ -0,0 +1,2 @@ +sadasd +fsdf diff --git a/src/main/java/exception/ErrorCode.java b/src/main/java/exception/ErrorCode.java index c4e67d3..55a5869 100644 --- a/src/main/java/exception/ErrorCode.java +++ b/src/main/java/exception/ErrorCode.java @@ -2,7 +2,7 @@ public interface ErrorCode { - int COMMON_ERROR_CODE_START = 0; + int COMMON_ERROR_CODE_START = 0123123123; int PLATFORM_ERROR_CODE_START = COMMON_ERROR_CODE_START + 1000; diff --git a/src/main/java/exception/hello b/src/main/java/exception/hello new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/java/exception/hello @@ -0,0 +1 @@ + diff --git a/src/main/java/hello-tree b/src/main/java/hello-tree new file mode 100644 index 0000000..243c020 --- /dev/null +++ b/src/main/java/hello-tree @@ -0,0 +1 @@ +12312313123 diff --git a/src/main/java/test-tree/new b/src/main/java/test-tree/new new file mode 100644 index 0000000..3d4db09 --- /dev/null +++ b/src/main/java/test-tree/new @@ -0,0 +1 @@ +123123 diff --git a/src/main/java/werwer b/src/main/java/werwer new file mode 100644 index 0000000..82d4e8a --- /dev/null +++ b/src/main/java/werwer @@ -0,0 +1 @@ +1231231 diff --git "a/src/main/java/\345\267\245\344\275\234.xmind" "b/src/main/java/\345\267\245\344\275\234.xmind" new file mode 100644 index 0000000..6e60bbf Binary files /dev/null and "b/src/main/java/\345\267\245\344\275\234.xmind" differ diff --git a/testProtectBranch.txt b/testProtectBranch.txt new file mode 100644 index 0000000..5f2f16b --- /dev/null +++ b/testProtectBranch.txt @@ -0,0 +1 @@ +1111 diff --git a/testamend.txt b/testamend.txt new file mode 100644 index 0000000..692d3d1 --- /dev/null +++ b/testamend.txt @@ -0,0 +1 @@ +werwerewr diff --git a/tree b/tree new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/tree @@ -0,0 +1 @@ + diff --git "a/\345\220\210\345\271\266\351\200\211\351\241\271.key" "b/\345\220\210\345\271\266\351\200\211\351\241\271.key" new file mode 100644 index 0000000..f7b89b6 Binary files /dev/null and "b/\345\220\210\345\271\266\351\200\211\351\241\271.key" differ