Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_wzk

atms-api/pom.xml

@@ -490,6 +490,17 @@
                 <env>uat</env>
             </properties>
         </profile>
+        <profile>
+            <id>didi-stage</id>
+            <build>
+                <filters>
+                    <filter>src/main/resources/conf/conf_profile_didi_stage.properties</filter>
+                </filters>
+            </build>
+            <properties>
+                <env>didi-stage</env>
+            </properties>
+        </profile>
     </profiles>
 
     <build>

atms-api/src/main/resources/conf/conf_profile_didi_stage.properties

+jdbc_url=jdbc:mysql://10.88.128.65:8806/fintax_stage?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+jdbc_user=fintax_user_stage
+jdbc_password=Fintaxuser@123Stage
+#jdbc_password=111111
+jdbc_admin_db=taxadmin2018
+
+jdbc2_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL = TCP)(HOST = 10.0.1.224)(PORT = 1521))(ADDRESS = (PROTOCOL = TCP)(HOST = 10.0.1.225)(PORT = 1521))(CONNECT_DATA =(SERVER = DEDICATED)(SERVICE_NAME = taxdb)))
+jdbc2_user=pwc_invoice
+jdbc2_password=pwc_invoice
+jdbc2_admin_db=pwc_invoice
+
+jdbc_url_demo=jdbc:mysql://10.158.230.144:3306/demo_db_name?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+
+mail_jdbc_url=jdbc:sqlserver://192.168.1.102:1434;DatabaseName=MAILMaster
+mail_jdbc_user=sa
+mail_jdbc_password=atmsunittestSQL
+
+web.url=http://dts-stage.erp.didichuxing.com
+#web.url=*
+jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
+jwt.powerToken=xxxx
+jwt.expireSecond=180000
+jwt.refreshSecond=600
+
+#File Server Config
+file.server.url=http://dts.erp.didichuxing.com:9001
+file.server.upload=/api/v1/upload
+
+#upload
+max_file_length=104857600
+
+#Distributed ID Generate
+distributed_id_datacenter=10
+distributed_id_machine=16
+id.generator.mapping={1:"10.89.181.45", 2:"10.89.182.45"}
+
+api.url=http://dts-stage.erp.didichuxing.com
+
+# Longi config
+longi_api_basic_user=
+longi_api_basic_pwd=
+longi_api_gl_balance=http://soa.longi-silicon.com:8011/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
+
+#log
+log.level=INFO
+log.debug=false
+
+env_type=pub
+file_upload_post_url=http://10.88.128.214:8000/resource/erp_tax_system
+file_upload_query_url=http://10.88.128.214:8001/resource/erp_tax_system
+
+#���ϵ�ַget_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
+check_ticket=true
+get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
+app_id=2432
+app_key=d7c66a9b9a989c1d7a5d49a4764bddd1
+cookie.maxAgeSeconds=18000
+org_sync_url=http://10.96.238.10/erp-main-data-test-v2/api/companies
+org_sync_token=174af08f
+dd_pubkey=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKUfMPRKV6I5num1dDWcxTrgTjXf5LctsVj0CpbwHE83mmjUO5CAlvA0Fwy30ajCX5sLmsyi+Eu/4uNmM6GQF3kCAwEAAQ==
+
+
+ebs_call_url=http://172.20.2.220:8080/ebs-proxy-stage/dts
+
+#tableau config
+tableau_get_ticket=http://172.20.201.98:8090/trusted?username=%s
+tableau_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet11?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_tax_comparison=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet19?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_countries=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_cost_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet24?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet31?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_other_domestic_data=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet39?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_doc_situation=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet42?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+tableau_dashboard=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409_MonthlyReport/Dashboard?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no&:toolbar=no
+

atms-web/pom.xml

@@ -180,6 +180,17 @@
                 <env>uat</env>
             </properties>
         </profile>
+        <profile>
+            <id>didi-stage</id>
+            <build>
+                <filters>
+                    <filter>src/main/resources/conf_profile_didi_stage.properties</filter>
+                </filters>
+            </build>
+            <properties>
+                <env>didi-stage</env>
+            </properties>
+        </profile>
     </profiles>
 
     <build>

atms-web/src/main/resources/conf_profile_didi_stage.properties

+api.url=http://dts-stage.erp.didichuxing.com
+
+jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
+jwt.powerToken=xxxx
+jwt.expireSecond=180000
+jwt.refreshSecond=600
+
+log.level=INFO
+
+#didi-config
+check_ticket=true
+get_user_info_url=http://mis.diditaxi.com.cn/auth/sso/api/
+app_id=2432
+app_key=d7c66a9b9a989c1d7a5d49a4764bddd1
+cookie.maxAgeSeconds=18000
+
+# Tableau Setting
+# Longi config
+longi_api_basic_user=
+longi_api_basic_pwd=
+longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServices/ErpQueryGLBalanceSoapProxy?wsdl
+
+#tableau config
+tableau_get_ticket=http://172.20.201.98:8090/trusted?username=%s
+
+#税种未返还税金
+tableau_tax_category_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_1?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#地区未返还税金
+tableau_district_unreturned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#未返还/返还后税金比较
+tableau_unreturned_and_returned_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#费用分析
+tableau_cost_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet4?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#地区利润总额 / 亏损额
+tableau_district_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet5?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#公司利润总额 / 亏损额
+tableau_company_profit_and_loss=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_2?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#司机 / 员工人数
+tableau_driver_and_employee=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/sheet7?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#业务线GMV及补贴统计
+tableau_gmv_and_subsidy=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/GMV_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#档案归档情况
+tableau_file_arrangement=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/_mobile_3?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#国际税全球概覧
+tableau_global_overview=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/InternationalOverview?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#国际税业务数据
+tableau_global_business=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/International_Table_mobile?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#墨西哥税务分析
+tableau_mexican_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Mexico?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#澳洲税务分析
+tableau_australian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Australia?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#巴西税务分析
+tableau_brazilian_tax=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Brazil?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no
+
+#其他税务分析
+tableau_other_tax_analysis=http://172.20.201.98:8090/trusted/%s/views/UAT_20190409/Others?iframeSizedToWindow=true&:embed=y&:showAppBanner=false&:display_count=no&:showVizHome=no