Merge branch 'pre' into 'master'

Pre

See merge request !34

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -91,7 +91,7 @@ public class SweetAppletController {
                                                            @RequestParam(required = false) Integer page,
                                                            @RequestParam(required = false) Integer size,
                                                            @RequestParam String uid) {
-
+        try {
             List<SweetManualArtistListDto> allReturnArtist = ObjectUtil.getSweetManualArtistListDtoList();
             List<SweetManualArtistListDto> returnArtist = ObjectUtil.getSweetManualArtistListDtoList();
 
@@ -174,6 +174,9 @@ public class SweetAppletController {
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
             return ResponseDto.success(data);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
     }
 
     @GetMapping("richText")
@@ -353,7 +356,7 @@ public class SweetAppletController {
         if (mobile == null || mobile.isEmpty()) {
             return ResponseDto.failure();
         }
-        SweetPrizeVo vo = redisDataUtils.changeLuckDrawStatus(mobile,unionId, luckDrawNum);
+        SweetPrizeVo vo = redisDataUtils.changeLuckDrawStatus(mobile, unionId, luckDrawNum);
         return ResponseDto.success(vo);
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletMdskController.java

@@ -91,7 +91,7 @@ public class SweetAppletMdskController {
                                                                @RequestParam(required = false) Integer page,
                                                                @RequestParam(required = false) Integer size,
                                                                @RequestParam String uid) {
-
+        try {
             List<SweetManualArtistListMDSKDto> allReturnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList();
             List<SweetManualArtistListMDSKDto> returnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList();
 
@@ -174,6 +174,9 @@ public class SweetAppletMdskController {
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
             return ResponseDto.success(data);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
     }
 
     @GetMapping("richText")

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualArtistsMapper.xml

@@ -40,6 +40,7 @@
         <where>
             sma.status = 1 and manual_id = #{manualId}
         </where>
+        ORDER BY sma.updated_at DESC
     </select>
 
     <select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult">

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualArtistsMdskMapper.xml

@@ -40,6 +40,7 @@
         <where>
             sma.status = 1 and manual_id = #{manualId}
         </where>
+        ORDER BY sma.updated_at DESC
     </select>
 
     <select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult">

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

@@ -19,7 +19,7 @@ liquidnet:
     password: admin
   config:
     #    location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
-#    location: /Users/hujiachen/JavaProject/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
+#    location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
     location: /app/support-config
 # end-dev-这里是配置信息基本值