Index: reference/gebo_admin_1.8.1/js/jquery-migrate.min.js =================================================================== diff -u -re609903dbf7dfa08b49dfc31b73afa4be50ba6eb -r3c0d6124df28d12eaf8127e87b576744ff07bedf --- reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision e609903dbf7dfa08b49dfc31b73afa4be50ba6eb) +++ reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision 3c0d6124df28d12eaf8127e87b576744ff07bedf) @@ -7,7 +7,7 @@ connect: { server: { options: { - port: 9999, + port: 80, hostname: '0.0.0.0', middleware: function (connect, options, defaultMiddleware) { @@ -26,29 +26,29 @@ ].concat(defaultMiddleware); } }, - proxies: [ + //proxies: [ // 로컬 개발 및 테스트용 - { - context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout', '/login', '/oauth2', '/arms-check', - '/swagger-ui.html', '/swagger-ui', '/webjars', '/swagger-resources', '/v2'], - host: '127.0.0.1', - port: 13131, - https: false, - changeOrigin: true - } - ] - - // proxies: [ - // // 외부에서 개발 // { // context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout', '/login', '/oauth2', '/arms-check', // '/swagger-ui.html', '/swagger-ui', '/webjars', '/swagger-resources', '/v2'], - // host: 'www.313.co.kr', - // port: 80, + // host: '127.0.0.1', + // port: 13131, // https: false, // changeOrigin: true // } // ] + + proxies: [ + // 외부에서 개발 + { + context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout', '/login', '/oauth2', '/arms-check', + '/swagger-ui.html', '/swagger-ui', '/webjars', '/swagger-resources', '/v2'], + host: 'www.313.co.kr', + port: 80, + https: false, + changeOrigin: true + } + ] }, }, watch: { Index: plugins/datatables/extensions/ColReorder/images/insert.png =================================================================== diff -u -r5fcbf822f8ae036449179a3213c57d2ef741ca84 -r3c0d6124df28d12eaf8127e87b576744ff07bedf --- plugins/datatables/extensions/ColReorder/images/insert.png (.../insert.png) (revision 5fcbf822f8ae036449179a3213c57d2ef741ca84) +++ plugins/datatables/extensions/ColReorder/images/insert.png (.../insert.png) (revision 3c0d6124df28d12eaf8127e87b576744ff07bedf) @@ -89,7 +89,8 @@ console.log("a-rms"); window.location.replace("http://www.a-rms.net:9999/arms"); } else { - alert("who are you?"); + alert("개발에 참여해 주셔서 감사합니다."); + window.location.replace("./arms"); } }; //]]>