nyx javaapp:

1. 新增通过dir得到oss参数的功能 2.

nyx javaapp:
1. 新增通过dir得到oss参数的功能 2.
8be222a8 · jscat · ba24d965 · 8be222a8 · 8be222a8 · 8be222a8
Commit 8be222a8 authored Sep 01, 2020 by jscat
--- a/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.java
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.java
 package cn.com.fun.nyxkey.api.repository;
@@ -53,6 +53,9 @@ public interface Rockwell_keyMapper {
    List<Rockwell_keyV_collect> getV_collect_by_page(Rockwell_keyT_collectQuery rockwell_keyT_collectQuery);
    void updateT_collect(Rockwell_keyT_collectQuery rockwell_keyT_collectQuery);
+    /* */
+    void addT_member(Rockwell_keyT_member rockwell_keyT_member);
    /* testing */
    void test(Rockwell_keyT_matchQuery rockwell_keyT_matchQuery);

--- a/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_keyService.java
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_keyService.java
 package cn.com.fun.nyxkey.api.service;
@@ -73,6 +73,11 @@ public interface Rockwell_keyService {
    JSONResult Rockwell_keyServiceGetV_collect(String userId, int pageNum, int pageCount);
    int Rockwell_keyServiceUpdateT_collect(String userId, String activityId, String collectStatus);
+    /*
+        add member api
+     */
+    int Rockwell_keyServiceAddT_member(String memberId, String memberLogo, String memberName, String memberAddress) throws UnsupportedEncodingException;
    // testing
    void Rockwell_keyServiceTest(List<Rockwell_keyT_match> listRockwell_keyT_match);

--- a/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_ossService.java
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/Rockwell_ossService.java
 package cn.com.fun.nyxkey.api.service;
@@ -14,7 +14,7 @@ import java.util.List;
 */
 public interface Rockwell_ossService {
-    JSONResult Rockwell_ossServiceGetToken(String userName, String tokenName);
+    JSONResult Rockwell_ossServiceGetToken(String userName, String tokenName, String dirType);
    String Rockwell_ossServiceGetQrcodeUrl(String matchId);
    void testQrcode();

--- a/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_keyServiceImpl.java
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_keyServiceImpl.java
 package cn.com.fun.nyxkey.api.service.impl;
@@ -566,6 +566,30 @@ public class Rockwell_keyServiceImpl implements Rockwell_keyService {
        return 0;
    }
+    /*
+        add member api
+     */
+    public int Rockwell_keyServiceAddT_member(String memberId, String memberLogo, String memberName, String memberAddress) throws UnsupportedEncodingException
+    {
+        LOGGER.debug("find Rockwell_keyServiceAddT_member");
+        System.out.println("find Rockwell_keyServiceAddT_member");
+        Rockwell_keyT_member rockwell_keyT_member = new Rockwell_keyT_member();
+        rockwell_keyT_member.setId(memberId);
+        rockwell_keyT_member.setMemberStatus("01");
+        rockwell_keyT_member.setMemberLogo(memberLogo);
+        rockwell_keyT_member.setMemberName(URLDecoder.decode(memberName, "UTF-8"));
+        rockwell_keyT_member.setMemberAddress(URLDecoder.decode(memberAddress, "UTF-8"));
+        rockwell_keyT_member.setGeoCode("");
+        rockwell_keyT_member.setLat(null);
+        rockwell_keyT_member.setLon(null);
+        rockwell_keyT_member.setCreateDatetime(new Date());
+        rockwell_keyT_member.setUpdateDatetime(new Date());
+        System.out.println(rockwell_keyT_member);
+        rockwell_keyMapper.addT_member(rockwell_keyT_member);
+        return 0;
+    }
    // testing
    public void Rockwell_keyServiceTest(List<Rockwell_keyT_match> listRockwell_keyT_match)
    {

--- a/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_ossServiceImpl.java
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_ossServiceImpl.java
 package cn.com.fun.nyxkey.api.service.impl;
@@ -102,6 +102,9 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
    @Value("${aliyun.oss.dirQrcode}")
    private String aliyunOssDirQrcode;
+    @Value("${aliyun.oss.dirLogo}")
+    private String aliyunOssDirLogo;
    /*
        总体流程
        1. 获取角色的授权accessid, getToken()
@@ -121,7 +124,7 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
        https://help.aliyun.com/document_detail/91868.html?spm=a2c4g.11186623.2.15.526f6e28cqDt2n#concept-ahk-rfz-2fb
    */
-    public JSONResult Rockwell_ossServiceGetToken(String userName, String tokenName)
+    public JSONResult Rockwell_ossServiceGetToken(String userName, String tokenName, String dir)
    {
        /*
          1. accessKeyId
@@ -130,11 +133,11 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
          4. expiration
        */
        Map<String, String> map = getSTSRoleAccessKeyId(userName, tokenName);
-        return getToken(map);
+        return getToken(map, dir);
    }
    //step2: 获取上传的参数
-    public JSONResult getToken(@org.jetbrains.annotations.NotNull Map<String, String> map)
+    public JSONResult getToken(@org.jetbrains.annotations.NotNull Map<String, String> map, String dirType)
    {
        //String accessId = aliyunOssAccessKeyID; // 请填写您的AccessKeyId。
@@ -148,7 +151,7 @@ public class Rockwell_ossServiceImpl implements Rockwell_ossService {
        String host = "https://" + bucket + "." + endpoint; // host的格式为 bucketname.endpoint
        // callbackUrl为 上传回调服务器的URL，请将下面的IP和Port配置为您自己的真实信息。
        String callbackUrl = aliyunOssCallbackUrl;
-        String dir = aliyunOssDir; // 用户上传文件时指定的前缀。
+        String dir = dirType; // 用户上传文件时指定的前缀。
        OSSClient client = new OSSClient(endpoint, accessId, accessKey);
        Map<String, String> respMap = new LinkedHashMap<String, String>();

--- a/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_userServiceImpl.java
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/service/impl/Rockwell_userServiceImpl.java
 package cn.com.fun.nyxkey.api.service.impl;
@@ -98,7 +98,7 @@ public class Rockwell_userServiceImpl implements Rockwell_userService {
                // 更新用户信息
                user.setOpenid(openId);
-                user.setAuthStatus("1"); //已授权
+                user.setAuthStatus("01"); //已授权
                user.setUpdateDatetime(new Date());
                rockwell_userMapper.insertUser(user);
@@ -169,7 +169,7 @@ public class Rockwell_userServiceImpl implements Rockwell_userService {
        // String userId ="uid_"+UUID.randomUUID().toString();
        user.setId(userId);
        user.setOpenid("");
-        user.setAuthStatus("0"); //未授权
+        user.setAuthStatus("00"); //未授权
        user.setCreateDatetime(new Date());
        user.setUpdateDatetime(new Date());
        rockwell_userMapper.insertUser(user);

--- a/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/OssApiController.java
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/java/cn/com/fun/nyxkey/api/web/controller/OssApiController.java
 package cn.com.fun.nyxkey.api.web.controller;
@@ -42,15 +42,17 @@ public class OssApiController {
    @ApiOperation(value="获取阿里云oss token", notes="获取阿里云oss token")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "userName", value = "用户名", required = false, dataType = "String", defaultValue = "1"),
-        @ApiImplicitParam(name = "tokenName", value = "android传入android，ios传入ios", required = false, dataType = "String", defaultValue = "1")
+        @ApiImplicitParam(name = "tokenName", value = "android传入android，ios传入ios", required = false, dataType = "String", defaultValue = "1"),
+        @ApiImplicitParam(name = "dirType", value = "上传的目录", required = true, dataType = "String", defaultValue = "user-dir/")
    })
    @RequestMapping(value = "/nyx/oss/getToken", method = RequestMethod.GET)
    public JSONResult RockwellAliyunOssGetToken(
        @RequestParam(value = "userName", required = false, defaultValue = "1") String userName,
-        @RequestParam(value = "tokenName", required = false, defaultValue = "ios") String tokenName
+        @RequestParam(value = "tokenName", required = false, defaultValue = "ios") String tokenName,
+        @RequestParam(value = "dirType", required = false, defaultValue = "user-dir/") String dirType
    ) {
-        return ossService.Rockwell_ossServiceGetToken(userName, tokenName);
+        return ossService.Rockwell_ossServiceGetToken(userName, tokenName, dirType);
    }
    // refer:
@@ -79,5 +81,29 @@ public class OssApiController {
        return result;
    }
+    /*
+        添加tbl_member
+     */
+    @RequestMapping(value = "/nyx/oss/member/callback", method = RequestMethod.POST)
+    @ResponseBody
+    public JSONObject addmember (
+            @RequestParam(value = "filename", required = false, defaultValue = "0") String filename,
+            @RequestParam(value = "size", required = false, defaultValue = "0") String size,
+            @RequestParam(value = "height", required = false, defaultValue = "0") String height,
+            @RequestParam(value = "width", required = false, defaultValue = "0") String width,
+            @RequestParam(value = "memberName", required = false, defaultValue = "0") String memberName,
+            @RequestParam(value = "memberAddress", required = false, defaultValue = "0") String memberAddress,
+            @RequestParam(value = "image", required = false, defaultValue = "0") String image,
+            @RequestParam(value = "memberId", required = false, defaultValue = "0") String memberId
+    ) throws UnsupportedEncodingException {
+        System.out.println("===member/callback_\n");
+        System.out.println("===filename: "+filename+"&name="+memberName+"&address="+memberAddress+"&image="+image+"&memberId="+memberId);
+        keyService.Rockwell_keyServiceAddT_member(memberId, image, memberName, memberAddress);
+        JSONObject result = new JSONObject();
+        result.put("Status","OK");
+        return result;
+    }
 }
--- a/增值产品-小程序及app/nyx_app_key/api/src/main/resources/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.xml
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/resources/cn/com/fun/nyxkey/api/repository/Rockwell_keyMapper.xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -405,7 +405,7 @@ limitations under the License.
        </if>
    </select>
-    <!-- collect api 6-1 获取 v_collect 的值 by page update jscat 20200826 -->
+    <!-- collect api 6-1 获取 v_collect 的值 by page; order by start_datetime asc jscat 20200826 -->
    <select id="getV_collect_by_page" parameterType="cn.com.fun.nyxkey.api.domain.query.Rockwell_keyT_collectQuery"
            resultType="cn.com.fun.nyxkey.api.domain.Rockwell_keyV_collect">
        select * from view_collect
@@ -418,7 +418,7 @@ limitations under the License.
        <if test="collectStatus != null and collectStatus != '' ">
            AND collect_status=#{collectStatus}
        </if>
-        order by num_like desc, create_datetime desc
+        order by start_datetime asc, num_like desc
        <if test="pagination != null ">
            <include refid="pagination"/>
        </if>
@@ -430,5 +430,12 @@ limitations under the License.
        values (#{collectStatus}, #{userId}, #{activityId} , NOW(), NOW() )
    </insert>
+    <!-- 添加一条member信息 -->
+    <insert id="addT_member" parameterType="cn.com.fun.nyxkey.api.domain.Rockwell_keyT_member">
+        insert into tbl_member(id, member_status, member_name, member_slogan, member_address, member_logo, lon, lat, geo_code, create_datetime, update_datetime)
+        values (#{id}, #{memberStatus}, #{memberName} , #{memberSlogan},  #{memberAddress},  #{memberLogo}, #{lon}, #{lat}, #{geoCode}, #{createDatetime}, #{updateDatetime})
+    </insert>
    <!-- ending API interface -->
 </mapper>
\ No newline at end of file
--- a/增值产品-小程序及app/nyx_app_key/api/src/main/resources/config/application.yml
+++ b/增值产品-小程序及app/nyx_app_key/api/src/main/resources/config/application.yml
 server:
@@ -83,3 +83,4 @@ aliyun:
    callbackUrl: http://88.88.88.88:8888
    dir: user-dir/
    dirQrcode: qrcode-dir/
+    dirLogo: logo-dir/