parent: bbe0a2 | patch | commitdiff
935090232@qq.com
2022-02-24 8c6026959d3006bbf9dce3f3c9311e70a02b80c1
refs
author 935090232@qq.com <ak473600000>
Thursday, February 24, 2022 23:29 +0800
committer 935090232@qq.com <ak473600000>
Thursday, February 24, 2022 23:29 +0800
commit8c6026959d3006bbf9dce3f3c9311e70a02b80c1
tree 48d37ac1aa7101b68f0ca44fc5077de989e85490 tree | zip | gz
parent bbe0a2fd03063316e50cf141986bda984599bbda view | diff
ceea128c48d5b21ebd1bb46943d656446aa974ec view | diff 
Merge branch 'developer'

# Conflicts:
#	zq-erp/pom.xml
9 files added
29 files modified
2 files deleted
1549 ■■■■■ changed files
zq-erp/pom.xml 48 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/rabbitmq/DeliverCallbackAdapter.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/tools/CodeUtil.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/tools/JSONUtil.java 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/ueditor/ActionEnter.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/ueditor/ConfigManager.java 37 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/ueditor/UeditorProperties.java 64 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/MvcCoreConfig.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/EnvironmentHolder.java 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/MatrixFileAppender.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/PropertiesUtil.java 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/FileUploadAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/UeditorController.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/AccountPasswordLogin.java 26 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/PropertiesConstance.java 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tools/UploadUtil.java 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShopInfoController.java 18 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatGzhApiTools.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxGetAcodeAction.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-alpha.properties 167 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-local.properties 77 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-meidu.properties 180 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-taiyan.properties 176 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application-test.properties 77 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 131 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/config.json 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/system.properties 109 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/readme-jyy 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/权限 2 ●●●●● diff | view | raw | blame | history