From 188d2b9b7211f43b96e4fbf45fbf49125959708d Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Mon, 22 Jan 2024 17:05:29 +0800
Subject: [PATCH] Configure Continuous Integration ....

---
 build.gradle                                             | 3 ++-
 modules/test/build.gradle                                | 9 +++++----
 modules/test/src/main/resources/domains/LogEntity.xml    | 1 +
 .../src/main/resources/views/SecurityAuditUser-form.xml  | 1 +
 .../test/src/main/resources/views/SecurityUser-form.xml  | 1 +
 .../test/src/main/resources/views/ServiceUser-form.xml   | 1 +
 .../src/main/resources/views/SystemManageUser-form.xml   | 1 +
 settings.gradle                                          | 2 ++
 src/main/resources/application.properties                | 9 +++++----
 9 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index eae015b..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'
@@ -70,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/LogEntity.xml b/modules/test/src/main/resources/domains/LogEntity.xml
index e22182d..f660b4d 100644
--- a/modules/test/src/main/resources/domains/LogEntity.xml
+++ b/modules/test/src/main/resources/domains/LogEntity.xml
@@ -21,6 +21,7 @@
     <enum column="USERAUTH" required="false" massUpdate="false" ref="module.UserAuth" name="userAuth" copy="true"/>
     <string nullable="true" actOverwrite="false" copy="true" column="USERAUTHDESC" massUpdate="false" name="userAuthDesc" isJudg="false"/>
     <string actOverwrite="false" copy="true" column="USERID" massUpdate="false" name="userId" isJudg="false"/>
+    <string actOverwrite="false" title="应用" copy="true" massUpdate="false" name="app" isJudg="false"/>
     <string actOverwrite="false" copy="true" massUpdate="false" name="address" isJudg="false"/>
   </entity>
 </domain-models>
diff --git a/modules/test/src/main/resources/views/SecurityAuditUser-form.xml b/modules/test/src/main/resources/views/SecurityAuditUser-form.xml
index d16f44f..862bdea 100644
--- a/modules/test/src/main/resources/views/SecurityAuditUser-form.xml
+++ b/modules/test/src/main/resources/views/SecurityAuditUser-form.xml
@@ -11,6 +11,7 @@
       <field canSuggest="true" name="opType" title="操作类型"/>
       <field canSuggest="true" name="time" title="操作时间"/>
       <field canSuggest="true" name="userAuth" title="用户权限"/>
+      <field canSuggest="true" name="app" title="应用"/>
     </panel>
   </form>
 </object-views>
diff --git a/modules/test/src/main/resources/views/SecurityUser-form.xml b/modules/test/src/main/resources/views/SecurityUser-form.xml
index ce646fd..5521e8b 100644
--- a/modules/test/src/main/resources/views/SecurityUser-form.xml
+++ b/modules/test/src/main/resources/views/SecurityUser-form.xml
@@ -11,6 +11,7 @@
       <field canSuggest="true" name="opType" title="操作类型"/>
       <field canSuggest="true" name="time" title="操作时间"/>
       <field canSuggest="true" name="userAuth" title="用户权限"/>
+      <field canSuggest="true" name="app" title="应用"/>
     </panel>
   </form>
 </object-views>
diff --git a/modules/test/src/main/resources/views/ServiceUser-form.xml b/modules/test/src/main/resources/views/ServiceUser-form.xml
index aff73a3..5615b90 100644
--- a/modules/test/src/main/resources/views/ServiceUser-form.xml
+++ b/modules/test/src/main/resources/views/ServiceUser-form.xml
@@ -11,6 +11,7 @@
       <field canSuggest="true" name="opType" title="操作类型"/>
       <field canSuggest="true" name="time" title="操作时间"/>
       <field canSuggest="true" name="userAuth" title="用户权限"/>
+      <field canSuggest="true" name="app" title="应用"/>
     </panel>
   </form>
 </object-views>
diff --git a/modules/test/src/main/resources/views/SystemManageUser-form.xml b/modules/test/src/main/resources/views/SystemManageUser-form.xml
index adab470..c9c17c2 100644
--- a/modules/test/src/main/resources/views/SystemManageUser-form.xml
+++ b/modules/test/src/main/resources/views/SystemManageUser-form.xml
@@ -11,6 +11,7 @@
       <field canSuggest="true" name="opType" title="操作类型"/>
       <field canSuggest="true" name="time" title="操作时间"/>
       <field canSuggest="true" name="userAuth" title="用户权限"/>
+      <field canSuggest="true" name="app" title="应用"/>
     </panel>
   </form>
 </object-views>
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 6d96906..9f34362 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -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_zhangqiyang_app_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=
 
 #db.company1.name=Company 1
 #db.company1.driver=com.mysql.cj.jdbc.Driver
@@ -390,5 +390,6 @@ application.gatewaycontext=/lowcode-portal-logmanage/
 
 
 
+