fix error

pengm2ng · May 30, 2021 · e6aa9ef · e6aa9ef
1 parent 817cb1e
commit e6aa9ef
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/jmt_webapp/src/main/java/dao/map/KakaoMapProviderDAO.java b/jmt_webapp/src/main/java/dao/map/KakaoMapProviderDAO.java
@@ -34,12 +34,14 @@ private static class InstHolder {
  public List<String> findPlace(String placeName) {
 
  try {
- File file = new File("./resources/kakaoKey.txt");
- FileInputStream is = new FileInputStream(file);
- InputStreamReader isr = new InputStreamReader(is);
- BufferedReader br = new BufferedReader(isr);
- String key = br.readLine();
- br.close();
+
+ File file = new File("../webapps/ROOT/resources/kakaoKey.txt");
+ BufferedReader inFiles
+
+ = new BufferedReader(new InputStreamReader(new FileInputStream(file.getAbsolutePath()), "UTF8"));
+
+ String key = inFiles.readLine();
+ inFiles.close();
  URL url = new URL("https://dapi.kakao.com/v2/local/search/keyword.json?page=1&size=1&sort=accuracy&query="
  + URLEncoder.encode(placeName, "utf-8"));
  System.out.println(url.toString());

diff --git a/jmt_webapp/src/main/java/dao/test/OrganizationTestDAO.java b/jmt_webapp/src/main/java/dao/test/OrganizationTestDAO.java
@@ -24,15 +24,15 @@ private static class InstHolder {
  @Override
  public List<Organization> getAllOrganization(Class<Organization> organizationClass) {
  List<Organization> list = new ArrayList<>();
- if (organizationClass.equals(DeptDiv.class)) {
+
  System.out.println("올 부서");
  System.out.println(organizationClass.getName());
  Organization organization = new DeptDiv("123123", "외청");
  Organization organization2 = new DeptDiv("123122", "본청");
  list.add(organization);
  list.add(organization2);
 
- } 
+
  return list;
  }
 
@@ -76,8 +76,7 @@ public List<Organization> getChildrenOf(Organization organization) {
  System.out.println(organization.getOrganizationName());
  Organization organization1 = new Dept("123123", "외청부서");
  Organization organization2 = new Dept("123122", "본청부서");
- list.add(organization1);
- list.add(organization2);
+
 
  if(organization.getOrganizationName().equals("외청실국")){
 

diff --git a/jmt_webapp/src/main/java/jdbc/DBCPInit.java b/jmt_webapp/src/main/java/jdbc/DBCPInit.java
@@ -36,7 +36,7 @@ public void init() throws ServletException {
  private void initConnectionPool() {
 
  try {
- File file = new File("./resources/pk.txt");
+ File file = new File("../webapps/ROOT/resources/pk.txt");
  FileInputStream is = new FileInputStream(file);
  InputStreamReader isr = new InputStreamReader(is);
  BufferedReader br = new BufferedReader(isr);

diff --git a/jmt_webapp/src/main/webapp/restful/get/category/GetCategory.jsp b/jmt_webapp/src/main/webapp/restful/get/category/GetCategory.jsp
@@ -71,7 +71,7 @@ try{
  JSONArray jsonArray = new JSONArray();
  JSONObject jsonObject = new JSONObject();
 
- if (deptDiv == "") {
+ if (deptDiv.equals("")) {
 
  list = OrganizationTestDAO.getInstance()
  .getAllOrganization((Class<Organization>) organizationDeptDiv.getClass());
@@ -111,7 +111,7 @@ try{
  System.out.println(jsonObject.toJSONString());
  } else if (hgdeptDiv != "") {
 
- list = OrganizationTestDAO.getInstance().getChildrenOf(organizationhgdeptDiv);
+ list = OrganizationTestDAO.getInstance().getChildrenOf(organizationHgdeptDiv);
  for (int i = 0; i < list.size(); i++) {
  jsonArray.add((list.get(i)).getOrganizationName());
  }

diff --git a/jmt_webapp/src/main/webapp/restful/get/top10/GetTop10.jsp b/jmt_webapp/src/main/webapp/restful/get/top10/GetTop10.jsp
@@ -13,6 +13,7 @@
 <%@page import="org.json.simple.JSONObject"%>
 <%@page import="java.sql.Date"%>
 <%@page import="entity.Place"%>
+<%@page import="dao.map.KakaoMapProviderDAO"%>
 <%
  response.setHeader("Access-Control-Allow-Origin", "*");
 try{