Merge remote-tracking branch 'origin/dev-lingfeng' into dev0.0.1

game-module/game-manage/pom.xml

@@ -27,6 +27,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zanxiang.module</groupId>
+            <artifactId>zx-oss</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

game-module/game-manage/src/main/java/com/zanxiang/manage/controller/OssController.java

@@ -0,0 +1,38 @@
+package com.zanxiang.manage.controller;
+
+import com.zanxiang.common.domain.ResultVo;
+import com.zanxiang.module.oss.service.IOssService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-07-12
+ * @description : oss相关接口
+ */
+@Api(tags = {"oss相关接口管理"})
+@RestController
+@RequestMapping("/oss")
+@Slf4j
+public class OssController {
+
+    @Autowired
+    private IOssService ossService;
+
+    @ApiOperation(value = "文件上传oss")
+    @GetMapping(value = "/form/upload/")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "成功", response = Map.class)})
+    public ResultVo<Map<String, String>> formUpload(String filePrefix, String mime) {
+        return new ResultVo<>(ossService.formUpload(filePrefix, mime));
+    }
+
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/OssServiceImpl.java

@@ -0,0 +1,16 @@
+package com.zanxiang.manage.service.Impl;
+
+import com.zanxiang.manage.service.OssService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-07-12
+ * @description : 阿里云oss
+ */
+@Slf4j
+@Service
+public class OssServiceImpl implements OssService {
+
+}

game-module/game-manage/src/main/java/com/zanxiang/manage/service/OssService.java

@@ -0,0 +1,9 @@
+package com.zanxiang.manage.service;
+
+/**
+ * @author : lingfeng
+ * @time : 2022-07-12
+ * @description : 阿里云oss
+ */
+public interface OssService {
+}

game-module/game-manage/src/main/resources/bootstrap.yml

@@ -13,7 +13,7 @@ spring:
         # 服务注册地址
         server-addr: 118.178.187.109:8848
       config:
-        namespace: DEV_game
+        namespace: LOCAL_game
         # 配置中心地址
         server-addr: 118.178.187.109:8848
         # 配置文件格式

game-module/game-sdk/pom.xml

@@ -26,7 +26,7 @@
             <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.zanxiangnet.module</groupId>
+            <groupId>com.zanxiang.module</groupId>
             <artifactId>zx-sms</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/Impl/SmsServiceImpl.java

@@ -5,6 +5,8 @@ import com.zanxiang.common.enums.ExpireTimeEnum;
 import com.zanxiang.common.enums.HttpStatusEnum;
 import com.zanxiang.common.enums.SmsTypeEnum;
 import com.zanxiang.common.utils.StringUtils;
+import com.zanxiang.module.sms.pojo.SendResult;
+import com.zanxiang.module.sms.service.impl.AliSmsService;
 import com.zanxiang.sdk.common.constant.RedisKeyConstant;
 import com.zanxiang.sdk.common.util.RedisUtil;
 import com.zanxiang.sdk.domain.dto.UserDTO;
@@ -14,8 +16,6 @@ import com.zanxiang.sdk.domain.params.UserData;
 import com.zanxiang.sdk.service.SmsService;
 import com.zanxiang.sdk.service.UserService;
 import com.zanxiang.sdk.service.UserTokenService;
-import com.zanxiangnet.module.sms.pojo.SendResult;
-import com.zanxiangnet.module.sms.service.impl.AliSmsService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;

game-module/game-sdk/src/main/resources/bootstrap.yml

@@ -13,7 +13,7 @@ spring:
         # 服务注册地址
         server-addr: 118.178.187.109:8848
       config:
-        namespace: DEV_game
+        namespace: LOCAL_game
         # 配置中心地址
         server-addr: 118.178.187.109:8848
         # 配置文件格式