Merge remote-tracking branch 'origin/master'

operating-service/src/main/java/com/txz/operating/controller/ConfigController.java

@@ -33,6 +33,19 @@ public class ConfigController {
         return configService.getConfigByCode(code);
     }
 
+
+    @ApiOperation("根据类型获取下载地址 type=1 安卓  2 ios")
+    @GetMapping(value = "/getUrlByType")
+    public Result getUrlByType(@RequestParam Integer type) {
+        if (type == 1){
+            return configService.getConfigByCode("apk_url");
+        } else if (type == 2){
+            return configService.getConfigByCode("app_url");
+        }
+        return Result.fail(ResultCode.OBJECT_IS_NULL);
+    }
+
+
     @PostMapping("/add")
     @ApiOperation(value = "配置新增")
     public Result add(@RequestBody Config config) {

operating-service/src/main/java/com/txz/operating/dubbo/impl/OperatingInterfacesDubboServiceImpl.java

@@ -63,11 +63,11 @@ public class OperatingInterfacesDubboServiceImpl implements OperatingInterfacesD
                 String key = interfacez.getServicePath();
                 if (key.equals(servicePath)) {
                     dto = InterfacesDTO.generator(interfacez);
-                    map.put(key, dto);
+                    // map.put(key, dto);
                     return Result.success(dto);
                 } else if (key.contains("*") && servicePath.startsWith(key.substring(0, key.indexOf("*")))) {
                     dto = InterfacesDTO.generator(interfacez);
-                    map.put(key, dto);
+                    // map.put(key, dto);
                     return Result.success(dto);
                 }
             }

operating-service/src/main/resources/bootstrap.properties

@@ -16,7 +16,7 @@ spring.profiles.active=dev
 local.nacos=124.222.152.234:8848
 #dev.nacos=127.0.0.1:8848
 dev.nacos=172.17.0.3:8848
-#pro.nacos=172.17.0.15:8848,172.17.0.15:8849,172.17.0.13:8848
+pro.nacos=172.31.181.53:8848
 #spring.profiles.include=wx,wxmp
 #spring.cloud.nacos.discovery.server-addr=129.211.99.19:84
 spring.cloud.nacos.discovery.server-addr=${${spring.profiles.active}.nacos}
@@ -70,18 +70,26 @@ dubbo.registry.check=false
 
 
 #minio
-minio.url= http://124.220.229.80:9098
+#minio.url= http://124.220.229.80:9098
+#minio.accessKey= admin
+#minio.secretKey= minio123
+
+dev.minio=http://124.220.229.80:9098
+pro.minio=https://minioapi.banhubuy.com
+minio.url= ${${spring.profiles.active}.minio}
 minio.accessKey= admin
 minio.secretKey= minio123
 
+
+
 statistics.data.ids=
 
 local.job=http://8.219.117.74/xxl-job-admin
 dev.job=http://124.220.229.80:9096/xxl-job-admin
 test.job=http://172.10.100.40:8080/xxl-job-admin
-pro.job=http://172.10.100.40:8080/xxl-job-admin
+pro.job=http://172.31.181.53:8080/xxl-job-admin
 dev.accessToken=
-
+pro.accessToken=
 
 spring.messages.basename=i18n/messages,i18n/messages_zh_CN
 spring.messages.encoding=UTF-8