parent: 677c87 | patch | commitdiff
zj
2024-09-04 6404cb07e5281cfd901267c4fd560ba89bd5e2fd
refs
author zj <1772600164@qq.com>
Wednesday, September 4, 2024 16:49 +0800
committer zj <1772600164@qq.com>
Wednesday, September 4, 2024 16:49 +0800
commit6404cb07e5281cfd901267c4fd560ba89bd5e2fd
tree ab0d7ea5209a4c7e275523ecc7466c4af722bf10 tree | zip | gz
parent 677c87ad5b0057a09381cfe023e857229aa770dd view | diff
2a13fc3d05c012766eb677cb0486e6dcf9ed1bf2 view | diff 
Merge remote-tracking branch 'origin/ysz' into ysz

# Conflicts:
#	src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
36 files modified
639 ■■■■■ changed files
src/main/java/com/nq/common/ServerResponse.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/common/interceptor/ApiUserAuthorityInterceptor.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/controller/PayApiController.java 178 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/controller/UserApiController.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/controller/agent/AgentUserController.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/controller/backend/AdminRechargeController.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/controller/backend/AdminStockDz.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/controller/echo/EChoController.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/controller/protol/UserController.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/enums/EStockType.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/IUserRechargeService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/StockDzService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/EchoServices.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/MandatoryLiquidationService.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/PriceServicesImpl.java 38 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/StockDzServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/StockServiceImpl.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/UserAssetsServices.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java 15 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/UserServiceImpl.java 11 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java 18 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/utils/task/OrderTask.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/utils/task/news/NewsTask.java 12 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/utils/task/stock/CarryPositionTask.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/utils/task/stock/StockTask.java 80 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/ws/WebSocketClientBeanConfig.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/ws/WebSocketInClient.java 49 ●●●●● diff | view | raw | blame | history
src/main/java/com/nq/ws/WebsocketRunClient.java 48 ●●●●● diff | view | raw | blame | history
src/main/resources/application.properties 10 ●●●●● diff | view | raw | blame | history
src/main/resources/application.yml 2 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/StockMapper.xml 2 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/UserPositionMapper.xml 6 ●●●●● diff | view | raw | blame | history