Merge branch 'master' of https://git.zorkdata.com/zhuyunwei/api-service

api-service-project/api-service-web/package/env/.env

-# vim:ft=sh
-## environment variables
+################################################################################
+#                          配置文件说明
+# .env-dev配置文件是开发时编译器使用的配置文件，在本地调试之前，需要把此文
+# 配置到IDE里，根据实际环境修改相应参数。程序打包发布不会使用该配置文件，
+# 程序发布后，通过app.sh运行，程序的配置通过.env自动加载到当前程序运行的
+# 上下文环境变量中
+################################################################################
 
-### 数据源mysql实例
-export DB_DBTYPE=mysql
-export DB_HOST=192.168.3.218
-export DB_PORT=3306
-export DB_NAME=icube3
+export CONTAINER_PORT=8080
+export NACOS_HOST=192.168.70.46
+export NACOS_PORT=8848
 
-export DB_USERNAME=root
-export DB_PASSWORD=zork.8888
+export JVM=500m
+
+# ====================================================================
+# mysql数据库配置
+# MYSQL_HOST:mysql host地址，默认会取本地hosts中paas-mysql的映射地址
+# MYSQL_USER:mysql数据库用户名
+# MYSQL_PWD:mysql数据库密码
+# MYSQLDB_NAME:mysql db数据库名字，默认为icube
+# ====================================================================
+export MYSQL_HOST=192.168.70.47
+export MYSQLDB_NAME=api-service
+export MYSQL_USER=root
+export MYSQL_PWD=admin1
+
+# ====================================================================
+# 蓝鲸 配置
+# APP_ID: 应用Id 蓝鲸的应用id应与本服务应用id相同
+# APP_TOKEN: 应用token 与蓝鲸的应用id相对应的token
+# BK_PASS_HOST: 蓝鲸paas的地址
+# BK_CMDB_HOST: 蓝鲸cmdb的地址
+# BK_CMDB_IS_HTTPS: 蓝鲸cmdb是否是https协议
+# BK_CMDB_USERNAME: 蓝鲸管理员用户名
+# BK_CMDB_PASSWORD: 蓝鲸管理员密码
+# ====================================================================
+export APP_ID=icube
+export APP_TOKEN=b3f18e9e-a159-4294-bdc4-19571abd6a5f
+export BK_PAAS_HOST=http://paas.bksingle.com
+export BK_CMDB_HOST=http://cmdb.bksingle.com
+export BK_CMDB_IS_HTTPS=false
+export BK_CMDB_USERNAME=admin
+export BK_CMDB_PASSWORD=zork.8888
+
+
+# ====================================================================
+# rabbbitmq 配置
+# RABBITMQ_ADDRESSES:rabbitmq地址
+# RABBITMQ_USER:rabbitmq用户名
+# RABBITMQ_PWD:rabbitmq密码
+# ====================================================================
+export RABBITMQ_ADDRESSES=192.168.70.46:5672,192.168.70.47:5672,192.168.70.49:5672
+export RABBITMQ_USER=admin
+export RABBITMQ_PWD=admin
+
+
+
+# ====================================================================
+# redis 配置
+# REDIS_PWD：redis密码，在redis开启验证时需要配置
+# ====================================================================
+
+export REDIS_PWD=admin
+
+
+
+
+export LOGGING_LEVEL_ROOT=INFO
\ No newline at end of file

api-service-project/api-service-web/src/main/java/com/zorkdata/apiservice/controller/ApiServicueController.java

@@ -106,7 +106,6 @@ public class ApiServicueController extends BaseController {
         return apiFacade.listGroup(keyword, pageSize, pageNo, sortField, sortType);
     }
 
-
     /**
      * Api接口
      *
@@ -260,17 +259,51 @@ public class ApiServicueController extends BaseController {
     }
 
     @Inner(value = false)
-    @PostMapping("/executeApi/{apiName}")
-    public InvokeResult executeApi(@PathVariable String apiName, @RequestBody(required = false) Map<String, String> inParam) {
+    @PostMapping("/executeApi")
+    public InvokeResult executeApi(@RequestParam String apiName,
+                                   @RequestBody(required = false) Map<String, String> inParam) {
         BkUser user = super.getUser();
         String username = user.getUsername();
         return apiFacade.executeApi(apiName, inParam, username);
     }
 
+
     @Inner(value = false)
+    @PutMapping("/csPut/{id}")
+    public InvokeResult csPut(@RequestParam String name,
+                              @PathVariable Integer id
+    ) {
+        return InvokeResult.success("测试Put混合条件,更新指定name名称");
+    }
+
+    @Inner(value = false)
+    @PutMapping("/csPut2")
+    public InvokeResult csPut2(@RequestBody ApiDTO apiDTO
+    ) {
+        return InvokeResult.success("测试Put混合条件,更新指定name名称");
+    }
+
     @PostMapping("/csPost")
     public InvokeResult csPost(@RequestBody ApiGroupDTO apiGroupDTO) {
         return InvokeResult.success("获取SqlServer数据类型成功!");
     }
 
+    @Inner(value = false)
+    @PostMapping("/csPost2/{id}")
+    public InvokeResult csPost2(
+            @PathVariable Integer id,
+            @RequestParam String name
+    ) {
+        return InvokeResult.success("测试Post混合条件");
+    }
+
+    @Inner(value = false)
+    @DeleteMapping("/delete/{id}")
+    public InvokeResult delete(
+            @PathVariable Integer id,
+            @RequestParam String name
+    ) {
+        return InvokeResult.success("测试Post混合条件");
+    }
+
 }

api-service-project/api-service-web/src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@
 # server.port 本地服务监听端口
 # ====================================================================
 server:
-  port: 8080
+  port: 6725
 
 
 spring: