Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -34,6 +34,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import ma.glasnost.orika.MapperFacade;
@@ -192,7 +193,6 @@ public class TicketBoxMgrController extends BaseApiController {
 				LambdaQueryWrapper<Ticket> pageQueryWrapper = new LambdaQueryWrapper<Ticket>();
 				pageQueryWrapper.select(Ticket::getSerialNo, Ticket::getDrawNum, Ticket::getCipherLuckyNum);
 				pageQueryWrapper.eq(Ticket::getBoxId, ids.getIds().get(0));
-				pageQueryWrapper.orderByAsc(Ticket::getSerialNo);
 				pageQueryWrapper.last("limit "+ (i*pageSize) +", " + pageSize);
 				List<Ticket> list = ticketService.list(pageQueryWrapper);
 				if(null != list && list.size() > 0 ) {
@@ -200,11 +200,11 @@ public class TicketBoxMgrController extends BaseApiController {
 				}
 			}
 		}else {
-			queryWrapper.orderByAsc(Ticket::getSerialNo);
 			listAll = ticketService.list(queryWrapper);
 		}
 
 		if(null != listAll && listAll.size() > 0 ) {
+			listAll.sort(Comparator.comparing(Ticket::getSerialNo));
 			for (Ticket ticket : listAll) {
 				if (null != ticket && StringUtils.isNotBlank(ticket.getSerialNo())
 						&& StringUtils.isNotBlank(ticket.getDrawNum())

mp-admin/src/main/resources/application-dev.yml

@@ -25,9 +25,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://110.40.236.236:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=UTC
-                username: mptest
-                password: wan789*@dfhzHu518!dr2xosn
+                url: jdbc:mysql://localhost:3306/mpdb_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=UTC
+                username: root
+                password: 123456
                 # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -121,5 +121,5 @@ miniprogram:
 
 # 盲票导出每页查询数量
 export:
-    page-size: 500
+    page-size: 2000