From 1a3da962679d193e3a46b25105105bbeb365aca0 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Fri, 25 Nov 2022 13:34:36 +0800 Subject: [PATCH 01/31] =?UTF-8?q?neutrino-proxy-admin=E6=96=B0=E5=A2=9Eloc?= =?UTF-8?q?al=E7=8E=AF=E5=A2=83=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build/webpack.local.conf.js | 88 +++++++++++++++++++ neutrino-proxy-admin/config/dev.env.js | 2 +- neutrino-proxy-admin/config/local.env.js | 5 ++ neutrino-proxy-admin/package.json | 3 +- 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 neutrino-proxy-admin/build/webpack.local.conf.js create mode 100644 neutrino-proxy-admin/config/local.env.js diff --git a/neutrino-proxy-admin/build/webpack.local.conf.js b/neutrino-proxy-admin/build/webpack.local.conf.js new file mode 100644 index 00000000..279389c9 --- /dev/null +++ b/neutrino-proxy-admin/build/webpack.local.conf.js @@ -0,0 +1,88 @@ +'use strict' +const path = require('path') +const utils = require('./utils') +const webpack = require('webpack') +const config = require('../config') +const merge = require('webpack-merge') +const baseWebpackConfig = require('./webpack.base.conf') +const HtmlWebpackPlugin = require('html-webpack-plugin') +const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') +const portfinder = require('portfinder') + +function resolve (dir) { + return path.join(__dirname, '..', dir) +} + +const HOST = process.env.HOST +const PORT = process.env.PORT && Number(process.env.PORT) + +const devWebpackConfig = merge(baseWebpackConfig, { + module: { + rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) + }, + // cheap-module-eval-source-map is faster for development + devtool: config.dev.devtool, + + // these devServer options should be customized in /config/index.js + devServer: { + clientLogLevel: 'warning', + historyApiFallback: true, + hot: true, + compress: true, + host: HOST || config.dev.host, + port: PORT || config.dev.port, + open: config.dev.autoOpenBrowser, + overlay: config.dev.errorOverlay + ? { warnings: false, errors: true } + : false, + publicPath: config.dev.assetsPublicPath, + proxy: config.dev.proxyTable, + quiet: true, // necessary for FriendlyErrorsPlugin + watchOptions: { + poll: config.dev.poll, + } + }, + plugins: [ + new webpack.DefinePlugin({ + 'process.env': require('../config/local.env') + }), + new webpack.HotModuleReplacementPlugin(), + new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update. + new webpack.NoEmitOnErrorsPlugin(), + // https://github.com/ampedandwired/html-webpack-plugin + new HtmlWebpackPlugin({ + filename: 'index.html', + template: 'index.html', + inject: true, + favicon: resolve('favicon.ico'), + title: 'vue-element-admin', + path: config.dev.assetsPublicPath + config.dev.assetsSubDirectory + }), + ] +}) + +module.exports = new Promise((resolve, reject) => { + portfinder.basePort = process.env.PORT || config.dev.port + portfinder.getPort((err, port) => { + if (err) { + reject(err) + } else { + // publish the new Port, necessary for e2e tests + process.env.PORT = port + // add port to devServer config + devWebpackConfig.devServer.port = port + + // Add FriendlyErrorsPlugin + devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ + compilationSuccessInfo: { + messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], + }, + onErrors: config.dev.notifyOnErrors + ? utils.createNotifierCallback() + : undefined + })) + + resolve(devWebpackConfig) + } + }) +}) diff --git a/neutrino-proxy-admin/config/dev.env.js b/neutrino-proxy-admin/config/dev.env.js index f5ee615e..f812fea4 100644 --- a/neutrino-proxy-admin/config/dev.env.js +++ b/neutrino-proxy-admin/config/dev.env.js @@ -1,5 +1,5 @@ module.exports = { NODE_ENV: '"development"', ENV_CONFIG: '"dev"', - BASE_API: '"http://localhost:8888"' + BASE_API: '"http://103.163.47.16:8888"' } diff --git a/neutrino-proxy-admin/config/local.env.js b/neutrino-proxy-admin/config/local.env.js new file mode 100644 index 00000000..8a8c18ec --- /dev/null +++ b/neutrino-proxy-admin/config/local.env.js @@ -0,0 +1,5 @@ +module.exports = { + NODE_ENV: '"development"', + ENV_CONFIG: '"local"', + BASE_API: '"http://localhost:8888"' +} diff --git a/neutrino-proxy-admin/package.json b/neutrino-proxy-admin/package.json index fed01c75..f2e2450f 100644 --- a/neutrino-proxy-admin/package.json +++ b/neutrino-proxy-admin/package.json @@ -6,7 +6,8 @@ "license": "MIT", "private": true, "scripts": { - "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host=0.0.0.0", + "local": "webpack-dev-server --inline --progress --config build/webpack.local.conf.js", + "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "build:dev": "cross-env NODE_ENV=dev env_config=dev node build/build.js", "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js", "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js", From 781d308c09b02b3ae52c7d98e5e93e75d95a1285 Mon Sep 17 00:00:00 2001 From: zCans <1224895921@qq.com> Date: Fri, 25 Nov 2022 17:32:50 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-admin/src/lang/zh.js | 3 +- .../views/system/components/update-pwd.vue | 82 +++++++++++++++++++ .../src/views/system/user.vue | 36 ++++++-- 3 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 neutrino-proxy-admin/src/views/system/components/update-pwd.vue diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js index fac13f8b..cf08901a 100644 --- a/neutrino-proxy-admin/src/lang/zh.js +++ b/neutrino-proxy-admin/src/lang/zh.js @@ -139,7 +139,8 @@ export default { jobLogMsg: '执行日志', alarmStatus: '报警状态', ip: 'IP', - happendTime: '发生时间' + happendTime: '发生时间', + updatePwd: '修改密码' }, errorLog: { tips: '请点击右上角bug小图标', diff --git a/neutrino-proxy-admin/src/views/system/components/update-pwd.vue b/neutrino-proxy-admin/src/views/system/components/update-pwd.vue new file mode 100644 index 00000000..31e30097 --- /dev/null +++ b/neutrino-proxy-admin/src/views/system/components/update-pwd.vue @@ -0,0 +1,82 @@ + + + diff --git a/neutrino-proxy-admin/src/views/system/user.vue b/neutrino-proxy-admin/src/views/system/user.vue index 9b20d580..330219cd 100644 --- a/neutrino-proxy-admin/src/views/system/user.vue +++ b/neutrino-proxy-admin/src/views/system/user.vue @@ -2,7 +2,7 @@
{{$t('table.search')}} - {{$t('table.add')}} + {{$t('table.add')}}
{{scope.row.enable | statusName}} - + @@ -56,7 +56,7 @@
- + @@ -81,6 +81,8 @@ + + @@ -89,6 +91,8 @@ import waves from '@/directive/waves' // 水波纹指令 import { parseTime } from '@/utils' import ButtonPopover from '../../components/Button/buttonPopover' + import UpdatePwd from './components/update-pwd' + import { mapGetters } from 'vuex' const calendarTypeOptions = [ { key: 'CN', display_name: 'China' }, @@ -108,8 +112,14 @@ directives: { waves }, + computed: { + ...mapGetters([ + 'loginName' + ]) + }, components: { - ButtonPopover + ButtonPopover, + UpdatePwd }, data() { return { @@ -150,7 +160,9 @@ name: [{ required: true, message: '用户名必填', trigger: 'blur' }], loginName: [{ required: true, message: '登录名必填', trigger: 'blur' }] }, - downloadLoading: false + downloadLoading: false, + updatePwdvisible: false, + selectRow: null } }, filters: { @@ -327,6 +339,14 @@ return v[j] } })) + }, + handleUpdatePassword(row) { + this.selectRow = row + this.updatePwdvisible = true + }, + handleCancel() { + this.updatePwdvisible = false + this.selectRow = null } } } From 155eeb2141f1752e1d7af87b2e93aed301d191ce Mon Sep 17 00:00:00 2001 From: zCans <1224895921@qq.com> Date: Fri, 25 Nov 2022 17:33:09 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-admin/src/api/user.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/neutrino-proxy-admin/src/api/user.js b/neutrino-proxy-admin/src/api/user.js index 70ef71e8..0429d4f4 100644 --- a/neutrino-proxy-admin/src/api/user.js +++ b/neutrino-proxy-admin/src/api/user.js @@ -73,3 +73,15 @@ export function hello() { }) } +/** + * 管理员修改成员密码 + * @param params + */ +export function updatePassword(params) { + return request({ + url: '/user/update/password', + method: 'post', + data: params + }) +} + From cc69dde5f14a53b9951d5b00ac926f574fb70da8 Mon Sep 17 00:00:00 2001 From: zCans <1224895921@qq.com> Date: Fri, 25 Nov 2022 17:42:07 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-admin/src/views/system/user.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutrino-proxy-admin/src/views/system/user.vue b/neutrino-proxy-admin/src/views/system/user.vue index 330219cd..88185e40 100644 --- a/neutrino-proxy-admin/src/views/system/user.vue +++ b/neutrino-proxy-admin/src/views/system/user.vue @@ -56,7 +56,7 @@ - + From e17ae87ba2e1cbd17424878bd7df08f0a2b9cb56 Mon Sep 17 00:00:00 2001 From: zCans <1224895921@qq.com> Date: Fri, 25 Nov 2022 18:32:13 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-admin/src/api/user.js | 12 ++++ neutrino-proxy-admin/src/lang/zh.js | 1 + .../src/views/layout/components/Navbar.vue | 19 ++++- .../views/system/components/update-pwd.vue | 71 +++++++++++++++---- 4 files changed, 87 insertions(+), 16 deletions(-) diff --git a/neutrino-proxy-admin/src/api/user.js b/neutrino-proxy-admin/src/api/user.js index 0429d4f4..0b982505 100644 --- a/neutrino-proxy-admin/src/api/user.js +++ b/neutrino-proxy-admin/src/api/user.js @@ -85,3 +85,15 @@ export function updatePassword(params) { }) } +/** + * 修改自己密码 + * @param params + */ +export function updateUserPassword(params) { + return request({ + url: '/user/current-user/update/password', + method: 'post', + data: params + }) +} + diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js index cf08901a..86bda466 100644 --- a/neutrino-proxy-admin/src/lang/zh.js +++ b/neutrino-proxy-admin/src/lang/zh.js @@ -60,6 +60,7 @@ export default { logOut: '退出登录', dashboard: '首页', github: '项目地址', + updatePwd: '修改密码', screenfull: '全屏', theme: '换肤' }, diff --git a/neutrino-proxy-admin/src/views/layout/components/Navbar.vue b/neutrino-proxy-admin/src/views/layout/components/Navbar.vue index ca630f58..1c66e100 100644 --- a/neutrino-proxy-admin/src/views/layout/components/Navbar.vue +++ b/neutrino-proxy-admin/src/views/layout/components/Navbar.vue @@ -33,12 +33,17 @@ {{$t('navbar.github')}} + + {{$t('navbar.updatePwd')}} + {{$t('navbar.logOut')}} + + @@ -50,9 +55,11 @@ import ErrorLog from '@/components/ErrorLog' import Screenfull from '@/components/Screenfull' import LangSelect from '@/components/LangSelect' import ThemePicker from '@/components/ThemePicker' +import UpdatePwd from '../../system/components/update-pwd' export default { components: { + UpdatePwd, Breadcrumb, Hamburger, ErrorLog, @@ -68,6 +75,11 @@ export default { 'loginName' ]) }, + data() { + return { + updatePwdvisible: false + } + }, methods: { toggleSideBar() { this.$store.dispatch('toggleSideBar') @@ -76,6 +88,9 @@ export default { this.$store.dispatch('LogOut').then(() => { location.reload()// In order to re-instantiate the vue-router object to avoid bugs }) + }, + handleCancel() { + this.updatePwdvisible = false } } } @@ -130,12 +145,12 @@ export default { height: 40px; border-radius: 10px; } - .el-icon-caret-bottom { + /*.el-icon-caret-bottom { position: absolute; right: -20px; top: 25px; font-size: 12px; - } + }*/ } } } diff --git a/neutrino-proxy-admin/src/views/system/components/update-pwd.vue b/neutrino-proxy-admin/src/views/system/components/update-pwd.vue index 31e30097..cf307c87 100644 --- a/neutrino-proxy-admin/src/views/system/components/update-pwd.vue +++ b/neutrino-proxy-admin/src/views/system/components/update-pwd.vue @@ -4,14 +4,21 @@ :visible.sync="visible" :close-on-click-modal="false" :before-close="onCancel" + :width="width" > - - + + + + + + + +
确定 @@ -22,20 +29,42 @@ + + From aaa06de7a4fa7780b363e80954ef2b729ea39dfb Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Sat, 26 Nov 2022 13:44:30 +0800 Subject: [PATCH 11/31] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=96=AD=E8=BF=9E=E6=8E=A5=E6=97=A5=E5=BF=97=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8E=92=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../neutrino/proxy/server/dal/ClientConnectRecordMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java index fb39c3a8..d3edc7ea 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/ClientConnectRecordMapper.java @@ -21,6 +21,6 @@ public interface ClientConnectRecordMapper extends SqlMapper { void add(ClientConnectRecordDO clientConnectRecordDO); @ResultType(ClientConnectRecordListRes.class) - @Select("select * from client_connect_record") + @Select("select * from client_connect_record order by id desc") void page(Page page, ClientConnectRecordListReq req); } From 826082b35bc4a3361f2696fa5cdc5f01a24efbc2 Mon Sep 17 00:00:00 2001 From: zCans <1224895921@qq.com> Date: Sat, 26 Nov 2022 14:18:26 +0800 Subject: [PATCH 12/31] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E8=BF=9E=E6=8E=A5=E6=97=A5=E5=BF=97=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=202=E3=80=81=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=9A=E4=BC=98=E5=8C=96=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/clientConnectLog.js | 9 ++ neutrino-proxy-admin/src/lang/zh.js | 5 +- neutrino-proxy-admin/src/router/index.js | 3 +- .../src/views/log/clientConnectLog.vue | 152 ++++++++++++++++++ neutrino-proxy-admin/src/views/log/jobLog.vue | 1 + .../src/views/log/loginLog.vue | 1 + 6 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 neutrino-proxy-admin/src/api/clientConnectLog.js create mode 100644 neutrino-proxy-admin/src/views/log/clientConnectLog.vue diff --git a/neutrino-proxy-admin/src/api/clientConnectLog.js b/neutrino-proxy-admin/src/api/clientConnectLog.js new file mode 100644 index 00000000..fb8df821 --- /dev/null +++ b/neutrino-proxy-admin/src/api/clientConnectLog.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function fetchList(query) { + return request({ + url: '/client-connect-record/page', + method: 'get', + params: query + }) +} diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js index 6687bb0b..573807de 100644 --- a/neutrino-proxy-admin/src/lang/zh.js +++ b/neutrino-proxy-admin/src/lang/zh.js @@ -143,7 +143,10 @@ export default { alarmStatus: '报警状态', ip: 'IP', happendTime: '发生时间', - updatePwd: '修改密码' + updatePwd: '修改密码', + msg: '消息', + outcome: '结果', + err: '异常信息' }, button: { lookOver: '查看' diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js index 96bfea8e..7e44c8d4 100644 --- a/neutrino-proxy-admin/src/router/index.js +++ b/neutrino-proxy-admin/src/router/index.js @@ -90,7 +90,8 @@ export const asyncRouterMap = [ }, children: [ { path: 'jobLog', component: _import('log/jobLog'), name: 'jobLog', meta: { title: 'jobLog' }}, - { path: 'loginLog', component: _import('log/loginLog'), name: 'loginLog', meta: { title: 'loginLog' }} + { path: 'loginLog', component: _import('log/loginLog'), name: 'loginLog', meta: { title: 'loginLog' }}, + { path: 'clientConnectLog', component: _import('log/clientConnectLog'), name: 'clientConnectLog', meta: { title: 'clientConnectLog' }} ] } ] diff --git a/neutrino-proxy-admin/src/views/log/clientConnectLog.vue b/neutrino-proxy-admin/src/views/log/clientConnectLog.vue new file mode 100644 index 00000000..fc9c8c8a --- /dev/null +++ b/neutrino-proxy-admin/src/views/log/clientConnectLog.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/neutrino-proxy-admin/src/views/log/jobLog.vue b/neutrino-proxy-admin/src/views/log/jobLog.vue index 4fda26fd..cd37202d 100644 --- a/neutrino-proxy-admin/src/views/log/jobLog.vue +++ b/neutrino-proxy-admin/src/views/log/jobLog.vue @@ -153,6 +153,7 @@ export default { }, handleSizeChange(val) { this.listQuery.pageSize = val + this.listQuery.currentPage = 1 this.getList() }, handleCurrentChange(val) { diff --git a/neutrino-proxy-admin/src/views/log/loginLog.vue b/neutrino-proxy-admin/src/views/log/loginLog.vue index c4c9ad04..6920fa89 100644 --- a/neutrino-proxy-admin/src/views/log/loginLog.vue +++ b/neutrino-proxy-admin/src/views/log/loginLog.vue @@ -121,6 +121,7 @@ export default { }, handleSizeChange(val) { this.listQuery.pageSize = val + this.listQuery.currentPage = 1 this.getList() }, handleCurrentChange(val) { From 324da0bb1185f059df51fc5740316a3538f17513 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Sat, 26 Nov 2022 18:32:02 +0800 Subject: [PATCH 13/31] =?UTF-8?q?doc=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/Channel.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Channel.MD b/docs/Channel.MD index 5c31b33e..28b4505b 100644 --- a/docs/Channel.MD +++ b/docs/Channel.MD @@ -31,7 +31,7 @@ - 1.3、服务端通过`CmdChannel`接收到来自客户端的`Auth`指令。若验证`license`有效，则建立`licenseId`与`CmdChannel`的映射缓存、 外网端口与`CmdChannel`的映射缓存。并启动服务端代理端口，等待用户连接。 ## 2、用户连接阶段 -- 2.1、用户访向服务端代理的外网端口发起请求，服务端建立`VisitorChannel`。 +- 2.1、用户向服务端代理的外网端口发起请求，服务端建立`VisitorChannel`。 - 2.2、根据外网端口查找`CmdChannel`，若不存在有效的`CmdChannel`，则关闭该`VisitorChannel`。否则， 设置`VisitorChannel`为不可读，并携带内网映射信息(如：`127.0.0.1:3306`)通过`CmdChannel`向客户端发送`Connect`指令。 ## 3、实际被代理服务连接阶段 From d12946c937540952dea9330f0adbbb106e65d4f8 Mon Sep 17 00:00:00 2001 From: zCans <1224895921@qq.com> Date: Tue, 29 Nov 2022 16:10:31 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E4=BC=98=E5=8C=96token=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=9C=AA=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-admin/src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutrino-proxy-admin/src/utils/request.js b/neutrino-proxy-admin/src/utils/request.js index 2bc8a5f7..a13d52a0 100644 --- a/neutrino-proxy-admin/src/utils/request.js +++ b/neutrino-proxy-admin/src/utils/request.js @@ -34,7 +34,7 @@ service.interceptors.response.use( type: 'error', duration: 5 * 1000 }) - if (res.code === 4 && !window.location.href.endsWith('#/login')) { + if ((res.code === 4 || res.code === 1) && !window.location.href.endsWith('#/login')) { store.dispatch('FedLogOut').then(() => { location.reload() // 为了重新实例化vue-router对象 避免bug }) From 915f667a56aea4f1eebe02ac8a7f313a6d3f13b4 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Mon, 5 Dec 2022 11:13:04 +0800 Subject: [PATCH 15/31] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/aop/compiler/AsgcCompiler.java | 1 + neutrino-proxy-server/pom.xml | 5 +++ .../proxy/server/base/rest/DBInitialize.java | 43 ++++++++++++++----- .../base/rest/config/RestConfiguration.java | 3 +- .../sql/{ => sqlite}/init-structure.sql | 0 .../sql/{ => sqlite}/job_info.data.sql | 0 .../sql/{ => sqlite}/license.data.sql | 0 .../sql/{ => sqlite}/port_mapping.data.sql | 0 .../sql/{ => sqlite}/port_pool.data.sql | 0 .../resources/sql/{ => sqlite}/user.data.sql | 0 10 files changed, 41 insertions(+), 11 deletions(-) rename neutrino-proxy-server/src/main/resources/sql/{ => sqlite}/init-structure.sql (100%) rename neutrino-proxy-server/src/main/resources/sql/{ => sqlite}/job_info.data.sql (100%) rename neutrino-proxy-server/src/main/resources/sql/{ => sqlite}/license.data.sql (100%) rename neutrino-proxy-server/src/main/resources/sql/{ => sqlite}/port_mapping.data.sql (100%) rename neutrino-proxy-server/src/main/resources/sql/{ => sqlite}/port_pool.data.sql (100%) rename neutrino-proxy-server/src/main/resources/sql/{ => sqlite}/user.data.sql (100%) diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/AsgcCompiler.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/AsgcCompiler.java index 1b040b2d..d44ef4b0 100644 --- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/AsgcCompiler.java +++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/AsgcCompiler.java @@ -171,6 +171,7 @@ public class AsgcCompiler { /** * 编译代码 + * @param pkg 包名 * @param className 类名 * @param sourceCode 源代码 */ diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml index aef19b8f..00dc1132 100644 --- a/neutrino-proxy-server/pom.xml +++ b/neutrino-proxy-server/pom.xml @@ -30,6 +30,11 @@ druid 1.1.24 + + mysql + mysql-connector-java + 8.0.29 + diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java index 1829a70c..90f56f4b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java @@ -27,7 +27,10 @@ import fun.asgc.neutrino.core.annotation.PreLoad; import fun.asgc.neutrino.core.db.template.JdbcTemplate; import fun.asgc.neutrino.core.util.*; import fun.asgc.neutrino.proxy.server.base.rest.config.DbConfig; +import fun.asgc.neutrino.proxy.server.constant.DbTypeEnum; import lombok.extern.slf4j.Slf4j; +import org.sqlite.SQLiteConfig; +import org.sqlite.SQLiteDataSource; import java.sql.DriverManager; import java.util.List; @@ -44,8 +47,15 @@ public class DBInitialize { private static DbConfig dbConfig; private static JdbcTemplate jdbcTemplate; + private static DbTypeEnum dbTypeEnum; + public static void init() throws Exception { dbConfig = ConfigUtil.getYmlConfig(DbConfig.class); + Assert.notNull(dbConfig.getType(), "neutrino.data.db.type不能为空!"); + dbTypeEnum = DbTypeEnum.of(dbConfig.getType()); + Assert.notNull(dbTypeEnum, "neutrino.data.db.type取值异常!"); + + log.info("{}数据库初始化...", dbConfig.getType()); jdbcTemplate = getJdbcTemplate(); initDBStructure(); initDBData(); @@ -55,7 +65,7 @@ public class DBInitialize { * 初始化数据库结构 */ private static void initDBStructure() throws Exception { - List lines = FileUtil.readContentAsStringList("classpath:/sql/init-structure.sql"); + List lines = FileUtil.readContentAsStringList(String.format("classpath:/sql/%s/init-structure.sql", dbConfig.getType())); if (CollectionUtil.isEmpty(lines)) { return; } @@ -87,7 +97,7 @@ public class DBInitialize { if (count > 0) { continue; } - List lines = FileUtil.readContentAsStringList(String.format("classpath:/sql/%s.data.sql", tableName)); + List lines = FileUtil.readContentAsStringList(String.format("classpath:/sql/%s/%s.data.sql", dbConfig.getType(), tableName)); if (CollectionUtil.isEmpty(lines)) { return; } @@ -117,14 +127,27 @@ public class DBInitialize { DBInitialize.class, () -> { Class.forName(dbConfig.getDriverClass()); - //建立一个数据库名data.db的连接，如果不存在就在当前目录下创建之 - DriverManager.getConnection(dbConfig.getUrl()); - // 创建数据源 - DruidDataSource dataSource = new DruidDataSource(); - dataSource.setUrl(dbConfig.getUrl()); - dataSource.setDriverClassName(dbConfig.getDriverClass()); - // 创建jdbcTemplate - jdbcTemplate = new JdbcTemplate(dataSource); + if (DbTypeEnum.SQLITE == dbTypeEnum) { + //建立一个数据库名data.db的连接，如果不存在就在当前目录下创建之 + DriverManager.getConnection(dbConfig.getUrl()); + // 创建数据源 + SQLiteDataSource dataSource = new SQLiteDataSource(); + dataSource.setUrl(dbConfig.getUrl()); + dataSource.setJournalMode(SQLiteConfig.JournalMode.WAL.getValue()); + // 创建jdbcTemplate + jdbcTemplate = new JdbcTemplate(dataSource); + } else if (DbTypeEnum.MYSQL == dbTypeEnum) { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setDriverClassName("com.mysql.jdbc.Driver"); + dataSource.setUrl(dbConfig.getUrl()); + dataSource.setInitialSize(5); + dataSource.setMinIdle(5); + dataSource.setMaxActive(20); + dataSource.setMaxWait(60000); + dataSource.setPoolPreparedStatements(true); + dataSource.setUsername(""); // TODO + dataSource.setPassword(""); + } }, () -> jdbcTemplate ); diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java index 4ec79309..43f78232 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java @@ -24,6 +24,7 @@ package fun.asgc.neutrino.proxy.server.base.rest.config; import fun.asgc.neutrino.core.annotation.*; import fun.asgc.neutrino.core.base.Ordered; import fun.asgc.neutrino.core.db.template.JdbcTemplate; +import org.sqlite.SQLiteConfig; import org.sqlite.SQLiteDataSource; import javax.sql.DataSource; @@ -43,7 +44,7 @@ public class RestConfiguration { public DataSource dataSource() { SQLiteDataSource dataSource = new SQLiteDataSource(); dataSource.setUrl(dbConfig.getUrl()); - dataSource.setJournalMode("WAL"); + dataSource.setJournalMode(SQLiteConfig.JournalMode.WAL.getValue()); return dataSource; } diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/init-structure.sql similarity index 100% rename from neutrino-proxy-server/src/main/resources/sql/init-structure.sql rename to neutrino-proxy-server/src/main/resources/sql/sqlite/init-structure.sql diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/job_info.data.sql similarity index 100% rename from neutrino-proxy-server/src/main/resources/sql/job_info.data.sql rename to neutrino-proxy-server/src/main/resources/sql/sqlite/job_info.data.sql diff --git a/neutrino-proxy-server/src/main/resources/sql/license.data.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/license.data.sql similarity index 100% rename from neutrino-proxy-server/src/main/resources/sql/license.data.sql rename to neutrino-proxy-server/src/main/resources/sql/sqlite/license.data.sql diff --git a/neutrino-proxy-server/src/main/resources/sql/port_mapping.data.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/port_mapping.data.sql similarity index 100% rename from neutrino-proxy-server/src/main/resources/sql/port_mapping.data.sql rename to neutrino-proxy-server/src/main/resources/sql/sqlite/port_mapping.data.sql diff --git a/neutrino-proxy-server/src/main/resources/sql/port_pool.data.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/port_pool.data.sql similarity index 100% rename from neutrino-proxy-server/src/main/resources/sql/port_pool.data.sql rename to neutrino-proxy-server/src/main/resources/sql/sqlite/port_pool.data.sql diff --git a/neutrino-proxy-server/src/main/resources/sql/user.data.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/user.data.sql similarity index 100% rename from neutrino-proxy-server/src/main/resources/sql/user.data.sql rename to neutrino-proxy-server/src/main/resources/sql/sqlite/user.data.sql From 8ba617c7243eff085d8a76cd251bf1f709fb1a20 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Mon, 5 Dec 2022 16:26:49 +0800 Subject: [PATCH 16/31] =?UTF-8?q?=E6=96=B0=E5=A2=9Emysql=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../proxy/server/base/rest/DBInitialize.java | 7 +- .../server/base/rest/config/DbConfig.java | 12 ++ .../base/rest/config/RestConfiguration.java | 27 ++- .../src/main/resources/application.yml | 11 +- .../resources/sql/mysql/init-structure.sql | 192 ++++++++++++++++++ .../resources/sql/mysql/job_info.data.sql | 13 ++ .../main/resources/sql/mysql/license.data.sql | 3 + .../resources/sql/mysql/port_mapping.data.sql | 5 + .../resources/sql/mysql/port_pool.data.sql | 41 ++++ .../main/resources/sql/mysql/user.data.sql | 5 + 11 files changed, 308 insertions(+), 9 deletions(-) create mode 100644 neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql create mode 100644 neutrino-proxy-server/src/main/resources/sql/mysql/job_info.data.sql create mode 100644 neutrino-proxy-server/src/main/resources/sql/mysql/license.data.sql create mode 100644 neutrino-proxy-server/src/main/resources/sql/mysql/port_mapping.data.sql create mode 100644 neutrino-proxy-server/src/main/resources/sql/mysql/port_pool.data.sql create mode 100644 neutrino-proxy-server/src/main/resources/sql/mysql/user.data.sql diff --git a/.gitignore b/.gitignore index 44013869..3278e90d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ data.db* .neutrino-proxy.license .neutrino-proxy-client.json* lib/* +SensitiveInformation.txt # Log file diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java index 90f56f4b..7906387b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java @@ -145,8 +145,11 @@ public class DBInitialize { dataSource.setMaxActive(20); dataSource.setMaxWait(60000); dataSource.setPoolPreparedStatements(true); - dataSource.setUsername(""); // TODO - dataSource.setPassword(""); + dataSource.setUsername(dbConfig.getUsername()); + dataSource.setPassword(dbConfig.getPassword()); + + // 创建jdbcTemplate + jdbcTemplate = new JdbcTemplate(dataSource); } }, () -> jdbcTemplate diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/DbConfig.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/DbConfig.java index 1a98e5d7..100ed4ae 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/DbConfig.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/DbConfig.java @@ -52,4 +52,16 @@ public class DbConfig { */ @Value("driver-class") private String driverClass; + + /** + * 用户名 + */ + @Value("username") + private String username; + + /** + * 密码 + */ + @Value("password") + private String password; } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java index 43f78232..2c42324a 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/RestConfiguration.java @@ -21,9 +21,11 @@ */ package fun.asgc.neutrino.proxy.server.base.rest.config; +import com.alibaba.druid.pool.DruidDataSource; import fun.asgc.neutrino.core.annotation.*; import fun.asgc.neutrino.core.base.Ordered; import fun.asgc.neutrino.core.db.template.JdbcTemplate; +import fun.asgc.neutrino.proxy.server.constant.DbTypeEnum; import org.sqlite.SQLiteConfig; import org.sqlite.SQLiteDataSource; @@ -42,10 +44,27 @@ public class RestConfiguration { @Bean public DataSource dataSource() { - SQLiteDataSource dataSource = new SQLiteDataSource(); - dataSource.setUrl(dbConfig.getUrl()); - dataSource.setJournalMode(SQLiteConfig.JournalMode.WAL.getValue()); - return dataSource; + DbTypeEnum dbTypeEnum = DbTypeEnum.of(dbConfig.getType()); + if (DbTypeEnum.SQLITE == dbTypeEnum) { + SQLiteDataSource dataSource = new SQLiteDataSource(); + dataSource.setUrl(dbConfig.getUrl()); + dataSource.setJournalMode(SQLiteConfig.JournalMode.WAL.getValue()); + return dataSource; + } else if (DbTypeEnum.MYSQL == dbTypeEnum) { + DruidDataSource dataSource = new DruidDataSource(); + dataSource.setDriverClassName(dbConfig.getDriverClass()); + dataSource.setUrl(dbConfig.getUrl()); + dataSource.setInitialSize(5); + dataSource.setMinIdle(5); + dataSource.setMaxActive(20); + dataSource.setMaxWait(60000); + dataSource.setPoolPreparedStatements(true); + dataSource.setUsername(dbConfig.getUsername()); + dataSource.setPassword(dbConfig.getPassword()); + return dataSource; + } + + return null; } @Bean diff --git a/neutrino-proxy-server/src/main/resources/application.yml b/neutrino-proxy-server/src/main/resources/application.yml index 87861a91..56c90fc2 100644 --- a/neutrino-proxy-server/src/main/resources/application.yml +++ b/neutrino-proxy-server/src/main/resources/application.yml @@ -28,6 +28,11 @@ neutrino: jks-path: classpath:/test.jks data: db: - type: sqlite - url: jdbc:sqlite:data.db - driver-class: org.sqlite.JDBC +# type: sqlite +# url: jdbc:sqlite:data.db +# driver-class: org.sqlite.JDBC + type: mysql + url: jdbc:mysql://localhost:3306/neutrino-proxy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true&useSSL=false + driver-class: com.mysql.jdbc.Driver + username: "******" + password: "******" diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql new file mode 100644 index 00000000..4096a1d4 --- /dev/null +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql @@ -0,0 +1,192 @@ +#############################系统管理相关表############################# +#用户表 +CREATE TABLE IF NOT EXISTS `user` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `name` varchar(50) NOT NULL COMMENT '用户名', + `login_name` varchar(50) NOT NULL COMMENT '登录名', + `login_password` varchar(255) NOT NULL COMMENT '登录密码', + `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + `update_time` datetime(3) NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `I_user_login_name` (`login_name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#用户token表 +CREATE TABLE IF NOT EXISTS `user_token` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `token` varchar(50) NOT NULL COMMENT 'token', + `user_id` int NOT NULL COMMENT '用户ID', + `expiration_time` datetime(3) NOT NULL COMMENT '过期时间', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + `update_time` datetime(3) NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `I_user_token_user_id` (`user_id`), + KEY `I_user_token_token` (`token`), + KEY `I_user_token_expiration_time` (`expiration_time`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#端口池 +CREATE TABLE IF NOT EXISTS `port_pool` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `port` int NOT NULL COMMENT '端口', + `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + `update_time` datetime(3) NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `I_port_pool_port` (`port`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#############################代理配置相关表############################# +#license表 +CREATE TABLE IF NOT EXISTS `license` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `name` varchar(50) NOT NULL COMMENT 'license名称', + `key` varchar(100) NOT NULL COMMENT 'license key', + `user_id` int NOT NULL COMMENT '用户ID', + `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）', + `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + `update_time` datetime(3) NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE, + KEY `I_license_key` (`key`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#端口映射表 +CREATE TABLE IF NOT EXISTS `port_mapping` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `license_id` int NOT NULL COMMENT 'licenseID', + `server_port` int NOT NULL COMMENT '服务端端口', + `client_ip` varchar(20) NOT NULL COMMENT '客户端IP', + `client_port` int NOT NULL COMMENT '客户端端口', + `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）', + `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + `update_time` datetime(3) NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `I_port_mapping_server_port` (`server_port`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#############################日志管理相关表############################# +#用户登录记录表 +CREATE TABLE IF NOT EXISTS `user_login_record` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `user_id` int NOT NULL COMMENT '用户ID', + `ip` varchar(50) NOT NULL COMMENT 'IP', + `token` varchar(100) NOT NULL COMMENT 'token', + `type` int NOT NULL COMMENT '类型（1、登录 2、登出）', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +#客户端连接记录表 +CREATE TABLE IF NOT EXISTS `client_connect_record` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'IP', + `license_id` int NOT NULL COMMENT 'licenseId', + `type` int NOT NULL COMMENT '类型（1、连接 2、断开连接）', + `msg` varchar(512) NOT NULL COMMENT '消息', + `code` int NOT NULL COMMENT '结果 （1、成功 2、失败）', + `err` text NOT NULL COMMENT '异常信息', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +#############################调度管理相关表############################# +#触发器信息表 +CREATE TABLE IF NOT EXISTS `job_info` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `desc` varchar(255) NOT NULL COMMENT '描述', + `handler` varchar(255) NOT NULL COMMENT '处理器', + `cron` varchar(128) NOT NULL COMMENT 'cron', + `param` varchar(512) DEFAULT NULL COMMENT '参数', + `alarm_email` varchar(255) DEFAULT NULL COMMENT '报警邮箱', + `alarm_ding` varchar(255) DEFAULT NULL COMMENT '报警钉钉配置', + `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + `update_time` datetime(3) NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + KEY `I_job_info_handler` (`handler`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#触发器日志表 +CREATE TABLE IF NOT EXISTS `job_log` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `job_id` int NOT NULL COMMENT 'JobId', + `handler` varchar(255) NOT NULL COMMENT '处理器', + `param` varchar(512) DEFAULT NULL COMMENT '参数', + `code` int NOT NULL COMMENT '结果（1、成功 2、失败）', + `msg` text COMMENT '消息', + `alarm_status` int NOT NULL COMMENT '报警状态（1、未报警 2、已报警）', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) USING BTREE, + KEY `I_job_log_create_time` (`create_time`) USING BTREE, + KEY `I_job_log_code` (`code`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#############################报表管理相关表############################# +#流量统计报表-分钟(保留24小时) +CREATE TABLE IF NOT EXISTS `flow_report_minute` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `user_id` int NOT NULL COMMENT '用户ID', + `license_id` int NOT NULL COMMENT 'licenseId', + `write_bytes` int NOT NULL COMMENT '写入流量', + `read_bytes` int NOT NULL COMMENT '读取流量', + `date` datetime(3) NOT NULL COMMENT '时间', + `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd HH:mm', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `I_flow_report_minute_create_time` (`create_time`) USING BTREE, + KEY `I_flow_report_minute_date` (`date`) USING BTREE, + KEY `I_flow_report_minute_user_id` (`user_id`), + KEY `I_flow_report_minute_license_id` (`license_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#流量统计报表-小时(保留60天) +CREATE TABLE IF NOT EXISTS `flow_report_hour` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `user_id` int NOT NULL COMMENT '用户ID', + `license_id` int NOT NULL COMMENT 'licenseId', + `write_bytes` int NOT NULL COMMENT '写入流量', + `read_bytes` int NOT NULL COMMENT '读取流量', + `date` datetime(3) NOT NULL COMMENT '时间', + `date_str` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '时间 yyyy-MM-dd HH', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `I_flow_report_hour_create_time` (`create_time`) USING BTREE, + KEY `I_flow_report_hour_date` (`date`) USING BTREE, + KEY `I_flow_report_hour_user_id` (`user_id`), + KEY `I_flow_report_hour_license_id` (`license_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#流量统计报表-天(保留1年) +CREATE TABLE IF NOT EXISTS `flow_report_day` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `user_id` int NOT NULL COMMENT '用户ID', + `license_id` int NOT NULL COMMENT 'licenseId', + `write_bytes` int NOT NULL COMMENT '写入流量', + `read_bytes` int NOT NULL COMMENT '读取流量', + `date` datetime(3) NOT NULL COMMENT '时间', + `date_str` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '时间 yyyy-MM-dd', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `I_flow_report_day_create_time` (`create_time`) USING BTREE, + KEY `I_flow_report_day_date` (`date`) USING BTREE, + KEY `I_flow_report_day_user_id` (`user_id`), + KEY `I_flow_report_day_license_id` (`license_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; + +#流量统计报表-月(全量保留) +CREATE TABLE IF NOT EXISTS `flow_report_month` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `user_id` int NOT NULL COMMENT '用户ID', + `license_id` int NOT NULL COMMENT 'licenseId', + `write_bytes` int NOT NULL COMMENT '写入流量', + `read_bytes` int NOT NULL COMMENT '读取流量', + `date` datetime(3) NOT NULL COMMENT '时间', + `date_str` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '时间 yyyy-MM', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `I_flow_report_month_create_time` (`create_time`) USING BTREE, + KEY `I_flow_report_month_date` (`date`) USING BTREE, + KEY `I_flow_report_month_user_id` (`user_id`), + KEY `I_flow_report_month_license_id` (`license_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; \ No newline at end of file diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/job_info.data.sql new file mode 100644 index 00000000..278387ba --- /dev/null +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/job_info.data.sql @@ -0,0 +1,13 @@ +#job_qrtz_trigger_info +INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES +(1, '示例Job', 'DemoJob', '0/10 * * * * ?', '{"a":101}', 1, now(), now()); +INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES +(2, '数据清理任务', 'DataCleanJob', '0 0 1 * * ?', '', 1, now(), now()); +INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES +(3, '流量统计报表-分钟', 'FlowReportForMinuteJob', '0 */1 * * * ?', '', 1, now(), now()); +INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES +(4, '流量统计报表-小时', 'FlowReportForHourJob', '0 0 */1 * * ?', '', 1, now(), now()); +INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES +(5, '流量统计报表-天', 'FlowReportForDayJob', '0 0 1 * * ?', '', 1, now(), now()); +INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES +(6, '流量统计报表-月', 'FlowReportForMonthJob', '0 30 1 1 * ?', '', 1, now(), now()); \ No newline at end of file diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/license.data.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/license.data.sql new file mode 100644 index 00000000..f7e239a2 --- /dev/null +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/license.data.sql @@ -0,0 +1,3 @@ +#license +INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES +(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, now(), now()); diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/port_mapping.data.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/port_mapping.data.sql new file mode 100644 index 00000000..4ffcdba7 --- /dev/null +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/port_mapping.data.sql @@ -0,0 +1,5 @@ +#port_mapping +INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES +(1, 1, 9101, '127.0.0.1', 8080, 2, 1, now(), now()); +INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES +(2, 1, 9102, '127.0.0.1', 3306, 2, 1, now(), now()); diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/port_pool.data.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/port_pool.data.sql new file mode 100644 index 00000000..3949bb75 --- /dev/null +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/port_pool.data.sql @@ -0,0 +1,41 @@ +#端口池 +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(1, 9101, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(2, 9102, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(3, 9103, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(4, 9104, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(5, 9105, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(6, 9106, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(7, 9107, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(8, 9108, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(9, 9109, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(10, 9110, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(11, 9111, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(12, 9112, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(13, 9113, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(14, 9114, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(15, 9115, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(16, 9116, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(17, 9117, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(18, 9118, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(19, 9119, 1, now(), now()); +INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(20, 9120, 1, now(), now()); diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/user.data.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/user.data.sql new file mode 100644 index 00000000..1be853ba --- /dev/null +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/user.data.sql @@ -0,0 +1,5 @@ +#用户表 6613b92b77056faeb72068f184ed4c4f +INSERT INTO `user`(`id`, `name`,`login_name`,`login_password`,`enable`,`create_time`, `update_time`) VALUES +(1, '管理员', 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, now(), now()); +INSERT INTO `user`(`id`, `name`,`login_name`,`login_password`,`enable`,`create_time`, `update_time`) VALUES +(2, '游客', 'visitor', 'e10adc3949ba59abbe56e057f20f883e', 1, now(), now()); From add31f55d5dc69e657adc375392060eab4bb77e8 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Mon, 5 Dec 2022 16:41:56 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E6=96=B0=E5=A2=9Emysql=E6=94=AF=E6=8C=81?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java | 2 +- .../src/main/resources/sql/mysql/init-structure.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java index d2547af7..03af06e4 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java @@ -101,6 +101,6 @@ public interface LicenseMapper extends SqlMapper { @Select("select * from `license` where user_id = :userId and name =:name and id not in (:excludeIds) limit 0,1") LicenseDO checkRepeat(@Param("userId") Integer userId, @Param("name") String name, @Param("excludeIds") Set excludeIds); - @Select("select * from `license` where key = ?") + @Select("select * from `license` where `key` = ?") LicenseDO findByKey(String licenseKey); } diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql index 4096a1d4..60c8eab5 100644 --- a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql @@ -84,9 +84,9 @@ CREATE TABLE IF NOT EXISTS `client_connect_record` ( `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'IP', `license_id` int NOT NULL COMMENT 'licenseId', `type` int NOT NULL COMMENT '类型（1、连接 2、断开连接）', - `msg` varchar(512) NOT NULL COMMENT '消息', + `msg` varchar(512) DEFAULT NULL COMMENT '消息', `code` int NOT NULL COMMENT '结果 （1、成功 2、失败）', - `err` text NOT NULL COMMENT '异常信息', + `err` text DEFAULT NULL COMMENT '异常信息', `create_time` datetime(3) NOT NULL COMMENT '创建时间', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; From 508a53b931646eb543c1f1c9b1fd6849fdf62926 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Mon, 5 Dec 2022 16:46:48 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E6=96=B0=E5=A2=9Emysql=E6=94=AF=E6=8C=81?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/neutrino-proxy-server/src/main/resources/application.yml b/neutrino-proxy-server/src/main/resources/application.yml index 56c90fc2..f27a5842 100644 --- a/neutrino-proxy-server/src/main/resources/application.yml +++ b/neutrino-proxy-server/src/main/resources/application.yml @@ -28,11 +28,11 @@ neutrino: jks-path: classpath:/test.jks data: db: -# type: sqlite -# url: jdbc:sqlite:data.db -# driver-class: org.sqlite.JDBC - type: mysql - url: jdbc:mysql://localhost:3306/neutrino-proxy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true&useSSL=false - driver-class: com.mysql.jdbc.Driver - username: "******" - password: "******" + type: sqlite + url: jdbc:sqlite:data.db + driver-class: org.sqlite.JDBC +# type: mysql +# url: jdbc:mysql://103.163.47.16:3306/neutrino-proxy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true&useSSL=false +# driver-class: com.mysql.jdbc.Driver +# username: "******" +# password: "******" From 27b2c82b9fba4c5e1a4eafd28c7d671752c59c57 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Mon, 5 Dec 2022 18:06:02 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=97=A5=E5=BF=97=E9=92=88=E5=AF=B9=E6=B8=B8=E5=AE=A2?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=84=B1=E6=95=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proxy/server/service/ClientConnectRecordService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java index 718939fb..fc9fbba8 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java @@ -27,6 +27,7 @@ import fun.asgc.neutrino.core.annotation.NonIntercept; import fun.asgc.neutrino.core.db.page.Page; import fun.asgc.neutrino.core.db.page.PageQuery; import fun.asgc.neutrino.core.util.CollectionUtil; +import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder; import fun.asgc.neutrino.proxy.server.controller.req.ClientConnectRecordListReq; import fun.asgc.neutrino.proxy.server.controller.res.ClientConnectRecordListRes; import fun.asgc.neutrino.proxy.server.dal.ClientConnectRecordMapper; @@ -80,6 +81,7 @@ public class ClientConnectRecordService { List userList = userMapper.findByIds(userIds); Map licenseMap = licenseList.stream().collect(Collectors.toMap(LicenseDO::getId, Function.identity())); Map userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity())); + boolean isAdmin = SystemContextHolder.isAdmin(); page.getRecords().forEach(item -> { LicenseDO license = licenseMap.get(item.getLicenseId()); if (null == license) { @@ -92,6 +94,10 @@ public class ClientConnectRecordService { return; } item.setUserName(user.getName()); + if (!isAdmin) { + // msg可能带有license等敏感信息，若登录者为游客，则不展示 + item.setMsg("******"); + } }); return page; } From 98ca2bed97d20c543a0c5aed863276814462d0bb Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Thu, 8 Dec 2022 14:41:00 +0800 Subject: [PATCH 20/31] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=89=B4=E6=9D=83token?= =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=E5=88=A4=E6=96=AD=20sqlite=E3=80=81?= =?UTF-8?q?mysql=E4=B8=8D=E5=85=BC=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java | 3 +-- .../fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java | 2 +- .../fun/asgc/neutrino/proxy/server/service/UserService.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java index 7906387b..73cb862f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/DBInitialize.java @@ -126,7 +126,6 @@ public class DBInitialize { () -> null == jdbcTemplate, DBInitialize.class, () -> { - Class.forName(dbConfig.getDriverClass()); if (DbTypeEnum.SQLITE == dbTypeEnum) { //建立一个数据库名data.db的连接，如果不存在就在当前目录下创建之 DriverManager.getConnection(dbConfig.getUrl()); @@ -138,7 +137,7 @@ public class DBInitialize { jdbcTemplate = new JdbcTemplate(dataSource); } else if (DbTypeEnum.MYSQL == dbTypeEnum) { DruidDataSource dataSource = new DruidDataSource(); - dataSource.setDriverClassName("com.mysql.jdbc.Driver"); + dataSource.setDriverClassName(dbConfig.getDriverClass()); dataSource.setUrl(dbConfig.getUrl()); dataSource.setInitialSize(5); dataSource.setMinIdle(5); diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java index c3673d80..eeae8fd2 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java @@ -56,7 +56,7 @@ public interface UserTokenMapper extends SqlMapper { * @return */ // @Select("select * from user_token where token = ? and expiration_time > ?") - UserTokenDO findByAvailableToken(String token, Long time); + UserTokenDO findByAvailableToken(String token, Date date); /** * 根据token删除记录 diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java index e45d08dd..4b8dbae5 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java @@ -115,7 +115,7 @@ public class UserService { public UserDO findByToken(String token) { Date now = new Date(); - UserTokenDO userTokenDO = userTokenMapper.findByAvailableToken(token, now.getTime()); + UserTokenDO userTokenDO = userTokenMapper.findByAvailableToken(token, now); if (null == userTokenDO) { return null; } From 461805e6522b59f359118b84f4009784a5f869a8 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Thu, 8 Dec 2022 14:45:51 +0800 Subject: [PATCH 21/31] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=85=E7=90=86?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1Job=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../neutrino/proxy/server/dal/DataCleanMapper.java | 14 ++++++++------ .../neutrino/proxy/server/job/DataCleanJob.java | 12 ++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java index 998ef2d2..70694712 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java @@ -26,6 +26,8 @@ import fun.asgc.neutrino.core.aop.Intercept; import fun.asgc.neutrino.core.db.annotation.Delete; import fun.asgc.neutrino.core.db.mapper.SqlMapper; +import java.util.Date; + /** * @author: aoshiguchen * @date: 2022/9/17 @@ -35,21 +37,21 @@ import fun.asgc.neutrino.core.db.mapper.SqlMapper; public interface DataCleanMapper extends SqlMapper { @Delete("delete from `job_log` where create_time < ?") - void cleanJobLog(long date); + void cleanJobLog(Date date); @Delete("delete from `user_login_record` where create_time < ?") - void cleanUserLoginRecord(long date); + void cleanUserLoginRecord(Date date); @Delete("delete from `client_connect_record` where create_time < ?") - void cleanClientConnectRecord(long date); + void cleanClientConnectRecord(Date date); @Delete("delete from `flow_report_minute` where create_time < ?") - void cleanFlowMinuteReport(long date); + void cleanFlowMinuteReport(Date date); @Delete("delete from `flow_report_hour` where create_time < ?") - void cleanFlowHourReport(long date); + void cleanFlowHourReport(Date date); @Delete("delete from `flow_report_day` where create_time < ?") - void cleanFlowDayReport(long date); + void cleanFlowDayReport(Date date); } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java index 6bcc2b22..44f43a0b 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java @@ -84,37 +84,37 @@ public class DataCleanJob implements IJobHandler { { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getJobLogKeepDays()); log.info("清理调度管理日志 date:{}", sdf.format(date)); - dataCleanMapper.cleanJobLog(date.getTime()); + dataCleanMapper.cleanJobLog(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getUserLoginRecordKeepDays()); log.info("清理用户登录日志 date:{}", sdf.format(date)); - dataCleanMapper.cleanUserLoginRecord(date.getTime()); + dataCleanMapper.cleanUserLoginRecord(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getClientConnectRecordKeepDays()); log.info("清理客户端连接日志 date:{}", sdf.format(date)); - dataCleanMapper.cleanClientConnectRecord(date.getTime()); + dataCleanMapper.cleanClientConnectRecord(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getFlowMinuteReportKeepDays()); log.info("清理流通统计分钟报表日志 date:{}", sdf.format(date)); - dataCleanMapper.cleanFlowMinuteReport(date.getTime()); + dataCleanMapper.cleanFlowMinuteReport(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getFlowHourReportKeepDays()); log.info("清理流通统计小时报表日志 date:{}", sdf.format(date)); - dataCleanMapper.cleanFlowHourReport(date.getTime()); + dataCleanMapper.cleanFlowHourReport(date); } { Date date = DateUtil.addDate(new Date(), Calendar.DATE, -1 * jobParams.getFlowDayReportKeepDays()); log.info("清理流通统计日报表日志 date:{}", sdf.format(date)); - dataCleanMapper.cleanFlowDayReport(date.getTime()); + dataCleanMapper.cleanFlowDayReport(date); } } From cfd079279fa5fdd0104d5b2c5e4815a63690be34 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Mon, 19 Dec 2022 10:18:59 +0800 Subject: [PATCH 22/31] =?UTF-8?q?license=E7=AE=A1=E7=90=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=87=8D=E7=BD=AEkey=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-admin/src/api/license.js | 10 ++++++++ neutrino-proxy-admin/src/lang/zh.js | 3 ++- .../src/views/proxy/license.vue | 25 ++++++++++++++++--- .../proxy/server/dal/LicenseMapper.java | 2 +- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/neutrino-proxy-admin/src/api/license.js b/neutrino-proxy-admin/src/api/license.js index 7069e9c6..d9aa0d90 100644 --- a/neutrino-proxy-admin/src/api/license.js +++ b/neutrino-proxy-admin/src/api/license.js @@ -51,3 +51,13 @@ export function deleteLicense(id) { } }) } + +export function resetLicense(id) { + return request({ + url: '/license/reset', + method: 'post', + params: { + id: id + } + }) +} diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js index 573807de..e021cbf8 100644 --- a/neutrino-proxy-admin/src/lang/zh.js +++ b/neutrino-proxy-admin/src/lang/zh.js @@ -146,7 +146,8 @@ export default { updatePwd: '修改密码', msg: '消息', outcome: '结果', - err: '异常信息' + err: '异常信息', + resetKey: '重置Key' }, button: { lookOver: '查看' diff --git a/neutrino-proxy-admin/src/views/proxy/license.vue b/neutrino-proxy-admin/src/views/proxy/license.vue index 64c0bb39..ab759ded 100644 --- a/neutrino-proxy-admin/src/views/proxy/license.vue +++ b/neutrino-proxy-admin/src/views/proxy/license.vue @@ -47,14 +47,14 @@ {{scope.row.isOnline | isOnlineName}} - + @@ -98,7 +98,7 @@