linxk 1 month ago
parent
commit
10bd6c0e1a
38 changed files with 22 additions and 1961 deletions
  1. 5 5
      operating-api/pom.xml
  2. 0 30
      operating-api/src/main/java/com/txz/operating/dto/award/AwardBizTypeEnum.java
  3. 0 36
      operating-api/src/main/java/com/txz/operating/dto/award/AwardCoinDTO.java
  4. 0 41
      operating-api/src/main/java/com/txz/operating/dto/award/AwardMenuDTO.java
  5. 0 25
      operating-api/src/main/java/com/txz/operating/dto/award/AwardRequestDTO.java
  6. 0 58
      operating-api/src/main/java/com/txz/operating/dto/award/AwardResultDTO.java
  7. 0 24
      operating-api/src/main/java/com/txz/operating/dto/award/AwardResultMenuDTO.java
  8. 0 23
      operating-api/src/main/java/com/txz/operating/dto/award/VoiceDTO.java
  9. 0 39
      operating-api/src/main/java/com/txz/operating/dto/rank/RequestMedianScoreByRankDto.java
  10. 0 51
      operating-api/src/main/java/com/txz/operating/dto/rank/RequestRankDto.java
  11. 0 27
      operating-api/src/main/java/com/txz/operating/dto/rank/ResponseRankIntro.java
  12. 0 39
      operating-api/src/main/java/com/txz/operating/dto/rank/ResponseUserRankDetailDTO.java
  13. 0 26
      operating-api/src/main/java/com/txz/operating/dto/rank/ResponseUserScore.java
  14. 0 26
      operating-api/src/main/java/com/txz/operating/service/IOperatingMedianScoreDubboService.java
  15. 0 70
      operating-api/src/main/java/com/txz/operating/service/IOperatingRankDubboService.java
  16. 7 27
      operating-service/pom.xml
  17. 3 3
      operating-service/src/main/java/com/txz/operating/OperatingApplication.java
  18. 0 49
      operating-service/src/main/java/com/txz/operating/configurer/Parameters.java
  19. 0 267
      operating-service/src/main/java/com/txz/operating/dubbo/impl/RankDubboServiceImpl.java
  20. 0 56
      operating-service/src/main/java/com/txz/operating/dubbo/impl/RankMedianScoreDubboServiceImpl.java
  21. 0 19
      operating-service/src/main/java/com/txz/operating/open/BaiduOpenApi.java
  22. 0 6
      operating-service/src/main/java/com/txz/operating/open/CosOpenApi.java
  23. 0 9
      operating-service/src/main/java/com/txz/operating/open/JbsOpenApi.java
  24. 0 9
      operating-service/src/main/java/com/txz/operating/open/TxOpenApi.java
  25. 0 75
      operating-service/src/main/java/com/txz/operating/open/impl/BaiduOpenApiImpl.java
  26. 0 309
      operating-service/src/main/java/com/txz/operating/open/impl/CosOpenApiImpl.java
  27. 0 37
      operating-service/src/main/java/com/txz/operating/open/impl/JbsOpenApiImpl.java
  28. 0 51
      operating-service/src/main/java/com/txz/operating/open/impl/TxOpenApiImpl.java
  29. 0 64
      operating-service/src/main/java/com/txz/operating/util/DistributeUtil.java
  30. 0 131
      operating-service/src/main/java/com/txz/operating/util/DubboServiceFactory.java
  31. 0 25
      operating-service/src/main/java/com/txz/operating/util/lock/DistributedLocker.java
  32. 0 15
      operating-service/src/main/java/com/txz/operating/util/lock/LockNameConst.java
  33. 0 62
      operating-service/src/main/java/com/txz/operating/util/lock/RedissonAutoConfiguration.java
  34. 0 60
      operating-service/src/main/java/com/txz/operating/util/lock/RedissonDistributedLocker.java
  35. 0 85
      operating-service/src/main/java/com/txz/operating/util/lock/RedissonLockUtil.java
  36. 0 56
      operating-service/src/main/java/com/txz/operating/web/RankController.java
  37. 6 25
      operating-service/src/main/resources/bootstrap.properties
  38. 1 1
      operating-service/src/main/resources/logback.xml

+ 5 - 5
operating-api/pom.xml

@@ -29,11 +29,11 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-redis</artifactId>
-            <scope>compile</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.data</groupId>-->
+<!--            <artifactId>spring-data-redis</artifactId>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
 
 
     </dependencies>

+ 0 - 30
operating-api/src/main/java/com/txz/operating/dto/award/AwardBizTypeEnum.java

@@ -1,30 +0,0 @@
-package com.txz.operating.dto.award;
-
-public enum AwardBizTypeEnum {
-
-    SIGN_IN(1, "签到领奖"),
-    ACTIVITY(2, "活动领奖"),
-    FEEDBACK(3,"意见反馈"),
-    MGR(4,"后台管理"),
-    LOTTERY(5, "大转盘抽奖"),
-    REDEEM_CODE(6, "兑换码"),
-    COUPON(7, "优惠券"),
-    PERMIT(8, "签到通行证"),
-    OTHER(99, "其他"),
-    ;
-    private Integer key;
-    private String value;
-
-    AwardBizTypeEnum(Integer key, String value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public Integer getKey() {
-        return key;
-    }
-
-    public String getDesc() {
-        return value;
-    }
-}

+ 0 - 36
operating-api/src/main/java/com/txz/operating/dto/award/AwardCoinDTO.java

@@ -1,36 +0,0 @@
-package com.txz.operating.dto.award;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author :linxk
- * @date :Created in 2020/7/9 13:40
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AwardCoinDTO  implements Serializable {
-
-    /**
-     * 币种类型
-     * @see
-     */
-    private Integer type;
-
-    /**
-     * 币种名称
-     */
-    private String name;
-
-    /**
-     * 变化值
-     */
-    private Integer num;
-
-
-}

+ 0 - 41
operating-api/src/main/java/com/txz/operating/dto/award/AwardMenuDTO.java

@@ -1,41 +0,0 @@
-package com.txz.operating.dto.award;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author :yuzhengqun
- * @date :Created in 2020/7/9 13:40
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class AwardMenuDTO  implements Serializable {
-
-    /**
-     * 奖品菜单ID
-     */
-    private Long menuId;
-    /**
-     * 奖品类型
-     * @see
-     */
-    private Integer type;
-
-    /**
-     * 奖品名称
-     */
-    private String name;
-
-    /**
-     * 用于前端选择资源
-     */
-    private String code;
-
-
-}

+ 0 - 25
operating-api/src/main/java/com/txz/operating/dto/award/AwardRequestDTO.java

@@ -1,25 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package com.txz.operating.dto.award;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class AwardRequestDTO implements Serializable {
-    private Integer prizeId;
-    private Long menuId;
-    private Integer value;
-    private AwardRequestDTO replace;
-
-}

+ 0 - 58
operating-api/src/main/java/com/txz/operating/dto/award/AwardResultDTO.java

@@ -1,58 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package com.txz.operating.dto.award;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class AwardResultDTO implements Serializable {
-    /**
-     * 状态 1成功
-     */
-    private Integer status;
-    /**
-     * 返回语句
-     */
-    private String remind;
-    /**
-     *返回语音
-     */
-    private VoiceDTO voice;
-    /**
-     *返回币种1变化
-     */
-    private Integer coin;
-
-    /**
-     *返回币种1变化
-     */
-    private Integer ore;
-    /**
-     * 自定义货币类型 和值的编号
-     */
-    private List<AwardCoinDTO> coins;
-
-    private Byte isVip;
-    /**
-     *奖励结果
-     */
-    private List<AwardResultMenuDTO> awardMenuList;
-    /**
-     *原奖励结果
-     */
-    private List<AwardRequestDTO> sourceAwardList;
-
-
-}

+ 0 - 24
operating-api/src/main/java/com/txz/operating/dto/award/AwardResultMenuDTO.java

@@ -1,24 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package com.txz.operating.dto.award;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class AwardResultMenuDTO implements Serializable {
-    private Integer type;
-    private Integer value;
-    private String code;
-
-}

+ 0 - 23
operating-api/src/main/java/com/txz/operating/dto/award/VoiceDTO.java

@@ -1,23 +0,0 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
-package com.txz.operating.dto.award;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class VoiceDTO implements Serializable {
-    private String content;
-    private String voiceUrl;
-
-}

+ 0 - 39
operating-api/src/main/java/com/txz/operating/dto/rank/RequestMedianScoreByRankDto.java

@@ -1,39 +0,0 @@
-package com.txz.operating.dto.rank;
-
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @Author: Fcx
- * @Date: 2019/11/26 14:01
- * @Version 1.0
- */
-@Data
-@ToString
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class RequestMedianScoreByRankDto implements Serializable {
-    private static final long serialVersionUID = -1L;
-
-    /**
-     * 排行榜是否逆序
-     * true 逆序, 数字越大的排名越前  比如: 正确率
-     * false  顺序, 数字越小排名越前  比如: 答题速度
-     *
-     * 怎么存怎么取: 如 存的时候传true,那么取的时候也传true
-     */
-    private Boolean reverse;
-
-    /**
-     * 排行榜存取的唯一key值(年级/学校等)
-     */
-    private String rankKey;
-
-    /**
-     * 排行榜的中位数索引  非必传
-     */
-    private Long medianIndex;
-
-}

+ 0 - 51
operating-api/src/main/java/com/txz/operating/dto/rank/RequestRankDto.java

@@ -1,51 +0,0 @@
-package com.txz.operating.dto.rank;
-
-import com.txz.operating.dto.PageDto;
-import lombok.*;
-
-/**
- * @Author: Fcx
- * @Date: 2019/11/26 14:01
- * @Version 1.0
- */
-@Data
-@ToString
-@EqualsAndHashCode(callSuper=true)
-@NoArgsConstructor
-@AllArgsConstructor
-public class RequestRankDto extends PageDto {
-
-    /**
-     * 排行榜是否逆序
-     * true 逆序, 数字越大的排名越前  比如: 正确率
-     * false  顺序, 数字越小排名越前  比如: 答题速度
-     *
-     * 怎么存怎么取: 如 存的时候传true,那么取的时候也传true
-     */
-    private Boolean reverse;
-
-    /**
-     * 排行榜存取的唯一key值(年级/学校等)
-     */
-    private String rankKey;
-
-    /**
-     * 用户id
-     */
-    private String userId;
-
-    /**
-     * 用户待更新的分数
-     */
-    private Integer score;
-
-    @Builder
-    private RequestRankDto(Boolean reverse, String rankKey, String userId, Integer score, Integer page, Integer size) {
-        super(page, size);
-        this.reverse = reverse;
-        this.rankKey = rankKey;
-        this.userId = userId;
-        this.score = score;
-    }
-
-}

+ 0 - 27
operating-api/src/main/java/com/txz/operating/dto/rank/ResponseRankIntro.java

@@ -1,27 +0,0 @@
-package com.txz.operating.dto.rank;
-
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @Author: Fcx
- * @Date: 2019/11/26 18:02
- * @Version 1.0
- */
-@Getter
-@Setter
-@ToString
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ResponseRankIntro implements Serializable {
-
-    private static final long serialVersionUID = 7553737909196727258L;
-
-    private Long rankSize;
-
-    private Long totalScore;
-
-}

+ 0 - 39
operating-api/src/main/java/com/txz/operating/dto/rank/ResponseUserRankDetailDTO.java

@@ -1,39 +0,0 @@
-package com.txz.operating.dto.rank;
-
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * 用户排行榜每一条的详情DTO
- *
- * @Author: Fcx
- * @Date: 2019/11/25 19:47
- * @Version 1.0
- */
-@Getter
-@Setter
-@ToString
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ResponseUserRankDetailDTO implements Serializable {
-
-    private static final long serialVersionUID = 8592131577850489756L;
-
-    /**
-     * 分数
-     */
-    private Double score;
-
-    /**
-     * 排名
-     */
-    private Long rank;
-
-    /**
-     * 排行榜总人数
-     */
-    private Long rankSize;
-
-}

+ 0 - 26
operating-api/src/main/java/com/txz/operating/dto/rank/ResponseUserScore.java

@@ -1,26 +0,0 @@
-package com.txz.operating.dto.rank;
-
-import lombok.*;
-
-import java.io.Serializable;
-
-/**
- * @Author: Fcx
- * @Date: 2019/11/26 18:02
- * @Version 1.0
- */
-@Getter
-@Setter
-@ToString
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ResponseUserScore implements Serializable {
-
-    private static final long serialVersionUID = -271210795658635545L;
-    private String userId;
-
-    private Integer score;
-
-}

+ 0 - 26
operating-api/src/main/java/com/txz/operating/service/IOperatingMedianScoreDubboService.java

@@ -1,26 +0,0 @@
-package com.txz.operating.service;
-
-import com.txz.operating.dto.rank.RequestMedianScoreByRankDto;
-import com.txz.operating.result.Result;
-
-/**
- * 排行榜接口
- * <p>
- * 若干个排行榜
- *
- * @Author: Fcx
- * @Date: 2019/11/25 15:07
- * @Version 1.0
- */
-public interface IOperatingMedianScoreDubboService {
-
-
-    /**
-     *获取中位数
-     * @param dto 所需参数: rankKey reverse
-     * @return
-     */
-    Result<Long> getMedianScore(RequestMedianScoreByRankDto dto);
-
-
-}

+ 0 - 70
operating-api/src/main/java/com/txz/operating/service/IOperatingRankDubboService.java

@@ -1,70 +0,0 @@
-package com.txz.operating.service;
-
-import com.txz.operating.dto.rank.RequestRankDto;
-import com.txz.operating.dto.rank.ResponseRankIntro;
-import com.txz.operating.dto.rank.ResponseUserRankDetailDTO;
-import com.txz.operating.dto.rank.ResponseUserScore;
-import com.txz.operating.result.Result;
-
-import java.util.List;
-
-/**
- * 排行榜接口
- * <p>
- * 若干个排行榜
- *
- * @Author: Fcx
- * @Date: 2019/11/25 15:07
- * @Version 1.0
- */
-public interface IOperatingRankDubboService {
-
-    /**
-     * 获取一个指定数量的排行榜列表
-     *
-     * @param dto 所需参数: rankKey reverse page size
-     * @return
-     */
-    Result<List<ResponseUserScore>> getRankList(RequestRankDto dto);
-
-    /**
-     * 获取排行榜的总人数
-     *
-     * @param dto 所需参数: rankKey reverse
-     * @return
-     */
-    Result<ResponseRankIntro> getRankSizeAndTotalScore(RequestRankDto dto);
-
-    /**
-     * 获取用户rankKey对应的所有排行榜,目前包括正确率和答题速度
-     *
-     * @param dto 所需参数: rankKey reverse userId
-     * @return
-     */
-    Result<ResponseUserRankDetailDTO> getRankByUserId(RequestRankDto dto);
-
-    /**
-     * 更新一个用户在某个排行榜中的分数
-     *
-     * @param dto 所需参数: rankKey reverse userId score
-     * @return
-     */
-    Result saveRankList(RequestRankDto dto);
-
-    /**
-     * 删掉一个用户在某个排行榜中的排名
-     * 传入 reverse rankKey userId
-     *
-     * @param dto
-     * @return
-     */
-    Result delUserRank(RequestRankDto dto);
-
-    /**
-     * 删掉一个排行榜
-     * 传入 reverse rankKey
-     *
-     * @return
-     */
-    Result delRank(RequestRankDto dto);
-}

+ 7 - 27
operating-service/pom.xml

@@ -17,30 +17,22 @@
 
     <!-- Inherit defaults from Spring Boot -->
     <dependencies>
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.boot</groupId>-->
-        <!--            <artifactId>spring-boot-starter-data-redis</artifactId>-->
-        <!--        </dependency>-->
         <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>3.13.1</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.qcloud</groupId>
-            <artifactId>cos_api</artifactId>
-            <version>5.6.15</version>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.3.0</version>
         </dependency>
-        <!-- rocketMQ start-->
+
+
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-zipkin</artifactId>
-        </dependency>
 
         <!--格式化sql日志-->
         <dependency>
@@ -49,18 +41,6 @@
             <version>3.8.6</version>
         </dependency>
         <!--Spring Boot依赖-->
-<!--        <dependency>-->
-<!--            <groupId>com.txz</groupId>-->
-<!--            <artifactId>cif-api</artifactId>-->
-<!--            <version>1.0.0-SNAPSHOT</version>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>com.github.binarywang</groupId>-->
-<!--                    <artifactId>wx-java-mp-spring-boot-starter</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
-        <!--Spring Boot依赖-->
 
         <!--异维科技dubbo接口包依赖-->
         <dependency>

+ 3 - 3
operating-service/src/main/java/com/txz/operating/OperatingApplication.java

@@ -19,9 +19,9 @@ import org.springframework.web.client.RestTemplate;
 @EnableDiscoveryClient
 @SpringBootApplication
 @EnableSwagger2Doc
-@RibbonClients(value = {
-        @RibbonClient(name = "operating",configuration = RibbonWeightedResponseTimeRuleConfig.class)
-})
+//@RibbonClients(value = {
+//        @RibbonClient(name = "operating",configuration = RibbonWeightedResponseTimeRuleConfig.class)
+//})
 //@EnableFeignClients(basePackages = {"com.txz.operating.service"})
 public class OperatingApplication {
 

+ 0 - 49
operating-service/src/main/java/com/txz/operating/configurer/Parameters.java

@@ -38,56 +38,7 @@ public class Parameters {
     @Value("${spring.application.name}")
     private String        application;
 
-    @Value("${jbs.url}")
-    private String        jbsUrl;
 
-    @Value("${cos.bucketName}")
-    private String cosBucketName; //桶的名称
-
-    @Value("${cos.region}")
-    private String cosRegion;//区域上海
-
-    @Value("${cos.appId}")
-    private String cosAppId; //APPID
-
-    @Value("${cos.secretId}")
-    private String cosSecretId; //SecretId 是用于标识 API 调用者的身份
-
-    @Value("${cos.secretKey}")
-    private String cosSecretKey; //SecretKey是用于加密签名字符串和服务器端验证签名字符串的密钥
-
-    @Value("${baidu.map.url}")
-    private String baiduMapUrl = "http://api.map.baidu.com/place/v2/search";
-
-    @Value("${baidu.map.ak}")
-    private String baiduMapAk = "0lzCFQAArNsjnm56HTGXSGNIFmUGCpwc";
-
-    @Value("${lottery.record.save.ids}")
-    private String lotterySaveIds = ",13,14,15,";
-
-    @Value("${tx.secret.id}")
-    private String secretId ;
-
-    @Value("${tx.secret.key}")
-    private String secretKey ;
-
-    @Value("${baidu.app.id}")
-    private String baiduAppId ;
-
-    @Value("${baidu.apk.key}")
-    private String baiduApkKey ;
-
-    @Value("${baidu.secret.key}")
-    private String baiduSecretKey ;
-
-    /**
-     * 通行证开关 off关闭 其他开启
-     */
-    @Value("${permit.service}")
-    private String permitService ;
-
-    @Value("${open.appCode}")
-    private String  openAppCode ;
 
 
 

+ 0 - 267
operating-service/src/main/java/com/txz/operating/dubbo/impl/RankDubboServiceImpl.java

@@ -1,267 +0,0 @@
-package com.txz.operating.dubbo.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.txz.operating.dto.rank.RequestRankDto;
-import com.txz.operating.dto.rank.ResponseRankIntro;
-import com.txz.operating.dto.rank.ResponseUserRankDetailDTO;
-import com.txz.operating.dto.rank.ResponseUserScore;
-import com.txz.operating.result.Result;
-import com.txz.operating.constants.MyConstants;
-import com.txz.operating.constants.RedisConstants;
-import com.txz.operating.core.ResultCode;
-import com.txz.operating.service.IOperatingRankDubboService;
-import com.txz.operating.util.lock.LockNameConst;
-import com.txz.operating.util.lock.RedissonLockUtil;
-import org.apache.dubbo.config.annotation.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ZSetOperations;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Author: Fcx
- * @Date: 2019/11/25 15:07
- * @Version 1.0
- */
-@Service
-public class RankDubboServiceImpl implements IOperatingRankDubboService {
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Override
-    public Result<List<ResponseUserScore>> getRankList(RequestRankDto dto) {
-        if (dto.getRankKey() == null || dto.getReverse() == null
-                || dto.getPage() == null || dto.getSize() == null) {
-            return Result.fail(ResultCode.REQUEST_ARGS_IS_NULL.getCode(), ResultCode.REQUEST_ARGS_IS_NULL.getMessage());
-        }
-        // rank列表
-        Set<ZSetOperations.TypedTuple<String>> rankList;
-        if (dto.getReverse()) {
-            rankList = redisTemplate.opsForZSet().reverseRangeWithScores(RedisConstants.RANK_LIST
-                    .replaceFirst("reverse", dto.getReverse().toString())
-                    .replaceFirst("rankKey", dto.getRankKey()), dto.getIndex(), dto.getSize());
-        } else {
-            rankList = redisTemplate.opsForZSet().rangeWithScores(RedisConstants.RANK_LIST
-                    .replaceFirst("reverse", dto.getReverse().toString())
-                    .replaceFirst("rankKey", dto.getRankKey()), dto.getIndex(), dto.getSize());
-        }
-        List<ResponseUserScore> list = new ArrayList<>(rankList.size());
-        for (ZSetOperations.TypedTuple<String> tuple : rankList) {
-            // key 转换
-            String userId = StrUtil.subAfter(tuple.getValue(), RedisConstants.RANK_USER.replace("userId", ""), false);
-            int score = tuple.getScore().intValue();
-            ResponseUserScore build = ResponseUserScore.builder()
-                    .userId(userId)
-                    .score(score)
-                    .build();
-            list.add(build);
-        }
-        return Result.success(list);
-    }
-
-    @Override
-    public Result<ResponseRankIntro> getRankSizeAndTotalScore(RequestRankDto dto) {
-        if (dto.getRankKey() == null || dto.getReverse() == null) {
-            return Result.fail(ResultCode.REQUEST_ARGS_IS_NULL.getCode(), ResultCode.REQUEST_ARGS_IS_NULL.getMessage());
-        }
-        Long rankSize = redisTemplate.opsForZSet().zCard(RedisConstants.RANK_LIST
-                .replaceFirst("reverse", dto.getReverse().toString())
-                .replaceFirst("rankKey", dto.getRankKey())
-        );
-        Object o = redisTemplate.opsForValue().get(RedisConstants.RANK_TOTAL_SCORE
-                .replaceFirst("reverse", dto.getReverse().toString())
-                .replaceFirst("rankKey", dto.getRankKey()));
-        Long totalScore = 0L;
-        if (o != null) {
-            totalScore = (Long) o;
-        }
-        ResponseRankIntro rankIntro = ResponseRankIntro.builder()
-                .rankSize(rankSize)
-                .totalScore(totalScore)
-                .build();
-        return Result.success(rankIntro);
-    }
-
-    @Override
-    public Result<ResponseUserRankDetailDTO> getRankByUserId(RequestRankDto dto) {
-        if (dto.getRankKey() == null || dto.getUserId() == null || dto.getReverse() == null) {
-            return Result.fail(ResultCode.REQUEST_ARGS_IS_NULL.getCode(), ResultCode.REQUEST_ARGS_IS_NULL.getMessage());
-        }
-        // 用户的分数
-        Double score = redisTemplate.opsForZSet().score(
-                RedisConstants.RANK_LIST
-                        .replaceFirst("reverse", dto.getReverse().toString())
-                        .replaceFirst("rankKey", dto.getRankKey()),
-                RedisConstants.RANK_USER
-                        .replaceFirst("reverse", dto.getReverse().toString())
-                        .replaceFirst("userId", dto.getUserId()));
-        // 用户的排名
-        // 取并列map,此得分的用户
-
-        String parataxisRankUserId = dto.getUserId();
-        Long rank = null;
-        if (null != score) {
-            Object o = redisTemplate.opsForHash().get(
-                    RedisConstants.RANK_PARATAXIS_MAP
-                            .replaceFirst("reverse", dto.getReverse().toString())
-                            .replaceFirst("rankKey", dto.getRankKey()),
-                    // key分数
-                    RedisConstants.RANK_MAP_SCORE.replace("num", String.valueOf(score.intValue()))
-            );
-            if (null != o) {
-                parataxisRankUserId = (String) o;
-            }
-            if (dto.getReverse()) {
-                rank = redisTemplate.opsForZSet().reverseRank(RedisConstants.RANK_LIST
-                                .replaceFirst("reverse", dto.getReverse().toString())
-                                .replaceFirst("rankKey", dto.getRankKey()),
-                        RedisConstants.RANK_USER
-                                .replaceFirst("userId", parataxisRankUserId));
-            } else {
-                rank = redisTemplate.opsForZSet().rank(RedisConstants.RANK_LIST
-                                .replaceFirst("reverse", dto.getReverse().toString())
-                                .replaceFirst("rankKey", dto.getRankKey()),
-                        RedisConstants.RANK_USER
-                                .replaceFirst("userId", parataxisRankUserId));
-            }
-        }
-
-        // 本排行榜的人数
-        Long rankSize = redisTemplate.opsForZSet().zCard(RedisConstants.RANK_LIST
-                .replaceFirst("reverse", dto.getReverse().toString())
-                .replaceFirst("rankKey", dto.getRankKey())
-        );
-
-        if (null != rank) {
-            rank += 1;
-        }
-
-        ResponseUserRankDetailDTO detailDTO = ResponseUserRankDetailDTO.builder()
-                .score(score)
-                .rank(rank)
-                .rankSize(rankSize)
-                .build();
-        return Result.success(detailDTO);
-    }
-
-    @Override
-    public Result saveRankList(RequestRankDto dto) {
-        if (dto.getRankKey() == null || dto.getUserId() == null || dto.getReverse() == null || dto.getScore() == null) {
-            return Result.fail(ResultCode.REQUEST_ARGS_IS_NULL.getCode(), ResultCode.REQUEST_ARGS_IS_NULL.getMessage());
-        }
-
-        /// 不收集排行榜的总分  2020年11月20日 14:48:33
-        // updateRankTotalScore(dto, true);
-
-        // 更新一个用户在某个排行榜中的分数
-        long floatNum;
-        if (dto.getReverse()) {
-            floatNum = System.currentTimeMillis();
-        } else {
-            floatNum = MyConstants.RANK_TOTAL_SCORE - System.currentTimeMillis();
-        }
-        redisTemplate.opsForZSet().add(
-                RedisConstants.RANK_LIST
-                        .replaceFirst("reverse", dto.getReverse().toString())
-                        .replaceFirst("rankKey", dto.getRankKey()),
-                RedisConstants.RANK_USER
-                        .replaceFirst("userId", dto.getUserId()),
-
-                // 小数点后加一个随时间更新的值, 后面的小于前面的, 所以同分数排名是后来居上
-                Double.valueOf(dto.getScore() + "." + floatNum)
-        );
-
-        // 更新并列map,此得分的用户
-        redisTemplate.opsForHash().put(
-                RedisConstants.RANK_PARATAXIS_MAP
-                        .replaceFirst("reverse", dto.getReverse().toString())
-                        .replaceFirst("rankKey", dto.getRankKey()),
-                // key存分数
-                RedisConstants.RANK_MAP_SCORE.replace("num", dto.getScore().toString())
-                ,
-                // value存userId
-                dto.getUserId()
-        );
-
-        return Result.success();
-    }
-
-    private void updateRankTotalScore(RequestRankDto dto, Boolean update) {
-        // 加分布式锁
-        String lockKey = LockNameConst.LOCK_RANK_TOTAL_SCORE
-                .replace("reverse", dto.getReverse().toString())
-                .replace("rankKey", dto.getRankKey());
-        // 等待5s, 10min释放
-        if (!RedissonLockUtil.tryLock(lockKey, TimeUnit.SECONDS, 5, 60 * 10)) {
-            throw new RuntimeException("分布式锁冲突");
-        }
-
-        // #######维护此排行榜的总分 start ######
-        Object o = redisTemplate.opsForValue().get(RedisConstants.RANK_TOTAL_SCORE
-                .replaceFirst("reverse", dto.getReverse().toString())
-                .replaceFirst("rankKey", dto.getRankKey()));
-        Long totalScore;
-        if (o != null) {
-            totalScore = (Long) o;
-        } else {
-            totalScore = 0L;
-        }
-
-        // 查出用户在排行榜里的分数,减去再加上新值
-        Double score = redisTemplate.opsForZSet().score(
-                RedisConstants.RANK_LIST
-                        .replaceFirst("reverse", dto.getReverse().toString())
-                        .replaceFirst("rankKey", dto.getRankKey()),
-                RedisConstants.RANK_USER
-                        .replaceFirst("userId", dto.getUserId()));
-        if (score != null) {
-            totalScore = totalScore - score.longValue();
-        }
-
-        if (update) {
-            totalScore = totalScore + dto.getScore();
-        }
-
-        redisTemplate.opsForValue().set(
-                RedisConstants.RANK_TOTAL_SCORE
-                        .replaceFirst("reverse", dto.getReverse().toString())
-                        .replaceFirst("rankKey", dto.getRankKey()),
-                totalScore
-        );
-        // #######维护此排行榜的总分 end ######
-        RedissonLockUtil.unlock(lockKey);
-    }
-
-    @Override
-    public Result delUserRank(RequestRankDto dto) {
-        // 减去用户在此排行榜的总分
-        updateRankTotalScore(dto, false);
-
-        Long remove = redisTemplate.opsForZSet().remove(
-                RedisConstants.RANK_LIST
-                        .replaceFirst("reverse", dto.getReverse().toString())
-                        .replaceFirst("rankKey", dto.getRankKey()),
-                RedisConstants.RANK_USER
-                        .replaceFirst("userId", dto.getUserId()));
-
-        return Result.success(remove);
-    }
-
-    @Override
-    public Result delRank(RequestRankDto dto) {
-        // 删除此排行榜的总分
-        Boolean deleteTotalScore = redisTemplate.delete(RedisConstants.RANK_TOTAL_SCORE
-                .replaceFirst("reverse", dto.getReverse().toString())
-                .replaceFirst("rankKey", dto.getRankKey()));
-        // 删除排行榜
-        Boolean delete = redisTemplate.delete(RedisConstants.RANK_LIST
-                .replaceFirst("reverse", dto.getReverse().toString())
-                .replaceFirst("rankKey", dto.getRankKey()));
-        return Result.success(deleteTotalScore && delete);
-    }
-}

+ 0 - 56
operating-service/src/main/java/com/txz/operating/dubbo/impl/RankMedianScoreDubboServiceImpl.java

@@ -1,56 +0,0 @@
-package com.txz.operating.dubbo.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.txz.operating.dto.rank.RequestMedianScoreByRankDto;
-import com.txz.operating.result.Result;
-import com.txz.operating.constants.RedisConstants;
-import com.txz.operating.service.IOperatingMedianScoreDubboService;
-import org.apache.dubbo.config.annotation.Service;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-
-import java.util.Set;
-
-/**
- * @Author: Fcx
- * @Date: 2019/11/25 15:07
- * @Version 1.0
- */
-@Service
-public class RankMedianScoreDubboServiceImpl implements IOperatingMedianScoreDubboService {
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Override
-    public Result<Long> getMedianScore(RequestMedianScoreByRankDto dto) {
-        Long medianIndex = dto.getMedianIndex();
-        if (null == medianIndex) {
-            Long rankSize = redisTemplate.opsForZSet().zCard(RedisConstants.RANK_LIST
-                    .replaceFirst("reverse", dto.getReverse().toString())
-                    .replaceFirst("rankKey", dto.getRankKey())
-            );
-            if (rankSize == null || rankSize == 0) {
-                return Result.fail("排行榜不存在" + dto.getRankKey() + dto.getReverse());
-            }
-            medianIndex = rankSize / 2;
-        }
-
-        Set range = redisTemplate.opsForZSet().range(
-                RedisConstants.RANK_LIST
-                        .replaceFirst("reverse", dto.getReverse().toString())
-                        .replaceFirst("rankKey", dto.getRankKey()),
-                medianIndex, medianIndex + 1);
-        if (CollUtil.isNotEmpty(range)) {
-            String key = (String) range.toArray()[0];
-
-            Double score = redisTemplate.opsForZSet().score(
-                    RedisConstants.RANK_LIST
-                            .replaceFirst("reverse", dto.getReverse().toString())
-                            .replaceFirst("rankKey", dto.getRankKey()),
-                    key);
-            return Result.success(score.longValue());
-        }
-        return Result.fail("请检查中位数" + medianIndex);
-    }
-}

+ 0 - 19
operating-service/src/main/java/com/txz/operating/open/BaiduOpenApi.java

@@ -1,19 +0,0 @@
-package com.txz.operating.open;
-
-import com.txz.operating.open.been.BdAdrressResult;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-
-
-public interface BaiduOpenApi {
-
-    BdAdrressResult search(String location, String query);
-
-    BdAdrressResult suggestion(String region,String query);
-
-    /**
-     * 语音-一句话翻译
-     */
-    JSONObject sentenceRecognition(byte[] data, String format, int rate, HashMap<String, Object> options);
-}

+ 0 - 6
operating-service/src/main/java/com/txz/operating/open/CosOpenApi.java

@@ -1,6 +0,0 @@
-package com.txz.operating.open;
-
-public interface CosOpenApi {
-
-
-}

+ 0 - 9
operating-service/src/main/java/com/txz/operating/open/JbsOpenApi.java

@@ -1,9 +0,0 @@
-package com.txz.operating.open;
-
-
-import com.txz.operating.open.been.JbsStation;
-
-public interface JbsOpenApi {
-
-    JbsStation getStationInfo(Integer mcc, Integer mnc, Integer lac, Integer ci);
-}

+ 0 - 9
operating-service/src/main/java/com/txz/operating/open/TxOpenApi.java

@@ -1,9 +0,0 @@
-package com.txz.operating.open;
-
-public interface TxOpenApi {
-
-    /**
-     * 语音-一句话翻译
-     */
-    String SentenceRecognition(String  sentenceUrl);
-}

+ 0 - 75
operating-service/src/main/java/com/txz/operating/open/impl/BaiduOpenApiImpl.java

@@ -1,75 +0,0 @@
-package com.txz.operating.open.impl;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
-import com.baidu.aip.speech.AipSpeech;
-import com.txz.operating.open.been.BdAdrressResult;
-import com.txz.operating.configurer.Parameters;
-import com.txz.operating.open.BaiduOpenApi;
-import lombok.extern.slf4j.Slf4j;
-import org.json.JSONObject;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-@Service
-public class BaiduOpenApiImpl implements BaiduOpenApi {
-
-    @Resource
-    private Parameters parameters;
-
-    @Override
-    public BdAdrressResult search(String location, String query) {
-        if (StrUtil.isBlank(location)){
-            return null;
-        }
-        Map<String, Object> map = new HashMap<>();
-        map.put("extensions_adcode",true);
-        map.put("radius",2000);
-        if (StrUtil.isBlank(query)){
-            map.put("query","学校%24小学%24幼儿园");
-        } else {
-            map.put("query",query);
-        }
-        map.put("location",location);
-        map.put("output","json");
-        map.put("page_num",0);
-        map.put("page_size",30);
-        map.put("ak",parameters.getBaiduMapAk());
-        map.put("radius_limit",false);
-        String s = HttpUtil.get(parameters.getBaiduMapUrl(),map);
-        return  JSONUtil.toBean(s, BdAdrressResult.class);
-    }
-
-    @Override
-    public BdAdrressResult suggestion(String region,String query) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("extensions_adcode",true);
-        if (StrUtil.isBlank(query)){
-            map.put("query","学校%24小学%24幼儿园");
-        } else {
-            map.put("query",query);
-        }
-        map.put("region",region);
-        map.put("output","json");
-        map.put("page_num",0);
-        map.put("page_size",30);
-        map.put("ak",parameters.getBaiduMapAk());
-        map.put("city_limit",false);
-        log.info(JSONUtil.toJsonStr(map));
-        String s = HttpUtil.get(parameters.getBaiduMapUrl(),map);
-        return  JSONUtil.toBean(s, BdAdrressResult.class);
-    }
-
-    @Override
-    public JSONObject sentenceRecognition(byte[] data, String format, int rate, HashMap<String, Object> options) {
-        AipSpeech client = new AipSpeech(parameters.getBaiduAppId(), parameters.getBaiduApkKey(), parameters.getBaiduSecretKey());
-        return client.asr(data, format, rate, options);
-    }
-
-
-}

+ 0 - 309
operating-service/src/main/java/com/txz/operating/open/impl/CosOpenApiImpl.java

@@ -1,309 +0,0 @@
-package com.txz.operating.open.impl;
-
-import cn.hutool.core.exceptions.ValidateException;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.StrUtil;
-import com.qcloud.cos.COSClient;
-import com.qcloud.cos.ClientConfig;
-import com.qcloud.cos.auth.BasicCOSCredentials;
-import com.qcloud.cos.auth.COSCredentials;
-import com.qcloud.cos.exception.CosClientException;
-import com.qcloud.cos.exception.CosServiceException;
-import com.qcloud.cos.model.*;
-import com.qcloud.cos.region.Region;
-import com.qcloud.cos.transfer.Copy;
-import com.qcloud.cos.transfer.Download;
-import com.qcloud.cos.transfer.TransferManager;
-import com.qcloud.cos.transfer.Upload;
-import com.txz.operating.configurer.Parameters;
-import com.txz.operating.open.CosOpenApi;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-
-@Service
-public class CosOpenApiImpl implements CosOpenApi {
-
-    @Resource
-    private Parameters parameters;
-
-    public COSClient createCosClient() {
-        // 1 初始化用户身份信息(secretId, secretKey)。
-        COSCredentials cred = new BasicCOSCredentials(parameters.getCosSecretId(), parameters.getCosSecretKey());
-        // 2 设置 bucket 的区域, COS 地域的简称请参照 https://cloud.tencent.com/document/product/436/6224
-        // clientConfig 中包含了设置 region, https(默认 http), 超时, 代理等 set 方法, 使用可参见源码或者常见问题 Java SDK 部分。
-        Region region = new Region(parameters.getCosRegion());
-        ClientConfig clientConfig = new ClientConfig(region);
-        // 3 生成 cos 客户端。
-        return new COSClient(cred, clientConfig);
-    }
-
-    public String upload(String path){
-        COSClient cosClient = null;
-        String key = StrUtil.uuid();
-        try {
-            // 指定要上传的文件
-            File localFile = new File(path);
-            // 指定要上传到的存储桶
-            // 指定要上传到 COS 上对象键
-            PutObjectRequest putObjectRequest = new PutObjectRequest(parameters.getCosBucketName(), key, localFile);
-            cosClient =  createCosClient();
-            PutObjectResult putObjectResult = cosClient.putObject(putObjectRequest);
-        } catch (CosServiceException serverException) {
-            serverException.printStackTrace();
-            return null;
-        } catch (CosClientException clientException) {
-            clientException.printStackTrace();
-            return null;
-        } finally {
-            cosClient.shutdown();
-        }
-        return key;
-    }
-
-    /**
-     * 方法描述:获取cos存储桶客户端.
-     * 创建时间:2019-02-27 18:09:46
-     *
-     * @author "linxk"
-     */
-    private COSClient getCOSClient() {
-        // 1 初始化用户身份信息(secretId, secretKey)。
-        COSCredentials cred = new BasicCOSCredentials(parameters.getCosSecretId(), parameters.getCosSecretKey());
-        // 2 设置bucket的区域, COS地域的简称请参照 https://cloud.tencent.com/document/product/436/6224
-        // clientConfig中包含了设置 region, https(默认 http), 超时, 代理等 set 方法, 使用可参见源码或者接口文档 FAQ 中说明。
-        ClientConfig clientConfig = new ClientConfig(new Region(parameters.getCosRegion()));
-        // 3 生成 cos 客户端。
-        return new COSClient(cred, clientConfig);
-    }
-
-    /**
-     * 方法描述:bucket 的命名规则为{name}-{appid} ,
-     * name 仅支持小写字母、数字和 - 的组合,不能超过40字符.
-     * 创建时间:2019-02-27 18:09:46
-     *
-     * @author "linxk"
-     */
-    private  String getBucketName(String bucketName) {
-        Validator.validateNotEmpty(bucketName, "bucketName不能为空");
-        Validator.validateMatchRegex("^[a-z!-@0-9]+$", bucketName,
-                "bucketName仅支持小写字母、数字和 - 的组合");
-        if (bucketName.length() > 40) {
-            throw new ValidateException("bucketName不能超过40字符");
-        }
-        return (bucketName + "-" + parameters.getCosAppId());
-    }
-
-    /**
-     * 方法描述:创建一个存储桶.
-     * 创建时间:2019-02-27 18:09:46
-     *
-     * @author "linxk"
-     */
-    public  Bucket createBucket(String bucketName) throws CosClientException {
-        Bucket bucket = null;
-        COSClient client = getCOSClient();
-        bucket = createBucket(getBucketName(bucketName));
-        //设置存储桶的权限为 公有读私有写
-        if (null != bucket) {
-            client.setBucketAcl(bucketName, CannedAccessControlList.PublicRead);
-        }
-        return bucket;
-    }
-
-    /**
-     * 方法描述:获取存储桶列表.
-     * 创建时间:2019-02-27 18:09:46
-     *
-     * @author "linxk"
-     */
-    public  List<Bucket> listBuckets() throws CosClientException {
-        return getCOSClient().listBuckets();
-    }
-
-    /**
-     * 方法描述:检测存储桶是否存在.
-     * 创建时间:2019-02-27 18:09:46
-     *
-     * @author "linxk"
-     */
-    public  boolean doesBucketExist(String bucketName) throws CosClientException {
-        return getCOSClient().doesBucketExist(getBucketName(bucketName));
-    }
-
-    /**
-     * 方法描述:删除文件.
-     * 创建时间:2019-03-05 14:25:08
-     * 创建作者:linxk
-     *
-     * @param bucketName bucketName
-     * @param fileName   文件地址
-     * @throws CosClientException the cos client exception
-     * @author "linxk"
-     */
-    public  void deleteObject(String bucketName, String fileName)
-            throws CosClientException {
-        getCOSClient().deleteObject(bucketName, fileName);
-    }
-
-    /**
-     * 方法描述:获取文件的信息.
-     * 创建时间:2019-03-05 14:54:09
-     * 创建作者:linxk
-     *
-     * @param bucketName bucketName
-     * @param fileName   文件地址
-     * @return the object metadata
-     * @throws CosClientException the cos client exception
-     * @author "linxk"
-     */
-    public  ObjectMetadata findObjectMetadata(String bucketName, String fileName)
-            throws CosClientException {
-        return getCOSClient().getObjectMetadata(getBucketName(bucketName), fileName);
-    }
-
-    /**
-     * 方法描述:获取一个高级的API TransferManager,项目中应该使用这些接口.
-     * 创建时间:2019-03-05 15:35:12
-     * 创建作者:linxk
-     *
-     * @return the transfer manager
-     * @author "linxk"
-     */
-    public  TransferManager cosTransferManager() {
-        ExecutorService threadPool = ThreadUtil.newExecutor();
-        return new TransferManager(getCOSClient(), threadPool);
-    }
-
-    /**
-     * 方法描述:上传文件
-     * 创建时间:2019-03-05 15:53:54
-     * 创建作者:linxk
-     *
-     * @param bucketName 存储桶名称
-     * @param filePath   文件存储地址
-     * @param stream     文件流
-     * @return the upload
-     * @author "linxk"
-     */
-    public  Upload upload(String bucketName, String filePath, InputStream stream) {
-        TransferManager manager = cosTransferManager();
-        Upload result = null;
-        try {
-            result = manager.upload(getBucketName(bucketName), filePath, stream, new ObjectMetadata());
-            result.waitForUploadResult();
-        } catch (CosClientException | InterruptedException e) {
-            e.printStackTrace();
-        } finally {
-            manager.shutdownNow();
-        }
-        return result;
-    }
-
-    /**
-     * 方法描述:下载文件.
-     * 创建时间:2019-03-05 16:20:16
-     * 创建作者:linxk
-     *
-     * @param bucketName 存储桶名称
-     * @param filePath   文件存储地址
-     * @param destFile   存储到的本地目标文件
-     * @return the download
-     * @author "linxk"
-     */
-    public  Download download(String bucketName, String filePath, File destFile) {
-        TransferManager manager = cosTransferManager();
-        Download download = null;
-        try {
-            download = manager.download(getBucketName(bucketName), filePath, destFile);
-            download.waitForCompletion();
-        } catch (CosClientException | InterruptedException e) {
-            e.printStackTrace();
-        } finally {
-            manager.shutdownNow();
-        }
-        return download;
-    }
-
-
-    /**
-     * 方法描述:复制文件-不同存储桶.
-     * 创建时间:2019-03-05 16:28:11
-     * 创建作者:linxk
-     *
-     * @param srcBucketName  源存储桶名称
-     * @param srcKey         源文件地址
-     * @param destBucketName 目标存储桶名称
-     * @param destKey        目标件地址
-     * @return the copy
-     * @author "linxk"
-     */
-    public  Copy copy(String srcBucketName, String srcKey, String destBucketName, String destKey) {
-        TransferManager manager = cosTransferManager();
-        Copy copy = null;
-        try {
-            copy = manager.copy(getBucketName(srcBucketName), srcKey, getBucketName(destBucketName), destKey);
-            copy.waitForCompletion();
-        } catch (CosClientException | InterruptedException e) {
-            e.printStackTrace();
-        } finally {
-            manager.shutdownNow();
-        }
-        return copy;
-    }
-
-    /**
-     * 方法描述:复制文件-同存储桶.
-     * 创建时间:2019-03-05 16:28:11
-     * 创建作者:linxk
-     *
-     * @param bucketName 源存储桶名称
-     * @param srcKey     源文件地址
-     * @param destKey    目标件地址
-     * @return the copy
-     * @author "linxk"
-     */
-    public  Copy copy(String bucketName, String srcKey, String destKey) {
-        return copy(bucketName, srcKey, bucketName, destKey);
-    }
-
-    /*测试*/
-    public static void main(String[] args) throws IOException {
-        // Bucket bucket = TxCosUtils.createBucket("test");
-        // List<Bucket> listBuckets = TxCosUtils.listBuckets();
-        // boolean test = TxCosUtils.doesBucketExist("web-js-css01");
-        // File file = new File("E:\\codeList01.html");
-        // BufferedInputStream stream = FileUtil.getInputStream(file);
-        // PutObjectResult result = TxCosUtils.putObject("test", "html/codeList01.html", stream);
-        // COSObject test = downObject("test", "html/codeList.html");
-        // COSObjectInputStream inputStream = test.getObjectContent();
-        // ObjectMetadata test = downObject("test", "html/codeList.html", new File("E:\\codeList.xml"));
-        // ObjectMetadata metadata = findObjectMetadata("test", "html/codeList.html");
-        // CopyObjectResult result = TxCosUtils.copyObject("web-js-css", "css/ch233.min.css", "test", "css/ch233.min.css");
-        // CopyObjectResult result = TxCosUtils.copyObject("test", "css/ch233.min.css", "css/ch233.min.css.bak");
-        // deleteObject(getBucketName("test"), "html/codeList01.html");
-
-        // 高级API
-        // 上传文件
-        // File file = new File("E:\\templet.html");
-        // BufferedInputStream stream = FileUtil.getInputStream(file);
-        // Upload test = TxCosUtils.upload("test", "html/templet.html", stream);
-        // Console.log(test);
-
-        // 下载文件
-        // Download test = TxCosUtils.download("test", "css/ch233.min.css.bak", new File("E:\\ch233.min.css"));
-        // Console.log(test);
-
-        // 复制文件
-        // Copy copy = TxCosUtils.copy("web-js-css", "layui/layui.js", "test", "layui/layui.js");
-        // Copy copy = TxCosUtils.copy("test", "layui/layui.js", "layui/layui.js.bak");
-        // Console.log(copy);
-    }
-
-}

+ 0 - 37
operating-service/src/main/java/com/txz/operating/open/impl/JbsOpenApiImpl.java

@@ -1,37 +0,0 @@
-package com.txz.operating.open.impl;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONUtil;
-import com.txz.operating.configurer.Parameters;
-import com.txz.operating.open.JbsOpenApi;
-import com.txz.operating.open.been.JbsStation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@Component
-public class JbsOpenApiImpl implements JbsOpenApi {
-
-//    @Value("${jbs.url}")
-//    private String        url;
-
-    @Resource
-    private Parameters parameters;
-
-    @Override
-    public JbsStation getStationInfo(Integer mcc, Integer mnc, Integer lac, Integer ci) {
-        try{
-            String ret = HttpUtil.get(parameters.getJbsUrl() + "?mcc=" + mcc + "&mnc=" + mnc + "&lac=" + lac + "&ci=" + ci + "&output=json");
-            if(StrUtil.isNotBlank(ret)){
-                return JSONUtil.toBean(ret,JbsStation.class);
-            }
-        }catch (Exception e){
-            log.error("调用jbs异常请求入参:"+parameters.getJbsUrl() + "?mcc=" + mcc + "&mnc=" + mnc + "&lac=" + lac + "&ci=" + ci + "&output=json");
-            log.error("调用jbs异常:",e);
-        }
-        return null;
-    }
-}

+ 0 - 51
operating-service/src/main/java/com/txz/operating/open/impl/TxOpenApiImpl.java

@@ -1,51 +0,0 @@
-package com.txz.operating.open.impl;
-
-import com.tencentcloudapi.asr.v20190614.AsrClient;
-import com.tencentcloudapi.asr.v20190614.models.SentenceRecognitionRequest;
-import com.tencentcloudapi.asr.v20190614.models.SentenceRecognitionResponse;
-import com.tencentcloudapi.common.Credential;
-import com.tencentcloudapi.common.exception.TencentCloudSDKException;
-import com.tencentcloudapi.common.profile.ClientProfile;
-import com.tencentcloudapi.common.profile.HttpProfile;
-import com.txz.operating.configurer.Parameters;
-import com.txz.operating.open.TxOpenApi;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@Service
-public class TxOpenApiImpl implements TxOpenApi {
-
-    @Resource
-    private Parameters parameters;
-
-    @Override
-    public String SentenceRecognition(String sentenceUrl) {
-        try{
-            Credential cred = new Credential(parameters.getSecretId(), parameters.getSecretKey());
-
-            HttpProfile httpProfile = new HttpProfile();
-            httpProfile.setEndpoint("asr.tencentcloudapi.com");
-
-            ClientProfile clientProfile = new ClientProfile();
-            clientProfile.setHttpProfile(httpProfile);
-
-            AsrClient client = new AsrClient(cred, "", clientProfile);
-            SentenceRecognitionRequest req = new SentenceRecognitionRequest();
-            req.setProjectId(0L);
-            req.setSubServiceType(2L);
-            req.setEngSerViceType("8k_zh");
-            req.setSourceType(0L);
-            req.setVoiceFormat("mp3");
-
-            SentenceRecognitionResponse resp = client.SentenceRecognition(req);
-
-            System.out.println(SentenceRecognitionResponse.toJsonString(resp));
-        } catch (TencentCloudSDKException e) {
-            System.out.println(e.toString());
-        }
-        return null;
-    }
-}

+ 0 - 64
operating-service/src/main/java/com/txz/operating/util/DistributeUtil.java

@@ -1,64 +0,0 @@
-//package com.txz.operating.util;
-//
-//import cn.hutool.core.bean.BeanUtil;
-//import cn.hutool.core.collection.CollUtil;
-//import com.txz.operating.dto.award.AwardMenuDTO;
-//import com.txz.operating.dto.award.AwardRequestDTO;
-//import com.txz.operating.dto.award.AwardResultDTO;
-//import com.txz.operating.service.award.OperatingAwardDubboService;
-//import com.txz.operating.web.bo.AwardBo;
-//import com.txz.operating.web.bo.AwardMenuBo;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.stereotype.Component;
-//
-//import javax.annotation.Resource;
-//import java.util.ArrayList;
-//import java.util.HashMap;
-//import java.util.List;
-//import java.util.Map;
-//
-///**
-// * 分发工具
-// */
-//@Component
-//@Slf4j
-//public class DistributeUtil {
-//
-//    @Resource
-//    private DubboServiceFactory dubboServiceFactory;
-//
-//    public AwardResultDTO myAward(String userId, String appCode, List<AwardRequestDTO> awardRequestDTOList, Integer coinType, Integer coinValue, Integer bizType) throws Exception {
-//        AwardResultDTO ret = null;
-//        try {
-//            Object[] args = {userId, awardRequestDTOList, coinType, coinValue, bizType, appCode};
-//            ret = BeanUtil.toBean(dubboServiceFactory.genericInvoke(appCode, OperatingAwardDubboService.class, "award", args), AwardResultDTO.class);
-//        } catch (Exception e) {
-//            log.error("调用泛化接口失败", e);
-//        }
-//        return ret;
-//    }
-//
-//    public List<AwardBo> awardList(String appCode) {
-//        List<AwardBo> ret = new ArrayList<>();
-//        try {
-//            Map<String, List<AwardMenuBo>> map2 = new HashMap<>();
-//            List<HashMap<String, Object>> hashMaps = (List<HashMap<String, Object>>) dubboServiceFactory.genericInvoke(appCode.split("_")[0], OperatingAwardDubboService.class, "getAwardMenuList", null, null);
-//            for (HashMap<String, Object> hashMap : hashMaps) {
-//                AwardMenuDTO d = BeanUtil.toBean(hashMap, AwardMenuDTO.class);
-//                List<AwardMenuBo> bos = map2.get(d.getType() + "");
-//                if (CollUtil.isEmpty(bos)) {
-//                    bos = new ArrayList<>();
-//                }
-//                bos.add(BeanUtil.toBean(d, AwardMenuBo.class));
-//                map2.put(d.getType() + "", bos);
-//            }
-//            for (String key : map2.keySet()) {
-//                AwardMenuBo bo = map2.get(key).get(0);
-//                ret.add(AwardBo.builder().code(bo.getType()).name("类别" + bo.getType()).awardMenus(map2.get(key)).build());
-//            }
-//        } catch (Exception e) {
-//            log.error("调用泛化接口失败", e);
-//        }
-//        return ret;
-//    }
-//}

+ 0 - 131
operating-service/src/main/java/com/txz/operating/util/DubboServiceFactory.java

@@ -1,131 +0,0 @@
-//package com.txz.operating.util;
-//
-//import cn.hutool.core.collection.CollUtil;
-//import com.txz.operating.configurer.Parameters;
-//import com.txz.operating.core.ResultCode;
-//import com.txz.operating.core.ServiceException;
-//import com.yiweikeji.operating.model.DubboService;
-//import com.yiweikeji.operating.service.DubboServiceService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.dubbo.config.ApplicationConfig;
-//import org.apache.dubbo.config.ReferenceConfig;
-//import org.apache.dubbo.config.RegistryConfig;
-//import org.apache.dubbo.config.utils.ReferenceConfigCache;
-//import org.apache.dubbo.rpc.service.GenericService;
-//import org.springframework.stereotype.Component;
-//import tk.mybatis.mapper.entity.Condition;
-//import javax.annotation.Resource;
-//import java.util.Arrays;
-//import java.util.List;
-//
-///**
-// * Created by Luo
-// */
-//@Slf4j
-//@Component
-//public class DubboServiceFactory {
-//
-//
-//    @Resource
-//    private Parameters parameters;
-//
-//    @Resource
-//    private DubboServiceService dubboServiceService;
-//
-//    private ApplicationConfig application;
-//    private RegistryConfig registry;
-//
-//    private DubboServiceFactory(){
-//    }
-//
-//    void init(){
-//        if (application  == null){
-//            ApplicationConfig applicationConfig = new ApplicationConfig();
-//            applicationConfig.setName(parameters.getApplication());
-//            //这里配置了dubbo的application信息*(demo只配置了name)*,因此demo没有额外的dubbo.xml配置文件
-//            RegistryConfig registryConfig = new RegistryConfig();
-//            registryConfig.setAddress(parameters.getDubboRegistryAddress());
-//            //这里配置dubbo的注册中心信息,因此demo没有额外的dubbo.xml配置文件
-//            this.application = applicationConfig;
-//            this.registry = registryConfig;
-//        }
-//    }
-//
-//
-//
-//    public Object genericInvoke(String appCode, Class interfaceClass, String methodName, Object[] args){
-//        Condition c = new Condition(DubboService.class);
-//        c.createCriteria().andEqualTo("appCode",appCode.split("_")[0]).andEqualTo("interfaceClass",interfaceClass.getName());
-//        List<DubboService> dubboServices = dubboServiceService.findByCondition(c);
-//        if (CollUtil.isEmpty(dubboServices)){
-//            log.error("[dubbo接口未配置]"+interfaceClass);
-//            throw new ServiceException(ResultCode.OBJECT_IS_NULL);
-//        }
-//        String[] parameterTypes = null;
-//        for (java.lang.reflect.Method method:interfaceClass.getMethods()) {
-//            if (method.getName().equals(methodName) && method.getParameterTypes() != null){
-//                parameterTypes = Arrays.stream(method.getParameterTypes()).map(temp -> temp.getName()).toArray(String[]::new);
-//            }
-//        }
-//        return genericInvoke(interfaceClass.getName(),methodName,parameterTypes,args,dubboServices.get(0).getVersion());
-//    }
-//
-//    public Object genericInvoke(String interfaceClass, String methodName, String[] parameterTypes, Object[] args,String version){
-//        init();
-//        ReferenceConfig<GenericService> reference = new ReferenceConfig<GenericService>();
-//        reference.setApplication(application);
-//        reference.setRegistry(registry);
-//        reference.setVersion(version);
-//        reference.setInterface(interfaceClass); // 接口名
-//        reference.setGeneric(true); // 声明为泛化接口
-//        /*ReferenceConfig实例很重,封装了与注册中心的连接以及与提供者的连接,
-//        需要缓存,否则重复生成ReferenceConfig可能造成性能问题并且会有内存和连接泄漏。
-//        API方式编程时,容易忽略此问题。
-//        这里使用dubbo内置的简单缓存工具类进行缓存*/
-//        ReferenceConfigCache cache = ReferenceConfigCache.getCache();
-//        GenericService genericService = cache.get(reference);
-//        // 用com.alibaba.dubbo.rpc.service.GenericService可以替代所有接口引用
-//        return genericService.$invoke(methodName, parameterTypes, args);
-//    }
-//
-//    public Object genericInvoke(String appCode, Class interfaceClass, String methodName, Object[] args ,Integer retries){
-//        Condition c = new Condition(DubboService.class);
-//        c.createCriteria().andEqualTo("appCode",appCode).andEqualTo("interfaceClass",interfaceClass.getName());
-//        List<DubboService> dubboServices = dubboServiceService.findByCondition(c);
-//        if (CollUtil.isEmpty(dubboServices)){
-//            log.error("[dubbo接口未配置]"+interfaceClass+"appCode:"+appCode);
-//            throw new ServiceException(ResultCode.OBJECT_IS_NULL);
-//        }
-//        String[] parameterTypes = null;
-//        for (java.lang.reflect.Method method:interfaceClass.getMethods()) {
-//            if (method.getName().equals(methodName) && method.getParameterTypes() != null){
-//                parameterTypes = Arrays.stream(method.getParameterTypes()).map(temp -> temp.getName()).toArray(String[]::new);
-//            }
-//        }
-//        return genericInvoke(interfaceClass.getName(),methodName,parameterTypes,args,dubboServices.get(0).getVersion() , retries);
-//    }
-//
-//    public Object genericInvoke(String interfaceClass, String methodName, String[] parameterTypes, Object[] args,String version ,Integer retries){
-//        init();
-//        ReferenceConfig<GenericService> reference = new ReferenceConfig<GenericService>();
-//        reference.setApplication(application);
-//        reference.setRegistry(registry);
-//        reference.setVersion(version);
-//        if (retries != null){
-//            reference.setRetries(retries);
-//        }
-////        reference.setRetries(-1);
-////        reference.setActives();
-//        reference.setInterface(interfaceClass); // 接口名
-//        reference.setGeneric(true); // 声明为泛化接口
-//        /*ReferenceConfig实例很重,封装了与注册中心的连接以及与提供者的连接,
-//        需要缓存,否则重复生成ReferenceConfig可能造成性能问题并且会有内存和连接泄漏。
-//        API方式编程时,容易忽略此问题。
-//        这里使用dubbo内置的简单缓存工具类进行缓存*/
-//        ReferenceConfigCache cache = ReferenceConfigCache.getCache();
-//        GenericService genericService = cache.get(reference);
-//        // 用com.alibaba.dubbo.rpc.service.GenericService可以替代所有接口引用
-//        return genericService.$invoke(methodName, parameterTypes, args);
-//    }
-//
-//}

+ 0 - 25
operating-service/src/main/java/com/txz/operating/util/lock/DistributedLocker.java

@@ -1,25 +0,0 @@
-package com.txz.operating.util.lock;
-
-import org.redisson.api.RLock;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Author: Fcx
- * @Date: 2020/7/1 15:49
- * @Version 1.0
- */
-public interface DistributedLocker {
-
-    RLock lock(String lockKey);
-
-    RLock lock(String lockKey, int timeout);
-
-    RLock lock(String lockKey, TimeUnit unit, int timeout);
-
-    boolean tryLock(String lockKey, TimeUnit unit, int waitTime, int leaseTime);
-
-    void unlock(String lockKey);
-
-    void unlock(RLock lock);
-}

+ 0 - 15
operating-service/src/main/java/com/txz/operating/util/lock/LockNameConst.java

@@ -1,15 +0,0 @@
-package com.txz.operating.util.lock;
-
-/**
- * @Author: Fcx
- * @Date: 2020/7/1 17:31
- * @Version 1.0
- */
-public class LockNameConst {
-
-
-    /**
-     * Rank锁 设置总分时
-     */
-    public static final String LOCK_RANK_TOTAL_SCORE = "lock_rank_total_score:reverse:rankKey";
-}

+ 0 - 62
operating-service/src/main/java/com/txz/operating/util/lock/RedissonAutoConfiguration.java

@@ -1,62 +0,0 @@
-package com.txz.operating.util.lock;
-
-import cn.hutool.core.util.StrUtil;
-import org.redisson.Redisson;
-import org.redisson.api.RedissonClient;
-import org.redisson.config.Config;
-import org.redisson.config.SingleServerConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Author: Fcx
- * @Date: 2020/7/1 15:52
- * @Version 1.0
- */
-@Configuration
-@ConditionalOnClass(Config.class)
-@EnableConfigurationProperties(RedisProperties.class)
-public class RedissonAutoConfiguration {
-
-    @Autowired
-    private RedisProperties redisProperties;
-
-    /**
-     * 单机模式自动装配
-     *
-     * @return
-     */
-    @Bean
-    RedissonClient redissonSingle() {
-        if (null == redisProperties) {
-            throw new RuntimeException("redis配置未加载");
-        }
-        Config config = new Config();
-        SingleServerConfig serverConfig = config.useSingleServer()
-                .setDatabase(redisProperties.getDatabase())
-                .setAddress("redis://" + redisProperties.getHost() + ":" + redisProperties.getPort())
-                .setTimeout(Math.toIntExact(redisProperties.getTimeout().toMillis()));
-
-        if (StrUtil.isNotEmpty(redisProperties.getPassword())) {
-            serverConfig.setPassword(redisProperties.getPassword());
-        }
-        return Redisson.create(config);
-    }
-
-    /**
-     * 装配locker类,并将实例注入到RedissonLockUtil中
-     *
-     * @return
-     */
-    @Bean
-    DistributedLocker distributedLocker(RedissonClient redissonClient) {
-        RedissonDistributedLocker locker = new RedissonDistributedLocker(redissonClient);
-        RedissonLockUtil.setLocker(locker);
-        return locker;
-    }
-
-}

+ 0 - 60
operating-service/src/main/java/com/txz/operating/util/lock/RedissonDistributedLocker.java

@@ -1,60 +0,0 @@
-package com.txz.operating.util.lock;
-
-import lombok.AllArgsConstructor;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Author: Fcx
- * @Date: 2020/7/1 15:50
- * @Version 1.0
- */
-@AllArgsConstructor
-public class RedissonDistributedLocker implements DistributedLocker {
-    private RedissonClient redissonClient;
-
-    @Override
-    public RLock lock(String lockKey) {
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.lock();
-        return lock;
-    }
-
-    @Override
-    public RLock lock(String lockKey, int leaseTime) {
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.lock(leaseTime, TimeUnit.SECONDS);
-        return lock;
-    }
-
-    @Override
-    public RLock lock(String lockKey, TimeUnit unit ,int timeout) {
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.lock(timeout, unit);
-        return lock;
-    }
-
-    @Override
-    public boolean tryLock(String lockKey, TimeUnit unit, int waitTime, int leaseTime) {
-        RLock lock = redissonClient.getLock(lockKey);
-        try {
-            return lock.tryLock(waitTime, leaseTime, unit);
-        } catch (InterruptedException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public void unlock(String lockKey) {
-        RLock lock = redissonClient.getLock(lockKey);
-        lock.unlock();
-    }
-
-    @Override
-    public void unlock(RLock lock) {
-        lock.unlock();
-    }
-
-}

+ 0 - 85
operating-service/src/main/java/com/txz/operating/util/lock/RedissonLockUtil.java

@@ -1,85 +0,0 @@
-package com.txz.operating.util.lock;
-
-import org.redisson.api.RLock;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Author: Fcx
- * @Date: 2020/7/1 15:54
- * @Version 1.0
- */
-public class RedissonLockUtil {
-    private static DistributedLocker redissonLock;
-
-    public static void setLocker(DistributedLocker locker) {
-        redissonLock = locker;
-    }
-
-    /**
-     * 加锁
-     * @param lockKey
-     * @return
-     */
-    public static RLock lock(String lockKey) {
-        return redissonLock.lock(lockKey);
-    }
-
-    /**
-     * 释放锁
-     * @param lockKey
-     */
-    public static void unlock(String lockKey) {
-        redissonLock.unlock(lockKey);
-    }
-
-    /**
-     * 释放锁
-     * @param lock
-     */
-    public static void unlock(RLock lock) {
-        redissonLock.unlock(lock);
-    }
-
-    /**
-     * 带超时的锁
-     * @param lockKey
-     * @param timeout 超时时间   单位:秒
-     */
-    public static RLock lock(String lockKey, int timeout) {
-        return redissonLock.lock(lockKey, timeout);
-    }
-
-    /**
-     * 带超时的锁
-     * @param lockKey
-     * @param unit 时间单位
-     * @param timeout 超时时间
-     */
-    public static RLock lock(String lockKey, TimeUnit unit , int timeout) {
-        return redissonLock.lock(lockKey, unit, timeout);
-    }
-
-    /**
-     * 尝试获取锁
-     * @param lockKey
-     * @param waitTime 最多等待时间
-     * @param leaseTime 上锁后自动释放锁时间
-     * @return
-     */
-    public static boolean tryLock(String lockKey, int waitTime, int leaseTime) {
-        return redissonLock.tryLock(lockKey, TimeUnit.SECONDS, waitTime, leaseTime);
-    }
-
-    /**
-     * 尝试获取锁
-     * @param lockKey
-     * @param unit 时间单位
-     * @param waitTime 最多等待时间
-     * @param leaseTime 上锁后自动释放锁时间
-     * @return
-     */
-    public static boolean tryLock(String lockKey, TimeUnit unit, int waitTime, int leaseTime) {
-        return redissonLock.tryLock(lockKey, unit, waitTime, leaseTime);
-    }
-}

+ 0 - 56
operating-service/src/main/java/com/txz/operating/web/RankController.java

@@ -1,56 +0,0 @@
-package com.txz.operating.web;
-
-import com.txz.operating.dto.rank.*;
-import com.txz.operating.result.Result;
-import com.txz.operating.service.IOperatingMedianScoreDubboService;
-import com.txz.operating.service.IOperatingRankDubboService;
-import org.apache.dubbo.config.annotation.Reference;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @Author: Fcx
- * @Date: 2019/11/26 14:00
- * @Version 1.0
- */
-@RestController
-@RequestMapping("rank")
-public class RankController {
-
-    @Reference
-    private IOperatingRankDubboService rankService;
-    @Reference
-    private IOperatingMedianScoreDubboService operatingMedianScoreDubboService;
-
-    @GetMapping("getRankList")
-    public Result<List<ResponseUserScore>> getRankList(@RequestBody RequestRankDto dto) {
-        return rankService.getRankList(dto);
-    }
-
-    @GetMapping("getRankSize")
-    public Result<ResponseRankIntro> getRankSize(@RequestBody RequestRankDto dto) {
-        return rankService.getRankSizeAndTotalScore(dto);
-    }
-
-    @GetMapping("getRankByUserId")
-    public Result<ResponseUserRankDetailDTO> getRankByUserId(@RequestBody RequestRankDto dto) {
-        return rankService.getRankByUserId(dto);
-    }
-
-    @PostMapping("saveRankList")
-    public Result saveRankList(@RequestBody RequestRankDto dto) {
-        return rankService.saveRankList(dto);
-    }
-
-    @GetMapping("getRankSizeAndTotalScore")
-    public Result<ResponseRankIntro> getRankSizeAndTotalScore(@RequestBody RequestRankDto dto) {
-        return rankService.getRankSizeAndTotalScore(dto);
-    }
-
-    @GetMapping("getMedianScore")
-    public Result<Long> getMedianScore(@RequestBody RequestMedianScoreByRankDto dto){
-        return Result.success(operatingMedianScoreDubboService.getMedianScore(dto));
-    }
-
-}

+ 6 - 25
operating-service/src/main/resources/bootstrap.properties

@@ -12,9 +12,10 @@ spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=1000MB
 # dubbo\u4F20\u8F93\u7684\u6700\u5927\u6587\u4EF6\u5927\u5C0F, \u9ED8\u8BA48388608  8M, \u8BBE\u7F6E80M
 dubbo.protocol.dubbo.payload=83886080
-spring.profiles.active=local
-local.nacos=127.0.0.1:8848
-dev.nacos=172.17.0.3:8848
+spring.profiles.active=dev
+local.nacos=124.222.152.234:8848
+dev.nacos=124.222.152.234:8848
+#dev.nacos=172.17.0.3:8848
 #pro.nacos=172.17.0.15:8848,172.17.0.15:8849,172.17.0.13:8848
 #spring.profiles.include=wx,wxmp
 #spring.cloud.nacos.discovery.server-addr=129.211.99.19:84
@@ -33,8 +34,8 @@ spring.cloud.nacos.config.ext-config[0].data-id=mq-${spring.profiles.active}.pro
 spring.cloud.nacos.config.ext-config[0].refresh=true
 spring.cloud.nacos.config.ext-config[1].data-id=redis-${spring.profiles.active}.properties
 spring.cloud.nacos.config.ext-config[1].refresh=true
-spring.cloud.nacos.config.ext-config[2].data-id=cos-${spring.profiles.active}.properties
-spring.cloud.nacos.config.ext-config[2].refresh=true
+#spring.cloud.nacos.config.ext-config[2].data-id=cos-${spring.profiles.active}.properties
+#spring.cloud.nacos.config.ext-config[2].refresh=true
 dubbo.protocol.serialization=kryo
 #dubbo.protocol.serialization=
 dubbo.protocol.optimizer=
@@ -57,24 +58,4 @@ management.endpoint.shutdown.enabled=true
 management.endpoints.web.base-path=/${spring.application.name}
 management.endpoints.web.path-mapping.shutdown=/shutThisBoot
 management.server.address=127.0.0.1
-baidu.map.url=http://api.map.baidu.com/place/v2/search
-baidu.map.ak=0lzCFQAArNsjnm56HTGXSGNIFmUGCpwc
-jbs.url=http://api.cellocation.com:81/cell/
-lottery.record.save.ids=,13,14,15,16,17,18,19,20,21,
-tx.secret.id=AKIDny6873YwFa1a7cKNWQ9m9HCyilbB8JVR
-tx.secret.key=ztYx64oMhmodGdiZBaq2yd1A6i4GQL5a
-baidu.app.id=22928231
-baidu.apk.key=vzYxasQytGahju8mMohgcYAT
-baidu.secret.key=ROtupVNSSczY5K1cK5RzRcivbMQjhXoZ
-permit.service=off
 
-
-#local.zipkin=127.0.0.1:9411
-#dev.zipkin=172.17.0.8:9411
-#pro.zipkin=172.17.16.10:9411
-#spring.zipkin.base-url=${${spring.profiles.active}.zipkin}
-#spring.zipkin.enabled=true
-#spring.zipkin.locator.discovery.enabled=true
-#spring.zipkin.service.name=operating
-
-open.appCode=wukong_xm

+ 1 - 1
operating-service/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="/var/logs/operating" />
+    <property name="LOG_HOME" value="logs/operating" />
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">