diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 6a00707..c0a8298 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -6,6 +6,22 @@ true org.mariadb.jdbc.Driver jdbc:mariadb://192.168.1.8:3306/beacon_cloud + "-Djdk.tls.disabledAlgorithms=SSLv3, TLSv1, RC4, DES, MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, include jdk.disabled.namedCurves" + $ProjectFileDir$ + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://10.3.10.36:3306/beacon_cloud + "-Djdk.tls.disabledAlgorithms=SSLv3, TLSv1, RC4, DES, MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL, include jdk.disabled.namedCurves" + $ProjectFileDir$ + + + mysql_aurora + true + org.mariadb.jdbc.Driver + jdbc:mariadb://101.42.1.196:3306/beacon_cloud $ProjectFileDir$ diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 5a74c51..f3b660f 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,6 +3,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 010c400..cf7031b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,11 @@ + diff --git a/beacon-cache/src/main/resources/bootstrap.yml b/beacon-cache/src/main/resources/bootstrap.yml index e802b24..fd01829 100644 --- a/beacon-cache/src/main/resources/bootstrap.yml +++ b/beacon-cache/src/main/resources/bootstrap.yml @@ -6,8 +6,10 @@ spring: cloud: nacos: config: - server-addr: 192.168.1.8:8848 +# server-addr: 192.168.1.8:8848 + server-addr: 10.3.10.36:8848 file-extension: yml # beacon-cache-dev.yml discovery: - server-addr: 192.168.1.8:8848 \ No newline at end of file +# server-addr: 192.168.1.8:8848 + server-addr: 10.3.10.36:8848 \ No newline at end of file diff --git a/beacon-common/src/main/java/com/mashibing/constant/CacheConstant.java b/beacon-common/src/main/java/com/mashibing/common/constant/CacheConstant.java similarity index 92% rename from beacon-common/src/main/java/com/mashibing/constant/CacheConstant.java rename to beacon-common/src/main/java/com/mashibing/common/constant/CacheConstant.java index 7de467a..9e1f1f5 100644 --- a/beacon-common/src/main/java/com/mashibing/constant/CacheConstant.java +++ b/beacon-common/src/main/java/com/mashibing/common/constant/CacheConstant.java @@ -1,4 +1,4 @@ -package com.mashibing.constant; +package com.mashibing.common.constant; /** * 缓存模块中的各种前缀 diff --git a/beacon-common/src/main/java/com/mashibing/enums/ExceptionEnums.java b/beacon-common/src/main/java/com/mashibing/common/enums/ExceptionEnums.java similarity index 94% rename from beacon-common/src/main/java/com/mashibing/enums/ExceptionEnums.java rename to beacon-common/src/main/java/com/mashibing/common/enums/ExceptionEnums.java index 95d7a1b..f1c4c9f 100644 --- a/beacon-common/src/main/java/com/mashibing/enums/ExceptionEnums.java +++ b/beacon-common/src/main/java/com/mashibing/common/enums/ExceptionEnums.java @@ -1,4 +1,4 @@ -package com.mashibing.enums; +package com.mashibing.common.enums; import lombok.Getter; diff --git a/beacon-common/src/main/java/com/mashibing/exceptiion/ApiException.java b/beacon-common/src/main/java/com/mashibing/common/exception/ApiException.java similarity index 82% rename from beacon-common/src/main/java/com/mashibing/exceptiion/ApiException.java rename to beacon-common/src/main/java/com/mashibing/common/exception/ApiException.java index 7d014db..43a9faa 100644 --- a/beacon-common/src/main/java/com/mashibing/exceptiion/ApiException.java +++ b/beacon-common/src/main/java/com/mashibing/common/exception/ApiException.java @@ -1,6 +1,6 @@ -package com.mashibing.exceptiion; +package com.mashibing.common.exception; -import com.mashibing.enums.ExceptionEnums; +import com.mashibing.common.enums.ExceptionEnums; import lombok.Getter; /** diff --git a/beacon-test/src/main/java/com/mashibing/test/entity/ClientBalance.java b/beacon-test/src/main/java/com/mashibing/test/entity/ClientBalance.java index 19a74ef..eb61e98 100644 --- a/beacon-test/src/main/java/com/mashibing/test/entity/ClientBalance.java +++ b/beacon-test/src/main/java/com/mashibing/test/entity/ClientBalance.java @@ -9,24 +9,6 @@ public class ClientBalance { private java.sql.Timestamp created; private long createId; - @Override - public String toString() { - return "ClientBalance{" + - "id=" + id + - ", clientId=" + clientId + - ", balance=" + balance + - ", created=" + created + - ", createId=" + createId + - ", updated=" + updated + - ", updateId=" + updateId + - ", isDelete=" + isDelete + - ", extend1='" + extend1 + '\'' + - ", extend2='" + extend2 + '\'' + - ", extend3='" + extend3 + '\'' + - ", extend4='" + extend4 + '\'' + - '}'; - } - private java.sql.Timestamp updated; private long updateId; private long isDelete; @@ -143,4 +125,21 @@ public class ClientBalance { this.extend4 = extend4; } + @Override + public String toString() { + return "ClientBalance{" + + "id=" + id + + ", clientId=" + clientId + + ", balance=" + balance + + ", created=" + created + + ", createId=" + createId + + ", updated=" + updated + + ", updateId=" + updateId + + ", isDelete=" + isDelete + + ", extend1='" + extend1 + '\'' + + ", extend2='" + extend2 + '\'' + + ", extend3='" + extend3 + '\'' + + ", extend4='" + extend4 + '\'' + + '}'; + } } diff --git a/beacon-test/src/main/java/com/mashibing/test/mapper/ClientBalanceMapper.java b/beacon-test/src/main/java/com/mashibing/test/mapper/ClientBalanceMapper.java index 3f04939..5a61526 100644 --- a/beacon-test/src/main/java/com/mashibing/test/mapper/ClientBalanceMapper.java +++ b/beacon-test/src/main/java/com/mashibing/test/mapper/ClientBalanceMapper.java @@ -4,12 +4,11 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** - * @author kezhen - * @date 2022/12/28 - * @description + * @Author kezhen + * @Date 2022-12-29 + * @Description */ public interface ClientBalanceMapper { - - @Select("select balance from client_balance where client_id = #{clientId}") - Long findByClientId(@Param("clientId") Integer clientId); + @Select("select balance from client_balance WHERE id = #{clientId}") + Integer findBalanceByid(@Param("clientId") Integer clientId); } diff --git a/beacon-test/src/main/resources/application.yml b/beacon-test/src/main/resources/application.yml index 7b9626b..dff504f 100644 --- a/beacon-test/src/main/resources/application.yml +++ b/beacon-test/src/main/resources/application.yml @@ -4,10 +4,12 @@ spring: cloud: nacos: discovery: - server-addr: 192.168.1.8:8848 +# server-addr: 192.168.1.8:8848 + server-addr: 192.168.56.10:8848 datasource: driver-class-name: org.gjt.mm.mysql.Driver - url: jdbc:mysql://192.168.1.8:3306/beacon_cloud?characterEncoding=utf-8 +# url: jdbc:mysql://192.168.1.8:3306/beacon_cloud?characterEncoding=utf-8 + url: jdbc:mysql://192.168.56.10:3306/beacon_cloud?characterEncoding=utf-8 username: root password: ZhengJinWei123! diff --git a/beacon-test/src/test/java/com/mashibing/test/mapper/ClientBalanceMapperTest.java b/beacon-test/src/test/java/com/mashibing/test/mapper/ClientBalanceMapperTest.java index e25fe8c..532c93a 100644 --- a/beacon-test/src/test/java/com/mashibing/test/mapper/ClientBalanceMapperTest.java +++ b/beacon-test/src/test/java/com/mashibing/test/mapper/ClientBalanceMapperTest.java @@ -1,6 +1,5 @@ package com.mashibing.test.mapper; -import com.mashibing.test.client.CacheClient; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -10,9 +9,9 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.junit.Assert.*; /** - * @author kezhen - * @date 2022/12/28 - * @description + * @Author kezhen + * @Date 2022-12-29 + * @Description */ @SpringBootTest @RunWith(SpringRunner.class) @@ -20,14 +19,9 @@ public class ClientBalanceMapperTest { @Autowired private ClientBalanceMapper clientBalanceMapper; - @Autowired - private CacheClient cacheClient; - @Test - public void findByClientId() { - Long balance = clientBalanceMapper.findByClientId(1); - System.out.println("balance = " + balance); - cacheClient.set("client_balance:1", balance); - + public void findBalanceByid() { + Integer balanceByid = clientBalanceMapper.findBalanceByid(1); + System.out.println("balanceByid = " + balanceByid); } } \ No newline at end of file diff --git a/beancon-api/src/main/java/com/mashibing/advice/ApiExceptionHander.java b/beancon-api/src/main/java/com/mashibing/api/advice/ApiExceptionHandler.java similarity index 63% rename from beancon-api/src/main/java/com/mashibing/advice/ApiExceptionHander.java rename to beancon-api/src/main/java/com/mashibing/api/advice/ApiExceptionHandler.java index 1c5b975..1b2ae36 100644 --- a/beancon-api/src/main/java/com/mashibing/advice/ApiExceptionHander.java +++ b/beancon-api/src/main/java/com/mashibing/api/advice/ApiExceptionHandler.java @@ -1,22 +1,23 @@ -package com.mashibing.advice; +package com.mashibing.api.advice; import com.mashibing.api.util.R; import com.mashibing.api.vo.ResultVO; -import com.mashibing.exceptiion.ApiException; +import com.mashibing.common.exception.ApiException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; /** - * @author kezhen - * @date 2022/12/29 + * @author zjw * @description */ @RestControllerAdvice -public class ApiExceptionHander { +public class ApiExceptionHandler{ + @ExceptionHandler(ApiException.class) public ResultVO apiException(ApiException ex){ - System.out.println("exception.getCode() = " + ex.getCode()); + System.out.println("ApiExceptionHandler.apiException"); return R.error(ex); } + } diff --git a/beancon-api/src/main/java/com/mashibing/api/controller/SmsController.java b/beancon-api/src/main/java/com/mashibing/api/controller/SmsController.java index 858eb34..f1746c4 100644 --- a/beancon-api/src/main/java/com/mashibing/api/controller/SmsController.java +++ b/beancon-api/src/main/java/com/mashibing/api/controller/SmsController.java @@ -5,7 +5,7 @@ import com.mashibing.api.from.SingleSendForm; import com.mashibing.api.util.R; import com.mashibing.api.vo.ResultVO; import com.mashibing.common.model.StandardSubmit; -import com.mashibing.enums.ExceptionEnums; +import com.mashibing.common.enums.ExceptionEnums; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/beancon-api/src/main/java/com/mashibing/api/filter/CheckFilter.java b/beancon-api/src/main/java/com/mashibing/api/filter/CheckFilter.java index b5af086..c37e8bd 100644 --- a/beancon-api/src/main/java/com/mashibing/api/filter/CheckFilter.java +++ b/beancon-api/src/main/java/com/mashibing/api/filter/CheckFilter.java @@ -10,7 +10,7 @@ public interface CheckFilter { /** * 校验！！！！ - * @param standardSubmit + * @param submit */ void check(StandardSubmit submit); } diff --git a/beancon-api/src/main/java/com/mashibing/api/filter/impl/ApiKeyCheckFilter.java b/beancon-api/src/main/java/com/mashibing/api/filter/impl/ApiKeyCheckFilter.java index 54982bc..4f3c3a2 100644 --- a/beancon-api/src/main/java/com/mashibing/api/filter/impl/ApiKeyCheckFilter.java +++ b/beancon-api/src/main/java/com/mashibing/api/filter/impl/ApiKeyCheckFilter.java @@ -2,10 +2,10 @@ package com.mashibing.api.filter.impl; import com.mashibing.api.client.BeaconCacheClient; import com.mashibing.api.filter.CheckFilter; +import com.mashibing.common.constant.CacheConstant; +import com.mashibing.common.enums.ExceptionEnums; +import com.mashibing.common.exception.ApiException; import com.mashibing.common.model.StandardSubmit; -import com.mashibing.constant.CacheConstant; -import com.mashibing.enums.ExceptionEnums; -import com.mashibing.exceptiion.ApiException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,25 +13,31 @@ import org.springframework.stereotype.Service; import java.util.Map; /** - * @author kezhen - * @description + * @author zjw + * @description 校验客户的apikey是否合法 */ @Service(value = "apikey") @Slf4j public class ApiKeyCheckFilter implements CheckFilter { @Autowired - private BeaconCacheClient beaconCacheClient; + private BeaconCacheClient cacheClient; + @Override public void check(StandardSubmit submit) { - log.info("【接口模块-校验apikey】 校验ing…………"); - Map clientBusiness = beaconCacheClient.hGetAll(CacheConstant.CLIENT_BUSINESS + submit.getApikey()); - if (clientBusiness == null || clientBusiness.size() == 0) { - log.info("【接口模块-校验apikey】 非法的apikey = {}", submit.getApikey()); + log.info("【接口模块-校验apikey】 校验ing…………"); + //1. 基于cacheClient查询客户信息 + Map clientBusiness = cacheClient.hGetAll(CacheConstant.CLIENT_BUSINESS + submit.getApikey()); + + //2. 如果为null，直接扔异常 + if(clientBusiness == null || clientBusiness.size() == 0){ + log.info("【接口模块-校验apikey】 非法的apikey = {}",submit.getApikey()); throw new ApiException(ExceptionEnums.ERROR_APIKEY); } - submit.setCliendId((Long) clientBusiness.get("id")); - log.info("【接口模块-校验apikey】 查询到客户信息 clientBusiness= {}", clientBusiness); + + //3. 正常封装数据 +// submit.setClientId(Long.parseLong(clientBusiness.get("id") + "")); + log.info("【接口模块-校验apikey】 查询到客户信息 clientBusiness = {}",clientBusiness); } } diff --git a/beancon-api/src/main/java/com/mashibing/api/util/R.java b/beancon-api/src/main/java/com/mashibing/api/util/R.java index 0c1fe3a..02d7003 100644 --- a/beancon-api/src/main/java/com/mashibing/api/util/R.java +++ b/beancon-api/src/main/java/com/mashibing/api/util/R.java @@ -1,7 +1,7 @@ package com.mashibing.api.util; import com.mashibing.api.vo.ResultVO; -import com.mashibing.exceptiion.ApiException; +import com.mashibing.common.exception.ApiException; /** * @author kezhen diff --git a/beancon-api/src/main/resources/bootstrap.yml b/beancon-api/src/main/resources/bootstrap.yml index fa31da1..e275270 100644 --- a/beancon-api/src/main/resources/bootstrap.yml +++ b/beancon-api/src/main/resources/bootstrap.yml @@ -9,10 +9,12 @@ spring: nacos: # nacos注册中心地址 discovery: - server-addr: 192.168.1.8:8848 +# server-addr: 192.168.1.8:8848 + server-addr: 10.3.10.36:8848 # nacos配置中心地址 config: - server-addr: 192.168.1.8:8848 +# server-addr: 192.168.1.8:8848 + server-addr: 10.3.10.36:8848 file-extension: yml # beacon-api-dev.yml