675 changed files with 27119 additions and 37649 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,22 @@
+# 告诉EditorConfig插件，这是根文件，不用继续往上查找
+root = true
+
+# 匹配全部文件
+[*]
+# 设置字符集
+charset = utf-8
+# 缩进风格，可选space、tab
+indent_style = space
+# 缩进的空格数
+indent_size = 2
+# 结尾换行符，可选lf、cr、crlf
+end_of_line = lf
+# 在文件结尾插入新行
+insert_final_newline = true
+# 删除一行中的前后空格
+trim_trailing_whitespace = true
+
+# 匹配md结尾的文件
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
--- a/.env.development
+++ b/.env.development
@ -0,0 +1,11 @@
+# 页面标题
+VUE_APP_TITLE = 若依管理系统
+
+# 开发环境配置
+ENV = 'development'
+
+# 若依管理系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
+# 路由懒加载
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/.env.production
+++ b/.env.production
@ -0,0 +1,8 @@
+# 页面标题
+VUE_APP_TITLE = 若依管理系统
+
+# 生产环境配置
+ENV = 'production'
+
+# 若依管理系统/生产环境
+VUE_APP_BASE_API = '/prod-api'
--- a/.env.staging
+++ b/.env.staging
@ -0,0 +1,10 @@
+# 页面标题
+VUE_APP_TITLE = 若依管理系统
+
+NODE_ENV = production
+
+# 测试环境配置
+ENV = 'staging'
+
+# 若依管理系统/测试环境
+VUE_APP_BASE_API = '/stage-api'
--- a/.eslintignore
+++ b/.eslintignore
@ -0,0 +1,10 @@
+# 忽略build目录下类型为js的文件的语法检查
+build/*.js
+# 忽略src/assets目录下文件的语法检查
+src/assets
+# 忽略public目录下文件的语法检查
+public
+# 忽略当前目录下为js的文件的语法检查
+*.js
+# 忽略当前目录下为vue的文件的语法检查
+*.vue
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -0,0 +1,199 @@
+// ESlint 检查配置
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: 'babel-eslint',
+    sourceType: 'module'
+  },
+  env: {
+    browser: true,
+    node: true,
+    es6: true,
+  },
+  extends: ['plugin:vue/recommended', 'eslint:recommended'],
+
+  // add your custom rules here
+  //it is base on https://github.com/vuejs/eslint-config-vue
+  rules: {
+    "vue/max-attributes-per-line": [2, {
+      "singleline": 10,
+      "multiline": {
+        "max": 1,
+        "allowFirstLine": false
+      }
+    }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline": "off",
+    "vue/name-property-casing": ["error", "PascalCase"],
+    "vue/no-v-html": "off",
+    'accessor-pairs': 2,
+    'arrow-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'block-spacing': [2, 'always'],
+    'brace-style': [2, '1tbs', {
+      'allowSingleLine': true
+    }],
+    'camelcase': [0, {
+      'properties': 'always'
+    }],
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'comma-style': [2, 'last'],
+    'constructor-super': 2,
+    'curly': [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'eol-last': 2,
+    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'generator-star-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'handle-callback-err': [2, '^(err|error)$'],
+    'indent': [2, 2, {
+      'SwitchCase': 1
+    }],
+    'jsx-quotes': [2, 'prefer-single'],
+    'key-spacing': [2, {
+      'beforeColon': false,
+      'afterColon': true
+    }],
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'new-cap': [2, {
+      'newIsCap': true,
+      'capIsNew': false
+    }],
+    'new-parens': 2,
+    'no-array-constructor': 2,
+    'no-caller': 2,
+    'no-console': 'off',
+    'no-class-assign': 2,
+    'no-cond-assign': 2,
+    'no-const-assign': 2,
+    'no-control-regex': 0,
+    'no-delete-var': 2,
+    'no-dupe-args': 2,
+    'no-dupe-class-members': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-empty-pattern': 2,
+    'no-eval': 2,
+    'no-ex-assign': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-boolean-cast': 2,
+    'no-extra-parens': [2, 'functions'],
+    'no-fallthrough': 2,
+    'no-floating-decimal': 2,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-inner-declarations': [2, 'functions'],
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 2,
+    'no-iterator': 2,
+    'no-label-var': 2,
+    'no-labels': [2, {
+      'allowLoop': false,
+      'allowSwitch': false
+    }],
+    'no-lone-blocks': 2,
+    'no-mixed-spaces-and-tabs': 2,
+    'no-multi-spaces': 2,
+    'no-multi-str': 2,
+    'no-multiple-empty-lines': [2, {
+      'max': 1
+    }],
+    'no-native-reassign': 2,
+    'no-negated-in-lhs': 2,
+    'no-new-object': 2,
+    'no-new-require': 2,
+    'no-new-symbol': 2,
+    'no-new-wrappers': 2,
+    'no-obj-calls': 2,
+    'no-octal': 2,
+    'no-octal-escape': 2,
+    'no-path-concat': 2,
+    'no-proto': 2,
+    'no-redeclare': 2,
+    'no-regex-spaces': 2,
+    'no-return-assign': [2, 'except-parens'],
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow-restricted-names': 2,
+    'no-spaced-func': 2,
+    'no-sparse-arrays': 2,
+    'no-this-before-super': 2,
+    'no-throw-literal': 2,
+    'no-trailing-spaces': 2,
+    'no-undef': 2,
+    'no-undef-init': 2,
+    'no-unexpected-multiline': 2,
+    'no-unmodified-loop-condition': 2,
+    'no-unneeded-ternary': [2, {
+      'defaultAssignment': false
+    }],
+    'no-unreachable': 2,
+    'no-unsafe-finally': 2,
+    'no-unused-vars': [2, {
+      'vars': 'all',
+      'args': 'none'
+    }],
+    'no-useless-call': 2,
+    'no-useless-computed-key': 2,
+    'no-useless-constructor': 2,
+    'no-useless-escape': 0,
+    'no-whitespace-before-property': 2,
+    'no-with': 2,
+    'one-var': [2, {
+      'initialized': 'never'
+    }],
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
+      }
+    }],
+    'padded-blocks': [2, 'never'],
+    'quotes': [2, 'single', {
+      'avoidEscape': true,
+      'allowTemplateLiterals': true
+    }],
+    'semi': [2, 'never'],
+    'semi-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'space-before-blocks': [2, 'always'],
+    'space-before-function-paren': [2, 'never'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 2,
+    'space-unary-ops': [2, {
+      'words': true,
+      'nonwords': false
+    }],
+    'spaced-comment': [2, 'always', {
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+    }],
+    'template-curly-spacing': [2, 'never'],
+    'use-isnan': 2,
+    'valid-typeof': 2,
+    'wrap-iife': [2, 'any'],
+    'yield-star-spacing': [2, 'both'],
+    'yoda': [2, 'never'],
+    'prefer-const': 2,
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'object-curly-spacing': [2, 'always', {
+      objectsInObjects: false
+    }],
+    'array-bracket-spacing': [2, 'never']
+  }
+}
--- a/.gitignore
+++ b/.gitignore
@ -1,46 +1,23 @@
-######################################################################
-# Build Tools
-
-.gradle
-/build/
-!gradle/wrapper/gradle-wrapper.jar
-
-target/
-!.mvn/wrapper/maven-wrapper.jar
-
-######################################################################
-# IDE
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### JRebel ###
-rebel.xml
-### NetBeans ###
-nbproject/private/
-build/*
-nbbuild/
+.DS_Store
+node_modules/
 dist/
-nbdist/
-.nb-gradle/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+**/*.log

-######################################################################
-# Others
-*.log
-*.xml.versionsBackup
-*.swp
+tests/**/coverage/
+tests/e2e/reports
+selenium-debug.log

-!*/build/*.java
-!*/build/*.html
-!*/build/*.xml
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.local
+
+package-lock.json
+yarn.lock
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 若依
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,26 +1,30 @@
-## 系统模块
+## 开发

-~~~
-com.muyu     
-├── muyu-ui              // 前端框架 [80]
-├── muyu-gateway         // 网关模块 [8080]
-├── muyu-auth            // 认证中心 [9200]
-├── muyu-common          // 通用模块
-│       └── muyu-common-core                         // 核心模块
-│       └── muyu-common-datascope                    // 权限范围
-│       └── muyu-common-datasource                   // 多数据源
-│       └── muyu-common-log                          // 日志记录
-│       └── muyu-common-redis                        // 缓存服务
-│       └── muyu-common-seata                        // 分布式事务
-│       └── muyu-common-security                     // 安全模块
-│       └── muyu-common-swagger                      // 系统接口
-│       └── muyu-common-system                       // 系统基础
-├── muyu-modules         // 业务模块
-│       └── muyu-system                              // 系统模块 [9201]
-│       └── muyu-gen                                 // 代码生成 [9202]
-│       └── muyu-job                                 // 定时任务 [9203]
-│       └── muyu-file                                // 文件服务 [9300]
-├── muyu-visual          // 图形化管理模块
-│       └── muyu-visual-monitor                      // 监控中心 [9100]
-├──pom.xml                // 公共依赖
-~~~
+```bash
+# 克隆项目
+git clone https://gitea.qinmian.online/ruoyi/cloud-ui.git
+
+# 进入项目目录
+cd cloud-ui
+
+# 安装依赖
+npm install
+
+# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
+npm install --registry=https://registry.npmmirror.com
+
+# 启动服务
+npm run dev
+```
+
+浏览器访问 http://localhost:80
+
+## 发布
+
+```bash
+# 构建测试环境
+npm run build:stage
+
+# 构建生产环境
+npm run build:prod
+```
--- a/babel.config.js
+++ b/babel.config.js
@ -0,0 +1,13 @@
+module.exports = {
+  presets: [
+    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
+    '@vue/cli-plugin-babel/preset'
+  ],
+  'env': {
+    'development': {
+      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
+      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
+      'plugins': ['dynamic-import-node']
+    }
+  }
+}
--- a/bin/build.bat
+++ b/bin/build.bat
@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 打包Web工程，生成dist文件。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run build:prod
+
+pause
--- a/bin/clean.bat
+++ b/bin/clean.bat
@ -1,12 +0,0 @@
-@echo off
-echo.
-echo [信息] 清理工程target生成路径。
-echo.
-
-%~d0
-cd %~dp0
-
-cd ..
-call mvn clean
-
-pause
--- a/bin/package.bat
+++ b/bin/package.bat
@ -1,12 +1,12 @@
@echo off
 echo.
-echo [信息] 打包Web工程，生成war/jar包文件。
+echo [信息] 安装Web工程，生成node_modules文件。
 echo.

 %~d0
 cd %~dp0

 cd ..
-call mvn clean package -Dmaven.test.skip=true
+npm install --registry=https://registry.npmmirror.com

 pause
--- a/bin/run-auth.bat
+++ b/bin/run-auth.bat
@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Auth<74><68><EFBFBD>̡<EFBFBD>
-echo.
-
-cd %~dp0
-cd ../muyu-auth/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-auth.jar
-
-cd bin
-pause
--- a/bin/run-gateway.bat
+++ b/bin/run-gateway.bat
@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Gateway<61><79><EFBFBD>̡<EFBFBD>
-echo.
-
-cd %~dp0
-cd ../muyu-gateway/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-gateway.jar
-
-cd bin
-pause
--- a/bin/run-modules-file.bat
+++ b/bin/run-modules-file.bat
@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-File<6C><65><EFBFBD>̡<EFBFBD>
-echo.
-
-cd %~dp0
-cd ../muyu-modules/muyu-file/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-modules-file.jar
-
-cd bin
-pause
--- a/bin/run-modules-gen.bat
+++ b/bin/run-modules-gen.bat
@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-Gen<65><6E><EFBFBD>̡<EFBFBD>
-echo.
-
-cd %~dp0
-cd ../muyu-modules/muyu-gen/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-modules-gen.jar
-
-cd bin
-pause
--- a/bin/run-modules-job.bat
+++ b/bin/run-modules-job.bat
@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-Job<6F><62><EFBFBD>̡<EFBFBD>
-echo.
-
-cd %~dp0
-cd ../muyu-modules/muyu-job/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-modules-job.jar
-
-cd bin
-pause
--- a/bin/run-modules-system.bat
+++ b/bin/run-modules-system.bat
@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Modules-System<65><6D><EFBFBD>̡<EFBFBD>
-echo.
-
-cd %~dp0
-cd ../muyu-modules/muyu-system/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-modules-system.jar
-
-cd bin
-pause
--- a/bin/run-monitor.bat
+++ b/bin/run-monitor.bat
@ -1,14 +0,0 @@
-@echo off
-echo.
-echo [<5B><>Ϣ] ʹ<><CAB9>Jar<61><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Monitor<6F><72><EFBFBD>̡<EFBFBD>
-echo.
-
-cd %~dp0
-cd ../muyu-visual/muyu-monitor/target
-
-set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar muyu-visual-monitor.jar
-
-cd bin
-pause
--- a/bin/run-web.bat
+++ b/bin/run-web.bat
@ -0,0 +1,12 @@
+@echo off
+echo.
+echo [信息] 使用 Vue CLI 命令运行 Web 工程。
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+npm run dev
+
+pause
--- a/build/index.js
+++ b/build/index.js
@ -0,0 +1,35 @@
+const {run} = require('runjs')
+const chalk = require('chalk')
+const config = require('../vue.config.js')
+const rawArgv = process.argv.slice(2)
+const args = rawArgv.join(' ')
+
+if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
+  const report = rawArgv.includes('--report')
+
+  run(`vue-cli-service build ${args}`)
+
+  const port = 9526
+  const publicPath = config.publicPath
+
+  var connect = require('connect')
+  var serveStatic = require('serve-static')
+  const app = connect()
+
+  app.use(
+    publicPath,
+    serveStatic('./dist', {
+      index: ['index.html', '/']
+    })
+  )
+
+  app.listen(port, function () {
+    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
+    if (report) {
+      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
+    }
+
+  })
+} else {
+  run(`vue-cli-service build ${args}`)
+}
--- a/docker/copy.sh
+++ b/docker/copy.sh
@ -1,41 +0,0 @@
-#!/bin/sh
-
-# 复制项目的文件到对应docker路径，便于一键生成镜像。
-usage() {
-	echo "Usage: sh copy.sh"
-	exit 1
-}
-
-
-# copy sql
-echo "begin copy sql "
-cp ../sql/ry_20230706.sql ./mysql/db
-cp ../sql/ry_config_20220929.sql ./mysql/db
-
-# copy html
-echo "begin copy html "
-cp -r ../muyu-ui/dist/** ./nginx/html/dist
-
-
-# copy jar
-echo "begin copy muyu-gateway "
-cp ../muyu-gateway/target/muyu-gateway.jar ./muyu/gateway/jar
-
-echo "begin copy muyu-auth "
-cp ../muyu-auth/target/muyu-auth.jar ./muyu/auth/jar
-
-echo "begin copy muyu-visual "
-cp ../muyu-visual/muyu-monitor/target/muyu-visual-monitor.jar  ./muyu/visual/monitor/jar
-
-echo "begin copy muyu-modules-system "
-cp ../muyu-modules/muyu-system/target/muyu-modules-system.jar ./muyu/modules/system/jar
-
-echo "begin copy muyu-modules-file "
-cp ../muyu-modules/muyu-file/target/muyu-modules-file.jar ./muyu/modules/file/jar
-
-echo "begin copy muyu-modules-job "
-cp ../muyu-modules/muyu-job/target/muyu-modules-job.jar ./muyu/modules/job/jar
-
-echo "begin copy muyu-modules-gen "
-cp ../muyu-modules/muyu-gen/target/muyu-modules-gen.jar ./muyu/modules/gen/jar
-
--- a/docker/deploy.sh
+++ b/docker/deploy.sh
@ -1,67 +0,0 @@
-#!/bin/sh
-
-# 使用说明，用来提示输入参数
-usage() {
-	echo "Usage: sh 执行脚本.sh [port|base|modules|stop|rm]"
-	exit 1
-}
-
-# 开启所需端口
-port(){
-	firewall-cmd --add-port=80/tcp --permanent
-	firewall-cmd --add-port=8080/tcp --permanent
-	firewall-cmd --add-port=8848/tcp --permanent
-	firewall-cmd --add-port=9848/tcp --permanent
-	firewall-cmd --add-port=9849/tcp --permanent
-	firewall-cmd --add-port=6379/tcp --permanent
-	firewall-cmd --add-port=3306/tcp --permanent
-	firewall-cmd --add-port=9100/tcp --permanent
-	firewall-cmd --add-port=9200/tcp --permanent
-	firewall-cmd --add-port=9201/tcp --permanent
-	firewall-cmd --add-port=9202/tcp --permanent
-	firewall-cmd --add-port=9203/tcp --permanent
-	firewall-cmd --add-port=9300/tcp --permanent
-	service firewalld restart
-}
-
-# 启动基础环境（必须）
-base(){
-	docker-compose up -d muyu-mysql muyu-redis muyu-nacos
-}
-
-# 启动程序模块（必须）
-modules(){
-	docker-compose up -d muyu-nginx muyu-gateway muyu-auth muyu-modules-system
-}
-
-# 关闭所有环境/模块
-stop(){
-	docker-compose stop
-}
-
-# 删除所有环境/模块
-rm(){
-	docker-compose rm
-}
-
-# 根据输入参数，选择执行对应方法，不输入则执行使用说明
-case "$1" in
-"port")
-	port
-;;
-"base")
-	base
-;;
-"modules")
-	modules
-;;
-"stop")
-	stop
-;;
-"rm")
-	rm
-;;
-*)
-	usage
-;;
-esac
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -1,140 +0,0 @@
-version : '3.8'
-services:
-  muyu-nacos:
-    container_name: muyu-nacos
-    image: nacos/nacos-server
-    build:
-      context: ./nacos
-    environment:
-      - MODE=standalone
-    volumes:
-      - ./nacos/logs/:/home/nacos/logs
-      - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
-    ports:
-      - "8848:8848"
-      - "9848:9848"
-      - "9849:9849"
-    depends_on:
-      - muyu-mysql
-  muyu-mysql:
-    container_name: muyu-mysql
-    image: mysql:5.7
-    build:
-      context: ./mysql
-    ports:
-      - "3306:3306"
-    volumes:
-      - ./mysql/conf:/etc/mysql/conf.d
-      - ./mysql/logs:/logs
-      - ./mysql/data:/var/lib/mysql
-    command: [
-          'mysqld',
-          '--innodb-buffer-pool-size=80M',
-          '--character-set-server=utf8mb4',
-          '--collation-server=utf8mb4_unicode_ci',
-          '--default-time-zone=+8:00',
-          '--lower-case-table-names=1'
-        ]
-    environment:
-      MYSQL_DATABASE: 'ry-cloud'
-      MYSQL_ROOT_PASSWORD: password
-  muyu-redis:
-    container_name: muyu-redis
-    image: redis
-    build:
-      context: ./redis
-    ports:
-      - "6379:6379"
-    volumes:
-      - ./redis/conf/redis.conf:/home/muyu/redis/redis.conf
-      - ./redis/data:/data
-    command: redis-server /home/muyu/redis/redis.conf
-  muyu-nginx:
-    container_name: muyu-nginx
-    image: nginx
-    build:
-      context: ./nginx
-    ports:
-      - "80:80"
-    volumes:
-      - ./nginx/html/dist:/home/muyu/projects/muyu-ui
-      - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
-      - ./nginx/logs:/var/log/nginx
-      - ./nginx/conf.d:/etc/nginx/conf.d
-    depends_on:
-      - muyu-gateway
-    links:
-      - muyu-gateway
-  muyu-gateway:
-    container_name: muyu-gateway
-    build:
-      context: ./muyu/gateway
-      dockerfile: dockerfile
-    ports:
-      - "8080:8080"
-    depends_on:
-      - muyu-redis
-    links:
-      - muyu-redis
-  muyu-auth:
-    container_name: muyu-auth
-    build:
-      context: ./muyu/auth
-      dockerfile: dockerfile
-    ports:
-      - "9200:9200"
-    depends_on:
-      - muyu-redis
-    links:
-      - muyu-redis
-  muyu-modules-system:
-    container_name: muyu-modules-system
-    build:
-      context: ./muyu/modules/system
-      dockerfile: dockerfile
-    ports:
-      - "9201:9201"
-    depends_on:
-      - muyu-redis
-      - muyu-mysql
-    links:
-      - muyu-redis
-      - muyu-mysql
-  muyu-modules-gen:
-    container_name: muyu-modules-gen
-    build:
-      context: ./muyu/modules/gen
-      dockerfile: dockerfile
-    ports:
-      - "9202:9202"
-    depends_on:
-      - muyu-mysql
-    links:
-      - muyu-mysql
-  muyu-modules-job:
-    container_name: muyu-modules-job
-    build:
-      context: ./muyu/modules/job
-      dockerfile: dockerfile
-    ports:
-      - "9203:9203"
-    depends_on:
-      - muyu-mysql
-    links:
-      - muyu-mysql
-  muyu-modules-file:
-    container_name: muyu-modules-file
-    build:
-      context: ./muyu/modules/file
-      dockerfile: dockerfile
-    ports:
-      - "9300:9300"
-    volumes:
-    - ./muyu/uploadPath:/home/muyu/uploadPath
-  muyu-visual-monitor:
-    container_name: muyu-visual-monitor
-    build:
-      context: ./muyu/visual/monitor
-      dockerfile: dockerfile
-    ports:
-      - "9100:9100"
--- a/docker/muyu/auth/dockerfile
+++ b/docker/muyu/auth/dockerfile
@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu
-# 创建目录
-RUN mkdir -p /home/muyu
-# 指定路径
-WORKDIR /home/muyu
-# 复制jar文件到路径
-COPY ./jar/muyu-auth.jar /home/muyu/muyu-auth.jar
-# 启动认证服务
-ENTRYPOINT ["java","-jar","muyu-auth.jar"]
--- a/docker/muyu/auth/jar/readme.txt
+++ b/docker/muyu/auth/jar/readme.txt
@ -1 +0,0 @@
-存放认证中心打包好的jar文件，用于docker启动应用。
--- a/docker/muyu/gateway/dockerfile
+++ b/docker/muyu/gateway/dockerfile
@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu
-# 创建目录
-RUN mkdir -p /home/muyu
-# 指定路径
-WORKDIR /home/muyu
-# 复制jar文件到路径
-COPY ./jar/muyu-gateway.jar /home/muyu/muyu-gateway.jar
-# 启动网关服务
-ENTRYPOINT ["java","-jar","muyu-gateway.jar"]
--- a/docker/muyu/gateway/jar/readme.txt
+++ b/docker/muyu/gateway/jar/readme.txt
@ -1 +0,0 @@
-存放网关模块打包好的jar文件，用于docker启动应用。
--- a/docker/muyu/modules/file/dockerfile
+++ b/docker/muyu/modules/file/dockerfile
@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu
-# 创建目录
-RUN mkdir -p /home/muyu
-# 指定路径
-WORKDIR /home/muyu
-# 复制jar文件到路径
-COPY ./jar/muyu-modules-file.jar /home/muyu/muyu-modules-file.jar
-# 启动文件服务
-ENTRYPOINT ["java","-jar","muyu-modules-file.jar"]
--- a/docker/muyu/modules/file/jar/readme.txt
+++ b/docker/muyu/modules/file/jar/readme.txt
@ -1 +0,0 @@
-存放文件服务打包好的jar文件，用于docker启动应用。
--- a/docker/muyu/modules/gen/dockerfile
+++ b/docker/muyu/modules/gen/dockerfile
@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu
-# 创建目录
-RUN mkdir -p /home/muyu
-# 指定路径
-WORKDIR /home/muyu
-# 复制jar文件到路径
-COPY ./jar/muyu-modules-gen.jar /home/muyu/muyu-modules-gen.jar
-# 启动代码生成服务
-ENTRYPOINT ["java","-jar","muyu-modules-gen.jar"]
--- a/docker/muyu/modules/gen/jar/readme.txt
+++ b/docker/muyu/modules/gen/jar/readme.txt
@ -1 +0,0 @@
-存放代码生成打包好的jar文件，用于docker启动应用。
--- a/docker/muyu/modules/job/dockerfile
+++ b/docker/muyu/modules/job/dockerfile
@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu
-# 创建目录
-RUN mkdir -p /home/muyu
-# 指定路径
-WORKDIR /home/muyu
-# 复制jar文件到路径
-COPY ./jar/muyu-modules-job.jar /home/muyu/muyu-modules-job.jar
-# 启动定时任务服务
-ENTRYPOINT ["java","-jar","muyu-modules-job.jar"]
--- a/docker/muyu/modules/job/jar/readme.txt
+++ b/docker/muyu/modules/job/jar/readme.txt
@ -1 +0,0 @@
-存放定时任务打包好的jar文件，用于docker启动应用。
--- a/docker/muyu/modules/system/dockerfile
+++ b/docker/muyu/modules/system/dockerfile
@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu
-# 创建目录
-RUN mkdir -p /home/muyu
-# 指定路径
-WORKDIR /home/muyu
-# 复制jar文件到路径
-COPY ./jar/muyu-modules-system.jar /home/muyu/muyu-modules-system.jar
-# 启动系统服务
-ENTRYPOINT ["java","-jar","muyu-modules-system.jar"]
--- a/docker/muyu/modules/system/jar/readme.txt
+++ b/docker/muyu/modules/system/jar/readme.txt
@ -1 +0,0 @@
-存放系统模块打包好的jar文件，用于docker启动应用。
--- a/docker/muyu/visual/monitor/dockerfile
+++ b/docker/muyu/visual/monitor/dockerfile
@ -1,15 +0,0 @@
-# 基础镜像
-FROM  openjdk:8-jre
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu
-# 创建目录
-RUN mkdir -p /home/muyu
-# 指定路径
-WORKDIR /home/muyu
-# 复制jar文件到路径
-COPY ./jar/muyu-visual-monitor.jar /home/muyu/muyu-visual-monitor.jar
-# 启动系统服务
-ENTRYPOINT ["java","-jar","muyu-visual-monitor.jar"]
--- a/docker/muyu/visual/monitor/jar/readme.txt
+++ b/docker/muyu/visual/monitor/jar/readme.txt
@ -1 +0,0 @@
-存放监控中心打包好的jar文件，用于docker启动应用。
--- a/docker/mysql/db/readme.txt
+++ b/docker/mysql/db/readme.txt
@ -1 +0,0 @@
-存放sql目录下的所有脚本，用于docker自动执行。
--- a/docker/mysql/dockerfile
+++ b/docker/mysql/dockerfile
@ -1,7 +0,0 @@
-# 基础镜像
-FROM mysql:5.7
-# author
-MAINTAINER muyu
-
-# 执行sql脚本
-ADD ./db/*.sql /docker-entrypoint-initdb.d/
--- a/docker/nacos/conf/application.properties
+++ b/docker/nacos/conf/application.properties
@ -1,32 +0,0 @@
-spring.datasource.platform=mysql
-db.num=1
-db.url.0=jdbc:mysql://muyu-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
-db.user=root
-db.password=password
-
-nacos.naming.empty-service.auto-clean=true
-nacos.naming.empty-service.clean.initial-delay-ms=50000
-nacos.naming.empty-service.clean.period-time-ms=30000
-
-management.endpoints.web.exposure.include=*
-
-management.metrics.export.elastic.enabled=false
-management.metrics.export.influx.enabled=false
-
-server.tomcat.accesslog.enabled=true
-server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
-
-server.tomcat.basedir=/home/muyu/nacos/tomcat/logs
-
-nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
-
-nacos.core.auth.system.type=nacos
-nacos.core.auth.enabled=false
-nacos.core.auth.default.token.expire.seconds=18000
-nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
-nacos.core.auth.caching.enabled=true
-nacos.core.auth.enable.userAgentAuthWhite=false
-nacos.core.auth.server.identity.key=serverIdentity
-nacos.core.auth.server.identity.value=security
-
-nacos.istio.mcp.server.enabled=false
--- a/docker/nacos/dockerfile
+++ b/docker/nacos/dockerfile
@ -1,7 +0,0 @@
-# 基础镜像
-FROM nacos/nacos-server
-# author
-MAINTAINER muyu
-
-# 复制conf文件到路径
-COPY ./conf/application.properties /home/nacos/conf/application.properties
--- a/docker/nginx/conf/nginx.conf
+++ b/docker/nginx/conf/nginx.conf
@ -1,41 +0,0 @@
-worker_processes  1;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    sendfile        on;
-    keepalive_timeout  65;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        location / {
-            root   /home/muyu/projects/muyu-ui;
-            try_files $uri $uri/ /index.html;
-            index  index.html index.htm;
-        }
-
-        location /prod-api/{
-            proxy_set_header Host $http_host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header REMOTE-HOST $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_pass http://muyu-gateway:8080/;
-        }
-
-        # 避免actuator暴露
-        if ($request_uri ~ "/actuator") {
-            return 403;
-        }
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-    }
-}
--- a/docker/nginx/dockerfile
+++ b/docker/nginx/dockerfile
@ -1,15 +0,0 @@
-# 基础镜像
-FROM nginx
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu/projects/muyu-ui
-# 创建目录
-RUN mkdir -p /home/muyu/projects/muyu-ui
-# 指定路径
-WORKDIR /home/muyu/projects/muyu-ui
-# 复制conf文件到路径
-COPY ./conf/nginx.conf /etc/nginx/nginx.conf
-# 复制html文件到路径
-COPY ./html/dist /home/muyu/projects/muyu-ui
--- a/docker/redis/conf/redis.conf
+++ b/docker/redis/conf/redis.conf
@ -1 +0,0 @@
-# requirepass 123456
--- a/docker/redis/dockerfile
+++ b/docker/redis/dockerfile
@ -1,13 +0,0 @@
-# 基础镜像
-FROM redis
-# author
-MAINTAINER muyu
-
-# 挂载目录
-VOLUME /home/muyu/redis
-# 创建目录
-RUN mkdir -p /home/muyu/redis
-# 指定路径
-WORKDIR /home/muyu/redis
-# 复制conf文件到路径
-COPY ./conf/redis.conf /home/muyu/redis/redis.conf
--- a/muyu-auth/pom.xml
+++ b/muyu-auth/pom.xml
@ -1,82 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>muyu</artifactId>
-        <version>3.6.3</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>muyu-auth</artifactId>
-
-    <description>
-        muyu-auth认证授权中心
-    </description>
-
-    <dependencies>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Web -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- MuYu Common Security-->
-        <dependency>
-            <groupId>com.muyu</groupId>
-            <artifactId>muyu-common-security</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- 加入maven deploy插件，当在deploy时，忽略些model-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
--- a/muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/MuYuAuthApplication.java
@ -1,19 +0,0 @@
-package com.muyu.auth;
-
-import com.muyu.common.security.annotation.EnableMyFeignClients;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-/**
- * 认证授权中心
- *
- * @author muyu
- */
-@EnableMyFeignClients
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class MuYuAuthApplication {
-    public static void main (String[] args) {
-        SpringApplication.run(MuYuAuthApplication.class, args);
-    }
-}
--- a/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java
@ -1,72 +0,0 @@
-package com.muyu.auth.controller;
-
-import com.muyu.auth.form.LoginBody;
-import com.muyu.auth.form.RegisterBody;
-import com.muyu.auth.service.SysLoginService;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.utils.JwtUtils;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.security.auth.AuthUtil;
-import com.muyu.common.security.service.TokenService;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * token 控制
- *
- * @author muyu
- */
-@RestController
-public class TokenController {
-    @Autowired
-    private TokenService tokenService;
-
-    @Autowired
-    private SysLoginService sysLoginService;
-
-    @PostMapping("login")
-    public Result<?> login (@RequestBody LoginBody form) {
-        // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
-        // 获取登录token
-        return Result.success(tokenService.createToken(userInfo));
-    }
-
-    @DeleteMapping("logout")
-    public Result<?> logout (HttpServletRequest request) {
-        String token = SecurityUtils.getToken(request);
-        if (StringUtils.isNotEmpty(token)) {
-            String username = JwtUtils.getUserName(token);
-            // 删除用户缓存记录
-            AuthUtil.logoutByToken(token);
-            // 记录用户退出日志
-            sysLoginService.logout(username);
-        }
-        return Result.success();
-    }
-
-    @PostMapping("refresh")
-    public Result<?> refresh (HttpServletRequest request) {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser)) {
-            // 刷新令牌有效期
-            tokenService.refreshToken(loginUser);
-            return Result.success();
-        }
-        return Result.success();
-    }
-
-    @PostMapping("register")
-    public Result<?> register (@RequestBody RegisterBody registerBody) {
-        // 用户注册
-        sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
-        return Result.success();
-    }
-}
--- a/muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/form/LoginBody.java
@ -1,34 +0,0 @@
-package com.muyu.auth.form;
-
-/**
- * 用户登录对象
- *
- * @author muyu
- */
-public class LoginBody {
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    public String getUsername () {
-        return username;
-    }
-
-    public void setUsername (String username) {
-        this.username = username;
-    }
-
-    public String getPassword () {
-        return password;
-    }
-
-    public void setPassword (String password) {
-        this.password = password;
-    }
-}
--- a/muyu-auth/src/main/java/com/muyu/auth/form/RegisterBody.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/form/RegisterBody.java
@ -1,10 +0,0 @@
-package com.muyu.auth.form;
-
-/**
- * 用户注册对象
- *
- * @author muyu
- */
-public class RegisterBody extends LoginBody {
-
-}
--- a/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
@ -1,127 +0,0 @@
-package com.muyu.auth.service;
-
-import com.muyu.common.core.constant.CacheConstants;
-import com.muyu.common.core.constant.Constants;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.constant.UserConstants;
-import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.enums.UserStatus;
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.common.core.text.Convert;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.ip.IpUtils;
-import com.muyu.common.redis.service.RedisService;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.remote.RemoteUserService;
-import com.muyu.common.system.domain.SysUser;
-import com.muyu.common.system.domain.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 登录校验方法
- *
- * @author muyu
- */
-@Component
-public class SysLoginService {
-    @Autowired
-    private RemoteUserService remoteUserService;
-
-    @Autowired
-    private SysPasswordService passwordService;
-
-    @Autowired
-    private SysRecordLogService recordLogService;
-
-    @Autowired
-    private RedisService redisService;
-
-    /**
-     * 登录
-     */
-    public LoginUser login (String username, String password) {
-        // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password)) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
-            throw new ServiceException("用户/密码必须填写");
-        }
-        // 密码如果不在指定范围内 错误
-        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
-            throw new ServiceException("用户密码不在指定范围");
-        }
-        // 用户名不在指定范围内 错误
-        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
-            throw new ServiceException("用户名不在指定范围");
-        }
-        // IP黑名单校验
-        String blackStr = Convert.toStr(redisService.getCacheObject(CacheConstants.SYS_LOGIN_BLACKIPLIST));
-        if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "很遗憾，访问IP已被列入系统黑名单");
-            throw new ServiceException("很遗憾，访问IP已被列入系统黑名单");
-        }
-        // 查询用户信息
-        Result<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
-
-        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
-            throw new ServiceException("登录用户：" + username + " 不存在");
-        }
-
-        if (Result.FAIL == userResult.getCode()) {
-            throw new ServiceException(userResult.getMsg());
-        }
-
-        LoginUser userInfo = userResult.getData();
-        SysUser user = userResult.getData().getSysUser();
-        if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
-            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
-        }
-        if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
-            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
-        }
-        passwordService.validate(user, password);
-        recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
-        return userInfo;
-    }
-
-    public void logout (String loginName) {
-        recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
-    }
-
-    /**
-     * 注册
-     */
-    public void register (String username, String password) {
-        // 用户名或密码为空 错误
-        if (StringUtils.isAnyBlank(username, password)) {
-            throw new ServiceException("用户/密码必须填写");
-        }
-        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
-                || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
-            throw new ServiceException("账户长度必须在2到20个字符之间");
-        }
-        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
-                || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
-            throw new ServiceException("密码长度必须在5到20个字符之间");
-        }
-
-        // 注册用户信息
-        SysUser sysUser = new SysUser();
-        sysUser.setUserName(username);
-        sysUser.setNickName(username);
-        sysUser.setPassword(SecurityUtils.encryptPassword(password));
-        Result<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
-
-        if (Result.FAIL == registerResult.getCode()) {
-            throw new ServiceException(registerResult.getMsg());
-        }
-        recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
-    }
-}
--- a/muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java
@ -1,76 +0,0 @@
-package com.muyu.auth.service;
-
-import com.muyu.common.core.constant.CacheConstants;
-import com.muyu.common.core.constant.Constants;
-import com.muyu.common.core.exception.ServiceException;
-import com.muyu.common.redis.service.RedisService;
-import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.SysUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * 登录密码方法
- *
- * @author muyu
- */
-@Component
-public class SysPasswordService {
-    @Autowired
-    private RedisService redisService;
-
-    private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
-
-    private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME;
-
-    @Autowired
-    private SysRecordLogService recordLogService;
-
-    /**
-     * 登录账户密码错误次数缓存键名
-     *
-     * @param username 用户名
-     *
-     * @return 缓存键key
-     */
-    private String getCacheKey (String username) {
-        return CacheConstants.PWD_ERR_CNT_KEY + username;
-    }
-
-    public void validate (SysUser user, String password) {
-        String username = user.getUserName();
-
-        Integer retryCount = redisService.getCacheObject(getCacheKey(username));
-
-        if (retryCount == null) {
-            retryCount = 0;
-        }
-
-        if (retryCount >= Integer.valueOf(maxRetryCount).intValue()) {
-            String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime);
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, errMsg);
-            throw new ServiceException(errMsg);
-        }
-
-        if (!matches(user, password)) {
-            retryCount = retryCount + 1;
-            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount));
-            redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
-            throw new ServiceException("用户不存在/密码错误");
-        } else {
-            clearLoginRecordCache(username);
-        }
-    }
-
-    public boolean matches (SysUser user, String rawPassword) {
-        return SecurityUtils.matchesPassword(rawPassword, user.getPassword());
-    }
-
-    public void clearLoginRecordCache (String loginName) {
-        if (redisService.hasKey(getCacheKey(loginName))) {
-            redisService.deleteObject(getCacheKey(loginName));
-        }
-    }
-}
--- a/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java
+++ b/muyu-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java
@ -1,44 +0,0 @@
-package com.muyu.auth.service;
-
-import com.muyu.common.core.constant.Constants;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.utils.ip.IpUtils;
-import com.muyu.common.system.remote.RemoteLogService;
-import com.muyu.common.system.domain.SysLogininfor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 记录日志方法
- *
- * @author muyu
- */
-@Component
-public class SysRecordLogService {
-    @Autowired
-    private RemoteLogService remoteLogService;
-
-    /**
-     * 记录登录信息
-     *
-     * @param username 用户名
-     * @param status   状态
-     * @param message  消息内容
-     *
-     * @return
-     */
-    public void recordLogininfor (String username, String status, String message) {
-        SysLogininfor logininfor = new SysLogininfor();
-        logininfor.setUserName(username);
-        logininfor.setIpaddr(IpUtils.getIpAddr());
-        logininfor.setMsg(message);
-        // 日志状态
-        if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
-            logininfor.setStatus(Constants.LOGIN_SUCCESS_STATUS);
-        } else if (Constants.LOGIN_FAIL.equals(status)) {
-            logininfor.setStatus(Constants.LOGIN_FAIL_STATUS);
-        }
-        remoteLogService.saveLogininfor(logininfor, SecurityConstants.INNER);
-    }
-}
--- a/muyu-auth/src/main/resources/banner.txt
+++ b/muyu-auth/src/main/resources/banner.txt
@ -1,2 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
--- a/muyu-auth/src/main/resources/bootstrap.yml
+++ b/muyu-auth/src/main/resources/bootstrap.yml
@ -1,29 +0,0 @@
-# Tomcat
-server:
-  port: 9200
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: muyu-auth
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 111.229.102.61:8848
-        # 命名空间
-        namespace: muyu
-      config:
-        # 配置中心地址
-        server-addr: 111.229.102.61:8848
-        #命名空间
-        namespace: muyu
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--- a/muyu-auth/src/main/resources/logback.xml
+++ b/muyu-auth/src/main/resources/logback.xml
@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/muyu-auth"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.muyu" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
--- a/muyu-common/muyu-common-core/pom.xml
+++ b/muyu-common/muyu-common-core/pom.xml
@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.muyu</groupId>
-        <artifactId>muyu-common</artifactId>
-        <version>3.6.3</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>muyu-common-core</artifactId>
-
-    <description>
-        muyu-common-core核心模块
-    </description>
-
-    <dependencies>
-
-        <!-- SpringCloud Openfeign -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Loadbalancer -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
-
-        <!-- Spring Context Support -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-
-        <!-- Spring Web -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
-        <!-- Transmittable ThreadLocal -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>transmittable-thread-local</artifactId>
-        </dependency>
-
-        <!-- Pagehelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- mybatis - plus 依赖 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.5.3.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.jsqlparser</groupId>
-                    <artifactId>jsqlparser</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- Hibernate Validator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- Jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <!-- Alibaba Fastjson -->
-        <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
-            <artifactId>fastjson2</artifactId>
-        </dependency>
-
-        <!-- Jwt -->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-        </dependency>
-
-        <!-- Jaxb -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <!-- Apache Lang3 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <!-- Commons Io -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <!-- excel工具 -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-        </dependency>
-
-        <!-- Java Servlet -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-
-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-
-        <!-- lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excel.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excel.java
@ -1,176 +0,0 @@
-package com.muyu.common.core.annotation;
-
-import com.muyu.common.core.utils.poi.ExcelHandlerAdapter;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.math.BigDecimal;
-
-/**
- * 自定义导出Excel数据注解
- *
- * @author muyu
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface Excel {
-    /**
-     * 导出时在excel中排序
-     */
-    public int sort () default Integer.MAX_VALUE;
-
-    /**
-     * 导出到Excel中的名字.
-     */
-    public String name () default "";
-
-    /**
-     * 日期格式, 如: yyyy-MM-dd
-     */
-    public String dateFormat () default "";
-
-    /**
-     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
-     */
-    public String readConverterExp () default "";
-
-    /**
-     * 分隔符，读取字符串组内容
-     */
-    public String separator () default ",";
-
-    /**
-     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
-     */
-    public int scale () default -1;
-
-    /**
-     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
-     */
-    public int roundingMode () default BigDecimal.ROUND_HALF_EVEN;
-
-    /**
-     * 导出时在excel中每个列的高度
-     */
-    public double height () default 14;
-
-    /**
-     * 导出时在excel中每个列的宽度
-     */
-    public double width () default 16;
-
-    /**
-     * 文字后缀,如% 90 变成90%
-     */
-    public String suffix () default "";
-
-    /**
-     * 当值为空时,字段的默认值
-     */
-    public String defaultValue () default "";
-
-    /**
-     * 提示信息
-     */
-    public String prompt () default "";
-
-    /**
-     * 设置只能选择不能输入的列内容.
-     */
-    public String[] combo () default {};
-
-    /**
-     * 是否需要纵向合并单元格,应对需求:含有list集合单元格)
-     */
-    public boolean needMerge () default false;
-
-    /**
-     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
-     */
-    public boolean isExport () default true;
-
-    /**
-     * 另一个类中的属性名称,支持多级获取,以小数点隔开
-     */
-    public String targetAttr () default "";
-
-    /**
-     * 是否自动统计数据,在最后追加一行统计数据总和
-     */
-    public boolean isStatistics () default false;
-
-    /**
-     * 导出类型（0数字 1字符串）
-     */
-    public ColumnType cellType () default ColumnType.STRING;
-
-    /**
-     * 导出列头背景颜色
-     */
-    public IndexedColors headerBackgroundColor () default IndexedColors.GREY_50_PERCENT;
-
-    /**
-     * 导出列头字体颜色
-     */
-    public IndexedColors headerColor () default IndexedColors.WHITE;
-
-    /**
-     * 导出单元格背景颜色
-     */
-    public IndexedColors backgroundColor () default IndexedColors.WHITE;
-
-    /**
-     * 导出单元格字体颜色
-     */
-    public IndexedColors color () default IndexedColors.BLACK;
-
-    /**
-     * 导出字段对齐方式
-     */
-    public HorizontalAlignment align () default HorizontalAlignment.CENTER;
-
-    /**
-     * 自定义数据处理器
-     */
-    public Class<?> handler () default ExcelHandlerAdapter.class;
-
-    /**
-     * 自定义数据处理器参数
-     */
-    public String[] args () default {};
-
-    /**
-     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
-     */
-    Type type () default Type.ALL;
-
-    public enum Type {
-        ALL(0), EXPORT(1), IMPORT(2);
-        private final int value;
-
-        Type (int value) {
-            this.value = value;
-        }
-
-        public int value () {
-            return this.value;
-        }
-    }
-
-    public enum ColumnType {
-        NUMERIC(0), STRING(1), IMAGE(2);
-        private final int value;
-
-        ColumnType (int value) {
-            this.value = value;
-        }
-
-        public int value () {
-            return this.value;
-        }
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excels.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/annotation/Excels.java
@ -1,17 +0,0 @@
-package com.muyu.common.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Excel注解集
- *
- * @author muyu
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Excels {
-    Excel[] value ();
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java
@ -1,58 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * 缓存常量信息
- *
- * @author muyu
- */
-public class CacheConstants {
-    /**
-     * 缓存有效期，默认720（分钟）
-     */
-    public final static long EXPIRATION = 720;
-
-    /**
-     * 缓存刷新时间，默认120（分钟）
-     */
-    public final static long REFRESH_TIME = 120;
-
-    /**
-     * 密码最大错误次数
-     */
-    public final static int PASSWORD_MAX_RETRY_COUNT = 5;
-
-    /**
-     * 密码锁定时间，默认10（分钟）
-     */
-    public final static long PASSWORD_LOCK_TIME = 10;
-
-    /**
-     * 权限缓存前缀
-     */
-    public final static String LOGIN_TOKEN_KEY = "login_tokens:";
-
-    /**
-     * 验证码 redis key
-     */
-    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
-
-    /**
-     * 参数管理 cache key
-     */
-    public static final String SYS_CONFIG_KEY = "sys_config:";
-
-    /**
-     * 字典管理 cache key
-     */
-    public static final String SYS_DICT_KEY = "sys_dict:";
-
-    /**
-     * 登录账户密码错误次数 redis key
-     */
-    public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
-
-    /**
-     * 登录IP黑名单 cache key
-     */
-    public static final String SYS_LOGIN_BLACKIPLIST = SYS_CONFIG_KEY + "sys.login.blackIPList";
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/Constants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/Constants.java
@ -1,134 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * 通用常量信息
- *
- * @author muyu
- */
-public class Constants {
-    /**
-     * UTF-8 字符集
-     */
-    public static final String UTF8 = "UTF-8";
-
-    /**
-     * GBK 字符集
-     */
-    public static final String GBK = "GBK";
-
-    /**
-     * www主域
-     */
-    public static final String WWW = "www.";
-
-    /**
-     * RMI 远程方法调用
-     */
-    public static final String LOOKUP_RMI = "rmi:";
-
-    /**
-     * LDAP 远程方法调用
-     */
-    public static final String LOOKUP_LDAP = "ldap:";
-
-    /**
-     * LDAPS 远程方法调用
-     */
-    public static final String LOOKUP_LDAPS = "ldaps:";
-
-    /**
-     * http请求
-     */
-    public static final String HTTP = "http://";
-
-    /**
-     * https请求
-     */
-    public static final String HTTPS = "https://";
-
-    /**
-     * 成功标记
-     */
-    public static final Integer SUCCESS = 200;
-
-    /**
-     * 失败标记
-     */
-    public static final Integer FAIL = 500;
-
-    /**
-     * 登录成功状态
-     */
-    public static final String LOGIN_SUCCESS_STATUS = "0";
-
-    /**
-     * 登录失败状态
-     */
-    public static final String LOGIN_FAIL_STATUS = "1";
-
-    /**
-     * 登录成功
-     */
-    public static final String LOGIN_SUCCESS = "Success";
-
-    /**
-     * 注销
-     */
-    public static final String LOGOUT = "Logout";
-
-    /**
-     * 注册
-     */
-    public static final String REGISTER = "Register";
-
-    /**
-     * 登录失败
-     */
-    public static final String LOGIN_FAIL = "Error";
-
-    /**
-     * 当前记录起始索引
-     */
-    public static final String PAGE_NUM = "pageNum";
-
-    /**
-     * 每页显示记录数
-     */
-    public static final String PAGE_SIZE = "pageSize";
-
-    /**
-     * 排序列
-     */
-    public static final String ORDER_BY_COLUMN = "orderByColumn";
-
-    /**
-     * 排序的方向 "desc" 或者 "asc".
-     */
-    public static final String IS_ASC = "isAsc";
-
-    /**
-     * 验证码有效期（分钟）
-     */
-    public static final long CAPTCHA_EXPIRATION = 2;
-
-    /**
-     * 资源映射路径 前缀
-     */
-    public static final String RESOURCE_PREFIX = "/profile";
-
-    /**
-     * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
-     */
-    public static final String[] JSON_WHITELIST_STR = {"org.springframework", "com.muyu"};
-
-    /**
-     * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
-     */
-    public static final String[] JOB_WHITELIST_STR = {"com.muyu"};
-
-    /**
-     * 定时任务违规的字符
-     */
-    public static final String[] JOB_ERROR_STR = {"java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
-            "org.springframework", "org.apache", "com.muyu.common.core.utils.file"};
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java
@ -1,186 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * 代码生成通用常量
- *
- * @author muyu
- */
-public class GenConstants {
-    /**
-     * 单表（增删改查）
-     */
-    public static final String TPL_CRUD = "crud";
-
-    /**
-     * 树表（增删改查）
-     */
-    public static final String TPL_TREE = "tree";
-
-    /**
-     * 主子表（增删改查）
-     */
-    public static final String TPL_SUB = "sub";
-
-    /**
-     * 树编码字段
-     */
-    public static final String TREE_CODE = "treeCode";
-
-    /**
-     * 树父编码字段
-     */
-    public static final String TREE_PARENT_CODE = "treeParentCode";
-
-    /**
-     * 树名称字段
-     */
-    public static final String TREE_NAME = "treeName";
-
-    /**
-     * 上级菜单ID字段
-     */
-    public static final String PARENT_MENU_ID = "parentMenuId";
-
-    /**
-     * 上级菜单名称字段
-     */
-    public static final String PARENT_MENU_NAME = "parentMenuName";
-
-    /**
-     * 数据库字符串类型
-     */
-    public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2"};
-
-    /**
-     * 数据库文本类型
-     */
-    public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"};
-
-    /**
-     * 数据库时间类型
-     */
-    public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"};
-
-    /**
-     * 数据库数字类型
-     */
-    public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer",
-            "bigint", "float", "double", "decimal"};
-
-    /**
-     * 页面不需要编辑字段
-     */
-    public static final String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"};
-
-    /**
-     * 页面不需要显示的列表字段
-     */
-    public static final String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time"};
-
-    /**
-     * 页面不需要查询字段
-     */
-    public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by",
-            "update_time", "remark"};
-
-    /**
-     * Entity基类字段
-     */
-    public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"};
-
-    /**
-     * Tree基类字段
-     */
-    public static final String[] TREE_ENTITY = {"parentName", "parentId", "orderNum", "ancestors"};
-
-    /**
-     * 文本框
-     */
-    public static final String HTML_INPUT = "input";
-
-    /**
-     * 文本域
-     */
-    public static final String HTML_TEXTAREA = "textarea";
-
-    /**
-     * 下拉框
-     */
-    public static final String HTML_SELECT = "select";
-
-    /**
-     * 单选框
-     */
-    public static final String HTML_RADIO = "radio";
-
-    /**
-     * 复选框
-     */
-    public static final String HTML_CHECKBOX = "checkbox";
-
-    /**
-     * 日期控件
-     */
-    public static final String HTML_DATETIME = "datetime";
-
-    /**
-     * 图片上传控件
-     */
-    public static final String HTML_IMAGE_UPLOAD = "imageUpload";
-
-    /**
-     * 文件上传控件
-     */
-    public static final String HTML_FILE_UPLOAD = "fileUpload";
-
-    /**
-     * 富文本控件
-     */
-    public static final String HTML_EDITOR = "editor";
-
-    /**
-     * 字符串类型
-     */
-    public static final String TYPE_STRING = "String";
-
-    /**
-     * 整型
-     */
-    public static final String TYPE_INTEGER = "Integer";
-
-    /**
-     * 长整型
-     */
-    public static final String TYPE_LONG = "Long";
-
-    /**
-     * 浮点型
-     */
-    public static final String TYPE_DOUBLE = "Double";
-
-    /**
-     * 高精度计算类型
-     */
-    public static final String TYPE_BIGDECIMAL = "BigDecimal";
-
-    /**
-     * 时间类型
-     */
-    public static final String TYPE_DATE = "Date";
-
-    /**
-     * 模糊查询
-     */
-    public static final String QUERY_LIKE = "LIKE";
-
-    /**
-     * 相等查询
-     */
-    public static final String QUERY_EQ = "EQ";
-
-    /**
-     * 需要
-     */
-    public static final String REQUIRE = "1";
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/HttpStatus.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/HttpStatus.java
@ -1,93 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * 返回状态码
- *
- * @author muyu
- */
-public class HttpStatus {
-    /**
-     * 操作成功
-     */
-    public static final int SUCCESS = 200;
-
-    /**
-     * 对象创建成功
-     */
-    public static final int CREATED = 201;
-
-    /**
-     * 请求已经被接受
-     */
-    public static final int ACCEPTED = 202;
-
-    /**
-     * 操作已经执行成功，但是没有返回数据
-     */
-    public static final int NO_CONTENT = 204;
-
-    /**
-     * 资源已被移除
-     */
-    public static final int MOVED_PERM = 301;
-
-    /**
-     * 重定向
-     */
-    public static final int SEE_OTHER = 303;
-
-    /**
-     * 资源没有被修改
-     */
-    public static final int NOT_MODIFIED = 304;
-
-    /**
-     * 参数列表错误（缺少，格式不匹配）
-     */
-    public static final int BAD_REQUEST = 400;
-
-    /**
-     * 未授权
-     */
-    public static final int UNAUTHORIZED = 401;
-
-    /**
-     * 访问受限，授权过期
-     */
-    public static final int FORBIDDEN = 403;
-
-    /**
-     * 资源，服务未找到
-     */
-    public static final int NOT_FOUND = 404;
-
-    /**
-     * 不允许的http方法
-     */
-    public static final int BAD_METHOD = 405;
-
-    /**
-     * 资源冲突，或者资源被锁
-     */
-    public static final int CONFLICT = 409;
-
-    /**
-     * 不支持的数据，媒体类型
-     */
-    public static final int UNSUPPORTED_TYPE = 415;
-
-    /**
-     * 系统内部错误
-     */
-    public static final int ERROR = 500;
-
-    /**
-     * 接口未实现
-     */
-    public static final int NOT_IMPLEMENTED = 501;
-
-    /**
-     * 系统警告消息
-     */
-    public static final int WARN = 601;
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ScheduleConstants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ScheduleConstants.java
@ -1,56 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * 任务调度通用常量
- *
- * @author muyu
- */
-public class ScheduleConstants {
-    public static final String TASK_CLASS_NAME = "TASK_CLASS_NAME";
-
-    /**
-     * 执行目标key
-     */
-    public static final String TASK_PROPERTIES = "TASK_PROPERTIES";
-
-    /**
-     * 默认
-     */
-    public static final String MISFIRE_DEFAULT = "0";
-
-    /**
-     * 立即触发执行
-     */
-    public static final String MISFIRE_IGNORE_MISFIRES = "1";
-
-    /**
-     * 触发一次执行
-     */
-    public static final String MISFIRE_FIRE_AND_PROCEED = "2";
-
-    /**
-     * 不触发立即执行
-     */
-    public static final String MISFIRE_DO_NOTHING = "3";
-
-    public enum Status {
-        /**
-         * 正常
-         */
-        NORMAL("0"),
-        /**
-         * 暂停
-         */
-        PAUSE("1");
-
-        private String value;
-
-        private Status (String value) {
-            this.value = value;
-        }
-
-        public String getValue () {
-            return value;
-        }
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java
@ -1,48 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * 权限相关通用常量
- *
- * @author muyu
- */
-public class SecurityConstants {
-    /**
-     * 用户ID字段
-     */
-    public static final String DETAILS_USER_ID = "user_id";
-
-    /**
-     * 用户名字段
-     */
-    public static final String DETAILS_USERNAME = "username";
-
-    /**
-     * 授权信息字段
-     */
-    public static final String AUTHORIZATION_HEADER = "authorization";
-
-    /**
-     * 请求来源
-     */
-    public static final String FROM_SOURCE = "from-source";
-
-    /**
-     * 内部请求
-     */
-    public static final String INNER = "inner";
-
-    /**
-     * 用户标识
-     */
-    public static final String USER_KEY = "user_key";
-
-    /**
-     * 登录用户
-     */
-    public static final String LOGIN_USER = "login_user";
-
-    /**
-     * 角色权限
-     */
-    public static final String ROLE_PERMISSION = "role_permission";
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
@ -1,23 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * 服务名称
- *
- * @author muyu
- */
-public class ServiceNameConstants {
-    /**
-     * 认证服务的serviceid
-     */
-    public static final String AUTH_SERVICE = "muyu-auth";
-
-    /**
-     * 系统模块的serviceid
-     */
-    public static final String SYSTEM_SERVICE = "muyu-system";
-
-    /**
-     * 文件服务的serviceid
-     */
-    public static final String FILE_SERVICE = "muyu-file";
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/TokenConstants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/TokenConstants.java
@ -1,24 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * Token的Key常量
- *
- * @author muyu
- */
-public class TokenConstants {
-    /**
-     * 令牌自定义标识
-     */
-    public static final String AUTHENTICATION = "Authorization";
-
-    /**
-     * 令牌前缀
-     */
-    public static final String PREFIX = "Bearer ";
-
-    /**
-     * 令牌秘钥
-     */
-    public final static String SECRET = "abcdefghijklmnopqrstuvwxyz";
-
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java
@ -1,113 +0,0 @@
-package com.muyu.common.core.constant;
-
-/**
- * 用户常量信息
- *
- * @author muyu
- */
-public class UserConstants {
-    /**
-     * 平台内系统用户的唯一标志
-     */
-    public static final String SYS_USER = "SYS_USER";
-
-    /**
-     * 正常状态
-     */
-    public static final String NORMAL = "0";
-
-    /**
-     * 异常状态
-     */
-    public static final String EXCEPTION = "1";
-
-    /**
-     * 用户封禁状态
-     */
-    public static final String USER_DISABLE = "1";
-
-    /**
-     * 角色封禁状态
-     */
-    public static final String ROLE_DISABLE = "1";
-
-    /**
-     * 部门正常状态
-     */
-    public static final String DEPT_NORMAL = "0";
-
-    /**
-     * 部门停用状态
-     */
-    public static final String DEPT_DISABLE = "1";
-
-    /**
-     * 字典正常状态
-     */
-    public static final String DICT_NORMAL = "0";
-
-    /**
-     * 是否为系统默认（是）
-     */
-    public static final String YES = "Y";
-
-    /**
-     * 是否菜单外链（是）
-     */
-    public static final String YES_FRAME = "0";
-
-    /**
-     * 是否菜单外链（否）
-     */
-    public static final String NO_FRAME = "1";
-
-    /**
-     * 菜单类型（目录）
-     */
-    public static final String TYPE_DIR = "M";
-
-    /**
-     * 菜单类型（菜单）
-     */
-    public static final String TYPE_MENU = "C";
-
-    /**
-     * 菜单类型（按钮）
-     */
-    public static final String TYPE_BUTTON = "F";
-
-    /**
-     * Layout组件标识
-     */
-    public final static String LAYOUT = "Layout";
-
-    /**
-     * ParentView组件标识
-     */
-    public final static String PARENT_VIEW = "ParentView";
-
-    /**
-     * InnerLink组件标识
-     */
-    public final static String INNER_LINK = "InnerLink";
-
-    /**
-     * 校验是否唯一的返回标识
-     */
-    public final static boolean UNIQUE = true;
-    public final static boolean NOT_UNIQUE = false;
-
-    /**
-     * 用户名长度限制
-     */
-    public static final int USERNAME_MIN_LENGTH = 2;
-
-    public static final int USERNAME_MAX_LENGTH = 20;
-
-    /**
-     * 密码长度限制
-     */
-    public static final int PASSWORD_MIN_LENGTH = 5;
-
-    public static final int PASSWORD_MAX_LENGTH = 20;
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/context/SecurityContextHolder.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/context/SecurityContextHolder.java
@ -1,83 +0,0 @@
-package com.muyu.common.core.context;
-
-import com.alibaba.ttl.TransmittableThreadLocal;
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.text.Convert;
-import com.muyu.common.core.utils.StringUtils;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * 获取当前线程变量中的 用户id、用户名称、Token等信息
- * 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
- *
- * @author muyu
- */
-public class SecurityContextHolder {
-    private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL = new TransmittableThreadLocal<>();
-
-    public static void set (String key, Object value) {
-        Map<String, Object> map = getLocalMap();
-        map.put(key, value == null ? StringUtils.EMPTY : value);
-    }
-
-    public static String get (String key) {
-        Map<String, Object> map = getLocalMap();
-        return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY));
-    }
-
-    public static <T> T get (String key, Class<T> clazz) {
-        Map<String, Object> map = getLocalMap();
-        return StringUtils.cast(map.getOrDefault(key, null));
-    }
-
-    public static Map<String, Object> getLocalMap () {
-        Map<String, Object> map = THREAD_LOCAL.get();
-        if (map == null) {
-            map = new ConcurrentHashMap<String, Object>();
-            THREAD_LOCAL.set(map);
-        }
-        return map;
-    }
-
-    public static void setLocalMap (Map<String, Object> threadLocalMap) {
-        THREAD_LOCAL.set(threadLocalMap);
-    }
-
-    public static Long getUserId () {
-        return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
-    }
-
-    public static void setUserId (String account) {
-        set(SecurityConstants.DETAILS_USER_ID, account);
-    }
-
-    public static String getUserName () {
-        return get(SecurityConstants.DETAILS_USERNAME);
-    }
-
-    public static void setUserName (String username) {
-        set(SecurityConstants.DETAILS_USERNAME, username);
-    }
-
-    public static String getUserKey () {
-        return get(SecurityConstants.USER_KEY);
-    }
-
-    public static void setUserKey (String userKey) {
-        set(SecurityConstants.USER_KEY, userKey);
-    }
-
-    public static String getPermission () {
-        return get(SecurityConstants.ROLE_PERMISSION);
-    }
-
-    public static void setPermission (String permissions) {
-        set(SecurityConstants.ROLE_PERMISSION, permissions);
-    }
-
-    public static void remove () {
-        THREAD_LOCAL.remove();
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/domain/Result.java
@ -1,112 +0,0 @@
-package com.muyu.common.core.domain;
-
-import com.muyu.common.core.constant.Constants;
-import com.muyu.common.core.constant.HttpStatus;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * 响应信息主体
- *
- * @author muyu
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class Result<T> implements Serializable {
-    /**
-     * 成功
-     */
-    public static final int SUCCESS = Constants.SUCCESS;
-    /**
-     * 失败
-     */
-    public static final int FAIL = Constants.FAIL;
-    /**
-     * 警告
-     */
-    public static final int WARN = HttpStatus.WARN;
-
-    private static final long serialVersionUID = 1L;
-    private int code;
-
-    private String msg;
-
-    private T data;
-
-    public static <T> Result<T> success () {
-        return restResult(null, SUCCESS, null);
-    }
-
-    public static <T> Result<T> success (T data) {
-        return restResult(data, SUCCESS, null);
-    }
-
-    public static <T> Result<T> success (T data, String msg) {
-        return restResult(data, SUCCESS, msg);
-    }
-
-    public static <T> Result<T> error () {
-        return restResult(null, FAIL, null);
-    }
-
-    public static <T> Result<T> error (String msg) {
-        return restResult(null, FAIL, msg);
-    }
-
-    public static <T> Result<T> error (T data) {
-        return restResult(data, FAIL, null);
-    }
-
-    public static <T> Result<T> error (T data, String msg) {
-        return restResult(data, FAIL, msg);
-    }
-
-    public static <T> Result<T> error (int code, String msg) {
-        return restResult(null, code, msg);
-    }
-
-
-
-    public static <T> Result<T> warn () {
-        return restResult(null, WARN, null);
-    }
-
-    public static <T> Result<T> warn (String msg) {
-        return restResult(null, WARN, msg);
-    }
-
-    public static <T> Result<T> warn (T data) {
-        return restResult(data, WARN, null);
-    }
-
-    public static <T> Result<T> warn (T data, String msg) {
-        return restResult(data, WARN, msg);
-    }
-
-    public static <T> Result<T> warn (int code, String msg) {
-        return restResult(null, code, msg);
-    }
-
-    private static <T> Result<T> restResult (T data, int code, String msg) {
-        return Result.<T>builder()
-                .code(code)
-                .data(data)
-                .msg(msg)
-                .build();
-    }
-
-    public static <T> Boolean isError (Result<T> ret) {
-        return !isSuccess(ret);
-    }
-
-    public static <T> Boolean isSuccess (Result<T> ret) {
-        return Result.SUCCESS == ret.getCode();
-    }
-
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java
@ -1,26 +0,0 @@
-package com.muyu.common.core.enums;
-
-/**
- * 用户状态
- *
- * @author muyu
- */
-public enum UserStatus {
-    OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
-
-    private final String code;
-    private final String info;
-
-    UserStatus (String code, String info) {
-        this.code = code;
-        this.info = info;
-    }
-
-    public String getCode () {
-        return code;
-    }
-
-    public String getInfo () {
-        return info;
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java
@ -1,14 +0,0 @@
-package com.muyu.common.core.exception;
-
-/**
- * 验证码错误异常类
- *
- * @author muyu
- */
-public class CaptchaException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public CaptchaException (String msg) {
-        super(msg);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java
@ -1,26 +0,0 @@
-package com.muyu.common.core.exception;
-
-/**
- * 检查异常
- *
- * @author muyu
- */
-public class CheckedException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public CheckedException (String message) {
-        super(message);
-    }
-
-    public CheckedException (Throwable cause) {
-        super(cause);
-    }
-
-    public CheckedException (String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public CheckedException (String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java
@ -1,13 +0,0 @@
-package com.muyu.common.core.exception;
-
-/**
- * 演示模式异常
- *
- * @author muyu
- */
-public class DemoModeException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public DemoModeException () {
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java
@ -1,51 +0,0 @@
-package com.muyu.common.core.exception;
-
-/**
- * 全局异常
- *
- * @author muyu
- */
-public class GlobalException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 错误提示
-     */
-    private String message;
-
-    /**
-     * 错误明细，内部调试错误
-     * <p>
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
-     */
-    private String detailMessage;
-
-    /**
-     * 空构造方法，避免反序列化问题
-     */
-    public GlobalException () {
-    }
-
-    public GlobalException (String message) {
-        this.message = message;
-    }
-
-    public String getDetailMessage () {
-        return detailMessage;
-    }
-
-    public GlobalException setDetailMessage (String detailMessage) {
-        this.detailMessage = detailMessage;
-        return this;
-    }
-
-    @Override
-    public String getMessage () {
-        return message;
-    }
-
-    public GlobalException setMessage (String message) {
-        this.message = message;
-        return this;
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java
@ -1,14 +0,0 @@
-package com.muyu.common.core.exception;
-
-/**
- * 内部认证异常
- *
- * @author muyu
- */
-public class InnerAuthException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public InnerAuthException (String message) {
-        super(message);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java
@ -1,13 +0,0 @@
-package com.muyu.common.core.exception;
-
-/**
- * 权限异常
- *
- * @author muyu
- */
-public class PreAuthorizeException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public PreAuthorizeException () {
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
@ -1,65 +0,0 @@
-package com.muyu.common.core.exception;
-
-/**
- * 业务异常
- *
- * @author muyu
- */
-public final class ServiceException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 错误码
-     */
-    private Integer code;
-
-    /**
-     * 错误提示
-     */
-    private String message;
-
-    /**
-     * 错误明细，内部调试错误
-     * <p>
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
-     */
-    private String detailMessage;
-
-    /**
-     * 空构造方法，避免反序列化问题
-     */
-    public ServiceException () {
-    }
-
-    public ServiceException (String message) {
-        this.message = message;
-    }
-
-    public ServiceException (String message, Integer code) {
-        this.message = message;
-        this.code = code;
-    }
-
-    public String getDetailMessage () {
-        return detailMessage;
-    }
-
-    public ServiceException setDetailMessage (String detailMessage) {
-        this.detailMessage = detailMessage;
-        return this;
-    }
-
-    @Override
-    public String getMessage () {
-        return message;
-    }
-
-    public ServiceException setMessage (String message) {
-        this.message = message;
-        return this;
-    }
-
-    public Integer getCode () {
-        return code;
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java
@ -1,22 +0,0 @@
-package com.muyu.common.core.exception;
-
-/**
- * 工具类异常
- *
- * @author muyu
- */
-public class UtilException extends RuntimeException {
-    private static final long serialVersionUID = 8247610319171014183L;
-
-    public UtilException (Throwable e) {
-        super(e.getMessage(), e);
-    }
-
-    public UtilException (String message) {
-        super(message);
-    }
-
-    public UtilException (String message, Throwable throwable) {
-        super(message, throwable);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java
@ -1,14 +0,0 @@
-package com.muyu.common.core.exception.auth;
-
-/**
- * 未能通过的登录认证异常
- *
- * @author muyu
- */
-public class NotLoginException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public NotLoginException (String message) {
-        super(message);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java
@ -1,20 +0,0 @@
-package com.muyu.common.core.exception.auth;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * 未能通过的权限认证异常
- *
- * @author muyu
- */
-public class NotPermissionException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public NotPermissionException (String permission) {
-        super(permission);
-    }
-
-    public NotPermissionException (String[] permissions) {
-        super(StringUtils.join(permissions, ","));
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java
@ -1,20 +0,0 @@
-package com.muyu.common.core.exception.auth;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * 未能通过的角色认证异常
- *
- * @author muyu
- */
-public class NotRoleException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    public NotRoleException (String role) {
-        super(role);
-    }
-
-    public NotRoleException (String[] roles) {
-        super(StringUtils.join(roles, ","));
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java
@ -1,69 +0,0 @@
-package com.muyu.common.core.exception.base;
-
-/**
- * 基础异常
- *
- * @author muyu
- */
-public class BaseException extends RuntimeException {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 所属模块
-     */
-    private String module;
-
-    /**
-     * 错误码
-     */
-    private String code;
-
-    /**
-     * 错误码对应的参数
-     */
-    private Object[] args;
-
-    /**
-     * 错误消息
-     */
-    private String defaultMessage;
-
-    public BaseException (String module, String code, Object[] args, String defaultMessage) {
-        this.module = module;
-        this.code = code;
-        this.args = args;
-        this.defaultMessage = defaultMessage;
-    }
-
-    public BaseException (String module, String code, Object[] args) {
-        this(module, code, args, null);
-    }
-
-    public BaseException (String module, String defaultMessage) {
-        this(module, null, null, defaultMessage);
-    }
-
-    public BaseException (String code, Object[] args) {
-        this(null, code, args, null);
-    }
-
-    public BaseException (String defaultMessage) {
-        this(null, null, null, defaultMessage);
-    }
-
-    public String getModule () {
-        return module;
-    }
-
-    public String getCode () {
-        return code;
-    }
-
-    public Object[] getArgs () {
-        return args;
-    }
-
-    public String getDefaultMessage () {
-        return defaultMessage;
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java
@ -1,17 +0,0 @@
-package com.muyu.common.core.exception.file;
-
-import com.muyu.common.core.exception.base.BaseException;
-
-/**
- * 文件信息异常类
- *
- * @author muyu
- */
-public class FileException extends BaseException {
-    private static final long serialVersionUID = 1L;
-
-    public FileException (String code, Object[] args, String msg) {
-        super("file", code, args, msg);
-    }
-
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java
@ -1,14 +0,0 @@
-package com.muyu.common.core.exception.file;
-
-/**
- * 文件名称超长限制异常类
- *
- * @author muyu
- */
-public class FileNameLengthLimitExceededException extends FileException {
-    private static final long serialVersionUID = 1L;
-
-    public FileNameLengthLimitExceededException (int defaultFileNameLength) {
-        super("upload.filename.exceed.length", new Object[]{defaultFileNameLength}, "the filename is too long");
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java
@ -1,14 +0,0 @@
-package com.muyu.common.core.exception.file;
-
-/**
- * 文件名大小限制异常类
- *
- * @author muyu
- */
-public class FileSizeLimitExceededException extends FileException {
-    private static final long serialVersionUID = 1L;
-
-    public FileSizeLimitExceededException (long defaultMaxSize) {
-        super("upload.exceed.maxSize", new Object[]{defaultMaxSize}, "the filesize is too large");
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java
@ -1,52 +0,0 @@
-package com.muyu.common.core.exception.file;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-/**
- * 文件上传异常类
- *
- * @author muyu
- */
-public class FileUploadException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    private final Throwable cause;
-
-    public FileUploadException () {
-        this(null, null);
-    }
-
-    public FileUploadException (final String msg) {
-        this(msg, null);
-    }
-
-    public FileUploadException (String msg, Throwable cause) {
-        super(msg);
-        this.cause = cause;
-    }
-
-    @Override
-    public void printStackTrace (PrintStream stream) {
-        super.printStackTrace(stream);
-        if (cause != null) {
-            stream.println("Caused by:");
-            cause.printStackTrace(stream);
-        }
-    }
-
-    @Override
-    public void printStackTrace (PrintWriter writer) {
-        super.printStackTrace(writer);
-        if (cause != null) {
-            writer.println("Caused by:");
-            cause.printStackTrace(writer);
-        }
-    }
-
-    @Override
-    public Throwable getCause () {
-        return cause;
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java
@ -1,67 +0,0 @@
-package com.muyu.common.core.exception.file;
-
-import java.util.Arrays;
-
-/**
- * 文件上传 误异常类
- *
- * @author muyu
- */
-public class InvalidExtensionException extends FileUploadException {
-    private static final long serialVersionUID = 1L;
-
-    private String[] allowedExtension;
-    private String extension;
-    private String filename;
-
-    public InvalidExtensionException (String[] allowedExtension, String extension, String filename) {
-        super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
-        this.allowedExtension = allowedExtension;
-        this.extension = extension;
-        this.filename = filename;
-    }
-
-    public String[] getAllowedExtension () {
-        return allowedExtension;
-    }
-
-    public String getExtension () {
-        return extension;
-    }
-
-    public String getFilename () {
-        return filename;
-    }
-
-    public static class InvalidImageExtensionException extends InvalidExtensionException {
-        private static final long serialVersionUID = 1L;
-
-        public InvalidImageExtensionException (String[] allowedExtension, String extension, String filename) {
-            super(allowedExtension, extension, filename);
-        }
-    }
-
-    public static class InvalidFlashExtensionException extends InvalidExtensionException {
-        private static final long serialVersionUID = 1L;
-
-        public InvalidFlashExtensionException (String[] allowedExtension, String extension, String filename) {
-            super(allowedExtension, extension, filename);
-        }
-    }
-
-    public static class InvalidMediaExtensionException extends InvalidExtensionException {
-        private static final long serialVersionUID = 1L;
-
-        public InvalidMediaExtensionException (String[] allowedExtension, String extension, String filename) {
-            super(allowedExtension, extension, filename);
-        }
-    }
-
-    public static class InvalidVideoExtensionException extends InvalidExtensionException {
-        private static final long serialVersionUID = 1L;
-
-        public InvalidVideoExtensionException (String[] allowedExtension, String extension, String filename) {
-            super(allowedExtension, extension, filename);
-        }
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java
@ -1,29 +0,0 @@
-package com.muyu.common.core.exception.job;
-
-/**
- * 计划策略异常
- *
- * @author muyu
- */
-public class TaskException extends Exception {
-    private static final long serialVersionUID = 1L;
-
-    private Code code;
-
-    public TaskException (String msg, Code code) {
-        this(msg, code, null);
-    }
-
-    public TaskException (String msg, Code code, Exception nestedEx) {
-        super(msg, nestedEx);
-        this.code = code;
-    }
-
-    public Code getCode () {
-        return code;
-    }
-
-    public enum Code {
-        TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java
@ -1,14 +0,0 @@
-package com.muyu.common.core.exception.user;
-
-/**
- * 验证码失效异常类
- *
- * @author muyu
- */
-public class CaptchaExpireException extends UserException {
-    private static final long serialVersionUID = 1L;
-
-    public CaptchaExpireException () {
-        super("user.jcaptcha.expire", null);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java
@ -1,16 +0,0 @@
-package com.muyu.common.core.exception.user;
-
-import com.muyu.common.core.exception.base.BaseException;
-
-/**
- * 用户信息异常类
- *
- * @author muyu
- */
-public class UserException extends BaseException {
-    private static final long serialVersionUID = 1L;
-
-    public UserException (String code, Object[] args) {
-        super("user", code, args, null);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java
@ -1,14 +0,0 @@
-package com.muyu.common.core.exception.user;
-
-/**
- * 用户密码不正确或不符合规范异常类
- *
- * @author muyu
- */
-public class UserPasswordNotMatchException extends UserException {
-    private static final long serialVersionUID = 1L;
-
-    public UserPasswordNotMatchException () {
-        super("user.password.not.match", null);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java
@ -1,94 +0,0 @@
-package com.muyu.common.core.text;
-
-import com.muyu.common.core.utils.StringUtils;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-/**
- * 字符集工具类
- *
- * @author muyu
- */
-public class CharsetKit {
-    /**
-     * ISO-8859-1
-     */
-    public static final String ISO_8859_1 = "ISO-8859-1";
-    /**
-     * UTF-8
-     */
-    public static final String UTF_8 = "UTF-8";
-    /**
-     * GBK
-     */
-    public static final String GBK = "GBK";
-
-    /**
-     * ISO-8859-1
-     */
-    public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
-    /**
-     * UTF-8
-     */
-    public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
-    /**
-     * GBK
-     */
-    public static final Charset CHARSET_GBK = Charset.forName(GBK);
-
-    /**
-     * 转换为Charset对象
-     *
-     * @param charset 字符集，为空则返回默认字符集
-     *
-     * @return Charset
-     */
-    public static Charset charset (String charset) {
-        return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
-    }
-
-    /**
-     * 转换字符串的字符集编码
-     *
-     * @param source      字符串
-     * @param srcCharset  源字符集，默认ISO-8859-1
-     * @param destCharset 目标字符集，默认UTF-8
-     *
-     * @return 转换后的字符集
-     */
-    public static String convert (String source, String srcCharset, String destCharset) {
-        return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
-    }
-
-    /**
-     * 转换字符串的字符集编码
-     *
-     * @param source      字符串
-     * @param srcCharset  源字符集，默认ISO-8859-1
-     * @param destCharset 目标字符集，默认UTF-8
-     *
-     * @return 转换后的字符集
-     */
-    public static String convert (String source, Charset srcCharset, Charset destCharset) {
-        if (null == srcCharset) {
-            srcCharset = StandardCharsets.ISO_8859_1;
-        }
-
-        if (null == destCharset) {
-            destCharset = StandardCharsets.UTF_8;
-        }
-
-        if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
-            return source;
-        }
-        return new String(source.getBytes(srcCharset), destCharset);
-    }
-
-    /**
-     * @return 系统字符集编码
-     */
-    public static String systemCharset () {
-        return Charset.defaultCharset().name();
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java
@ -1,903 +0,0 @@
-package com.muyu.common.core.text;
-
-import com.muyu.common.core.utils.StringUtils;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.math.RoundingMode;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.text.NumberFormat;
-import java.util.Set;
-
-/**
- * 类型转换器
- *
- * @author muyu
- */
-public class Convert {
-    /**
-     * 转换为字符串<br>
-     * 如果给定的值为null，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static String toStr (Object value, String defaultValue) {
-        if (null == value) {
-            return defaultValue;
-        }
-        if (value instanceof String) {
-            return (String) value;
-        }
-        return value.toString();
-    }
-
-    /**
-     * 转换为字符串<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static String toStr (Object value) {
-        return toStr(value, null);
-    }
-
-    /**
-     * 转换为字符<br>
-     * 如果给定的值为null，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Character toChar (Object value, Character defaultValue) {
-        if (null == value) {
-            return defaultValue;
-        }
-        if (value instanceof Character) {
-            return (Character) value;
-        }
-
-        final String valueStr = toStr(value, null);
-        return StringUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
-    }
-
-    /**
-     * 转换为字符<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Character toChar (Object value) {
-        return toChar(value, null);
-    }
-
-    /**
-     * 转换为byte<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Byte toByte (Object value, Byte defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Byte) {
-            return (Byte) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).byteValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Byte.parseByte(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为byte<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Byte toByte (Object value) {
-        return toByte(value, null);
-    }
-
-    /**
-     * 转换为Short<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Short toShort (Object value, Short defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Short) {
-            return (Short) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).shortValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Short.parseShort(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Short<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Short toShort (Object value) {
-        return toShort(value, null);
-    }
-
-    /**
-     * 转换为Number<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Number toNumber (Object value, Number defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Number) {
-            return (Number) value;
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return NumberFormat.getInstance().parse(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Number<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Number toNumber (Object value) {
-        return toNumber(value, null);
-    }
-
-    /**
-     * 转换为int<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Integer toInt (Object value, Integer defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Integer) {
-            return (Integer) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).intValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Integer.parseInt(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为int<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Integer toInt (Object value) {
-        return toInt(value, null);
-    }
-
-    /**
-     * 转换为Integer数组<br>
-     *
-     * @param str 被转换的值
-     *
-     * @return 结果
-     */
-    public static Integer[] toIntArray (String str) {
-        return toIntArray(",", str);
-    }
-
-    /**
-     * 转换为Long数组<br>
-     *
-     * @param str 被转换的值
-     *
-     * @return 结果
-     */
-    public static Long[] toLongArray (String str) {
-        return toLongArray(",", str);
-    }
-
-    /**
-     * 转换为Integer数组<br>
-     *
-     * @param split 分隔符
-     * @param str   被转换的值
-     *
-     * @return 结果
-     */
-    public static Integer[] toIntArray (String split, String str) {
-        if (StringUtils.isEmpty(str)) {
-            return new Integer[]{};
-        }
-        String[] arr = str.split(split);
-        final Integer[] ints = new Integer[arr.length];
-        for (int i = 0 ; i < arr.length ; i++) {
-            final Integer v = toInt(arr[i], 0);
-            ints[i] = v;
-        }
-        return ints;
-    }
-
-    /**
-     * 转换为Long数组<br>
-     *
-     * @param split 分隔符
-     * @param str   被转换的值
-     *
-     * @return 结果
-     */
-    public static Long[] toLongArray (String split, String str) {
-        if (StringUtils.isEmpty(str)) {
-            return new Long[]{};
-        }
-        String[] arr = str.split(split);
-        final Long[] longs = new Long[arr.length];
-        for (int i = 0 ; i < arr.length ; i++) {
-            final Long v = toLong(arr[i], null);
-            longs[i] = v;
-        }
-        return longs;
-    }
-
-    /**
-     * 转换为String数组<br>
-     *
-     * @param str 被转换的值
-     *
-     * @return 结果
-     */
-    public static String[] toStrArray (String str) {
-        return toStrArray(",", str);
-    }
-
-    /**
-     * 转换为String数组<br>
-     *
-     * @param split 分隔符
-     * @param str   被转换的值
-     *
-     * @return 结果
-     */
-    public static String[] toStrArray (String split, String str) {
-        return str.split(split);
-    }
-
-    /**
-     * 转换为long<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Long toLong (Object value, Long defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Long) {
-            return (Long) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            // 支持科学计数法
-            return new BigDecimal(valueStr.trim()).longValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为long<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Long toLong (Object value) {
-        return toLong(value, null);
-    }
-
-    /**
-     * 转换为double<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Double toDouble (Object value, Double defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Double) {
-            return (Double) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).doubleValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            // 支持科学计数法
-            return new BigDecimal(valueStr.trim()).doubleValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为double<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Double toDouble (Object value) {
-        return toDouble(value, null);
-    }
-
-    /**
-     * 转换为Float<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Float toFloat (Object value, Float defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Float) {
-            return (Float) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).floatValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Float.parseFloat(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Float<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Float toFloat (Object value) {
-        return toFloat(value, null);
-    }
-
-    /**
-     * 转换为boolean<br>
-     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static Boolean toBool (Object value, Boolean defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Boolean) {
-            return (Boolean) value;
-        }
-        String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        valueStr = valueStr.trim().toLowerCase();
-        switch (valueStr) {
-            case "true":
-            case "yes":
-            case "ok":
-            case "1":
-                return true;
-            case "false":
-            case "no":
-            case "0":
-                return false;
-            default:
-                return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为boolean<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static Boolean toBool (Object value) {
-        return toBool(value, null);
-    }
-
-    /**
-     * 转换为Enum对象<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     *
-     * @param clazz        Enum的Class
-     * @param value        值
-     * @param defaultValue 默认值
-     *
-     * @return Enum
-     */
-    public static <E extends Enum<E>> E toEnum (Class<E> clazz, Object value, E defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (clazz.isAssignableFrom(value.getClass())) {
-            @SuppressWarnings("unchecked")
-            E myE = (E) value;
-            return myE;
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Enum.valueOf(clazz, valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Enum对象<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     *
-     * @param clazz Enum的Class
-     * @param value 值
-     *
-     * @return Enum
-     */
-    public static <E extends Enum<E>> E toEnum (Class<E> clazz, Object value) {
-        return toEnum(clazz, value, null);
-    }
-
-    /**
-     * 转换为BigInteger<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static BigInteger toBigInteger (Object value, BigInteger defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof BigInteger) {
-            return (BigInteger) value;
-        }
-        if (value instanceof Long) {
-            return BigInteger.valueOf((Long) value);
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return new BigInteger(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为BigInteger<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static BigInteger toBigInteger (Object value) {
-        return toBigInteger(value, null);
-    }
-
-    /**
-     * 转换为BigDecimal<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     *
-     * @return 结果
-     */
-    public static BigDecimal toBigDecimal (Object value, BigDecimal defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof BigDecimal) {
-            return (BigDecimal) value;
-        }
-        if (value instanceof Long) {
-            return new BigDecimal((Long) value);
-        }
-        if (value instanceof Double) {
-            return BigDecimal.valueOf((Double) value);
-        }
-        if (value instanceof Integer) {
-            return new BigDecimal((Integer) value);
-        }
-        final String valueStr = toStr(value, null);
-        if (StringUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return new BigDecimal(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为BigDecimal<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     *
-     * @return 结果
-     */
-    public static BigDecimal toBigDecimal (Object value) {
-        return toBigDecimal(value, null);
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj 对象
-     *
-     * @return 字符串
-     */
-    public static String utf8Str (Object obj) {
-        return str(obj, CharsetKit.CHARSET_UTF_8);
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj         对象
-     * @param charsetName 字符集
-     *
-     * @return 字符串
-     */
-    public static String str (Object obj, String charsetName) {
-        return str(obj, Charset.forName(charsetName));
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj     对象
-     * @param charset 字符集
-     *
-     * @return 字符串
-     */
-    public static String str (Object obj, Charset charset) {
-        if (null == obj) {
-            return null;
-        }
-
-        if (obj instanceof String) {
-            return (String) obj;
-        } else if (obj instanceof byte[] || obj instanceof Byte[]) {
-            if (obj instanceof byte[]) {
-                return str((byte[]) obj, charset);
-            } else {
-                Byte[] bytes = (Byte[]) obj;
-                int length = bytes.length;
-                byte[] dest = new byte[length];
-                for (int i = 0 ; i < length ; i++) {
-                    dest[i] = bytes[i];
-                }
-                return str(dest, charset);
-            }
-        } else if (obj instanceof ByteBuffer) {
-            return str((ByteBuffer) obj, charset);
-        }
-        return obj.toString();
-    }
-
-    /**
-     * 将byte数组转为字符串
-     *
-     * @param bytes   byte数组
-     * @param charset 字符集
-     *
-     * @return 字符串
-     */
-    public static String str (byte[] bytes, String charset) {
-        return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
-    }
-
-    /**
-     * 解码字节码
-     *
-     * @param data    字符串
-     * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
-     *
-     * @return 解码后的字符串
-     */
-    public static String str (byte[] data, Charset charset) {
-        if (data == null) {
-            return null;
-        }
-
-        if (null == charset) {
-            return new String(data);
-        }
-        return new String(data, charset);
-    }
-
-    /**
-     * 将编码的byteBuffer数据转换为字符串
-     *
-     * @param data    数据
-     * @param charset 字符集，如果为空使用当前系统字符集
-     *
-     * @return 字符串
-     */
-    public static String str (ByteBuffer data, String charset) {
-        if (data == null) {
-            return null;
-        }
-
-        return str(data, Charset.forName(charset));
-    }
-
-    /**
-     * 将编码的byteBuffer数据转换为字符串
-     *
-     * @param data    数据
-     * @param charset 字符集，如果为空使用当前系统字符集
-     *
-     * @return 字符串
-     */
-    public static String str (ByteBuffer data, Charset charset) {
-        if (null == charset) {
-            charset = Charset.defaultCharset();
-        }
-        return charset.decode(data).toString();
-    }
-
-    // ----------------------------------------------------------------------- 全角半角转换
-
-    /**
-     * 半角转全角
-     *
-     * @param input String.
-     *
-     * @return 全角字符串.
-     */
-    public static String toSBC (String input) {
-        return toSBC(input, null);
-    }
-
-    /**
-     * 半角转全角
-     *
-     * @param input         String
-     * @param notConvertSet 不替换的字符集合
-     *
-     * @return 全角字符串.
-     */
-    public static String toSBC (String input, Set<Character> notConvertSet) {
-        char[] c = input.toCharArray();
-        for (int i = 0 ; i < c.length ; i++) {
-            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-                // 跳过不替换的字符
-                continue;
-            }
-
-            if (c[i] == ' ') {
-                c[i] = '\u3000';
-            } else if (c[i] < '\177') {
-                c[i] = (char) (c[i] + 65248);
-
-            }
-        }
-        return new String(c);
-    }
-
-    /**
-     * 全角转半角
-     *
-     * @param input String.
-     *
-     * @return 半角字符串
-     */
-    public static String toDBC (String input) {
-        return toDBC(input, null);
-    }
-
-    /**
-     * 替换全角为半角
-     *
-     * @param text          文本
-     * @param notConvertSet 不替换的字符集合
-     *
-     * @return 替换后的字符
-     */
-    public static String toDBC (String text, Set<Character> notConvertSet) {
-        char[] c = text.toCharArray();
-        for (int i = 0 ; i < c.length ; i++) {
-            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-                // 跳过不替换的字符
-                continue;
-            }
-
-            if (c[i] == '\u3000') {
-                c[i] = ' ';
-            } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
-                c[i] = (char) (c[i] - 65248);
-            }
-        }
-        return new String(c);
-    }
-
-    /**
-     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
-     *
-     * @param n 数字
-     *
-     * @return 中文大写数字
-     */
-    public static String digitUppercase (double n) {
-        String[] fraction = {"角", "分"};
-        String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
-        String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
-
-        String head = n < 0 ? "负" : "";
-        n = Math.abs(n);
-
-        String s = "";
-        for (int i = 0 ; i < fraction.length ; i++) {
-            // 优化double计算精度丢失问题
-            BigDecimal nNum = new BigDecimal(n);
-            BigDecimal decimal = new BigDecimal(10);
-            BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN);
-            double d = scale.doubleValue();
-            s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
-        }
-        if (s.length() < 1) {
-            s = "整";
-        }
-        int integerPart = (int) Math.floor(n);
-
-        for (int i = 0 ; i < unit[0].length && integerPart > 0 ; i++) {
-            String p = "";
-            for (int j = 0 ; j < unit[1].length && n > 0 ; j++) {
-                p = digit[integerPart % 10] + unit[1][j] + p;
-                integerPart = integerPart / 10;
-            }
-            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
-        }
-        return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整");
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java
@ -1,77 +0,0 @@
-package com.muyu.common.core.text;
-
-import com.muyu.common.core.utils.StringUtils;
-
-/**
- * 字符串格式化
- *
- * @author muyu
- */
-public class StrFormatter {
-    public static final String EMPTY_JSON = "{}";
-    public static final char C_BACKSLASH = '\\';
-    public static final char C_DELIM_START = '{';
-    public static final char C_DELIM_END = '}';
-
-    /**
-     * 格式化字符串<br>
-     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
-     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
-     * 例：<br>
-     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
-     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a<br>
-     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
-     *
-     * @param strPattern 字符串模板
-     * @param argArray   参数列表
-     *
-     * @return 结果
-     */
-    public static String format (final String strPattern, final Object... argArray) {
-        if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) {
-            return strPattern;
-        }
-        final int strPatternLength = strPattern.length();
-
-        // 初始化定义好的长度以获得更好的性能
-        StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
-
-        int handledPosition = 0;
-        int delimIndex;// 占位符所在位置
-        for (int argIndex = 0 ; argIndex < argArray.length ; argIndex++) {
-            delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
-            if (delimIndex == -1) {
-                if (handledPosition == 0) {
-                    return strPattern;
-                } else { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
-                    sbuf.append(strPattern, handledPosition, strPatternLength);
-                    return sbuf.toString();
-                }
-            } else {
-                if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {
-                    if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {
-                        // 转义符之前还有一个转义符，占位符依旧有效
-                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
-                        sbuf.append(Convert.utf8Str(argArray[argIndex]));
-                        handledPosition = delimIndex + 2;
-                    } else {
-                        // 占位符被转义
-                        argIndex--;
-                        sbuf.append(strPattern, handledPosition, delimIndex - 1);
-                        sbuf.append(C_DELIM_START);
-                        handledPosition = delimIndex + 1;
-                    }
-                } else {
-                    // 正常占位符
-                    sbuf.append(strPattern, handledPosition, delimIndex);
-                    sbuf.append(Convert.utf8Str(argArray[argIndex]));
-                    handledPosition = delimIndex + 2;
-                }
-            }
-        }
-        // 加入最后一个占位符后所有的字符
-        sbuf.append(strPattern, handledPosition, strPattern.length());
-
-        return sbuf.toString();
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java
@ -1,158 +0,0 @@
-package com.muyu.common.core.utils;
-
-import org.apache.commons.lang3.time.DateFormatUtils;
-
-import java.lang.management.ManagementFactory;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.*;
-import java.util.Date;
-
-/**
- * 时间工具类
- *
- * @author muyu
- */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
-    public static String YYYY = "yyyy";
-
-    public static String YYYY_MM = "yyyy-MM";
-
-    public static String YYYY_MM_DD = "yyyy-MM-dd";
-
-    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
-
-    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
-
-    private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
-            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
-            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
-
-    /**
-     * 获取当前Date型日期
-     *
-     * @return Date() 当前日期
-     */
-    public static Date getNowDate () {
-        return new Date();
-    }
-
-    /**
-     * 获取当前日期, 默认格式为yyyy-MM-dd
-     *
-     * @return String
-     */
-    public static String getDate () {
-        return dateTimeNow(YYYY_MM_DD);
-    }
-
-    public static final String getTime () {
-        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
-    }
-
-    public static final String dateTimeNow () {
-        return dateTimeNow(YYYYMMDDHHMMSS);
-    }
-
-    public static final String dateTimeNow (final String format) {
-        return parseDateToStr(format, new Date());
-    }
-
-    public static final String dateTime (final Date date) {
-        return parseDateToStr(YYYY_MM_DD, date);
-    }
-
-    public static final String parseDateToStr (final String format, final Date date) {
-        return new SimpleDateFormat(format).format(date);
-    }
-
-    public static final Date dateTime (final String format, final String ts) {
-        try {
-            return new SimpleDateFormat(format).parse(ts);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * 日期路径 即年/月/日 如2018/08/08
-     */
-    public static final String datePath () {
-        Date now = new Date();
-        return DateFormatUtils.format(now, "yyyy/MM/dd");
-    }
-
-    /**
-     * 日期路径 即年/月/日 如20180808
-     */
-    public static final String dateTime () {
-        Date now = new Date();
-        return DateFormatUtils.format(now, "yyyyMMdd");
-    }
-
-    /**
-     * 日期型字符串转化为日期 格式
-     */
-    public static Date parseDate (Object str) {
-        if (str == null) {
-            return null;
-        }
-        try {
-            return parseDate(str.toString(), parsePatterns);
-        } catch (ParseException e) {
-            return null;
-        }
-    }
-
-    /**
-     * 获取服务器启动时间
-     */
-    public static Date getServerStartDate () {
-        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
-        return new Date(time);
-    }
-
-    /**
-     * 计算时间差
-     *
-     * @param endDate   最后时间
-     * @param startTime 开始时间
-     *
-     * @return 时间差（天/小时/分钟）
-     */
-    public static String timeDistance (Date endDate, Date startTime) {
-        long nd = 1000 * 24 * 60 * 60;
-        long nh = 1000 * 60 * 60;
-        long nm = 1000 * 60;
-        // long ns = 1000;
-        // 获得两个时间的毫秒时间差异
-        long diff = endDate.getTime() - startTime.getTime();
-        // 计算差多少天
-        long day = diff / nd;
-        // 计算差多少小时
-        long hour = diff % nd / nh;
-        // 计算差多少分钟
-        long min = diff % nd % nh / nm;
-        // 计算差多少秒//输出结果
-        // long sec = diff % nd % nh % nm / ns;
-        return day + "天" + hour + "小时" + min + "分钟";
-    }
-
-    /**
-     * 增加 LocalDateTime ==> Date
-     */
-    public static Date toDate (LocalDateTime temporalAccessor) {
-        ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
-        return Date.from(zdt.toInstant());
-    }
-
-    /**
-     * 增加 LocalDate ==> Date
-     */
-    public static Date toDate (LocalDate temporalAccessor) {
-        LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
-        ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
-        return Date.from(zdt.toInstant());
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java
@ -1,35 +0,0 @@
-package com.muyu.common.core.utils;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-/**
- * 错误信息处理类。
- *
- * @author muyu
- */
-public class ExceptionUtil {
-    /**
-     * 获取exception的详细错误信息。
-     */
-    public static String getExceptionMessage (Throwable e) {
-        StringWriter sw = new StringWriter();
-        e.printStackTrace(new PrintWriter(sw, true));
-        return sw.toString();
-    }
-
-    public static String getRootErrorMessage (Exception e) {
-        Throwable root = ExceptionUtils.getRootCause(e);
-        root = (root == null ? e : root);
-        if (root == null) {
-            return "";
-        }
-        String msg = root.getMessage();
-        if (msg == null) {
-            return "null";
-        }
-        return StringUtils.defaultString(msg);
-    }
-}
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java
@ -1,123 +0,0 @@
-package com.muyu.common.core.utils;
-
-import com.muyu.common.core.constant.SecurityConstants;
-import com.muyu.common.core.constant.TokenConstants;
-import com.muyu.common.core.text.Convert;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-
-import java.util.Map;
-
-/**
- * Jwt工具类
- *
- * @author muyu
- */
-public class JwtUtils {
-    public static String secret = TokenConstants.SECRET;
-
-    /**
-     * 从数据声明生成令牌
-     *
-     * @param claims 数据声明
-     *
-     * @return 令牌
-     */
-    public static String createToken (Map<String, Object> claims) {
-        String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact();
-        return token;
-    }
-
-    /**
-     * 从令牌中获取数据声明
-     *
-     * @param token 令牌
-     *
-     * @return 数据声明
-     */
-    public static Claims parseToken (String token) {
-        return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
-    }
-
-    /**
-     * 根据令牌获取用户标识
-     *
-     * @param token 令牌
-     *
-     * @return 用户ID
-     */
-    public static String getUserKey (String token) {
-        Claims claims = parseToken(token);
-        return getValue(claims, SecurityConstants.USER_KEY);
-    }
-
-    /**
-     * 根据令牌获取用户标识
-     *
-     * @param claims 身份信息
-     *
-     * @return 用户ID
-     */
-    public static String getUserKey (Claims claims) {
-        return getValue(claims, SecurityConstants.USER_KEY);
-    }
-
-    /**
-     * 根据令牌获取用户ID
-     *
-     * @param token 令牌
-     *
-     * @return 用户ID
-     */
-    public static String getUserId (String token) {
-        Claims claims = parseToken(token);
-        return getValue(claims, SecurityConstants.DETAILS_USER_ID);
-    }
-
-    /**
-     * 根据身份信息获取用户ID
-     *
-     * @param claims 身份信息
-     *
-     * @return 用户ID
-     */
-    public static String getUserId (Claims claims) {
-        return getValue(claims, SecurityConstants.DETAILS_USER_ID);
-    }
-
-    /**
-     * 根据令牌获取用户名
-     *
-     * @param token 令牌
-     *
-     * @return 用户名
-     */
-    public static String getUserName (String token) {
-        Claims claims = parseToken(token);
-        return getValue(claims, SecurityConstants.DETAILS_USERNAME);
-    }
-
-    /**
-     * 根据身份信息获取用户名
-     *
-     * @param claims 身份信息
-     *
-     * @return 用户名
-     */
-    public static String getUserName (Claims claims) {
-        return getValue(claims, SecurityConstants.DETAILS_USERNAME);
-    }
-
-    /**
-     * 根据身份信息获取键值
-     *
-     * @param claims 身份信息
-     * @param key    键
-     *
-     * @return 值
-     */
-    public static String getValue (Claims claims, String key) {
-        return Convert.toStr(claims.get(key), "");
-    }
-}
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`存放认证中心打包好的jar文件，用于docker启动应用。`
				`@ -1 +0,0 @@`
				`存放网关模块打包好的jar文件，用于docker启动应用。`
				`@ -1 +0,0 @@`
				`存放文件服务打包好的jar文件，用于docker启动应用。`
				`@ -1 +0,0 @@`
				`存放代码生成打包好的jar文件，用于docker启动应用。`
				`@ -1 +0,0 @@`
				`存放定时任务打包好的jar文件，用于docker启动应用。`
				`@ -1 +0,0 @@`
				`存放系统模块打包好的jar文件，用于docker启动应用。`
				`@ -1 +0,0 @@`
				`存放监控中心打包好的jar文件，用于docker启动应用。`
				`@ -1 +0,0 @@`
				`存放sql目录下的所有脚本，用于docker自动执行。`