diff --git a/eslint.config.js b/eslint.config.js index b695218..06fcf00 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,8 +1,10 @@ import antfu from "@antfu/eslint-config"; export default antfu({ - // Remove formatter configuration that might be causing issues - formatters: false, + formatters: { + html: false, + css: true, + }, test: false, typescript: true, react: true, diff --git a/jjb.config.js b/jjb.config.js index 274bbea..8a8c1dd 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -9,7 +9,8 @@ module.exports = { // 应用后端分支名称,部署上线需要 javaGitBranch: "", // 接口服务地址 - API_HOST: "http://192.168.20.100:30140", + API_HOST: "", + // API_HOST: "http://192.168.20.100:30140", }, production: { // 应用后端分支名称,部署上线需要 @@ -24,7 +25,7 @@ module.exports = { contextInject: { // 应用Key appKey: "", - fileUrl: "http://192.168.20.240:9787/mnt", + fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/", }, // public/index.html注入全局变量 windowInject: { diff --git a/package.json b/package.json index 1af600e..71f256b 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "^1.0.127" + "zy-react-library": "^1.2.3" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/main.js b/src/main.js index 676128f..9718d2d 100644 --- a/src/main.js +++ b/src/main.js @@ -1,10 +1,12 @@ import { setJJBCommonAntdMessage } from "@cqsjjb/jjb-common-lib"; +import { getFileUrlFromServer } from "zy-react-library/utils"; import { setup } from "@cqsjjb/jjb-dva-runtime"; import { message } from "antd"; import dayjs from "dayjs"; import "dayjs/locale/zh-cn"; import "../blessed_by_buddha"; +getFileUrlFromServer(); require("antd/dist/reset.css"); require("zy-react-library/css/common.less"); dayjs.locale("zh-cn"); @@ -12,6 +14,7 @@ setJJBCommonAntdMessage(message); const app = setup(); +window.mapBaiDuKey = "OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"; // 非底座环境运行 if (!window.__POWERED_BY_QIANKUN__) { // 云组件默认依赖