{"id":94268,"date":"2020-04-29T21:03:14","date_gmt":"2020-04-29T13:03:14","guid":{"rendered":"http:\/\/4563.org\/?p=94268"},"modified":"2020-04-29T21:03:14","modified_gmt":"2020-04-29T13:03:14","slug":"git-%e6%8f%90%e4%ba%a4%e4%bb%a3%e7%a0%81%e6%97%b6%e5%8f%91%e7%8e%b0%e6%8a%8a%e5%90%8c%e4%ba%8b%e7%9a%84%e4%bb%a3%e7%a0%81%e5%88%a0%e4%ba%86%ef%bc%8c-git-%e5%8d%b4%e6%b2%a1%e6%9c%89%e6%8f%90%e7%a4%ba-m","status":"publish","type":"post","link":"http:\/\/4563.org\/?p=94268","title":{"rendered":"git \u63d0\u4ea4\u4ee3\u7801\u65f6\u53d1\u73b0\u628a\u540c\u4e8b\u7684\u4ee3\u7801\u5220\u4e86\uff0c git \u5374\u6ca1\u6709\u63d0\u793a merging \u662f\u600e\u4e48\u56de\u4e8b\uff1f"},"content":{"rendered":"<div>\n<div>\n<div>\n<h1>                  git \u63d0\u4ea4\u4ee3\u7801\u65f6\u53d1\u73b0\u628a\u540c\u4e8b\u7684\u4ee3\u7801\u5220\u4e86\uff0c git \u5374\u6ca1\u6709\u63d0\u793a merging \u662f\u600e\u4e48\u56de\u4e8b\uff1f               <\/h1>\n<p> <\/p>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : 337136897 <\/span>  <span><i><\/i> 15<\/span> <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<\/p><\/div>\n<div isfirst=\"1\"> <\/p>\n<p>\u6539\u4e86 4 \u4e2a\u6587\u4ef6\uff0c\u7136\u540e \u4e00\u987f\u64cd\u4f5c\u5982\u4e0b\uff1a \u4e00\uff1a\u5148 pull \u4ee3\u7801 ,\u63d0\u793a\u6709\u4eba\u63d0\u4ea4\u8fc7\u4ee3\u7801<\/p>\n<pre><code>[email&#160;protected] MINGW64 \/c\/project\/chargespot-business-api (feature-init20200401) $ git pull remote: Enumerating objects: 852, done. remote: Counting objects: 100% (852\/852), done. remote: Compressing objects: 100% (340\/340), done. remote: Total 852 (delta 357), reused 748 (delta 312) Receiving objects: 100% (852\/852), 207.41 KiB | 131.00 KiB\/s, done. Resolving deltas: 100% (357\/357), completed with 11 local objects. From https:\/\/gitlab.charge-spot.com\/backend-group\/chargespot-business-api    7bb0b5eb..ae21cc9d  feature-init20200401 -&gt; origin\/feature-init20200401 error: Your local changes to the following files would be overwritten by merge:         business-device\/business-device-biz\/src\/main\/java\/com\/chargespot\/device\/service\/impl\/BatteryServiceImpl.java Please commit your changes or stash them before you merge. Aborting Updating 7bb0b5eb..ae21cc9d  <\/code><\/pre>\n<p>\u4e8c: add \u548c \u770b\u4e00\u4e0b status<\/p>\n<pre><code>[email&#160;protected] MINGW64 \/c\/project\/chargespot-business-api (feature-init20200401) $ git status On branch feature-init20200401 Your branch is behind 'origin\/feature-init20200401' by 61 commits, and can be fast-forwarded.   (use \"git pull\" to update your local branch)  Changes to be committed:   (use \"git restore --staged &lt;file&gt;...\" to unstage)         modified:   business-device\/business-device-biz\/src\/main\/java\/com\/chargespot\/device\/service\/impl\/BatteryServiceImpl.java <\/code><\/pre>\n<p>\u4e09:commit<\/p>\n<pre><code>[email&#160;protected] MINGW64 \/c\/project\/chargespot-business-api (feature-init20200401) $ git commit -m '\u53bb\u6389 log' [feature-init20200401 c3c59ecc] \u53bb\u6389 log  1 file changed, 2 deletions(-)  <\/code><\/pre>\n<p>\u56db\uff1acommit \u540e\u518d pull \u4e00\u4e0b<\/p>\n<pre><code>[email&#160;protected] MINGW64 \/c\/project\/chargespot-business-api (feature-init20200401) $ git pull Auto-merging business-device\/business-device-biz\/src\/main\/java\/com\/chargespot\/device\/service\/impl\/BatteryServiceImpl.java Merge made by the 'recursive' strategy.  ...\/device\/client\/DeviceOwnerRelClient.java        |   9 ++  ...\/fallback\/DeviceOwnerRelClientFallBack.java     |   5 +  ...\/com\/chargespot\/device\/dto\/DeviceModelDTO.java  |  18 +++  ...\/chargespot\/device\/vo\/ExportDeviceListVO.java   |   2 +-  business-device\/business-device-biz\/pom.xml        |   2 +-  ...\/device\/mapper\/DeviceOwnerRelMapper.java        |  11 ++  ...\/device\/service\/DeviceOwnerRelService.java      |   8 ++  ...\/device\/service\/impl\/BatteryServiceImpl.java    |   4 +-  ...\/service\/impl\/DeviceGroupServiceImpl.java       |   4 +-  ...\/service\/impl\/DeviceOperationsServiceImpl.java  |   2 +-  ...\/service\/impl\/DeviceOwnerRelServiceImpl.java    |  20 ++-  ...\/device\/service\/impl\/DeviceServiceImpl.java     |   8 +-  ...\/device\/web\/DeviceOwnerRelController.java       |   5 +  ...\/mapper\/extend\/DeviceOwnerRelMapperExtend.xml   |  18 ++-  ...\/chargespot\/move\/model\/BusinessDeviceRelVO.java |   3 +  ...\/move\/service\/impl\/CabinetGroupServiceImpl.java |   2 +-  ...\/service\/impl\/MemberCouponsServiceImpl.java     |  55 ++++----  ...\/move\/service\/impl\/MoveServiceImpl.java         |  61 +++++----  ...\/mapper\/extend\/CabinetMapperExtend.xml          |   3 +-  ...\/mapper\/extend\/MemberCouponsMapperExtend.xml    |   5 +-  ...\/order\/service\/impl\/OrderLendServiceImpl.java   |   1 +  ...\/mapper\/extend\/OrderOwnerMapperExtend.xml       |   4 +-  ...\/proxy\/client\/ProxyAccountClient.java           |   2 +  ...\/fallback\/ProxyAccountClientFailback.java       |   5 +  ...\/chargespot\/proxy\/model\/GetDrawAmountDTO.java   |   6 +  ...\/chargespot\/proxy\/config\/param\/DramParam.java   |   5 +  ...\/chargespot\/proxy\/handler\/MqMessageHandler.java |  13 +-  ...\/proxy\/mapper\/ProxyDrawOrderMapper.java         |   8 ++  ...\/proxy\/service\/ProxyAccountService.java         |   7 ++  ...\/proxy\/service\/ProxyOrderBillService.java       |   3 +-  ...\/service\/impl\/ProxyAccountServiceImpl.java      |  86 ++++++++++++-  ...\/service\/impl\/ProxyDrawOrderServiceImpl.java    |  48 ++++---  ...\/proxy\/service\/impl\/ProxyIndexServiceImpl.java  | 139 +++++++--------------  ...\/service\/impl\/ProxyOrderBillServiceImpl.java    |   6 +-  ...\/proxy\/web\/ProxyAccountController.java          |   7 ++  ...\/mapper\/extend\/ProxyDrawOrderMapperExtend.xml   |  38 +++++-  ...\/mapper\/extend\/ProxyOrderBillMapperExtend.xml   |   8 +-  ...\/business\/job\/BusinessDeviceEventJob.java       |  40 +++---  ...\/impl\/BusinessmenCouponsMemberServiceImpl.java  |  13 --  ...\/impl\/BusinessmenOwnerRelServiceImpl.java       |   4 +-  ...\/service\/impl\/BusinessmenServiceImpl.java       | 111 ++++++++--------  41 files changed, 506 insertions(+), 293 deletions(-)  create mode 100644 business-device\/business-device-base\/src\/main\/java\/com\/chargespot\/device\/dto\/DeviceModelDTO.java  <\/code><\/pre>\n<p>\u4e94\uff1a\u518d add \u5e76\u4e14\u770b\u4e00\u4e0b status(\u5728\u8fd9\u91cc\u63d0\u793a\u4fee\u6539\u662f\u6b63\u786e\u7684\uff0c4 \u4e2a\u6587\u4ef6)<\/p>\n<pre><code>[email&#160;protected] MINGW64 \/c\/project\/chargespot-business-api (feature-init20200401) $ git add . gi [email&#160;protected] MINGW64 \/c\/project\/chargespot-business-api (feature-init20200401) $ git status On branch feature-init20200401 Your branch is ahead of 'origin\/feature-init20200401' by 2 commits.   (use \"git push\" to publish your local commits)  Changes to be committed:   (use \"git restore --staged &lt;file&gt;...\" to unstage)         modified:   business-device\/business-device-biz\/src\/main\/java\/com\/chargespot\/device\/service\/impl\/BlackListBatteryServiceImpl.java         modified:   business-device\/business-device-biz\/src\/main\/java\/com\/chargespot\/device\/service\/impl\/DeviceOperationsServiceImpl.java         modified:   business-device\/business-device-biz\/src\/main\/java\/com\/chargespot\/device\/service\/impl\/DeviceOwnerRelServiceImpl.java         modified:   business-device\/business-device-biz\/src\/main\/java\/com\/chargespot\/device\/service\/impl\/DevicePreWarningDataServiceImpl.java   <\/code><\/pre>\n<p>\u6700\u540e\u518d commit \u548c push<\/p>\n<pre><code>[email&#160;protected] MINGW64 \/c\/project\/chargespot-business-api (feature-init20200401) $ git commit -m '\u53bb log' [feature-init20200401 9e87e2c6] \u53bb log  4 files changed, 6 insertions(+), 20 deletions(-)  [email&#160;protected] MINGW64 \/c\/project\/chargespot-business-api (feature-init20200401) $ git push origin Enumerating objects: 66, done. Counting objects: 100% (66\/66), done. Delta compression using up to 12 threads Compressing objects: 100% (33\/33), done. Writing objects: 100% (42\/42), 20.74 KiB | 1.22 MiB\/s, done. Total 42 (delta 20), reused 0 (delta 0) remote: remote: To create a merge request for feature-init20200401, visit: remote:   https:\/\/gitlab.charge-spot.com\/backend-group\/chargespot-business-api\/merge_requests\/new?merge_request%5Bsource_branch%5D=feature-init20200401 remote: To https:\/\/gitlab.charge-spot.com\/backend-group\/chargespot-business-api.git    ae21cc9d..9e87e2c6  feature-init20200401 -&gt; feature-init20200401   <\/code><\/pre>\n<p>\uff0c\u7136\u540e\u770b\u4e86\u4e0b\uff0c\u628a\u540c\u4e8b\u4ee3\u7801\u5220\u4e86<\/p>\n<p><img decoding=\"async\" src=\"http:\/\/4563.org\/wp-content\/uploads\/2020\/05\/20200519_5ec4654e11dd0.png\" alt=\"git \u63d0\u4ea4\u4ee3\u7801\u65f6\u53d1\u73b0\u628a\u540c\u4e8b\u7684\u4ee3\u7801\u5220\u4e86\uff0c git \u5374\u6ca1\u6709\u63d0\u793a merging \u662f\u600e\u4e48\u56de\u4e8b\uff1f\" \/><\/p>\n<p>\u662f\u6211\u64cd\u4f5c\u4e0d\u5bf9\u5417\uff1f\u4e3a\u4ec0\u4e48\u4f1a\u8fd9\u6837\uff0c\u5927\u54e5\u4eec<\/p>\n<\/p><\/div>\n<div> <b>\u5927\u4f6c\u6709\u8a71\u8aaa<\/b> (<span>2<\/span>)        <\/div>\n<div> <\/div>\n<\/p><\/div>\n<\/p><\/div>\n<ul>\n<li data-pid=\"1201418\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u8cc7\u6df1\u5927\u4f6c : msg7086 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             \u65b0\u624b\u5165\u95e8\u6211\u603b\u662f\u5efa\u8bae\u8bf7\u8001\u8001\u5b9e\u5b9e\u4ece\u4e00\u4e2a\u4f18\u79c0\u7684 GUI \u5f00\u59cb\u3002\u7b49\u4f60\u77e5\u9053\u4e86 working directory \/ stash \/ stage \/ commit \/ merge \/ merge back \/ rebase \u4e86\u4ee5\u540e\uff0c\u518d\u8981\u60f3\u6bd4\u5982\u8bf4\u88c5\u4e2a B\uff0c\u518d\u8003\u8651\u7eaf CLI \u7684\u60c5\u51b5\u3002<br \/>\u6bd4\u5982 git pull \u8fd9\u6837\u7684\u547d\u4ee4\u53ea\u80fd\u5904\u7406\u6700\u7b80\u5355\u7684\u62c9\u53d6\u60c5\u51b5\u3002\u5982\u679c\u4f60\u8981\u62c9\u53d6\u6709\u51b2\u7a81\u7684 commit\uff0c\u60c5\u51b5\u4f1a\u590d\u6742\u5f97\u591a\uff0c\u5149\u4e00\u4e2a add \u4e00\u4e2a commit \u662f\u8fdc\u8fdc\u4e0d\u591f\u7684\uff0c\u9700\u8981\u9996\u5148\u6839\u636e\u573a\u666f\u770b\u8981\u505a rebase \u8fd8\u662f merge\uff0c\u7136\u540e\u6839\u636e\u5177\u4f53\u64cd\u4f5c\u53bb\u505a 3-way conflict resolve \u3002<\/p>\n<p>\u4f60\u73b0\u5728\u7684\u60c5\u51b5\u662f working directory \u6709\u66f4\u6539\uff0c\u6ca1\u8fdb stage \u4e5f\u6ca1\u4e0a commit\uff0c\u66f4\u6ca1 stash\uff0c\u4e8e\u662f\u4ea7\u751f\u4e86 local change conflict \u3002\u7136\u540e\u4f60\u505a\u4e86 add \u548c commit\uff0c\u8fd9\u65f6\u5019\u5982\u679c\u4f60\u6709\u56fe\u5f62\u754c\u9762\u7684\u8bdd\u4f60\u53ef\u4ee5\u770b\u5230\u72b6\u6001\u662f\u8fd9\u6837\u7684\u3002<\/p>\n<p>origin\/feature-init20200401 -&gt; 7bb0b5eb &#8212; 60 \u591a\u4e2a\u63d0\u4ea4 &#8212;&gt; ae21cc9d<br \/>feature-init20200401 -&gt; 7bb0b5eb -&gt; c3c59ecc<\/p>\n<p>\u7136\u540e\u4f60\u53c8\u505a\u4e86 pull &#8211;merge\uff0c\u548c\u4e00\u4e2a commit\uff0c\u53d8\u6210\u4e86<\/p>\n<p>feature-init20200401 -&gt; 7bb0b5eb -&gt; c3c59ecc -(merge ae21cc9d) -&gt; 9e87e2c6<\/p>\n<p>\u5148\u4e0d\u8bba\u7ed3\u679c\u600e\u4e48\u6837\uff0c\u4e2d\u9014\u8fd9\u6761\u5206\u652f\u53c9\u51fa\u6765\u53c9\u8fdb\u6765\u518d\u53c9\u56de\u53bb\uff0c\u4f1a\u8ba9\u4eba\u65e0\u6cd5\u770b\u6e05\u6bcf\u4e00\u4e2a\u63d0\u4ea4\u7684\u7528\u5904\u548c\u6bcf\u4e00\u5904\u4fee\u6539\u7684\u4f4d\u7f6e\uff0c\u4e07\u4e00\u63d0\u4ea4\u540e\u51fa\u4e86\u95ee\u9898\uff0c\u4e5f\u5f88\u96be\u53bb\u5355\u72ec\u9694\u79bb\u51fa\u67d0\u4e00\u6bb5\u63d0\u4ea4\u7136\u540e\u56de\u6eda\u3002\u6bd4\u5982\u4f60\u8fd9\u91cc\uff0c\u4e00\u5904\u4fee\u6539\u5206\u4e86\u4e24\u6b21\u63d0\u4ea4\uff0c\u4e00\u6b21\u5728 merge point \u4e4b\u524d\uff0c\u4e00\u6b21\u5728\u4e4b\u540e\uff0c\u5c31\u5f88\u96be\u53bb\u9694\u79bb\u6d4b\u8bd5\u3002<\/p>\n<p>\u6bd4\u8f83\u597d\u7684\u505a\u6cd5\u662f\uff0c\u5148 stash\uff0c\u7136\u540e\u7b7e\u51fa ae21cc9d\uff0c\u7136\u540e stash pop \u5e76 resolve conflict\uff0c\u7136\u540e\u518d\u505a\u4e00\u4e2a\u5355\u72ec\u7684\u300c\u53bb log \u300d\u63d0\u4ea4\u3002<br \/>\u53e6\u4e00\u79cd\u505a\u6cd5\u662f\uff0c\u5148 commit\uff0c\u7136\u540e\u505a pull rebase\uff0c\u5728 rebase \u8fc7\u7a0b\u4e2d resolve conflict\uff0c\u7136\u540e\u628a rebase \u8fc7\u7684 commit \u7ed9 push \u4e0a\u53bb\u3002<br \/>\u4e24\u79cd\u505a\u6cd5\u7684\u7ed3\u679c\u662f\u5b8c\u5168\u76f8\u540c\u7684\u3002<\/p>\n<p>\u5982\u679c\u4f60\u53f8\u6ca1\u6709\u9488\u5bf9 git \u7684\u5b66\u4e60\u8fc7\u7a0b\u7684\u8bdd\uff0c\u5efa\u8bae\u5927\u5bb6\u805a\u5728\u4e00\u8d77\u597d\u597d\u5b66\u4e00\u4e0b\u3002\u778e\u57fa\u5c14\u7528 git \u662f\u5bf9 git \u5f3a\u5927\u80fd\u529b\u7684\u4e00\u79cd\u6d6a\u8d39\u3002\u6b63\u786e\u4f7f\u7528 git \u4f1a\u5927\u5e45\u63d0\u9ad8\u6e90\u4ee3\u7801\u7ba1\u7406\u6548\u7387\u7684\u3002<\/p>\n<p>\u81f3\u4e8e\u4f60\u8bf4\u628a\u540c\u4e8b\u4ee3\u7801\u5220\u4e86\u662f\u600e\u4e48\u56de\u4e8b\uff0c\u8fd9\u4e2a\u4e5f\u53ea\u9700\u8981\u5f00\u4e2a GUI \u5de5\u5177\uff0c\u5f80\u4e0a\u56de\u6eaf\u4e00\u4e0b\u770b\u770b\u6bcf\u4e2a\u63d0\u4ea4\u7684 diff \u5c31\u77e5\u9053\u600e\u4e48\u56de\u4e8b\u4e86\u3002\u65e0\u975e\u662f merge \u7684\u65f6\u5019\u51fa\u4e86\u95ee\u9898\u5427\u3002                                                            <\/p><\/div>\n<\/p><\/div>\n<\/li>\n<li data-pid=\"1201419\" data-uid=\"2\">\n<div>\n<div>\n<div> <span>\u4e3b<\/span> <span>\u8cc7\u6df1\u5927\u4f6c : 337136897 <\/span>  <\/div>\n<div> <i title=\"\u5f15\u7528\"><\/i>  <span>          <\/span> <\/div>\n<\/p><\/div>\n<div>                                                             @msg7086 \u611f\u8c22\u5927\u4f6c\u7684\u56de\u590d\uff0c\u597d\u8be6\u7ec6\uff0c\u5b66\u4e60\u4e86                                                            <\/div>\n<\/p><\/div>\n<\/li>\n<li>\n","protected":false},"excerpt":{"rendered":"<p>git \u63d0\u4ea4\u4ee3\u7801\u65f6\u53d1\u73b0\u628a\u540c\u4e8b\u7684\u4ee3\u7801&hellip;<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[],"tags":[],"_links":{"self":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/94268"}],"collection":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=94268"}],"version-history":[{"count":0,"href":"http:\/\/4563.org\/index.php?rest_route=\/wp\/v2\/posts\/94268\/revisions"}],"wp:attachment":[{"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=94268"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=94268"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/4563.org\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=94268"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}