Parcourir la source

实现 RPC 接口

reghao il y a 3 ans
Parent
commit
71798aba93

+ 4 - 0
src/main/java/cn/reghao/dfs/store/db/mapper/RegionMapper.java

@@ -1,10 +1,13 @@
 package cn.reghao.dfs.store.db.mapper;
 
+import cn.reghao.dfs.api.dto.KeyValue;
 import cn.reghao.dfs.store.model.po.Region;
 import cn.reghao.jutil.jdk.db.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author reghao
  * @date 2023-01-05 09:23:27
@@ -12,4 +15,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface RegionMapper extends BaseMapper<Region> {
     Integer findIdByLocation(@Param("location") String location);
+    List<KeyValue> findKeyValues();
 }

+ 6 - 0
src/main/java/cn/reghao/dfs/store/rpc/BucketServiceImpl.java

@@ -2,6 +2,7 @@ package cn.reghao.dfs.store.rpc;
 
 import cn.reghao.dfs.api.dto.BucketInfo;
 import cn.reghao.dfs.api.dto.BucketListResult;
+import cn.reghao.dfs.api.dto.BucketRegion;
 import cn.reghao.dfs.api.dto.CreateBucket;
 import cn.reghao.dfs.api.iface.BucketService;
 import cn.reghao.dfs.store.db.mapper.BucketMapper;
@@ -62,4 +63,9 @@ public class BucketServiceImpl implements BucketService {
         BucketListResult bucketListResult = new BucketListResult(list);
         return bucketListResult;
     }
+
+    @Override
+    public List<BucketRegion> getBucketRegions() {
+        return bucketMapper.findAll1();
+    }
 }

+ 1 - 1
src/main/java/cn/reghao/dfs/store/rpc/ObjectServiceImpl.java

@@ -133,7 +133,7 @@ public class ObjectServiceImpl implements ObjectService {
     @Override
     public GenerateSignedUrlResult signedUrl(GenerateSignedUrl generateSignedUrl) {
         String objectName = generateSignedUrl.getObjectName();
-        String url = String.format("//oss.reghao.cn/object/%s", objectName);
+        String url = String.format("//oss.reghao.cn/%s", objectName);
         // 5 分钟后链接失效
         long expires = System.currentTimeMillis()/1000 + 300;
         String ossAccessId = "TMP.3KeSkQJhXm4fZNupmzTEFx8HQ7QobdYnbc4A5do6zvqDnkkHdwyKj2rvJzPCfprxBSfHM6H3tqci21rCnHwWEmVje3PHaA";

+ 8 - 7
src/main/java/cn/reghao/dfs/store/rpc/RegionServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.reghao.dfs.store.rpc;
 
-import cn.reghao.dfs.api.dto.BucketRegion;
+import cn.reghao.dfs.api.dto.KeyValue;
 import cn.reghao.dfs.api.iface.RegionService;
-import cn.reghao.dfs.store.db.mapper.BucketMapper;
+import cn.reghao.dfs.store.db.mapper.RegionMapper;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.stereotype.Service;
 
@@ -15,13 +15,14 @@ import java.util.List;
 @DubboService
 @Service
 public class RegionServiceImpl implements RegionService {
-    private BucketMapper bucketMapper;
+    private RegionMapper regionMapper;
 
-    public RegionServiceImpl(BucketMapper bucketMapper) {
-        this.bucketMapper = bucketMapper;
+    public RegionServiceImpl(RegionMapper regionMapper) {
+        this.regionMapper = regionMapper;
     }
 
-    public List<BucketRegion> list() {
-        return bucketMapper.findAll1();
+    public List<KeyValue> list() {
+        List<KeyValue> list = regionMapper.findKeyValues();
+        return list;
     }
 }

+ 7 - 4
src/main/resources/mapper/oss/RegionMapper.xml

@@ -17,10 +17,13 @@
         </foreach>
     </insert>
 
-    <select id="findAll" resultType="cn.reghao.dfs.store.model.po.Region">
-        select * from region
-    </select>
     <select id="findIdByLocation" resultType="java.lang.Integer">
-        select * from region where location=#{location}
+        select *
+        from region
+        where location=#{location}
+    </select>
+    <select id="findKeyValues" resultType="cn.reghao.dfs.api.dto.KeyValue">
+        select name_zh_cn as `key`,location as `value`
+        from region
     </select>
 </mapper>