信息安全处理

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/MerchantMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
+import com.chelvc.cloud.vehicle.api.param.MerchantQueryParam;
 import com.chelvc.cloud.vehicle.api.param.NearbyQueryParam;
 import com.chelvc.cloud.vehicle.api.param.PointQueryParam;
 import com.chelvc.cloud.vehicle.server.entity.Merchant;
@@ -35,4 +36,12 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
      * @return 商家信息列表
      */
     List<MerchantDTO> listNearbyMerchants(@Param("param") NearbyQueryParam param, @Param("size") int size);
+
+    /**
+     * 查询商家
+     *
+     * @param param 查询参数
+     * @return 商家信息列表
+     */
+    List<MerchantDTO> listSimpleMerchants(MerchantQueryParam param);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantServiceImpl.java

@@ -48,7 +48,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
 
     @Override
     public List<MerchantDTO> listSimpleMerchants(@NonNull MerchantQueryParam param) {
-        return MerchantCopier.INSTANCE.copying(this.list());
+        return this.baseMapper.listSimpleMerchants(param);
     }
 
     @Override

vehicle-server/src/main/resources/application-dev.yml

@@ -6,11 +6,11 @@ spring:
   datasource:
     url: jdbc:mysql://47.108.128.78:6180/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
     username: vehicle
-    password: Chelvc@vehicle!2023#
+    password: ENC(VrauMsUlDGVDnOAUp3yOAYWiHuzSX6V/1hOgaLC1OoI=)
   redis:
     host: 47.108.128.78
     port: 7031
-    password: Chelvc@2023
+    password: ENC(d6ocMzfjRx4wZZEMxx7m9Z319Jo085r8)
 
 dubbo:
   registry:

vehicle-server/src/main/resources/application-pre.yml

@@ -6,11 +6,11 @@ spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:6180/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
     username: vehicle
-    password: Chelvc@vehicle!2023#
+    password: ENC(i6KsFPHPhOKqU7LTUxtLI05a6VmU0ca+maT8PNom28I=)
   redis:
     host: 127.0.0.1
     port: 7031
-    password: Chelvc@2023
+    password: ENC(im/fsTimU1kTlAcMlj8N5ygFP58Xxs5o)
 
 dubbo:
   registry:

vehicle-server/src/main/resources/application-prod.yml

@@ -6,11 +6,11 @@ spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:6180/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
     username: vehicle
-    password: Chelvc@vehicle!2023#
+    password: ENC(i6KsFPHPhOKqU7LTUxtLI05a6VmU0ca+maT8PNom28I=)
   redis:
     host: 127.0.0.1
     port: 7031
-    password: Chelvc@2023
+    password: ENC(im/fsTimU1kTlAcMlj8N5ygFP58Xxs5o)
 
 dubbo:
   registry:

vehicle-server/src/main/resources/application-test.yml

@@ -6,11 +6,11 @@ spring:
   datasource:
     url: jdbc:mysql://127.0.0.1:6180/vehicle?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
     username: vehicle
-    password: Chelvc@vehicle!2023#
+    password: ENC(VrauMsUlDGVDnOAUp3yOAYWiHuzSX6V/1hOgaLC1OoI=)
   redis:
     host: 127.0.0.1
     port: 7031
-    password: Chelvc@2023
+    password: ENC(d6ocMzfjRx4wZZEMxx7m9Z319Jo085r8)
 
 dubbo:
   registry:

vehicle-server/src/main/resources/application.yml

@@ -23,6 +23,12 @@ spring:
       maximum-pool-size: 5
       max-lifetime: 60000
 
+jasypt:
+  encryptor:
+    password: ${JASYPT_ENCRYPTOR_PASSWORD}
+    algorithm: PBEWithMD5AndDES
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
 mybatis-plus:
   mapper-locations: classpath:mapper/*.xml
   global-config:

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -36,4 +36,12 @@
             order by distance asc limit #{size}
         ) t on t.id = mt.id
     </select>
+
+    <select id="listSimpleMerchants" resultType="com.chelvc.cloud.vehicle.api.dto.MerchantDTO">
+        select
+        from `merchant`
+        <where>
+
+        </where>
+    </select>
 </mapper>