Merge remote-tracking branch 'origin/develop' into develop

db/uasp.mysql.sql

@@ -99,8 +99,8 @@ CREATE TABLE `act_hi_procinst`  (
   `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
   `BUSINESS_KEY_` varchar(1020) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `START_TIME_` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-  `END_TIME_` datetime(6) NOT NULL,
+  `START_TIME_` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `END_TIME_` datetime NOT NULL,
   `DURATION_` int(11) NULL DEFAULT NULL,
   `START_USER_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `START_ACT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
@@ -547,8 +547,8 @@ CREATE TABLE `act_ru_task_extension`  (
   `TASK_DEF_KEY_` varchar(1020) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `DELEGATION_` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `PRIORITY_` int(11) NULL DEFAULT NULL,
-  `START_TIME_` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6),
-  `DUE_DATE_` timestamp(6) NOT NULL,
+  `START_TIME_` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `DUE_DATE_` datetime NOT NULL,
   `SUSPENSION_STATE_` int(11) NULL DEFAULT NULL,
   `CATEGORY_` varchar(1020) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
   `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '',

huigou-xt/src/main/resources/application-mysql.properties

+pub.db.url=jdbc:mysql://192.168.3.57:3306/bpmtest?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
+pub.db.user=topsun
+pub.db.password=topsunit.com
+
+log.db.url=jdbc:mysql://192.168.3.57:3306/bpmtest?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8&useSSL=false
+log.db.user=topsun
+log.db.password=topsunit.com
+
+shiro.host=127.0.0.1
+shiro.port=6379
+shiro.expire=18000
+
+system.dataSource=dataSource
+system.hibernate.dialect=com.huigou.data.dialect.MySQL5InnoDBDialect
+sqlDialect=mysql
+
+#shiroFilter loginUrl
+shiro.loginUrl=/Login.jsp
+#cas shiroFilter loginUrl
+#shiro.loginUrl=http://localhost:8085/cas/login?service=http://localhost:8080/yihe/Login.jsp
+
+shiro.cas.flag=false
+shiro.cas.serverUrlPrefix=http://localhost:8085/cas
+shiro.cas.service=http://localhost:8080/yihe
+
+#openldap and adldap server
+shiro.ldap.serverUrlPrefix=ldap://192.168.2.200:389
+shiro.ldap.systemUsername=manager
+shiro.ldap.systemPassword=123456
+#adldap: {0}@dev.huigou.com
+#openldap: uid={0},ou=users,dc=huigou,dc=com
+shiro.ldap.userDnTemplate={0}@dev.huigou.com
+
+rtx.server.ip=192.168.2.200
+sys.server.ip=127.0.0.1:8080/is/
+
+corpId=wxafae524e350f2298
+corpSecret=FwcIKKl8AcVp6xlaXYxfMF0KSTFmyWGP9ZSt0iaCFNf-1GQcLU29ulmk4mVax1QB
\ No newline at end of file