parent: 8f7b99 | patch | commitdiff
xiaoyong931011
2021-04-08 7849d7799c9ede8447a4d57c26e032e08c1eff74
refs
author xiaoyong931011 <15274802129@163.com>
Thursday, April 8, 2021 20:14 +0800
committer xiaoyong931011 <15274802129@163.com>
Thursday, April 8, 2021 20:14 +0800
commit7849d7799c9ede8447a4d57c26e032e08c1eff74
tree b29a67239313889557aebe9373886c16d0be86cf tree | zip | gz
parent 8f7b99b0a3d53f4410e8b1f2f209ce2743f0a944 view | diff
7679e293100b783a729a929da4ee09e33dd118bc view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
10 files modified
10 files added
1450 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/component/websoket/ScanQrCodeLoginDto.java 57 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/websoket/WebSocketPushHandler.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/websoket/WebSoketScanQrCodeLoginObserver.java 66 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/WebSocketConfig.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/authority/AppAuthorityManager.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java 68 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/DefaultAuthorityManager.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java 82 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml 66 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/demoPage/soketLoginTest.html 137 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/demoPage/soketTest.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/dui.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/pc.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/qrcode.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/qrcodeBack.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/js/plugin/qrcode.js 614 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/js/systools/MBase.js 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/common/login.html 298 ●●●●● diff | view | raw | blame | history