ufo / yohoufo-fore · Commits

# Conflicts:
#	common/src/main/java/com/yohoufo/common/cache/RedisLock.java

(cherry picked from commit 98aeae96)
(cherry picked from commit b8cd93879c09eca2d23f6fd9f19e9f3a13a6db76)

(cherry picked from commit 444f447b)
(cherry picked from commit a266373bacbc3321209e2f6f91f0157f3d4e58e9)

(cherry picked from commit df751387)
(cherry picked from commit 34f8d5e7aaffb750ce221832f1be9b2dea094c11)

(cherry picked from commit c4424f07)
(cherry picked from commit 04bf6a8243d48163c1534984993eefe9249d0ff1)

(cherry picked from commit 460af584)
(cherry picked from commit 44211818912a12fc84a232e1f69c8244245846bb)

(cherry picked from commit 8aeab383)
(cherry picked from commit 5294fcc3c4370da7530110695c5c241606f7bc47)

Conflicts:
	web/src/main/resources/databases.yml
	web/src/main/webapp/META-INF/autoconf/databases.yml

This reverts commit 5b557b9d.

This reverts commit e0e01bfc.

(cherry picked from commit 4bb1e094)

(cherry picked from commit 5d283c88)

(cherry picked from commit b350c965)

(cherry picked from commit 8f5896d9)

(cherry picked from commit 78c9f3a2)

This reverts commit 2adac8ab.

This reverts commit 952ec654.