diff --git a/app/ui/config b/app/ui/config index 60e6921..3433da8 100644 --- a/app/ui/config +++ b/app/ui/config @@ -1,11 +1,11 @@ { ".url": { - "certimate.Application": { + "Certimate.Application": { "title": "Certimate", "icon": "images/icon_{0}.png", "protocol": "http", "type": "iframe", - "port": "8090", + "port": "8091", "url": "/", "allUsers": false } diff --git a/cmd/install_callback b/cmd/install_callback index ecca542..2ddeb42 100644 --- a/cmd/install_callback +++ b/cmd/install_callback @@ -7,18 +7,13 @@ CREATE_CMD="${TRIM_APPDEST}/certimate superuser add ${cer_user} ${cer_pwd}" echo "正在创建新的管理员账户..." $DELETE_CMD -if [ $? -eq 0 ]; then - echo "新管理员创建成功" -else - echo "错误:创建新管理员失败" - exit 1 # 如果创建失败,退出并返回错误码 -fi $CREATE_CMD if [ $? -eq 0 ]; then echo "新管理员创建成功" else echo "错误:创建新管理员失败" - exit 1 # 如果创建失败,退出并返回错误码 + exit 1 fi + exit 0 \ No newline at end of file diff --git a/cmd/main b/cmd/main index 200af45..0d6ae9b 100644 --- a/cmd/main +++ b/cmd/main @@ -4,7 +4,7 @@ LOG_FILE="${TRIM_PKGVAR}/info.log" PID_FILE="${TRIM_PKGVAR}/app.pid" # write the command to start your program here -CMD="${TRIM_APPDEST}/certimate -serve ${server_address}:8090 --dir ./pb_data" +CMD="${TRIM_APPDEST}/certimate serve --http ${server_address}:8091 --dir ${TRIM_APPDEST}/pb_data" log_msg() { echo "$(date '+%Y-%m-%d %H:%M:%S') - $1" >> ${LOG_FILE} diff --git a/config/resource b/config/resource index c1198c8..7a73a41 100644 --- a/config/resource +++ b/config/resource @@ -1,28 +1,2 @@ { - "data-share": - { - "shares": - [ - { - "name": "certimate", - "permission": - { - "rw": - [ - "certimate" - ] - } - }, - { - "name": "certimate/data", - "permission": - { - "rw": - [ - "certimate" - ] - } - } - ] - } } \ No newline at end of file diff --git a/manifest b/manifest index 334f3bd..d060370 100644 --- a/manifest +++ b/manifest @@ -7,4 +7,4 @@ source = thirdparty maintainer = certimate distributor = Krcia desktop_uidir = ui -desktop_applaunchname = certimate.Application +desktop_applaunchname = Certimate.Application diff --git a/wizard/install.json b/wizard/install similarity index 69% rename from wizard/install.json rename to wizard/install index f5345d7..5a76d5a 100644 --- a/wizard/install.json +++ b/wizard/install @@ -6,7 +6,6 @@ "type": "text", "field": "cer_user", "label": "邮箱", - "initValue": "admin", "rules": [ { "required": true, @@ -48,24 +47,28 @@ }, { "stepTitle": "请选择访问范围", - "type": "select", - "field": "server_address", - "label": "访问范围", - "initValue": "127.0.0.1", - "options": [ + "items": [ { - "label": "127.0.0.1", - "value": "127.0.0.1" - }, - { - "label": "0.0.0.0", - "value": "0.0.0.0" - } - ], - "rules": [ - { - "required": true, - "message": "请选择访问范围" + "type": "select", + "field": "server_address", + "label": "访问范围", + "initValue": "127.0.0.1", + "options": [ + { + "label": "127.0.0.1", + "value": "127.0.0.1" + }, + { + "label": "0.0.0.0", + "value": "0.0.0.0" + } + ], + "rules": [ + { + "required": true, + "message": "请选择访问范围" + } + ] } ] }