Merge pull request #167 from suyuan32/dev

Dev
suyuan32 · Jul 25, 2023 · bb0db7c · bb0db7c
2 parents 4b6ae21 + f2d4a50
commit bb0db7c
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 26 deletions.
diff --git a/Dockerfile-api b/Dockerfile-api
@@ -1,4 +1,4 @@
-FROM golang:1.20.5-alpine3.17 as builder
+FROM golang:1.20.6-alpine3.17 as builder
 
 # Define the project name | 定义项目名称
 ARG PROJECT=core

diff --git a/Dockerfile-rpc b/Dockerfile-rpc
@@ -1,4 +1,4 @@
-FROM golang:1.20.5-alpine3.17 as builder
+FROM golang:1.20.6-alpine3.17 as builder
 
 # Define the project name | 定义项目名称
 ARG PROJECT=core

diff --git a/api/core.go b/api/core.go
@@ -5,7 +5,7 @@
 //		Schemes: http, https
 //		Host: localhost:9100
 //		BasePath: /
-//		Version: 1.0.14
+//		Version: 1.1.0
 //		Contact: [email protected]
 //		SecurityDefinitions:
 //		  Token:

diff --git a/core.json b/core.json
@@ -16,7 +16,7 @@
     "contact": {
       "email": "[email protected]"
     },
-    "version": "1.0.14"
+    "version": "1.1.0"
   },
   "host": "localhost:9100",
   "basePath": "/",

diff --git a/deploy/docker-compose/all_in_one/mysql/docker-compose.yaml b/deploy/docker-compose/all_in_one/mysql/docker-compose.yaml
@@ -63,7 +63,7 @@ services:
           memory: 200M
 
   core-rpc:
-    image: ryanpower/core-rpc-docker:v1.0.14
+    image: ryanpower/core-rpc-docker:v1.1.0
     container_name: core-rpc
     restart: always
     ports:
@@ -88,7 +88,7 @@ services:
           memory: 200M
 
   job-rpc:
-    image: ryanpower/job-rpc-docker:v1.0.14
+    image: ryanpower/job-rpc-docker:v1.1.0
     container_name: job-rpc
     restart: always
     ports:
@@ -113,7 +113,7 @@ services:
           memory: 200M
 
   core-api:
-    image: ryanpower/core-api-docker:v1.0.14
+    image: ryanpower/core-api-docker:v1.1.0
     container_name: core-api
     restart: always
     environment:
@@ -140,7 +140,7 @@ services:
           memory: 200M
 
   backend-ui:
-    image: ryanpower/backend-ui-docker:v1.0.14
+    image: ryanpower/backend-ui-docker:v1.1.0
     container_name: backend-ui
     restart: always
     ports:
@@ -191,7 +191,7 @@ services:
           memory: 200M
 
   mcms-rpc:
-    image: ryanpower/mcms-rpc-docker:v1.0.14
+    image: ryanpower/mcms-rpc-docker:v1.1.0
     container_name: mcms-rpc
     restart: always
     environment:

diff --git a/deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml b/deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml
@@ -62,7 +62,7 @@ services:
           memory: 200M
 
   core-rpc:
-    image: ryanpower/core-rpc-docker:v1.0.14
+    image: ryanpower/core-rpc-docker:v1.1.0
     container_name: core-rpc
     restart: always
     #    ports:
@@ -82,7 +82,7 @@ services:
           memory: 200M
 
   job-rpc:
-    image: ryanpower/job-rpc-docker:v1.0.14
+    image: ryanpower/job-rpc-docker:v1.1.0
     container_name: job-rpc
     restart: always
     #    ports:
@@ -102,7 +102,7 @@ services:
           memory: 200M
 
   core-api:
-    image: ryanpower/core-api-docker:v1.0.14
+    image: ryanpower/core-api-docker:v1.1.0
     container_name: core-api
     restart: always
     environment:
@@ -125,7 +125,7 @@ services:
           memory: 200M
 
   backend-ui:
-    image: ryanpower/backend-ui-docker:v1.0.14
+    image: ryanpower/backend-ui-docker:v1.1.0
     container_name: backend-ui
     restart: always
     ports:
@@ -171,7 +171,7 @@ services:
           memory: 200M
 
   mcms-rpc:
-    image: ryanpower/mcms-rpc-docker:v1.0.14
+    image: ryanpower/mcms-rpc-docker:v1.1.0
     container_name: mcms-rpc
     restart: always
     #    environment:

diff --git a/go.mod b/go.mod
@@ -4,14 +4,14 @@ go 1.20
 
 require (
 	entgo.io/ent v0.12.3
-	github.com/casbin/casbin/v2 v2.71.1
+	github.com/casbin/casbin/v2 v2.72.1
 	github.com/duke-git/lancet/v2 v2.2.3
 	github.com/gofrs/uuid/v5 v5.0.0
 	github.com/hibiken/asynq v0.24.1
 	github.com/mojocn/base64Captcha v1.3.5
-	github.com/suyuan32/simple-admin-common v1.0.14
-	github.com/suyuan32/simple-admin-job v1.0.14
-	github.com/suyuan32/simple-admin-message-center v1.0.14
+	github.com/suyuan32/simple-admin-common v1.1.0
+	github.com/suyuan32/simple-admin-job v1.1.0
+	github.com/suyuan32/simple-admin-message-center v1.1.0
 	github.com/zeromicro/go-zero v1.5.4
 	golang.org/x/oauth2 v0.7.0
 	google.golang.org/grpc v1.56.2
@@ -95,6 +95,9 @@ require (
 	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
+	github.com/tidwall/gjson v1.14.4 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/zclconf/go-cty v1.13.1 // indirect
 	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect

diff --git a/go.sum b/go.sum
@@ -75,8 +75,8 @@ github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
 github.com/bsm/gomega v1.26.0/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/casbin/casbin/v2 v2.29.2/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
-github.com/casbin/casbin/v2 v2.71.1 h1:LRHyqM0S1LzM/K59PmfUIN0ZJfLgcOjL4OhOQI/FNXU=
-github.com/casbin/casbin/v2 v2.71.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
+github.com/casbin/casbin/v2 v2.72.1 h1:AF6JM0pvyi+tRyudiyTI/rF08RvBZ4NV897kk82CCZs=
+github.com/casbin/casbin/v2 v2.72.1/go.mod h1:mzGx0hYW9/ksOSpw3wNjk3NRAroq5VMFYUQ6G43iGPk=
 github.com/casbin/ent-adapter v0.3.0 h1:4lkhB/BwXAhj84iSrZG/gQ4avkO4uPwz4kdDP1VEnww=
 github.com/casbin/ent-adapter v0.3.0/go.mod h1:U6saAFuVDEOWLCtrgx35d95M12FC0uh5GtJL82QunRM=
 github.com/casbin/redis-watcher/v2 v2.5.0 h1:a0922GOKYDSSiD7hEQxmLh/psea2eLZtf1V12XzLI5w=
@@ -539,14 +539,20 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/suyuan32/simple-admin-common v1.0.14 h1:NPCicXOSitgzQCo/YBOfo0pg18KG6rHAVtUVuN4ikn0=
-github.com/suyuan32/simple-admin-common v1.0.14/go.mod h1:D3dQ6R4Nb+wP45Eg6+gomFI8Y5yMs0lP4TLsiyE2e48=
-github.com/suyuan32/simple-admin-job v1.0.14 h1:snZkTfYG1MOmHCT9lhZWdmLqftt28YTXSUsCTvbFiyc=
-github.com/suyuan32/simple-admin-job v1.0.14/go.mod h1:enkFFO7GqNgQXrie5wzAAj4LClmiCO0ZgKj8C7M1rHc=
-github.com/suyuan32/simple-admin-message-center v1.0.14 h1:1wCEcddQlkuWCGi4tchIuGo70+CaUSuLtgWFAhSqm+o=
-github.com/suyuan32/simple-admin-message-center v1.0.14/go.mod h1:EJuOBXA6OWUD/kneZlM9dX0nAJb9oSxEfwSr7ptTNjM=
+github.com/suyuan32/simple-admin-common v1.1.0 h1:aoKCmr5fiY7dpoRrMiDsa62Q1L83qgyFNiLLYpYfBEY=
+github.com/suyuan32/simple-admin-common v1.1.0/go.mod h1:ZAZ38l37vg5KXtTMLREobfrPjWhtI7r0s53oje1iIIs=
+github.com/suyuan32/simple-admin-job v1.1.0 h1:tiz6RXYa2Di6VYvA/5xARVgU6VyYn1yb4KUKRbR6VBI=
+github.com/suyuan32/simple-admin-job v1.1.0/go.mod h1:ANF/VtEbB/+NSXMZgr25R1/mtYjXg4CEl6Lc6WJ6OeQ=
+github.com/suyuan32/simple-admin-message-center v1.1.0 h1:Wa2apBKvXsjtC3yGjbPDpf50hL2n37CZhr518fW3OeY=
+github.com/suyuan32/simple-admin-message-center v1.1.0/go.mod h1:qH9Vd9x1vUYiaOEPBKMbJ8UH0n7HYrowru77kKhMnm0=
 github.com/suyuan32/simple-admin-tools v1.5.13 h1:ULAwPs+bboLVPDxU69MTSAWHoUTKQHOlZNCOyDZ0DEQ=
 github.com/suyuan32/simple-admin-tools v1.5.13/go.mod h1:Z77AWRcji26zjB2kGS6ZVMvkwW2/6y8oSQ+4Igmr/9c=
+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=