diff --git a/backend/crmeb-admin/src/main/resources/application-miao50.yml b/backend/crmeb-admin/src/main/resources/application-miao50.yml index 5718c35..db9df57 100644 --- a/backend/crmeb-admin/src/main/resources/application-miao50.yml +++ b/backend/crmeb-admin/src/main/resources/application-miao50.yml @@ -6,6 +6,11 @@ crmeb: server: port: 30032 +# 订单同步配置(每个单商户实例需要配置不同的source-id和target-mer-id) +sync: + source-id: shop_c + target-mer-id: 5 + spring: datasource: name: yangtangyoupin diff --git a/backend/crmeb-admin/src/main/resources/application-miao80.yml b/backend/crmeb-admin/src/main/resources/application-miao80.yml index 18f6d9b..bd2111f 100644 --- a/backend/crmeb-admin/src/main/resources/application-miao80.yml +++ b/backend/crmeb-admin/src/main/resources/application-miao80.yml @@ -6,6 +6,11 @@ crmeb: server: port: 30032 +# 订单同步配置(每个单商户实例需要配置不同的source-id和target-mer-id) +sync: + source-id: shop_d + target-mer-id: 6 + spring: datasource: name: yangtangyoupin diff --git a/backend/crmeb-admin/src/main/resources/application.yml b/backend/crmeb-admin/src/main/resources/application.yml index 3378ac4..fe63e2b 100644 --- a/backend/crmeb-admin/src/main/resources/application.yml +++ b/backend/crmeb-admin/src/main/resources/application.yml @@ -38,7 +38,7 @@ server: spring: profiles: - active: miao50 + active: miao80 servlet: multipart: max-file-size: 50MB #设置单个文件大小 diff --git a/backend/deploy.conf b/backend/deploy.conf index 3c3f582..bbbf122 100644 --- a/backend/deploy.conf +++ b/backend/deploy.conf @@ -1,17 +1,22 @@ by80: + spring: + profiles: + active: miao80 + SERVER_HOST=123.56.214.80 SERVER_USER=root SERVER_PORT=22 -REMOTE_DIR=/www/crmeb -LOCAL_PORT=20822 -JAR_NAME=sophia-front-2.2.jar +REMOTE_DIR=/www/wwwroot/crmeb +FRONT_LOCAL_PORT=30031 +FRONT_JAR_NAME=miao-front-2.2.jar +ADMIN_LOCAL_PORT=30032 +ADMIN_JAR_NAME=miao-admin-2.2.jar miao50: - -spring: - profiles: - active: miao50 + spring: + profiles: + active: miao50 SERVER_HOST=101.37.253.50 SERVER_USER=root diff --git a/frontend/.env.development b/frontend/.env.development index ce9e95e..d63fbf8 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -3,10 +3,10 @@ ENV = 'development' # base api # VUE_APP_BASE_API = '/dev-api' -# VUE_APP_BASE_API = 'http://127.0.0.1:30032' + VUE_APP_BASE_API = 'http://127.0.0.1:30032' # VUE_APP_BASE_API = 'https://jfadmin.suzhouyuqi.com' # VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com' - VUE_APP_BASE_API = 'http://jfadmin.wenjinhui.com' +# VUE_APP_BASE_API = 'http://jfadmin.wenjinhui.com' # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable, # to control whether the babel-plugin-dynamic-import-node plugin is enabled. diff --git a/frontend/deploy.conf b/frontend/deploy.conf new file mode 100644 index 0000000..76bf113 --- /dev/null +++ b/frontend/deploy.conf @@ -0,0 +1,29 @@ +by80: + spring: + profiles: + active: miao80 + +SERVER_HOST=123.56.214.80 +SERVER_USER=root +SERVER_PORT=22 +REMOTE_DIR_JAR=/www/wwwroot/crmeb +REMOTE_DIR_ADMIN=/www/wwwroot/jfadmin.bosenyuan.com +FRONT_LOCAL_PORT=30031 +FRONT_JAR_NAME=miao-front-2.2.jar +ADMIN_LOCAL_PORT=30032 +ADMIN_JAR_NAME=miao-admin-2.2.jar + + +miao50: + spring: + profiles: + active: miao50 + +SERVER_HOST=101.37.253.50 +SERVER_USER=root +SERVER_PORT=22 +REMOTE_DIR=/www/wwwroot/crmeb +FRONT_LOCAL_PORT=30031 +FRONT_JAR_NAME=miao-front-2.2.jar +ADMIN_LOCAL_PORT=30032 +ADMIN_JAR_NAME=miao-admin-2.2.jar