weapp修改

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/controller/TzsAppController.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.utils.Menu;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.app.api.common.MobileLoginParam;
-import com.yeejoin.amos.boot.module.app.api.dto.EquipExportDto;
 import com.yeejoin.amos.boot.module.app.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.app.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.app.api.entity.PageParam;
@@ -30,7 +29,14 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -256,8 +262,8 @@ public class TzsAppController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "获取机器人登录token", notes = "获取机器人登录token")
     @GetMapping(value = "/acquireToken")
-    synchronized public String getRobotLoginToken() {
-        return amosRequestContext.getToken();
+    synchronized public ResponseModel<String> getRobotLoginToken() {
+        return ResponseHelper.buildResponse(amosRequestContext.getToken());
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/controller/TzsWeChatController.java

+package com.yeejoin.amos.boot.module.app.biz.controller;
+
+import com.yeejoin.amos.boot.module.app.biz.service.impl.TzsAuthServiceImpl;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+@RestController
+@Slf4j
+@Api(tags = "wechat小程序接口")
+@RequestMapping(value = "/wechat")
+public class TzsWeChatController {
+
+    @Autowired
+    AmosRequestContext amosRequestContext;
+
+    @Autowired
+    TzsAuthServiceImpl authServiceImpl;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "获取机器人登录token", notes = "获取机器人登录token")
+    @GetMapping(value = "/api/acquireToken")
+    synchronized public ResponseModel<String> getRobotLoginToken() {
+        return ResponseHelper.buildResponse(authServiceImpl.getUserToken());
+    }
+}

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/StartPlatformTokenService.java

@@ -11,28 +11,18 @@ import com.yeejoin.amos.component.robot.AmosRequestContext;
 @Service
 public class StartPlatformTokenService {
 
-	@Value("${admin.product}")
+	@Value("${amos.system.user.product}")
 	String product;
 
-	@Value("${admin.appkey}")
+	@Value("${amos.system.user.app-key}")
 	String appkey;
 
-	@Value("${admin.user}")
-	String user;
-
-	@Value("${admin.password}")
-	String password;
-
-	@Value("${amos.secret.key}")
-	String secretKey;
-
 	@Autowired
 	RedisUtil redisUtil;
 	
 	@Autowired
 	AmosRequestContext amosRequestContext;
 	
-
 	public void getToken() {
 		RequestContext.setProduct(product);
 		RequestContext.setAppKey(appkey);

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -39,6 +39,7 @@ import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -82,6 +83,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 	RegUnitIcServiceImpl regUnitIcService;
 
 	@Autowired
+    @Lazy
 	RegUnitInfoServiceImpl regUnitInfoService;
 
 	@Autowired

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAuthServiceImpl.java

@@ -48,6 +48,11 @@ public class TzsAuthServiceImpl implements TzsAuthService {
     @Value("${cti.user.pwd}")
     private String ctiUserPwd;
 
+    @Value("${amos.wechat.robot.user}")
+    private String weRobotUser;
+
+    @Value("${amos.wechat.robot.password}")
+    private String weRobotPassword;
 
     /**
      * saveUserRedis设置过期时间
@@ -58,6 +63,7 @@ public class TzsAuthServiceImpl implements TzsAuthService {
     @Autowired
     private StartPlatformTokenService startPlatformTokenService;
 
+    String weChatToken = "WECHAT_TOKEN";
 
     @Override
     public List<String> getUserRegionCode() {
@@ -149,20 +155,18 @@ public class TzsAuthServiceImpl implements TzsAuthService {
 
     }
 
-
-    private void loginCtiUser() {
-        String passwd = DesUtil.encode(ctiUserPwd, "qaz");
-        IdPasswordAuthModel loninData = new IdPasswordAuthModel();
-        loninData.setLoginId(ctiUserName);
-        loninData.setPassword(passwd);
-        FeignClientResult loginResult = Privilege.authClient.idpassword(loninData);
+    private void loginUser(String userName, String password, String token) {
+        String pwd = DesUtil.encode(password, "qaz");
+        IdPasswordAuthModel loginData = new IdPasswordAuthModel();
+        loginData.setLoginId(userName);
+        loginData.setPassword(pwd);
+        FeignClientResult loginResult = Privilege.authClient.idpassword(loginData);
         if(loginResult.getStatus() == 200) {
             HashMap resultMap = (HashMap) loginResult.getResult();
-            redisUtils.set(RedisKey.CTI_USER_TOKEN,  resultMap.get("token").toString(), redisRegionTimeSecond);
+            redisUtils.set(token, resultMap.get("token").toString(), redisRegionTimeSecond);
         }
     }
 
-
     public void setRequestContext() {
         // 需要登录后台账号
         RequestContext.setAppKey("AMOS_STUDIO");
@@ -173,10 +177,10 @@ public class TzsAuthServiceImpl implements TzsAuthService {
                 boolean validToken = TokenOperation.refresh(redisUtils.get(RedisKey.CTI_USER_TOKEN).toString());
                 // 登陆
                 if (!validToken) {
-                    this.loginCtiUser();
+                    this.loginUser(ctiUserName, ctiUserPwd, RedisKey.CTI_USER_TOKEN);
                 }
             } else { // 登陆
-                this.loginCtiUser();
+                this.loginUser(ctiUserName, ctiUserPwd, RedisKey.CTI_USER_TOKEN);
             }
         }
         String ctiToken = redisUtils.get(RedisKey.CTI_USER_TOKEN).toString();
@@ -193,7 +197,6 @@ public class TzsAuthServiceImpl implements TzsAuthService {
 
     }
 
-
     private void saveUserRedis(AgencyUserModel user, String token) {
         String authToken = RedisKey.buildReginKey(user.getUserId(), token);
         if (redisUtils.hasKey(authToken)) {
@@ -229,5 +232,23 @@ public class TzsAuthServiceImpl implements TzsAuthService {
         redisUtils.set(authToken, JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
     }
 
-
+    public String getUserToken() {
+        // 需要登录后台账号
+        RequestContext.setAppKey("AMOS_STUDIO");
+        RequestContext.setProduct("AMOS_STUDIO_WEB");
+        synchronized (TzsAuthServiceImpl.class) {
+            if (redisUtils.hasKey(weChatToken)) {
+                // 验证token
+                boolean validToken = TokenOperation.refresh(redisUtils.get(weChatToken).toString());
+                // 登陆
+                if (!validToken) {
+                    this.loginUser(weRobotUser, weRobotPassword, weChatToken);
+                }
+            } else { // 登陆
+                this.loginUser(weRobotUser, weRobotPassword, weChatToken);
+            }
+        }
+        String weToken = redisUtils.get(weChatToken).toString();
+        return weToken;
+    }
 }
\ No newline at end of file