update 更新前端常见方法

admin-ui/src/utils/dynamicTitle.js

@@ -1,6 +1,5 @@
-import {store} from '@/store'
+import { useSettingsStore } from '@/store'
 import defaultSettings from '@/settings'
-import useSettingsStore from '@/store/modules/settings'
 
 /**
  * 动态修改标题
@@ -13,3 +12,7 @@ export function useDynamicTitle() {
     document.title = defaultSettings.title;
   }
 }
+
+export function setDynamicTitle(title) {
+  useSettingsStore().title = title
+}

admin-ui/src/utils/index.js

@@ -1,12 +1,32 @@
 import { parseTime } from './ruoyi'
 import prototypes from "./modules/prototypes"
-import timerEvent from "./modules/timerEvent";
+import timer from "./modules/timer"
+import Base64 from './modules/base64'
 export const util = {
   install(Vue) {
     prototypes();
     timerEvent();
   }
 }
+export { timerBind, timerUnBind } from "./modules/timer"
+
+const base64 = new Base64()
+
+export { base64, Base64 }
+
+export { getToken, setToken, removeToken } from './auth'
+
+export { useDict } from './dict'
+
+export { useDynamicTitle, setDynamicTitle } from './dynamicTitle'
+
+export { encrypt, decrypt } from './jsencrypt'
+
+export { checkPermi, checkRole } from './permission'
+
+import request from './request'
+
+export { request }
 
 /**
  * 表格时间格式化

admin-ui/src/utils/modules/base64.js

@@ -0,0 +1,117 @@
+//1.加密解密方法使用：
+ 
+//1.加密
+// var str = '124中文内容';
+// var base = new Base64();
+// var result = base.encode(str);
+// //document.write(result);
+ 
+// //2.解密
+// var result2 = base.decode(result);
+// document.write(result2);
+// //2.加密、解密算法封装：
+ 
+function Base64() {
+ 
+  // private property
+  var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+  // public method for encoding
+  this.encode = function (input) {
+      if (!input) { console.log('请传入要加密的值'); return }
+      var output = "";
+      var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+      var i = 0;
+      input = _utf8_encode(input);
+      while (i < input.length) {
+          chr1 = input.charCodeAt(i++);
+          chr2 = input.charCodeAt(i++);
+          chr3 = input.charCodeAt(i++);
+          enc1 = chr1 >> 2;
+          enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+          enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+          enc4 = chr3 & 63;
+          if (isNaN(chr2)) {
+              enc3 = enc4 = 64;
+          } else if (isNaN(chr3)) {
+              enc4 = 64;
+          }
+          output = output +
+              _keyStr.charAt(enc1) + _keyStr.charAt(enc2) +
+              _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
+      }
+      return output;
+  }
+
+  // public method for decoding
+  this.decode = function (input) {
+      if (!input) { console.log('请传入要解密的值'); return }
+      var output = "";
+      var chr1, chr2, chr3;
+      var enc1, enc2, enc3, enc4;
+      var i = 0;
+      input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+      while (i < input.length) {
+          enc1 = _keyStr.indexOf(input.charAt(i++));
+          enc2 = _keyStr.indexOf(input.charAt(i++));
+          enc3 = _keyStr.indexOf(input.charAt(i++));
+          enc4 = _keyStr.indexOf(input.charAt(i++));
+          chr1 = (enc1 << 2) | (enc2 >> 4);
+          chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+          chr3 = ((enc3 & 3) << 6) | enc4;
+          output = output + String.fromCharCode(chr1);
+          if (enc3 != 64) {
+              output = output + String.fromCharCode(chr2);
+          }
+          if (enc4 != 64) {
+              output = output + String.fromCharCode(chr3);
+          }
+      }
+      output = _utf8_decode(output);
+      return output;
+  }
+
+  // private method for UTF-8 encoding
+  var _utf8_encode = function (string) {
+      string = string.replace(/\r\n/g, "\n");
+      var utftext = "";
+      for (var n = 0; n < string.length; n++) {
+          var c = string.charCodeAt(n);
+          if (c < 128) {
+              utftext += String.fromCharCode(c);
+          } else if ((c > 127) && (c < 2048)) {
+              utftext += String.fromCharCode((c >> 6) | 192);
+              utftext += String.fromCharCode((c & 63) | 128);
+          } else {
+              utftext += String.fromCharCode((c >> 12) | 224);
+              utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+              utftext += String.fromCharCode((c & 63) | 128);
+          }
+      }
+      return utftext;
+  }
+  // private method for UTF-8 decoding
+  var _utf8_decode = function (utftext) {
+      var string = "";
+      var i = 0;
+      let c = 0, c1 = 0, c2 = 0;
+      while (i < utftext.length) {
+          c = utftext.charCodeAt(i);
+          if (c < 128) {
+              string += String.fromCharCode(c);
+              i++;
+          } else if ((c > 191) && (c < 224)) {
+              c2 = utftext.charCodeAt(i + 1);
+              string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+              i += 2;
+          } else {
+              c2 = utftext.charCodeAt(i + 1);
+              c1 = utftext.charCodeAt(i + 2);
+              string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c1 & 63));
+              i += 3;
+          }
+      }
+      return string;
+  }
+}
+export default Base64

admin-ui/src/utils/modules/timer.js

@@ -0,0 +1,43 @@
+export default function () {
+  /**
+   * 触发周期性事件
+   */
+  let count = 0;
+  window.dispatchEvent(new CustomEvent("timer", { bubbles: false, detail: { count: count } }));
+  window.setInterval(() => {
+    count++;
+    if (count > 36000000) {
+      count = 0;
+    }
+    window.dispatchEvent(new CustomEvent("timer", { bubbles: false, detail: { count: count } }));
+  }, 1000);
+
+}
+
+
+const map = {}
+
+/**
+ * 每seconds秒执行一次fn
+ * @param {Number} seconds 
+ * @param {Function} fn 
+ */
+export const timerBind = (seconds, fn) => {
+  map[fn] = (event) => {
+    //每seconds秒执行一次
+    if (event.detail.count % seconds != 0) {
+      return
+    }
+    fn()
+  }
+  window.addEventListener("timer", map[fn])
+}
+
+/**
+ * 解除函数的绑定
+ * @param {Function} fn 
+ */
+export const timerUnBind = (fn) => {
+  window.removeEventListener("timer", map[fn])
+  delete map[fn]
+}

admin-ui/src/utils/modules/timerEvent.js

@@ -1,25 +0,0 @@
-export default function(){}
-/**
- * 触发周期性事件
- */
-let count = 0;
-window.dispatchEvent(new CustomEvent("timer", { bubbles: false, detail: { count: count } }));
-window.setInterval(() => {
-  count++;
-  if (count > 36000000) {
-    count = 0;
-  }
-  window.dispatchEvent(new CustomEvent("timer", { bubbles: false, detail: { count: count } }));
-  if(count%5==0){
-    window.dispatchEvent(new CustomEvent("timer5",{bubbles: false}));
-  }
-  if(count%10==0){
-    window.dispatchEvent(new CustomEvent("timer10",{bubbles: false}));
-  }
-  if(count%30==0){
-    window.dispatchEvent(new CustomEvent("timer30",{bubbles: false}));
-  }
-  if(count%60==0){
-    window.dispatchEvent(new CustomEvent("timer60",{bubbles: false}));
-  }
-}, 1000);

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java

@@ -362,13 +362,29 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     if (UPLOAD.equals(oss.getService())) {
       return oss;
     } else {
-      OssClient storage = OssFactory.instance(oss.getService());
+      oss.setUrl(query(oss.getService(), oss.getUrl(), second));
+      return oss;
+    }
+  }
+
+  private String query(String service, String url, int second) {
+    OssClient storage = OssFactory.instance(service);
     // 仅修改桶类型为 private 的URL，临时URL时长为120s
     if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) {
-        oss.setUrl(storage.getPrivateUrl(oss.getFileName(), second));
+      String old = url;
+      if (url.indexOf("://") > -1) {
+        url = url.substring(url.indexOf("/", url.indexOf("//") + 2));
       }
-      return oss;
+      if (url.startsWith("/")) {
+        url = url.substring(1);
       }
+      url = url.substring(url.indexOf("/") + 1);
+
+      String queryString = storage.getPrivateUrl(url, second);
+      queryString = queryString.substring(queryString.indexOf("?"));
+      return old + queryString;
+    }
+    return url;
   }
 
   @Override
@@ -376,12 +392,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
     if (Service.upload.equals(service)) {
       return url;
     } else {
-      OssClient storage = OssFactory.instance(service.name());
+      return query(service.name(), url, second);
-      // 仅修改桶类型为 private 的URL，临时URL时长为120s
-      if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) {
-        return storage.getPrivateUrl(url, second);
-      }
-      return url;
     }
   }