Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -34,7 +34,7 @@ public class AdamRedisConst {
     public static final String INFO_MEMBER_ORDER = INFO.concat("morder:");
     public static final String INFO_BUY_MEMBER_ORDER_CODE = INFO.concat("mordercode:");
 
-    public static final String INFO_LIBRARY_NKNAME = INFO.concat("library:nkname");
+//    public static final String INFO_LIBRARY_NKNAME = INFO.concat("library:nkname");
 
     public static final String BLACK_LIST = ADAM.concat("blacklist:");
     public static final String BLK_LIST_MEMBER_UID = BLACK_LIST.concat("member:uid");
@@ -51,7 +51,6 @@ public class AdamRedisConst {
     /* ----------------------------------------------------------------- */
 
 //    public static final String LOCK_KEY_UMEMBER_NO = "adam:lk:member:no";
-    // // // // // // // // // //
 //    public static final String LOCK_KEY_SMS_CODE_MOBILE = "adam:lk:sms:code:mobile:";
 //    public static final String LOCK_KEY_UREGISTER = "adam:lk:register:";
 //    public static final String LOCK_KEY_UIDENTITY = "adam:lk:identity:";

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/config/CorsConfig.java

@@ -35,6 +35,13 @@ public class CorsConfig {
         corsConfiguration.addAllowedOrigin("http://devm.zhengzai.tv");
         corsConfiguration.addAllowedOrigin("https://devm.zhengzai.tv");
 
+        corsConfiguration.addAllowedOrigin("http://devapplets.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("https://devapplets.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://testapplets.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("https://testapplets.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("http://applets.zhengzai.tv");
+        corsConfiguration.addAllowedOrigin("https://applets.zhengzai.tv");
+
         corsConfiguration.setAllowCredentials(true);
         corsConfiguration.addAllowedHeader("*");
         corsConfiguration.addAllowedMethod("*");

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

-create database if not exists ln_scene character set utf8mb4 collate utf8mb4_unicode_ci;
-use ln_scene;
--- >>------------------------------------------------------------------------------------
+# create database if not exists ln_scene character set utf8mb4 collate utf8mb4_unicode_ci;
+# use ln_scene;
+# -- >>------------------------------------------------------------------------------------
 drop table if exists adam_third_party;
 create table adam_third_party
 (

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

@@ -14,7 +14,6 @@ import com.liquidnet.common.sms.processor.SmsProcessor;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.core.JwtValidator;
 import com.liquidnet.commons.lang.util.*;
-import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.constant.AdamWechatConst;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.AdamLoginInfoVo;
@@ -193,7 +192,7 @@ public class AdamLoginController {
                                                    @Pattern(regexp = "\\d{6}", message = "验证码格式有误")
                                                    @RequestParam String code) {
         log.debug("mobile:{},code:{}", mobile, code);
-        ResponseDto checkSmsCodeDto = this.checkSmsCode(mobile, code);
+        ResponseDto<AdamLoginInfoVo> checkSmsCodeDto = this.checkSmsCode(mobile, code);
         if (!checkSmsCodeDto.isSuccess()) return checkSmsCodeDto;
 
         String uid = adamRdmService.getUidByMobile(mobile);
@@ -278,7 +277,7 @@ public class AdamLoginController {
             loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(uid));
 //            loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         } else {// 新账号注册
-            ResponseDto checkSmsCodeDto = this.checkSmsCode(parameter.getMobile(), parameter.getCode());
+            ResponseDto<AdamLoginInfoVo> checkSmsCodeDto = this.checkSmsCode(parameter.getMobile(), parameter.getCode());
             if (!checkSmsCodeDto.isSuccess()) {
                 return checkSmsCodeDto;
             }
@@ -376,22 +375,11 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
     /* ---------------------------- Internal Method ---------------------------- */
 
-    private ResponseDto checkSmsCode(String mobile, String code) {
-        Integer switchGrayLoginSms = (Integer) redisUtil.get(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS);
-        if (null != switchGrayLoginSms) {
-            if (switchGrayLoginSms == 615243) {
-                if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
-                    return ResponseDto.success();
-                }
-            }
-            if (switchGrayLoginSms == 612543) {
-                if (reviewMobile.equals(mobile) ||
-                        Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
-                ) {
-                    if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
-                        return ResponseDto.success();
-                    }
-                }
+    private ResponseDto<AdamLoginInfoVo> checkSmsCode(String mobile, String code) {
+        if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(env.getProperty(CurrentUtil.CK_ENV_ACTIVE))
+                || reviewMobile.equals(mobile)) {
+            if (CurrentUtil.GRAY_LOGIN_SMS_CODE.equals(code)) {
+                return ResponseDto.success();
             }
         }
 

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

@@ -35,15 +35,7 @@ public class AdamRdmService {
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Loader meta-fil */
 
-    public List<String> getNknameList() {
-        ArrayList<String> list = (ArrayList<String>) redisUtil.get(AdamRedisConst.INFO_LIBRARY_NKNAME);
-        if (CollectionUtils.isEmpty(list)) {
-            list = NknameUtil.readForStringList();
 
-            if (!CollectionUtils.isEmpty(list)) redisUtil.set(AdamRedisConst.INFO_LIBRARY_NKNAME, list);
-        }
-        return list;
-    }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <Mobile, SMS CODE> */
 

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

@@ -12,6 +12,7 @@ import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamEntersService;
 import com.liquidnet.service.adam.service.IAdamRealNameService;
 import com.liquidnet.service.adam.service.IAdamUserService;
+import com.liquidnet.service.adam.util.NknameUtil;
 import com.liquidnet.service.adam.util.QueueUtils;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
@@ -72,8 +73,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 userInfoVo = AdamUserInfoVo.getNew();
                 userInfoVo.setUid(IDGenerator.nextSnowId() + "");
                 userInfoVo.setMobile(mobile);
-                List<String> nknameList = adamRdmService.getNknameList();
-                userInfoVo.setNickname("宇航员".concat(nknameList.get(RandomUtils.nextInt(0, nknameList.size()))));
+                userInfoVo.setNickname(NknameUtil.randomNkname());
                 userInfoVo.setIsComplete(0);
                 userInfoVo.setState(1);
                 userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/util/NknameUtil.java

@@ -4,19 +4,30 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.CollectionUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 
 public class NknameUtil {
     private static final Logger log = LoggerFactory.getLogger(NknameUtil.class);
 
-    public static ArrayList<String> readForStringList() {
-        ArrayList<String> nknameList = CollectionUtil.arrayListString();
+    private static Random random = new Random();
+    static {
+        reload();
+    }
+
+    private static int bound;
+    private static List<String> nknameList;
+    private static String nknamePrefix = "宇航员";
+
+    public static void reload() {
+        nknameList = CollectionUtil.arrayListString();
         InputStream inputStream = null;
         InputStreamReader inputStreamReader = null;
         BufferedReader bufferedReader = null;
@@ -36,6 +47,9 @@ public class NknameUtil {
                 }
                 nknameList.add(line);
             }
+            if (!CollectionUtils.isEmpty(nknameList)) {
+                bound = nknameList.size();
+            }
         } catch (IOException e) {
             log.error("Read CSV[library_nickname.csv] failure.", e);
         } finally {
@@ -47,6 +61,9 @@ public class NknameUtil {
                 log.error("Close stream failure.", e);
             }
         }
-        return nknameList;
+    }
+
+    public static String randomNkname() {
+        return nknamePrefix + nknameList.get(random.nextInt(bound));
     }
 }
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/docu/db_dragon_structure.sql

-create database if not exists ln_scene character set utf8mb4 collate utf8mb4_unicode_ci;
--- >>------------------------------------------------------------------------------------
-use ln_scene;
+# create database if not exists ln_scene character set utf8mb4 collate utf8mb4_unicode_ci;
+# -- >>------------------------------------------------------------------------------------
+# use ln_scene;
 
 -- 支付订单表
 drop TABLE if exists `dragon_orders`;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DMRdmService.java

@@ -38,15 +38,7 @@ public class DMRdmService {
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Loader meta-fil */
 
-    public List<String> getNknameList() {
-        ArrayList<String> list = (ArrayList<String>) redisUtil.get(AdamRedisConst.INFO_LIBRARY_NKNAME);
-        if (CollectionUtils.isEmpty(list)) {
-            list = NknameUtil.readForStringList();
 
-            if (!CollectionUtils.isEmpty(list)) redisUtil.set(AdamRedisConst.INFO_LIBRARY_NKNAME, list);
-        }
-        return list;
-    }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <Mobile, SMS CODE> */