Skip to content
This repository was archived by the owner on Jan 24, 2023. It is now read-only.

Commit 07f83c5

Browse files
ftgibranftgibran
committed
feat(server): Assigned server into simpli 2.0.0
1 parent e0f2874 commit 07f83c5

79 files changed

Lines changed: 2421 additions & 1277 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/@simpli/cli-scaffold/generator/index.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.exports = (api, options) => {
5656
'normalize-scss': '7.0.1',
5757
'register-service-worker': '1.5.2',
5858
'simple-line-icons': '2.4.1',
59-
'simpli-web-sdk': '^1.1.0',
59+
'simpli-web-sdk': '^1.1.3',
6060
'vue': '^2.5.17',
6161
'vue-chartjs': '3.4.0',
6262
'vue-chartkick': '0.5.0',
@@ -69,16 +69,16 @@ module.exports = (api, options) => {
6969
'vuex-class': '0.3.1'
7070
},
7171
devDependencies: {
72-
'@babel/core': '^7.1.2',
73-
'@cypress/webpack-preprocessor': '^3.0.0',
74-
'@vue/cli-plugin-babel': '^3.0.5',
75-
'@vue/cli-plugin-pwa': '^3.0.5',
76-
'@vue/cli-plugin-typescript': '^3.0.5',
77-
'@vue/cli-service': '^3.0.5',
72+
'@babel/core': '7.1.2',
73+
'@cypress/webpack-preprocessor': '3.0.0',
74+
'@vue/cli-plugin-babel': '3.0.5',
75+
'@vue/cli-plugin-pwa': '3.0.5',
76+
'@vue/cli-plugin-typescript': '3.0.5',
77+
'@vue/cli-service': '3.0.5',
7878
'babel-core': '7.0.0-bridge.0',
79-
'lint-staged': '^7.2.2',
80-
'node-sass': '^4.9.0',
81-
'sass-loader': '^7.0.1',
79+
'lint-staged': '7.2.2',
80+
'node-sass': '4.9.3',
81+
'sass-loader': '7.0.1',
8282
'typescript': '^3.0.0',
8383
'vue-template-compiler': '^2.5.17'
8484
},

‎packages/@simpli/cli-server/generator/index.js‎

Lines changed: 91 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,115 @@ module.exports = (api, options) => {
1515
const moduleName = options.serverSetup.moduleName
1616

1717
if (!options.sync) {
18-
// From root
19-
api.renderFrom('./injected', 'src/main/AppMail.kt', `./java/${dir}/AppMail.kt`)
20-
api.renderFrom('./injected', 'src/main/AppProvider.kt', `./java/${dir}/AppProvider.kt`)
21-
api.renderFrom('./injected', 'src/main/RequestLogger.kt', `./java/${dir}/RequestLogger.kt`)
22-
api.renderFrom('./injected', 'src/main/RouterWrapper.kt', `./java/${dir}/RouterWrapper.kt`)
23-
api.renderFrom('./injected', 'src/main/SwaggerInit.kt', `./java/${dir}/SwaggerInit.kt`)
24-
25-
// Router
26-
api.renderFrom('./injected', 'src/main/module/Router.kt', `../java/${dir}/${moduleName}/Router.kt`)
27-
api.renderFrom('./injected', 'src/main/module/AuthPipe.kt', `../java/${dir}/${moduleName}/AuthPipe.kt`)
28-
29-
// Mail
30-
api.renderFrom('./injected', 'src/main/module/mail/ResetPasswordMail.kt', `../../java/${dir}/${moduleName}/mail/ResetPasswordMail.kt`)
18+
// main/app
19+
api.renderFrom('./injected', 'src/main/app/AppProvider.kt', `../java/${dir}/app/AppProvider.kt`)
20+
api.renderFrom('./injected', 'src/main/app/Cast.kt', `../java/${dir}/app/Cast.kt`)
21+
api.renderFrom('./injected', 'src/main/app/Env.kt', `../java/${dir}/app/Env.kt`)
22+
api.renderFrom('./injected', 'src/main/app/RequestLogger.kt', `../java/${dir}/app/RequestLogger.kt`)
23+
api.renderFrom('./injected', 'src/main/app/SwaggerInit.kt', `../java/${dir}/app/SwaggerInit.kt`)
3124

32-
// Login Controller
33-
api.renderFrom('./injected', 'src/main/module/process/LoginService.kt', `../../java/${dir}/${moduleName}/process/LoginService.kt`)
34-
api.renderFrom('./injected', 'src/main/module/response/LoginResp.kt', `../../java/${dir}/${moduleName}/response/LoginResp.kt`)
35-
api.renderFrom('./injected', 'src/main/dao/LoginServiceDao.kt', `../java/${dir}/dao/LoginServiceDao.kt`)
25+
// main/enums
26+
api.renderFrom('./injected', 'src/main/enums/Lang.kt', `../java/${dir}/enums/Lang.kt`)
3627

37-
// Exception
28+
// main/exception
3829
api.renderFrom('./injected', 'src/main/exception/HttpException.kt', `../java/${dir}/exception/HttpException.kt`)
3930

40-
// Lang
41-
api.renderFrom('./injected', 'src/main/lang/EnUs.kt', `../java/${dir}/lang/EnUs.kt`)
42-
api.renderFrom('./injected', 'src/main/lang/PtBr.kt', `../java/${dir}/lang/PtBr.kt`)
31+
// main/exception/response
32+
api.renderFrom('./injected', 'src/main/exception/response/BadGatewayException.kt', `../../java/${dir}/exception/response/BadGatewayException.kt`)
33+
api.renderFrom('./injected', 'src/main/exception/response/BadRequestException.kt', `../../java/${dir}/exception/response/BadRequestException.kt`)
34+
api.renderFrom('./injected', 'src/main/exception/response/ConflictException.kt', `../../java/${dir}/exception/response/ConflictException.kt`)
35+
api.renderFrom('./injected', 'src/main/exception/response/ExpectationFailedException.kt', `../../java/${dir}/exception/response/ExpectationFailedException.kt`)
36+
api.renderFrom('./injected', 'src/main/exception/response/ForbiddenException.kt', `../../java/${dir}/exception/response/ForbiddenException.kt`)
37+
api.renderFrom('./injected', 'src/main/exception/response/GatewayTimeoutException.kt', `../../java/${dir}/exception/response/GatewayTimeoutException.kt`)
38+
api.renderFrom('./injected', 'src/main/exception/response/GoneException.kt', `../../java/${dir}/exception/response/GoneException.kt`)
39+
api.renderFrom('./injected', 'src/main/exception/response/HttpVersionNotSupportedException.kt', `../../java/${dir}/exception/response/HttpVersionNotSupportedException.kt`)
40+
api.renderFrom('./injected', 'src/main/exception/response/InternalServerErrorException.kt', `../../java/${dir}/exception/response/InternalServerErrorException.kt`)
41+
api.renderFrom('./injected', 'src/main/exception/response/LengthRequiredException.kt', `../../java/${dir}/exception/response/LengthRequiredException.kt`)
42+
api.renderFrom('./injected', 'src/main/exception/response/MethodNotAllowedException.kt', `../../java/${dir}/exception/response/MethodNotAllowedException.kt`)
43+
api.renderFrom('./injected', 'src/main/exception/response/NotAcceptableException.kt', `../../java/${dir}/exception/response/NotAcceptableException.kt`)
44+
api.renderFrom('./injected', 'src/main/exception/response/NotFoundException.kt', `../../java/${dir}/exception/response/NotFoundException.kt`)
45+
api.renderFrom('./injected', 'src/main/exception/response/NotImplementedException.kt', `../../java/${dir}/exception/response/NotImplementedException.kt`)
46+
api.renderFrom('./injected', 'src/main/exception/response/PaymentRequiredException.kt', `../../java/${dir}/exception/response/PaymentRequiredException.kt`)
47+
api.renderFrom('./injected', 'src/main/exception/response/PreconditionFailedException.kt', `../../java/${dir}/exception/response/PreconditionFailedException.kt`)
48+
api.renderFrom('./injected', 'src/main/exception/response/ProxyAuthenticationRequiredException.kt', `../../java/${dir}/exception/response/ProxyAuthenticationRequiredException.kt`)
49+
api.renderFrom('./injected', 'src/main/exception/response/RequestedRangeNotSatisfiableException.kt', `../../java/${dir}/exception/response/RequestedRangeNotSatisfiableException.kt`)
50+
api.renderFrom('./injected', 'src/main/exception/response/RequestEntityToLargeException.kt', `../../java/${dir}/exception/response/RequestEntityToLargeException.kt`)
51+
api.renderFrom('./injected', 'src/main/exception/response/RequestTimeoutException.kt', `../../java/${dir}/exception/response/RequestTimeoutException.kt`)
52+
api.renderFrom('./injected', 'src/main/exception/response/RequestUriToLongException.kt', `../../java/${dir}/exception/response/RequestUriToLongException.kt`)
53+
api.renderFrom('./injected', 'src/main/exception/response/ServiceUnavailableException.kt', `../../java/${dir}/exception/response/ServiceUnavailableException.kt`)
54+
api.renderFrom('./injected', 'src/main/exception/response/UnauthorizedException.kt', `../../java/${dir}/exception/response/UnauthorizedException.kt`)
55+
api.renderFrom('./injected', 'src/main/exception/response/UnsupportedMediaTypeException.kt', `../../java/${dir}/exception/response/UnsupportedMediaTypeException.kt`)
56+
57+
// main/locale
58+
api.renderFrom('./injected', 'src/main/locale/EnUs.kt', `../java/${dir}/locale/EnUs.kt`)
59+
api.renderFrom('./injected', 'src/main/locale/PtBr.kt', `../java/${dir}/locale/PtBr.kt`)
60+
61+
// main/param
62+
api.renderFrom('./injected', 'src/main/param/DefaultParam.kt', `../java/${dir}/param/DefaultParam.kt`)
63+
64+
// main/wrapper
65+
api.renderFrom('./injected', 'src/main/wrapper/GatewayWrapper.kt', `../java/${dir}/wrapper/GatewayWrapper.kt`)
66+
api.renderFrom('./injected', 'src/main/wrapper/MailWrapper.kt', `../java/${dir}/wrapper/MailWrapper.kt`)
67+
api.renderFrom('./injected', 'src/main/wrapper/ModelWrapper.kt', `../java/${dir}/wrapper/ModelWrapper.kt`)
68+
api.renderFrom('./injected', 'src/main/wrapper/ProcessWrapper.kt', `../java/${dir}/wrapper/ProcessWrapper.kt`)
69+
api.renderFrom('./injected', 'src/main/wrapper/RouterWrapper.kt', `../java/${dir}/wrapper/RouterWrapper.kt`)
70+
71+
// main/module/auth
72+
api.renderFrom('./injected', 'src/main/module/auth/AuthDao.kt', `../../java/${dir}/${moduleName}/auth/AuthDao.kt`)
73+
api.renderFrom('./injected', 'src/main/module/auth/AuthProcess.kt', `../../java/${dir}/${moduleName}/auth/AuthProcess.kt`)
74+
api.renderFrom('./injected', 'src/main/module/auth/AuthRouter.kt', `../../java/${dir}/${moduleName}/auth/AuthRouter.kt`)
75+
76+
// main/module/gateway
77+
api.renderFrom('./injected', 'src/main/module/gateway/AuthGateway.kt', `../../java/${dir}/${moduleName}/gateway/AuthGateway.kt`)
78+
api.renderFrom('./injected', 'src/main/module/gateway/GuestGateway.kt', `../../java/${dir}/${moduleName}/gateway/GuestGateway.kt`)
79+
80+
// main/module/mail
81+
api.renderFrom('./injected', 'src/main/module/mail/ResetPasswordMail.kt', `../../java/${dir}/${moduleName}/mail/ResetPasswordMail.kt`)
82+
83+
// main/module/request
84+
api.renderFrom('./injected', 'src/main/module/request/AuthRequest.kt', `../../java/${dir}/${moduleName}/request/AuthRequest.kt`)
85+
api.renderFrom('./injected', 'src/main/module/request/ChangePasswordRequest.kt', `../../java/${dir}/${moduleName}/request/ChangePasswordRequest.kt`)
86+
api.renderFrom('./injected', 'src/main/module/request/RecoverPasswordRequest.kt', `../../java/${dir}/${moduleName}/request/RecoverPasswordRequest.kt`)
87+
api.renderFrom('./injected', 'src/main/module/request/ResetPasswordRequest.kt', `../../java/${dir}/${moduleName}/request/ResetPasswordRequest.kt`)
4388

44-
// Test
45-
api.renderFrom('./injected', 'src/test/module/process/LoginServiceTest.kt', `../../java/${dir}/${moduleName}/process/LoginServiceTest.kt`)
46-
api.renderFrom('./injected', 'src/test/OtherTest.kt', `./java/${dir}/OtherTest.kt`)
89+
// main/module/response
90+
api.renderFrom('./injected', 'src/main/module/response/AuthResponse.kt', `../../java/${dir}/${moduleName}/response/AuthResponse.kt`)
91+
92+
// test
93+
api.renderFrom('./injected', 'src/test/AppTest.kt', `./java/${dir}/AppTest.kt`)
94+
95+
// test/module
96+
api.renderFrom('./injected', 'src/test/module/MailTest.kt', `../java/${dir}/${moduleName}/MailTest.kt`)
97+
api.renderFrom('./injected', 'src/test/module/ProcessTest.kt', `../java/${dir}/${moduleName}/ProcessTest.kt`)
98+
99+
// test/module/auth
100+
api.renderFrom('./injected', 'src/test/module/auth/AuthProcessTest.kt', `../../java/${dir}/${moduleName}/auth/AuthProcessTest.kt`)
47101
}
48102

49103
commonTables.forEach((table) => {
50104
const data = { table }
105+
// main/dao
51106
api.renderFrom('./injected', 'src/main/dao/TemplateDao.kt', `../java/${dir}/dao/${table.modelName}Dao.kt`, data)
52-
api.renderFrom('./injected', 'src/main/module/response/TemplateResp.kt', `../../java/${dir}/${moduleName}/response/${table.modelName}Resp.kt`, data)
107+
108+
// main/model
53109
api.renderFrom('./injected', 'src/main/model/Template.kt', `../java/${dir}/model/${table.modelName}.kt`, data)
110+
111+
// main/module/process
54112
api.renderFrom('./injected', 'src/main/module/process/TemplateProcess.kt', `../../java/${dir}/${moduleName}/process/${table.modelName}Process.kt`, data)
55-
// Test
113+
114+
// main/module/router
115+
api.renderFrom('./injected', 'src/main/module/router/TemplateRouter.kt', `../../java/${dir}/${moduleName}/router/${table.modelName}Router.kt`, data)
116+
117+
// test/model
56118
api.renderFrom('./injected', 'src/test/model/TemplateTest.kt', `../java/${dir}/model/${table.modelName}Test.kt`, data)
119+
120+
// test/module/process
57121
api.renderFrom('./injected', 'src/test/module/process/TemplateProcessTest.kt', `../../java/${dir}/${moduleName}/process/${table.modelName}ProcessTest.kt`, data)
58122
})
59123

60124
pivotTables.forEach((table) => {
61125
const data = { table }
126+
// main/dao
62127
api.renderFrom('./injected', 'src/main/dao/TemplateDao.kt', `../java/${dir}/dao/${table.modelName}Dao.kt`, data)
63128
})
64129
}

‎packages/@simpli/cli-server/generator/injected/src/main/AppMail.kt‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎packages/@simpli/cli-server/generator/injected/src/main/AppProvider.kt‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎packages/@simpli/cli-server/generator/injected/src/main/RouterWrapper.kt‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎packages/@simpli/cli-server/generator/injected/src/main/app/AppProvider.kt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<%_ var packageAddress = options.serverSetup.packageAddress _%>
2+
package <%-packageAddress%>.app
3+
4+
import <%-packageAddress%>.app.Cast.builder
5+
import com.google.gson.Gson
6+
import java.io.IOException
7+
import javax.ws.rs.container.ContainerRequestContext
8+
import javax.ws.rs.container.ContainerResponseContext
9+
import javax.ws.rs.container.ContainerResponseFilter
10+
import javax.ws.rs.ext.ContextResolver
11+
import javax.ws.rs.ext.Provider
12+
13+
/**
14+
* App Provider
15+
* Provides rules of access for all requests
16+
* @author Simpli CLI generator
17+
*/
18+
@Provider
19+
class AppProvider : ContextResolver<Gson>, ContainerResponseFilter {
20+
21+
override fun getContext(type: Class<*>?): Gson {
22+
return builder
23+
}
24+
25+
@Throws(IOException::class)
26+
override fun filter(request: ContainerRequestContext, response: ContainerResponseContext) {
27+
response.headers.add("Access-Control-Allow-Origin", "*")
28+
response.headers.add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE")
29+
response.headers.add("Access-Control-Allow-Headers", "Access-Control-Allow-Headers, Origin, Accept, X-Client-Version, Authorization, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers")
30+
}
31+
32+
}

0 commit comments

Comments
 (0)