diff --git a/.gradle/6.3/executionHistory/executionHistory.bin b/.gradle/6.3/executionHistory/executionHistory.bin index b28b03b..98bb0c5 100644 Binary files a/.gradle/6.3/executionHistory/executionHistory.bin and b/.gradle/6.3/executionHistory/executionHistory.bin differ diff --git a/.gradle/6.3/executionHistory/executionHistory.lock b/.gradle/6.3/executionHistory/executionHistory.lock index 3a65b72..ead2663 100644 Binary files a/.gradle/6.3/executionHistory/executionHistory.lock and b/.gradle/6.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/6.3/fileHashes/fileHashes.bin b/.gradle/6.3/fileHashes/fileHashes.bin index 3404d24..fda467c 100644 Binary files a/.gradle/6.3/fileHashes/fileHashes.bin and b/.gradle/6.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/6.3/fileHashes/fileHashes.lock b/.gradle/6.3/fileHashes/fileHashes.lock index f1d601b..8c9e131 100644 Binary files a/.gradle/6.3/fileHashes/fileHashes.lock and b/.gradle/6.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/6.3/fileHashes/resourceHashesCache.bin b/.gradle/6.3/fileHashes/resourceHashesCache.bin index c91b601..c4f7a03 100644 Binary files a/.gradle/6.3/fileHashes/resourceHashesCache.bin and b/.gradle/6.3/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/6.3/javaCompile/javaCompile.lock b/.gradle/6.3/javaCompile/javaCompile.lock index 37b15b5..93b9dbf 100644 Binary files a/.gradle/6.3/javaCompile/javaCompile.lock and b/.gradle/6.3/javaCompile/javaCompile.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 6f83b34..483e5fe 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index a898066..8fd462b 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/modules/test/build.gradle b/modules/test/build.gradle index 64ab875..34eb976 100644 --- a/modules/test/build.gradle +++ b/modules/test/build.gradle @@ -1,6 +1,6 @@ -apply plugin: 'com.hypaas.app-module' -hypaas { - title = "test" -} -dependencies { -} +apply plugin: 'com.hypaas.app-module' +hypaas { + title = "test" +} +dependencies { +} diff --git a/modules/test/out/production/classes/module/UserAuth.class b/modules/test/out/production/classes/module/UserAuth.class index 225484e..cc34c87 100644 Binary files a/modules/test/out/production/classes/module/UserAuth.class and b/modules/test/out/production/classes/module/UserAuth.class differ diff --git a/modules/test/out/production/resources/domains/UserAuth.xml b/modules/test/out/production/resources/domains/UserAuth.xml index 61c0644..d5975a8 100644 --- a/modules/test/out/production/resources/domains/UserAuth.xml +++ b/modules/test/out/production/resources/domains/UserAuth.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/test/out/production/resources/views/actionGroup.xml b/modules/test/out/production/resources/views/actionGroup.xml index d35926b..8a87c84 100644 --- a/modules/test/out/production/resources/views/actionGroup.xml +++ b/modules/test/out/production/resources/views/actionGroup.xml @@ -18,6 +18,6 @@ - self.userAuth=0 + self.userAuth=4 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 @@ - + 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 @@ - self.userAuth=0 + self.userAuth=4 diff --git a/out/production/resources/AccessInterface.yml b/out/production/resources/AccessInterface.yml index d9d99b4..c06eee0 100644 --- a/out/production/resources/AccessInterface.yml +++ b/out/production/resources/AccessInterface.yml @@ -1,3 +1,5 @@ interfaceList: - "/ws/register/register/face" - - "/ws/register/login/face" \ No newline at end of file + - "/ws/register/login/face" + # - "/ws/eventCenter/user/saveUser" + # - "/ws/eventCenter/user/deleteUser" \ No newline at end of file diff --git a/out/production/resources/application.properties b/out/production/resources/application.properties index 8a8a09c..20802dd 100644 --- a/out/production/resources/application.properties +++ b/out/production/resources/application.properties @@ -62,14 +62,13 @@ auth.logout.local=true #db.default.password = hypaas # MySQL -#db.default.driver = com.mysql.jdbc.Driver -#db.default.visible=false db.default.driver=com.mysql.cj.jdbc.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.company1.name=Company 1 #db.company1.driver=com.mysql.cj.jdbc.Driver #db.company1.url=jdbc:mysql://localhost:3306/hy_iot_paas2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false @@ -319,6 +318,13 @@ logging.level.com.hypaas=INFO # Log connection pooling #logging.level.com.zaxxer.hikari = INFO +#auth.jwt.basic.auth.enabled=true +#application.microcontext=/LogManage +#application.gatewaycontext=/LogManage + + + + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 04f43dc..0a1fab3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -62,14 +62,13 @@ auth.logout.local=true #db.default.password = hypaas # MySQL -#db.default.driver = com.mysql.jdbc.Driver -#db.default.visible=false db.default.driver=com.mysql.cj.jdbc.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.company1.name=Company 1 #db.company1.driver=com.mysql.cj.jdbc.Driver #db.company1.url=jdbc:mysql://localhost:3306/hy_iot_paas2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false @@ -320,8 +319,9 @@ logging.level.com.hypaas=INFO #logging.level.com.zaxxer.hikari = INFO auth.jwt.basic.auth.enabled=true -application.microcontext=/LogManage -application.gatewaycontext=/LogManage +application.microcontext=/lowcode-portal-logmanage +application.gatewaycontext=/lowcode-portal-logmanage +