Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
IncomeCalculator
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
neel
IncomeCalculator
Commits
0d7c4c38
Commit
0d7c4c38
authored
Apr 29, 2020
by
Yashvant Kantival
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes suggested by nirav bhai, bug fixes
parent
167a448f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
8 deletions
+9
-8
src/main/java/com/iRecruit/config/SecurityConfig.java
+1
-1
src/main/java/com/iRecruit/modules/auth/controller/AuthController.java
+1
-1
src/main/java/com/iRecruit/modules/auth/payload/request/LoginRequest.java
+1
-1
src/main/java/com/iRecruit/modules/auth/service/impl/NGPACalcSerivceImpl.java
+1
-1
src/main/java/com/iRecruit/modules/auth/service/impl/NGPAtoNGPLCalcServiceImpl.java
+2
-1
src/main/java/com/iRecruit/security/AuthProvider.java
+1
-1
src/main/resources/application.properties
+2
-2
No files found.
src/main/java/com/iRecruit/config/SecurityConfig.java
View file @
0d7c4c38
...
@@ -92,7 +92,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
...
@@ -92,7 +92,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/**/*.css"
,
"/**/*.css"
,
"/**/*.js"
)
"/**/*.js"
)
.
permitAll
()
.
permitAll
()
.
antMatchers
(
"/api/v1/configurations/**"
,
"/api/v1/auth/signin/**"
,
"/api/v1/msamapping/**"
,
"/api/v1/mdbmapping/**"
,
"/api/v1/l1salbsmapping/**"
,
"/api/v1/
ngpatongplCalculation/**"
,
"/api/v1/ngpaCalculation/**"
,
"/api/v1/l2salbsmapping/**"
,
"/api/v1/mpbmapping/**"
,
"/api/v1/leaderCalculation/**"
,
"/api/v1/fycmapping/**"
,
"/api/v1/auth/P100Login"
,
"/api/v1/auth/SendOTP"
,
"/v2/api-docs"
,
"/api/v1/auth/ValidateOTP"
,
"/configuration/ui"
,
"/swagger-resources/**"
,
"/configuration/security"
,
"/swagger-ui.html"
,
"/webjars/**"
)
.
antMatchers
(
"/api/v1/configurations/**"
,
"/api/v1/auth/signin/**"
,
"/api/v1/msamapping/**"
,
"/api/v1/mdbmapping/**"
,
"/api/v1/l1salbsmapping/**"
,
"/api/v1/
l2salbsmapping/**"
,
"/api/v1/mpbmapping/**"
,
"/v2/api-docs"
,
"/configuration/ui"
,
"/swagger-resources/**"
,
"/configuration/security"
,
"/swagger-ui.html"
,
"/webjars/**"
)
.
permitAll
()
.
permitAll
()
.
antMatchers
(
"/api/userPhoto"
,
"/api/user/checkEmailAvailability"
)
.
antMatchers
(
"/api/userPhoto"
,
"/api/user/checkEmailAvailability"
)
.
permitAll
()
.
permitAll
()
...
...
src/main/java/com/iRecruit/modules/auth/controller/AuthController.java
View file @
0d7c4c38
...
@@ -79,7 +79,7 @@ public class AuthController {
...
@@ -79,7 +79,7 @@ public class AuthController {
String
jwt
;
String
jwt
;
try
{
try
{
UsernamePasswordAuthenticationToken
authenticationObj
=
new
UsernamePasswordAuthenticationToken
(
loginRequest
.
getUsername
(),
loginRequest
.
get
Passwor
d
());
UsernamePasswordAuthenticationToken
authenticationObj
=
new
UsernamePasswordAuthenticationToken
(
loginRequest
.
getUsername
(),
loginRequest
.
get
UserI
d
());
authenticationObj
.
setDetails
(
loginRequest
);
authenticationObj
.
setDetails
(
loginRequest
);
Authentication
authentication
=
authenticationManager
.
authenticate
(
authenticationObj
);
Authentication
authentication
=
authenticationManager
.
authenticate
(
authenticationObj
);
SecurityContextHolder
.
getContext
().
setAuthentication
(
authentication
);
SecurityContextHolder
.
getContext
().
setAuthentication
(
authentication
);
...
...
src/main/java/com/iRecruit/modules/auth/payload/request/LoginRequest.java
View file @
0d7c4c38
...
@@ -15,7 +15,7 @@ public class LoginRequest {
...
@@ -15,7 +15,7 @@ public class LoginRequest {
private
String
username
;
private
String
username
;
@NotBlank
@NotBlank
private
String
passwor
d
;
private
String
userI
d
;
private
String
notificationId
;
private
String
notificationId
;
...
...
src/main/java/com/iRecruit/modules/auth/service/impl/NGPACalcSerivceImpl.java
View file @
0d7c4c38
...
@@ -126,7 +126,7 @@ public class NGPACalcSerivceImpl implements NGPACalcService {
...
@@ -126,7 +126,7 @@ public class NGPACalcSerivceImpl implements NGPACalcService {
Response_JSON
.
put
(
"Annual_Year_1_Validations_Met"
,
requestJSON
.
getString
(
"Annual_Year_1_Validations_Met"
));
Response_JSON
.
put
(
"Annual_Year_1_Validations_Met"
,
requestJSON
.
getString
(
"Annual_Year_1_Validations_Met"
));
Response_JSON
.
put
(
"Annual_Year_2_Validations_Met"
,
requestJSON
.
getString
(
"Annual_Year_2_Validations_Met"
));
Response_JSON
.
put
(
"Annual_Year_2_Validations_Met"
,
requestJSON
.
getString
(
"Annual_Year_2_Validations_Met"
));
Response_JSON
.
put
(
"Commission_Rate"
,
requestJSON
.
get
String
(
"Commission_Rate"
));
Response_JSON
.
put
(
"Commission_Rate"
,
requestJSON
.
get
Double
(
"Commission_Rate"
));
for
(
i
=
0
;
i
<
4
;
i
++
)
{
for
(
i
=
0
;
i
<
4
;
i
++
)
{
basicJSONOperation1
=
new
JSONObject
();
basicJSONOperation1
=
new
JSONObject
();
basicJSONOperation1
.
put
(
"Validations_Met"
,
(
(
mainTable
[
i
][
0
]
==
1
)
?
"Yes"
:
"No"
));
basicJSONOperation1
.
put
(
"Validations_Met"
,
(
(
mainTable
[
i
][
0
]
==
1
)
?
"Yes"
:
"No"
));
...
...
src/main/java/com/iRecruit/modules/auth/service/impl/NGPAtoNGPLCalcServiceImpl.java
View file @
0d7c4c38
...
@@ -161,7 +161,7 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
...
@@ -161,7 +161,7 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
basicJSONOperation
=
MSA_Value
.
getJSONObject
(
0
);
basicJSONOperation
=
MSA_Value
.
getJSONObject
(
0
);
basicStringOperation
=
requestJSON
.
getString
(
"FS_Type"
);
basicStringOperation
=
requestJSON
.
getString
(
"FS_Type"
);
basicDoubleOperation
=
basicJSONOperation
.
getDouble
(
basicStringOperation
);
basicDoubleOperation
=
basicJSONOperation
.
getDouble
(
basicStringOperation
);
earningsTable
[
0
][
0
]
=
Math
.
round
(
(
metricsTable
[
0
][
6
]
*
fycPersantage
)
/
100
);
earningsTable
[
0
][
0
]
=
Math
.
round
(
(
metricsTable
[
0
][
6
]
*
requestJSON
.
getDouble
(
"Commission_Rate"
)
)
/
100
);
basicJSONOperation1
=
new
JSONObject
();
basicJSONOperation1
=
new
JSONObject
();
basicJSONOperation1
=
calculateFYCCreditAndWFYC
(
"BA"
,
earningsTable
[
0
][
0
]);
basicJSONOperation1
=
calculateFYCCreditAndWFYC
(
"BA"
,
earningsTable
[
0
][
0
]);
...
@@ -232,6 +232,7 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
...
@@ -232,6 +232,7 @@ public class NGPAtoNGPLCalcServiceImpl implements NGPAtoNGPLCalcService {
Response_JSON
.
put
(
"FS_Type"
,
requestJSON
.
getString
(
"FS_Type"
));
Response_JSON
.
put
(
"FS_Type"
,
requestJSON
.
getString
(
"FS_Type"
));
Response_JSON
.
put
(
"Total_Validations_Met"
,
requestJSON
.
getString
(
"Total_Validations_Met"
));
Response_JSON
.
put
(
"Total_Validations_Met"
,
requestJSON
.
getString
(
"Total_Validations_Met"
));
Response_JSON
.
put
(
"Eligible_Premium"
,
requestJSON
.
getDouble
(
"Eligible_Premium"
));
Response_JSON
.
put
(
"Eligible_Premium"
,
requestJSON
.
getDouble
(
"Eligible_Premium"
));
Response_JSON
.
put
(
"Commission_Rate"
,
requestJSON
.
getDouble
(
"Commission_Rate"
));
basicJSONOperation1
=
new
JSONObject
();
basicJSONOperation1
=
new
JSONObject
();
for
(
i
=
0
;
i
<
3
;
i
++)
{
for
(
i
=
0
;
i
<
3
;
i
++)
{
...
...
src/main/java/com/iRecruit/security/AuthProvider.java
View file @
0d7c4c38
...
@@ -46,7 +46,7 @@ public class AuthProvider implements AuthenticationProvider {
...
@@ -46,7 +46,7 @@ public class AuthProvider implements AuthenticationProvider {
LoginRequest
loginRequest
=
new
LoginRequest
();
LoginRequest
loginRequest
=
new
LoginRequest
();
loginRequest
.
setUsername
(
username
);
loginRequest
.
setUsername
(
username
);
loginRequest
.
set
Passwor
d
(
password
);
loginRequest
.
set
UserI
d
(
password
);
LOG
.
info
(
"login request for user "
+
username
);
LOG
.
info
(
"login request for user "
+
username
);
// LDAP Service Call
// LDAP Service Call
...
...
src/main/resources/application.properties
View file @
0d7c4c38
...
@@ -2,7 +2,7 @@ spring.datasource.url = jdbc:mysql://localhost:3306/imcalculator?useSSL=false&se
...
@@ -2,7 +2,7 @@ spring.datasource.url = jdbc:mysql://localhost:3306/imcalculator?useSSL=false&se
irecruit.datasource.url
=
jdbc:oracle:thin:@192.168.10.120:1521:orcl
irecruit.datasource.url
=
jdbc:oracle:thin:@192.168.10.120:1521:orcl
irecruit.datasource.jndi-name
=
jdbc/irecruit
irecruit.datasource.jndi-name
=
jdbc/irecruit
irecruit.jpa.hibernate.ddl-auto
=
updat
e
irecruit.jpa.hibernate.ddl-auto
=
non
e
irecruit.datasource.username
=
root
irecruit.datasource.username
=
root
irecruit.datasource.password
=
P@ssw0rd
irecruit.datasource.password
=
P@ssw0rd
irecruit.datasource.initialization-mode
=
always
irecruit.datasource.initialization-mode
=
always
...
@@ -18,7 +18,7 @@ irecruit.jpa.hibernate.physical_naming_strategy=com.iRecruit.config.CustomPhysic
...
@@ -18,7 +18,7 @@ irecruit.jpa.hibernate.physical_naming_strategy=com.iRecruit.config.CustomPhysic
#naaf.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
#naaf.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
naaf.datasource.url
=
jdbc:oracle:thin:@192.168.10.120:1521:orcl
naaf.datasource.url
=
jdbc:oracle:thin:@192.168.10.120:1521:orcl
naaf.jpa.hibernate.ddl-auto
=
updat
e
naaf.jpa.hibernate.ddl-auto
=
non
e
naaf.datasource.username
=
SOUAT
naaf.datasource.username
=
SOUAT
naaf.datasource.password
=
tata
naaf.datasource.password
=
tata
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment