beauty-erp.git - Gitblit

parent: 1e1315f4 | patch | commit | ignore whitespace

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

Merge branch 'developer' into alpha

2 files modified

	zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java	1 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/application-alpha.properties	2 ●●●●● patch \| view \| raw \| blame \| history

 zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java

@@ -110,6 +110,7 @@
            throw new GlobleException(AppMessageCode.User.ACCOUNT_IS_LOCK);
        } else {
            addErrorLoginRecord(loginUser, AppConstance.LOGIN_FAIL);
            throw new GlobleException(AppMessageCode.User.ACCOUNT_PASSWORD_ERROR, sessionErrorTimes, 5);
        }



 zq-erp/src/main/resources/config/application-alpha.properties

@@ -120,6 +120,8 @@
wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
xcx_appid =wx3836ab3c1490ff29
xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
xcx_manager_appid=wx0d5655a6443807d3
xcx_manager_secret=b04e675224437c4f17c3068b6c2377b6

#微信支付调试开关
wx_pay_debug_onoff = false

			@@ -110,6 +110,7 @@
			throw new GlobleException(AppMessageCode.User.ACCOUNT_IS_LOCK);
			} else {
			addErrorLoginRecord(loginUser, AppConstance.LOGIN_FAIL);
			throw new GlobleException(AppMessageCode.User.ACCOUNT_PASSWORD_ERROR, sessionErrorTimes, 5);
			}

			@@ -120,6 +120,8 @@
			wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
			xcx_appid =wx3836ab3c1490ff29
			xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
			xcx_manager_appid=wx0d5655a6443807d3
			xcx_manager_secret=b04e675224437c4f17c3068b6c2377b6

			#微信支付调试开关
			wx_pay_debug_onoff = false