dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://122.51.230.86:3000/dianliang/oil-station

Browse Source 
# 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:
DESKTOP-369JRHT\12997 2024-08-17 10:19:45 +08:00
parent 2ee1d623d1
commit 7dfde1b3b5
7 changed files with 148 additions and 1059 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/.env.development
View File

@ -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/

2
fuintAdmin_zt/.env.development
View File

@ -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端地址

4
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -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

2
fuintCashierWeb/.env.development
View File

@ -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/'

2
gasStation-uni/config.js
View File

@ -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',
// 应用信息 // 应用信息

1190
gasStation-uni/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
pos-uni/package-lock.json generated Normal file
View File

@ -0,0 +1,3 @@
{
"lockfileVersion": 1
}