Skip to content

Commit 0fe6df6

Browse files
github-actions[bot]github-actions[bot]
committed
chore: resolve conflict
2 parents 5a943df + de4d9bc commit 0fe6df6

65 files changed

Lines changed: 10416 additions & 5496 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎db/TDesign.db‎

0 Bytes
Binary file not shown.

‎packages/frontend/_site/assets/index.6a3db75c.js‎

Lines changed: 0 additions & 2178 deletions
This file was deleted.

‎packages/frontend/_site/assets/index.8bca0f80.js‎

Lines changed: 2234 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/frontend/_site/assets/index.b0382545.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/frontend/_site/assets/index.b17e133c.js‎

Lines changed: 135 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/frontend/_site/assets/index.b38432fd.js‎

Lines changed: 0 additions & 135 deletions
This file was deleted.

‎packages/frontend/_site/assets/index.c1e17ccf.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/frontend/_site/assets/preview.b9cb1670.js renamed to packages/frontend/_site/assets/preview.0ab53baa.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/frontend/_site/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
}
1616
</style>
1717
<![endif]-->
18-
<script type="module" crossorigin src="/assets/index.6a3db75c.js"></script>
19-
<link rel="stylesheet" href="/assets/index.c1e17ccf.css">
18+
<script type="module" crossorigin src="/assets/index.8bca0f80.js"></script>
19+
<link rel="stylesheet" href="/assets/index.b0382545.css">
2020
</head>
2121

2222
<body>

‎packages/frontend/src/services/api-server.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
import axios from 'axios'
22

33
const cmpApiInstance = axios.create({
4-
baseURL: 'http://127.0.0.1:16001/',
4+
5+
baseURL: getBaseURL(),
56
headers: {
67
'Access-Control-Allow-Origin': '*'
78
},
89
timeout: 1000
910
})
1011

12+
function getBaseURL() {
13+
if (import.meta.env.MODE === 'development') {
14+
if (window.location.host.includes('cnb.run')) {
15+
return window.location.origin.replace('10000.cnb.run', '16001.cnb.run')
16+
}
17+
return 'http://127.0.0.1:16001/'
18+
}
19+
return '/'
20+
}
21+
1122
export { cmpApiInstance }
1223

1324
export default cmpApiInstance

0 commit comments

Comments
 (0)