diff --git a/.env.xumu b/.env.xumu index 6c0e54d0..fa21f251 100644 --- a/.env.xumu +++ b/.env.xumu @@ -1,4 +1,5 @@ VUE_APP_SCOPE=xumu -VUE_APP_API=http://192.168.1.87:19897 +VUE_APP_API=http://192.168.1.251:19998 VUE_APP_IS_SIMPLE_SERVER=1 VUE_APP_PORT=12413 +VUE_APP_OMS_ID=2cd70a15-a3cf-4b4d-9a22-0f3b3a888b08 # oms定制方案的ID diff --git a/examples/router/axios.js b/examples/router/axios.js index a5be821d..53943126 100644 --- a/examples/router/axios.js +++ b/examples/router/axios.js @@ -11,7 +11,7 @@ instance.interceptors.request.use(config => { config.url = "/ns" + config.url } if (process.env.VUE_APP_IS_SIMPLE_SERVER == 1) { - config.url = config.url.replace(/(app|auth|admin)\//, "api/") + config.url = config.url.replace(/\/(app|auth|admin)\//, "/api/") if (['xumu'].includes(process.env.VUE_APP_SCOPE)) { config.url = config.url.replace("/api/", "/") } diff --git a/package.json b/package.json index 40d4b00c..4e716e01 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "predev": "node bin/scanApps.js", "preoms": "dotenv -e .env.oms node bin/scanApps.js", "prexumu": "dotenv -e .env.xumu node bin/scanApps.js", - "preview:xumu":"dotenv -e .env.xumu node bin/build.js&& vue-cli-service serve --mode xumu" + "view:xumu": "vue-cli-service serve --mode xumu", + "preview:xumu": "dotenv -e .env.xumu node bin/build.js" }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", diff --git a/project/xumu/AppSign/AppSign.vue b/project/xumu/AppSign/AppSign.vue new file mode 100644 index 00000000..a02478bd --- /dev/null +++ b/project/xumu/AppSign/AppSign.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/project/xumu/sign/AppSign.vue b/project/xumu/sign/AppSign.vue deleted file mode 100644 index a2121ded..00000000 --- a/project/xumu/sign/AppSign.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - diff --git a/src/utils/axios.js b/src/utils/axios.js index 83466bb4..083c5a3e 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -11,7 +11,7 @@ instance.defaults.baseURL = baseURLs[process.env.NODE_ENV] instance.interceptors.request.use(config => { config.timeout = 300000 if (extra?.isSingleService) { - config.url = config.url.replace(/(app|auth|admin)\//, "api/") + config.url = config.url.replace(/\/(app|auth|admin)\//, "/api/") } if (config.url.startsWith("/node")) { config.baseURL = "/ns" diff --git a/ui/lib/js/encryption.js b/ui/lib/js/encryption.js index 940b410c..89fecd15 100644 --- a/ui/lib/js/encryption.js +++ b/ui/lib/js/encryption.js @@ -9,8 +9,9 @@ import CryptoJs from "crypto-js"; export const $encryption = (params, c = 0) => { if (CryptoJs) { const key = "thanks,villcloud" + let password = typeof params == "object" ? params.password : params let iv = CryptoJs.enc.Latin1.parse(key) - let encrypted = CryptoJs.AES.encrypt(params.password, iv, { + let encrypted = CryptoJs.AES.encrypt(password, iv, { iv, mode: CryptoJs.mode.CBC, padding: CryptoJs.pad.ZeroPadding diff --git a/ui/lib/styles/common.scss b/ui/lib/styles/common.scss index 5f0bf81f..34f65c74 100644 --- a/ui/lib/styles/common.scss +++ b/ui/lib/styles/common.scss @@ -80,12 +80,21 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; /** 不换行文本 */ -.nowrap-text { +.nowrap-text, .t-nowrap { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +.t-center { + text-align: center; +} +.t-bold{ + font-weight: bold; +} +.t-right{ + text-align: right; +} /** 表头式样 */