Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performancesStatic.html

@@ -35,12 +35,12 @@
                         <div th:text="*{totalGeneral}">80</div>
                     </div>
                 </div>
-                <div class="col-lg-1">
-                    <div>
-                        <div>已兑换总数(张)</div>
-                        <div th:text="*{totalExchange}">0</div>
-                    </div>
-                </div>
+<!--                <div class="col-lg-1">-->
+<!--                    <div>-->
+<!--                        <div>已兑换总数(张)</div>-->
+<!--                        <div th:text="*{totalExchange}">0</div>-->
+<!--                    </div>-->
+<!--                </div>-->
 <!--                <div class="col-lg-1">-->
 <!--                    <div>-->
 <!--                        <div>兑换库存(张)</div>-->
@@ -100,9 +100,9 @@
                 <th>
                     <div class="cell">销售额（元）</div>
                 </th>
-                <th>
-                    <div class="cell">兑换数量</div>
-                </th>
+<!--                <th>-->
+<!--                    <div class="cell">兑换数量</div>-->
+<!--                </th>-->
             </tr>
             </thead>
             <tbody>
@@ -137,9 +137,9 @@
                 <td>
                     <div class="cell" th:text="${respBean.totalSalePrice}">0</div>
                 </td>
-                <td>
-                    <div class="cell" th:text="${respBean.totalExchange}">0</div>
-                </td>
+<!--                <td>-->
+<!--                    <div class="cell" th:text="${respBean.totalExchange}">0</div>-->
+<!--                </td>-->
             </tr>
             </tbody>
         </table>

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/StringUtil.java

@@ -447,10 +447,6 @@ public abstract class StringUtil {
 		sb.append(right(bankId, 4));
 		return sb.toString();
 	}
-	public static void main(String[] args) {
-		System.out.println(isEmail("123@qq.com"));
-	}
-
 
 
     public static boolean isBlank(CharSequence cs) {
@@ -598,4 +594,31 @@ public abstract class StringUtil {
 		}
 		return false;
 	}
+
+	public static void main(String[] args) {
+		System.out.println(isEmail("123@qq.com#$%^&*()"));
+
+		String regEx="[\n`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。， 、？]";
+
+		//可以在中括号内加上任何想要替换的字符，实际上是一个正则表达式
+
+		String aa = "";//这里是将特殊字符换为aa字符串," "代表直接去掉
+
+		Pattern p = Pattern.compile(regEx);
+
+		Matcher m = p.matcher("原字符串");//这里把想要替换的字符串传进来
+
+		String newString = m.replaceAll(aa).trim();
+		System.out.println("newString====="+newString);
+
+		//将替换后的字符串存在变量newString中
+
+		//方法二 如果第一种太麻烦可以直接用下面的
+
+		String str = "#$%^&*()我的正确#$%^&*()原字符串#$%^&*()";
+
+		String newString2 = str.replaceAll(regEx,aa).trim();//不想保留原来的字符串可以直接写成 “str = str.replaceAll(regEX,aa);”
+		System.out.println("newString2====="+newString2);
+
+	}
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -125,8 +125,8 @@ public class AdamUserController {
 //        editVo.setAvatar(parameter.getAvatar());
 //        editVo.setBackground(parameter.getBackground());
 //        editVo.setNickname(parameter.getNickname());
-        editVo.setAvatar(editVo.getAvatar());
-        editVo.setBackground(editVo.getBackground());
+        editVo.setAvatar(StringUtils.isEmpty(editVo.getAvatar()) ? avatarDefUrl : editVo.getAvatar());
+        editVo.setBackground(StringUtils.isEmpty(editVo.getBackground()) ? avatarDefUrl : editVo.getBackground());
         editVo.setNickname(editVo.getNickname());
         editVo.setSex(sex);
         editVo.setBirthday(parameter.getBirthday());

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/controller/PayController.java

@@ -89,14 +89,14 @@ public class PayController {
         dragonPayBaseReqDto.setOpenId(openId);
         dragonPayBaseReqDto.setType(type);
         dragonPayBaseReqDto.setPrice(price);
-        if(StringUtil.isNotNull(name)&&name.length()>=32){
-            name = name.substring(0,32);
-        }
-        dragonPayBaseReqDto.setName(name);
-        if(StringUtil.isNotNull(detail)&&detail.length()>=64){
-            detail = detail.substring(0,64);
-        }
-        dragonPayBaseReqDto.setDetail(detail);
+//        if(StringUtil.isNotNull(name)&&name.length()>=32){
+//            name = name.substring(0,32);
+//        }
+        dragonPayBaseReqDto.setName("正在现场");
+//        if(StringUtil.isNotNull(detail)&&detail.length()>=64){
+//            detail = detail.substring(0,64);
+//        }
+        dragonPayBaseReqDto.setDetail("正在现场");
         dragonPayBaseReqDto.setOrderCode(orderCode);
         dragonPayBaseReqDto.setClientIp(clientIp);
         dragonPayBaseReqDto.setNotifyUrl(notifyUrl);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/BannersServiceImpl.java

@@ -63,20 +63,20 @@ public class BannersServiceImpl implements IKylinBannersService {
                     }
 
                     // list
-                    if (bannerInfo.getPromotionType() != 1) {
-                        List<String> pList = bannerInfo.getPositionList();
-                        Boolean pis = false;
-                        if (null != pList) {
-                            for (String positionName : pList) {
-                                if (positionName.equals(position)) {
-                                    pis = true;
-                                }
+                    List<String> pList = bannerInfo.getPositionList();
+                    Boolean pis = false;
+                    if (null != pList) {
+                        for (String positionName : pList) {
+                            if (positionName.equals(position)) {
+                                pis = true;
                             }
                         }
-                        if (!pis || null == pList) {
-                            itBannerList.remove();
-                        }
+                    }
+                    if (!pis || null == pList) {
+                        itBannerList.remove();
+                    }
 
+                    if (bannerInfo.getPromotionType() != 1) {
                         List<String> proList = bannerInfo.getProvincesList();
                         Boolean prois = false;
                         if (null != proList) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/DataController.java

-package com.liquidnet.service.platform.controller.kylin;
-
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.platform.service.impl.kylin.DataImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Api(tags = "数据迁移 (会重复)")
-@RestController
-@RequestMapping("data")
-public class DataController {
-
-    @Autowired
-    private DataImpl data;
-
-    @PostMapping("performance")
-    @ApiOperation("演出数据迁移")
-    public ResponseDto<Boolean> performance() {
-        Boolean result = data.performance();
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("order")
-    @ApiOperation("订单数据迁移")
-    public ResponseDto<Boolean> order(String month) {
-        Boolean result = data.order(month);
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("roadShow")
-    @ApiOperation("巡演数据迁移")
-    public ResponseDto<Boolean> roadShow() {
-        Boolean result = data.roadShow();
-        return ResponseDto.success(result);
-    }
-
-    @PostMapping("childAccount")
-    @ApiOperation("验票子账号数据迁移")
-    public ResponseDto<Boolean> childAccount() {
-        Boolean result = data.childAccount();
-        return ResponseDto.success(result);
-    }
-
-}
+//package com.liquidnet.service.platform.controller.kylin;
+//
+//import com.liquidnet.service.base.ResponseDto;
+//import com.liquidnet.service.platform.service.impl.kylin.DataImpl;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//
+//@Api(tags = "数据迁移 (会重复)")
+//@RestController
+//@RequestMapping("data")
+//public class DataController {
+//
+//    @Autowired
+//    private DataImpl data;
+//
+//    @PostMapping("performance")
+//    @ApiOperation("演出数据迁移")
+//    public ResponseDto<Boolean> performance() {
+//        Boolean result = data.performance();
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("order")
+//    @ApiOperation("订单数据迁移")
+//    public ResponseDto<Boolean> order(String month) {
+//        Boolean result = data.order(month);
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("roadShow")
+//    @ApiOperation("巡演数据迁移")
+//    public ResponseDto<Boolean> roadShow() {
+//        Boolean result = data.roadShow();
+//        return ResponseDto.success(result);
+//    }
+//
+//    @PostMapping("childAccount")
+//    @ApiOperation("验票子账号数据迁移")
+//    public ResponseDto<Boolean> childAccount() {
+//        Boolean result = data.childAccount();
+//        return ResponseDto.success(result);
+//    }
+//
+//}