diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java index b4fce261..59ac2e8c 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java @@ -72,7 +72,7 @@ public class CmsCallBackController { user.preInsert(); user.setCreateUid("1"); user.setUpdateUid("1"); - user.setRemark("门户定时任务数据添加"); + user.setNote("门户定时任务数据添加"); user.setId(IdUtils.fastSimpleUUID()); user.setIsPcUser("0"); user.setDelFlag("0"); diff --git a/shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java b/shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java index fe13475e..4e6ced3e 100644 --- a/shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java +++ b/shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java @@ -66,7 +66,7 @@ public class WaterScheduled { user.preInsert(); user.setCreateUid("1"); user.setUpdateUid("1"); - user.setRemark("门户定时任务数据添加"); + user.setNote("门户定时任务数据添加"); user.setId(IdUtils.fastSimpleUUID()); user.setIsPcUser("0"); user.setDelFlag("0"); @@ -133,7 +133,7 @@ public class WaterScheduled { dept = new SysDept(); dept.setCreateUid("1"); dept.setUpdateUid("1"); - dept.setRemark("门户定时任务数据添加"); + dept.setNote("门户定时任务数据添加"); dept.setIsDownload("0"); dept.setIsComment("0"); dept.setDelFlag("0"); @@ -199,7 +199,7 @@ public class WaterScheduled { sysRole.setRoleSort("0"); sysRole.setCreateUid("1"); sysRole.setUpdateUid("1"); - sysRole.setRemark("门户定时任务数据添加"); + sysRole.setNote("门户定时任务数据添加"); sysRole.setMd5(MD5Util.MD5Encode(singleRole.toString(), "utf-8")); BeanUtils.copyProperties(singleRole,sysRole); sysRole.setRoleName(singleRole.getName()); diff --git a/shuili-admin/src/main/java/com/slsoft/App.java b/shuili-admin/src/main/java/com/slsoft/App.java deleted file mode 100644 index 6c47f115..00000000 --- a/shuili-admin/src/main/java/com/slsoft/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.slsoft; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/shuili-admin/src/main/resources/application-druid-test.yml b/shuili-admin/src/main/resources/application-druid-test.yml index 43713932..87327867 100644 --- a/shuili-admin/src/main/resources/application-druid-test.yml +++ b/shuili-admin/src/main/resources/application-druid-test.yml @@ -7,7 +7,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.93.254.187:3306/sgc_yg_tdsql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: shuili password: wuxukgdvJ1!@! # 从库数据源 diff --git a/shuili-admin/src/main/resources/config/application-druid-dev.yml b/shuili-admin/src/main/resources/config/application-druid-dev.yml index 3037030c..503570e6 100644 --- a/shuili-admin/src/main/resources/config/application-druid-dev.yml +++ b/shuili-admin/src/main/resources/config/application-druid-dev.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://mysql:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: mysql123456 + url: jdbc:mysql://47.93.254.187:3306/sgc_yg_tdsql?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + username: shuili + password: wuxukgdvJ1!@! # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/shuili-common/src/main/java/com/shuili/common/constant/GenConstants.java b/shuili-common/src/main/java/com/shuili/common/constant/GenConstants.java index cab96aec..6e95c3e8 100644 --- a/shuili-common/src/main/java/com/shuili/common/constant/GenConstants.java +++ b/shuili-common/src/main/java/com/shuili/common/constant/GenConstants.java @@ -48,10 +48,10 @@ public class GenConstants /** 页面不需要查询字段 */ public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by", - "update_time", "remark" }; + "update_time", "note" }; /** Entity基类字段 */ - public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" }; + public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "note" }; /** Tree基类字段 */ public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors", "children" }; diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java index 883d7207..13647f40 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/BaseEntity.java @@ -53,7 +53,9 @@ public class BaseEntity implements Serializable @TableField(exist = false) /** 备注 */ @Excel(name = "备注,可以不填") - protected String remark; + protected String note; + + /** 开始时间 */ @JsonIgnore @@ -179,14 +181,12 @@ public class BaseEntity implements Serializable this.updateTime = updateTime; } - public String getRemark() - { - return remark; + public String getNote() { + return note; } - public void setRemark(String remark) - { - this.remark = remark; + public void setNote(String note) { + this.note = note; } public String getBeginTime() diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictData.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictData.java index f2386c16..a58adacc 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictData.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictData.java @@ -166,7 +166,7 @@ public class SysDictData extends BaseEntity .append("createTime", getCreateTime()) .append("updateUid", getUpdateUid()) .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) + .append("remark", getNote()) .toString(); } } diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictType.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictType.java index 94cd855c..ae0e60e0 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictType.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysDictType.java @@ -77,7 +77,7 @@ public class SysDictType extends BaseEntity .append("createTime", getCreateTime()) .append("updateBy", getUpdateUid()) .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) + .append("remark", getNote()) .toString(); } } diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java index c535f287..e876bb71 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java @@ -229,7 +229,7 @@ public class SysMenu extends BaseEntity { .append("createTime", getCreateTime()) .append("updateBy", getUpdateUid()) .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) + .append("remark", getNote()) .toString(); } } diff --git a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java index d3ba216e..4ac50677 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysRole.java @@ -195,7 +195,7 @@ public class SysRole extends BaseEntity .append("createTime", getCreateTime()) .append("updateBy", getUpdateUid()) .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) + .append("remark", getNote()) .toString(); } } diff --git a/shuili-framework/src/main/java/com/slsoft/App.java b/shuili-framework/src/main/java/com/slsoft/App.java deleted file mode 100644 index 6c47f115..00000000 --- a/shuili-framework/src/main/java/com/slsoft/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.slsoft; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/shuili-generator/src/main/java/com/slsoft/App.java b/shuili-generator/src/main/java/com/slsoft/App.java deleted file mode 100644 index 6c47f115..00000000 --- a/shuili-generator/src/main/java/com/slsoft/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.slsoft; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/shuili-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/shuili-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 3b07b878..e5b6c801 100644 --- a/shuili-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/shuili-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_uid, create_time, update_uid, update_time, remark + select id, table_name, table_comment, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_uid, create_time, update_uid, update_time, note from gen_table @@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.id,u.is_pc_user,u.invitee,u.is_first, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.remark, + select u.id,u.is_pc_user,u.invitee,u.is_first, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_uid, u.create_time, u.note, d.dept_name as ddept_name,d.tag as dtag, d.id as did,d.parent_id as dparent_id, u.real_name,u.card_no,u.department,u.post,u.professional,d.leader,d.is_download,d.is_comment, d.ip_start,d.ip_end, d.pc_logo, d.pc_background, d.admin_logo @@ -201,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_date, create_uid, update_uid, - remark, + note, real_name, card_no, department, @@ -226,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{loginIp}, #{loginDate}, #{updateUid}, - #{remark}, + #{note}, #{realName}, @@ -264,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_ip = #{loginIp}, login_date = #{loginDate}, update_uid = #{updateUid}, - remark = #{remark}, + note = #{note}, is_first = #{isFirst}, real_name = #{realName}, diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml index d4501023..6acf5d8a 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml @@ -21,7 +21,7 @@ - + @@ -40,7 +40,7 @@ service_url,annotation_url,service_token, service_type,service_index,annotation_service_index,pub_date, create_user,layer_3d_type,tile_size, - tile_matrix_set,dir_id,dir_name,remark,format,data,tileset_option,is_layer_group, + tile_matrix_set,dir_id,dir_name,note,format,data,tileset_option,is_layer_group, relation_service_id,relation_service_name,relation_style_id,relation_style_name,extend_data,is_need_cluster @@ -53,7 +53,7 @@ service_url,annotation_url,service_token,service_type,service_index,annotation_service_index, pub_date, create_user,layer_3d_type,tile_size, - tile_matrix_set,dir_id,dir_name,remark,format,data,tileset_option,is_layer_group, + tile_matrix_set,dir_id,dir_name,note,format,data,tileset_option,is_layer_group, relation_service_id,relation_service_name,relation_style_id,relation_style_name,extend_data,is_need_cluster @@ -76,7 +76,7 @@ tile_matrix_set, dir_id, dir_name, - remark, + note, format, data, tileset_option, @@ -107,7 +107,7 @@ #{tileMatrixSet,jdbcType=VARCHAR}, #{dirId,jdbcType=VARCHAR}, #{dirName,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, + #{note,jdbcType=VARCHAR}, #{format,jdbcType=VARCHAR}, #{data,jdbcType=VARCHAR}, #{tileSetOption,jdbcType=VARCHAR}, @@ -142,7 +142,7 @@ tile_matrix_set=#{tileMatrixSet,jdbcType=VARCHAR}, dir_id=#{dirId,jdbcType=VARCHAR}, dir_name=#{dirName,jdbcType=VARCHAR}, - remark=#{remark,jdbcType=VARCHAR}, + note=#{note,jdbcType=VARCHAR}, format=#{format,jdbcType=VARCHAR}, data=#{data,jdbcType=VARCHAR}, tileset_option=#{tileSetOption,jdbcType=VARCHAR}, diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml index b62359c7..0054464c 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml @@ -9,7 +9,7 @@ - + @@ -19,7 +19,7 @@ id ,name,layer_type, - information,remark,style_type, + information,note,style_type, view_img,create_time,modify_time