Browse Source

调整目录

tsurumure 10 months ago
parent
commit
5e15db93b9

+ 1 - 1
.drone.yml

@@ -33,7 +33,7 @@ steps:
       - name: maven-build
         path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
     commands:
-      - mvn clean package -P dev
+      - mvn clean package -P prod
       # (此时拷贝的内容是仓库分支拉下来的代码)
       - mkdir -p /app/build/target
       # 将打包好的 Jar包 拷贝到指定目录

+ 2 - 2
pom.xml

@@ -391,9 +391,9 @@
             </activation>
         </profile>
         <profile>
-            <id>dev</id>
+            <id>prod</id>
             <properties>
-                <profile.active>dev</profile.active>
+                <profile.active>prod</profile.active>
             </properties>
         </profile>
     </profiles>

+ 30 - 0
src/main/java/com/backendsys/modules/common/config/SpringDocConfig.java

@@ -0,0 +1,30 @@
+package com.backendsys.modules.common.config;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.servers.Server;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+
+@Configuration
+public class SpringDocConfig {
+
+    @Value("${HTTP_BASE_URI}")
+    private String HTTP_BASE_URI;
+
+    @Bean
+    public OpenAPI customOpenAPI(Environment environment) {
+        return new OpenAPI()
+            .info(new Info()
+                    .title("SpringDoc API Documentation")
+//                    .version("v1")
+//                    .description("SpringDoc API Documentation Description"))
+            )
+            .addServersItem(new Server().url(HTTP_BASE_URI))
+            .components(new Components());
+    }
+
+}

+ 64 - 0
src/main/java/com/backendsys/modules/common/utils/Result.java

@@ -0,0 +1,64 @@
+package com.backendsys.modules.common.utils;
+
+import org.apache.http.HttpStatus;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 返回数据
+ *
+ */
+public class Result extends HashMap<String, Object> {
+	private static final long serialVersionUID = 1L;
+	
+	public Result() {
+		put("code", 0);
+		put("msg", "success");
+	}
+	
+	public static Result error() {
+		return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常");
+	}
+	
+	public static Result error(String msg) {
+		return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg);
+	}
+	
+	public static Result error(int code, String msg) {
+		Result r = new Result();
+		r.put("code", code);
+		r.put("msg", msg);
+		return r;
+	}
+
+	public static Result error(int code, String msg, Object obj) {
+		Result r = new Result();
+		r.put("code", code);
+		r.put("msg", msg);
+		r.put("data", obj);
+		return r;
+	}
+
+	public static Result success(String msg) {
+		Result r = new Result();
+		r.put("msg", msg);
+		return r;
+	}
+	
+	public static Result success(Map<String, Object> map) {
+		Result r = new Result();
+		r.putAll(map);
+		return r;
+	}
+	
+	public static Result success() {
+		return new Result();
+	}
+
+	@Override
+    public Result  put(String key, Object value) {
+		super.put(key, value);
+		return this;
+	}
+}

+ 23 - 0
src/main/java/com/backendsys/modules/system/controller/SysUserV2Controller.java

@@ -0,0 +1,23 @@
+package com.backendsys.modules.system.controller;
+
+import com.backendsys.modules.common.utils.Result;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Tag(name = "系统用户")
+public class SysUserV2Controller {
+
+
+    @Operation(summary = "获得系统用户详情")
+    @GetMapping("/api/v2/system/user/getUserDetail")
+    public Result getUserDetail(@Parameter(description = "用户ID") Long user_id) {
+        System.out.println("user_id = " + user_id);
+        return Result.success();
+    }
+
+}

+ 7 - 0
src/main/java/com/backendsys/modules/system/service/SysUserV2Service.java

@@ -0,0 +1,7 @@
+package com.backendsys.modules.system.service;
+
+import com.backendsys.modules.system.entity.SysUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface SysUserV2Service extends IService<SysUser> {
+}

+ 11 - 0
src/main/java/com/backendsys/modules/system/service/impl/SysUserV2ServiceImpl.java

@@ -0,0 +1,11 @@
+package com.backendsys.modules.system.service.impl;
+
+import com.backendsys.modules.system.dao.SysUserDao;
+import com.backendsys.modules.system.entity.SysUser;
+import com.backendsys.modules.system.service.SysUserV2Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SysUserV2ServiceImpl extends ServiceImpl<SysUserDao, SysUser> implements SysUserV2Service {
+}

+ 1 - 1
src/main/resources/application-local.yml

@@ -13,7 +13,7 @@ HTTP_ACTUATOR_URI: https://jsonplaceholder.typicode.com
 
 spring:
   config:
-    name: application-dev
+    name: application-local
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/backendsys?useUnicode=true&

+ 0 - 0
src/main/resources/application-dev.yml → src/main/resources/application-prod.yml


+ 12 - 10
src/main/resources/application.yml

@@ -88,6 +88,7 @@ whitelist:
     /uploads/**,
     /swagger-ui/index.html,
     /swagger-ui/**,
+    /docs/**,
     /v3/**
   jwt:
     /api/webhook,
@@ -148,17 +149,18 @@ management:
 
 
 springdoc:
-  api-docs:
-    enabled: true #
-#    path: /api-docs # 默认/v3/api-docs # 样式
-
-#  swagger-ui:
-#    path: /swagger-ui.html #自定义swagger-ui HTML文档路径
 
-#group-configs: #进行文档分组每个组配置对应的请求路径以及区分所在包
-#  - group: 'user'
-#    paths-to-match: '/api/users/**'
-#    packages-to-scan: com.toher.springdoc.user
+  #  swagger-ui:
+  #    path: /swagger-ui.html #自定义swagger-ui HTML文档路径
+  api-docs:
+    path: /docs/api
+    enabled: true
+    operations-sorter: method
+  # 进行文档分组每个组配置对应的请求路径以及区分所在包
+  group-configs:
+    - group: 'system'
+      paths-to-match: '/api/v2/system/**'
+      packages-to-scan: com.backendsys.modules.system
 #  - group: 'product'
 #    paths-to-match: '/api/product/**'
 #    packages-to-scan: com.toher.springdoc.product