迁移

UI/src/utils/config.js

@@ -1,49 +1,33 @@
 const APIV1 = '/api/v1'
-const APIV2 = '/api/v2' 
-const APIV3 = 'http://192.168.50.32:8004'
-const APIV4 = 'http://192.168.50.32:8005'
+const APIV2 = '/api/v2'
+const APIV3 = 'http://119.130.113.245:8004'
+const APIV4 = 'http://119.130.113.245:8005'
 
-const APIV3Auth = 'http://192.168.50.32:13001/oauth2'
-// const WXAPIV5= 'http://192.168.50.32:13001/qiyewechat'
-const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
-const staticMpAPI = 'http://192.168.50.32:13001/mpwechat'
-
-// const APIV3Auth = 'http://192.168.50.32:8031'
-const WXAPIV5= 'http://localhost:7000'
-// const WXMpAPI= 'http://localhost:8081'
+const APIV3Auth = 'http://mem.360lj.com:13000/oauth2'
+const WXAPIV5= 'http://mem.360lj.com:13000/qiyewechat'
+const WXMpAPI= 'http://mem.360lj.com:13000/mpwechat'
+const staticMpAPI = 'http://mem.360lj.com:13000/mpwechat'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
-  footerText: 'bird admin  ? 2018 360lj.com',
+  footerText: 'bird admin  © 2018 360lj.com',
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: ['http://localhost:8000',
-  'http://localhost:8030',
-  'http://localhost:7000',
-  'http://192.168.50.32:8031',
-  'http://192.168.50.32:8030',
-  'http://localhost:8030',
-  'http://192.168.50.32:13001',
-  'http://192.168.10.40:13002',
-  'http://localhost:13001',
-  'http://192.168.10.129:8081',
-  'http://192.168.10.40:8081',
-  'http://192.168.50.32:7000',
-  'http://192.168.10.129:7000',
-  'http://192.168.50.39:8081',
-  'http://192.168.10.68:8081',
-  'http://localhost:8081',
-  'http://192.168.50.32:8004',
-  'http://localhost:8005',
-  'http://192.168.50.32:8005',
-  'http://localhost:7000',  
-  'http://192.168.50.32:7000',
+  CORS: [
+    'http://mem.360lj.com:7111',
+    'http://119.130.113.245:8004',
+    'http://119.130.113.245:8005',
+    'http://119.130.113.245:7001',
+    'http://119.130.113.245:8030',
+    'http://mem.360lj.com:13000',
+    'http://mem.360lj.com:7000',
+    'http://mem.360lj.com:7001',
   ],
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
-  webApiPrefix: APIV3,
+  webApiPrefix:APIV3,
   authApiPrefix: APIV3Auth,
   APIV1,
   APIV2,
@@ -81,4 +65,5 @@ module.exports =  {
     // permissions:`${APIV3}/web/auth/permissions`
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
+  APIV4, 
 }

UI/src/utils/config_prod.js

@@ -1,33 +1,49 @@
 const APIV1 = '/api/v1'
-const APIV2 = '/api/v2'
-const APIV3 = 'http://119.130.113.245:8004'
-const APIV4 = 'http://119.130.113.245:8005'
+const APIV2 = '/api/v2' 
+const APIV3 = 'http://192.168.50.32:8004'
+const APIV4 = 'http://192.168.50.32:8005'
 
-const APIV3Auth = 'http://mem.360lj.com:13000/oauth2'
-const WXAPIV5= 'http://mem.360lj.com:13000/qiyewechat'
-const WXMpAPI= 'http://mem.360lj.com:13000/mpwechat'
-const staticMpAPI = 'http://mem.360lj.com:13000/mpwechat'
+const APIV3Auth = 'http://192.168.50.32:13001/oauth2'
+const WXAPIV5= 'http://192.168.50.32:13001/qiyewechat'
+const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
+const staticMpAPI = 'http://192.168.50.32:13001/mpwechat'
+
+// const APIV3Auth = 'http://192.168.50.32:8031'
+// const WXAPIV5= 'http://localhost:7000'
+// const WXMpAPI= 'http://localhost:8081'
 module.exports =  {
   name: '亮健营销平台',
   prefix: 'bird',
-  footerText: 'bird admin  © 2018 360lj.com',
+  footerText: 'bird admin  ? 2018 360lj.com',
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: [
-    'http://mem.360lj.com:7111',
-    'http://119.130.113.245:8004',
-    'http://119.130.113.245:8005',
-    'http://119.130.113.245:7001',
-    'http://119.130.113.245:8030',
-    'http://mem.360lj.com:13000',
-    'http://mem.360lj.com:7000',
-    'http://mem.360lj.com:7001',
+  CORS: ['http://localhost:8000',
+  'http://localhost:8030',
+  'http://localhost:7000',
+  'http://192.168.50.32:8031',
+  'http://192.168.50.32:8030',
+  'http://localhost:8030',
+  'http://192.168.50.32:13001',
+  'http://192.168.10.40:13002',
+  'http://localhost:13001',
+  'http://192.168.10.129:8081',
+  'http://192.168.10.40:8081',
+  'http://192.168.50.32:7000',
+  'http://192.168.10.129:7000',
+  'http://192.168.50.39:8081',
+  'http://192.168.10.68:8081',
+  'http://localhost:8081',
+  'http://192.168.50.32:8004',
+  'http://localhost:8005',
+  'http://192.168.50.32:8005',
+  'http://localhost:7000',  
+  'http://192.168.50.32:7000',
   ],
   //YQL: ['http://localhost:57251'],
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
-  webApiPrefix:APIV3,
+  webApiPrefix: APIV3,
   authApiPrefix: APIV3Auth,
   APIV1,
   APIV2,
@@ -65,5 +81,4 @@ module.exports =  {
     // permissions:`${APIV3}/web/auth/permissions`
     permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
-  APIV4, 
 }

mpwechatApp/src/main/resources/application-pgprod.properties

@@ -37,9 +37,9 @@ spring.druid.filters= stat,wall,slf4j
 spring.druid.connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 
 spring.datasource.driver-class-name= org.postgresql.Driver
-spring.datasource.url= jdbc:postgresql://192.168.138.200:5433/qiyewechat
-spring.datasource.username= dbuserpg
-spring.datasource.password= postgres#360lj.com@2019@#
+spring.datasource.url= jdbc:postgresql://localhost:5433/qiyewechat
+spring.datasource.username= dbuser
+spring.datasource.password= postgres#lj360.com@2019@#
 
 
 
@@ -66,10 +66,10 @@ spring.ue.druid.filters= stat,wall,slf4j
 spring.ue.druid.connectionProperties= druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 
 spring.ue.datasource.driver-class-name= org.postgresql.Driver
-spring.ue.datasource.url= jdbc:postgresql://192.168.138.200:5433/qiyewechat
-spring.ue.datasource.username= dbuserpg
-spring.ue.datasource.password= postgres#360lj.com@2019@#
-    
+spring.ue.datasource.url= jdbc:postgresql://localhost:5433/qiyewechat
+spring.ue.datasource.username= dbuser
+spring.ue.datasource.password= postgres#lj360.com@2019@#
+
 # quartz
 spring.quartz.properties.org.quartz.scheduler.instanceName = clusteredScheduler
 spring.quartz.properties.org.quartz.scheduler.instanceId = AUTO