From 4cef48e807af293749fdb34482104c7253504dd1 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 28 Feb 2018 21:06:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 17 ++- README.md | 14 +- .../jeesite/modules/sys/db/InitCoreData.xlsx | Bin 175927 -> 175929 bytes .../main/resources/config/jeesite-core.yml | 2 +- web/bin/init-data.bat | 16 ++- web/db/mysql/core.sql | 123 ----------------- web/db/mysql/gen.sql | 5 - web/db/oracle/core.sql | 124 ------------------ web/db/oracle/gen.sql | 5 - 9 files changed, 38 insertions(+), 268 deletions(-) diff --git a/.gitignore b/.gitignore index 252d9b7f..28af7ee2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,16 @@ -.classpath -.project -.class +*.class **/target **/webapp/userfiles **/WEB-INF/classes -**/logs/log*.log \ No newline at end of file +**/logs/log*.log + +.classpath +.project + +.idea +*.ipr +*.iml +*.iws + +.DS_Store +Thumbs.db \ No newline at end of file diff --git a/README.md b/README.md index 0bf8be5e..ad5e8e24 100644 --- a/README.md +++ b/README.md @@ -57,12 +57,12 @@ JeeSite 自开源以来已被广大爱好者用到了企业、政府、医疗、 # 技术交流方式 -* QQ 群： `127515876`、`209330483`、`223507718` +* QQ 群： `127515876`、`209330483`、`223507718` * 入群须知：目前为付费群，刚入群会有5分钟禁言，腾讯预设置的，无法解除，稍等片刻即可正常发言；由于群容量有限，为了维持运营千人QQ群的所需支付的QQ年费会员费用，故开启付费入群模式，申请者只需支付少量金额即可加入，这样也可以保证只有真实交流需求的人进入，避免闲杂做广告人员的乱入；新手提问前，请先阅读此[【文章】](http://www.dianbo.org/9238/stone/tiwendezhihui.htm)。 * 开源中国： * GitHub： * 作者博客： -* 开源问答： +* 问题反馈： * 官方网站： 论坛： # 关于授权协议声明 @@ -76,9 +76,15 @@ JeeSite 自开源以来已被广大爱好者用到了企业、政府、医疗、 7. 为了避免给您造成不必要的损失，请知晓：社区版最大允许10个用户同时登录，1万行数据。 8. 没有收入的开源软件不是好软件，请给我们一些动力吧，后面会推出**企业版**敬请期待。 -# Maven快照强制更新 +# 今后如何升级？ -Eclipse： 在web项目上右键，选择菜单 -> Maven -> Update Project...（或按Alt+F5） -> 点击 Select All 按钮 -> 选择 Force Update of Snapshots/Releases 复选框 -> 点击OK按钮即可 +尽量不修改web项目以外的项目，如jeesite-common、jeesite-modele-core，如果修改了，请尽量 Pull Requests 上来，否则代码编码将与官方不同步，将对你的日后升级带来困难。 + +JeeSite的小版本（4.0.x）升级是非常便捷的，你只需要进行Maven快照强制更新，即可将最新版的依赖jar更新到本地，下面介绍一下在Eclipse里如何操作： + +在web项目上右键，选择菜单 -> Maven -> Update Project...（或按Alt+F5） -> 点击 Select All 按钮 -> 选择 Force Update of Snapshots/Releases 复选框 -> 点击OK按钮即可。 + +如果进行相对大的版本（4.x.x）升级这里我们会附加一个声明，帮助你进行迁移操作。 # Git 全局设置技巧 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index f96ffd657372fa598ddb6cdb4ba774e777b87690..6cf0e06dabb3a20545d98360fd9a0fe7c061db89 100644 GIT binary patch delta 18318 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 delta 18244 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 L{8ycY0IB|8{kN@m diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index d6694d1a..b2b91205 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -348,7 +348,7 @@ web: # 系统主题名称，主题视图优先级最高，如果主题下无这个视图文件则访问默认视图 # 引入页面头部：'/themes/'+themeName+'/include/header.html' - # 引入页面为不：'/themes/'+themeName+'/include/footer.html' + # 引入页面尾部：'/themes/'+themeName+'/include/footer.html' themeName: default # MVC 拦截器 diff --git a/web/bin/init-data.bat b/web/bin/init-data.bat index d9528ef6..6bff8183 100644 --- a/web/bin/init-data.bat +++ b/web/bin/init-data.bat @@ -11,11 +11,23 @@ pause echo. echo [Ϣ] ˲ݱָʼ״̬ echo. -echo [Ϣ] ȷϼ𣿷رմڡ +echo [Ϣ] ȷϼ𣿷رմڡ5 echo. pause echo. -echo [Ϣ] ȷϼ𣿷رմڡ +echo [Ϣ] ȷϼ𣿷رմڡ4 +echo. +pause +echo. +echo [Ϣ] ȷϼ𣿷رմڡ3 +echo. +pause +echo. +echo [Ϣ] ȷϼ𣿷رմڡ2 +echo. +pause +echo. +echo [Ϣ] ȷϼ𣿷رմڡ1 echo. pause echo. diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index 2438d1ba..36368f53 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -1,128 +1,5 @@ SET SESSION FOREIGN_KEY_CHECKS=0; -/* Drop Indexes */ - -DROP INDEX idx_sys_area_pc ON js_sys_area; -DROP INDEX idx_sys_area_ts ON js_sys_area; -DROP INDEX idx_sys_area_status ON js_sys_area; -DROP INDEX idx_sys_area_pcs ON js_sys_area; -DROP INDEX idx_sys_area_tss ON js_sys_area; -DROP INDEX idx_sys_company_cc ON js_sys_company; -DROP INDEX idx_sys_company_pc ON js_sys_company; -DROP INDEX idx_sys_company_ts ON js_sys_company; -DROP INDEX idx_sys_company_status ON js_sys_company; -DROP INDEX idx_sys_company_vc ON js_sys_company; -DROP INDEX idx_sys_company_pcs ON js_sys_company; -DROP INDEX idx_sys_company_tss ON js_sys_company; -DROP INDEX idx_sys_config_key ON js_sys_config; -DROP INDEX idx_sys_dict_data_cc ON js_sys_dict_data; -DROP INDEX idx_sys_dict_data_dt ON js_sys_dict_data; -DROP INDEX idx_sys_dict_data_pc ON js_sys_dict_data; -DROP INDEX idx_sys_dict_data_status ON js_sys_dict_data; -DROP INDEX idx_sys_dict_data_pcs ON js_sys_dict_data; -DROP INDEX idx_sys_dict_data_ts ON js_sys_dict_data; -DROP INDEX idx_sys_dict_data_tss ON js_sys_dict_data; -DROP INDEX idx_sys_dict_data_dv ON js_sys_dict_data; -DROP INDEX idx_sys_dict_type_is ON js_sys_dict_type; -DROP INDEX idx_sys_dict_type_status ON js_sys_dict_type; -DROP INDEX idx_sys_employee_cco ON js_sys_employee; -DROP INDEX idx_sys_employee_cc ON js_sys_employee; -DROP INDEX idx_sys_employee_ud ON js_sys_employee; -DROP INDEX idx_sys_employee_oc ON js_sys_employee; -DROP INDEX idx_sys_employee_status ON js_sys_employee; -DROP INDEX idx_sys_file_entity_md5 ON js_sys_file_entity; -DROP INDEX idx_sys_file_entity_size ON js_sys_file_entity; -DROP INDEX idx_sys_file_biz_ft ON js_sys_file_upload; -DROP INDEX idx_sys_file_biz_fi ON js_sys_file_upload; -DROP INDEX idx_sys_file_biz_status ON js_sys_file_upload; -DROP INDEX idx_sys_file_biz_cb ON js_sys_file_upload; -DROP INDEX idx_sys_file_biz_ud ON js_sys_file_upload; -DROP INDEX idx_sys_file_biz_bt ON js_sys_file_upload; -DROP INDEX idx_sys_file_biz_bk ON js_sys_file_upload; -DROP INDEX idx_sys_job_status ON js_sys_job; -DROP INDEX idx_sys_job_log_jn ON js_sys_job_log; -DROP INDEX idx_sys_job_log_jg ON js_sys_job_log; -DROP INDEX idx_sys_job_log_t ON js_sys_job_log; -DROP INDEX idx_sys_job_log_e ON js_sys_job_log; -DROP INDEX idx_sys_job_log_ie ON js_sys_job_log; -DROP INDEX idx_sys_lang_code ON js_sys_lang; -DROP INDEX idx_sys_lang_type ON js_sys_lang; -DROP INDEX idx_sys_log_cd ON js_sys_log; -DROP INDEX idx_sys_log_cc ON js_sys_log; -DROP INDEX idx_sys_log_lt ON js_sys_log; -DROP INDEX idx_sys_log_bk ON js_sys_log; -DROP INDEX idx_sys_log_bt ON js_sys_log; -DROP INDEX idx_sys_log_ie ON js_sys_log; -DROP INDEX idx_sys_menu_pc ON js_sys_menu; -DROP INDEX idx_sys_menu_ts ON js_sys_menu; -DROP INDEX idx_sys_menu_status ON js_sys_menu; -DROP INDEX idx_sys_menu_mt ON js_sys_menu; -DROP INDEX idx_sys_menu_pss ON js_sys_menu; -DROP INDEX idx_sys_menu_tss ON js_sys_menu; -DROP INDEX idx_sys_menu_sc ON js_sys_menu; -DROP INDEX idx_sys_menu_is ON js_sys_menu; -DROP INDEX idx_sys_menu_mcs ON js_sys_menu; -DROP INDEX idx_sys_module_status ON js_sys_module; -DROP INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner; -DROP INDEX idx_sys_msg_inner_status ON js_sys_msg_inner; -DROP INDEX idx_sys_msg_inner_cl ON js_sys_msg_inner; -DROP INDEX idx_sys_msg_inner_sc ON js_sys_msg_inner; -DROP INDEX idx_sys_msg_inner_sd ON js_sys_msg_inner; -DROP INDEX idx_sys_msg_inner_r_mi ON js_sys_msg_inner_record; -DROP INDEX idx_sys_msg_inner_r_rc ON js_sys_msg_inner_record; -DROP INDEX idx_sys_msg_inner_r_ruc ON js_sys_msg_inner_record; -DROP INDEX idx_sys_msg_inner_r_status ON js_sys_msg_inner_record; -DROP INDEX idx_sys_msg_inner_r_star ON js_sys_msg_inner_record; -DROP INDEX idx_sys_msg_push_type ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_rc ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_uc ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_suc ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_pd ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_ps ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_rs ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_bk ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_bt ON js_sys_msg_push; -DROP INDEX idx_sys_msg_push_imp ON js_sys_msg_push; -DROP INDEX idx_sys_msg_pushw_type ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_rc ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_uc ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_suc ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_pd ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_ps ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_rs ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_bk ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_bt ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_pushw_imp ON js_sys_msg_push_wait; -DROP INDEX idx_sys_msg_tpl_key ON js_sys_msg_template; -DROP INDEX idx_sys_msg_tpl_type ON js_sys_msg_template; -DROP INDEX idx_sys_msg_tpl_status ON js_sys_msg_template; -DROP INDEX idx_sys_office_cc ON js_sys_office; -DROP INDEX idx_sys_office_pc ON js_sys_office; -DROP INDEX idx_sys_office_pcs ON js_sys_office; -DROP INDEX idx_sys_office_status ON js_sys_office; -DROP INDEX idx_sys_office_ot ON js_sys_office; -DROP INDEX idx_sys_office_vc ON js_sys_office; -DROP INDEX idx_sys_office_ts ON js_sys_office; -DROP INDEX idx_sys_office_tss ON js_sys_office; -DROP INDEX idx_sys_post_cc ON js_sys_post; -DROP INDEX idx_sys_post_status ON js_sys_post; -DROP INDEX idx_sys_post_ps ON js_sys_post; -DROP INDEX idx_sys_role_cc ON js_sys_role; -DROP INDEX idx_sys_role_is ON js_sys_role; -DROP INDEX idx_sys_role_status ON js_sys_role; -DROP INDEX idx_sys_role_rs ON js_sys_role; -DROP INDEX idx_sys_user_lc ON js_sys_user; -DROP INDEX idx_sys_user_email ON js_sys_user; -DROP INDEX idx_sys_user_mobile ON js_sys_user; -DROP INDEX idx_sys_user_wo ON js_sys_user; -DROP INDEX idx_sys_user_imei ON js_sys_user; -DROP INDEX idx_sys_user_rt ON js_sys_user; -DROP INDEX idx_sys_user_rc ON js_sys_user; -DROP INDEX idx_sys_user_mt ON js_sys_user; -DROP INDEX idx_sys_user_us ON js_sys_user; -DROP INDEX idx_sys_user_ud ON js_sys_user; -DROP INDEX idx_sys_user_status ON js_sys_user; -DROP INDEX idx_sys_user_cc ON js_sys_user; diff --git a/web/db/mysql/gen.sql b/web/db/mysql/gen.sql index 74d29b6f..2ae78e5b 100644 --- a/web/db/mysql/gen.sql +++ b/web/db/mysql/gen.sql @@ -1,10 +1,5 @@ SET SESSION FOREIGN_KEY_CHECKS=0; -/* Drop Indexes */ - -DROP INDEX idx_gen_table_ptn ON js_gen_table; -DROP INDEX idx_gen_table_column_tn ON js_gen_table_column; - /* Drop Tables */ diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 7cf740c0..b8248a7e 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -1,128 +1,4 @@ -/* Drop Indexes */ - -DROP INDEX idx_sys_area_pc; -DROP INDEX idx_sys_area_ts; -DROP INDEX idx_sys_area_status; -DROP INDEX idx_sys_area_pcs; -DROP INDEX idx_sys_area_tss; -DROP INDEX idx_sys_company_cc; -DROP INDEX idx_sys_company_pc; -DROP INDEX idx_sys_company_ts; -DROP INDEX idx_sys_company_status; -DROP INDEX idx_sys_company_vc; -DROP INDEX idx_sys_company_pcs; -DROP INDEX idx_sys_company_tss; -DROP INDEX idx_sys_config_key; -DROP INDEX idx_sys_dict_data_cc; -DROP INDEX idx_sys_dict_data_dt; -DROP INDEX idx_sys_dict_data_pc; -DROP INDEX idx_sys_dict_data_status; -DROP INDEX idx_sys_dict_data_pcs; -DROP INDEX idx_sys_dict_data_ts; -DROP INDEX idx_sys_dict_data_tss; -DROP INDEX idx_sys_dict_data_dv; -DROP INDEX idx_sys_dict_type_is; -DROP INDEX idx_sys_dict_type_status; -DROP INDEX idx_sys_employee_cco; -DROP INDEX idx_sys_employee_cc; -DROP INDEX idx_sys_employee_ud; -DROP INDEX idx_sys_employee_oc; -DROP INDEX idx_sys_employee_status; -DROP INDEX idx_sys_file_entity_md5; -DROP INDEX idx_sys_file_entity_size; -DROP INDEX idx_sys_file_biz_ft; -DROP INDEX idx_sys_file_biz_fi; -DROP INDEX idx_sys_file_biz_status; -DROP INDEX idx_sys_file_biz_cb; -DROP INDEX idx_sys_file_biz_ud; -DROP INDEX idx_sys_file_biz_bt; -DROP INDEX idx_sys_file_biz_bk; -DROP INDEX idx_sys_job_status; -DROP INDEX idx_sys_job_log_jn; -DROP INDEX idx_sys_job_log_jg; -DROP INDEX idx_sys_job_log_t; -DROP INDEX idx_sys_job_log_e; -DROP INDEX idx_sys_job_log_ie; -DROP INDEX idx_sys_lang_code; -DROP INDEX idx_sys_lang_type; -DROP INDEX idx_sys_log_cd; -DROP INDEX idx_sys_log_cc; -DROP INDEX idx_sys_log_lt; -DROP INDEX idx_sys_log_bk; -DROP INDEX idx_sys_log_bt; -DROP INDEX idx_sys_log_ie; -DROP INDEX idx_sys_menu_pc; -DROP INDEX idx_sys_menu_ts; -DROP INDEX idx_sys_menu_status; -DROP INDEX idx_sys_menu_mt; -DROP INDEX idx_sys_menu_pss; -DROP INDEX idx_sys_menu_tss; -DROP INDEX idx_sys_menu_sc; -DROP INDEX idx_sys_menu_is; -DROP INDEX idx_sys_menu_mcs; -DROP INDEX idx_sys_module_status; -DROP INDEX idx_sys_msg_inner_cb; -DROP INDEX idx_sys_msg_inner_status; -DROP INDEX idx_sys_msg_inner_cl; -DROP INDEX idx_sys_msg_inner_sc; -DROP INDEX idx_sys_msg_inner_sd; -DROP INDEX idx_sys_msg_inner_r_mi; -DROP INDEX idx_sys_msg_inner_r_rc; -DROP INDEX idx_sys_msg_inner_r_ruc; -DROP INDEX idx_sys_msg_inner_r_status; -DROP INDEX idx_sys_msg_inner_r_star; -DROP INDEX idx_sys_msg_push_type; -DROP INDEX idx_sys_msg_push_rc; -DROP INDEX idx_sys_msg_push_uc; -DROP INDEX idx_sys_msg_push_suc; -DROP INDEX idx_sys_msg_push_pd; -DROP INDEX idx_sys_msg_push_ps; -DROP INDEX idx_sys_msg_push_rs; -DROP INDEX idx_sys_msg_push_bk; -DROP INDEX idx_sys_msg_push_bt; -DROP INDEX idx_sys_msg_push_imp; -DROP INDEX idx_sys_msg_pushw_type; -DROP INDEX idx_sys_msg_pushw_rc; -DROP INDEX idx_sys_msg_pushw_uc; -DROP INDEX idx_sys_msg_pushw_suc; -DROP INDEX idx_sys_msg_pushw_pd; -DROP INDEX idx_sys_msg_pushw_ps; -DROP INDEX idx_sys_msg_pushw_rs; -DROP INDEX idx_sys_msg_pushw_bk; -DROP INDEX idx_sys_msg_pushw_bt; -DROP INDEX idx_sys_msg_pushw_imp; -DROP INDEX idx_sys_msg_tpl_key; -DROP INDEX idx_sys_msg_tpl_type; -DROP INDEX idx_sys_msg_tpl_status; -DROP INDEX idx_sys_office_cc; -DROP INDEX idx_sys_office_pc; -DROP INDEX idx_sys_office_pcs; -DROP INDEX idx_sys_office_status; -DROP INDEX idx_sys_office_ot; -DROP INDEX idx_sys_office_vc; -DROP INDEX idx_sys_office_ts; -DROP INDEX idx_sys_office_tss; -DROP INDEX idx_sys_post_cc; -DROP INDEX idx_sys_post_status; -DROP INDEX idx_sys_post_ps; -DROP INDEX idx_sys_role_cc; -DROP INDEX idx_sys_role_is; -DROP INDEX idx_sys_role_status; -DROP INDEX idx_sys_role_rs; -DROP INDEX idx_sys_user_lc; -DROP INDEX idx_sys_user_email; -DROP INDEX idx_sys_user_mobile; -DROP INDEX idx_sys_user_wo; -DROP INDEX idx_sys_user_imei; -DROP INDEX idx_sys_user_rt; -DROP INDEX idx_sys_user_rc; -DROP INDEX idx_sys_user_mt; -DROP INDEX idx_sys_user_us; -DROP INDEX idx_sys_user_ud; -DROP INDEX idx_sys_user_status; -DROP INDEX idx_sys_user_cc; - /* Drop Tables */ diff --git a/web/db/oracle/gen.sql b/web/db/oracle/gen.sql index c3d18ad0..8eea2996 100644 --- a/web/db/oracle/gen.sql +++ b/web/db/oracle/gen.sql @@ -1,9 +1,4 @@ -/* Drop Indexes */ - -DROP INDEX idx_gen_table_ptn; -DROP INDEX idx_gen_table_column_tn; - /* Drop Tables */