Merge branch 'master-0404' of http://120.79.101.85:8181/caifen/testMenu into master-0404

1

Merge branch 'master-0404' of http://120.79.101.85:8181/caifen/testMenu into master-0404
5881d285 · macmini · 4bb36510 · ded8f436 · 5881d285 · 4bb36510
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
    "body-parser": "^1.20.1",
    "core-js": "^3.6.5",
    "cropperjs": "^1.5.12",
-    "electron-icon-builder": "^2.0.1",
    "element-ui": "^2.15.6",
    "icns": "^0.1.0",
    "js-cookie": "^3.0.1",

--- a/public/ckeditor/ckeditor.js
+++ b/public/ckeditor/ckeditor.js
--- a/public/ckeditor/ckeditor.js.map
+++ b/public/ckeditor/ckeditor.js.map
--- a/public/ckeditor/translations/af.js
+++ b/public/ckeditor/translations/af.js
--- a/public/ckeditor/translations/ar.js
+++ b/public/ckeditor/translations/ar.js
--- a/public/ckeditor/translations/ast.js
+++ b/public/ckeditor/translations/ast.js
--- a/public/ckeditor/translations/az.js
+++ b/public/ckeditor/translations/az.js
--- a/public/ckeditor/translations/bg.js
+++ b/public/ckeditor/translations/bg.js
--- a/public/ckeditor/translations/bs.js
+++ b/public/ckeditor/translations/bs.js
--- a/public/ckeditor/translations/ca.js
+++ b/public/ckeditor/translations/ca.js
--- a/public/ckeditor/translations/cs.js
+++ b/public/ckeditor/translations/cs.js
--- a/public/ckeditor/translations/da.js
+++ b/public/ckeditor/translations/da.js
--- a/public/ckeditor/translations/de-ch.js
+++ b/public/ckeditor/translations/de-ch.js
--- a/public/ckeditor/translations/de.js
+++ b/public/ckeditor/translations/de.js
--- a/public/ckeditor/translations/el.js
+++ b/public/ckeditor/translations/el.js
--- a/public/ckeditor/translations/en-au.js
+++ b/public/ckeditor/translations/en-au.js
--- a/public/ckeditor/translations/en-gb.js
+++ b/public/ckeditor/translations/en-gb.js
--- a/public/ckeditor/translations/en.js
+++ b/public/ckeditor/translations/en.js
--- a/public/ckeditor/translations/eo.js
+++ b/public/ckeditor/translations/eo.js
--- a/public/ckeditor/translations/es.js
+++ b/public/ckeditor/translations/es.js
--- a/public/ckeditor/translations/et.js
+++ b/public/ckeditor/translations/et.js
--- a/public/ckeditor/translations/eu.js
+++ b/public/ckeditor/translations/eu.js
--- a/public/ckeditor/translations/fa.js
+++ b/public/ckeditor/translations/fa.js
--- a/public/ckeditor/translations/fi.js
+++ b/public/ckeditor/translations/fi.js
--- a/public/ckeditor/translations/fr.js
+++ b/public/ckeditor/translations/fr.js
--- a/public/ckeditor/translations/gl.js
+++ b/public/ckeditor/translations/gl.js
--- a/public/ckeditor/translations/gu.js
+++ b/public/ckeditor/translations/gu.js
--- a/public/ckeditor/translations/he.js
+++ b/public/ckeditor/translations/he.js
--- a/public/ckeditor/translations/hi.js
+++ b/public/ckeditor/translations/hi.js
--- a/public/ckeditor/translations/hr.js
+++ b/public/ckeditor/translations/hr.js
--- a/public/ckeditor/translations/hu.js
+++ b/public/ckeditor/translations/hu.js
--- a/public/ckeditor/translations/id.js
+++ b/public/ckeditor/translations/id.js
--- a/public/ckeditor/translations/it.js
+++ b/public/ckeditor/translations/it.js
--- a/public/ckeditor/translations/ja.js
+++ b/public/ckeditor/translations/ja.js
--- a/public/ckeditor/translations/jv.js
+++ b/public/ckeditor/translations/jv.js
--- a/public/ckeditor/translations/kk.js
+++ b/public/ckeditor/translations/kk.js
--- a/public/ckeditor/translations/km.js
+++ b/public/ckeditor/translations/km.js
--- a/public/ckeditor/translations/kn.js
+++ b/public/ckeditor/translations/kn.js
--- a/public/ckeditor/translations/ko.js
+++ b/public/ckeditor/translations/ko.js
--- a/public/ckeditor/translations/ku.js
+++ b/public/ckeditor/translations/ku.js
--- a/public/ckeditor/translations/lt.js
+++ b/public/ckeditor/translations/lt.js
--- a/public/ckeditor/translations/lv.js
+++ b/public/ckeditor/translations/lv.js
--- a/public/ckeditor/translations/ms.js
+++ b/public/ckeditor/translations/ms.js
--- a/public/ckeditor/translations/nb.js
+++ b/public/ckeditor/translations/nb.js
--- a/public/ckeditor/translations/ne.js
+++ b/public/ckeditor/translations/ne.js
--- a/public/ckeditor/translations/nl.js
+++ b/public/ckeditor/translations/nl.js
--- a/public/ckeditor/translations/no.js
+++ b/public/ckeditor/translations/no.js
--- a/public/ckeditor/translations/oc.js
+++ b/public/ckeditor/translations/oc.js
--- a/public/ckeditor/translations/pl.js
+++ b/public/ckeditor/translations/pl.js
--- a/public/ckeditor/translations/pt-br.js
+++ b/public/ckeditor/translations/pt-br.js
--- a/public/ckeditor/translations/pt.js
+++ b/public/ckeditor/translations/pt.js
--- a/public/ckeditor/translations/ro.js
+++ b/public/ckeditor/translations/ro.js
--- a/public/ckeditor/translations/ru.js
+++ b/public/ckeditor/translations/ru.js
--- a/public/ckeditor/translations/si.js
+++ b/public/ckeditor/translations/si.js
--- a/public/ckeditor/translations/sk.js
+++ b/public/ckeditor/translations/sk.js
--- a/public/ckeditor/translations/sl.js
+++ b/public/ckeditor/translations/sl.js
--- a/public/ckeditor/translations/sq.js
+++ b/public/ckeditor/translations/sq.js
--- a/public/ckeditor/translations/sr-latn.js
+++ b/public/ckeditor/translations/sr-latn.js
--- a/public/ckeditor/translations/sr.js
+++ b/public/ckeditor/translations/sr.js
--- a/public/ckeditor/translations/sv.js
+++ b/public/ckeditor/translations/sv.js
--- a/public/ckeditor/translations/th.js
+++ b/public/ckeditor/translations/th.js
--- a/public/ckeditor/translations/tk.js
+++ b/public/ckeditor/translations/tk.js
--- a/public/ckeditor/translations/tr.js
+++ b/public/ckeditor/translations/tr.js
--- a/public/ckeditor/translations/tt.js
+++ b/public/ckeditor/translations/tt.js
--- a/public/ckeditor/translations/ug.js
+++ b/public/ckeditor/translations/ug.js
--- a/public/ckeditor/translations/uk.js
+++ b/public/ckeditor/translations/uk.js
--- a/public/ckeditor/translations/ur.js
+++ b/public/ckeditor/translations/ur.js
--- a/public/ckeditor/translations/uz.js
+++ b/public/ckeditor/translations/uz.js
--- a/public/ckeditor/translations/vi.js
+++ b/public/ckeditor/translations/vi.js
--- a/public/ckeditor/translations/zh-cn.js
+++ b/public/ckeditor/translations/zh-cn.js
--- a/public/ckeditor/translations/zh.js
+++ b/public/ckeditor/translations/zh.js
--- a/public/index.html
+++ b/public/index.html
--- a/src/libs/utils/auth.js
+++ b/src/libs/utils/auth.js
--- a/src/libs/utils/data.js
+++ b/src/libs/utils/data.js
--- a/src/libs/utils/request.js
+++ b/src/libs/utils/request.js
--- a/src/main/events/app.js
+++ b/src/main/events/app.js
--- a/src/main/events/ipc.js
+++ b/src/main/events/ipc.js
--- a/src/main/plugins/softList.js
+++ b/src/main/plugins/softList.js
--- a/src/preload.js
+++ b/src/preload.js
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
--- a/vue.config.js
+++ b/vue.config.js
--- a/yarn.lock
+++ b/yarn.lock