feature-img-1.0:修改生产环境链接内网地址、移除Pixable接口

bnyer-auth/src/main/resources/bootstrap-prod.yml

@@ -2,23 +2,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        # 解决部署在不同服务器访问不到的问题，需暴露外网ip
-        ip: 81.69.47.31
-        # 部署在不同服务器上的指定端口
-        port: 8010
         # 服务注册地址
-        server-addr: http://175.24.122.142:8848
+        server-addr: http://192.168.3.100:6001
         # 命名空间地址
-        namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d
+        namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
       config:
         # 配置中心地址
-        server-addr: http://175.24.122.142:8848
+        server-addr: http://192.168.3.100:6001
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
-        namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d
+        namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
         # 共享配置

bnyer-auth/src/main/resources/bootstrap.yml

@@ -12,4 +12,4 @@ spring:
     name: bnyer-auth
   profiles:
     # 环境配置
-    active: dev
+    active: prod

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/CommonImgsTypeEnum.java

@@ -1,23 +0,0 @@
-package com.bnyer.common.core.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author chengkun
- * @date 2023/03/11 15:18
- */
-@Getter
-@AllArgsConstructor
-public enum CommonImgsTypeEnum {
-
-    HEAD("all","头像","0"),
-    BACK("photo","壁纸","1"),
-    ILLUSTRATION("illustration","插画","2");
-
-    private String type;
-
-    private String name;
-
-    private String code;
-}

bnyer-gateway/src/main/resources/bootstrap-prod.yml

@@ -2,19 +2,15 @@ spring:
   cloud:
     nacos:
       discovery:
-        # 解决部署在不同服务器访问不到的问题，需暴露外网ip
-        ip: 203.104.38.186
-        # 部署在不同服务器上的指定端口
-        port: 7010
         # 服务注册地址
-        server-addr: http://203.104.38.186:6001
+        server-addr: http://192.168.3.100:6001
         # 命名空间地址
         namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
       config:
         # 配置中心地址
-        server-addr: http://203.104.38.186:6001
+        server-addr: http://192.168.3.100:6001
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
@@ -24,18 +20,18 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-    sentinel:
+#    sentinel:
-      # 取消控制台懒加载
+#      # 取消控制台懒加载
-      eager: true
+#      eager: true
-      transport:
+#      transport:
-        # 控制台地址
+#        # 控制台地址
-        dashboard: #127.0.0.1:7011
+#        dashboard: http://175.24.122.142:8858
-      # nacos配置持久化
+#      # nacos配置持久化
-      datasource:
+#      datasource:
-        ds1:
+#        ds1:
-          nacos:
+#          nacos:
-            server-addr: http://203.104.38.186:6001
+#            server-addr: http://117.50.61.7:8848
-            dataId: sentinel-bnyer-gateway
+#            dataId: sentinel-bnyer-gateway
-            groupId: prod
+#            groupId: dev
-            data-type: json
+#            data-type: json
-            rule-type: flow
+#            rule-type: flow

bnyer-gateway/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     name: bnyer-gateway
   profiles:
     # 环境配置
-    active: dev
+    active: prod
   main:
     allow-circular-references: true
     allow-bean-definition-overriding: true

bnyer-services/bnyer-file/src/main/resources/bootstrap-prod.yml

@@ -2,19 +2,15 @@ spring:
   cloud:
     nacos:
       discovery:
-        # 解决部署在不同服务器访问不到的问题，需暴露外网ip
-        ip: 203.104.38.186
-        # 部署在不同服务器上的指定端口
-        port: 8011
         # 服务注册地址
-        server-addr: http://203.104.38.186:6001
+        server-addr: http://192.168.3.100:6001
         # 命名空间地址
         namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
       config:
         # 配置中心地址
-        server-addr: http://203.104.38.186:6001
+        server-addr: http://192.168.3.100:6001
         # 配置文件格式
         file-extension: yml
         # 命名空间地址

bnyer-services/bnyer-file/src/main/resources/bootstrap.yml

@@ -12,7 +12,7 @@ spring:
     name: bnyer-file
   profiles:
     # 环境配置
-    active: dev
+    active: prod
   servlet:
     multipart:
       maxFileSize: 27MB

bnyer-services/bnyer-img/src/main/resources/bootstrap-prod.yml

@@ -2,23 +2,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        # 解决部署在不同服务器访问不到的问题，需暴露外网ip
-        ip: 81.69.47.31
-        # 部署在不同服务器上的指定端口
-        port: 9102
         # 服务注册地址
-        server-addr: http://175.24.122.142:8848
+        server-addr: http://192.168.3.100:6001
         # 命名空间地址
-        namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d
+        namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
       config:
         # 配置中心地址
-        server-addr: http://175.24.122.142:8848
+        server-addr: http://192.168.3.100:6001
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
-        namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d
+        namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
         # 共享配置

bnyer-services/bnyer-img/src/main/resources/bootstrap.yml

@@ -12,4 +12,4 @@ spring:
     name: bnyer-img
   profiles:
     # 环境配置
-    active: dev
+    active: prod

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/config/PixaBayConfig.java

@@ -1,26 +0,0 @@
-package com.bnyer.system.config;
-
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * pixaBay配置类
- * @author chengkun
- * @date 2023/03/10 17:43
- */
-@Configuration
-@ConfigurationProperties(prefix = "bnyer.system.pixabay")
-@Getter
-@RefreshScope
-public class PixaBayConfig {
-
-    @Value("${bnyer.system.pixabay.apiKey}")
-    private String apiKey;
-
-    @Value("${bnyer.system.pixabay.apiUrl}")
-    private String apiUrl;
-
-}

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/CommonImgsController.java

@@ -1,18 +1,10 @@
 package com.bnyer.system.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.bnyer.common.core.dto.CommonImgsDto;
 import com.bnyer.common.core.web.controller.BaseController;
-import com.bnyer.common.core.web.domain.AjaxResult;
 import com.bnyer.system.service.ICommonImgsService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -34,14 +26,6 @@ public class CommonImgsController extends BaseController {
 //        return getDataTable(commonImgss);
 //    }
 
-    //@RequiresPermissions("system:config:list")
-    @ApiOperation(value="新增commonImgs")
-    @PostMapping(value = "/importCommonImgs")
-    public AjaxResult importCommonImgs(@Validated @RequestBody @ApiParam("commonImgs对象")CommonImgsDto dto){
-        log.debug("【图文平台后台】新增commonImgs参数为:{}", JSON.toJSONString(dto));
-        return AjaxResult.success(commonImgsService.importCommonImgs(dto.getType(), dto.getPage(), dto.getPageSize()));
-    }
-
     //@RequiresPermissions("system:config:list")
 //    @ApiOperation(value="修改commonImgs")
 //    @PostMapping(value = "/update")

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ICommonImgsService.java

@@ -6,15 +6,6 @@ import java.util.List;
 
 public interface ICommonImgsService {
 
-    /**
-     * 新增commonImgs
-     * @param type 图片类型
-     * @param page 第几页
-     * @param pageSize 每页条数
-     * @return -
-     */
-    int importCommonImgs(String type,String page,String pageSize);
-
     /**
      * 批量删除commonImgs
      * @param ids ids

bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/CommonImgsServiceImpl.java

@@ -1,12 +1,7 @@
 package com.bnyer.system.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.bnyer.common.core.domain.CommonImgs;
-import com.bnyer.common.core.enums.CommonImgsTypeEnum;
-import com.bnyer.common.core.exception.ServiceException;
-import com.bnyer.system.config.PixaBayConfig;
 import com.bnyer.system.mapper.CommonImgsMapper;
 import com.bnyer.system.service.ICommonImgsService;
 import lombok.extern.slf4j.Slf4j;
@@ -15,8 +10,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @Service
@@ -26,51 +19,9 @@ public class CommonImgsServiceImpl implements ICommonImgsService {
     @Autowired
     private CommonImgsMapper commonImgsMapper;
 
-    @Autowired
-    private PixaBayConfig pixaBayConfig;
-
     @Autowired
     private RestTemplate restTemplate;
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int importCommonImgs(String type,String page,String pageSize) {
-        //获取数据源
-        String apiKey = pixaBayConfig.getApiKey();
-        String apiUrl = pixaBayConfig.getApiUrl();
-        String url = apiUrl+"?key="+apiKey+"&image_type="+type+"&page="+page+"&per_page="+pageSize;
-
-        JSONObject resultObject = restTemplate.getForObject(url, JSONObject.class);
-        if(resultObject != null && resultObject.getJSONArray("hits") != null &&resultObject.getJSONArray("hits").size() < 0){
-            throw new ServiceException("获取pixabay数据失败!");
-        }
-        //获取数据成功
-        JSONArray hits = resultObject.getJSONArray("hits");
-        List<String> headUrlList = new ArrayList<>();
-        List<String> backUrlList = new ArrayList<>();
-        for (int i = 0; i < hits.size(); i++) {
-            JSONObject jsonObject = hits.getJSONObject(i);
-            if(jsonObject != null){
-                //获取头像
-                headUrlList.add(jsonObject.getString("userImageURL"));
-                //获取图片
-                backUrlList.add(jsonObject.getString("webformatURL"));
-            }
-        }
-        if(type.equals(CommonImgsTypeEnum.HEAD.getType())){
-            //批量入库头像
-          return commonImgsMapper.insertBatch(headUrlList,CommonImgsTypeEnum.HEAD.getCode());
-        }else if(type.equals(CommonImgsTypeEnum.BACK.getType())){
-            //批量入库头像
-          return commonImgsMapper.insertBatch(backUrlList,CommonImgsTypeEnum.BACK.getCode());
-        }else if(type.equals(CommonImgsTypeEnum.ILLUSTRATION.getType())){
-            //批量入库头像
-          return commonImgsMapper.insertBatch(backUrlList,CommonImgsTypeEnum.ILLUSTRATION.getCode());
-        }else{
-            return 0;
-        }
-    }
-
 
     @Override
     @Transactional(rollbackFor = Exception.class)

bnyer-services/bnyer-system/src/main/resources/bootstrap-prod.yml

@@ -2,23 +2,19 @@ spring:
   cloud:
     nacos:
       discovery:
-        # 解决部署在不同服务器访问不到的问题，需暴露外网ip
-        ip: 81.69.47.31
-        # 部署在不同服务器上的指定端口
-        port: 9101
         # 服务注册地址
-        server-addr: http://175.24.122.142:8848
+        server-addr: http://192.168.3.100:6001
         # 命名空间地址
-        namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d
+        namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
       config:
         # 配置中心地址
-        server-addr: http://175.24.122.142:8848
+        server-addr: http://192.168.3.100:6001
         # 配置文件格式
         file-extension: yml
         # 命名空间地址
-        namespace: 604df951-ada5-481f-a0be-9fd9b97a7f4d
+        namespace: b133c9e5-9f8d-4ed4-9ebd-95557802889f
         # 命名空间分组
         group: prod
         # 共享配置

bnyer-services/bnyer-system/src/main/resources/bootstrap.yml

@@ -12,4 +12,4 @@ spring:
     name: bnyer-system
   profiles:
     # 环境配置
-    active: dev
+    active: prod