diff --git a/.gitignore b/.gitignore index 344d289..06a6031 100644 --- a/.gitignore +++ b/.gitignore @@ -38,8 +38,6 @@ __pycache__ /external/openssl /external/python -/build/config.py - # for dist folder /dist/*.zip /dist/*.tar.gz diff --git a/build/.idea/build.iml b/build/.idea/build.iml index 8182651..4462c8b 100644 --- a/build/.idea/build.iml +++ b/build/.idea/build.iml @@ -2,7 +2,7 @@ - + diff --git a/build/builder/build-external.py b/build/builder/build-external.py index 4c2a439..aecb5d5 100644 --- a/build/builder/build-external.py +++ b/build/builder/build-external.py @@ -14,10 +14,10 @@ ROOT_PATH = utils.cfg.ROOT_PATH PATH_EXTERNAL = os.path.join(ROOT_PATH, 'external') PATH_DOWNLOAD = os.path.join(PATH_EXTERNAL, '_download_') -OPENSSL_VER = utils.cfg.OPENSSL_VER -LIBUV_VER = utils.cfg.LIBUV_VER -MBEDTLS_VER = utils.cfg.MBEDTLS_VER -SQLITE_VER = utils.cfg.SQLITE_VER +OPENSSL_VER = utils.cfg.ver.openssl +LIBUV_VER = utils.cfg.ver.libuv +MBEDTLS_VER = utils.cfg.ver.mbedtls +SQLITE_VER = utils.cfg.ver.sqlite class BuilderBase: diff --git a/build/builder/build-installer.py b/build/builder/build-installer.py index a751f3c..f48816d 100644 --- a/build/builder/build-installer.py +++ b/build/builder/build-installer.py @@ -24,155 +24,30 @@ class BuilderBase: def build_installer(self): pass - def _build_web_backend(self, base_path, dist, target_path): - cc.n('make Teleport Backend package...') - src_path = os.path.join(ROOT_PATH, 'web', 'site', 'backend') - pkg_path = os.path.join(ROOT_PATH, 'web', 'packages') - tmp_path = os.path.join(base_path, '_tmp_backend_') - tmp_app_path = os.path.join(tmp_path, 'app') - - if os.path.exists(tmp_path): - utils.remove(tmp_path) - - cc.n(' - make pyo and pack to zip...') - - shutil.copytree(os.path.join(src_path, 'app'), tmp_app_path) - - comm_path = os.path.join(pkg_path, 'common') - comm_dir = os.listdir(comm_path) - - for d in comm_dir: - s = os.path.join(comm_path, d) - t = os.path.join(tmp_app_path, d) - if os.path.isdir(s): - shutil.copytree(s, t) - else: - shutil.copy(s, t) - - makepyo.make(tmp_app_path) - shutil.make_archive(os.path.join(tmp_path, 'app'), 'zip', tmp_app_path) - utils.remove(tmp_app_path) - - cc.n(' - copy packages...') - pkgs = ['packages-common', 'packages-{}'.format(dist)] - for d in pkgs: - s = os.path.join(pkg_path, d) - t = os.path.join(tmp_path, 'packages', d) - if os.path.isdir(s): - shutil.copytree(s, t) - else: - shutil.copy(s, t) - - makepyo.remove_cache(tmp_path) - - cc.n(' - copy static and view...') - miscs = ['static', 'view', 'res', 'tools'] - for d in miscs: - s = os.path.join(src_path, d) - t = os.path.join(tmp_path, d) - if os.path.isdir(s): - shutil.copytree(s, t) - else: - shutil.copy(s, t) - - # self._create_start_file(os.path.join(tmp_path, 'eom_bootstrap.py'), 'ts-backend') - - shutil.copytree(tmp_path, os.path.join(target_path, 'www', 'backend')) - utils.remove(tmp_path) - - # def _create_start_file(self, fname, name): - # f = open(fname, 'w') - # f.write('# -*- coding: utf-8 -*-\n') - # f.write('import os\n') - # f.write('import sys\n') - # f.write('p = os.path.abspath(os.path.dirname(__file__))\n') - # f.write('_p = os.path.join(p, "app.zip")\n') - # f.write('sys.path.insert(0, _p)\n') - # # f.write('_p = os.path.join(p, "{}", "app", "common.zip")\n'.format(name)) - # # f.write('sys.path.insert(0, _p)\n') - # f.write('def main():\n') - # f.write(' try:\n') - # f.write(' import eom_main\n') - # f.write(' return eom_main.main()\n') - # f.write(' except:\n') - # f.write(' print("can not start {}.")\n'.format(name)) - # f.write(' raise\n') - # f.write('if __name__ == "__main__":\n') - # f.write(' sys.exit(main())\n') - # - # f.close() - - # def _build_web_frontend(self, base_path, dist, target_path): - # cc.n('make Teleport Frontend package...') - # src_path = os.path.join(ROOT_PATH, 'web', 'site', 'frontend') - # pkg_path = os.path.join(ROOT_PATH, 'web', 'packages') - # tmp_path = os.path.join(base_path, '_tmp_frontend_') - # - # if os.path.exists(tmp_path): - # utils.remove(tmp_path) - # - # shutil.copytree(os.path.join(src_path, 'app'), os.path.join(tmp_path, 'app')) - # - # pkg_common = os.path.join(pkg_path, 'common') - # _s_path = os.listdir(pkg_common) - # for d in _s_path: - # s = os.path.join(pkg_common, d) - # t = os.path.join(tmp_path, 'app', d) - # if os.path.isdir(s): - # shutil.copytree(s, t) - # else: - # shutil.copy(s, t) - # - # cc.n(' - copy packages...') - # pkgs = ['packages-common', 'packages-{}'.format(dist)] - # for d in pkgs: - # s = os.path.join(pkg_path, d) - # t = os.path.join(tmp_path, 'packages', d) - # if os.path.isdir(s): - # shutil.copytree(s, t) - # else: - # shutil.copy(s, t) - # - # makepyo.remove_cache(tmp_path) - # - # cc.n(' - copy static and view...') - # miscs = ['static', 'view', 'res'] - # for d in miscs: - # s = os.path.join(src_path, d) - # t = os.path.join(tmp_path, d) - # if os.path.isdir(s): - # shutil.copytree(s, t) - # else: - # shutil.copy(s, t) - # - # # if not os.path.exists(os.path.join(tmp_path, 'static', 'download')): - # # utils.makedirs(os.path.join(tmp_path, 'static', 'download')) - # # utils.copy_file(os.path.join(ROOT_PATH, 'dist'), os.path.join(tmp_path, 'static', 'download'), 'teleport-assist-win.zip') - # - # shutil.copytree(tmp_path, os.path.join(target_path, 'www', 'frontend')) - # utils.remove(tmp_path) - - def _build_web(self, base_path, dist, target_path): cc.n('make Teleport Web package...') - src_path = os.path.join(ROOT_PATH, 'web', 'site', 'teleport') - pkg_path = os.path.join(ROOT_PATH, 'web', 'packages') + # src_path = os.path.join(ROOT_PATH, 'server', 'www', 'teleport') + # pkg_path = os.path.join(ROOT_PATH, 'server', 'www', 'packages') + src_path = os.path.join(ROOT_PATH, 'server', 'www') + pkg_path = os.path.join(src_path, 'packages') tmp_path = os.path.join(base_path, '_tmp_web_') if os.path.exists(tmp_path): utils.remove(tmp_path) - shutil.copytree(os.path.join(src_path, 'app'), os.path.join(tmp_path, 'app')) + # shutil.copytree(os.path.join(src_path, 'app'), os.path.join(tmp_path, 'app')) + shutil.copytree(os.path.join(src_path, 'teleport'), os.path.join(tmp_path, 'teleport')) + utils.remove(os.path.join(tmp_path, 'teleport', '.idea')) - pkg_common = os.path.join(pkg_path, 'common') - _s_path = os.listdir(pkg_common) - for d in _s_path: - s = os.path.join(pkg_common, d) - t = os.path.join(tmp_path, 'app', d) - if os.path.isdir(s): - shutil.copytree(s, t) - else: - shutil.copy(s, t) + # pkg_common = os.path.join(pkg_path, 'common') + # _s_path = os.listdir(pkg_common) + # for d in _s_path: + # s = os.path.join(pkg_common, d) + # t = os.path.join(tmp_path, 'app', d) + # if os.path.isdir(s): + # shutil.copytree(s, t) + # else: + # shutil.copy(s, t) cc.n(' - copy packages...') pkgs = ['packages-common', 'packages-{}'.format(dist)] @@ -186,21 +61,21 @@ class BuilderBase: makepyo.remove_cache(tmp_path) - cc.n(' - copy static and view...') - miscs = ['static', 'view', 'res', 'tools'] - for d in miscs: - s = os.path.join(src_path, d) - t = os.path.join(tmp_path, d) - if os.path.isdir(s): - shutil.copytree(s, t) - else: - shutil.copy(s, t) + # cc.n(' - copy static and view...') + # miscs = ['static', 'view', 'res', 'tools'] + # for d in miscs: + # s = os.path.join(src_path, d) + # t = os.path.join(tmp_path, d) + # if os.path.isdir(s): + # shutil.copytree(s, t) + # else: + # shutil.copy(s, t) # if not os.path.exists(os.path.join(tmp_path, 'static', 'download')): # utils.makedirs(os.path.join(tmp_path, 'static', 'download')) # utils.copy_file(os.path.join(ROOT_PATH, 'dist'), os.path.join(tmp_path, 'static', 'download'), 'teleport-assist-win.zip') - shutil.copytree(tmp_path, os.path.join(target_path, 'www', 'teleport')) + shutil.copytree(tmp_path, os.path.join(target_path, 'www')) utils.remove(tmp_path) @@ -287,7 +162,8 @@ class BuilderLinux(BuilderBase): # self.name = 'teleport-server-linux-{}-{}'.format(ctx.bits_path, _ver) self.name = 'teleport-server-linux-{}-{}'.format(ctx.bits_path, VER_TELEPORT_SERVER) - self.base_path = os.path.join(ROOT_PATH, 'dist', 'installer', ctx.dist, 'server') + self.dist_path = os.path.join(ROOT_PATH, 'dist', ctx.dist, 'server') + self.base_path = os.path.join(ROOT_PATH, 'out', 'installer', 'server') self.base_tmp = os.path.join(self.base_path, '_tmp_') self.tmp_path = os.path.join(self.base_tmp, self.name, 'data', 'teleport') @@ -309,27 +185,29 @@ class BuilderLinux(BuilderBase): # utils.copy_file(os.path.join(ROOT_PATH, 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'web-frontend.conf') self._build_web(self.base_path, 'linux', self.tmp_path) - utils.copy_file(os.path.join(ROOT_PATH, 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'web.conf') + utils.copy_file(os.path.join(ROOT_PATH, 'server', 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), ('web.ini.in', 'web.ini')) + utils.copy_file(os.path.join(ROOT_PATH, 'server', 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), ('core.ini.in', 'core.ini')) # out_path = os.path.join(ROOT_PATH, 'out', 'eom_ts', ctx.target_path, ctx.dist_path) # out_path = os.path.join(ROOT_PATH, 'out', 'eom_ts', ctx.bits_path, 'bin') # bin_path = os.path.join(self.tmp_path, 'bin') # utils.copy_file(out_path, bin_path, 'eom_ts') - out_path = os.path.join(ROOT_PATH, 'out', 'eom_ts', ctx.bits_path, 'bin') + out_path = os.path.join(ROOT_PATH, 'out', 'server', ctx.bits_path, 'bin') bin_path = os.path.join(self.tmp_path, 'bin') - utils.copy_ex(out_path, bin_path, 'eom_ts') + utils.copy_ex(out_path, bin_path, 'tp_web') + utils.copy_ex(out_path, bin_path, 'tp_core') + utils.copy_ex(out_path, bin_path, 'libtpssh.so') - # utils.copy_ex(out_path, bin_path, 'pysrt') - utils.copy_ex(os.path.join(ROOT_PATH, 'dist', 'pysrt'), bin_path, (ctx.dist_path, 'pysrt')) + utils.copy_ex(os.path.join(ROOT_PATH, 'out', 'pysrt'), bin_path, (ctx.dist_path, 'pysrt')) - utils.copy_file(os.path.join(ROOT_PATH, 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'eom_ts.ini') + # utils.copy_file(os.path.join(ROOT_PATH, 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'eom_ts.ini') # utils.copy_file(os.path.join(ROOT_PATH, 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'license.key') - utils.copy_file(os.path.join(ROOT_PATH, 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'ts_ssh_server.key') - utils.copy_ex(os.path.join(ROOT_PATH, 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'ssl') + utils.copy_file(os.path.join(ROOT_PATH, 'server', 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'tp_ssh_server.key') + # utils.copy_ex(os.path.join(ROOT_PATH, 'share', 'etc'), os.path.join(self.tmp_path, 'tmp', 'etc'), 'ssl') # utils.copy_ex(os.path.join(ROOT_PATH, 'share', 'data'), os.path.join(self.tmp_path, 'tmp', 'data'), ('ts_db_release.db', 'ts_db.db')) - utils.copy_ex(os.path.join(ROOT_PATH, 'share', 'data'), os.path.join(self.tmp_path, 'tmp', 'data'), 'main.sql') + utils.copy_ex(os.path.join(ROOT_PATH, 'server', 'share', 'data'), os.path.join(self.tmp_path, 'tmp', 'data'), 'main.sql') # utils.make_zip(self.tmp_path, os.path.join(self.tmp_path, '..', 'eom_ts.zip')) utils.make_targz(os.path.join(self.tmp_path, '..'), 'teleport', 'teleport.tar.gz') @@ -338,16 +216,17 @@ class BuilderLinux(BuilderBase): # make final installer. cc.n('pack final server installer...') # out_file = os.path.join(ROOT_PATH, 'dist', '{}.zip'.format(self.name)) - out_file = os.path.join(ROOT_PATH, 'dist', '{}.tar.gz'.format(self.name)) + out_file = os.path.join(ROOT_PATH, 'out', 'installer', '{}.tar.gz'.format(self.name)) if os.path.exists(out_file): utils.remove(out_file) # # copy installer scripts. for i in ['daemon', 'start.sh', 'stop.sh', 'status.sh']: - shutil.copy(os.path.join(self.base_path, 'script', i), os.path.abspath(os.path.join(self.tmp_path, '..', i))) - for i in ['install.sh']: - shutil.copy(os.path.join(self.base_path, 'script', i), os.path.abspath(os.path.join(self.tmp_path, '..', '..', i))) + # for i in ['daemon_web', 'daemon_core', 'teleport.sh']: + shutil.copy(os.path.join(self.dist_path, 'script', i), os.path.abspath(os.path.join(self.tmp_path, '..', i))) + for i in ['install.sh', 'uninst.sh']: + shutil.copy(os.path.join(self.dist_path, 'script', i), os.path.abspath(os.path.join(self.tmp_path, '..', '..', i))) # utils.make_zip(os.path.join(self.base_tmp, self.name), out_file) utils.make_targz(self.base_tmp, self.name, out_file) diff --git a/build/builder/build-pysrt.py b/build/builder/build-pysrt.py index ef187e7..2d37a0d 100644 --- a/build/builder/build-pysrt.py +++ b/build/builder/build-pysrt.py @@ -28,7 +28,7 @@ PY_LIB_REMOVE_LINUX = ['ctypes/test', 'curses', 'config-3.4m-x86_64-linux-gnu', class PYSBase: def __init__(self): - self.base_path = os.path.join(ROOT_PATH, 'out', 'pysrt')#, ctx.dist_path) + self.base_path = os.path.join(ROOT_PATH, 'out', 'pysrt', ctx.dist_path) self.py_dll_path = '' self.py_lib_path = '' diff --git a/build/builder/core/configs.py b/build/builder/core/configs.py index 69324a4..47c781b 100644 --- a/build/builder/core/configs.py +++ b/build/builder/core/configs.py @@ -83,11 +83,12 @@ class ConfigFile(AttrDict): self['ver'][k] = _tmp[k] _tmp = _cfg['toolchain'] + self['toolchain'] = AttrDict() if self.is_win: - self['nsis'] = _tmp.get('nsis', None) - self['msbuild'] = None # msbuild always read from register. + self['toolchain']['nsis'] = _tmp.get('nsis', None) + self['toolchain']['msbuild'] = None # msbuild always read from register. else: - self['cmake'] = _tmp.get('cmake', '/usr/bin/cmake') + self['toolchain']['cmake'] = _tmp.get('cmake', '/usr/bin/cmake') return True diff --git a/build/builder/core/utils.py b/build/builder/core/utils.py index 13b712c..efe8399 100644 --- a/build/builder/core/utils.py +++ b/build/builder/core/utils.py @@ -17,7 +17,7 @@ try: if not cfg.init(CONFIG_FILE): sys.exit(1) except: - cc.e('can not load configuration.\n\nplease copy `config.py.in` into `config.py` and modify it to fit your condition and try again.') + cc.e('can not load configuration.\n\nplease copy `config.ini.in` into `config.ini` and modify it to fit your condition and try again.') sys.exit(1) if cfg.is_py2: @@ -340,14 +340,16 @@ def nsis_build(nsi_file, _define=''): def cmake(work_path, target, force_rebuild, cmake_define=''): # because cmake v2.8 shipped with Ubuntu 14.04LTS, but we need 3.5. - # so we copy a v3.5 cmake from CLion and put to $WORK/eomsoft/toolchain/cmake. - # CMAKE = os.path.abspath(os.path.join(root_path(), 'toolchain', 'cmake', 'bin', 'cmake')) - if 'cmake' not in cfg: + # I copy a v3.5 cmake from CLion. + print(cfg) + if 'cmake' not in cfg.toolchain: raise RuntimeError('please set `cmake` path.') - if not os.path.exists(cfg['cmake']): - raise RuntimeError('`cmake` does not exists, please check your config.py and try again.') - CMAKE = cfg['cmake'] + print(cfg.toolchain.cmake) + if not os.path.exists(cfg.toolchain.cmake): + raise RuntimeError('`cmake` does not exists, please check your configuration and try again.') + + CMAKE = cfg.toolchain.cmake cc.n('make by cmake', target, sep=': ') old_p = os.getcwd() diff --git a/common/libex/src/ex_log.cpp b/common/libex/src/ex_log.cpp index 42ea2f3..0a8d506 100644 --- a/common/libex/src/ex_log.cpp +++ b/common/libex/src/ex_log.cpp @@ -160,7 +160,7 @@ void ExLogger::log_w(int level, const wchar_t* fmt, va_list valist) } #else vswprintf(szTmp+offset, 4095-offset, fmt, valist); - wprintf(L"%s", szTmp); + wprintf(L"%ls", szTmp); fflush(stdout); #endif diff --git a/config.ini.in b/config.ini.in index 79c7b1b..020324f 100644 --- a/config.ini.in +++ b/config.ini.in @@ -4,10 +4,10 @@ #============================================ # if not set nsis path, default to get it by register. -#nsis = "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" +#nsis = C:\Program Files (x86)\NSIS\Unicode\makensis.exe # if not set msbuild path, default to get it by register. -#msbuild = "C:\Program Files (x86)\MSBuild\14.0\bin\MSBuild.exe" +#msbuild = C:\Program Files (x86)\MSBuild\14.0\bin\MSBuild.exe # ============================================ @@ -15,11 +15,11 @@ # ============================================ # if not set cmake path, default to '/usr/bin/cmake' -cmake = "/opt/cmake/bin/cmake" +cmake = /opt/cmake/bin/cmake [external_ver] -# openssl = 1.0.2h +openssl = 1.0.2h libuv = 1.9.1 mbedtls = 2.3.0 sqlite = 3160200 diff --git a/dist/linux/server/script/daemon b/dist/linux/server/script/daemon index 96a9b67..560fba2 100644 --- a/dist/linux/server/script/daemon +++ b/dist/linux/server/script/daemon @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash ### BEGIN INIT INFO -# Provides: eomsoft -# Required-Start: $local_fs $remote_fs $network $syslog -# Required-Stop: $local_fs $remote_fs $network $syslog +# Provides: teleport +# Required-Start: $local_fs $network $syslog +# Required-Stop: $local_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: starts the teleport daemon diff --git a/dist/linux/server/script/install.sh b/dist/linux/server/script/install.sh index f6421ea..b514937 100755 --- a/dist/linux/server/script/install.sh +++ b/dist/linux/server/script/install.sh @@ -17,24 +17,28 @@ PATH_TARGET=/usr/local/eom if [ ! -d "${PATH_TARGET}" ]; then mkdir -p "${PATH_TARGET}" -else - if [ -f /etc/init.d/eom_ts ]; then - service eom_ts stop - rm -rf /etc/init.d/eom_ts - fi - if [ -f /etc/rc2.d/S50eom_ts ]; then - rm -rf /etc/rc2.d/S50eom_ts - fi - - if [ -f /etc/init.d/teleport ]; then - service teleport stop - rm -rf /etc/init.d/teleport - fi - if [ -f /etc/rc2.d/S50teleport ]; then - rm -rf /etc/rc2.d/S50teleport - fi fi +if [ -f /etc/init.d/eom_ts ]; then + service eom_ts stop + rm -rf /etc/init.d/eom_ts +fi +rm -rf /etc/rc2.d/S50eom_ts +rm -rf /etc/rc3.d/S50eom_ts +rm -rf /etc/rc4.d/S50eom_ts +rm -rf /etc/rc5.d/S50eom_ts + + +if [ -f /etc/init.d/teleport ]; then + service teleport stop + rm -rf /etc/init.d/teleport +fi +rm -rf /etc/rc2.d/S50teleport +rm -rf /etc/rc3.d/S50teleport +rm -rf /etc/rc4.d/S50teleport +rm -rf /etc/rc5.d/S50teleport + +sleep 1 echo "" echo "Installing EOM Teleport Server..." @@ -72,10 +76,10 @@ chmod +x "${PATH_TARGET}/teleport/status.sh" cp "${PATH_ROOT}/data/daemon" /etc/init.d/teleport chmod +x /etc/init.d/teleport -if [ -f /etc/rc2.d/S50teleport ]; then - rm -rf /etc/rc2.d/S50teleport -fi ln -s /etc/init.d/teleport /etc/rc2.d/S50teleport +ln -s /etc/init.d/teleport /etc/rc3.d/S50teleport +ln -s /etc/init.d/teleport /etc/rc4.d/S50teleport +ln -s /etc/init.d/teleport /etc/rc5.d/S50teleport # Upgrade database... "${PATH_TARGET}/teleport/bin/tp_web" --py "${PATH_TARGET}/teleport/www/teleport/app/eom_upgrade.py" diff --git a/dist/linux/server/script/uninst.sh b/dist/linux/server/script/uninst.sh index bc76a03..61e9276 100755 --- a/dist/linux/server/script/uninst.sh +++ b/dist/linux/server/script/uninst.sh @@ -19,17 +19,20 @@ if [ -f /etc/init.d/eom_ts ]; then service eom_ts stop rm -rf /etc/init.d/eom_ts fi -if [ -f /etc/rc2.d/S50eom_ts ]; then - rm -rf /etc/rc2.d/S50eom_ts -fi +rm -rf /etc/rc2.d/S50eom_ts +rm -rf /etc/rc3.d/S50eom_ts +rm -rf /etc/rc4.d/S50eom_ts +rm -rf /etc/rc5.d/S50eom_ts + if [ -f /etc/init.d/teleport ]; then service teleport stop rm -rf /etc/init.d/teleport fi -if [ -f /etc/rc2.d/S50teleport ]; then - rm -rf /etc/rc2.d/S50teleport -fi +rm -rf /etc/rc2.d/S50teleport +rm -rf /etc/rc3.d/S50teleport +rm -rf /etc/rc4.d/S50teleport +rm -rf /etc/rc5.d/S50teleport if [ -d /usr/local/eom/teleport ]; then diff --git a/server/tp_web/src/ts_env.cpp b/server/tp_web/src/ts_env.cpp index f6db09f..e508c2f 100644 --- a/server/tp_web/src/ts_env.cpp +++ b/server/tp_web/src/ts_env.cpp @@ -88,8 +88,8 @@ bool TsEnv::init(void) EXLOG_LEVEL(log_level); } - EXLOGI("==============================\n"); - EXLOGI("[tpweb] start...\n"); +// EXLOGI("==============================\n"); +// EXLOGI("[tpweb] start...\n"); return true; } diff --git a/server/www/teleport/.idea/teleport.iml b/server/www/teleport/.idea/teleport.iml index 7de5a86..617ed06 100644 --- a/server/www/teleport/.idea/teleport.iml +++ b/server/www/teleport/.idea/teleport.iml @@ -11,11 +11,11 @@ - + -