zhangqiyang
/
logManage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Configure Continuous Integration ....

master
hypaas 7 months ago
parent
082d74ddd9
commit
822b79cb4b
11 changed files with 43 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      build.gradle
  2. 1
      modules/test/build.gradle
  3. 8
      modules/test/src/main/resources/domains/UserAuth.xml
  4. 2
      modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
  5. 2
      modules/test/src/main/resources/views/SecurityUser-grid.xml
  6. 2
      modules/test/src/main/resources/views/ServiceUser-grid.xml
  7. 2
      modules/test/src/main/resources/views/SystemManageUser-grid.xml
  8. 35
      modules/test/src/main/resources/views/actionGroup.xml
  9. 4
      modules/test/src/main/resources/views/menu.xml
  10. 2
      settings.gradle
  11. 11
      src/main/resources/application.properties

6
build.gradle
Unescape View File

@ -4,7 +4,7 @@ buildscript {
//mavenCentral() //mavenCentral()
// maven { url 'https://plugins.gradle.org/m2/' } // maven { url 'https://plugins.gradle.org/m2/' }
//jcenter() //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.platformVersion = '1.0.+'
ext.appVersion = '1.0.0' ext.appVersion = '1.0.0'
@ -43,7 +43,8 @@ configurations {
runtime.exclude group: 'javax.ws.rs', module: 'jsr311-api' runtime.exclude group: 'javax.ws.rs', module: 'jsr311-api'
} }
dependencies { dependencies {
implementation project(':modules:test') implementation project(":modules:test")
implementation 'com.alibaba:easyexcel:2.2.6' implementation 'com.alibaba:easyexcel:2.2.6'
implementation 'com.alibaba:fastjson:1.2.83' implementation 'com.alibaba:fastjson:1.2.83'
//aem //aem
@ -69,3 +70,4 @@ dependencies {
wrapper { wrapper {
gradleVersion = "6.3" gradleVersion = "6.3"
} }

1
modules/test/build.gradle
Unescape View File

@ -4,3 +4,4 @@ hypaas {
} }
dependencies { dependencies {
} }

8
modules/test/src/main/resources/domains/UserAuth.xml
Unescape View File

@ -2,9 +2,9 @@
<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"> <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"/> <module name="com.module.enmus" package="module"/>
<enum name="UserAuth"> <enum name="UserAuth">
<item name="SystemManageUser" title="系统管理员" value="16"/> <item name="SystemManageUser" title="系统管理员" value="1"/>
<item name="SecurityUser" title="安全保密员" value="1"/> <item name="SecurityUser" title="安全保密员" value="2"/>
<item name="SecurityAuditUser" title="安全审计员" value="2"/> <item name="SecurityAuditUser" title="安全审计员" value="3"/>
<item name="ServiceUser" title="业务用户" value="3"/> <item name="ServiceUser" title="业务用户" value="4"/>
</enum> </enum>
</domain-models> </domain-models>

2
modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
Unescape View File

@ -2,7 +2,7 @@
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<grid title="安全审计员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityAuditUser-grid" width="large"> <grid title="安全审计员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityAuditUser-grid" width="large">
<toolbar> <toolbar>
<button onClick="action.view.Export.Log" title="导出" name="导出"/> <button onClick="action.method.system.securityAuditUserLogExport" title="导出" name="导出"/>
</toolbar> </toolbar>
<field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/> <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
<field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/> <field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/>

2
modules/test/src/main/resources/views/SecurityUser-grid.xml
Unescape View File

@ -2,7 +2,7 @@
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<grid title="安全保密员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityUser-grid" width="large"> <grid title="安全保密员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityUser-grid" width="large">
<toolbar> <toolbar>
<button onClick="action.view.Export.Log" title="导出" name="导出"/> <button onClick="action.method.system.securityUserLogExport" title="导出" name="导出"/>
</toolbar> </toolbar>
<field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/> <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
<field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/> <field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/>

2
modules/test/src/main/resources/views/ServiceUser-grid.xml
Unescape View File

@ -2,7 +2,7 @@
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<grid canMove="false" canNew="true" title="业务用户操作日志" model="Log.LogEntity" canDelete="true" edit-icon="true" canArchive="false" editable="false" canSave="false" freeSearch="all" name="ServiceUser-grid" width="large" customSearch="true"> <grid canMove="false" canNew="true" title="业务用户操作日志" model="Log.LogEntity" canDelete="true" edit-icon="true" canArchive="false" editable="false" canSave="false" freeSearch="all" name="ServiceUser-grid" width="large" customSearch="true">
<toolbar> <toolbar>
<button onClick="action.view.Export.Log" title="导出" name="导出"/> <button onClick="action.method.system.serviceUserLogExport" title="导出" name="导出"/>
<button onClick="action.view.ServiceUserLogBackup.Log" title="日志备份" name="日志备份"/> <button onClick="action.view.ServiceUserLogBackup.Log" title="日志备份" name="日志备份"/>
</toolbar> </toolbar>
<field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/> <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>

2
modules/test/src/main/resources/views/SystemManageUser-grid.xml
Unescape View File

@ -2,7 +2,7 @@
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<grid title="系统管理员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SystemManageUser-grid" width="large"> <grid title="系统管理员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SystemManageUser-grid" width="large">
<toolbar> <toolbar>
<button onClick="action.view.Export.Log" title="导出" name="导出"/> <button onClick="action.method.system.systemManageUserLogExport" title="导出" name="导出"/>
<button onClick="action.view.SystemManageUserLogBackup.Log" title="日志备份" name="日志备份"/> <button onClick="action.view.SystemManageUserLogBackup.Log" title="日志备份" name="日志备份"/>
</toolbar> </toolbar>
<field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/> <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>

35
modules/test/src/main/resources/views/actionGroup.xml
Unescape View File

@ -1,15 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<action-method name="action.method.system.securityAuditUserLogExport" model="Log.LogEntity">
<call method="exportSecurityAuditUserLog" class="com.system.log.controller.LogController"/>
</action-method>
<action-method name="action.method.system.systemManageUserLogExport" model="Log.LogEntity">
<call method="exportSystemManageUserLog" class="com.system.log.controller.LogController"/>
</action-method>
<action-view name="action.view.ServiceUser.Log" model="Log.LogEntity" title="业务用户"> <action-view name="action.view.ServiceUser.Log" model="Log.LogEntity" title="业务用户">
<view name="ServiceUser-grid" type="grid"/> <view name="ServiceUser-grid" type="grid"/>
<view name="ServiceUser-form" type="form"/> <view name="ServiceUser-form" type="form"/>
<domain>self.userAuth=3</domain> <domain>self.userAuth=4</domain>
</action-view> </action-view>
<action-view name="action.view.SecurityUser.Log" model="Log.LogEntity" title="安全保密员"> <action-view name="action.view.SecurityUser.Log" model="Log.LogEntity" title="安全保密员">
<view name="SecurityUser-grid" type="grid"/> <view name="SecurityUser-grid" type="grid"/>
<view name="SecurityUser-form" type="form"/> <view name="SecurityUser-form" type="form"/>
<domain>self.userAuth=1</domain> <domain>self.userAuth=2</domain>
</action-view> </action-view>
<action-method name="action.method.system.securityUserLogExport" model="Log.LogEntity">
<call method="exportSecurityUserLog" class="com.system.log.controller.LogController"/>
</action-method>
<action-view name="action.view.Config.Log" model="Log.LogEntity" title="日志配置"> <action-view name="action.view.Config.Log" model="Log.LogEntity" title="日志配置">
<view name="LogConfig-grid" type="grid"/> <view name="LogConfig-grid" type="grid"/>
<view name="LogConfig-form" type="form"/> <view name="LogConfig-form" type="form"/>
@ -17,24 +26,24 @@
<action-method name="action.method.system.logBackup" model="Log.LogConfig"> <action-method name="action.method.system.logBackup" model="Log.LogConfig">
<call method="secondBackup" class="com.system.log.controller.LogController"/> <call method="secondBackup" class="com.system.log.controller.LogController"/>
</action-method> </action-method>
<action-method name="action.method.system.serviceUserLogExport" model="Log.LogEntity">
<call method="exportServiceUserLog" class="com.system.log.controller.LogController"/>
</action-method>
<action-view name="action.view.Export.Log" model="Log.LogEntity" title="日志导出"> <action-view name="action.view.Export.Log" model="Log.LogEntity" title="日志导出">
<view name="export-form" type="form"/> <view name="export-form" type="form"/>
</action-view> </action-view>
<action-view name="action.view.ServiceUserLogBackup.Log" model="Log.LogConfig" title="业务用户日志备份"> <action-view name="action.view.ServiceUserLogBackup.Log" model="Log.LogConfig" title="业务用户日志备份">
<view name="ServiceUserLogBackup-grid" type="grid"/> <view name="ServiceUserLogBackup-grid" type="grid"/>
</action-view> </action-view>
<action-method name="action.method.system.logExport" model="Log.LogEntity">
<call method="exportLog" class="com.system.log.controller.LogController"/>
</action-method>
<action-view name="action.view.SecurityAuditUser.Log" model="Log.LogEntity" title="安全审计员"> <action-view name="action.view.SecurityAuditUser.Log" model="Log.LogEntity" title="安全审计员">
<view name="SecurityAuditUser-grid" type="grid"/> <view name="SecurityAuditUser-grid" type="grid"/>
<view name="SecurityAuditUser-form" type="form"/> <view name="SecurityAuditUser-form" type="form"/>
<domain>self.userAuth=2</domain> <domain>self.userAuth=3</domain>
</action-view> </action-view>
<action-view name="action.view.SystemManageUser.Log" model="Log.LogEntity" title="系统管理员"> <action-view name="action.view.SystemManageUser.Log" model="Log.LogEntity" title="系统管理员">
<view name="SystemManageUser-grid" type="grid"/> <view name="SystemManageUser-grid" type="grid"/>
<view name="SystemManageUser-form" type="form"/> <view name="SystemManageUser-form" type="form"/>
<domain>self.userAuth=16</domain> <domain>self.userAuth=1</domain>
</action-view> </action-view>
<action-view name="action.view.System.Log" title="查询系统日志"> <action-view name="action.view.System.Log" title="查询系统日志">
<view name="SystemManageUser-grid" type="grid"/> <view name="SystemManageUser-grid" type="grid"/>
@ -45,16 +54,4 @@
<action-view name="action.view.SystemManageUserLogBackup.Log" model="Log.LogConfig" title="系统管理员日志备份"> <action-view name="action.view.SystemManageUserLogBackup.Log" model="Log.LogConfig" title="系统管理员日志备份">
<view name="SystemManageUserBackup-grid" type="grid"/> <view name="SystemManageUserBackup-grid" type="grid"/>
</action-view> </action-view>
<action-method name="action.method.system.logManage.systemLog" model="Log.LogEntity">
<call method="getFileZip" class="com.system.log.controller.LogController"/>
</action-method>
<action-view name="action.view.selectSystemLog.Log" model="Log.LogEntity" title="系统运行日志查询">
<view name="LogWeb/index.html" type="html"/>
</action-view>
<action-view name="action.view.SecurityUser.LogConfig" model="Log.LogConfig" title="日志配置">
<view name="LogBackup/index.html" type="html"/>
</action-view>
</object-views> </object-views>

4
modules/test/src/main/resources/views/menu.xml
Unescape View File

@ -5,6 +5,6 @@
<menuitem parent="menu-LogManage" title="安全审计员操作日志" left="true" name="menu-SecurityAuditUser-Log" action="action.view.SecurityAuditUser.Log"/> <menuitem parent="menu-LogManage" title="安全审计员操作日志" left="true" name="menu-SecurityAuditUser-Log" action="action.view.SecurityAuditUser.Log"/>
<menuitem parent="menu-LogManage" title="系统管理员操作日志" left="true" name="menu-SystemManageUser-Log" action="action.view.SystemManageUser.Log"/> <menuitem parent="menu-LogManage" title="系统管理员操作日志" left="true" name="menu-SystemManageUser-Log" action="action.view.SystemManageUser.Log"/>
<menuitem parent="menu-LogManage" title="安全保密员操作日志" left="true" name="menu-SecurityUser-Log" action="action.view.SecurityUser.Log"/> <menuitem parent="menu-LogManage" title="安全保密员操作日志" left="true" name="menu-SecurityUser-Log" action="action.view.SecurityUser.Log"/>
<menuitem parent="menu-LogManage" title="系统运行日志" left="true" name="menu-System-Log" action="action.view.selectSystemLog.Log"/> <menuitem parent="menu-LogManage" title="系统运行日志" left="true" name="menu-System-Log"/>
<menuitem parent="menu-LogManage" title="日志配置" left="true" name="menu-Config-Log" action="action.view.SecurityUser.LogConfig"/> <menuitem parent="menu-LogManage" title="日志配置" left="true" name="menu-Config-Log"/>
</object-views> </object-views>

2
settings.gradle
Unescape View File

@ -1,3 +1,5 @@
rootProject.name = 'hy-iot-paas' rootProject.name = 'hy-iot-paas'
include "modules:test" include "modules:test"

11
src/main/resources/application.properties
Unescape View File

@ -1,7 +1,7 @@
# Application Information # Application Information
# ~~~~~ # ~~~~~
application.name=\u004c\u006f\u0067\u004d\u0061\u006e\u0061\u0067\u0065 application.name=\u004c\u006f\u0067\u004d\u0061\u006e\u0061\u0067\u0065
application.id=b7e60204-649b-4998-86e1-ec33090a8744 application.id=
application.sid=1719173642480254976 application.sid=1719173642480254976
application.callback.url=http://117.78.10.170:3000/api/v1/message/preview/ application.callback.url=http://117.78.10.170:3000/api/v1/message/preview/
application.description= application.description=
@ -62,11 +62,11 @@ auth.logout.local=true
#db.default.password = hypaas #db.default.password = hypaas
# MySQL # MySQL
db.default.driver=com.mysql.cj.jdbc.Driver db.default.driver=
db.default.ddl=update 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.url=jdbc:://?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
db.default.user=app_zhangqiyang db.default.user=
db.default.password=Asdf123!@# db.default.password=
system.operate.log.switch=false system.operate.log.switch=false
@ -466,5 +466,6 @@ logging.level.com.hypaas=INFO

Write Preview
Loading…
Cancel
Save