Skip to content

Commit

Permalink
fix:update SCUI 1.6.9
Browse files Browse the repository at this point in the history
  • Loading branch information
Tinywan committed Apr 6, 2024
1 parent 869cdc7 commit 4de0d45
Show file tree
Hide file tree
Showing 8 changed files with 8,670 additions and 8,693 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
"php": ">=7.4",
"ext-json": "*",
"ext-gd": "*",
"ext-openssl": "*",
"ext-pdo": "*",
"ext-redis": "*",
"workerman/webman-framework": "^1.5",
"monolog/monolog": "^2.0",
"illuminate/redis": "^8.83",
Expand All @@ -48,15 +51,12 @@
"tinywan/rpc": "^1.2",
"tinywan/jwt": "^1.8",
"workbunny/webman-nacos": "^1.1",
"ext-openssl": "*",
"webman/gateway-worker": "^1.0",
"ext-pdo": "*",
"webman/think-orm": "^1.1",
"casbin/webman-permission": "^1.2",
"psr/container": "^1.1",
"php-di/php-di": "^6.4",
"mkorkmaz/redislabs-rejson": "^2.0",
"ext-redis": "*",
"ethanhann/redisearch-php": "^1.9",
"webman/push": "^1.0"
},
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions config/redis.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
return array(
'default' =>
array(
'host' => '192.168.13.168',
'password' => null,
'port' => 63789,
'host' => '192.168.3.29',
'password' => 123456,
'port' => 6379,
'database' => 0,
),
);
2 changes: 1 addition & 1 deletion config/server.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

return [
'listen' => 'http://0.0.0.0:8201',
'listen' => 'http://0.0.0.0:8888',
'transport' => 'tcp',
'context' => [],
'name' => 'webman-admin',
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scui",
"version": "1.5.0",
"version": "1.6.9",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
4 changes: 2 additions & 2 deletions web/src/config/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ const DEFAULT_CONFIG = {
DASHBOARD_URL: "/dashboard",

//版本号
APP_VER: "1.5.0",
APP_VER: "1.6.9",

//内核版本号
CORE_VER: "1.5.0",
CORE_VER: "1.6.9",

//接口地址
// API_URL: "/api",
Expand Down
5 changes: 2 additions & 3 deletions web/src/views/userCenter/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,8 @@
}
},
async login(){
var validate = await this.$refs.loginForm.validate().catch(()=>{})
if(!validate){ return false }
// var validate = await this.$refs.loginForm.validate().catch(()=>{})
// if(!validate){ return false }
// this.islogin = true
var data = {
username: this.ruleForm.user,
Expand Down
Loading

0 comments on commit 4de0d45

Please sign in to comment.