tangbin vor 1 Jahr
Ursprung
Commit
40b95e6370
100 geänderte Dateien mit 309 neuen und 308 gelöschten Zeilen
  1. 2 2
      pom.xml
  2. 1 1
      wjp-admin/Dockerfile
  3. 9 9
      wjp-admin/db/dm8.sql
  4. 5 5
      wjp-admin/db/generator/dm8.sql
  5. 5 5
      wjp-admin/db/generator/mysql.sql
  6. 5 5
      wjp-admin/db/generator/oracle.sql
  7. 5 5
      wjp-admin/db/generator/postgresql.sql
  8. 5 5
      wjp-admin/db/generator/sqlserver.sql
  9. 3 3
      wjp-admin/db/generator/template/add-or-update.vue.ftl
  10. 2 2
      wjp-admin/db/generator/template/list.vue.ftl
  11. 9 9
      wjp-admin/db/mysql.sql
  12. 9 9
      wjp-admin/db/oracle.sql
  13. 9 9
      wjp-admin/db/postgresql.sql
  14. 9 9
      wjp-admin/db/sqlserver.sql
  15. 2 2
      wjp-admin/src/main/java/com/wjp/AdminApplication.java
  16. 3 3
      wjp-admin/src/main/java/com/wjp/common/annotation/DataFilter.java
  17. 3 3
      wjp-admin/src/main/java/com/wjp/common/annotation/LogOperation.java
  18. 5 4
      wjp-admin/src/main/java/com/wjp/common/aspect/DataFilterAspect.java
  19. 3 3
      wjp-admin/src/main/java/com/wjp/common/aspect/LogOperationAspect.java
  20. 3 3
      wjp-admin/src/main/java/com/wjp/common/config/MybatisPlusConfig.java
  21. 6 6
      wjp-admin/src/main/java/com/wjp/common/config/SwaggerConfig.java
  22. 6 6
      wjp-admin/src/main/java/com/wjp/common/exception/MyExceptionHandler.java
  23. 3 3
      wjp-admin/src/main/java/com/wjp/common/handler/FieldMetaObjectHandler.java
  24. 3 3
      wjp-admin/src/main/java/com/wjp/common/interceptor/DataFilterInterceptor.java
  25. 3 3
      wjp-admin/src/main/java/com/wjp/common/interceptor/DataScope.java
  26. 3 3
      wjp-admin/src/main/java/com/wjp/common/utils/ExcelDataListener.java
  27. 3 3
      wjp-admin/src/main/java/com/wjp/common/utils/ExcelUtils.java
  28. 3 3
      wjp-admin/src/main/java/com/wjp/common/validator/group/AliyunGroup.java
  29. 3 3
      wjp-admin/src/main/java/com/wjp/common/validator/group/FastDFSGroup.java
  30. 3 3
      wjp-admin/src/main/java/com/wjp/common/validator/group/LocalGroup.java
  31. 3 3
      wjp-admin/src/main/java/com/wjp/common/validator/group/MinioGroup.java
  32. 3 3
      wjp-admin/src/main/java/com/wjp/common/validator/group/QcloudGroup.java
  33. 3 3
      wjp-admin/src/main/java/com/wjp/common/validator/group/QiniuGroup.java
  34. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/controller/ExcelDataController.java
  35. 3 3
      wjp-admin/src/main/java/com/wjp/modules/demo/controller/NewsController.java
  36. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/controller/ProductController.java
  37. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/dao/ExcelDataDao.java
  38. 3 3
      wjp-admin/src/main/java/com/wjp/modules/demo/dao/NewsDao.java
  39. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/dao/ProductDao.java
  40. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/dao/ProductParamsDao.java
  41. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/dto/ExcelDataDTO.java
  42. 3 3
      wjp-admin/src/main/java/com/wjp/modules/demo/dto/NewsDTO.java
  43. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/dto/ProductDTO.java
  44. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/dto/ProductParamsDTO.java
  45. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/entity/ExcelDataEntity.java
  46. 3 3
      wjp-admin/src/main/java/com/wjp/modules/demo/entity/NewsEntity.java
  47. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/entity/ProductEntity.java
  48. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/entity/ProductParamsEntity.java
  49. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/excel/ExcelDataExcel.java
  50. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/service/ExcelDataService.java
  51. 3 3
      wjp-admin/src/main/java/com/wjp/modules/demo/service/NewsService.java
  52. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/service/ProductParamsService.java
  53. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/service/ProductService.java
  54. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/service/impl/ExcelDataServiceImpl.java
  55. 2 2
      wjp-admin/src/main/java/com/wjp/modules/demo/service/impl/NewsServiceImpl.java
  56. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/service/impl/ProductParamsServiceImpl.java
  57. 1 1
      wjp-admin/src/main/java/com/wjp/modules/demo/service/impl/ProductServiceImpl.java
  58. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/config/DataSourceInfo.java
  59. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/AbstractQuery.java
  60. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/DmQuery.java
  61. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/MySqlQuery.java
  62. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/OracleQuery.java
  63. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/PostgreSqlQuery.java
  64. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/SqlServerQuery.java
  65. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/controller/BaseClassController.java
  66. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/controller/DataSourceController.java
  67. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/controller/FieldTypeController.java
  68. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/controller/GenParamController.java
  69. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/controller/GeneratorController.java
  70. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/controller/ProjectController.java
  71. 6 6
      wjp-admin/src/main/java/com/wjp/modules/devtools/controller/TemplateController.java
  72. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/dao/BaseClassDao.java
  73. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/dao/DataSourceDao.java
  74. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/dao/FieldTypeDao.java
  75. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/dao/GeneratorMenuDao.java
  76. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/dao/TableFieldDao.java
  77. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/dao/TableInfoDao.java
  78. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/dao/TemplateDao.java
  79. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/BaseClassEntity.java
  80. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/DataSourceEntity.java
  81. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/FieldTypeEntity.java
  82. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/GenParam.java
  83. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/MenuEntity.java
  84. 1 1
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/ProjectEntity.java
  85. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/TableFieldEntity.java
  86. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/TableInfoEntity.java
  87. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/entity/TemplateEntity.java
  88. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/BaseClassService.java
  89. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/DataSourceService.java
  90. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/FieldTypeService.java
  91. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/GeneratorService.java
  92. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/TableFieldService.java
  93. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/TableInfoService.java
  94. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/TemplateService.java
  95. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/BaseClassServiceImpl.java
  96. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/DataSourceServiceImpl.java
  97. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/FieldTypeServiceImpl.java
  98. 5 5
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/GeneratorServiceImpl.java
  99. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/TableFieldServiceImpl.java
  100. 3 3
      wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/TableInfoServiceImpl.java

+ 2 - 2
pom.xml

@@ -7,8 +7,8 @@
     <packaging>pom</packaging>
 
     <name>wjp-project40</name>
-    <description>人人权限专业版</description>
-    <url>https://www.wjp.io</url>
+    <description>佳缘科技后台管理系统</description>
+    <url>https://www.scjydz.com</url>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>

+ 1 - 1
wjp-admin/Dockerfile

@@ -2,6 +2,6 @@ FROM eclipse-temurin:17-jre
 EXPOSE 8081
 
 VOLUME /tmp
-ADD renren-admin.jar /app.jar
+ADD wjp-admin.jar /app.jar
 RUN bash -c 'touch /app.jar'
 ENTRYPOINT ["java","-jar","/app.jar"]

+ 9 - 9
wjp-admin/db/dm8.sql

@@ -886,8 +886,8 @@ COMMENT ON COLUMN mp_menu.update_date IS '更新时间';
 
 
 -- 初始数据
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@renren.io', '13612345678', 1, null, 1, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@renren.io', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@scjydz.com', '13612345678', 1, null, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@scjydz.com', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, now(), 1067246875800000001, now());
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000002, '0', NULL, NULL, 0, 0, 'icon-safetycertificate', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000003, 1067246875800000055, NULL, 'sys:user:save,sys:dept:list,sys:role:list', 1, 0, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
@@ -1245,7 +1245,7 @@ INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, u
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000063, 1067246875800000066, '1067246875800000066', '长沙分公司', 1, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000064, 1067246875800000066, '1067246875800000066', '上海分公司', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000065, 1067246875800000064, '1067246875800000066,1067246875800000064', '市场部', 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '人人开源集团', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '佳缘科技股份有限公司', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000067, 1067246875800000064, '1067246875800000066,1067246875800000064', '销售部', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000068, 1067246875800000063, '1067246875800000066,1067246875800000063', '产品部', 1, 1067246875800000001, now(), 1067246875800000001, now());
 
@@ -1268,15 +1268,15 @@ INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort
 
 INSERT INTO sys_sms(id, sms_code, platform, sms_config, remark, creator, create_date, updater, update_date) VALUES (1228954061084676097, '1001', 1, '{"aliyunAccessKeyId":"1","aliyunAccessKeySecret":"1","aliyunSignName":"1","aliyunTemplateCode":"1","qcloudAppKey":"","qcloudSignName":"","qcloudTemplateId":"","qiniuAccessKey":"","qiniuSecretKey":"","qiniuTemplateId":""}', '', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.renren.io","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"renren-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"renrenio_test@163.com","password":"renren123456"}', 0, '邮件配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.scjydz.com","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"wjp-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"javatangbin@163.com","password":"123456"}', 0, '邮件配置信息', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'renren', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'wjp', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '人人开源注册验证码', '<p>人人开源注册验证码:${code}</p>', now());
+INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '注册验证码', '<p>注册验证码:${code}</p>', now());
 
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '人人企业版', 3600.00, 1, 1067246875800000001, now(), now());
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '人人微服务版', 4800.00, 0, 1067246875800000001, NULL, now());
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '测试产品1', 3600.00, 1, 1067246875800000001, now(), now());
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '测试产品2', 4800.00, 0, 1067246875800000001, NULL, now());
 
 INSERT INTO tb_alipay_notify_log(id, out_trade_no, total_amount, buyer_pay_amount, receipt_amount, invoice_amount, notify_id, buyer_id, seller_id, trade_no, trade_status, create_date) VALUES (1343493644518195201, 1343491774781419523, 3600.00, 3600.00, 3600.00, 3600.00, '2020122800222174658006930510128003', '2088102177806934', '2088102177441441', '2020122822001406930501194003', 'TRADE_SUCCESS', now());
 

+ 5 - 5
wjp-admin/db/generator/dm8.sql

@@ -230,10 +230,10 @@ INSERT INTO sys_language(table_name, table_id, field_name, field_value, language
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN');
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW');
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"io.renren","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\renrenio\\security-enterprise\\renren-admin","frontendPath":"D:\\renrenio\\security-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"com.wjp","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\wjp\\wjp-enterprise\\wjp-admin","frontendPath":"D:\\wjp\\wjp-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '专业版', now());
-INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'renren', '123456', 0, now());
+INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '', now());
+INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/wjp_project40?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'root', '123456', 0, now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152452777352425473, 'datetime', 'Date', 'java.util.Date', now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453412995002369, 'date', 'Date', 'java.util.Date', now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453603525455873, 'tinyint', 'Integer', NULL, now());
@@ -266,7 +266,7 @@ INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455184669011969, 'int2', 'Integer', NULL, now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455217359417345, 'numeric', 'BigDecimal', 'java.math.BigDecimal', now());
 
-INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'io.renren', '3.0', 'D:\\renrenio\\security-enterprise\\renren-admin', 'D:\\renrenio\\security-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, now());
+INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'com.wjp', '3.0', 'D:\\wjp\\wjp-enterprise\\wjp-admin', 'D:\\wjp\\wjp-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, now());
 
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671502385153, 1308327671447859201, 'gen_test_data', 'id', 'BIGINT', 'id', 'id', 'Long', NULL, 1, 0, 0, 0, 0, '=', 'text', NULL, NULL, 0);
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773761, 1308327671447859201, 'gen_test_data', 'username', 'VARCHAR', '用户名', 'username', 'String', NULL, 0, 1, 1, 1, 1, 'like', 'text', NULL, NULL, 1);
@@ -293,7 +293,7 @@ INSERT INTO gen_template(id, name, file_name, content, path, status, create_date
 INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304293015698169857, 'add-or-update.vue', '${classname}-add-or-update.vue', '', '${frontendPath}/src/views/${moduleName}', 0, now());
 
 
-INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@renren.io', 0, '<p>人人开源代码生成器!</p>', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@scjydz.com', 0, '<p>代码生成器!</p>', 1067246875800000001, now(), 1067246875800000001, now());
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1340949288542347266, 1302850622416084993, 'form-generator/form', '', 0, 'icon-edit-square', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1340949288542347266, 'name', 'Page Design', 'en-US');

+ 5 - 5
wjp-admin/db/generator/mysql.sql

@@ -142,10 +142,10 @@ INSERT INTO sys_language(table_name, table_id, field_name, field_value, language
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN');
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW');
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"io.renren","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\\\renrenio\\\\security-enterprise\\\\renren-admin","frontendPath":"D:\\\\renrenio\\\\security-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"com.wjp","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\\\wjp\\\\wjp-enterprise\\\\wjp-admin","frontendPath":"D:\\\\wjp\\\\wjp-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '专业版', now());
-INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'renren', '123456', 0, now());
+INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '', now());
+INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/wjp_project40?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'root', '123456', 0, now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152452777352425473, 'datetime', 'Date', 'java.util.Date', now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453412995002369, 'date', 'Date', 'java.util.Date', now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453603525455873, 'tinyint', 'Integer', NULL, now());
@@ -178,7 +178,7 @@ INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455184669011969, 'int2', 'Integer', NULL, now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455217359417345, 'numeric', 'BigDecimal', 'java.math.BigDecimal', now());
 
-INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'io.renren', '3.0', 'D:\\renrenio\\security-enterprise\\renren-admin', 'D:\\renrenio\\security-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, now());
+INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'com.wjp', '3.0', 'D:\\wjp\\wjp-enterprise\\wjp-admin', 'D:\\wjp\\wjp-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, now());
 
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671502385153, 1308327671447859201, 'gen_test_data', 'id', 'BIGINT', 'id', 'id', 'Long', NULL, 1, 0, 0, 0, 0, '=', 'text', NULL, NULL, 0);
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773761, 1308327671447859201, 'gen_test_data', 'username', 'VARCHAR', '用户名', 'username', 'String', NULL, 0, 1, 1, 1, 1, 'like', 'text', NULL, NULL, 1);
@@ -203,7 +203,7 @@ INSERT INTO gen_template(id, name, file_name, content, path, status, create_date
 INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304292858898309122, 'list.vue', '${classname}.vue', '', '${frontendPath}/src/views/${moduleName}', 0, now());
 INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304293015698169857, 'add-or-update.vue', '${classname}-add-or-update.vue', '', '${frontendPath}/src/views/${moduleName}', 0, now());
 
-INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@renren.io', 0, '<p>人人开源代码生成器!</p>', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@scjydz.com', 0, '<p>代码生成器!</p>', 1067246875800000001, now(), 1067246875800000001, now());
 
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1340949288542347266, 1302850622416084993, 'form-generator/form', '', 0, 0, 'icon-edit-square', 0, 1067246875800000001, now(), 1067246875800000001, now());

+ 5 - 5
wjp-admin/db/generator/oracle.sql

@@ -229,10 +229,10 @@ INSERT INTO sys_language(table_name, table_id, field_name, field_value, language
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN');
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW');
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"io.renren","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\renrenio\\security-enterprise\\renren-admin","frontendPath":"D:\\renrenio\\security-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"com.wjp","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\wjp\\wjp-enterprise\\wjp-admin","frontendPath":"D:\\wjp\\wjp-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 
-INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '专业版', CURRENT_DATE);
-INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'renren', '123456', 0, CURRENT_DATE);
+INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '', CURRENT_DATE);
+INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/wjp_project40?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'root', '123456', 0, CURRENT_DATE);
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152452777352425473, 'datetime', 'Date', 'java.util.Date', CURRENT_DATE);
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453412995002369, 'date', 'Date', 'java.util.Date', CURRENT_DATE);
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453603525455873, 'tinyint', 'Integer', NULL, CURRENT_DATE);
@@ -265,7 +265,7 @@ INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455184669011969, 'int2', 'Integer', NULL, CURRENT_DATE);
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455217359417345, 'numeric', 'BigDecimal', 'java.math.BigDecimal', CURRENT_DATE);
 
-INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'io.renren', '3.0', 'D:\\renrenio\\security-enterprise\\renren-admin', 'D:\\renrenio\\security-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, CURRENT_DATE);
+INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'com.wjp', '3.0', 'D:\\wjp\\wjp-enterprise\\wjp-admin', 'D:\\wjp\\wjp-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, CURRENT_DATE);
 
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671502385153, 1308327671447859201, 'gen_test_data', 'id', 'BIGINT', 'id', 'id', 'Long', NULL, 1, 0, 0, 0, 0, '=', 'text', NULL, NULL, 0);
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773761, 1308327671447859201, 'gen_test_data', 'username', 'VARCHAR', '用户名', 'username', 'String', NULL, 0, 1, 1, 1, 1, 'like', 'text', NULL, NULL, 1);
@@ -290,7 +290,7 @@ INSERT INTO gen_template(id, name, file_name, content, path, status, create_date
 INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304292858898309122, 'list.vue', '${classname}.vue', '', '${frontendPath}/src/views/${moduleName}', 0, CURRENT_DATE);
 INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304293015698169857, 'add-or-update.vue', '${classname}-add-or-update.vue', '', '${frontendPath}/src/views/${moduleName}', 0, CURRENT_DATE);
 
-INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@renren.io', 0, '<p>人人开源代码生成器!</p>', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@scjydz.com', 0, '<p>代码生成器!</p>', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1340949288542347266, 1302850622416084993, 'form-generator/form', '', 0, 'icon-edit-square', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1340949288542347266, 'name', 'Page Design', 'en-US');

+ 5 - 5
wjp-admin/db/generator/postgresql.sql

@@ -230,10 +230,10 @@ INSERT INTO sys_language(table_name, table_id, field_name, field_value, language
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN');
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW');
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"io.renren","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\renrenio\\security-enterprise\\renren-admin","frontendPath":"D:\\renrenio\\security-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"com.wjp","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\wjp\\wjp-enterprise\\wjp-admin","frontendPath":"D:\\wjp\\wjp-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '专业版', now());
-INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'renren', '123456', 0, now());
+INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '', now());
+INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/wjp_project40?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'root', '123456', 0, now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152452777352425473, 'datetime', 'Date', 'java.util.Date', now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453412995002369, 'date', 'Date', 'java.util.Date', now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453603525455873, 'tinyint', 'Integer', NULL, now());
@@ -266,7 +266,7 @@ INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455184669011969, 'int2', 'Integer', NULL, now());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455217359417345, 'numeric', 'BigDecimal', 'java.math.BigDecimal', now());
 
-INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'io.renren', '3.0', 'D:\\renrenio\\security-enterprise\\renren-admin', 'D:\\renrenio\\security-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, now());
+INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'com.wjp', '3.0', 'D:\\wjp\\wjp-enterprise\\wjp-admin', 'D:\\wjp\\wjp-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, now());
 
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671502385153, 1308327671447859201, 'gen_test_data', 'id', 'BIGINT', 'id', 'id', 'Long', NULL, true, false, false, false, false, '=', 'text', NULL, NULL, 0);
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773761, 1308327671447859201, 'gen_test_data', 'username', 'VARCHAR', '用户名', 'username', 'String', NULL, false, true, true, true, true, 'like', 'text', NULL, NULL, 1);
@@ -294,7 +294,7 @@ INSERT INTO gen_template(id, name, file_name, content, path, status, create_date
 
 
 
-INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@renren.io', 0, '<p>人人开源代码生成器!</p>', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@scjydz.com', 0, '<p>代码生成器!</p>', 1067246875800000001, now(), 1067246875800000001, now());
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1340949288542347266, 1302850622416084993, 'form-generator/form', '', 0, 'icon-edit-square', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1340949288542347266, 'name', 'Page Design', 'en-US');

+ 5 - 5
wjp-admin/db/generator/sqlserver.sql

@@ -143,10 +143,10 @@ INSERT INTO sys_language(table_name, table_id, field_name, field_value, language
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-CN');
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1305532398162145281, 'name', '配置信息', 'zh-TW');
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"io.renren","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\renrenio\\security-enterprise\\renren-admin","frontendPath":"D:\\renrenio\\security-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000072, 'DEV_TOOLS_PARAM_KEY', '{"packageName":"com.wjp","version":"3.0","author":"Mark","email":"sunlightcs@gmail.com","backendPath":"D:\\wjp\\wjp-enterprise\\wjp-admin","frontendPath":"D:\\wjp\\wjp-enterprise-admin"}', 0, '代码生成器配置信息', 1067246875800000001, getdate(), 1067246875800000001, getdate());
 
-INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '专业版', getdate());
-INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/security_enterprise?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'renren', '123456', 0, getdate());
+INSERT INTO gen_base_class(id, package_name, code, fields, remark, create_date) VALUES (1302875019642159105, '${package}.common.entity.BaseEntity', 'BaseEntity', 'id,creator,create_date', '', getdate());
+INSERT INTO gen_datasource(id, db_type, conn_name, conn_url, username, password, status, create_date) VALUES (1302855887882412034, 'MySQL', '本地', 'jdbc:mysql://localhost:3306/wjp_project40?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true', 'root', '123456', 0, getdate());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152452777352425473, 'datetime', 'Date', 'java.util.Date', getdate());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453412995002369, 'date', 'Date', 'java.util.Date', getdate());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152453603525455873, 'tinyint', 'Integer', NULL, getdate());
@@ -179,7 +179,7 @@ INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455184669011969, 'int2', 'Integer', NULL, getdate());
 INSERT INTO gen_field_type(id, column_type, attr_type, package_name, create_date) VALUES (1152455217359417345, 'numeric', 'BigDecimal', 'java.math.BigDecimal', getdate());
 
-INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'io.renren', '3.0', 'D:\\renrenio\\security-enterprise\\renren-admin', 'D:\\renrenio\\security-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, getdate());
+INSERT INTO gen_table_info(id, table_name, class_name, table_comment, author, email, package_name, version, backend_path, frontend_path, module_name, sub_module_name, datasource_id, baseclass_id, create_date) VALUES (1308327671447859201, 'gen_test_data', 'TestData', '测试功能', 'Mark', 'sunlightcs@gmail.com', 'com.wjp', '3.0', 'D:\\wjp\\wjp-enterprise\\wjp-admin', 'D:\\wjp\\wjp-enterprise-admin', 'gen', NULL, 0, 1302875019642159105, getdate());
 
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671502385153, 1308327671447859201, 'gen_test_data', 'id', 'BIGINT', 'id', 'id', 'Long', NULL, 1, 0, 0, 0, 0, '=', 'text', NULL, NULL, 0);
 INSERT INTO gen_table_field(id, table_id, table_name, column_name, column_type, column_comment, attr_name, attr_type, package_name, is_pk, is_required, is_form, is_list, is_query, query_type, form_type, dict_name, validator_type, sort) VALUES (1308327671510773761, 1308327671447859201, 'gen_test_data', 'username', 'VARCHAR', '用户名', 'username', 'String', NULL, 0, 1, 1, 1, 1, 'like', 'text', NULL, NULL, 1);
@@ -204,7 +204,7 @@ INSERT INTO gen_template(id, name, file_name, content, path, status, create_date
 INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304292858898309122, 'list.vue', '${classname}.vue', '', '${frontendPath}/src/views/${moduleName}', 0, getdate());
 INSERT INTO gen_template(id, name, file_name, content, path, status, create_date) VALUES (1304293015698169857, 'add-or-update.vue', '${classname}-add-or-update.vue', '', '${frontendPath}/src/views/${moduleName}', 0, getdate());
 
-INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@renren.io', 0, '<p>人人开源代码生成器!</p>', 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO gen_test_data(id, username, real_name, gender, email, notice_type, content, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'sunlightcs', 'Mark', 0, 'root@scjydz.com', 0, '<p>代码生成器!</p>', 1067246875800000001, getdate(), 1067246875800000001, getdate());
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, icon, sort, creator, create_date, updater, update_date) VALUES (1340949288542347266, 1302850622416084993, 'form-generator/form', '', 0, 'icon-edit-square', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
 INSERT INTO sys_language(table_name, table_id, field_name, field_value, language) VALUES ('sys_menu', 1340949288542347266, 'name', 'Page Design', 'en-US');

+ 3 - 3
wjp-admin/db/generator/template/add-or-update.vue.ftl

@@ -21,19 +21,19 @@
     <#elseif column.formType == 'select'>
       <#if column.dictName??>
       <el-form-item label="${column.comment!}" prop="${column.attrName}">
-        <ren-select v-model="dataForm.${column.attrName}" dict-type="${column.dictName}" placeholder="${column.comment!}"></ren-select>
+        <my-select v-model="dataForm.${column.attrName}" dict-type="${column.dictName}" placeholder="${column.comment!}"></my-select>
       </el-form-item>
       <#else>
       <el-form-item label="${column.comment!}" prop="${column.attrName}">
         <el-select v-model="dataForm.${column.attrName}" placeholder="请选择">
-          <el-option label="人人" value="0"></el-option>
+          <el-option label="佳缘" value="0"></el-option>
         </el-select>
       </el-form-item>
       </#if>
     <#elseif column.formType == 'radio'>
       <#if column.dictName??>
       <el-form-item label="${column.comment!}" prop="${column.attrName}">
-        <ren-radio-group v-model="dataForm.${column.attrName}" dict-type="${column.dictName}"></ren-radio-group>
+        <my-radio-group v-model="dataForm.${column.attrName}" dict-type="${column.dictName}"></my-radio-group>
       </el-form-item>
       <#else>
       <el-form-item label="${column.comment!}" prop="${column.attrName}">

+ 2 - 2
wjp-admin/db/generator/template/list.vue.ftl

@@ -8,7 +8,7 @@
         <el-input v-model="state.dataForm.${column.attrName}" placeholder="${column.comment!}" clearable></el-input>
         <#elseif column.formType == 'select'>
           <#if column.dictName??>
-        <ren-select v-model="state.dataForm.${column.attrName}" dict-type="${column.dictName}" placeholder="${column.comment!}"></ren-select>
+        <my-select v-model="state.dataForm.${column.attrName}" dict-type="${column.dictName}" placeholder="${column.comment!}"></my-select>
           <#else>
         <el-select v-model="state.dataForm.${column.attrName}" placeholder="${column.comment!}">
           <el-option label="选择" value="0"></el-option>
@@ -16,7 +16,7 @@
           </#if>
         <#elseif column.formType == 'radio'>
           <#if column.dictName??>
-            <ren-radio-group v-model="state.dataForm.${column.attrName}" dict-type="${column.dictName}"></ren-radio-group>
+            <my-radio-group v-model="state.dataForm.${column.attrName}" dict-type="${column.dictName}"></my-radio-group>
           <#else>
             <el-radio-group v-model="state.dataForm.${column.attrName}">
               <el-radio :label="0">单选</el-radio>

+ 9 - 9
wjp-admin/db/mysql.sql

@@ -553,8 +553,8 @@ CREATE TABLE bpm_instance_ext (
 ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='流程实例扩展';
 
 -- 初始数据
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@renren.io', '13612345678', 1, null, 1, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@renren.io', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@scjydz.com', '13612345678', 1, null, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@scjydz.com', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, now(), 1067246875800000001, now());
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000002, '0', NULL, NULL, 0, 0, 'icon-safetycertificate', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000003, 1067246875800000055, NULL, 'sys:user:save,sys:dept:list,sys:role:list', 1, 0, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
@@ -948,7 +948,7 @@ INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, u
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000063, 1067246875800000066, '1067246875800000066', '长沙分公司', 1, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000064, 1067246875800000066, '1067246875800000066', '上海分公司', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000065, 1067246875800000064, '1067246875800000066,1067246875800000064', '市场部', 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '人人开源集团', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '佳缘科技股份有限公司', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000067, 1067246875800000064, '1067246875800000066,1067246875800000064', '销售部', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000068, 1067246875800000063, '1067246875800000066,1067246875800000063', '产品部', 1, 1067246875800000001, now(), 1067246875800000001, now());
 
@@ -971,15 +971,15 @@ INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort
 
 INSERT INTO sys_sms(id, sms_code, platform, sms_config, remark, creator, create_date, updater, update_date) VALUES (1228954061084676097, '1001', 1, '{"aliyunAccessKeyId":"1","aliyunAccessKeySecret":"1","aliyunSignName":"1","aliyunTemplateCode":"1","qcloudAppKey":"","qcloudSignName":"","qcloudTemplateId":"","qiniuAccessKey":"","qiniuSecretKey":"","qiniuTemplateId":""}', '', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.renren.io","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"renren-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"renrenio_test@163.com","password":"renren123456"}', 0, '邮件配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.scjydz.com","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"wjp-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"javatangbin@163.com","password":"123456"}', 0, '邮件配置信息', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'renren', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'wjp', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '人人开源注册验证码', '<p>人人开源注册验证码:${code}</p>', now());
+INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '注册验证码', '<p>注册验证码:${code}</p>', now());
 
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '人人企业版', 3600.00, 1, 1067246875800000001, now(), now());
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '人人微服务版', 4800.00, 0, 1067246875800000001, NULL, now());
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '测试产品1', 3600.00, 1, 1067246875800000001, now(), now());
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '测试产品2', 4800.00, 0, 1067246875800000001, NULL, now());
 
 INSERT INTO tb_alipay_notify_log(id, out_trade_no, total_amount, buyer_pay_amount, receipt_amount, invoice_amount, notify_id, buyer_id, seller_id, trade_no, trade_status, create_date) VALUES (1343493644518195201, 1343491774781419523, 3600.00, 3600.00, 3600.00, 3600.00, '2020122800222174658006930510128003', '2088102177806934', '2088102177441441', '2020122822001406930501194003', 'TRADE_SUCCESS', now());
 

+ 9 - 9
wjp-admin/db/oracle.sql

@@ -957,8 +957,8 @@ COMMENT ON COLUMN bpm_instance_ext.update_date IS '更新时间';
 
 
 -- 初始数据
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@renren.io', '13612345678', 1, null, 1, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@renren.io', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@scjydz.com', '13612345678', 1, null, 1, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@scjydz.com', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000002, '0', NULL, NULL, 0, 0, 'icon-safetycertificate', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000003, 1067246875800000055, NULL, 'sys:user:save,sys:dept:list,sys:role:list', 1, 0, NULL, 1, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
@@ -1352,7 +1352,7 @@ INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, u
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000063, 1067246875800000066, '1067246875800000066', '长沙分公司', 1, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000064, 1067246875800000066, '1067246875800000066', '上海分公司', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000065, 1067246875800000064, '1067246875800000066,1067246875800000064', '市场部', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
-INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '人人开源集团', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '集团', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000067, 1067246875800000064, '1067246875800000066,1067246875800000064', '销售部', 0, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000068, 1067246875800000063, '1067246875800000066,1067246875800000063', '产品部', 1, 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 
@@ -1375,15 +1375,15 @@ INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort
 
 INSERT INTO sys_sms(id, sms_code, platform, sms_config, remark, creator, create_date, updater, update_date) VALUES (1228954061084676097, '1001', 1, '{"aliyunAccessKeyId":"1","aliyunAccessKeySecret":"1","aliyunSignName":"1","aliyunTemplateCode":"1","qcloudAppKey":"","qcloudSignName":"","qcloudTemplateId":"","qiniuAccessKey":"","qiniuSecretKey":"","qiniuTemplateId":""}', '', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.renren.io","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"renren-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"renrenio_test@163.com","password":"renren123456"}', 0, '邮件配置信息', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.scjydz.com","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"wjp-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"javatangbin@163.com","password":"123456"}', 0, '邮件配置信息', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 
-INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'renren', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
+INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'wjp', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, CURRENT_DATE, 1067246875800000001, CURRENT_DATE);
 
-INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '人人开源注册验证码', '<p>人人开源注册验证码:${code}</p>', CURRENT_DATE);
+INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '注册验证码', '<p>注册验证码:${code}</p>', CURRENT_DATE);
 
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '人人企业版', 3600.00, 1, 1067246875800000001, CURRENT_DATE, CURRENT_DATE);
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '人人微服务版', 4800.00, 0, 1067246875800000001, NULL, CURRENT_DATE);
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '测试产品1', 3600.00, 1, 1067246875800000001, CURRENT_DATE, CURRENT_DATE);
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '测试产品2', 4800.00, 0, 1067246875800000001, NULL, CURRENT_DATE);
 
 INSERT INTO tb_alipay_notify_log(id, out_trade_no, total_amount, buyer_pay_amount, receipt_amount, invoice_amount, notify_id, buyer_id, seller_id, trade_no, trade_status, create_date) VALUES (1343493644518195201, 1343491774781419523, 3600.00, 3600.00, 3600.00, 3600.00, '2020122800222174658006930510128003', '2088102177806934', '2088102177441441', '2020122822001406930501194003', 'TRADE_SUCCESS', CURRENT_DATE);
 

+ 9 - 9
wjp-admin/db/postgresql.sql

@@ -955,8 +955,8 @@ COMMENT ON COLUMN bpm_instance_ext.update_date IS '更新时间';
 
 
 -- 初始数据
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@renren.io', '13612345678', 1, null, 1, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@renren.io', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@scjydz.com', '13612345678', 1, null, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@scjydz.com', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, now(), 1067246875800000001, now());
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000002, '0', NULL, NULL, 0, 0, 'icon-safetycertificate', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000003, 1067246875800000055, NULL, 'sys:user:save,sys:dept:list,sys:role:list', 1, 0, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
@@ -1350,7 +1350,7 @@ INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, u
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000063, 1067246875800000066, '1067246875800000066', '长沙分公司', 1, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000064, 1067246875800000066, '1067246875800000066', '上海分公司', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000065, 1067246875800000064, '1067246875800000066,1067246875800000064', '市场部', 0, 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '人人开源集团', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '佳缘科技股份有限公司', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000067, 1067246875800000064, '1067246875800000066,1067246875800000064', '销售部', 0, 1067246875800000001, now(), 1067246875800000001, now());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000068, 1067246875800000063, '1067246875800000066,1067246875800000063', '产品部', 1, 1067246875800000001, now(), 1067246875800000001, now());
 
@@ -1373,15 +1373,15 @@ INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort
 
 INSERT INTO sys_sms(id, sms_code, platform, sms_config, remark, creator, create_date, updater, update_date) VALUES (1228954061084676097, '1001', 1, '{"aliyunAccessKeyId":"1","aliyunAccessKeySecret":"1","aliyunSignName":"1","aliyunTemplateCode":"1","qcloudAppKey":"","qcloudSignName":"","qcloudTemplateId":"","qiniuAccessKey":"","qiniuSecretKey":"","qiniuTemplateId":""}', '', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.renren.io","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"renren-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, now(), 1067246875800000001, now());
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"renrenio_test@163.com","password":"renren123456"}', 0, '邮件配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.scjydz.com","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"wjp-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"javatangbin@163.com","password":"123456"}', 0, '邮件配置信息', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'renren', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'wjp', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, now(), 1067246875800000001, now());
 
-INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '人人开源注册验证码', '<p>人人开源注册验证码:${code}</p>', now());
+INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '注册验证码', '<p>注册验证码:${code}</p>', now());
 
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '人人企业版', 3600.00, 1, 1067246875800000001, now(), now());
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '人人微服务版', 4800.00, 0, 1067246875800000001, NULL, now());
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '测试产品1', 3600.00, 1, 1067246875800000001, now(), now());
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '测试产品2', 4800.00, 0, 1067246875800000001, NULL, now());
 
 INSERT INTO tb_alipay_notify_log(id, out_trade_no, total_amount, buyer_pay_amount, receipt_amount, invoice_amount, notify_id, buyer_id, seller_id, trade_no, trade_status, create_date) VALUES (1343493644518195201, 1343491774781419523, 3600.00, 3600.00, 3600.00, 3600.00, '2020122800222174658006930510128003', '2088102177806934', '2088102177441441', '2020122822001406930501194003', 'TRADE_SUCCESS', now());
 

+ 9 - 9
wjp-admin/db/sqlserver.sql

@@ -559,8 +559,8 @@ CREATE TABLE bpm_instance_ext (
 );
 
 -- 初始数据
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@renren.io', '13612345678', 1, null, 1, 1067246875800000001, getdate(), 1067246875800000001, getdate());
-INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@renren.io', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, status, dept_id, super_admin, creator, create_date, updater, update_date) VALUES (1067246875800000001, 'admin', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '管理员', 0, 'root@scjydz.com', '13612345678', 1, null, 1, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_user(id, username, password, real_name, gender, email, mobile, dept_id, super_admin, status, creator, create_date, updater, update_date) VALUES (1353943117220315138, 'test', '$2a$10$012Kx2ba5jzqr9gLlG4MX.bnQJTD9UWqF57XDo2N3.fPtLne02u/m', '测试用户', 0, 'test@scjydz.com', '13012345678', 1067246875800000066, 0, 1, 1067246875800000001, getdate(), 1067246875800000001, getdate());
 
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000002, '0', NULL, NULL, 0, 0, 'icon-safetycertificate', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
 INSERT INTO sys_menu(id, pid, url, permissions, menu_type, open_style, icon, sort, creator, create_date, updater, update_date) VALUES (1067246875800000003, 1067246875800000055, NULL, 'sys:user:save,sys:dept:list,sys:role:list', 1, 0, NULL, 1, 1067246875800000001, getdate(), 1067246875800000001, getdate());
@@ -954,7 +954,7 @@ INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, u
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000063, 1067246875800000066, '1067246875800000066', '长沙分公司', 1, 1067246875800000001, getdate(), 1067246875800000001, getdate());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000064, 1067246875800000066, '1067246875800000066', '上海分公司', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000065, 1067246875800000064, '1067246875800000066,1067246875800000064', '市场部', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
-INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '人人开源集团', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000066, 0, '0', '佳缘科技股份有限公司', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000067, 1067246875800000064, '1067246875800000066,1067246875800000064', '销售部', 0, 1067246875800000001, getdate(), 1067246875800000001, getdate());
 INSERT INTO sys_dept(id, pid, pids, name, sort, creator, create_date, updater, update_date) VALUES (1067246875800000068, 1067246875800000063, '1067246875800000066,1067246875800000063', '产品部', 1, 1067246875800000001, getdate(), 1067246875800000001, getdate());
 
@@ -977,15 +977,15 @@ INSERT INTO sys_dict_data(id, dict_type_id, dict_label, dict_value, remark, sort
 
 INSERT INTO sys_sms(id, sms_code, platform, sms_config, remark, creator, create_date, updater, update_date) VALUES (1228954061084676097, '1001', 1, '{"aliyunAccessKeyId":"1","aliyunAccessKeySecret":"1","aliyunSignName":"1","aliyunTemplateCode":"1","qcloudAppKey":"","qcloudSignName":"","qcloudTemplateId":"","qiniuAccessKey":"","qiniuSecretKey":"","qiniuTemplateId":""}', '', 1067246875800000001, getdate(), 1067246875800000001, getdate());
 
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.renren.io","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"renren-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, getdate(), 1067246875800000001, getdate());
-INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"renrenio_test@163.com","password":"renren123456"}', 0, '邮件配置信息', 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000073, 'CLOUD_STORAGE_CONFIG_KEY', '{"type":1,"qiniuDomain":"http://test.oss.scjydz.com","qiniuPrefix":"upload","qiniuAccessKey":"NrgMfABZxWLo5B-YYSjoE8-AZ1EISdi1Z3ubLOeZ","qiniuSecretKey":"uIwJHevMRWU0VLxFvgy0tAcOdGqasdtVlJkdy6vV","qiniuBucketName":"wjp-oss","aliyunDomain":"","aliyunPrefix":"","aliyunEndPoint":"","aliyunAccessKeyId":"","aliyunAccessKeySecret":"","aliyunBucketName":"","qcloudDomain":"","qcloudPrefix":"","qcloudSecretId":"","qcloudSecretKey":"","qcloudBucketName":""}', '0', '云存储配置信息', 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO sys_params(id, param_code, param_value, param_type, remark, creator, create_date, updater, update_date) VALUES (1067246875800000075, 'MAIL_CONFIG_KEY', '{"smtp":"smtp.163.com","port":25,"username":"javatangbin@163.com","password":"123456"}', 0, '邮件配置信息', 1067246875800000001, getdate(), 1067246875800000001, getdate());
 
-INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'renren', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, getdate(), 1067246875800000001, getdate());
+INSERT INTO schedule_job (id, bean_name, params, cron_expression, status, remark, creator, create_date, updater, update_date) VALUES (1067246875800000076, 'testTask', 'wjp', '0 0/30 * * * ?', 0, '有参测试,多个参数使用json', 1067246875800000001, getdate(), 1067246875800000001, getdate());
 
-INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '人人开源注册验证码', '<p>人人开源注册验证码:${code}</p>', getdate());
+INSERT INTO sys_mail_template(id, name, subject, content, create_date) VALUES (1067246875800000077, '验证码模板', '注册验证码', '<p>注册验证码:${code}</p>', getdate());
 
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '人人企业版', 3600.00, 1, 1067246875800000001, getdate(), getdate());
-INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '人人微服务版', 4800.00, 0, 1067246875800000001, NULL, getdate());
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491774781419523, 1343491774781419523, 1, '测试产品1', 3600.00, 1, 1067246875800000001, getdate(), getdate());
+INSERT INTO tb_order(id, order_id, product_id, product_name, pay_amount, status, user_id, pay_at, create_date) VALUES (1343491827268939779, 1343491827268939778, 2, '测试产品2', 4800.00, 0, 1067246875800000001, NULL, getdate());
 
 INSERT INTO tb_alipay_notify_log(id, out_trade_no, total_amount, buyer_pay_amount, receipt_amount, invoice_amount, notify_id, buyer_id, seller_id, trade_no, trade_status, create_date) VALUES (1343493644518195201, 1343491774781419523, 3600.00, 3600.00, 3600.00, 3600.00, '2020122800222174658006930510128003', '2088102177806934', '2088102177441441', '2020122822001406930501194003', 'TRADE_SUCCESS', getdate());
 

+ 2 - 2
wjp-admin/src/main/java/com/wjp/AdminApplication.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/annotation/DataFilter.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -13,7 +13,7 @@ import java.lang.annotation.*;
 /**
  * 数据过滤注解
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/annotation/LogOperation.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -17,7 +17,7 @@ import java.lang.annotation.Target;
 /**
  * 操作日志注解
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

+ 5 - 4
wjp-admin/src/main/java/com/wjp/common/aspect/DataFilterAspect.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -12,6 +12,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.wjp.common.annotation.DataFilter;
 import com.wjp.common.constant.Constant;
 import com.wjp.common.exception.ErrorCode;
+import com.wjp.common.exception.MyException;
 import com.wjp.common.interceptor.DataScope;
 import com.wjp.modules.security.user.SecurityUser;
 import com.wjp.common.user.UserDetail;
@@ -31,7 +32,7 @@ import java.util.Map;
 /**
  * 数据过滤,切面处理类
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Aspect
 @Component
@@ -65,7 +66,7 @@ public class DataFilterAspect {
             return ;
         }
 
-        throw new com.wjp.common.exception.RenException(ErrorCode.DATA_SCOPE_PARAMS_ERROR);
+        throw new MyException(ErrorCode.DATA_SCOPE_PARAMS_ERROR);
     }
 
     /**

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/aspect/LogOperationAspect.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -32,7 +32,7 @@ import java.lang.reflect.Method;
 /**
  * 操作日志,切面处理类
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Aspect
 @Component

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/config/MybatisPlusConfig.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -19,7 +19,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * mybatis-plus配置
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  * @since 1.0.0
  */
 @Configuration

+ 6 - 6
wjp-admin/src/main/java/com/wjp/common/config/SwaggerConfig.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -17,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * Swagger配置
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Configuration
 public class SwaggerConfig {
@@ -26,7 +26,7 @@ public class SwaggerConfig {
     public GroupedOpenApi userApi() {
         String[] paths = {"/**"};
         String[] packagedToMatch = {"com.wjp"};
-        return GroupedOpenApi.builder().group("RenRen")
+        return GroupedOpenApi.builder().group("Wjp")
                 .pathsToMatch(paths)
                 .packagesToScan(packagedToMatch).build();
     }
@@ -34,9 +34,9 @@ public class SwaggerConfig {
     @Bean
     public OpenAPI customOpenAPI() {
         return new OpenAPI().info(new Info()
-                .title("人人开源")
+                .title("佳缘科技")
                 .description("wjp-admin文档")
                 .version("3.0")
-                .termsOfService("https://www.wjp.io"));
+                .termsOfService("https://www.scjydz.com"));
     }
 }

+ 6 - 6
wjp-admin/src/main/java/com/wjp/common/exception/RenExceptionHandler.java → wjp-admin/src/main/java/com/wjp/common/exception/MyExceptionHandler.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -30,20 +30,20 @@ import java.util.Map;
 /**
  * 异常处理器
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  * @since 1.0.0
  */
 @Slf4j
 @AllArgsConstructor
 @RestControllerAdvice
-public class RenExceptionHandler {
+public class MyExceptionHandler {
     private final SysLogErrorService sysLogErrorService;
 
     /**
      * 处理自定义异常
      */
-    @ExceptionHandler(RenException.class)
-    public Result handleRenException(RenException ex) {
+    @ExceptionHandler(MyException.class)
+    public Result handleMyException(MyException ex) {
         Result result = new Result();
         result.error(ex.getCode(), ex.getMsg());
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/handler/FieldMetaObjectHandler.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -19,7 +19,7 @@ import java.util.Date;
 /**
  * 公共字段,自动填充值
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Component
 public class FieldMetaObjectHandler implements MetaObjectHandler {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/interceptor/DataFilterInterceptor.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -29,7 +29,7 @@ import java.util.Map;
 /**
  * 数据过滤
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public class DataFilterInterceptor implements InnerInterceptor {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/interceptor/DataScope.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -11,7 +11,7 @@ package com.wjp.common.interceptor;
 /**
  * 数据范围
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  * @since 1.0.0
  */
 public class DataScope {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/utils/ExcelDataListener.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -20,7 +20,7 @@ import java.util.List;
 /**
  * Excel模板读取类
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public class ExcelDataListener<E, T> extends AnalysisEventListener<T> {
     private static final Logger LOGGER = LoggerFactory.getLogger(ExcelDataListener.class);

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/utils/ExcelUtils.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -24,7 +24,7 @@ import java.util.List;
 /**
  * excel工具类
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public class ExcelUtils {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/validator/group/AliyunGroup.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -11,7 +11,7 @@ package com.wjp.common.validator.group;
 /**
  * 阿里云
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface AliyunGroup {
 }

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/validator/group/FastDFSGroup.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -11,7 +11,7 @@ package com.wjp.common.validator.group;
 /**
  * FastDFS
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface FastDFSGroup {
 }

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/validator/group/LocalGroup.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -11,7 +11,7 @@ package com.wjp.common.validator.group;
 /**
  * 本地上传
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface LocalGroup {
 }

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/validator/group/MinioGroup.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -11,7 +11,7 @@ package com.wjp.common.validator.group;
 /**
  * MinIO
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface MinioGroup {
 }

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/validator/group/QcloudGroup.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -11,7 +11,7 @@ package com.wjp.common.validator.group;
 /**
  * 腾讯云
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface QcloudGroup {
 }

+ 3 - 3
wjp-admin/src/main/java/com/wjp/common/validator/group/QiniuGroup.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -11,7 +11,7 @@ package com.wjp.common.validator.group;
 /**
  * 七牛
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface QiniuGroup {
 }

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/controller/ExcelDataController.java

@@ -32,7 +32,7 @@ import java.util.Map;
 /**
  * Excel导入演示
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/demo/controller/NewsController.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -34,7 +34,7 @@ import java.util.Map;
 /**
  * 新闻
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/controller/ProductController.java

@@ -26,7 +26,7 @@ import java.util.Map;
 /**
  * 产品管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/dao/ExcelDataDao.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
 * Excel导入演示
 *
-* @author Mark sunlightcs@gmail.com
+* @author Toby javatangbin@163.com
 */
 @Mapper
 public interface ExcelDataDao extends BaseDao<ExcelDataEntity> {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/demo/dao/NewsDao.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -18,7 +18,7 @@ import java.util.Map;
 /**
  * 新闻
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface NewsDao extends BaseDao<NewsEntity> {

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/dao/ProductDao.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 产品管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface ProductDao extends BaseDao<ProductEntity> {

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/dao/ProductParamsDao.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 产品参数管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface ProductParamsDao extends BaseDao<ProductParamsEntity> {

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/dto/ExcelDataDTO.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * Excel导入演示
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @Schema(description = "Excel导入演示")

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/demo/dto/NewsDTO.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -26,7 +26,7 @@ import java.util.Date;
 /**
  * 新闻管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @Schema(description = "新闻管理")

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/dto/ProductDTO.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 产品管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @Schema(description = "产品管理")

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/dto/ProductParamsDTO.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 /**
  * 产品参数管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @Schema(description = "产品参数管理")

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/entity/ExcelDataEntity.java

@@ -11,7 +11,7 @@ import java.util.Date;
 /**
  * Excel导入演示
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @TableName("tb_excel_data")

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/demo/entity/NewsEntity.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -20,7 +20,7 @@ import java.util.Date;
 /**
  * 新闻
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/entity/ProductEntity.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * 产品管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/entity/ProductParamsEntity.java

@@ -14,7 +14,7 @@ import java.util.Date;
 /**
  * 产品参数管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/excel/ExcelDataExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
 /**
  * Excel导入演示
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @ContentRowHeight(20)

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/service/ExcelDataService.java

@@ -7,7 +7,7 @@ import com.wjp.modules.demo.entity.ExcelDataEntity;
 /**
  * Excel导入演示
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface ExcelDataService extends CrudService<ExcelDataEntity, ExcelDataDTO> {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/demo/service/NewsService.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */
@@ -18,7 +18,7 @@ import java.util.Map;
 /**
  * 新闻
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface NewsService extends BaseService<NewsEntity> {
 

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/service/ProductParamsService.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 产品参数管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface ProductParamsService extends BaseService<ProductParamsEntity> {
 

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/service/ProductService.java

@@ -7,7 +7,7 @@ import com.wjp.modules.demo.entity.ProductEntity;
 /**
  * 产品管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface ProductService extends CrudService<ProductEntity, ProductDTO> {
 

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/service/impl/ExcelDataServiceImpl.java

@@ -14,7 +14,7 @@ import java.util.Map;
 /**
  * Excel导入演示
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Service
 public class ExcelDataServiceImpl extends CrudServiceImpl<ExcelDataDao, ExcelDataEntity, ExcelDataDTO> implements ExcelDataService {

+ 2 - 2
wjp-admin/src/main/java/com/wjp/modules/demo/service/impl/NewsServiceImpl.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2018 人人开源 All rights reserved.
+ * Copyright (c) 2018 Toby All rights reserved.
  *
- * https://www.wjp.io
+ * https://www.scjydz.com
  *
  * 版权所有,侵权必究!
  */

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/service/impl/ProductParamsServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * 产品参数管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Service
 public class ProductParamsServiceImpl extends BaseServiceImpl<ProductParamsDao, ProductParamsEntity> implements ProductParamsService {

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/demo/service/impl/ProductServiceImpl.java

@@ -19,7 +19,7 @@ import java.util.Map;
 /**
  * 产品管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @Service

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/config/DataSourceInfo.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -20,7 +20,7 @@ import java.sql.SQLException;
 /**
  * 数据源信息
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 public class DataSourceInfo {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/AbstractQuery.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -14,7 +14,7 @@ import com.wjp.modules.devtools.utils.DbType;
 /**
  * Query
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface AbstractQuery {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/DmQuery.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 /**
  * 达梦数据库 查询
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public class DmQuery implements AbstractQuery {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/MySqlQuery.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 /**
  * MySQL查询
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public class MySqlQuery implements AbstractQuery {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/OracleQuery.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -15,7 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 /**
  * Oracle查询
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public class OracleQuery implements AbstractQuery {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/PostgreSqlQuery.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 /**
  * PostgreSql查询
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public class PostgreSqlQuery implements AbstractQuery {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/config/query/SqlServerQuery.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.StringUtils;
 /**
  * SqlServer查询
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public class SqlServerQuery implements AbstractQuery {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/controller/BaseClassController.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -22,7 +22,7 @@ import java.util.Map;
 /**
  * 基类管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/controller/DataSourceController.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -24,7 +24,7 @@ import java.util.Map;
 /**
  * 数据源管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/controller/FieldTypeController.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -22,7 +22,7 @@ import java.util.Set;
 /**
  * 字段类型管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/controller/GenParamController.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*;
 /**
  * 代码生成参数配置
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/controller/GeneratorController.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -29,7 +29,7 @@ import java.util.Map;
 /**
  * 代码生成
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/controller/ProjectController.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 项目名修改
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @RestController
 @RequestMapping("devtools/project")

+ 6 - 6
wjp-admin/src/main/java/com/wjp/modules/devtools/controller/TemplateController.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -9,7 +9,7 @@
 package com.wjp.modules.devtools.controller;
 
 import com.google.common.collect.Maps;
-import com.wjp.common.exception.RenException;
+import com.wjp.common.exception.MyException;
 import com.wjp.common.page.PageData;
 import com.wjp.common.utils.Result;
 import com.wjp.modules.devtools.entity.TemplateEntity;
@@ -24,7 +24,7 @@ import java.util.Map;
 /**
  * 模板管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @RestController
@@ -52,7 +52,7 @@ public class TemplateController {
             //检查模板语法是否正确
             GenUtils.getTemplateContent(entity.getContent(), Maps.newHashMap());
         } catch (Exception e) {
-            throw new RenException("模板语法错误,请查看控制台报错信息!", e);
+            throw new MyException("模板语法错误,请查看控制台报错信息!", e);
         }
 
         templateService.insert(entity);
@@ -66,7 +66,7 @@ public class TemplateController {
             //检查模板语法是否正确
             GenUtils.getTemplateContent(entity.getContent(), Maps.newHashMap());
         } catch (Exception e) {
-            throw new RenException("模板语法错误,请查看控制台报错信息!", e);
+            throw new MyException("模板语法错误,请查看控制台报错信息!", e);
         }
         templateService.updateById(entity);
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/dao/BaseClassDao.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 基类管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface BaseClassDao extends BaseMapper<BaseClassEntity> {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/dao/DataSourceDao.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 数据源管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface DataSourceDao extends BaseMapper<DataSourceEntity> {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/dao/FieldTypeDao.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -17,7 +17,7 @@ import java.util.Set;
 /**
  * 字段类型管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface FieldTypeDao extends BaseMapper<FieldTypeEntity> {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/dao/GeneratorMenuDao.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * 创建菜单
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface GeneratorMenuDao {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/dao/TableFieldDao.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * 表
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface TableFieldDao extends BaseMapper<TableFieldEntity> {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/dao/TableInfoDao.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 列
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface TableInfoDao extends BaseMapper<TableInfoEntity> {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/dao/TemplateDao.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -17,7 +17,7 @@ import java.util.Map;
 /**
  * 模板管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Mapper
 public interface TemplateDao extends BaseMapper<TemplateEntity> {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/BaseClassEntity.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -20,7 +20,7 @@ import java.util.Date;
 /**
  * 基类管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @TableName("gen_base_class")

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/DataSourceEntity.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -21,7 +21,7 @@ import java.util.Date;
 /**
  * 数据源管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @TableName("gen_datasource")

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/FieldTypeEntity.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -21,7 +21,7 @@ import java.util.Date;
 /**
  * 字段类型管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @TableName("gen_field_type")

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/GenParam.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -14,7 +14,7 @@ import java.io.Serializable;
 /**
  * 代码生成参数配置
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 public class GenParam implements Serializable {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/MenuEntity.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -12,7 +12,7 @@ import lombok.Data;
 /**
  * 创建菜单
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 public class MenuEntity {

+ 1 - 1
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/ProjectEntity.java

@@ -5,7 +5,7 @@ import lombok.Data;
 /**
  * 项目名修改
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 public class ProjectEntity {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/TableFieldEntity.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -16,7 +16,7 @@ import lombok.Data;
 /**
  * 表字段信息
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @TableName("gen_table_field")

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/TableInfoEntity.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -19,7 +19,7 @@ import java.util.List;
 /**
  * 表信息
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @TableName("gen_table_info")

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/entity/TemplateEntity.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -21,7 +21,7 @@ import java.util.Date;
 /**
  * 模板管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Data
 @TableName("gen_template")

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/BaseClassService.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -19,7 +19,7 @@ import java.util.Map;
 /**
  * 基类管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface BaseClassService extends BaseService<BaseClassEntity> {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/DataSourceService.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -18,7 +18,7 @@ import java.util.Map;
 /**
  * 数据源管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface DataSourceService extends BaseService<DataSourceEntity> {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/FieldTypeService.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -18,7 +18,7 @@ import java.util.Set;
 /**
  * 字段类型管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface FieldTypeService extends BaseService<FieldTypeEntity> {
     PageData<FieldTypeEntity> page(Map<String, Object> params);

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/GeneratorService.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -18,7 +18,7 @@ import java.util.List;
 /**
  * 代码生成
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface GeneratorService {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/TableFieldService.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * 列
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface TableFieldService extends BaseService<TableFieldEntity> {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/TableInfoService.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -18,7 +18,7 @@ import java.util.Map;
 /**
  * 表
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface TableInfoService extends BaseService<TableInfoEntity> {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/TemplateService.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -19,7 +19,7 @@ import java.util.Map;
 /**
  * 模板管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 public interface TemplateService extends BaseService<TemplateEntity> {
 

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/BaseClassServiceImpl.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -25,7 +25,7 @@ import java.util.Map;
 /**
  * 基类管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Service
 public class BaseClassServiceImpl extends BaseServiceImpl<BaseClassDao, BaseClassEntity> implements BaseClassService {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/DataSourceServiceImpl.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -26,7 +26,7 @@ import java.util.Map;
 /**
  * 数据源管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Service
 public class DataSourceServiceImpl extends BaseServiceImpl<DataSourceDao, DataSourceEntity> implements DataSourceService {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/FieldTypeServiceImpl.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -28,7 +28,7 @@ import java.util.Set;
 /**
  * 字段类型管理
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Service
 public class FieldTypeServiceImpl extends BaseServiceImpl<FieldTypeDao, FieldTypeEntity> implements FieldTypeService {

+ 5 - 5
wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/GeneratorServiceImpl.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -11,7 +11,7 @@ package com.wjp.modules.devtools.service.impl;
 import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.wjp.common.constant.Constant;
-import com.wjp.common.exception.RenException;
+import com.wjp.common.exception.MyException;
 import com.wjp.common.utils.DateUtils;
 import com.wjp.modules.devtools.config.DataSourceInfo;
 import com.wjp.modules.devtools.dao.GeneratorMenuDao;
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 /**
  * 代码生成
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @AllArgsConstructor
 @Service
@@ -76,7 +76,7 @@ public class GeneratorServiceImpl implements GeneratorService {
         TableInfoEntity table = tableInfoService.getByTableName(tableInfo.getTableName());
         //表存在
         if (table != null) {
-            throw new RenException(tableInfo.getTableName() + "数据表已存在");
+            throw new MyException(tableInfo.getTableName() + "数据表已存在");
         }
 
         table = DbUtils.getTablesInfo(info, tableInfo.getTableName());

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/TableFieldServiceImpl.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -20,7 +20,7 @@ import java.util.List;
 /**
  * 表
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Service
 public class TableFieldServiceImpl extends BaseServiceImpl<TableFieldDao, TableFieldEntity> implements TableFieldService {

+ 3 - 3
wjp-admin/src/main/java/com/wjp/modules/devtools/service/impl/TableInfoServiceImpl.java

@@ -1,7 +1,7 @@
 /**
- * Copyright (c) 2020 人人开源 All rights reserved.
+ * Copyright (c) 2020 Toby All rights reserved.
  * <p>
- * https://www.wjp.io
+ * https://www.scjydz.com
  * <p>
  * 版权所有,侵权必究!
  */
@@ -28,7 +28,7 @@ import java.util.Map;
 /**
  * 表
  *
- * @author Mark sunlightcs@gmail.com
+ * @author Toby javatangbin@163.com
  */
 @Service
 @AllArgsConstructor

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.