refactor(app): 删除应用管理相关代码模块

- 移除App实体类及对应的AppInfo实体类 - 删除AppController控制器及其相关方法 - 清理AppMapper接口及其XML映射文件 - 删除AppParam查询参数类 - 移除AppService接口及其实现类AppServiceImpl - 删除测试代码生成器AppsGenerator类 - 清理所有与应用管理相关的代码文件，进行代码精简和重构
文件服务器
2026-04-26 01:35:12 +08:00 · 2023-06-27 14:28:06 +08:00 · 2023-06-27 12:14:33 +08:00 · 2022-11-17 23:16:26 +08:00 · 2022-11-17 11:17:05 +08:00 · 2022-02-12 23:22:10 +08:00
594 changed files with 2113 additions and 201077 deletions
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}
--- a/dynamicTheme.js
+++ b/dynamicTheme.js
@@ -1,377 +0,0 @@
-/** ele admin pro dynamic theme plugin license by http://eleadmin.com */
-/**
- * 需要修改的less变量
- */
-const variables = {
-  // Blue
-  '@blue-1': 'var(--blue-1)',
-  '@blue-2': 'var(--blue-2)',
-  '@blue-3': 'var(--blue-3)',
-  '@blue-4': 'var(--blue-4)',
-  '@blue-5': 'var(--blue-5)',
-  '@blue-6': 'var(--blue-6)',
-  '@blue-7': 'var(--blue-7)',
-  '@blue-8': 'var(--blue-8)',
-  '@blue-9': 'var(--blue-9)',
-  '@blue-10': 'var(--blue-10)',
-  // Green
-  '@green-1': 'var(--green-1)',
-  '@green-2': 'var(--green-2)',
-  '@green-3': 'var(--green-3)',
-  '@green-4': 'var(--green-4)',
-  '@green-5': 'var(--green-5)',
-  '@green-6': 'var(--green-6)',
-  '@green-7': 'var(--green-7)',
-  '@green-8': 'var(--green-8)',
-  '@green-9': 'var(--green-9)',
-  '@green-10': 'var(--green-10)',
-  // Red
-  '@red-1': 'var(--red-1)',
-  '@red-2': 'var(--red-2)',
-  '@red-3': 'var(--red-3)',
-  '@red-4': 'var(--red-4)',
-  '@red-5': 'var(--red-5)',
-  '@red-6': 'var(--red-6)',
-  '@red-7': 'var(--red-7)',
-  '@red-8': 'var(--red-8)',
-  '@red-9': 'var(--red-9)',
-  '@red-10': 'var(--red-10)',
-  // Gold
-  '@gold-1': 'var(--gold-1)',
-  '@gold-2': 'var(--gold-2)',
-  '@gold-3': 'var(--gold-3)',
-  '@gold-4': 'var(--gold-4)',
-  '@gold-5': 'var(--gold-5)',
-  '@gold-6': 'var(--gold-6)',
-  '@gold-7': 'var(--gold-7)',
-  '@gold-8': 'var(--gold-8)',
-  '@gold-9': 'var(--gold-9)',
-  '@gold-10': 'var(--gold-10)',
-  // Purple
-  '@purple-1': 'var(--purple-1)',
-  '@purple-2': 'var(--purple-2)',
-  '@purple-3': 'var(--purple-3)',
-  '@purple-4': 'var(--purple-4)',
-  '@purple-5': 'var(--purple-5)',
-  '@purple-6': 'var(--purple-6)',
-  '@purple-7': 'var(--purple-7)',
-  '@purple-8': 'var(--purple-8)',
-  '@purple-9': 'var(--purple-9)',
-  '@purple-10': 'var(--purple-10)',
-  // Cyan
-  '@cyan-1': 'var(--cyan-1)',
-  '@cyan-2': 'var(--cyan-2)',
-  '@cyan-3': 'var(--cyan-3)',
-  '@cyan-4': 'var(--cyan-4)',
-  '@cyan-5': 'var(--cyan-5)',
-  '@cyan-6': 'var(--cyan-6)',
-  '@cyan-7': 'var(--cyan-7)',
-  '@cyan-8': 'var(--cyan-8)',
-  '@cyan-9': 'var(--cyan-9)',
-  '@cyan-10': 'var(--cyan-10)',
-  // Pink
-  '@pink-1': 'var(--pink-1)',
-  '@pink-2': 'var(--pink-2)',
-  '@pink-3': 'var(--pink-3)',
-  '@pink-4': 'var(--pink-4)',
-  '@pink-5': 'var(--pink-5)',
-  '@pink-6': 'var(--pink-6)',
-  '@pink-7': 'var(--pink-7)',
-  '@pink-8': 'var(--pink-8)',
-  '@pink-9': 'var(--pink-9)',
-  '@pink-10': 'var(--pink-10)',
-  // Orange
-  '@orange-1': 'var(--orange-1)',
-  '@orange-2': 'var(--orange-2)',
-  '@orange-3': 'var(--orange-3)',
-  '@orange-4': 'var(--orange-4)',
-  '@orange-5': 'var(--orange-5)',
-  '@orange-6': 'var(--orange-6)',
-  '@orange-7': 'var(--orange-7)',
-  '@orange-8': 'var(--orange-8)',
-  '@orange-9': 'var(--orange-9)',
-  '@orange-10': 'var(--orange-10)',
-  // Colors
-  '@primary-color': 'var(--primary-color)',
-  '@info-color': 'var(--info-color)',
-  '@success-color': 'var(--success-color)',
-  '@processing-color': 'var(--processing-color)',
-  '@error-color': 'var(--error-color)',
-  '@highlight-color': 'var(--highlight-color)',
-  '@warning-color': 'var(--warning-color)',
-  // Color used by default to control hover and active backgrounds
-  '@primary-1': 'var(--primary-1)',
-  '@primary-2': 'var(--primary-2)',
-  '@primary-3': 'var(--primary-3)',
-  '@primary-4': 'var(--primary-4)',
-  '@primary-5': 'var(--primary-5)',
-  '@primary-6': 'var(--primary-6)',
-  '@primary-7': 'var(--primary-7)',
-  '@primary-8': 'var(--primary-8)',
-  '@primary-9': 'var(--primary-9)',
-  '@primary-10': 'var(--primary-10)',
-  // Background color
-  '@body-background': 'var(--body-background)',
-  '@component-background': 'var(--component-background)',
-  // Popover
-  '@popover-background': 'var(--popover-background)',
-  '@popover-customize-border-color': 'var(--popover-customize-border-color)',
-  // Text Color
-  '@text-color': 'var(--text-color)',
-  '@text-color-secondary': 'var(--text-color-secondary)',
-  '@text-color-inverse': 'var(--text-color-inverse)',
-  '@icon-color-hover': 'var(--icon-color-hover)',
-  '@heading-color': 'var(--heading-color)',
-  // The background colors for active and hover states for things like
-  '@item-hover-bg': 'var(--item-hover-bg)',
-  // LINK
-  '@link-hover-color': '@primary-5',
-  '@link-active-color': '@primary-7',
-  // Border color
-  '@border-color-base': 'var(--border-color-base)',
-  '@border-color-split': 'var(--border-color-split)',
-  '@border-color-inverse': 'var(--border-color-inverse)',
-  // Outline
-  '@background-color-light': 'var(--background-color-light)',
-  '@background-color-base': 'var(--background-color-base)',
-  // Disabled states
-  '@disabled-color': 'var(--disabled-color)',
-  '@disabled-bg': 'var(--disabled-bg)',
-  '@disabled-color-dark': 'var(--disabled-color-dark)',
-  // Shadow
-  '@shadow-color': 'var(--shadow-color)',
-  '@box-shadow-base': 'var(--box-shadow-base)',
-  '@shadow-1-up': 'var(--shadow-1-up)',
-  '@shadow-1-down': 'var(--shadow-1-down)',
-  '@shadow-1-left': 'var(--shadow-1-left)',
-  '@shadow-1-right': 'var(--shadow-1-right)',
-  '@shadow-2': 'var(--shadow-2)',
-  // Buttons
-  '@btn-shadow': 'var(--btn-shadow)',
-  '@btn-primary-shadow': 'var(--btn-primary-shadow)',
-  '@btn-text-shadow': 'var(--btn-text-shadow)',
-  '@btn-default-bg': 'var(--btn-default-bg)',
-  '@btn-danger-bg': '@error-color',
-  '@btn-danger-border': '@error-color',
-  '@btn-default-ghost-color': 'var(--btn-default-ghost-color)',
-  '@btn-default-ghost-border': 'var(--btn-default-ghost-border)',
-  '@btn-text-hover-bg': 'var(--btn-text-hover-bg)',
-  // Checkbox
-  '@checkbox-check-bg': 'var(--checkbox-check-bg)',
-  // Descriptions
-  '@descriptions-bg': 'var(--descriptions-bg)',
-  // Divider
-  '@divider-color': 'var(--divider-color)',
-  // Dropdown
-  '@dropdown-menu-submenu-disabled-bg': 'var(--dropdown-menu-submenu-disabled-bg)',
-  // Radio
-  '@radio-dot-disabled-color': 'var(--radio-dot-disabled-color)',
-  '@radio-solid-checked-color': 'var(--radio-solid-checked-color)',
-  '@radio-focused-outline': '3px solid @primary-1',  // var(--primary-fade-6)
-  // Radio buttons
-  '@radio-disabled-button-checked-bg': 'var(--radio-disabled-button-checked-bg)',
-  // Layout
-  '@layout-body-background': 'var(--layout-body-background)',
-  '@layout-header-background': 'var(--layout-header-background)',
-  '@layout-trigger-background': 'var(--layout-trigger-background)',
-  // Dropdown
-  '@dropdown-menu-bg': 'var(--dropdown-menu-bg)',
-  // Input
-  '@input-placeholder-color': 'var(--input-placeholder-color)',
-  '@input-icon-color': 'var(--input-icon-color)',
-  '@input-bg': 'var(--input-bg)',
-  '@input-number-handler-active-bg': 'var(--input-number-handler-active-bg)',
-  '@input-icon-hover-color': 'var(--input-icon-hover-color)',
-  // Mentions
-  '@mentions-dropdown-bg': 'var(--mentions-dropdown-bg)',
-  // Select
-  '@select-dropdown-bg': 'var(--select-dropdown-bg)',
-  '@select-background': 'var(--select-background)',
-  '@select-clear-background': 'var(--select-clear-background)',
-  '@select-selection-item-bg': 'var(--select-selection-item-bg)',
-  '@select-selection-item-border-color': 'var(--select-selection-item-border-color)',
-  '@select-multiple-disabled-background': 'var(--select-multiple-disabled-background)',
-  '@select-multiple-item-disabled-color': 'var(--select-multiple-item-disabled-color)',
-  '@select-multiple-item-disabled-border-color': 'var(--select-multiple-item-disabled-border-color)',
-  // Cascader
-  '@cascader-bg': 'var(--cascader-bg)',
-  '@cascader-menu-bg': 'var(--cascader-menu-bg)',
-  '@cascader-menu-border-color-split': 'var(--cascader-menu-border-color-split)',
-  // Tooltip
-  '@tooltip-bg': 'var(--tooltip-bg)',
-  // Popover
-  '@popover-bg': 'var(--popover-bg)',
-  // Modal
-  '@modal-header-bg': 'var(--modal-header-bg)',
-  '@modal-header-border-color-split': 'var(--modal-header-border-color-split)',
-  '@modal-content-bg': 'var(--modal-content-bg)',
-  '@modal-footer-border-color-split': 'var(--modal-footer-border-color-split)',
-  // Menu
-  '@menu-popup-bg': 'var(--menu-popup-bg)',
-  '@menu-dark-bg': 'var(--menu-dark-bg)',
-  '@menu-dark-submenu-bg': 'var(--menu-dark-submenu-bg)',
-  // Table
-  '@table-header-bg': 'var(--table-header-bg)',
-  '@table-header-sort-bg': 'var(--table-header-sort-bg)',
-  '@table-body-sort-bg': 'var(--table-body-sort-bg)',
-  '@table-row-hover-bg': 'var(--table-row-hover-bg)',
-  '@table-selected-row-hover-bg': '@primary-1',
-  '@table-expanded-row-bg': 'var(--table-expanded-row-bg)',
-  '@table-header-sort-active-bg': 'var(--table-header-sort-active-bg)',
-  '@table-header-filter-active-bg': 'var(--table-header-filter-active-bg)',
-  // Badge
-  '@badge-text-color': '@white',
-  // Rate
-  '@rate-star-bg': 'var(--rate-star-bg)',
-  // Card
-  '@card-actions-background': 'var(--card-actions-background)',
-  '@card-skeleton-bg': 'var(--card-skeleton-bg)',
-  '@card-shadow': 'var(--card-shadow)',
-  '@gradient-min': 'var(--gradient-min)',
-  '@gradient-max': 'var(--gradient-max)',
-  // Comment
-  '@comment-bg': 'var(--comment-bg)',
-  '@comment-author-time-color': 'var(--comment-author-time-color)',
-  '@comment-action-hover-color': 'var(--comment-action-hover-color)',
-  // BackTop
-  '@back-top-bg': 'var(--back-top-bg)',
-  '@back-top-hover-bg': 'var(--back-top-hover-bg)',
-  // Avatar
-  '@avatar-bg': 'var(--avatar-bg)',
-  // Switch
-  '@switch-bg': '@white',
-  // Pagination
-  '@pagination-item-bg': 'var(--pagination-item-bg)',
-  '@pagination-item-bg-active': 'var(--pagination-item-bg-active)',
-  '@pagination-item-link-bg': 'var(--pagination-item-link-bg)',
-  '@pagination-item-disabled-color-active': 'var(--pagination-item-disabled-color-active)',
-  '@pagination-item-disabled-bg-active': 'var(--pagination-item-disabled-bg-active)',
-  '@pagination-item-input-bg': 'var(--pagination-item-input-bg)',
-  // PageHeader
-  '@page-header-back-color': 'var(--page-header-back-color)',
-  // Slider
-  '@slider-rail-background-color': 'var(--slider-rail-background-color)',
-  '@slider-rail-background-color-hover': 'var(--slider-rail-background-color-hover)',
-  '@slider-handle-color-focus': '@primary-5',
-  '@slider-handle-color-focus-shadow': 'var(--primary-fade-20)',
-  '@slider-dot-border-color': 'var(--slider-dot-border-color)',
-  '@slider-dot-border-color-active': 'var(--slider-dot-border-color)',
-  // Skeleton
-  '@skeleton-to-color': 'var(--skeleton-to-color)',
-  // Transfer
-  '@transfer-item-hover-bg': 'var(--transfer-item-hover-bg)',
-  // Message
-  '@message-notice-content-bg': 'var(--message-notice-content-bg)',
-  // Alert
-  '@alert-success-border-color': '@green-3',
-  '@alert-success-bg-color': '@green-1',
-  '@alert-success-icon-color': '@success-color',
-  '@alert-info-border-color': '@primary-3',
-  '@alert-info-bg-color': '@primary-1',
-  '@alert-info-icon-color': '@primary-color',
-  '@alert-warning-border-color': '@gold-3',
-  '@alert-warning-bg-color': '@gold-1',
-  '@alert-warning-icon-color': '@warning-color',
-  '@alert-error-border-color': '@red-3',
-  '@alert-error-bg-color': '@red-1',
-  '@alert-error-icon-color': '@error-color',
-  // Drawer
-  '@drawer-bg': 'var(--drawer-bg)',
-  // Timeline
-  '@timeline-color': 'var(--timeline-color)',
-  '@timeline-dot-color': 'var(--timeline-dot-color)',
-  // Image
-  '@image-preview-operation-disabled-color': 'var(--image-preview-operation-disabled-color)',
-  // Steps
-  '@steps-nav-arrow-color': 'var(--steps-nav-arrow-color)',
-  '@steps-background': 'var(--steps-background)',
-  // Notification
-  '@notification-bg': 'var(--notification-bg)',
-};
-
-/**
- * 需要替换的内容
- */
-const replaces = {
-  // input/style/mixin.less
-  'fade(@color, 20%)': 'ele-fade(@color, 20%)',
-  // layout/style/index.less
-  //'tint(@layout-sider-background, 10%)': 'var(--layout-sider-background-1)',
-  // notification/style/index.less
-  'shade(@text-color-secondary, 40%)': '@text-color',
-  // popover/style/index.less
-  'box-shadow: ~\'0 0 8px @{shadow-color} \\9\';': '',
-  // radio/style/index.less
-  'fade(@radio-dot-color, 8%)': 'var(--primary-fade-8)',
-  // switch/style/index.less
-  'fade(@switch-color, 20%)': 'var(--primary-fade-20)',
-  // menu/style/index.less
-  'fade(@primary-color, 20%)': 'var(--primary-fade-20)',
-  // button/style/mixin.less
-  'fadein(@btn-text-hover-bg, 1%)': 'var(--btn-text-active-bg)'
-};
-
-/**
- * 修改less变量的预处理器
- */
-class AntdLessPreProcessor {
-  constructor(variables, replaces) {
-    this.variables = variables || {};
-    this.replaces = replaces || {};
-  }
-
-  process(src) {
-    let result = src;
-    Object.keys(this.variables).forEach((key) => {
-      result = result.replace(new RegExp(key + ':[^;]*;', 'g'), key + ': ' + this.variables[key] + ';');
-    });
-    Object.keys(this.replaces).forEach((key) => {
-      //result = result.replaceAll(key, this.replaces[key]);
-      // replaceAll以及正则如果含有符号容易报错, 使用如下实现全部替换
-      result = result.split(key).join(this.replaces[key]);
-    });
-    return result;
-  }
-}
-
-/**
- * 转换antd变量的less插件
- */
-class DynamicAntdLess {
-  constructor(opt) {
-    this.option = {
-      variables: Object.assign({}, variables, opt ? opt.variables : null),
-      replaces: Object.assign({}, replaces, opt ? opt.replaces : null),
-    };
-  }
-
-  install(less, manager, functions) {
-    // 添加预处理器
-    manager.addPreProcessor(new AntdLessPreProcessor(this.option.variables, this.option.replaces), 2000);
-
-    // 添加自定义函数, 替代fade函数以支持var()
-    const call = (name, ...args) => new less.tree.Call(name, [new less.tree.Expression(args)]);
-    functions.add('ele-fade', (node, amount) => {
-      if (node.name === 'var') {
-        const color = node.args[0].value;
-        if (color === '--primary-color' || color === '--info-color') {
-          return call('var', new less.tree.Anonymous('--primary-fade-' + amount.value));
-        }
-        if (color === '--error-color' || color === '--highlight-color') {
-          return call('var', new less.tree.Anonymous('--error-fade-' + amount.value));
-        }
-        if (color === '--warning-color') {
-          return call('var', new less.tree.Anonymous('--warning-fade-' + amount.value));
-        }
-        if (color === '--success-color') {
-          return call('var', new less.tree.Anonymous('--success-fade-' + amount.value));
-        }
-        return call('var', new less.tree.Anonymous(color + '-fade-unknown'));
-      }
-      const f = functions.get('fade');
-      return f ? f(node, amount) : node;
-    });
-  }
-}
-
-module.exports = DynamicAntdLess;
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "@/*": [
-        "src/*"
-      ]
-    }
-  },
-  "exclude": [
-    "node_modules",
-    "dist"
-  ]
-}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,59 +0,0 @@
-{
-  "name": "ele-admin-pro-template",
-  "version": "1.5.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "build:preview": "vue-cli-service build --mode preview",
-    "build:report": "vue-cli-service build --report",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@antv/l7": "^2.5.8",
-    "@antv/l7-district": "^2.3.11",
-    "@antv/l7-maps": "^2.5.8",
-    "@tinymce/tinymce-vue": "~4.0.4",
-    "ant-design-vue": "~2.2.2",
-    "axios": "~0.21.1",
-    "core-js": "~3.15.2",
-    "countup.js": "~2.0.7",
-    "cropperjs": "~1.5.12",
-    "echarts": "~5.1.2",
-    "echarts-wordcloud": "~2.0.0",
-    "exceljs": "^4.3.0",
-    "install": "^0.13.0",
-    "lodash": "^4.17.21",
-    "nprogress": "~0.2.0",
-    "tinymce": "~5.8.2",
-    "uuid-js": "^0.7.5",
-    "vue": "~3.1.5",
-    "vue-axios": "~3.2.4",
-    "vue-i18n": "~9.1.7",
-    "vue-router": "~4.0.10",
-    "vuedraggable": "~4.0.3",
-    "vuex": "~4.0.2",
-    "xgplayer-vue": "~1.1.5",
-    "xlsx": "~0.17.0"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.13",
-    "@vue/cli-plugin-eslint": "~4.5.13",
-    "@vue/cli-plugin-router": "~4.5.13",
-    "@vue/cli-plugin-vuex": "~4.5.13",
-    "@vue/cli-service": "~4.5.13",
-    "@vue/compiler-sfc": "~3.1.5",
-    "babel-eslint": "~10.1.0",
-    "compression-webpack-plugin": "~6.1.1",
-    "eslint": "~6.8.0",
-    "eslint-plugin-vue": "~7.13.0",
-    "less": "~4.1.1",
-    "less-loader": "~7.3.0",
-    "postcss": "~8.3.5"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead"
-  ]
-}
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= process.env.VUE_APP_NAME %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app">
-      <div class="ele-admin-loading"></div>
-      <style>
-        .ele-admin-loading{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%)}.ele-admin-loading:before{content:"";width:30px;height:30px;margin:0 auto;display:block;border-radius:50%;background:#1890ff;animation:loading-bounce .3s cubic-bezier(0.05,0,0.2,1) infinite alternate}.ele-admin-loading:after{content:"";width:10px;height:2px;margin:0 auto;display:block;border-radius:50%;background:#BBB;animation:loading-shadow .3s cubic-bezier(0.05,0,0.2,1) infinite alternate}@keyframes loading-bounce{from{transform:translateY(0)}to{transform:translateY(-40px)}}@keyframes loading-shadow{from{transform:scale(1,1);opacity:1}to{transform:scale(3,2);opacity:.3}}
-      </style>
-    </div>
-    <!-- built files will be auto injected -->
-  </body>
-  <script type="text/javascript" src="//api.map.baidu.com/api?v=3.0&ak=l5Bm66STm3OhEUvQosvevkE2LNewOfGR"></script>
-</html>
--- a/public/template/专项湖库数据报送表.xlsx
+++ b/public/template/专项湖库数据报送表.xlsx
--- a/public/template/五象湖水质监测报告表.xlsx
+++ b/public/template/五象湖水质监测报告表.xlsx
--- a/public/template/其它内湖水质监测报告表.xls
+++ b/public/template/其它内湖水质监测报告表.xls
--- a/public/template/农村村庄地下水饮用水.xlsx
+++ b/public/template/农村村庄地下水饮用水.xlsx
--- a/public/template/农村村庄地表水饮用水.xlsx
+++ b/public/template/农村村庄地表水饮用水.xlsx
--- a/public/template/功能区噪声-县.xlsx
+++ b/public/template/功能区噪声-县.xlsx
--- a/public/template/功能区噪声-市.xlsx
+++ b/public/template/功能区噪声-市.xlsx
--- a/public/template/区域噪声-县.xlsx
+++ b/public/template/区域噪声-县.xlsx
--- a/public/template/区域噪声-市.xlsx
+++ b/public/template/区域噪声-市.xlsx
--- a/public/template/县级地下水饮用水.xlsx
+++ b/public/template/县级地下水饮用水.xlsx
--- a/public/template/县级（在用）地表水饮用水.xlsm
+++ b/public/template/县级（在用）地表水饮用水.xlsm
--- a/public/template/县级（备用、规划）地表水饮用水.xls
+++ b/public/template/县级（备用、规划）地表水饮用水.xls
--- a/public/template/各取水点取水量情况表.xlsx
+++ b/public/template/各取水点取水量情况表.xlsx
--- a/public/template/市级（在用）地表水饮用水.xls
+++ b/public/template/市级（在用）地表水饮用水.xls
--- a/public/template/市级（备用）地表水饮用水.xlsx
+++ b/public/template/市级（备用）地表水饮用水.xlsx
--- a/public/template/水功能区-国家级水功能区数据表.xlsx
+++ b/public/template/水功能区-国家级水功能区数据表.xlsx
--- a/public/template/水功能区-自治区级水站月均值数据表.xls
+++ b/public/template/水功能区-自治区级水站月均值数据表.xls
--- a/public/template/水站-国家级水站历史数据表.xlsx
+++ b/public/template/水站-国家级水站历史数据表.xlsx
--- a/public/template/水站-自治区级水站均值数据报表.xlsx
+++ b/public/template/水站-自治区级水站均值数据报表.xlsx
--- a/public/template/江河-断面共享数据表.xls
+++ b/public/template/江河-断面共享数据表.xls
--- a/public/template/环境空气-县.xlsx
+++ b/public/template/环境空气-县.xlsx
--- a/public/template/环境空气-市.xlsx
+++ b/public/template/环境空气-市.xlsx
--- a/public/template/环境空气-站点.xlsx
+++ b/public/template/环境空气-站点.xlsx
--- a/public/template/道路交通噪声-县.xlsx
+++ b/public/template/道路交通噪声-县.xlsx
--- a/public/template/道路交通噪声-市.xlsx
+++ b/public/template/道路交通噪声-市.xlsx
--- a/public/template/酸雨-县.xlsx
+++ b/public/template/酸雨-县.xlsx
--- a/public/template/酸雨-市.xlsx
+++ b/public/template/酸雨-市.xlsx
--- a/public/tinymce/langs/zh_CN.js
+++ b/public/tinymce/langs/zh_CN.js
@@ -1,389 +0,0 @@
-tinymce.addI18n('zh_CN',{
-"Redo": "\u91cd\u505a",
-"Undo": "\u64a4\u9500",
-"Cut": "\u526a\u5207",
-"Copy": "\u590d\u5236",
-"Paste": "\u7c98\u8d34",
-"Select all": "\u5168\u9009",
-"New document": "\u65b0\u6587\u4ef6",
-"Ok": "\u786e\u5b9a",
-"Cancel": "\u53d6\u6d88",
-"Visual aids": "\u7f51\u683c\u7ebf",
-"Bold": "\u7c97\u4f53",
-"Italic": "\u659c\u4f53",
-"Underline": "\u4e0b\u5212\u7ebf",
-"Strikethrough": "\u5220\u9664\u7ebf",
-"Superscript": "\u4e0a\u6807",
-"Subscript": "\u4e0b\u6807",
-"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
-"Align left": "\u5de6\u8fb9\u5bf9\u9f50",
-"Align center": "\u4e2d\u95f4\u5bf9\u9f50",
-"Align right": "\u53f3\u8fb9\u5bf9\u9f50",
-"Justify": "\u4e24\u7aef\u5bf9\u9f50",
-"Bullet list": "\u9879\u76ee\u7b26\u53f7",
-"Numbered list": "\u7f16\u53f7\u5217\u8868",
-"Decrease indent": "\u51cf\u5c11\u7f29\u8fdb",
-"Increase indent": "\u589e\u52a0\u7f29\u8fdb",
-"Close": "\u5173\u95ed",
-"Formats": "\u683c\u5f0f",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u4f60\u7684\u6d4f\u89c8\u5668\u4e0d\u652f\u6301\u6253\u5f00\u526a\u8d34\u677f\uff0c\u8bf7\u4f7f\u7528Ctrl+X\/C\/V\u7b49\u5feb\u6377\u952e\u3002",
-"Headers": "\u6807\u9898",
-"Header 1": "\u6807\u98981",
-"Header 2": "\u6807\u98982",
-"Header 3": "\u6807\u98983",
-"Header 4": "\u6807\u98984",
-"Header 5": "\u6807\u98985",
-"Header 6": "\u6807\u98986",
-"Headings": "\u6807\u9898",
-"Heading 1": "\u6807\u98981",
-"Heading 2": "\u6807\u98982",
-"Heading 3": "\u6807\u98983",
-"Heading 4": "\u6807\u98984",
-"Heading 5": "\u6807\u98985",
-"Heading 6": "\u6807\u98986",
-"Preformatted": "\u9884\u5148\u683c\u5f0f\u5316\u7684",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u4ee3\u7801",
-"Paragraph": "\u6bb5\u843d",
-"Blockquote": "\u5f15\u6587\u533a\u5757",
-"Inline": "\u6587\u672c",
-"Blocks": "\u57fa\u5757",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u5f53\u524d\u4e3a\u7eaf\u6587\u672c\u7c98\u8d34\u6a21\u5f0f\uff0c\u518d\u6b21\u70b9\u51fb\u53ef\u4ee5\u56de\u5230\u666e\u901a\u7c98\u8d34\u6a21\u5f0f\u3002",
-"Fonts": "\u5b57\u4f53",
-"Font Sizes": "\u5b57\u53f7",
-"Class": "\u7c7b\u578b",
-"Browse for an image": "\u6d4f\u89c8\u56fe\u50cf",
-"OR": "\u6216",
-"Drop an image here": "\u62d6\u653e\u4e00\u5f20\u56fe\u50cf\u81f3\u6b64",
-"Upload": "\u4e0a\u4f20",
-"Block": "\u5757",
-"Align": "\u5bf9\u9f50",
-"Default": "\u9ed8\u8ba4",
-"Circle": "\u7a7a\u5fc3\u5706",
-"Disc": "\u5b9e\u5fc3\u5706",
-"Square": "\u65b9\u5757",
-"Lower Alpha": "\u5c0f\u5199\u82f1\u6587\u5b57\u6bcd",
-"Lower Greek": "\u5c0f\u5199\u5e0c\u814a\u5b57\u6bcd",
-"Lower Roman": "\u5c0f\u5199\u7f57\u9a6c\u5b57\u6bcd",
-"Upper Alpha": "\u5927\u5199\u82f1\u6587\u5b57\u6bcd",
-"Upper Roman": "\u5927\u5199\u7f57\u9a6c\u5b57\u6bcd",
-"Anchor...": "\u951a\u70b9...",
-"Name": "\u540d\u79f0",
-"Id": "\u6807\u8bc6\u7b26",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u6807\u8bc6\u7b26\u5e94\u8be5\u4ee5\u5b57\u6bcd\u5f00\u5934\uff0c\u540e\u8ddf\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7834\u6298\u53f7\u3001\u70b9\u3001\u5192\u53f7\u6216\u4e0b\u5212\u7ebf\u3002",
-"You have unsaved changes are you sure you want to navigate away?": "\u4f60\u8fd8\u6709\u6587\u6863\u5c1a\u672a\u4fdd\u5b58\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\uff1f",
-"Restore last draft": "\u6062\u590d\u4e0a\u6b21\u7684\u8349\u7a3f",
-"Special characters...": "\u7279\u6b8a\u5b57\u7b26...",
-"Source code": "\u6e90\u4ee3\u7801",
-"Insert\/Edit code sample": "\u63d2\u5165\/\u7f16\u8f91\u4ee3\u7801\u793a\u4f8b",
-"Language": "\u8bed\u8a00",
-"Code sample...": "\u793a\u4f8b\u4ee3\u7801...",
-"Color Picker": "\u9009\u8272\u5668",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u4ece\u5de6\u5230\u53f3",
-"Right to left": "\u4ece\u53f3\u5230\u5de6",
-"Emoticons...": "\u8868\u60c5\u7b26\u53f7...",
-"Metadata and Document Properties": "\u5143\u6570\u636e\u548c\u6587\u6863\u5c5e\u6027",
-"Title": "\u6807\u9898",
-"Keywords": "\u5173\u952e\u8bcd",
-"Description": "\u63cf\u8ff0",
-"Robots": "\u673a\u5668\u4eba",
-"Author": "\u4f5c\u8005",
-"Encoding": "\u7f16\u7801",
-"Fullscreen": "\u5168\u5c4f",
-"Action": "\u64cd\u4f5c",
-"Shortcut": "\u5feb\u6377\u952e",
-"Help": "\u5e2e\u52a9",
-"Address": "\u5730\u5740",
-"Focus to menubar": "\u79fb\u52a8\u7126\u70b9\u5230\u83dc\u5355\u680f",
-"Focus to toolbar": "\u79fb\u52a8\u7126\u70b9\u5230\u5de5\u5177\u680f",
-"Focus to element path": "\u79fb\u52a8\u7126\u70b9\u5230\u5143\u7d20\u8def\u5f84",
-"Focus to contextual toolbar": "\u79fb\u52a8\u7126\u70b9\u5230\u4e0a\u4e0b\u6587\u83dc\u5355",
-"Insert link (if link plugin activated)": "\u63d2\u5165\u94fe\u63a5 (\u5982\u679c\u94fe\u63a5\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Save (if save plugin activated)": "\u4fdd\u5b58(\u5982\u679c\u4fdd\u5b58\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Find (if searchreplace plugin activated)": "\u67e5\u627e(\u5982\u679c\u67e5\u627e\u66ff\u6362\u63d2\u4ef6\u5df2\u6fc0\u6d3b)",
-"Plugins installed ({0}):": "\u5df2\u5b89\u88c5\u63d2\u4ef6 ({0}):",
-"Premium plugins:": "\u4f18\u79c0\u63d2\u4ef6\uff1a",
-"Learn more...": "\u4e86\u89e3\u66f4\u591a...",
-"You are using {0}": "\u4f60\u6b63\u5728\u4f7f\u7528 {0}",
-"Plugins": "\u63d2\u4ef6",
-"Handy Shortcuts": "\u5feb\u6377\u952e",
-"Horizontal line": "\u6c34\u5e73\u5206\u5272\u7ebf",
-"Insert\/edit image": "\u63d2\u5165\/\u7f16\u8f91\u56fe\u7247",
-"Image description": "\u56fe\u7247\u63cf\u8ff0",
-"Source": "\u5730\u5740",
-"Dimensions": "\u5927\u5c0f",
-"Constrain proportions": "\u4fdd\u6301\u7eb5\u6a2a\u6bd4",
-"General": "\u666e\u901a",
-"Advanced": "\u9ad8\u7ea7",
-"Style": "\u6837\u5f0f",
-"Vertical space": "\u5782\u76f4\u8fb9\u8ddd",
-"Horizontal space": "\u6c34\u5e73\u8fb9\u8ddd",
-"Border": "\u8fb9\u6846",
-"Insert image": "\u63d2\u5165\u56fe\u7247",
-"Image...": "\u56fe\u7247...",
-"Image list": "\u56fe\u7247\u5217\u8868",
-"Rotate counterclockwise": "\u9006\u65f6\u9488\u65cb\u8f6c",
-"Rotate clockwise": "\u987a\u65f6\u9488\u65cb\u8f6c",
-"Flip vertically": "\u5782\u76f4\u7ffb\u8f6c",
-"Flip horizontally": "\u6c34\u5e73\u7ffb\u8f6c",
-"Edit image": "\u7f16\u8f91\u56fe\u7247",
-"Image options": "\u56fe\u7247\u9009\u9879",
-"Zoom in": "\u653e\u5927",
-"Zoom out": "\u7f29\u5c0f",
-"Crop": "\u88c1\u526a",
-"Resize": "\u8c03\u6574\u5927\u5c0f",
-"Orientation": "\u65b9\u5411",
-"Brightness": "\u4eae\u5ea6",
-"Sharpen": "\u9510\u5316",
-"Contrast": "\u5bf9\u6bd4\u5ea6",
-"Color levels": "\u989c\u8272\u5c42\u6b21",
-"Gamma": "\u4f3d\u9a6c\u503c",
-"Invert": "\u53cd\u8f6c",
-"Apply": "\u5e94\u7528",
-"Back": "\u540e\u9000",
-"Insert date\/time": "\u63d2\u5165\u65e5\u671f\/\u65f6\u95f4",
-"Date\/time": "\u65e5\u671f\/\u65f6\u95f4",
-"Insert\/Edit Link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
-"Insert\/edit link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
-"Text to display": "\u663e\u793a\u6587\u5b57",
-"Url": "\u5730\u5740",
-"Open link in...": "\u94fe\u63a5\u6253\u5f00\u4f4d\u7f6e...",
-"Current window": "\u5f53\u524d\u7a97\u53e3",
-"None": "\u65e0",
-"New window": "\u5728\u65b0\u7a97\u53e3\u6253\u5f00",
-"Remove link": "\u5220\u9664\u94fe\u63a5",
-"Anchors": "\u951a\u70b9",
-"Link...": "\u94fe\u63a5...",
-"Paste or type a link": "\u7c98\u8d34\u6216\u8f93\u5165\u94fe\u63a5",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u4e3a\u90ae\u4ef6\u5730\u5740\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7f00\u5417\uff1f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7f00\u5417\uff1f",
-"Link list": "\u94fe\u63a5\u5217\u8868",
-"Insert video": "\u63d2\u5165\u89c6\u9891",
-"Insert\/edit video": "\u63d2\u5165\/\u7f16\u8f91\u89c6\u9891",
-"Insert\/edit media": "\u63d2\u5165\/\u7f16\u8f91\u5a92\u4f53",
-"Alternative source": "\u955c\u50cf",
-"Alternative source URL": "\u66ff\u4ee3\u6765\u6e90\u7f51\u5740",
-"Media poster (Image URL)": "\u5c01\u9762(\u56fe\u7247\u5730\u5740)",
-"Paste your embed code below:": "\u5c06\u5185\u5d4c\u4ee3\u7801\u7c98\u8d34\u5728\u4e0b\u9762:",
-"Embed": "\u5185\u5d4c",
-"Media...": "\u591a\u5a92\u4f53...",
-"Nonbreaking space": "\u4e0d\u95f4\u65ad\u7a7a\u683c",
-"Page break": "\u5206\u9875\u7b26",
-"Paste as text": "\u7c98\u8d34\u4e3a\u6587\u672c",
-"Preview": "\u9884\u89c8",
-"Print...": "\u6253\u5370...",
-"Save": "\u4fdd\u5b58",
-"Find": "\u67e5\u627e",
-"Replace with": "\u66ff\u6362\u4e3a",
-"Replace": "\u66ff\u6362",
-"Replace all": "\u5168\u90e8\u66ff\u6362",
-"Previous": "\u4e0a\u4e00\u4e2a",
-"Next": "\u4e0b\u4e00\u4e2a",
-"Find and replace...": "\u67e5\u627e\u5e76\u66ff\u6362...",
-"Could not find the specified string.": "\u672a\u627e\u5230\u641c\u7d22\u5185\u5bb9.",
-"Match case": "\u533a\u5206\u5927\u5c0f\u5199",
-"Find whole words only": "\u5168\u5b57\u5339\u914d",
-"Spell check": "\u62fc\u5199\u68c0\u67e5",
-"Ignore": "\u5ffd\u7565",
-"Ignore all": "\u5168\u90e8\u5ffd\u7565",
-"Finish": "\u5b8c\u6210",
-"Add to Dictionary": "\u6dfb\u52a0\u5230\u5b57\u5178",
-"Insert table": "\u63d2\u5165\u8868\u683c",
-"Table properties": "\u8868\u683c\u5c5e\u6027",
-"Delete table": "\u5220\u9664\u8868\u683c",
-"Cell": "\u5355\u5143\u683c",
-"Row": "\u884c",
-"Column": "\u5217",
-"Cell properties": "\u5355\u5143\u683c\u5c5e\u6027",
-"Merge cells": "\u5408\u5e76\u5355\u5143\u683c",
-"Split cell": "\u62c6\u5206\u5355\u5143\u683c",
-"Insert row before": "\u5728\u4e0a\u65b9\u63d2\u5165",
-"Insert row after": "\u5728\u4e0b\u65b9\u63d2\u5165",
-"Delete row": "\u5220\u9664\u884c",
-"Row properties": "\u884c\u5c5e\u6027",
-"Cut row": "\u526a\u5207\u884c",
-"Copy row": "\u590d\u5236\u884c",
-"Paste row before": "\u7c98\u8d34\u5230\u4e0a\u65b9",
-"Paste row after": "\u7c98\u8d34\u5230\u4e0b\u65b9",
-"Insert column before": "\u5728\u5de6\u4fa7\u63d2\u5165",
-"Insert column after": "\u5728\u53f3\u4fa7\u63d2\u5165",
-"Delete column": "\u5220\u9664\u5217",
-"Cols": "\u5217",
-"Rows": "\u884c",
-"Width": "\u5bbd",
-"Height": "\u9ad8",
-"Cell spacing": "\u5355\u5143\u683c\u5916\u95f4\u8ddd",
-"Cell padding": "\u5355\u5143\u683c\u5185\u8fb9\u8ddd",
-"Show caption": "\u663e\u793a\u6807\u9898",
-"Left": "\u5de6\u5bf9\u9f50",
-"Center": "\u5c45\u4e2d",
-"Right": "\u53f3\u5bf9\u9f50",
-"Cell type": "\u5355\u5143\u683c\u7c7b\u578b",
-"Scope": "\u8303\u56f4",
-"Alignment": "\u5bf9\u9f50\u65b9\u5f0f",
-"H Align": "\u6c34\u5e73\u5bf9\u9f50",
-"V Align": "\u5782\u76f4\u5bf9\u9f50",
-"Top": "\u9876\u90e8\u5bf9\u9f50",
-"Middle": "\u5782\u76f4\u5c45\u4e2d",
-"Bottom": "\u5e95\u90e8\u5bf9\u9f50",
-"Header cell": "\u8868\u5934\u5355\u5143\u683c",
-"Row group": "\u884c\u7ec4",
-"Column group": "\u5217\u7ec4",
-"Row type": "\u884c\u7c7b\u578b",
-"Header": "\u8868\u5934",
-"Body": "\u8868\u4f53",
-"Footer": "\u8868\u5c3e",
-"Border color": "\u8fb9\u6846\u989c\u8272",
-"Insert template...": "\u63d2\u5165\u6a21\u677f...",
-"Templates": "\u6a21\u677f",
-"Template": "\u6a21\u677f",
-"Text color": "\u6587\u5b57\u989c\u8272",
-"Background color": "\u80cc\u666f\u8272",
-"Custom...": "\u81ea\u5b9a\u4e49...",
-"Custom color": "\u81ea\u5b9a\u4e49\u989c\u8272",
-"No color": "\u65e0",
-"Remove color": "\u79fb\u9664\u989c\u8272",
-"Table of Contents": "\u5185\u5bb9\u5217\u8868",
-"Show blocks": "\u663e\u793a\u533a\u5757\u8fb9\u6846",
-"Show invisible characters": "\u663e\u793a\u4e0d\u53ef\u89c1\u5b57\u7b26",
-"Word count": "\u5b57\u6570",
-"Words: {0}": "\u5b57\u6570\uff1a{0}",
-"{0} words": "{0} \u5b57",
-"File": "\u6587\u4ef6",
-"Edit": "\u7f16\u8f91",
-"Insert": "\u63d2\u5165",
-"View": "\u89c6\u56fe",
-"Format": "\u683c\u5f0f",
-"Table": "\u8868\u683c",
-"Tools": "\u5de5\u5177",
-"Powered by {0}": "\u7531{0}\u9a71\u52a8",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u5728\u7f16\u8f91\u533a\u6309ALT-F9\u6253\u5f00\u83dc\u5355\uff0c\u6309ALT-F10\u6253\u5f00\u5de5\u5177\u680f\uff0c\u6309ALT-0\u67e5\u770b\u5e2e\u52a9",
-"Image title": "\u56fe\u7247\u6807\u9898",
-"Border width": "\u8fb9\u6846\u5bbd\u5ea6",
-"Border style": "\u8fb9\u6846\u6837\u5f0f",
-"Error": "\u9519\u8bef",
-"Warn": "\u8b66\u544a",
-"Valid": "\u6709\u6548",
-"To open the popup, press Shift+Enter": "\u6309Shitf+Enter\u952e\u6253\u5f00\u5bf9\u8bdd\u6846",
-"Rich Text Area. Press ALT-0 for help.": "\u7f16\u8f91\u533a\u3002\u6309Alt+0\u952e\u6253\u5f00\u5e2e\u52a9\u3002",
-"System Font": "\u7cfb\u7edf\u5b57\u4f53",
-"Failed to upload image: {0}": "\u56fe\u7247\u4e0a\u4f20\u5931\u8d25: {0}",
-"Failed to load plugin: {0} from url {1}": "\u63d2\u4ef6\u52a0\u8f7d\u5931\u8d25: {0} \u6765\u81ea\u94fe\u63a5 {1}",
-"Failed to load plugin url: {0}": "\u63d2\u4ef6\u52a0\u8f7d\u5931\u8d25 \u94fe\u63a5: {0}",
-"Failed to initialize plugin: {0}": "\u63d2\u4ef6\u521d\u59cb\u5316\u5931\u8d25: {0}",
-"example": "\u793a\u4f8b",
-"Search": "\u641c\u7d22",
-"All": "\u5168\u90e8",
-"Currency": "\u8d27\u5e01",
-"Text": "\u6587\u5b57",
-"Quotations": "\u5f15\u7528",
-"Mathematical": "\u6570\u5b66",
-"Extended Latin": "\u62c9\u4e01\u8bed\u6269\u5145",
-"Symbols": "\u7b26\u53f7",
-"Arrows": "\u7bad\u5934",
-"User Defined": "\u81ea\u5b9a\u4e49",
-"dollar sign": "\u7f8e\u5143\u7b26\u53f7",
-"currency sign": "\u8d27\u5e01\u7b26\u53f7",
-"euro-currency sign": "\u6b27\u5143\u7b26\u53f7",
-"colon sign": "\u5192\u53f7",
-"cruzeiro sign": "\u514b\u9c81\u8d5b\u7f57\u5e01\u7b26\u53f7",
-"french franc sign": "\u6cd5\u90ce\u7b26\u53f7",
-"lira sign": "\u91cc\u62c9\u7b26\u53f7",
-"mill sign": "\u5bc6\u5c14\u7b26\u53f7",
-"naira sign": "\u5948\u62c9\u7b26\u53f7",
-"peseta sign": "\u6bd4\u585e\u5854\u7b26\u53f7",
-"rupee sign": "\u5362\u6bd4\u7b26\u53f7",
-"won sign": "\u97e9\u5143\u7b26\u53f7",
-"new sheqel sign": "\u65b0\u8c22\u514b\u5c14\u7b26\u53f7",
-"dong sign": "\u8d8a\u5357\u76fe\u7b26\u53f7",
-"kip sign": "\u8001\u631d\u57fa\u666e\u7b26\u53f7",
-"tugrik sign": "\u56fe\u683c\u91cc\u514b\u7b26\u53f7",
-"drachma sign": "\u5fb7\u62c9\u514b\u9a6c\u7b26\u53f7",
-"german penny symbol": "\u5fb7\u56fd\u4fbf\u58eb\u7b26\u53f7",
-"peso sign": "\u6bd4\u7d22\u7b26\u53f7",
-"guarani sign": "\u74dc\u62c9\u5c3c\u7b26\u53f7",
-"austral sign": "\u6fb3\u5143\u7b26\u53f7",
-"hryvnia sign": "\u683c\u91cc\u592b\u5c3c\u4e9a\u7b26\u53f7",
-"cedi sign": "\u585e\u5730\u7b26\u53f7",
-"livre tournois sign": "\u91cc\u5f17\u5f17\u5c14\u7b26\u53f7",
-"spesmilo sign": "spesmilo\u7b26\u53f7",
-"tenge sign": "\u575a\u6208\u7b26\u53f7",
-"indian rupee sign": "\u5370\u5ea6\u5362\u6bd4",
-"turkish lira sign": "\u571f\u8033\u5176\u91cc\u62c9",
-"nordic mark sign": "\u5317\u6b27\u9a6c\u514b",
-"manat sign": "\u9a6c\u7eb3\u7279\u7b26\u53f7",
-"ruble sign": "\u5362\u5e03\u7b26\u53f7",
-"yen character": "\u65e5\u5143\u5b57\u6837",
-"yuan character": "\u4eba\u6c11\u5e01\u5143\u5b57\u6837",
-"yuan character, in hong kong and taiwan": "\u5143\u5b57\u6837\uff08\u6e2f\u53f0\u5730\u533a\uff09",
-"yen\/yuan character variant one": "\u5143\u5b57\u6837\uff08\u5927\u5199\uff09",
-"Loading emoticons...": "\u52a0\u8f7d\u8868\u60c5\u7b26\u53f7...",
-"Could not load emoticons": "\u4e0d\u80fd\u52a0\u8f7d\u8868\u60c5\u7b26\u53f7",
-"People": "\u4eba\u7c7b",
-"Animals and Nature": "\u52a8\u7269\u548c\u81ea\u7136",
-"Food and Drink": "\u98df\u7269\u548c\u996e\u54c1",
-"Activity": "\u6d3b\u52a8",
-"Travel and Places": "\u65c5\u6e38\u548c\u5730\u70b9",
-"Objects": "\u7269\u4ef6",
-"Flags": "\u65d7\u5e1c",
-"Characters": "\u5b57\u7b26",
-"Characters (no spaces)": "\u5b57\u7b26(\u65e0\u7a7a\u683c)",
-"Error: Form submit field collision.": "\u9519\u8bef: \u8868\u5355\u63d0\u4ea4\u5b57\u6bb5\u51b2\u7a81\u3002",
-"Error: No form element found.": "\u9519\u8bef: \u6ca1\u6709\u8868\u5355\u63a7\u4ef6\u3002",
-"Update": "\u66f4\u65b0",
-"Color swatch": "\u989c\u8272\u6837\u672c",
-"Turquoise": "\u9752\u7eff\u8272",
-"Green": "\u7eff\u8272",
-"Blue": "\u84dd\u8272",
-"Purple": "\u7d2b\u8272",
-"Navy Blue": "\u6d77\u519b\u84dd",
-"Dark Turquoise": "\u6df1\u84dd\u7eff\u8272",
-"Dark Green": "\u6df1\u7eff\u8272",
-"Medium Blue": "\u4e2d\u84dd\u8272",
-"Medium Purple": "\u4e2d\u7d2b\u8272",
-"Midnight Blue": "\u6df1\u84dd\u8272",
-"Yellow": "\u9ec4\u8272",
-"Orange": "\u6a59\u8272",
-"Red": "\u7ea2\u8272",
-"Light Gray": "\u6d45\u7070\u8272",
-"Gray": "\u7070\u8272",
-"Dark Yellow": "\u6697\u9ec4\u8272",
-"Dark Orange": "\u6df1\u6a59\u8272",
-"Dark Red": "\u6df1\u7ea2\u8272",
-"Medium Gray": "\u4e2d\u7070\u8272",
-"Dark Gray": "\u6df1\u7070\u8272",
-"Black": "\u9ed1\u8272",
-"White": "\u767d\u8272",
-"Switch to or from fullscreen mode": "\u5207\u6362\u5168\u5c4f\u6a21\u5f0f",
-"Open help dialog": "\u6253\u5f00\u5e2e\u52a9\u5bf9\u8bdd\u6846",
-"history": "\u5386\u53f2",
-"styles": "\u6837\u5f0f",
-"formatting": "\u683c\u5f0f\u5316",
-"alignment": "\u5bf9\u9f50",
-"indentation": "\u7f29\u8fdb",
-"permanent pen": "\u8bb0\u53f7\u7b14",
-"comments": "\u5907\u6ce8",
-"Anchor": "\u951a\u70b9",
-"Special character": "\u7279\u6b8a\u7b26\u53f7",
-"Code sample": "\u4ee3\u7801\u793a\u4f8b",
-"Color": "\u989c\u8272",
-"Emoticons": "\u8868\u60c5",
-"Document properties": "\u6587\u6863\u5c5e\u6027",
-"Image": "\u56fe\u7247",
-"Insert link": "\u63d2\u5165\u94fe\u63a5",
-"Target": "\u6253\u5f00\u65b9\u5f0f",
-"Link": "\u94fe\u63a5",
-"Poster": "\u5c01\u9762",
-"Media": "\u5a92\u4f53",
-"Print": "\u6253\u5370",
-"Prev": "\u4e0a\u4e00\u4e2a",
-"Find and replace": "\u67e5\u627e\u548c\u66ff\u6362",
-"Whole words": "\u5168\u5b57\u5339\u914d",
-"Spellcheck": "\u62fc\u5199\u68c0\u67e5",
-"Caption": "\u6807\u9898",
-"Insert template": "\u63d2\u5165\u6a21\u677f"
-});
--- a/public/tinymce/skins/content/dark/content.css
+++ b/public/tinymce/skins/content/dark/content.css
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body {
-  background-color: #2f3742;
-  color: #dfe0e4;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-  line-height: 1.4;
-  margin: 1rem;
-}
-a {
-  color: #4099ff;
-}
-table {
-  border-collapse: collapse;
-}
-table th,
-table td {
-  border: 1px solid #6d737b;
-  padding: 0.4rem;
-}
-figure {
-  display: table;
-  margin: 1rem auto;
-}
-figure figcaption {
-  color: #8a8f97;
-  display: block;
-  margin-top: 0.25rem;
-  text-align: center;
-}
-hr {
-  border-color: #6d737b;
-  border-style: solid;
-  border-width: 1px 0 0 0;
-}
-code {
-  background-color: #6d737b;
-  border-radius: 3px;
-  padding: 0.1rem 0.2rem;
-}
-/* Make text in selected cells in tables dark and readable */
-td[data-mce-selected],
-th[data-mce-selected] {
-  color: #333;
-}
-.mce-content-body:not([dir=rtl]) blockquote {
-  border-left: 2px solid #6d737b;
-  margin-left: 1.5rem;
-  padding-left: 1rem;
-}
-.mce-content-body[dir=rtl] blockquote {
-  border-right: 2px solid #6d737b;
-  margin-right: 1.5rem;
-  padding-right: 1rem;
-}
--- a/public/tinymce/skins/content/dark/content.min.css
+++ b/public/tinymce/skins/content/dark/content.min.css
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body{background-color:#2f3742;color:#dfe0e4;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}a{color:#4099ff}table{border-collapse:collapse}table td,table th{border:1px solid #6d737b;padding:.4rem}figure{display:table;margin:1rem auto}figure figcaption{color:#8a8f97;display:block;margin-top:.25rem;text-align:center}hr{border-color:#6d737b;border-style:solid;border-width:1px 0 0 0}code{background-color:#6d737b;border-radius:3px;padding:.1rem .2rem}td[data-mce-selected],th[data-mce-selected]{color:#333}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #6d737b;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #6d737b;margin-right:1.5rem;padding-right:1rem}
--- a/public/tinymce/skins/content/default/content.css
+++ b/public/tinymce/skins/content/default/content.css
@@ -1,49 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-  line-height: 1.4;
-  margin: 1rem;
-}
-table {
-  border-collapse: collapse;
-}
-table th,
-table td {
-  border: 1px solid #ccc;
-  padding: 0.4rem;
-}
-figure {
-  display: table;
-  margin: 1rem auto;
-}
-figure figcaption {
-  color: #999;
-  display: block;
-  margin-top: 0.25rem;
-  text-align: center;
-}
-hr {
-  border-color: #ccc;
-  border-style: solid;
-  border-width: 1px 0 0 0;
-}
-code {
-  background-color: #e8e8e8;
-  border-radius: 3px;
-  padding: 0.1rem 0.2rem;
-}
-.mce-content-body:not([dir=rtl]) blockquote {
-  border-left: 2px solid #ccc;
-  margin-left: 1.5rem;
-  padding-left: 1rem;
-}
-.mce-content-body[dir=rtl] blockquote {
-  border-right: 2px solid #ccc;
-  margin-right: 1.5rem;
-  padding-right: 1rem;
-}
--- a/public/tinymce/skins/content/default/content.min.css
+++ b/public/tinymce/skins/content/default/content.min.css
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem}table{border-collapse:collapse}table td,table th{border:1px solid #ccc;padding:.4rem}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}
--- a/public/tinymce/skins/content/document/content.css
+++ b/public/tinymce/skins/content/document/content.css
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-@media screen {
-  html {
-    background: #f4f4f4;
-    min-height: 100%;
-  }
-}
-body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-}
-@media screen {
-  body {
-    background-color: #fff;
-    box-shadow: 0 0 4px rgba(0, 0, 0, 0.15);
-    box-sizing: border-box;
-    margin: 1rem auto 0;
-    max-width: 820px;
-    min-height: calc(100vh - 1rem);
-    padding: 4rem 6rem 6rem 6rem;
-  }
-}
-table {
-  border-collapse: collapse;
-}
-table th,
-table td {
-  border: 1px solid #ccc;
-  padding: 0.4rem;
-}
-figure figcaption {
-  color: #999;
-  margin-top: 0.25rem;
-  text-align: center;
-}
-hr {
-  border-color: #ccc;
-  border-style: solid;
-  border-width: 1px 0 0 0;
-}
-.mce-content-body:not([dir=rtl]) blockquote {
-  border-left: 2px solid #ccc;
-  margin-left: 1.5rem;
-  padding-left: 1rem;
-}
-.mce-content-body[dir=rtl] blockquote {
-  border-right: 2px solid #ccc;
-  margin-right: 1.5rem;
-  padding-right: 1rem;
-}
--- a/public/tinymce/skins/content/document/content.min.css
+++ b/public/tinymce/skins/content/document/content.min.css
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-@media screen{html{background:#f4f4f4;min-height:100%}}body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif}@media screen{body{background-color:#fff;box-shadow:0 0 4px rgba(0,0,0,.15);box-sizing:border-box;margin:1rem auto 0;max-width:820px;min-height:calc(100vh - 1rem);padding:4rem 6rem 6rem 6rem}}table{border-collapse:collapse}table td,table th{border:1px solid #ccc;padding:.4rem}figure figcaption{color:#999;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}
--- a/public/tinymce/skins/content/writer/content.css
+++ b/public/tinymce/skins/content/writer/content.css
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
-  line-height: 1.4;
-  margin: 1rem auto;
-  max-width: 900px;
-}
-table {
-  border-collapse: collapse;
-}
-table th,
-table td {
-  border: 1px solid #ccc;
-  padding: 0.4rem;
-}
-figure {
-  display: table;
-  margin: 1rem auto;
-}
-figure figcaption {
-  color: #999;
-  display: block;
-  margin-top: 0.25rem;
-  text-align: center;
-}
-hr {
-  border-color: #ccc;
-  border-style: solid;
-  border-width: 1px 0 0 0;
-}
-code {
-  background-color: #e8e8e8;
-  border-radius: 3px;
-  padding: 0.1rem 0.2rem;
-}
-.mce-content-body:not([dir=rtl]) blockquote {
-  border-left: 2px solid #ccc;
-  margin-left: 1.5rem;
-  padding-left: 1rem;
-}
-.mce-content-body[dir=rtl] blockquote {
-  border-right: 2px solid #ccc;
-  margin-right: 1.5rem;
-  padding-right: 1rem;
-}
--- a/public/tinymce/skins/content/writer/content.min.css
+++ b/public/tinymce/skins/content/writer/content.min.css
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Open Sans','Helvetica Neue',sans-serif;line-height:1.4;margin:1rem auto;max-width:900px}table{border-collapse:collapse}table td,table th{border:1px solid #ccc;padding:.4rem}figure{display:table;margin:1rem auto}figure figcaption{color:#999;display:block;margin-top:.25rem;text-align:center}hr{border-color:#ccc;border-style:solid;border-width:1px 0 0 0}code{background-color:#e8e8e8;border-radius:3px;padding:.1rem .2rem}.mce-content-body:not([dir=rtl]) blockquote{border-left:2px solid #ccc;margin-left:1.5rem;padding-left:1rem}.mce-content-body[dir=rtl] blockquote{border-right:2px solid #ccc;margin-right:1.5rem;padding-right:1rem}
--- a/public/tinymce/skins/ui/oxide-dark/content.css
+++ b/public/tinymce/skins/ui/oxide-dark/content.css
@@ -1,677 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.mce-content-body .mce-item-anchor {
-  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
-  cursor: default;
-  display: inline-block;
-  height: 12px !important;
-  padding: 0 2px;
-  -webkit-user-modify: read-only;
-  -moz-user-modify: read-only;
-  -webkit-user-select: all;
-  -moz-user-select: all;
-  -ms-user-select: all;
-      user-select: all;
-  width: 8px !important;
-}
-.mce-content-body .mce-item-anchor[data-mce-selected] {
-  outline-offset: 1px;
-}
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
-}
-.tox-comments-visible .tox-comment--active {
-  background-color: #ffe168;
-}
-.tox-checklist > li:not(.tox-checklist--hidden) {
-  list-style: none;
-  margin: 0.25em 0;
-}
-.tox-checklist > li:not(.tox-checklist--hidden)::before {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%236d737b%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
-  background-size: 100%;
-  content: '';
-  cursor: pointer;
-  height: 1em;
-  margin-left: -1.5em;
-  margin-top: 0.125em;
-  position: absolute;
-  width: 1em;
-}
-.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
-}
-[dir=rtl] .tox-checklist > li:not(.tox-checklist--hidden)::before {
-  margin-left: 0;
-  margin-right: -1.5em;
-}
-/* stylelint-disable */
-/* http://prismjs.com/ */
-/**
- * Dracula Theme originally by Zeno Rocha [@zenorocha]
- * https://draculatheme.com/
- *
- * Ported for PrismJS by Albert Vallverdu [@byverdu]
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: #f8f8f2;
-  background: none;
-  text-shadow: 0 1px rgba(0, 0, 0, 0.3);
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-  -moz-tab-size: 4;
-  tab-size: 4;
-  -webkit-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: 0.5em 0;
-  overflow: auto;
-  border-radius: 0.3em;
-}
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-  background: #282a36;
-}
-/* Inline code */
-:not(pre) > code[class*="language-"] {
-  padding: 0.1em;
-  border-radius: 0.3em;
-  white-space: normal;
-}
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: #6272a4;
-}
-.token.punctuation {
-  color: #f8f8f2;
-}
-.namespace {
-  opacity: 0.7;
-}
-.token.property,
-.token.tag,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #ff79c6;
-}
-.token.boolean,
-.token.number {
-  color: #bd93f9;
-}
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #50fa7b;
-}
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string,
-.token.variable {
-  color: #f8f8f2;
-}
-.token.atrule,
-.token.attr-value,
-.token.function,
-.token.class-name {
-  color: #f1fa8c;
-}
-.token.keyword {
-  color: #8be9fd;
-}
-.token.regex,
-.token.important {
-  color: #ffb86c;
-}
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-.token.italic {
-  font-style: italic;
-}
-.token.entity {
-  cursor: help;
-}
-/* stylelint-enable */
-.mce-content-body {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-}
-.mce-content-body .mce-visual-caret {
-  background-color: black;
-  background-color: currentColor;
-  position: absolute;
-}
-.mce-content-body .mce-visual-caret-hidden {
-  display: none;
-}
-.mce-content-body *[data-mce-caret] {
-  left: -1000px;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  right: auto;
-  top: 0;
-}
-.mce-content-body .mce-offscreen-selection {
-  left: -2000000px;
-  max-width: 1000000px;
-  position: absolute;
-}
-.mce-content-body *[contentEditable=false] {
-  cursor: default;
-}
-.mce-content-body *[contentEditable=true] {
-  cursor: text;
-}
-.tox-cursor-format-painter {
-  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
-}
-.mce-content-body figure.align-left {
-  float: left;
-}
-.mce-content-body figure.align-right {
-  float: right;
-}
-.mce-content-body figure.image.align-center {
-  display: table;
-  margin-left: auto;
-  margin-right: auto;
-}
-.mce-preview-object {
-  border: 1px solid gray;
-  display: inline-block;
-  line-height: 0;
-  margin: 0 2px 0 2px;
-  position: relative;
-}
-.mce-preview-object .mce-shim {
-  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.mce-preview-object[data-mce-selected="2"] .mce-shim {
-  display: none;
-}
-.mce-object {
-  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%20fill%3D%22%23cccccc%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
-  border: 1px dashed #aaa;
-}
-.mce-pagebreak {
-  border: 1px dashed #aaa;
-  cursor: default;
-  display: block;
-  height: 5px;
-  margin-top: 15px;
-  page-break-before: always;
-  width: 100%;
-}
-@media print {
-  .mce-pagebreak {
-    border: 0;
-  }
-}
-.tiny-pageembed .mce-shim {
-  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.tiny-pageembed[data-mce-selected="2"] .mce-shim {
-  display: none;
-}
-.tiny-pageembed {
-  display: inline-block;
-  position: relative;
-}
-.tiny-pageembed--21by9,
-.tiny-pageembed--16by9,
-.tiny-pageembed--4by3,
-.tiny-pageembed--1by1 {
-  display: block;
-  overflow: hidden;
-  padding: 0;
-  position: relative;
-  width: 100%;
-}
-.tiny-pageembed--21by9 {
-  padding-top: 42.857143%;
-}
-.tiny-pageembed--16by9 {
-  padding-top: 56.25%;
-}
-.tiny-pageembed--4by3 {
-  padding-top: 75%;
-}
-.tiny-pageembed--1by1 {
-  padding-top: 100%;
-}
-.tiny-pageembed--21by9 iframe,
-.tiny-pageembed--16by9 iframe,
-.tiny-pageembed--4by3 iframe,
-.tiny-pageembed--1by1 iframe {
-  border: 0;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.mce-content-body[data-mce-placeholder] {
-  position: relative;
-}
-.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before {
-  color: rgba(34, 47, 62, 0.7);
-  content: attr(data-mce-placeholder);
-  position: absolute;
-}
-.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before {
-  left: 1px;
-}
-.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before {
-  right: 1px;
-}
-.mce-content-body div.mce-resizehandle {
-  background-color: #4099ff;
-  border-color: #4099ff;
-  border-style: solid;
-  border-width: 1px;
-  box-sizing: border-box;
-  height: 10px;
-  position: absolute;
-  width: 10px;
-  z-index: 10000;
-}
-.mce-content-body div.mce-resizehandle:hover {
-  background-color: #4099ff;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(1) {
-  cursor: nwse-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(2) {
-  cursor: nesw-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(3) {
-  cursor: nwse-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(4) {
-  cursor: nesw-resize;
-}
-.mce-content-body .mce-clonedresizable {
-  opacity: 0.5;
-  outline: 1px dashed black;
-  position: absolute;
-  z-index: 10000;
-}
-.mce-content-body .mce-resize-helper {
-  background: #555;
-  background: rgba(0, 0, 0, 0.75);
-  border: 1px;
-  border-radius: 3px;
-  color: white;
-  display: none;
-  font-family: sans-serif;
-  font-size: 12px;
-  line-height: 14px;
-  margin: 5px 10px;
-  padding: 5px;
-  position: absolute;
-  white-space: nowrap;
-  z-index: 10001;
-}
-.tox-rtc-user-selection {
-  position: relative;
-}
-.tox-rtc-user-cursor {
-  bottom: 0;
-  cursor: default;
-  position: absolute;
-  top: 0;
-  width: 2px;
-}
-.tox-rtc-user-cursor::before {
-  background-color: inherit;
-  border-radius: 50%;
-  content: '';
-  display: block;
-  height: 8px;
-  position: absolute;
-  right: -3px;
-  top: -3px;
-  width: 8px;
-}
-.tox-rtc-user-cursor:hover::after {
-  background-color: inherit;
-  border-radius: 100px;
-  box-sizing: border-box;
-  color: #fff;
-  content: attr(data-user);
-  display: block;
-  font-size: 12px;
-  font-weight: bold;
-  left: -5px;
-  min-height: 8px;
-  min-width: 8px;
-  padding: 0 12px;
-  position: absolute;
-  top: -11px;
-  white-space: nowrap;
-  z-index: 1000;
-}
-.tox-rtc-user-selection--1 .tox-rtc-user-cursor {
-  background-color: #2dc26b;
-}
-.tox-rtc-user-selection--2 .tox-rtc-user-cursor {
-  background-color: #e03e2d;
-}
-.tox-rtc-user-selection--3 .tox-rtc-user-cursor {
-  background-color: #f1c40f;
-}
-.tox-rtc-user-selection--4 .tox-rtc-user-cursor {
-  background-color: #3598db;
-}
-.tox-rtc-user-selection--5 .tox-rtc-user-cursor {
-  background-color: #b96ad9;
-}
-.tox-rtc-user-selection--6 .tox-rtc-user-cursor {
-  background-color: #e67e23;
-}
-.tox-rtc-user-selection--7 .tox-rtc-user-cursor {
-  background-color: #aaa69d;
-}
-.tox-rtc-user-selection--8 .tox-rtc-user-cursor {
-  background-color: #f368e0;
-}
-.tox-rtc-remote-image {
-  background: #eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;
-  border: 1px solid #ccc;
-  min-height: 240px;
-  min-width: 320px;
-}
-.mce-match-marker {
-  background: #aaa;
-  color: #fff;
-}
-.mce-match-marker-selected {
-  background: #39f;
-  color: #fff;
-}
-.mce-match-marker-selected::-moz-selection {
-  background: #39f;
-  color: #fff;
-}
-.mce-match-marker-selected::selection {
-  background: #39f;
-  color: #fff;
-}
-.mce-content-body img[data-mce-selected],
-.mce-content-body table[data-mce-selected] {
-  outline: 3px solid #4099ff;
-}
-.mce-content-body hr[data-mce-selected] {
-  outline: 3px solid #4099ff;
-  outline-offset: 1px;
-}
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
-  outline: 3px solid #4099ff;
-}
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
-  outline: 3px solid #4099ff;
-}
-.mce-content-body *[contentEditable=false][data-mce-selected] {
-  cursor: not-allowed;
-  outline: 3px solid #4099ff;
-}
-.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,
-.mce-content-body.mce-content-readonly *[contentEditable=true]:hover {
-  outline: none;
-}
-.mce-content-body *[data-mce-selected="inline-boundary"] {
-  background-color: #4099ff;
-}
-.mce-content-body .mce-edit-focus {
-  outline: 3px solid #4099ff;
-}
-.mce-content-body td[data-mce-selected],
-.mce-content-body th[data-mce-selected] {
-  background-color: #b4d7ff !important;
-}
-.mce-content-body td[data-mce-selected]::-moz-selection,
-.mce-content-body th[data-mce-selected]::-moz-selection {
-  background: none;
-}
-.mce-content-body td[data-mce-selected]::selection,
-.mce-content-body th[data-mce-selected]::selection {
-  background: none;
-}
-.mce-content-body td[data-mce-selected] *,
-.mce-content-body th[data-mce-selected] * {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-}
-.mce-content-body img::-moz-selection {
-  background: none;
-}
-.mce-content-body img::selection {
-  background: none;
-}
-.ephox-snooker-resizer-bar {
-  background-color: #4099ff;
-  opacity: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.ephox-snooker-resizer-cols {
-  cursor: col-resize;
-}
-.ephox-snooker-resizer-rows {
-  cursor: row-resize;
-}
-.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging {
-  opacity: 1;
-}
-.mce-spellchecker-word {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
-  background-position: 0 calc(100% + 1px);
-  background-repeat: repeat-x;
-  background-size: auto 6px;
-  cursor: default;
-  height: 2rem;
-}
-.mce-spellchecker-grammar {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
-  background-position: 0 calc(100% + 1px);
-  background-repeat: repeat-x;
-  background-size: auto 6px;
-  cursor: default;
-}
-.mce-toc {
-  border: 1px solid gray;
-}
-.mce-toc h2 {
-  margin: 4px;
-}
-.mce-toc li {
-  list-style-type: none;
-}
-.mce-item-table,
-.mce-item-table td,
-.mce-item-table th,
-.mce-item-table caption {
-  border: 1px dashed #bbb;
-}
-.mce-visualblocks p,
-.mce-visualblocks h1,
-.mce-visualblocks h2,
-.mce-visualblocks h3,
-.mce-visualblocks h4,
-.mce-visualblocks h5,
-.mce-visualblocks h6,
-.mce-visualblocks div:not([data-mce-bogus]),
-.mce-visualblocks section,
-.mce-visualblocks article,
-.mce-visualblocks blockquote,
-.mce-visualblocks address,
-.mce-visualblocks pre,
-.mce-visualblocks figure,
-.mce-visualblocks figcaption,
-.mce-visualblocks hgroup,
-.mce-visualblocks aside,
-.mce-visualblocks ul,
-.mce-visualblocks ol,
-.mce-visualblocks dl {
-  background-repeat: no-repeat;
-  border: 1px dashed #bbb;
-  margin-left: 3px;
-  padding-top: 10px;
-}
-.mce-visualblocks p {
-  background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
-}
-.mce-visualblocks h1 {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
-}
-.mce-visualblocks h2 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
-}
-.mce-visualblocks h3 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
-}
-.mce-visualblocks h4 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
-}
-.mce-visualblocks h5 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
-}
-.mce-visualblocks h6 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
-}
-.mce-visualblocks div:not([data-mce-bogus]) {
-  background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
-}
-.mce-visualblocks section {
-  background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
-}
-.mce-visualblocks article {
-  background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
-}
-.mce-visualblocks blockquote {
-  background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
-}
-.mce-visualblocks address {
-  background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
-}
-.mce-visualblocks pre {
-  background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
-}
-.mce-visualblocks figure {
-  background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
-}
-.mce-visualblocks figcaption {
-  border: 1px dashed #bbb;
-}
-.mce-visualblocks hgroup {
-  background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
-}
-.mce-visualblocks aside {
-  background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
-}
-.mce-visualblocks ul {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);
-}
-.mce-visualblocks ol {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
-}
-.mce-visualblocks dl {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
-}
-.mce-visualblocks:not([dir=rtl]) p,
-.mce-visualblocks:not([dir=rtl]) h1,
-.mce-visualblocks:not([dir=rtl]) h2,
-.mce-visualblocks:not([dir=rtl]) h3,
-.mce-visualblocks:not([dir=rtl]) h4,
-.mce-visualblocks:not([dir=rtl]) h5,
-.mce-visualblocks:not([dir=rtl]) h6,
-.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),
-.mce-visualblocks:not([dir=rtl]) section,
-.mce-visualblocks:not([dir=rtl]) article,
-.mce-visualblocks:not([dir=rtl]) blockquote,
-.mce-visualblocks:not([dir=rtl]) address,
-.mce-visualblocks:not([dir=rtl]) pre,
-.mce-visualblocks:not([dir=rtl]) figure,
-.mce-visualblocks:not([dir=rtl]) figcaption,
-.mce-visualblocks:not([dir=rtl]) hgroup,
-.mce-visualblocks:not([dir=rtl]) aside,
-.mce-visualblocks:not([dir=rtl]) ul,
-.mce-visualblocks:not([dir=rtl]) ol,
-.mce-visualblocks:not([dir=rtl]) dl {
-  margin-left: 3px;
-}
-.mce-visualblocks[dir=rtl] p,
-.mce-visualblocks[dir=rtl] h1,
-.mce-visualblocks[dir=rtl] h2,
-.mce-visualblocks[dir=rtl] h3,
-.mce-visualblocks[dir=rtl] h4,
-.mce-visualblocks[dir=rtl] h5,
-.mce-visualblocks[dir=rtl] h6,
-.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),
-.mce-visualblocks[dir=rtl] section,
-.mce-visualblocks[dir=rtl] article,
-.mce-visualblocks[dir=rtl] blockquote,
-.mce-visualblocks[dir=rtl] address,
-.mce-visualblocks[dir=rtl] pre,
-.mce-visualblocks[dir=rtl] figure,
-.mce-visualblocks[dir=rtl] figcaption,
-.mce-visualblocks[dir=rtl] hgroup,
-.mce-visualblocks[dir=rtl] aside,
-.mce-visualblocks[dir=rtl] ul,
-.mce-visualblocks[dir=rtl] ol,
-.mce-visualblocks[dir=rtl] dl {
-  background-position-x: right;
-  margin-right: 3px;
-}
-.mce-nbsp,
-.mce-shy {
-  background: #aaa;
-}
-.mce-shy::after {
-  content: '-';
-}
-body {
-  font-family: sans-serif;
-}
-table {
-  border-collapse: collapse;
-}
--- a/public/tinymce/skins/ui/oxide-dark/content.inline.css
+++ b/public/tinymce/skins/ui/oxide-dark/content.inline.css
@@ -1,689 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.mce-content-body .mce-item-anchor {
-  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
-  cursor: default;
-  display: inline-block;
-  height: 12px !important;
-  padding: 0 2px;
-  -webkit-user-modify: read-only;
-  -moz-user-modify: read-only;
-  -webkit-user-select: all;
-  -moz-user-select: all;
-  -ms-user-select: all;
-      user-select: all;
-  width: 8px !important;
-}
-.mce-content-body .mce-item-anchor[data-mce-selected] {
-  outline-offset: 1px;
-}
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
-}
-.tox-comments-visible .tox-comment--active {
-  background-color: #ffe168;
-}
-.tox-checklist > li:not(.tox-checklist--hidden) {
-  list-style: none;
-  margin: 0.25em 0;
-}
-.tox-checklist > li:not(.tox-checklist--hidden)::before {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
-  background-size: 100%;
-  content: '';
-  cursor: pointer;
-  height: 1em;
-  margin-left: -1.5em;
-  margin-top: 0.125em;
-  position: absolute;
-  width: 1em;
-}
-.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
-}
-[dir=rtl] .tox-checklist > li:not(.tox-checklist--hidden)::before {
-  margin-left: 0;
-  margin-right: -1.5em;
-}
-/* stylelint-disable */
-/* http://prismjs.com/ */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  font-size: 1em;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-  -moz-tab-size: 4;
-  tab-size: 4;
-  -webkit-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-@media print {
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: 0.5em 0;
-  overflow: auto;
-}
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-/* Inline code */
-:not(pre) > code[class*="language-"] {
-  padding: 0.1em;
-  border-radius: 0.3em;
-  white-space: normal;
-}
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-.token.punctuation {
-  color: #999;
-}
-.namespace {
-  opacity: 0.7;
-}
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, 0.5);
-}
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-.token.italic {
-  font-style: italic;
-}
-.token.entity {
-  cursor: help;
-}
-/* stylelint-enable */
-.mce-content-body {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-}
-.mce-content-body .mce-visual-caret {
-  background-color: black;
-  background-color: currentColor;
-  position: absolute;
-}
-.mce-content-body .mce-visual-caret-hidden {
-  display: none;
-}
-.mce-content-body *[data-mce-caret] {
-  left: -1000px;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  right: auto;
-  top: 0;
-}
-.mce-content-body .mce-offscreen-selection {
-  left: -2000000px;
-  max-width: 1000000px;
-  position: absolute;
-}
-.mce-content-body *[contentEditable=false] {
-  cursor: default;
-}
-.mce-content-body *[contentEditable=true] {
-  cursor: text;
-}
-.tox-cursor-format-painter {
-  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
-}
-.mce-content-body figure.align-left {
-  float: left;
-}
-.mce-content-body figure.align-right {
-  float: right;
-}
-.mce-content-body figure.image.align-center {
-  display: table;
-  margin-left: auto;
-  margin-right: auto;
-}
-.mce-preview-object {
-  border: 1px solid gray;
-  display: inline-block;
-  line-height: 0;
-  margin: 0 2px 0 2px;
-  position: relative;
-}
-.mce-preview-object .mce-shim {
-  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.mce-preview-object[data-mce-selected="2"] .mce-shim {
-  display: none;
-}
-.mce-object {
-  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
-  border: 1px dashed #aaa;
-}
-.mce-pagebreak {
-  border: 1px dashed #aaa;
-  cursor: default;
-  display: block;
-  height: 5px;
-  margin-top: 15px;
-  page-break-before: always;
-  width: 100%;
-}
-@media print {
-  .mce-pagebreak {
-    border: 0;
-  }
-}
-.tiny-pageembed .mce-shim {
-  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.tiny-pageembed[data-mce-selected="2"] .mce-shim {
-  display: none;
-}
-.tiny-pageembed {
-  display: inline-block;
-  position: relative;
-}
-.tiny-pageembed--21by9,
-.tiny-pageembed--16by9,
-.tiny-pageembed--4by3,
-.tiny-pageembed--1by1 {
-  display: block;
-  overflow: hidden;
-  padding: 0;
-  position: relative;
-  width: 100%;
-}
-.tiny-pageembed--21by9 {
-  padding-top: 42.857143%;
-}
-.tiny-pageembed--16by9 {
-  padding-top: 56.25%;
-}
-.tiny-pageembed--4by3 {
-  padding-top: 75%;
-}
-.tiny-pageembed--1by1 {
-  padding-top: 100%;
-}
-.tiny-pageembed--21by9 iframe,
-.tiny-pageembed--16by9 iframe,
-.tiny-pageembed--4by3 iframe,
-.tiny-pageembed--1by1 iframe {
-  border: 0;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.mce-content-body[data-mce-placeholder] {
-  position: relative;
-}
-.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before {
-  color: rgba(34, 47, 62, 0.7);
-  content: attr(data-mce-placeholder);
-  position: absolute;
-}
-.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before {
-  left: 1px;
-}
-.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before {
-  right: 1px;
-}
-.mce-content-body div.mce-resizehandle {
-  background-color: #4099ff;
-  border-color: #4099ff;
-  border-style: solid;
-  border-width: 1px;
-  box-sizing: border-box;
-  height: 10px;
-  position: absolute;
-  width: 10px;
-  z-index: 10000;
-}
-.mce-content-body div.mce-resizehandle:hover {
-  background-color: #4099ff;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(1) {
-  cursor: nwse-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(2) {
-  cursor: nesw-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(3) {
-  cursor: nwse-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(4) {
-  cursor: nesw-resize;
-}
-.mce-content-body .mce-clonedresizable {
-  opacity: 0.5;
-  outline: 1px dashed black;
-  position: absolute;
-  z-index: 10000;
-}
-.mce-content-body .mce-resize-helper {
-  background: #555;
-  background: rgba(0, 0, 0, 0.75);
-  border: 1px;
-  border-radius: 3px;
-  color: white;
-  display: none;
-  font-family: sans-serif;
-  font-size: 12px;
-  line-height: 14px;
-  margin: 5px 10px;
-  padding: 5px;
-  position: absolute;
-  white-space: nowrap;
-  z-index: 10001;
-}
-.tox-rtc-user-selection {
-  position: relative;
-}
-.tox-rtc-user-cursor {
-  bottom: 0;
-  cursor: default;
-  position: absolute;
-  top: 0;
-  width: 2px;
-}
-.tox-rtc-user-cursor::before {
-  background-color: inherit;
-  border-radius: 50%;
-  content: '';
-  display: block;
-  height: 8px;
-  position: absolute;
-  right: -3px;
-  top: -3px;
-  width: 8px;
-}
-.tox-rtc-user-cursor:hover::after {
-  background-color: inherit;
-  border-radius: 100px;
-  box-sizing: border-box;
-  color: #fff;
-  content: attr(data-user);
-  display: block;
-  font-size: 12px;
-  font-weight: bold;
-  left: -5px;
-  min-height: 8px;
-  min-width: 8px;
-  padding: 0 12px;
-  position: absolute;
-  top: -11px;
-  white-space: nowrap;
-  z-index: 1000;
-}
-.tox-rtc-user-selection--1 .tox-rtc-user-cursor {
-  background-color: #2dc26b;
-}
-.tox-rtc-user-selection--2 .tox-rtc-user-cursor {
-  background-color: #e03e2d;
-}
-.tox-rtc-user-selection--3 .tox-rtc-user-cursor {
-  background-color: #f1c40f;
-}
-.tox-rtc-user-selection--4 .tox-rtc-user-cursor {
-  background-color: #3598db;
-}
-.tox-rtc-user-selection--5 .tox-rtc-user-cursor {
-  background-color: #b96ad9;
-}
-.tox-rtc-user-selection--6 .tox-rtc-user-cursor {
-  background-color: #e67e23;
-}
-.tox-rtc-user-selection--7 .tox-rtc-user-cursor {
-  background-color: #aaa69d;
-}
-.tox-rtc-user-selection--8 .tox-rtc-user-cursor {
-  background-color: #f368e0;
-}
-.tox-rtc-remote-image {
-  background: #eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;
-  border: 1px solid #ccc;
-  min-height: 240px;
-  min-width: 320px;
-}
-.mce-match-marker {
-  background: #aaa;
-  color: #fff;
-}
-.mce-match-marker-selected {
-  background: #39f;
-  color: #fff;
-}
-.mce-match-marker-selected::-moz-selection {
-  background: #39f;
-  color: #fff;
-}
-.mce-match-marker-selected::selection {
-  background: #39f;
-  color: #fff;
-}
-.mce-content-body img[data-mce-selected],
-.mce-content-body table[data-mce-selected] {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body hr[data-mce-selected] {
-  outline: 3px solid #b4d7ff;
-  outline-offset: 1px;
-}
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body *[contentEditable=false][data-mce-selected] {
-  cursor: not-allowed;
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,
-.mce-content-body.mce-content-readonly *[contentEditable=true]:hover {
-  outline: none;
-}
-.mce-content-body *[data-mce-selected="inline-boundary"] {
-  background-color: #b4d7ff;
-}
-.mce-content-body .mce-edit-focus {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body td[data-mce-selected],
-.mce-content-body th[data-mce-selected] {
-  background-color: #b4d7ff !important;
-}
-.mce-content-body td[data-mce-selected]::-moz-selection,
-.mce-content-body th[data-mce-selected]::-moz-selection {
-  background: none;
-}
-.mce-content-body td[data-mce-selected]::selection,
-.mce-content-body th[data-mce-selected]::selection {
-  background: none;
-}
-.mce-content-body td[data-mce-selected] *,
-.mce-content-body th[data-mce-selected] * {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-}
-.mce-content-body img::-moz-selection {
-  background: none;
-}
-.mce-content-body img::selection {
-  background: none;
-}
-.ephox-snooker-resizer-bar {
-  background-color: #b4d7ff;
-  opacity: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.ephox-snooker-resizer-cols {
-  cursor: col-resize;
-}
-.ephox-snooker-resizer-rows {
-  cursor: row-resize;
-}
-.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging {
-  opacity: 1;
-}
-.mce-spellchecker-word {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
-  background-position: 0 calc(100% + 1px);
-  background-repeat: repeat-x;
-  background-size: auto 6px;
-  cursor: default;
-  height: 2rem;
-}
-.mce-spellchecker-grammar {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
-  background-position: 0 calc(100% + 1px);
-  background-repeat: repeat-x;
-  background-size: auto 6px;
-  cursor: default;
-}
-.mce-toc {
-  border: 1px solid gray;
-}
-.mce-toc h2 {
-  margin: 4px;
-}
-.mce-toc li {
-  list-style-type: none;
-}
-.mce-item-table,
-.mce-item-table td,
-.mce-item-table th,
-.mce-item-table caption {
-  border: 1px dashed #bbb;
-}
-.mce-visualblocks p,
-.mce-visualblocks h1,
-.mce-visualblocks h2,
-.mce-visualblocks h3,
-.mce-visualblocks h4,
-.mce-visualblocks h5,
-.mce-visualblocks h6,
-.mce-visualblocks div:not([data-mce-bogus]),
-.mce-visualblocks section,
-.mce-visualblocks article,
-.mce-visualblocks blockquote,
-.mce-visualblocks address,
-.mce-visualblocks pre,
-.mce-visualblocks figure,
-.mce-visualblocks figcaption,
-.mce-visualblocks hgroup,
-.mce-visualblocks aside,
-.mce-visualblocks ul,
-.mce-visualblocks ol,
-.mce-visualblocks dl {
-  background-repeat: no-repeat;
-  border: 1px dashed #bbb;
-  margin-left: 3px;
-  padding-top: 10px;
-}
-.mce-visualblocks p {
-  background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
-}
-.mce-visualblocks h1 {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
-}
-.mce-visualblocks h2 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
-}
-.mce-visualblocks h3 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
-}
-.mce-visualblocks h4 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
-}
-.mce-visualblocks h5 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
-}
-.mce-visualblocks h6 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
-}
-.mce-visualblocks div:not([data-mce-bogus]) {
-  background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
-}
-.mce-visualblocks section {
-  background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
-}
-.mce-visualblocks article {
-  background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
-}
-.mce-visualblocks blockquote {
-  background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
-}
-.mce-visualblocks address {
-  background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
-}
-.mce-visualblocks pre {
-  background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
-}
-.mce-visualblocks figure {
-  background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
-}
-.mce-visualblocks figcaption {
-  border: 1px dashed #bbb;
-}
-.mce-visualblocks hgroup {
-  background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
-}
-.mce-visualblocks aside {
-  background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
-}
-.mce-visualblocks ul {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);
-}
-.mce-visualblocks ol {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
-}
-.mce-visualblocks dl {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
-}
-.mce-visualblocks:not([dir=rtl]) p,
-.mce-visualblocks:not([dir=rtl]) h1,
-.mce-visualblocks:not([dir=rtl]) h2,
-.mce-visualblocks:not([dir=rtl]) h3,
-.mce-visualblocks:not([dir=rtl]) h4,
-.mce-visualblocks:not([dir=rtl]) h5,
-.mce-visualblocks:not([dir=rtl]) h6,
-.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),
-.mce-visualblocks:not([dir=rtl]) section,
-.mce-visualblocks:not([dir=rtl]) article,
-.mce-visualblocks:not([dir=rtl]) blockquote,
-.mce-visualblocks:not([dir=rtl]) address,
-.mce-visualblocks:not([dir=rtl]) pre,
-.mce-visualblocks:not([dir=rtl]) figure,
-.mce-visualblocks:not([dir=rtl]) figcaption,
-.mce-visualblocks:not([dir=rtl]) hgroup,
-.mce-visualblocks:not([dir=rtl]) aside,
-.mce-visualblocks:not([dir=rtl]) ul,
-.mce-visualblocks:not([dir=rtl]) ol,
-.mce-visualblocks:not([dir=rtl]) dl {
-  margin-left: 3px;
-}
-.mce-visualblocks[dir=rtl] p,
-.mce-visualblocks[dir=rtl] h1,
-.mce-visualblocks[dir=rtl] h2,
-.mce-visualblocks[dir=rtl] h3,
-.mce-visualblocks[dir=rtl] h4,
-.mce-visualblocks[dir=rtl] h5,
-.mce-visualblocks[dir=rtl] h6,
-.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),
-.mce-visualblocks[dir=rtl] section,
-.mce-visualblocks[dir=rtl] article,
-.mce-visualblocks[dir=rtl] blockquote,
-.mce-visualblocks[dir=rtl] address,
-.mce-visualblocks[dir=rtl] pre,
-.mce-visualblocks[dir=rtl] figure,
-.mce-visualblocks[dir=rtl] figcaption,
-.mce-visualblocks[dir=rtl] hgroup,
-.mce-visualblocks[dir=rtl] aside,
-.mce-visualblocks[dir=rtl] ul,
-.mce-visualblocks[dir=rtl] ol,
-.mce-visualblocks[dir=rtl] dl {
-  background-position-x: right;
-  margin-right: 3px;
-}
-.mce-nbsp,
-.mce-shy {
-  background: #aaa;
-}
-.mce-shy::after {
-  content: '-';
-}
--- a/public/tinymce/skins/ui/oxide-dark/content.inline.min.css
+++ b/public/tinymce/skins/ui/oxide-dark/content.inline.min.css
--- a/public/tinymce/skins/ui/oxide-dark/content.min.css
+++ b/public/tinymce/skins/ui/oxide-dark/content.min.css
--- a/public/tinymce/skins/ui/oxide-dark/content.mobile.css
+++ b/public/tinymce/skins/ui/oxide-dark/content.mobile.css
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection {
-  /* Note: this file is used inside the content, so isn't part of theming */
-  background-color: green;
-  display: inline-block;
-  opacity: 0.5;
-  position: absolute;
-}
-body {
-  -webkit-text-size-adjust: none;
-}
-body img {
-  /* this is related to the content margin */
-  max-width: 96vw;
-}
-body table img {
-  max-width: 95%;
-}
-body {
-  font-family: sans-serif;
-}
-table {
-  border-collapse: collapse;
-}
--- a/public/tinymce/skins/ui/oxide-dark/content.mobile.min.css
+++ b/public/tinymce/skins/ui/oxide-dark/content.mobile.min.css
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{background-color:green;display:inline-block;opacity:.5;position:absolute}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}body{font-family:sans-serif}table{border-collapse:collapse}
--- a/public/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff
+++ b/public/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff
--- a/public/tinymce/skins/ui/oxide-dark/skin.css
+++ b/public/tinymce/skins/ui/oxide-dark/skin.css
--- a/public/tinymce/skins/ui/oxide-dark/skin.min.css
+++ b/public/tinymce/skins/ui/oxide-dark/skin.min.css
--- a/public/tinymce/skins/ui/oxide-dark/skin.mobile.css
+++ b/public/tinymce/skins/ui/oxide-dark/skin.mobile.css
@@ -1,673 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-/* RESET all the things! */
-.tinymce-mobile-outer-container {
-  all: initial;
-  display: block;
-}
-.tinymce-mobile-outer-container * {
-  border: 0;
-  box-sizing: initial;
-  cursor: inherit;
-  float: none;
-  line-height: 1;
-  margin: 0;
-  outline: 0;
-  padding: 0;
-  -webkit-tap-highlight-color: transparent;
-  /* TBIO-3691, stop the gray flicker on touch. */
-  text-shadow: none;
-  white-space: nowrap;
-}
-.tinymce-mobile-icon-arrow-back::before {
-  content: "\e5cd";
-}
-.tinymce-mobile-icon-image::before {
-  content: "\e412";
-}
-.tinymce-mobile-icon-cancel-circle::before {
-  content: "\e5c9";
-}
-.tinymce-mobile-icon-full-dot::before {
-  content: "\e061";
-}
-.tinymce-mobile-icon-align-center::before {
-  content: "\e234";
-}
-.tinymce-mobile-icon-align-left::before {
-  content: "\e236";
-}
-.tinymce-mobile-icon-align-right::before {
-  content: "\e237";
-}
-.tinymce-mobile-icon-bold::before {
-  content: "\e238";
-}
-.tinymce-mobile-icon-italic::before {
-  content: "\e23f";
-}
-.tinymce-mobile-icon-unordered-list::before {
-  content: "\e241";
-}
-.tinymce-mobile-icon-ordered-list::before {
-  content: "\e242";
-}
-.tinymce-mobile-icon-font-size::before {
-  content: "\e245";
-}
-.tinymce-mobile-icon-underline::before {
-  content: "\e249";
-}
-.tinymce-mobile-icon-link::before {
-  content: "\e157";
-}
-.tinymce-mobile-icon-unlink::before {
-  content: "\eca2";
-}
-.tinymce-mobile-icon-color::before {
-  content: "\e891";
-}
-.tinymce-mobile-icon-previous::before {
-  content: "\e314";
-}
-.tinymce-mobile-icon-next::before {
-  content: "\e315";
-}
-.tinymce-mobile-icon-large-font::before,
-.tinymce-mobile-icon-style-formats::before {
-  content: "\e264";
-}
-.tinymce-mobile-icon-undo::before {
-  content: "\e166";
-}
-.tinymce-mobile-icon-redo::before {
-  content: "\e15a";
-}
-.tinymce-mobile-icon-removeformat::before {
-  content: "\e239";
-}
-.tinymce-mobile-icon-small-font::before {
-  content: "\e906";
-}
-.tinymce-mobile-icon-readonly-back::before,
-.tinymce-mobile-format-matches::after {
-  content: "\e5ca";
-}
-.tinymce-mobile-icon-small-heading::before {
-  content: "small";
-}
-.tinymce-mobile-icon-large-heading::before {
-  content: "large";
-}
-.tinymce-mobile-icon-small-heading::before,
-.tinymce-mobile-icon-large-heading::before {
-  font-family: sans-serif;
-  font-size: 80%;
-}
-.tinymce-mobile-mask-edit-icon::before {
-  content: "\e254";
-}
-.tinymce-mobile-icon-back::before {
-  content: "\e5c4";
-}
-.tinymce-mobile-icon-heading::before {
-  /* TODO: Translate */
-  content: "Headings";
-  font-family: sans-serif;
-  font-size: 80%;
-  font-weight: bold;
-}
-.tinymce-mobile-icon-h1::before {
-  content: "H1";
-  font-weight: bold;
-}
-.tinymce-mobile-icon-h2::before {
-  content: "H2";
-  font-weight: bold;
-}
-.tinymce-mobile-icon-h3::before {
-  content: "H3";
-  font-weight: bold;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  background: rgba(51, 51, 51, 0.5);
-  height: 100%;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container {
-  align-items: center;
-  border-radius: 50%;
-  display: flex;
-  flex-direction: column;
-  font-family: sans-serif;
-  font-size: 1em;
-  justify-content: space-between;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .mixin-menu-item {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  border-radius: 50%;
-  height: 2.1em;
-  width: 2.1em;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-  font-size: 1em;
-}
-@media only screen and (min-device-width:700px) {
-  .tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section {
-    font-size: 1.2em;
-  }
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  border-radius: 50%;
-  height: 2.1em;
-  width: 2.1em;
-  background-color: white;
-  color: #207ab7;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon::before {
-  content: "\e900";
-  font-family: 'tinymce-mobile', sans-serif;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section:not(.tinymce-mobile-mask-tap-icon-selected) .tinymce-mobile-mask-tap-icon {
-  z-index: 2;
-}
-.tinymce-mobile-android-container.tinymce-mobile-android-maximized {
-  background: #ffffff;
-  border: none;
-  bottom: 0;
-  display: flex;
-  flex-direction: column;
-  left: 0;
-  position: fixed;
-  right: 0;
-  top: 0;
-}
-.tinymce-mobile-android-container:not(.tinymce-mobile-android-maximized) {
-  position: relative;
-}
-.tinymce-mobile-android-container .tinymce-mobile-editor-socket {
-  display: flex;
-  flex-grow: 1;
-}
-.tinymce-mobile-android-container .tinymce-mobile-editor-socket iframe {
-  display: flex !important;
-  flex-grow: 1;
-  height: auto !important;
-}
-.tinymce-mobile-android-scroll-reload {
-  overflow: hidden;
-}
-:not(.tinymce-mobile-readonly-mode) > .tinymce-mobile-android-selection-context-toolbar {
-  margin-top: 23px;
-}
-.tinymce-mobile-toolstrip {
-  background: #fff;
-  display: flex;
-  flex: 0 0 auto;
-  z-index: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar {
-  align-items: center;
-  background-color: #fff;
-  border-bottom: 1px solid #cccccc;
-  display: flex;
-  flex: 1;
-  height: 2.5em;
-  width: 100%;
-  /* Make it no larger than the toolstrip, so that it needs to scroll */
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group {
-  align-items: center;
-  display: flex;
-  height: 100%;
-  flex-shrink: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group > div {
-  align-items: center;
-  display: flex;
-  height: 100%;
-  flex: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container {
-  background: #f44336;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-toolbar-scrollable-group {
-  flex-grow: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item {
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button {
-  align-items: center;
-  display: flex;
-  height: 80%;
-  margin-left: 2px;
-  margin-right: 2px;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button.tinymce-mobile-toolbar-button-selected {
-  background: #c8cbcf;
-  color: #cccccc;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:first-of-type,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:last-of-type {
-  background: #207ab7;
-  color: #eceff1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar {
-  /* Note, this file is imported inside .tinymce-mobile-context-toolbar, so that prefix is on everything here. */
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group {
-  align-items: center;
-  display: flex;
-  height: 100%;
-  flex: 1;
-  padding-bottom: 0.4em;
-  padding-top: 0.4em;
-  /* Make any buttons appearing on the left and right display in the centre (e.g. color edges) */
-  /* For widgets like the colour picker, use the whole height */
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog {
-  display: flex;
-  min-height: 1.5em;
-  overflow: hidden;
-  padding-left: 0;
-  padding-right: 0;
-  position: relative;
-  width: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain {
-  display: flex;
-  height: 100%;
-  transition: left cubic-bezier(0.4, 0, 1, 1) 0.15s;
-  width: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen {
-  display: flex;
-  flex: 0 0 auto;
-  justify-content: space-between;
-  width: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen input {
-  font-family: Sans-serif;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container {
-  display: flex;
-  flex-grow: 1;
-  position: relative;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container .tinymce-mobile-input-container-x {
-  -ms-grid-row-align: center;
-      align-self: center;
-  background: inherit;
-  border: none;
-  border-radius: 50%;
-  color: #888;
-  font-size: 0.6em;
-  font-weight: bold;
-  height: 100%;
-  padding-right: 2px;
-  position: absolute;
-  right: 0;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container.tinymce-mobile-input-container-empty .tinymce-mobile-input-container-x {
-  display: none;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next {
-  align-items: center;
-  display: flex;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous::before,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next::before {
-  align-items: center;
-  display: flex;
-  font-weight: bold;
-  height: 100%;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous.tinymce-mobile-toolbar-navigation-disabled::before,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next.tinymce-mobile-toolbar-navigation-disabled::before {
-  visibility: hidden;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item {
-  color: #cccccc;
-  font-size: 10px;
-  line-height: 10px;
-  margin: 0 2px;
-  padding-top: 3px;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item.tinymce-mobile-dot-active {
-  color: #c8cbcf;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-font::before,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-heading::before {
-  margin-left: 0.5em;
-  margin-right: 0.9em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-font::before,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-heading::before {
-  margin-left: 0.9em;
-  margin-right: 0.5em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider {
-  display: flex;
-  flex: 1;
-  margin-left: 0;
-  margin-right: 0;
-  padding: 0.28em 0;
-  position: relative;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container {
-  align-items: center;
-  display: flex;
-  flex-grow: 1;
-  height: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line {
-  background: #cccccc;
-  display: flex;
-  flex: 1;
-  height: 0.2em;
-  margin-bottom: 0.3em;
-  margin-top: 0.3em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container {
-  padding-left: 2em;
-  padding-right: 2em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container {
-  align-items: center;
-  display: flex;
-  flex-grow: 1;
-  height: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient {
-  background: linear-gradient(to right, hsl(0, 100%, 50%) 0%, hsl(60, 100%, 50%) 17%, hsl(120, 100%, 50%) 33%, hsl(180, 100%, 50%) 50%, hsl(240, 100%, 50%) 67%, hsl(300, 100%, 50%) 83%, hsl(0, 100%, 50%) 100%);
-  display: flex;
-  flex: 1;
-  height: 0.2em;
-  margin-bottom: 0.3em;
-  margin-top: 0.3em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-black {
-  /* Not part of theming */
-  background: black;
-  height: 0.2em;
-  margin-bottom: 0.3em;
-  margin-top: 0.3em;
-  width: 1.2em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-white {
-  /* Not part of theming */
-  background: white;
-  height: 0.2em;
-  margin-bottom: 0.3em;
-  margin-top: 0.3em;
-  width: 1.2em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb {
-  /* vertically centering trick (margin: auto, top: 0, bottom: 0). On iOS and Safari, if you leave
-     * out these values, then it shows the thumb at the top of the spectrum. This is probably because it is
-     * absolutely positioned with only a left value, and not a top. Note, on Chrome it seems to be fine without
-     * this approach.
-    */
-  align-items: center;
-  background-clip: padding-box;
-  background-color: #455a64;
-  border: 0.5em solid rgba(136, 136, 136, 0);
-  border-radius: 3em;
-  bottom: 0;
-  color: #fff;
-  display: flex;
-  height: 0.5em;
-  justify-content: center;
-  left: -10px;
-  margin: auto;
-  position: absolute;
-  top: 0;
-  transition: border 120ms cubic-bezier(0.39, 0.58, 0.57, 1);
-  width: 0.5em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb.tinymce-mobile-thumb-active {
-  border: 0.5em solid rgba(136, 136, 136, 0.39);
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group > div {
-  align-items: center;
-  display: flex;
-  height: 100%;
-  flex: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper {
-  flex-direction: column;
-  justify-content: center;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item {
-  align-items: center;
-  display: flex;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item:not(.tinymce-mobile-serialised-dialog) {
-  height: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-container {
-  display: flex;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input {
-  background: #ffffff;
-  border: none;
-  border-radius: 0;
-  color: #455a64;
-  flex-grow: 1;
-  font-size: 0.85em;
-  padding-bottom: 0.1em;
-  padding-left: 5px;
-  padding-top: 0.1em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::-webkit-input-placeholder {
-  /* WebKit, Blink, Edge */
-  color: #888;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::placeholder {
-  /* WebKit, Blink, Edge */
-  color: #888;
-}
-/* dropup */
-.tinymce-mobile-dropup {
-  background: white;
-  display: flex;
-  overflow: hidden;
-  width: 100%;
-}
-.tinymce-mobile-dropup.tinymce-mobile-dropup-shrinking {
-  transition: height 0.3s ease-out;
-}
-.tinymce-mobile-dropup.tinymce-mobile-dropup-growing {
-  transition: height 0.3s ease-in;
-}
-.tinymce-mobile-dropup.tinymce-mobile-dropup-closed {
-  flex-grow: 0;
-}
-.tinymce-mobile-dropup.tinymce-mobile-dropup-open:not(.tinymce-mobile-dropup-growing) {
-  flex-grow: 1;
-}
-/* TODO min-height for device size and orientation */
-.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
-  min-height: 200px;
-}
-@media only screen and (orientation: landscape) {
-  .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
-    min-height: 200px;
-  }
-}
-@media only screen and (min-device-width : 320px) and (max-device-width : 568px) and (orientation : landscape) {
-  .tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
-    min-height: 150px;
-  }
-}
-/* styles menu */
-.tinymce-mobile-styles-menu {
-  font-family: sans-serif;
-  outline: 4px solid black;
-  overflow: hidden;
-  position: relative;
-  width: 100%;
-}
-.tinymce-mobile-styles-menu [role="menu"] {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  position: absolute;
-  width: 100%;
-}
-.tinymce-mobile-styles-menu [role="menu"].transitioning {
-  transition: transform 0.5s ease-in-out;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-item {
-  border-bottom: 1px solid #ddd;
-  color: #455a64;
-  cursor: pointer;
-  display: flex;
-  padding: 1em 1em;
-  position: relative;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser .tinymce-mobile-styles-collapse-icon::before {
-  color: #455a64;
-  content: "\e314";
-  font-family: 'tinymce-mobile', sans-serif;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-styles-item-is-menu::after {
-  color: #455a64;
-  content: "\e315";
-  font-family: 'tinymce-mobile', sans-serif;
-  padding-left: 1em;
-  padding-right: 1em;
-  position: absolute;
-  right: 0;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-format-matches::after {
-  font-family: 'tinymce-mobile', sans-serif;
-  padding-left: 1em;
-  padding-right: 1em;
-  position: absolute;
-  right: 0;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-separator,
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser {
-  align-items: center;
-  background: #fff;
-  border-top: #455a64;
-  color: #455a64;
-  display: flex;
-  min-height: 2.5em;
-  padding-left: 1em;
-  padding-right: 1em;
-}
-.tinymce-mobile-styles-menu [data-transitioning-destination="before"][data-transitioning-state],
-.tinymce-mobile-styles-menu [data-transitioning-state="before"] {
-  transform: translate(-100%);
-}
-.tinymce-mobile-styles-menu [data-transitioning-destination="current"][data-transitioning-state],
-.tinymce-mobile-styles-menu [data-transitioning-state="current"] {
-  transform: translate(0%);
-}
-.tinymce-mobile-styles-menu [data-transitioning-destination="after"][data-transitioning-state],
-.tinymce-mobile-styles-menu [data-transitioning-state="after"] {
-  transform: translate(100%);
-}
-@font-face {
-  font-family: 'tinymce-mobile';
-  font-style: normal;
-  font-weight: normal;
-  src: url('fonts/tinymce-mobile.woff?8x92w3') format('woff');
-}
-@media (min-device-width: 700px) {
-  .tinymce-mobile-outer-container,
-  .tinymce-mobile-outer-container input {
-    font-size: 25px;
-  }
-}
-@media (max-device-width: 700px) {
-  .tinymce-mobile-outer-container,
-  .tinymce-mobile-outer-container input {
-    font-size: 18px;
-  }
-}
-.tinymce-mobile-icon {
-  font-family: 'tinymce-mobile', sans-serif;
-}
-.mixin-flex-and-centre {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-}
-.mixin-flex-bar {
-  align-items: center;
-  display: flex;
-  height: 100%;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-editor-socket iframe {
-  background-color: #fff;
-  width: 100%;
-}
-.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
-  /* Note, on the iPod touch in landscape, this isn't visible when the navbar appears */
-  background-color: #207ab7;
-  border-radius: 50%;
-  bottom: 1em;
-  color: white;
-  font-size: 1em;
-  height: 2.1em;
-  position: fixed;
-  right: 2em;
-  width: 2.1em;
-  align-items: center;
-  display: flex;
-  justify-content: center;
-}
-@media only screen and (min-device-width:700px) {
-  .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
-    font-size: 1.2em;
-  }
-}
-.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket {
-  height: 300px;
-  overflow: hidden;
-}
-.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket iframe {
-  height: 100%;
-}
-.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-toolstrip {
-  display: none;
-}
-/*
-  Note, that if you don't include this (::-webkit-file-upload-button), the toolbar width gets
-  increased and the whole body becomes scrollable. It's important!
- */
-input[type="file"]::-webkit-file-upload-button {
-  display: none;
-}
-@media only screen and (min-device-width : 320px) and (max-device-width : 568px) and (orientation : landscape) {
-  .tinymce-mobile-ios-container .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
-    bottom: 50%;
-  }
-}
--- a/public/tinymce/skins/ui/oxide-dark/skin.mobile.min.css
+++ b/public/tinymce/skins/ui/oxide-dark/skin.mobile.min.css
--- a/public/tinymce/skins/ui/oxide/content.css
+++ b/public/tinymce/skins/ui/oxide/content.css
@@ -1,695 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.mce-content-body .mce-item-anchor {
-  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
-  cursor: default;
-  display: inline-block;
-  height: 12px !important;
-  padding: 0 2px;
-  -webkit-user-modify: read-only;
-  -moz-user-modify: read-only;
-  -webkit-user-select: all;
-  -moz-user-select: all;
-  -ms-user-select: all;
-      user-select: all;
-  width: 8px !important;
-}
-.mce-content-body .mce-item-anchor[data-mce-selected] {
-  outline-offset: 1px;
-}
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
-}
-.tox-comments-visible .tox-comment--active {
-  background-color: #ffe168;
-}
-.tox-checklist > li:not(.tox-checklist--hidden) {
-  list-style: none;
-  margin: 0.25em 0;
-}
-.tox-checklist > li:not(.tox-checklist--hidden)::before {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
-  background-size: 100%;
-  content: '';
-  cursor: pointer;
-  height: 1em;
-  margin-left: -1.5em;
-  margin-top: 0.125em;
-  position: absolute;
-  width: 1em;
-}
-.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
-}
-[dir=rtl] .tox-checklist > li:not(.tox-checklist--hidden)::before {
-  margin-left: 0;
-  margin-right: -1.5em;
-}
-/* stylelint-disable */
-/* http://prismjs.com/ */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  font-size: 1em;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-  -moz-tab-size: 4;
-  tab-size: 4;
-  -webkit-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-@media print {
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: 0.5em 0;
-  overflow: auto;
-}
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-/* Inline code */
-:not(pre) > code[class*="language-"] {
-  padding: 0.1em;
-  border-radius: 0.3em;
-  white-space: normal;
-}
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-.token.punctuation {
-  color: #999;
-}
-.namespace {
-  opacity: 0.7;
-}
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, 0.5);
-}
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-.token.italic {
-  font-style: italic;
-}
-.token.entity {
-  cursor: help;
-}
-/* stylelint-enable */
-.mce-content-body {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-}
-.mce-content-body .mce-visual-caret {
-  background-color: black;
-  background-color: currentColor;
-  position: absolute;
-}
-.mce-content-body .mce-visual-caret-hidden {
-  display: none;
-}
-.mce-content-body *[data-mce-caret] {
-  left: -1000px;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  right: auto;
-  top: 0;
-}
-.mce-content-body .mce-offscreen-selection {
-  left: -2000000px;
-  max-width: 1000000px;
-  position: absolute;
-}
-.mce-content-body *[contentEditable=false] {
-  cursor: default;
-}
-.mce-content-body *[contentEditable=true] {
-  cursor: text;
-}
-.tox-cursor-format-painter {
-  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
-}
-.mce-content-body figure.align-left {
-  float: left;
-}
-.mce-content-body figure.align-right {
-  float: right;
-}
-.mce-content-body figure.image.align-center {
-  display: table;
-  margin-left: auto;
-  margin-right: auto;
-}
-.mce-preview-object {
-  border: 1px solid gray;
-  display: inline-block;
-  line-height: 0;
-  margin: 0 2px 0 2px;
-  position: relative;
-}
-.mce-preview-object .mce-shim {
-  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.mce-preview-object[data-mce-selected="2"] .mce-shim {
-  display: none;
-}
-.mce-object {
-  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
-  border: 1px dashed #aaa;
-}
-.mce-pagebreak {
-  border: 1px dashed #aaa;
-  cursor: default;
-  display: block;
-  height: 5px;
-  margin-top: 15px;
-  page-break-before: always;
-  width: 100%;
-}
-@media print {
-  .mce-pagebreak {
-    border: 0;
-  }
-}
-.tiny-pageembed .mce-shim {
-  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.tiny-pageembed[data-mce-selected="2"] .mce-shim {
-  display: none;
-}
-.tiny-pageembed {
-  display: inline-block;
-  position: relative;
-}
-.tiny-pageembed--21by9,
-.tiny-pageembed--16by9,
-.tiny-pageembed--4by3,
-.tiny-pageembed--1by1 {
-  display: block;
-  overflow: hidden;
-  padding: 0;
-  position: relative;
-  width: 100%;
-}
-.tiny-pageembed--21by9 {
-  padding-top: 42.857143%;
-}
-.tiny-pageembed--16by9 {
-  padding-top: 56.25%;
-}
-.tiny-pageembed--4by3 {
-  padding-top: 75%;
-}
-.tiny-pageembed--1by1 {
-  padding-top: 100%;
-}
-.tiny-pageembed--21by9 iframe,
-.tiny-pageembed--16by9 iframe,
-.tiny-pageembed--4by3 iframe,
-.tiny-pageembed--1by1 iframe {
-  border: 0;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.mce-content-body[data-mce-placeholder] {
-  position: relative;
-}
-.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before {
-  color: rgba(34, 47, 62, 0.7);
-  content: attr(data-mce-placeholder);
-  position: absolute;
-}
-.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before {
-  left: 1px;
-}
-.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before {
-  right: 1px;
-}
-.mce-content-body div.mce-resizehandle {
-  background-color: #4099ff;
-  border-color: #4099ff;
-  border-style: solid;
-  border-width: 1px;
-  box-sizing: border-box;
-  height: 10px;
-  position: absolute;
-  width: 10px;
-  z-index: 10000;
-}
-.mce-content-body div.mce-resizehandle:hover {
-  background-color: #4099ff;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(1) {
-  cursor: nwse-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(2) {
-  cursor: nesw-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(3) {
-  cursor: nwse-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(4) {
-  cursor: nesw-resize;
-}
-.mce-content-body .mce-clonedresizable {
-  opacity: 0.5;
-  outline: 1px dashed black;
-  position: absolute;
-  z-index: 10000;
-}
-.mce-content-body .mce-resize-helper {
-  background: #555;
-  background: rgba(0, 0, 0, 0.75);
-  border: 1px;
-  border-radius: 3px;
-  color: white;
-  display: none;
-  font-family: sans-serif;
-  font-size: 12px;
-  line-height: 14px;
-  margin: 5px 10px;
-  padding: 5px;
-  position: absolute;
-  white-space: nowrap;
-  z-index: 10001;
-}
-.tox-rtc-user-selection {
-  position: relative;
-}
-.tox-rtc-user-cursor {
-  bottom: 0;
-  cursor: default;
-  position: absolute;
-  top: 0;
-  width: 2px;
-}
-.tox-rtc-user-cursor::before {
-  background-color: inherit;
-  border-radius: 50%;
-  content: '';
-  display: block;
-  height: 8px;
-  position: absolute;
-  right: -3px;
-  top: -3px;
-  width: 8px;
-}
-.tox-rtc-user-cursor:hover::after {
-  background-color: inherit;
-  border-radius: 100px;
-  box-sizing: border-box;
-  color: #fff;
-  content: attr(data-user);
-  display: block;
-  font-size: 12px;
-  font-weight: bold;
-  left: -5px;
-  min-height: 8px;
-  min-width: 8px;
-  padding: 0 12px;
-  position: absolute;
-  top: -11px;
-  white-space: nowrap;
-  z-index: 1000;
-}
-.tox-rtc-user-selection--1 .tox-rtc-user-cursor {
-  background-color: #2dc26b;
-}
-.tox-rtc-user-selection--2 .tox-rtc-user-cursor {
-  background-color: #e03e2d;
-}
-.tox-rtc-user-selection--3 .tox-rtc-user-cursor {
-  background-color: #f1c40f;
-}
-.tox-rtc-user-selection--4 .tox-rtc-user-cursor {
-  background-color: #3598db;
-}
-.tox-rtc-user-selection--5 .tox-rtc-user-cursor {
-  background-color: #b96ad9;
-}
-.tox-rtc-user-selection--6 .tox-rtc-user-cursor {
-  background-color: #e67e23;
-}
-.tox-rtc-user-selection--7 .tox-rtc-user-cursor {
-  background-color: #aaa69d;
-}
-.tox-rtc-user-selection--8 .tox-rtc-user-cursor {
-  background-color: #f368e0;
-}
-.tox-rtc-remote-image {
-  background: #eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;
-  border: 1px solid #ccc;
-  min-height: 240px;
-  min-width: 320px;
-}
-.mce-match-marker {
-  background: #aaa;
-  color: #fff;
-}
-.mce-match-marker-selected {
-  background: #39f;
-  color: #fff;
-}
-.mce-match-marker-selected::-moz-selection {
-  background: #39f;
-  color: #fff;
-}
-.mce-match-marker-selected::selection {
-  background: #39f;
-  color: #fff;
-}
-.mce-content-body img[data-mce-selected],
-.mce-content-body table[data-mce-selected] {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body hr[data-mce-selected] {
-  outline: 3px solid #b4d7ff;
-  outline-offset: 1px;
-}
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body *[contentEditable=false][data-mce-selected] {
-  cursor: not-allowed;
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,
-.mce-content-body.mce-content-readonly *[contentEditable=true]:hover {
-  outline: none;
-}
-.mce-content-body *[data-mce-selected="inline-boundary"] {
-  background-color: #b4d7ff;
-}
-.mce-content-body .mce-edit-focus {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body td[data-mce-selected],
-.mce-content-body th[data-mce-selected] {
-  background-color: #b4d7ff !important;
-}
-.mce-content-body td[data-mce-selected]::-moz-selection,
-.mce-content-body th[data-mce-selected]::-moz-selection {
-  background: none;
-}
-.mce-content-body td[data-mce-selected]::selection,
-.mce-content-body th[data-mce-selected]::selection {
-  background: none;
-}
-.mce-content-body td[data-mce-selected] *,
-.mce-content-body th[data-mce-selected] * {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-}
-.mce-content-body img::-moz-selection {
-  background: none;
-}
-.mce-content-body img::selection {
-  background: none;
-}
-.ephox-snooker-resizer-bar {
-  background-color: #b4d7ff;
-  opacity: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.ephox-snooker-resizer-cols {
-  cursor: col-resize;
-}
-.ephox-snooker-resizer-rows {
-  cursor: row-resize;
-}
-.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging {
-  opacity: 1;
-}
-.mce-spellchecker-word {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
-  background-position: 0 calc(100% + 1px);
-  background-repeat: repeat-x;
-  background-size: auto 6px;
-  cursor: default;
-  height: 2rem;
-}
-.mce-spellchecker-grammar {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
-  background-position: 0 calc(100% + 1px);
-  background-repeat: repeat-x;
-  background-size: auto 6px;
-  cursor: default;
-}
-.mce-toc {
-  border: 1px solid gray;
-}
-.mce-toc h2 {
-  margin: 4px;
-}
-.mce-toc li {
-  list-style-type: none;
-}
-.mce-item-table,
-.mce-item-table td,
-.mce-item-table th,
-.mce-item-table caption {
-  border: 1px dashed #bbb;
-}
-.mce-visualblocks p,
-.mce-visualblocks h1,
-.mce-visualblocks h2,
-.mce-visualblocks h3,
-.mce-visualblocks h4,
-.mce-visualblocks h5,
-.mce-visualblocks h6,
-.mce-visualblocks div:not([data-mce-bogus]),
-.mce-visualblocks section,
-.mce-visualblocks article,
-.mce-visualblocks blockquote,
-.mce-visualblocks address,
-.mce-visualblocks pre,
-.mce-visualblocks figure,
-.mce-visualblocks figcaption,
-.mce-visualblocks hgroup,
-.mce-visualblocks aside,
-.mce-visualblocks ul,
-.mce-visualblocks ol,
-.mce-visualblocks dl {
-  background-repeat: no-repeat;
-  border: 1px dashed #bbb;
-  margin-left: 3px;
-  padding-top: 10px;
-}
-.mce-visualblocks p {
-  background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
-}
-.mce-visualblocks h1 {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
-}
-.mce-visualblocks h2 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
-}
-.mce-visualblocks h3 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
-}
-.mce-visualblocks h4 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
-}
-.mce-visualblocks h5 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
-}
-.mce-visualblocks h6 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
-}
-.mce-visualblocks div:not([data-mce-bogus]) {
-  background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
-}
-.mce-visualblocks section {
-  background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
-}
-.mce-visualblocks article {
-  background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
-}
-.mce-visualblocks blockquote {
-  background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
-}
-.mce-visualblocks address {
-  background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
-}
-.mce-visualblocks pre {
-  background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
-}
-.mce-visualblocks figure {
-  background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
-}
-.mce-visualblocks figcaption {
-  border: 1px dashed #bbb;
-}
-.mce-visualblocks hgroup {
-  background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
-}
-.mce-visualblocks aside {
-  background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
-}
-.mce-visualblocks ul {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);
-}
-.mce-visualblocks ol {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
-}
-.mce-visualblocks dl {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
-}
-.mce-visualblocks:not([dir=rtl]) p,
-.mce-visualblocks:not([dir=rtl]) h1,
-.mce-visualblocks:not([dir=rtl]) h2,
-.mce-visualblocks:not([dir=rtl]) h3,
-.mce-visualblocks:not([dir=rtl]) h4,
-.mce-visualblocks:not([dir=rtl]) h5,
-.mce-visualblocks:not([dir=rtl]) h6,
-.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),
-.mce-visualblocks:not([dir=rtl]) section,
-.mce-visualblocks:not([dir=rtl]) article,
-.mce-visualblocks:not([dir=rtl]) blockquote,
-.mce-visualblocks:not([dir=rtl]) address,
-.mce-visualblocks:not([dir=rtl]) pre,
-.mce-visualblocks:not([dir=rtl]) figure,
-.mce-visualblocks:not([dir=rtl]) figcaption,
-.mce-visualblocks:not([dir=rtl]) hgroup,
-.mce-visualblocks:not([dir=rtl]) aside,
-.mce-visualblocks:not([dir=rtl]) ul,
-.mce-visualblocks:not([dir=rtl]) ol,
-.mce-visualblocks:not([dir=rtl]) dl {
-  margin-left: 3px;
-}
-.mce-visualblocks[dir=rtl] p,
-.mce-visualblocks[dir=rtl] h1,
-.mce-visualblocks[dir=rtl] h2,
-.mce-visualblocks[dir=rtl] h3,
-.mce-visualblocks[dir=rtl] h4,
-.mce-visualblocks[dir=rtl] h5,
-.mce-visualblocks[dir=rtl] h6,
-.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),
-.mce-visualblocks[dir=rtl] section,
-.mce-visualblocks[dir=rtl] article,
-.mce-visualblocks[dir=rtl] blockquote,
-.mce-visualblocks[dir=rtl] address,
-.mce-visualblocks[dir=rtl] pre,
-.mce-visualblocks[dir=rtl] figure,
-.mce-visualblocks[dir=rtl] figcaption,
-.mce-visualblocks[dir=rtl] hgroup,
-.mce-visualblocks[dir=rtl] aside,
-.mce-visualblocks[dir=rtl] ul,
-.mce-visualblocks[dir=rtl] ol,
-.mce-visualblocks[dir=rtl] dl {
-  background-position-x: right;
-  margin-right: 3px;
-}
-.mce-nbsp,
-.mce-shy {
-  background: #aaa;
-}
-.mce-shy::after {
-  content: '-';
-}
-body {
-  font-family: sans-serif;
-}
-table {
-  border-collapse: collapse;
-}
--- a/public/tinymce/skins/ui/oxide/content.inline.css
+++ b/public/tinymce/skins/ui/oxide/content.inline.css
@@ -1,689 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.mce-content-body .mce-item-anchor {
-  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'8'%20height%3D'12'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20d%3D'M0%200L8%200%208%2012%204.09117821%209%200%2012z'%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
-  cursor: default;
-  display: inline-block;
-  height: 12px !important;
-  padding: 0 2px;
-  -webkit-user-modify: read-only;
-  -moz-user-modify: read-only;
-  -webkit-user-select: all;
-  -moz-user-select: all;
-  -ms-user-select: all;
-      user-select: all;
-  width: 8px !important;
-}
-.mce-content-body .mce-item-anchor[data-mce-selected] {
-  outline-offset: 1px;
-}
-.tox-comments-visible .tox-comment {
-  background-color: #fff0b7;
-}
-.tox-comments-visible .tox-comment--active {
-  background-color: #ffe168;
-}
-.tox-checklist > li:not(.tox-checklist--hidden) {
-  list-style: none;
-  margin: 0.25em 0;
-}
-.tox-checklist > li:not(.tox-checklist--hidden)::before {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-unchecked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2215%22%20height%3D%2215%22%20x%3D%22.5%22%20y%3D%22.5%22%20fill-rule%3D%22nonzero%22%20stroke%3D%22%234C4C4C%22%20rx%3D%222%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
-  background-size: 100%;
-  content: '';
-  cursor: pointer;
-  height: 1em;
-  margin-left: -1.5em;
-  margin-top: 0.125em;
-  position: absolute;
-  width: 1em;
-}
-.tox-checklist li:not(.tox-checklist--hidden).tox-checklist--checked::before {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2216%22%20viewBox%3D%220%200%2016%2016%22%3E%3Cg%20id%3D%22checklist-checked%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%3Crect%20id%3D%22Rectangle%22%20width%3D%2216%22%20height%3D%2216%22%20fill%3D%22%234099FF%22%20fill-rule%3D%22nonzero%22%20rx%3D%222%22%2F%3E%3Cpath%20id%3D%22Path%22%20fill%3D%22%23FFF%22%20fill-rule%3D%22nonzero%22%20d%3D%22M11.5703186%2C3.14417309%20C11.8516238%2C2.73724603%2012.4164781%2C2.62829933%2012.83558%2C2.89774797%20C13.260121%2C3.17069355%2013.3759736%2C3.72932262%2013.0909105%2C4.14168582%20L7.7580587%2C11.8560195%20C7.43776896%2C12.3193404%206.76483983%2C12.3852142%206.35607322%2C11.9948725%20L3.02491697%2C8.8138662%20C2.66090143%2C8.46625845%202.65798871%2C7.89594698%203.01850234%2C7.54483354%20C3.373942%2C7.19866177%203.94940006%2C7.19592841%204.30829608%2C7.5386474%20L6.85276923%2C9.9684299%20L11.5703186%2C3.14417309%20Z%22%2F%3E%3C%2Fg%3E%3C%2Fsvg%3E%0A");
-}
-[dir=rtl] .tox-checklist > li:not(.tox-checklist--hidden)::before {
-  margin-left: 0;
-  margin-right: -1.5em;
-}
-/* stylelint-disable */
-/* http://prismjs.com/ */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  font-size: 1em;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-  -moz-tab-size: 4;
-  tab-size: 4;
-  -webkit-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-@media print {
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: 0.5em 0;
-  overflow: auto;
-}
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-/* Inline code */
-:not(pre) > code[class*="language-"] {
-  padding: 0.1em;
-  border-radius: 0.3em;
-  white-space: normal;
-}
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-.token.punctuation {
-  color: #999;
-}
-.namespace {
-  opacity: 0.7;
-}
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, 0.5);
-}
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-.token.italic {
-  font-style: italic;
-}
-.token.entity {
-  cursor: help;
-}
-/* stylelint-enable */
-.mce-content-body {
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-}
-.mce-content-body .mce-visual-caret {
-  background-color: black;
-  background-color: currentColor;
-  position: absolute;
-}
-.mce-content-body .mce-visual-caret-hidden {
-  display: none;
-}
-.mce-content-body *[data-mce-caret] {
-  left: -1000px;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  right: auto;
-  top: 0;
-}
-.mce-content-body .mce-offscreen-selection {
-  left: -2000000px;
-  max-width: 1000000px;
-  position: absolute;
-}
-.mce-content-body *[contentEditable=false] {
-  cursor: default;
-}
-.mce-content-body *[contentEditable=true] {
-  cursor: text;
-}
-.tox-cursor-format-painter {
-  cursor: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%3E%0A%20%20%3Cg%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M15%2C6%20C15%2C5.45%2014.55%2C5%2014%2C5%20L6%2C5%20C5.45%2C5%205%2C5.45%205%2C6%20L5%2C10%20C5%2C10.55%205.45%2C11%206%2C11%20L14%2C11%20C14.55%2C11%2015%2C10.55%2015%2C10%20L15%2C9%20L16%2C9%20L16%2C12%20L9%2C12%20L9%2C19%20C9%2C19.55%209.45%2C20%2010%2C20%20L11%2C20%20C11.55%2C20%2012%2C19.55%2012%2C19%20L12%2C14%20L18%2C14%20L18%2C7%20L15%2C7%20L15%2C6%20Z%22%2F%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23000%22%20fill-rule%3D%22nonzero%22%20d%3D%22M1%2C1%20L8.25%2C1%20C8.66421356%2C1%209%2C1.33578644%209%2C1.75%20L9%2C1.75%20C9%2C2.16421356%208.66421356%2C2.5%208.25%2C2.5%20L2.5%2C2.5%20L2.5%2C8.25%20C2.5%2C8.66421356%202.16421356%2C9%201.75%2C9%20L1.75%2C9%20C1.33578644%2C9%201%2C8.66421356%201%2C8.25%20L1%2C1%20Z%22%2F%3E%0A%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E%0A"), default;
-}
-.mce-content-body figure.align-left {
-  float: left;
-}
-.mce-content-body figure.align-right {
-  float: right;
-}
-.mce-content-body figure.image.align-center {
-  display: table;
-  margin-left: auto;
-  margin-right: auto;
-}
-.mce-preview-object {
-  border: 1px solid gray;
-  display: inline-block;
-  line-height: 0;
-  margin: 0 2px 0 2px;
-  position: relative;
-}
-.mce-preview-object .mce-shim {
-  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.mce-preview-object[data-mce-selected="2"] .mce-shim {
-  display: none;
-}
-.mce-object {
-  background: transparent url("data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%203h16a1%201%200%200%201%201%201v16a1%201%200%200%201-1%201H4a1%201%200%200%201-1-1V4a1%201%200%200%201%201-1zm1%202v14h14V5H5zm4.79%202.565l5.64%204.028a.5.5%200%200%201%200%20.814l-5.64%204.028a.5.5%200%200%201-.79-.407V7.972a.5.5%200%200%201%20.79-.407z%22%2F%3E%3C%2Fsvg%3E%0A") no-repeat center;
-  border: 1px dashed #aaa;
-}
-.mce-pagebreak {
-  border: 1px dashed #aaa;
-  cursor: default;
-  display: block;
-  height: 5px;
-  margin-top: 15px;
-  page-break-before: always;
-  width: 100%;
-}
-@media print {
-  .mce-pagebreak {
-    border: 0;
-  }
-}
-.tiny-pageembed .mce-shim {
-  background: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.tiny-pageembed[data-mce-selected="2"] .mce-shim {
-  display: none;
-}
-.tiny-pageembed {
-  display: inline-block;
-  position: relative;
-}
-.tiny-pageembed--21by9,
-.tiny-pageembed--16by9,
-.tiny-pageembed--4by3,
-.tiny-pageembed--1by1 {
-  display: block;
-  overflow: hidden;
-  padding: 0;
-  position: relative;
-  width: 100%;
-}
-.tiny-pageembed--21by9 {
-  padding-top: 42.857143%;
-}
-.tiny-pageembed--16by9 {
-  padding-top: 56.25%;
-}
-.tiny-pageembed--4by3 {
-  padding-top: 75%;
-}
-.tiny-pageembed--1by1 {
-  padding-top: 100%;
-}
-.tiny-pageembed--21by9 iframe,
-.tiny-pageembed--16by9 iframe,
-.tiny-pageembed--4by3 iframe,
-.tiny-pageembed--1by1 iframe {
-  border: 0;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.mce-content-body[data-mce-placeholder] {
-  position: relative;
-}
-.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before {
-  color: rgba(34, 47, 62, 0.7);
-  content: attr(data-mce-placeholder);
-  position: absolute;
-}
-.mce-content-body:not([dir=rtl])[data-mce-placeholder]:not(.mce-visualblocks)::before {
-  left: 1px;
-}
-.mce-content-body[dir=rtl][data-mce-placeholder]:not(.mce-visualblocks)::before {
-  right: 1px;
-}
-.mce-content-body div.mce-resizehandle {
-  background-color: #4099ff;
-  border-color: #4099ff;
-  border-style: solid;
-  border-width: 1px;
-  box-sizing: border-box;
-  height: 10px;
-  position: absolute;
-  width: 10px;
-  z-index: 10000;
-}
-.mce-content-body div.mce-resizehandle:hover {
-  background-color: #4099ff;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(1) {
-  cursor: nwse-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(2) {
-  cursor: nesw-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(3) {
-  cursor: nwse-resize;
-}
-.mce-content-body div.mce-resizehandle:nth-of-type(4) {
-  cursor: nesw-resize;
-}
-.mce-content-body .mce-clonedresizable {
-  opacity: 0.5;
-  outline: 1px dashed black;
-  position: absolute;
-  z-index: 10000;
-}
-.mce-content-body .mce-resize-helper {
-  background: #555;
-  background: rgba(0, 0, 0, 0.75);
-  border: 1px;
-  border-radius: 3px;
-  color: white;
-  display: none;
-  font-family: sans-serif;
-  font-size: 12px;
-  line-height: 14px;
-  margin: 5px 10px;
-  padding: 5px;
-  position: absolute;
-  white-space: nowrap;
-  z-index: 10001;
-}
-.tox-rtc-user-selection {
-  position: relative;
-}
-.tox-rtc-user-cursor {
-  bottom: 0;
-  cursor: default;
-  position: absolute;
-  top: 0;
-  width: 2px;
-}
-.tox-rtc-user-cursor::before {
-  background-color: inherit;
-  border-radius: 50%;
-  content: '';
-  display: block;
-  height: 8px;
-  position: absolute;
-  right: -3px;
-  top: -3px;
-  width: 8px;
-}
-.tox-rtc-user-cursor:hover::after {
-  background-color: inherit;
-  border-radius: 100px;
-  box-sizing: border-box;
-  color: #fff;
-  content: attr(data-user);
-  display: block;
-  font-size: 12px;
-  font-weight: bold;
-  left: -5px;
-  min-height: 8px;
-  min-width: 8px;
-  padding: 0 12px;
-  position: absolute;
-  top: -11px;
-  white-space: nowrap;
-  z-index: 1000;
-}
-.tox-rtc-user-selection--1 .tox-rtc-user-cursor {
-  background-color: #2dc26b;
-}
-.tox-rtc-user-selection--2 .tox-rtc-user-cursor {
-  background-color: #e03e2d;
-}
-.tox-rtc-user-selection--3 .tox-rtc-user-cursor {
-  background-color: #f1c40f;
-}
-.tox-rtc-user-selection--4 .tox-rtc-user-cursor {
-  background-color: #3598db;
-}
-.tox-rtc-user-selection--5 .tox-rtc-user-cursor {
-  background-color: #b96ad9;
-}
-.tox-rtc-user-selection--6 .tox-rtc-user-cursor {
-  background-color: #e67e23;
-}
-.tox-rtc-user-selection--7 .tox-rtc-user-cursor {
-  background-color: #aaa69d;
-}
-.tox-rtc-user-selection--8 .tox-rtc-user-cursor {
-  background-color: #f368e0;
-}
-.tox-rtc-remote-image {
-  background: #eaeaea url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D%2236%22%20height%3D%2212%22%20viewBox%3D%220%200%2036%2012%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%20%20%3Ccircle%20cx%3D%226%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2218%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.33s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%20%20%3Ccircle%20cx%3D%2230%22%20cy%3D%226%22%20r%3D%223%22%20fill%3D%22rgba(0%2C%200%2C%200%2C%20.2)%22%3E%0A%20%20%20%20%3Canimate%20attributeName%3D%22r%22%20values%3D%223%3B5%3B3%22%20calcMode%3D%22linear%22%20begin%3D%22.66s%22%20dur%3D%221s%22%20repeatCount%3D%22indefinite%22%20%2F%3E%0A%20%20%3C%2Fcircle%3E%0A%3C%2Fsvg%3E%0A") no-repeat center center;
-  border: 1px solid #ccc;
-  min-height: 240px;
-  min-width: 320px;
-}
-.mce-match-marker {
-  background: #aaa;
-  color: #fff;
-}
-.mce-match-marker-selected {
-  background: #39f;
-  color: #fff;
-}
-.mce-match-marker-selected::-moz-selection {
-  background: #39f;
-  color: #fff;
-}
-.mce-match-marker-selected::selection {
-  background: #39f;
-  color: #fff;
-}
-.mce-content-body img[data-mce-selected],
-.mce-content-body table[data-mce-selected] {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body hr[data-mce-selected] {
-  outline: 3px solid #b4d7ff;
-  outline-offset: 1px;
-}
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body *[contentEditable=false][data-mce-selected] {
-  cursor: not-allowed;
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,
-.mce-content-body.mce-content-readonly *[contentEditable=true]:hover {
-  outline: none;
-}
-.mce-content-body *[data-mce-selected="inline-boundary"] {
-  background-color: #b4d7ff;
-}
-.mce-content-body .mce-edit-focus {
-  outline: 3px solid #b4d7ff;
-}
-.mce-content-body td[data-mce-selected],
-.mce-content-body th[data-mce-selected] {
-  background-color: #b4d7ff !important;
-}
-.mce-content-body td[data-mce-selected]::-moz-selection,
-.mce-content-body th[data-mce-selected]::-moz-selection {
-  background: none;
-}
-.mce-content-body td[data-mce-selected]::selection,
-.mce-content-body th[data-mce-selected]::selection {
-  background: none;
-}
-.mce-content-body td[data-mce-selected] *,
-.mce-content-body th[data-mce-selected] * {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-}
-.mce-content-body img::-moz-selection {
-  background: none;
-}
-.mce-content-body img::selection {
-  background: none;
-}
-.ephox-snooker-resizer-bar {
-  background-color: #b4d7ff;
-  opacity: 0;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.ephox-snooker-resizer-cols {
-  cursor: col-resize;
-}
-.ephox-snooker-resizer-rows {
-  cursor: row-resize;
-}
-.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging {
-  opacity: 1;
-}
-.mce-spellchecker-word {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%23ff0000'%20fill%3D'none'%20stroke-linecap%3D'round'%20stroke-opacity%3D'.75'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
-  background-position: 0 calc(100% + 1px);
-  background-repeat: repeat-x;
-  background-size: auto 6px;
-  cursor: default;
-  height: 2rem;
-}
-.mce-spellchecker-grammar {
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3Csvg%20width%3D'4'%20height%3D'4'%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%3E%3Cpath%20stroke%3D'%2300A835'%20fill%3D'none'%20stroke-linecap%3D'round'%20d%3D'M0%203L2%201%204%203'%2F%3E%3C%2Fsvg%3E%0A");
-  background-position: 0 calc(100% + 1px);
-  background-repeat: repeat-x;
-  background-size: auto 6px;
-  cursor: default;
-}
-.mce-toc {
-  border: 1px solid gray;
-}
-.mce-toc h2 {
-  margin: 4px;
-}
-.mce-toc li {
-  list-style-type: none;
-}
-.mce-item-table,
-.mce-item-table td,
-.mce-item-table th,
-.mce-item-table caption {
-  border: 1px dashed #bbb;
-}
-.mce-visualblocks p,
-.mce-visualblocks h1,
-.mce-visualblocks h2,
-.mce-visualblocks h3,
-.mce-visualblocks h4,
-.mce-visualblocks h5,
-.mce-visualblocks h6,
-.mce-visualblocks div:not([data-mce-bogus]),
-.mce-visualblocks section,
-.mce-visualblocks article,
-.mce-visualblocks blockquote,
-.mce-visualblocks address,
-.mce-visualblocks pre,
-.mce-visualblocks figure,
-.mce-visualblocks figcaption,
-.mce-visualblocks hgroup,
-.mce-visualblocks aside,
-.mce-visualblocks ul,
-.mce-visualblocks ol,
-.mce-visualblocks dl {
-  background-repeat: no-repeat;
-  border: 1px dashed #bbb;
-  margin-left: 3px;
-  padding-top: 10px;
-}
-.mce-visualblocks p {
-  background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
-}
-.mce-visualblocks h1 {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
-}
-.mce-visualblocks h2 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
-}
-.mce-visualblocks h3 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
-}
-.mce-visualblocks h4 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
-}
-.mce-visualblocks h5 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
-}
-.mce-visualblocks h6 {
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
-}
-.mce-visualblocks div:not([data-mce-bogus]) {
-  background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
-}
-.mce-visualblocks section {
-  background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
-}
-.mce-visualblocks article {
-  background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
-}
-.mce-visualblocks blockquote {
-  background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
-}
-.mce-visualblocks address {
-  background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
-}
-.mce-visualblocks pre {
-  background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
-}
-.mce-visualblocks figure {
-  background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
-}
-.mce-visualblocks figcaption {
-  border: 1px dashed #bbb;
-}
-.mce-visualblocks hgroup {
-  background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
-}
-.mce-visualblocks aside {
-  background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
-}
-.mce-visualblocks ul {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);
-}
-.mce-visualblocks ol {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
-}
-.mce-visualblocks dl {
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
-}
-.mce-visualblocks:not([dir=rtl]) p,
-.mce-visualblocks:not([dir=rtl]) h1,
-.mce-visualblocks:not([dir=rtl]) h2,
-.mce-visualblocks:not([dir=rtl]) h3,
-.mce-visualblocks:not([dir=rtl]) h4,
-.mce-visualblocks:not([dir=rtl]) h5,
-.mce-visualblocks:not([dir=rtl]) h6,
-.mce-visualblocks:not([dir=rtl]) div:not([data-mce-bogus]),
-.mce-visualblocks:not([dir=rtl]) section,
-.mce-visualblocks:not([dir=rtl]) article,
-.mce-visualblocks:not([dir=rtl]) blockquote,
-.mce-visualblocks:not([dir=rtl]) address,
-.mce-visualblocks:not([dir=rtl]) pre,
-.mce-visualblocks:not([dir=rtl]) figure,
-.mce-visualblocks:not([dir=rtl]) figcaption,
-.mce-visualblocks:not([dir=rtl]) hgroup,
-.mce-visualblocks:not([dir=rtl]) aside,
-.mce-visualblocks:not([dir=rtl]) ul,
-.mce-visualblocks:not([dir=rtl]) ol,
-.mce-visualblocks:not([dir=rtl]) dl {
-  margin-left: 3px;
-}
-.mce-visualblocks[dir=rtl] p,
-.mce-visualblocks[dir=rtl] h1,
-.mce-visualblocks[dir=rtl] h2,
-.mce-visualblocks[dir=rtl] h3,
-.mce-visualblocks[dir=rtl] h4,
-.mce-visualblocks[dir=rtl] h5,
-.mce-visualblocks[dir=rtl] h6,
-.mce-visualblocks[dir=rtl] div:not([data-mce-bogus]),
-.mce-visualblocks[dir=rtl] section,
-.mce-visualblocks[dir=rtl] article,
-.mce-visualblocks[dir=rtl] blockquote,
-.mce-visualblocks[dir=rtl] address,
-.mce-visualblocks[dir=rtl] pre,
-.mce-visualblocks[dir=rtl] figure,
-.mce-visualblocks[dir=rtl] figcaption,
-.mce-visualblocks[dir=rtl] hgroup,
-.mce-visualblocks[dir=rtl] aside,
-.mce-visualblocks[dir=rtl] ul,
-.mce-visualblocks[dir=rtl] ol,
-.mce-visualblocks[dir=rtl] dl {
-  background-position-x: right;
-  margin-right: 3px;
-}
-.mce-nbsp,
-.mce-shy {
-  background: #aaa;
-}
-.mce-shy::after {
-  content: '-';
-}
--- a/public/tinymce/skins/ui/oxide/content.inline.min.css
+++ b/public/tinymce/skins/ui/oxide/content.inline.min.css
--- a/public/tinymce/skins/ui/oxide/content.min.css
+++ b/public/tinymce/skins/ui/oxide/content.min.css
--- a/public/tinymce/skins/ui/oxide/content.mobile.css
+++ b/public/tinymce/skins/ui/oxide/content.mobile.css
@@ -1,29 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection {
-  /* Note: this file is used inside the content, so isn't part of theming */
-  background-color: green;
-  display: inline-block;
-  opacity: 0.5;
-  position: absolute;
-}
-body {
-  -webkit-text-size-adjust: none;
-}
-body img {
-  /* this is related to the content margin */
-  max-width: 96vw;
-}
-body table img {
-  max-width: 95%;
-}
-body {
-  font-family: sans-serif;
-}
-table {
-  border-collapse: collapse;
-}
--- a/public/tinymce/skins/ui/oxide/content.mobile.min.css
+++ b/public/tinymce/skins/ui/oxide/content.mobile.min.css
@@ -1,7 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-.tinymce-mobile-unfocused-selections .tinymce-mobile-unfocused-selection{background-color:green;display:inline-block;opacity:.5;position:absolute}body{-webkit-text-size-adjust:none}body img{max-width:96vw}body table img{max-width:95%}body{font-family:sans-serif}table{border-collapse:collapse}
--- a/public/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff
+++ b/public/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff
--- a/public/tinymce/skins/ui/oxide/skin.css
+++ b/public/tinymce/skins/ui/oxide/skin.css
--- a/public/tinymce/skins/ui/oxide/skin.min.css
+++ b/public/tinymce/skins/ui/oxide/skin.min.css
--- a/public/tinymce/skins/ui/oxide/skin.mobile.css
+++ b/public/tinymce/skins/ui/oxide/skin.mobile.css
@@ -1,673 +0,0 @@
-/**
- * Copyright (c) Tiny Technologies, Inc. All rights reserved.
- * Licensed under the LGPL or a commercial license.
- * For LGPL see License.txt in the project root for license information.
- * For commercial licenses see https://www.tiny.cloud/
- */
-/* RESET all the things! */
-.tinymce-mobile-outer-container {
-  all: initial;
-  display: block;
-}
-.tinymce-mobile-outer-container * {
-  border: 0;
-  box-sizing: initial;
-  cursor: inherit;
-  float: none;
-  line-height: 1;
-  margin: 0;
-  outline: 0;
-  padding: 0;
-  -webkit-tap-highlight-color: transparent;
-  /* TBIO-3691, stop the gray flicker on touch. */
-  text-shadow: none;
-  white-space: nowrap;
-}
-.tinymce-mobile-icon-arrow-back::before {
-  content: "\e5cd";
-}
-.tinymce-mobile-icon-image::before {
-  content: "\e412";
-}
-.tinymce-mobile-icon-cancel-circle::before {
-  content: "\e5c9";
-}
-.tinymce-mobile-icon-full-dot::before {
-  content: "\e061";
-}
-.tinymce-mobile-icon-align-center::before {
-  content: "\e234";
-}
-.tinymce-mobile-icon-align-left::before {
-  content: "\e236";
-}
-.tinymce-mobile-icon-align-right::before {
-  content: "\e237";
-}
-.tinymce-mobile-icon-bold::before {
-  content: "\e238";
-}
-.tinymce-mobile-icon-italic::before {
-  content: "\e23f";
-}
-.tinymce-mobile-icon-unordered-list::before {
-  content: "\e241";
-}
-.tinymce-mobile-icon-ordered-list::before {
-  content: "\e242";
-}
-.tinymce-mobile-icon-font-size::before {
-  content: "\e245";
-}
-.tinymce-mobile-icon-underline::before {
-  content: "\e249";
-}
-.tinymce-mobile-icon-link::before {
-  content: "\e157";
-}
-.tinymce-mobile-icon-unlink::before {
-  content: "\eca2";
-}
-.tinymce-mobile-icon-color::before {
-  content: "\e891";
-}
-.tinymce-mobile-icon-previous::before {
-  content: "\e314";
-}
-.tinymce-mobile-icon-next::before {
-  content: "\e315";
-}
-.tinymce-mobile-icon-large-font::before,
-.tinymce-mobile-icon-style-formats::before {
-  content: "\e264";
-}
-.tinymce-mobile-icon-undo::before {
-  content: "\e166";
-}
-.tinymce-mobile-icon-redo::before {
-  content: "\e15a";
-}
-.tinymce-mobile-icon-removeformat::before {
-  content: "\e239";
-}
-.tinymce-mobile-icon-small-font::before {
-  content: "\e906";
-}
-.tinymce-mobile-icon-readonly-back::before,
-.tinymce-mobile-format-matches::after {
-  content: "\e5ca";
-}
-.tinymce-mobile-icon-small-heading::before {
-  content: "small";
-}
-.tinymce-mobile-icon-large-heading::before {
-  content: "large";
-}
-.tinymce-mobile-icon-small-heading::before,
-.tinymce-mobile-icon-large-heading::before {
-  font-family: sans-serif;
-  font-size: 80%;
-}
-.tinymce-mobile-mask-edit-icon::before {
-  content: "\e254";
-}
-.tinymce-mobile-icon-back::before {
-  content: "\e5c4";
-}
-.tinymce-mobile-icon-heading::before {
-  /* TODO: Translate */
-  content: "Headings";
-  font-family: sans-serif;
-  font-size: 80%;
-  font-weight: bold;
-}
-.tinymce-mobile-icon-h1::before {
-  content: "H1";
-  font-weight: bold;
-}
-.tinymce-mobile-icon-h2::before {
-  content: "H2";
-  font-weight: bold;
-}
-.tinymce-mobile-icon-h3::before {
-  content: "H3";
-  font-weight: bold;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  background: rgba(51, 51, 51, 0.5);
-  height: 100%;
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container {
-  align-items: center;
-  border-radius: 50%;
-  display: flex;
-  flex-direction: column;
-  font-family: sans-serif;
-  font-size: 1em;
-  justify-content: space-between;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .mixin-menu-item {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  border-radius: 50%;
-  height: 2.1em;
-  width: 2.1em;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-  font-size: 1em;
-}
-@media only screen and (min-device-width:700px) {
-  .tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section {
-    font-size: 1.2em;
-  }
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  border-radius: 50%;
-  height: 2.1em;
-  width: 2.1em;
-  background-color: white;
-  color: #207ab7;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section .tinymce-mobile-mask-tap-icon::before {
-  content: "\e900";
-  font-family: 'tinymce-mobile', sans-serif;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-disabled-mask .tinymce-mobile-content-container .tinymce-mobile-content-tap-section:not(.tinymce-mobile-mask-tap-icon-selected) .tinymce-mobile-mask-tap-icon {
-  z-index: 2;
-}
-.tinymce-mobile-android-container.tinymce-mobile-android-maximized {
-  background: #ffffff;
-  border: none;
-  bottom: 0;
-  display: flex;
-  flex-direction: column;
-  left: 0;
-  position: fixed;
-  right: 0;
-  top: 0;
-}
-.tinymce-mobile-android-container:not(.tinymce-mobile-android-maximized) {
-  position: relative;
-}
-.tinymce-mobile-android-container .tinymce-mobile-editor-socket {
-  display: flex;
-  flex-grow: 1;
-}
-.tinymce-mobile-android-container .tinymce-mobile-editor-socket iframe {
-  display: flex !important;
-  flex-grow: 1;
-  height: auto !important;
-}
-.tinymce-mobile-android-scroll-reload {
-  overflow: hidden;
-}
-:not(.tinymce-mobile-readonly-mode) > .tinymce-mobile-android-selection-context-toolbar {
-  margin-top: 23px;
-}
-.tinymce-mobile-toolstrip {
-  background: #fff;
-  display: flex;
-  flex: 0 0 auto;
-  z-index: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar {
-  align-items: center;
-  background-color: #fff;
-  border-bottom: 1px solid #cccccc;
-  display: flex;
-  flex: 1;
-  height: 2.5em;
-  width: 100%;
-  /* Make it no larger than the toolstrip, so that it needs to scroll */
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group {
-  align-items: center;
-  display: flex;
-  height: 100%;
-  flex-shrink: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group > div {
-  align-items: center;
-  display: flex;
-  height: 100%;
-  flex: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container {
-  background: #f44336;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-toolbar-scrollable-group {
-  flex-grow: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item {
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button {
-  align-items: center;
-  display: flex;
-  height: 80%;
-  margin-left: 2px;
-  margin-right: 2px;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item.tinymce-mobile-toolbar-button.tinymce-mobile-toolbar-button-selected {
-  background: #c8cbcf;
-  color: #cccccc;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:first-of-type,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group:last-of-type {
-  background: #207ab7;
-  color: #eceff1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar {
-  /* Note, this file is imported inside .tinymce-mobile-context-toolbar, so that prefix is on everything here. */
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group {
-  align-items: center;
-  display: flex;
-  height: 100%;
-  flex: 1;
-  padding-bottom: 0.4em;
-  padding-top: 0.4em;
-  /* Make any buttons appearing on the left and right display in the centre (e.g. color edges) */
-  /* For widgets like the colour picker, use the whole height */
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog {
-  display: flex;
-  min-height: 1.5em;
-  overflow: hidden;
-  padding-left: 0;
-  padding-right: 0;
-  position: relative;
-  width: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain {
-  display: flex;
-  height: 100%;
-  transition: left cubic-bezier(0.4, 0, 1, 1) 0.15s;
-  width: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen {
-  display: flex;
-  flex: 0 0 auto;
-  justify-content: space-between;
-  width: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen input {
-  font-family: Sans-serif;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container {
-  display: flex;
-  flex-grow: 1;
-  position: relative;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container .tinymce-mobile-input-container-x {
-  -ms-grid-row-align: center;
-      align-self: center;
-  background: inherit;
-  border: none;
-  border-radius: 50%;
-  color: #888;
-  font-size: 0.6em;
-  font-weight: bold;
-  height: 100%;
-  padding-right: 2px;
-  position: absolute;
-  right: 0;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-input-container.tinymce-mobile-input-container-empty .tinymce-mobile-input-container-x {
-  display: none;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next {
-  align-items: center;
-  display: flex;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous::before,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next::before {
-  align-items: center;
-  display: flex;
-  font-weight: bold;
-  height: 100%;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-previous.tinymce-mobile-toolbar-navigation-disabled::before,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serialised-dialog .tinymce-mobile-serialised-dialog-chain .tinymce-mobile-serialised-dialog-screen .tinymce-mobile-icon-next.tinymce-mobile-toolbar-navigation-disabled::before {
-  visibility: hidden;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item {
-  color: #cccccc;
-  font-size: 10px;
-  line-height: 10px;
-  margin: 0 2px;
-  padding-top: 3px;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-item.tinymce-mobile-dot-active {
-  color: #c8cbcf;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-font::before,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-large-heading::before {
-  margin-left: 0.5em;
-  margin-right: 0.9em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-font::before,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-icon-small-heading::before {
-  margin-left: 0.9em;
-  margin-right: 0.5em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider {
-  display: flex;
-  flex: 1;
-  margin-left: 0;
-  margin-right: 0;
-  padding: 0.28em 0;
-  position: relative;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container {
-  align-items: center;
-  display: flex;
-  flex-grow: 1;
-  height: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line {
-  background: #cccccc;
-  display: flex;
-  flex: 1;
-  height: 0.2em;
-  margin-bottom: 0.3em;
-  margin-top: 0.3em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container {
-  padding-left: 2em;
-  padding-right: 2em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container {
-  align-items: center;
-  display: flex;
-  flex-grow: 1;
-  height: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient {
-  background: linear-gradient(to right, hsl(0, 100%, 50%) 0%, hsl(60, 100%, 50%) 17%, hsl(120, 100%, 50%) 33%, hsl(180, 100%, 50%) 50%, hsl(240, 100%, 50%) 67%, hsl(300, 100%, 50%) 83%, hsl(0, 100%, 50%) 100%);
-  display: flex;
-  flex: 1;
-  height: 0.2em;
-  margin-bottom: 0.3em;
-  margin-top: 0.3em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-black {
-  /* Not part of theming */
-  background: black;
-  height: 0.2em;
-  margin-bottom: 0.3em;
-  margin-top: 0.3em;
-  width: 1.2em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-hue-slider-white {
-  /* Not part of theming */
-  background: white;
-  height: 0.2em;
-  margin-bottom: 0.3em;
-  margin-top: 0.3em;
-  width: 1.2em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb {
-  /* vertically centering trick (margin: auto, top: 0, bottom: 0). On iOS and Safari, if you leave
-     * out these values, then it shows the thumb at the top of the spectrum. This is probably because it is
-     * absolutely positioned with only a left value, and not a top. Note, on Chrome it seems to be fine without
-     * this approach.
-    */
-  align-items: center;
-  background-clip: padding-box;
-  background-color: #455a64;
-  border: 0.5em solid rgba(136, 136, 136, 0);
-  border-radius: 3em;
-  bottom: 0;
-  color: #fff;
-  display: flex;
-  height: 0.5em;
-  justify-content: center;
-  left: -10px;
-  margin: auto;
-  position: absolute;
-  top: 0;
-  transition: border 120ms cubic-bezier(0.39, 0.58, 0.57, 1);
-  width: 0.5em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-thumb.tinymce-mobile-thumb-active {
-  border: 0.5em solid rgba(136, 136, 136, 0.39);
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper,
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group > div {
-  align-items: center;
-  display: flex;
-  height: 100%;
-  flex: 1;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper {
-  flex-direction: column;
-  justify-content: center;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item {
-  align-items: center;
-  display: flex;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-toolbar-group-item:not(.tinymce-mobile-serialised-dialog) {
-  height: 100%;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-dot-container {
-  display: flex;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input {
-  background: #ffffff;
-  border: none;
-  border-radius: 0;
-  color: #455a64;
-  flex-grow: 1;
-  font-size: 0.85em;
-  padding-bottom: 0.1em;
-  padding-left: 5px;
-  padding-top: 0.1em;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::-webkit-input-placeholder {
-  /* WebKit, Blink, Edge */
-  color: #888;
-}
-.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group input::placeholder {
-  /* WebKit, Blink, Edge */
-  color: #888;
-}
-/* dropup */
-.tinymce-mobile-dropup {
-  background: white;
-  display: flex;
-  overflow: hidden;
-  width: 100%;
-}
-.tinymce-mobile-dropup.tinymce-mobile-dropup-shrinking {
-  transition: height 0.3s ease-out;
-}
-.tinymce-mobile-dropup.tinymce-mobile-dropup-growing {
-  transition: height 0.3s ease-in;
-}
-.tinymce-mobile-dropup.tinymce-mobile-dropup-closed {
-  flex-grow: 0;
-}
-.tinymce-mobile-dropup.tinymce-mobile-dropup-open:not(.tinymce-mobile-dropup-growing) {
-  flex-grow: 1;
-}
-/* TODO min-height for device size and orientation */
-.tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
-  min-height: 200px;
-}
-@media only screen and (orientation: landscape) {
-  .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
-    min-height: 200px;
-  }
-}
-@media only screen and (min-device-width : 320px) and (max-device-width : 568px) and (orientation : landscape) {
-  .tinymce-mobile-ios-container .tinymce-mobile-dropup:not(.tinymce-mobile-dropup-closed) {
-    min-height: 150px;
-  }
-}
-/* styles menu */
-.tinymce-mobile-styles-menu {
-  font-family: sans-serif;
-  outline: 4px solid black;
-  overflow: hidden;
-  position: relative;
-  width: 100%;
-}
-.tinymce-mobile-styles-menu [role="menu"] {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  position: absolute;
-  width: 100%;
-}
-.tinymce-mobile-styles-menu [role="menu"].transitioning {
-  transition: transform 0.5s ease-in-out;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-item {
-  border-bottom: 1px solid #ddd;
-  color: #455a64;
-  cursor: pointer;
-  display: flex;
-  padding: 1em 1em;
-  position: relative;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser .tinymce-mobile-styles-collapse-icon::before {
-  color: #455a64;
-  content: "\e314";
-  font-family: 'tinymce-mobile', sans-serif;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-styles-item-is-menu::after {
-  color: #455a64;
-  content: "\e315";
-  font-family: 'tinymce-mobile', sans-serif;
-  padding-left: 1em;
-  padding-right: 1em;
-  position: absolute;
-  right: 0;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-item.tinymce-mobile-format-matches::after {
-  font-family: 'tinymce-mobile', sans-serif;
-  padding-left: 1em;
-  padding-right: 1em;
-  position: absolute;
-  right: 0;
-}
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-separator,
-.tinymce-mobile-styles-menu .tinymce-mobile-styles-collapser {
-  align-items: center;
-  background: #fff;
-  border-top: #455a64;
-  color: #455a64;
-  display: flex;
-  min-height: 2.5em;
-  padding-left: 1em;
-  padding-right: 1em;
-}
-.tinymce-mobile-styles-menu [data-transitioning-destination="before"][data-transitioning-state],
-.tinymce-mobile-styles-menu [data-transitioning-state="before"] {
-  transform: translate(-100%);
-}
-.tinymce-mobile-styles-menu [data-transitioning-destination="current"][data-transitioning-state],
-.tinymce-mobile-styles-menu [data-transitioning-state="current"] {
-  transform: translate(0%);
-}
-.tinymce-mobile-styles-menu [data-transitioning-destination="after"][data-transitioning-state],
-.tinymce-mobile-styles-menu [data-transitioning-state="after"] {
-  transform: translate(100%);
-}
-@font-face {
-  font-family: 'tinymce-mobile';
-  font-style: normal;
-  font-weight: normal;
-  src: url('fonts/tinymce-mobile.woff?8x92w3') format('woff');
-}
-@media (min-device-width: 700px) {
-  .tinymce-mobile-outer-container,
-  .tinymce-mobile-outer-container input {
-    font-size: 25px;
-  }
-}
-@media (max-device-width: 700px) {
-  .tinymce-mobile-outer-container,
-  .tinymce-mobile-outer-container input {
-    font-size: 18px;
-  }
-}
-.tinymce-mobile-icon {
-  font-family: 'tinymce-mobile', sans-serif;
-}
-.mixin-flex-and-centre {
-  align-items: center;
-  display: flex;
-  justify-content: center;
-}
-.mixin-flex-bar {
-  align-items: center;
-  display: flex;
-  height: 100%;
-}
-.tinymce-mobile-outer-container .tinymce-mobile-editor-socket iframe {
-  background-color: #fff;
-  width: 100%;
-}
-.tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
-  /* Note, on the iPod touch in landscape, this isn't visible when the navbar appears */
-  background-color: #207ab7;
-  border-radius: 50%;
-  bottom: 1em;
-  color: white;
-  font-size: 1em;
-  height: 2.1em;
-  position: fixed;
-  right: 2em;
-  width: 2.1em;
-  align-items: center;
-  display: flex;
-  justify-content: center;
-}
-@media only screen and (min-device-width:700px) {
-  .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
-    font-size: 1.2em;
-  }
-}
-.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket {
-  height: 300px;
-  overflow: hidden;
-}
-.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-editor-socket iframe {
-  height: 100%;
-}
-.tinymce-mobile-outer-container:not(.tinymce-mobile-fullscreen-maximized) .tinymce-mobile-toolstrip {
-  display: none;
-}
-/*
-  Note, that if you don't include this (::-webkit-file-upload-button), the toolbar width gets
-  increased and the whole body becomes scrollable. It's important!
- */
-input[type="file"]::-webkit-file-upload-button {
-  display: none;
-}
-@media only screen and (min-device-width : 320px) and (max-device-width : 568px) and (orientation : landscape) {
-  .tinymce-mobile-ios-container .tinymce-mobile-editor-socket .tinymce-mobile-mask-edit-icon {
-    bottom: 50%;
-  }
-}
--- a/public/tinymce/skins/ui/oxide/skin.mobile.min.css
+++ b/public/tinymce/skins/ui/oxide/skin.mobile.min.css
--- a/redis-demo/redis-demo.iml
+++ b/redis-demo/redis-demo.iml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.30" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.7.7-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.7.7-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.7.7-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.10.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.86.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.26" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.24" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.4.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:2.4.8" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:9.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.22.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.8.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:4.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.12.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.12.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.25" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.25" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.9.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.3.3" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.3.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.7.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.11" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.mysql:mysql-connector-j:8.0.31" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:6.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.25" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-observation:1.10.2" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-commons:1.10.2" level="project" />
+    <orderEntry type="library" name="Maven: com.ibeetl:beetl:3.6.1.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.9.2" level="project" />
+  </component>
+</module>
--- a/redis-demo/src/main/resources/application-dev.yml
+++ b/redis-demo/src/main/resources/application-dev.yml
@@ -0,0 +1,23 @@
+# 开发环境配置
+
+# 数据源配置
+spring:
+  datasource:
+    url: jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: com_gxwebsoft_oa
+    password: EZfW2R4YiWfbLHLw
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+
+# 日志配置
+logging:
+  level:
+    com.gxwebsoft: DEBUG
+    com.baomidou.mybatisplus: DEBUG
+
+
+# 框架配置
+config:
+  # 开发环境接口
+  server-url: http://127.0.0.1:8081/api
+  upload-path: /Users/gxwebsoft/Documents/uploads/
--- a/redis-demo/src/main/resources/application-prod.yml
+++ b/redis-demo/src/main/resources/application-prod.yml
@@ -0,0 +1,26 @@
+# 生产环境配置
+
+# 数据源配置
+spring:
+  datasource:
+    url: jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: com_gxwebsoft_oa
+    password: EZfW2R4YiWfbLHLw
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    type: com.alibaba.druid.pool.DruidDataSource
+
+# 日志配置
+logging:
+  file:
+    name: websoft-api.log
+  level:
+    root: WARN
+    com.gxwebsoft: ERROR
+    com.baomidou.mybatisplus: ERROR
+
+# 框架配置
+config:
+  # 生产环境接口
+  server-url: https://open.gxwebsoft.com/api
+  upload-path: /www/wwwroot/file.ws/
+
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/AppsGenerator.java
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/AppsGenerator.java
@@ -0,0 +1,181 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class AppsGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+//      "apps_equipment",
+//      "apps_equipment_fault",
+//      "apps_equipment_alarm",
+//      "apps_equipment_record"
+//      "apps_cashier",
+//        "apps_hualala_card",
+//        "apps_hualala_card_benefits",
+        "apps_hualala_food",
+//        "apps_hualala_shop",
+//        "apps_hualala_cart_food",
+//        "apps_hualala_food_category",
+//      "apps_link",
+//      "apps_link",
+//      "apps_link",
+//      "apps_link",
+
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "apps_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/CmsGenerator.java
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/CmsGenerator.java
@@ -0,0 +1,177 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class CmsGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "cms";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+//            "cms_article",
+            "cms_article_category",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+//            "cms_docs",
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "cms_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/CodeGenerator.java
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/CodeGenerator.java
@@ -0,0 +1,167 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class CodeGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "WebSoft";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://localhost:3306/websoft-api?useUnicode=true&useSSL=false&characterEncoding=utf8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "root";
+    private static final String DB_PASSWORD = "123456";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "test";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+            "sys_user",
+            "sys_role"
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "sys_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/OaGenerator.java
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/OaGenerator.java
@@ -0,0 +1,176 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class OaGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "oa";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+//      "oa_project",
+//      "oa_link",
+//      "oa_assets",
+//      "oa_customer",
+//      "oa_task",
+//      "sys_tenant",
+//      "oa_app",
+//      "oa_setting",
+//      "oa_assets",
+//      "oa_assets",
+
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "oa_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/ShopGenerator.java
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/ShopGenerator.java
@@ -0,0 +1,195 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class ShopGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "shop";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+//      "shop_order",
+//      "shop_goods",
+//      "shop_store",
+//      "shop_cart",
+//      "shop_express",
+//      "shop_category",
+//      "shop_goods_image",
+//      "shop_comment",
+//      "shop_goods_service"
+//      "shop_member"
+//      "shop_user_balance_log",
+//      "shop_user_address",
+//      "shop_user_coupon",
+//      "shop_user_follow",
+//      "shop_user_oauth",
+//      "shop_user_points_log",
+//      "shop_cart"
+//      "shop_info"
+//      "shop_coupon"
+//        "shop_clerk"
+//      "shop_merchant",
+//      "shop_merchant_clerk"
+//      "shop_merchant_withdraw"
+//      "shop_order_address"
+      "shop_payment",
+//      "shop_payment_template",
+//      "shop_payment_trade"
+//      "shop_order_goods"
+//      "shop_user_oauth"
+
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "shop_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/SysGenerator.java
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/SysGenerator.java
@@ -0,0 +1,170 @@
+package com.gxwebsoft.generator;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.gxwebsoft.generator.engine.BeetlTemplateEnginePlus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成工具
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:31:14
+ */
+public class SysGenerator {
+    // 输出位置
+    private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
+    //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
+    // 输出目录
+    private static final String OUTPUT_DIR = "/src/main/java";
+    // 作者名称
+    private static final String AUTHOR = "科技小王子";
+    // 是否在xml中添加二级缓存配置
+    private static final boolean ENABLE_CACHE = false;
+    // 数据库连接配置
+    private static final String DB_URL = "jdbc:mysql://47.119.165.234:3308/com_gxwebsoft_oa?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8";
+    private static final String DB_DRIVER = "com.mysql.cj.jdbc.Driver";
+    private static final String DB_USERNAME = "com_gxwebsoft_oa";
+    private static final String DB_PASSWORD = "EZfW2R4YiWfbLHLw";
+    // 包名
+    private static final String PACKAGE_NAME = "com.gxwebsoft";
+    // 模块名
+    private static final String MODULE_NAME = "common.system";
+    // 需要生成的表
+    private static final String[] TABLE_NAMES = new String[]{
+
+//      "sys_user",
+      "sys_tenant",
+      "sys_setting"
+
+    };
+    // 需要去除的表前缀
+    private static final String[] TABLE_PREFIX = new String[]{
+            "sys_",
+            "tb_"
+    };
+    // 不需要作为查询参数的字段
+    private static final String[] PARAM_EXCLUDE_FIELDS = new String[]{
+            "tenant_id",
+            "create_time",
+            "update_time"
+    };
+    // 查询参数使用String的类型
+    private static final String[] PARAM_TO_STRING_TYPE = new String[]{
+            "Date",
+            "LocalDate",
+            "LocalTime",
+            "LocalDateTime"
+    };
+    // 查询参数使用EQ的类型
+    private static final String[] PARAM_EQ_TYPE = new String[]{
+            "Integer",
+            "Boolean",
+            "BigDecimal"
+    };
+    // 是否添加权限注解
+    private static final boolean AUTH_ANNOTATION = true;
+    // 是否添加日志注解
+    private static final boolean LOG_ANNOTATION = true;
+    // controller的mapping前缀
+    private static final String CONTROLLER_MAPPING_PREFIX = "/api";
+    // 模板所在位置
+    private static final String TEMPLATES_DIR = "/src/test/java/com/gxwebsoft/generator/templates";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        gc.setOutputDir(OUTPUT_LOCATION + OUTPUT_DIR);
+        gc.setAuthor(AUTHOR);
+        gc.setOpen(false);
+        gc.setFileOverride(true);
+        gc.setEnableCache(ENABLE_CACHE);
+        gc.setSwagger2(true);
+        gc.setIdType(IdType.AUTO);
+        gc.setServiceName("%sService");
+        mpg.setGlobalConfig(gc);
+
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl(DB_URL);
+        // dsc.setSchemaName("public");
+        dsc.setDriverName(DB_DRIVER);
+        dsc.setUsername(DB_USERNAME);
+        dsc.setPassword(DB_PASSWORD);
+        mpg.setDataSource(dsc);
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(MODULE_NAME);
+        pc.setParent(PACKAGE_NAME);
+        mpg.setPackageInfo(pc);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setInclude(TABLE_NAMES);
+        strategy.setTablePrefix(TABLE_PREFIX);
+        strategy.setSuperControllerClass(PACKAGE_NAME + ".common.core.web.BaseController");
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        strategy.setControllerMappingHyphenStyle(true);
+        strategy.setLogicDeleteFieldName("deleted");
+        mpg.setStrategy(strategy);
+
+        // 模板配置
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setController(TEMPLATES_DIR + "/controller.java");
+        templateConfig.setEntity(TEMPLATES_DIR + "/entity.java");
+        templateConfig.setMapper(TEMPLATES_DIR + "/mapper.java");
+        templateConfig.setXml(TEMPLATES_DIR + "/mapper.xml");
+        templateConfig.setService(TEMPLATES_DIR + "/service.java");
+        templateConfig.setServiceImpl(TEMPLATES_DIR + "/serviceImpl.java");
+        mpg.setTemplate(templateConfig);
+        mpg.setTemplateEngine(new BeetlTemplateEnginePlus());
+
+        // 自定义模板配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<>();
+                map.put("packageName", PACKAGE_NAME);
+                map.put("paramExcludeFields", PARAM_EXCLUDE_FIELDS);
+                map.put("paramToStringType", PARAM_TO_STRING_TYPE);
+                map.put("paramEqType", PARAM_EQ_TYPE);
+                map.put("authAnnotation", AUTH_ANNOTATION);
+                map.put("logAnnotation", LOG_ANNOTATION);
+                map.put("controllerMappingPrefix", CONTROLLER_MAPPING_PREFIX);
+                this.setMap(map);
+            }
+        };
+        String templatePath = TEMPLATES_DIR + "/param.java.btl";
+        List<FileOutConfig> focList = new ArrayList<>();
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return OUTPUT_LOCATION + OUTPUT_DIR + "/"
+                        + PACKAGE_NAME.replace(".", "/")
+                        + "/" + pc.getModuleName() + "/param/"
+                        + tableInfo.getEntityName() + "Param" + StringPool.DOT_JAVA;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+
+        mpg.execute();
+    }
+
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/engine/BeetlTemplateEnginePlus.java
@@ -0,0 +1,50 @@
+package com.gxwebsoft.generator.engine;
+
+import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
+import com.baomidou.mybatisplus.generator.engine.AbstractTemplateEngine;
+import org.beetl.core.Configuration;
+import org.beetl.core.GroupTemplate;
+import org.beetl.core.Template;
+import org.beetl.core.resource.FileResourceLoader;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Beetl模板引擎实现文件输出
+ *
+ * @author WebSoft
+ * @since 2021-09-05 00:30:28
+ */
+public class BeetlTemplateEnginePlus extends AbstractTemplateEngine {
+    private GroupTemplate groupTemplate;
+
+    @Override
+    public AbstractTemplateEngine init(ConfigBuilder configBuilder) {
+        super.init(configBuilder);
+        try {
+            Configuration cfg = Configuration.defaultConfiguration();
+            groupTemplate = new GroupTemplate(new FileResourceLoader(), cfg);
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+        }
+        return this;
+    }
+
+    @Override
+    public void writer(Map<String, Object> objectMap, String templatePath, String outputFile) throws Exception {
+        Template template = groupTemplate.getTemplate(templatePath);
+        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile)) {
+            template.binding(objectMap);
+            template.renderTo(fileOutputStream);
+        }
+        logger.debug("模板:" + templatePath + ";  文件:" + outputFile);
+    }
+
+    @Override
+    public String templateFilePath(String filePath) {
+        return filePath + ".btl";
+    }
+
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/templates/controller.java.btl
@@ -0,0 +1,284 @@
+<%
+var serviceIns = strutil.toLowerCase(strutil.subStringTo(table.serviceName, 0, 1)) + strutil.subString(table.serviceName, 1);
+var authPre = package.ModuleName + ':' + table.entityPath;
+var idFieldName, idPropertyName;
+for(field in table.fields) {
+    if(field.keyFlag) {
+        idFieldName = field.name;
+        idPropertyName = field.propertyName;
+    }
+}
+%>
+package ${package.Controller};
+
+<% if(isNotEmpty(superControllerClassPackage)) { %>
+import ${superControllerClassPackage};
+<% } %>
+import ${cfg.packageName!}.${package.ModuleName}.service.${entity}Service;
+import ${cfg.packageName!}.${package.ModuleName}.entity.${entity};
+import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;
+import ${cfg.packageName!}.common.core.web.ApiResult;
+import ${cfg.packageName!}.common.core.web.PageResult;
+import ${cfg.packageName!}.common.core.web.PageParam;
+import ${cfg.packageName!}.common.core.web.BatchParam;
+import ${cfg.packageName!}.common.core.annotation.OperationLog;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+<% if(!restControllerStyle) { %>
+import org.springframework.stereotype.Controller;
+<% } %>
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * ${table.comment!}控制器
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(swagger2) { %>
+@Api(tags = "${table.comment!}管理")
+<% } %>
+<% if(restControllerStyle) { %>
+@RestController
+<% } else { %>
+@Controller
+<% } %>
+@RequestMapping("${cfg.controllerMappingPrefix!}<% if(isNotEmpty(package.ModuleName)){ %>/${package.ModuleName}<% } %>/<% if(isNotEmpty(controllerMappingHyphenStyle)){ %>${controllerMappingHyphen}<% }else{ %>${table.entityPath}<% } %>")
+<% if(kotlin) { %>
+class ${table.controllerName}<% if(isNotEmpty(superControllerClass)) { %> : ${superControllerClass}()<% } %>
+<% } else if(isNotEmpty(superControllerClass)) { %>
+public class ${table.controllerName} extends ${superControllerClass} {
+<% } else { %>
+public class ${table.controllerName} {
+<% } %>
+    @Resource
+    private ${table.serviceName} ${serviceIns};
+
+    <% if(!swagger2) { %>
+    /**
+     * 分页查询${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:list')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("分页查询${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @GetMapping("/page")
+    public ApiResult<PageResult<${entity}>> page(${entity}Param param) {
+        PageParam<${entity}, ${entity}Param> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(${serviceIns}.page(page, page.getWrapper()));
+        // 使用关联查询
+        //return success(${serviceIns}.pageRel(param));
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 查询全部${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:list')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("查询全部${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @GetMapping()
+    public ApiResult<List<${entity}>> list(${entity}Param param) {
+        PageParam<${entity}, ${entity}Param> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        return success(${serviceIns}.list(page.getOrderWrapper()));
+        // 使用关联查询
+        //return success(${serviceIns}.listRel(param));
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 根据id查询${table.comment!}
+     */
+    <% } %>
+    @PreAuthorize("hasAuthority('${authPre}:list')")
+    @OperationLog
+    @ApiOperation("根据id查询${table.comment!}")
+    @GetMapping("/{id}")
+    public ApiResult<${entity}> get(@PathVariable("id") Integer id) {
+        return success(${serviceIns}.getById(id));
+        // 使用关联查询
+        //return success(${serviceIns}.getByIdRel(id));
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 添加${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:save')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("添加${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody ${entity} ${table.entityPath}) {
+        // 记录当前登录用户id、租户id、商户编号
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+          ${table.entityPath}.setUserId(loginUser.getUserId());
+          ${table.entityPath}.setMerchantCode(getMerchantCode());
+        }
+        if (${serviceIns}.save(${table.entityPath})) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 修改${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:update')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("修改${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody ${entity} ${table.entityPath}) {
+        if (${serviceIns}.updateById(${table.entityPath})) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 删除${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:remove')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("删除${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (${serviceIns}.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 批量添加${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:save')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("批量添加${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @PostMapping("/batch")
+    public ApiResult<?> saveBatch(@RequestBody List<${entity}> list) {
+        if (${serviceIns}.saveBatch(list)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 批量修改${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:update')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("批量修改${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @PutMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody BatchParam<${entity}> batchParam) {
+        if (batchParam.update(${serviceIns}, "${idFieldName!}")) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    <% if(!swagger2) { %>
+    /**
+     * 批量删除${table.comment!}
+     */
+    <% } %>
+    <% if(cfg.authAnnotation) { %>
+    @PreAuthorize("hasAuthority('${authPre}:remove')")
+    <% } %>
+    <% if(cfg.logAnnotation) { %>
+    @OperationLog
+    <% } %>
+    <% if(swagger2) { %>
+    @ApiOperation("批量删除${table.comment!}")
+    <% } %>
+    <% if(!restControllerStyle) { %>
+    @ResponseBody
+    <% } %>
+    @DeleteMapping("/batch")
+    public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {
+        if (${serviceIns}.removeByIds(ids)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/templates/entity.java.btl
@@ -0,0 +1,158 @@
+package ${package.Entity};
+
+<% for(pkg in table.importPackages) { %>
+import ${pkg};
+<% } %>
+<% if(swagger2) { %>
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+<% } %>
+<% if(entityLombokModel) { %>
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+    <% if(chainModel) { %>
+import lombok.experimental.Accessors;
+    <% } %>
+<% } %>
+
+/**
+ * ${table.comment!}
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(entityLombokModel) { %>
+@Data
+    <% if(isNotEmpty(superEntityClass)) { %>
+@EqualsAndHashCode(callSuper = true)
+    <% } else { %>
+@EqualsAndHashCode(callSuper = false)
+    <% } %>
+    <% if(chainModel) { %>
+@Accessors(chain = true)
+    <% } %>
+<% } %>
+<% if(swagger2) { %>
+@ApiModel(value = "${entity}对象", description = "${table.comment!''}")
+<% } %>
+<% if(table.convert) { %>
+@TableName("${table.name}")
+<% } %>
+<% if(isNotEmpty(superEntityClass)) { %>
+public class ${entity} extends ${superEntityClass}<% if(activeRecord) { %><${entity}><% } %>{
+<% } else if(activeRecord) { %>
+public class ${entity} extends Model<${entity}> {
+<% } else { %>
+public class ${entity} implements Serializable {
+<% } %>
+<% if(entitySerialVersionUID) { %>
+    private static final long serialVersionUID = 1L;
+<% } %>
+<% /** -----------BEGIN 字段循环遍历----------- **/ %>
+<% for(field in table.fields) { %>
+    <%
+    var keyPropertyName;
+    if(field.keyFlag) {
+        keyPropertyName = field.propertyName;
+    }
+    %>
+
+    <% if(isNotEmpty(field.comment)) { %>
+        <% if(swagger2) { %>
+    @ApiModelProperty(value = "${field.comment}")
+        <% }else{ %>
+    /**
+     * ${field.comment}
+     */
+        <% } %>
+    <% } %>
+    <% /* 主键 */ %>
+    <% if(field.keyFlag) { %>
+        <% if(field.keyIdentityFlag) { %>
+    @TableId(value = "${field.annotationColumnName}", type = IdType.AUTO)
+        <% } else if(isNotEmpty(idType)) { %>
+    @TableId(value = "${field.annotationColumnName}", type = IdType.${idType})
+        <% } else if(field.convert) { %>
+    @TableId("${field.annotationColumnName}")
+        <% } %>
+    <% /* 普通字段 */ %>
+    <% } else if(isNotEmpty(field.fill)) { %>
+        <% if(field.convert){ %>
+    @TableField(value = "${field.annotationColumnName}", fill = FieldFill.${field.fill})
+        <% }else{ %>
+    @TableField(fill = FieldFill.${field.fill})
+        <% } %>
+    <% } else if(field.convert) { %>
+    @TableField("${field.annotationColumnName}")
+    <% } %>
+    <% /* 乐观锁注解 */ %>
+    <% if(versionFieldName!'' == field.name) { %>
+    @Version
+    <% } %>
+    <% /* 逻辑删除注解 */ %>
+    <% if(logicDeleteFieldName!'' == field.name) { %>
+    @TableLogic
+    <% } %>
+    private ${field.propertyType} ${field.propertyName};
+<% } %>
+<% /** -----------END 字段循环遍历----------- **/ %>
+
+<% if(!entityLombokModel) { %>
+    <% for(field in table.fields) { %>
+        <%
+        var getprefix = '';
+        if(field.propertyType == 'boolean') {
+            getprefix = 'is';
+        } else {
+            getprefix = 'get';
+        }
+        %>
+    public ${field.propertyType} ${getprefix}${field.capitalName}() {
+        return ${field.propertyName};
+    }
+
+        <% if(chainModel) { %>
+    public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+        <% } else { %>
+    public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+        <% } %>
+        this.${field.propertyName} = ${field.propertyName};
+        <% if(chainModel){ %>
+        return this;
+        <% } %>
+    }
+
+    <% } %>
+<% } %>
+<% if(entityColumnConstant) { %>
+    <% for(field in table.fields) { %>
+    public static final String ${strutil.toUpperCase(field.name)} = "${field.name}";
+
+    <% } %>
+<% } %>
+<% if(activeRecord) { %>
+    @Override
+    protected Serializable pkVal() {
+        <% if(isNotEmpty(keyPropertyName)){ %>
+        return this.${keyPropertyName};
+        <% }else{ %>
+        return null;
+        <% } %>
+    }
+
+<% } %>
+<% if(!entityLombokModel){ %>
+    @Override
+    public String toString() {
+        return "${entity}{" +
+        <% for(field in table.fields){ %>
+            <% if(fieldLP.index==0){ %>
+        "${field.propertyName}=" + ${field.propertyName} +
+            <% }else{ %>
+        ", ${field.propertyName}=" + ${field.propertyName} +
+            <% } %>
+        <% } %>
+        "}";
+    }
+<% } %>
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/templates/mapper.java.btl
@@ -0,0 +1,41 @@
+package ${package.Mapper};
+
+import ${superMapperClassPackage};
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import ${package.Entity}.${entity};
+import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ${table.comment!}Mapper
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(kotlin){ %>
+interface ${table.mapperName} : ${superMapperClass}<${entity}>
+<% }else{ %>
+public interface ${table.mapperName} extends ${superMapperClass}<${entity}> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<${entity}>
+     */
+    List<${entity}> selectPageRel(@Param("page") IPage<${entity}> page,
+                             @Param("param") ${entity}Param param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<${entity}> selectListRel(@Param("param") ${entity}Param param);
+
+}
+<% } %>
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/templates/mapper.xml.btl
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${package.Mapper}.${table.mapperName}">
+<% if(enableCache) { %>
+
+    <!-- 开启二级缓存 -->
+    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
+<% } %>
+<% if(baseResultMap) { %>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="${package.Entity}.${entity}">
+    <% /** 生成主键排在第一位 **/ %>
+    <% for(field in table.fields) { %>
+        <% if(field.keyFlag){ %>
+        <id column="${field.name}" property="${field.propertyName}" />
+        <% } %>
+    <% } %>
+    <% /** 生成公共字段 **/ %>
+    <% for(field in table.commonFields) { %>
+        <result column="${field.name}" property="${field.propertyName}" />
+    <% } %>
+    <% /** 生成普通字段 **/ %>
+    <% for(field in table.fields) { %>
+        <% if(!field.keyFlag) { %>
+        <result column="${field.name}" property="${field.propertyName}" />
+        <% } %>
+    <% } %>
+    </resultMap>
+<% } %>
+<% if(baseColumnList) { %>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+    <% for(field in table.commonFields) { %>
+        ${field.columnName},
+    <% } %>
+        ${table.fieldNames}
+    </sql>
+<% } %>
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*
+        FROM ${table.name} a
+        <where>
+<% for(field in table.fields) { %>
+    <% if(field.keyFlag) { %>
+        <% /** 主键字段 **/ %>
+            <if test="param.${field.propertyName} != null">
+                AND a.${field.name} = #{param.${field.propertyName}}
+            </if>
+    <% } else if(field.name == logicDeleteFieldName) { %>
+        <% /** 逻辑删除字段 **/ %>
+            <if test="param.deleted != null">
+                AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+                AND a.deleted = 0
+            </if>
+    <% } else if(field.name == 'create_time') { %>
+        <% /** 创建时间字段 **/ %>
+            <if test="param.createTimeStart != null">
+                AND a.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null">
+                AND a.create_time &lt;= #{param.createTimeEnd}
+            </if>
+    <% } else if(array.contain(cfg.paramExcludeFields, field.name)) { %>
+        <% /** 排除的字段 **/ %>
+    <% } else if(array.contain(cfg.paramEqType, field.propertyType)) { %>
+        <% /** 使用EQ的字段 **/ %>
+            <if test="param.${field.propertyName} != null">
+                AND a.${field.name} = #{param.${field.propertyName}}
+            </if>
+    <% } else { %>
+        <% /** 其它类型使用LIKE **/ %>
+            <if test="param.${field.propertyName} != null">
+                AND a.${field.name} LIKE CONCAT('%', #{param.${field.propertyName}}, '%')
+            </if>
+    <% } %>
+<% } %>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="${package.Entity}.${entity}">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="${package.Entity}.${entity}">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/templates/param.java.btl
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/templates/param.java.btl
@@ -0,0 +1,146 @@
+package ${cfg.packageName!}.${package.ModuleName}.param;
+
+import ${cfg.packageName!}.common.core.annotation.QueryField;
+import ${cfg.packageName!}.common.core.annotation.QueryType;
+import ${cfg.packageName!}.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+<% if(swagger2) { %>
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+<% } %>
+<% if(entityLombokModel) { %>
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+    <% if(chainModel) { %>
+import lombok.experimental.Accessors;
+    <% } %>
+<% } %>
+
+/**
+ * ${table.comment!}查询参数
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(entityLombokModel) { %>
+@Data
+    <% if(isNotEmpty(superEntityClass)) { %>
+@EqualsAndHashCode(callSuper = true)
+    <% } else { %>
+@EqualsAndHashCode(callSuper = false)
+    <% } %>
+    <% if(chainModel) { %>
+@Accessors(chain = true)
+    <% } %>
+<% } %>
+@JsonInclude(JsonInclude.Include.NON_NULL)
+<% if(swagger2) { %>
+@ApiModel(value = "${entity}Param对象", description = "${table.comment!''}查询参数")
+<% } %>
+public class ${entity}Param extends BaseParam {
+<% if(entitySerialVersionUID) { %>
+    private static final long serialVersionUID = 1L;
+<% } %>
+<% /** -----------BEGIN 字段循环遍历----------- **/ %>
+<% for(field in table.fields) { %>
+    <%
+    var keyPropertyName;
+    if(field.keyFlag) {
+        keyPropertyName = field.propertyName;
+    }
+    // 排除的字段
+    if(array.contain(cfg.paramExcludeFields, field.name)) {
+        continue;
+    }
+    %>
+
+    <% if(isNotEmpty(field.comment)) { %>
+        <% if(swagger2) { %>
+    @ApiModelProperty(value = "${field.comment}")
+        <% }else{ %>
+    /**
+     * ${field.comment}
+     */
+        <% } %>
+    <% } %>
+    <% /* 主键 */ %>
+    <% if(field.keyFlag) { %>
+    @QueryField(type = QueryType.EQ)
+    <% /* 使用EQ的字段 */ %>
+    <% } else if(array.contain(cfg.paramEqType, field.propertyType)) { %>
+    @QueryField(type = QueryType.EQ)
+    <% } %>
+    <% /* 使用String类型的字段 */ %>
+    <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %>
+    private String ${field.propertyName};
+    <% } else { %>
+    <% /* 普通字段 */ %>
+    private ${field.propertyType} ${field.propertyName};
+    <% } %>
+<% } %>
+<% /** -----------END 字段循环遍历----------- **/ %>
+
+<% if(!entityLombokModel) { %>
+    <% for(field in table.fields) { %>
+        <%
+        var getprefix = '';
+        if(field.propertyType == 'boolean') {
+            getprefix = 'is';
+        } else {
+            getprefix = 'get';
+        }
+        // 排除的字段
+        if(array.contain(cfg.paramExcludeFields, field.name)) {
+            continue;
+        }
+        %>
+        <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %>
+    public String ${getprefix}${field.capitalName}() {
+        <% } else { %>
+    public ${field.propertyType} ${getprefix}${field.capitalName}() {
+        <% } %>
+        return ${field.propertyName};
+    }
+
+        <% if(chainModel) { %>
+            <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %>
+    public ${entity} set${field.capitalName}(String ${field.propertyName}) {
+            <% } else { %>
+    public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+            <% } %>
+        <% } else { %>
+            <% if(array.contain(cfg.paramToStringType, field.propertyType)) { %>
+    public void set${field.capitalName}(String ${field.propertyName}) {
+            <% } else { %>
+    public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
+            <% } %>
+        <% } %>
+        this.${field.propertyName} = ${field.propertyName};
+        <% if(chainModel){ %>
+        return this;
+        <% } %>
+    }
+
+    <% } %>
+<% } %>
+<% if(!entityLombokModel) { %>
+    @Override
+    public String toString() {
+        return "${entity}{" +
+        <% for(field in table.fields) { %>
+            <%
+            // 排除的字段
+            if(array.contain(cfg.paramExcludeFields, field.name)) {
+                continue;
+            }
+            %>
+            <% if(fieldLP.index == 0) { %>
+        "${field.propertyName}=" + ${field.propertyName} +
+            <% } else { %>
+        ", ${field.propertyName}=" + ${field.propertyName} +
+            <% } %>
+        <% } %>
+        "}";
+    }
+<% } %>
+}
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/templates/service.java.btl
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/templates/service.java.btl
@@ -0,0 +1,55 @@
+<%
+var idPropertyName, idComment;
+for(field in table.fields) {
+    if(field.keyFlag) {
+        idPropertyName = field.propertyName;
+        idComment = field.comment;
+    }
+}
+%>
+package ${package.Service};
+
+import ${superServiceClassPackage};
+import ${cfg.packageName!}.common.core.web.PageResult;
+import ${package.Entity}.${entity};
+import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;
+
+import java.util.List;
+
+/**
+ * ${table.comment!}Service
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+<% if(kotlin){ %>
+interface ${table.serviceName} : ${superServiceClass}<${entity}>
+<% }else{ %>
+public interface ${table.serviceName} extends ${superServiceClass}<${entity}> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<${entity}>
+     */
+    PageResult<${entity}> pageRel(${entity}Param param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<${entity}>
+     */
+    List<${entity}> listRel(${entity}Param param);
+
+    /**
+     * 根据id查询
+     *
+     * @param ${idPropertyName!} ${idComment!}
+     * @return ${entity}
+     */
+    ${entity} getByIdRel(Integer ${idPropertyName!});
+
+}
+<% } %>
--- a/redis-demo/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl
+++ b/redis-demo/src/test/java/com/gxwebsoft/generator/templates/serviceImpl.java.btl
@@ -0,0 +1,62 @@
+<%
+var idPropertyName, idCapitalName;
+for(field in table.fields) {
+    if(field.keyFlag) {
+        idPropertyName = field.propertyName;
+        idCapitalName = field.capitalName;
+    }
+}
+%>
+package ${package.ServiceImpl};
+
+import ${superServiceImplClassPackage};
+import ${package.Mapper}.${table.mapperName};
+import ${package.Service}.${table.serviceName};
+import ${package.Entity}.${entity};
+import ${cfg.packageName!}.${package.ModuleName}.param.${entity}Param;
+import ${cfg.packageName!}.common.core.web.PageParam;
+import ${cfg.packageName!}.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * ${table.comment!}Service实现
+ *
+ * @author ${author}
+ * @since ${date(), 'yyyy-MM-dd HH:mm:ss'}
+ */
+@Service
+<% if(kotlin){ %>
+open class ${table.serviceImplName} : ${superServiceImplClass}<${table.mapperName}, ${entity}>(), ${table.serviceName} {
+
+}
+<% }else{ %>
+public class ${table.serviceImplName} extends ${superServiceImplClass}<${table.mapperName}, ${entity}> implements ${table.serviceName} {
+
+    @Override
+    public PageResult<${entity}> pageRel(${entity}Param param) {
+        PageParam<${entity}, ${entity}Param> page = new PageParam<>(param);
+        //page.setDefaultOrder("create_time desc");
+        List<${entity}> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<${entity}> listRel(${entity}Param param) {
+        List<${entity}> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<${entity}, ${entity}Param> page = new PageParam<>();
+        //page.setDefaultOrder("create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public ${entity} getByIdRel(Integer ${idPropertyName!}) {
+        ${entity}Param param = new ${entity}Param();
+        param.set${idCapitalName!}(${idPropertyName!});
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+}
+<% } %>
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,31 +0,0 @@
-<template>
-  <a-config-provider :locale="locale">
-    <router-view/>
-  </a-config-provider>
-</template>
-
-<script>
-import zh_CN from '@/components/ele-admin-pro/packages/lang/zh_CN';
-import zh_TW from '@/components/ele-admin-pro/packages/lang/zh_TW';
-import en from '@/components/ele-admin-pro/packages/lang/en_US';
-
-const languages = {zh_CN, zh_TW, en};
-
-export default {
-  data() {
-    return {
-      locale: languages[this.$i18n.locale]
-    };
-  },
-  computed: {
-    language() {
-      return this.$i18n.locale;
-    }
-  },
-  watch: {
-    language() {
-      this.locale = languages[this.language];
-    }
-  }
-};
-</script>
--- a/src/api/ecology/atmosphere/acid-rain-plcae.js
+++ b/src/api/ecology/atmosphere/acid-rain-plcae.js
@@ -1,39 +0,0 @@
-import axios from 'axios';
-const baseUri = "/acidRain/acidRainPlaceBaseInfoDict";
-const listAllUrl = baseUri + "";
-
-// 添加
-const savePlace = function (data) {
-    return axios.post("/acidRain/acidRainPlaceBaseInfoDict",data)
-}
-
-// 删除
-const removePlace = function (id) {
-    return axios.delete(`/acidRain/acidRainPlaceBaseInfoDict/${id}`,)
-}
-// 批量删除
-const removeBatchPlace = function (ids) {
-    return axios.delete("/acidRain/acidRainPlaceBaseInfoDict/batch",{data:ids})
-}
-
-// 修改
-const updatePlace = function (data) {
-    return axios.put("/acidRain/acidRainPlaceBaseInfoDict",data)
-}
-
-const copyBatchPlace = function (data){
-    return axios.post("/acidRain/acidRainPlaceBaseInfoDict/copyBatch",data)
-}
-const getColumnOptions = function(column){
-    return axios.get("/acidRain/acidRainPlaceBaseInfoDict/options",{params:{column}})
-}
-export {
-    listAllUrl,
-    savePlace,
-    updatePlace,
-    removeBatchPlace,
-    removePlace,
-    copyBatchPlace,
-    getColumnOptions
-
-}
--- a/src/api/ecology/atmosphere/acid.js
+++ b/src/api/ecology/atmosphere/acid.js
@@ -1,100 +0,0 @@
-import axios from 'axios';
-// ----------------------列表-----------------------
-const pageBillUrl = '/acidRain/acidRainBill/page';
-// 添加
-const saveAcidRainBill = function (data) {
-    return axios.post("/acidRain/acidRainBill/importBatch",data)
-}
-
-// 删除
-const removeAcidRainBill = function (id) {
-    return axios.delete(`/acidRain/acidRainBill/${id}`,)
-}
-// 批量删除
-const removeBatchAcidRainBill = function (ids) {
-    return axios.delete("/acidRain/acidRainBill/batch",{data:ids})
-}
-
-// 修改
-const updateAcidRainBill = function (data) {
-    return axios.put("/acidRain/acidRainBill",data)
-}
-// 审核
-const verifyAcidRainBill = function (data) {
-    return axios.put("/acidRain/acidRainBill/verify",data);
-}
-const getAcidRainBill = function (id) {
-    return axios.get(`/acidRain/acidRainBill/${id}`)
-}
-// -------------------------数据---------------------
-const pageAcidRainUrl = '/acidRain/acidRain/page';
-// 添加
-const saveAcidRain = function (data) {
-    return axios.post("/acidRain/acidRain",data)
-}
-
-// 删除
-const removeAcidRain = function (id) {
-    return axios.delete(`/acidRain/acidRain/${id}`,)
-}
-// 批量删除
-const removeBatchAcidRain = function (ids) {
-    return axios.delete("/acidRain/acidRain/batch",{data:ids})
-}
-
-// 修改
-const updateAcidRain = function (data) {
-        return axios.put("/acidRain/acidRain",data)
-}
-
-// -------------------------统计---------------------
-const pageAcidRainStatisticUrl = '/acidRain/acidRain/statistic';
-
-const getHistoryyears = function () {
-    return axios.get("/acidRain/acidRain/history-year")
-}
-const getColumnOptions = function(column){
-    return axios.get("/acidRain/acidRain/options",{params:{column}})
-}
-// ---gis--
-const getPlaceGis = function(data){
-    return axios.get("/acidRain/acidRain/gis/place",{params:data})
-}
-const getPlaceOptions = (regionLevel) => axios.get("/acidRain/acidRain/placeOptions", {params:{regionLevel}})
-
-const getTrendChart = function(data){
-    return axios.post("/acidRain/acidRain/trend/chart",data)
-}
-const getYearOptions = () => axios.get("/acidRain/acidRain/yearOptions")
-const getPlaceByRegionLevel = function(column){
-    return axios.get("/acidRain/acidRain/place/region",{params:{column}})
-}
-const statisticCity = "/acidRain/acidRain/statistic/city"
-const statisticCounty = "/acidRain/acidRain/statistic/county"
-const statisticIon = "/acidRain/acidRain/statistic/ion"
-
-export {
-    pageBillUrl,
-    saveAcidRainBill,
-    removeAcidRainBill,
-    updateAcidRainBill,
-    removeBatchAcidRainBill,
-    verifyAcidRainBill,
-    getAcidRainBill,
-    pageAcidRainUrl,
-    saveAcidRain,
-    removeAcidRain,
-    updateAcidRain,
-    removeBatchAcidRain,
-    pageAcidRainStatisticUrl,
-    getHistoryyears,
-    getColumnOptions,
-    statisticCity,
-    statisticIon,
-    statisticCounty,
-    getPlaceGis,
-    getYearOptions,
-    getPlaceOptions,
-    getTrendChart,
-    getPlaceByRegionLevel
-}
--- a/src/api/ecology/atmosphere/air-api-relate.js
+++ b/src/api/ecology/atmosphere/air-api-relate.js
@@ -1,40 +0,0 @@
-import axios from 'axios';
-const baseUri = "/ambientAir/airAqiRelateInfoDict";
-const listAllUrl = baseUri + "";
-
-// 添加
-const saveAqiRelate = function (data) {
-    return axios.post("/ambientAir/airAqiRelateInfoDict",data)
-}
-
-// 删除
-const removeAqiRelate = function (id) {
-    return axios.delete(`/ambientAir/airAqiRelateInfoDict/${id}`,)
-}
-// 批量删除
-const removeBatchAqiRelate = function (ids) {
-    return axios.delete("/ambientAir/airAqiRelateInfoDict/batch",{data:ids})
-}
-
-// 修改
-const updateAqiRelate = function (data) {
-    return axios.put("/ambientAir/airAqiRelateInfoDict",data)
-}
-
-const copyBatchPlace = function (data){
-    return axios.post("/ambientAir/airAqiRelateInfoDict/copyBatch",data)
-}
-const getColumnOptions = function(column){
-    return axios.get("/ambientAir/airAqiRelateInfoDict/options",{params:{column}})
-}
-
-export {
-    listAllUrl,
-    saveAqiRelate,
-    updateAqiRelate,
-    removeBatchAqiRelate,
-    removeAqiRelate,
-    copyBatchPlace,
-    getColumnOptions
-
-}
--- a/src/api/ecology/atmosphere/air-evaluation-standard.js
+++ b/src/api/ecology/atmosphere/air-evaluation-standard.js
@@ -1,39 +0,0 @@
-import axios from 'axios';
-const baseUri = "/ambientAir/airEvaluationStandard";
-const listAllUrl = baseUri + "";
-
-// 添加
-const saveStandard = function (data) {
-    return axios.post("/ambientAir/airEvaluationStandard",data)
-}
-
-// 删除
-const removeStandard = function (id) {
-    return axios.delete(`/ambientAir/airEvaluationStandard/${id}`,)
-}
-// 批量删除
-const removeBatchStandard = function (ids) {
-    return axios.delete("/ambientAir/airEvaluationStandard/batch",{data:ids})
-}
-
-// 修改
-const updateStandard = function (data) {
-    return axios.put("/ambientAir/airEvaluationStandard",data)
-}
-const copyBatchPlace = function (data){
-    return axios.post("/ambientAir/airEvaluationStandard/copyBatch",data)
-}
-const getColumnOptions = function(column){
-    return axios.get("/ambientAir/airEvaluationStandard/options",{params:{column}})
-}
-
-export {
-    listAllUrl,
-    saveStandard,
-    updateStandard,
-    removeBatchStandard,
-    removeStandard,
-    copyBatchPlace,
-    getColumnOptions
-
-}
--- a/src/api/ecology/atmosphere/air-indicator-iaqi.js
+++ b/src/api/ecology/atmosphere/air-indicator-iaqi.js
@@ -1,39 +0,0 @@
-import axios from 'axios';
-const baseUri = "/ambientAir/airIndicatorIaqiDict";
-const listAllUrl = baseUri + "";
-
-// 添加
-const saveIndicatorIaqi = function (data) {
-    return axios.post("/ambientAir/airIndicatorIaqiDict",data)
-}
-
-// 删除
-const removeIndicatorIaqi = function (id) {
-    return axios.delete(`/ambientAir/airIndicatorIaqiDict/${id}`,)
-}
-// 批量删除
-const removeBatchIndicatorIaqi = function (ids) {
-    return axios.delete("/ambientAir/airIndicatorIaqiDict/batch",{data:ids})
-}
-
-// 修改
-const updateIndicatorIaqi = function (data) {
-    return axios.put("/ambientAir/airIndicatorIaqiDict",data)
-}
-
-const copyBatchPlace = function (data){
-    return axios.post("/ambientAir/airIndicatorIaqiDict/copyBatch",data)
-}
-const getColumnOptions = function(column){
-    return axios.get("/ambientAir/airIndicatorIaqiDict/options",{params:{column}})
-}
-export {
-    listAllUrl,
-    saveIndicatorIaqi,
-    updateIndicatorIaqi,
-    removeBatchIndicatorIaqi,
-    removeIndicatorIaqi,
-    copyBatchPlace,
-    getColumnOptions
-
-}
--- a/src/api/ecology/atmosphere/air-plcae.js
+++ b/src/api/ecology/atmosphere/air-plcae.js
@@ -1,39 +0,0 @@
-import axios from 'axios';
-const baseUri = "/ambientAir/airPlaceBasicInfoDict";
-const listAllUrl = baseUri + "";
-
-// 添加
-const savePlace = function (data) {
-    return axios.post("/ambientAir/airPlaceBasicInfoDict",data)
-}
-
-// 删除
-const removePlace = function (id) {
-    return axios.delete(`/ambientAir/airPlaceBasicInfoDict/${id}`,)
-}
-// 批量删除
-const removeBatchPlace = function (ids) {
-    return axios.delete("/ambientAir/airPlaceBasicInfoDict/batch",{data:ids})
-}
-
-// 修改
-const updatePlace = function (data) {
-    return axios.put("/ambientAir/airPlaceBasicInfoDict",data)
-}
-
-const copyBatchPlace = function (data){
-    return axios.post("/ambientAir/airPlaceBasicInfoDict/copyBatch",data)
-}
-const getColumnOptions = function(column){
-    return axios.get("/ambientAir/airPlaceBasicInfoDict/options",{params:{column}})
-}
-export {
-    listAllUrl,
-    savePlace,
-    updatePlace,
-    removeBatchPlace,
-    removePlace,
-    copyBatchPlace,
-    getColumnOptions
-
-}
--- a/src/api/ecology/atmosphere/air.js
+++ b/src/api/ecology/atmosphere/air.js
@@ -1,145 +0,0 @@
-import axios from 'axios';
-// ----------------------列表-----------------------
-const pageBillUrl = '/ambientAir/ambientAirBill/page';
-// 添加
-const saveAirBill = function (data) {
-    return axios.post("/ambientAir/ambientAirBill/importBatch",data)
-}
-
-// 删除
-const removeAirBill = function (id) {
-    return axios.delete(`/ambientAir/ambientAirBill/${id}`,)
-}
-// 批量删除
-const removeBatchAirBill = function (ids) {
-    return axios.delete("/ambientAir/ambientAirBill/batch",{data:ids})
-}
-
-// 修改
-const updateAirBill = function (data) {
-    return axios.put("/ambientAir/ambientAirBill",data)
-}
-// 审核
-const verifyAirBill = function (data) {
-    return axios.put("/ambientAir/ambientAirBill/verify",data);
-}
-const getAirBill = function (id) {
-    return axios.get(`/ambientAir/ambientAirBill/${id}`)
-}
-// -------------------------数据---------------------
-// 分页
-const pageAirUrl = '/ambientAir/ambientAir/page';
-// 全部
-const listAllAir = function (params){
-    return axios .get("/ambientAir/ambientAir",{params})
-}
-// 添加
-const saveAir = function (data) {
-    return axios.post("/ambientAir/ambientAir",data)
-}
-
-// 删除
-const removeAir = function (id) {
-    return axios.delete(`/ambientAir/ambientAir/${id}`,)
-}
-// 批量删除
-const removeBatchAir = function (ids) {
-    return axios.delete("/ambientAir/ambientAir/batch",{data:ids})
-}
-
-// 修改
-const updateAir = function (data) {
-        return axios.put("/ambientAir/ambientAir",data)
-}
-
-// -------------------------统计---------------------
-
-const getColumnOptions = function(column){
-    return axios.get("/ambientAir/ambientAir/options",{params:{column}})
-}
-//均值 百分位
-const statisticAvg = "/ambientAir/ambientAir/statistic/avg";
-
-//市县站点统计
-const statisticUrl = "/ambientAir/ambientAir/statistic";
-
-//城区统计
-const statisticAreaBase = "/ambientAir/ambientAir/statistic/areaBase";
-const statisticArea = "/ambientAir/ambientAir/statistic/area";
-
-// ---gis--
-const getPlaceGis = function(data){
-    return axios.get("/ambientAir/ambientAir/gis/place",{params:data})
-}
-const getYearOptions = () => axios.get("/ambientAir/ambientAir/yearOptions")
-const getTrendChart = function(data){
-    return axios.post("/ambientAir/ambientAir/trend/chart",data)
-}
-const getCityPlace = function(column){
-    return axios.get("/ambientAir/ambientAir/place/city",{params:{column}})
-}
-const getCountryPlace = function(column){
-    return axios.get("/ambientAir/ambientAir/place/country",{params:{column}})
-}
-
-const statisticAll = function(params){
-  return axios.get("/ambientAir/ambientAir/statisticAll",{params})
-}
-// 排行
-const airDayRankUrl = "/zhenQiWang/ambientAirZhenqiCityDayAqiRankData";
-const airMonthRankUrl = "/zhenQiWang/ambientAirZhenqiCityMonthComprehensiveAqiRankData/page";
-const airMonthProvincialCapitalRankUrl = "/zhenQiWang/ambientAirZhenqiCityMonthComprehensiveAqiRankData/listProvincialCapitalRank";
-const airYearRankUrl = "/zhenQiWang/ambientAirZhenqiCityYearComprehensiveAqiRankData/page";
-const airYearProvincialCapitalRankUrl = "/zhenQiWang/ambientAirZhenqiCityYearComprehensiveAqiRankData/listProvincialCapitalRank";
-const airPm25YearRankUrl = "/zhenQiWang/ambientAirZhenqiCityYearPm25RankData/page";
-const airPm25YearProvincialCapitalRankUrl = "/zhenQiWang/ambientAirZhenqiCityYearPm25RankData/listProvincialCapitalRank";
-
-
-//PM2.5爬虫
-const getPmNewData = function(data){
-  return axios.get("/zhenQiWang/ambientAirZhenqiCityYearPm25RankData/crawler",{params:{data}})
-}
-//月综合指数爬虫
-const getMonthNewData = function(data){
-  return axios.get("/zhenQiWang/ambientAirZhenqiCityMonthComprehensiveAqiRankData/crawler",{params:{data}})
-}
-//年综合指数爬虫
-const getYearNewData = function(data){
-  return axios.get("/zhenQiWang/ambientAirZhenqiCityYearComprehensiveAqiRankData/crawler",{params:{data}})
-}
-export {
-    pageBillUrl,
-    saveAirBill,
-    removeAirBill,
-    updateAirBill,
-    removeBatchAirBill,
-    verifyAirBill,
-    getAirBill,
-    pageAirUrl,
-    listAllAir,
-    saveAir,
-    removeAir,
-    updateAir,
-    removeBatchAir,
-    getColumnOptions,
-    getPlaceGis,
-    statisticAvg,
-    statisticUrl,
-    statisticAreaBase,
-    statisticArea,
-    airDayRankUrl,
-    airMonthRankUrl,
-    airYearRankUrl,
-    airPm25YearRankUrl,
-    airYearProvincialCapitalRankUrl,
-    airPm25YearProvincialCapitalRankUrl,
-    airMonthProvincialCapitalRankUrl,
-  getYearOptions,
-  getTrendChart,
-  getCityPlace,
-  getCountryPlace,
-  getMonthNewData,
-  getYearNewData,
-  getPmNewData,
-  statisticAll
-}
--- a/src/api/ecology/dict.js
+++ b/src/api/ecology/dict.js
@@ -1,3 +0,0 @@
-import axios from 'axios';
-// 查询全部字典项
-export const getDictData = params => axios.get("/sys/dictdata",{params})
--- a/src/api/ecology/drinking-water-dict.js
+++ b/src/api/ecology/drinking-water-dict.js
@@ -1,199 +0,0 @@
-import axios from 'axios';
-// ----------------------市级字典列表-----------------------
-const pageDictUrl = '/drinkingWater/drinkingWaterDict';
-const listAllUrl = pageDictUrl + "";
-
-// 添加
-const saveDrinkingWaterDict = function (data) {
-    return axios.post("/drinkingWater/drinkingWaterDict/",data)
-}
-
-// 删除
-const removeDrinkingWaterDict = function (id) {
-    return axios.delete(`/drinkingWater/drinkingWaterDict/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWaterDict = function (ids) {
-    return axios.delete("/drinkingWater/drinkingWaterDict/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWaterDict = function (data) {
-    return axios.put("/drinkingWater/drinkingWaterDict",data)
-}
-
-const getColumnOptions = function(column){
-    return axios.get("/drinkingWater/drinkingWaterDict/options",{params:{column}})
-}
-const copyBatchPlace = function (data){
-    return axios.post("/drinkingWater/drinkingWaterDict/copyBatch",data)
-}
-
-// ----------------------县级地表水字典列表-----------------------
-const pageCountyDictUrl = '/drinkingWater/drinkingWaterCountyDict';
-const listCountyAllUrl = pageCountyDictUrl + "";
-
-// 添加
-const saveDrinkingWaterCountyDict = function (data) {
-    return axios.post("/drinkingWater/drinkingWaterCountyDict/",data)
-}
-
-// 删除
-const removeDrinkingWaterCountyDict = function (id) {
-    return axios.delete(`/drinkingWater/drinkingWaterCountyDict/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWaterCountyDict = function (ids) {
-    return axios.delete("/drinkingWater/drinkingWaterCountyDict/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWaterCountyDict = function (data) {
-    return axios.put("/drinkingWater/drinkingWaterCountyDict",data)
-}
-
-const getCountyColumnOptions = function(column){
-    return axios.get("/drinkingWater/drinkingWaterCountyDict/options",{params:{column}})
-}
-const copyBatchCountyPlace = function (data){
-    return axios.post("/drinkingWater/drinkingWaterCountyDict/copyBatch",data)
-}
-
-// ----------------------县级地下水字典列表-----------------------
-const pageCountyBottomDictUrl = '/drinkingWater/drinkingWaterCountyBottomDict';
-const listCountyBottomAllUrl = pageCountyBottomDictUrl + "";
-
-// 添加
-const saveDrinkingWaterCountyBottomDict = function (data) {
-    return axios.post("/drinkingWater/drinkingWaterCountyBottomDict/",data)
-}
-
-// 删除
-const removeDrinkingWaterCountyBottomDict = function (id) {
-    return axios.delete(`/drinkingWater/drinkingWaterCountyBottomDict/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWaterCountyBottomDict = function (ids) {
-    return axios.delete("/drinkingWater/drinkingWaterCountyBottomDict/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWaterCountyBottomDict = function (data) {
-    return axios.put("/drinkingWater/drinkingWaterCountyBottomDict",data)
-}
-
-const getCountyBottomColumnOptions = function(column){
-    return axios.get("/drinkingWater/drinkingWaterCountyBottomDict/options",{params:{column}})
-}
-const copyBatchCountyBottomPlace = function (data){
-    return axios.post("/drinkingWater/drinkingWaterCountyBottomDict/copyBatch",data)
-}
-
-// ----------------------农村地表水字典-----------------------
-const pageVillageTopDictUrl = '/drinkingWater/drinkingWaterVillageTopDict';
-const listVillageTopAllUrl = pageVillageTopDictUrl + "";
-
-// 添加
-const saveDrinkingWaterVillageTopDict = function (data) {
-    return axios.post("/drinkingWater/drinkingWaterVillageTopDict/",data)
-}
-
-// 删除
-const removeDrinkingWaterVillageTopDict = function (id) {
-    return axios.delete(`/drinkingWater/drinkingWaterVillageTopDict/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWaterVillageTopDict = function (ids) {
-    return axios.delete("/drinkingWater/drinkingWaterVillageTopDict/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWaterVillageTopDict = function (data) {
-    return axios.put("/drinkingWater/drinkingWaterVillageTopDict",data)
-}
-
-const getVillageTopColumnOptions = function(column){
-    return axios.get("/drinkingWater/drinkingWaterVillageTopDict/options",{params:{column}})
-}
-const copyBatchVillageTopPlace = function (data){
-    return axios.post("/drinkingWater/drinkingWaterVillageTopDict/copyBatch",data)
-}
-
-// ----------------------农村地下水字典-----------------------
-const pageVillageBottomDictUrl = '/drinkingWater/drinkingWaterVillageBottomDict';
-const listVillageBottomAllUrl = pageVillageBottomDictUrl + "";
-
-// 添加
-const saveDrinkingWaterVillageBottomDict = function (data) {
-    return axios.post("/drinkingWater/drinkingWaterVillageBottomDict/",data)
-}
-
-// 删除
-const removeDrinkingWaterVillageBottomDict = function (id) {
-    return axios.delete(`/drinkingWater/drinkingWaterVillageBottomDict/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWaterVillageBottomDict = function (ids) {
-    return axios.delete("/drinkingWater/drinkingWaterVillageBottomDict/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWaterVillageBottomDict = function (data) {
-    return axios.put("/drinkingWater/drinkingWaterVillageBottomDict",data)
-}
-
-const getVillageBottomColumnOptions = function(column){
-    return axios.get("/drinkingWater/drinkingWaterVillageBottomDict/options",{params:{column}})
-}
-const copyBatchVillageBottomPlace = function (data){
-    return axios.post("/drinkingWater/drinkingWaterVillageBottomDict/copyBatch",data)
-}
-
-
-export {
-    //市级
-    pageDictUrl,
-    listAllUrl,
-    saveDrinkingWaterDict,
-    removeDrinkingWaterDict,
-    removeBatchDrinkingWaterDict,
-    updateDrinkingWaterDict,
-    getColumnOptions,
-    copyBatchPlace,
-    // 县级地表水
-    pageCountyDictUrl,
-    listCountyAllUrl,
-    saveDrinkingWaterCountyDict,
-    removeDrinkingWaterCountyDict,
-    removeBatchDrinkingWaterCountyDict,
-    updateDrinkingWaterCountyDict,
-    getCountyColumnOptions,
-    copyBatchCountyPlace,
-    //县级地下水
-    pageCountyBottomDictUrl,
-    listCountyBottomAllUrl,
-    saveDrinkingWaterCountyBottomDict,
-    removeDrinkingWaterCountyBottomDict,
-    removeBatchDrinkingWaterCountyBottomDict,
-    updateDrinkingWaterCountyBottomDict,
-    getCountyBottomColumnOptions,
-    copyBatchCountyBottomPlace,
-    //农村地表水
-    pageVillageTopDictUrl,
-    listVillageTopAllUrl,
-    saveDrinkingWaterVillageTopDict,
-    removeDrinkingWaterVillageTopDict,
-    removeBatchDrinkingWaterVillageTopDict,
-    updateDrinkingWaterVillageTopDict,
-    getVillageTopColumnOptions,
-    copyBatchVillageTopPlace,
-    //农村地下水
-    pageVillageBottomDictUrl,
-    listVillageBottomAllUrl,
-    saveDrinkingWaterVillageBottomDict,
-    removeDrinkingWaterVillageBottomDict,
-    removeBatchDrinkingWaterVillageBottomDict,
-    updateDrinkingWaterVillageBottomDict,
-    getVillageBottomColumnOptions,
-    copyBatchVillageBottomPlace,
-}
--- a/src/api/ecology/drinking-water-village.js
+++ b/src/api/ecology/drinking-water-village.js
@@ -1,97 +0,0 @@
-import axios from 'axios';
-// ----------------------列表-----------------------
-const pageBillUrl = '/drinkingWaterVillage/drinkingWaterVillageBill/page';
-// 添加
-const saveDrinkingWaterVillageBill = function (data) {
-    return axios.post("/drinkingWaterVillage/drinkingWaterVillageBill/importBatch",data)
-}
-
-// 删除
-const removeDrinkingWaterVillageBill = function (id) {
-    return axios.delete(`/drinkingWaterVillage/drinkingWaterVillageBill/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWaterVillageBill = function (ids) {
-    return axios.delete("/drinkingWaterVillage/drinkingWaterVillageBill/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWaterVillageBill = function (data) {
-    return axios.put("/drinkingWaterVillage/drinkingWaterVillageBill",data)
-}
-// 审核
-const verifyDrinkingWaterVillageBill = function (data) {
-    return axios.put("/drinkingWaterVillage/drinkingWaterVillageBill/verify",data);
-}
-const getDrinkingWaterVillageBill = function (id) {
-    return axios.get(`/drinkingWaterVillage/drinkingWaterVillageBill/${id}`)
-}
-// -------------------------数据---------------------
-const pageDrinkingWaterVillageUrl = '/drinkingWaterVillage/drinkingWaterVillage/page';
-
-const listAll = function(data){
-    return axios.get("/drinkingWaterVillage/drinkingWaterVillage",{params:data})
-}
-// 添加
-const saveDrinkingWaterVillage = function (data) {
-    return axios.post("/drinkingWaterVillage/drinkingWaterVillage",data)
-}
-
-// 删除
-const removeDrinkingWaterVillage = function (id) {
-    return axios.delete(`/drinkingWaterVillage/drinkingWaterVillage/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWaterVillage = function (ids) {
-    return axios.delete("/drinkingWaterVillage/drinkingWaterVillage/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWaterVillage = function (data) {
-        return axios.put("/drinkingWaterVillage/drinkingWaterVillage",data)
-}
-
-//批量修改取水量
-const updateVillageWaterWithdrawal=function(data){
-    return axios.put("/drinkingWaterVillage/drinkingWaterVillage/updateVillageWater",data)
-}
-
-// -------------------------统计---------------------
-const pageDrinkingWaterVillageStatisticUrl = '/drinkingWaterVillage/drinkingWaterVillage/VillageAnalysePage';
-// const pageDrinkingWaterVillageCompare = '/drinkingWaterVillage/drinkingWaterVillage/statistic/compare';
-const getHistoryyears = function () {
-    return axios.get("/drinkingWaterVillage/drinkingWaterVillage/history-year")
-}
-const getColumnOptions = function(column){
-    return axios.get("/drinkingWaterVillage/drinkingWaterVillage/options",{params:{column}})
-}
-
-const getGisBase = function(data){
-    return axios.get("/drinkingWaterVillage/drinkingWaterVillage/gis",{params:data})
-}
-
-const getGisArea = function(data){
-    return axios.get("/drinkingWaterVillage/drinkingWaterVillage/gis/area",{params:data})
-}
-export {
-    pageBillUrl,
-    saveDrinkingWaterVillageBill,
-    removeDrinkingWaterVillageBill,
-    updateDrinkingWaterVillageBill,
-    removeBatchDrinkingWaterVillageBill,
-    verifyDrinkingWaterVillageBill,
-    getDrinkingWaterVillageBill,
-    pageDrinkingWaterVillageUrl,
-    saveDrinkingWaterVillage,
-    removeDrinkingWaterVillage,
-    updateDrinkingWaterVillage,
-    removeBatchDrinkingWaterVillage,
-    pageDrinkingWaterVillageStatisticUrl,
-    getHistoryyears,
-    // pageDrinkingWaterVillageCompare,
-    getColumnOptions,
-    listAll,
-    getGisBase,
-    getGisArea,
-    updateVillageWaterWithdrawal
-}
--- a/src/api/ecology/drinking-water.js
+++ b/src/api/ecology/drinking-water.js
@@ -1,103 +0,0 @@
-import axios from 'axios';
-// ----------------------列表-----------------------
-const pageBillUrl = '/drinkingWater/drinkingWaterBill/page';
-// 添加
-const saveDrinkingWaterBill = function (data) {
-    return axios.post("/drinkingWater/drinkingWaterBill/batch",data)
-}
-
-// 删除
-const removeDrinkingWaterBill = function (id) {
-    return axios.delete(`/drinkingWater/drinkingWaterBill/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWaterBill = function (ids) {
-    return axios.delete("/drinkingWater/drinkingWaterBill/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWaterBill = function (data) {
-    return axios.put("/drinkingWater/drinkingWaterBill",data)
-}
-// 审核
-const verifyDrinkingWaterBill = function (data) {
-    return axios.put("/drinkingWater/drinkingWaterBill/verify",data);
-}
-const getDrinkingWaterBill = function (id) {
-    return axios.get(`/drinkingWater/drinkingWaterBill/${id}`)
-}
-// -------------------------数据---------------------
-const pageDrinkingWaterUrl = '/drinkingWater/drinkingWater/page';
-
-const listAll = function(data){
-    return axios.get("/drinkingWater/drinkingWater",{params:data})
-}
-// 添加
-const saveDrinkingWater = function (data) {
-    return axios.post("/drinkingWater/drinkingWater",data)
-}
-
-// 删除
-const removeDrinkingWater = function (id) {
-    return axios.delete(`/drinkingWater/drinkingWater/${id}`,)
-}
-// 批量删除
-const removeBatchDrinkingWater = function (ids) {
-    return axios.delete("/drinkingWater/drinkingWater/batch",{data:ids})
-}
-
-// 修改
-const updateDrinkingWater = function (data) {
-        return axios.put("/drinkingWater/drinkingWater",data)
-}
-//批量修改取水量
-const updateWaterWithdrawal=function(data){
-    return axios.put("/drinkingWater/drinkingWater/updateWater",data)
-}
-
-
-
-// -------------------------统计---------------------
-//市级原始数据
-const pageDrinkingWaterStatisticUrl = '/drinkingWater/drinkingWater/AnalysePage';
-//县级原始数据
-const pageDrinkingWaterCountyStatisticUrl='/drinkingWater/drinkingWater/CountyAnalysePage'
-// const pageDrinkingWaterCompare = '/drinkingWater/drinkingWater/statistic/compare';
-const getHistoryyears = function () {
-    return axios.get("/drinkingWater/drinkingWater/history-year")
-}
-const getColumnOptions = function(column){
-    return axios.get("/drinkingWater/drinkingWater/options",{params:{column}})
-}
-
-const getGisBase = function(data){
-    return axios.get("/drinkingWater/drinkingWater/gis",{params:data})
-}
-
-const getGisArea = function(data){
-    return axios.get("/drinkingWater/drinkingWater/gis/area",{params:data})
-}
-export {
-    pageBillUrl,
-    saveDrinkingWaterBill,
-    removeDrinkingWaterBill,
-    updateDrinkingWaterBill,
-    removeBatchDrinkingWaterBill,
-    verifyDrinkingWaterBill,
-    getDrinkingWaterBill,
-    pageDrinkingWaterUrl,
-    saveDrinkingWater,
-    removeDrinkingWater,
-    updateDrinkingWater,
-    removeBatchDrinkingWater,
-    pageDrinkingWaterStatisticUrl,
-    pageDrinkingWaterCountyStatisticUrl,
-    getHistoryyears,
-    // pageDrinkingWaterCompare,
-    getColumnOptions,
-    listAll,
-    getGisBase,
-    getGisArea,
-    updateWaterWithdrawal
-  
-}
--- a/src/api/ecology/lake.js
+++ b/src/api/ecology/lake.js
@@ -1,86 +0,0 @@
-import axios from 'axios';
-// ----------------------列表-----------------------
-const pageBillUrl = '/lakeLibrary/lakeLibraryInnerCityBill/page';
-
-const getInnerData = function (data) {
-    return axios.get(pageBillUrl,{params:data})
-}
-
-// 添加
-const saveLakeBill = function (data) {
-    return axios.post("/lakeLibrary/lakeLibraryInnerCityBill/importBatch",data)
-}
-
-// 删除
-const removeLakeBill = function (id) {
-    return axios.delete(`/lakeLibrary/lakeLibraryInnerCityBill/${id}`,)
-}
-// 批量删除
-const removeBatchLakeBill = function (ids) {
-    return axios.delete("/lakeLibrary/lakeLibraryInnerCityBill/batch",{data:ids})
-}
-
-// 修改
-const updateLakeBill = function (data) {
-    return axios.put("/lakeLibrary/lakeLibraryInnerCityBill",data)
-}
-// 审核
-const verifyLakeBill = function (data) {
-    return axios.put("/lakeLibrary/lakeLibraryInnerCityBill/verify",data);
-}
-const getLakeBill = function (id) {
-    return axios.get(`/lakeLibrary/lakeLibraryInnerCityBill/${id}`)
-}
-// -------------------------数据---------------------
-const pageLakeUrl = '/lakeLibrary/lakeLibraryInnerCity/page';
-// 添加
-const saveLake = function (data) {
-    return axios.post("/lakeLibrary/lakeLibraryInnerCity",data)
-}
-
-// 删除
-const removeLake = function (id) {
-    return axios.delete(`/lakeLibrary/lakeLibraryInnerCity/${id}`,)
-}
-// 批量删除
-const removeBatchLake = function (ids) {
-    return axios.delete("/lakeLibrary/lakeLibraryInnerCity/batch",{data:ids})
-}
-
-// 修改
-const updateLake = function (data) {
-        return axios.put("/lakeLibrary/lakeLibraryInnerCity",data)
-}
-
-// -------------------------统计---------------------
-const pageLakeStatisticUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic';
-const statisticSourceUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic/source';
-const statisticYearUrl = '/lakeLibrary/lakeLibraryInnerCity/statistic/year';
-const getHistoryyears = function () {
-    return axios.get("/lakeLibrary/lakeLibraryInnerCity/history-year")
-}
-const getColumnOptions = function(column){
-    return axios.get("/lakeLibrary/lakeLibraryInnerCity/options",{params:{column}})
-}
-
-export {
-    pageBillUrl,
-    saveLakeBill,
-    removeLakeBill,
-    updateLakeBill,
-    removeBatchLakeBill,
-    verifyLakeBill,
-    getLakeBill,
-    pageLakeUrl,
-    saveLake,
-    removeLake,
-    updateLake,
-    removeBatchLake,
-    pageLakeStatisticUrl,
-    getHistoryyears,
-    getColumnOptions,
-    statisticSourceUrl,
-    statisticYearUrl,
-    getInnerData
-
-}
--- a/src/api/ecology/new-drinking-water.js
+++ b/src/api/ecology/new-drinking-water.js
@@ -1,173 +0,0 @@
-
-import axios from 'axios';
-
-// 获取市级下拉
-
-export const listInfoUrl = '/drinkingWater/drinkingWaterDict';
-export const listInfo = function (data) {
-    return axios.get(listInfoUrl,data)
-}
-
-// 县级地表水
-export const countyListInfoUrl = '/drinkingWater/drinkingWaterCountyDict';
-export const countyListInfo = function (data) {
-    return axios.get(countyListInfoUrl,data)
-}
-
-// 县级地下水
-export const countyDownListInfoUrl = '/drinkingWater/drinkingWaterCountyBottomDict';
-export const countyDownListInfo = function (data) {
-    return axios.get(countyDownListInfoUrl,data)
-}
-// 村级地表水
-export const villageUpListInfoUrl = '/drinkingWater/drinkingWaterVillageTopDict';
-export const villageUpListInfo = function (data) {
-    return axios.get(villageUpListInfoUrl,data)
-}
-
-
-// 村级地下水
-export const villageListInfoUrl = '/drinkingWater/drinkingWaterVillageBottomDict';
-export const villageListInfo = function (data) {
-    return axios.get(villageListInfoUrl,data)
-}
-
-// 下拉结束
-
-// 市级监测数据报送表
-export const pageBsaeListUrl = '/drinkingWater/drinkingWater/AnalysePage';
-export const analysePageData = function (data) {
-    return axios.post(pageBsaeListUrl,data)
-}
-
-//市级—报送情况说明表
-export const pageDescListUrl = '/drinkingWater/drinkingWater/getDescripForm';
-export const getDescripForm = function (data) {
-    return axios.post(pageDescListUrl,data)
-}
-
-
-
-//市级—取水量统计
-export const pageanalyseListUrl = '/drinkingWater/drinkingWater/AnalysePage';
-export const getWaterCount = function (data) {
-    return axios.post(pageanalyseListUrl,data)
-}
-
-//市级—超标评价
-export const overStandardtUrl = '/drinkingWater/drinkingWater/getWaterEvaluate';
-export const overStandardCount = function (data) {
-    return axios.post(overStandardtUrl,data)
-}
-
-
-//市级—水质类别
-export const waterQualityUrl = '/drinkingWater/drinkingWater/getWaterQualityCategory';
-export const waterQualityData = function (data) {
-    return axios.post(waterQualityUrl,data)
-}
-
-//市级—水质统计
-export const waterQualityCountUrl = '/drinkingWater/drinkingWater/getWaterQualityStatistics';
-export const waterQualityCountData = function (data) {
-    return axios.post(waterQualityCountUrl,data)
-}
-
-//市级—水质达标情况
-export const waterQualityUpUrl = '/drinkingWater/drinkingWater/getWaterQualityStandard';
-export const waterQualityUpData = function (data) {
-    return axios.post(waterQualityUpUrl,data)
-}
-
-//市级—备用水源营养指数
-export const waterNutritionalUrl = '/drinkingWater/drinkingWater/getCompositeNutritionIndex';
-export const waterNutritionalData = function (data) {
-    return axios.post(waterNutritionalUrl,data)
-}
-
-
-
-// 县级
-//监测数据报送表
-export const countyPageBsaeListUrl = '/drinkingWater/drinkingWater/CountyAnalysePage';
-export const countyPageBsaeData = function (data) {
-    return axios.post(countyPageBsaeListUrl,data)
-}
-
-//报送情况说明表
-export const countyDescripFormUrl = '/drinkingWater/drinkingWater/getCountyDescripForm';
-export const countyDescripFormData = function (data) {
-    return axios.post(countyDescripFormUrl,data)
-}
-
-//县级—取水量统计
-export const countyWaterCount = function (data) {
-    return axios.post('/drinkingWater/drinkingWater/analyseCountyPage',data)
-}
-
-//县级—超标评价
-export const countyOverStandardtUrl = '/drinkingWater/drinkingWater/getCountyWaterEvaluate';
-export const countyOverStandardCount = function (data) {
-    return axios.post(countyOverStandardtUrl,data)
-}
-
-//县级—水质类别
-export const countyWaterQualityUrl = '/drinkingWater/drinkingWater/getCountyWaterQualityCategory';
-export const countyWaterQualityData = function (data) {
-    return axios.post(countyWaterQualityUrl,data)
-}
-
-//县级—水质统计
-export const countyWaterQualityCountUrl = '/drinkingWater/drinkingWater/getCountyWaterQualityStatistics';
-export const countyWaterQualityCountData = function (data) {
-    return axios.post(countyWaterQualityCountUrl,data)
-}
-
-//县级—水质达标情况
-export const countyWaterQualityUpUrl = '/drinkingWater/drinkingWater/getCountyWaterQualityStandard';
-export const countyWaterQualityUpData = function (data) {
-    return axios.post(countyWaterQualityUpUrl,data)
-}
-
-
-// 农村
-export const villageAnalysePageUrl = '/drinkingWaterVillage/drinkingWaterVillage/VillageAnalysePage';
-export const villageAnalysePageData = function (data) {
-    return axios.post(villageAnalysePageUrl,data)
-}
-
-//农村—水质类别
-export const villageWaterQualityUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterQualityCategoryVillage';
-export const villageWaterQualityData = function (data) {
-    return axios.post(villageWaterQualityUrl,data)
-}
-
-//农村—水质达标情况
-export const villageWaterQualityUpUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterQualityStandard';
-export const villageWaterQualityUpData = function (data) {
-    return axios.post(villageWaterQualityUpUrl,data)
-}
-
-//农村—超标评价
-export const villageOverStandardtUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterVillageEvaluate';
-export const villageOverStandardCount = function (data) {
-    return axios.post(villageOverStandardtUrl,data)
-}
-
-//农村—水质统计
-export const villageWaterQualityCountUrl = '/drinkingWaterVillage/drinkingWaterVillage/getWaterQualityStatistics';
-export const villageWaterQualityCountData = function (data) {
-    return axios.post(villageWaterQualityCountUrl,data)
-}
-// /api/waterFunctionArea/drinkingWaterEvaluationStandard
-
-export const filterList = function (data) {
-    return axios.post('/waterFunctionArea/drinkingWaterEvaluationStandard',data)
-}
-
-// 饮用水统计图表
-
-export const drinkingWaterTrendUrl = '/drinkingWater/trendChart/data';
-export const drinkingWaterTrend = function (data) {
-    return axios.post(drinkingWaterTrendUrl,data)
-}
--- a/src/api/ecology/new-lake.js
+++ b/src/api/ecology/new-lake.js
@@ -1,85 +0,0 @@
-import axios from 'axios';
-
-// 湖库断面，区域
-export const getLakeDropdown = function () {
-    return axios.get(`/lakeLibrary/lakeCityDict/list`)
-}
-
-// 湖库专湖断面，区域
-export const getSpecialLakeDropdown = function () {
-    return axios.get(`/lakeLibrary/lakeSpecialDict/specialDictPage`)
-}
-
-
-
-// 湖库水质分析城市内湖原始数据接口
-export const cityOriginalUrl = '/lakeLibrary/wateAnalysis/city/originalData'
-export const cityOriginalData = function (data) {
-    return axios.post(cityOriginalUrl,data)
-}
-
-//城市内湖综合营养指数接口
-export const cityComprehensiveNutritionUrl = '/lakeLibrary/wateAnalysis/city/comprehensiveNutrition';
-export const cityComprehensiveNutritionData = function (data) {
-    return axios.post(cityComprehensiveNutritionUrl,data)
-}
-
-
-// 城市内湖平均数据接口
-export const cityAverageUrl = '/lakeLibrary/wateAnalysis/city/average';
-export const cityAverageData = function (data) {
-    return axios.post(cityAverageUrl,data)
-}
-
-
-// 城市内湖平均营养指数接口
-export const cityAverageNutritionUrl = '/lakeLibrary/wateAnalysis/city/averageNutrition';
-export const cityAverageNutrition = function (data) {
-    return axios.post(cityAverageNutritionUrl,data)
-}
-
-// 城市内湖平均营养指数接口
-export const cityYearContrastUrl = '/lakeLibrary/wateAnalysis/city/yearContrast';
-export const cityYearContrastData = function (data) {
-    return axios.post(cityYearContrastUrl,data)
-}
-
-// 专项湖库
-// 专项湖库原始数据接口
-export const specialOriginalUrl = '/lakeLibrary/wateAnalysis/special/originalData'
-export const specialOriginalData = function (data) {
-    return axios.post(specialOriginalUrl,data)
-}
-
-//专项湖库综合营养指数接口
-export const specialComprehensiveNutritionUrl = '/lakeLibrary/wateAnalysis/special/comprehensiveNutrition';
-export const specialComprehensiveNutritionData = function (data) {
-    return axios.post(specialComprehensiveNutritionUrl,data)
-}
-
-
-// 专项湖库平均数据接口
-export const specialAverageUrl = '/lakeLibrary/wateAnalysis/special/average';
-export const specialAverageData = function (data) {
-    return axios.post(specialAverageUrl,data)
-}
-
-
-// 专项湖库平均营养指数接口
-export const specialAverageNutritionUrl = '/lakeLibrary/wateAnalysis/special/averageNutrition';
-export const specialAverageNutrition = function (data) {
-    return axios.post(specialAverageNutritionUrl,data)
-}
-
-// 专项湖库平均营养指数接口
-export const specialYearContrastUrl = '/lakeLibrary/wateAnalysis/special/yearContrast';
-export const specialYearContrastData = function (data) {
-    return axios.post(specialYearContrastUrl,data)
-}
-
-// 湖库统计图表
-
-export const lakeLibraryUrl = '/lakeLibrary/trendChart/data';
-export const lakeLibrary = function (data) {
-    return axios.post(lakeLibraryUrl,data)
-}
--- a/src/api/ecology/noise/function-noise-function-type.js
+++ b/src/api/ecology/noise/function-noise-function-type.js
@@ -1,38 +0,0 @@
-import axios from 'axios';
-const baseUri = "/sound/function/functionType";
-const listAllUrl = baseUri + "";
-
-// 添加
-const saveFunctionType = function (data) {
-    return axios.post("/sound/function/functionType",data)
-}
-
-// 删除
-const removeFunctionType = function (id) {
-    return axios.delete(`/sound/function/functionType/${id}`,)
-}
-// 批量删除
-const removeBatchFunctionType = function (ids) {
-    return axios.delete("/sound/function/functionType/batch",{data:ids})
-}
-
-// 修改
-const updateFunctionType = function (data) {
-    return axios.put("/sound/function/functionType",data)
-}
-const getColumnOptions = function(column){
-    return axios.get("/sound/function/functionType/options",{params:{column}})
-}
-const copyBatchFunctionType = function (data){
-    return axios.post("/sound/function/functionType/copyBatch",data)
-}
-export {
-    listAllUrl,
-    saveFunctionType,
-    updateFunctionType,
-    removeBatchFunctionType,
-    removeFunctionType,
-    getColumnOptions,
-    copyBatchFunctionType
-
-}
--- a/src/api/ecology/noise/function-noise-leq-level.js
+++ b/src/api/ecology/noise/function-noise-leq-level.js
@@ -1,35 +0,0 @@
-import axios from 'axios';
-const baseUri = "/sound/function/noiseLeqLevel";
-const listAllUrl = baseUri + "";
-
-// 添加
-const saveLeqLevel = function (data) {
-    return axios.post("/sound/function/noiseLeqLevel",data)
-}
-
-// 删除
-const removeLeqLevel = function (id) {
-    return axios.delete(`/sound/function/noiseLeqLevel/${id}`,)
-}
-// 批量删除
-const removeBatchLeqLevel = function (ids) {
-    return axios.delete("/sound/function/noiseLeqLevel/batch",{data:ids})
-}
-
-// 修改
-const updateLeqLevel = function (data) {
-    return axios.put("/sound/function/noiseLeqLevel",data)
-}
-const getColumnOptions = function(column){
-    return axios.get("/sound/function/noiseLeqLevel/options",{params:{column}})
-}
-
-export {
-    listAllUrl,
-    saveLeqLevel,
-    updateLeqLevel,
-    removeBatchLeqLevel,
-    removeLeqLevel,
-    getColumnOptions
-
-}
--- a/src/api/ecology/noise/function-noise-place.js
+++ b/src/api/ecology/noise/function-noise-place.js
@@ -1,44 +0,0 @@
-import axios from 'axios';
-const baseUri = "/sound/function/place";
-const listAllUrl = baseUri + "";
-
-// 添加
-const savePlace = function (data) {
-    return axios.post("/sound/function/place",data)
-}
-// 批量添加
-const savePlaceBatch = function (data) {
-    return axios.post("/sound/function/place/batch",data)
-}
-// 删除
-const removePlace = function (id) {
-    return axios.delete(`/sound/function/place/${id}`,)
-}
-// 批量删除
-const removeBatchPlace = function (ids) {
-    return axios.delete("/sound/function/place/batch",{data:ids})
-}
-
-// 修改
-const updatePlace = function (data) {
-    return axios.put("/sound/function/place",data)
-}
-
-const getColumnOptions = function(column){
-    return axios.get("/sound/function/place/options",{params:{column}})
-}
-
-const copyBatchPlace = function (data){
-    return axios.post("/sound/function/place/copyBatch",data)
-}
-
-export {
-    listAllUrl,
-    savePlace,
-    updatePlace,
-    removeBatchPlace,
-    removePlace,
-    getColumnOptions,
-    copyBatchPlace,
-    savePlaceBatch
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
赵忠林	723f749125	refactor(app): 删除应用管理相关代码模块 - 移除App实体类及对应的AppInfo实体类 - 删除AppController控制器及其相关方法 - 清理AppMapper接口及其XML映射文件 - 删除AppParam查询参数类 - 移除AppService接口及其实现类AppServiceImpl - 删除测试代码生成器AppsGenerator类 - 清理所有与应用管理相关的代码文件，进行代码精简和重构	2026-04-26 01:35:12 +08:00
gxwebsoft	e57c560c3e	文件服务器	2023-06-27 14:28:06 +08:00
gxwebsoft	0592f9b335	新增充值订单结算任务	2023-06-27 12:14:33 +08:00
gxwebsoft	fc2a3ffe4c	实现多租户功能	2022-11-17 23:16:26 +08:00
gxwebsoft	7ba1abf59f	更新	2022-11-17 11:17:05 +08:00
hey7845	b9ba66dcb2	趋势图柱状宽度等功能修改	2022-02-12 23:22:10 +08:00
庞东林	96059c7d94	修改趋势图样式	2022-02-12 19:45:36 +08:00
weicw	531657cd6a	字典添加名称筛选	2022-02-07 18:22:41 +08:00
weicw	b62b755d21	饮用水点位修正	2022-02-07 18:04:18 +08:00
weicw	072e889860	江河点位修正	2022-02-07 15:20:17 +08:00