Merge branch 'master' of http://122.51.230.86:3000/dianliang/oil-station
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
parent
2ee1d623d1
commit
7dfde1b3b5
@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
|
|||||||
VUE_APP_PUBLIC_PATH = '/'
|
VUE_APP_PUBLIC_PATH = '/'
|
||||||
|
|
||||||
# 后端接口地址
|
# 后端接口地址
|
||||||
VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
|
VUE_APP_SERVER_URL = 'http://192.168.31.178:8081/'
|
||||||
|
|
||||||
|
|
||||||
# http://192.168.0.121:8080/
|
# http://192.168.0.121:8080/
|
||||||
|
@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
|
|||||||
VUE_APP_PUBLIC_PATH = '/'
|
VUE_APP_PUBLIC_PATH = '/'
|
||||||
|
|
||||||
# 后端接口地址
|
# 后端接口地址
|
||||||
VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
|
VUE_APP_SERVER_URL = 'http://192.168.31.178:8081/'
|
||||||
|
|
||||||
|
|
||||||
# cp端地址
|
# cp端地址
|
||||||
|
@ -3,8 +3,8 @@ server.port=8081
|
|||||||
env.profile=dev
|
env.profile=dev
|
||||||
#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
|
#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
|
||||||
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/
|
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/
|
||||||
env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
|
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
|
||||||
#env.properties.path=D:/code/oilSystem/fuintBackend/configure/
|
env.properties.path=D:/code/oilSystem/fuintBackend/configure/
|
||||||
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
|
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
|
||||||
|
|
||||||
# \u6570\u636E\u5E93\u914D\u7F6E
|
# \u6570\u636E\u5E93\u914D\u7F6E
|
||||||
|
@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/dev-api'
|
|||||||
VUE_APP_PUBLIC_PATH = '/'
|
VUE_APP_PUBLIC_PATH = '/'
|
||||||
|
|
||||||
# 后端接口地址
|
# 后端接口地址
|
||||||
VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
|
VUE_APP_SERVER_URL = 'http://192.168.31.178:8081/'
|
||||||
|
@ -5,7 +5,7 @@ module.exports = {
|
|||||||
// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
|
// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
|
||||||
// baseUrl: 'https://oilapi.youkerr.com/oilAdmin/',
|
// baseUrl: 'https://oilapi.youkerr.com/oilAdmin/',
|
||||||
// baseUrl: 'https://8q4f124343.yicp.fun/',
|
// baseUrl: 'https://8q4f124343.yicp.fun/',
|
||||||
baseUrl: 'http://192.168.31.96:8080/',
|
baseUrl: 'http://192.168.31.178:8081/',
|
||||||
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
|
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
|
||||||
imagesUrl: 'http://www.nuoyunr.com/lananRsc',
|
imagesUrl: 'http://www.nuoyunr.com/lananRsc',
|
||||||
// 应用信息
|
// 应用信息
|
||||||
|
1192
gasStation-uni/package-lock.json
generated
1192
gasStation-uni/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
3
pos-uni/package-lock.json
generated
Normal file
3
pos-uni/package-lock.json
generated
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"lockfileVersion": 1
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user