Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat merge 0128 #200

Merged
merged 6 commits into from
Jan 27, 2024
Merged

Feat merge 0128 #200

merged 6 commits into from
Jan 27, 2024

Commits on Jan 23, 2024

  1. feat:增加状态机

    techa03 committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    456af23 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. [新增]状态机集成

    techa03 committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    0947725 View commit details
    Browse the repository at this point in the history
  2. [新增]状态机集成

    techa03 committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    84122d9 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. Configuration menu
    Copy the full SHA
    e69368e View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feat_state' into feat_merge_0128

    # Conflicts:
    #	goodskill-seckill-provider/goodskill-service/pom.xml
    #	goodskill-seckill-provider/goodskill-service/src/main/java/com/goodskill/service/config/StateMachineConfig.java
    #	goodskill-seckill-provider/goodskill-service/src/main/java/com/goodskill/service/impl/dubbo/SeckillServiceImpl.java
    #	goodskill-seckill-provider/goodskill-service/src/main/java/com/goodskill/service/inner/SeckillProcedureExecutor.java
    #	goodskill-seckill-provider/goodskill-service/src/main/java/com/goodskill/service/mock/strategy/AtomicWithCanalStrategy.java
    #	goodskill-seckill-provider/goodskill-service/src/main/java/com/goodskill/service/mock/strategy/RedisMongoReactiveStrategy.java
    #	goodskill-seckill-provider/goodskill-service/src/main/java/com/goodskill/service/mock/strategy/SynchronizedLockStrategy.java
    #	goodskill-seckill-provider/goodskill-service/src/main/java/com/goodskill/service/util/StateMachineUtil.java
    techa03 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    eed5aec View commit details
    Browse the repository at this point in the history
  3. [更新]说明文档

    techa03 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    a1527a1 View commit details
    Browse the repository at this point in the history