bug fix

admin-console/pom.xml

@@ -35,6 +35,4 @@
 		</dependency>
 	</dependencies>
 
-
-
 </project>

admin-console/src/main/resources/application.properties

@@ -11,8 +11,8 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 
 # 1，1 是管理员密码，相当于启动后就登录，方便测试，系统需要取消这俩个配置
-#user.id=1
-#user.orgId=1
+user.id=1
+user.orgId=1
 #打开审计功能，开发模式应该关闭
 audit.enable=false
 spring.session.store-type=HASH_MAP 

admin-console/src/main/resources/sql/console/audit.md

@@ -9,16 +9,16 @@ queryByCondtion
     @ // 添加数据权限
     and  #function("audit.query")#
     @if(isNotEmpty(functionName)){
-    		function_name like #'%'+functionName+'%'#
+    		and function_name like #'%'+functionName+'%'#
     @}
     @if(isNotEmpty(functionCode)){
-    		function_code like #'%'+functionCode+'%'#
+    		and function_code like #'%'+functionCode+'%'#
     @}
     @if(isNotEmpty(userName)){
-    		user_name like #'%'+userName+'%'#
+    		and user_name like #'%'+userName+'%'#
     @}
     @if(!isEmpty(createDateMin)){
-        and  create_time>= #createDateMin#
+         and  create_time>= #createDateMin#
     @}
     @if(!isEmpty(createDateMax)){
         and  create_time< #nextDay(createDateMax)#

admin-core/pom.xml

@@ -40,7 +40,7 @@
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>beetl-framework-starter</artifactId>
-			<version>1.1.45.RELEASE</version>
+			<version>1.1.47.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>com.trigersoft</groupId>

admin-workflow/src/main/resources/application.properties

-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/flowable?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=123456
+server.port=9000
+
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/flowable?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+#spring.datasource.username=root
+#spring.datasource.password=123456
+spring.datasource.url=jdbc:oracle:thin:@172.16.86.56:1521:dfzb
+spring.datasource.username=flowable
+spring.datasource.password=flowable
+spring.datasource.driver-class-name=oracle.jdbc.OracleDriver