Commit 1177059e412006e7b7182868c933d576c5219205
1 parent
00e623a9
修改前后端环境配置，设置默认部署配置为test环境
Signed-off-by: TanYibin <5491541@qq.com>
Showing
10 changed files
with
22 additions
and
21 deletions
ant-design-vue-jeecg/.env.development
| 1 | 1 | NODE_ENV=development |
| 2 | 2 | VUE_APP_ENV=development |
| 3 | 3 | outputDir=dist |
| 4 | -VUE_APP_API_BASE_URL=http://localhost:8080/wms | |
| 5 | -VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas | |
| 4 | +VUE_APP_API_BASE_URL=http://localhost:8080/wms/api | |
| 5 | +VUE_APP_CAS_BASE_URL=http://localhost:8443/cas | |
| 6 | 6 | VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview |
| 7 | 7 | |
| 8 | 8 | # 微应用列表必须VUE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 |
| ... | ... |
ant-design-vue-jeecg/.env.production
| 1 | 1 | NODE_ENV=production |
| 2 | 2 | VUE_APP_ENV=production |
| 3 | 3 | outputDir=dist |
| 4 | -VUE_APP_API_BASE_URL=http://localhost:8080/wms | |
| 5 | -VUE_APP_CAS_BASE_URL=http://localhost:8888/cas | |
| 4 | +VUE_APP_API_BASE_URL=http://localhost:8080/wms/api | |
| 5 | +VUE_APP_CAS_BASE_URL=http://localhost:8443/cas | |
| 6 | 6 | VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview |
| 7 | 7 | \ No newline at end of file |
| ... | ... |
ant-design-vue-jeecg/.env.test
| 1 | 1 | NODE_ENV=production |
| 2 | 2 | VUE_APP_ENV=test |
| 3 | 3 | outputDir=dist |
| 4 | -VUE_APP_API_BASE_URL=http://test-api.huahengrobot.com/wms | |
| 5 | -VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas | |
| 4 | +VUE_APP_API_BASE_URL=http://172.16.29.77:8081/wms/api | |
| 5 | +VUE_APP_CAS_BASE_URL=http://localhost:8443/cas | |
| 6 | 6 | VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview |
| 7 | 7 | \ No newline at end of file |
| ... | ... |
ant-design-vue-jeecg/package.json
| ... | ... | @@ -3,10 +3,12 @@ |
| 3 | 3 | "version": "3.1.0", |
| 4 | 4 | "private": true, |
| 5 | 5 | "scripts": { |
| 6 | - "build": "vue-cli-service build", | |
| 6 | + "build_development": "vue-cli-service build --mode development", | |
| 7 | 7 | "build_test": "vue-cli-service build --mode test", |
| 8 | - "build_productiont": "vue-cli-service build --mode production", | |
| 8 | + "build_production": "vue-cli-service build --mode production", | |
| 9 | + "build": "vue-cli-service build", | |
| 9 | 10 | "serve": "vue-cli-service serve", |
| 11 | + "serve_development": "vue-cli-service serve --mode development", | |
| 10 | 12 | "serve_test": "vue-cli-service serve --mode test", |
| 11 | 13 | "serve_production": "vue-cli-service serve --mode production", |
| 12 | 14 | "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org || npm install echarts", |
| ... | ... |
ant-design-vue-jeecg/pom.xml
ant-design-vue-jeecg/src/views/dashboard/Analysis.vue
| ... | ... | @@ -140,8 +140,6 @@ export default { |
| 140 | 140 | let chart3 = this.$echarts.init(document.getElementById('chart3')) |
| 141 | 141 | let chart4 = this.$echarts.init(document.getElementById('chart4')) |
| 142 | 142 | |
| 143 | - | |
| 144 | - debugger; | |
| 145 | 143 | deliveringAmount().then((res) => { |
| 146 | 144 | if (res.success) { |
| 147 | 145 | chart1.setOption(JSON.parse(res.message)); |
| ... | ... |
huaheng-wms-core/src/main/resources/application-dev.yml
| ... | ... | @@ -7,7 +7,7 @@ server: |
| 7 | 7 | include-stacktrace: ALWAYS |
| 8 | 8 | include-message: ALWAYS |
| 9 | 9 | servlet: |
| 10 | - context-path: /wms | |
| 10 | + context-path: /wms/api | |
| 11 | 11 | compression: |
| 12 | 12 | enabled: true |
| 13 | 13 | min-response-size: 1024 |
| ... | ... | @@ -131,9 +131,9 @@ spring: |
| 131 | 131 | connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 |
| 132 | 132 | datasource: |
| 133 | 133 | master: |
| 134 | - url: jdbc:mysql://172.16.29.45:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true | |
| 134 | + url: jdbc:mysql://127.0.0.1:3306/wms4?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true | |
| 135 | 135 | username: root |
| 136 | - password: hhsoftware | |
| 136 | + password: 123456 | |
| 137 | 137 | driver-class-name: com.mysql.cj.jdbc.Driver |
| 138 | 138 | # 多数据源配置 |
| 139 | 139 | #multi-datasource1: |
| ... | ... | @@ -147,11 +147,12 @@ spring: |
| 147 | 147 | host: 127.0.0.1 |
| 148 | 148 | lettuce: |
| 149 | 149 | pool: |
| 150 | - max-active: 8 #最大连接数据库连接数,设 -1 为没有限制 | |
| 151 | - max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 | |
| 152 | - max-wait: 100ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 | |
| 153 | 150 | min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 |
| 154 | - shutdown-timeout: 100ms | |
| 151 | + max-idle: 8 #最大等待连接中的数量,设 0 为没有限制 | |
| 152 | + max-active: 10 #最大连接数据库连接数,设 -1 为没有限制 | |
| 153 | + max-wait: 5s #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 | |
| 154 | + time-between-eviction-runs: 1s #空闲对象逐出器线程的运行间隔时间.空闲连接线程释放周期时间 | |
| 155 | + shutdown-timeout: 100ms #关闭超时 | |
| 155 | 156 | password: "" |
| 156 | 157 | port: 6379 |
| 157 | 158 | #mybatis plus 设置 |
| ... | ... |
huaheng-wms-core/src/main/resources/application-prod.yml
huaheng-wms-core/src/main/resources/application-test.yml