diff --git a/common/pom.xml b/common/pom.xml index ec7b1a97..924d5013 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -228,6 +228,13 @@ + + + com.belerweb + pinyin4j + 2.5.0 + + org.slf4j diff --git a/common/src/main/java/com/jeesite/common/lang/DateUtils.java b/common/src/main/java/com/jeesite/common/lang/DateUtils.java index 65a88d88..e94ec221 100644 --- a/common/src/main/java/com/jeesite/common/lang/DateUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/DateUtils.java @@ -8,6 +8,7 @@ import java.text.ParseException; import java.util.Calendar; import java.util.Date; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.FastDateFormat; /** @@ -278,6 +279,44 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { return new Date(time); } + /** + * 格式化为日期范围字符串 + * @param beginDate 2018-01-01 + * @param endDate 2018-01-31 + * @return 2018-01-01 ~ 2018-01-31 + * @author ThinkGem + */ + public static String formatDateBetweenString(Date beginDate, Date endDate){ + String begin = DateUtils.formatDate(beginDate); + String end = DateUtils.formatDate(endDate); + if (StringUtils.isNoneBlank(begin, end)){ + return begin + " ~ " + end; + } + return StringUtils.EMPTY; + } + + /** + * 解析日期范围字符串为日期对象 + * @param dateString 2018-01-01 ~ 2018-01-31 + * @return new Date[]{2018-01-01, 2018-01-31} + * @author ThinkGem + */ + public static Date[] parseDateBetweenString(String dateString){ + Date beginDate = null; Date endDate = null; + if (StringUtils.isNotBlank(dateString)){ + String[] ss = StringUtils.split(dateString, "~"); + if (ss != null && ss.length == 2){ + String begin = StringUtils.trim(ss[0]); + String end = StringUtils.trim(ss[1]); + if (StringUtils.isNoneBlank(begin, end)){ + beginDate = DateUtils.parseDate(begin); + endDate = DateUtils.parseDate(end); + } + } + } + return new Date[]{beginDate, endDate}; + } + // /** // * @param args // * @throws ParseException diff --git a/common/src/main/java/com/jeesite/common/text/PinyinUtils.java b/common/src/main/java/com/jeesite/common/text/PinyinUtils.java new file mode 100644 index 00000000..03684150 --- /dev/null +++ b/common/src/main/java/com/jeesite/common/text/PinyinUtils.java @@ -0,0 +1,106 @@ +package com.jeesite.common.text; + +import net.sourceforge.pinyin4j.PinyinHelper; +import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; +import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; +import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; +import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; + +/** + * 拼音工具类 + * @author ThinkGem + */ +public class PinyinUtils { + +// /** +// * 将字符串中的中文转化为拼音，其他字符不变 +// * @param inputString +// * @return +// */ +// public static String getPinyin(String inputString) { +// HanyuPinyinOutputFormat format = new HanyuPinyinOutputFormat(); +// format.setCaseType(HanyuPinyinCaseType.LOWERCASE); +// format.setToneType(HanyuPinyinToneType.WITHOUT_TONE); +// format.setVCharType(HanyuPinyinVCharType.WITH_V); +// +// char[] input = inputString.trim().toCharArray(); +// String output = ""; +// +// try { +// for (int i = 0; i < input.length; i++) { +// if (java.lang.Character.toString(input[i]).matches("[\\u4E00-\\u9FA5]+")) { +// String[] temp = PinyinHelper.toHanyuPinyinStringArray(input[i], format); +// output += temp[0]; +// } else { +// output += java.lang.Character.toString(input[i]); +// } +// } +// } catch (BadHanyuPinyinOutputFormatCombination e) { +// e.printStackTrace(); +// } +// return output; +// } + + /** + * 获取汉字串拼音首字母，替换调非法标示符字符，英文字符不变，去除空格 + * @param chinese 汉字串 + * @return 汉语拼音首字母 + */ + public static String getFirstSpell(String chinese) { + StringBuffer pybf = new StringBuffer(); + char[] arr = chinese.toCharArray(); + HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); + defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE); + defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE); + for (int i = 0; i < arr.length; i++) { + if (arr[i] > 128) { + try { + String[] temp = PinyinHelper.toHanyuPinyinStringArray(arr[i], defaultFormat); + if (temp != null) { + pybf.append(temp[0].charAt(0)); + } + } catch (BadHanyuPinyinOutputFormatCombination e) { + e.printStackTrace(); + } + } else { + pybf.append(arr[i]); + } + } + return pybf.toString().replaceAll("\\W", "").trim(); + } + + /** + * 获取汉字串全拼，英文字符不变 + * @param chinese 汉字串 + * @return 汉语拼音 + */ + public static String getFullSpell(String chinese) { + StringBuffer pybf = new StringBuffer(); + char[] arr = chinese.toCharArray(); + HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); + defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE); + defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE); + for (int i = 0; i < arr.length; i++) { + if (arr[i] > 128) { + try { + String[] ss = PinyinHelper.toHanyuPinyinStringArray(arr[i], defaultFormat); + if (ss != null && ss.length > 0){ + pybf.append(ss[0]); + } + } catch (BadHanyuPinyinOutputFormatCombination e) { + e.printStackTrace(); + } + } else { + pybf.append(arr[i]); + } + } + return pybf.toString(); + } + + public static void main(String[] args) { + String str = "你好，123，世界abc,~!#$_Sdf"; +// System.out.println(getPinyin(str)); + System.out.println(getFirstSpell(str)); + System.out.println(getFullSpell(str)); + } +} diff --git a/common/src/main/resources/static/my97/skin/WdatePicker.css b/common/src/main/resources/static/my97/skin/WdatePicker.css index d714a58b..40945fe3 100644 --- a/common/src/main/resources/static/my97/skin/WdatePicker.css +++ b/common/src/main/resources/static/my97/skin/WdatePicker.css @@ -1,4 +1,4 @@ .Wdate,.Wdate-date,.Wdate-datetime{background:#fff url(datePicker.gif) no-repeat right;} -.Wdate-date{width:105px!important}.Wdate-datetime{width:163px!important} +.Wdate-date{width:105px!important}.Wdate-datetime{width:147px!important} .WdateFmtErr{font-weight:bold;color:red;} .Wdate::-ms-clear{display:none;} \ No newline at end of file diff --git a/modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java similarity index 90% rename from modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.java rename to modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java index 861fade2..367c56c1 100644 --- a/modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java @@ -1,7 +1,7 @@ /** * Copyright (c) 2013-Now http://jeesite.com All rights reserved. */ -package com.jeesite.modules.db; +package com.jeesite.modules.sys.db; import java.io.File; @@ -62,7 +62,7 @@ public class InitCoreData extends BaseInitDataTests { * 清理日志表 */ public void initLog() throws Exception{ - clearTable(new Log()); + clearTable(Log.class); } @Autowired @@ -72,7 +72,7 @@ public class InitCoreData extends BaseInitDataTests { */ public void initConfig() throws Exception{ try{ - clearTable(new Config()); + clearTable(Config.class); initExcelData(Config.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -100,7 +100,7 @@ public class InitCoreData extends BaseInitDataTests { */ public void initModule() throws Exception{ try{ - clearTable(new Module()); + clearTable(Module.class); initExcelData(Module.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -129,7 +129,7 @@ public class InitCoreData extends BaseInitDataTests { */ public void initDict() throws Exception{ try{ - clearTable(new DictType()); + clearTable(DictType.class); initExcelData(DictType.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -145,7 +145,7 @@ public class InitCoreData extends BaseInitDataTests { } }); - clearTable(new DictData()); + clearTable(DictData.class); initExcelData(DictData.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -172,9 +172,9 @@ public class InitCoreData extends BaseInitDataTests { */ public void initRole() throws Exception{ try{ - clearTable(new Role()); - clearTable(new RoleMenu()); - clearTable(new RoleDataScope()); + clearTable(Role.class); + clearTable(RoleMenu.class); + clearTable(RoleDataScope.class); initExcelData(Role.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -203,8 +203,8 @@ public class InitCoreData extends BaseInitDataTests { */ public void initMenu() throws Exception{ try{ - clearTable(new Menu()); - clearTable(new RoleMenu()); + clearTable(Menu.class); + clearTable(RoleMenu.class); initExcelData(Menu.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -235,9 +235,9 @@ public class InitCoreData extends BaseInitDataTests { */ public void initUser() throws Exception{ try{ - clearTable(new User()); - clearTable(new UserRole()); - clearTable(new UserDataScope()); + clearTable(User.class); + clearTable(UserRole.class); + clearTable(UserDataScope.class); initExcelData(User.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -265,7 +265,7 @@ public class InitCoreData extends BaseInitDataTests { */ public void initArea() throws Exception{ try{ - clearTable(new Area()); + clearTable(Area.class); initExcelData(Area.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -292,7 +292,7 @@ public class InitCoreData extends BaseInitDataTests { */ public void initOffice() throws Exception{ try{ - clearTable(new Office()); + clearTable(Office.class); initExcelData(Office.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -319,8 +319,8 @@ public class InitCoreData extends BaseInitDataTests { */ public void initCompany() throws Exception{ try{ - clearTable(new Company()); - clearTable(new CompanyOffice()); + clearTable(Company.class); + clearTable(CompanyOffice.class); initExcelData(Company.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -347,7 +347,7 @@ public class InitCoreData extends BaseInitDataTests { */ public void initPost() throws Exception{ try{ - clearTable(new Post()); + clearTable(Post.class); initExcelData(Post.class, new MethodCallback() { @Override public Object execute(Object... params) { @@ -374,8 +374,8 @@ public class InitCoreData extends BaseInitDataTests { */ public void initEmpUser() throws Exception{ try{ - clearTable(new Employee()); - clearTable(new EmployeePost()); + clearTable(Employee.class); + clearTable(EmployeePost.class); initExcelData(EmpUser.class, new MethodCallback() { @Override public Object execute(Object... params) { diff --git a/modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx similarity index 100% rename from modules/core/src/main/java/com/jeesite/modules/db/InitCoreData.xlsx rename to modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx diff --git a/modules/core/src/main/resources/jeesite-core.yml b/modules/core/src/main/resources/jeesite-core.yml index c0aa75db..a46a25c1 100644 --- a/modules/core/src/main/resources/jeesite-core.yml +++ b/modules/core/src/main/resources/jeesite-core.yml @@ -5,22 +5,22 @@ # 数据库连接 jdbc: - - # Oracle 数据库配置 - type: oracle - driver: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@127.0.0.1:1521/orcl - username: jeesite - password: jeesite - testSql: SELECT 1 FROM DUAL - # Mysql 数据库配置 +# # Mysql 数据库配置 # type: mysql # driver: com.mysql.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite?useUnicode=true&characterEncoding=utf-8 +# url: jdbc:mysql://127.0.0.1:3306/jeesite4?useUnicode=true&characterEncoding=utf-8 +# username: root +# password: 123456 +# testSql: SELECT 1 + + # Oracle 数据库配置 +# type: oracle +# driver: oracle.jdbc.driver.OracleDriver +# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl # username: jeesite # password: jeesite -# testSql: SELECT 1 +# testSql: SELECT 1 FROM DUAL # Sql Server 数据库配置 # type: mssql diff --git a/web/db/mysql/test.sql b/web/db/mysql/test.sql index 29c92f06..805bc309 100644 --- a/web/db/mysql/test.sql +++ b/web/db/mysql/test.sql @@ -11,7 +11,7 @@ DROP TABLE IF EXISTS test_tree; /* Create Tables */ --- test_data +-- 测试数据 CREATE TABLE test_data ( id varchar(64) NOT NULL COMMENT '编号', @@ -22,10 +22,11 @@ CREATE TABLE test_data test_radio varchar(10) COMMENT '单选框', test_checkbox varchar(200) COMMENT '复选框', test_date timestamp COMMENT '日期选择', - test_datetime timestamp COMMENT '日期时间选择', + test_datetime timestamp COMMENT '日期时间', test_user_code varchar(64) COMMENT '用户选择', test_office_code varchar(64) COMMENT '部门选择', test_company_code varchar(64) COMMENT '公司选择', + test_area_code varchar(64) COMMENT '区域选择', status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）', create_by varchar(64) NOT NULL COMMENT '创建者', create_date timestamp NOT NULL COMMENT '创建时间', @@ -33,10 +34,10 @@ CREATE TABLE test_data update_date timestamp NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', PRIMARY KEY (id) -) COMMENT = 'test_data'; +) ENGINE = InnoDB COMMENT = '测试数据' DEFAULT CHARACTER SET utf8; --- test_data_child +-- 测试数据子表 CREATE TABLE test_data_child ( id varchar(64) NOT NULL COMMENT '编号', @@ -49,15 +50,16 @@ CREATE TABLE test_data_child test_radio varchar(10) COMMENT '单选框', test_checkbox varchar(200) COMMENT '复选框', test_date timestamp COMMENT '日期选择', - test_datetime timestamp COMMENT '日期时间选择', + test_datetime timestamp COMMENT '日期时间', test_user_code varchar(64) COMMENT '用户选择', test_office_code varchar(64) COMMENT '部门选择', test_company_code varchar(64) COMMENT '公司选择', + test_area_code varchar(64) COMMENT '区域选择', PRIMARY KEY (id) -) COMMENT = 'test_data_child'; +) ENGINE = InnoDB COMMENT = '测试数据子表' DEFAULT CHARACTER SET utf8; --- test_tree +-- 测试树表 CREATE TABLE test_tree ( id varchar(64) NOT NULL COMMENT '编号', @@ -76,7 +78,7 @@ CREATE TABLE test_tree update_date timestamp NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', PRIMARY KEY (id) -) COMMENT = 'test_tree'; +) ENGINE = InnoDB COMMENT = '测试树表' DEFAULT CHARACTER SET utf8; diff --git a/web/db/oracle/test.sql b/web/db/oracle/test.sql index 40ebca66..fd75d2e0 100644 --- a/web/db/oracle/test.sql +++ b/web/db/oracle/test.sql @@ -24,7 +24,8 @@ CREATE TABLE test_data test_datetime timestamp, test_user_code varchar2(64), test_office_code varchar2(64), - test_company_code varchar2(64), + test_area_code varchar2(64), + test_area_name nvarchar2(100), status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, create_date timestamp NOT NULL, @@ -51,7 +52,8 @@ CREATE TABLE test_data_child test_datetime timestamp, test_user_code varchar2(64), test_office_code varchar2(64), - test_company_code varchar2(64), + test_area_code varchar2(64), + test_area_name nvarchar2(100), PRIMARY KEY (id) ); @@ -93,7 +95,8 @@ COMMENT ON COLUMN test_data.test_date IS '日期选择'; COMMENT ON COLUMN test_data.test_datetime IS '日期时间'; COMMENT ON COLUMN test_data.test_user_code IS '用户选择'; COMMENT ON COLUMN test_data.test_office_code IS '部门选择'; -COMMENT ON COLUMN test_data.test_company_code IS '公司选择'; +COMMENT ON COLUMN test_data.test_area_code IS '区域选择'; +COMMENT ON COLUMN test_data.test_area_name IS '区域名称'; COMMENT ON COLUMN test_data.status IS '状态（0正常 1删除 2停用）'; COMMENT ON COLUMN test_data.create_by IS '创建者'; COMMENT ON COLUMN test_data.create_date IS '创建时间'; @@ -114,7 +117,8 @@ COMMENT ON COLUMN test_data_child.test_date IS '日期选择'; COMMENT ON COLUMN test_data_child.test_datetime IS '日期时间'; COMMENT ON COLUMN test_data_child.test_user_code IS '用户选择'; COMMENT ON COLUMN test_data_child.test_office_code IS '部门选择'; -COMMENT ON COLUMN test_data_child.test_company_code IS '公司选择'; +COMMENT ON COLUMN test_data_child.test_area_code IS '区域选择'; +COMMENT ON COLUMN test_data_child.test_area_name IS '区域名称'; COMMENT ON TABLE test_tree IS '测试树表'; COMMENT ON COLUMN test_tree.id IS '编号'; COMMENT ON COLUMN test_tree.parent_code IS '父级编号'; diff --git a/web/db/test.erm b/web/db/test.erm index 199fdf58..993c04f3 100644 --- a/web/db/test.erm +++ b/web/db/test.erm @@ -12,7 +12,7 @@ 0 1.0 0 - 31 + 0 128 128 @@ -647,6 +647,38 @@ status character(n) + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + 64 + null + false + null + false + false + false + + false + + 区域选择 + test_area_code + varchar(n) + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + 100 + null + false + null + false + false + false + + false + + 区域名称 + test_area_name + nvarchar(n) + cdc46f802299958a2b3140200410caf5cbeb8a27 200 @@ -663,22 +695,6 @@ test_checkbox varchar(n) - - a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4 - 64 - null - false - null - false - false - false - - false - - 公司选择 - test_company_code - varchar(n) - d829e707316a49d39e5a11da5f5d36030a856b86 64 @@ -1086,434 +1102,6 @@ - - 5435ef11ea53f170fe3491b199c113e47932e175 - 401 - 320 - Segoe UI - 9 - 36 - 36 - - 128 - 128 - 192 - - - - test_data - 测试数据 - - - - - - - 869fc70cf3a4e92e8056b40814df8e03f9f9efde - d82778c36626013cd39fd790da6f55a9762f0c76 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - ac02f2d1fff63fa66db583735eb1c8e9b466872f - 3e14b40dc07c134329a40752973acfad2ffdc48b - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 68b1f859bfea8bf1733964c0ccaf826fc05f3b1f - 8050d948828b16267482e9e3716219321f206b81 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6697b12cf2f6d7135570c2a581212ee067c13206 - 3664605e054c39531ca8e91aa4463c955a993357 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c - f7b189ecdc92c78bfaae9c736318ab6a5aedd396 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 791691b791efedc2d14867a152b4de58f4567326 - 6e4837ab55b592669ccc7ebfc8b1ed96a00607b3 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cdc46f802299958a2b3140200410caf5cbeb8a27 - 9fb81bdc12ed017f62e9dd4529025e536eff7f08 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - ffd84f2ff6d4918bb700605c5a46d3642eac6bcd - 9d9478798ed2766a81b0e5a8a022eb89d9c5cc34 - - - - - timestamp - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 38b1e9d7b26e11fab47d111ba7f951b0705aabe1 - c131dc5cb7ce6f1aa5e8d5f86f2002c8ae1bb8f6 - - - - - timestamp - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2eda719a62fb7e1d3face62555046d938abddda9 - cfe3c330968a9a824c2cf933b227887d3e9615ac - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5d32d32e3e7a7e115fe0ec3dff297801019dcd78 - 23041cb30875514136904ea11043c7ea1924f048 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4 - 463f8c1eeb29b2c87bebef4217202772169d1b67 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - - - - - - - - -
fb11bc47b30b0d8e468d3cd16ed660bf57bc8863217 @@ -1966,8 +1554,8 @@ - a5742c4c2c1fd5c201d5d34d977964f97f0fe2c4 - fd675547aecaf4cab579decef6612af613c9fb55 + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + 1afc7f146271f5c90ea811aa24c08ce25d12552e @@ -1998,6 +1586,500 @@ 0 + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + 343f0db997b913f299b0496c4306d3617ad708de + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + + + + + + + +
+ + 5435ef11ea53f170fe3491b199c113e47932e175 + 401 + 320 + Segoe UI + 9 + 36 + 36 + + 128 + 128 + 192 + + + + test_data + 测试数据 + + + + + + + 869fc70cf3a4e92e8056b40814df8e03f9f9efde + d82778c36626013cd39fd790da6f55a9762f0c76 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + ac02f2d1fff63fa66db583735eb1c8e9b466872f + 3e14b40dc07c134329a40752973acfad2ffdc48b + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 68b1f859bfea8bf1733964c0ccaf826fc05f3b1f + 8050d948828b16267482e9e3716219321f206b81 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6697b12cf2f6d7135570c2a581212ee067c13206 + 3664605e054c39531ca8e91aa4463c955a993357 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 68b9381c1fb6668186fef70f52fc0c14b1bd6f1c + f7b189ecdc92c78bfaae9c736318ab6a5aedd396 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 791691b791efedc2d14867a152b4de58f4567326 + 6e4837ab55b592669ccc7ebfc8b1ed96a00607b3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cdc46f802299958a2b3140200410caf5cbeb8a27 + 9fb81bdc12ed017f62e9dd4529025e536eff7f08 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + ffd84f2ff6d4918bb700605c5a46d3642eac6bcd + 9d9478798ed2766a81b0e5a8a022eb89d9c5cc34 + + + + + timestamp + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 38b1e9d7b26e11fab47d111ba7f951b0705aabe1 + c131dc5cb7ce6f1aa5e8d5f86f2002c8ae1bb8f6 + + + + + timestamp + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2eda719a62fb7e1d3face62555046d938abddda9 + cfe3c330968a9a824c2cf933b227887d3e9615ac + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5d32d32e3e7a7e115fe0ec3dff297801019dcd78 + 23041cb30875514136904ea11043c7ea1924f048 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 23b25e48c87be0e4f3952f7a8330594e9d511a4e + b6d5dc8745c0fa484ed6f14e90a42282ca1b285d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8bc627205b6e55931d09079fcd07bfacbbd38f41 + d244401ff7302bb5b75092016531952d093b238b + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd diff --git a/web/src/main/resources/jeesite.yml b/web/src/main/resources/jeesite.yml index e280aea0..5a84b9e5 100644 --- a/web/src/main/resources/jeesite.yml +++ b/web/src/main/resources/jeesite.yml @@ -6,6 +6,14 @@ # 数据库连接 jdbc: + # Mysql 数据库配置 +# type: mysql +# driver: com.mysql.jdbc.Driver +# url: jdbc:mysql://127.0.0.1:3306/jeesite4?useUnicode=true&characterEncoding=utf-8 +# username: root +# password: 123456 +# testSql: SELECT 1 + # Oracle 数据库配置 type: oracle driver: oracle.jdbc.driver.OracleDriver @@ -13,15 +21,7 @@ jdbc: username: jeesite password: jeesite testSql: SELECT 1 FROM DUAL - - # Mysql 数据库配置 -# type: mysql -# driver: com.mysql.jdbc.Driver -# url: jdbc:mysql://127.0.0.1:3306/jeesite?useUnicode=true&characterEncoding=utf-8 -# username: jeesite -# password: jeesite -# testSql: SELECT 1 - + # Redis 配置 redis: diff --git a/web/src/test/java/com/jeesite/test/InitCoreData.java b/web/src/test/java/com/jeesite/test/InitCoreData.java index 9ebcd9bd..f83f970a 100644 --- a/web/src/test/java/com/jeesite/test/InitCoreData.java +++ b/web/src/test/java/com/jeesite/test/InitCoreData.java @@ -5,7 +5,7 @@ package com.jeesite.test; import org.junit.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.Commit; +import org.springframework.test.annotation.Rollback; import com.jeesite.modules.config.Application; @@ -15,23 +15,23 @@ import com.jeesite.modules.config.Application; * @version 2017-10-22 */ @SpringBootTest(classes=Application.class) -@Commit -public class InitCoreData extends com.jeesite.modules.db.InitCoreData { +@Rollback(false) +public class InitCoreData extends com.jeesite.modules.sys.db.InitCoreData { @Test public void initCoreData() throws Exception{ initLog(); - initConfig(); - initModule(); - initDict(); - initRole(); - initMenu(); - initUser(); +// initConfig(); +// initModule(); +// initDict(); +// initRole(); +// initMenu(); +// initUser(); // initArea(); - initOffice(); - initCompany(); - initPost(); - initEmpUser(); +// initOffice(); +// initCompany(); +// initPost(); +// initEmpUser(); } } diff --git a/web/src/test/java/com/jeesite/test/InitGenData.java b/web/src/test/java/com/jeesite/test/InitGenData.java new file mode 100644 index 00000000..a1811fb3 --- /dev/null +++ b/web/src/test/java/com/jeesite/test/InitGenData.java @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + */ +package com.jeesite.test; + +import org.junit.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.Rollback; + +import com.jeesite.modules.config.Application; + + +/** + * 初始化代码生成表测试数据 + * @author ThinkGem + * @version 2017-10-22 + */ +@SpringBootTest(classes=Application.class) +@Rollback(false) +public class InitGenData extends com.jeesite.modules.gen.db.InitGenData { + + @Test + public void initGenData() throws Exception{ + initGenTestData(); + initGenTreeData(); + } + +}