Compare commits

..

No commits in common. 'dev' and 'main' have entirely different histories.
dev ... main

@ -1,6 +1,6 @@
NODE_PATH=src
REACT_APP_MODE=production
REACT_APP_VERSION = v0.0.1
#REACT_APP_API_URL=http://traffic.gangnam.go.kr1:8090
REACT_APP_API_URL=http://211.119.124.9:8090
#REACT_APP_API_URL=http://211.119.124.9:8090
REACT_APP_API_URL=http://localhost:8090
REACT_APP_SERVER_TIMEOUT=6000

@ -2,7 +2,6 @@
"name": "xit-opst-fo",
"version": "0.0.1",
"private": true,
"proxy": "http://localhost:8090",
"dependencies": {
"@emotion/cache": "^11.7.1",
"@emotion/react": "^11.7.1",

@ -1,53 +1,53 @@
// const URL = process.env.NODE_ENV !== 'development' ? process.env.REACT_APP_API_URL : ''
// console.log(process.env.NODE_ENV)
export const LOGIN_URL = '/api/v1/ctgy/account/login';
export const GET_CMM_CODE_LIST = '/api/v1/biz/cmm/combo';
export const GET_FILE_DOWNLOAD = '/api/v1/ctgy/file/download/';
export const LOGIN_URL = '/api/v2/ctgy/account/login';
export const GET_CMM_CODE_LIST = '/api/v2/biz/cmm/combo';
export const GET_FILE_DOWNLOAD = '/api/v2/ctgy/file/download/';
export const GET_DASHBOARD = '/api/v1/ctgy/dashboard';
export const GET_DASHBOARD = '/api/v2/ctgy/dashboard';
// 공지사항
export const GET_PUBLIC_BOARD_LIST = '/api/v1/ctgy/pboard';
export const SAVE_PUBLIC_BOARD_HIT_CNT = '/api/v1/ctgy/pboard/hit/';
export const SAVE_PUBLIC_BOARD = '/api/v1/ctgy/file/pboard';
export const REMOVE_PUBLIC_BOARD = '/api/v1/ctgy/file/pboard/';
export const GET_PUBLIC_BOARD_LIST = '/api/v2/ctgy/pboard';
export const SAVE_PUBLIC_BOARD_HIT_CNT = '/api/v2/ctgy/pboard/hit/';
export const SAVE_PUBLIC_BOARD = '/api/v2/ctgy/file/pboard';
export const REMOVE_PUBLIC_BOARD = '/api/v2/ctgy/file/pboard/';
// 게시판
export const GET_BOARD_LIST = '/api/v1/ctgy/board';
export const SAVE_BOARD_HIT_CNT = '/api/v1/ctgy/board/hit/';
export const SAVE_BOARD = '/api/v1/ctgy/board';
export const REMOVE_BOARD = '/api/v1/ctgy/board/';
export const GET_BOARD_LIST = '/api/v2/ctgy/board';
export const SAVE_BOARD_HIT_CNT = '/api/v2/ctgy/board/hit/';
export const SAVE_BOARD = '/api/v2/ctgy/board';
export const REMOVE_BOARD = '/api/v2/ctgy/board/';
// 주정차 의견 진술
export const GET_PARKING_LIST = '/api/v1/ctgy/parking';
export const GET_PARKING_JUDGE_RESULT_LIST = '/api/v1/ctgy/parking/result';
export const GET_PARKING_JUDGE_TARGET_LIST = '/api/v1/ctgy/parking/target';
export const SAVE_PARKING_JUDGE_TARGET_LIST = '/api/v1/ctgy/parking/target';
export const REMOVE_PARKING_JUDGE = '/api/v1/ctgy/parking/remove';
export const GET_PARKING_LIST = '/api/v2/ctgy/parking';
export const GET_PARKING_JUDGE_RESULT_LIST = '/api/v2/ctgy/parking/result';
export const GET_PARKING_JUDGE_TARGET_LIST = '/api/v2/ctgy/parking/target';
export const SAVE_PARKING_JUDGE_TARGET_LIST = '/api/v2/ctgy/parking/target';
export const REMOVE_PARKING_JUDGE = '/api/v2/ctgy/parking/remove';
export const GET_PARKING_JUDGE_LIST = '/api/v1/ctgy/parking/judge';
export const GET_PARKING_JUDGE_LIST = '/api/v2/ctgy/parking/judge';
// 거주자/장애인 의견 진술
export const GET_ADMIN_JUDGE_DATA_LIST = '/api/v1/ctgy/admin/data';
export const SAVE_ADMIN_JUDGE_DATA = '/api/v1/ctgy/admin/data';
export const GET_ADMIN_JUDGE_DATA = '/api/v1/ctgy/admin/data/';
export const REMOVE_ADMIN_JUDGE_DATA = '/api/v1/ctgy/admin/data/remove';
export const GET_ADMIN_JUDGE_DATA_LIST = '/api/v2/ctgy/admin/data';
export const SAVE_ADMIN_JUDGE_DATA = '/api/v2/ctgy/admin/data';
export const GET_ADMIN_JUDGE_DATA = '/api/v2/ctgy/admin/data/';
export const REMOVE_ADMIN_JUDGE_DATA = '/api/v2/ctgy/admin/data/remove';
export const GET_ADMIN_JUDGE_LIST = '/api/v1/ctgy/admin';
export const GET_ADMIN_JUDGE_RESULT_LIST = '/api/v1/ctgy/admin/result';
export const GET_ADMIN_JUDGE_LIST = '/api/v2/ctgy/admin';
export const GET_ADMIN_JUDGE_RESULT_LIST = '/api/v2/ctgy/admin/result';
export const GET_ADMIN_JUDGE_TARGET_LIST = '/api/v1/ctgy/admin/target';
export const SAVE_ADMIN_JUDGE_TARGET_LIST = '/api/v1/ctgy/admin/target';
export const REMOVE_ADMIN_JUDGE = '/api/v1/ctgy/admin/remove';
export const GET_ADMIN_JUDGE_TARGET_LIST = '/api/v2/ctgy/admin/target';
export const SAVE_ADMIN_JUDGE_TARGET_LIST = '/api/v2/ctgy/admin/target';
export const REMOVE_ADMIN_JUDGE = '/api/v2/ctgy/admin/remove';
export const SAVE_ADMIN_JUDGE_STDS = '/api/v1/ctgy/admin/judge';
export const SAVE_ADMIN_JUDGE_STDS = '/api/v2/ctgy/admin/judge';
export const GET_JUDGE_LIST = '/api/v1/ctgy/judge';
export const SAVE_JUDGE_RESULT = '/api/v1/ctgy/judge';
export const GET_JUDGE_LIST = '/api/v2/ctgy/judge';
export const SAVE_JUDGE_RESULT = '/api/v2/ctgy/judge';
export const GET_JUDGE_FILE_DOWNLOAD = '/api/v1/ctgy/cmm/download/judge';
export const GET_JUDGE_FILE_DOWNLOAD = '/api/v2/ctgy/cmm/download/judge';
// 사용자 관리
export const GET_USER_LIST = '/api/v1/ctgy/user';
export const SAVE_USER = '/api/v1/ctgy/user';
export const REMOVE_USER = '/api/v1/ctgy/user';
export const GET_USER_LIST = '/api/v2/ctgy/user';
export const SAVE_USER = '/api/v2/ctgy/user';
export const REMOVE_USER = '/api/v2/ctgy/user';

@ -62,7 +62,7 @@ export const JWTProvider = ({ children }) => {
// TODO: verifyToken ??
if (accessToken && verifyToken(accessToken)) {
setLocalStorage(ACCESS_TOKEN_NAME, accessToken);
const response = await axios.get('/api/v1/ctgy/user/info');
const response = await axios.get('/api/v2/ctgy/user/info');
console.log(response);
// TODO : 적용 필요
const { userid, email, name, accesstype } = response.data;

@ -7,8 +7,8 @@ import Swal from 'sweetalert2';
const axiosService = axios.create({
// baseURL: process.env.NODE_ENV === 'development' ? process.env.REACT_APP_API_URL : '',
// baseURL: process.env.REACT_APP_API_URL,
withCredentials: true, // 개발시만 사용 : crossdomain
baseURL: process.env.REACT_APP_API_URL,
withCredentials: process.env.NODE_ENV !== 'production', // 개발시만 사용 : crossdomain
timeout: Number(process.env.REACT_APP_SERVER_TIMEOUT),
headers: {
'Content-Type': 'application/json'

@ -61,10 +61,6 @@ const JudgeRegistReview = ({ scDatagb, menuName }) => {
];
const search = () => {
if (scSeq1.toString().length < 10 || scSeq2.toString().length < 10) {
showAlert.show('접수번호는 10자리 입니다.');
return;
}
const params = {
scDatagb, //
scTransfer,

@ -66,7 +66,12 @@ const Dashboard = () => {
headerName: '제목',
headerAlign: 'center',
field: 'inTitle',
width: 400
width: 400,
renderCell: (params) => (
<Link underline="hover" href="#">
{params.value}
</Link>
)
},
{
headerName: '첨부파일',

Loading…
Cancel
Save