diff --git a/README.md b/README.md index 04fc851b8b456db38ab9fabc7857f007f20dab6d..63daf07c1a7957cd827613c0d2a8faf8b5e4502f 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ oauthserver是一个基于Spring Boot Oauth2的完整的独立的Oauth2 Server [oauth接口调用示例](tutorial/api.md) ## 管理端页面 -测试账号：用户名jeesun，密码1234567890c +测试账号：手机号18800000000，密码1234567890c ### 管理端页面样式1 访问地址：[http://localhost:8182/index/index_v1](http://localhost:8182/index/index_v1) ![index_v1](tutorial/screenshots/indev_v1.jpg) diff --git a/common/src/main/java/com/simon/common/utils/PlaceholderUtil.java b/common/src/main/java/com/simon/common/utils/PlaceholderUtil.java new file mode 100644 index 0000000000000000000000000000000000000000..6e55c0742c8b4b97bfaca483a93f68065917bb9f --- /dev/null +++ b/common/src/main/java/com/simon/common/utils/PlaceholderUtil.java @@ -0,0 +1,54 @@ +package com.simon.common.utils; + +import lombok.extern.slf4j.Slf4j; + +import java.util.Map; + +/** + * 配置文件或模板中的占位符替换工具类 + * + * @author simon + * @date 2019-01-03 + **/ +@Slf4j +public class PlaceholderUtil { + + /** + * 占位符前缀: "${" + */ + private static final String PLACEHOLDER_PREFIX = "${"; + /** + * 占位符的后缀: "}" + */ + private static final String PLACEHOLDER_SUFFIX = "}"; + + public static String resolvePlaceholders(String text, Map parameter) { + if (parameter == null || parameter.isEmpty()) { + return text; + } + StringBuffer buf = new StringBuffer(text); + int startIndex = buf.indexOf(PLACEHOLDER_PREFIX); + while (startIndex != -1) { + int endIndex = buf.indexOf(PLACEHOLDER_SUFFIX, startIndex + PLACEHOLDER_PREFIX.length()); + if (endIndex != -1) { + String placeholder = buf.substring(startIndex + PLACEHOLDER_PREFIX.length(), endIndex); + int nextIndex = endIndex + PLACEHOLDER_SUFFIX.length(); + try { + String propVal = parameter.get(placeholder); + if (propVal != null) { + buf.replace(startIndex, endIndex + PLACEHOLDER_SUFFIX.length(), propVal); + nextIndex = startIndex + propVal.length(); + } else { + log.warn("Could not resolve placeholder '" + placeholder + "' in [" + text + "] "); + } + } catch (Exception ex) { + log.warn("Could not resolve placeholder '" + placeholder + "' in [" + text + "]: " + ex); + } + startIndex = buf.indexOf(PLACEHOLDER_PREFIX, nextIndex); + } else { + startIndex = -1; + } + } + return buf.toString(); + } +} \ No newline at end of file diff --git "a/\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\350\204\232\346\234\254.sql" "b/\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\350\204\232\346\234\254.sql" index b73363d28ade55d90349b97a2d7170a77bca9645..dcd044ff08960dba2fba803aa3b995f9b75f07be 100644 --- "a/\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\350\204\232\346\234\254.sql" +++ "b/\346\225\260\346\215\256\345\210\235\345\247\213\345\214\226\350\204\232\346\234\254.sql" @@ -11,7 +11,7 @@ Target Server Version : 50709 File Encoding : 65001 - Date: 01/01/2019 21:18:21 + Date: 03/01/2019 11:52:12 */ SET NAMES utf8mb4; @@ -38,7 +38,7 @@ CREATE TABLE `logging_event` ( `caller_line` char(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `event_id` bigint(20) NOT NULL AUTO_INCREMENT, PRIMARY KEY (`event_id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 8062 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = MyISAM AUTO_INCREMENT = 8137 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for logging_event_exception @@ -406,17 +406,18 @@ CREATE TABLE `t_news_info` ( `tags` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `news_type` int(4) NULL DEFAULT NULL COMMENT '新闻类型', PRIMARY KEY (`id`) USING BTREE -) ENGINE = MyISAM AUTO_INCREMENT = 99132665180979201 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '新闻' ROW_FORMAT = Dynamic; +) ENGINE = MyISAM AUTO_INCREMENT = 111993828751179777 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '新闻' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of t_news_info -- ---------------------------- INSERT INTO `t_news_info` VALUES (1, 1, '2018-11-15 21:58:04', 1, '2018-11-15 21:58:07', '被库克批评之后，扎克伯格下令FB高管都用安卓手机', 1, 1, '

大苏打\"gangtiexia.jpg\"/

', '/fileUpload/6026febf5dc24c5a9ffdeefa9c727364.jpeg', '2018-11-15 22:08:18', NULL, 0); INSERT INTO `t_news_info` VALUES (94611785297952768, NULL, '2018-11-16 00:08:52', NULL, '2018-11-16 00:08:49', '标题测试', NULL, NULL, '

的撒大苏打

', NULL, '2018-11-16 00:08:59', NULL, 0); -INSERT INTO `t_news_info` VALUES (94775027517358080, NULL, NULL, NULL, NULL, '图片上传测试', NULL, NULL, '

', NULL, NULL, NULL, 0); +INSERT INTO `t_news_info` VALUES (94775027517358080, NULL, NULL, NULL, NULL, '图片上传测试', NULL, NULL, '

\"26891736.jpeg\"

', NULL, NULL, NULL, 0); INSERT INTO `t_news_info` VALUES (94776970356719616, NULL, NULL, NULL, NULL, '再次测试图片上传', NULL, NULL, '

\"f498e01633b5b704ebfe0385f52bad20.jpg\"

', NULL, NULL, NULL, 0); -INSERT INTO `t_news_info` VALUES (99132408858673152, NULL, NULL, NULL, NULL, '测试图文混排', NULL, NULL, '

测试图文混排

', NULL, NULL, NULL, 1); -INSERT INTO `t_news_info` VALUES (99132665180979200, NULL, NULL, NULL, NULL, '新图文混排', NULL, NULL, '

测试图文混排

', NULL, NULL, NULL, 1); +INSERT INTO `t_news_info` VALUES (99132408858673152, NULL, NULL, NULL, NULL, '测试图文混排', NULL, NULL, '

测试图文混排


', NULL, NULL, NULL, 1); +INSERT INTO `t_news_info` VALUES (99132665180979200, NULL, NULL, NULL, NULL, '新图文混排', NULL, NULL, '

测试图文混排

\"26891736.jpeg\"/

', NULL, NULL, NULL, 1); +INSERT INTO `t_news_info` VALUES (111993828751179776, NULL, NULL, NULL, NULL, '测试layer', NULL, NULL, '

111

', NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_news_tag @@ -498,7 +499,7 @@ CREATE TABLE `t_s_quartz_job` ( `method_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '任务调用的方法名', `is_concurrent` int(4) NULL DEFAULT NULL COMMENT '任务是否有状态', `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `bean_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '全限定名', + `bean_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '任务执行时调用哪个类的方法 包名+类名，完全限定名', `trigger_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '触发器名称', `job_status` int(4) NULL DEFAULT NULL COMMENT '任务状态', `spring_bean` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, @@ -509,7 +510,7 @@ CREATE TABLE `t_s_quartz_job` ( -- ---------------------------- -- Records of t_s_quartz_job -- ---------------------------- -INSERT INTO `t_s_quartz_job` VALUES (1, 1, '2018-12-21 22:21:26', 1000000000, '2019-01-01 21:08:28', '*/5 * * * * ?', 'execute', 0, '测试', 'com.simon.task.SampleTask', 'org.quartz.CronTrigger', 0, NULL, 'com.simon.task.SampleTask'); +INSERT INTO `t_s_quartz_job` VALUES (1, 1, '2018-12-21 22:21:26', 1000000000, '2019-01-02 22:19:29', '*/5 * * * * ?', 'execute', 0, '测试', 'com.simon.task.SampleTask', 'org.quartz.CronTrigger', 0, NULL, 'com.simon.task.SampleTask'); -- ---------------------------- -- Table structure for t_side_menu @@ -587,12 +588,12 @@ CREATE TABLE `t_users` ( -- ---------------------------- -- Records of t_users -- ---------------------------- -INSERT INTO `t_users` VALUES (1000000000, NULL, NULL, NULL, NULL, 'jeesun', '$2a$11$t4akVchfgOv00XxB/ZKLlOmweUoL/Aed4CiJqQjaiRLZpBU3AWfxu', 1, '+86', '18362102427', 'simon.sun.dev@hotmail.com', NULL, NULL, '江苏省苏州市', 18, '2018-07-04', '/fileUpload/1491809301512510.jpg', '巨蟹宅', 1, NULL, NULL, NULL, NULL); -INSERT INTO `t_users` VALUES (1000000001, NULL, NULL, NULL, NULL, 'user2711', '$2a$11$BUiKPp8.pcym7sxXYPvZeOjl0BOoVl3PZT.1Wfb3kmIgooO/GfQ4G', 1, '+86', '18860902711', '18860902711@163.com', NULL, NULL, NULL, NULL, '2018-01-30', NULL, NULL, 0, NULL, NULL, NULL, '2018-10-27 02:56:23'); -INSERT INTO `t_users` VALUES (1000000002, NULL, NULL, NULL, NULL, 'user6745', '$2a$11$a7XDbu2RvLjZdr4kCvqh2u7gwVXhwxdauIzbX3ZizbBU.HeV8BOky', 1, '+86', '18550046745', '', NULL, NULL, NULL, NULL, '2009-09-14', NULL, NULL, 0, NULL, NULL, NULL, '2018-10-27 03:38:24'); -INSERT INTO `t_users` VALUES (1000000003, NULL, NULL, NULL, NULL, 'simon', '$2a$11$t4akVchfgOv00XxB/ZKLlOmweUoL/Aed4CiJqQjaiRLZpBU3AWfxu', 1, '+86', '18362102421', '', NULL, NULL, NULL, NULL, NULL, '/fileUpload/微信图片_20181016142155.png', NULL, 0, NULL, NULL, NULL, NULL); -INSERT INTO `t_users` VALUES (1000000004, NULL, NULL, NULL, NULL, 'sss', '$2a$11$rTQdNRld6Cc02vK9btH6tupdQW7aqbfcNlaD8ioigbADeHJWEcLM6', 1, '+86', '18362202422', '', NULL, NULL, NULL, NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL); -INSERT INTO `t_users` VALUES (1000000005, NULL, NULL, NULL, NULL, 'admin', '$2a$11$7pwrZUA2nOx8jWr6P1H3f.eEsmUnFmzZOs1jVxEEQSXa3HForbGKS', 1, '+86', '18362102622', '', NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL); +INSERT INTO `t_users` VALUES (1000000000, NULL, NULL, NULL, NULL, 'jeesun', '$2a$11$t4akVchfgOv00XxB/ZKLlOmweUoL/Aed4CiJqQjaiRLZpBU3AWfxu', 1, '+86', '18800000000', '18800000000@163.com', NULL, NULL, '江苏省苏州市', 18, '2018-07-04', '/fileUpload/1491809301512510.jpg', '巨蟹宅', 1, NULL, NULL, NULL, NULL); +INSERT INTO `t_users` VALUES (1000000001, NULL, NULL, NULL, NULL, 'user2711', '$2a$11$BUiKPp8.pcym7sxXYPvZeOjl0BOoVl3PZT.1Wfb3kmIgooO/GfQ4G', 1, '+86', '18800000001', '18800000001@163.com', NULL, NULL, NULL, NULL, '2018-01-30', NULL, NULL, 0, NULL, NULL, NULL, '2018-10-27 02:56:23'); +INSERT INTO `t_users` VALUES (1000000002, NULL, NULL, NULL, NULL, 'user6745', '$2a$11$a7XDbu2RvLjZdr4kCvqh2u7gwVXhwxdauIzbX3ZizbBU.HeV8BOky', 1, '+86', '18800000002', '18800000002@163.com', NULL, NULL, NULL, NULL, '2009-09-14', NULL, NULL, 0, NULL, NULL, NULL, '2018-10-27 03:38:24'); +INSERT INTO `t_users` VALUES (1000000003, NULL, NULL, NULL, NULL, 'simon', '$2a$11$t4akVchfgOv00XxB/ZKLlOmweUoL/Aed4CiJqQjaiRLZpBU3AWfxu', 1, '+86', '18800000003', '18800000003@163.com', NULL, NULL, NULL, NULL, NULL, '/fileUpload/微信图片_20181016142155.png', NULL, 0, NULL, NULL, NULL, NULL); +INSERT INTO `t_users` VALUES (1000000004, NULL, NULL, NULL, NULL, 'sss', '$2a$11$rTQdNRld6Cc02vK9btH6tupdQW7aqbfcNlaD8ioigbADeHJWEcLM6', 1, '+86', '18800000004', '18800000004@163.com', NULL, NULL, NULL, NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL); +INSERT INTO `t_users` VALUES (1000000005, NULL, NULL, NULL, NULL, 'admin', '$2a$11$7pwrZUA2nOx8jWr6P1H3f.eEsmUnFmzZOs1jVxEEQSXa3HForbGKS', 1, '+86', '18800000005', '18800000005@163.com', NULL, NULL, '', NULL, NULL, NULL, '', 1, NULL, NULL, NULL, NULL); -- ---------------------------- -- Table structure for t_veri_code