Browse Source

更改为正式应用

Lgx 4 years ago
parent
commit
671bbbc21e

+ 21 - 7
UI/src/utils/config1.js

@@ -3,14 +3,16 @@ const APIV2 = '/api/v2'
 const APIV3 = 'http://119.130.113.245:8004'
 const JAPIV = 'http://119.130.113.245:8005'
 const APIV4 = 'http://119.130.113.245:8005'
+const APIV3Auth = 'http://119.130.113.245:8030'
+const WXAPIV5= 'http://219.128.77.86:7000'
 module.exports =  {
-  name: '亮健会员中心',
+  name: '亮健会员系统管理',
   prefix: 'bird',
   footerText: 'bird admin  © 2018 360lj.com',
   logo: '/logo.svg',
   iconFontCSS: '/iconfont.css',
   iconFontJS: '/iconfont.js',
-  CORS: ['http://119.27.191.247:80','http://localhost:57251','http://localhost:8000',
+  CORS: ['http://119.27.191.247:80','http://localhost:57251','http://localhost:8000','http://119.130.113.245:8030','http://219.128.77.86:7000',
   'http://localhost:8001','http://localhost:8002','http://localhost:8003',
   'http://coop.360lj.com:8004','http://coop.360lj.com:8005',
   'https://localhost','https://coop.360lj.com',' https://localhost:44351',
@@ -20,26 +22,38 @@ module.exports =  {
   openPages: ['/login','/'],
   apiPrefix: '/api/v1',
   webApiPrefix:APIV3,
+  authApiPrefix: APIV3Auth,
   APIV1,
   APIV2,
   APIV3,
+  APIV3Auth,
   APIV4,
+  WXAPIV5,
+  ClientId:'f3ed0d90-3fc8-4eba-b83c-a0cfe54c174d',
+  ClientSecret:'78e238b4-c199-49ad-b619-69b6a78959d8',
+  ApplicationKey:'test',
   color:{
     success:'#52c41a',
     warn:'#E6A23C',
     error:'#ff4d4f'
   },
   api: {
-    userLogin: `${APIV3}/web/login/index`,
-    userLogout: `${APIV3}/web/login/logout`,
+    // userLogin: `${APIV3}/web/login/index`,
+    userLogin: `${APIV3Auth}/ums/oauth2/accessToken?grant_type=password`,
+    // userLogout: `${APIV3}/web/login/logout`,
+    userLogout: `${APIV3Auth}/web/login/logout`,
     //menus: `${APIV1}/menus`,
-    menus: `${APIV3}/web/auth/menus`,
+    // menus: `${APIV3}/web/auth/menus`,
+    menus: `${APIV3Auth}/ums/oauth2/list/permission`,//?types=1 两种菜单类型 顶部菜单和左侧菜单
     getDic:`${APIV1}/getdic?key=`,
+
     upload:`${APIV3}/web/upload/uploadprofile`,
     //getFileName:`/file/getName?url=`,
     getFileName:`${APIV3}/`,
-    getOperationToken:`${APIV3}/web/login/getOperationToken`,
-    permissions:`${APIV3}/web/auth/permissions`
+    // getOperationToken:`${APIV3}/web/login/getOperationToken`,
+    getOperationToken: `${APIV3Auth}/ums/oauth2/accessToken?grant_type=refresh_token`,
+    // permissions:`${APIV3}/web/auth/permissions`
+    permissions:`${APIV3Auth}/ums/oauth2/list/permission?types=2`,
   },
   JAPIV, 
 }

+ 1 - 1
src/main/java/com/liangjiang11/wx/cp/controller/WxaAddContactController.java

@@ -24,7 +24,7 @@ import java.util.List;
 @RequestMapping("/wx/cp/addcontact")
 public class WxaAddContactController {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
-    private static Integer agentId=1000003;
+    private static Integer agentId=1000004;
     final WxCpService wxCpService = WxCpConfiguration.getCpService(agentId);
     @Autowired
     private ExternalUserService externalUserService;

+ 6 - 11
src/main/resources/application.yml

@@ -12,18 +12,18 @@ foo:
         #spring.datasource.url = jdbc:mysql://localhost:3306/wechat?useUnicode=true&characterEncoding=utf-8&useSSL=true
         #spring.datasource.username = root
         #spring.datasource.password = root
-#        url: jdbc:mysql://192.168.50.41:3306/wechat?useUnicode=true&characterEncoding=utf-8
-#        username: cdh
-#        password: CDH360lj#com2019
-#        driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:sqlserver://219.128.77.86:1433; DatabaseName=qywechattest
+        #        url: jdbc:mysql://192.168.50.41:3306/wechat?useUnicode=true&characterEncoding=utf-8
+        #        username: cdh
+        #        password: CDH360lj#com2019
+        #        driver-class-name: com.mysql.jdbc.Driver
+        url: jdbc:sqlserver://127.0.0.1:1433; DatabaseName=qywechattest
         username: test
         password: 360ljtest!
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 
 bar:
     datasource:
-        url: jdbc:sqlserver://219.128.77.96:1433; DatabaseName=YPassport
+        url: jdbc:sqlserver://172.16.0.40:1433; DatabaseName=YPassport
         username: caixukun
         password: cxk@membercenter!@#
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -35,11 +35,6 @@ wechat:
         secret: 3whtB0Z8Px1iQ_9SDs4P65I-5apuuA1lJg4Wv90foIY
         token: Fh9jrzyLqL1
         aesKey: 6d7562bCSWGQy5V6fI2RwDWr9jIywr4lzjVPq2Ud2n7
-      - agentId: 1000002
-        secret: 3whtB0Z8Px1iQ_9SDs4P65I-5apuuA1lJg4Wv90foIY
-        token: 111
-        aesKey: 111
-
 mybatis-plus:
     mapper-locations: classpath*:mapper/*Mapper.xml
     type-aliases-package: java.com.liangjiang11.wx.cp.dao.foo