From 82d7475082e3f08e2333e99ccc73f427be613d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=E2=99=82=E5=9C=A3=E7=BF=94?= Date: Fri, 27 Jul 2018 20:36:54 +0800 Subject: [PATCH 1/2] SQL --- sqls/1.iBase4J.sql | 2 +- sqls/4.biz.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sqls/1.iBase4J.sql b/sqls/1.iBase4J.sql index 0740d3e5..17c766f0 100644 --- a/sqls/1.iBase4J.sql +++ b/sqls/1.iBase4J.sql @@ -246,7 +246,7 @@ CREATE TABLE `sys_feedback` ( `update_by` BIGINT(20) NULL DEFAULT NULL, `update_time` DATETIME NULL DEFAULT NULL, PRIMARY KEY (`id_`) -)COMMENT='反馈' COLLATE=utf8 ENGINE=InnoDB; +)COMMENT='反馈' ENGINE=InnoDB; -- 导出 表 ibase4j.sys_menu 结构 DROP TABLE IF EXISTS `sys_menu`; diff --git a/sqls/4.biz.sql b/sqls/4.biz.sql index 35fb6a57..ceea11b1 100644 --- a/sqls/4.biz.sql +++ b/sqls/4.biz.sql @@ -37,4 +37,4 @@ CREATE TABLE IF NOT EXISTS `t_member` ( UNIQUE KEY `email_` (`email_`), UNIQUE KEY `user_name` (`user_name`), KEY `sex_` (`sex_`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='会员'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT COMMENT='会员'; \ No newline at end of file -- Gitee From 26bd7b1c5ccfc6d09e3914f2cea7f922211ff0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=E2=99=82=E5=9C=A3=E7=BF=94?= Date: Wed, 1 Aug 2018 14:01:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE;?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/prod/jdbc.properties | 26 ++ .../resources/config/test/jdbc.properties | 26 ++ .../config/{ => dev}/system.properties | 0 .../resources/config/prod/system.properties | 3 + .../resources/config/test/system.properties | 3 + .../resources/config/prod/system.properties | 72 +++++ .../resources/config/test/system.properties | 72 +++++ .../service/impl/SysDeptServiceImpl.java | 25 +- .../service/impl/SysMenuServiceImpl.java | 3 +- .../service/impl/SysUserServiceImpl.java | 20 ++ .../resources/config/prod/jdbc.properties | 26 ++ .../resources/config/test/jdbc.properties | 26 ++ .../org/ibase4j/web/SysUserController.java | 7 - .../resources/config/prod/system.properties | 7 + .../resources/config/test/system.properties | 7 + iBase4J-UI/iBase4J-UI-AngularJS/index.html | 1 + iBase4J-UI/iBase4J-UI-AngularJS/lib/md5.js | 256 ++++++++++++++++++ .../src/app/sys/login/loginController.js | 4 +- .../src/app/sys/user/updateController.js | 1 + 19 files changed, 565 insertions(+), 20 deletions(-) create mode 100644 iBase4J-Biz-Service/src/main/resources/config/prod/jdbc.properties create mode 100644 iBase4J-Biz-Service/src/main/resources/config/test/jdbc.properties rename iBase4J-Biz-Web/src/main/resources/config/{ => dev}/system.properties (100%) create mode 100644 iBase4J-Biz-Web/src/main/resources/config/prod/system.properties create mode 100644 iBase4J-Biz-Web/src/main/resources/config/test/system.properties create mode 100644 iBase4J-SYS-Facade/src/main/resources/config/prod/system.properties create mode 100644 iBase4J-SYS-Facade/src/main/resources/config/test/system.properties create mode 100644 iBase4J-SYS-Service/src/main/resources/config/prod/jdbc.properties create mode 100644 iBase4J-SYS-Service/src/main/resources/config/test/jdbc.properties create mode 100644 iBase4J-SYS-Web/src/main/resources/config/prod/system.properties create mode 100644 iBase4J-SYS-Web/src/main/resources/config/test/system.properties create mode 100644 iBase4J-UI/iBase4J-UI-AngularJS/lib/md5.js diff --git a/iBase4J-Biz-Service/src/main/resources/config/prod/jdbc.properties b/iBase4J-Biz-Service/src/main/resources/config/prod/jdbc.properties new file mode 100644 index 00000000..7d1e8b7c --- /dev/null +++ b/iBase4J-Biz-Service/src/main/resources/config/prod/jdbc.properties @@ -0,0 +1,26 @@ +#\u9a71\u52a8 +druid.driverClassName=com.mysql.cj.jdbc.Driver +#\u5bc6\u94a5(\u4f7f\u7528\u65b9\u5f0f\u67e5\u770btop.ibase4j.core.config.Configs) +druid.key= +#\u8bfb +druid.reader.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false +druid.reader.username=root +#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6 +druid.reader.password=68NKG7n1mN8rErEfbag2qM== +#\u5199 +druid.writer.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false +druid.writer.username=root +#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6 +druid.writer.password=68NKG7n1mN8rErEfbag2qM== + +#\u5b9a\u4e49\u521d\u59cb\u8fde\u63a5\u6570 +druid.initialSize=5 +#\u5b9a\u4e49\u6700\u5927\u8fde\u63a5\u6570 +druid.maxActive=20 + +# Mybatis\u914d\u7f6e +mybatis.dialectType: mysql +mybatis.typeAliasesPackage: *.*.model* +mybatis.mapperLocations: classpath*:**/mapper/xml/*.xml +mybatis.mapperBasePackage: *.*.mapper +mybatis.idType: AUTO \ No newline at end of file diff --git a/iBase4J-Biz-Service/src/main/resources/config/test/jdbc.properties b/iBase4J-Biz-Service/src/main/resources/config/test/jdbc.properties new file mode 100644 index 00000000..7d1e8b7c --- /dev/null +++ b/iBase4J-Biz-Service/src/main/resources/config/test/jdbc.properties @@ -0,0 +1,26 @@ +#\u9a71\u52a8 +druid.driverClassName=com.mysql.cj.jdbc.Driver +#\u5bc6\u94a5(\u4f7f\u7528\u65b9\u5f0f\u67e5\u770btop.ibase4j.core.config.Configs) +druid.key= +#\u8bfb +druid.reader.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false +druid.reader.username=root +#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6 +druid.reader.password=68NKG7n1mN8rErEfbag2qM== +#\u5199 +druid.writer.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false +druid.writer.username=root +#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6 +druid.writer.password=68NKG7n1mN8rErEfbag2qM== + +#\u5b9a\u4e49\u521d\u59cb\u8fde\u63a5\u6570 +druid.initialSize=5 +#\u5b9a\u4e49\u6700\u5927\u8fde\u63a5\u6570 +druid.maxActive=20 + +# Mybatis\u914d\u7f6e +mybatis.dialectType: mysql +mybatis.typeAliasesPackage: *.*.model* +mybatis.mapperLocations: classpath*:**/mapper/xml/*.xml +mybatis.mapperBasePackage: *.*.mapper +mybatis.idType: AUTO \ No newline at end of file diff --git a/iBase4J-Biz-Web/src/main/resources/config/system.properties b/iBase4J-Biz-Web/src/main/resources/config/dev/system.properties similarity index 100% rename from iBase4J-Biz-Web/src/main/resources/config/system.properties rename to iBase4J-Biz-Web/src/main/resources/config/dev/system.properties diff --git a/iBase4J-Biz-Web/src/main/resources/config/prod/system.properties b/iBase4J-Biz-Web/src/main/resources/config/prod/system.properties new file mode 100644 index 00000000..11ae7f13 --- /dev/null +++ b/iBase4J-Biz-Web/src/main/resources/config/prod/system.properties @@ -0,0 +1,3 @@ +rpc.registry.name=iBase4J-Biz-Web +rpc.protocol.port=18090 +redis.enableTransaction=false \ No newline at end of file diff --git a/iBase4J-Biz-Web/src/main/resources/config/test/system.properties b/iBase4J-Biz-Web/src/main/resources/config/test/system.properties new file mode 100644 index 00000000..11ae7f13 --- /dev/null +++ b/iBase4J-Biz-Web/src/main/resources/config/test/system.properties @@ -0,0 +1,3 @@ +rpc.registry.name=iBase4J-Biz-Web +rpc.protocol.port=18090 +redis.enableTransaction=false \ No newline at end of file diff --git a/iBase4J-SYS-Facade/src/main/resources/config/prod/system.properties b/iBase4J-SYS-Facade/src/main/resources/config/prod/system.properties new file mode 100644 index 00000000..3f271079 --- /dev/null +++ b/iBase4J-SYS-Facade/src/main/resources/config/prod/system.properties @@ -0,0 +1,72 @@ +# +#rpc.type=motan +rpc.type=dubbo +rpc.registry=zookeeper +rpc.address=127.0.0.1:2181 +rpc.protocol.maxThread=500 +rpc.protocol.minThread=20 +rpc.protocol.maxContentLength=1048576 +rpc.protocol.maxClientConnection=10 +rpc.cache.dir=/output/cache/ +rpc.connect.timeout=20000 +rpc.request.timeout=20000 +rpc.accesslog=false +rpc.package=org.ibase4j +#\u5931\u8d25\u91cd\u8bd5\u6b21\u6570 +rpc.consumer.retries=0 +# +redis.host=127.0.0.1 +redis.port=6379 +redis.password= +#\u6700\u5c0f\u7a7a\u95f2\u6570 +redis.minIdle=2 +#\u6700\u5927\u7a7a\u95f2\u6570 +redis.maxIdle=10 +#\u6700\u5927\u8fde\u63a5\u6570 +redis.maxTotal=1000 +#\u6700\u5927\u5efa\u7acb\u8fde\u63a5\u7b49\u5f85\u65f6\u95f4 +redis.maxWaitMillis=3000 +#\u5ba2\u6237\u7aef\u8d85\u65f6\u65f6\u95f4\u5355\u4f4d\u662f\u6beb\u79d2 +redis.timeout=120000 +redis.commandTimeout=60000 +redis.shutdownTimeout=5000 +#\u660e\u662f\u5426\u5728\u4ece\u6c60\u4e2d\u53d6\u51fa\u8fde\u63a5\u524d\u8fdb\u884c\u68c0\u9a8c,\u5982\u679c\u68c0\u9a8c\u5931\u8d25,\u5219\u4ece\u6c60\u4e2d\u53bb\u9664\u8fde\u63a5\u5e76\u5c1d\u8bd5\u53d6\u51fa\u53e6\u4e00\u4e2a +redis.testOnBorrow=true +#\u7f13\u5b58\u914d\u7f6e +redis.expiration=600 +redis.enableTransaction=true +redis.cache.ttl=10 +redis.cache.enableTransaction=true +#\u96c6\u7fa4\u914d\u7f6e +redis.cluster.nodes= +#redis.cluster.nodes=127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003,127.0.0.1:7004,127.0.0.1:7005,127.0.0.1:7006 +redis.cluster.max-redirects=3 +#\u4e3b\u4ece\u914d\u7f6e +redis.master= +redis.slave= +# +mq.brokerURL=failover:(tcp://localhost:61616) +mq.userName= +mq.password= +mq.sessionCacheSize=100 +mq.receiveTimeout=10000 +#\u4e34\u65f6\u6587\u4ef6\u9884\u89c8 +ui.file.uri.prefix=http://localhost/ +#fastdfs +fdfs.trackerList=127.0.0.1:22122 +fdfs.fileHost=http://127.0.0.1/ +# +sftp.host=192.168.5.100 +sftp.port=22 +sftp.user.name=root +sftp.user.password=buzhidao +sftp.timeout=5000 +sftp.aliveMax=10 +sftp.baseDir=/user/ibase4j/ +sftp.nginx.path=http://localhost/ +# +email.smtp.host=smtp.126.com +email.send.from=ibase4j,ibase4j@126.com +email.user.name=ibase4j +email.user.password=a123456 +email.authorisation.code=ibase4j \ No newline at end of file diff --git a/iBase4J-SYS-Facade/src/main/resources/config/test/system.properties b/iBase4J-SYS-Facade/src/main/resources/config/test/system.properties new file mode 100644 index 00000000..3f271079 --- /dev/null +++ b/iBase4J-SYS-Facade/src/main/resources/config/test/system.properties @@ -0,0 +1,72 @@ +# +#rpc.type=motan +rpc.type=dubbo +rpc.registry=zookeeper +rpc.address=127.0.0.1:2181 +rpc.protocol.maxThread=500 +rpc.protocol.minThread=20 +rpc.protocol.maxContentLength=1048576 +rpc.protocol.maxClientConnection=10 +rpc.cache.dir=/output/cache/ +rpc.connect.timeout=20000 +rpc.request.timeout=20000 +rpc.accesslog=false +rpc.package=org.ibase4j +#\u5931\u8d25\u91cd\u8bd5\u6b21\u6570 +rpc.consumer.retries=0 +# +redis.host=127.0.0.1 +redis.port=6379 +redis.password= +#\u6700\u5c0f\u7a7a\u95f2\u6570 +redis.minIdle=2 +#\u6700\u5927\u7a7a\u95f2\u6570 +redis.maxIdle=10 +#\u6700\u5927\u8fde\u63a5\u6570 +redis.maxTotal=1000 +#\u6700\u5927\u5efa\u7acb\u8fde\u63a5\u7b49\u5f85\u65f6\u95f4 +redis.maxWaitMillis=3000 +#\u5ba2\u6237\u7aef\u8d85\u65f6\u65f6\u95f4\u5355\u4f4d\u662f\u6beb\u79d2 +redis.timeout=120000 +redis.commandTimeout=60000 +redis.shutdownTimeout=5000 +#\u660e\u662f\u5426\u5728\u4ece\u6c60\u4e2d\u53d6\u51fa\u8fde\u63a5\u524d\u8fdb\u884c\u68c0\u9a8c,\u5982\u679c\u68c0\u9a8c\u5931\u8d25,\u5219\u4ece\u6c60\u4e2d\u53bb\u9664\u8fde\u63a5\u5e76\u5c1d\u8bd5\u53d6\u51fa\u53e6\u4e00\u4e2a +redis.testOnBorrow=true +#\u7f13\u5b58\u914d\u7f6e +redis.expiration=600 +redis.enableTransaction=true +redis.cache.ttl=10 +redis.cache.enableTransaction=true +#\u96c6\u7fa4\u914d\u7f6e +redis.cluster.nodes= +#redis.cluster.nodes=127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003,127.0.0.1:7004,127.0.0.1:7005,127.0.0.1:7006 +redis.cluster.max-redirects=3 +#\u4e3b\u4ece\u914d\u7f6e +redis.master= +redis.slave= +# +mq.brokerURL=failover:(tcp://localhost:61616) +mq.userName= +mq.password= +mq.sessionCacheSize=100 +mq.receiveTimeout=10000 +#\u4e34\u65f6\u6587\u4ef6\u9884\u89c8 +ui.file.uri.prefix=http://localhost/ +#fastdfs +fdfs.trackerList=127.0.0.1:22122 +fdfs.fileHost=http://127.0.0.1/ +# +sftp.host=192.168.5.100 +sftp.port=22 +sftp.user.name=root +sftp.user.password=buzhidao +sftp.timeout=5000 +sftp.aliveMax=10 +sftp.baseDir=/user/ibase4j/ +sftp.nginx.path=http://localhost/ +# +email.smtp.host=smtp.126.com +email.send.from=ibase4j,ibase4j@126.com +email.user.name=ibase4j +email.user.password=a123456 +email.authorisation.code=ibase4j \ No newline at end of file diff --git a/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysDeptServiceImpl.java b/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysDeptServiceImpl.java index e683ce9e..5b8497b2 100644 --- a/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysDeptServiceImpl.java +++ b/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,8 @@ package org.ibase4j.service.impl; +import java.util.List; +import java.util.Map; + import org.ibase4j.mapper.SysDeptMapper; import org.ibase4j.model.SysDept; import org.ibase4j.service.SysDeptService; @@ -19,18 +22,20 @@ import top.ibase4j.core.base.BaseServiceImpl; @MotanService(interfaceClass = SysDeptService.class) public class SysDeptServiceImpl extends BaseServiceImpl implements SysDeptService { @Override - public SysDept queryById(Long id) { - SysDept sysDept = super.queryById(id); - if (sysDept != null) { - if (sysDept.getParentId() != null) { - SysDept parent = super.queryById(sysDept.getParentId()); - if (parent != null) { - sysDept.setParentName(parent.getDeptName()); - } else { - sysDept.setParentId(null); + public List queryList(Map params) { + List page = super.queryList(params); + for (SysDept sysDept : page) { + if (sysDept != null) { + if (sysDept.getParentId() != null) { + SysDept parent = super.queryById(sysDept.getParentId()); + if (parent != null) { + sysDept.setParentName(parent.getDeptName()); + } else { + sysDept.setParentId(null); + } } } } - return sysDept; + return page; } } diff --git a/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysMenuServiceImpl.java b/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysMenuServiceImpl.java index 4098bf5e..0d8b9027 100644 --- a/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysMenuServiceImpl.java +++ b/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysMenuServiceImpl.java @@ -91,8 +91,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl List> dicMaps = InstanceUtil.newArrayList(); for (SysDic sysDic : sysDics) { if (!"read".equals(sysDic.getCode())) { - if ("add".equals(sysDic.getCode()) || "update".equals(sysDic.getCode()) - || "delete".equals(sysDic.getCode()) + if ("update".equals(sysDic.getCode()) || "delete".equals(sysDic.getCode()) || "sys.task.scheduled".equals(sysMenu.getPermission())) { Map dicMap = InstanceUtil.transBean2Map(sysDic); dicMap.put("id", "D" + sysDic.getId()); diff --git a/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysUserServiceImpl.java b/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysUserServiceImpl.java index f2f1eb3f..9e7c232c 100644 --- a/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysUserServiceImpl.java +++ b/iBase4J-SYS-Service/src/main/java/org/ibase4j/service/impl/SysUserServiceImpl.java @@ -23,8 +23,10 @@ import com.alibaba.dubbo.config.annotation.Service; import com.weibo.api.motan.config.springsupport.annotation.MotanService; import top.ibase4j.core.base.BaseServiceImpl; +import top.ibase4j.core.exception.BusinessException; import top.ibase4j.core.support.Pagination; import top.ibase4j.core.support.login.ThirdPartyUser; +import top.ibase4j.core.util.DataUtil; import top.ibase4j.core.util.InstanceUtil; import top.ibase4j.core.util.SecurityUtil; @@ -47,6 +49,24 @@ public class SysUserServiceImpl extends BaseServiceImpl @Autowired private SysAuthorizeService sysAuthorizeService; + @Override + @Transactional + public SysUser update(SysUser record) { + if (DataUtil.isNotEmpty(record.getOldPassword())) { + SysUser sysUser = super.queryById(record.getId()); + String encryptPassword = SecurityUtil.encryptPassword(record.getOldPassword()); + if (!sysUser.getPassword().equals(encryptPassword)) { + throw new BusinessException("原密码错误."); + } + } + if (DataUtil.isEmpty(record.getPassword())) { + record.setPassword(null); + } else { + record.setPassword(SecurityUtil.encryptPassword(record.getPassword())); + } + return super.update(record); + } + @Override public SysUser queryById(Long id) { SysUser record = super.queryById(id); diff --git a/iBase4J-SYS-Service/src/main/resources/config/prod/jdbc.properties b/iBase4J-SYS-Service/src/main/resources/config/prod/jdbc.properties new file mode 100644 index 00000000..686a0aef --- /dev/null +++ b/iBase4J-SYS-Service/src/main/resources/config/prod/jdbc.properties @@ -0,0 +1,26 @@ +#\u9a71\u52a8 +druid.driverClassName=com.mysql.cj.jdbc.Driver +#\u5bc6\u94a5(\u4f7f\u7528\u65b9\u5f0f\u67e5\u770btop.ibase4j.core.config.Configs) +druid.key= +#\u8bfb +druid.reader.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false +druid.reader.username=root +#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6 +druid.reader.password=68NKG7n1mN8rErEfbag2qM== +#\u5199 +druid.writer.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false +druid.writer.username=root +#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6 +druid.writer.password=68NKG7n1mN8rErEfbag2qM== + +#\u5b9a\u4e49\u521d\u59cb\u8fde\u63a5\u6570 +druid.initialSize=5 +#\u5b9a\u4e49\u6700\u5927\u8fde\u63a5\u6570 +druid.maxActive=20 + +# Mybatis\u914d\u7f6e +mybatis.dialectType=mysql +mybatis.typeAliasesPackage=*.*.model* +mybatis.mapperLocations=classpath*:**/mapper/xml/*.xml +mybatis.mapperBasePackage=*.*.mapper +mybatis.idType=AUTO \ No newline at end of file diff --git a/iBase4J-SYS-Service/src/main/resources/config/test/jdbc.properties b/iBase4J-SYS-Service/src/main/resources/config/test/jdbc.properties new file mode 100644 index 00000000..686a0aef --- /dev/null +++ b/iBase4J-SYS-Service/src/main/resources/config/test/jdbc.properties @@ -0,0 +1,26 @@ +#\u9a71\u52a8 +druid.driverClassName=com.mysql.cj.jdbc.Driver +#\u5bc6\u94a5(\u4f7f\u7528\u65b9\u5f0f\u67e5\u770btop.ibase4j.core.config.Configs) +druid.key= +#\u8bfb +druid.reader.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false +druid.reader.username=root +#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6 +druid.reader.password=68NKG7n1mN8rErEfbag2qM== +#\u5199 +druid.writer.url=jdbc:mysql://127.0.0.1:3306/ibase4j\u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&serverTimezone=PRC&useSSL=false +druid.writer.username=root +#\u914d\u7f6ePropertiesUtil\u89e3\u5bc6 +druid.writer.password=68NKG7n1mN8rErEfbag2qM== + +#\u5b9a\u4e49\u521d\u59cb\u8fde\u63a5\u6570 +druid.initialSize=5 +#\u5b9a\u4e49\u6700\u5927\u8fde\u63a5\u6570 +druid.maxActive=20 + +# Mybatis\u914d\u7f6e +mybatis.dialectType=mysql +mybatis.typeAliasesPackage=*.*.model* +mybatis.mapperLocations=classpath*:**/mapper/xml/*.xml +mybatis.mapperBasePackage=*.*.mapper +mybatis.idType=AUTO \ No newline at end of file diff --git a/iBase4J-SYS-Web/src/main/java/org/ibase4j/web/SysUserController.java b/iBase4J-SYS-Web/src/main/java/org/ibase4j/web/SysUserController.java index 68e0332a..7253492a 100644 --- a/iBase4J-SYS-Web/src/main/java/org/ibase4j/web/SysUserController.java +++ b/iBase4J-SYS-Web/src/main/java/org/ibase4j/web/SysUserController.java @@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import top.ibase4j.core.base.BaseController; -import top.ibase4j.core.exception.BusinessException; import top.ibase4j.core.support.Assert; import top.ibase4j.core.support.http.HttpCode; import top.ibase4j.core.util.SecurityUtil; @@ -52,12 +51,6 @@ public class SysUserController extends BaseController { public Object update(ModelMap modelMap, @RequestBody SysUser param) { Assert.isNotBlank(param.getAccount(), "ACCOUNT"); Assert.length(param.getAccount(), 3, 15, "ACCOUNT"); - if (param.getId() != null) { - SysUser result = service.queryById(param.getId()); - if ("3".equals(result.getUserType())) { - throw new BusinessException("不允许修改系统内置用户"); - } - } if (param.getEnable() == null) { param.setEnable(0); } diff --git a/iBase4J-SYS-Web/src/main/resources/config/prod/system.properties b/iBase4J-SYS-Web/src/main/resources/config/prod/system.properties new file mode 100644 index 00000000..3a3ddf1f --- /dev/null +++ b/iBase4J-SYS-Web/src/main/resources/config/prod/system.properties @@ -0,0 +1,7 @@ +rpc.registry.name=iBase4J-SYS-Web +rpc.protocol.port=18088 +redis.enableTransaction=false +#\u4f1a\u8bdd +session.maxInactiveInterval=1800 +session.cookie.secure=true +rememberMe.cookie.maxAge=86400 \ No newline at end of file diff --git a/iBase4J-SYS-Web/src/main/resources/config/test/system.properties b/iBase4J-SYS-Web/src/main/resources/config/test/system.properties new file mode 100644 index 00000000..1fa8111a --- /dev/null +++ b/iBase4J-SYS-Web/src/main/resources/config/test/system.properties @@ -0,0 +1,7 @@ +rpc.registry.name=iBase4J-SYS-Web +rpc.protocol.port=18088 +redis.enableTransaction=false +#\u4f1a\u8bdd +session.maxInactiveInterval=1800 +session.cookie.secure=false +rememberMe.cookie.maxAge=86400 \ No newline at end of file diff --git a/iBase4J-UI/iBase4J-UI-AngularJS/index.html b/iBase4J-UI/iBase4J-UI-AngularJS/index.html index af991725..c071de50 100644 --- a/iBase4J-UI/iBase4J-UI-AngularJS/index.html +++ b/iBase4J-UI/iBase4J-UI-AngularJS/index.html @@ -54,6 +54,7 @@ + diff --git a/iBase4J-UI/iBase4J-UI-AngularJS/lib/md5.js b/iBase4J-UI/iBase4J-UI-AngularJS/lib/md5.js new file mode 100644 index 00000000..36fc1c22 --- /dev/null +++ b/iBase4J-UI/iBase4J-UI-AngularJS/lib/md5.js @@ -0,0 +1,256 @@ +/* + * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message + * Digest Algorithm, as defined in RFC 1321. + * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002. + * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet + * Distributed under the BSD License + * See http://pajhome.org.uk/crypt/md5 for more info. + */ + +/* + * Configurable variables. You may need to tweak these to be compatible with + * the server-side, but the defaults work in most cases. + */ +var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */ +var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */ +var chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */ + +/* + * These are the functions you'll usually want to call + * They take string arguments and return either hex or base-64 encoded strings + */ +function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));} +function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));} +function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));} +function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); } +function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); } +function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); } + +/* + * Perform a simple self-test to see if the VM is working + */ +function md5_vm_test() +{ + return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72"; +} + +/* + * Calculate the MD5 of an array of little-endian words, and a bit length + */ +function core_md5(x, len) +{ + /* append padding */ + x[len >> 5] |= 0x80 << ((len) % 32); + x[(((len + 64) >>> 9) << 4) + 14] = len; + + var a = 1732584193; + var b = -271733879; + var c = -1732584194; + var d = 271733878; + + for(var i = 0; i < x.length; i += 16) + { + var olda = a; + var oldb = b; + var oldc = c; + var oldd = d; + + a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936); + d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586); + c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819); + b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330); + a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897); + d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426); + c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341); + b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983); + a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416); + d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417); + c = md5_ff(c, d, a, b, x[i+10], 17, -42063); + b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162); + a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682); + d = md5_ff(d, a, b, c, x[i+13], 12, -40341101); + c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290); + b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329); + + a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510); + d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632); + c = md5_gg(c, d, a, b, x[i+11], 14, 643717713); + b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302); + a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691); + d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083); + c = md5_gg(c, d, a, b, x[i+15], 14, -660478335); + b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848); + a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438); + d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690); + c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961); + b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501); + a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467); + d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784); + c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473); + b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734); + + a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558); + d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463); + c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562); + b = md5_hh(b, c, d, a, x[i+14], 23, -35309556); + a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060); + d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353); + c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632); + b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640); + a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174); + d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222); + c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979); + b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189); + a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487); + d = md5_hh(d, a, b, c, x[i+12], 11, -421815835); + c = md5_hh(c, d, a, b, x[i+15], 16, 530742520); + b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651); + + a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844); + d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415); + c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905); + b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055); + a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571); + d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606); + c = md5_ii(c, d, a, b, x[i+10], 15, -1051523); + b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799); + a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359); + d = md5_ii(d, a, b, c, x[i+15], 10, -30611744); + c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380); + b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649); + a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070); + d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379); + c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259); + b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551); + + a = safe_add(a, olda); + b = safe_add(b, oldb); + c = safe_add(c, oldc); + d = safe_add(d, oldd); + } + return Array(a, b, c, d); + +} + +/* + * These functions implement the four basic operations the algorithm uses. + */ +function md5_cmn(q, a, b, x, s, t) +{ + return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b); +} +function md5_ff(a, b, c, d, x, s, t) +{ + return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t); +} +function md5_gg(a, b, c, d, x, s, t) +{ + return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t); +} +function md5_hh(a, b, c, d, x, s, t) +{ + return md5_cmn(b ^ c ^ d, a, b, x, s, t); +} +function md5_ii(a, b, c, d, x, s, t) +{ + return md5_cmn(c ^ (b | (~d)), a, b, x, s, t); +} + +/* + * Calculate the HMAC-MD5, of a key and some data + */ +function core_hmac_md5(key, data) +{ + var bkey = str2binl(key); + if(bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz); + + var ipad = Array(16), opad = Array(16); + for(var i = 0; i < 16; i++) + { + ipad[i] = bkey[i] ^ 0x36363636; + opad[i] = bkey[i] ^ 0x5C5C5C5C; + } + + var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz); + return core_md5(opad.concat(hash), 512 + 128); +} + +/* + * Add integers, wrapping at 2^32. This uses 16-bit operations internally + * to work around bugs in some JS interpreters. + */ +function safe_add(x, y) +{ + var lsw = (x & 0xFFFF) + (y & 0xFFFF); + var msw = (x >> 16) + (y >> 16) + (lsw >> 16); + return (msw << 16) | (lsw & 0xFFFF); +} + +/* + * Bitwise rotate a 32-bit number to the left. + */ +function bit_rol(num, cnt) +{ + return (num << cnt) | (num >>> (32 - cnt)); +} + +/* + * Convert a string to an array of little-endian words + * If chrsz is ASCII, characters >255 have their hi-byte silently ignored. + */ +function str2binl(str) +{ + var bin = Array(); + var mask = (1 << chrsz) - 1; + for(var i = 0; i < str.length * chrsz; i += chrsz) + bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32); + return bin; +} + +/* + * Convert an array of little-endian words to a string + */ +function binl2str(bin) +{ + var str = ""; + var mask = (1 << chrsz) - 1; + for(var i = 0; i < bin.length * 32; i += chrsz) + str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask); + return str; +} + +/* + * Convert an array of little-endian words to a hex string. + */ +function binl2hex(binarray) +{ + var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef"; + var str = ""; + for(var i = 0; i < binarray.length * 4; i++) + { + str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) + + hex_tab.charAt((binarray[i>>2] >> ((i%4)*8 )) & 0xF); + } + return str; +} + +/* + * Convert an array of little-endian words to a base-64 string + */ +function binl2b64(binarray) +{ + var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + var str = ""; + for(var i = 0; i < binarray.length * 4; i += 3) + { + var triplet = (((binarray[i >> 2] >> 8 * ( i %4)) & 0xFF) << 16) + | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 ) + | ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF); + for(var j = 0; j < 4; j++) + { + if(i * 8 + j * 6 > binarray.length * 32) str += b64pad; + else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F); + } + } + return str; +} diff --git a/iBase4J-UI/iBase4J-UI-AngularJS/src/app/sys/login/loginController.js b/iBase4J-UI/iBase4J-UI-AngularJS/src/app/sys/login/loginController.js index 0db998a3..9450db9e 100644 --- a/iBase4J-UI/iBase4J-UI-AngularJS/src/app/sys/login/loginController.js +++ b/iBase4J-UI/iBase4J-UI-AngularJS/src/app/sys/login/loginController.js @@ -4,12 +4,14 @@ angular.module('app') .controller('loginController',[ '$rootScope', '$scope', '$http', '$state', function($rootScope, $scope, $http, $state) { $scope.user = {}; $scope.login = function () { + var u = $scope.user; + u.password = hex_md5(u.password); $.ajax({ type: 'POST', dataType: 'json', contentType:'application/json;charset=UTF-8', url : '/login', - data: angular.toJson($scope.user) + data: angular.toJson(u) }).then(function(result) { if (result.code == 200) { $state.go('main.sys.user.list'); diff --git a/iBase4J-UI/iBase4J-UI-AngularJS/src/app/sys/user/updateController.js b/iBase4J-UI/iBase4J-UI-AngularJS/src/app/sys/user/updateController.js index 246737fb..87060e8d 100644 --- a/iBase4J-UI/iBase4J-UI-AngularJS/src/app/sys/user/updateController.js +++ b/iBase4J-UI/iBase4J-UI-AngularJS/src/app/sys/user/updateController.js @@ -46,6 +46,7 @@ var m = $scope.record; if(m){ $scope.isDisabled = true;//提交disabled + m.password && (m.password = hex_md5(m.password)); $.ajax({ type: 'POST', url : '/user', -- Gitee