From 72e1f6c02fe70475b2136facb05a09f6f3ab85f7 Mon Sep 17 00:00:00 2001
From: yangzhq68909 <993367776@qq.com>
Date: Tue, 15 Oct 2024 08:38:47 +0800
Subject: [PATCH] 1

---
 bpm/leaveApplication/index.vue             |  1 -
 unpackage/dist/dev/app-plus/app-service.js | 59 +++++++++++++++++-----
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/bpm/leaveApplication/index.vue b/bpm/leaveApplication/index.vue
index 0c0fbdc..13171c6 100644
--- a/bpm/leaveApplication/index.vue
+++ b/bpm/leaveApplication/index.vue
@@ -92,7 +92,6 @@
 						{{item.assigneeName}} | {{item.endTime}}
 					</view>
 				</view>
-
 			</view>
 		</view>
 	</view>
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index 9c1899c..5bd8591 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -61,7 +61,7 @@ if (uni.restoreGlobal) {
   const _imports_4 = "/static/login/eye-off.png";
   const _imports_5 = "/static/login/nocheck.png";
   const _imports_6 = "/static/login/checked.png";
-  let baseUrl$1 = "http://10.75.166.174:8080/jeecg-boot";
+  let baseUrl$1 = "https://36.112.48.190/jeecg-boot";
   let loading = false;
   function https(config) {
     if (loading)
@@ -130,9 +130,9 @@ if (uni.restoreGlobal) {
     });
     return promise;
   }
-  function localLoginApi(config) {
+  function loginApi(config) {
     return https({
-      url: "/sys/login",
+      url: "/sys/sinopecLogin",
       method: "post",
       data: config
     });
@@ -1779,15 +1779,21 @@ This will fail in production.`);
           return proxy.$toast("请输入账号");
         if (!password.value.trim())
           return proxy.$toast("请输入密码");
-        Base64.encode(encodeURIComponent(username.value));
-        Base64.encode(encodeURIComponent(password.value));
+        let un = Base64.encode(encodeURIComponent(username.value));
+        let pw = Base64.encode(encodeURIComponent(password.value));
         uni.showLoading({
           title: "登录中..."
         });
-        localLoginApi({
-          username: username.value,
-          password: password.value,
-          captcha: "app"
+        loginApi({
+          username: un,
+          password: pw,
+          ip: getDeviceIp()
+          /*生产环境 end */
+          /*开发环境 begin */
+          // localLoginApi({
+          // 	username: username.value,
+          // 	password: password.value,
+          // 	captcha: 'app'
           /*开发环境 end */
         }).then((loginres) => {
           if (loginres.success) {
@@ -1819,6 +1825,31 @@ This will fail in production.`);
           password.value = obj.pw ? obj.pw : "";
         }
       });
+      function getDeviceIp() {
+        let deviceIp;
+        if (plus.os.name == "Android") {
+          let Context = plus.android.importClass("android.content.Context");
+          let main = plus.android.runtimeMainActivity();
+          let cm = main.getSystemService(Context.CONNECTIVITY_SERVICE);
+          plus.android.importClass(cm);
+          let linkProperties = cm.getLinkProperties(cm.getActiveNetwork());
+          let linkAddrs = plus.android.invoke(linkProperties, "getLinkAddresses");
+          plus.android.importClass(linkAddrs);
+          for (var i2 = 0; i2 < linkAddrs.size(); i2++) {
+            let inetAddr = plus.android.invoke(linkAddrs.get(i2), "getAddress");
+            deviceIp = plus.android.invoke(inetAddr, "getHostAddress");
+          }
+          if (deviceIp == "") {
+            var wifiManager = plus.android.runtimeMainActivity().getSystemService(Context.WIFI_SERVICE);
+            var wifiInfo = plus.android.invoke(wifiManager, "getConnectionInfo");
+            var ipAddress = plus.android.invoke(wifiInfo, "getIpAddress");
+            if (ipAddress != 0) {
+              deviceIp = (ipAddress & 255) + "." + (ipAddress >> 8 & 255) + "." + (ipAddress >> 16 & 255) + "." + (ipAddress >> 24 & 255);
+            }
+          }
+        }
+        return deviceIp;
+      }
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock(
           "view",
@@ -6420,7 +6451,7 @@ This will fail in production.`);
     }
   };
   const customNav = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-420daeb5"], ["__file", "D:/projects/cxc-szcx-uniapp/bpm/customNav.vue"]]);
-  const baseurl = "http://10.75.166.174:8080/jeecg-boot/sys/common/static/";
+  const baseurl = "https://36.112.48.190/jeecg-boot/sys/common/static/";
   const toast = (title, icon, duration) => {
     uni.showToast({
       title,
@@ -6643,7 +6674,7 @@ This will fail in production.`);
       vue.useCssVars((_ctx) => ({
         "ae0729d5-cusnavbarheight": cusnavbarheight
       }));
-      const baseurl2 = "http://10.75.166.174:8080/jeecg-boot";
+      const baseurl2 = "https://36.112.48.190/jeecg-boot";
       const store = useStore();
       onShow(() => {
         cxcDaping();
@@ -15675,7 +15706,7 @@ ${i3}
       const address = vue.ref("");
       const reason = vue.ref("");
       const path = vue.ref([]);
-      const baseUrl2 = "http://10.75.166.174:8080/jeecg-boot/sys/common/upload/";
+      const baseUrl2 = "https://36.112.48.190/jeecg-boot/sys/common/upload/";
       const imageStyles = {
         width: 64,
         height: 64,
@@ -16084,7 +16115,7 @@ ${i3}
   const _sfc_main$j = {
     __name: "useredit",
     setup(__props) {
-      const baseUrl2 = "http://10.75.166.174:8080/jeecg-boot/sys/common/upload";
+      const baseUrl2 = "https://36.112.48.190/jeecg-boot/sys/common/upload";
       const store = useStore();
       const chooseAvatar = () => {
         uni.chooseImage({
@@ -18975,7 +19006,7 @@ ${i3}
   __definePage("pages/safe/detail", PagesSafeDetail);
   __definePage("pages/zhiban/index", PagesZhibanIndex);
   __definePage("pages/task/self", PagesTaskSelf);
-  const baseUrl = "http://10.75.166.174:8080/jeecg-boot/sys/common/static/";
+  const baseUrl = "https://36.112.48.190/jeecg-boot/sys/common/static/";
   const useUpdateApp = defineStore("updateApp", () => {
     const updateOptions = vue.reactive({
       force: false,