Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

李进 2 лет назад
Родитель
Сommit
91368d6300

+ 7 - 0
sys-api-service/pom.xml

@@ -54,5 +54,12 @@
             <artifactId>xy-log</artifactId>
             <version>1.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>xy-oss</artifactId>
+            <version>1.0</version>
+        </dependency>
+
     </dependencies>
 </project>

+ 28 - 0
sys-api-service/src/main/java/com/xy/service/OssServiceImpl.java

@@ -0,0 +1,28 @@
+package com.xy.service;
+
+import com.xy.utils.R;
+import com.xy.vo.PolicyVo;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/***
+ * 对象存储实现类
+ * @author 谭斌
+ * @date 2023/1/9 11:22
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class OssServiceImpl implements OssService {
+
+    private final AliOssService aliOssService;
+
+    @ApiOperation(value = "policy获取", notes = "阿里云OSS服务端签名后前端直传方式获取policy")
+    @GetMapping("aliOSS/policy")
+    public R<PolicyVo> getPolicy() {
+        return aliOssService.getPolicy();
+    }
+}

+ 1 - 1
sys-api-service/src/main/java/com/xy/service/SysDictServiceImpl.java

@@ -38,8 +38,8 @@ import static com.xy.utils.PlusBeans.toPageBean;
  */
 @Slf4j
 @Service
-@Api(tags = "系统字典")
 @AllArgsConstructor
+@Api(tags = "系统字典")
 public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements SysDictService {
 
     private RedisService<SysDictRedis> redisService;

+ 15 - 0
sys-api/src/main/java/com/xy/service/OssService.java

@@ -0,0 +1,15 @@
+package com.xy.service;
+
+import com.xy.annotate.RestMappingController;
+import io.swagger.annotations.Api;
+
+/***
+ * 对象存储服务类
+ * @author 谭斌
+ * @date 2023/1/9 11:11
+ */
+@Api(tags = "对象存储")
+@RestMappingController("oss")
+public interface OssService {
+ 
+}

+ 2 - 0
sys-api/src/main/java/com/xy/service/SysDictService.java

@@ -1,10 +1,12 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import io.swagger.annotations.Api;
 
 /**
  * 字典 接口路由
  */
+@Api(tags = "系统字典")
 @RestMappingController("sys-dict")
 public interface SysDictService {
 }

+ 2 - 0
sys-api/src/main/java/com/xy/service/SysRegionService.java

@@ -3,6 +3,7 @@ package com.xy.service;
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.SysRegionDto;
 import com.xy.utils.R;
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -11,6 +12,7 @@ import java.util.List;
 /**
  * 行政区域 接口路由
  */
+@Api(tags = "区域")
 @RestMappingController("sys-region")
 public interface SysRegionService {
 

+ 2 - 0
sys-api/src/main/java/com/xy/service/UiGuideService.java

@@ -1,6 +1,7 @@
 package com.xy.service;
 
 import com.xy.annotate.RestMappingController;
+import io.swagger.annotations.Api;
 
 /**
  * <p>
@@ -10,6 +11,7 @@ import com.xy.annotate.RestMappingController;
  * @author lijin
  * @since 2023-01-05
  */
+@Api(tags = "界面-引导提示配置")
 @RestMappingController("ui-guide")
 public interface UiGuideService {
 

+ 1 - 1
sys-start/pom.xml

@@ -44,7 +44,7 @@
         <dependency>
             <groupId>cn.torna</groupId>
             <artifactId>swagger-plugin</artifactId>
-            <version>1.2.18</version>
+            <version>2.2.21</version>
         </dependency>
 
     </dependencies>

+ 2 - 2
sys-start/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     include: cloud
   mqtt:
     topics:
-      - {topic: "dev-sys-log", handler: com.xy.consumer.LogConsumer}
+      - { topic: "dev-sys-log", handler: com.xy.consumer.LogConsumer }
 
 server:
   port: 9053
@@ -13,7 +13,7 @@ cloud:
   center:
     url: 119.96.213.127:9007
     config:
-      shared-configs: redis.yaml,mysql.yaml,mqtt.yaml,es.yaml
+      shared-configs: redis.yaml,mysql.yaml,mqtt.yaml,es.yaml,xy-oss.yaml
       name: sys
   service:
     name: dev-sys