From d3411e82d5412f583ee2b896693083a3f6c20c8f Mon Sep 17 00:00:00 2001 From: star2t Date: Tue, 22 Aug 2023 14:06:42 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#36=20=EC=86=8C=EC=9C=A0=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/data_collectors/nasa_data.js | 193 +++++++++++++++++++++++------- 1 file changed, 152 insertions(+), 41 deletions(-) diff --git a/apps/data_collectors/nasa_data.js b/apps/data_collectors/nasa_data.js index d2bcd95e..e92c6848 100644 --- a/apps/data_collectors/nasa_data.js +++ b/apps/data_collectors/nasa_data.js @@ -33,15 +33,19 @@ async function sleep(ms) { } function saveTLEInfo(updatedCount, newCount, totalCount, fetchTime) { - const queryInsertInfo = "INSERT INTO tle_data_info (updated_count, new_count, total_count, fetch_time) VALUES (?, ?, ?, ?)"; - - connection.query(queryInsertInfo, [updatedCount, newCount, totalCount, fetchTime], (error, results) => { - if (error) { - console.error("Error saving TLE info:", error); - } else { - //console.log("TLE info saved successfully."); + const queryInsertInfo = + "INSERT INTO tle_data_info (updated_count, new_count, total_count, fetch_time) VALUES (?, ?, ?, ?)"; + connection.query( + queryInsertInfo, + [updatedCount, newCount, totalCount, fetchTime], + (error, results) => { + if (error) { + console.error("Error saving TLE info:", error); + } else { + //console.log("TLE info saved successfully."); + } } - }); + ); } async function getTotalCount() { @@ -81,6 +85,116 @@ function calculateSatellitePosition(line1, line2, date) { }; } +function updateInfoBasedOnName(name) { + if (name.startsWith('BEIDOU')) { + return '중국'; + } else if (name.startsWith('COSMOS')) { + return '러시아'; + } else if (name.startsWith('EUTELSAT')) { + return 'Eutelsat'; + } else if (name.startsWith('FALCON')) { + return 'SpaceX'; + } else if (name.startsWith('FENGYUN')) { + return '중국'; + } else if (name.startsWith('GALAXY')) { + return 'Intelsat'; + } else if (name.startsWith('INTELSAT')) { + return 'Intelsat'; + } else if (name.startsWith('GAOFEN')) { + return '중국'; + } else if (name.startsWith('GLOBALSTAR')) { + return 'Globalstar'; + } else if (name.startsWith('GONETS')) { + return '러시아'; + } else if (name.startsWith('GORIZONT')) { + return '러시아'; + } else if (name.startsWith('GOES')) { + return '미국'; + } else if (name.startsWith('GPS BIIA')) { + return '미국'; + } else if (name.startsWith('GPS BIIF')) { + return '미국'; + } else if (name.startsWith('GPS BIII')) { + return '미국'; + } else if (name.startsWith('GPS BIIIR')) { + return '미국'; + } else if (name.startsWith('GPS BIIIRM')) { + return '미국'; + } else if (name.startsWith('GSAT')) { + return '인도'; + } else if (name.startsWith('IRIDIUM')) { + return 'Iridium communication system'; + } else if (name.startsWith('LEMUR')) { + return 'Spire Global'; + } else if (name.startsWith('MOLNIYA')) { + return '러시아'; + } else if (name.startsWith('RADUGA')) { + return '러시아'; + } else if (name.startsWith('NUSAT')) { + return '아르헨티나'; + } else if (name.startsWith('ONEWEB')) { + return 'ONEWEB'; + } else if (name.startsWith('ORBCOMM')) { + return 'ORBCOMM'; + } else if (name.startsWith('SHIJIAN')) { + return '중국'; + } else if (name.startsWith('SHIYAN')) { + return '중국'; + } else if (name.startsWith('SPACEBEE')) { + return 'Swarm Technologies'; + } else if (name.startsWith('STARLINK')) { + return 'SpaceX'; + } else if (name.startsWith('APRIZESAT')) { + return '미국, 영국'; + } else if (name.startsWith('ASTROCAST')) { + return 'Astrocast SA'; + } else if (name.startsWith('CHINASAT')) { + return '중국'; + } else if (name.startsWith('CZ')) { + return '중국'; + } else if (name.startsWith('ECHOSTAR')) { + return 'EchoStar Satellite Services'; + } else if (name.startsWith('YAOGAN')) { + return '중국'; + } else if (name.startsWith('ISS')) { + return '국제우주정거장'; + } else if (name.startsWith('YUNHAI')) { + return '중국'; + } else if (name.startsWith('NOAA')) { + return '미국'; + } else if (name.startsWith('USA')) { + return '미국'; + } else if (name.startsWith('WGS')) { + return '미국'; + } else if (name.startsWith('UNKNOWN')) { + return '비식별위성'; + } else if (name.startsWith('GALILEO')) { + return '유럽'; + } else if (name.startsWith('ROBUSTA')) { + return '프랑스'; + } else if (name.startsWith('INMARSAT')) { + return 'Inmarsat'; + } else if (name.startsWith('JILIN')) { + return '중국'; + } else if (name.startsWith('KANOPUS')) { + return '러시아'; + } else if (name.startsWith('KEPLER')) { + return 'NASA'; + } else if (name.startsWith('KOREASAT')) { + return '대한민국'; + } else if (name.startsWith('KSF')) { + return '대한민국'; + } else if (name.startsWith('O3B')) { + return 'O3B Networks'; + } else if (name.startsWith('SAUDI')) { + return '사우디 아라비아'; + } else if (name.startsWith('SKYSAT')) { + return 'Planets Labs'; + } + + return null; +} + function processTLEData(tleData, fetchTime) { const extractedTLEData = []; @@ -117,6 +231,7 @@ function processTLEData(tleData, fetchTime) { const satellitePosition = calculateSatellitePosition(line1, line2, new Date(tle.date)); const latitude = satellitePosition.latitude; const longitude = satellitePosition.longitude; + const info = updateInfoBasedOnName(tle.name); extractedTLEData.push({ satellite_id: tle.satelliteId, @@ -129,6 +244,8 @@ function processTLEData(tleData, fetchTime) { fetch_timestamp: fetchTime, latitude: latitude, longitude: longitude, + info: info, + isNew: true, }); } else { console.error("Line data is not available for this TLE."); @@ -154,7 +271,10 @@ function saveTLEData(tleData, fetchTime) { const latitude = tle.latitude; const longitude = tle.longitude; const first_launch = line1Fields.firstLaunch; + const isNew = tle.isNew ? 1 : 0; + const info = tle.info; + //console.log(`Satellite Name: ${name}, Info: ${info}`); const changed_time = new Date() .toISOString() .slice(0, 19) @@ -193,12 +313,14 @@ function saveTLEData(tleData, fetchTime) { fetch_timestamp: fetchTime, latitude: latitude, longitude: longitude, + info: info, + isNew: isNew, }, (error, results) => { if (error) { console.error("Error saving TLE data:", error); } else { - //console.log("TLE data saved successfully for:", name); + //console.log("TLE data saved successfully for :",name); } } ); @@ -232,12 +354,13 @@ function saveTLEData(tleData, fetchTime) { changed_time, latitude, longitude, + isNew, ], (error, results) => { if (error) { console.error("Error saving TLE data to tle_data_log:", error); } else { - //console.log("TLE data saved to tle_data_log successfully for:",name); + //console.log("TLE data saved to tle_data_log successfully for:", name); } } ); @@ -267,28 +390,23 @@ function saveTLEData(tleData, fetchTime) { fetch_timestamp: fetchTime, latitude: latitude, longitude: longitude, + info: info, }; const hasChanges = JSON.stringify(existingData) !== JSON.stringify(newData); - if (hasChanges) { - connection.query( - queryUpdate, - [{ ...newData }, satellite_id], - (error, results) => { + if (hasChanges) { + connection.query(queryUpdate, [{ ...newData }, satellite_id], (error, results) => { if (error) { console.error("Error updating TLE data:", error); } else { - //console.log("TLE data updated successfully for:", name); + //console.log(`TLE data saved successfully for Satellite Name: ${name}, Info: ${info}`); } - } - ); - - // tle_data_log 테이블 - connection.query( - queryInsertLog, - [ + }); + + // tle_data_log 테이블 + connection.query(queryInsertLog, [ satellite_id, name, date, @@ -314,6 +432,7 @@ function saveTLEData(tleData, fetchTime) { changed_time, latitude, longitude, + isNew ? 1 : 0, ], (error, results) => { if (error) { @@ -361,14 +480,13 @@ async function fetchTLE() { const extractedTLEData = processTLEData(tleData.member, formattedFetchTime); const updatedCount = extractedTLEData.length; - const newCount = extractedTLEData.filter(entry => entry.isNew).length; + const newCount = extractedTLEData.filter(tle => tle.isNew === 1).length; totalUpdatedCount += updatedCount; totalNewCount += newCount; if (extractedTLEData.length > 0) { await saveTLEData(extractedTLEData, formattedFetchTime); - } else { console.error("Processed TLE data is empty or invalid."); } @@ -379,17 +497,19 @@ async function fetchTLE() { if (pageCounter === 100) { console.log(`Wait...`); - await sleep(15 * 60 * 1000); // 100페이지마다 15분 대기 + await sleep(10 * 60 * 1000); // 100페이지마다 10분 대기 pageCounter = 0; } } - const totalCount = await getTotalCount(); + const totalCount = await getTotalCount(); saveTLEInfo(totalUpdatedCount, totalNewCount, totalCount, formattedFetchTime); } catch (error) { console.error("Error fetching or saving TLE data:", error); - console.log("Retrying in 1 hour..."); + + const totalCount = await getTotalCount(); + saveTLEInfo(totalUpdatedCount, totalNewCount, totalCount, formattedFetchTime);; if (connection && !connection._closed) { connection.end(); @@ -397,31 +517,22 @@ async function fetchTLE() { await sleep(60 * 60 * 1000); - connection = mysql.createConnection(mysqlConfig); - connection.connect((error) => { - if (error) { - console.error("Error connecting to the database:", error); - } else { - console.log("Reconnected to the MySQL database."); - fetchTLE(); - } - }); + fetchTLE(); } } + async function run() { while (true) { totalUpdatedCount = 0; + totalNewCount = 0; console.log("Fetching TLE data from API..."); try { await fetchTLE(); - const totalCount = await getTotalCount(); - const fetchTime = new Date().toISOString().slice(0, 19).replace("T", " "); - saveTLEInfo(totalUpdatedCount, totalNewCount, totalCount, fetchTime); } catch (error) { console.error("Error occurred:", error); } - await sleep(120 * 60 * 1000); // 120분마다 갱신 + await sleep(150 * 60 * 1000); // 150분마다 갱신 } } From 0c4a6a8e38d571af8be12e8d31a2adc64a9c8b34 Mon Sep 17 00:00:00 2001 From: star2t Date: Tue, 22 Aug 2023 14:14:10 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#36=20=EC=86=8C=EC=9C=A0=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/data_collectors/nasa_data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/data_collectors/nasa_data.js b/apps/data_collectors/nasa_data.js index e92c6848..09130f31 100644 --- a/apps/data_collectors/nasa_data.js +++ b/apps/data_collectors/nasa_data.js @@ -401,7 +401,7 @@ function saveTLEData(tleData, fetchTime) { if (error) { console.error("Error updating TLE data:", error); } else { - //console.log(`TLE data saved successfully for Satellite Name: ${name}, Info: ${info}`); + //console.log("TLE data saved successfully:", name); } }); From c31404f5fd893857035d1b77aa1317577d1a0753 Mon Sep 17 00:00:00 2001 From: MIN0225 Date: Tue, 22 Aug 2023 16:41:10 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20tle=5Fdata=20=EC=9C=84=EC=84=B1=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executionHistory/executionHistory.bin | Bin 831546 -> 831546 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/8.1.1/fileHashes/fileHashes.bin | Bin 32047 -> 32047 bytes .../.gradle/8.1.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.1.1/fileHashes/resourceHashesCache.bin | Bin 30771 -> 31111 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../satellite/.gradle/file-system.probe | Bin 8 -> 8 bytes API_SERVER/satellite/.idea/workspace.xml | 4 +++- .../controller/TleDataController.class | Bin 4104 -> 4116 bytes .../satellite/dto/UpdateTleDataDto.class | Bin 1252 -> 601 bytes .../repository/TleDataRepository.class | Bin 1324 -> 1495 bytes .../satellite/service/TleDataService.class | Bin 6279 -> 6230 bytes .../stash-dir/TleData.class.uniqueId1 | Bin 6640 -> 0 bytes ...eId2 => TleDataController.class.uniqueId0} | Bin 4104 -> 4099 bytes .../TleDataRepository.class.uniqueId0 | Bin 1324 -> 0 bytes .../stash-dir/TleDataService.class.uniqueId1 | Bin 0 -> 6349 bytes .../stash-dir/TleDataService.class.uniqueId3 | Bin 6279 -> 0 bytes .../compileJava/previous-compilation-data.bin | Bin 64859 -> 64859 bytes .../controller/TleDataController.java | 4 ++-- .../satellite/dto/UpdateTleDataDto.java | 3 --- .../repository/TleDataRepository.java | 2 ++ .../satellite/service/TleDataService.java | 18 +++++++----------- 22 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/TleData.class.uniqueId1 rename API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/{TleDataController.class.uniqueId2 => TleDataController.class.uniqueId0} (82%) delete mode 100644 API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/TleDataRepository.class.uniqueId0 create mode 100644 API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/TleDataService.class.uniqueId1 delete mode 100644 API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/TleDataService.class.uniqueId3 diff --git a/API_SERVER/satellite/.gradle/8.1.1/executionHistory/executionHistory.bin b/API_SERVER/satellite/.gradle/8.1.1/executionHistory/executionHistory.bin index 9b11a2a3824b229de34e3141b54aec05118b19b7..7c1fee9c39caf52229710082aa03316291c556f1 100644 GIT binary patch delta 616 zcmV-u0+;=|;4-@4GJu2ugaU*Egam{Iga)(+5oRK4H*a!kHgs+`HDYZwXL4+FXK8eB zXm&PYbpQYW000015w~&R2=fNFCT$0#j1X!C#U=2Ii32&e6Z!}3 z4iIT%)t}44qQaqiWEC#pIrNt?b_*GozkUl8w>=3633J;fnlmkq+Sq%uA0}#~j$VmfWm+>iWTsAjcGmIE`l zHxUSr0uW>1kdjmZ=evfS>kX7k{oycF^M{}@p9BK{5LM3hO0(|1ak8Y>;=5;2qnF_+ z1Rj@e&;<~eiW>;U7?-Bn2s!S=NeXqS=`ydewdB{l;h{0sFqdZ>2$5VqD>1Di+C&u0 zH4OM*hE(GN01$d{|L7w#M-Dza;%Fgt>)QhW5M(k`D*#5~5ZBJZbB0z@X9EBb@(|s# zgipNIvnhpR<+1T^0{{>+r8*QHg&;RkY?tOei-ww)u_^>9m)|-EZVQy|`dS!BWXL@*SVP(F_$i6nn4yALq7uF;n=3633J;fnlmkq+Sq%uA0}z?Iq*_$-2ut@DDbB;>gV7e*pinqvjix&{u2nl0U9pc0DBp2H)f)!#j2QN)XazK zh?k);h#&!+mw@^Q7MJZ62)_{d+Ox67bW@gxqkIAyurk88ycP&f11nF8J)LISouqbu zA+l2gxaiETnv0+@ycF^M{}@p9BK{5JJNMWmNtrb{PYnfhidivzOs1 z1Rj@e&;<~eiW>;U7%t<%NW43sop9LCtApw73A*Ztm!UC-F_&i?2$5VLuwq+EcxE3) zV_HNiH~=dH01(%AW&pvSU#Tn+(4UX93XB5)5CxgKqv0r_c#rSYEVn_^8Up|j#C#}i zXmSw4nx5lpj4C)80{{?VVLA~V5(1SDO3u{o%kkTnu_^>9m)|-EZ$+nyC;)oUbP*MhkDQ2Lxo-wBNdP&o^92xmF>mkNP zT0vB@UY~s1UwyJ)h^#_Vc2)x0ivZS@s}9=V_jq;-Vx;y>h(ZC8&D|k9j1o1=<{sJa zR3=|>YfI;1xuR82RX;Yb4`pHrQn9?Ke`LZI-?h3%I>`^2gs5)7N-hwqA2~Rrh;tPIn zI#r_?0a7XbT|E$@l40-Ug;m1xbrV*&*s>~GRP9bQGZtiosL^tSs9}oSEM6hO3IL4v BbW;ET delta 377 zcmZ4gi*fxg#tjbx6@q67zSeYE6S3W(%>3Cii7yNcj9tuud}a(_z#K7|F~~*1`>1D~ z-tSYLyEtzYcwrIuCRWp*WoPj7bWrrvf;Mm+9!ow(WQ)bgX zw}uDV8^5k_y?5qJFjQ5==JlaWEJ1(r^mJ==p77mHKKsR)F*X3~tiUWch#7pVfV7@5 zkkABTMGzLydwkGikM)AN1vk#GZhrZe6Kb9nP!b3v+9!vnx@>ljs*?>`a3MPApvLL> zGv|q|=!sf;9;A{nZN^H7N=6kRjb^rgm+joNTXUC`)hliaX5R4vqGLKRut0$2$!75i G3045cWqE@D diff --git a/API_SERVER/satellite/.gradle/8.1.1/fileHashes/fileHashes.lock b/API_SERVER/satellite/.gradle/8.1.1/fileHashes/fileHashes.lock index 946a555413ada334407c621cbdbcd4c9c5ff67a2..66017ea490c508d69cef2b8bdd98a86fa4d42293 100644 GIT binary patch literal 17 VcmZQxFMnzI&p6v`1~A~`0RT4t1Y`gJ literal 17 VcmZQxFMnzI&p6v`1~A|~1pqg@1t9hU@ zNgx&kVS&}f%TK%S@i^Jc`+sRm|Gb{bjK#viDOcy8KD6l2!m1Qey$6WA*fe^{R@@9w`c!51M53y~}DPk1sXO#i5v8)K`x;N@PB F3II_DqQw9J delta 75 zcmV-R0JQ&y^8vH)0kAX}0co=}7?}aH<{6j)vz8mU1+!)${|J+PDtMC(E2y*0E9e4~ h%`U*Rr7s8sv&Az&1+yJF>Hz{F>9HXw4zoc>@-M9~9=!kn diff --git a/API_SERVER/satellite/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/API_SERVER/satellite/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 7c10ee82eaff9758071e7ca20eaa4f014ad375d4..e69b4ec702db863c924343335d37f64f17b123d9 100644 GIT binary patch literal 17 VcmZR6`B8jgWVPRY1~6a?0{}Wq1mgez literal 17 VcmZR6`B8jgWVPRY1~6bV0025B1ib(N diff --git a/API_SERVER/satellite/.gradle/file-system.probe b/API_SERVER/satellite/.gradle/file-system.probe index 7162ebdbdad2ff3f52b396b2b54cfe4f059f7d33..1832e6d9a94ed91fb07be34a2be616c0ee5832f9 100644 GIT binary patch literal 8 PcmZQzVC<599?c2>2Al!z literal 8 PcmZQzVC)ilpt=bF2BZR2 diff --git a/API_SERVER/satellite/.idea/workspace.xml b/API_SERVER/satellite/.idea/workspace.xml index ab4dc97c..16e4097d 100644 --- a/API_SERVER/satellite/.idea/workspace.xml +++ b/API_SERVER/satellite/.idea/workspace.xml @@ -260,7 +260,9 @@ - + + + diff --git a/API_SERVER/satellite/build/classes/java/main/com/example/satellite/controller/TleDataController.class b/API_SERVER/satellite/build/classes/java/main/com/example/satellite/controller/TleDataController.class index 250a4b799c9102f6a81a54205f7b27f5c1bf18e4..e5eb89e21a757ee97180bd8601856273eb29a876 100644 GIT binary patch delta 324 zcmX|+NlpS$6h%)}BEPEmg2A8+Oehlv8Zj_)q=_*xB!CUrgH54=AkvH72AmfgG0aSK z0q((#I57V2z`;H5zMFRk@5LRurO%(Y4`7*RhX{u@6C7zA2Psl=IN?;|OygX`vslpw zWs8d-mt5(vqEXej7StT-+z1-4rD0&QGM}w`125U|n$={X->o&Pe#(gXEfMwOVqugM zZNtq=qD)Dqi3x5cP38nGNt=$OOUM7RWC5MTtyls+JBdav46jBG9N=rqI9$O?;Hg2jQrHsM0qQwq*|2>?D7u065 P`&W!8x2N{~|MI~vP=Pi- delta 324 zcmX|+xlTe+6h+s41n=W<6+SW#Fi-~b{jI3W%=3(ooh_KzPiBo-F- z`X~N^h4EYqi@nZ1J7*WC?LYg~&!4w?Nyl6<&BL@qju?niiBIA;EI}%KYQ7j2v3KWBnSbA_-Hiyz*F)nUJ J_VRyu^%ql~GJgO7 diff --git a/API_SERVER/satellite/build/classes/java/main/com/example/satellite/dto/UpdateTleDataDto.class b/API_SERVER/satellite/build/classes/java/main/com/example/satellite/dto/UpdateTleDataDto.class index 653e9c2e0590e51559fbc8a1037630024bc77af1..73d270ce92d51b8d1fcbdc01af5074d5964d9be6 100644 GIT binary patch delta 337 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 diff --git a/API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/TleData.class.uniqueId1 b/API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/TleData.class.uniqueId1 deleted file mode 100644 index 0624e1c55c82be26fd8673b37fc896c9823b9ff1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6640 zcma)A`EwLS80`tUGufO3gEwFd0a-v1H3)`;NHBp&V!T}^vy;u>>}=ebMex4w`@Zj6 zw6sdgDu3_~@Q<>5Uw7|jx978Je))F#d;MPbbie6i|M~Z?zl9L{#V?)W0`X>tIA6R) z;cW`{tD6h5c$1%)pud`01F3g1xpmcn-wzNhd5 zg&!&W)F#fgiJvXeT53@}*=D#Z|BbLbR3OLRp}>;-`zdoyUNUox_R6Be=yaoGhu;`VGcwJe}<&nt6GSls?t$IZ?5iOowL(7?3ITy=B zw-*2psYGG)K88c#&77e<(Nv@R1lXFX$kE>O&x z>&Is;(dU#46>99n$~?MM@X(=wYA#n=$-yrw+g0?Oa3U-fod7(WN;#)m?4;sciM)nB zNvx<#nH4W~S84n(FvT_WNhajT=}dco{>PO(+OGH3RH*_N!!jK~DJ%jWTN zewbYhJb2YX!z~3bCdZ>Kd|nxp7V1BQ!O`v9r_hFa$K`iJPh@*^r&_iCQ|PZ3tj=~H zl9Pt}JCLhdo_aA|{|!(=f!g=&NE}gKAF5V1{ksXk0_*HvAcq@0OsOM{rj@Bin|7hr zWX+h=tC@Ol(tDjW?McE7ejG$*B56rdo2&Oi#STlyD8yYuSx%>cYj|1#3SX*pylbE%|h2kPxY!%yVv4z5jxZD<_^fX3c2Zfy! zc2U?(VGo5XDeR-LpTe~i#wi@2a6N@X6mFn!n8Fl=X_7xGW^8dxU^&~CW)Z|EK<}(J z`xDEjJU14X;_z_+4nf1BiQYh1;$oC~P`U)am!iBS0?1s3d{y05DQXUN<4FI!|1oi^J3?+f90ASXV zz|{aSlS$wj0GQn*a2){5coG-~02d^I0|4NRBybP_+>!(i0f2*&zytueDhW&ifYXw| z5dd&s61Win9GL`;0)R`Cz%h)iMPCo%9PF0GuZ7>1u|I|N8y=d(al}@c>=q~RY^w@l zUfhh5B~FS3#76S(qUoGL?qkV|;ueOy;a7t^$dZ>>ahY`F6JD zR+D@oOTL38x0&QiSn{1Lx!ojhWyyE3@Gl2=&r zfJvTW$pw}?Xp(Pa$*U}Rqe(u-l6{suWRmAt@+p?Q$t2IS)(|WY(}@ zlf1-|LzcYRB;U@GOJWUM11G*s-d?G+D_C#=YH^7EEIb2 z8f6hBBzOEFHl&qQ$0IGdRZ7OZWOG_cb+FQsTcl(~oaTDjl2%e3$+YB%lzf2iWoueV zb(qtVqf+t=FWHt>QXK=eOLnD|RL5N{xm!v;!b{p|CDlP$OYV`9kMfe;X(iPWTT5OkB_HD@GifE& z;ap4Zlai0~l09i9)v;bn?w68J@RGf0CDnyMOI|A_pX4R`(n_kUgq9qal27rH{b?oD zB}7XekdjaHk^^Za)%8V7UN0q|;Ux#tN~(*GmOLaSpXDVtrj=AzCM|h`lzfht97-#x zE?Zjiu#|kBm)w+AQeD%uyw;`W~5w36y-s3ng|$(MP_ i&1ogorBX{CgJhF! zfzM%zBkDFhwm7jkHJpWX4F-6U;8hw{{mYqDtZ6_ delta 306 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 literal 0 HcmV?d00001 diff --git a/API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/TleDataService.class.uniqueId3 b/API_SERVER/satellite/build/tmp/compileJava/compileTransaction/stash-dir/TleDataService.class.uniqueId3 deleted file mode 100644 index 9f1b03e9f4344f4d1ea8f3a32f53a47d1382ef68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6279 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 I^ftWxe`U4ZzyJUM diff --git a/API_SERVER/satellite/build/tmp/compileJava/previous-compilation-data.bin b/API_SERVER/satellite/build/tmp/compileJava/previous-compilation-data.bin index 64af77add46ea3929ab6911f6b92192c6699a17c..f5c3caf720a1b58eb98e14b162df609a2343307b 100644 GIT binary patch delta 94 zcmV-k0HOce`UBhg1F#_i5KNJnUjbZ&*K~rmY#bk~uahwX_7GxgYG4NFPz9-~!9U+f z=Gv1t1B(#3evqg{Jp~~+db?pZGZ6uk(gQ&dm!{eXIqt+s3U#RIGOw| getTleDataBySatelliteId(@RequestParam String satelliteId) { } @PutMapping("/{satelliteId}") - public TleData updateTleData(@PathVariable int id, @RequestBody UpdateTleDataDto tleData) { - return service.updateTleData(id, tleData); + public TleData updateTleData(@PathVariable String satelliteId, @RequestBody UpdateTleDataDto tleData) { + return service.updateTleData(satelliteId, tleData); } } \ No newline at end of file diff --git a/API_SERVER/satellite/src/main/java/com/example/satellite/dto/UpdateTleDataDto.java b/API_SERVER/satellite/src/main/java/com/example/satellite/dto/UpdateTleDataDto.java index da5a7568..5f00f5fd 100644 --- a/API_SERVER/satellite/src/main/java/com/example/satellite/dto/UpdateTleDataDto.java +++ b/API_SERVER/satellite/src/main/java/com/example/satellite/dto/UpdateTleDataDto.java @@ -6,8 +6,5 @@ @Getter @Setter public class UpdateTleDataDto { // tle_data 수정할때 쓸 dto - private String satelliteNumber; private String name; - private String classification; - private String firstLaunch; } diff --git a/API_SERVER/satellite/src/main/java/com/example/satellite/repository/TleDataRepository.java b/API_SERVER/satellite/src/main/java/com/example/satellite/repository/TleDataRepository.java index 3386fccd..78184f8b 100644 --- a/API_SERVER/satellite/src/main/java/com/example/satellite/repository/TleDataRepository.java +++ b/API_SERVER/satellite/src/main/java/com/example/satellite/repository/TleDataRepository.java @@ -23,4 +23,6 @@ public interface TleDataRepository extends JpaRepository { List findByNameContaining(String satelliteName); Optional findBySatelliteId(String satelliteId); + + Optional findById(Integer id); } diff --git a/API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java b/API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java index 212cabda..e9080ecf 100644 --- a/API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java +++ b/API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java @@ -73,19 +73,15 @@ public List getSearchedTleData(String satelliteName) { return repository.findByNameContaining(satelliteName); } - public TleData updateTleData(int id, UpdateTleDataDto updateTleDataDto) { - if(repository.existsById((long) id)){ - TleData tleData = repository.findById((long) id).get(); - tleData.setSatelliteNumber(updateTleDataDto.getSatelliteNumber()); - tleData.setName(updateTleDataDto.getName()); - tleData.setClassification(updateTleDataDto.getClassification()); - tleData.setFirstLaunch(updateTleDataDto.getFirstLaunch()); - return repository.save(tleData); - } else { - throw new ResponseStatusException(HttpStatus.NOT_FOUND, "TleData not found"); - } + + public TleData updateTleData(String id, UpdateTleDataDto updateTleDataDto) { + TleData tleData = repository.findBySatelliteId(id) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "TleData not found")); + tleData.setName(updateTleDataDto.getName()); + return repository.save(tleData); } + public List getSearchedTleDataBySatelliteId(String satelliteId) { Optional optionalTleData = repository.findBySatelliteId(satelliteId); return optionalTleData.map(Collections::singletonList).orElse(Collections.emptyList()); From 5293945c280da7992ddfc461a7564cd7f3bceedd Mon Sep 17 00:00:00 2001 From: MIN0225 Date: Tue, 22 Aug 2023 17:02:23 +0900 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20tle=5Fdata=20=EC=9C=84=EC=84=B1=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95=EA=B8=B0=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executionHistory/executionHistory.bin | Bin 831546 -> 831546 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/8.1.1/fileHashes/fileHashes.bin | Bin 32047 -> 32047 bytes .../.gradle/8.1.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.1.1/fileHashes/resourceHashesCache.bin | Bin 31111 -> 31145 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../satellite/.gradle/file-system.probe | Bin 8 -> 8 bytes API_SERVER/satellite/.idea/.gitignore | 8 + API_SERVER/satellite/.idea/compiler.xml | 17 + API_SERVER/satellite/.idea/dbnavigator.xml | 420 ++++++++++++++++++ API_SERVER/satellite/.idea/gradle.xml | 16 + .../satellite/.idea/jarRepositories.xml | 20 + API_SERVER/satellite/.idea/misc.xml | 10 + API_SERVER/satellite/.idea/vcs.xml | 6 + .../satellite/service/TleDataService.class | Bin 6230 -> 6230 bytes .../build/resources/main/application.yml | 41 ++ .../compileJava/previous-compilation-data.bin | Bin 64859 -> 64737 bytes .../out/production/resources/application.yml | 41 ++ .../satellite/service/TleDataService.java | 1 + .../src/main/resources/application.yml | 41 ++ 20 files changed, 621 insertions(+) create mode 100644 API_SERVER/satellite/.idea/.gitignore create mode 100644 API_SERVER/satellite/.idea/compiler.xml create mode 100644 API_SERVER/satellite/.idea/dbnavigator.xml create mode 100644 API_SERVER/satellite/.idea/gradle.xml create mode 100644 API_SERVER/satellite/.idea/jarRepositories.xml create mode 100644 API_SERVER/satellite/.idea/misc.xml create mode 100644 API_SERVER/satellite/.idea/vcs.xml create mode 100644 API_SERVER/satellite/build/resources/main/application.yml create mode 100644 API_SERVER/satellite/out/production/resources/application.yml create mode 100644 API_SERVER/satellite/src/main/resources/application.yml diff --git a/API_SERVER/satellite/.gradle/8.1.1/executionHistory/executionHistory.bin b/API_SERVER/satellite/.gradle/8.1.1/executionHistory/executionHistory.bin index 7c1fee9c39caf52229710082aa03316291c556f1..090f72e574c30481503f729c58c5e073d453e373 100644 GIT binary patch delta 893 zcmaizdq`7J9LIOPJMK6KO>?_*la0)DzPqz28RW_y{-KaWh?0pftbEKl=}F=D0`LK&5#HWw(c(tLHSvAA{2 z28+hxVgY08m~BeIf17~7sI$O%TcdkA?_IM{Fr>;(3yktk5S#M0j(s?b`YY)GV~_(Z zu@Sl*OZN%x+LTr^vlcl}(Q86%Cs&C!Hp3>+(TKkQWoA%bpqF5M2F0K$C#V9G3L7{Oh~hz3M30IU$xP7GNvO)x|Z{o#@o*+FO2ag+82h9>KqTEuW4 zxIt!qh@l(z7DmJ{&=Zssb3X$;z;%K;2Ks^r1n+36Eufv?8wQ4gB7zPQs0ND-)>_|M zIuI-qyeNTQ{3R>0eLU(miseE%8j(QeUur=DJz>7JfGx2{skO8_C?Iu*oS`qjkX*dB zrK$~)$u!Gqitj7Tnphd~8NpOWI0l@h!!g)F>GiarZaW+o+* zgqKytQAdl0v-2OPxhUG&tH|xJJ$hM3D?uHJ9gyMGRFf^0$ly*;L$FT<{lO|3pj@CI ze~u(AQtAeZZ>6229HF?!r0b6jv-~t`4r&a~%-5_rc4#}gTTi?5m&yEqfT}W-PBUn> zo^}M^NF8XPl_`h}4=QMma94Sq>B*Pb1>21&50?>n8Mg9@ol_kIu^;bA6XMN6VEPM{e9cpdA}6>BL;PN zaXpban5Q+Az7Il3#Y;q*P{1NaPw5qV9`@w&qndq^&V-3(!+(GJYW*$P(N&sDaX3%+ Yq8wMKF3wRvEITYdmc21YAuyHx0jj@#^8f$< delta 865 zcmXYudq`7J9LIOOJNj!{%u?@~<;Cl$0g?RrD~JnUDD-vLq^JA*E*S zSL*bZX(5#@t&!P_EQ+)g&6O6;We>5Go>=s{J9Xg;pYy%ve7~IEX>#hCoVtAnNux(j zA0Epg!9>=OwxWR8!}>k;68f~)@wO_z&gCJAlO&f!?R73s*){TDCAS4XYLhq4ixdZMV7rBjvKxG% z&_fyTEIJlP-d;CX42?a$>X!?J26-6%o&cxm{g%)9BAQZ2IPGRwl|pzN@&g?mVe1fo z2&GR(8!aNn_`?kP=wexci2M8@M*iH<+>agp5cS_26957&Zhv%B#03E`6TZ3wgwBa* zE9WBUk$di@+5lKWYgqC~08Eqr96W@`^Pr`zEO;po)9J167O5_che+DOw$`MQV0w?? zLmn2>N`}5F&{GS;NGlgjk)c@y;fmr*UCpA<=0(onCOHJ*GZpZ(;Qhc25x=NF3nP_p z%0;2j8+Tf{P+GwbuAK;x3acB1yPo7^N$h~iVj|;dIs5z5%IRn+!w=F%`JJv8eHf&M z^|YFq*=lKI|L$->4FVi>mkB*SXflyN)#~CCo5{vJN9O*kNs~0^>zgiHou>qcH{Pz~ z!l;cUEDMxIQ_7}P7znc|GHeTkng4UiB$%P7ZyJb%JurK?Wu+qP z+@P-Bc4a_%mQzCaEIeDqg(|+evxN>Ha-yW@J&(gx+;}>~`l!f-8IQY5giZ}7Q_hbN zE`;+#^jeFt}k z$-D1EE#jU0I}+qRfs)DbQD8>Z&d69q$X>pPn%quWi**LN0=4pGJ$!M6=U>3 z8a7VeoudmDIz9Pqj@0D&F(M%0b(2@-Lxk5)zMU_%nK^a_Gf2FA^85s_zS7ATA&l0^ z2eYLn%O--gO_^+(2$p^|IUU0IHhCtPAt*k%78r8B^C0$rpZpghEHzm_39Mu4=ES5P zMvxuXCx1)^3q70s5U9mA#SJJbC_K461?;ot$*&=dmd*aDdxStbDkk$+d;>8iOy;Zv zYyC0V8p8NFITym1G+- zxi(Zvp=R0KBm14o0B&Vw2Fa&u}el@`v(IU{EeRcGE{Z)ols*I#Ma!tAADc~Sq!ge|^nb&YhA9S+n$v}tBQwDGn8X+2{gp$Wu_AS^I_*)0yscSk(A zN>{uzTEB5C)S@Soe@BAdCptMk3e1q6d>F`JI&0%U`E-@kWbO26lWVh#CiCV9vvvXf zVK`YaMi1m6x5>M6biqPlli%h@O`abk0upwayfPmm>^k{&zSL&s*cr?qaq-FX6Tte! zCSQawoj*Ap!YG|Q6T+A>xfU35zw;pWmrec)5uQF-KMAZu zb#r1;4i+a$0E5c*&AP_7*%?1>R8-*I?C9ZUsALS3 ekOX2u5EkIMW>k`67OtHnwx?0~(WOeDpd0`;D;J3X delta 31 ncmZ4anX&yd;|3E6#^S}M64IM}jW4q^-rT5Y!MoYf!_5!?#LEjs diff --git a/API_SERVER/satellite/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/API_SERVER/satellite/.gradle/buildOutputCleanup/buildOutputCleanup.lock index e69b4ec702db863c924343335d37f64f17b123d9..9d426e940dd6d216b380a34700c839a9cb2f5ddb 100644 GIT binary patch literal 17 VcmZR6`B8jgWVPRY1~6cY1pqoz1nK|) literal 17 VcmZR6`B8jgWVPRY1~6a?0{}Wq1mgez diff --git a/API_SERVER/satellite/.gradle/file-system.probe b/API_SERVER/satellite/.gradle/file-system.probe index 1832e6d9a94ed91fb07be34a2be616c0ee5832f9..c18fcba159b55a8a5ba41f5cb1da581a4bf36cd9 100644 GIT binary patch literal 8 PcmZQzVC<4{=8gvd1a1LU literal 8 PcmZQzVC<599?c2>2Al!z diff --git a/API_SERVER/satellite/.idea/.gitignore b/API_SERVER/satellite/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/API_SERVER/satellite/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/API_SERVER/satellite/.idea/compiler.xml b/API_SERVER/satellite/.idea/compiler.xml new file mode 100644 index 00000000..14e0f3cc --- /dev/null +++ b/API_SERVER/satellite/.idea/compiler.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/API_SERVER/satellite/.idea/dbnavigator.xml b/API_SERVER/satellite/.idea/dbnavigator.xml new file mode 100644 index 00000000..352209ac --- /dev/null +++ b/API_SERVER/satellite/.idea/dbnavigator.xml @@ -0,0 +1,420 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/API_SERVER/satellite/.idea/gradle.xml b/API_SERVER/satellite/.idea/gradle.xml new file mode 100644 index 00000000..ba1ec5c7 --- /dev/null +++ b/API_SERVER/satellite/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/API_SERVER/satellite/.idea/jarRepositories.xml b/API_SERVER/satellite/.idea/jarRepositories.xml new file mode 100644 index 00000000..fdc392fe --- /dev/null +++ b/API_SERVER/satellite/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/API_SERVER/satellite/.idea/misc.xml b/API_SERVER/satellite/.idea/misc.xml new file mode 100644 index 00000000..5d982561 --- /dev/null +++ b/API_SERVER/satellite/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/API_SERVER/satellite/.idea/vcs.xml b/API_SERVER/satellite/.idea/vcs.xml new file mode 100644 index 00000000..b2bdec2d --- /dev/null +++ b/API_SERVER/satellite/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/API_SERVER/satellite/build/classes/java/main/com/example/satellite/service/TleDataService.class b/API_SERVER/satellite/build/classes/java/main/com/example/satellite/service/TleDataService.class index 0663ff9af9ca18886da5a1465e60bfd0dc5a5cf9..733ec47321732c737c61bd20e907bf3b60b4d698 100644 GIT binary patch delta 180 zcmca+aLr)DK_N~l1{MZs22KW<$)|*h1?3sI7!(-97!-kGN(^cY3X>lSi%(7!&K6Vy z%4h&(G=VZ&Kp737Osl9K0|$dXg8+j8g9L*iP^U3ajmhL{kqSWzpo}F@#tJB74V1B& z%p#h}>HrjVocvAHYw{jZQ&v|X&ke{cXY`t!C)U90&%n22KX)$)|*h1?3pH7~~nm7!(+!859}R8005E6c(SHDx58- z3Y1X?%4h&(G=VbeK$%uiT?P&YJq7^=eFg~z1E4M=puF+qYLN;-bD)d`P{tA{V+EA4 zp3EYe$!ZT2b(s83)NAq{QBzhIAkP)ZD`)haoF~@6>&L*);19GTfI*HSaPn`lCe|

4uPUJ@^wq&?{2eQjMp$RE!ErE$jU)KJRI1Qk+H1jVB$C@KbXDX3uU z)U9>jcdK=48nvCaX{=UT_ZXpiEgrmBOhnW;Wevii^QeqHt2uc>}Fw7jn zPs_keuRl=b02@ajpTT$zbrf+MzO}B{`~vbNv@tY|L+wFL?OcbS^$PMeqHkclEhl-6 z4O9MwSY>f7<+^Z@4iBLm9a@A9C_C@%Ij2bP`yd>7UOAb^9NjZOBdyB#=pY%kDcbJzC+nf zf=PGr>Gvq_v*`gFTDW7Ule+yOWe=4!qrHsh;9KRgogzc|h{j{aQcSqNTm6Kx mk48VW6oYQ9P1uwJ)bnt!pbk*n_Q*N_ delta 765 zcmXw%TS!z<7=_PPA98vzoq8zfUug*i?unp>go5epf@6co*>k91f+8q-DJZ3=Xh?{l zg0y2<+Wlg7RWmCmE3c!D9|2&gCnMkh9NJ%TN znpm*mN4w@Ks{XdFrmmqrD`mwmw%Xh>lM~dMsi1{KBV}f-{GF~S3R~Jryp3c#`8!At zlc$qBO|&^RKUcNq#jJ~XH>nX4J>-v)r`HlJN=?sLYzy}H5$`8CKw^-LFu8U+;I1L! z!=#Up79%lA{y2HY)>y1I%ewPy_$(VIK0)3|l2g_!RqnF~d(CBujVx;JOsr*b^IW2k zh0TA795!g?{LKvNCGf>4;4CR)rQnyKn(##^;KbTf27VdpAM)4>&$BDwLYpSH{cxZf{1NoW@IQebr~F(e>9(if&mdaJv0C*Uyauus{xHoKzNrrU1w=j6 zm(Us@U%?2?=X9{(Ylt^c8=-|D-@;fvAF&Di9mIQx50D{}r#M|-3byvypwHK$EdmUM$hp!PtEkbAD(pu!eL!Fy5AhrF{me!|{* ztRH*;>L9#BFrwtz?tDch8wMYNjKNoofO8%@M#1BdW6+A>cHTQ&>4;*7bf(Vr;#l{0Am3_mltt diff --git a/API_SERVER/satellite/out/production/resources/application.yml b/API_SERVER/satellite/out/production/resources/application.yml new file mode 100644 index 00000000..f2dee3f8 --- /dev/null +++ b/API_SERVER/satellite/out/production/resources/application.yml @@ -0,0 +1,41 @@ +tle: + api-key: FZVfJwO7l89rRRJg67NE56mG0iat9wPEztjLkXJd + +server: +# address: localhost + address: 0.0.0.0 + port: 8080 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://14.52.137.81:3306/team_ed_user3?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC +# username: satellite +# password: Abcd123! + username: team_ed + password: team_ed!@#123 + jpa: + database: mysql + show-sql: true + hibernate: + ddl-auto: update + properties: + hibernate: + show_sql: true + format_sql: true +jwt: + issuer: cro7710@gmail.com + secret_key: satellite-project + +#app: +# datasource2: +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://localhost:3306/root?useSSL=false&serverTimezone=UTC +# username: satellite +# password: Abcd123! + +#logging: +# level: +# org: +# springframework: +# security: DEBUG \ No newline at end of file diff --git a/API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java b/API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java index e9080ecf..cb7defdc 100644 --- a/API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java +++ b/API_SERVER/satellite/src/main/java/com/example/satellite/service/TleDataService.java @@ -17,6 +17,7 @@ import java.util.Optional; import java.util.stream.Collectors; + @Service public class TleDataService { diff --git a/API_SERVER/satellite/src/main/resources/application.yml b/API_SERVER/satellite/src/main/resources/application.yml new file mode 100644 index 00000000..f2dee3f8 --- /dev/null +++ b/API_SERVER/satellite/src/main/resources/application.yml @@ -0,0 +1,41 @@ +tle: + api-key: FZVfJwO7l89rRRJg67NE56mG0iat9wPEztjLkXJd + +server: +# address: localhost + address: 0.0.0.0 + port: 8080 + +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://14.52.137.81:3306/team_ed_user3?allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=UTC +# username: satellite +# password: Abcd123! + username: team_ed + password: team_ed!@#123 + jpa: + database: mysql + show-sql: true + hibernate: + ddl-auto: update + properties: + hibernate: + show_sql: true + format_sql: true +jwt: + issuer: cro7710@gmail.com + secret_key: satellite-project + +#app: +# datasource2: +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://localhost:3306/root?useSSL=false&serverTimezone=UTC +# username: satellite +# password: Abcd123! + +#logging: +# level: +# org: +# springframework: +# security: DEBUG \ No newline at end of file