ip

src/main/java/com/yeejoin/amos/api/tool/controller/DataBaseLinkResource.java

@@ -125,8 +125,8 @@ public class DataBaseLinkResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/agency/list")
     @ApiOperation(httpMethod = "GET", value = "机构列表查询", notes = "列表查询")
-    public ResponseModel<List<AgencyModel>> queryForList() throws SQLException, IOException {
-        return ResponseHelper.buildResponse(dataBaseLinkService.queryForAgencyList());
+    public ResponseModel<List<AgencyModel>> queryForList(HttpServletRequest request) throws SQLException, IOException {
+        return ResponseHelper.buildResponse(dataBaseLinkService.queryForAgencyList(request));
     }
 
 

src/main/java/com/yeejoin/amos/api/tool/face/model/DataBaseLinkModel.java

 package com.yeejoin.amos.api.tool.face.model;
 
+import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseLink;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -38,4 +39,6 @@ public class DataBaseLinkModel extends BaseModel {
         this.userName = userName;
         this.passWord = passWord;
     }
+    
+
 }

src/main/java/com/yeejoin/amos/api/tool/face/service/DataBaseLinkService.java

 package com.yeejoin.amos.api.tool.face.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.AgencyModel;
 import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
@@ -7,14 +8,16 @@ import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseLinkMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseLink;
 import com.yeejoin.amos.api.tool.utils.AESUtils;
 import com.yeejoin.amos.api.tool.utils.DataBaseUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
+import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +32,8 @@ import java.util.Map;
 @Service
 public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBaseLink, DataBaseLinkMapper> {
 
+    @Autowired
+    DataBaseLinkMapper dataBaseLinkMapper;
     /**
      * 新增
      */
@@ -84,8 +89,12 @@ public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBase
     /**
      * 机构列表查询
      */
-    public List<AgencyModel> queryForAgencyList() throws SQLException, IOException {
-        Connection connection = this.connectNewDatabase(this.queryModelByParams(DataBaseUtils.getIp()));
+    public List<AgencyModel> queryForAgencyList(HttpServletRequest request) throws SQLException, IOException {
+//        URL url = new URL(request.getRequestURL().toString());
+        DataBaseLink dataBaseLink = getOne(new QueryWrapper<DataBaseLink>().eq("IP",DataBaseUtils.getIp()));
+        DataBaseLinkModel dataBaseLinkModel = new DataBaseLinkModel();
+        Bean.toModel(dataBaseLink,dataBaseLinkModel);
+        Connection connection = this.connectNewDatabase(dataBaseLinkModel);
         List<Map<String, Object>> maps =
                 DataBaseUtils.getMaps("SELECT AGENCY_NAME, AGENCY_CODE, AGENCY_DESC FROM privilege_agency;", connection);
         connection.close();

src/main/java/com/yeejoin/amos/api/tool/utils/DataBaseUtils.java

@@ -5,8 +5,13 @@ import com.yeejoin.amos.api.tool.face.orm.entity.TableColumn;
 import org.springframework.util.ObjectUtils;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.sql.*;
 import java.util.*;
 
@@ -147,12 +152,39 @@ public class DataBaseUtils {
     }
 
     public static String getIp() throws IOException {
-        InputStream inputStream = ClassLoader.getSystemResourceAsStream("config/application-dev.properties");
+//        InetAddress inetAddress = null;
+//        boolean isFind = false; // 返回标识
+//        Enumeration<NetworkInterface> networkInterfaceLists = null;
+//        try {
+//            // 获取网络接口
+//            networkInterfaceLists = (Enumeration<NetworkInterface>) NetworkInterface.getNetworkInterfaces();
+//        } catch (SocketException e) {
+//            e.printStackTrace();
+//        }
+//        while (networkInterfaceLists.hasMoreElements()) {
+//            NetworkInterface networkInterface = (NetworkInterface) networkInterfaceLists.nextElement();
+//            Enumeration<InetAddress> ips = networkInterface.getInetAddresses();
+//            // 遍历所有ip，获取本地地址中不是回环地址的ipv4地址
+//            while (ips.hasMoreElements()) {
+//                inetAddress = (InetAddress) ips.nextElement();
+//                if (inetAddress instanceof Inet4Address && inetAddress.isSiteLocalAddress()
+//                        && !inetAddress.isLoopbackAddress()) {
+//                    isFind = true;
+//                    break;
+//                }
+//            }
+//            if (isFind) {
+//                break;
+//            }
+//        }
+//        return inetAddress == null ? "" : inetAddress.getHostAddress();
+        //获取jar包同级目录
+        String filePath = System.getProperty("user.dir") + "/config/application-dev.properties";
+        InputStream in = new BufferedInputStream(Files.newInputStream(Paths.get(filePath)));
         Properties properties = new Properties();
-        properties.load(inputStream);
-        properties.list(System.out);
+        properties.load(in);
+        //获取配置文件数据
         return properties.getProperty("eureka.instance.hostname");
     }
 
-
 }