First merge from develop to main (WIP) #7

Merged

sugar merged 199 commits from develop into main 2026-01-27 17:47:07 +00:00

Conversation 0 Commits 199 Files Changed 228 +21302

sugar commented 2026-01-27 17:46:53 +00:00

Owner

Copy Link

No description provided.

sugar added 199 commits 2026-01-27 17:46:54 +00:00

Init golang project ... b81a43019a

- Gin
- Gorm
- Viper
- Logrus

Signed-off-by: Asai Neko <sugar@sne.moe>

Add justfile to project ... 55e7d3520a

NOTE: only go build added

Signed-off-by: Asai Neko <sugar@sne.moe>

Add static router & mod justfile ... e2345a8d4a

- default, run, build actions in justfile

Signed-off-by: Asai Neko <sugar@sne.moe>

Add database driver and config module ... dc128c0392

Signed-off-by: Asai Neko <sugar@sne.moe>

Add user db search ... 0fb5c8b758

- Search user by email

Signed-off-by: Asai Neko <sugar@sne.moe>

Add dev services ... f130401ff8

- Development dotenvs
- Caddy service
- Redis service
- Postgres service
- Fix env parser error

Signed-off-by: Asai Neko <sugar@sne.moe>

Add user service checkin func ... 1505783c62

- User service SetCheckinState

NOTE: Not Tested

Signed-off-by: Asai Neko <sugar@sne.moe>

Add jwt crypto module, support unit test for config module ... d314942c08

Signed-off-by:  Asai Neko<sugar@sne.moe>

Remove env settings in unit test ... 2d92d5fba7

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix config module for unit test ... b933522123

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix grabage codes 5 years ago ... 485d0de64b

Signed-off-by: Asai Neko <sugar@sne.moe>

Replace menual env replacer to auto env replacer ... fd4da4f1a1

Signed-off-by: Asai Neko <sugar@sne.moe>

Add authentication function ... cd2bcd597c

Signed-off-by: Asai Neko <sugar@sne.moe>

Impl magic login logic && checkin logic ... bd726f80ea

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix User database struct ... ca08c997c8

Signed-off-by: Asai Neko <sugar@sne.moe>

Checkin time data column, checkin module ... 396ab10469

Signed-off-by: Asai Neko <sugar@sne.moe>

Add user info service ... f8b6c1b1df

Signed-off-by: Asai Neko <sugar@sne.moe>

feat(client): initial commit ... 1302a5ea03

- Initialized vite project
- Added bun devshell config

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): setup formatting ... f5a811a6a2

- Installed @antfu/eslint-config for formatting
- Installed lint-staged for pre-commit formatting compliance

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): setup tailwindcss and shadcn ... 2148e47b10

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): add shadcn theme ... 44616895cf

- Added Nix theme
- Defaults to dark mode

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): setup tanstack router ... b888bb25b0

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): setup tanstack query and axios ... 06c51e599d

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): setup axios client ... 3e9656db23

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): login page ... 634c922903

Signed-off-by: Noa Virellia <noa@requiem.garden>

refactor(client): token helper ... 1d387a33c5

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): workspace ... e4e15b2f6e

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): magic link sign-in ... 606c74c587

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): check in ... 9ac598cd98

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): user info ... be3d778420

Signed-off-by: Noa Virellia <noa@requiem.garden>

Modify justfile for bun build ... 43f95ba4af

Signed-off-by: Asai Neko <sugar@sne.moe>

Real email send after login ... a5a354e929

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix unreturned error ... 942767aed3

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix caddy api proxy ... 9c7cfb3da6

Signed-off-by: Asai Neko <sugar@sne.moe>

chore(client): remove internal devshell ... f94220dcc3

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): logout ... 9e51414a13

Signed-off-by: Noa Virellia <noa@requiem.garden>

Add redis driver ... 32a27d974a

Signed-off-by: Asai Neko <sugar@sne.moe>

Add full refresh token and access token function ... 3a86d387bd

Signed-off-by: Asai Neko <sugar@sne.moe>

Add meilisearch service to devenv ... 5b571f7a84

Signed-off-by: Asai Neko <sugar@sne.moe>

Add user CRUD actions, add permission level for user ... 9135edbd60

Signed-off-by: Asai Neko <sugar@sne.moe>

Set default user permission level to 10 ... c672d174f6

Signed-off-by: Asai Neko <sugar@sne.moe>

Add user permission level notes ... 9e649d83e5

Signed-off-by: Asai Neko <sugar@sne.moe>

Migrate checkin to user service ... bfeb46a61f

Signed-off-by: Asai Neko <sugar@sne.moe>

Add user update service ... d3d823c85f

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove error router ... c7cefb3898

Signed-off-by: Asai Neko <sugar@sne.moe>

Auto reg user, event map ... b30d9db69d

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove user create api ... 8e43d6699c

Signed-off-by: Asai Neko <sugar@sne.moe>

Mod event and user table, add event CURD ... 3dbcc00a2d

Signed-off-by: Asai Neko <sugar@sne.moe>

Add meilisearch for user and event ... 6681ffccdf

Signed-off-by: Asai Neko <sugar@sne.moe>

Add full search for user table ... 98e32b67e1

Signed-off-by: Asai Neko <sugar@sne.moe>

Add search full for event table ... 81a518a98b

Signed-off-by: Asai Neko <sugar@sne.moe>

refactor(client): use updated interface ... a06248f3be

Signed-off-by: Noa Virellia <noa@requiem.garden>

chore(client): eslint format ... 2b99d415de

Signed-off-by: Noa Virellia <noa@requiem.garden>

Add event service, caddy test domain ... afc62f311b

Signed-off-by: Asai Neko <sugar@sne.moe>

Modify condig file ... e87bda4f33

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix JWT ttl failed ... e6492eeb94

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove a space ... 10f148a07f

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix typo error ... 959bb8be0b

Signed-off-by: Asai Neko <sugar@sne.moe>

Add renew refresh token ... b6003544c8

Signed-off-by: Asai Neko <sugar@sne.moe>

Add event query api ... b3fe91444d

Signed-off-by: Asai Neko <sugar@sne.moe>

Move event query to user query ... fb7ecaffe9

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix checkin time zero json error ... f89a483380

Signed-off-by: Asai Neko <sugar@sne.moe>

feat(client): qrcode checkin dialog ... a48f5ad2fa

Signed-off-by: Noa Virellia <noa@requiem.garden>

Fix code duplicate bug ... 0a861fa674

Signed-off-by: Asai Neko <sugar@sne.moe>

Merge branch 'develop' of ssh://git.sne.moe:2222/sugar/nixcn-cms into develop 8bafd52f43

chore(client): remove unused files ... af66dc6155

Signed-off-by: Noa Virellia <noa@requiem.garden>

Expend justfile functions ... 7d76b85055

Signed-off-by: Asai Neko <sugar@sne.moe>

Rename client-dev to client ... 3f05dbe1e6

Signed-off-by: Asai Neko <sugar@sne.moe>

feat(.zed/settings): set tab size for nix and ts files ... cdcd05ea52

Signed-off-by: Noa Virellia <noa@requiem.garden>

chore(client): specify dev server host ... d46af028dc

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(devenv)!: integrate all services and tasks ... 580402a5c2

Signed-off-by: Noa Virellia <noa@requiem.garden>

fix(devenv): use correct just command ... 228d838c37

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(auth/magic): log to console instead of sending email in debug mode ... a49450bf9e

Signed-off-by: Noa Virellia <noa@requiem.garden>

chore(just): do not run frontend install in backend commands ... d44eef6bb7

Signed-off-by: Noa Virellia <noa@requiem.garden>

Add contributing guide to README ... 4c438cf4e4

Signed-off-by: Asai Neko <sugar@sne.moe>

refactor(client): optimize suspense components ... b5b4bb9d66

Signed-off-by: Noa Virellia <noa@requiem.garden>

refactor(client): qr dialog skeleton ... 8973d518a2

Signed-off-by: Noa Virellia <noa@requiem.garden>

Refactor mass data structure ... acd3c95c80

Signed-off-by: Asai Neko <sugar@sne.moe>

Refactor checkin table to attendance table ... 304e1d95ed

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove user.type from auth/magic service ... e40d175c8e

Signed-off-by: Asai Neko <sugar@sne.moe>

Add bcrypt and aes crypto lib ... 63f71d3b81

Signed-off-by: Asai Neko <sugar@sne.moe>

Add aes cryptography library ... 27ba3b7bef

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix a bug ... 9f927c907a

Signed-off-by: Asai Neko <sugar@sne.moe>

Add Bio to user table, set varchar for role in attendance table ... e0e1abab93

Signed-off-by: Asai Neko <sugar@sne.moe>

Return user bio in user info service ... 5b6bc9ce42

Signed-off-by: Asai Neko <sugar@sne.moe>

Add event type for event table ... 83fe326962

Signed-off-by: Asai Neko <sugar@sne.moe>

Add hot reload for backend ... 3d685b5a86

Signed-off-by: Asai Neko <sugar@sne.moe>

Modify jwt middleware logic ... cbec9bf2b3

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix dup err logic ... bd8eecbc7d

Signed-off-by: Asai Neko <sugar@sne.moe>

Modify auth middleware ... 4dfd4cd529

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix jwt middleware ... 4796653896

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix request return ... 743f8373b0

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix jwt middleware cnext ... ae93f49691

Signed-off-by: Asai Neko <sugar@sne.moe>

Add abort for jwt middleware ... fd1c89392f

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix default config ... 62da1e096e

Signed-off-by: Asai Neko <sugar@sne.moe>

Add oauth2 like auth service ... a98ab26fa4

Signed-off-by: Asai Neko <sugar@sne.moe>

Change resend to using smtp ... d70ade4907

Signed-off-by: Asai Neko <sugar@sne.moe>

Change magic_link_ttl old name to auth_code_ttl ... 0b710fd538

Signed-off-by: Asai Neko <sugar@sne.moe>

Sign new code for new redirect ... 61d2d2aef3

Signed-off-by: Asai Neko <sugar@sne.moe>

Add bio base64 verification ... 8dbdb58327

Signed-off-by: Asai Neko <sugar@sne.moe>

Add owner to event table ... d6acae1625

Signed-off-by: Asai Neko <sugar@sne.moe>

Add user full table api ... aa8e57bd89

Signed-off-by: Asai Neko <sugar@sne.moe>

Add kycinfo for attendance table ane related utils ... 1fa90b15c3

Signed-off-by: Asai Neko <sugar@sne.moe>

Add Aliyun Id2MetaVerify encode impl ... 3510d6c1f8

Signed-off-by: Asai Neko <sugar@sne.moe>

Add AliId2MetaVerify OpenAPI pkg ... 1adfda54a6

Signed-off-by: Asai Neko <sugar@sne.moe>

Add description for event table ... 5f7f078f02

Signed-off-by: Asai Neko <sugar@sne.moe>

Add Attendance state for attendance table ... ef64c29ea7

Signed-off-by: Asai Neko <sugar@sne.moe>

Go mod tidy ... aea7fddef0

Signed-off-by: Asai Neko <sugar@sne.moe>

Change authcode using redis, authtoken use client secret to sign jwt ... b0684492fa

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove jwt_secret from config ... eddfa9a884

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix missed saving file (auth/redirect service) ... c2fd1c5cc8

Signed-off-by: Asai Neko <sugar@sne.moe>

Add EnableKYC for event table ... b4d0959de4

Signed-off-by: Asai Neko <sugar@sne.moe>

Add permission middleware ... ddffb0da23

Signed-off-by: Asai Neko <sugar@sne.moe>

Mod permission middleware to only request database once ... 0f1c8e327e

Signed-off-by: Asai Neko <sugar@sne.moe>

Tune user API permission level ... 9e840901d1

Signed-off-by: Asai Neko <sugar@sne.moe>

Tune permission level ... 0710ffce72

Signed-off-by: Asai Neko <sugar@sne.moe>

Reorder checkin api location (move to event) ... 70846e0d1e

Signed-off-by: Asai Neko <sugar@sne.moe>

Use utils.HttpResponse/Abort to replace c.JSON/Abort ... 6a9c013799

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove some useless comments ... f8a3d0ca45

Signed-off-by: Asai Neko <sugar@sne.moe>

Add Exchange SMTP Oauth2 Support (not verified) ... aaedddfd2f

Signed-off-by: Asai Neko <sugar@sne.moe>

Go mod tidy ... 67e22eb793

Signed-off-by: Asai Neko <sugar@sne.moe>

feat(client): profile-wip ... a80c3cd1dd

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): refactor auth/login ... 8e792ced68

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): add profile bio markdown editor ... b8a2e24bd0

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): migrate to pnpm ... 7edcda544b

Signed-off-by: Noa Virellia <noa@requiem.garden>

Add Containerfile for production use ... 7e37b92f24

Signed-off-by: Asai Neko <sugar@sne.moe>

feat(just): migrate client commands to pnpm ... ea28436628

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(devenv): migrate from bun to corepack/pnpm 725fd18536

feat(client): pin pnpm version ... 197d14fb72

Signed-off-by: Noa Virellia <noa@requiem.garden>

Add NixCN mobile using flutter ... aa85aab55e

Signed-off-by: Asai Neko <sugar@sne.moe>

Edit mobile ignores ... 1b2933ba0e

Signed-off-by: Asai Neko <sugar@sne.moe>

Add fvm to devenv ... 164e271d81

Signed-off-by: Asai Neko <sugar@sne.moe>

Add empty test api version header checker ... 087cd4ee51

Signed-off-by: Asai Neko <sugar@sne.moe>

Add dev-back for justfile, just for develop backend ... f0cca0cda4

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove caddy service from devenv ... a04d562d61

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove unused devenv nix imports ... c4951f820a

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix devenv and justfile client running logic ... 4cda783fed

Signed-off-by: Asai Neko <sugar@sne.moe>

Add cleaning output dir for client and backend build/dev ... 5c540db325

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove clean for building client and backend ... 2e76a4c6a7

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove clean for watch-back ... 55afbb29b4

Signed-off-by: Asai Neko <sugar@sne.moe>

Restruct justfile ... 194f1fa1fe

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove justfile default and backend settings ... 63f8439886

Signed-off-by: Asai Neko <sugar@sne.moe>

Add party end empty folder ... ecbb890cac

Signed-off-by: Asai Neko <sugar@sne.moe>

refactor(client): split client to cms/mobile/party ... b2c5f8de38

Signed-off-by: Noa Virellia <noa@requiem.garden>

Add charts empty folder ... de0d05df0a

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix Containerfile using just build ... 5e17bbd965

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix response structure error and router error ... 9b83ab565a

Signed-off-by: Asai Neko <sugar@sne.moe>

Add exchange api endpoint, fix jwt authtoken var type error ... cd93491d98

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix exchange bind json error ... 89c2d11f19

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix typo ... 0e7aaed154

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix bind json error ... 231f591767

Signed-off-by: Asai Neko <sugar@sne.moe>

Disable email changes, lazy~~~~~ ... 100fe32f8e

Signed-off-by: Asai Neko <sugar@sne.moe>

User update check one by one ... 2ed4a4da02

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove oauth login email ... 97f5677a97

Signed-off-by: Asai Neko <sugar@sne.moe>

Move email send from to send func ... d04f8cdc44

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix config types ... 632fa6cf8e

Signed-off-by: Asai Neko <sugar@sne.moe>

Split and optimize gin logger ... 3f8f2547be

Signed-off-by: Asai Neko <sugar@sne.moe>

Restruct logger order ... 64392c32c6

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix gin logger ... 110627f27e

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix gin debug mode ... cf761d218d

Signed-off-by: Asai Neko <sugar@sne.moe>

Remove file logger from config ... fd262239e4

Signed-off-by: Asai Neko <sugar@sne.moe>

Change logrus to slog ... b7e6009706

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix error reponses ... 4ac5b1c101

Signed-off-by: Asai Neko <sugar@sne.moe>

Add error retern for database ... 200614a5c9

Signed-off-by: Asai Neko <sugar@sne.moe>

Add exception error manager ... 5dbbdc62e6

Signed-off-by: Asai Neko <sugar@sne.moe>

refactor: standardize error handling with exception.Builder ... e4329dfc2b

- Replace hardcoded error messages with structured error codes using exception.Builder.
- Introduce new common error constants in exception/common.go (CommonErrorInvalidInput, CommonErrorUserNotFound, etc.).
- Update exception/specific.go with domain-specific errors and remove redundant ones.
- Apply consistent error handling across auth, event, user services and middleware.

Co-authored-by: Gemini <gemini@google.com>
Signed-off-by: Noa Virellia <noa@requiem.garden>

Use generator to generate exceptions from yaml ... ac428946e7

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix go mod ... 2e11fc5d9c

Signed-off-by: Asai Neko <sugar@sne.moe>

Move definitions to gen_exception ... 2d6f6700f0

Signed-off-by: Asai Neko <sugar@sne.moe>

Ignore generated go files ... f03d472c30

Signed-off-by: Asai Neko <sugar@sne.moe>

Mod justfile ... 38401a5f69

Signed-off-by: Asai Neko <sugar@sne.moe>

Mod justfile ... 64bab332c9

Signed-off-by: Asai Neko <sugar@sne.moe>

Mod justfile ... 8f69b61799

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix some type change bugs (error) ... 585ec46282

Signed-off-by: Asai Neko <sugar@sne.moe>

Add Build error hook (print exception) ... b1c78dce28

Signed-off-by: Asai Neko <sugar@sne.moe>

refactor: update exception constants to follow new naming convention ... 14f50ecdb2

- Update old ErrorStatus, ErrorType, and Service/Endpoint constants to new naming convention
- Fix incorrect TypeSpecific usage in JWT middleware
- Add missing event specific error definitions to specific.yaml
- Regenerate exception constants

Co-authored-by: Gemini <gemini@google.com>

refactor: use SetError in exception.Builder where errors are available ... a60a796345

Update multiple services and middlewares to pass the original error to exception.Builder before building the error code.

Co-authored-by: Gemini <gemini@google.com>

feat: sync api changes and fix auth-related bugs ... 27ac4d9b4a

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): update userinfo ... 4e45a9b6d0

Signed-off-by: Noa Virellia <noa@requiem.garden>

feat(client): bio editor ... 96d76b3657

Signed-off-by: Noa Virellia <noa@requiem.garden>

Fix stupid ai errors ... 2f26b2ddb5

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix 200 response exception builder ... 9aff7d8f26

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix stupid ai bug ... 8e41514d05

Signed-off-by: Asai Neko <sugar@sne.moe>

refactor(client): improve token handler stability ... a060901cc3

Signed-off-by: Noa Virellia <noa@requiem.garden>

fix(client): remove console.log ... 75c4edfa3d

Signed-off-by: Noa Virellia <noa@requiem.garden>

Add ErrorHandler for log level selects ... 7b3fe24b7c

Signed-off-by: Asai Neko <sugar@sne.moe>

Only enable file log in debug mode ... 83df018d34

Signed-off-by: Asai Neko <sugar@sne.moe>

Add context for everything ... b8f89ab655

Signed-off-by: Asai Neko <sugar@sne.moe>

Add otel tracer ... 3f44d2d9c2

Signed-off-by: Asai Neko <sugar@sne.moe>

Trace back everything (tested) ... 5f6eb9f2a2

Signed-off-by: Asai Neko <sugar@sne.moe>

Devenv backend wait for 30s to boot ... f779435cf0

Signed-off-by: Asai Neko <sugar@sne.moe>

Change postgres db instance name ... 154c929859

Signed-off-by: Asai Neko <sugar@sne.moe>

Add context for all exceptions ... 986f63c0af

Signed-off-by: Asai Neko <sugar@sne.moe>

Change default config ... dfd5532b20

Signed-off-by: Asai Neko <sugar@sne.moe>

WIP: Full restruct, seprate service and api ... 8e11ba4631

Signed-off-by: Asai Neko <sugar@sne.moe>

Finilize user api layer ... 314995e5f9

Signed-off-by: Asai Neko <sugar@sne.moe>

Optomize user list service query bind struct ... 5a5239e335

Signed-off-by: Asai Neko <sugar@sne.moe>

Add gitea action workflow ... ca080f4e2a

Signed-off-by: Asai Neko <sugar@sne.moe>

Fix gitea workflow ... 4f7632af53

Signed-off-by: Asai Neko <sugar@sne.moe>

sugar merged commit ad521e04ae into main 2026-01-27 17:47:07 +00:00

sugar referenced this issue from a commit 2026-01-27 17:47:08 +00:00

Merge pull request 'First merge from develop to main (WIP)' (#7) from develop into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Assignees

Clear assignees

Renna42 cryolitia nvirellia prince213 sugar xiaomo

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: nixcn/cms-server#7