opt;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/pom.xml

@@ -73,6 +73,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector-java.version}</version>
         </dependency>
 
         <!-- 核心模块-->

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/ClientAdminApplication.java

+package com.liquidnet.client.admin;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+import java.net.InetAddress;
+import java.util.Arrays;
+
+@Slf4j
+@EnableAsync
+@EnableEurekaClient
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}, scanBasePackages = {"com.liquidnet"})
+@MapperScan(basePackages = {"com.liquidnet.service.kylin.mapper", "com.liquidnet.service.adam.mapper"})//
+public class ClientAdminApplication implements CommandLineRunner {
+    @Autowired
+    private Environment environment;
+
+    public static void main(String[] args) {
+        // System.setProperty("spring.devtools.restart.enabled", "false");
+        SpringApplication.run(ClientAdminApplication.class, args);
+    }
+
+    @Override
+    public void run(String... args) throws Exception {
+        try {
+            log.info("\n----------------------------------------------------------\n\t" +
+                            "Application '{}' is running! Access URLs:\n\t" +
+                            "Local: \t\thttp://127.0.0.1:{}\n\t" +
+                            "External: \thttp://{}:{}{}/login\n\t" +
+                            "Profile(s): \t{}\n----------------------------------------------------------",
+                    environment.getProperty("spring.application.name"),
+                    environment.getProperty("server.port"),
+                    InetAddress.getLocalHost().getHostAddress(),
+                    environment.getProperty("server.port"),
+                    environment.getProperty("server.servlet.context-path"),
+                    Arrays.toString(environment.getActiveProfiles()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/RuoYiServletInitializer.java → liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/ClientAdminServletInitializer.java

@@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  * 
  * @author ruoyi
  */
-public class RuoYiServletInitializer extends SpringBootServletInitializer
+public class ClientAdminServletInitializer extends SpringBootServletInitializer
 {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(RuoYiApplication.class);
+        return application.sources(ClientAdminApplication.class);
     }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/RuoYiApplication.java

-package com.liquidnet.client.admin;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-/**
- * 启动程序
- * 
- * @author ruoyi
- */
-@EnableAsync
-@EnableEurekaClient
-@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class },scanBasePackages = {"com.liquidnet"})
-@MapperScan(basePackages = {"com.liquidnet.service.kylin.mapper","com.liquidnet.service.adam.mapper"})//
-public class RuoYiApplication
-{
-    public static void main(String[] args)
-    {
-        // System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  正在映画启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
-    }
-}
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-mq</artifactId>
+            <artifactId>liquidnet-common-cache-redisson</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/service/impl/AdamMemberCodeAdminServiceImpl.java

@@ -2,17 +2,19 @@ package com.liquidnet.client.admin.zhengzai.adam.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberCodeAdminService;
-import com.liquidnet.common.mq.constant.MQConst;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
+import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
+import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamMemberCode;
 import com.liquidnet.service.adam.mapper.AdamMemberCodeMapper;
-import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.liquidnet.service.adam.util.MemberUtil;
-import com.liquidnet.service.base.SqlMapping;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -20,18 +22,19 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
+import java.util.regex.Pattern;
+
+import static com.liquidnet.service.adam.constant.AdamRedisConst.LOCK_KEY_UMEMBER_NO;
 
 @Slf4j
 @Service
 public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMapper, AdamMemberCode> implements IAdamMemberCodeAdminService {
     @Autowired
-    MongoTemplate mongoTemplate;
+    AdamMemberCodeMapper memberCodeMapper;
     @Autowired
-    RabbitTemplate rabbitTemplate;
+    MongoTemplate mongoTemplate;
     @Autowired
-    IAdamUserMemberService adamUserMemberService;
-//    @Autowired
-//    AdamRdmService adamRdmService;
+    RedisUtil redisUtil;
 
     @Override
     public String createGiftCode(AdamMemberCodeParam param) {
@@ -45,7 +48,7 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
         } while (exists);
 
         // 需要主动生成会员编号
-        memberNo = adamUserMemberService.getNextMemberNo(param.getMemberId());
+        memberNo = getNextMemberNo(param.getMemberId());
 
         if (StringUtils.isEmpty(memberNo)) return "";
 
@@ -58,17 +61,80 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
         initMemberCode.setState(0);// 0-未使用,1-已使用,2-不可用
         initMemberCode.setCreatedAt(LocalDateTime.now());
 
-//        adamMemberCodeMapper.insert(initMemberCode);
+        memberCodeMapper.insert(initMemberCode);
 
         AdamMemberCodeVo vo = AdamMemberCodeVo.getNew().copy(initMemberCode);
         mongoTemplate.insert(vo, AdamMemberCodeVo.class.getSimpleName());
-//        adamRdmService.setMemberCodeVoByCode(mCode, vo);
-        rabbitTemplate.convertAndSend(MQConst.EX_LNS_SQL_UCENTER, MQConst.RK_SQL_UCENTER,
-                SqlMapping.get("adam_member_code.add",
-                        initMemberCode.getCode(), initMemberCode.getType(), initMemberCode.getMemberId(), initMemberCode.getMemberPriceId(),
-                        initMemberCode.getMemberNo(), initMemberCode.getState(), initMemberCode.getCreatedAt(), null, null, null
-                )
-        );
+
+        setMemberCodeVoByCode(mCode, vo);
+
         return initMemberCode.getCode();
     }
+
+    public String getNextMemberNo(String memberId) {
+        long s = System.currentTimeMillis();
+        int memberMaxNo = getMaxMemberNo();
+        if (-1 == memberMaxNo) {
+            if (RedisLockUtil.tryLock(LOCK_KEY_UMEMBER_NO, 1, 3)) {
+                memberMaxNo = getMaxMemberNo();
+                if (-1 == memberMaxNo) {
+                    Query query = Query.query(Criteria.where("memberId").is(memberId)).with(Sort.by(Sort.Direction.DESC, "memberNo")).limit(1);
+
+                    AdamUserMemberVo latestMaxMemberNoVo = mongoTemplate.findOne(query, AdamUserMemberVo.class, AdamUserMemberVo.class.getSimpleName());
+
+                    if (null == latestMaxMemberNoVo) {
+                        AdamMemberVo memberVo = getMemberVoByMemberId(memberId);
+
+                        setMaxMemberNo(memberVo.getStartNo());
+                    } else {
+                        setMaxMemberNo(Integer.parseInt(latestMaxMemberNoVo.getMemberNo()));
+                    }
+                }
+                RedisLockUtil.unlock(LOCK_KEY_UMEMBER_NO);
+            } else {
+                return null;
+            }
+        }
+        String nextMemberNoStr = String.valueOf(incrMemberNo());
+        if (Pattern.matches("([\\d])\\1{" + (nextMemberNoStr.length() - 1) + "}", nextMemberNoStr)) {
+            // 不能是完全相同的数字
+            nextMemberNoStr = String.valueOf(incrMemberNo());
+        }
+        log.debug("#MNO耗时:{}ms", System.currentTimeMillis() - s);
+        return nextMemberNoStr;
+    }
+
+    private int getMaxMemberNo() {
+        Object o = redisUtil.get(AdamRedisConst.INCR_MEMBER_NO);
+        return null == o ? -1 : (int) o;
+    }
+
+    public AdamMemberVo getMemberVoByMemberId(String memberId) {
+        String key = AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId);
+        long s = System.currentTimeMillis();
+        AdamMemberVo vo = (AdamMemberVo) redisUtil.get(key);
+        if (null == vo) {
+            s = System.currentTimeMillis();
+            vo = mongoTemplate.findOne(
+                    Query.query(Criteria.where("memberId").is(memberId).and("state").is(1)),
+                    AdamMemberVo.class, AdamMemberVo.class.getSimpleName()
+            );
+            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
+            if (null != vo) redisUtil.set(key, vo);
+        }
+        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
+        return vo;
+    }
+
+    public boolean setMaxMemberNo(int val) {
+        return redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, val);
+    }
+
+    public int incrMemberNo() {
+        return (int) redisUtil.incr(AdamRedisConst.INCR_MEMBER_NO, 1);
+    }
+
+    public boolean setMemberCodeVoByCode(String memberCode, AdamMemberCodeVo vo) {
+        return redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode), vo);
+    }
 }

liquidnet-bus-service/pom.xml

@@ -203,7 +203,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.19</version>
+            <version>${mysql-connector-java.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>