From 19585e11a029b6b6fc764ead57add95fd31b4b09 Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Sun, 31 Dec 2023 17:11:52 +0800
Subject: [PATCH 1/2] Configure Continuous Integration ....

---
 build.gradle                              | 3 ++-
 modules/test/build.gradle                 | 5 +++--
 settings.gradle                           | 2 ++
 src/main/resources/application.properties | 9 +++++----
 4 files changed, 12 insertions(+), 7 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 64ab875..b18e7f2 100644
--- a/modules/test/build.gradle
+++ b/modules/test/build.gradle
@@ -1,6 +1,7 @@
-apply plugin: 'com.hypaas.app-module'
+apply plugin: 'com.hypaas.app-module'
 hypaas {
   title = "test"
-}
+}
 dependencies {
 }
+
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 04f43dc..a64991d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -64,11 +64,11 @@ auth.logout.local=true
 # MySQL
 #db.default.driver = com.mysql.jdbc.Driver
 #db.default.visible=false
-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=/LogManage
 
 
 
+
 
 

From 599995e0ae4bd6d7148817967fc7b9e56e184518 Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Sun, 31 Dec 2023 17:34:56 +0800
Subject: [PATCH 2/2] Configure Continuous Integration ....

---
 modules/test/src/main/resources/domains/UserAuth.xml  | 2 +-
 modules/test/src/main/resources/views/actionGroup.xml | 2 +-
 src/main/resources/application.properties             | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/test/src/main/resources/domains/UserAuth.xml b/modules/test/src/main/resources/domains/UserAuth.xml
index 61c0644..d5975a8 100644
--- a/modules/test/src/main/resources/domains/UserAuth.xml
+++ b/modules/test/src/main/resources/domains/UserAuth.xml
@@ -2,7 +2,7 @@
 <domain-models  xmlns="http://hypaas.com/xml/ns/domain-models" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/domain-models http://hypaas.com/xml/ns/domain-models/domain-models_5.2.xsd">
   <module name="com.module.enmus" package="module"/>
   <enum name="UserAuth">
-    <item name="SystemManageUser" title="系统管理员" value="0"/>
+    <item name="SystemManageUser" title="系统管理员" value="4"/>
     <item name="SecurityUser" title="安全保密员" value="1"/>
     <item name="SecurityAuditUser" title="安全审计员" value="2"/>
     <item name="ServiceUser" title="业务用户" value="3"/>
diff --git a/modules/test/src/main/resources/views/actionGroup.xml b/modules/test/src/main/resources/views/actionGroup.xml
index d35926b..8a87c84 100644
--- a/modules/test/src/main/resources/views/actionGroup.xml
+++ b/modules/test/src/main/resources/views/actionGroup.xml
@@ -18,6 +18,6 @@
   <action-view name="action.view.SystemManageUser.Log" model="Log.LogEntity" title="系统管理员动作">
     <view name="SystemManageUser-grid" type="grid"/>
     <view name="SystemManageUser-form" type="form"/>
-    <domain>self.userAuth=0</domain>
+    <domain>self.userAuth=4</domain>
   </action-view>
 </object-views>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a64991d..b3c23c1 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -391,5 +391,6 @@ application.gatewaycontext=/LogManage
 
 
 
+