rosewiper
2023-12-13
Merge branch 'master' into campain
@4c83954db6d99b8f6ed336c6d2ccfe798499e089
--- src/main/java/itn/let/mjo/addr/web/AddrController.java
+++ src/main/java/itn/let/mjo/addr/web/AddrController.java
... | ... | @@ -1195,7 +1195,7 @@ |
| 1195 | 1195 |
String cellValue = ""; |
| 1196 | 1196 |
|
| 1197 | 1197 |
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
| 1198 |
- String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 1198 |
+ String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 1199 | 1199 |
|
| 1200 | 1200 |
int errPhoneCnt = 0; |
| 1201 | 1201 |
int errNameCnt = 0; |
... | ... | @@ -1595,7 +1595,7 @@ |
| 1595 | 1595 |
int totRowNum = 0; |
| 1596 | 1596 |
|
| 1597 | 1597 |
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
| 1598 |
- String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 1598 |
+ String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 1599 | 1599 |
|
| 1600 | 1600 |
List<HashMap<String, String>> json = new ArrayList<HashMap<String, String>>(); |
| 1601 | 1601 |
|
... | ... | @@ -1696,7 +1696,7 @@ |
| 1696 | 1696 |
modelAndView.setViewName("jsonView");
|
| 1697 | 1697 |
|
| 1698 | 1698 |
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
| 1699 |
- String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 1699 |
+ String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 1700 | 1700 |
|
| 1701 | 1701 |
String charset = "euc-kr"; |
| 1702 | 1702 |
boolean isSuccess = true; |
--- src/main/java/itn/let/mjo/block/web/AddrBlockController.java
+++ src/main/java/itn/let/mjo/block/web/AddrBlockController.java
... | ... | @@ -1,9 +1,6 @@ |
| 1 | 1 |
package itn.let.mjo.block.web; |
| 2 | 2 |
|
| 3 | 3 |
import java.io.BufferedReader; |
| 4 |
-import java.io.File; |
|
| 5 |
-import java.io.FileInputStream; |
|
| 6 |
-import java.io.FileOutputStream; |
|
| 7 | 4 |
import java.io.InputStreamReader; |
| 8 | 5 |
import java.io.OutputStream; |
| 9 | 6 |
import java.math.BigDecimal; |
... | ... | @@ -644,7 +641,7 @@ |
| 644 | 641 |
String cellValue = ""; |
| 645 | 642 |
|
| 646 | 643 |
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
| 647 |
- String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 644 |
+ String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 648 | 645 |
|
| 649 | 646 |
int errPhoneCnt = 0; |
| 650 | 647 |
|
... | ... | @@ -858,7 +855,7 @@ |
| 858 | 855 |
int errPhoneCnt = 0; |
| 859 | 856 |
|
| 860 | 857 |
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
| 861 |
- String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 858 |
+ String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 862 | 859 |
|
| 863 | 860 |
List<HashMap<String, String>> json = new ArrayList<HashMap<String, String>>(); |
| 864 | 861 |
|
--- src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
+++ src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
... | ... | @@ -3627,7 +3627,7 @@ |
| 3627 | 3627 |
String cellValue = ""; |
| 3628 | 3628 |
|
| 3629 | 3629 |
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
| 3630 |
- String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 3630 |
+ String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 3631 | 3631 |
|
| 3632 | 3632 |
int errPhoneCnt = 0; |
| 3633 | 3633 |
int errNameCnt = 0; |
... | ... | @@ -3980,7 +3980,7 @@ |
| 3980 | 3980 |
int errPhoneCnt = 0; |
| 3981 | 3981 |
|
| 3982 | 3982 |
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
| 3983 |
- String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 3983 |
+ String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 3984 | 3984 |
|
| 3985 | 3985 |
List<HashMap<String, String>> json = new ArrayList<HashMap<String, String>>(); |
| 3986 | 3986 |
|
... | ... | @@ -4145,7 +4145,7 @@ |
| 4145 | 4145 |
} |
| 4146 | 4146 |
|
| 4147 | 4147 |
//String phoneRegExp = "^01(?:0|1|[6-9])[.-]?(\\d{3}|\\d{4})[.-]?(\\d{4})$";
|
| 4148 |
- String phoneRegExp = "^(050[234567]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 4148 |
+ String phoneRegExp = "^(050[2345678]{1}|01[016789]{1})-?[0-9]{3,4}-?[0-9]{4}$";
|
|
| 4149 | 4149 |
|
| 4150 | 4150 |
List<HashMap<String, String>> json = new ArrayList<HashMap<String, String>>(); |
| 4151 | 4151 |
PhoneVO pVO = new PhoneVO(); |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?