Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git pull
remote: Counting objects: 133, done.
remote: Compressing objects: 100% (60/60), done.
remote: Total 133 (delta 71), reused 120 (delta 58)
Receiving objects: 100% (133/133), 10.87 KiB | 0 bytes/s, done.
Resolving deltas: 100% (71/71), completed with 15 local objects.
From http://180.168.71.6:8000/cmam/aggregation-game-service
0331a45..f46c7e5 dev -> origin/dev
2be013a..2a85484 master -> origin/master
Updating 0331a45..f46c7e5
error: Your local changes to the following files would be overwritten by merge:
src/main/resources/bootstrap.yml
Please commit your changes or stash them before you can merge.
Aborting
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git diff
warning: LF will be replaced by CRLF in pom.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/util/ParseXmlForActpointUtil.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/util/ParseXmlForContentUtil.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/util/ParseXmlForCopyrightUtil.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/util/ParseXmlForPropUtil.java.
The file will have its original line endings in your working directory.
diff --git a/pom.xml b/pom.xml
index c003529..12b8430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.migu</groupId>
<artifactId>aggregation-game-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <packaging>war</packaging>
+ <packaging>jar</packaging>
<name>aggregation-game-service</name>
<description>Demo project for Spring Boot</description>
diff --git a/src/main/java/com/migu/cmam/game/aggregator/api/IGameApi.java b/src/main/java/com/migu/cmam/game/aggregator/api/IGameApi.java
index 4651961..3d9b38c 100644
--- a/src/main/java/com/migu/cmam/game/aggregator/api/IGameApi.java
+++ b/src/main/java/com/migu/cmam/game/aggregator/api/IGameApi.java
@@ -13,7 +13,6 @@ package com.migu.cmam.game.aggregator.api;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-
import com.migu.cmam.common.dto.Response;
import com.migu.cmam.game.aggregator.domain.ConveyMsg;
@@ -42,5 +41,4 @@ public interface IGameApi {
*/
@RequestMapping(value = "/initmsg", produces = { "application/json" }, method = RequestMethod.POST)
Response initMsg(@RequestBody ConveyMsg<?> conveyMsg);
-
}
diff --git a/src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java b/src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java
index 97d7ef9..7633a71 100644
--- a/src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java
+++ b/src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java
@@ -39,4 +39,5 @@ public class CTaskDetailConst {
public static final String DOWNLOAD_MSG_SEND_FAIL = "Download: download msg send failed.";
public static final String DOWNLOAD_SUCCESS = "Download: download success.";
public static final String DOWNLOAD_FAIL = "Download: download failed .";
+ public static final String COMPENSATION_DIAGNOSE_TIMEOUT = "compensation: diagnose timeout.";
}
diff --git a/src/main/java/com/migu/cmam/game/aggregator/controller/GameController.java b/src/main/java/com/migu/cmam/game/aggregator/controller/GameController.java
index 1bebe79..61b43e9 100644
--- a/src/main/java/com/migu/cmam/game/aggregator/controller/GameController.java
+++ b/src/main/java/com/migu/cmam/game/aggregator/controller/GameController.java
@@ -13,9 +13,9 @@ package com.migu.cmam.game.aggregator.controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;^M
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git status
On branch dev
Your branch is behind 'origin/dev' by 19 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: pom.xml
modified: src/main/java/com/migu/cmam/game/aggregator/api/IGameApi.java
modified: src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java
modified: src/main/java/com/migu/cmam/game/aggregator/controller/GameController.java
modified: src/main/java/com/migu/cmam/game/aggregator/mq/MsgProducer.java
modified: src/main/java/com/migu/cmam/game/aggregator/mq/channel/ICustomSource.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/ICTaskRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/IConveyMsgRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/ICTaskMongoRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/IConveyMsgMongoRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/impl/CTaskMongoRepositoryImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/impl/ConveyMsgMongoRepositoryImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/IAggregation.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/ConvergeServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/DownloadServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/PreServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/callback/CallBackServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/ActpointStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/CopyrightStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/GameStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/PropertyStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/util/FilePathHelper.java
modified: src/main/resources/application.yml
modified: src/main/resources/bootstrap-online.yml
modified: src/main/resources/bootstrap-onlinetest.yml
modified: src/main/resources/bootstrap.yml
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java
src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest.java
src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java
src/main/java/com/migu/cmam/game/aggregator/compensation/
src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java
src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java
src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseController.java
src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java
src/test/java/com/migu/cmam/game/aggregator/compensation/
no changes added to commit (use "git add" and/or "git commit -a")
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git stash
*** Please tell me who you are.
Run
git config --global user.email "[email protected]"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: unable to auto-detect email address (got 'Administrator@GZ-20160802BKJG.(none)')
Cannot save the current index state
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git config --gloabl user.name "zhangchenglong"
error: unknown option `gloabl'
usage: git config [<options>]
Config file location
--global use global config file
--system use system config file
--local use repository config file
-f, --file <file> use given config file
--blob <blob-id> read config from given blob object
Action
--get get value: name [value-regex]
--get-all get all values: key [value-regex]
--get-regexp get values for regexp: name-regex [value-regex]
--get-urlmatch get value specific for the URL: section[.var] URL
--replace-all replace all matching variables: name value [value_regex]
--add add a new variable: name value
--unset remove a variable: name [value-regex]
--unset-all remove all matches: name [value-regex]
--rename-section rename section: old-name new-name
--remove-section remove a section: name
-l, --list list all
-e, --edit open an editor
--get-color find the color configured: slot [default]
--get-colorbool find the color setting: slot [stdout-is-tty]
Type
--bool value is "true" or "false"
--int value is decimal number
--bool-or-int value is --bool or --int
--path value is a path (file or directory name)
Other
-z, --null terminate values with NUL byte
--name-only show variable names only
--includes respect include directives on lookup
--show-origin show origin of config (file, standard input, blob, command line)
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git config --global user.name "zhangchenglong"
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git config --global user.email "[email protected]"
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git stash
warning: LF will be replaced by CRLF in pom.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in pom.xml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/mq/channel/ICustomSource.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/repository/ICTaskRepository.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/repository/mongo/ICTaskMongoRepository.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/service/IAggregation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/service/impl/DownloadServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/ActpointStrategy.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/CopyrightStrategy.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/GameStrategy.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/PropertyStrategy.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/util/FilePathHelper.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/resources/application.yml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/resources/bootstrap-online.yml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/resources/bootstrap-onlinetest.yml.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/resources/bootstrap.yml.
The file will have its original line endings in your working directory.
Saved working directory and index state WIP on dev: 0331a45 open callbackService
HEAD is now at 0331a45 open callbackService
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git pull
Updating 0331a45..f46c7e5
Fast-forward
.../constant/constcode/CmamIdConstants.java | 40 +++++++++------
.../stockhandler/FileCsvImportController.java | 34 ++++++++-----
.../migu/cmam/game/aggregator/util/FileTool.java | 2 +-
src/main/resources/bootstrap.yml | 58 +++++++++++-----------
src/main/resources/logback-spring.xml | 39 ++++-----------
5 files changed, 89 insertions(+), 84 deletions(-)
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git stash pop
Auto-merging src/main/resources/bootstrap.yml
CONFLICT (content): Merge conflict in src/main/resources/bootstrap.yml
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git branch -nv
error: unknown switch `n'
usage: git branch [<options>] [-r | -a] [--merged | --no-merged]
or: git branch [<options>] [-l] [-f] <branch-name> [<start-point>]
or: git branch [<options>] [-r] (-d | -D) <branch-name>...
or: git branch [<options>] (-m | -M) [<old-branch>] <new-branch>
or: git branch [<options>] [-r | -a] [--points-at]
Generic options
-v, --verbose show hash and subject, give twice for upstream branch
-q, --quiet suppress informational messages
-t, --track set up tracking mode (see git-pull(1))
--set-upstream change upstream info
-u, --set-upstream-to <upstream>
change the upstream info
--unset-upstream Unset the upstream info
--color[=<when>] use colored output
-r, --remotes act on remote-tracking branches
--contains <commit> print only branches that contain the commit
--abbrev[=<n>] use <n> digits to display SHA-1s
Specific git-branch actions:
-a, --all list both remote-tracking and local branches
-d, --delete delete fully merged branch
-D delete branch (even if not merged)
-m, --move move/rename a branch and its reflog
-M move/rename a branch, even if target exists
--list list branch names
-l, --create-reflog create the branch's reflog
--edit-description edit the description for the branch
-f, --force force creation, move/rename, deletion
--merged <commit> print only branches that are merged
--no-merged <commit> print only branches that are not merged
--column[=<style>] list branches in columns
--sort <key> field name to sort on
--points-at <object> print only branches of the object
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git branch -rv
origin/dev f46c7e5 filter kafka log
origin/master 2a85484 Update bootstrap.yml
origin/patch-1 d235876 Update pom.xml
origin/releaseV1.0.0 2be013a Merge branch 'dev' into 'master'
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (dev)
$ git checkout -b zhangchenglong
M pom.xml
M src/main/java/com/migu/cmam/game/aggregator/api/IGameApi.java
M src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java
M src/main/java/com/migu/cmam/game/aggregator/controller/GameController.java
M src/main/java/com/migu/cmam/game/aggregator/mq/MsgProducer.java
M src/main/java/com/migu/cmam/game/aggregator/mq/channel/ICustomSource.java
M src/main/java/com/migu/cmam/game/aggregator/repository/ICTaskRepository.java
M src/main/java/com/migu/cmam/game/aggregator/repository/IConveyMsgRepository.java
M src/main/java/com/migu/cmam/game/aggregator/repository/mongo/ICTaskMongoRepository.java
M src/main/java/com/migu/cmam/game/aggregator/repository/mongo/IConveyMsgMongoRepository.java
M src/main/java/com/migu/cmam/game/aggregator/repository/mongo/impl/CTaskMongoRepositoryImpl.java
M src/main/java/com/migu/cmam/game/aggregator/repository/mongo/impl/ConveyMsgMongoRepositoryImpl.java
M src/main/java/com/migu/cmam/game/aggregator/service/IAggregation.java
M src/main/java/com/migu/cmam/game/aggregator/service/impl/ConvergeServiceImpl.java
M src/main/java/com/migu/cmam/game/aggregator/service/impl/DownloadServiceImpl.java
M src/main/java/com/migu/cmam/game/aggregator/service/impl/PreServiceImpl.java
M src/main/java/com/migu/cmam/game/aggregator/service/impl/callback/CallBackServiceImpl.java
M src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/ActpointStrategy.java
M src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/CopyrightStrategy.java
M src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/GameStrategy.java
M src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/PropertyStrategy.java
M src/main/java/com/migu/cmam/game/aggregator/util/FilePathHelper.java
M src/main/resources/application.yml
M src/main/resources/bootstrap-online.yml
M src/main/resources/bootstrap-onlinetest.yml
Switched to a new branch 'zhangchenglong'
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git branch -v
dev f46c7e5 filter kafka log
* zhangchenglong f46c7e5 filter kafka log
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git branch -rv
origin/dev f46c7e5 filter kafka log
origin/master 2a85484 Update bootstrap.yml
origin/patch-1 d235876 Update pom.xml
origin/releaseV1.0.0 2be013a Merge branch 'dev' into 'master'
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git status
On branch zhangchenglong
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: pom.xml
modified: src/main/java/com/migu/cmam/game/aggregator/api/IGameApi.java
modified: src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java
modified: src/main/java/com/migu/cmam/game/aggregator/controller/GameController.java
modified: src/main/java/com/migu/cmam/game/aggregator/mq/MsgProducer.java
modified: src/main/java/com/migu/cmam/game/aggregator/mq/channel/ICustomSource.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/ICTaskRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/IConveyMsgRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/ICTaskMongoRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/IConveyMsgMongoRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/impl/CTaskMongoRepositoryImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/impl/ConveyMsgMongoRepositoryImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/IAggregation.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/ConvergeServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/DownloadServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/PreServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/callback/CallBackServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/ActpointStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/CopyrightStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/GameStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/PropertyStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/util/FilePathHelper.java
modified: src/main/resources/application.yml
modified: src/main/resources/bootstrap-online.yml
modified: src/main/resources/bootstrap-onlinetest.yml
Untracked files:
(use "git add <file>..." to include in what will be committed)
src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java
src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest.java
src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java
src/main/java/com/migu/cmam/game/aggregator/compensation/
src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java
src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java
src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseController.java
src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java
src/test/java/com/migu/cmam/game/aggregator/compensation/
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git add .
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/CTaskCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/ConveyMsgCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfo.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfoCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgsStatusRest.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/factory/CompensationFactory.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/AGHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/DLHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/HandlerCompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/ICompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SCHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SLHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoCreateService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoStatusSendService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoTimeOutService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoCreateServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoStatusSendServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoTimeOutServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseController.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/test/java/com/migu/cmam/game/aggregator/compensation/CompensationTest.java.
The file will have its original line endings in your working directory.
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git status
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/HandlerCompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/ICompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoCreateService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoStatusSendService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoTimeOutService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java.
The file will have its original line endings in your working directory.
On branch zhangchenglong
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: pom.xml
new file: src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java
modified: src/main/java/com/migu/cmam/game/aggregator/api/IGameApi.java
new file: src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest.java
new file: src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/CTaskCap.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/ConveyMsgCap.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfo.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfoCap.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgsStatusRest.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/factory/CompensationFactory.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/handler/AGHandler.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/handler/DLHandler.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/handler/HandlerCompensation.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/handler/ICompensation.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SCHandler.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SLHandler.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoCreateService.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoStatusSendService.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoTimeOutService.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoCreateServiceImpl.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoStatusSendServiceImpl.java
new file: src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoTimeOutServiceImpl.java
new file: src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java
modified: src/main/java/com/migu/cmam/game/aggregator/constant/constcode/CTaskDetailConst.java
new file: src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java
new file: src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseController.java
modified: src/main/java/com/migu/cmam/game/aggregator/controller/GameController.java
modified: src/main/java/com/migu/cmam/game/aggregator/mq/MsgProducer.java
modified: src/main/java/com/migu/cmam/game/aggregator/mq/channel/ICustomSource.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/ICTaskRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/IConveyMsgRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/ICTaskMongoRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/IConveyMsgMongoRepository.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/impl/CTaskMongoRepositoryImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/repository/mongo/impl/ConveyMsgMongoRepositoryImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/IAggregation.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/ConvergeServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/DownloadServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/PreServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/callback/CallBackServiceImpl.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/ActpointStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/CopyrightStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/GameStrategy.java
modified: src/main/java/com/migu/cmam/game/aggregator/service/impl/strategy/PropertyStrategy.java
new file: src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java
modified: src/main/java/com/migu/cmam/game/aggregator/util/FilePathHelper.java
modified: src/main/resources/application.yml
modified: src/main/resources/bootstrap-online.yml
modified: src/main/resources/bootstrap-onlinetest.yml
new file: src/test/java/com/migu/cmam/game/aggregator/compensation/CompensationTest.java
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git commit -m "add diagnose function"
[zhangchenglong warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/HandlerCompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/ICompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoCreateService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoStatusSendService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoTimeOutService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java.
The file will have its original line endings in your working directory.
5e709aa] add diagnose function
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/CTaskCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/ConveyMsgCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfo.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfoCap.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgsStatusRest.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/factory/CompensationFactory.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/AGHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/DLHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/HandlerCompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/ICompensation.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SCHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SLHandler.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoCreateService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoStatusSendService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoTimeOutService.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoCreateServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoStatusSendServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoTimeOutServiceImpl.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseController.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in src/test/java/com/migu/cmam/game/aggregator/compensation/CompensationTest.java.
The file will have its original line endings in your working directory.
51 files changed, 2897 insertions(+), 86 deletions(-)
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/api/IDiagnoseApi.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/client/CompenMsgsStatusRest.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/client/fallback/CompenMsgsStatusRestFallBack.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/CTaskCap.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/ConveyMsgCap.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfo.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgInfoCap.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/domain/restful/MsgsStatusRest.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/factory/CompensationFactory.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/AGHandler.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/DLHandler.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/HandlerCompensation.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/ICompensation.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SCHandler.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/handler/SLHandler.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoCreateService.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoStatusSendService.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/IMsgInfoTimeOutService.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoCreateServiceImpl.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoStatusSendServiceImpl.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/compensation/service/impl/MsgInfoTimeOutServiceImpl.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/config/CompensationConfig.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/constant/enumcode/CompensationStatusEnum.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/controller/DiagnoseController.java
create mode 100644 src/main/java/com/migu/cmam/game/aggregator/util/CompensationUtil.java
rewrite src/main/resources/bootstrap-online.yml (99%)
rewrite src/main/resources/bootstrap-onlinetest.yml (100%)
create mode 100644 src/test/java/com/migu/cmam/game/aggregator/compensation/CompensationTest.java
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git status
On branch zhangchenglong
nothing to commit, working directory clean
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git push origin zhangchenglong
Counting objects: 95, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (82/82), done.
Writing objects: 100% (95/95), 42.31 KiB | 0 bytes/s, done.
Total 95 (delta 45), reused 0 (delta 0)
To http://180.168.71.6:8000/cmam/aggregation-game-service.git
* [new branch] zhangchenglong -> zhangchenglong
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
$ git branch -rv
origin/dev f46c7e5 filter kafka log
origin/master 2a85484 Update bootstrap.yml
origin/patch-1 d235876 Update pom.xml
origin/releaseV1.0.0 2be013a Merge branch 'dev' into 'master'
origin/zhangchenglong 5e709aa add diagnose function
Administrator@GZ-20160802BKJG MINGW64 /e/migu/workspace/aggregation-game-service (zhangchenglong)
git操作一之原库建分支
猜你喜欢
转载自blog.csdn.net/longlovefilm/article/details/80669569
今日推荐
周排行