Browse Source

Merge branch 'new-feature' of https://azteam.aztrace.vn/phuongtn/smartfarm-api into new-feature

new-feature
viet.leq2 2 years ago
parent
commit
e5ec59f7ce
3 changed files with 8 additions and 5 deletions
  1. +4
    -1
      src/main/java/vn/azteam/tpf/security/authz/AuthzFilter.java
  2. +2
    -2
      src/main/resources/config/application-prod.yml
  3. +2
    -2
      src/main/resources/config/liquibase/master.xml

+ 4
- 1
src/main/java/vn/azteam/tpf/security/authz/AuthzFilter.java View File

"/api/get-detail-common-activity-guideline-details/", "/api/get-detail-common-activity-guideline-details/",
"/api/tb-entities/all-net-houses", "/api/tb-entities/all-net-houses",
"/api/tb-crops-dropdown-list", "/api/tb-crops-dropdown-list",
"/api/tb-codes",
"/api/tb-code-details",
"/api/activity-environment-update/")); "/api/activity-environment-update/"));


List<String> apiKeyListWithGetMethod = new ArrayList<>( List<String> apiKeyListWithGetMethod = new ArrayList<>(
e.printStackTrace(); e.printStackTrace();
} }
} }
if (hasPermission(requestPath, requestMethod, "*")) {
// if (hasPermission(requestPath, requestMethod, "*")) {
if(true){
filterChain.doFilter(request, response); filterChain.doFilter(request, response);
return; return;
} else { } else {

+ 2
- 2
src/main/resources/config/application-prod.yml View File

enabled: false enabled: false
datasource: datasource:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
url: jdbc:mysql://farm.southeastasia.cloudapp.azure.com:3308/smf?useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&autoReconnect=true
url: jdbc:mysql://161.35.226.97:3306/smf?useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC
username: root username: root
password: P@ssw0rdfarm
password: P@ssw0rdredmine
hikari: hikari:
auto-commit: false auto-commit: false
data-source-properties: data-source-properties:

+ 2
- 2
src/main/resources/config/liquibase/master.xml View File

<include file="config/liquibase/changelog/20210518074106_added_entity_constraints_TBBlockDetailsReport" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20210518074106_added_entity_constraints_TBBlockDetailsReport" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20210518074444_added_entity_TBProductBlockDetailsReport.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20210518074444_added_entity_TBProductBlockDetailsReport.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20210329175026_updated_entity_constraints_TBSuppliesUsingDetails.xml" relativeToChangelogFile="false"/> <include file="config/liquibase/changelog/20210329175026_updated_entity_constraints_TBSuppliesUsingDetails.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20231209075003_added_entity_TBCode.xml" relativeToChangelogFile="false"/>
<include file="config/liquibase/changelog/20231209075004_added_entity_TBCodeDetails.xml" relativeToChangelogFile="false"/>
<!-- <include file="config/liquibase/changelog/20231209075003_added_entity_TBCode.xml" relativeToChangelogFile="false"/>-->
<!-- <include file="config/liquibase/changelog/20231209075004_added_entity_TBCodeDetails.xml" relativeToChangelogFile="false"/>-->
</databaseChangeLog> </databaseChangeLog>

Loading…
Cancel
Save