commit cd882d97789cf249cef05a4123d709e9487653c9 Author: yangpeng <3074487626@qq.com> Date: Tue Jul 23 15:18:51 2024 +0800 week1杨鹏7.23考试 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..3442324 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b31c82e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..b1e38cb --- /dev/null +++ b/pom.xml @@ -0,0 +1,129 @@ + + + 4.0.0 + + com.bwwei + week1ks7.23 + 1.0-SNAPSHOT + pom + + + yangpeng-auth + yangpeng-common + yangpeng-gateway + yangpeng-modules + + + + 8 + 8 + UTF-8 + 2021.1 + 2021.0.0 + 2.0.4 + 1.0-SNAPSHOT + 0.9.1 + 1.2.80 + 5.8.3 + 2.0.1 + 3.12.0 + 1.26.5 + 1.2.8 + 2.2.2 + 1.4.1 + + + + org.springframework.boot + spring-boot-parent + 2.6.2 + + + + + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + com.alibaba.nacos + nacos-client + ${alibaba-nacos.version} + + + + com.bwwei + yangpeng-common + 1.0-SNAPSHOT + + + + + io.jsonwebtoken + jjwt + ${jjwt.version} + + + + com.alibaba + fastjson + ${alibaba-fastjson.version} + + + + cn.hutool + hutool-all + ${hutool.version} + + + + com.aliyun + dysmsapi20170525 + ${alibaba-dysmsapi.version} + + + + com.aliyun.oss + aliyun-sdk-oss + ${alibaba-sdk.version} + + + com.github.tobato + fastdfs-client + ${taobao.version} + + + + com.alibaba + druid-spring-boot-starter + ${alibaba-drulid.version} + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis.version} + + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pageHelper.version} + + + + diff --git a/sql/7.23ks.sql b/sql/7.23ks.sql new file mode 100644 index 0000000..d169523 --- /dev/null +++ b/sql/7.23ks.sql @@ -0,0 +1,100 @@ +/* + Navicat Premium Dump SQL + + Source Server : 123.60.88.248 + Source Server Type : MySQL + Source Server Version : 50744 (5.7.44) + Source Host : 123.60.88.248:3306 + Source Schema : 7.23ks + + Target Server Type : MySQL + Target Server Version : 50744 (5.7.44) + File Encoding : 65001 + + Date: 23/07/2024 15:14:15 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for bicycle +-- ---------------------------- +DROP TABLE IF EXISTS `bicycle`; +CREATE TABLE `bicycle` ( + `bicycle_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '序号', + `bicycle_number` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '车辆编号', + `type_id` int(11) NULL DEFAULT NULL COMMENT '车辆类型', + `status_id` int(11) NULL DEFAULT NULL COMMENT '状态', + `user_id` int(11) NULL DEFAULT NULL COMMENT '用户姓名', + `bicycle_time` datetime NULL DEFAULT NULL COMMENT '开始用车时间', + `bicycle_driving` int(11) NULL DEFAULT NULL COMMENT '用车时长(分钟)', + `bicycle_traveldistance` int(11) NULL DEFAULT NULL COMMENT '行驶距离', + `bicycle_price` int(11) NULL DEFAULT NULL COMMENT '费用', + `bicycle_ridingstatus` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', + PRIMARY KEY (`bicycle_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of bicycle +-- ---------------------------- +INSERT INTO `bicycle` VALUES (1, 'HGb4322323', 1, 1, 1, '2222-02-02 00:00:00', 1, 1, 1, '已结束'); +INSERT INTO `bicycle` VALUES (2, 'SH64234232', 2, 2, 1, '2024-07-24 09:20:58', 23, 23, 40, '骑行中'); +INSERT INTO `bicycle` VALUES (3, 'SH64223578', 3, 1, 1, '2024-07-24 09:20:58', 23, 12, 30, '已结束'); +INSERT INTO `bicycle` VALUES (4, 'SH64287654', 4, 2, 2, '2024-07-24 09:20:58', 54, 34, 45, '已结束'); +INSERT INTO `bicycle` VALUES (5, 'SH64123455', 2, 1, 2, '2024-07-24 09:20:58', 24, 12, 30, '骑行中'); + +-- ---------------------------- +-- Table structure for status +-- ---------------------------- +DROP TABLE IF EXISTS `status`; +CREATE TABLE `status` ( + `status_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '状态唯一标识', + `status_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态名称', + PRIMARY KEY (`status_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of status +-- ---------------------------- +INSERT INTO `status` VALUES (1, '未出租'); +INSERT INTO `status` VALUES (2, '已出租'); + +-- ---------------------------- +-- Table structure for type +-- ---------------------------- +DROP TABLE IF EXISTS `type`; +CREATE TABLE `type` ( + `type_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '类型唯一标识', + `type_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '类型名称', + PRIMARY KEY (`type_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of type +-- ---------------------------- +INSERT INTO `type` VALUES (1, '入门公路车'); +INSERT INTO `type` VALUES (2, '入门山地车'); +INSERT INTO `type` VALUES (3, '基础公路车'); +INSERT INTO `type` VALUES (4, '基础山地车'); + +-- ---------------------------- +-- Table structure for user +-- ---------------------------- +DROP TABLE IF EXISTS `user`; +CREATE TABLE `user` ( + `user_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户编号', + `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户账号', + `user_pwd` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户密码', + `user_role` int(11) NULL DEFAULT NULL COMMENT '用户角色', + `user_tell` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户手机号', + PRIMARY KEY (`user_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of user +-- ---------------------------- +INSERT INTO `user` VALUES (1, 'root', '123', 1, '15505250208'); +INSERT INTO `user` VALUES (2, 'tom', '123', 2, '17582850208'); + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/src/App.vue b/src/App.vue new file mode 100644 index 0000000..ec9032c --- /dev/null +++ b/src/App.vue @@ -0,0 +1,11 @@ + + + diff --git a/src/api/good.js b/src/api/good.js new file mode 100644 index 0000000..5a4d34b --- /dev/null +++ b/src/api/good.js @@ -0,0 +1,16 @@ +import request from '@/utils/request' + +export function getList(data) { + return request({ + url: '/bicycle/bicycle/list', + method: 'post', + data + }) +} +export function updateStatic(data) { + return request({ + url: '/bicycle/bicycle/update', + method: 'post', + data + }) +} diff --git a/src/api/table.js b/src/api/table.js new file mode 100644 index 0000000..2752f52 --- /dev/null +++ b/src/api/table.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function getList(params) { + return request({ + url: '/vue-admin-template/table/list', + method: 'get', + params + }) +} diff --git a/src/api/user.js b/src/api/user.js new file mode 100644 index 0000000..6761af5 --- /dev/null +++ b/src/api/user.js @@ -0,0 +1,31 @@ +import request from '@/utils/request' + +export function login(data) { + return request({ + url: '/auth/auth/login', + method: 'post', + data + }) +} + +export function getCode(data) { + return request({ + url: '/auth/auth/userTell/'+data, + method: 'post', + }) +} + +export function getInfo(token) { + return request({ + url: '/auth/auth/info', + method: 'get', + params: { token } + }) +} + +export function logout() { + return request({ + url: '/vue-admin-template/user/logout', + method: 'post' + }) +} diff --git a/src/assets/404_images/404.png b/src/assets/404_images/404.png new file mode 100644 index 0000000..3d8e230 Binary files /dev/null and b/src/assets/404_images/404.png differ diff --git a/src/assets/404_images/404_cloud.png b/src/assets/404_images/404_cloud.png new file mode 100644 index 0000000..c6281d0 Binary files /dev/null and b/src/assets/404_images/404_cloud.png differ diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue new file mode 100644 index 0000000..29f9a04 --- /dev/null +++ b/src/components/Breadcrumb/index.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue new file mode 100644 index 0000000..368b002 --- /dev/null +++ b/src/components/Hamburger/index.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue new file mode 100644 index 0000000..b07ded2 --- /dev/null +++ b/src/components/SvgIcon/index.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/icons/index.js b/src/icons/index.js new file mode 100644 index 0000000..2c6b309 --- /dev/null +++ b/src/icons/index.js @@ -0,0 +1,9 @@ +import Vue from 'vue' +import SvgIcon from '@/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/src/icons/svg/dashboard.svg b/src/icons/svg/dashboard.svg new file mode 100644 index 0000000..5317d37 --- /dev/null +++ b/src/icons/svg/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/example.svg b/src/icons/svg/example.svg new file mode 100644 index 0000000..46f42b5 --- /dev/null +++ b/src/icons/svg/example.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/eye-open.svg b/src/icons/svg/eye-open.svg new file mode 100644 index 0000000..88dcc98 --- /dev/null +++ b/src/icons/svg/eye-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/eye.svg b/src/icons/svg/eye.svg new file mode 100644 index 0000000..16ed2d8 --- /dev/null +++ b/src/icons/svg/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/form.svg b/src/icons/svg/form.svg new file mode 100644 index 0000000..dcbaa18 --- /dev/null +++ b/src/icons/svg/form.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/link.svg b/src/icons/svg/link.svg new file mode 100644 index 0000000..48197ba --- /dev/null +++ b/src/icons/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/nested.svg b/src/icons/svg/nested.svg new file mode 100644 index 0000000..06713a8 --- /dev/null +++ b/src/icons/svg/nested.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/password.svg b/src/icons/svg/password.svg new file mode 100644 index 0000000..e291d85 --- /dev/null +++ b/src/icons/svg/password.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/table.svg b/src/icons/svg/table.svg new file mode 100644 index 0000000..0e3dc9d --- /dev/null +++ b/src/icons/svg/table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/tree.svg b/src/icons/svg/tree.svg new file mode 100644 index 0000000..dd4b7dd --- /dev/null +++ b/src/icons/svg/tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/user.svg b/src/icons/svg/user.svg new file mode 100644 index 0000000..0ba0716 --- /dev/null +++ b/src/icons/svg/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svgo.yml b/src/icons/svgo.yml new file mode 100644 index 0000000..d11906a --- /dev/null +++ b/src/icons/svgo.yml @@ -0,0 +1,22 @@ +# replace default config + +# multipass: true +# full: true + +plugins: + + # - name + # + # or: + # - name: false + # - name: true + # + # or: + # - name: + # param1: 1 + # param2: 2 + +- removeAttrs: + attrs: + - 'fill' + - 'fill-rule' diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue new file mode 100644 index 0000000..f6a3286 --- /dev/null +++ b/src/layout/components/AppMain.vue @@ -0,0 +1,40 @@ + + + + + + + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue new file mode 100644 index 0000000..0ca5cf6 --- /dev/null +++ b/src/layout/components/Navbar.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/src/layout/components/Sidebar/FixiOSBug.js b/src/layout/components/Sidebar/FixiOSBug.js new file mode 100644 index 0000000..bc14856 --- /dev/null +++ b/src/layout/components/Sidebar/FixiOSBug.js @@ -0,0 +1,26 @@ +export default { + computed: { + device() { + return this.$store.state.app.device + } + }, + mounted() { + // In order to fix the click on menu on the ios device will trigger the mouseleave bug + // https://github.com/PanJiaChen/vue-element-admin/issues/1135 + this.fixBugIniOS() + }, + methods: { + fixBugIniOS() { + const $subMenu = this.$refs.subMenu + if ($subMenu) { + const handleMouseleave = $subMenu.handleMouseleave + $subMenu.handleMouseleave = (e) => { + if (this.device === 'mobile') { + return + } + handleMouseleave(e) + } + } + } + } +} diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue new file mode 100644 index 0000000..aa1f5da --- /dev/null +++ b/src/layout/components/Sidebar/Item.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue new file mode 100644 index 0000000..530b3d5 --- /dev/null +++ b/src/layout/components/Sidebar/Link.vue @@ -0,0 +1,43 @@ + + + diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue new file mode 100644 index 0000000..040fab6 --- /dev/null +++ b/src/layout/components/Sidebar/Logo.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue new file mode 100644 index 0000000..a418c3d --- /dev/null +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -0,0 +1,95 @@ + + + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue new file mode 100644 index 0000000..da39034 --- /dev/null +++ b/src/layout/components/Sidebar/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/layout/components/index.js b/src/layout/components/index.js new file mode 100644 index 0000000..97ee3cd --- /dev/null +++ b/src/layout/components/index.js @@ -0,0 +1,3 @@ +export { default as Navbar } from './Navbar' +export { default as Sidebar } from './Sidebar' +export { default as AppMain } from './AppMain' diff --git a/src/layout/index.vue b/src/layout/index.vue new file mode 100644 index 0000000..db22a7b --- /dev/null +++ b/src/layout/index.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js new file mode 100644 index 0000000..e8d0df8 --- /dev/null +++ b/src/layout/mixin/ResizeHandler.js @@ -0,0 +1,45 @@ +import store from '@/store' + +const { body } = document +const WIDTH = 992 // refer to Bootstrap's responsive design + +export default { + watch: { + $route(route) { + if (this.device === 'mobile' && this.sidebar.opened) { + store.dispatch('app/closeSideBar', { withoutAnimation: false }) + } + } + }, + beforeMount() { + window.addEventListener('resize', this.$_resizeHandler) + }, + beforeDestroy() { + window.removeEventListener('resize', this.$_resizeHandler) + }, + mounted() { + const isMobile = this.$_isMobile() + if (isMobile) { + store.dispatch('app/toggleDevice', 'mobile') + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_isMobile() { + const rect = body.getBoundingClientRect() + return rect.width - 1 < WIDTH + }, + $_resizeHandler() { + if (!document.hidden) { + const isMobile = this.$_isMobile() + store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') + + if (isMobile) { + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + } + } + } +} diff --git a/src/main.js b/src/main.js new file mode 100644 index 0000000..01cba2f --- /dev/null +++ b/src/main.js @@ -0,0 +1,43 @@ +import Vue from 'vue' + +import 'normalize.css/normalize.css' // A modern alternative to CSS resets + +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' +import locale from 'element-ui/lib/locale/lang/en' // lang i18n + +import '@/styles/index.scss' // global css + +import App from './App' +import store from './store' +import router from './router' + +import '@/icons' // icon +import '@/permission' // permission control + +/** + * If you don't want to use mock-server + * you want to use MockJs for mock api + * you can execute: mockXHR() + * + * Currently MockJs will be used in the production environment, + * please remove it before going online ! ! ! + */ +if (process.env.NODE_ENV === 'production') { + const { mockXHR } = require('../mock') + mockXHR() +} + +// set ElementUI lang to EN +Vue.use(ElementUI, { locale }) +// 如果想要中文版 element-ui，按如下方式声明 +// Vue.use(ElementUI) + +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/src/router/index.js b/src/router/index.js new file mode 100644 index 0000000..7fb1b2b --- /dev/null +++ b/src/router/index.js @@ -0,0 +1,193 @@ +import Vue from 'vue' +import Router from 'vue-router' + +Vue.use(Router) + +/* Layout */ +import Layout from '@/layout' + +/** + * Note: sub-menu only appear when route children.length >= 1 + * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html + * + * hidden: true if set true, item will not show in the sidebar(default is false) + * alwaysShow: true if set true, will always show the root menu + * if not set alwaysShow, when item has more than one children route, + * it will becomes nested mode, otherwise not show the root menu + * redirect: noRedirect if set noRedirect will no redirect in the breadcrumb + * name:'router-name' the name is used by (must set!!!) + * meta : { + roles: ['admin','editor'] control the page roles (you can set multiple roles) + title: 'title' the name show in sidebar and breadcrumb (recommend set) + icon: 'svg-name'/'el-icon-x' the icon show in the sidebar + breadcrumb: false if set false, the item will hidden in breadcrumb(default is true) + activeMenu: '/example/list' if set path, the sidebar will highlight the path you set + } + */ + +/** + * constantRoutes + * a base page that does not have permission requirements + * all roles can be accessed + */ +export const constantRoutes = [ + { + path: '/login', + component: () => import('@/views/login/index'), + hidden: true + }, + + { + path: '/404', + component: () => import('@/views/404'), + hidden: true + }, + + { + path: '/', + component: Layout, + redirect: '/dashboard', + children: [{ + path: 'dashboard', + name: 'Dashboard', + component: () => import('@/views/dashboard/index'), + meta: { title: 'Dashboard', icon: 'dashboard' } + }] + }, + + { + path: '/example', + component: Layout, + redirect: '/example/table', + name: 'Example', + meta: { title: 'Example', icon: 'el-icon-s-help' }, + children: [ + { + path: 'table', + name: 'Table', + component: () => import('@/views/table/index'), + meta: { title: 'Table', icon: 'table' } + }, + { + path: 'tree', + name: 'Tree', + component: () => import('@/views/tree/index'), + meta: { title: 'Tree', icon: 'tree' } + } + ] + }, + + { + path: '/form', + component: Layout, + children: [ + { + path: 'index', + name: 'Form', + component: () => import('@/views/form/index'), + meta: { title: 'Form', icon: 'form' } + } + ] + }, + { + path: '/good', + component: Layout, + children: [ + { + path: 'index', + name: 'good', + component: () => import('@/views/good/index'), + meta: { title: '自行车', icon: 'form' } + } + ] + }, + + { + path: '/nested', + component: Layout, + redirect: '/nested/menu1', + name: 'Nested', + meta: { + title: 'Nested', + icon: 'nested' + }, + children: [ + { + path: 'menu1', + component: () => import('@/views/nested/menu1/index'), // Parent router-view + name: 'Menu1', + meta: { title: 'Menu1' }, + children: [ + { + path: 'menu1-1', + component: () => import('@/views/nested/menu1/menu1-1'), + name: 'Menu1-1', + meta: { title: 'Menu1-1' } + }, + { + path: 'menu1-2', + component: () => import('@/views/nested/menu1/menu1-2'), + name: 'Menu1-2', + meta: { title: 'Menu1-2' }, + children: [ + { + path: 'menu1-2-1', + component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'), + name: 'Menu1-2-1', + meta: { title: 'Menu1-2-1' } + }, + { + path: 'menu1-2-2', + component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'), + name: 'Menu1-2-2', + meta: { title: 'Menu1-2-2' } + } + ] + }, + { + path: 'menu1-3', + component: () => import('@/views/nested/menu1/menu1-3'), + name: 'Menu1-3', + meta: { title: 'Menu1-3' } + } + ] + }, + { + path: 'menu2', + component: () => import('@/views/nested/menu2/index'), + name: 'Menu2', + meta: { title: 'menu2' } + } + ] + }, + + { + path: 'external-link', + component: Layout, + children: [ + { + path: 'https://panjiachen.github.io/vue-element-admin-site/#/', + meta: { title: 'External Link', icon: 'link' } + } + ] + }, + + // 404 page must be placed at the end !!! + { path: '*', redirect: '/404', hidden: true } +] + +const createRouter = () => new Router({ + // mode: 'history', // require service support + scrollBehavior: () => ({ y: 0 }), + routes: constantRoutes +}) + +const router = createRouter() + +// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 +export function resetRouter() { + const newRouter = createRouter() + router.matcher = newRouter.matcher // reset router +} + +export default router diff --git a/src/store/getters.js b/src/store/getters.js new file mode 100644 index 0000000..5ab7b4c --- /dev/null +++ b/src/store/getters.js @@ -0,0 +1,8 @@ +const getters = { + sidebar: state => state.app.sidebar, + device: state => state.app.device, + token: state => state.user.token, + avatar: state => state.user.avatar, + name: state => state.user.name +} +export default getters diff --git a/src/store/index.js b/src/store/index.js new file mode 100644 index 0000000..6be466a --- /dev/null +++ b/src/store/index.js @@ -0,0 +1,19 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import getters from './getters' +import app from './modules/app' +import settings from './modules/settings' +import user from './modules/user' + +Vue.use(Vuex) + +const store = new Vuex.Store({ + modules: { + app, + settings, + user + }, + getters +}) + +export default store diff --git a/src/store/modules/app.js b/src/store/modules/app.js new file mode 100644 index 0000000..7ea7e33 --- /dev/null +++ b/src/store/modules/app.js @@ -0,0 +1,48 @@ +import Cookies from 'js-cookie' + +const state = { + sidebar: { + opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + withoutAnimation: false + }, + device: 'desktop' +} + +const mutations = { + TOGGLE_SIDEBAR: state => { + state.sidebar.opened = !state.sidebar.opened + state.sidebar.withoutAnimation = false + if (state.sidebar.opened) { + Cookies.set('sidebarStatus', 1) + } else { + Cookies.set('sidebarStatus', 0) + } + }, + CLOSE_SIDEBAR: (state, withoutAnimation) => { + Cookies.set('sidebarStatus', 0) + state.sidebar.opened = false + state.sidebar.withoutAnimation = withoutAnimation + }, + TOGGLE_DEVICE: (state, device) => { + state.device = device + } +} + +const actions = { + toggleSideBar({ commit }) { + commit('TOGGLE_SIDEBAR') + }, + closeSideBar({ commit }, { withoutAnimation }) { + commit('CLOSE_SIDEBAR', withoutAnimation) + }, + toggleDevice({ commit }, device) { + commit('TOGGLE_DEVICE', device) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js new file mode 100644 index 0000000..b3f33f8 --- /dev/null +++ b/src/store/modules/settings.js @@ -0,0 +1,32 @@ +import defaultSettings from '@/settings' + +const { showSettings, fixedHeader, sidebarLogo } = defaultSettings + +const state = { + showSettings: showSettings, + fixedHeader: fixedHeader, + sidebarLogo: sidebarLogo +} + +const mutations = { + CHANGE_SETTING: (state, { key, value }) => { + // eslint-disable-next-line no-prototype-builtins + if (state.hasOwnProperty(key)) { + state[key] = value + } + } +} + +const actions = { + changeSetting({ commit }, data) { + commit('CHANGE_SETTING', data) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/src/store/modules/user.js b/src/store/modules/user.js new file mode 100644 index 0000000..85e4f5e --- /dev/null +++ b/src/store/modules/user.js @@ -0,0 +1,97 @@ +import { login, logout, getInfo } from '@/api/user' +import { getToken, setToken, removeToken } from '@/utils/auth' +import { resetRouter } from '@/router' + +const getDefaultState = () => { + return { + token: getToken(), + name: '', + avatar: '' + } +} + +const state = getDefaultState() + +const mutations = { + RESET_STATE: (state) => { + Object.assign(state, getDefaultState()) + }, + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + } +} + +const actions = { + // user login + login({ commit }, userInfo) { + const { userTell, code } = userInfo + return new Promise((resolve, reject) => { + login({ userTell: userTell.trim(), code: code }).then(response => { + const { data } = response + commit('SET_TOKEN', data.token) + setToken(data.token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // get user info + getInfo({ commit, state }) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(response => { + const { data } = response + + if (!data) { + return reject('Verification failed, please Login again.') + } + + const { name, avatar } = data + + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + resolve(data) + }).catch(error => { + reject(error) + }) + }) + }, + + // user logout + logout({ commit, state }) { + return new Promise((resolve, reject) => { + logout(state.token).then(() => { + removeToken() // must remove token first + resetRouter() + commit('RESET_STATE') + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // remove token + resetToken({ commit }) { + return new Promise(resolve => { + removeToken() // must remove token first + commit('RESET_STATE') + resolve() + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss new file mode 100644 index 0000000..0062411 --- /dev/null +++ b/src/styles/element-ui.scss @@ -0,0 +1,49 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} + +// to fix el-date-picker css style +.el-range-separator { + box-sizing: content-box; +} diff --git a/src/styles/index.scss b/src/styles/index.scss new file mode 100644 index 0000000..3b4da51 --- /dev/null +++ b/src/styles/index.scss @@ -0,0 +1,65 @@ +@import './variables.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; + +body { + height: 100%; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +// main-container global css +.app-container { + padding: 20px; +} diff --git a/src/styles/mixin.scss b/src/styles/mixin.scss new file mode 100644 index 0000000..36b74bb --- /dev/null +++ b/src/styles/mixin.scss @@ -0,0 +1,28 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss new file mode 100644 index 0000000..94760cc --- /dev/null +++ b/src/styles/sidebar.scss @@ -0,0 +1,226 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + margin-left: $sideBarWidth; + position: relative; + } + + .sidebar-container { + transition: width 0.28s; + width: $sideBarWidth !important; + background-color: $menuBg; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + background-color: $menuHover !important; + } + } + + .is-active>.el-submenu__title { + color: $subMenuActiveText !important; + } + + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item { + min-width: $sideBarWidth !important; + background-color: $subMenuBg !important; + + &:hover { + background-color: $subMenuHover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + } + } + + .el-submenu { + overflow: hidden; + + &>.el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .sub-el-icon { + margin-left: 19px; + } + + .el-submenu__icon-arrow { + display: none; + } + } + } + + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + min-width: $sideBarWidth !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $sideBarWidth !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$sideBarWidth, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + .sub-el-icon { + margin-right: 12px; + margin-left: -2px; + } + } + + .nest-menu .el-submenu>.el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + background-color: $menuHover !important; + } + } + + // the scroll bar appears when the subMenu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/src/styles/transition.scss b/src/styles/transition.scss new file mode 100644 index 0000000..4cb27cc --- /dev/null +++ b/src/styles/transition.scss @@ -0,0 +1,48 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/src/styles/variables.scss b/src/styles/variables.scss new file mode 100644 index 0000000..be55772 --- /dev/null +++ b/src/styles/variables.scss @@ -0,0 +1,25 @@ +// sidebar +$menuText:#bfcbd9; +$menuActiveText:#409EFF; +$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 + +$menuBg:#304156; +$menuHover:#263445; + +$subMenuBg:#1f2d3d; +$subMenuHover:#001528; + +$sideBarWidth: 210px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuText: $menuText; + menuActiveText: $menuActiveText; + subMenuActiveText: $subMenuActiveText; + menuBg: $menuBg; + menuHover: $menuHover; + subMenuBg: $subMenuBg; + subMenuHover: $subMenuHover; + sideBarWidth: $sideBarWidth; +} diff --git a/src/utils/auth.js b/src/utils/auth.js new file mode 100644 index 0000000..059af18 --- /dev/null +++ b/src/utils/auth.js @@ -0,0 +1,15 @@ +import Cookies from 'js-cookie' + +const TokenKey = 'vue_admin_template_token' + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token) { + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js new file mode 100644 index 0000000..a6de99d --- /dev/null +++ b/src/utils/get-page-title.js @@ -0,0 +1,10 @@ +import defaultSettings from '@/settings' + +const title = defaultSettings.title || 'Vue Admin Template' + +export default function getPageTitle(pageTitle) { + if (pageTitle) { + return `${pageTitle} - ${title}` + } + return `${title}` +} diff --git a/src/utils/index.js b/src/utils/index.js new file mode 100644 index 0000000..4830c04 --- /dev/null +++ b/src/utils/index.js @@ -0,0 +1,117 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * Parse the time to string + * @param {(Object|string|number)} time + * @param {string} cFormat + * @returns {string | null} + */ +export function parseTime(time, cFormat) { + if (arguments.length === 0 || !time) { + return null + } + const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string')) { + if ((/^[0-9]+$/.test(time))) { + // support "1548221490638" + time = parseInt(time) + } else { + // support safari + // https://stackoverflow.com/questions/4310953/invalid-date-in-safari + time = time.replace(new RegExp(/-/gm), '/') + } + } + + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { + const value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } + return value.toString().padStart(2, '0') + }) + return time_str +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} diff --git a/src/utils/request.js b/src/utils/request.js new file mode 100644 index 0000000..608d615 --- /dev/null +++ b/src/utils/request.js @@ -0,0 +1,85 @@ +import axios from 'axios' +import { MessageBox, Message } from 'element-ui' +import store from '@/store' +import { getToken } from '@/utils/auth' + +// create an axios instance +const service = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url + // withCredentials: true, // send cookies when cross-domain requests + timeout: 50000 // request timeout +}) + +// request interceptor +service.interceptors.request.use( + config => { + // do something before request is sent + + if (store.getters.token) { + // let each request carry token + // ['X-Token'] is a custom headers key + // please modify it according to the actual situation + config.headers['token'] = getToken() + } + return config + }, + error => { + // do something with request error + console.log(error) // for debug + return Promise.reject(error) + } +) + +// response interceptor +service.interceptors.response.use( + /** + * If you want to get http information such as headers or status + * Please return response => response + */ + + /** + * Determine the request status by custom code + * Here is just an example + * You can also judge the status by HTTP Status Code + */ + response => { + const res = response.data + + // if the custom code is not 20000, it is judged as an error. + if (res.code !== 200) { + Message({ + message: res.msg || 'Error', + type: 'error', + duration: 5 * 1000 + }) + + // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; + if (res.code === 50008 || res.code === 50012 || res.code === 50014) { + // to re-login + MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { + confirmButtonText: 'Re-Login', + cancelButtonText: 'Cancel', + type: 'warning' + }).then(() => { + store.dispatch('user/resetToken').then(() => { + location.reload() + }) + }) + } + return Promise.reject(new Error(res.msg || 'Error')) + } else { + return res + } + }, + error => { + console.log('err' + error) // for debug + Message({ + message: error.msg, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + } +) + +export default service diff --git a/src/utils/validate.js b/src/utils/validate.js new file mode 100644 index 0000000..8d962ad --- /dev/null +++ b/src/utils/validate.js @@ -0,0 +1,20 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 +} diff --git a/src/views/404.vue b/src/views/404.vue new file mode 100644 index 0000000..1791f55 --- /dev/null +++ b/src/views/404.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue new file mode 100644 index 0000000..33e5ab6 --- /dev/null +++ b/src/views/dashboard/index.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/views/form/index.vue b/src/views/form/index.vue new file mode 100644 index 0000000..f4d66d3 --- /dev/null +++ b/src/views/form/index.vue @@ -0,0 +1,85 @@ + + + + + + diff --git a/src/views/good/index.vue b/src/views/good/index.vue new file mode 100644 index 0000000..453cef1 --- /dev/null +++ b/src/views/good/index.vue @@ -0,0 +1,295 @@ + + + + + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue new file mode 100644 index 0000000..a947934 --- /dev/null +++ b/src/views/login/index.vue @@ -0,0 +1,241 @@ + + + + + + + diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue new file mode 100644 index 0000000..30cb670 --- /dev/null +++ b/src/views/nested/menu1/index.vue @@ -0,0 +1,7 @@ + diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue new file mode 100644 index 0000000..27e173a --- /dev/null +++ b/src/views/nested/menu1/menu1-1/index.vue @@ -0,0 +1,7 @@ + diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue new file mode 100644 index 0000000..0c86276 --- /dev/null +++ b/src/views/nested/menu1/menu1-2/index.vue @@ -0,0 +1,7 @@ + diff --git a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue new file mode 100644 index 0000000..f87d88f --- /dev/null +++ b/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue new file mode 100644 index 0000000..d88789f --- /dev/null +++ b/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/views/nested/menu1/menu1-3/index.vue b/src/views/nested/menu1/menu1-3/index.vue new file mode 100644 index 0000000..f7cd073 --- /dev/null +++ b/src/views/nested/menu1/menu1-3/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/views/nested/menu2/index.vue b/src/views/nested/menu2/index.vue new file mode 100644 index 0000000..19dd48f --- /dev/null +++ b/src/views/nested/menu2/index.vue @@ -0,0 +1,5 @@ + diff --git a/src/views/table/index.vue b/src/views/table/index.vue new file mode 100644 index 0000000..a1ed847 --- /dev/null +++ b/src/views/table/index.vue @@ -0,0 +1,79 @@ + + + diff --git a/src/views/tree/index.vue b/src/views/tree/index.vue new file mode 100644 index 0000000..89c6b01 --- /dev/null +++ b/src/views/tree/index.vue @@ -0,0 +1,78 @@ + + + + diff --git a/yangpeng-auth/pom.xml b/yangpeng-auth/pom.xml new file mode 100644 index 0000000..ba10daa --- /dev/null +++ b/yangpeng-auth/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + com.bwwei + week1ks7.23 + 1.0-SNAPSHOT + + + yangpeng-auth + + + 8 + 8 + UTF-8 + + + + + com.bwwei + yangpeng-common + 1.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + + + + org.springframework.kafka + spring-kafka + + + diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/AuthApplication.java b/yangpeng-auth/src/main/java/com/bwie/auth/AuthApplication.java new file mode 100644 index 0000000..9b53f1b --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/AuthApplication.java @@ -0,0 +1,18 @@ +package com.bwie.auth; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @Classname AuthApplication + * @Description TODO + * @Created by 杨旭飞 + */ +@SpringBootApplication +@EnableFeignClients +public class AuthApplication { + public static void main(String[] args) { + SpringApplication.run(AuthApplication.class); + } +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/config/ConfirmCallbackConfig.java b/yangpeng-auth/src/main/java/com/bwie/auth/config/ConfirmCallbackConfig.java new file mode 100644 index 0000000..f686387 --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/config/ConfirmCallbackConfig.java @@ -0,0 +1,43 @@ +package com.bwie.auth.config; + +import org.springframework.amqp.rabbit.connection.CorrelationData; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +/** + * @ClassName: + * @Description: 消息发送到交换件确认的 回调 + */ +@Component +public class ConfirmCallbackConfig implements RabbitTemplate.ConfirmCallback { + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * bean 初始化方法 + */ + @PostConstruct + public void init() { + this.rabbitTemplate.setConfirmCallback(this); + } + + /** + * 消息发送到交换机 成功 或者 失败 都会执行 + * @param correlationData correlation data for the callback. + * @param ack true for ack, false for nack + * @param cause An optional cause, for nack, when available, otherwise null. + */ + @Override + public void confirm(CorrelationData correlationData, boolean ack, String cause) { + if (ack) { + System.out.println("消息发送到交换机成功..."); + } else { + System.out.println("消息发送到交换机失败，失败的原因：" + cause); + } + } + +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/config/RabbitAdminConfig.java b/yangpeng-auth/src/main/java/com/bwie/auth/config/RabbitAdminConfig.java new file mode 100644 index 0000000..d2abf6c --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/config/RabbitAdminConfig.java @@ -0,0 +1,53 @@ +package com.bwie.auth.config; + +import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; +import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * RabbitAdmin是RabbitMQ的一个Java客户端库，它提供了管理RabbitMQ资源的功能。它是通过与RabbitMQ服务器进行交互来执行管理操作的。 + */ +@Configuration +public class RabbitAdminConfig { + + @Value("${spring.rabbitmq.host}") + private String host; + @Value("${spring.rabbitmq.username}") + private String username; + @Value("${spring.rabbitmq.password}") + private String password; + @Value("${spring.rabbitmq.virtualhost}") + private String virtualhost; + + /** + * 构建 RabbitMQ的连接工厂 + * @return + */ + @Bean + public ConnectionFactory connectionFactory() { + CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); + connectionFactory.setAddresses(host); + connectionFactory.setUsername(username); + connectionFactory.setPassword(password); + connectionFactory.setVirtualHost(virtualhost); + // 配置发送确认回调时，次配置必须配置，否则即使在RabbitTemplate配置了ConfirmCallback也不会生效 + connectionFactory.setPublisherConfirmType(CachingConnectionFactory.ConfirmType.CORRELATED); + connectionFactory.setPublisherReturns(true); + return connectionFactory; + } + + /** + * 自己初始化 RabbitAdmin + * @param connectionFactory + * @return + */ + @Bean + public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { + RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory); + rabbitAdmin.setAutoStartup(true); + return rabbitAdmin; + } +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/consumer/LongSuccessConsumer.java b/yangpeng-auth/src/main/java/com/bwie/auth/consumer/LongSuccessConsumer.java new file mode 100644 index 0000000..d40906e --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/consumer/LongSuccessConsumer.java @@ -0,0 +1,56 @@ +package com.bwie.auth.consumer; + +import com.bwie.common.result.Result; +import com.rabbitmq.client.Channel; +import lombok.extern.log4j.Log4j2; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +/** + * @ClassName LongSuccessConsumer + * @Description 描述 + */ +@Component +@Log4j2 +public class LongSuccessConsumer { + @Autowired + private RedisTemplate redisTemplate; + + @RabbitListener(queuesToDeclare = @Queue(name = "longSuccess")) + public void longSuccessConsumer(Integer userId, Message message, Channel channel) { + String messageId = message.getMessageProperties().getMessageId(); + try { + //直接添加到redis 的set 集合中 + Long count = redisTemplate.opsForSet().add("登录成功", messageId); + if (count==1){ + log.info("接受到消息,消息内容为:{}",userId); + try{ + //TODO 记录成功日志 + //Result code = authService.getCode(userPhone); + log.info("记录成功日志"); + channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); + }catch (Exception e){ + e.printStackTrace(); + //执行消息重试方法 + log.info("执行失败"); +// redisTemplate.opsForValue().set(messageId,"messageId"); + } + } + //消息不重复 + }catch (Exception e){ + redisTemplate.opsForSet().remove("登录失败",messageId); + try { + channel.basicReject(message.getMessageProperties().getDeliveryTag(),true); + } catch (IOException ioException) { + throw new RuntimeException(ioException); + } + } + + } +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/controller/AuthController.java b/yangpeng-auth/src/main/java/com/bwie/auth/controller/AuthController.java new file mode 100644 index 0000000..a5e0d5e --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/controller/AuthController.java @@ -0,0 +1,38 @@ +package com.bwie.auth.controller; + +import com.bwie.auth.service.AuthService; +import com.bwie.common.domain.User; +import com.bwie.common.domain.request.UserRequest; +import com.bwie.common.domain.response.JwtResponse; +import com.bwie.common.result.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @Classname AuthController + * @Description TODO + * @Created by 杨旭飞 + * *http://localhost:9001/ + */ +@RestController +@RequestMapping("/auth") +public class AuthController { + @Autowired + private AuthService authService; + + @PostMapping("/userTell/{userTell}") + public Result getCode(@PathVariable("userTell") String userTell){ + return authService.getCode(userTell); + } + + @PostMapping("/login") + public Resultlogin(@RequestBody UserRequest userRequest){ + return authService.login(userRequest); + } + + @GetMapping("/info") + public Result info(){ + User info = authService.info(); + return Result.success(info); + } +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/feign/AuthFeign.java b/yangpeng-auth/src/main/java/com/bwie/auth/feign/AuthFeign.java new file mode 100644 index 0000000..8521bd4 --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/feign/AuthFeign.java @@ -0,0 +1,18 @@ +package com.bwie.auth.feign; + +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @Classname AuthFeign + * @Description TODO + * @Created by 杨旭飞 + */ +@FeignClient(value = "yangpeng-user",fallbackFactory = AuthFeignImpl.class) +public interface AuthFeign { + @PostMapping("/user/userTell/{userTell}") + public Result userTell(@PathVariable("userTell") String userTell); +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/feign/AuthFeignImpl.java b/yangpeng-auth/src/main/java/com/bwie/auth/feign/AuthFeignImpl.java new file mode 100644 index 0000000..ddfaeb9 --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/feign/AuthFeignImpl.java @@ -0,0 +1,23 @@ +package com.bwie.auth.feign; + +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import org.springframework.cloud.openfeign.FallbackFactory; + +/** + * @Classname AuthFeignImpl + * @Description TODO + * @Created by 杨鹏 + */ +//12:43 +public class AuthFeignImpl implements FallbackFactory { + @Override + public AuthFeign create(Throwable cause) { + return new AuthFeign() { + @Override + public Result userTell(String userTell) { + return Result.error("服务器繁忙，请重试"); + } + }; + } +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/service/AuthService.java b/yangpeng-auth/src/main/java/com/bwie/auth/service/AuthService.java new file mode 100644 index 0000000..405433e --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/service/AuthService.java @@ -0,0 +1,20 @@ +package com.bwie.auth.service; + +import com.bwie.common.domain.User; +import com.bwie.common.domain.request.UserRequest; +import com.bwie.common.domain.response.JwtResponse; +import com.bwie.common.result.Result; + +/** + * @Classname AuthService + * @Description TODO + * @Created by 杨旭飞 + */ +public interface AuthService { + + Result getCode(String userTell); + + Resultlogin(UserRequest userRequest); + + User info(); +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java b/yangpeng-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java new file mode 100644 index 0000000..25638db --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/service/impl/AuthServiceImpl.java @@ -0,0 +1,101 @@ +package com.bwie.auth.service.impl; + +import cn.hutool.core.util.RandomUtil; +import com.alibaba.fastjson.JSON; +import com.bwie.auth.feign.AuthFeign; +import com.bwie.auth.service.AuthService; +import com.bwie.common.constants.JwtConstants; +import com.bwie.common.constants.TokenConstants; +import com.bwie.common.domain.User; +import com.bwie.common.domain.request.UserRequest; +import com.bwie.common.domain.response.JwtResponse; +import com.bwie.common.result.Result; +import com.bwie.common.utils.JwtUtils; +import com.bwie.common.utils.TelSmsUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +/** + * @Classname AuthServiceImpl + * @Description TODO + * @Created by 杨旭飞 + */ +@Service +public class AuthServiceImpl implements AuthService { + + @Autowired + private AuthFeign authFeign; + + @Autowired + private StringRedisTemplate stringRedisTemplate; + + @Autowired + private HttpServletRequest httpServletRequest; + + @Override + public Result getCode(String userTell) { + Result result = authFeign.userTell(userTell); + User user = result.getData(); + if (user==null){ + return Result.error("账号错误！"); + } + String code = RandomUtil.randomNumbers(4); + HashMap map = new HashMap<>(); + map.put("code",code); + + stringRedisTemplate.opsForValue().set(userTell,code,30, TimeUnit.MINUTES); + + TelSmsUtils.sendSms(userTell,code,new HashMap(){{ + put("code",code); + }}); + System.out.println(code); + return Result.success(code); + } + + @Override + public Result login(UserRequest userRequest) { + Result result = authFeign.userTell(userRequest.getUserTell()); + User user = result.getData(); + if (user==null){ + return Result.error("账号错误！"); + } + if (!user.getUserTell().equals(user.getUserTell())){ + return Result.error("请先注册！"); + } + String code = stringRedisTemplate.opsForValue().get(userRequest.getUserTell()); + if (!code.equals(userRequest.getCode())){ + return Result.error("验证码错误！"); + } + String userKey = UUID.randomUUID().toString(); + HashMap map = new HashMap<>(); + map.put(JwtConstants.USER_KEY,userKey); + map.put(JwtConstants.DETAILS_USER_ID,user.getUserId()); + map.put(JwtConstants.DETAILS_USERNAME,user.getUserName()); + + String token = JwtUtils.createToken(map); + + stringRedisTemplate.opsForValue().set(TokenConstants.LOGIN_TOKEN_KEY+userKey, JSON.toJSONString(user),30,TimeUnit.MINUTES); + + JwtResponse jwtResponse = new JwtResponse(); + jwtResponse.setEtime("720MIN"); + jwtResponse.setToken(token); + + return Result.success(jwtResponse); + } + + @Override + public User info() { + String token = httpServletRequest.getHeader(TokenConstants.TOKEN); + String userKey = JwtUtils.getUserKey(token); + String StrJson = stringRedisTemplate.opsForValue().get(TokenConstants.LOGIN_TOKEN_KEY + userKey); + return JSON.parseObject(StrJson,User.class); + } + +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/utils/DLXQueue.java b/yangpeng-auth/src/main/java/com/bwie/auth/utils/DLXQueue.java new file mode 100644 index 0000000..d76e2c2 --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/utils/DLXQueue.java @@ -0,0 +1,77 @@ +package com.bwie.auth.utils; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.DirectExchange; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +@Component +public class DLXQueue { + // routingKey + private static final String DEAD_ROUTING_KEY = "dead.routingkey"; + private static final String ROUTING_KEY = "routingkey"; + private static final String DEAD_EXCHANGE = "dead.exchange"; + private static final String EXCHANGE = "common.exchange"; + @Autowired + RabbitTemplate rabbitTemplate; + @Resource + RabbitAdmin rabbitAdmin; + + /** + * 发送死信队列，过期后进入死信交换机，进入死信队列 + * + * @param queueName 队列名称 + * @param deadQueueName 死信队列名称 + * @param params 消息内容 + * @param expiration 过期时间 毫秒 + */ + public void sendDLXQueue(String queueName, String deadQueueName, Object params, Integer expiration) { + /** + * ----------------------------------先创建一个ttl队列和死信队列-------------------------------------------- + */ + Map map = new HashMap<>(); + // 队列设置存活时间，单位ms, 必须是整形数据。 + map.put("x-message-ttl", expiration); + // 设置死信交换机 + map.put("x-dead-letter-exchange", DEAD_EXCHANGE); + // 设置死信交换器路由 + map.put("x-dead-letter-routing-key", DEAD_ROUTING_KEY); + /*参数1：队列名称 参数2：持久化 参数3：是否排他 参数4：自动删除队列 参数5：队列参数*/ + Queue queue = new Queue(queueName, true, false, false, map); + rabbitAdmin.declareQueue(queue); + /** + * ---------------------------------创建交换机--------------------------------------------- + */ + DirectExchange directExchange = new DirectExchange(EXCHANGE, true, false); + rabbitAdmin.declareExchange(directExchange); + /** + * ---------------------------------队列绑定交换机--------------------------------------------- + */ + Binding binding = BindingBuilder.bind(queue).to(directExchange).with(ROUTING_KEY); + rabbitAdmin.declareBinding(binding); + /** + * ---------------------------------在创建一个死信交换机和队列，接收死信队列--------------------------------------------- + */ + DirectExchange deadExchange = new DirectExchange(DEAD_EXCHANGE, true, false); + rabbitAdmin.declareExchange(deadExchange); + + Queue deadQueue = new Queue(deadQueueName, true, false, false); + rabbitAdmin.declareQueue(deadQueue); + /** + * ---------------------------------队列绑定死信交换机--------------------------------------------- + */ + // 将队列和交换机绑定 + Binding deadbinding = BindingBuilder.bind(deadQueue).to(deadExchange).with(DEAD_ROUTING_KEY); + rabbitAdmin.declareBinding(deadbinding); + // 发送消息 + rabbitTemplate.convertAndSend(EXCHANGE, ROUTING_KEY, params); + } +} diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/utils/DelayedQueue.java b/yangpeng-auth/src/main/java/com/bwie/auth/utils/DelayedQueue.java new file mode 100644 index 0000000..0df9f49 --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/utils/DelayedQueue.java @@ -0,0 +1,79 @@ +package com.bwie.auth.utils; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.CustomExchange; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * 发送延迟队列的工具类 + */ +@Component +public class DelayedQueue { + + // routingKey + private static final String DELAYED_ROUTING_KEY = "delayed.routingkey"; + + // 延迟队列交换机 + private static final String DELAYED_EXCHANGE = "delayed.exchange"; + + @Autowired + RabbitTemplate rabbitTemplate; + + @Resource + RabbitAdmin rabbitAdmin; + + /** + * 发送延迟队列 + * + * @param queueName 队列名称 + * @param params 消息内容 + * @param expiration 延迟时间 毫秒 + */ + public void sendDelayedQueue(String queueName, Object params, Integer expiration) { + // 先创建一个队列 + Queue queue = new Queue(queueName); + rabbitAdmin.declareQueue(queue); + + // 创建延迟队列交换机 + CustomExchange customExchange = createCustomExchange(); + rabbitAdmin.declareExchange(customExchange); + + // 将队列和交换机绑定 + Binding binding = BindingBuilder.bind(queue).to(customExchange).with(DELAYED_ROUTING_KEY).noargs(); + rabbitAdmin.declareBinding(binding); + + // 发送延迟消息 + rabbitTemplate.convertAndSend(DELAYED_EXCHANGE, DELAYED_ROUTING_KEY, params, msg -> { + // 发送消息的时候 延迟时长 + msg.getMessageProperties().setMessageId(UUID.randomUUID().toString().replaceAll("-", "")); + msg.getMessageProperties().setDelay(expiration); + return msg; + }); + } + + private CustomExchange createCustomExchange() { + Map arguments = new HashMap<>(); + /** + * 参数说明： + * 1.交换机的名称 + * 2.交换机的类型 + * 3.是否需要持久化 + * 4.是否自动删除 + * 5.其它参数 + */ + arguments.put("x-delayed-type", "direct"); + return new CustomExchange(DELAYED_EXCHANGE, "x-delayed-message", true, false, arguments); + } + +} + diff --git a/yangpeng-auth/src/main/java/com/bwie/auth/utils/TtlQueue.java b/yangpeng-auth/src/main/java/com/bwie/auth/utils/TtlQueue.java new file mode 100644 index 0000000..51db22d --- /dev/null +++ b/yangpeng-auth/src/main/java/com/bwie/auth/utils/TtlQueue.java @@ -0,0 +1,66 @@ +package com.bwie.auth.utils; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.DirectExchange; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +/** + * 发送TTL队列 设置 消息的存活时间 如果超过了存活时间 + * 该条消息还没有被消费 则自动从队列中消息 ，如果配置了死信队列则消息会进入死信队列 + */ +@Component +public class TtlQueue { + // routingKey + private static final String TTL_KEY = "ttl.routingkey"; + private static final String TTL_EXCHANGE = "ttl.exchange"; + + @Autowired + RabbitTemplate rabbitTemplate; + + @Resource + RabbitAdmin rabbitAdmin; + + /** + * 发送TTL队列 + * + * @param queueName 队列名称 + * @param params 消息内容 + * @param expiration 过期时间 毫秒 + */ + public void sendTtlQueue(String queueName, Object params, Integer expiration) { + /** + * ----------------------------------先创建一个ttl队列-------------------------------------------- + */ + Map map = new HashMap<>(); + // 队列设置存活时间，单位ms,必须是整形数据。 + map.put("x-message-ttl", expiration); + /*参数1：队列名称 参数2：持久化 参数3：是否排他 参数4：自动删除队列 参数5：队列参数*/ + Queue queue = new Queue(queueName, true, false, false, map); + rabbitAdmin.declareQueue(queue); + + /** + * ---------------------------------创建交换机--------------------------------------------- + */ + DirectExchange directExchange = new DirectExchange(TTL_EXCHANGE, true, false); + rabbitAdmin.declareExchange(directExchange); + /** + * ---------------------------------队列绑定交换机--------------------------------------------- + */ + // 将队列和交换机绑定 + Binding binding = BindingBuilder.bind(queue).to(directExchange).with(TTL_KEY); + rabbitAdmin.declareBinding(binding); + + // 发送消息 + rabbitTemplate.convertAndSend(TTL_EXCHANGE, TTL_KEY, params); + } +} + diff --git a/yangpeng-auth/src/main/resources/bootstrap.yml b/yangpeng-auth/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..53b120b --- /dev/null +++ b/yangpeng-auth/src/main/resources/bootstrap.yml @@ -0,0 +1,115 @@ +# Tomcat +server: + port: 9001 +# Spring +spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: yangpeng-auth + kafka: + producer: + # Kafka服务器 + bootstrap-servers: 123.60.88.248:9092 + # 开启事务，必须在开启了事务的方法中发送，否则报错 + transaction-id-prefix: kafkaTx- + # 发生错误后，消息重发的次数，开启事务必须设置大于0。 + retries: 3 + # acks=0 ： 生产者在成功写入消息之前不会等待任何来自服务器的响应。 + # acks=1 ： 只要集群的首领节点收到消息，生产者就会收到一个来自服务器成功响应。 + # acks=all ：只有当所有参与复制的节点全部收到消息时，生产者才会收到一个来自服务器的成功响应。 + # 开启事务时，必须设置为all + acks: all + # 当有多个消息需要被发送到同一个分区时，生产者会把它们放在同一个批次里。该参数指定了一个批次可以使用的内存大小，按照字节数计算。 + batch-size: 16384 + # 生产者内存缓冲区的大小。 + buffer-memory: 1024000 + # 键的序列化方式 + key-serializer: org.springframework.kafka.support.serializer.JsonSerializer + # 值的序列化方式（建议使用Json，这种序列化方式可以无需额外配置传输实体类） + value-serializer: org.springframework.kafka.support.serializer.JsonSerializer + + consumer: + # Kafka服务器 + bootstrap-servers: 123.60.88.248:9092 + group-id: firstGroup + # 自动提交的时间间隔 在spring boot 2.X 版本中这里采用的是值的类型为Duration 需要符合特定的格式，如1S,1M,2H,5D + #auto-commit-interval: 2s + # 该属性指定了消费者在读取一个没有偏移量的分区或者偏移量无效的情况下该作何处理： + # earliest：当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，从头开始消费分区的记录 + # latest：当各分区下有已提交的offset时，从提交的offset开始消费；无提交的offset时，消费新产生的该分区下的数据（在消费者启动之后生成的记录） + # none：当各分区都存在已提交的offset时，从提交的offset开始消费；只要有一个分区不存在已提交的offset，则抛出异常 + auto-offset-reset: latest + # 是否自动提交偏移量，默认值是true，为了避免出现重复数据和数据丢失，可以把它设置为false，然后手动提交偏移量 + enable-auto-commit: false + # 键的反序列化方式 + #key-deserializer: org.apache.kafka.common.serialization.StringDeserializer + key-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer + # 值的反序列化方式（建议使用Json，这种序列化方式可以无需额外配置传输实体类） + value-deserializer: org.springframework.kafka.support.serializer.JsonDeserializer + # 配置消费者的 Json 反序列化的可信赖包，反序列化实体类需要 + properties: + spring: + json: + trusted: + packages: "*" + # 这个参数定义了poll方法最多可以拉取多少条消息，默认值为500。如果在拉取消息的时候新消息不足500条，那有多少返回多少；如果超过500条，每次只返回500。 + # 这个默认值在有些场景下太大，有些场景很难保证能够在5min内处理完500条消息， + # 如果消费者无法在5分钟内处理完500条消息的话就会触发reBalance, + # 然后这批消息会被分配到另一个消费者中，还是会处理不完，这样这批消息就永远也处理不完。 + # 要避免出现上述问题，提前评估好处理一条消息最长需要多少时间，然后覆盖默认的max.poll.records参数 + # 注：需要开启BatchListener批量监听才会生效，如果不开启BatchListener则不会出现reBalance情况 + max-poll-records: 3 + properties: + # 两次poll之间的最大间隔，默认值为5分钟。如果超过这个间隔会触发reBalance + max: + poll: + interval: + ms: 600000 + # 当broker多久没有收到consumer的心跳请求后就触发reBalance，默认值是10s + session: + timeout: + ms: 10000 + listener: + # 在侦听器容器中运行的线程数，一般设置为 机器数*分区数 + concurrency: 4 + # 自动提交关闭，需要设置手动消息确认 + ack-mode: manual_immediate + # 消费监听接口监听的主题不存在时，默认会报错，所以设置为false忽略错误 + missing-topics-fatal: false + # 两次poll之间的最大间隔，默认值为5分钟。如果超过这个间隔会触发reBalance + poll-timeout: 600000 + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 123.60.88.248:8848 + config: + # 配置中心地址 + server-addr: 123.60.88.248:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + rabbitmq: + username: user + password: yp122.8. + virtualHost: / + port: 5672 + host: 123.60.88.248 + listener: + simple: + prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) diff --git a/yangpeng-common/pom.xml b/yangpeng-common/pom.xml new file mode 100644 index 0000000..9e3c1ed --- /dev/null +++ b/yangpeng-common/pom.xml @@ -0,0 +1,128 @@ + + + 4.0.0 + + com.bwwei + week1ks7.23 + 1.0-SNAPSHOT + + + yangpeng-common + + + 8 + 8 + UTF-8 + + + + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + io.jsonwebtoken + jjwt + + + + com.alibaba + fastjson + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + org.springframework.boot + spring-boot-starter-validation + + + + org.apache.commons + commons-lang3 + + + + org.projectlombok + lombok + + + + cn.hutool + hutool-all + + + + com.aliyun + dysmsapi20170525 + + + + com.aliyun.oss + aliyun-sdk-oss + + + + org.springframework.boot + spring-boot-starter-amqp + + + + com.github.tobato + fastdfs-client + + + + io.springfox + springfox-boot-starter + 3.0.0 + + + + com.aliyun.oss + aliyun-sdk-oss + 3.16.3 + + + diff --git a/yangpeng-common/src/main/java/com/bwie/common/constants/Constants.java b/yangpeng-common/src/main/java/com/bwie/common/constants/Constants.java new file mode 100644 index 0000000..9b3a9ab --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/constants/Constants.java @@ -0,0 +1,18 @@ +package com.bwie.common.constants; + +/** + * @Description 系统常量 + * @Created by 杨鹏 + */ +public class Constants { + /** + * 成功标记 + */ + public static final Integer SUCCESS = 200; + public static final String SUCCESS_MSG = "操作成功"; + /** + * 失败标记 + */ + public static final Integer ERROR = 500; + public static final String ERROR_MSG = "操作异常"; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/constants/JwtConstants.java b/yangpeng-common/src/main/java/com/bwie/common/constants/JwtConstants.java new file mode 100644 index 0000000..2cf8e48 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/constants/JwtConstants.java @@ -0,0 +1,29 @@ +package com.bwie.common.constants; + +/** + * @Description Jwt常量 + * @Created by 杨鹏 + */ +public class JwtConstants { + + /** + * 用户ID字段 + */ + public static final String DETAILS_USER_ID = "user_id"; + + /** + * 用户名字段 + */ + public static final String DETAILS_USERNAME = "username"; + + /** + * 用户标识 + */ + public static final String USER_KEY = "user_key"; + + /** + * 令牌秘钥 + */ + public final static String SECRET = "abcdefghijklmnopqrstuvwxyz"; + +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/constants/QueueConstants.java b/yangpeng-common/src/main/java/com/bwie/common/constants/QueueConstants.java new file mode 100644 index 0000000..44666de --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/constants/QueueConstants.java @@ -0,0 +1,13 @@ +package com.bwie.common.constants; + +/** + * @Description TODO + * @Created by 杨鹏 + */ +public class QueueConstants { + + public static final String SEND_CODE_QUEUE = "send_code_queue"; + public static final String SEND_CODE_PREVENT_REPEAT_ID = "send_code_prevent_repeat_id:"; + public static final String BLOG_UPDATE_QUEUE = "blog_update_queue"; + public static final String BLOG_UPDATE_PREVENT_REPEAT_ID = "blog_update_prevent_repeat_id:"; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQConstants.java b/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQConstants.java new file mode 100644 index 0000000..b77e460 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQConstants.java @@ -0,0 +1,9 @@ +package com.bwie.common.constants; + +/** + * @Description TODO + * @Created by 杨鹏 + */ +public class RabbitMQConstants { + public static final String SEND_CODE="send_code"; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQOneConstants.java b/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQOneConstants.java new file mode 100644 index 0000000..5db6068 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQOneConstants.java @@ -0,0 +1,17 @@ +package com.bwie.common.constants; + +/** + * @Description 发送短消息队列名称 查看的日志队列名称 + * @Created by 杨鹏 + */ + + +public class RabbitMQOneConstants { + + //发送短消息队列名称 + public static final String SEND_SHORT_MESSAGE_QUEUE_NAME = "send_short_message"; + + //查看的日志队列名称 + public static final String QUERY_LOG_QUEUE_NAME = "query_log_message"; + +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQTwoConstants.java b/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQTwoConstants.java new file mode 100644 index 0000000..c0126ba --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/constants/RabbitMQTwoConstants.java @@ -0,0 +1,16 @@ +package com.bwie.common.constants; + +/** + * @Description 发送消息队列名称 添加消息队列名称日志 + * @Created by 杨鹏 + */ + +public class RabbitMQTwoConstants { + + //发送消息队列名称 + public static final String SEND_SMS_QUEUE = "send_sms_queue"; + + //添加消息队列名称日志 + public static final String ADD_MESSAGE_QUEUE_NAME_LOG = "add_message_log"; + +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/constants/TokenConstants.java b/yangpeng-common/src/main/java/com/bwie/common/constants/TokenConstants.java new file mode 100644 index 0000000..aa0445e --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/constants/TokenConstants.java @@ -0,0 +1,24 @@ +package com.bwie.common.constants; + +/** + * @Description 令牌常量 + * @Created by 杨鹏 + */ +public class TokenConstants { + /** + * 缓存有效期，默认720（分钟） + */ + public final static long EXPIRATION = 720; + /** + * 缓存刷新时间，默认120（分钟） + */ + public final static long REFRESH_TIME = 120; + /** + * 权限缓存前缀 + */ + public final static String LOGIN_TOKEN_KEY = "login_tokens:"; + /** + * token标识 + */ + public static final String TOKEN = "token"; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/Bicycle.java b/yangpeng-common/src/main/java/com/bwie/common/domain/Bicycle.java new file mode 100644 index 0000000..41f6e1e --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/Bicycle.java @@ -0,0 +1,70 @@ +package com.bwie.common.domain; + +import lombok.Data; + +/** + * @Classname Bicycle + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class Bicycle { + + private String userName; + /** + * 序号 + */ + private Integer bicycleId; + /** + * 车辆编号 + */ + private String bicycleNumber; + /** + * 车辆类型 + */ + private Integer typeId; + /** + * 状态 + */ + private Integer statusId; + /** + * 用户姓名 + */ + private Integer userId; + /** + * 开始用车时间 + */ + private String bicycleTime; + /** + * 用车时长(分钟) + */ + private Integer bicycleDriving; + /** + * 行驶距离 + */ + private Integer bicycleTraveldistance; + /** + * 费用 + */ + private Integer bicyclePrice; + /** + * 状态 + */ + private String bicycleRidingstatus; + /** + * 车辆类型 + */ + private String typeName; + /** + * 状态 + */ + private String statusName; + /** + * 分页 + */ + private Integer pageNum=1; + /** + * 分页 + */ + private Integer pageSize=5; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/Status.java b/yangpeng-common/src/main/java/com/bwie/common/domain/Status.java new file mode 100644 index 0000000..477cc75 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/Status.java @@ -0,0 +1,17 @@ +package com.bwie.common.domain; + +import lombok.Data; + +/** + * @Classname StatusRequest + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class Status { + private Integer statusId; + private String statusName; + + + +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/Type.java b/yangpeng-common/src/main/java/com/bwie/common/domain/Type.java new file mode 100644 index 0000000..76aecf9 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/Type.java @@ -0,0 +1,14 @@ +package com.bwie.common.domain; + +import lombok.Data; + +/** + * @Classname TypeRequest + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class Type { + private Integer typeId; + private String typeName; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/User.java b/yangpeng-common/src/main/java/com/bwie/common/domain/User.java new file mode 100644 index 0000000..ba7891f --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/User.java @@ -0,0 +1,18 @@ +package com.bwie.common.domain; + +import lombok.Data; + +/** + * @Classname User + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class User { + private Integer userId; + private String userName; + private String userPwd; + private Integer userRole; + private String userTell; + private String code; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/request/BicycleRequest.java b/yangpeng-common/src/main/java/com/bwie/common/domain/request/BicycleRequest.java new file mode 100644 index 0000000..07e3597 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/request/BicycleRequest.java @@ -0,0 +1,69 @@ +package com.bwie.common.domain.request; + +import lombok.Data; + +/** + * @Classname BicycleRequest + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class BicycleRequest { + private String userName; + /** + * 序号 + */ + private Integer bicycleId; + /** + * 车辆编号 + */ + private String bicycleNumber; + /** + * 车辆类型 + */ + private Integer typeId; + /** + * 状态 + */ + private Integer statusId; + /** + * 用户姓名 + */ + private Integer userId; + /** + * 开始用车时间 + */ + private String bicycleTime; + /** + * 用车时长(分钟) + */ + private Integer bicycleDriving; + /** + * 行驶距离 + */ + private Integer bicycleTraveldistance; + /** + * 费用 + */ + private Integer bicyclePrice; + /** + * 状态 + */ + private String bicycleRidingstatus; + /** + * 车辆类型 + */ + private String typeName; + /** + * 状态 + */ + private String statusName; + /** + * 分页 + */ + private Integer pageNum=1; + /** + * 分页 + */ + private Integer pageSize=5; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/request/StatusRequest.java b/yangpeng-common/src/main/java/com/bwie/common/domain/request/StatusRequest.java new file mode 100644 index 0000000..f8f7755 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/request/StatusRequest.java @@ -0,0 +1,17 @@ +package com.bwie.common.domain.request; + +import lombok.Data; + +/** + * @Classname StatusRequest + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class StatusRequest { + private Integer statusId; + private String statusName; + + + +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/request/TypeRequest.java b/yangpeng-common/src/main/java/com/bwie/common/domain/request/TypeRequest.java new file mode 100644 index 0000000..a58ca97 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/request/TypeRequest.java @@ -0,0 +1,14 @@ +package com.bwie.common.domain.request; + +import lombok.Data; + +/** + * @Classname TypeRequest + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class TypeRequest { + private Integer typeId; + private String typeName; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/request/UserRequest.java b/yangpeng-common/src/main/java/com/bwie/common/domain/request/UserRequest.java new file mode 100644 index 0000000..9551e3d --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/request/UserRequest.java @@ -0,0 +1,36 @@ +package com.bwie.common.domain.request; + +import lombok.Data; + +/** + * @Classname UserRequest + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class UserRequest { + /** + * 用户编号 + */ + private Integer userId; + /** + * 用户账号 + */ + private String userName; + /** + * 用户密码 + */ + private String userPwd; + /** + * 用户角色 + */ + private Integer userRole; + /** + * 用户手机号 + */ + private String userTell; + /** + * 验证码 + */ + private String code; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/response/BicycleResponse.java b/yangpeng-common/src/main/java/com/bwie/common/domain/response/BicycleResponse.java new file mode 100644 index 0000000..d9395aa --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/response/BicycleResponse.java @@ -0,0 +1,69 @@ +package com.bwie.common.domain.response; + +import lombok.Data; + +/** + * @Classname BicycleResponse + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class BicycleResponse { + private String userName; + /** + * 序号 + */ + private Integer bicycleId; + /** + * 车辆编号 + */ + private String bicycleNumber; + /** + * 车辆类型 + */ + private Integer typeId; + /** + * 状态 + */ + private Integer statusId; + /** + * 用户姓名 + */ + private Integer userId; + /** + * 开始用车时间 + */ + private String bicycleTime; + /** + * 用车时长(分钟) + */ + private Integer bicycleDriving; + /** + * 行驶距离 + */ + private Integer bicycleTraveldistance; + /** + * 费用 + */ + private Integer bicyclePrice; + /** + * 状态 + */ + private String bicycleRidingstatus; + /** + * 车辆类型 + */ + private String typeName; + /** + * 状态 + */ + private String statusName; + /** + * 分页 + */ + private Integer pageNum=1; + /** + * 分页 + */ + private Integer pageSize=5; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java b/yangpeng-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java new file mode 100644 index 0000000..a8cccbc --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/response/JwtResponse.java @@ -0,0 +1,15 @@ +package com.bwie.common.domain.response; + +import lombok.Data; + +/** + * @Classname JwtResponse + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class JwtResponse { + private String token; + private String etime; + +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/response/StatusResponse.java b/yangpeng-common/src/main/java/com/bwie/common/domain/response/StatusResponse.java new file mode 100644 index 0000000..195e461 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/response/StatusResponse.java @@ -0,0 +1,14 @@ +package com.bwie.common.domain.response; + +import lombok.Data; + +/** + * @Classname StatusRequest + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class StatusResponse { + private Integer statusId; + private String statusName; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/domain/response/TypeResponse.java b/yangpeng-common/src/main/java/com/bwie/common/domain/response/TypeResponse.java new file mode 100644 index 0000000..247d0fe --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/domain/response/TypeResponse.java @@ -0,0 +1,14 @@ +package com.bwie.common.domain.response; + +import lombok.Data; + +/** + * @Classname TypeRequest + * @Description TODO + * @Created by 杨鹏 + */ +@Data +public class TypeResponse { + private Integer typeId; + private String typeName; +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/result/PageResult.java b/yangpeng-common/src/main/java/com/bwie/common/result/PageResult.java new file mode 100644 index 0000000..148e782 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/result/PageResult.java @@ -0,0 +1,34 @@ +package com.bwie.common.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 列表返回结果集 + * @Created by 杨鹏 + */ +@Data +public class PageResult implements Serializable { + /** + * 总条数 + */ + private long total; + /** + * 结果集合 + */ + private List list; + public PageResult() { + } + public PageResult(long total, List list) { + this.total = total; + this.list = list; + } + public static PageResult toPageResult(long total, List list){ + return new PageResult(total , list); + } + public static Result> toResult(long total, List list){ + return Result.success(PageResult.toPageResult(total,list)); + } +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/result/Result.java b/yangpeng-common/src/main/java/com/bwie/common/result/Result.java new file mode 100644 index 0000000..9182988 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/result/Result.java @@ -0,0 +1,78 @@ +package com.bwie.common.result; + +import com.bwie.common.constants.Constants; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 响应信息主体 + * @Created by 杨鹏 + */ + + +@Data +public class Result implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 成功 + */ + public static final int SUCCESS = Constants.SUCCESS; + /** + * 失败 + */ + public static final int FAIL = Constants.ERROR; + /** + * 返回状态码 + */ + private int code; + /** + * 响应信息 + */ + private String msg; + /** + * 响应数据 + */ + private T data; + + public static Result success() { + return restResult(null, SUCCESS, Constants.SUCCESS_MSG); + } + + public static Result success(T data) { + return restResult(data, SUCCESS, Constants.SUCCESS_MSG); + } + + public static Result success(T data, String msg) { + return restResult(data, SUCCESS, msg); + } + + public static Result error() { + return restResult(null, FAIL, Constants.ERROR_MSG); + } + + public static Result error(String msg) { + return restResult(null, FAIL, msg); + } + + public static Result error(T data) { + return restResult(data, FAIL, Constants.ERROR_MSG); + } + + public static Result error(T data, String msg) { + return restResult(data, FAIL, msg); + } + + public static Result error(int code, String msg) { + return restResult(null, code, msg); + } + + private static Result restResult(T data, int code, String msg) { + Result apiResult = new Result<>(); + apiResult.setCode(code); + apiResult.setData(data); + apiResult.setMsg(msg); + return apiResult; + } +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/utils/IpUtils.java b/yangpeng-common/src/main/java/com/bwie/common/utils/IpUtils.java new file mode 100644 index 0000000..1a77a4f --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/utils/IpUtils.java @@ -0,0 +1,311 @@ +package com.bwie.common.utils; + +import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; +import java.net.UnknownHostException; +/** + * 获取IP方法 + * @Description ruoyi + * @Created by 杨鹏 + */ +public class IpUtils { + public final static String REGX_0_255 = "(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)"; + // 匹配 ip + public final static String REGX_IP = "((" + REGX_0_255 + "\\.){3}" + REGX_0_255 + ")"; + public final static String REGX_IP_WILDCARD = "(((\\*\\.){3}\\*)|(" + REGX_0_255 + "(\\.\\*){3})|(" + REGX_0_255 + "\\." + REGX_0_255 + ")(\\.\\*){2}" + "|((" + REGX_0_255 + "\\.){3}\\*))"; + // 匹配网段 + public final static String REGX_IP_SEG = "(" + REGX_IP + "\\-" + REGX_IP + ")"; + + /** + * 获取客户端IP + * + * @param request 请求对象 + * @return IP地址 + */ + public static String getIpAddr(HttpServletRequest request) { + if (request == null) { + return "unknown"; + } + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("X-Forwarded-For"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("X-Real-IP"); + } + + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + } + + return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip); + } + + /** + * 检查是否为内部IP地址 + * + * @param ip IP地址 + * @return 结果 + */ + public static boolean internalIp(String ip) { + byte[] addr = textToNumericFormatV4(ip); + return internalIp(addr) || "127.0.0.1".equals(ip); + } + + /** + * 检查是否为内部IP地址 + * + * @param addr byte地址 + * @return 结果 + */ + private static boolean internalIp(byte[] addr) { + if (StringUtils.isNull(addr) || addr.length < 2) { + return true; + } + final byte b0 = addr[0]; + final byte b1 = addr[1]; + // 10.x.x.x/8 + final byte SECTION_1 = 0x0A; + // 172.16.x.x/12 + final byte SECTION_2 = (byte) 0xAC; + final byte SECTION_3 = (byte) 0x10; + final byte SECTION_4 = (byte) 0x1F; + // 192.168.x.x/16 + final byte SECTION_5 = (byte) 0xC0; + final byte SECTION_6 = (byte) 0xA8; + switch (b0) { + case SECTION_1: + return true; + case SECTION_2: + if (b1 >= SECTION_3 && b1 <= SECTION_4) { + return true; + } + case SECTION_5: + switch (b1) { + case SECTION_6: + return true; + } + default: + return false; + } + } + + /** + * 将IPv4地址转换成字节 + * + * @param text IPv4地址 + * @return byte 字节 + */ + public static byte[] textToNumericFormatV4(String text) { + if (text.length() == 0) { + return null; + } + + byte[] bytes = new byte[4]; + String[] elements = text.split("\\.", -1); + try { + long l; + int i; + switch (elements.length) { + case 1: + l = Long.parseLong(elements[0]); + if ((l < 0L) || (l > 4294967295L)) { + return null; + } + bytes[0] = (byte) (int) (l >> 24 & 0xFF); + bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF); + bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 2: + l = Integer.parseInt(elements[0]); + if ((l < 0L) || (l > 255L)) { + return null; + } + bytes[0] = (byte) (int) (l & 0xFF); + l = Integer.parseInt(elements[1]); + if ((l < 0L) || (l > 16777215L)) { + return null; + } + bytes[1] = (byte) (int) (l >> 16 & 0xFF); + bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 3: + for (i = 0; i < 2; ++i) { + l = Integer.parseInt(elements[i]); + if ((l < 0L) || (l > 255L)) { + return null; + } + bytes[i] = (byte) (int) (l & 0xFF); + } + l = Integer.parseInt(elements[2]); + if ((l < 0L) || (l > 65535L)) { + return null; + } + bytes[2] = (byte) (int) (l >> 8 & 0xFF); + bytes[3] = (byte) (int) (l & 0xFF); + break; + case 4: + for (i = 0; i < 4; ++i) { + l = Integer.parseInt(elements[i]); + if ((l < 0L) || (l > 255L)) { + return null; + } + bytes[i] = (byte) (int) (l & 0xFF); + } + break; + default: + return null; + } + } catch (NumberFormatException e) { + return null; + } + return bytes; + } + + /** + * 获取IP地址 + * + * @return 本地IP地址 + */ + public static String getHostIp() { + try { + return InetAddress.getLocalHost().getHostAddress(); + } catch (UnknownHostException e) { + } + return "127.0.0.1"; + } + + /** + * 获取主机名 + * + * @return 本地主机名 + */ + public static String getHostName() { + try { + return InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + } + return "未知"; + } + + /** + * 从多级反向代理中获得第一个非unknown IP地址 + * + * @param ip 获得的IP地址 + * @return 第一个非unknown IP地址 + */ + public static String getMultistageReverseProxyIp(String ip) { + // 多级反向代理检测 + if (ip != null && ip.indexOf(",") > 0) { + final String[] ips = ip.trim().split(","); + for (String subIp : ips) { + if (false == isUnknown(subIp)) { + ip = subIp; + break; + } + } + } + return StringUtils.substring(ip, 0, 255); + } + + /** + * 检测给定字符串是否为未知，多用于检测HTTP请求相关 + * + * @param checkString 被检测的字符串 + * @return 是否未知 + */ + public static boolean isUnknown(String checkString) { + return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString); + } + + /** + * 是否为IP + */ + public static boolean isIP(String ip) { + return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP); + } + + /** + * 是否为IP，或 *为间隔的通配符地址 + */ + public static boolean isIpWildCard(String ip) { + return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP_WILDCARD); + } + + /** + * 检测参数是否在ip通配符里 + */ + public static boolean ipIsInWildCardNoCheck(String ipWildCard, String ip) { + String[] s1 = ipWildCard.split("\\."); + String[] s2 = ip.split("\\."); + boolean isMatchedSeg = true; + for (int i = 0; i < s1.length && !s1[i].equals("*"); i++) { + if (!s1[i].equals(s2[i])) { + isMatchedSeg = false; + break; + } + } + return isMatchedSeg; + } + + /** + * 是否为特定格式如:“10.10.10.1-10.10.10.99”的ip段字符串 + */ + public static boolean isIPSegment(String ipSeg) { + return StringUtils.isNotBlank(ipSeg) && ipSeg.matches(REGX_IP_SEG); + } + + /** + * 判断ip是否在指定网段中 + */ + public static boolean ipIsInNetNoCheck(String iparea, String ip) { + int idx = iparea.indexOf('-'); + String[] sips = iparea.substring(0, idx).split("\\."); + String[] sipe = iparea.substring(idx + 1).split("\\."); + String[] sipt = ip.split("\\."); + long ips = 0L, ipe = 0L, ipt = 0L; + for (int i = 0; i < 4; ++i) { + ips = ips << 8 | Integer.parseInt(sips[i]); + ipe = ipe << 8 | Integer.parseInt(sipe[i]); + ipt = ipt << 8 | Integer.parseInt(sipt[i]); + } + if (ips > ipe) { + long t = ips; + ips = ipe; + ipe = t; + } + return ips <= ipt && ipt <= ipe; + } + + /** + * 校验ip是否符合过滤串规则 + * + * @param filter 过滤IP列表,支持后缀'*'通配,支持网段如:`10.10.10.1-10.10.10.99` + * @param ip 校验IP地址 + * @return boolean 结果 + */ + public static boolean isMatchedIp(String filter, String ip) { + if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip)) { + return false; + } + String[] ips = filter.split(";"); + for (String iStr : ips) { + if (isIP(iStr) && iStr.equals(ip)) { + return true; + } else if (isIpWildCard(iStr) && ipIsInWildCardNoCheck(iStr, ip)) { + return true; + } else if (isIPSegment(iStr) && ipIsInNetNoCheck(iStr, ip)) { + return true; + } + } + return false; + } +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/utils/JwtUtils.java b/yangpeng-common/src/main/java/com/bwie/common/utils/JwtUtils.java new file mode 100644 index 0000000..0512c83 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/utils/JwtUtils.java @@ -0,0 +1,109 @@ +package com.bwie.common.utils; + +import com.bwie.common.constants.JwtConstants; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; + +import java.util.Map; + +/** + * @Description Jwt工具类 + * @Created by 杨鹏 + */ +public class JwtUtils { + + /** + * 秘钥 + */ + public static String secret = JwtConstants.SECRET; + + /** + * 从数据声明生成令牌 + * + * @param claims 数据声明 + * @return 令牌 + */ + public static String createToken(Map 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, JwtConstants.USER_KEY); + } + /** + * 根据令牌获取用户标识 + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getUserKey(Claims claims){ + return getValue(claims, JwtConstants.USER_KEY); + } + /** + * 根据令牌获取用户ID + * + * @param token 令牌 + * @return 用户ID + */ + public static String getUserId(String token){ + Claims claims = parseToken(token); + return getValue(claims, JwtConstants.DETAILS_USER_ID); + } + /** + * 根据身份信息获取用户ID + * + * @param claims 身份信息 + * @return 用户ID + */ + public static String getUserId(Claims claims){ + return getValue(claims, JwtConstants.DETAILS_USER_ID); + } + /** + * 根据令牌获取用户名 + * + * @param token 令牌 + * @return 用户名 + */ + public static String getUserName(String token){ + Claims claims = parseToken(token); + return getValue(claims, JwtConstants.DETAILS_USERNAME); + } + /** + * 根据身份信息获取用户名 + * + * @param claims 身份信息 + * @return 用户名 + */ + public static String getUserName(Claims claims){ + return getValue(claims, JwtConstants.DETAILS_USERNAME); + } + /** + * 根据身份信息获取键值 + * + * @param claims 身份信息 + * @param key 键 + * @return 值 + */ + public static String getValue(Claims claims, String key){ + Object obj = claims.get(key); + return obj == null ? "" : obj.toString(); + } +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/utils/StringUtils.java b/yangpeng-common/src/main/java/com/bwie/common/utils/StringUtils.java new file mode 100644 index 0000000..b090406 --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/utils/StringUtils.java @@ -0,0 +1,68 @@ +package com.bwie.common.utils; + +import org.springframework.util.AntPathMatcher; + +import java.util.Collection; +import java.util.List; + +/** + * @Description TODO + * @Created by 杨鹏 + */ +public class StringUtils extends org.apache.commons.lang3.StringUtils { + + /** + * * 判断一个对象是否为空 + * + * @param object Object + * @return true：为空 false：非空 + */ + public static boolean isNull(Object object) { + return object == null; + } + + /** + * * 判断一个Collection是否为空， 包含List，Set，Queue + * + * @param coll 要判断的Collection + * @return true：为空 false：非空 + */ + public static boolean isEmpty(Collection coll) { + return isNull(coll) || coll.isEmpty(); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) { + if (isEmpty(str) || isEmpty(strs)) { + return false; + } + for (String pattern : strs) { + if (isMatch(pattern, str)) + { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串，不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + * @return + */ + public static boolean isMatch(String pattern, String url) { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } +} diff --git a/yangpeng-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java b/yangpeng-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java new file mode 100644 index 0000000..661939b --- /dev/null +++ b/yangpeng-common/src/main/java/com/bwie/common/utils/TelSmsUtils.java @@ -0,0 +1,89 @@ +package com.bwie.common.utils; + +import com.alibaba.fastjson.JSONObject; +import com.aliyun.dysmsapi20170525.Client; +import com.aliyun.dysmsapi20170525.models.SendSmsRequest; +import com.aliyun.dysmsapi20170525.models.SendSmsResponse; +import com.aliyun.teaopenapi.models.Config; +import lombok.extern.log4j.Log4j2; + +import java.util.Map; + +/** + * @Description 短信工具类 + * @Created by 杨鹏 + */ +@Log4j2 +public class TelSmsUtils { + + /** + * 阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限 + */ + private static String accessKeyId = "LTAI5tQWdAodc1EJ1doShoW4"; + private static String accessKeySecret = "9MbfDBJ3Efqc6iN5yPFX0zq3ZErsII"; + private static String templateCode = "SMS0001"; + + /** + * 短信访问域名 + */ + private static String endpoint = "dysmsapi.aliyuncs.com"; + /** + * 短信签名 + */ + private static String signName = "登录验证"; + + /** + * 实例化短信对象 + */ + private static Client client; + + static { + log.info("初始化短信服务开始"); + long startTime = System.currentTimeMillis(); + try { + client = initClient(); + log.info("初始化短信成功：{}",signName); + } catch (Exception e) { + e.printStackTrace(); + } + log.info("初始化短信服务结束：耗时：{}MS",(System.currentTimeMillis()-startTime)); + } + /** + * 初始化短信对象 + * @return + * @throws Exception + */ + private static Client initClient() throws Exception{ + Config config = new Config() + // 您的AccessKey ID + .setAccessKeyId(accessKeyId) + // 您的AccessKey Secret + .setAccessKeySecret(accessKeySecret); + // 访问的域名 + config.endpoint = endpoint; + return new Client(config); + } + + /** + * 发送单条短信 + * @param tel + * @param templateCode SMS_153991546 + * @param sendDataMap + */ + public static String sendSms(String tel, String templateCode,Map sendDataMap){ + SendSmsRequest sendSmsRequest = new SendSmsRequest() + .setPhoneNumbers(tel) + .setSignName(signName) + .setTemplateCode(templateCode) + .setTemplateParam(JSONObject.toJSONString(sendDataMap)); + SendSmsResponse sendSmsResponse = null; + try { + log.info("发送短信验证码：消息内容是：【{}】", JSONObject.toJSONString(sendDataMap)); + sendSmsResponse = client.sendSms(sendSmsRequest); + } catch (Exception e) { + log.error("短信发送异常，手机号：【{}】，短信内容：【{}】，异常信息：【{}】", tel, sendDataMap, e); + } + return JSONObject.toJSONString(sendSmsResponse.getBody()); + } + +} diff --git a/yangpeng-gateway/pom.xml b/yangpeng-gateway/pom.xml new file mode 100644 index 0000000..95c8e6c --- /dev/null +++ b/yangpeng-gateway/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + com.bwwei + week1ks7.23 + 1.0-SNAPSHOT + + + yangpeng-gateway + + + 8 + 8 + UTF-8 + + + + + com.bwwei + yangpeng-common + 1.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + com.alibaba.cloud + spring-cloud-alibaba-sentinel-gateway + + + + com.alibaba.csp + sentinel-spring-cloud-gateway-adapter + + + diff --git a/yangpeng-gateway/src/main/java/com/bwie/GatewayApplication.java b/yangpeng-gateway/src/main/java/com/bwie/GatewayApplication.java new file mode 100644 index 0000000..81d7f83 --- /dev/null +++ b/yangpeng-gateway/src/main/java/com/bwie/GatewayApplication.java @@ -0,0 +1,18 @@ +package com.bwie; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @Classname GatewayApplication + * @Description TODO + * @Created by 杨鹏 + */ +@SpringBootApplication +@EnableFeignClients +public class GatewayApplication { + public static void main(String[] args) { + SpringApplication.run(GatewayApplication.class); + } +} diff --git a/yangpeng-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java b/yangpeng-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java new file mode 100644 index 0000000..b240016 --- /dev/null +++ b/yangpeng-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java @@ -0,0 +1,32 @@ +package com.bwie.gateway.config; + +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.extern.log4j.Log4j2; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description 放行白名单配置 + * @Created by 杨鹏 + */ +@Configuration +@RefreshScope +@ConfigurationProperties(prefix = "ignore") +@Data +@Log4j2 +public class IgnoreWhiteConfig { + /** + * 放行白名单配置，网关不校验此处的白名单 + */ + private List whites = new ArrayList<>(); + + public void setWhites(List whites) { + log.info("加载网关路径白名单:{}", JSONObject.toJSONString(whites)); + this.whites = whites; + } +} diff --git a/yangpeng-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java b/yangpeng-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java new file mode 100644 index 0000000..a22796b --- /dev/null +++ b/yangpeng-gateway/src/main/java/com/bwie/gateway/filters/AuthFilter.java @@ -0,0 +1,83 @@ +package com.bwie.gateway.filters; + +import com.bwie.common.constants.TokenConstants; +import com.bwie.common.utils.JwtUtils; +import com.bwie.common.utils.StringUtils; +import com.bwie.gateway.config.IgnoreWhiteConfig; +import com.bwie.gateway.utils.GatewayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +import java.util.List; + +/** + * @Description 鉴权过滤器 + * @Created by 杨鹏 + */ +@Component +public class AuthFilter implements GlobalFilter, Ordered { + + @Autowired + private IgnoreWhiteConfig ignoreWhiteConfig; + + @Autowired + private RedisTemplate redisTemplate; + + /** + * 过滤方法 验证 token + * @param exchange 请求的上下文 通过这个参数 可以获取到 请求对象 以及 响应对象 + * @param chain 网关过滤器链 chain 放行 或者 拦截 + * @return Mono + */ + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + // 验证当前的请求 是否需要拦截 【配置白名单请求 不拦截的请求 】 将白名单请求配置到配置文件中 + // 获取系统白名单请求 + List whites = ignoreWhiteConfig.getWhites(); + // 获取当前的请求 URI + ServerHttpRequest request = exchange.getRequest(); + String path = request.getURI().getPath(); + boolean matches = StringUtils.matches(path, whites); + if (matches) { // 放行 + return chain.filter(exchange); + } + // 获取token + String token = request.getHeaders().getFirst(TokenConstants.TOKEN); + // token 非空验证 + if (StringUtils.isEmpty(token)) { + // 不放行 提示错误信息 + return GatewayUtils.errorResponse(exchange, "token不能为空！", HttpStatus.UNAUTHORIZED); + } + try { + // token 合法性性 + JwtUtils.parseToken(token); + } catch (Exception ex) { + return GatewayUtils.errorResponse(exchange, "token格式错误！"); + } + // token 是否过期 + // 获取 UserKey + String userKey = JwtUtils.getUserKey(token); + if (!redisTemplate.hasKey(TokenConstants.LOGIN_TOKEN_KEY + userKey)) { + return GatewayUtils.errorResponse(exchange, "token过期！"); + } + // 放行 + return chain.filter(exchange); + } + + /** + * 当存在多个filter的时候 用来执行执行的优先级 + * @return 数字 数字的值越小 执行的优先级越高 + */ + @Override + public int getOrder() { + return 0; + } +} diff --git a/yangpeng-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java b/yangpeng-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java new file mode 100644 index 0000000..bfe90e7 --- /dev/null +++ b/yangpeng-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java @@ -0,0 +1,99 @@ +package com.bwie.gateway.utils; + +import com.alibaba.fastjson.JSONObject; +import com.bwie.common.result.Result; +import com.bwie.common.utils.StringUtils; +import lombok.extern.log4j.Log4j2; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + + +/** + * @Description 网关处理工具类 + * @Created by 杨鹏 + */ +@Log4j2 +public class GatewayUtils { + /** + * 添加请求头参数 + * @param mutate 修改对象 + * @param key 键 + * @param value 值 + */ + public static void addHeader(ServerHttpRequest.Builder mutate, String key, Object value) { + if (StringUtils.isEmpty(key)){ + log.warn("添加请求头参数键不可以为空"); + return; + } + if (value == null) { + log.warn("添加请求头参数：[{}]值为空",key); + return; + } + String valueStr = value.toString(); + mutate.header(key, valueStr); + log.info("添加请求头参数成功 - 键:[{}] , 值:[{}]", key , value); + } + + /** + * 删除请求头参数 + * @param mutate 修改对象 + * @param key 键 + */ + public static void removeHeader(ServerHttpRequest.Builder mutate, String key) { + if (StringUtils.isEmpty(key)){ + log.warn("删除请求头参数键不可以为空"); + return; + } + mutate.headers(httpHeaders -> httpHeaders.remove(key)).build(); + log.info("删除请求头参数 - 键:[{}]",key); + } + + /** + * 错误结果响应 + * @param exchange 响应上下文 + * @param msg 响应消息 + * @return + */ + public static Mono errorResponse(ServerWebExchange exchange, String msg, HttpStatus httpStatus) { + ServerHttpResponse response = exchange.getResponse(); + //设置HTTP响应头状态 + response.setStatusCode(httpStatus); + //设置HTTP响应头文本格式 + response.getHeaders().add(HttpHeaders.CONTENT_TYPE, "application/json"); + //定义响应内容 + Result result = Result.error(msg); + String resultJson = JSONObject.toJSONString(result); + log.error("[鉴权异常处理]请求路径:[{}]，异常信息：[{}]，响应结果：[{}]", exchange.getRequest().getPath(), msg, resultJson); + DataBuffer dataBuffer = response.bufferFactory().wrap(resultJson.getBytes()); + //进行响应 + return response.writeWith(Mono.just(dataBuffer)); + } + + /** + * 错误结果响应 + * @param exchange 响应上下文 + * @param msg 响应消息 + * @return + */ + public static Mono errorResponse(ServerWebExchange exchange, String msg) { + ServerHttpResponse response = exchange.getResponse(); + //设置HTTP响应头状态 + response.setStatusCode(HttpStatus.OK); + //设置HTTP响应头文本格式 + response.getHeaders().add(HttpHeaders.CONTENT_TYPE, "application/json"); + //定义响应内容 + Result result = Result.error(msg); + String resultJson = JSONObject.toJSONString(result); + log.error("[鉴权异常处理]请求路径:[{}]，异常信息：[{}]，响应结果：[{}]", exchange.getRequest().getPath(), msg, resultJson); + DataBuffer dataBuffer = response.bufferFactory().wrap(resultJson.getBytes()); + //进行响应 + return response.writeWith(Mono.just(dataBuffer)); + } + + +} diff --git a/yangpeng-gateway/src/main/resources/bootstrap.yml b/yangpeng-gateway/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..07915da --- /dev/null +++ b/yangpeng-gateway/src/main/resources/bootstrap.yml @@ -0,0 +1,30 @@ +# Tomcat +server: + port: 18080 +# Spring +spring: + application: + # 应用名称 + name: yangpeng-gateway + profiles: + # 环境配置 + active: dev + main: + # 允许使用循环引用 + allow-circular-references: true + # 允许定义相同的bean对象 去覆盖原有的 + allow-bean-definition-overriding: true + web-application-type: reactive + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 123.60.88.248:8848 + config: + # 配置中心地址 + server-addr: 123.60.88.248:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/yangpeng-modules/pom.xml b/yangpeng-modules/pom.xml new file mode 100644 index 0000000..1961578 --- /dev/null +++ b/yangpeng-modules/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + com.bwwei + week1ks7.23 + 1.0-SNAPSHOT + + + + + yangpeng-modules + pom + + yangpeng-bicycle + yangpeng-type + yangpeng-status + yangpeng-user + yangpeng-rabbitmq + yangpeng-es + + + + 8 + 8 + UTF-8 + + + diff --git a/yangpeng-modules/yangpeng-bicycle/pom.xml b/yangpeng-modules/yangpeng-bicycle/pom.xml new file mode 100644 index 0000000..186a520 --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + com.bwwei + yangpeng-modules + 1.0-SNAPSHOT + + + yangpeng-bicycle + + + 8 + 8 + UTF-8 + + + + + com.bwwei + yangpeng-common + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba + druid-spring-boot-starter + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.github.tobato + fastdfs-client + + + + io.springfox + springfox-boot-starter + 3.0.0 + + + diff --git a/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/BicycleApplication.java b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/BicycleApplication.java new file mode 100644 index 0000000..73b34a7 --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/BicycleApplication.java @@ -0,0 +1,18 @@ +package com.bwie.bicycle; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @Classname BicycleApplication + * @Description + * @Created by 杨鹏 + */ +@SpringBootApplication +@EnableFeignClients +public class BicycleApplication { + public static void main(String[] args) { + SpringApplication.run(BicycleApplication.class); + } +} diff --git a/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/controller/BicycleController.java b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/controller/BicycleController.java new file mode 100644 index 0000000..27015a8 --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/controller/BicycleController.java @@ -0,0 +1,52 @@ +package com.bwie.bicycle.controller; + +import com.bwie.bicycle.service.BicycleService; +import com.bwie.common.domain.Bicycle; +import com.bwie.common.result.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Classname Bicycle + * @Description TODO + * @Created by 杨鹏 + */ + +@RestController +@RequestMapping("/bicycle") +public class BicycleController { + @Autowired + private BicycleService bicycleService; + + @PostMapping("/list") + public Result>list(){ + List list = bicycleService.list(); + return Result.success(list); + } + + @PostMapping("/add") + public Result add(@RequestBody Bicycle bicycle){ + Integer add = bicycleService.add(bicycle); + return Result.success(add); + } + + @PostMapping("/update") + public Result update(@RequestBody Bicycle bicycle){ + Integer update = bicycleService.update(bicycle); + return Result.success(update); + } + + @PostMapping("/delete/{bicycleId}") + public Result delete(@PathVariable("bicycleId") Integer bicycleId){ + Integer delete = bicycleService.delete(bicycleId); + return Result.success(delete); + } + + @PostMapping("/findById/{bicycleId}") + public Bicycle findById(@PathVariable("bicycleId") Integer bicycleId){ + Bicycle findById = bicycleService.findById(bicycleId); + return findById; + } +} diff --git a/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/mapper/BicycleMapper.java b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/mapper/BicycleMapper.java new file mode 100644 index 0000000..eb1bc34 --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/mapper/BicycleMapper.java @@ -0,0 +1,27 @@ +package com.bwie.bicycle.mapper; + +import com.bwie.common.domain.Bicycle; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Classname BicycleMapper + * @Description TODO + * @Created by 杨鹏 + */ +@Mapper +public interface BicycleMapper { + Integer add(Bicycle bicycle); + + Integer update(Bicycle bicycle); + + Integer delete(Integer bicycleId); + + Bicycle findById(Integer bicycleId); + + List list(); + + + Integer updateStatic(Bicycle bicycle); +} diff --git a/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/service/BicycleService.java b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/service/BicycleService.java new file mode 100644 index 0000000..422458f --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/service/BicycleService.java @@ -0,0 +1,22 @@ +package com.bwie.bicycle.service; + +import com.bwie.common.domain.Bicycle; + +import java.util.List; + +/** + * @Classname BicycleService + * @Description TODO + * @Created by 杨鹏 + */ +public interface BicycleService { + + Integer add(Bicycle bicycle); + Integer update(Bicycle bicycle); + Integer delete(Integer bicycleId); + Bicycle findById(Integer bicycleId); + + Integer updateStatic(Bicycle bicycle); + + Listlist(); +} diff --git a/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/service/impl/BicycleServiceImpl.java b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/service/impl/BicycleServiceImpl.java new file mode 100644 index 0000000..bcf0faf --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/service/impl/BicycleServiceImpl.java @@ -0,0 +1,67 @@ +package com.bwie.bicycle.service.impl; + +import com.bwie.bicycle.mapper.BicycleMapper; +import com.bwie.bicycle.service.BicycleService; +import com.bwie.common.domain.Bicycle; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Classname BicycleServiceImpl + * @Description TODO + * @Created by 杨鹏 + */ +@Service +public class BicycleServiceImpl implements BicycleService { + + @Autowired + private BicycleMapper bicycleMapper; + + + @Override + public Integer add(Bicycle bicycle) { + return bicycleMapper.add(bicycle); + } + + @Override + public Integer update(Bicycle bicycle) { + return bicycleMapper.update(bicycle); + } + + @Override + public Integer delete(Integer bicycleId) { + return bicycleMapper.delete(bicycleId); + } + + @Override + public Bicycle findById(Integer bicycleId) { + Bicycle findById=bicycleMapper.findById(bicycleId); + return findById; + } + + @Override + public Integer updateStatic(Bicycle bicycle) { + return bicycleMapper.updateStatic(bicycle); + } + + @Override + public List list() { + return bicycleMapper.list(); + } + + public void compute(Bicycle bicycle){ + ArrayList list = new ArrayList<>(); + + Integer PriceCount=0; +// 费用计算公式：（车型公里单价）×公里数+0.1×用车时间（单位分钟） +// ，车型公里单价（入门山地每公里1元，入门公路车每公里1.2元，专业山地车每公里1.3元，专业公路车每公里1.6元） +// if (PriceCount=Integer.valueOf(bicycle.getBicycleTraveldistance()+0.1*bicycle.getBicycleDriving())){ +// System.out.println("消费为："+PriceCount); +// } + + + } +} diff --git a/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/utils/OssUtil.java b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/utils/OssUtil.java new file mode 100644 index 0000000..7aa5e6c --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/src/main/java/com/bwie/bicycle/utils/OssUtil.java @@ -0,0 +1,163 @@ +package com.bwie.shop.utils; + +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.model.GetObjectRequest; +import com.aliyun.oss.model.PutObjectRequest; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.multipart.MultipartFile; + +import java.io.*; +import java.time.LocalDateTime; +import java.util.UUID; + +/** + * @Classname + * @Description Oss工具 + * @Created by 杨鹏 + */ +@Log4j2 +public class OssUtil { + + /** + * Endpoint 存储对象概述 阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限 访问路径前缀 存储对象概述 + */ + private static String endPoint = "oss-cn-shanghai.aliyuncs.com"; + private static String accessKeyId = "LTAI5tDbRqXkC5i3SMrCSDcX"; + private static String accessKeySecret = "XUzMZoHPLsjNLafHsdQnMElBWZATsu"; + private static String accessPre = "https://mall-bw.oss-cn-shanghai.aliyuncs.com/"; + + /** + * bucket名称 + * + * @return + */ + private static String bucketName = "mall-bw"; + + private static OSS ossClient; + + static { + ossClient = new OSSClientBuilder().build( + endPoint, + accessKeyId, + accessKeySecret); + log.info("oss服务连接成功！"); + } + + /** + * 默认路径上传本地文件 + * + * @param filePath + */ + public static String uploadFile(String filePath) { + return uploadFileForBucket(bucketName, getOssFilePath(filePath), filePath); + } + + /** + * 默认路径上传multipartFile文件 + * + * @param multipartFile + */ + public static String uploadMultipartFile(MultipartFile multipartFile) { + return uploadMultipartFile(bucketName, getOssFilePath(multipartFile.getOriginalFilename()), multipartFile); + } + + /** + * 上传 multipartFile 类型文件 + * + * @param bucketName + * @param ossPath + * @param multipartFile + */ + public static String uploadMultipartFile(String bucketName, String ossPath, MultipartFile multipartFile) { + InputStream inputStream = null; + try { + inputStream = multipartFile.getInputStream(); + } catch (IOException e) { + e.printStackTrace(); + } + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre + ossPath; + } + + /** + * 使用File上传PutObject上传文件 ** 程序默认使用次方法上传 + * + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileForBucket(String bucketName, String ossPath, String filePath) { + // 创建PutObjectRequest对象。 + PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath, new File(filePath)); + // 上传 + ossClient.putObject(putObjectRequest); + return accessPre + ossPath; + } + + /** + * 使用文件流上传到指定的bucket实例 + * + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileInputStreamForBucket(String bucketName, String ossPath, String filePath) { + + // 填写本地文件的完整路径。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件流。 + InputStream inputStream = null; + try { + inputStream = new FileInputStream(filePath); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + // 填写Bucket名称和Object完整路径。Object完整路径中不能包含Bucket名称。 + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre + ossPath; + } + + public static void uploadFileInputStreamForBucket(String bucketName, String ossPath, InputStream inputStream) { + ossClient.putObject(bucketName, ossPath, inputStream); + } + + /** + * 下载 + * + * @param ossFilePath + * @param filePath + */ + public static void downloadFile(String ossFilePath, String filePath) { + downloadFileForBucket(bucketName, ossFilePath, filePath); + } + + /** + * 下载 + * + * @param bucketName 实例名称 + * @param ossFilePath oss存储路径 + * @param filePath 本地文件路径 + */ + public static void downloadFileForBucket(String bucketName, String ossFilePath, String filePath) { + ossClient.getObject(new GetObjectRequest(bucketName, ossFilePath), new File(filePath)); + } + + /** + * @return + */ + public static String getOssDefaultPath() { + LocalDateTime now = LocalDateTime.now(); + String url = + now.getYear() + "/" + + now.getMonth() + "/" + + now.getDayOfMonth() + "/" + + now.getHour() + "/" + + now.getMinute() + "/"; + return url; + } + + public static String getOssFilePath(String filePath) { + String fileSuf = filePath.substring(filePath.indexOf(".") + 1); + return getOssDefaultPath() + UUID.randomUUID().toString() + "." + fileSuf; + } + +} diff --git a/yangpeng-modules/yangpeng-bicycle/src/main/resources/bootstrap.yml b/yangpeng-modules/yangpeng-bicycle/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..5caaa82 --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/src/main/resources/bootstrap.yml @@ -0,0 +1,50 @@ +# Tomcat +server: + port: 9125 +# Spring +spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: yangpeng-bicycle + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 123.60.88.248:8848 + config: + # 配置中心地址 + server-addr: 123.60.88.248:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - yangpeng-auth-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-mysql-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - yangpeng-shop-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +fdfs: + so-timeout: 1500 # socket 连接时长 + connect-timeout: 600 # 连接 tracker 服务器超时时长 + # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流 + tracker-list: 123.60.88.248:22122 + web-server-url: 123.60.88.248:8888 + pool: + jmx-enabled: false + # 生成缩略图 + thumb-image: + height: 500 + width: 500 +mybatis: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + diff --git a/yangpeng-modules/yangpeng-bicycle/src/main/resources/mappers/ShopMapper.xml b/yangpeng-modules/yangpeng-bicycle/src/main/resources/mappers/ShopMapper.xml new file mode 100644 index 0000000..34fc9b9 --- /dev/null +++ b/yangpeng-modules/yangpeng-bicycle/src/main/resources/mappers/ShopMapper.xml @@ -0,0 +1,62 @@ + + + + + + + INSERT INTO `7.23ks`.`bicycle` (`bicycle_number`, `type_id`, `status_id`, `user_id`, + `bicycle_time`, `bicycle_driving`, `bicycle_traveldistance`, `bicycle_price`, + `bicycle_ridingstatus`) + VALUES (#{bicycleNumber}, #{typeId}, #{statusId}, #{userId}, #{bicycleTime}, #{bicycleDriving}, + #{bicycleTraveldistance}, #{bicyclePrice}, #{bicycleRidingstatus}); + + + + UPDATE `7.23ks`.`bicycle` + SET `bicycle_number` = #{bicycleNumber}, + `type_id` = #{typeId}, + `status_id` = #{statusId}, + `user_id` = #{userId}, + `bicycle_time` = #{bicycleTime}, + `bicycle_driving` = #{bicycleDriving}, + `bicycle_traveldistance` = #{bicycleTraveldistance}, + `bicycle_price` = #{bicyclePrice}, + `bicycle_ridingstatus` = #{bicycleRidingstatus} + WHERE `bicycle_id` = #{bicycleId} + + + + UPDATE `7.23ks`.`bicycle` + SET `bicycle_ridingstatus` = "已结束" + WHERE `bicycle_id` = #{bicycleId} + + + + delete + from bicycle + where bicycle_id = #{bicycleId} + + + + + + diff --git a/yangpeng-modules/yangpeng-es/.gitignore b/yangpeng-modules/yangpeng-es/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/yangpeng-modules/yangpeng-es/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/yangpeng-modules/yangpeng-es/pom.xml b/yangpeng-modules/yangpeng-es/pom.xml new file mode 100644 index 0000000..7625cff --- /dev/null +++ b/yangpeng-modules/yangpeng-es/pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + + com.bwwei + yangpeng-modules + 1.0-SNAPSHOT + + + yangpeng-es + + + 8 + 8 + UTF-8 + + + + + + com.bwwei + yangpeng-common + + + + org.springframework.boot + spring-boot-starter-web + + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + + com.alibaba + druid-spring-boot-starter + + + + diff --git a/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/ESApplication.java b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/ESApplication.java new file mode 100644 index 0000000..5c20d3c --- /dev/null +++ b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/ESApplication.java @@ -0,0 +1,18 @@ +package com.bwie.es; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; +/** + * @Classname ShopESApplication + * @Description TODO + * @Created by 杨鹏 + */ + +@SpringBootApplication +@EnableScheduling +public class ESApplication { + public static void main(String[] args) { + SpringApplication.run(ESApplication.class); + } +} diff --git a/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/config/InitEsRes.java b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/config/InitEsRes.java new file mode 100644 index 0000000..217cb38 --- /dev/null +++ b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/config/InitEsRes.java @@ -0,0 +1,47 @@ +package com.bwie.es.config; + +import lombok.Data; +import org.apache.http.HttpHost; +import org.elasticsearch.client.RestClient; +import org.elasticsearch.client.RestClientBuilder; +import org.elasticsearch.client.RestHighLevelClient; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +/** + * @Classname + * @Description TODO + * @Created by 杨鹏 + */ +@Configuration +@ConfigurationProperties(prefix = "es") +@Data +public class InitEsRes { + + /**InitEsRes + * es服务 地址 + */ + private String host; + + /** + * 端口 + */ + private int port; + + /** + * 请求方式 + */ + private String scheme; + + /** + * 构建 RestHighLevelClient 用来做 es 操作 + * @return + */ + @Bean + public RestHighLevelClient restHighLevelClient() { + return new RestHighLevelClient( + RestClient.builder(new HttpHost(host, port, scheme)) + ); + } + +} diff --git a/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/controller/EsController.java b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/controller/EsController.java new file mode 100644 index 0000000..d28973a --- /dev/null +++ b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/controller/EsController.java @@ -0,0 +1,58 @@ +package com.bwie.es.controller; + +import com.bwie.common.domain.Bicycle; +import com.bwie.common.result.Result; +import com.bwie.es.service.EsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Classname EsController + * @Description TODO + * @Created by 杨鹏 + */ +@RestController +@RequestMapping("/es") +public class EsController { + + @Autowired + private EsService esService; + + @PostMapping("/add") + public Result add(@RequestBody Bicycle bicycle){ + return esService.add(bicycle); + } + + @PostMapping("/update") + public Result update(@RequestBody Bicycle bicycle){ + return esService.update(bicycle); + } + + @PostMapping("/delete/{bicycleId}") + public Result delete(@PathVariable("bicycleId") Integer bicycleId){ + return esService.delete(bicycleId); + } + + @PostMapping("/select/{bicycleId}") + public Result select(@PathVariable("bicycleId") Integer bicycleId){ + return esService.select(bicycleId); + } + + @PostMapping("/blackAdd") + public Result blackAdd(@RequestBody Listbicycles){ + return esService.blackAdd(bicycles); + } + + @PostMapping("/blackDelete") + public Result blackDelete(@RequestBody ListbicyclesId){ + return esService.blackDelete(bicyclesId); + } + + @PostMapping("/search") + public Result search(@RequestBody Bicycle bicycle){ + return esService.search(bicycle); + } + +} diff --git a/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/mapper/EsMapper.java b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/mapper/EsMapper.java new file mode 100644 index 0000000..3d5a075 --- /dev/null +++ b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/mapper/EsMapper.java @@ -0,0 +1,16 @@ +package com.bwie.es.mapper; + +import com.bwie.common.domain.Bicycle; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Classname EsMapper + * @Description TODO + * @Created by 杨鹏 + */ +@Mapper +public interface EsMapper { + ListBicycleListData(); +} diff --git a/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/service/EsService.java b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/service/EsService.java new file mode 100644 index 0000000..a15f742 --- /dev/null +++ b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/service/EsService.java @@ -0,0 +1,24 @@ +package com.bwie.es.service; + +import com.bwie.common.domain.Bicycle; +import com.bwie.common.result.Result; + +import java.util.List; + +/** + * @Classname EsService + * @Description TODO + * @Created by 杨鹏 + */ +public interface EsService { + + Result add(Bicycle bicycle); + Result update(Bicycle bicycle); + Result delete(Integer bicycleId); + Result select(Integer bicycleId); + Result blackAdd(Listbicycles); + Result blackDelete(ListbicyclesId); + Result search(Bicycle bicycle); + + +} diff --git a/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/service/impl/EsServiceImpl.java b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/service/impl/EsServiceImpl.java new file mode 100644 index 0000000..dfe193c --- /dev/null +++ b/yangpeng-modules/yangpeng-es/src/main/java/com/bwie/es/service/impl/EsServiceImpl.java @@ -0,0 +1,225 @@ +package com.bwie.es.service.impl; + +import com.alibaba.fastjson.JSON; +import com.bwie.common.domain.Bicycle; +import com.bwie.common.result.PageResult; +import com.bwie.common.result.Result; +import com.bwie.common.utils.StringUtils; +import com.bwie.es.mapper.EsMapper; +import com.bwie.es.service.EsService; +import org.elasticsearch.action.bulk.BulkRequest; +import org.elasticsearch.action.delete.DeleteRequest; +import org.elasticsearch.action.get.GetRequest; +import org.elasticsearch.action.get.GetResponse; +import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.action.search.SearchRequest; +import org.elasticsearch.action.search.SearchResponse; +import org.elasticsearch.action.update.UpdateRequest; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.common.text.Text; +import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.reindex.DeleteByQueryRequest; +import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; +import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.SearchHits; +import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; +import org.elasticsearch.search.fetch.subphase.highlight.HighlightField; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Classname EsServiceImpl + * @Description TODO + * @Created by 杨鹏 + */ +@Service +public class EsServiceImpl implements EsService { + + @Autowired + private EsMapper esMapper; + + @Autowired + private RestHighLevelClient restHighLevelClient; + + private final static String INDEX_NAME="bicycle"; + + @Override + public Result add(Bicycle bicycle) { + try { + IndexRequest indexRequest = new IndexRequest(); + indexRequest.id(bicycle.getBicycleId()+""); + indexRequest.source(INDEX_NAME, XContentType.JSON); + restHighLevelClient.index(indexRequest, RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } + return Result.success(); + } + + @Override + public Result update(Bicycle bicycle) { + try { + UpdateRequest updateRequest = new UpdateRequest(INDEX_NAME,bicycle.getBicycleId()+""); + updateRequest.doc(JSON.toJSONString(Bicycle.class),XContentType.JSON); + restHighLevelClient.update(updateRequest,RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } + return Result.success(); + } + + @Override + public Result delete(Integer bicycleId) { + try { + DeleteRequest deleteRequest = new DeleteRequest(INDEX_NAME,bicycleId + ""); + restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } + return Result.success(); + } + + @Override + public Result select(Integer bicycleId) { + try { + GetRequest getRequest = new GetRequest(INDEX_NAME, bicycleId + ""); + GetResponse documentFields = restHighLevelClient.get(getRequest, RequestOptions.DEFAULT); + String sourceAsString = documentFields.getSourceAsString(); + JSON.parseObject(sourceAsString, Bicycle.class); + } catch (IOException e) { + throw new RuntimeException(e); + } + return Result.success(); + } + + @Override + public Result blackAdd(List bicycles) { + try { + BulkRequest bulkRequest = new BulkRequest(); + for (Bicycle bicycle : bicycles) { + bulkRequest.add( + new IndexRequest(INDEX_NAME) + .id(bicycle.getBicycleId()+"") + .source(JSON.toJSONString(bicycle),XContentType.JSON) + ); + } + restHighLevelClient.bulk(bulkRequest,RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } + return Result.success(); + } + + @Override + public Result blackDelete(List bicyclesId) { + try { + BulkRequest bulkRequest = new BulkRequest(); + for (Bicycle bicycle : bicyclesId) { + bulkRequest.add( + new DeleteRequest(INDEX_NAME,bicycle+"") + ); + } + restHighLevelClient.bulk(bulkRequest,RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } + return Result.success(); + } + + @Override + public Result search(Bicycle bicycle) { + + long total=0; + + List list = new ArrayList<>(); + + try { + SearchRequest searchRequest = new SearchRequest(INDEX_NAME); + SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); + BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + + if (StringUtils.isNotBlank(bicycle.getBicycleNumber())){ + boolQueryBuilder.must(QueryBuilders.matchQuery("bicycleNumber",bicycle.getBicycleNumber())); + } + + if (bicycle.getStatusId()!=null){ + boolQueryBuilder.must(QueryBuilders.matchQuery("statusId",bicycle.getStatusId())); + } + + if (bicycle.getTypeId()!=null){ + boolQueryBuilder.must(QueryBuilders.matchQuery("typeId",bicycle.getTypeId())); + } + searchSourceBuilder.query(boolQueryBuilder) + .sort("bicycleTime") + .from((bicycle.getPageNum()-1)*bicycle.getPageSize()) + .size(bicycle.getPageSize()) + .highlighter( + new HighlightBuilder() + .field("bicycleNumber") + .preTags("") + .postTags("") + ); + + searchRequest.source(searchSourceBuilder); + + SearchResponse search = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT); + SearchHits hits = search.getHits(); + total = hits.getTotalHits().value; + SearchHit[] searchHits = hits.getHits(); + + for (SearchHit searchHit : searchHits) { + String sourceAsString = searchHit.getSourceAsString(); + Bicycle bicycleData = JSON.parseObject(sourceAsString, Bicycle.class); + Map highlightFields = searchHit.getHighlightFields(); + if (highlightFields.size()>0&&highlightFields!=null){ + HighlightField highlightField = highlightFields.get("bicycleNumber"); + String str=""; + for (Text fragment : highlightField.getFragments()) { + str+=fragment; + } + bicycleData.setBicycleNumber(str); + } + list.add(bicycleData); + } + return PageResult.toResult(total,list); + } catch (Exception e) { + throw new RuntimeException(e); + } + + } + + public ListBicycleListData(){ + return esMapper.BicycleListData(); + } + + public void delete(){ + try { + DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(INDEX_NAME); + deleteByQueryRequest.setQuery(QueryBuilders.matchAllQuery()); + restHighLevelClient.deleteByQuery(deleteByQueryRequest,RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + @Scheduled(cron = "*/30 * * * * ?") + public void syncData(){ + List bicycles = esMapper.BicycleListData(); + if (bicycles.size()>0&&bicycles!=null){ + delete(); + blackAdd(bicycles); + } + } + + +} diff --git a/yangpeng-modules/yangpeng-es/src/main/resources/bootstrap.yml b/yangpeng-modules/yangpeng-es/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..87fbbbf --- /dev/null +++ b/yangpeng-modules/yangpeng-es/src/main/resources/bootstrap.yml @@ -0,0 +1,36 @@ +# Tomcat +server: + port: 9005 +# Spring +spring : + mvc: + pathmatch: + matching-strategy: ant-path-matcher + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: yangpeng-es + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 123.60.88.248:8848 + config: + # 配置中心地址 + server-addr: 123.60.88.248:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - yangpeng-book-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +es: + host: 122.51.25.106 + port: 9200 + scheme: http diff --git a/yangpeng-modules/yangpeng-es/src/main/resources/mappers/BookMapper.xml b/yangpeng-modules/yangpeng-es/src/main/resources/mappers/BookMapper.xml new file mode 100644 index 0000000..8ef1f2f --- /dev/null +++ b/yangpeng-modules/yangpeng-es/src/main/resources/mappers/BookMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/yangpeng-modules/yangpeng-rabbitmq/.gitignore b/yangpeng-modules/yangpeng-rabbitmq/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/yangpeng-modules/yangpeng-rabbitmq/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/yangpeng-modules/yangpeng-rabbitmq/pom.xml b/yangpeng-modules/yangpeng-rabbitmq/pom.xml new file mode 100644 index 0000000..eeb68dc --- /dev/null +++ b/yangpeng-modules/yangpeng-rabbitmq/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + com.bwwei + week1ks7.23 + 1.0-SNAPSHOT + ../../pom.xml + + + yangpeng-rabbitmq + + + 8 + 8 + UTF-8 + + + + + + com.bwwei + yangpeng-common + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-amqp + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + 2.9.10 + + + + diff --git a/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/MqApplication.java b/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/MqApplication.java new file mode 100644 index 0000000..fc64f7b --- /dev/null +++ b/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/MqApplication.java @@ -0,0 +1,20 @@ +package com.bwie; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @Classname MqApplication + * @Description 描述 + * @Created by 杨鹏 + */ + +@SpringBootApplication +@EnableFeignClients +public class MqApplication { + public static void main(String[] args) { + SpringApplication.run(MqApplication.class); + } + +} diff --git a/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/config/ConfirmCallbackConfig.java b/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/config/ConfirmCallbackConfig.java new file mode 100644 index 0000000..5d53b70 --- /dev/null +++ b/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/config/ConfirmCallbackConfig.java @@ -0,0 +1,43 @@ +package com.bwie.mq.config; + +import org.springframework.amqp.rabbit.connection.CorrelationData; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +/** + * @Classname + * @Description 消息发送到交换件确认的 回调 + * @Created by 杨鹏 + */ +@Component +public class ConfirmCallbackConfig implements RabbitTemplate.ConfirmCallback { + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * bean 初始化方法 + */ + @PostConstruct + public void init() { + this.rabbitTemplate.setConfirmCallback(this); + } + + /** + * 消息发送到交换机 成功 或者 失败 都会执行 + * @param correlationData correlation data for the callback. + * @param ack true for ack, false for nack + * @param cause An optional cause, for nack, when available, otherwise null. + */ + @Override + public void confirm(CorrelationData correlationData, boolean ack, String cause) { + if (ack) { + System.out.println("消息发送到交换机成功..."); + } else { + System.out.println("消息发送到交换机失败，失败的原因：" + cause); + } + } + +} diff --git a/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/config/RabbitAdminConfig.java b/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/config/RabbitAdminConfig.java new file mode 100644 index 0000000..c9c89e8 --- /dev/null +++ b/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/config/RabbitAdminConfig.java @@ -0,0 +1,53 @@ +package com.bwie.mq.config; + +import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; +import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +/** + * @Classname + * @Description + * @Created by 杨鹏 + */ +@Configuration +public class RabbitAdminConfig { + + @Value("${spring.rabbitmq.host}") + private String host; + @Value("${spring.rabbitmq.username}") + private String username; + @Value("${spring.rabbitmq.password}") + private String password; + @Value("${spring.rabbitmq.virtualhost}") + private String virtualhost; + + /** + * 构建RabbitMQ的连接工厂 + * @return + */ + @Bean + public ConnectionFactory connectionFactory() { + CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); + connectionFactory.setAddresses(host); + connectionFactory.setUsername(username); + connectionFactory.setPassword(password); + connectionFactory.setVirtualHost(virtualhost); + return connectionFactory; + } + + + /** + * 初始化RabbitAdmin + * @param connectionFactory + * @return + */ + @Bean + public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { + RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory); + rabbitAdmin.setAutoStartup(true); + return rabbitAdmin; + } + +} diff --git a/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/consumer/LongSuccessConsumer.java b/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/consumer/LongSuccessConsumer.java new file mode 100644 index 0000000..5bc5891 --- /dev/null +++ b/yangpeng-modules/yangpeng-rabbitmq/src/main/java/com/bwie/mq/consumer/LongSuccessConsumer.java @@ -0,0 +1,57 @@ +package com.bwie.mq.consumer; + +import com.bwie.common.result.Result; +import com.rabbitmq.client.Channel; +import lombok.extern.log4j.Log4j2; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +/** + * @Classname LongSuccessConsumer + * @Description 描述 + * @Created by 杨鹏 + */ +@Component +@Log4j2 +public class LongSuccessConsumer { + @Autowired + private RedisTemplate redisTemplate; + + @RabbitListener(queuesToDeclare = @Queue(name = "longSuccess")) + public void longSuccessConsumer(Integer userId, Message message, Channel channel) { + String messageId = message.getMessageProperties().getMessageId(); + try { + //直接添加到redis 的set 集合中 + Long count = redisTemplate.opsForSet().add("登录成功", messageId); + if (count==1){ + log.info("接受到消息,消息内容为:{}",userId); + try{ + //TODO 记录成功日志 + //Result code = authService.getCode(userPhone); + log.info("记录成功日志"); + channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); + }catch (Exception e){ + e.printStackTrace(); + //执行消息重试方法 + log.info("执行失败"); +// redisTemplate.opsForValue().set(messageId,"messageId"); + } + } + //消息不重复 + }catch (Exception e){ + redisTemplate.opsForSet().remove("登录失败",messageId); + try { + channel.basicReject(message.getMessageProperties().getDeliveryTag(),true); + } catch (IOException ioException) { + throw new RuntimeException(ioException); + } + } + + } +} diff --git a/yangpeng-modules/yangpeng-rabbitmq/src/main/resources/bootstrap.yml b/yangpeng-modules/yangpeng-rabbitmq/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..51d13ed --- /dev/null +++ b/yangpeng-modules/yangpeng-rabbitmq/src/main/resources/bootstrap.yml @@ -0,0 +1,57 @@ +# Tomcat +server: + port: 9672 +# Spring +spring: + redis: + host: 123.60.88.248 + port: 6379 + password: yp122.8. + mvc: + pathmatch: + matching-strategy: ant-path-matcher + application: + # 应用名称 + name: yangpeng-rabbitmq + profiles: + # 环境配置 + active: dev + rabbitmq: + host: 123.60.88.248 + port: 5672 + username: user + password: yp122.8. + virtual-host: / + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) + listener: + simple: + prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 + #acknowledge-mode: manual # 设置消费端手动ack确认 + retry: + enabled: true # 是否支持重试 + template: + # 只要消息抵达Queue，就会异步发送优先回调return firm + mandatory: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + main: + # 允许使用循环引用 + allow-circular-references: true + # 允许定义相同的bean对象 去覆盖原有的 + allow-bean-definition-overriding: true + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 123.60.88.248:8848 + config: + # 配置中心地址 + server-addr: 123.60.88.248:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + diff --git a/yangpeng-modules/yangpeng-status/pom.xml b/yangpeng-modules/yangpeng-status/pom.xml new file mode 100644 index 0000000..d91cb3a --- /dev/null +++ b/yangpeng-modules/yangpeng-status/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + com.bwwei + yangpeng-modules + 1.0-SNAPSHOT + + + yangpeng-status + + + 8 + 8 + UTF-8 + + + + + com.bwwei + yangpeng-common + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba + druid-spring-boot-starter + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.github.tobato + fastdfs-client + + + + io.springfox + springfox-boot-starter + 3.0.0 + + + diff --git a/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/StatusApplication.java b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/StatusApplication.java new file mode 100644 index 0000000..76e3f7c --- /dev/null +++ b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/StatusApplication.java @@ -0,0 +1,18 @@ +package com.bwie.status; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @Classname BicycleApplication + * @Description + * @Created by 杨鹏 + */ +@SpringBootApplication +@EnableFeignClients +public class StatusApplication { + public static void main(String[] args) { + SpringApplication.run(StatusApplication.class); + } +} diff --git a/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/controller/StatusController.java b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/controller/StatusController.java new file mode 100644 index 0000000..9593d64 --- /dev/null +++ b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/controller/StatusController.java @@ -0,0 +1,30 @@ +package com.bwie.status.controller; + +import com.bwie.common.domain.Status; +import com.bwie.common.result.Result; +import com.bwie.status.service.StatusService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Classname Bicycle + * @Description TODO + * @Created by 杨鹏 + */ + +@RestController +@RequestMapping("/status") +public class StatusController { + @Autowired + private StatusService statusService; + + @GetMapping("/list") + public Result>list(){ + List list = statusService.list(); + return Result.success(list); + } +} diff --git a/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/mapper/StatusMapper.java b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/mapper/StatusMapper.java new file mode 100644 index 0000000..726240c --- /dev/null +++ b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/mapper/StatusMapper.java @@ -0,0 +1,16 @@ +package com.bwie.status.mapper; + +import com.bwie.common.domain.Status; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Classname BicycleMapper + * @Description TODO + * @Created by 杨鹏 + */ +@Mapper +public interface StatusMapper { + List list(); +} diff --git a/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/service/StatusService.java b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/service/StatusService.java new file mode 100644 index 0000000..daa9125 --- /dev/null +++ b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/service/StatusService.java @@ -0,0 +1,14 @@ +package com.bwie.status.service; + +import com.bwie.common.domain.Status; + +import java.util.List; + +/** + * @Classname BicycleService + * @Description TODO + * @Created by 杨鹏 + */ +public interface StatusService { + Listlist(); +} diff --git a/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/service/impl/StatusServiceImpl.java b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/service/impl/StatusServiceImpl.java new file mode 100644 index 0000000..4015c44 --- /dev/null +++ b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/service/impl/StatusServiceImpl.java @@ -0,0 +1,26 @@ +package com.bwie.status.service.impl; + +import com.bwie.common.domain.Status; +import com.bwie.status.mapper.StatusMapper; +import com.bwie.status.service.StatusService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Classname BicycleServiceImpl + * @Description TODO + * @Created by 杨鹏 + */ +@Service +public class StatusServiceImpl implements StatusService { + + @Autowired + private StatusMapper statusMapper; + + @Override + public List list() { + return statusMapper.list(); + } +} diff --git a/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/utils/OssUtil.java b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/utils/OssUtil.java new file mode 100644 index 0000000..1ba5997 --- /dev/null +++ b/yangpeng-modules/yangpeng-status/src/main/java/com/bwie/status/utils/OssUtil.java @@ -0,0 +1,163 @@ +package com.bwie.status.utils; + +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.model.GetObjectRequest; +import com.aliyun.oss.model.PutObjectRequest; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.multipart.MultipartFile; + +import java.io.*; +import java.time.LocalDateTime; +import java.util.UUID; + +/** + * @Classname + * @Description Oss工具 + * @Created by 杨鹏 + */ +@Log4j2 +public class OssUtil { + + /** + * Endpoint 存储对象概述 阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限 访问路径前缀 存储对象概述 + */ + private static String endPoint = "oss-cn-shanghai.aliyuncs.com"; + private static String accessKeyId = "LTAI5tDbRqXkC5i3SMrCSDcX"; + private static String accessKeySecret = "XUzMZoHPLsjNLafHsdQnMElBWZATsu"; + private static String accessPre = "https://mall-bw.oss-cn-shanghai.aliyuncs.com/"; + + /** + * bucket名称 + * + * @return + */ + private static String bucketName = "mall-bw"; + + private static OSS ossClient; + + static { + ossClient = new OSSClientBuilder().build( + endPoint, + accessKeyId, + accessKeySecret); + log.info("oss服务连接成功！"); + } + + /** + * 默认路径上传本地文件 + * + * @param filePath + */ + public static String uploadFile(String filePath) { + return uploadFileForBucket(bucketName, getOssFilePath(filePath), filePath); + } + + /** + * 默认路径上传multipartFile文件 + * + * @param multipartFile + */ + public static String uploadMultipartFile(MultipartFile multipartFile) { + return uploadMultipartFile(bucketName, getOssFilePath(multipartFile.getOriginalFilename()), multipartFile); + } + + /** + * 上传 multipartFile 类型文件 + * + * @param bucketName + * @param ossPath + * @param multipartFile + */ + public static String uploadMultipartFile(String bucketName, String ossPath, MultipartFile multipartFile) { + InputStream inputStream = null; + try { + inputStream = multipartFile.getInputStream(); + } catch (IOException e) { + e.printStackTrace(); + } + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre + ossPath; + } + + /** + * 使用File上传PutObject上传文件 ** 程序默认使用次方法上传 + * + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileForBucket(String bucketName, String ossPath, String filePath) { + // 创建PutObjectRequest对象。 + PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath, new File(filePath)); + // 上传 + ossClient.putObject(putObjectRequest); + return accessPre + ossPath; + } + + /** + * 使用文件流上传到指定的bucket实例 + * + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileInputStreamForBucket(String bucketName, String ossPath, String filePath) { + + // 填写本地文件的完整路径。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件流。 + InputStream inputStream = null; + try { + inputStream = new FileInputStream(filePath); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + // 填写Bucket名称和Object完整路径。Object完整路径中不能包含Bucket名称。 + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre + ossPath; + } + + public static void uploadFileInputStreamForBucket(String bucketName, String ossPath, InputStream inputStream) { + ossClient.putObject(bucketName, ossPath, inputStream); + } + + /** + * 下载 + * + * @param ossFilePath + * @param filePath + */ + public static void downloadFile(String ossFilePath, String filePath) { + downloadFileForBucket(bucketName, ossFilePath, filePath); + } + + /** + * 下载 + * + * @param bucketName 实例名称 + * @param ossFilePath oss存储路径 + * @param filePath 本地文件路径 + */ + public static void downloadFileForBucket(String bucketName, String ossFilePath, String filePath) { + ossClient.getObject(new GetObjectRequest(bucketName, ossFilePath), new File(filePath)); + } + + /** + * @return + */ + public static String getOssDefaultPath() { + LocalDateTime now = LocalDateTime.now(); + String url = + now.getYear() + "/" + + now.getMonth() + "/" + + now.getDayOfMonth() + "/" + + now.getHour() + "/" + + now.getMinute() + "/"; + return url; + } + + public static String getOssFilePath(String filePath) { + String fileSuf = filePath.substring(filePath.indexOf(".") + 1); + return getOssDefaultPath() + UUID.randomUUID().toString() + "." + fileSuf; + } + +} diff --git a/yangpeng-modules/yangpeng-status/src/main/resources/bootstrap.yml b/yangpeng-modules/yangpeng-status/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..81bca2e --- /dev/null +++ b/yangpeng-modules/yangpeng-status/src/main/resources/bootstrap.yml @@ -0,0 +1,50 @@ +# Tomcat +server: + port: 9127 +# Spring +spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: yangpeng-status + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 123.60.88.248:8848 + config: + # 配置中心地址 + server-addr: 123.60.88.248:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - yangpeng-auth-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-mysql-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - yangpeng-status-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +fdfs: + so-timeout: 1500 # socket 连接时长 + connect-timeout: 600 # 连接 tracker 服务器超时时长 + # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流 + tracker-list: 123.60.88.248:22122 + web-server-url: 123.60.88.248:8888 + pool: + jmx-enabled: false + # 生成缩略图 + thumb-image: + height: 500 + width: 500 +mybatis: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + diff --git a/yangpeng-modules/yangpeng-status/src/main/resources/mappers/StatusMapper.xml b/yangpeng-modules/yangpeng-status/src/main/resources/mappers/StatusMapper.xml new file mode 100644 index 0000000..068a82f --- /dev/null +++ b/yangpeng-modules/yangpeng-status/src/main/resources/mappers/StatusMapper.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/yangpeng-modules/yangpeng-type/pom.xml b/yangpeng-modules/yangpeng-type/pom.xml new file mode 100644 index 0000000..13eead3 --- /dev/null +++ b/yangpeng-modules/yangpeng-type/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + com.bwwei + yangpeng-modules + 1.0-SNAPSHOT + + + yangpeng-type + + + 8 + 8 + UTF-8 + + + + + com.bwwei + yangpeng-common + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba + druid-spring-boot-starter + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.github.tobato + fastdfs-client + + + + io.springfox + springfox-boot-starter + 3.0.0 + + + diff --git a/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/TypeApplication.java b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/TypeApplication.java new file mode 100644 index 0000000..b9f19de --- /dev/null +++ b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/TypeApplication.java @@ -0,0 +1,18 @@ +package com.bwie.type; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * @Classname BicycleApplication + * @Description + * @Created by 杨鹏 + */ +@SpringBootApplication +@EnableFeignClients +public class TypeApplication { + public static void main(String[] args) { + SpringApplication.run(TypeApplication.class); + } +} diff --git a/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/controller/TypeController.java b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/controller/TypeController.java new file mode 100644 index 0000000..58fd12d --- /dev/null +++ b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/controller/TypeController.java @@ -0,0 +1,30 @@ +package com.bwie.type.controller; + +import com.bwie.common.domain.Type; +import com.bwie.common.result.Result; +import com.bwie.type.service.TypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @Classname Bicycle + * @Description TODO + * @Created by 杨鹏 + */ + +@RestController +@RequestMapping("/type") +public class TypeController { + @Autowired + private TypeService typeService; + + @GetMapping("/list") + public Result>list(){ + List list = typeService.list(); + return Result.success(list); + } +} diff --git a/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/mapper/TypeMapper.java b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/mapper/TypeMapper.java new file mode 100644 index 0000000..626ae97 --- /dev/null +++ b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/mapper/TypeMapper.java @@ -0,0 +1,16 @@ +package com.bwie.type.mapper; + +import com.bwie.common.domain.Type; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Classname BicycleMapper + * @Description TODO + * @Created by 杨鹏 + */ +@Mapper +public interface TypeMapper { + List list(); +} diff --git a/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/service/TypeService.java b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/service/TypeService.java new file mode 100644 index 0000000..e29ce56 --- /dev/null +++ b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/service/TypeService.java @@ -0,0 +1,16 @@ +package com.bwie.type.service; + +import com.bwie.common.domain.Status; +import com.bwie.common.domain.Type; + +import java.util.List; + +/** + * @Classname BicycleService + * @Description TODO + * @Created by 杨鹏 + */ +public interface TypeService { + + List list(); +} diff --git a/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/service/impl/TypeServiceImpl.java b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/service/impl/TypeServiceImpl.java new file mode 100644 index 0000000..4580fd4 --- /dev/null +++ b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/service/impl/TypeServiceImpl.java @@ -0,0 +1,27 @@ +package com.bwie.type.service.impl; + +import com.bwie.common.domain.Type; +import com.bwie.type.mapper.TypeMapper; +import com.bwie.type.service.TypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Classname BicycleServiceImpl + * @Description TODO + * @Created by 杨鹏 + */ +@Service +public class TypeServiceImpl implements TypeService { + + @Autowired + private TypeMapper typeMapper; + + + @Override + public List list() { + return typeMapper.list(); + } +} diff --git a/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/utils/OssUtil.java b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/utils/OssUtil.java new file mode 100644 index 0000000..2140ec7 --- /dev/null +++ b/yangpeng-modules/yangpeng-type/src/main/java/com/bwie/type/utils/OssUtil.java @@ -0,0 +1,163 @@ +package com.bwie.type.utils; + +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.model.GetObjectRequest; +import com.aliyun.oss.model.PutObjectRequest; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.multipart.MultipartFile; + +import java.io.*; +import java.time.LocalDateTime; +import java.util.UUID; + +/** + * @Classname + * @Description Oss工具 + * @Created by 杨鹏 + */ +@Log4j2 +public class OssUtil { + + /** + * Endpoint 存储对象概述 阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限 访问路径前缀 存储对象概述 + */ + private static String endPoint = "oss-cn-shanghai.aliyuncs.com"; + private static String accessKeyId = "LTAI5tDbRqXkC5i3SMrCSDcX"; + private static String accessKeySecret = "XUzMZoHPLsjNLafHsdQnMElBWZATsu"; + private static String accessPre = "https://mall-bw.oss-cn-shanghai.aliyuncs.com/"; + + /** + * bucket名称 + * + * @return + */ + private static String bucketName = "mall-bw"; + + private static OSS ossClient; + + static { + ossClient = new OSSClientBuilder().build( + endPoint, + accessKeyId, + accessKeySecret); + log.info("oss服务连接成功！"); + } + + /** + * 默认路径上传本地文件 + * + * @param filePath + */ + public static String uploadFile(String filePath) { + return uploadFileForBucket(bucketName, getOssFilePath(filePath), filePath); + } + + /** + * 默认路径上传multipartFile文件 + * + * @param multipartFile + */ + public static String uploadMultipartFile(MultipartFile multipartFile) { + return uploadMultipartFile(bucketName, getOssFilePath(multipartFile.getOriginalFilename()), multipartFile); + } + + /** + * 上传 multipartFile 类型文件 + * + * @param bucketName + * @param ossPath + * @param multipartFile + */ + public static String uploadMultipartFile(String bucketName, String ossPath, MultipartFile multipartFile) { + InputStream inputStream = null; + try { + inputStream = multipartFile.getInputStream(); + } catch (IOException e) { + e.printStackTrace(); + } + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre + ossPath; + } + + /** + * 使用File上传PutObject上传文件 ** 程序默认使用次方法上传 + * + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileForBucket(String bucketName, String ossPath, String filePath) { + // 创建PutObjectRequest对象。 + PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath, new File(filePath)); + // 上传 + ossClient.putObject(putObjectRequest); + return accessPre + ossPath; + } + + /** + * 使用文件流上传到指定的bucket实例 + * + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileInputStreamForBucket(String bucketName, String ossPath, String filePath) { + + // 填写本地文件的完整路径。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件流。 + InputStream inputStream = null; + try { + inputStream = new FileInputStream(filePath); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + // 填写Bucket名称和Object完整路径。Object完整路径中不能包含Bucket名称。 + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre + ossPath; + } + + public static void uploadFileInputStreamForBucket(String bucketName, String ossPath, InputStream inputStream) { + ossClient.putObject(bucketName, ossPath, inputStream); + } + + /** + * 下载 + * + * @param ossFilePath + * @param filePath + */ + public static void downloadFile(String ossFilePath, String filePath) { + downloadFileForBucket(bucketName, ossFilePath, filePath); + } + + /** + * 下载 + * + * @param bucketName 实例名称 + * @param ossFilePath oss存储路径 + * @param filePath 本地文件路径 + */ + public static void downloadFileForBucket(String bucketName, String ossFilePath, String filePath) { + ossClient.getObject(new GetObjectRequest(bucketName, ossFilePath), new File(filePath)); + } + + /** + * @return + */ + public static String getOssDefaultPath() { + LocalDateTime now = LocalDateTime.now(); + String url = + now.getYear() + "/" + + now.getMonth() + "/" + + now.getDayOfMonth() + "/" + + now.getHour() + "/" + + now.getMinute() + "/"; + return url; + } + + public static String getOssFilePath(String filePath) { + String fileSuf = filePath.substring(filePath.indexOf(".") + 1); + return getOssDefaultPath() + UUID.randomUUID().toString() + "." + fileSuf; + } + +} diff --git a/yangpeng-modules/yangpeng-type/src/main/resources/bootstrap.yml b/yangpeng-modules/yangpeng-type/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..7d87525 --- /dev/null +++ b/yangpeng-modules/yangpeng-type/src/main/resources/bootstrap.yml @@ -0,0 +1,50 @@ +# Tomcat +server: + port: 9126 +# Spring +spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: yangpeng-type + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 123.60.88.248:8848 + config: + # 配置中心地址 + server-addr: 123.60.88.248:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - yangpeng-auth-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-mysql-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - yangpeng-type-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +fdfs: + so-timeout: 1500 # socket 连接时长 + connect-timeout: 600 # 连接 tracker 服务器超时时长 + # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流 + tracker-list: 123.60.88.248:22122 + web-server-url: 123.60.88.248:8888 + pool: + jmx-enabled: false + # 生成缩略图 + thumb-image: + height: 500 + width: 500 +mybatis: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + diff --git a/yangpeng-modules/yangpeng-type/src/main/resources/mappers/TypeMapper.xml b/yangpeng-modules/yangpeng-type/src/main/resources/mappers/TypeMapper.xml new file mode 100644 index 0000000..58e735d --- /dev/null +++ b/yangpeng-modules/yangpeng-type/src/main/resources/mappers/TypeMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/yangpeng-modules/yangpeng-user/pom.xml b/yangpeng-modules/yangpeng-user/pom.xml new file mode 100644 index 0000000..45564fe --- /dev/null +++ b/yangpeng-modules/yangpeng-user/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + com.bwwei + yangpeng-modules + 1.0-SNAPSHOT + + + yangpeng-user + + + 8 + 8 + UTF-8 + + + + + + com.bwwei + yangpeng-common + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba + druid-spring-boot-starter + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + com.github.tobato + fastdfs-client + + + + io.springfox + springfox-boot-starter + 3.0.0 + + + diff --git a/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/UserApplication.java b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/UserApplication.java new file mode 100644 index 0000000..9df1447 --- /dev/null +++ b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/UserApplication.java @@ -0,0 +1,17 @@ +package com.bwie.user; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +/** + * @Classname UserApplication + * @Description Oss工具 + * @Created by 杨鹏 + */ +@SpringBootApplication +@EnableFeignClients +public class UserApplication { + public static void main(String[] args) { + SpringApplication.run(UserApplication.class); + } +} diff --git a/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/controller/UserController.java b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/controller/UserController.java new file mode 100644 index 0000000..ee8686a --- /dev/null +++ b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/controller/UserController.java @@ -0,0 +1,30 @@ +package com.bwie.user.controller; + +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import com.bwie.user.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Classname UserController + * @Description TODO + * @Created by 杨鹏 + */ +@RestController +@RequestMapping("/user") +public class UserController { + + @Autowired + private UserService userService; + + @PostMapping("/userTell/{userTell}") + public ResultuserTell(@PathVariable("userTell") String userTell){ + User user = userService.userTell(userTell); + return Result.success(user); + } +} diff --git a/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/mapper/UserMapper.java b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/mapper/UserMapper.java new file mode 100644 index 0000000..219e53e --- /dev/null +++ b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/mapper/UserMapper.java @@ -0,0 +1,19 @@ +package com.bwie.user.mapper; + +import com.bwie.common.domain.User; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @Classname UserMapper + * @Description TODO + * @Created by 杨鹏 + */ +@Mapper +public interface UserMapper { + + User userTell(String userTell); + + List list(); +} diff --git a/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/service/UserService.java b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/service/UserService.java new file mode 100644 index 0000000..ca36f52 --- /dev/null +++ b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/service/UserService.java @@ -0,0 +1,18 @@ +package com.bwie.user.service; + +import com.bwie.common.domain.User; + +import java.util.List; + +/** + * @Classname UserService + * @Description TODO + * @Created by 杨鹏 + */ +public interface UserService { + + + Listlist(); + User userTell(String userTell); + +} diff --git a/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..e7394c5 --- /dev/null +++ b/yangpeng-modules/yangpeng-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java @@ -0,0 +1,34 @@ +package com.bwie.user.service.impl; + +import com.bwie.common.domain.User; +import com.bwie.common.result.Result; +import com.bwie.user.mapper.UserMapper; +import com.bwie.user.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Classname UserServiceImpl + * @Description TODO + * @Created by 杨鹏 + */ +@Service +public class UserServiceImpl implements UserService { + + + @Autowired + private UserMapper userMapper; + + + @Override + public List list() { + return userMapper.list(); + } + + @Override + public User userTell(String userTell) { + return userMapper.userTell(userTell); + } +} diff --git a/yangpeng-modules/yangpeng-user/src/main/resources/bootstrap.yml b/yangpeng-modules/yangpeng-user/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..df58891 --- /dev/null +++ b/yangpeng-modules/yangpeng-user/src/main/resources/bootstrap.yml @@ -0,0 +1,49 @@ +# Tomcat +server: + port: 9124 +# Spring +spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: yangpeng-user + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 123.60.88.248:8848 + config: + # 配置中心地址 + server-addr: 123.60.88.248:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - yangpeng-auth-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-mysql-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +fdfs: + so-timeout: 1500 # socket 连接时长 + connect-timeout: 600 # 连接 tracker 服务器超时时长 + # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流 + tracker-list: 123.60.88.248:22122 + web-server-url: 123.60.88.248:8888 + pool: + jmx-enabled: false + # 生成缩略图 + thumb-image: + height: 500 + width: 500 +mybatis: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + diff --git a/yangpeng-modules/yangpeng-user/src/main/resources/mappers/UserMapper.xml b/yangpeng-modules/yangpeng-user/src/main/resources/mappers/UserMapper.xml new file mode 100644 index 0000000..7823c14 --- /dev/null +++ b/yangpeng-modules/yangpeng-user/src/main/resources/mappers/UserMapper.xml @@ -0,0 +1,15 @@ + + + + + + + +