Browse Source

配置文件修改。

zhengqiang 5 years ago
parent
commit
e06284ceb2

+ 14 - 0
web/pom.xml

@@ -172,5 +172,19 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>docker</id>
+            <properties>
+                <active.profile>docker</active.profile>
+            </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                    <version>3.1.0</version>
+                    <scope>provided</scope>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>

+ 71 - 15
web/src/main/resources/application-docker.yml

@@ -1,31 +1,87 @@
-server:
-  port: 8080
-  servlet:
-    context-path: /smart-community-server
-
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    #    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    #    username: root
+    #    password: slgo^Root_!Q@W#E)P(O*I
+    url: jdbc:log4jdbc:mysql://192.168.0.1:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: jpsoft2016
+    password: jpsoft8121234
   devtools:
     restart:
       enabled: true
-
+  redis:
+    # Redis数据库索引(默认为0)
+    database: 2
+    # Redis服务器地址
+    host: 192.168.0.1
+    # Redis服务器连接端口
+    port: 6379
+    password:
+  rabbitmq:
+    host: 192.168.0.1
+    port: 5672
+    username: admin
+    password: jpsoft
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: prodmq
 logger:
   level: WARN
-  dir: /opt/logs
-
-electricity:
-  port: 9966    #监听端口
+  dir: /usr/local/tomcat/api-logs
 
 springfox:
   documentation:
     swagger:
       v2:
-        host: 192.168.33.21:5566
+        host: wisdomhouse.sudaonline.net
 
 wx:
   pay:
-    appId: wx7e70eb62a8459869
-    appSecret: 909d17e353268da57c4f18cc09798049
+    #    appId: wx7e70eb62a8459869
+    #    appSecret: 909d17e353268da57c4f18cc09798049
+    appId: wx0b3c41a903053808
+    appSecret: 43557bd62f77b0c3d6670e991872f0e7
+    mchId: 1500160622
+    subMchId: 1505070291
+    mchKey: jpsoft11111111111111111111111111
+    notifyUrl: http://wisdomhouse.sudaonline.net/wxPay/payNotify
+    ip: 101.37.31.116
+    token: weixin
+    tokenUrl: "https://api.weixin.qq.com/cgi-bin/token"
+    refreshOAuth2TokenUrl: "https://api.weixin.qq.com/sns/oauth2/refresh_token"
+    createQrCodeUrl: "https://api.weixin.qq.com/cgi-bin/qrcode/create"
+    showQrCodeUrl: "https://mp.weixin.qq.com/cgi-bin/showqrcode"
+  cp:
+    corpId: wwe5fb36b045f42c42
+    appConfigs:
+      - agentId: 1000001
+        secret: jWDwhE92FPB7it7ciO0PzJbu2c0mErMYUNtsiYR3sEo
+        token: M9Kq
+        aesKey: K9j9sJJ6QhNZeCprXoFCU5NYm7jOlyyIXfY0Dewbfnm
+      - agentId: 1000002
+        secret: 1111
+        token: 111
+        aesKey: 111
+
+#可支付环境(小鹏物业app)
+parkalipay:
+  serviceUrl: https://openapi.alipay.com/gateway.do
+  appId: 2019031663559245
+  privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDP1o0XIBiHlNhBamD+8KMFUuyc4R8pAZAmfDlyCKsC+fZNGLEtENroGGMkLw0RiB+exuXbwFkJEpcf2FtU/RECG27zL9r2JHjL6Z4jtNW5JGNK+ScIYUIacOLCAmGyOKPKUnxtqCtrn/m3WPO8ouucnqQIUc1pR9QA5EM8/Y1ckRzQcjSkzIK7caqxdN2L84YiXFSD7q7t1tCb6t2OoiPl4jgnzSrX6EwtBTdKnatahhrFseODyGdZUTNRVFWKss26m3U+oBLQUrIDfx6XYvDgPSR7dz1g4syenj0iI8TBsmgKyo0oufoGpeAOmAjTK4//KcqYqgWwaWDUE/Vfq20/AgMBAAECggEALs4rkgSpYYc0uG6jj2ZT4DQPkzjjkpGGjBQ3v6WSFaaDQFOKOxLrqY8sbI6oC8WzEUfLphSIOJHWNNa9osMnHGlfMCcb0YjfJ1TiRzpHU12NeunnT2zPvTKk7noo1EELKdovqWZQ+Pja/N5sbZPnKatUV4dMkiQZ62V8evTC7BBdxyeA1Ivg2uj1id0G7uLVhoPTuqn0+FHid8r3sSaPHKcY9hfGVat7WgQQoqGurBuJrLP4RTzyaHN3OxuZzMnSu6q7zhMpfBZK0xsrA2+D3pHPdsnOt6fKnDCBdaXsumonQEuJFmLqOjyYCqZLDrfp41E+Tj6enDuGamN/9f1HkQKBgQD6Mbm9IMab3nG8rKnJBQTMJmZryCgDm/RZtqlAnIxgk10lkF77KRy2ZVU0/zcwa8BK7Ah6sQHE0rQ/OxjUrRj7PBv0CKkm6FpVoLZVtWdNBkJQsAbU7sB0cIM9r7QHvRzxHYzS8V3pkCEHvvOmyNQ3b6S0cHasI2ILMHgYChFXJwKBgQDUqTWqdUjZD1+z94gYke76w1bZGMmJnPDCvChZjpIFP5M3PSt3+HJgqPHA/ptg1OPJ2DX+dUNsZsTsM71jDz/yax1+zZkgIO+nsUWrTGek7Oi8THdoICa1++xhL3WcpUXxIl+l9U75qyXW9DV/zggr1x6DQDU1UaunMsvRg4LIKQKBgQDXZJnYNfBmXkIiwa9GDVkM/H4uilnQiaH63mOl6WB9AEEvxrPOnJ1IdcK+Zn235PveRIgkQGEadp+Q1CrTZdZc7GnQVOhzQ5QJpdtzvEGbsSjEWFb5WDY9yGNkZvChvPC+r8b+D6ffHSMijQUscDcrJqVwZmX0Wl3c7jRl1b0J/wKBgQC1hd4WK1jMVxAk6SSVfHPWPskyNLNLMNheEQgMMeM4caTy4Nbq5/qRwYPibjIo/G+XymOEWYn8zNhImn2NQeYewgoCQ/Lx9ss6g9npNyW9JLAgktDV46PHcUu7RSyKUpUaGHI2kecgvFNnYTsNZcuZyFz2QedpJNZ1uKk7pJsMyQKBgDNatWHVOJez9MAwAzpIDM90vdm79nzTUQ5NzanroGLGPTzREYLyw7F4mB035D34DVeUPgRDy0RHSK0kdA/HHtvcr6ONVummXXBEKaGKC3KvFHf1EXMVI0iA9nB70BCjkokFegqeTexlC3bkEZiMT2iWdK8rdBakd1ITIAsLE9AO
+  zfbPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo3gaIrAD47mfSBmye1c8GLIRF4H3sl0MhT1OHIO0FqwtDqyxpHkrpOQADQggEzgv1nO82V+ChQxHUeaQ7W987+s1cnwtm7ZVML8DxVtji1va1ahBKL62dBommOoIt4fRIO2upbnF6r3NjB/3MCTZUIE03xIqc+aUeNdRO7eAMpm6sHjBfSimFwXlyTaEsAsnTK4hkOzdvoldHry6A3375kE3msj8Z48Nko7AFedOToPfJNolap+i7qWv3VOhnWLrAZH/Jgq/uHQmx8r29BeBl9AT4EwxDN5mVVKDOYsWW1efmrhKXO3wvzInhB6qQ8L1uBCWKhw1eGHCvlCjTHxBYQIDAQAB
+  inputCharset: UTF-8
+  mchId: 2088511854331096
+  # appAuthToken: 201906BBbc7d6558596f4bbc9f056c01b8aebX48
+  signType: RSA2
+  format : json
+  notifyUrl: http://zldb.xiaoxinda.com:8088/smart-community-server/aliPay/payNotify
+
+mobile:
+  unMeasureUrl: http://wisdomhousewechat.sudaonline.net/prevention/adundetect_wx_message.html
+
+parking:
+  userName: system
+  ip: http://101.37.31.116:7002
+
+realname:
+  selectUrl: "http://jztest.e2r.cn:8115/foreign/select/check"
+  uploadUrl: "http://jztest.e2r.cn:8115/foreign/upload/check"

+ 6 - 0
web/src/main/resources/logback-spring.xml

@@ -52,4 +52,10 @@
             <appender-ref ref="FILE" />
         </root>
     </springProfile>
+    <springProfile name="docker">
+        <root level="WARN">
+            <appender-ref ref="STDOUT" />
+            <appender-ref ref="FILE" />
+        </root>
+    </springProfile>
 </configuration>