diff --git a/pgserver/.env b/pgserver/.env index df9c54e..35f542d 100644 --- a/pgserver/.env +++ b/pgserver/.env @@ -1,29 +1,21 @@ [service] -EVALUATE_DICT_API_URL = 'http://pg.xsimon.com/AutoEvluationBackend/evaluate_dict_api/public/index.php/' -EVALUATE_DICT_API_URL = 'http://dev-pg.xsimon.com/AutoEvluationBackend/evaluate_dict_api/public/index.php/' +EVALUATE_DICT_API_URL = 'http://dev3.gzpg2006.cn/AutoEvluationBackend/evaluate_dict_api/public/index.php/' project_folder ='pgserver' estimate_short_name="国中" #文件上传地址 [uploadFile] -thum_url = 'http://pg.xsimon.com/index.php/'. DS .'public'. DS .'uploads'. DS .'thum'. DS ."date('Ymd',time())" -url = https://gzpg-pro-1386488401.cos.ap-guangzhou.myqcloud.com -host_url = http://pg.xsimon.com/ -evaluate_host_url = http://pg.xsimon.com/ -bucket = gzpg-pro-1386488401 -thum_url = 'http://dev-pg.xsimon.com/index.php/'. DS .'public'. DS .'uploads'. DS .'thum'. DS ."date('Ymd',time())" +thum_url = 'http://dev3.gzpg2006.cn/index.php/'. DS .'public'. DS .'uploads'. DS .'thum'. DS ."date('Ymd',time())" url = https://gzpg-dev-1386488401.cos.ap-guangzhou.myqcloud.com -host_url = http://dev-pg.xsimon.com/ -evaluate_host_url = http://dev-pg.xsimon.com/ +host_url = http://dev3.gzpg2006.cn/ +evaluate_host_url = http://dev3.gzpg2006.cn/ bucket = gzpg-dev-1386488401 access_key_id = AKIDvmV5kOsRsBLtLdyJhx4yf8OTKzQflgOt access_key_secret = NXWUL2XsJeo062rZKwLWTFqEg0KahdQG endpoint = 'ap-guangzhou' -qrcode_url = http://pg.xsimon.com -qrcode_url = http://dev-pg.xsimon.com +qrcode_url = http://dev3.gzpg2006.cn [cos] -bucket = gzpg-pro-1386488401 bucket = gzpg-dev-1386488401 access_key_id = AKIDvmV5kOsRsBLtLdyJhx4yf8OTKzQflgOt access_key_secret = NXWUL2XsJeo062rZKwLWTFqEg0KahdQG @@ -35,8 +27,6 @@ WORKDAY_URL = 'http://193.112.110.115:8089/what/is/today?today=' [auth] # 生产环境 auth_url = http://127.0.0.1:8951/ -#auth_url = http://127.0.0.1:8951/ -auth_url = http://192.168.122.1:8951/ [push] # 开发环境 diff --git a/pgserver/config/app.php b/pgserver/config/app.php index b889493..80cc934 100644 --- a/pgserver/config/app.php +++ b/pgserver/config/app.php @@ -156,6 +156,6 @@ return [ 'is_ftp_dirver' => 0, //开启FTP服务 'url_route_on' => true, //开启路由 - 'domain' => 'http://dev-pg.xsimon.com' + 'domain' => 'http://dev3.gzpg2006.cn' ]; diff --git a/pgserver/config/database.php b/pgserver/config/database.php index f99ae97..282981e 100644 --- a/pgserver/config/database.php +++ b/pgserver/config/database.php @@ -13,8 +13,7 @@ return [ // 数据库类型 'type' => 'mysql', // 服务器地址 -// 'hostname' => '127.0.0.1', - 'hostname' => '192.168.122.1', + 'hostname' => '127.0.0.1', // 数据库名 'database' => 'pgserver3.0_dev',// 国中 // 用户名 @@ -68,8 +67,7 @@ return [ // 数据库类型 'type' => 'mysql', // 服务器地址 -// 'hostname' => '127.0.0.1', - 'hostname' => '192.168.1.12', + 'hostname' => '127.0.0.1', // 数据库名 'database' => 'fullestate', // 用户名 diff --git a/pgweb/.env.development b/pgweb/.env.development index d6158bf..464ac5e 100644 --- a/pgweb/.env.development +++ b/pgweb/.env.development @@ -1,8 +1,7 @@ NODE_ENV=development # IP端口或域名 -#VUE_APP_IP = 192.168.1.18:8955 -VUE_APP_IP = gzpg3.com:8090 +VUE_APP_IP = dev3.gzpg2006.cn # 接口地址 #VUE_APP_API_URL = http://${VUE_APP_IP}/php/ diff --git a/pgweb/.env.migrate b/pgweb/.env.migrate deleted file mode 100644 index f34d79e..0000000 --- a/pgweb/.env.migrate +++ /dev/null @@ -1,14 +0,0 @@ -# 指定构建模式 -NODE_ENV=production - -# 接口地址 -VUE_APP_API_URL = http://1.13.246.65:8011/public/index.php #http://120.78.206.39:7001/public/index.php/ - -# 部署应用包时的基本 URL -VUE_APP_PUBLIC_PATH = / - -# FTP 下载基础URL 9910 生产， 9911测试 -FTP_DOWNLOAD_BASE_URL = http://113.98.62.215:9910/download -# FTP_DOWNLOAD_BASE_URL = http://113.98.62.215:9911/download -#websocket地址 -VUE_APP_SOCKET_URL = http://1.13.246.65:2120 #http://120.78.206.39:2120 diff --git a/pgweb/.env.production b/pgweb/.env.production index 8230211..8798f36 100644 --- a/pgweb/.env.production +++ b/pgweb/.env.production @@ -1,7 +1,7 @@ NODE_ENV=production # IP端口或域名 -VUE_APP_IP = dev3.gzpg2006.cn +VUE_APP_IP = sys.gzpg2006.cn # 接口地址 VUE_APP_API_URL = http://${VUE_APP_IP}/php/ diff --git a/pgweb/.env.test b/pgweb/.env.test deleted file mode 100644 index 5c12b6b..0000000 --- a/pgweb/.env.test +++ /dev/null @@ -1,16 +0,0 @@ -# 指定构建模式 -NODE_ENV=production - -# 接口地址 -//VUE_APP_API_URL = http://test.cspg-api.ecspg.com/cspg2.4/public/index.php/ - - -# 部署应用包时的基本 URL -VUE_APP_PUBLIC_PATH = /dev_c1.1.0.5/dist/ - -# FTP 下载基础URL 9910 生产， 9911测试 -FTP_DOWNLOAD_BASE_URL = http://113.98.62.215:9910/download -# FTP_DOWNLOAD_BASE_URL = http://113.98.62.215:9911/download - -#websocket地址 -//VUE_APP_SOCKET_URL = http://47.115.14.163:2120 \ No newline at end of file diff --git a/pgweb/.env.uat b/pgweb/.env.uat deleted file mode 100644 index b2acf5d..0000000 --- a/pgweb/.env.uat +++ /dev/null @@ -1,17 +0,0 @@ -# 指定构建模式 -NODE_ENV=production - -# 接口地址 -VUE_APP_API_URL = http://uat.cspg-api.ecspg.com/cspg2.4/public/index.php/ - - -# 部署应用包时的基本 URL -VUE_APP_PUBLIC_PATH = /dev_c1.1.0.5/ - -# FTP 下载基础URL 9910 生产， 9911测试 -FTP_DOWNLOAD_BASE_URL = http://113.98.62.215:9910/download -# FTP_DOWNLOAD_BASE_URL = http://113.98.62.215:9911/download - -#websocket地址 -#VUE_APP_SOCKET_URL = http://120.78.206.39:2120 -VUE_APP_SOCKET_URL = http://47.115.14.163:2120 diff --git a/pgweb/note.txt b/pgweb/note.txt deleted file mode 100644 index e69de29..0000000