From 822b79cb4b8bffc30615123000ba74f6987508d9 Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Thu, 18 Apr 2024 15:20:57 +0800
Subject: [PATCH] Configure Continuous Integration ....
---
build.gradle | 6 ++--
modules/test/build.gradle | 9 ++---
.../src/main/resources/domains/UserAuth.xml | 8 ++---
.../views/SecurityAuditUser-grid.xml | 2 +-
.../resources/views/SecurityUser-grid.xml | 2 +-
.../main/resources/views/ServiceUser-grid.xml | 2 +-
.../resources/views/SystemManageUser-grid.xml | 2 +-
.../src/main/resources/views/actionGroup.xml | 35 +++++++++----------
.../test/src/main/resources/views/menu.xml | 4 +--
settings.gradle | 2 ++
src/main/resources/application.properties | 11 +++---
11 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/build.gradle b/build.gradle
index a0d08c2..b169a37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
//mavenCentral()
// maven { url 'https://plugins.gradle.org/m2/' }
//jcenter()
- maven { url 'http://139.9.112.197:3081/repository/GradleRep/' }
+ maven { url 'http://192.168.0.200:3081/repository/GradleRep/' }
}
ext.platformVersion = '1.0.+'
ext.appVersion = '1.0.0'
@@ -43,7 +43,8 @@ configurations {
runtime.exclude group: 'javax.ws.rs', module: 'jsr311-api'
}
dependencies {
- implementation project(':modules:test')
+ implementation project(":modules:test")
+
implementation 'com.alibaba:easyexcel:2.2.6'
implementation 'com.alibaba:fastjson:1.2.83'
//aem
@@ -69,3 +70,4 @@ dependencies {
wrapper {
gradleVersion = "6.3"
}
+
diff --git a/modules/test/build.gradle b/modules/test/build.gradle
index 34eb976..b18e7f2 100644
--- a/modules/test/build.gradle
+++ b/modules/test/build.gradle
@@ -1,6 +1,7 @@
apply plugin: 'com.hypaas.app-module'
-hypaas {
- title = "test"
-}
-dependencies {
+hypaas {
+ title = "test"
}
+dependencies {
+}
+
diff --git a/modules/test/src/main/resources/domains/UserAuth.xml b/modules/test/src/main/resources/domains/UserAuth.xml
index e42ee79..ae6c913 100644
--- a/modules/test/src/main/resources/domains/UserAuth.xml
+++ b/modules/test/src/main/resources/domains/UserAuth.xml
@@ -2,9 +2,9 @@
-
-
-
-
+
+
+
+
diff --git a/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml b/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
index cc7f3ce..ba0ff57 100644
--- a/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
+++ b/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/modules/test/src/main/resources/views/SecurityUser-grid.xml b/modules/test/src/main/resources/views/SecurityUser-grid.xml
index 847975b..ecdbe62 100644
--- a/modules/test/src/main/resources/views/SecurityUser-grid.xml
+++ b/modules/test/src/main/resources/views/SecurityUser-grid.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/modules/test/src/main/resources/views/ServiceUser-grid.xml b/modules/test/src/main/resources/views/ServiceUser-grid.xml
index ab944f8..10afe8a 100644
--- a/modules/test/src/main/resources/views/ServiceUser-grid.xml
+++ b/modules/test/src/main/resources/views/ServiceUser-grid.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/modules/test/src/main/resources/views/SystemManageUser-grid.xml b/modules/test/src/main/resources/views/SystemManageUser-grid.xml
index ca47f89..d3b238c 100644
--- a/modules/test/src/main/resources/views/SystemManageUser-grid.xml
+++ b/modules/test/src/main/resources/views/SystemManageUser-grid.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/modules/test/src/main/resources/views/actionGroup.xml b/modules/test/src/main/resources/views/actionGroup.xml
index bc0fc05..659bf25 100644
--- a/modules/test/src/main/resources/views/actionGroup.xml
+++ b/modules/test/src/main/resources/views/actionGroup.xml
@@ -1,15 +1,24 @@
+
+
+
+
+
+
- self.userAuth=3
+ self.userAuth=4
- self.userAuth=1
+ self.userAuth=2
+
+
+
@@ -17,24 +26,24 @@
+
+
+
-
-
-
- self.userAuth=2
+ self.userAuth=3
- self.userAuth=16
+ self.userAuth=1
@@ -45,16 +54,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/test/src/main/resources/views/menu.xml b/modules/test/src/main/resources/views/menu.xml
index 7ea9f9b..f765997 100644
--- a/modules/test/src/main/resources/views/menu.xml
+++ b/modules/test/src/main/resources/views/menu.xml
@@ -5,6 +5,6 @@
-
-
+
+
diff --git a/settings.gradle b/settings.gradle
index 9a71af0..6162fa6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,5 @@
rootProject.name = 'hy-iot-paas'
include "modules:test"
+
+
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index aacf3e0..056e8ec 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
# Application Information
# ~~~~~
application.name=\u004c\u006f\u0067\u004d\u0061\u006e\u0061\u0067\u0065
-application.id=b7e60204-649b-4998-86e1-ec33090a8744
+application.id=
application.sid=1719173642480254976
application.callback.url=http://117.78.10.170:3000/api/v1/message/preview/
application.description=
@@ -62,11 +62,11 @@ auth.logout.local=true
#db.default.password = hypaas
# MySQL
-db.default.driver=com.mysql.cj.jdbc.Driver
+db.default.driver=
db.default.ddl=update
-db.default.url=jdbc:mysql://117.78.10.170:3006/app_331617a15c45392328b161de78a9aa81_master_pre?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
-db.default.user=app_zhangqiyang
-db.default.password=Asdf123!@#
+db.default.url=jdbc:://?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
+db.default.user=
+db.default.password=
system.operate.log.switch=false
@@ -466,5 +466,6 @@ logging.level.com.hypaas=INFO
+