PenaSide/heruvym
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

--

Browse Source
This commit is contained in:
Skeris 2022-12-13 23:08:17 +03:00
parent fd0a38f5d4
commit e007c02e6d
4 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -1,10 +1,10 @@
FROM alpine
ADD heruvym /
COPY prod.crt /
COPY prod.key /
ENV APP_ADDR=:1488
ENV BB_IS_PROD=true
ENV BB_MONGO_URI=mongodb://mongodb,mongodb2
ENV MINIO_ENDPOINT=minio:9001
RUN apk add --no-cache ca-certificates
ENV BB_PORT=1488
ENV BB_IS_PROD=false
ENV BB_MONGO_URI=mongodb://mongo:27017
ENV BB_MINIO_EP=minio:9000
ENV BB_MINIO_AK=minioadmin
ENV BB_MINIO_SK=minioadmin
EXPOSE 1488
CMD ["/heruvym"]

27
app/app.go
View File

@ -134,17 +134,20 @@ func New(ctx context.Context, opts interface{}, ver appInit.Version) (appInit.Co
}
fmt.Println("miniod")
newBot, err := tb.NewBot(tb.Settings{
Token: "5240336345:AAG6ZXm6IYqsIZn7SoJTltJWviOXhVa4D0c",
Verbose: false,
ParseMode: tb.ModeHTML,
Poller: &tb.LongPoller{
Timeout: time.Second,
},
})
if err != nil {
//logger.Emit(json.Token(err))
return nil, err
var newBot *tb.Bot
if options.LoggerDevMode {
newBot, err = tb.NewBot(tb.Settings{
Token: "5240336345:AAG6ZXm6IYqsIZn7SoJTltJWviOXhVa4D0c",
Verbose: false,
ParseMode: tb.ModeHTML,
Poller: &tb.LongPoller{
Timeout: time.Second,
},
})
if err != nil {
//logger.Emit(json.Token(err))
return nil, err
}
}
heruvym := service.New(blobStore, database, connRoles, logger, newBot)
@ -222,7 +225,7 @@ func New(ctx context.Context, opts interface{}, ver appInit.Version) (appInit.Co
errChan <- err
}
} else {
fmt.Println("startserver")
fmt.Println("startserver" + options.NumberPortLocal)
if err := server.ListenAndServe(); err != nil {
errChan <- err
}

4
compose.yml
View File

@ -1,6 +1,8 @@
services:
svc:
build: .
ports:
- 1488:1488
depends_on:
- mongo
- mongosetup
@ -9,7 +11,7 @@ services:
image: mongo:6
hostname: mongo
restart: always
entrypoint: ["/usr/bin/mongod", "--logpath", "/dev/null","--bind_ip_all","--replSet","rs0"]
entrypoint: ["/usr/bin/mongod","--bind_ip_all","--replSet","rs0"]
mongosetup:
image: mongo:6
depends_on:

36
service/service.go
View File

@ -137,6 +137,9 @@ func (h *Heruvym) CreateTicket(w http.ResponseWriter, r *http.Request) {
}
go func() {
if h.ral == nil {
return
}
role, _ := h.ral.GetProfileRole(context.TODO(), session.User)
if role != "user" && role != "" {
return
@ -202,11 +205,19 @@ func (h *Heruvym) GetList(ctx context.Context) chan interface{} {
if sess.User == "" {
go h.unauthorizedTickets(ctx, sess.Session, output)
} else {
role, err := h.ral.GetProfileRole(ctx, sess.User)
var (
role string
err error
)
if h.ral != nil {
role, err = h.ral.GetProfileRole(ctx, sess.User)
if err != nil {
fmt.Println("HER ERR", err)
go h.hasNoRole(output)
if err != nil {
fmt.Println("HER ERR", err)
go h.hasNoRole(output)
}
} else {
role = "admin"
}
fmt.Println("ALL TICKETS Sess ", sess.User, role)
if role == "admin" || role == "manager" {
@ -320,6 +331,9 @@ func (h *Heruvym) PutMessage(
}
go func() {
if h.ral == nil {
return
}
role, _ := h.ral.GetProfileRole(context.TODO(), sess.User)
if role != "user" && role != "" {
return
@ -426,9 +440,17 @@ func (h *Heruvym) Subscribe(ctx context.Context) chan interface{} {
}
}()
} else {
role, err := h.ral.GetProfileRole(ctx, sess.User)
if err != nil {
go h.hasNoRole(output)
var (
role string
err error
)
if h.ral != nil {
role, err = h.ral.GetProfileRole(ctx, sess.User)
if err != nil {
go h.hasNoRole(output)
}
} else {
role = "admin"
}
if role == "admin" || role == "manager" {