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

merge Develop #30

Merged
merged 62 commits into from
Aug 31, 2016
Merged

merge Develop #30

merged 62 commits into from
Aug 31, 2016

Commits on Aug 1, 2016

  1. Update README.md

    binarywang authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    f40cec5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    65fb373 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    49d561c View commit details
    Browse the repository at this point in the history
  4. Update README.md

    binarywang authored Aug 1, 2016
    Configuration menu
    Copy the full SHA
    8b1c320 View commit details
    Browse the repository at this point in the history
  5. 调整readme部分格式

    binarywang committed Aug 1, 2016
    Configuration menu
    Copy the full SHA
    baf99d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2016

  1. Configuration menu
    Copy the full SHA
    6643498 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f7a64a7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d05da57 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2016

  1. Update README.md

    binarywang committed Aug 9, 2016
    Configuration menu
    Copy the full SHA
    f65c6f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. Configuration menu
    Copy the full SHA
    8a4f1e6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #19 from ZhaoxiongTan/develop

    卡券service构造方法改为public
    binarywang authored Aug 10, 2016
    Configuration menu
    Copy the full SHA
    6e55387 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Update README.md

    binarywang committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    ccecac9 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. Configuration menu
    Copy the full SHA
    5057f2d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #21 from gaigeshen/develop

    增加生成授权链接方法,重定向链接可直接读取配置。
    kareanyi authored Aug 12, 2016
    Configuration menu
    Copy the full SHA
    c2f00a1 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2016

  1. 规范代码命名格式

    binarywang committed Aug 13, 2016
    Configuration menu
    Copy the full SHA
    4bd7e61 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a154e30 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Configuration menu
    Copy the full SHA
    ff2cd99 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #22 from gaigeshen/develop

    修复创建JS-API签名的漏洞
    binarywang authored Aug 16, 2016
    Configuration menu
    Copy the full SHA
    58f9570 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. Configuration menu
    Copy the full SHA
    87707fa View commit details
    Browse the repository at this point in the history
  2. Merge pull request #24 from gaigeshen/develop

    企业号全局配置存储添加Redis支持
    kareanyi authored Aug 17, 2016
    Configuration menu
    Copy the full SHA
    27ad02d View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2016

  1. Configuration menu
    Copy the full SHA
    977161c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    184e6d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2016

  1. Configuration menu
    Copy the full SHA
    c8d21e3 View commit details
    Browse the repository at this point in the history
  2. 修复部分javadoc

    binarywang committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    30c914f View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2016

  1. Configuration menu
    Copy the full SHA
    a7846f9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f2e251a View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2016

  1. 格式化pom格式

    binarywang committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    a70f937 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bb0147b View commit details
    Browse the repository at this point in the history
  3. fix javadoc error

    binarywang committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    8d72adc View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2016

  1. Configuration menu
    Copy the full SHA
    d1a66b2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #27 from xiaohulu/eclipse-ignore-bin

    ignore bin folder created by eclipse ide.
    binarywang authored Aug 24, 2016
    Configuration menu
    Copy the full SHA
    00d7b85 View commit details
    Browse the repository at this point in the history
  3. update javadoc

    binarywang committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    e8abad8 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2016

  1. 更改toString方法

    binarywang committed Aug 25, 2016
    Configuration menu
    Copy the full SHA
    90b4b5c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f38f31f View commit details
    Browse the repository at this point in the history
  3. 重构,改名

    binarywang committed Aug 25, 2016
    Configuration menu
    Copy the full SHA
    f7454b6 View commit details
    Browse the repository at this point in the history
  4. 重构,改名

    binarywang committed Aug 25, 2016
    Configuration menu
    Copy the full SHA
    f0cd7dd View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    14fb63d View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. Configuration menu
    Copy the full SHA
    b5d9ce9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7bd75c9 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2016

  1. Configuration menu
    Copy the full SHA
    e016372 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f262c74 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9c5b3c3 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4c98a56 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a294bc4 View commit details
    Browse the repository at this point in the history
  6. add gradle support

    binarywang committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    f70a6a5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2db53ec View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2016

  1. Configuration menu
    Copy the full SHA
    c449e87 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ee158b6 View commit details
    Browse the repository at this point in the history
  3. 调整部分段落位置

    binarywang committed Aug 30, 2016
    Configuration menu
    Copy the full SHA
    4a994ea View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    af9bfa2 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2016

  1. Configuration menu
    Copy the full SHA
    5525c4f View commit details
    Browse the repository at this point in the history
  2. 修改代码格式使用两个空格

    aimil authored and aimil committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    4047f6d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #29 from aimilin6688/develop

    添加批量查询用户基本信息功能,没有测试,没有添加超过100验证
    binarywang authored Aug 31, 2016
    Configuration menu
    Copy the full SHA
    1eadbc8 View commit details
    Browse the repository at this point in the history
  4. fix javadoc

    binarywang committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    473feaf View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    76e1da5 View commit details
    Browse the repository at this point in the history
  6. fix unqualified access

    binarywang committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    b991929 View commit details
    Browse the repository at this point in the history
  7. add serialVersionUID

    binarywang committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    52b2a37 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    05f809c View commit details
    Browse the repository at this point in the history
  9. remove unused imports

    binarywang committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    dafbe07 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d17f113 View commit details
    Browse the repository at this point in the history
  11. fix javadoc

    binarywang committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    74737e2 View commit details
    Browse the repository at this point in the history
  12. 版本号更新为2.1.0

    binarywang committed Aug 31, 2016
    Configuration menu
    Copy the full SHA
    8bca9e7 View commit details
    Browse the repository at this point in the history