diff --git a/.cursorrules b/.cursorrules index 0d43e76..87e9bb4 100644 --- a/.cursorrules +++ b/.cursorrules @@ -12,7 +12,7 @@ 项目目录结构说明： ``` -tydata-server/ # 项目根目录 +qnc-server/ # 项目根目录 ├── app/ # 应用服务目录 │ └── user/ # 用户服务 │ ├── cmd/ # 服务启动入口 diff --git a/app/user/cmd/api/etc/main.dev.yaml b/app/user/cmd/api/etc/main.dev.yaml index b6c5095..7bf8bd3 100644 --- a/app/user/cmd/api/etc/main.dev.yaml +++ b/app/user/cmd/api/etc/main.dev.yaml @@ -1,7 +1,7 @@ Name: main Host: 0.0.0.0 Port: 8888 -DataSource: "tydata:5vg67b3UNHu8@tcp(127.0.0.1:21001)/tydata?charset=utf8mb4&parseTime=True&loc=Local" +DataSource: "qnc:5vg67b3UNHu8@tcp(127.0.0.1:21001)/qnc?charset=utf8mb4&parseTime=True&loc=Local" CacheRedis: - Host: "127.0.0.1:21002" Pass: "3m3WsgyCKWqz" # Redis 密码，如果未设置则留空 @@ -29,10 +29,10 @@ YushanConfig: AcctID: "YSSJ843926726" Url: "https://api.yushanshuju.com/credit-gw/service" Alipay: - AppID: "2021005113664540" - PrivateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCA1mtTVZmB/7/wWV37Z8hUXEXFs0Gn1/Ie7c6rPQQRUlPHyJGcPAZvDii+ySC1/bplneMENRAjCuoJEM1z4X1FMt8rLggCqnF1xzUN2p9fdXUwcRPmSV4yi9ggMiFXldm0/eyaobV2fj0/VSLED2Qc8xBStM9pqkfszwf2rsAAKL15WQXOUiQw0s25s+Du18H4+YgkQ0HBr0+VPfhL4QoOvsE34ZYP0TuTwxVheYNkvSOPXFXmtE3z/b+75y2n2msa9S4HItNVYpOkB7z3GDB+0/rvX+Q+GvYI9BSBbgJwEuqiMN2SwQyAjH608JBoAUGnk0ygfG8juF77shBxzr/vAgMBAAECggEAQTlL2EJrlm59IxZ7B72Ao4SbJf0b7fba8mF90R7wojxFgcy+OpQAxdQrOHrl/nxXEv6dYRHj+3mZBcHl4RZ0rsWUSW3iTEcxbWjOKRdWu6LhEwcMBfd6oqg9X/9A9fA86O3sDFR1Y2mBZECbexo3mphK2TQEFQBJrU8aPv404V784u0wTh1oLO0Z3NjgvXOAy3ZsM64oZROVCkObXnZGyrY8Hf6W+YLmCoI7eajOQ9QTFy1x24fm8LFdWNizG9/DFa4EC7ZjiYzFhGpfpKb4964QnN3Krlf18Ryhgf3PO6IDO04JOdnHLKhR8+kHIN5m6AMIyKxbZ/vKw4X09Z8XoQKBgQD7jNHzEhIo4IOmRzgdoGxSCLXe1cUbwFL4tU3n7miUCYL/k6wpiNkCGwikaHMiSG0Om2D6+I9gX/rBrTrp2MAmcHA6ymn1GARSYMv7rz+5afGygfBDNr/7xQ2ASCatB65TObH+AUZzdq82B5dpr46AJhilRcHnQEyc/SyIelft2QKBgQCDHeDYt3vTDJ1vIPtXeyO1NHbGQY7cUucx3sZ+QVdF0abstcutT0LrHOgDCWFtnvjia1f0QRPDnTzUtq4GQxj63/9zZr1pMGsd7gjgIvVjM0LqUQXU0TMpO1DuU2zyemRyJTfWDDN+vTvA2+376cW0QxKq2CKOhX45WZRrUBbXBwKBgQCPVFe0ZlGOlQ6uSdpBl0zhGTF3vNpIy7b7G2M+ietwnlLUCXKJX/42YuzzsMgZeqcZMZN6rPIU+dtJS8lLwUMLI/nupbLmAj9EKP9RczOeFC2xhrQ9uA6ACHF+7J2M7dl4dmFi15sq4y9GW+D8SRmrDwnv8eVgPJTqxp7/TKaZUQKBgCMMI4QKV7DsWFDSMh0KL1tKcM1BzNwb1OzBrbEl6hwhlEsFtTHYU/zgtyvIoCBbNA/hvZruokfRiecaBZ5q5Qx6P6ArQEoTxS406G5xKcKgeyyDB9oBKXnF/zYVWrPd/2d7h1dR35nrH0PIBe8mZ9BtdVnxeBs8l6bgyQl+WPyVAoGBAPW7XxyLUAZ4X6JD4b5Iqq4E40xmDO3rUysrH8Zj7MN47ykZI0SlwA9B6hqliRLLJXkzhaAamecWb1RNJFDWfcg4bIyew4ukRbYB07RI+l0DXEgOxxTBcvN6BNUoIiQSEKXkOv+xt7Ez2TBoDm67xD58vwSXT4aPt4qxnd4i7Ves" - AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kkRL7lgKYs7f8Xi4DNKzp2ggjwy4By7RunwT4Ur4A71HVOqRQed9r45a6/W4JPuVv51tiHMojZifEKX7ixSlDG6be677RiNslMJ5G3mjw/+Ku01tV9Qzw5YyhvxbqmS8Qp9vgL8VPYhxqTxKO6WW+xiyVvxko+mrU+dbSFIVbBjp88NVVcquu+vZT/uwtjriKSwsesAm8DkKT6mTqY5P/JroMzTU7xa3/ErAMte6t2dOsxPS7kqWjJyoLBHRk+AH87X5lNBEjLgYPk1ADU7zFsLdC+nv4fm7nihYre7fCrdCTVKguXmPCEFBjqwSkag7BSIxRQjS3qHxi+DUMst7wIDAQAB" - AppCertPath: "app/user/cmd/api/etc/merchant/appCertPublicKey_2021005113664540.crt" + AppID: "2021004165608254" + PrivateKey: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCPsXuwFJeHAL8CwI0QdD9GP7xQ8eejIoQKg6J3/peu26su68JCtGSRhlDm/7vbLHJcFR6h7at+INoz2juc7SqlmNO7i9wKc3+Ua0487y1G2fCsneRNxTTqbceBZwqjj9/AAN0u5/4nSl0bcqTeMddofdpTGOvwGvIJh6CZgCglnhMZnH4D6H6yiIyZf7Q6k2d/qBpVGK8kluYEtSnf/vEQCHhxRx+/DgTL7V1LjbA3BYoPTELZ15JAj0uIzuxextAtxOm4+Huli0RJFAN3q/to2L1Zs8yYY1gKJyTaPWKsJWBx8zI+gZcC/e45k6CZnGgh1Fn3+Xqkf7eGxJGGHs1fAgMBAAECggEAM2rkApbrvdBDiV2TXK7sMVv/K8vUAmkIbKa7zUpZxqUuNSUBp1LbpcM1UeNyujPGXDLmejUMp55j1igiKr4nA4iTQ0oBm+/GWDqpjV5cijzURUBegIGvtK9Bs4lGok6KVy839l/nbvHKLVcxrZySIv7dz9xcGNfbghN5IVRdiU/kOokNbtwQNC837piG5q4PHL6bzwIUGbrLED/RDmw/IwVMMmZovcQQ2JAuWJBo9CS9LB0Nc3I4MOPNx/0Rl+5URSSfmJAriL5ihlWckocQCUHwhRpSGQ6Q4xAXFYvb8OsApAQG3WU9SciBfs2wg/QfGNFzwQgGFofPcTQg3DTeuQKBgQDUHBTsgoe3WXnGo6qZKw1zA4OtF67IJJoltHo5JtkBRKCNVU3BJ+q+6i/fn0MBwScKQ1mhPjWe3h+qTRT207RRxGaxb6ljATOiU+BxmpHvu6jP+DVYtP5F3M7MCAGqpDAEoXgoAWttxmijqk+5YuLOLe0j/btCmpzuH7zwxSnqlQKBgQCtbTvaS/g+Jeu4Ml6iv7xi5//JCjeTn2wUJpXnNmN0jn+riRwEO81z4GWuOI8WukZHHAnufI6qWk2sLH0gcdLQ/STsMnl2L3NbeUyO8o5w2JSAlnZDYfaFfasGqFkGJrBLqG6bh/Bk1DP3/Bl6iMEwDbmu7Ptoy8ihokng9dEPIwKBgBHdi6WgGO5IiwlAH85m4eseEKkzpXUWICWs3d6SdxS0QxGkbbgnNI6ACyg6sdoj+rXSlmoOY1XOP7yIYYuoqTd542xui0XbhA3YIr9u1XvrwnxB27xtAj3AK2rkAb/ttF2ve/9inznPzGB8p9plidTz6VVuuacSfsVPxwpAkRdBAoGAR7c9Ifd6b1DFGkWSBuEc6RWhG6Si+OPbELYoFRXTqNZoiynGsSV9v2ZTBemTmkVrXGqG3N0bLezr47/9+lW3ZP7ZrubsfWf/3xrZAt/g8V9OgaI2w4SWKfuepsElFzsWeiLroltjmH58Axd3/cjhgpqaZ3DOQjbK/7QZsvJUAlsCgYEAqTQVhKLizM7BvXu1N6Z2K8trfJbiN+f90XhZIRPkIIcom0PnOfXhRtT76MCxz9n+lwf+alOKOfbQFy0pZtWG/eaFSYroQlXL+EfmqlFPXZR6D0NQLeygWAKH8161IQUh2VF3Qkhle6g6ZkyJA3Ev4RmqH2BYGv8hcZTTHsZ3Ic4=" + AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2CqoCp95w/JV3RT/gzF4/8QmVT1HQNaeW7yUp+mA7x9AbjvlTW/+eRn6oGAL/XhZLjvHD0XjKLVKX0MJVS1aUQHEHEbOJN4Eu8II45OavD4iZISa7Kp9V6AM+i4qTyaeV2wNDnGxHQBaLVUGCfMR+56EK2YpORdE1H9uy72SSQseVb3bmpsV9EW/IJNmcVL/ut3uA1JWAoRmzlQ7ekxg7p8AYXzYPEHQr1tl7W+M4zv9wO9GKZCxIqMA8U3RP5npPfRaCfIRGzXzCqFEEUvWuidOB7frsvN4jiPD07qpL2Bi9LM1X/ee2kC/oM8Uhd7ERZhG8MbZfijZKxgrsDKBcwIDAQAB" + AppCertPath: "app/user/cmd/api/etc/merchant/appCertPublicKey_2021004165608254.crt" AlipayCertPath: "app/user/cmd/api/etc/merchant/alipayCertPublicKey_RSA2.crt" AlipayRootCertPath: "app/user/cmd/api/etc/merchant/alipayRootCert.crt" IsProduction: true diff --git a/app/user/cmd/api/etc/main.yaml b/app/user/cmd/api/etc/main.yaml index 51e054d..25d85ea 100644 --- a/app/user/cmd/api/etc/main.yaml +++ b/app/user/cmd/api/etc/main.yaml @@ -1,9 +1,9 @@ Name: main Host: 0.0.0.0 Port: 8888 -DataSource: "tydata:5vg67b3UNHu8@tcp(tydata_mysql:3306)/tydata?charset=utf8mb4&parseTime=True&loc=Local" +DataSource: "qnc:5vg67b3UNHu8@tcp(qnc_mysql:3306)/qnc?charset=utf8mb4&parseTime=True&loc=Local" CacheRedis: - - Host: "tydata_redis:6379" + - Host: "qnc_redis:6379" Pass: "3m3WsgyCKWqz" # Redis 密码，如果未设置则留空 Type: "node" # 单节点模式 @@ -16,7 +16,7 @@ VerifyCode: AccessKeyID: "LTAI5tKGB3TVJbMHSoZN3yr9" AccessKeySecret: "OCQ30GWp4yENMjmfOAaagksE18bp65" EndpointURL: "dysmsapi.aliyuncs.com" - SignName: "天远数据" + SignName: "全能查" TemplateCode: "SMS_302641455" ValidTime: 300 Encrypt: @@ -31,15 +31,15 @@ YushanConfig: AcctID: "YSSJ843926726" Url: "https://api.yushanshuju.com/credit-gw/service" Alipay: - AppID: "2021005113664540" - PrivateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCA1mtTVZmB/7/wWV37Z8hUXEXFs0Gn1/Ie7c6rPQQRUlPHyJGcPAZvDii+ySC1/bplneMENRAjCuoJEM1z4X1FMt8rLggCqnF1xzUN2p9fdXUwcRPmSV4yi9ggMiFXldm0/eyaobV2fj0/VSLED2Qc8xBStM9pqkfszwf2rsAAKL15WQXOUiQw0s25s+Du18H4+YgkQ0HBr0+VPfhL4QoOvsE34ZYP0TuTwxVheYNkvSOPXFXmtE3z/b+75y2n2msa9S4HItNVYpOkB7z3GDB+0/rvX+Q+GvYI9BSBbgJwEuqiMN2SwQyAjH608JBoAUGnk0ygfG8juF77shBxzr/vAgMBAAECggEAQTlL2EJrlm59IxZ7B72Ao4SbJf0b7fba8mF90R7wojxFgcy+OpQAxdQrOHrl/nxXEv6dYRHj+3mZBcHl4RZ0rsWUSW3iTEcxbWjOKRdWu6LhEwcMBfd6oqg9X/9A9fA86O3sDFR1Y2mBZECbexo3mphK2TQEFQBJrU8aPv404V784u0wTh1oLO0Z3NjgvXOAy3ZsM64oZROVCkObXnZGyrY8Hf6W+YLmCoI7eajOQ9QTFy1x24fm8LFdWNizG9/DFa4EC7ZjiYzFhGpfpKb4964QnN3Krlf18Ryhgf3PO6IDO04JOdnHLKhR8+kHIN5m6AMIyKxbZ/vKw4X09Z8XoQKBgQD7jNHzEhIo4IOmRzgdoGxSCLXe1cUbwFL4tU3n7miUCYL/k6wpiNkCGwikaHMiSG0Om2D6+I9gX/rBrTrp2MAmcHA6ymn1GARSYMv7rz+5afGygfBDNr/7xQ2ASCatB65TObH+AUZzdq82B5dpr46AJhilRcHnQEyc/SyIelft2QKBgQCDHeDYt3vTDJ1vIPtXeyO1NHbGQY7cUucx3sZ+QVdF0abstcutT0LrHOgDCWFtnvjia1f0QRPDnTzUtq4GQxj63/9zZr1pMGsd7gjgIvVjM0LqUQXU0TMpO1DuU2zyemRyJTfWDDN+vTvA2+376cW0QxKq2CKOhX45WZRrUBbXBwKBgQCPVFe0ZlGOlQ6uSdpBl0zhGTF3vNpIy7b7G2M+ietwnlLUCXKJX/42YuzzsMgZeqcZMZN6rPIU+dtJS8lLwUMLI/nupbLmAj9EKP9RczOeFC2xhrQ9uA6ACHF+7J2M7dl4dmFi15sq4y9GW+D8SRmrDwnv8eVgPJTqxp7/TKaZUQKBgCMMI4QKV7DsWFDSMh0KL1tKcM1BzNwb1OzBrbEl6hwhlEsFtTHYU/zgtyvIoCBbNA/hvZruokfRiecaBZ5q5Qx6P6ArQEoTxS406G5xKcKgeyyDB9oBKXnF/zYVWrPd/2d7h1dR35nrH0PIBe8mZ9BtdVnxeBs8l6bgyQl+WPyVAoGBAPW7XxyLUAZ4X6JD4b5Iqq4E40xmDO3rUysrH8Zj7MN47ykZI0SlwA9B6hqliRLLJXkzhaAamecWb1RNJFDWfcg4bIyew4ukRbYB07RI+l0DXEgOxxTBcvN6BNUoIiQSEKXkOv+xt7Ez2TBoDm67xD58vwSXT4aPt4qxnd4i7Ves" - AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kkRL7lgKYs7f8Xi4DNKzp2ggjwy4By7RunwT4Ur4A71HVOqRQed9r45a6/W4JPuVv51tiHMojZifEKX7ixSlDG6be677RiNslMJ5G3mjw/+Ku01tV9Qzw5YyhvxbqmS8Qp9vgL8VPYhxqTxKO6WW+xiyVvxko+mrU+dbSFIVbBjp88NVVcquu+vZT/uwtjriKSwsesAm8DkKT6mTqY5P/JroMzTU7xa3/ErAMte6t2dOsxPS7kqWjJyoLBHRk+AH87X5lNBEjLgYPk1ADU7zFsLdC+nv4fm7nihYre7fCrdCTVKguXmPCEFBjqwSkag7BSIxRQjS3qHxi+DUMst7wIDAQAB" - AppCertPath: "etc/merchant/appCertPublicKey_2021005113664540.crt" + AppID: "2021004165608254" + PrivateKey: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCPsXuwFJeHAL8CwI0QdD9GP7xQ8eejIoQKg6J3/peu26su68JCtGSRhlDm/7vbLHJcFR6h7at+INoz2juc7SqlmNO7i9wKc3+Ua0487y1G2fCsneRNxTTqbceBZwqjj9/AAN0u5/4nSl0bcqTeMddofdpTGOvwGvIJh6CZgCglnhMZnH4D6H6yiIyZf7Q6k2d/qBpVGK8kluYEtSnf/vEQCHhxRx+/DgTL7V1LjbA3BYoPTELZ15JAj0uIzuxextAtxOm4+Huli0RJFAN3q/to2L1Zs8yYY1gKJyTaPWKsJWBx8zI+gZcC/e45k6CZnGgh1Fn3+Xqkf7eGxJGGHs1fAgMBAAECggEAM2rkApbrvdBDiV2TXK7sMVv/K8vUAmkIbKa7zUpZxqUuNSUBp1LbpcM1UeNyujPGXDLmejUMp55j1igiKr4nA4iTQ0oBm+/GWDqpjV5cijzURUBegIGvtK9Bs4lGok6KVy839l/nbvHKLVcxrZySIv7dz9xcGNfbghN5IVRdiU/kOokNbtwQNC837piG5q4PHL6bzwIUGbrLED/RDmw/IwVMMmZovcQQ2JAuWJBo9CS9LB0Nc3I4MOPNx/0Rl+5URSSfmJAriL5ihlWckocQCUHwhRpSGQ6Q4xAXFYvb8OsApAQG3WU9SciBfs2wg/QfGNFzwQgGFofPcTQg3DTeuQKBgQDUHBTsgoe3WXnGo6qZKw1zA4OtF67IJJoltHo5JtkBRKCNVU3BJ+q+6i/fn0MBwScKQ1mhPjWe3h+qTRT207RRxGaxb6ljATOiU+BxmpHvu6jP+DVYtP5F3M7MCAGqpDAEoXgoAWttxmijqk+5YuLOLe0j/btCmpzuH7zwxSnqlQKBgQCtbTvaS/g+Jeu4Ml6iv7xi5//JCjeTn2wUJpXnNmN0jn+riRwEO81z4GWuOI8WukZHHAnufI6qWk2sLH0gcdLQ/STsMnl2L3NbeUyO8o5w2JSAlnZDYfaFfasGqFkGJrBLqG6bh/Bk1DP3/Bl6iMEwDbmu7Ptoy8ihokng9dEPIwKBgBHdi6WgGO5IiwlAH85m4eseEKkzpXUWICWs3d6SdxS0QxGkbbgnNI6ACyg6sdoj+rXSlmoOY1XOP7yIYYuoqTd542xui0XbhA3YIr9u1XvrwnxB27xtAj3AK2rkAb/ttF2ve/9inznPzGB8p9plidTz6VVuuacSfsVPxwpAkRdBAoGAR7c9Ifd6b1DFGkWSBuEc6RWhG6Si+OPbELYoFRXTqNZoiynGsSV9v2ZTBemTmkVrXGqG3N0bLezr47/9+lW3ZP7ZrubsfWf/3xrZAt/g8V9OgaI2w4SWKfuepsElFzsWeiLroltjmH58Axd3/cjhgpqaZ3DOQjbK/7QZsvJUAlsCgYEAqTQVhKLizM7BvXu1N6Z2K8trfJbiN+f90XhZIRPkIIcom0PnOfXhRtT76MCxz9n+lwf+alOKOfbQFy0pZtWG/eaFSYroQlXL+EfmqlFPXZR6D0NQLeygWAKH8161IQUh2VF3Qkhle6g6ZkyJA3Ev4RmqH2BYGv8hcZTTHsZ3Ic4=" + AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2CqoCp95w/JV3RT/gzF4/8QmVT1HQNaeW7yUp+mA7x9AbjvlTW/+eRn6oGAL/XhZLjvHD0XjKLVKX0MJVS1aUQHEHEbOJN4Eu8II45OavD4iZISa7Kp9V6AM+i4qTyaeV2wNDnGxHQBaLVUGCfMR+56EK2YpORdE1H9uy72SSQseVb3bmpsV9EW/IJNmcVL/ut3uA1JWAoRmzlQ7ekxg7p8AYXzYPEHQr1tl7W+M4zv9wO9GKZCxIqMA8U3RP5npPfRaCfIRGzXzCqFEEUvWuidOB7frsvN4jiPD07qpL2Bi9LM1X/ee2kC/oM8Uhd7ERZhG8MbZfijZKxgrsDKBcwIDAQAB" + AppCertPath: "etc/merchant/appCertPublicKey_2021004165608254.crt" AlipayCertPath: "etc/merchant/alipayCertPublicKey_RSA2.crt" AlipayRootCertPath: "etc/merchant/alipayRootCert.crt" IsProduction: true - NotifyUrl: "https://www.tianyuandb.com/api/v1/pay/alipay/callback" - ReturnURL: "https://www.tianyuandb.com/report" + NotifyUrl: "https://www.quannengcha.com/api/v1/pay/alipay/callback" + ReturnURL: "https://www.quannengcha.com/report" Wxpay: AppID: "wxa581992dc74d860e" MchID: "1704330055" @@ -48,8 +48,8 @@ Wxpay: MchCertificateSerialNumber: "434FE8C0FC8CFEF28B76B3EF35DD2297E977A3CB" MchApiv3Key: "h6Jk9Qm7W1pXyFzA4bL2V8CzH0K3wDqw" MchPrivateKeyPath: "etc/merchant/apiclient_key.pem" - NotifyUrl: "https://www.tianyuandb.com/api/v1/pay/wechat/callback" - RefundNotifyUrl: "https://www.tianyuandb.com/api/v1/wechat/refund_callback" + NotifyUrl: "https://www.quannengcha.com/api/v1/pay/wechat/callback" + RefundNotifyUrl: "https://www.quannengcha.com/api/v1/wechat/refund_callback" Applepay: ProductionVerifyURL: "https://api.storekit.itunes.apple.com/inApps/v1/transactions/receipt" SandboxVerifyURL: "https://api.storekit-sandbox.itunes.apple.com/inApps/v1/transactions/receipt" diff --git a/app/user/cmd/api/etc/merchant/alipayCertPublicKey_RSA2.crt b/app/user/cmd/api/etc/merchant/alipayCertPublicKey_RSA2.crt index 5846438..a1de812 100644 --- a/app/user/cmd/api/etc/merchant/alipayCertPublicKey_RSA2.crt +++ b/app/user/cmd/api/etc/merchant/alipayCertPublicKey_RSA2.crt @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDtTCCAp2gAwIBAgIQICUDBjgAYvSDOiVZlr/A9zANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +MIIDuDCCAqCgAwIBAgIQICQIJEqhy5G63s3j7VrljTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs -YXNzIDIgUjEwHhcNMjUwMzA2MTE1ODQ2WhcNMzAwMzA1MTE1ODQ2WjCBlTELMAkGA1UEBhMCQ04x -MDAuBgNVBAoMJ+a1t+WNl+Wkqei/nOWkp+aVsOaNruenkeaKgOaciemZkOWFrOWPuDEPMA0GA1UE -CwwGQWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZkOWF -rOWPuC0yMDg4MDUxMDMyOTk4NDkyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kkR -L7lgKYs7f8Xi4DNKzp2ggjwy4By7RunwT4Ur4A71HVOqRQed9r45a6/W4JPuVv51tiHMojZifEKX -7ixSlDG6be677RiNslMJ5G3mjw/+Ku01tV9Qzw5YyhvxbqmS8Qp9vgL8VPYhxqTxKO6WW+xiyVvx -ko+mrU+dbSFIVbBjp88NVVcquu+vZT/uwtjriKSwsesAm8DkKT6mTqY5P/JroMzTU7xa3/ErAMte -6t2dOsxPS7kqWjJyoLBHRk+AH87X5lNBEjLgYPk1ADU7zFsLdC+nv4fm7nihYre7fCrdCTVKguXm -PCEFBjqwSkag7BSIxRQjS3qHxi+DUMst7wIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJKoZI -hvcNAQELBQADggEBAIrXa4HfvKtjIb+F5YRi1GuhdPn20tkyQaw8GB/xZ30kpe1NyQdr2D3JPSIi -wd+MBGEhAF2HrD+UT9AnqsHQOwFrWJUNFArw1joMkMJQtnpD9nH1po1l0ECR5KF0gzsDroXOFXsW -QVicHhbZ4J54LswgedEKURETP74o/NdTD24IzXt+rjQe1Nsu7mgkj+VqmXVtqjOIS5IllRo3TD30 -h031HCg+OLGpGmJylYiD5C5Y+7YkPzJC0pzsvqLvT1yGNForSlujPB/s7rCBq4ZEX08/u2fbfMpd -PuZJgZdRmF7Xr5LV7JeeYrTzOKmzSEByXIFM0NsEdggpSD8eyqclQd4= +YXNzIDIgUjEwHhcNMjQwODI0MTMzMDA3WhcNMjkwODIzMTMzMDA3WjCBmDELMAkGA1UEBhMCQ04x +MzAxBgNVBAoMKua1t+WNl+ecgeWtpuWuh+aAnee9kee7nOenkeaKgOaciemZkOWFrOWPuDEPMA0G +A1UECwwGQWxpcGF5MUMwQQYDVQQDDDrmlK/ku5jlrp0o5Lit5Zu9Kee9kee7nOaKgOacr+aciemZ +kOWFrOWPuC0yMDg4ODQxODczNDU0MDUzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +2CqoCp95w/JV3RT/gzF4/8QmVT1HQNaeW7yUp+mA7x9AbjvlTW/+eRn6oGAL/XhZLjvHD0XjKLVK +X0MJVS1aUQHEHEbOJN4Eu8II45OavD4iZISa7Kp9V6AM+i4qTyaeV2wNDnGxHQBaLVUGCfMR+56E +K2YpORdE1H9uy72SSQseVb3bmpsV9EW/IJNmcVL/ut3uA1JWAoRmzlQ7ekxg7p8AYXzYPEHQr1tl +7W+M4zv9wO9GKZCxIqMA8U3RP5npPfRaCfIRGzXzCqFEEUvWuidOB7frsvN4jiPD07qpL2Bi9LM1 +X/ee2kC/oM8Uhd7ERZhG8MbZfijZKxgrsDKBcwIDAQABoxIwEDAOBgNVHQ8BAf8EBAMCA/gwDQYJ +KoZIhvcNAQELBQADggEBADsqTEJB7QQc+zFteTgZ608BnTvVlZlPHK+5pLFSG9N1XK3LCv2wj1Tc +FfDo6VXq5YhLmIIp8LlyUWTn5Gwd+/3Rbv50p52CvzsdeqZ9kSJAqFyO4iWmAPUB4f63yLH81q+1 +eyUjc4GkUmZ3EZmB2+vyG2iRHvyG27TYbWrGPWz4AaPECU5jn3rIPDVvR6C9JXjODiiuU5PCVJ9j +pCmGgmllTYAHSvhkOF8zM+qt1Fz0iEtB2ZPMzKexBD4uz8ULkwp+x3QvuLD/ebBbMr2R3BJMCD+3 +2dx0wQJ0OhXuXGOXbuwyAo17LmRKheucoadlT+7Ilr+i5JrAwApBLQSQI6w= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIE4jCCAsqgAwIBAgIIYsSr5bKAMl8wDQYJKoZIhvcNAQELBQAwejELMAkGA1UEBhMCQ04xFjAU diff --git a/app/user/cmd/api/etc/merchant/appCertPublicKey_2021004165608254.crt b/app/user/cmd/api/etc/merchant/appCertPublicKey_2021004165608254.crt new file mode 100644 index 0000000..55f1aaa --- /dev/null +++ b/app/user/cmd/api/etc/merchant/appCertPublicKey_2021004165608254.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIEpzCCA4+gAwIBAgIQICUEEJni7ld+YaII5tXCjTANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE +BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs +YXNzIDEgUjEwHhcNMjUwNDEwMDQwNTQyWhcNMzAwNDA5MDQwNTQyWjBuMQswCQYDVQQGEwJDTjEz +MDEGA1UECgwq5rW35Y2X55yB5a2m5a6H5oCd572R57uc56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYD +VQQLDAZBbGlwYXkxGTAXBgNVBAMMEDIwODg4NDE4NzM0NTQwNTMwggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQCPsXuwFJeHAL8CwI0QdD9GP7xQ8eejIoQKg6J3/peu26su68JCtGSRhlDm +/7vbLHJcFR6h7at+INoz2juc7SqlmNO7i9wKc3+Ua0487y1G2fCsneRNxTTqbceBZwqjj9/AAN0u +5/4nSl0bcqTeMddofdpTGOvwGvIJh6CZgCglnhMZnH4D6H6yiIyZf7Q6k2d/qBpVGK8kluYEtSnf +/vEQCHhxRx+/DgTL7V1LjbA3BYoPTELZ15JAj0uIzuxextAtxOm4+Huli0RJFAN3q/to2L1Zs8yY +Y1gKJyTaPWKsJWBx8zI+gZcC/e45k6CZnGgh1Fn3+Xqkf7eGxJGGHs1fAgMBAAGjggEqMIIBJjAf +BgNVHSMEGDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQUb4Kgf8qXsgDnWyG5deLm +Rw1DhPowQAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlw +YXkuY29tL2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMDAGA1UdHwQpMCcwJaAjoCGGH2h0dHA6Ly9j +YS5hbGlwYXkuY29tL2NybDEwMC5jcmwwYAYIKwYBBQUHAQEEVDBSMCgGCCsGAQUFBzAChhxodHRw +Oi8vY2EuYWxpcGF5LmNvbS9jYTYuY2VyMCYGCCsGAQUFBzABhhpodHRwOi8vY2EuYWxpcGF5LmNv +bTo4MzQwLzANBgkqhkiG9w0BAQsFAAOCAQEAYFgnBMeYL/+DjWpimqTtlGnlDsjPUDOjpZopzSa+ +HdL4nxWZBW48K+EzN8x45Ua7b1VKNmHWXe1O3X6W2Cz2H53NslVglzipPnxg9REx3Acr+8spkxWe +oxX9+1xwbSzBnpwG4UayambP0I6L2V9YQxSiLlLr6t2VuDxwCHVLu83rvnrOdlKjyjZop6oufhC9 +29BqfVmR6xuZv/VsCRx+BuRqNtHDoOZuP26kRVaHdnZMPPyTVw++cBt5Xh0Pq6vrYr1Nr9Kkp7wy +8RW951YTarYY5rDQ8RdaEFxPc+QWKQujVFQCvvt3ktTzrVa1mCgW/vX5qI0hXdPGGbq0DH3dxg== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/app/user/cmd/api/etc/merchant/appCertPublicKey_2021005113664540.crt b/app/user/cmd/api/etc/merchant/appCertPublicKey_2021005113664540.crt deleted file mode 100644 index 405a9bc..0000000 --- a/app/user/cmd/api/etc/merchant/appCertPublicKey_2021005113664540.crt +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEozCCA4ugAwIBAgIQICUDBmfevHFjK0cMiK6zxDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE -BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0 -aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs -YXNzIDEgUjEwHhcNMjUwMzA2MTE1ODQ1WhcNMzAwMzA1MTE1ODQ1WjBrMQswCQYDVQQGEwJDTjEw -MC4GA1UECgwn5rW35Y2X5aSp6L+c5aSn5pWw5o2u56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQL -DAZBbGlwYXkxGTAXBgNVBAMMEDIwODgwNTEwMzI5OTg0OTIwggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQCA1mtTVZmB/7/wWV37Z8hUXEXFs0Gn1/Ie7c6rPQQRUlPHyJGcPAZvDii+ySC1 -/bplneMENRAjCuoJEM1z4X1FMt8rLggCqnF1xzUN2p9fdXUwcRPmSV4yi9ggMiFXldm0/eyaobV2 -fj0/VSLED2Qc8xBStM9pqkfszwf2rsAAKL15WQXOUiQw0s25s+Du18H4+YgkQ0HBr0+VPfhL4QoO -vsE34ZYP0TuTwxVheYNkvSOPXFXmtE3z/b+75y2n2msa9S4HItNVYpOkB7z3GDB+0/rvX+Q+GvYI -9BSBbgJwEuqiMN2SwQyAjH608JBoAUGnk0ygfG8juF77shBxzr/vAgMBAAGjggEpMIIBJTAfBgNV -HSMEGDAWgBRxB+IEYRbk5fJl6zEPyeD0PJrVkTAdBgNVHQ4EFgQU8Izqtjr8qvIpRYglmzELt22E -b7MwQAYDVR0gBDkwNzA1BgdggRwBbgEBMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9jYS5hbGlwYXku -Y29tL2Nwcy5wZGYwDgYDVR0PAQH/BAQDAgbAMC8GA1UdHwQoMCYwJKAioCCGHmh0dHA6Ly9jYS5h -bGlwYXkuY29tL2NybDk5LmNybDBgBggrBgEFBQcBAQRUMFIwKAYIKwYBBQUHMAKGHGh0dHA6Ly9j -YS5hbGlwYXkuY29tL2NhNi5jZXIwJgYIKwYBBQUHMAGGGmh0dHA6Ly9jYS5hbGlwYXkuY29tOjgz -NDAvMA0GCSqGSIb3DQEBCwUAA4IBAQC5j9d26HpXXf/eC40ejQ8E/r5PwN87129jfdDpCQGVJopL -ZyrJzxAHoPW+pG5lbDGmlDC9g8CRgeVcpNNkKDshyDAjlAoKbedTSaI8Bacly6fKPlCwAipepiy3 -fBTovcQYgPNl4aw3spi/0ZsnoTJ3Ye8n7KD4j3j3iBwptXdWFDVSQCJFSdC5tSMQSnm6WUgW3Duw -UalPi2I5CjxCZK35Pbk0GFP5dJwtz4h3YGkLX20TP18HZi0hVrxOErH5U2mP+dlq72DclJEZZZj0 -PPMyOLUqmcQRWMmaVmGhDKpkcx81jSowFKuPlSQfU0dCXZGdqpnXVnAYlLMuMAILQqE+ ------END CERTIFICATE----- \ No newline at end of file diff --git a/app/user/cmd/api/internal/handler/agent/activateagentmembershiphandler.go b/app/user/cmd/api/internal/handler/agent/activateagentmembershiphandler.go index 639d90c..bebf377 100644 --- a/app/user/cmd/api/internal/handler/agent/activateagentmembershiphandler.go +++ b/app/user/cmd/api/internal/handler/agent/activateagentmembershiphandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func ActivateAgentMembershipHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/agentwithdrawalhandler.go b/app/user/cmd/api/internal/handler/agent/agentwithdrawalhandler.go index 7434ee0..7b73d59 100644 --- a/app/user/cmd/api/internal/handler/agent/agentwithdrawalhandler.go +++ b/app/user/cmd/api/internal/handler/agent/agentwithdrawalhandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func AgentWithdrawalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/applyforagenthandler.go b/app/user/cmd/api/internal/handler/agent/applyforagenthandler.go index 42cad30..ffdf2bb 100644 --- a/app/user/cmd/api/internal/handler/agent/applyforagenthandler.go +++ b/app/user/cmd/api/internal/handler/agent/applyforagenthandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func ApplyForAgentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/generatinglinkhandler.go b/app/user/cmd/api/internal/handler/agent/generatinglinkhandler.go index 76333dc..0cdc6e4 100644 --- a/app/user/cmd/api/internal/handler/agent/generatinglinkhandler.go +++ b/app/user/cmd/api/internal/handler/agent/generatinglinkhandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GeneratingLinkHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getagentauditstatushandler.go b/app/user/cmd/api/internal/handler/agent/getagentauditstatushandler.go index 0435a34..6ea7690 100644 --- a/app/user/cmd/api/internal/handler/agent/getagentauditstatushandler.go +++ b/app/user/cmd/api/internal/handler/agent/getagentauditstatushandler.go @@ -3,9 +3,9 @@ package agent import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func GetAgentAuditStatusHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getagentcommissionhandler.go b/app/user/cmd/api/internal/handler/agent/getagentcommissionhandler.go index f602904..dcad1b7 100644 --- a/app/user/cmd/api/internal/handler/agent/getagentcommissionhandler.go +++ b/app/user/cmd/api/internal/handler/agent/getagentcommissionhandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetAgentCommissionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getagentinfohandler.go b/app/user/cmd/api/internal/handler/agent/getagentinfohandler.go index 157d16b..2897fb3 100644 --- a/app/user/cmd/api/internal/handler/agent/getagentinfohandler.go +++ b/app/user/cmd/api/internal/handler/agent/getagentinfohandler.go @@ -3,9 +3,9 @@ package agent import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func GetAgentInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getagentmembershipproductconfighandler.go b/app/user/cmd/api/internal/handler/agent/getagentmembershipproductconfighandler.go index 7a5f3b3..e531b79 100644 --- a/app/user/cmd/api/internal/handler/agent/getagentmembershipproductconfighandler.go +++ b/app/user/cmd/api/internal/handler/agent/getagentmembershipproductconfighandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetAgentMembershipProductConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getagentproductconfighandler.go b/app/user/cmd/api/internal/handler/agent/getagentproductconfighandler.go index af0a0f1..70c5572 100644 --- a/app/user/cmd/api/internal/handler/agent/getagentproductconfighandler.go +++ b/app/user/cmd/api/internal/handler/agent/getagentproductconfighandler.go @@ -3,9 +3,9 @@ package agent import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func GetAgentProductConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getagentrevenueinfohandler.go b/app/user/cmd/api/internal/handler/agent/getagentrevenueinfohandler.go index b0a7d21..a2dc1b0 100644 --- a/app/user/cmd/api/internal/handler/agent/getagentrevenueinfohandler.go +++ b/app/user/cmd/api/internal/handler/agent/getagentrevenueinfohandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetAgentRevenueInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getagentrewardshandler.go b/app/user/cmd/api/internal/handler/agent/getagentrewardshandler.go index d62fafd..6ef64b0 100644 --- a/app/user/cmd/api/internal/handler/agent/getagentrewardshandler.go +++ b/app/user/cmd/api/internal/handler/agent/getagentrewardshandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetAgentRewardsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getagentwithdrawalhandler.go b/app/user/cmd/api/internal/handler/agent/getagentwithdrawalhandler.go index a8ac5c1..1271466 100644 --- a/app/user/cmd/api/internal/handler/agent/getagentwithdrawalhandler.go +++ b/app/user/cmd/api/internal/handler/agent/getagentwithdrawalhandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetAgentWithdrawalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/getlinkdatahandler.go b/app/user/cmd/api/internal/handler/agent/getlinkdatahandler.go index e31e5cc..93c78da 100644 --- a/app/user/cmd/api/internal/handler/agent/getlinkdatahandler.go +++ b/app/user/cmd/api/internal/handler/agent/getlinkdatahandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetLinkDataHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/agent/saveagentmembershipuserconfighandler.go b/app/user/cmd/api/internal/handler/agent/saveagentmembershipuserconfighandler.go index 6de0168..c997dbf 100644 --- a/app/user/cmd/api/internal/handler/agent/saveagentmembershipuserconfighandler.go +++ b/app/user/cmd/api/internal/handler/agent/saveagentmembershipuserconfighandler.go @@ -3,12 +3,13 @@ package agent import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/agent" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/agent" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func SaveAgentMembershipUserConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/app/getappversionhandler.go b/app/user/cmd/api/internal/handler/app/getappversionhandler.go index 18dd185..cdcce8e 100644 --- a/app/user/cmd/api/internal/handler/app/getappversionhandler.go +++ b/app/user/cmd/api/internal/handler/app/getappversionhandler.go @@ -3,9 +3,9 @@ package app import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/app" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/app" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func GetAppVersionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/app/healthcheckhandler.go b/app/user/cmd/api/internal/handler/app/healthcheckhandler.go index b8902dc..a76abd3 100644 --- a/app/user/cmd/api/internal/handler/app/healthcheckhandler.go +++ b/app/user/cmd/api/internal/handler/app/healthcheckhandler.go @@ -3,9 +3,9 @@ package app import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/app" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/app" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func HealthCheckHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/auth/sendsmshandler.go b/app/user/cmd/api/internal/handler/auth/sendsmshandler.go index ea17795..4d0a519 100644 --- a/app/user/cmd/api/internal/handler/auth/sendsmshandler.go +++ b/app/user/cmd/api/internal/handler/auth/sendsmshandler.go @@ -3,12 +3,13 @@ package auth import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/auth" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/auth" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func SendSmsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/notification/getnotificationshandler.go b/app/user/cmd/api/internal/handler/notification/getnotificationshandler.go index c87d12a..6dc313f 100644 --- a/app/user/cmd/api/internal/handler/notification/getnotificationshandler.go +++ b/app/user/cmd/api/internal/handler/notification/getnotificationshandler.go @@ -3,9 +3,9 @@ package notification import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/notification" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/notification" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func GetNotificationsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/pay/alipaycallbackhandler.go b/app/user/cmd/api/internal/handler/pay/alipaycallbackhandler.go index 3c66039..6ddda20 100644 --- a/app/user/cmd/api/internal/handler/pay/alipaycallbackhandler.go +++ b/app/user/cmd/api/internal/handler/pay/alipaycallbackhandler.go @@ -3,9 +3,9 @@ package pay import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/pay" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/pay" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func AlipayCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/pay/iapcallbackhandler.go b/app/user/cmd/api/internal/handler/pay/iapcallbackhandler.go index 448acce..2aa4c1d 100644 --- a/app/user/cmd/api/internal/handler/pay/iapcallbackhandler.go +++ b/app/user/cmd/api/internal/handler/pay/iapcallbackhandler.go @@ -3,12 +3,13 @@ package pay import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/pay" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/pay" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func IapCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/pay/paymenthandler.go b/app/user/cmd/api/internal/handler/pay/paymenthandler.go index 9ef8b6a..4312ac9 100644 --- a/app/user/cmd/api/internal/handler/pay/paymenthandler.go +++ b/app/user/cmd/api/internal/handler/pay/paymenthandler.go @@ -3,12 +3,13 @@ package pay import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/pay" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/pay" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func PaymentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/pay/wechatpaycallbackhandler.go b/app/user/cmd/api/internal/handler/pay/wechatpaycallbackhandler.go index ba70209..68397d0 100644 --- a/app/user/cmd/api/internal/handler/pay/wechatpaycallbackhandler.go +++ b/app/user/cmd/api/internal/handler/pay/wechatpaycallbackhandler.go @@ -3,9 +3,9 @@ package pay import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/pay" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/pay" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func WechatPayCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/pay/wechatpayrefundcallbackhandler.go b/app/user/cmd/api/internal/handler/pay/wechatpayrefundcallbackhandler.go index 892c37e..b9bfa0a 100644 --- a/app/user/cmd/api/internal/handler/pay/wechatpayrefundcallbackhandler.go +++ b/app/user/cmd/api/internal/handler/pay/wechatpayrefundcallbackhandler.go @@ -3,9 +3,9 @@ package pay import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/pay" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/pay" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func WechatPayRefundCallbackHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/product/getproductappbyenhandler.go b/app/user/cmd/api/internal/handler/product/getproductappbyenhandler.go index f313714..fef21c1 100644 --- a/app/user/cmd/api/internal/handler/product/getproductappbyenhandler.go +++ b/app/user/cmd/api/internal/handler/product/getproductappbyenhandler.go @@ -3,12 +3,13 @@ package product import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/product" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/product" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetProductAppByEnHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/product/getproductbyenhandler.go b/app/user/cmd/api/internal/handler/product/getproductbyenhandler.go index 0209101..5c5bc2f 100644 --- a/app/user/cmd/api/internal/handler/product/getproductbyenhandler.go +++ b/app/user/cmd/api/internal/handler/product/getproductbyenhandler.go @@ -3,12 +3,13 @@ package product import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/product" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/product" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetProductByEnHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/product/getproductbyidhandler.go b/app/user/cmd/api/internal/handler/product/getproductbyidhandler.go index 19de298..b4aa9a7 100644 --- a/app/user/cmd/api/internal/handler/product/getproductbyidhandler.go +++ b/app/user/cmd/api/internal/handler/product/getproductbyidhandler.go @@ -3,12 +3,13 @@ package product import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/product" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/product" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func GetProductByIDHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/querydetailbyorderidhandler.go b/app/user/cmd/api/internal/handler/query/querydetailbyorderidhandler.go index 5ef4242..d64e13e 100644 --- a/app/user/cmd/api/internal/handler/query/querydetailbyorderidhandler.go +++ b/app/user/cmd/api/internal/handler/query/querydetailbyorderidhandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryDetailByOrderIdHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/querydetailbyordernohandler.go b/app/user/cmd/api/internal/handler/query/querydetailbyordernohandler.go index c6b921b..9c19172 100644 --- a/app/user/cmd/api/internal/handler/query/querydetailbyordernohandler.go +++ b/app/user/cmd/api/internal/handler/query/querydetailbyordernohandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryDetailByOrderNoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/querydetailhandler.go b/app/user/cmd/api/internal/handler/query/querydetailhandler.go index bdcf5cf..7539dce 100644 --- a/app/user/cmd/api/internal/handler/query/querydetailhandler.go +++ b/app/user/cmd/api/internal/handler/query/querydetailhandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryDetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/queryexamplehandler.go b/app/user/cmd/api/internal/handler/query/queryexamplehandler.go index 5ac658b..672a1fc 100644 --- a/app/user/cmd/api/internal/handler/query/queryexamplehandler.go +++ b/app/user/cmd/api/internal/handler/query/queryexamplehandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryExampleHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/querylisthandler.go b/app/user/cmd/api/internal/handler/query/querylisthandler.go index e472f5e..5698fe7 100644 --- a/app/user/cmd/api/internal/handler/query/querylisthandler.go +++ b/app/user/cmd/api/internal/handler/query/querylisthandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/queryprovisionalorderhandler.go b/app/user/cmd/api/internal/handler/query/queryprovisionalorderhandler.go index b3bc5a6..5059053 100644 --- a/app/user/cmd/api/internal/handler/query/queryprovisionalorderhandler.go +++ b/app/user/cmd/api/internal/handler/query/queryprovisionalorderhandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryProvisionalOrderHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/queryretryhandler.go b/app/user/cmd/api/internal/handler/query/queryretryhandler.go index 189f263..daafa74 100644 --- a/app/user/cmd/api/internal/handler/query/queryretryhandler.go +++ b/app/user/cmd/api/internal/handler/query/queryretryhandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryRetryHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/queryserviceagenthandler.go b/app/user/cmd/api/internal/handler/query/queryserviceagenthandler.go index e817712..b4322a1 100644 --- a/app/user/cmd/api/internal/handler/query/queryserviceagenthandler.go +++ b/app/user/cmd/api/internal/handler/query/queryserviceagenthandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryServiceAgentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/queryserviceapphandler.go b/app/user/cmd/api/internal/handler/query/queryserviceapphandler.go index 1dce604..cbac130 100644 --- a/app/user/cmd/api/internal/handler/query/queryserviceapphandler.go +++ b/app/user/cmd/api/internal/handler/query/queryserviceapphandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QueryServiceAppHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/queryservicehandler.go b/app/user/cmd/api/internal/handler/query/queryservicehandler.go index a51706b..5dcb204 100644 --- a/app/user/cmd/api/internal/handler/query/queryservicehandler.go +++ b/app/user/cmd/api/internal/handler/query/queryservicehandler.go @@ -3,11 +3,12 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" ) func QueryServiceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/querysingletesthandler.go b/app/user/cmd/api/internal/handler/query/querysingletesthandler.go index 5c52db0..05be329 100644 --- a/app/user/cmd/api/internal/handler/query/querysingletesthandler.go +++ b/app/user/cmd/api/internal/handler/query/querysingletesthandler.go @@ -3,12 +3,13 @@ package query import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func QuerySingleTestHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/query/updatequerydatahandler.go b/app/user/cmd/api/internal/handler/query/updatequerydatahandler.go index 457e4a2..320f45b 100644 --- a/app/user/cmd/api/internal/handler/query/updatequerydatahandler.go +++ b/app/user/cmd/api/internal/handler/query/updatequerydatahandler.go @@ -3,11 +3,11 @@ package query import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/query" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" + "qnc-server/app/user/cmd/api/internal/logic/query" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" "github.com/zeromicro/go-zero/rest/httpx" ) diff --git a/app/user/cmd/api/internal/handler/routes.go b/app/user/cmd/api/internal/handler/routes.go index d4ec417..a282967 100644 --- a/app/user/cmd/api/internal/handler/routes.go +++ b/app/user/cmd/api/internal/handler/routes.go @@ -6,15 +6,15 @@ package handler import ( "net/http" - agent "tydata-server/app/user/cmd/api/internal/handler/agent" - app "tydata-server/app/user/cmd/api/internal/handler/app" - auth "tydata-server/app/user/cmd/api/internal/handler/auth" - notification "tydata-server/app/user/cmd/api/internal/handler/notification" - pay "tydata-server/app/user/cmd/api/internal/handler/pay" - product "tydata-server/app/user/cmd/api/internal/handler/product" - query "tydata-server/app/user/cmd/api/internal/handler/query" - user "tydata-server/app/user/cmd/api/internal/handler/user" - "tydata-server/app/user/cmd/api/internal/svc" + agent "qnc-server/app/user/cmd/api/internal/handler/agent" + app "qnc-server/app/user/cmd/api/internal/handler/app" + auth "qnc-server/app/user/cmd/api/internal/handler/auth" + notification "qnc-server/app/user/cmd/api/internal/handler/notification" + pay "qnc-server/app/user/cmd/api/internal/handler/pay" + product "qnc-server/app/user/cmd/api/internal/handler/product" + query "qnc-server/app/user/cmd/api/internal/handler/query" + user "qnc-server/app/user/cmd/api/internal/handler/user" + "qnc-server/app/user/cmd/api/internal/svc" "github.com/zeromicro/go-zero/rest" ) diff --git a/app/user/cmd/api/internal/handler/user/agentmobilecodeloginhandler.go b/app/user/cmd/api/internal/handler/user/agentmobilecodeloginhandler.go index 0b57630..1eaac81 100644 --- a/app/user/cmd/api/internal/handler/user/agentmobilecodeloginhandler.go +++ b/app/user/cmd/api/internal/handler/user/agentmobilecodeloginhandler.go @@ -3,12 +3,13 @@ package user import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func AgentMobileCodeLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/user/cancelouthandler.go b/app/user/cmd/api/internal/handler/user/cancelouthandler.go index 863e584..41008d5 100644 --- a/app/user/cmd/api/internal/handler/user/cancelouthandler.go +++ b/app/user/cmd/api/internal/handler/user/cancelouthandler.go @@ -3,9 +3,9 @@ package user import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func CancelOutHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/user/detailhandler.go b/app/user/cmd/api/internal/handler/user/detailhandler.go index b344bc1..109adc1 100644 --- a/app/user/cmd/api/internal/handler/user/detailhandler.go +++ b/app/user/cmd/api/internal/handler/user/detailhandler.go @@ -3,9 +3,9 @@ package user import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func DetailHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/user/gettokenhandler.go b/app/user/cmd/api/internal/handler/user/gettokenhandler.go index b8bf7d6..dce90e1 100644 --- a/app/user/cmd/api/internal/handler/user/gettokenhandler.go +++ b/app/user/cmd/api/internal/handler/user/gettokenhandler.go @@ -3,9 +3,9 @@ package user import ( "net/http" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/common/result" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/common/result" ) func GetTokenHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/user/mobilecodeloginhandler.go b/app/user/cmd/api/internal/handler/user/mobilecodeloginhandler.go index c2e8e27..15db414 100644 --- a/app/user/cmd/api/internal/handler/user/mobilecodeloginhandler.go +++ b/app/user/cmd/api/internal/handler/user/mobilecodeloginhandler.go @@ -3,12 +3,13 @@ package user import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func MobileCodeLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/user/mobileloginhandler.go b/app/user/cmd/api/internal/handler/user/mobileloginhandler.go index 86c007d..60b3084 100644 --- a/app/user/cmd/api/internal/handler/user/mobileloginhandler.go +++ b/app/user/cmd/api/internal/handler/user/mobileloginhandler.go @@ -3,12 +3,13 @@ package user import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func MobileLoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/user/registerhandler.go b/app/user/cmd/api/internal/handler/user/registerhandler.go index 6970734..31d7f9f 100644 --- a/app/user/cmd/api/internal/handler/user/registerhandler.go +++ b/app/user/cmd/api/internal/handler/user/registerhandler.go @@ -3,12 +3,13 @@ package user import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func RegisterHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/user/wxh5authhandler.go b/app/user/cmd/api/internal/handler/user/wxh5authhandler.go index a830f6e..0e17e7b 100644 --- a/app/user/cmd/api/internal/handler/user/wxh5authhandler.go +++ b/app/user/cmd/api/internal/handler/user/wxh5authhandler.go @@ -3,12 +3,13 @@ package user import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func WxH5AuthHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/handler/user/wxminiauthhandler.go b/app/user/cmd/api/internal/handler/user/wxminiauthhandler.go index 0d1c3d6..a0dc537 100644 --- a/app/user/cmd/api/internal/handler/user/wxminiauthhandler.go +++ b/app/user/cmd/api/internal/handler/user/wxminiauthhandler.go @@ -3,12 +3,13 @@ package user import ( "net/http" + "qnc-server/app/user/cmd/api/internal/logic/user" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" + "github.com/zeromicro/go-zero/rest/httpx" - "tydata-server/app/user/cmd/api/internal/logic/user" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" ) func WxMiniAuthHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { diff --git a/app/user/cmd/api/internal/logic/agent/activateagentmembershiplogic.go b/app/user/cmd/api/internal/logic/agent/activateagentmembershiplogic.go index 8fa215e..f366ebf 100644 --- a/app/user/cmd/api/internal/logic/agent/activateagentmembershiplogic.go +++ b/app/user/cmd/api/internal/logic/agent/activateagentmembershiplogic.go @@ -3,16 +3,16 @@ package agent import ( "context" "database/sql" + "qnc-server/app/user/model" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" "time" - "tydata-server/app/user/model" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/sqlx" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/agentwithdrawallogic.go b/app/user/cmd/api/internal/logic/agent/agentwithdrawallogic.go index d867e1e..7ea3a7e 100644 --- a/app/user/cmd/api/internal/logic/agent/agentwithdrawallogic.go +++ b/app/user/cmd/api/internal/logic/agent/agentwithdrawallogic.go @@ -3,18 +3,19 @@ package agent import ( "context" "fmt" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/lzUtils" + "time" + "github.com/cenkalti/backoff/v4" "github.com/pkg/errors" "github.com/smartwalle/alipay/v3" "github.com/zeromicro/go-zero/core/stores/sqlx" - "time" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/lzUtils" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/applyforagentlogic.go b/app/user/cmd/api/internal/logic/agent/applyforagentlogic.go index 03150df..95a76a9 100644 --- a/app/user/cmd/api/internal/logic/agent/applyforagentlogic.go +++ b/app/user/cmd/api/internal/logic/agent/applyforagentlogic.go @@ -3,19 +3,19 @@ package agent import ( "context" "fmt" + "qnc-server/app/user/model" + jwtx "qnc-server/common/jwt" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/lzUtils" "time" - "tydata-server/app/user/model" - jwtx "tydata-server/common/jwt" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/lzUtils" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/redis" "github.com/zeromicro/go-zero/core/stores/sqlx" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) @@ -64,9 +64,9 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type } if user == nil { user = &model.User{Mobile: encryptedMobile} - if len(user.Nickname) == 0 { - user.Nickname = encryptedMobile - } + // if len(user.Nickname) == 0 { + // user.Nickname = encryptedMobile + // } insertResult, userInsertErr := l.svcCtx.UserModel.Insert(transCtx, session, user) if userInsertErr != nil { return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 数据库插入新用户失败, mobile%s, err: %+v", encryptedMobile, err) diff --git a/app/user/cmd/api/internal/logic/agent/generatinglinklogic.go b/app/user/cmd/api/internal/logic/agent/generatinglinklogic.go index 0d4fbe4..1f5e8e7 100644 --- a/app/user/cmd/api/internal/logic/agent/generatinglinklogic.go +++ b/app/user/cmd/api/internal/logic/agent/generatinglinklogic.go @@ -4,16 +4,17 @@ import ( "context" "encoding/hex" "encoding/json" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" + "strconv" + "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "strconv" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getagentauditstatuslogic.go b/app/user/cmd/api/internal/logic/agent/getagentauditstatuslogic.go index 4386173..ed985e7 100644 --- a/app/user/cmd/api/internal/logic/agent/getagentauditstatuslogic.go +++ b/app/user/cmd/api/internal/logic/agent/getagentauditstatuslogic.go @@ -2,14 +2,14 @@ package agent import ( "context" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getagentcommissionlogic.go b/app/user/cmd/api/internal/logic/agent/getagentcommissionlogic.go index dc60985..c8de7cb 100644 --- a/app/user/cmd/api/internal/logic/agent/getagentcommissionlogic.go +++ b/app/user/cmd/api/internal/logic/agent/getagentcommissionlogic.go @@ -2,14 +2,15 @@ package agent import ( "context" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "github.com/Masterminds/squirrel" "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getagentinfologic.go b/app/user/cmd/api/internal/logic/agent/getagentinfologic.go index d6ae714..8e4a96d 100644 --- a/app/user/cmd/api/internal/logic/agent/getagentinfologic.go +++ b/app/user/cmd/api/internal/logic/agent/getagentinfologic.go @@ -3,15 +3,15 @@ package agent import ( "context" "database/sql" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/lzUtils" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/lzUtils" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getagentmembershipproductconfiglogic.go b/app/user/cmd/api/internal/logic/agent/getagentmembershipproductconfiglogic.go index df85ea4..f1a680f 100644 --- a/app/user/cmd/api/internal/logic/agent/getagentmembershipproductconfiglogic.go +++ b/app/user/cmd/api/internal/logic/agent/getagentmembershipproductconfiglogic.go @@ -2,15 +2,16 @@ package agent import ( "context" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/lzUtils" + "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/lzUtils" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getagentproductconfiglogic.go b/app/user/cmd/api/internal/logic/agent/getagentproductconfiglogic.go index 33ac172..d690b98 100644 --- a/app/user/cmd/api/internal/logic/agent/getagentproductconfiglogic.go +++ b/app/user/cmd/api/internal/logic/agent/getagentproductconfiglogic.go @@ -2,15 +2,15 @@ package agent import ( "context" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/mr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getagentrevenueinfologic.go b/app/user/cmd/api/internal/logic/agent/getagentrevenueinfologic.go index e6ab102..9e6ea2e 100644 --- a/app/user/cmd/api/internal/logic/agent/getagentrevenueinfologic.go +++ b/app/user/cmd/api/internal/logic/agent/getagentrevenueinfologic.go @@ -2,15 +2,16 @@ package agent import ( "context" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "time" + "github.com/Masterminds/squirrel" "github.com/pkg/errors" - "time" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getagentrewardslogic.go b/app/user/cmd/api/internal/logic/agent/getagentrewardslogic.go index 5369605..db67c6f 100644 --- a/app/user/cmd/api/internal/logic/agent/getagentrewardslogic.go +++ b/app/user/cmd/api/internal/logic/agent/getagentrewardslogic.go @@ -2,14 +2,15 @@ package agent import ( "context" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "github.com/Masterminds/squirrel" "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getagentwithdrawallogic.go b/app/user/cmd/api/internal/logic/agent/getagentwithdrawallogic.go index dd1e102..d17e23b 100644 --- a/app/user/cmd/api/internal/logic/agent/getagentwithdrawallogic.go +++ b/app/user/cmd/api/internal/logic/agent/getagentwithdrawallogic.go @@ -2,14 +2,15 @@ package agent import ( "context" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "github.com/Masterminds/squirrel" "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/getlinkdatalogic.go b/app/user/cmd/api/internal/logic/agent/getlinkdatalogic.go index 793a808..29f7cf4 100644 --- a/app/user/cmd/api/internal/logic/agent/getlinkdatalogic.go +++ b/app/user/cmd/api/internal/logic/agent/getlinkdatalogic.go @@ -2,12 +2,13 @@ package agent import ( "context" + "qnc-server/common/xerr" + "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/agent/saveagentmembershipuserconfiglogic.go b/app/user/cmd/api/internal/logic/agent/saveagentmembershipuserconfiglogic.go index 07e85bf..82c11c1 100644 --- a/app/user/cmd/api/internal/logic/agent/saveagentmembershipuserconfiglogic.go +++ b/app/user/cmd/api/internal/logic/agent/saveagentmembershipuserconfiglogic.go @@ -2,14 +2,14 @@ package agent import ( "context" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/app/getappversionlogic.go b/app/user/cmd/api/internal/logic/app/getappversionlogic.go index 3129392..c4e6bd5 100644 --- a/app/user/cmd/api/internal/logic/app/getappversionlogic.go +++ b/app/user/cmd/api/internal/logic/app/getappversionlogic.go @@ -3,8 +3,8 @@ package app import ( "context" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/app/healthchecklogic.go b/app/user/cmd/api/internal/logic/app/healthchecklogic.go index 07fd63e..a9f53f6 100644 --- a/app/user/cmd/api/internal/logic/app/healthchecklogic.go +++ b/app/user/cmd/api/internal/logic/app/healthchecklogic.go @@ -3,8 +3,8 @@ package app import ( "context" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/auth/sendsmslogic.go b/app/user/cmd/api/internal/logic/auth/sendsmslogic.go index 5cd1974..7c2a747 100644 --- a/app/user/cmd/api/internal/logic/auth/sendsmslogic.go +++ b/app/user/cmd/api/internal/logic/auth/sendsmslogic.go @@ -4,14 +4,14 @@ import ( "context" "fmt" "math/rand" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" "time" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" dysmsapi "github.com/alibabacloud-go/dysmsapi-20170525/v3/client" diff --git a/app/user/cmd/api/internal/logic/notification/getnotificationslogic.go b/app/user/cmd/api/internal/logic/notification/getnotificationslogic.go index 329a5ab..fd6a42f 100644 --- a/app/user/cmd/api/internal/logic/notification/getnotificationslogic.go +++ b/app/user/cmd/api/internal/logic/notification/getnotificationslogic.go @@ -2,13 +2,14 @@ package notification import ( "context" + "qnc-server/common/xerr" + "time" + "github.com/jinzhu/copier" "github.com/pkg/errors" - "time" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/pay/alipaycallbacklogic.go b/app/user/cmd/api/internal/logic/pay/alipaycallbacklogic.go index f670fe8..4533172 100644 --- a/app/user/cmd/api/internal/logic/pay/alipaycallbacklogic.go +++ b/app/user/cmd/api/internal/logic/pay/alipaycallbacklogic.go @@ -4,12 +4,12 @@ import ( "context" "net/http" "os" + "qnc-server/pkg/lzkit/lzUtils" "time" - "tydata-server/pkg/lzkit/lzUtils" "github.com/smartwalle/alipay/v3" - "tydata-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/pay/iapcallbacklogic.go b/app/user/cmd/api/internal/logic/pay/iapcallbacklogic.go index c976f82..17ecfd3 100644 --- a/app/user/cmd/api/internal/logic/pay/iapcallbacklogic.go +++ b/app/user/cmd/api/internal/logic/pay/iapcallbacklogic.go @@ -2,12 +2,13 @@ package pay import ( "context" - "github.com/pkg/errors" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/lzUtils" "time" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/lzUtils" + + "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/pay/paymentlogic.go b/app/user/cmd/api/internal/logic/pay/paymentlogic.go index a965c82..fce92f8 100644 --- a/app/user/cmd/api/internal/logic/pay/paymentlogic.go +++ b/app/user/cmd/api/internal/logic/pay/paymentlogic.go @@ -6,12 +6,12 @@ import ( "encoding/json" "fmt" "os" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" diff --git a/app/user/cmd/api/internal/logic/pay/wechatpaycallbacklogic.go b/app/user/cmd/api/internal/logic/pay/wechatpaycallbacklogic.go index 5db5b4b..4143fb5 100644 --- a/app/user/cmd/api/internal/logic/pay/wechatpaycallbacklogic.go +++ b/app/user/cmd/api/internal/logic/pay/wechatpaycallbacklogic.go @@ -3,12 +3,13 @@ package pay import ( "context" "net/http" + "qnc-server/app/user/cmd/api/internal/service" + "qnc-server/pkg/lzkit/lzUtils" "time" - "tydata-server/app/user/cmd/api/internal/service" - "tydata-server/pkg/lzkit/lzUtils" + + "qnc-server/app/user/cmd/api/internal/svc" "github.com/zeromicro/go-zero/core/logx" - "tydata-server/app/user/cmd/api/internal/svc" ) type WechatPayCallbackLogic struct { diff --git a/app/user/cmd/api/internal/logic/pay/wechatpayrefundcallbacklogic.go b/app/user/cmd/api/internal/logic/pay/wechatpayrefundcallbacklogic.go index 3cd8125..9dc83c6 100644 --- a/app/user/cmd/api/internal/logic/pay/wechatpayrefundcallbacklogic.go +++ b/app/user/cmd/api/internal/logic/pay/wechatpayrefundcallbacklogic.go @@ -2,10 +2,11 @@ package pay import ( "context" + "net/http" + "qnc-server/app/user/cmd/api/internal/svc" + "github.com/wechatpay-apiv3/wechatpay-go/services/refunddomestic" "github.com/zeromicro/go-zero/core/logx" - "net/http" - "tydata-server/app/user/cmd/api/internal/svc" ) type WechatPayRefundCallbackLogic struct { diff --git a/app/user/cmd/api/internal/logic/product/getproductappbyenlogic.go b/app/user/cmd/api/internal/logic/product/getproductappbyenlogic.go index 4f5a49f..65a09bc 100644 --- a/app/user/cmd/api/internal/logic/product/getproductappbyenlogic.go +++ b/app/user/cmd/api/internal/logic/product/getproductappbyenlogic.go @@ -2,15 +2,16 @@ package product import ( "context" + "qnc-server/app/user/model" + "qnc-server/common/xerr" + "github.com/Masterminds/squirrel" "github.com/jinzhu/copier" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/mr" - "tydata-server/app/user/model" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/product/getproductbyenlogic.go b/app/user/cmd/api/internal/logic/product/getproductbyenlogic.go index 9659fee..bb072a2 100644 --- a/app/user/cmd/api/internal/logic/product/getproductbyenlogic.go +++ b/app/user/cmd/api/internal/logic/product/getproductbyenlogic.go @@ -2,15 +2,16 @@ package product import ( "context" + "qnc-server/app/user/model" + "qnc-server/common/xerr" + "github.com/Masterminds/squirrel" "github.com/jinzhu/copier" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/mr" - "tydata-server/app/user/model" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/product/getproductbyidlogic.go b/app/user/cmd/api/internal/logic/product/getproductbyidlogic.go index 634c747..17382d1 100644 --- a/app/user/cmd/api/internal/logic/product/getproductbyidlogic.go +++ b/app/user/cmd/api/internal/logic/product/getproductbyidlogic.go @@ -3,8 +3,8 @@ package product import ( "context" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/querydetailbyorderidlogic.go b/app/user/cmd/api/internal/logic/query/querydetailbyorderidlogic.go index 5a7ec7c..9abade3 100644 --- a/app/user/cmd/api/internal/logic/query/querydetailbyorderidlogic.go +++ b/app/user/cmd/api/internal/logic/query/querydetailbyorderidlogic.go @@ -6,19 +6,19 @@ import ( "encoding/hex" "encoding/json" "fmt" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/delay" + "qnc-server/pkg/lzkit/lzUtils" "time" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/delay" - "tydata-server/pkg/lzkit/lzUtils" "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/querydetailbyordernologic.go b/app/user/cmd/api/internal/logic/query/querydetailbyordernologic.go index 42fcaa6..0364fb5 100644 --- a/app/user/cmd/api/internal/logic/query/querydetailbyordernologic.go +++ b/app/user/cmd/api/internal/logic/query/querydetailbyordernologic.go @@ -4,17 +4,17 @@ import ( "context" "encoding/hex" "fmt" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/delay" "time" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/delay" "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/querydetaillogic.go b/app/user/cmd/api/internal/logic/query/querydetaillogic.go index 1f52b8e..53b25e9 100644 --- a/app/user/cmd/api/internal/logic/query/querydetaillogic.go +++ b/app/user/cmd/api/internal/logic/query/querydetaillogic.go @@ -4,14 +4,15 @@ import ( "context" "encoding/hex" "encoding/json" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/lzUtils" + "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/lzUtils" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/queryexamplelogic.go b/app/user/cmd/api/internal/logic/query/queryexamplelogic.go index 2462a03..3556c16 100644 --- a/app/user/cmd/api/internal/logic/query/queryexamplelogic.go +++ b/app/user/cmd/api/internal/logic/query/queryexamplelogic.go @@ -4,11 +4,12 @@ import ( "context" "encoding/hex" "fmt" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/xerr" + "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/xerr" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/querylistlogic.go b/app/user/cmd/api/internal/logic/query/querylistlogic.go index 8112bac..3d9d263 100644 --- a/app/user/cmd/api/internal/logic/query/querylistlogic.go +++ b/app/user/cmd/api/internal/logic/query/querylistlogic.go @@ -2,14 +2,15 @@ package query import ( "context" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "github.com/Masterminds/squirrel" "github.com/jinzhu/copier" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" ) type QueryListLogic struct { diff --git a/app/user/cmd/api/internal/logic/query/queryprovisionalorderlogic.go b/app/user/cmd/api/internal/logic/query/queryprovisionalorderlogic.go index 4d3fe1a..2b6bf22 100644 --- a/app/user/cmd/api/internal/logic/query/queryprovisionalorderlogic.go +++ b/app/user/cmd/api/internal/logic/query/queryprovisionalorderlogic.go @@ -4,12 +4,13 @@ import ( "context" "encoding/json" "fmt" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "github.com/jinzhu/copier" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/queryretrylogic.go b/app/user/cmd/api/internal/logic/query/queryretrylogic.go index a946d8e..214d7bf 100644 --- a/app/user/cmd/api/internal/logic/query/queryretrylogic.go +++ b/app/user/cmd/api/internal/logic/query/queryretrylogic.go @@ -2,11 +2,12 @@ package query import ( "context" - "github.com/pkg/errors" - "tydata-server/common/xerr" + "qnc-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "github.com/pkg/errors" + + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/queryserviceagentlogic.go b/app/user/cmd/api/internal/logic/query/queryserviceagentlogic.go index 8d8e652..7228a16 100644 --- a/app/user/cmd/api/internal/logic/query/queryserviceagentlogic.go +++ b/app/user/cmd/api/internal/logic/query/queryserviceagentlogic.go @@ -2,8 +2,8 @@ package query import ( "context" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/queryserviceapplogic.go b/app/user/cmd/api/internal/logic/query/queryserviceapplogic.go index 0b544df..5adfa02 100644 --- a/app/user/cmd/api/internal/logic/query/queryserviceapplogic.go +++ b/app/user/cmd/api/internal/logic/query/queryserviceapplogic.go @@ -3,8 +3,8 @@ package query import ( "context" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/queryservicelogic.go b/app/user/cmd/api/internal/logic/query/queryservicelogic.go index 3e99c36..6256911 100644 --- a/app/user/cmd/api/internal/logic/query/queryservicelogic.go +++ b/app/user/cmd/api/internal/logic/query/queryservicelogic.go @@ -5,21 +5,21 @@ import ( "encoding/hex" "encoding/json" "fmt" + "qnc-server/app/user/cmd/api/internal/service" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + jwtx "qnc-server/common/jwt" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/validator" "time" - "tydata-server/app/user/cmd/api/internal/service" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - jwtx "tydata-server/common/jwt" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/validator" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/redis" "github.com/zeromicro/go-zero/core/stores/sqlx" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) @@ -1408,9 +1408,9 @@ func (l *QueryServiceLogic) GetOrCreateUser(mobile string) (int64, error) { // 没有则创建账号 if userModel == nil { userModel = &model.User{Mobile: mobile} - if len(userModel.Nickname) == 0 { - userModel.Nickname = mobile - } + // if len(userModel.Nickname) == 0 { + // userModel.Nickname = mobile + // } if transErr := l.svcCtx.UserModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error { insertResult, userInsertErr := l.svcCtx.UserModel.Insert(ctx, session, userModel) if userInsertErr != nil { diff --git a/app/user/cmd/api/internal/logic/query/querysingletestlogic.go b/app/user/cmd/api/internal/logic/query/querysingletestlogic.go index be307f7..8cb3922 100644 --- a/app/user/cmd/api/internal/logic/query/querysingletestlogic.go +++ b/app/user/cmd/api/internal/logic/query/querysingletestlogic.go @@ -3,11 +3,12 @@ package query import ( "context" "encoding/json" - "github.com/pkg/errors" - "tydata-server/common/xerr" + "qnc-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "github.com/pkg/errors" + + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/query/updatequerydatalogic.go b/app/user/cmd/api/internal/logic/query/updatequerydatalogic.go index d09a8a2..ecd7801 100644 --- a/app/user/cmd/api/internal/logic/query/updatequerydatalogic.go +++ b/app/user/cmd/api/internal/logic/query/updatequerydatalogic.go @@ -5,11 +5,11 @@ import ( "database/sql" "encoding/hex" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" diff --git a/app/user/cmd/api/internal/logic/user/agentmobilecodeloginlogic.go b/app/user/cmd/api/internal/logic/user/agentmobilecodeloginlogic.go index 956a122..ffe4b82 100644 --- a/app/user/cmd/api/internal/logic/user/agentmobilecodeloginlogic.go +++ b/app/user/cmd/api/internal/logic/user/agentmobilecodeloginlogic.go @@ -3,13 +3,13 @@ package user import ( "context" "fmt" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" + jwtx "qnc-server/common/jwt" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" "time" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" - jwtx "tydata-server/common/jwt" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/redis" @@ -57,9 +57,9 @@ func (l *AgentMobileCodeLoginLogic) AgentMobileCodeLogin(req *types.MobileCodeLo } if user == nil { user = &model.User{Mobile: encryptedMobile} - if len(user.Nickname) == 0 { - user.Nickname = "" - } + // if len(user.Nickname) == 0 { + // user.Nickname = "" + // } if transErr := l.svcCtx.UserModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error { insertResult, userInsertErr := l.svcCtx.UserModel.Insert(ctx, session, user) if userInsertErr != nil { diff --git a/app/user/cmd/api/internal/logic/user/canceloutlogic.go b/app/user/cmd/api/internal/logic/user/canceloutlogic.go index 1fbc8e1..fd016b0 100644 --- a/app/user/cmd/api/internal/logic/user/canceloutlogic.go +++ b/app/user/cmd/api/internal/logic/user/canceloutlogic.go @@ -2,16 +2,16 @@ package user import ( "context" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" "github.com/zeromicro/go-zero/core/mr" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/sqlx" - "tydata-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/user/detaillogic.go b/app/user/cmd/api/internal/logic/user/detaillogic.go index b9c391e..a972fc2 100644 --- a/app/user/cmd/api/internal/logic/user/detaillogic.go +++ b/app/user/cmd/api/internal/logic/user/detaillogic.go @@ -2,12 +2,12 @@ package user import ( "context" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" "github.com/jinzhu/copier" "github.com/pkg/errors" diff --git a/app/user/cmd/api/internal/logic/user/gettokenlogic.go b/app/user/cmd/api/internal/logic/user/gettokenlogic.go index 2532925..2fd0494 100644 --- a/app/user/cmd/api/internal/logic/user/gettokenlogic.go +++ b/app/user/cmd/api/internal/logic/user/gettokenlogic.go @@ -2,14 +2,15 @@ package user import ( "context" - "github.com/pkg/errors" + "qnc-server/common/ctxdata" + jwtx "qnc-server/common/jwt" + "qnc-server/common/xerr" "time" - "tydata-server/common/ctxdata" - jwtx "tydata-server/common/jwt" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "github.com/pkg/errors" + + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/user/mobilecodeloginlogic.go b/app/user/cmd/api/internal/logic/user/mobilecodeloginlogic.go index 5911a2c..ad72718 100644 --- a/app/user/cmd/api/internal/logic/user/mobilecodeloginlogic.go +++ b/app/user/cmd/api/internal/logic/user/mobilecodeloginlogic.go @@ -3,13 +3,13 @@ package user import ( "context" "fmt" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" + jwtx "qnc-server/common/jwt" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" "time" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" - jwtx "tydata-server/common/jwt" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/redis" @@ -59,9 +59,9 @@ func (l *MobileCodeLoginLogic) MobileCodeLogin(req *types.MobileCodeLoginReq) (r } if user == nil { user = &model.User{Mobile: encryptedMobile} - if len(user.Nickname) == 0 { - user.Nickname = encryptedMobile - } + // if len(user.Nickname) == 0 { + // user.Nickname = encryptedMobile + // } if transErr := l.svcCtx.UserModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error { insertResult, userInsertErr := l.svcCtx.UserModel.Insert(ctx, session, user) if userInsertErr != nil { diff --git a/app/user/cmd/api/internal/logic/user/mobileloginlogic.go b/app/user/cmd/api/internal/logic/user/mobileloginlogic.go index 8498ee8..5f9f520 100644 --- a/app/user/cmd/api/internal/logic/user/mobileloginlogic.go +++ b/app/user/cmd/api/internal/logic/user/mobileloginlogic.go @@ -2,18 +2,18 @@ package user import ( "context" + "qnc-server/app/user/model" + jwtx "qnc-server/common/jwt" + "qnc-server/common/tool" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/lzUtils" "time" - "tydata-server/app/user/model" - jwtx "tydata-server/common/jwt" - "tydata-server/common/tool" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/lzUtils" "github.com/pkg/errors" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/user/registerlogic.go b/app/user/cmd/api/internal/logic/user/registerlogic.go index f4bdb72..6c8781b 100644 --- a/app/user/cmd/api/internal/logic/user/registerlogic.go +++ b/app/user/cmd/api/internal/logic/user/registerlogic.go @@ -3,15 +3,15 @@ package user import ( "context" "fmt" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" + jwtx "qnc-server/common/jwt" + "qnc-server/common/tool" + "qnc-server/common/xerr" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/lzUtils" "time" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" - jwtx "tydata-server/common/jwt" - "tydata-server/common/tool" - "tydata-server/common/xerr" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/lzUtils" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/redis" @@ -63,9 +63,9 @@ func (l *RegisterLogic) Register(req *types.RegisterReq) (resp *types.RegisterRe if transErr := l.svcCtx.UserModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error { user := new(model.User) user.Mobile = encryptedMobile - if len(user.Nickname) == 0 { - user.Nickname = encryptedMobile - } + // if len(user.Nickname) == 0 { + // user.Nickname = encryptedMobile + // } if len(req.Password) > 0 { user.Password = lzUtils.StringToNullString(tool.Md5ByString(req.Password)) } diff --git a/app/user/cmd/api/internal/logic/user/wxh5authlogic.go b/app/user/cmd/api/internal/logic/user/wxh5authlogic.go index 8c6ed75..78ddfa5 100644 --- a/app/user/cmd/api/internal/logic/user/wxh5authlogic.go +++ b/app/user/cmd/api/internal/logic/user/wxh5authlogic.go @@ -4,17 +4,18 @@ import ( "context" "encoding/json" "fmt" - "github.com/pkg/errors" - "github.com/zeromicro/go-zero/core/stores/sqlx" "io" "net/http" + "qnc-server/app/user/model" + jwtx "qnc-server/common/jwt" + "qnc-server/common/xerr" "time" - "tydata-server/app/user/model" - jwtx "tydata-server/common/jwt" - "tydata-server/common/xerr" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "github.com/pkg/errors" + "github.com/zeromicro/go-zero/core/stores/sqlx" + + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/logic/user/wxminiauthlogic.go b/app/user/cmd/api/internal/logic/user/wxminiauthlogic.go index 904644d..d268e62 100644 --- a/app/user/cmd/api/internal/logic/user/wxminiauthlogic.go +++ b/app/user/cmd/api/internal/logic/user/wxminiauthlogic.go @@ -3,8 +3,8 @@ package user import ( "context" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/app/user/cmd/api/internal/queue/cleanQueryData.go b/app/user/cmd/api/internal/queue/cleanQueryData.go index 984deed..e4d1333 100644 --- a/app/user/cmd/api/internal/queue/cleanQueryData.go +++ b/app/user/cmd/api/internal/queue/cleanQueryData.go @@ -2,11 +2,9 @@ package queue import ( "context" - "time" - "tydata-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/svc" "github.com/hibiken/asynq" - "github.com/zeromicro/go-zero/core/logx" ) // TASKTIME 定义为每天凌晨3点执行 @@ -23,19 +21,19 @@ func NewCleanQueryDataHandler(svcCtx *svc.ServiceContext) *CleanQueryDataHandler } func (l *CleanQueryDataHandler) ProcessTask(ctx context.Context, t *asynq.Task) error { - now := time.Now().Format("2006-01-02 15:04:05") - logx.Infof("%s - 开始执行查询数据清理任务", now) + // now := time.Now().Format("2006-01-02 15:04:05") + // logx.Infof("%s - 开始执行查询数据清理任务", now) - // 计算3天前的时间 - threeDaysAgo := time.Now().AddDate(0, 0, -3) + // // 计算3天前的时间 + // threeDaysAgo := time.Now().AddDate(0, 0, -3) - // 调用QueryModel删除3天前的数据 - result, err := l.svcCtx.QueryModel.DeleteBefore(ctx, threeDaysAgo) - if err != nil { - logx.Errorf("%s - 清理查询数据失败: %v", time.Now().Format("2006-01-02 15:04:05"), err) - return err - } + // // 调用QueryModel删除3天前的数据 + // result, err := l.svcCtx.QueryModel.DeleteBefore(ctx, threeDaysAgo) + // if err != nil { + // logx.Errorf("%s - 清理查询数据失败: %v", time.Now().Format("2006-01-02 15:04:05"), err) + // return err + // } - logx.Infof("%s - 查询数据清理完成，共删除 %d 条记录", time.Now().Format("2006-01-02 15:04:05"), result) + // logx.Infof("%s - 查询数据清理完成，共删除 %d 条记录", time.Now().Format("2006-01-02 15:04:05"), result) return nil } diff --git a/app/user/cmd/api/internal/queue/paySuccessNotify.go b/app/user/cmd/api/internal/queue/paySuccessNotify.go index 23a68f0..9f27ed7 100644 --- a/app/user/cmd/api/internal/queue/paySuccessNotify.go +++ b/app/user/cmd/api/internal/queue/paySuccessNotify.go @@ -6,13 +6,13 @@ import ( "encoding/json" "fmt" "os" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "qnc-server/app/user/model" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/lzUtils" "regexp" "strings" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" - "tydata-server/app/user/model" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/lzUtils" "github.com/hibiken/asynq" "github.com/zeromicro/go-zero/core/logx" @@ -55,21 +55,21 @@ func (l *PaySuccessNotifyUserHandler) ProcessTask(ctx context.Context, t *asynq. redisKey := fmt.Sprintf("%d:%s", order.UserId, order.OrderNo) cache, cacheErr := l.svcCtx.Redis.GetCtx(ctx, redisKey) if cacheErr != nil { - return fmt.Errorf("生成订单, 获取缓存内容失败: %+v", cacheErr) + return fmt.Errorf("获取缓存内容失败: %+v", cacheErr) } var data types.QueryCacheLoad err = json.Unmarshal([]byte(cache), &data) if err != nil { - return fmt.Errorf("生成订单, 解析缓存内容失败: %+v", err) + return fmt.Errorf("解析缓存内容失败: %+v", err) } secretKey := l.svcCtx.Config.Encrypt.SecretKey key, decodeErr := hex.DecodeString(secretKey) if decodeErr != nil { - return fmt.Errorf("生成订单, 获取AES密钥失败: %+v", decodeErr) + return fmt.Errorf("获取AES密钥失败: %+v", decodeErr) } decryptData, aesdecryptErr := crypto.AesDecrypt(data.Params, key) if aesdecryptErr != nil { - return fmt.Errorf("生成订单, 解密参数失败: %+v", aesdecryptErr) + return fmt.Errorf("解密参数失败: %+v", aesdecryptErr) } // 敏感数据脱敏处理 @@ -93,7 +93,7 @@ func (l *PaySuccessNotifyUserHandler) ProcessTask(ctx context.Context, t *asynq. } result, insertQueryErr := l.svcCtx.QueryModel.Insert(ctx, nil, query) if insertQueryErr != nil { - return fmt.Errorf("生成订单, 保存查询失败: %+v", insertQueryErr) + return fmt.Errorf("保存查询失败: %+v", insertQueryErr) } // 获取插入后的ID diff --git a/app/user/cmd/api/internal/queue/routes.go b/app/user/cmd/api/internal/queue/routes.go index e59a65c..ed63f14 100644 --- a/app/user/cmd/api/internal/queue/routes.go +++ b/app/user/cmd/api/internal/queue/routes.go @@ -3,9 +3,10 @@ package queue import ( "context" "fmt" + "qnc-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/types" + "github.com/hibiken/asynq" - "tydata-server/app/user/cmd/api/internal/svc" - "tydata-server/app/user/cmd/api/internal/types" ) type CronJob struct { diff --git a/app/user/cmd/api/internal/service/agentService.go b/app/user/cmd/api/internal/service/agentService.go index cbf75dc..8a0d530 100644 --- a/app/user/cmd/api/internal/service/agentService.go +++ b/app/user/cmd/api/internal/service/agentService.go @@ -2,9 +2,9 @@ package service import ( "context" - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/app/user/model" - "tydata-server/pkg/lzkit/lzUtils" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/app/user/model" + "qnc-server/pkg/lzkit/lzUtils" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/sqlx" diff --git a/app/user/cmd/api/internal/service/alipayService.go b/app/user/cmd/api/internal/service/alipayService.go index cab354d..cd21fe3 100644 --- a/app/user/cmd/api/internal/service/alipayService.go +++ b/app/user/cmd/api/internal/service/alipayService.go @@ -6,11 +6,11 @@ import ( "encoding/hex" "fmt" "net/http" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/pkg/lzkit/lzUtils" "strconv" "sync/atomic" "time" - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/pkg/lzkit/lzUtils" "github.com/smartwalle/alipay/v3" ) diff --git a/app/user/cmd/api/internal/service/apirequestService.go b/app/user/cmd/api/internal/service/apirequestService.go index 10a77e2..f3f475a 100644 --- a/app/user/cmd/api/internal/service/apirequestService.go +++ b/app/user/cmd/api/internal/service/apirequestService.go @@ -8,14 +8,14 @@ import ( "io" "net/http" "net/url" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/app/user/model" + "qnc-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/lzUtils" "strings" "sync" "sync/atomic" "time" - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/app/user/model" - "tydata-server/pkg/lzkit/crypto" - "tydata-server/pkg/lzkit/lzUtils" "github.com/Masterminds/squirrel" "github.com/bytedance/sonic" diff --git a/app/user/cmd/api/internal/service/applepayService.go b/app/user/cmd/api/internal/service/applepayService.go index 31ff63f..2ac8d96 100644 --- a/app/user/cmd/api/internal/service/applepayService.go +++ b/app/user/cmd/api/internal/service/applepayService.go @@ -7,12 +7,13 @@ import ( "encoding/json" "encoding/pem" "fmt" - "github.com/golang-jwt/jwt/v4" "io/ioutil" "net/http" + "qnc-server/app/user/cmd/api/internal/config" "strconv" "time" - "tydata-server/app/user/cmd/api/internal/config" + + "github.com/golang-jwt/jwt/v4" ) // ApplePayService 是 Apple IAP 支付服务的结构体 diff --git a/app/user/cmd/api/internal/service/asynqService.go b/app/user/cmd/api/internal/service/asynqService.go index 09b3e1f..03c7feb 100644 --- a/app/user/cmd/api/internal/service/asynqService.go +++ b/app/user/cmd/api/internal/service/asynqService.go @@ -4,10 +4,11 @@ package service import ( "encoding/json" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/app/user/cmd/api/internal/types" + "github.com/hibiken/asynq" "github.com/zeromicro/go-zero/core/logx" - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/app/user/cmd/api/internal/types" ) type AsynqService struct { diff --git a/app/user/cmd/api/internal/service/verificationService.go b/app/user/cmd/api/internal/service/verificationService.go index 4b4fb5f..3454235 100644 --- a/app/user/cmd/api/internal/service/verificationService.go +++ b/app/user/cmd/api/internal/service/verificationService.go @@ -6,9 +6,9 @@ import ( "io" "net/http" "net/url" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/pkg/lzkit/crypto" "strings" - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/pkg/lzkit/crypto" "github.com/tidwall/gjson" ) diff --git a/app/user/cmd/api/internal/service/wechatpayService.go b/app/user/cmd/api/internal/service/wechatpayService.go index adefb0f..f404cc9 100644 --- a/app/user/cmd/api/internal/service/wechatpayService.go +++ b/app/user/cmd/api/internal/service/wechatpayService.go @@ -3,6 +3,14 @@ package service import ( "context" "fmt" + "net/http" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/app/user/model" + "qnc-server/common/ctxdata" + "qnc-server/pkg/lzkit/lzUtils" + "strconv" + "time" + "github.com/wechatpay-apiv3/wechatpay-go/core" "github.com/wechatpay-apiv3/wechatpay-go/core/auth/verifiers" "github.com/wechatpay-apiv3/wechatpay-go/core/downloader" @@ -14,13 +22,6 @@ import ( "github.com/wechatpay-apiv3/wechatpay-go/services/refunddomestic" "github.com/wechatpay-apiv3/wechatpay-go/utils" "github.com/zeromicro/go-zero/core/logx" - "net/http" - "strconv" - "time" - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/app/user/model" - "tydata-server/common/ctxdata" - "tydata-server/pkg/lzkit/lzUtils" ) const ( diff --git a/app/user/cmd/api/internal/service/westdexService.go b/app/user/cmd/api/internal/service/westdexService.go index 9072148..52bc147 100644 --- a/app/user/cmd/api/internal/service/westdexService.go +++ b/app/user/cmd/api/internal/service/westdexService.go @@ -4,13 +4,14 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/pkg/errors" "io" "net/http" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/pkg/lzkit/crypto" "strconv" "time" - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/pkg/lzkit/crypto" + + "github.com/pkg/errors" ) type WestResp struct { diff --git a/app/user/cmd/api/internal/service/yushanService.go b/app/user/cmd/api/internal/service/yushanService.go index 03ea56b..0e9ef4e 100644 --- a/app/user/cmd/api/internal/service/yushanService.go +++ b/app/user/cmd/api/internal/service/yushanService.go @@ -9,12 +9,13 @@ import ( "encoding/hex" "encoding/json" "fmt" - "github.com/tidwall/gjson" "io" "net/http" + "qnc-server/app/user/cmd/api/internal/config" "strings" "time" - "tydata-server/app/user/cmd/api/internal/config" + + "github.com/tidwall/gjson" ) type YushanService struct { diff --git a/app/user/cmd/api/internal/svc/servicecontext.go b/app/user/cmd/api/internal/svc/servicecontext.go index c2e7a20..65d9e87 100644 --- a/app/user/cmd/api/internal/svc/servicecontext.go +++ b/app/user/cmd/api/internal/svc/servicecontext.go @@ -1,10 +1,10 @@ package svc import ( - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/app/user/cmd/api/internal/middleware" - "tydata-server/app/user/cmd/api/internal/service" - "tydata-server/app/user/model" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/app/user/cmd/api/internal/middleware" + "qnc-server/app/user/cmd/api/internal/service" + "qnc-server/app/user/model" "github.com/hibiken/asynq" "github.com/zeromicro/go-zero/core/logx" diff --git a/app/user/cmd/api/main.go b/app/user/cmd/api/main.go index 7dfaaa5..efb4e8d 100644 --- a/app/user/cmd/api/main.go +++ b/app/user/cmd/api/main.go @@ -5,10 +5,10 @@ import ( "flag" "fmt" "os" - "tydata-server/app/user/cmd/api/internal/config" - "tydata-server/app/user/cmd/api/internal/handler" - "tydata-server/app/user/cmd/api/internal/queue" - "tydata-server/app/user/cmd/api/internal/svc" + "qnc-server/app/user/cmd/api/internal/config" + "qnc-server/app/user/cmd/api/internal/handler" + "qnc-server/app/user/cmd/api/internal/queue" + "qnc-server/app/user/cmd/api/internal/svc" "github.com/zeromicro/go-zero/core/logx" @@ -53,7 +53,9 @@ func main() { } fmt.Println("异步任务启动！！！") }() - + // go func() { + // script.RunEncryptMobile() + // }() server := rest.MustNewServer(c.RestConf) defer server.Stop() diff --git a/app/user/model/agentActiveStatModel_gen.go b/app/user/model/agentActiveStatModel_gen.go index af443da..1c9aca5 100644 --- a/app/user/model/agentActiveStatModel_gen.go +++ b/app/user/model/agentActiveStatModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( agentActiveStatRowsExpectAutoSet = strings.Join(stringx.Remove(agentActiveStatFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentActiveStatRowsWithPlaceHolder = strings.Join(stringx.Remove(agentActiveStatFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentActiveStatIdPrefix = "cache:tydata:agentActiveStat:id:" - cacheTydataAgentActiveStatAgentIdStatDatePrefix = "cache:tydata:agentActiveStat:agentId:statDate:" + cacheQncAgentActiveStatIdPrefix = "cache:qnc:agentActiveStat:id:" + cacheQncAgentActiveStatAgentIdStatDatePrefix = "cache:qnc:agentActiveStat:agentId:statDate:" ) type ( @@ -77,21 +77,21 @@ func newAgentActiveStatModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgent func (m *defaultAgentActiveStatModel) Insert(ctx context.Context, session sqlx.Session, data *AgentActiveStat) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, data.Id) + qncAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheQncAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) + qncAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheQncAgentActiveStatIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?)", m.table, agentActiveStatRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.StatDate, data.ActiveNumber, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.AgentId, data.StatDate, data.ActiveNumber, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentActiveStatAgentIdStatDateKey, tydataAgentActiveStatIdKey) + }, qncAgentActiveStatAgentIdStatDateKey, qncAgentActiveStatIdKey) } func (m *defaultAgentActiveStatModel) FindOne(ctx context.Context, id int64) (*AgentActiveStat, error) { - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, id) + qncAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheQncAgentActiveStatIdPrefix, id) var resp AgentActiveStat - err := m.QueryRowCtx(ctx, &resp, tydataAgentActiveStatIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentActiveStatIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentActiveStatRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -106,9 +106,9 @@ func (m *defaultAgentActiveStatModel) FindOne(ctx context.Context, id int64) (*A } func (m *defaultAgentActiveStatModel) FindOneByAgentIdStatDate(ctx context.Context, agentId int64, statDate time.Time) (*AgentActiveStat, error) { - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, agentId, statDate) + qncAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheQncAgentActiveStatAgentIdStatDatePrefix, agentId, statDate) var resp AgentActiveStat - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentActiveStatAgentIdStatDateKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentActiveStatAgentIdStatDateKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `agent_id` = ? and `stat_date` = ? and del_state = ? limit 1", agentActiveStatRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, agentId, statDate, globalkey.DelStateNo); err != nil { return nil, err @@ -130,15 +130,15 @@ func (m *defaultAgentActiveStatModel) Update(ctx context.Context, session sqlx.S if err != nil { return nil, err } - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, data.Id) + qncAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheQncAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) + qncAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheQncAgentActiveStatIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentActiveStatRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.AgentId, newData.StatDate, newData.ActiveNumber, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.AgentId, newData.StatDate, newData.ActiveNumber, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentActiveStatAgentIdStatDateKey, tydataAgentActiveStatIdKey) + }, qncAgentActiveStatAgentIdStatDateKey, qncAgentActiveStatIdKey) } func (m *defaultAgentActiveStatModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentActiveStat) error { @@ -153,15 +153,15 @@ func (m *defaultAgentActiveStatModel) UpdateWithVersion(ctx context.Context, ses if err != nil { return err } - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, data.Id) + qncAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheQncAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) + qncAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheQncAgentActiveStatIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentActiveStatRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.AgentId, newData.StatDate, newData.ActiveNumber, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.AgentId, newData.StatDate, newData.ActiveNumber, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentActiveStatAgentIdStatDateKey, tydataAgentActiveStatIdKey) + }, qncAgentActiveStatAgentIdStatDateKey, qncAgentActiveStatIdKey) if err != nil { return err } @@ -180,7 +180,7 @@ func (m *defaultAgentActiveStatModel) DeleteSoft(ctx context.Context, session sq data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentActiveStatModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentActiveStatModel delete err : %+v", err) } return nil } @@ -384,19 +384,19 @@ func (m *defaultAgentActiveStatModel) Delete(ctx context.Context, session sqlx.S return err } - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, id) + qncAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheQncAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) + qncAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheQncAgentActiveStatIdPrefix, id) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentActiveStatAgentIdStatDateKey, tydataAgentActiveStatIdKey) + }, qncAgentActiveStatAgentIdStatDateKey, qncAgentActiveStatIdKey) return err } func (m *defaultAgentActiveStatModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentActiveStatIdPrefix, primary) } func (m *defaultAgentActiveStatModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentActiveStatRows, m.table) diff --git a/app/user/model/agentAuditModel_gen.go b/app/user/model/agentAuditModel_gen.go index 420b6bb..32e014a 100644 --- a/app/user/model/agentAuditModel_gen.go +++ b/app/user/model/agentAuditModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,13 +26,15 @@ var ( agentAuditRowsExpectAutoSet = strings.Join(stringx.Remove(agentAuditFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentAuditRowsWithPlaceHolder = strings.Join(stringx.Remove(agentAuditFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentAuditIdPrefix = "cache:tydata:agentAudit:id:" + cacheQncAgentAuditIdPrefix = "cache:qnc:agentAudit:id:" + cacheQncAgentAuditUserIdPrefix = "cache:qnc:agentAudit:userId:" ) type ( agentAuditModel interface { Insert(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error) FindOne(ctx context.Context, id int64) (*AgentAudit, error) + FindOneByUserId(ctx context.Context, userId int64) (*AgentAudit, error) Update(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentAudit) error Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error @@ -79,20 +81,21 @@ func newAgentAuditModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentAudit func (m *defaultAgentAuditModel) Insert(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, data.Id) + qncAgentAuditIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditIdPrefix, data.Id) + qncAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditUserIdPrefix, data.UserId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentAuditRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentAuditIdKey) + }, qncAgentAuditIdKey, qncAgentAuditUserIdKey) } func (m *defaultAgentAuditModel) FindOne(ctx context.Context, id int64) (*AgentAudit, error) { - tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, id) + qncAgentAuditIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditIdPrefix, id) var resp AgentAudit - err := m.QueryRowCtx(ctx, &resp, tydataAgentAuditIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentAuditIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentAuditRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -106,33 +109,63 @@ func (m *defaultAgentAuditModel) FindOne(ctx context.Context, id int64) (*AgentA } } -func (m *defaultAgentAuditModel) Update(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error) { - tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, data.Id) +func (m *defaultAgentAuditModel) FindOneByUserId(ctx context.Context, userId int64) (*AgentAudit, error) { + qncAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditUserIdPrefix, userId) + var resp AgentAudit + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentAuditUserIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + query := fmt.Sprintf("select %s from %s where `user_id` = ? and del_state = ? limit 1", agentAuditRows, m.table) + if err := conn.QueryRowCtx(ctx, &resp, query, userId, globalkey.DelStateNo); err != nil { + return nil, err + } + return resp.Id, nil + }, m.queryPrimary) + switch err { + case nil: + return &resp, nil + case sqlc.ErrNotFound: + return nil, ErrNotFound + default: + return nil, err + } +} + +func (m *defaultAgentAuditModel) Update(ctx context.Context, session sqlx.Session, newData *AgentAudit) (sql.Result, error) { + data, err := m.FindOne(ctx, newData.Id) + if err != nil { + return nil, err + } + qncAgentAuditIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditIdPrefix, data.Id) + qncAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditUserIdPrefix, data.UserId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentAuditRowsWithPlaceHolder) if session != nil { - return session.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version, data.Id) + return session.ExecCtx(ctx, query, newData.UserId, newData.Region, newData.Mobile, newData.WechatId, newData.Status, newData.AuditReason, newData.AuditTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } - return conn.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version, data.Id) - }, tydataAgentAuditIdKey) + return conn.ExecCtx(ctx, query, newData.UserId, newData.Region, newData.Mobile, newData.WechatId, newData.Status, newData.AuditReason, newData.AuditTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) + }, qncAgentAuditIdKey, qncAgentAuditUserIdKey) } -func (m *defaultAgentAuditModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentAudit) error { +func (m *defaultAgentAuditModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentAudit) error { - oldVersion := data.Version - data.Version += 1 + oldVersion := newData.Version + newData.Version += 1 var sqlResult sql.Result var err error - tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, data.Id) + data, err := m.FindOne(ctx, newData.Id) + if err != nil { + return err + } + qncAgentAuditIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditIdPrefix, data.Id) + qncAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditUserIdPrefix, data.UserId) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentAuditRowsWithPlaceHolder) if session != nil { - return session.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) + return session.ExecCtx(ctx, query, newData.UserId, newData.Region, newData.Mobile, newData.WechatId, newData.Status, newData.AuditReason, newData.AuditTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } - return conn.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) - }, tydataAgentAuditIdKey) + return conn.ExecCtx(ctx, query, newData.UserId, newData.Region, newData.Mobile, newData.WechatId, newData.Status, newData.AuditReason, newData.AuditTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) + }, qncAgentAuditIdKey, qncAgentAuditUserIdKey) if err != nil { return err } @@ -350,18 +383,24 @@ func (m *defaultAgentAuditModel) SelectBuilder() squirrel.SelectBuilder { return squirrel.Select().From(m.table) } func (m *defaultAgentAuditModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { - tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, id) - _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { + data, err := m.FindOne(ctx, id) + if err != nil { + return err + } + + qncAgentAuditIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditIdPrefix, id) + qncAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentAuditUserIdPrefix, data.UserId) + _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentAuditIdKey) + }, qncAgentAuditIdKey, qncAgentAuditUserIdKey) return err } func (m *defaultAgentAuditModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentAuditIdPrefix, primary) } func (m *defaultAgentAuditModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentAuditRows, m.table) diff --git a/app/user/model/agentClosureModel_gen.go b/app/user/model/agentClosureModel_gen.go index 3923c6c..572fbda 100644 --- a/app/user/model/agentClosureModel_gen.go +++ b/app/user/model/agentClosureModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,9 +26,9 @@ var ( agentClosureRowsExpectAutoSet = strings.Join(stringx.Remove(agentClosureFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentClosureRowsWithPlaceHolder = strings.Join(stringx.Remove(agentClosureFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentClosureIdPrefix = "cache:tydata:agentClosure:id:" - cacheTydataAgentClosureAncestorIdDescendantIdPrefix = "cache:tydata:agentClosure:ancestorId:descendantId:" - cacheTydataAgentClosureDescendantIdDepthPrefix = "cache:tydata:agentClosure:descendantId:depth:" + cacheQncAgentClosureIdPrefix = "cache:qnc:agentClosure:id:" + cacheQncAgentClosureAncestorIdDescendantIdPrefix = "cache:qnc:agentClosure:ancestorId:descendantId:" + cacheQncAgentClosureDescendantIdDepthPrefix = "cache:qnc:agentClosure:descendantId:depth:" ) type ( @@ -79,22 +79,22 @@ func newAgentClosureModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentClo func (m *defaultAgentClosureModel) Insert(ctx context.Context, session sqlx.Session, data *AgentClosure) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureAncestorIdDescendantIdPrefix, data.AncestorId, data.DescendantId) - tydataAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureDescendantIdDepthPrefix, data.DescendantId, data.Depth) - tydataAgentClosureIdKey := fmt.Sprintf("%s%v", cacheTydataAgentClosureIdPrefix, data.Id) + qncAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureAncestorIdDescendantIdPrefix, data.AncestorId, data.DescendantId) + qncAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureDescendantIdDepthPrefix, data.DescendantId, data.Depth) + qncAgentClosureIdKey := fmt.Sprintf("%s%v", cacheQncAgentClosureIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?)", m.table, agentClosureRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.AncestorId, data.DescendantId, data.Depth, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.AncestorId, data.DescendantId, data.Depth, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentClosureAncestorIdDescendantIdKey, tydataAgentClosureDescendantIdDepthKey, tydataAgentClosureIdKey) + }, qncAgentClosureAncestorIdDescendantIdKey, qncAgentClosureDescendantIdDepthKey, qncAgentClosureIdKey) } func (m *defaultAgentClosureModel) FindOne(ctx context.Context, id int64) (*AgentClosure, error) { - tydataAgentClosureIdKey := fmt.Sprintf("%s%v", cacheTydataAgentClosureIdPrefix, id) + qncAgentClosureIdKey := fmt.Sprintf("%s%v", cacheQncAgentClosureIdPrefix, id) var resp AgentClosure - err := m.QueryRowCtx(ctx, &resp, tydataAgentClosureIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentClosureIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentClosureRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -109,9 +109,9 @@ func (m *defaultAgentClosureModel) FindOne(ctx context.Context, id int64) (*Agen } func (m *defaultAgentClosureModel) FindOneByAncestorIdDescendantId(ctx context.Context, ancestorId int64, descendantId int64) (*AgentClosure, error) { - tydataAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureAncestorIdDescendantIdPrefix, ancestorId, descendantId) + qncAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureAncestorIdDescendantIdPrefix, ancestorId, descendantId) var resp AgentClosure - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentClosureAncestorIdDescendantIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentClosureAncestorIdDescendantIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `ancestor_id` = ? and `descendant_id` = ? and del_state = ? limit 1", agentClosureRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, ancestorId, descendantId, globalkey.DelStateNo); err != nil { return nil, err @@ -129,9 +129,9 @@ func (m *defaultAgentClosureModel) FindOneByAncestorIdDescendantId(ctx context.C } func (m *defaultAgentClosureModel) FindOneByDescendantIdDepth(ctx context.Context, descendantId int64, depth int64) (*AgentClosure, error) { - tydataAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureDescendantIdDepthPrefix, descendantId, depth) + qncAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureDescendantIdDepthPrefix, descendantId, depth) var resp AgentClosure - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentClosureDescendantIdDepthKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentClosureDescendantIdDepthKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `descendant_id` = ? and `depth` = ? and del_state = ? limit 1", agentClosureRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, descendantId, depth, globalkey.DelStateNo); err != nil { return nil, err @@ -153,16 +153,16 @@ func (m *defaultAgentClosureModel) Update(ctx context.Context, session sqlx.Sess if err != nil { return nil, err } - tydataAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureAncestorIdDescendantIdPrefix, data.AncestorId, data.DescendantId) - tydataAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureDescendantIdDepthPrefix, data.DescendantId, data.Depth) - tydataAgentClosureIdKey := fmt.Sprintf("%s%v", cacheTydataAgentClosureIdPrefix, data.Id) + qncAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureAncestorIdDescendantIdPrefix, data.AncestorId, data.DescendantId) + qncAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureDescendantIdDepthPrefix, data.DescendantId, data.Depth) + qncAgentClosureIdKey := fmt.Sprintf("%s%v", cacheQncAgentClosureIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentClosureRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.AncestorId, newData.DescendantId, newData.Depth, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.AncestorId, newData.DescendantId, newData.Depth, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentClosureAncestorIdDescendantIdKey, tydataAgentClosureDescendantIdDepthKey, tydataAgentClosureIdKey) + }, qncAgentClosureAncestorIdDescendantIdKey, qncAgentClosureDescendantIdDepthKey, qncAgentClosureIdKey) } func (m *defaultAgentClosureModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentClosure) error { @@ -177,16 +177,16 @@ func (m *defaultAgentClosureModel) UpdateWithVersion(ctx context.Context, sessio if err != nil { return err } - tydataAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureAncestorIdDescendantIdPrefix, data.AncestorId, data.DescendantId) - tydataAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureDescendantIdDepthPrefix, data.DescendantId, data.Depth) - tydataAgentClosureIdKey := fmt.Sprintf("%s%v", cacheTydataAgentClosureIdPrefix, data.Id) + qncAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureAncestorIdDescendantIdPrefix, data.AncestorId, data.DescendantId) + qncAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureDescendantIdDepthPrefix, data.DescendantId, data.Depth) + qncAgentClosureIdKey := fmt.Sprintf("%s%v", cacheQncAgentClosureIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentClosureRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.AncestorId, newData.DescendantId, newData.Depth, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.AncestorId, newData.DescendantId, newData.Depth, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentClosureAncestorIdDescendantIdKey, tydataAgentClosureDescendantIdDepthKey, tydataAgentClosureIdKey) + }, qncAgentClosureAncestorIdDescendantIdKey, qncAgentClosureDescendantIdDepthKey, qncAgentClosureIdKey) if err != nil { return err } @@ -205,7 +205,7 @@ func (m *defaultAgentClosureModel) DeleteSoft(ctx context.Context, session sqlx. data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentClosureModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentClosureModel delete err : %+v", err) } return nil } @@ -409,20 +409,20 @@ func (m *defaultAgentClosureModel) Delete(ctx context.Context, session sqlx.Sess return err } - tydataAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureAncestorIdDescendantIdPrefix, data.AncestorId, data.DescendantId) - tydataAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentClosureDescendantIdDepthPrefix, data.DescendantId, data.Depth) - tydataAgentClosureIdKey := fmt.Sprintf("%s%v", cacheTydataAgentClosureIdPrefix, id) + qncAgentClosureAncestorIdDescendantIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureAncestorIdDescendantIdPrefix, data.AncestorId, data.DescendantId) + qncAgentClosureDescendantIdDepthKey := fmt.Sprintf("%s%v:%v", cacheQncAgentClosureDescendantIdDepthPrefix, data.DescendantId, data.Depth) + qncAgentClosureIdKey := fmt.Sprintf("%s%v", cacheQncAgentClosureIdPrefix, id) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentClosureAncestorIdDescendantIdKey, tydataAgentClosureDescendantIdDepthKey, tydataAgentClosureIdKey) + }, qncAgentClosureAncestorIdDescendantIdKey, qncAgentClosureDescendantIdDepthKey, qncAgentClosureIdKey) return err } func (m *defaultAgentClosureModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentClosureIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentClosureIdPrefix, primary) } func (m *defaultAgentClosureModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentClosureRows, m.table) diff --git a/app/user/model/agentCommissionDeductionModel_gen.go b/app/user/model/agentCommissionDeductionModel_gen.go index b397110..69c4e43 100644 --- a/app/user/model/agentCommissionDeductionModel_gen.go +++ b/app/user/model/agentCommissionDeductionModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,7 +26,7 @@ var ( agentCommissionDeductionRowsExpectAutoSet = strings.Join(stringx.Remove(agentCommissionDeductionFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentCommissionDeductionRowsWithPlaceHolder = strings.Join(stringx.Remove(agentCommissionDeductionFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentCommissionDeductionIdPrefix = "cache:tydata:agentCommissionDeduction:id:" + cacheQncAgentCommissionDeductionIdPrefix = "cache:qnc:agentCommissionDeduction:id:" ) type ( @@ -78,20 +78,20 @@ func newAgentCommissionDeductionModel(conn sqlx.SqlConn, c cache.CacheConf) *def func (m *defaultAgentCommissionDeductionModel) Insert(ctx context.Context, session sqlx.Session, data *AgentCommissionDeduction) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionDeductionIdPrefix, data.Id) + qncAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionDeductionIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentCommissionDeductionRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.DeductedAgentId, data.Amount, data.ProductId, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.AgentId, data.DeductedAgentId, data.Amount, data.ProductId, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentCommissionDeductionIdKey) + }, qncAgentCommissionDeductionIdKey) } func (m *defaultAgentCommissionDeductionModel) FindOne(ctx context.Context, id int64) (*AgentCommissionDeduction, error) { - tydataAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionDeductionIdPrefix, id) + qncAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionDeductionIdPrefix, id) var resp AgentCommissionDeduction - err := m.QueryRowCtx(ctx, &resp, tydataAgentCommissionDeductionIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentCommissionDeductionIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentCommissionDeductionRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -106,14 +106,14 @@ func (m *defaultAgentCommissionDeductionModel) FindOne(ctx context.Context, id i } func (m *defaultAgentCommissionDeductionModel) Update(ctx context.Context, session sqlx.Session, data *AgentCommissionDeduction) (sql.Result, error) { - tydataAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionDeductionIdPrefix, data.Id) + qncAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionDeductionIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentCommissionDeductionRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.DeductedAgentId, data.Amount, data.ProductId, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id) } return conn.ExecCtx(ctx, query, data.AgentId, data.DeductedAgentId, data.Amount, data.ProductId, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id) - }, tydataAgentCommissionDeductionIdKey) + }, qncAgentCommissionDeductionIdKey) } func (m *defaultAgentCommissionDeductionModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentCommissionDeduction) error { @@ -124,14 +124,14 @@ func (m *defaultAgentCommissionDeductionModel) UpdateWithVersion(ctx context.Con var sqlResult sql.Result var err error - tydataAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionDeductionIdPrefix, data.Id) + qncAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionDeductionIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentCommissionDeductionRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.DeductedAgentId, data.Amount, data.ProductId, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) } return conn.ExecCtx(ctx, query, data.AgentId, data.DeductedAgentId, data.Amount, data.ProductId, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) - }, tydataAgentCommissionDeductionIdKey) + }, qncAgentCommissionDeductionIdKey) if err != nil { return err } @@ -150,7 +150,7 @@ func (m *defaultAgentCommissionDeductionModel) DeleteSoft(ctx context.Context, s data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentCommissionDeductionModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentCommissionDeductionModel delete err : %+v", err) } return nil } @@ -349,18 +349,18 @@ func (m *defaultAgentCommissionDeductionModel) SelectBuilder() squirrel.SelectBu return squirrel.Select().From(m.table) } func (m *defaultAgentCommissionDeductionModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { - tydataAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionDeductionIdPrefix, id) + qncAgentCommissionDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionDeductionIdPrefix, id) _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentCommissionDeductionIdKey) + }, qncAgentCommissionDeductionIdKey) return err } func (m *defaultAgentCommissionDeductionModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentCommissionDeductionIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentCommissionDeductionIdPrefix, primary) } func (m *defaultAgentCommissionDeductionModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentCommissionDeductionRows, m.table) diff --git a/app/user/model/agentCommissionModel_gen.go b/app/user/model/agentCommissionModel_gen.go index 2353856..ea1e0b8 100644 --- a/app/user/model/agentCommissionModel_gen.go +++ b/app/user/model/agentCommissionModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,7 +26,7 @@ var ( agentCommissionRowsExpectAutoSet = strings.Join(stringx.Remove(agentCommissionFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentCommissionRowsWithPlaceHolder = strings.Join(stringx.Remove(agentCommissionFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentCommissionIdPrefix = "cache:tydata:agentCommission:id:" + cacheQncAgentCommissionIdPrefix = "cache:qnc:agentCommission:id:" ) type ( @@ -77,20 +77,20 @@ func newAgentCommissionModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgent func (m *defaultAgentCommissionModel) Insert(ctx context.Context, session sqlx.Session, data *AgentCommission) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionIdPrefix, data.Id) + qncAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentCommissionRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.OrderId, data.Amount, data.ProductId, data.Status, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.AgentId, data.OrderId, data.Amount, data.ProductId, data.Status, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentCommissionIdKey) + }, qncAgentCommissionIdKey) } func (m *defaultAgentCommissionModel) FindOne(ctx context.Context, id int64) (*AgentCommission, error) { - tydataAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionIdPrefix, id) + qncAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionIdPrefix, id) var resp AgentCommission - err := m.QueryRowCtx(ctx, &resp, tydataAgentCommissionIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentCommissionIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentCommissionRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -105,14 +105,14 @@ func (m *defaultAgentCommissionModel) FindOne(ctx context.Context, id int64) (*A } func (m *defaultAgentCommissionModel) Update(ctx context.Context, session sqlx.Session, data *AgentCommission) (sql.Result, error) { - tydataAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionIdPrefix, data.Id) + qncAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentCommissionRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.OrderId, data.Amount, data.ProductId, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id) } return conn.ExecCtx(ctx, query, data.AgentId, data.OrderId, data.Amount, data.ProductId, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id) - }, tydataAgentCommissionIdKey) + }, qncAgentCommissionIdKey) } func (m *defaultAgentCommissionModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentCommission) error { @@ -123,14 +123,14 @@ func (m *defaultAgentCommissionModel) UpdateWithVersion(ctx context.Context, ses var sqlResult sql.Result var err error - tydataAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionIdPrefix, data.Id) + qncAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentCommissionRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.OrderId, data.Amount, data.ProductId, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) } return conn.ExecCtx(ctx, query, data.AgentId, data.OrderId, data.Amount, data.ProductId, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) - }, tydataAgentCommissionIdKey) + }, qncAgentCommissionIdKey) if err != nil { return err } @@ -149,7 +149,7 @@ func (m *defaultAgentCommissionModel) DeleteSoft(ctx context.Context, session sq data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentCommissionModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentCommissionModel delete err : %+v", err) } return nil } @@ -348,18 +348,18 @@ func (m *defaultAgentCommissionModel) SelectBuilder() squirrel.SelectBuilder { return squirrel.Select().From(m.table) } func (m *defaultAgentCommissionModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { - tydataAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentCommissionIdPrefix, id) + qncAgentCommissionIdKey := fmt.Sprintf("%s%v", cacheQncAgentCommissionIdPrefix, id) _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentCommissionIdKey) + }, qncAgentCommissionIdKey) return err } func (m *defaultAgentCommissionModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentCommissionIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentCommissionIdPrefix, primary) } func (m *defaultAgentCommissionModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentCommissionRows, m.table) diff --git a/app/user/model/agentLinkModel_gen.go b/app/user/model/agentLinkModel_gen.go index 1e70f39..b40eee0 100644 --- a/app/user/model/agentLinkModel_gen.go +++ b/app/user/model/agentLinkModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( agentLinkRowsExpectAutoSet = strings.Join(stringx.Remove(agentLinkFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentLinkRowsWithPlaceHolder = strings.Join(stringx.Remove(agentLinkFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentLinkIdPrefix = "cache:tydata:agentLink:id:" - cacheTydataAgentLinkLinkIdentifierPrefix = "cache:tydata:agentLink:linkIdentifier:" + cacheQncAgentLinkIdPrefix = "cache:qnc:agentLink:id:" + cacheQncAgentLinkLinkIdentifierPrefix = "cache:qnc:agentLink:linkIdentifier:" ) type ( @@ -79,21 +79,21 @@ func newAgentLinkModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentLinkMo func (m *defaultAgentLinkModel) Insert(ctx context.Context, session sqlx.Session, data *AgentLink) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentLinkIdKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkIdPrefix, data.Id) - tydataAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkLinkIdentifierPrefix, data.LinkIdentifier) + qncAgentLinkIdKey := fmt.Sprintf("%s%v", cacheQncAgentLinkIdPrefix, data.Id) + qncAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheQncAgentLinkLinkIdentifierPrefix, data.LinkIdentifier) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentLinkRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.ProductId, data.Price, data.UserId, data.AgentId, data.LinkIdentifier, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.ProductId, data.Price, data.UserId, data.AgentId, data.LinkIdentifier, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentLinkIdKey, tydataAgentLinkLinkIdentifierKey) + }, qncAgentLinkIdKey, qncAgentLinkLinkIdentifierKey) } func (m *defaultAgentLinkModel) FindOne(ctx context.Context, id int64) (*AgentLink, error) { - tydataAgentLinkIdKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkIdPrefix, id) + qncAgentLinkIdKey := fmt.Sprintf("%s%v", cacheQncAgentLinkIdPrefix, id) var resp AgentLink - err := m.QueryRowCtx(ctx, &resp, tydataAgentLinkIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentLinkIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentLinkRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -108,9 +108,9 @@ func (m *defaultAgentLinkModel) FindOne(ctx context.Context, id int64) (*AgentLi } func (m *defaultAgentLinkModel) FindOneByLinkIdentifier(ctx context.Context, linkIdentifier string) (*AgentLink, error) { - tydataAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkLinkIdentifierPrefix, linkIdentifier) + qncAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheQncAgentLinkLinkIdentifierPrefix, linkIdentifier) var resp AgentLink - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentLinkLinkIdentifierKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentLinkLinkIdentifierKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `link_identifier` = ? and del_state = ? limit 1", agentLinkRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, linkIdentifier, globalkey.DelStateNo); err != nil { return nil, err @@ -132,15 +132,15 @@ func (m *defaultAgentLinkModel) Update(ctx context.Context, session sqlx.Session if err != nil { return nil, err } - tydataAgentLinkIdKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkIdPrefix, data.Id) - tydataAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkLinkIdentifierPrefix, data.LinkIdentifier) + qncAgentLinkIdKey := fmt.Sprintf("%s%v", cacheQncAgentLinkIdPrefix, data.Id) + qncAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheQncAgentLinkLinkIdentifierPrefix, data.LinkIdentifier) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentLinkRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.ProductId, newData.Price, newData.UserId, newData.AgentId, newData.LinkIdentifier, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.ProductId, newData.Price, newData.UserId, newData.AgentId, newData.LinkIdentifier, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentLinkIdKey, tydataAgentLinkLinkIdentifierKey) + }, qncAgentLinkIdKey, qncAgentLinkLinkIdentifierKey) } func (m *defaultAgentLinkModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentLink) error { @@ -155,15 +155,15 @@ func (m *defaultAgentLinkModel) UpdateWithVersion(ctx context.Context, session s if err != nil { return err } - tydataAgentLinkIdKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkIdPrefix, data.Id) - tydataAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkLinkIdentifierPrefix, data.LinkIdentifier) + qncAgentLinkIdKey := fmt.Sprintf("%s%v", cacheQncAgentLinkIdPrefix, data.Id) + qncAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheQncAgentLinkLinkIdentifierPrefix, data.LinkIdentifier) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentLinkRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.ProductId, newData.Price, newData.UserId, newData.AgentId, newData.LinkIdentifier, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.ProductId, newData.Price, newData.UserId, newData.AgentId, newData.LinkIdentifier, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentLinkIdKey, tydataAgentLinkLinkIdentifierKey) + }, qncAgentLinkIdKey, qncAgentLinkLinkIdentifierKey) if err != nil { return err } @@ -182,7 +182,7 @@ func (m *defaultAgentLinkModel) DeleteSoft(ctx context.Context, session sqlx.Ses data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentLinkModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentLinkModel delete err : %+v", err) } return nil } @@ -386,19 +386,19 @@ func (m *defaultAgentLinkModel) Delete(ctx context.Context, session sqlx.Session return err } - tydataAgentLinkIdKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkIdPrefix, id) - tydataAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheTydataAgentLinkLinkIdentifierPrefix, data.LinkIdentifier) + qncAgentLinkIdKey := fmt.Sprintf("%s%v", cacheQncAgentLinkIdPrefix, id) + qncAgentLinkLinkIdentifierKey := fmt.Sprintf("%s%v", cacheQncAgentLinkLinkIdentifierPrefix, data.LinkIdentifier) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentLinkIdKey, tydataAgentLinkLinkIdentifierKey) + }, qncAgentLinkIdKey, qncAgentLinkLinkIdentifierKey) return err } func (m *defaultAgentLinkModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentLinkIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentLinkIdPrefix, primary) } func (m *defaultAgentLinkModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentLinkRows, m.table) diff --git a/app/user/model/agentMembershipConfigModel_gen.go b/app/user/model/agentMembershipConfigModel_gen.go index 50ccab5..b7f947c 100644 --- a/app/user/model/agentMembershipConfigModel_gen.go +++ b/app/user/model/agentMembershipConfigModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( agentMembershipConfigRowsExpectAutoSet = strings.Join(stringx.Remove(agentMembershipConfigFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentMembershipConfigRowsWithPlaceHolder = strings.Join(stringx.Remove(agentMembershipConfigFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentMembershipConfigIdPrefix = "cache:tydata:agentMembershipConfig:id:" - cacheTydataAgentMembershipConfigLevelNamePrefix = "cache:tydata:agentMembershipConfig:levelName:" + cacheQncAgentMembershipConfigIdPrefix = "cache:qnc:agentMembershipConfig:id:" + cacheQncAgentMembershipConfigLevelNamePrefix = "cache:qnc:agentMembershipConfig:levelName:" ) type ( @@ -88,21 +88,21 @@ func newAgentMembershipConfigModel(conn sqlx.SqlConn, c cache.CacheConf) *defaul func (m *defaultAgentMembershipConfigModel) Insert(ctx context.Context, session sqlx.Session, data *AgentMembershipConfig) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigIdPrefix, data.Id) - tydataAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigLevelNamePrefix, data.LevelName) + qncAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigIdPrefix, data.Id) + qncAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigLevelNamePrefix, data.LevelName) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentMembershipConfigRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.LevelName, data.Price, data.ReportCommission, data.LowerActivityReward, data.NewActivityReward, data.LowerStandardCount, data.NewLowerStandardCount, data.LowerWithdrawRewardRatio, data.LowerConvertVipReward, data.LowerConvertSvipReward, data.ExemptionAmount, data.PriceIncreaseMax, data.PriceRatio, data.PriceIncreaseAmount, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.LevelName, data.Price, data.ReportCommission, data.LowerActivityReward, data.NewActivityReward, data.LowerStandardCount, data.NewLowerStandardCount, data.LowerWithdrawRewardRatio, data.LowerConvertVipReward, data.LowerConvertSvipReward, data.ExemptionAmount, data.PriceIncreaseMax, data.PriceRatio, data.PriceIncreaseAmount, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentMembershipConfigIdKey, tydataAgentMembershipConfigLevelNameKey) + }, qncAgentMembershipConfigIdKey, qncAgentMembershipConfigLevelNameKey) } func (m *defaultAgentMembershipConfigModel) FindOne(ctx context.Context, id int64) (*AgentMembershipConfig, error) { - tydataAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigIdPrefix, id) + qncAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigIdPrefix, id) var resp AgentMembershipConfig - err := m.QueryRowCtx(ctx, &resp, tydataAgentMembershipConfigIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentMembershipConfigIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentMembershipConfigRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -117,9 +117,9 @@ func (m *defaultAgentMembershipConfigModel) FindOne(ctx context.Context, id int6 } func (m *defaultAgentMembershipConfigModel) FindOneByLevelName(ctx context.Context, levelName string) (*AgentMembershipConfig, error) { - tydataAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigLevelNamePrefix, levelName) + qncAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigLevelNamePrefix, levelName) var resp AgentMembershipConfig - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentMembershipConfigLevelNameKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentMembershipConfigLevelNameKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `level_name` = ? and del_state = ? limit 1", agentMembershipConfigRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, levelName, globalkey.DelStateNo); err != nil { return nil, err @@ -141,15 +141,15 @@ func (m *defaultAgentMembershipConfigModel) Update(ctx context.Context, session if err != nil { return nil, err } - tydataAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigIdPrefix, data.Id) - tydataAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigLevelNamePrefix, data.LevelName) + qncAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigIdPrefix, data.Id) + qncAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigLevelNamePrefix, data.LevelName) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentMembershipConfigRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.LevelName, newData.Price, newData.ReportCommission, newData.LowerActivityReward, newData.NewActivityReward, newData.LowerStandardCount, newData.NewLowerStandardCount, newData.LowerWithdrawRewardRatio, newData.LowerConvertVipReward, newData.LowerConvertSvipReward, newData.ExemptionAmount, newData.PriceIncreaseMax, newData.PriceRatio, newData.PriceIncreaseAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.LevelName, newData.Price, newData.ReportCommission, newData.LowerActivityReward, newData.NewActivityReward, newData.LowerStandardCount, newData.NewLowerStandardCount, newData.LowerWithdrawRewardRatio, newData.LowerConvertVipReward, newData.LowerConvertSvipReward, newData.ExemptionAmount, newData.PriceIncreaseMax, newData.PriceRatio, newData.PriceIncreaseAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentMembershipConfigIdKey, tydataAgentMembershipConfigLevelNameKey) + }, qncAgentMembershipConfigIdKey, qncAgentMembershipConfigLevelNameKey) } func (m *defaultAgentMembershipConfigModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentMembershipConfig) error { @@ -164,15 +164,15 @@ func (m *defaultAgentMembershipConfigModel) UpdateWithVersion(ctx context.Contex if err != nil { return err } - tydataAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigIdPrefix, data.Id) - tydataAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigLevelNamePrefix, data.LevelName) + qncAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigIdPrefix, data.Id) + qncAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigLevelNamePrefix, data.LevelName) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentMembershipConfigRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.LevelName, newData.Price, newData.ReportCommission, newData.LowerActivityReward, newData.NewActivityReward, newData.LowerStandardCount, newData.NewLowerStandardCount, newData.LowerWithdrawRewardRatio, newData.LowerConvertVipReward, newData.LowerConvertSvipReward, newData.ExemptionAmount, newData.PriceIncreaseMax, newData.PriceRatio, newData.PriceIncreaseAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.LevelName, newData.Price, newData.ReportCommission, newData.LowerActivityReward, newData.NewActivityReward, newData.LowerStandardCount, newData.NewLowerStandardCount, newData.LowerWithdrawRewardRatio, newData.LowerConvertVipReward, newData.LowerConvertSvipReward, newData.ExemptionAmount, newData.PriceIncreaseMax, newData.PriceRatio, newData.PriceIncreaseAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentMembershipConfigIdKey, tydataAgentMembershipConfigLevelNameKey) + }, qncAgentMembershipConfigIdKey, qncAgentMembershipConfigLevelNameKey) if err != nil { return err } @@ -191,7 +191,7 @@ func (m *defaultAgentMembershipConfigModel) DeleteSoft(ctx context.Context, sess data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentMembershipConfigModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentMembershipConfigModel delete err : %+v", err) } return nil } @@ -395,19 +395,19 @@ func (m *defaultAgentMembershipConfigModel) Delete(ctx context.Context, session return err } - tydataAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigIdPrefix, id) - tydataAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigLevelNamePrefix, data.LevelName) + qncAgentMembershipConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigIdPrefix, id) + qncAgentMembershipConfigLevelNameKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigLevelNamePrefix, data.LevelName) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentMembershipConfigIdKey, tydataAgentMembershipConfigLevelNameKey) + }, qncAgentMembershipConfigIdKey, qncAgentMembershipConfigLevelNameKey) return err } func (m *defaultAgentMembershipConfigModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentMembershipConfigIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentMembershipConfigIdPrefix, primary) } func (m *defaultAgentMembershipConfigModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentMembershipConfigRows, m.table) diff --git a/app/user/model/agentMembershipRechargeOrderModel_gen.go b/app/user/model/agentMembershipRechargeOrderModel_gen.go index 669e440..acb0df8 100644 --- a/app/user/model/agentMembershipRechargeOrderModel_gen.go +++ b/app/user/model/agentMembershipRechargeOrderModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,7 +26,7 @@ var ( agentMembershipRechargeOrderRowsExpectAutoSet = strings.Join(stringx.Remove(agentMembershipRechargeOrderFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentMembershipRechargeOrderRowsWithPlaceHolder = strings.Join(stringx.Remove(agentMembershipRechargeOrderFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentMembershipRechargeOrderIdPrefix = "cache:tydata:agentMembershipRechargeOrder:id:" + cacheQncAgentMembershipRechargeOrderIdPrefix = "cache:qnc:agentMembershipRechargeOrder:id:" ) type ( @@ -79,20 +79,20 @@ func newAgentMembershipRechargeOrderModel(conn sqlx.SqlConn, c cache.CacheConf) func (m *defaultAgentMembershipRechargeOrderModel) Insert(ctx context.Context, session sqlx.Session, data *AgentMembershipRechargeOrder) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipRechargeOrderIdPrefix, data.Id) + qncAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipRechargeOrderIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentMembershipRechargeOrderRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.UserId, data.AgentId, data.LevelName, data.Amount, data.PaymentMethod, data.TransactionId, data.Status, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.UserId, data.AgentId, data.LevelName, data.Amount, data.PaymentMethod, data.TransactionId, data.Status, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentMembershipRechargeOrderIdKey) + }, qncAgentMembershipRechargeOrderIdKey) } func (m *defaultAgentMembershipRechargeOrderModel) FindOne(ctx context.Context, id int64) (*AgentMembershipRechargeOrder, error) { - tydataAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipRechargeOrderIdPrefix, id) + qncAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipRechargeOrderIdPrefix, id) var resp AgentMembershipRechargeOrder - err := m.QueryRowCtx(ctx, &resp, tydataAgentMembershipRechargeOrderIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentMembershipRechargeOrderIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentMembershipRechargeOrderRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -107,14 +107,14 @@ func (m *defaultAgentMembershipRechargeOrderModel) FindOne(ctx context.Context, } func (m *defaultAgentMembershipRechargeOrderModel) Update(ctx context.Context, session sqlx.Session, data *AgentMembershipRechargeOrder) (sql.Result, error) { - tydataAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipRechargeOrderIdPrefix, data.Id) + qncAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipRechargeOrderIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentMembershipRechargeOrderRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.UserId, data.AgentId, data.LevelName, data.Amount, data.PaymentMethod, data.TransactionId, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id) } return conn.ExecCtx(ctx, query, data.UserId, data.AgentId, data.LevelName, data.Amount, data.PaymentMethod, data.TransactionId, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id) - }, tydataAgentMembershipRechargeOrderIdKey) + }, qncAgentMembershipRechargeOrderIdKey) } func (m *defaultAgentMembershipRechargeOrderModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentMembershipRechargeOrder) error { @@ -125,14 +125,14 @@ func (m *defaultAgentMembershipRechargeOrderModel) UpdateWithVersion(ctx context var sqlResult sql.Result var err error - tydataAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipRechargeOrderIdPrefix, data.Id) + qncAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipRechargeOrderIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentMembershipRechargeOrderRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.UserId, data.AgentId, data.LevelName, data.Amount, data.PaymentMethod, data.TransactionId, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) } return conn.ExecCtx(ctx, query, data.UserId, data.AgentId, data.LevelName, data.Amount, data.PaymentMethod, data.TransactionId, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) - }, tydataAgentMembershipRechargeOrderIdKey) + }, qncAgentMembershipRechargeOrderIdKey) if err != nil { return err } @@ -151,7 +151,7 @@ func (m *defaultAgentMembershipRechargeOrderModel) DeleteSoft(ctx context.Contex data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentMembershipRechargeOrderModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentMembershipRechargeOrderModel delete err : %+v", err) } return nil } @@ -350,18 +350,18 @@ func (m *defaultAgentMembershipRechargeOrderModel) SelectBuilder() squirrel.Sele return squirrel.Select().From(m.table) } func (m *defaultAgentMembershipRechargeOrderModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { - tydataAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipRechargeOrderIdPrefix, id) + qncAgentMembershipRechargeOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipRechargeOrderIdPrefix, id) _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentMembershipRechargeOrderIdKey) + }, qncAgentMembershipRechargeOrderIdKey) return err } func (m *defaultAgentMembershipRechargeOrderModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentMembershipRechargeOrderIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentMembershipRechargeOrderIdPrefix, primary) } func (m *defaultAgentMembershipRechargeOrderModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentMembershipRechargeOrderRows, m.table) diff --git a/app/user/model/agentMembershipUserConfigModel_gen.go b/app/user/model/agentMembershipUserConfigModel_gen.go index 540085c..aebe9fd 100644 --- a/app/user/model/agentMembershipUserConfigModel_gen.go +++ b/app/user/model/agentMembershipUserConfigModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( agentMembershipUserConfigRowsExpectAutoSet = strings.Join(stringx.Remove(agentMembershipUserConfigFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentMembershipUserConfigRowsWithPlaceHolder = strings.Join(stringx.Remove(agentMembershipUserConfigFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentMembershipUserConfigIdPrefix = "cache:tydata:agentMembershipUserConfig:id:" - cacheTydataAgentMembershipUserConfigAgentIdProductIdPrefix = "cache:tydata:agentMembershipUserConfig:agentId:productId:" + cacheQncAgentMembershipUserConfigIdPrefix = "cache:qnc:agentMembershipUserConfig:id:" + cacheQncAgentMembershipUserConfigAgentIdProductIdPrefix = "cache:qnc:agentMembershipUserConfig:agentId:productId:" ) type ( @@ -81,21 +81,21 @@ func newAgentMembershipUserConfigModel(conn sqlx.SqlConn, c cache.CacheConf) *de func (m *defaultAgentMembershipUserConfigModel) Insert(ctx context.Context, session sqlx.Session, data *AgentMembershipUserConfig) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentMembershipUserConfigAgentIdProductIdPrefix, data.AgentId, data.ProductId) - tydataAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipUserConfigIdPrefix, data.Id) + qncAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentMembershipUserConfigAgentIdProductIdPrefix, data.AgentId, data.ProductId) + qncAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipUserConfigIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentMembershipUserConfigRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.UserId, data.AgentId, data.ProductId, data.PriceRangeFrom, data.PriceRangeTo, data.PriceRatio, data.PriceIncreaseAmount, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.UserId, data.AgentId, data.ProductId, data.PriceRangeFrom, data.PriceRangeTo, data.PriceRatio, data.PriceIncreaseAmount, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentMembershipUserConfigAgentIdProductIdKey, tydataAgentMembershipUserConfigIdKey) + }, qncAgentMembershipUserConfigAgentIdProductIdKey, qncAgentMembershipUserConfigIdKey) } func (m *defaultAgentMembershipUserConfigModel) FindOne(ctx context.Context, id int64) (*AgentMembershipUserConfig, error) { - tydataAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipUserConfigIdPrefix, id) + qncAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipUserConfigIdPrefix, id) var resp AgentMembershipUserConfig - err := m.QueryRowCtx(ctx, &resp, tydataAgentMembershipUserConfigIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentMembershipUserConfigIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentMembershipUserConfigRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -110,9 +110,9 @@ func (m *defaultAgentMembershipUserConfigModel) FindOne(ctx context.Context, id } func (m *defaultAgentMembershipUserConfigModel) FindOneByAgentIdProductId(ctx context.Context, agentId int64, productId int64) (*AgentMembershipUserConfig, error) { - tydataAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentMembershipUserConfigAgentIdProductIdPrefix, agentId, productId) + qncAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentMembershipUserConfigAgentIdProductIdPrefix, agentId, productId) var resp AgentMembershipUserConfig - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentMembershipUserConfigAgentIdProductIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentMembershipUserConfigAgentIdProductIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `agent_id` = ? and `product_id` = ? and del_state = ? limit 1", agentMembershipUserConfigRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, agentId, productId, globalkey.DelStateNo); err != nil { return nil, err @@ -134,15 +134,15 @@ func (m *defaultAgentMembershipUserConfigModel) Update(ctx context.Context, sess if err != nil { return nil, err } - tydataAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentMembershipUserConfigAgentIdProductIdPrefix, data.AgentId, data.ProductId) - tydataAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipUserConfigIdPrefix, data.Id) + qncAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentMembershipUserConfigAgentIdProductIdPrefix, data.AgentId, data.ProductId) + qncAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipUserConfigIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentMembershipUserConfigRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.UserId, newData.AgentId, newData.ProductId, newData.PriceRangeFrom, newData.PriceRangeTo, newData.PriceRatio, newData.PriceIncreaseAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.UserId, newData.AgentId, newData.ProductId, newData.PriceRangeFrom, newData.PriceRangeTo, newData.PriceRatio, newData.PriceIncreaseAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentMembershipUserConfigAgentIdProductIdKey, tydataAgentMembershipUserConfigIdKey) + }, qncAgentMembershipUserConfigAgentIdProductIdKey, qncAgentMembershipUserConfigIdKey) } func (m *defaultAgentMembershipUserConfigModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentMembershipUserConfig) error { @@ -157,15 +157,15 @@ func (m *defaultAgentMembershipUserConfigModel) UpdateWithVersion(ctx context.Co if err != nil { return err } - tydataAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentMembershipUserConfigAgentIdProductIdPrefix, data.AgentId, data.ProductId) - tydataAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipUserConfigIdPrefix, data.Id) + qncAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentMembershipUserConfigAgentIdProductIdPrefix, data.AgentId, data.ProductId) + qncAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipUserConfigIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentMembershipUserConfigRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.UserId, newData.AgentId, newData.ProductId, newData.PriceRangeFrom, newData.PriceRangeTo, newData.PriceRatio, newData.PriceIncreaseAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.UserId, newData.AgentId, newData.ProductId, newData.PriceRangeFrom, newData.PriceRangeTo, newData.PriceRatio, newData.PriceIncreaseAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentMembershipUserConfigAgentIdProductIdKey, tydataAgentMembershipUserConfigIdKey) + }, qncAgentMembershipUserConfigAgentIdProductIdKey, qncAgentMembershipUserConfigIdKey) if err != nil { return err } @@ -184,7 +184,7 @@ func (m *defaultAgentMembershipUserConfigModel) DeleteSoft(ctx context.Context, data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentMembershipUserConfigModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentMembershipUserConfigModel delete err : %+v", err) } return nil } @@ -388,19 +388,19 @@ func (m *defaultAgentMembershipUserConfigModel) Delete(ctx context.Context, sess return err } - tydataAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentMembershipUserConfigAgentIdProductIdPrefix, data.AgentId, data.ProductId) - tydataAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentMembershipUserConfigIdPrefix, id) + qncAgentMembershipUserConfigAgentIdProductIdKey := fmt.Sprintf("%s%v:%v", cacheQncAgentMembershipUserConfigAgentIdProductIdPrefix, data.AgentId, data.ProductId) + qncAgentMembershipUserConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentMembershipUserConfigIdPrefix, id) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentMembershipUserConfigAgentIdProductIdKey, tydataAgentMembershipUserConfigIdKey) + }, qncAgentMembershipUserConfigAgentIdProductIdKey, qncAgentMembershipUserConfigIdKey) return err } func (m *defaultAgentMembershipUserConfigModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentMembershipUserConfigIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentMembershipUserConfigIdPrefix, primary) } func (m *defaultAgentMembershipUserConfigModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentMembershipUserConfigRows, m.table) diff --git a/app/user/model/agentModel_gen.go b/app/user/model/agentModel_gen.go index 01aae09..bbdd4f9 100644 --- a/app/user/model/agentModel_gen.go +++ b/app/user/model/agentModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,9 +26,9 @@ var ( agentRowsExpectAutoSet = strings.Join(stringx.Remove(agentFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentRowsWithPlaceHolder = strings.Join(stringx.Remove(agentFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentIdPrefix = "cache:tydata:agent:id:" - cacheTydataAgentMobilePrefix = "cache:tydata:agent:mobile:" - cacheTydataAgentUserIdPrefix = "cache:tydata:agent:userId:" + cacheQncAgentIdPrefix = "cache:qnc:agent:id:" + cacheQncAgentMobilePrefix = "cache:qnc:agent:mobile:" + cacheQncAgentUserIdPrefix = "cache:qnc:agent:userId:" ) type ( @@ -82,22 +82,22 @@ func newAgentModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentModel { func (m *defaultAgentModel) Insert(ctx context.Context, session sqlx.Session, data *Agent) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentIdPrefix, data.Id) - tydataAgentMobileKey := fmt.Sprintf("%s%v", cacheTydataAgentMobilePrefix, data.Mobile) - tydataAgentUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentUserIdPrefix, data.UserId) + qncAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentIdPrefix, data.Id) + qncAgentMobileKey := fmt.Sprintf("%s%v", cacheQncAgentMobilePrefix, data.Mobile) + qncAgentUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentUserIdPrefix, data.UserId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.UserId, data.LevelName, data.Region, data.Mobile, data.WechatId, data.MembershipExpiryTime, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.UserId, data.LevelName, data.Region, data.Mobile, data.WechatId, data.MembershipExpiryTime, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentIdKey, tydataAgentMobileKey, tydataAgentUserIdKey) + }, qncAgentIdKey, qncAgentMobileKey, qncAgentUserIdKey) } func (m *defaultAgentModel) FindOne(ctx context.Context, id int64) (*Agent, error) { - tydataAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentIdPrefix, id) + qncAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentIdPrefix, id) var resp Agent - err := m.QueryRowCtx(ctx, &resp, tydataAgentIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -112,9 +112,9 @@ func (m *defaultAgentModel) FindOne(ctx context.Context, id int64) (*Agent, erro } func (m *defaultAgentModel) FindOneByMobile(ctx context.Context, mobile string) (*Agent, error) { - tydataAgentMobileKey := fmt.Sprintf("%s%v", cacheTydataAgentMobilePrefix, mobile) + qncAgentMobileKey := fmt.Sprintf("%s%v", cacheQncAgentMobilePrefix, mobile) var resp Agent - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentMobileKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentMobileKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `mobile` = ? and del_state = ? limit 1", agentRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, mobile, globalkey.DelStateNo); err != nil { return nil, err @@ -132,9 +132,9 @@ func (m *defaultAgentModel) FindOneByMobile(ctx context.Context, mobile string) } func (m *defaultAgentModel) FindOneByUserId(ctx context.Context, userId int64) (*Agent, error) { - tydataAgentUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentUserIdPrefix, userId) + qncAgentUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentUserIdPrefix, userId) var resp Agent - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentUserIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentUserIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `user_id` = ? and del_state = ? limit 1", agentRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, userId, globalkey.DelStateNo); err != nil { return nil, err @@ -156,16 +156,16 @@ func (m *defaultAgentModel) Update(ctx context.Context, session sqlx.Session, ne if err != nil { return nil, err } - tydataAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentIdPrefix, data.Id) - tydataAgentMobileKey := fmt.Sprintf("%s%v", cacheTydataAgentMobilePrefix, data.Mobile) - tydataAgentUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentUserIdPrefix, data.UserId) + qncAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentIdPrefix, data.Id) + qncAgentMobileKey := fmt.Sprintf("%s%v", cacheQncAgentMobilePrefix, data.Mobile) + qncAgentUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentUserIdPrefix, data.UserId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.UserId, newData.LevelName, newData.Region, newData.Mobile, newData.WechatId, newData.MembershipExpiryTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.UserId, newData.LevelName, newData.Region, newData.Mobile, newData.WechatId, newData.MembershipExpiryTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentIdKey, tydataAgentMobileKey, tydataAgentUserIdKey) + }, qncAgentIdKey, qncAgentMobileKey, qncAgentUserIdKey) } func (m *defaultAgentModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *Agent) error { @@ -180,16 +180,16 @@ func (m *defaultAgentModel) UpdateWithVersion(ctx context.Context, session sqlx. if err != nil { return err } - tydataAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentIdPrefix, data.Id) - tydataAgentMobileKey := fmt.Sprintf("%s%v", cacheTydataAgentMobilePrefix, data.Mobile) - tydataAgentUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentUserIdPrefix, data.UserId) + qncAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentIdPrefix, data.Id) + qncAgentMobileKey := fmt.Sprintf("%s%v", cacheQncAgentMobilePrefix, data.Mobile) + qncAgentUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentUserIdPrefix, data.UserId) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.UserId, newData.LevelName, newData.Region, newData.Mobile, newData.WechatId, newData.MembershipExpiryTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.UserId, newData.LevelName, newData.Region, newData.Mobile, newData.WechatId, newData.MembershipExpiryTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentIdKey, tydataAgentMobileKey, tydataAgentUserIdKey) + }, qncAgentIdKey, qncAgentMobileKey, qncAgentUserIdKey) if err != nil { return err } @@ -208,7 +208,7 @@ func (m *defaultAgentModel) DeleteSoft(ctx context.Context, session sqlx.Session data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentModel delete err : %+v", err) } return nil } @@ -412,20 +412,20 @@ func (m *defaultAgentModel) Delete(ctx context.Context, session sqlx.Session, id return err } - tydataAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentIdPrefix, id) - tydataAgentMobileKey := fmt.Sprintf("%s%v", cacheTydataAgentMobilePrefix, data.Mobile) - tydataAgentUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentUserIdPrefix, data.UserId) + qncAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentIdPrefix, id) + qncAgentMobileKey := fmt.Sprintf("%s%v", cacheQncAgentMobilePrefix, data.Mobile) + qncAgentUserIdKey := fmt.Sprintf("%s%v", cacheQncAgentUserIdPrefix, data.UserId) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentIdKey, tydataAgentMobileKey, tydataAgentUserIdKey) + }, qncAgentIdKey, qncAgentMobileKey, qncAgentUserIdKey) return err } func (m *defaultAgentModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentIdPrefix, primary) } func (m *defaultAgentModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentRows, m.table) diff --git a/app/user/model/agentOrderModel_gen.go b/app/user/model/agentOrderModel_gen.go index 81a56d9..e8dac91 100644 --- a/app/user/model/agentOrderModel_gen.go +++ b/app/user/model/agentOrderModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( agentOrderRowsExpectAutoSet = strings.Join(stringx.Remove(agentOrderFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentOrderRowsWithPlaceHolder = strings.Join(stringx.Remove(agentOrderFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentOrderIdPrefix = "cache:tydata:agentOrder:id:" - cacheTydataAgentOrderOrderIdPrefix = "cache:tydata:agentOrder:orderId:" + cacheQncAgentOrderIdPrefix = "cache:qnc:agentOrder:id:" + cacheQncAgentOrderOrderIdPrefix = "cache:qnc:agentOrder:orderId:" ) type ( @@ -76,21 +76,21 @@ func newAgentOrderModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentOrder func (m *defaultAgentOrderModel) Insert(ctx context.Context, session sqlx.Session, data *AgentOrder) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderIdPrefix, data.Id) - tydataAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderOrderIdPrefix, data.OrderId) + qncAgentOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderIdPrefix, data.Id) + qncAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderOrderIdPrefix, data.OrderId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, agentOrderRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.OrderId, data.AgentId, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.OrderId, data.AgentId, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentOrderIdKey, tydataAgentOrderOrderIdKey) + }, qncAgentOrderIdKey, qncAgentOrderOrderIdKey) } func (m *defaultAgentOrderModel) FindOne(ctx context.Context, id int64) (*AgentOrder, error) { - tydataAgentOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderIdPrefix, id) + qncAgentOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderIdPrefix, id) var resp AgentOrder - err := m.QueryRowCtx(ctx, &resp, tydataAgentOrderIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentOrderIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentOrderRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -105,9 +105,9 @@ func (m *defaultAgentOrderModel) FindOne(ctx context.Context, id int64) (*AgentO } func (m *defaultAgentOrderModel) FindOneByOrderId(ctx context.Context, orderId int64) (*AgentOrder, error) { - tydataAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderOrderIdPrefix, orderId) + qncAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderOrderIdPrefix, orderId) var resp AgentOrder - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentOrderOrderIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentOrderOrderIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `order_id` = ? and del_state = ? limit 1", agentOrderRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, orderId, globalkey.DelStateNo); err != nil { return nil, err @@ -129,15 +129,15 @@ func (m *defaultAgentOrderModel) Update(ctx context.Context, session sqlx.Sessio if err != nil { return nil, err } - tydataAgentOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderIdPrefix, data.Id) - tydataAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderOrderIdPrefix, data.OrderId) + qncAgentOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderIdPrefix, data.Id) + qncAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderOrderIdPrefix, data.OrderId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentOrderRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.OrderId, newData.AgentId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.OrderId, newData.AgentId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentOrderIdKey, tydataAgentOrderOrderIdKey) + }, qncAgentOrderIdKey, qncAgentOrderOrderIdKey) } func (m *defaultAgentOrderModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentOrder) error { @@ -152,15 +152,15 @@ func (m *defaultAgentOrderModel) UpdateWithVersion(ctx context.Context, session if err != nil { return err } - tydataAgentOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderIdPrefix, data.Id) - tydataAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderOrderIdPrefix, data.OrderId) + qncAgentOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderIdPrefix, data.Id) + qncAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderOrderIdPrefix, data.OrderId) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentOrderRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.OrderId, newData.AgentId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.OrderId, newData.AgentId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentOrderIdKey, tydataAgentOrderOrderIdKey) + }, qncAgentOrderIdKey, qncAgentOrderOrderIdKey) if err != nil { return err } @@ -179,7 +179,7 @@ func (m *defaultAgentOrderModel) DeleteSoft(ctx context.Context, session sqlx.Se data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentOrderModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentOrderModel delete err : %+v", err) } return nil } @@ -383,19 +383,19 @@ func (m *defaultAgentOrderModel) Delete(ctx context.Context, session sqlx.Sessio return err } - tydataAgentOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderIdPrefix, id) - tydataAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheTydataAgentOrderOrderIdPrefix, data.OrderId) + qncAgentOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderIdPrefix, id) + qncAgentOrderOrderIdKey := fmt.Sprintf("%s%v", cacheQncAgentOrderOrderIdPrefix, data.OrderId) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentOrderIdKey, tydataAgentOrderOrderIdKey) + }, qncAgentOrderIdKey, qncAgentOrderOrderIdKey) return err } func (m *defaultAgentOrderModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentOrderIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentOrderIdPrefix, primary) } func (m *defaultAgentOrderModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentOrderRows, m.table) diff --git a/app/user/model/agentPlatformDeductionModel_gen.go b/app/user/model/agentPlatformDeductionModel_gen.go index aa1f7d8..636d994 100644 --- a/app/user/model/agentPlatformDeductionModel_gen.go +++ b/app/user/model/agentPlatformDeductionModel_gen.go @@ -17,16 +17,16 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( agentPlatformDeductionFieldNames = builder.RawFieldNames(&AgentPlatformDeduction{}) agentPlatformDeductionRows = strings.Join(agentPlatformDeductionFieldNames, ",") - agentPlatformDeductionRowsExpectAutoSet = strings.Join(stringx.Remove(agentPlatformDeductionFieldNames, "`create_time`", "`update_time`"), ",") + agentPlatformDeductionRowsExpectAutoSet = strings.Join(stringx.Remove(agentPlatformDeductionFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentPlatformDeductionRowsWithPlaceHolder = strings.Join(stringx.Remove(agentPlatformDeductionFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentPlatformDeductionIdPrefix = "cache:tydata:agentPlatformDeduction:id:" + cacheQncAgentPlatformDeductionIdPrefix = "cache:qnc:agentPlatformDeduction:id:" ) type ( @@ -76,20 +76,20 @@ func newAgentPlatformDeductionModel(conn sqlx.SqlConn, c cache.CacheConf) *defau func (m *defaultAgentPlatformDeductionModel) Insert(ctx context.Context, session sqlx.Session, data *AgentPlatformDeduction) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentPlatformDeductionIdPrefix, data.Id) + qncAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentPlatformDeductionIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentPlatformDeductionRowsExpectAutoSet) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?)", m.table, agentPlatformDeductionRowsExpectAutoSet) if session != nil { - return session.ExecCtx(ctx, query, data.Id, data.AgentId, data.Amount, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version) + return session.ExecCtx(ctx, query, data.AgentId, data.Amount, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version) } - return conn.ExecCtx(ctx, query, data.Id, data.AgentId, data.Amount, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentPlatformDeductionIdKey) + return conn.ExecCtx(ctx, query, data.AgentId, data.Amount, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version) + }, qncAgentPlatformDeductionIdKey) } func (m *defaultAgentPlatformDeductionModel) FindOne(ctx context.Context, id int64) (*AgentPlatformDeduction, error) { - tydataAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentPlatformDeductionIdPrefix, id) + qncAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentPlatformDeductionIdPrefix, id) var resp AgentPlatformDeduction - err := m.QueryRowCtx(ctx, &resp, tydataAgentPlatformDeductionIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentPlatformDeductionIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentPlatformDeductionRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -104,14 +104,14 @@ func (m *defaultAgentPlatformDeductionModel) FindOne(ctx context.Context, id int } func (m *defaultAgentPlatformDeductionModel) Update(ctx context.Context, session sqlx.Session, data *AgentPlatformDeduction) (sql.Result, error) { - tydataAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentPlatformDeductionIdPrefix, data.Id) + qncAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentPlatformDeductionIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentPlatformDeductionRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.Amount, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id) } return conn.ExecCtx(ctx, query, data.AgentId, data.Amount, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id) - }, tydataAgentPlatformDeductionIdKey) + }, qncAgentPlatformDeductionIdKey) } func (m *defaultAgentPlatformDeductionModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentPlatformDeduction) error { @@ -122,14 +122,14 @@ func (m *defaultAgentPlatformDeductionModel) UpdateWithVersion(ctx context.Conte var sqlResult sql.Result var err error - tydataAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentPlatformDeductionIdPrefix, data.Id) + qncAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentPlatformDeductionIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentPlatformDeductionRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.Amount, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) } return conn.ExecCtx(ctx, query, data.AgentId, data.Amount, data.Type, data.Status, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) - }, tydataAgentPlatformDeductionIdKey) + }, qncAgentPlatformDeductionIdKey) if err != nil { return err } @@ -148,7 +148,7 @@ func (m *defaultAgentPlatformDeductionModel) DeleteSoft(ctx context.Context, ses data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentPlatformDeductionModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentPlatformDeductionModel delete err : %+v", err) } return nil } @@ -347,18 +347,18 @@ func (m *defaultAgentPlatformDeductionModel) SelectBuilder() squirrel.SelectBuil return squirrel.Select().From(m.table) } func (m *defaultAgentPlatformDeductionModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { - tydataAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheTydataAgentPlatformDeductionIdPrefix, id) + qncAgentPlatformDeductionIdKey := fmt.Sprintf("%s%v", cacheQncAgentPlatformDeductionIdPrefix, id) _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentPlatformDeductionIdKey) + }, qncAgentPlatformDeductionIdKey) return err } func (m *defaultAgentPlatformDeductionModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentPlatformDeductionIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentPlatformDeductionIdPrefix, primary) } func (m *defaultAgentPlatformDeductionModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentPlatformDeductionRows, m.table) diff --git a/app/user/model/agentProductConfigModel_gen.go b/app/user/model/agentProductConfigModel_gen.go index 2193eec..e6dd6b5 100644 --- a/app/user/model/agentProductConfigModel_gen.go +++ b/app/user/model/agentProductConfigModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( agentProductConfigRowsExpectAutoSet = strings.Join(stringx.Remove(agentProductConfigFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentProductConfigRowsWithPlaceHolder = strings.Join(stringx.Remove(agentProductConfigFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentProductConfigIdPrefix = "cache:tydata:agentProductConfig:id:" - cacheTydataAgentProductConfigProductIdPrefix = "cache:tydata:agentProductConfig:productId:" + cacheQncAgentProductConfigIdPrefix = "cache:qnc:agentProductConfig:id:" + cacheQncAgentProductConfigProductIdPrefix = "cache:qnc:agentProductConfig:productId:" ) type ( @@ -80,21 +80,21 @@ func newAgentProductConfigModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAg func (m *defaultAgentProductConfigModel) Insert(ctx context.Context, session sqlx.Session, data *AgentProductConfig) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigIdPrefix, data.Id) - tydataAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigProductIdPrefix, data.ProductId) + qncAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigIdPrefix, data.Id) + qncAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigProductIdPrefix, data.ProductId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentProductConfigRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.ProductId, data.CostPrice, data.PriceRangeMin, data.PriceRangeMax, data.PricingStandard, data.OverpricingRatio, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.ProductId, data.CostPrice, data.PriceRangeMin, data.PriceRangeMax, data.PricingStandard, data.OverpricingRatio, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentProductConfigIdKey, tydataAgentProductConfigProductIdKey) + }, qncAgentProductConfigIdKey, qncAgentProductConfigProductIdKey) } func (m *defaultAgentProductConfigModel) FindOne(ctx context.Context, id int64) (*AgentProductConfig, error) { - tydataAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigIdPrefix, id) + qncAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigIdPrefix, id) var resp AgentProductConfig - err := m.QueryRowCtx(ctx, &resp, tydataAgentProductConfigIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentProductConfigIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentProductConfigRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -109,9 +109,9 @@ func (m *defaultAgentProductConfigModel) FindOne(ctx context.Context, id int64) } func (m *defaultAgentProductConfigModel) FindOneByProductId(ctx context.Context, productId int64) (*AgentProductConfig, error) { - tydataAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigProductIdPrefix, productId) + qncAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigProductIdPrefix, productId) var resp AgentProductConfig - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentProductConfigProductIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentProductConfigProductIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `product_id` = ? and del_state = ? limit 1", agentProductConfigRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, productId, globalkey.DelStateNo); err != nil { return nil, err @@ -133,15 +133,15 @@ func (m *defaultAgentProductConfigModel) Update(ctx context.Context, session sql if err != nil { return nil, err } - tydataAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigIdPrefix, data.Id) - tydataAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigProductIdPrefix, data.ProductId) + qncAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigIdPrefix, data.Id) + qncAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigProductIdPrefix, data.ProductId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentProductConfigRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.ProductId, newData.CostPrice, newData.PriceRangeMin, newData.PriceRangeMax, newData.PricingStandard, newData.OverpricingRatio, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.ProductId, newData.CostPrice, newData.PriceRangeMin, newData.PriceRangeMax, newData.PricingStandard, newData.OverpricingRatio, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentProductConfigIdKey, tydataAgentProductConfigProductIdKey) + }, qncAgentProductConfigIdKey, qncAgentProductConfigProductIdKey) } func (m *defaultAgentProductConfigModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentProductConfig) error { @@ -156,15 +156,15 @@ func (m *defaultAgentProductConfigModel) UpdateWithVersion(ctx context.Context, if err != nil { return err } - tydataAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigIdPrefix, data.Id) - tydataAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigProductIdPrefix, data.ProductId) + qncAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigIdPrefix, data.Id) + qncAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigProductIdPrefix, data.ProductId) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentProductConfigRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.ProductId, newData.CostPrice, newData.PriceRangeMin, newData.PriceRangeMax, newData.PricingStandard, newData.OverpricingRatio, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.ProductId, newData.CostPrice, newData.PriceRangeMin, newData.PriceRangeMax, newData.PricingStandard, newData.OverpricingRatio, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentProductConfigIdKey, tydataAgentProductConfigProductIdKey) + }, qncAgentProductConfigIdKey, qncAgentProductConfigProductIdKey) if err != nil { return err } @@ -183,7 +183,7 @@ func (m *defaultAgentProductConfigModel) DeleteSoft(ctx context.Context, session data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentProductConfigModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentProductConfigModel delete err : %+v", err) } return nil } @@ -387,19 +387,19 @@ func (m *defaultAgentProductConfigModel) Delete(ctx context.Context, session sql return err } - tydataAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigIdPrefix, id) - tydataAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheTydataAgentProductConfigProductIdPrefix, data.ProductId) + qncAgentProductConfigIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigIdPrefix, id) + qncAgentProductConfigProductIdKey := fmt.Sprintf("%s%v", cacheQncAgentProductConfigProductIdPrefix, data.ProductId) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentProductConfigIdKey, tydataAgentProductConfigProductIdKey) + }, qncAgentProductConfigIdKey, qncAgentProductConfigProductIdKey) return err } func (m *defaultAgentProductConfigModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentProductConfigIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentProductConfigIdPrefix, primary) } func (m *defaultAgentProductConfigModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentProductConfigRows, m.table) diff --git a/app/user/model/agentRewardsModel_gen.go b/app/user/model/agentRewardsModel_gen.go index 1502f71..47331dd 100644 --- a/app/user/model/agentRewardsModel_gen.go +++ b/app/user/model/agentRewardsModel_gen.go @@ -17,16 +17,16 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( agentRewardsFieldNames = builder.RawFieldNames(&AgentRewards{}) agentRewardsRows = strings.Join(agentRewardsFieldNames, ",") - agentRewardsRowsExpectAutoSet = strings.Join(stringx.Remove(agentRewardsFieldNames, "`create_time`", "`update_time`"), ",") + agentRewardsRowsExpectAutoSet = strings.Join(stringx.Remove(agentRewardsFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentRewardsRowsWithPlaceHolder = strings.Join(stringx.Remove(agentRewardsFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentRewardsIdPrefix = "cache:tydata:agentRewards:id:" + cacheQncAgentRewardsIdPrefix = "cache:qnc:agentRewards:id:" ) type ( @@ -76,20 +76,20 @@ func newAgentRewardsModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentRew func (m *defaultAgentRewardsModel) Insert(ctx context.Context, session sqlx.Session, data *AgentRewards) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheTydataAgentRewardsIdPrefix, data.Id) + qncAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheQncAgentRewardsIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentRewardsRowsExpectAutoSet) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?)", m.table, agentRewardsRowsExpectAutoSet) if session != nil { - return session.ExecCtx(ctx, query, data.Id, data.AgentId, data.RelationAgentId, data.Amount, data.Type, data.DeleteTime, data.DelState, data.Version) + return session.ExecCtx(ctx, query, data.AgentId, data.RelationAgentId, data.Amount, data.Type, data.DeleteTime, data.DelState, data.Version) } - return conn.ExecCtx(ctx, query, data.Id, data.AgentId, data.RelationAgentId, data.Amount, data.Type, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentRewardsIdKey) + return conn.ExecCtx(ctx, query, data.AgentId, data.RelationAgentId, data.Amount, data.Type, data.DeleteTime, data.DelState, data.Version) + }, qncAgentRewardsIdKey) } func (m *defaultAgentRewardsModel) FindOne(ctx context.Context, id int64) (*AgentRewards, error) { - tydataAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheTydataAgentRewardsIdPrefix, id) + qncAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheQncAgentRewardsIdPrefix, id) var resp AgentRewards - err := m.QueryRowCtx(ctx, &resp, tydataAgentRewardsIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentRewardsIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentRewardsRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -104,14 +104,14 @@ func (m *defaultAgentRewardsModel) FindOne(ctx context.Context, id int64) (*Agen } func (m *defaultAgentRewardsModel) Update(ctx context.Context, session sqlx.Session, data *AgentRewards) (sql.Result, error) { - tydataAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheTydataAgentRewardsIdPrefix, data.Id) + qncAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheQncAgentRewardsIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentRewardsRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.RelationAgentId, data.Amount, data.Type, data.DeleteTime, data.DelState, data.Version, data.Id) } return conn.ExecCtx(ctx, query, data.AgentId, data.RelationAgentId, data.Amount, data.Type, data.DeleteTime, data.DelState, data.Version, data.Id) - }, tydataAgentRewardsIdKey) + }, qncAgentRewardsIdKey) } func (m *defaultAgentRewardsModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentRewards) error { @@ -122,14 +122,14 @@ func (m *defaultAgentRewardsModel) UpdateWithVersion(ctx context.Context, sessio var sqlResult sql.Result var err error - tydataAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheTydataAgentRewardsIdPrefix, data.Id) + qncAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheQncAgentRewardsIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentRewardsRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.RelationAgentId, data.Amount, data.Type, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) } return conn.ExecCtx(ctx, query, data.AgentId, data.RelationAgentId, data.Amount, data.Type, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion) - }, tydataAgentRewardsIdKey) + }, qncAgentRewardsIdKey) if err != nil { return err } @@ -148,7 +148,7 @@ func (m *defaultAgentRewardsModel) DeleteSoft(ctx context.Context, session sqlx. data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentRewardsModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentRewardsModel delete err : %+v", err) } return nil } @@ -347,18 +347,18 @@ func (m *defaultAgentRewardsModel) SelectBuilder() squirrel.SelectBuilder { return squirrel.Select().From(m.table) } func (m *defaultAgentRewardsModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { - tydataAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheTydataAgentRewardsIdPrefix, id) + qncAgentRewardsIdKey := fmt.Sprintf("%s%v", cacheQncAgentRewardsIdPrefix, id) _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentRewardsIdKey) + }, qncAgentRewardsIdKey) return err } func (m *defaultAgentRewardsModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentRewardsIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentRewardsIdPrefix, primary) } func (m *defaultAgentRewardsModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentRewardsRows, m.table) diff --git a/app/user/model/agentWalletModel_gen.go b/app/user/model/agentWalletModel_gen.go index 8db881b..efe6e27 100644 --- a/app/user/model/agentWalletModel_gen.go +++ b/app/user/model/agentWalletModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( agentWalletRowsExpectAutoSet = strings.Join(stringx.Remove(agentWalletFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentWalletRowsWithPlaceHolder = strings.Join(stringx.Remove(agentWalletFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentWalletIdPrefix = "cache:tydata:agentWallet:id:" - cacheTydataAgentWalletAgentIdPrefix = "cache:tydata:agentWallet:agentId:" + cacheQncAgentWalletIdPrefix = "cache:qnc:agentWallet:id:" + cacheQncAgentWalletAgentIdPrefix = "cache:qnc:agentWallet:agentId:" ) type ( @@ -79,21 +79,21 @@ func newAgentWalletModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentWall func (m *defaultAgentWalletModel) Insert(ctx context.Context, session sqlx.Session, data *AgentWallet) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletAgentIdPrefix, data.AgentId) - tydataAgentWalletIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletIdPrefix, data.Id) + qncAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletAgentIdPrefix, data.AgentId) + qncAgentWalletIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentWalletRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.AgentId, data.Balance, data.FrozenBalance, data.TotalEarnings, data.WithdrawnAmount, data.DeleteTime, data.DelState, data.Version) } return conn.ExecCtx(ctx, query, data.AgentId, data.Balance, data.FrozenBalance, data.TotalEarnings, data.WithdrawnAmount, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentWalletAgentIdKey, tydataAgentWalletIdKey) + }, qncAgentWalletAgentIdKey, qncAgentWalletIdKey) } func (m *defaultAgentWalletModel) FindOne(ctx context.Context, id int64) (*AgentWallet, error) { - tydataAgentWalletIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletIdPrefix, id) + qncAgentWalletIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletIdPrefix, id) var resp AgentWallet - err := m.QueryRowCtx(ctx, &resp, tydataAgentWalletIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentWalletIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentWalletRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -108,9 +108,9 @@ func (m *defaultAgentWalletModel) FindOne(ctx context.Context, id int64) (*Agent } func (m *defaultAgentWalletModel) FindOneByAgentId(ctx context.Context, agentId int64) (*AgentWallet, error) { - tydataAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletAgentIdPrefix, agentId) + qncAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletAgentIdPrefix, agentId) var resp AgentWallet - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentWalletAgentIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentWalletAgentIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `agent_id` = ? and del_state = ? limit 1", agentWalletRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, agentId, globalkey.DelStateNo); err != nil { return nil, err @@ -132,15 +132,15 @@ func (m *defaultAgentWalletModel) Update(ctx context.Context, session sqlx.Sessi if err != nil { return nil, err } - tydataAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletAgentIdPrefix, data.AgentId) - tydataAgentWalletIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletIdPrefix, data.Id) + qncAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletAgentIdPrefix, data.AgentId) + qncAgentWalletIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentWalletRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.AgentId, newData.Balance, newData.FrozenBalance, newData.TotalEarnings, newData.WithdrawnAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.AgentId, newData.Balance, newData.FrozenBalance, newData.TotalEarnings, newData.WithdrawnAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentWalletAgentIdKey, tydataAgentWalletIdKey) + }, qncAgentWalletAgentIdKey, qncAgentWalletIdKey) } func (m *defaultAgentWalletModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentWallet) error { @@ -155,15 +155,15 @@ func (m *defaultAgentWalletModel) UpdateWithVersion(ctx context.Context, session if err != nil { return err } - tydataAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletAgentIdPrefix, data.AgentId) - tydataAgentWalletIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletIdPrefix, data.Id) + qncAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletAgentIdPrefix, data.AgentId) + qncAgentWalletIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentWalletRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.AgentId, newData.Balance, newData.FrozenBalance, newData.TotalEarnings, newData.WithdrawnAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.AgentId, newData.Balance, newData.FrozenBalance, newData.TotalEarnings, newData.WithdrawnAmount, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentWalletAgentIdKey, tydataAgentWalletIdKey) + }, qncAgentWalletAgentIdKey, qncAgentWalletIdKey) if err != nil { return err } @@ -182,7 +182,7 @@ func (m *defaultAgentWalletModel) DeleteSoft(ctx context.Context, session sqlx.S data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentWalletModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentWalletModel delete err : %+v", err) } return nil } @@ -386,19 +386,19 @@ func (m *defaultAgentWalletModel) Delete(ctx context.Context, session sqlx.Sessi return err } - tydataAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletAgentIdPrefix, data.AgentId) - tydataAgentWalletIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWalletIdPrefix, id) + qncAgentWalletAgentIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletAgentIdPrefix, data.AgentId) + qncAgentWalletIdKey := fmt.Sprintf("%s%v", cacheQncAgentWalletIdPrefix, id) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentWalletAgentIdKey, tydataAgentWalletIdKey) + }, qncAgentWalletAgentIdKey, qncAgentWalletIdKey) return err } func (m *defaultAgentWalletModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentWalletIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentWalletIdPrefix, primary) } func (m *defaultAgentWalletModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentWalletRows, m.table) diff --git a/app/user/model/agentWithdrawalModel_gen.go b/app/user/model/agentWithdrawalModel_gen.go index b00a937..f9b8b1e 100644 --- a/app/user/model/agentWithdrawalModel_gen.go +++ b/app/user/model/agentWithdrawalModel_gen.go @@ -17,17 +17,17 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( agentWithdrawalFieldNames = builder.RawFieldNames(&AgentWithdrawal{}) agentWithdrawalRows = strings.Join(agentWithdrawalFieldNames, ",") - agentWithdrawalRowsExpectAutoSet = strings.Join(stringx.Remove(agentWithdrawalFieldNames, "`create_time`", "`update_time`"), ",") + agentWithdrawalRowsExpectAutoSet = strings.Join(stringx.Remove(agentWithdrawalFieldNames, "`id`", "`create_time`", "`update_time`"), ",") agentWithdrawalRowsWithPlaceHolder = strings.Join(stringx.Remove(agentWithdrawalFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataAgentWithdrawalIdPrefix = "cache:tydata:agentWithdrawal:id:" - cacheTydataAgentWithdrawalWithdrawNoPrefix = "cache:tydata:agentWithdrawal:withdrawNo:" + cacheQncAgentWithdrawalIdPrefix = "cache:qnc:agentWithdrawal:id:" + cacheQncAgentWithdrawalWithdrawNoPrefix = "cache:qnc:agentWithdrawal:withdrawNo:" ) type ( @@ -80,21 +80,21 @@ func newAgentWithdrawalModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgent func (m *defaultAgentWithdrawalModel) Insert(ctx context.Context, session sqlx.Session, data *AgentWithdrawal) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalIdPrefix, data.Id) - tydataAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) + qncAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalIdPrefix, data.Id) + qncAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentWithdrawalRowsExpectAutoSet) + query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentWithdrawalRowsExpectAutoSet) if session != nil { - return session.ExecCtx(ctx, query, data.Id, data.AgentId, data.WithdrawNo, data.Amount, data.Status, data.PayeeAccount, data.Remark, data.DeleteTime, data.DelState, data.Version) + return session.ExecCtx(ctx, query, data.AgentId, data.WithdrawNo, data.Amount, data.Status, data.PayeeAccount, data.Remark, data.DeleteTime, data.DelState, data.Version) } - return conn.ExecCtx(ctx, query, data.Id, data.AgentId, data.WithdrawNo, data.Amount, data.Status, data.PayeeAccount, data.Remark, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentWithdrawalIdKey, tydataAgentWithdrawalWithdrawNoKey) + return conn.ExecCtx(ctx, query, data.AgentId, data.WithdrawNo, data.Amount, data.Status, data.PayeeAccount, data.Remark, data.DeleteTime, data.DelState, data.Version) + }, qncAgentWithdrawalIdKey, qncAgentWithdrawalWithdrawNoKey) } func (m *defaultAgentWithdrawalModel) FindOne(ctx context.Context, id int64) (*AgentWithdrawal, error) { - tydataAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalIdPrefix, id) + qncAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalIdPrefix, id) var resp AgentWithdrawal - err := m.QueryRowCtx(ctx, &resp, tydataAgentWithdrawalIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncAgentWithdrawalIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentWithdrawalRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -109,9 +109,9 @@ func (m *defaultAgentWithdrawalModel) FindOne(ctx context.Context, id int64) (*A } func (m *defaultAgentWithdrawalModel) FindOneByWithdrawNo(ctx context.Context, withdrawNo string) (*AgentWithdrawal, error) { - tydataAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalWithdrawNoPrefix, withdrawNo) + qncAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalWithdrawNoPrefix, withdrawNo) var resp AgentWithdrawal - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentWithdrawalWithdrawNoKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncAgentWithdrawalWithdrawNoKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `withdraw_no` = ? and del_state = ? limit 1", agentWithdrawalRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, withdrawNo, globalkey.DelStateNo); err != nil { return nil, err @@ -133,15 +133,15 @@ func (m *defaultAgentWithdrawalModel) Update(ctx context.Context, session sqlx.S if err != nil { return nil, err } - tydataAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalIdPrefix, data.Id) - tydataAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) + qncAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalIdPrefix, data.Id) + qncAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentWithdrawalRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) } return conn.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentWithdrawalIdKey, tydataAgentWithdrawalWithdrawNoKey) + }, qncAgentWithdrawalIdKey, qncAgentWithdrawalWithdrawNoKey) } func (m *defaultAgentWithdrawalModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentWithdrawal) error { @@ -156,15 +156,15 @@ func (m *defaultAgentWithdrawalModel) UpdateWithVersion(ctx context.Context, ses if err != nil { return err } - tydataAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalIdPrefix, data.Id) - tydataAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) + qncAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalIdPrefix, data.Id) + qncAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentWithdrawalRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.AgentId, newData.WithdrawNo, newData.Amount, newData.Status, newData.PayeeAccount, newData.Remark, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentWithdrawalIdKey, tydataAgentWithdrawalWithdrawNoKey) + }, qncAgentWithdrawalIdKey, qncAgentWithdrawalWithdrawNoKey) if err != nil { return err } @@ -183,7 +183,7 @@ func (m *defaultAgentWithdrawalModel) DeleteSoft(ctx context.Context, session sq data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentWithdrawalModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "AgentWithdrawalModel delete err : %+v", err) } return nil } @@ -387,19 +387,19 @@ func (m *defaultAgentWithdrawalModel) Delete(ctx context.Context, session sqlx.S return err } - tydataAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalIdPrefix, id) - tydataAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) + qncAgentWithdrawalIdKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalIdPrefix, id) + qncAgentWithdrawalWithdrawNoKey := fmt.Sprintf("%s%v", cacheQncAgentWithdrawalWithdrawNoPrefix, data.WithdrawNo) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataAgentWithdrawalIdKey, tydataAgentWithdrawalWithdrawNoKey) + }, qncAgentWithdrawalIdKey, qncAgentWithdrawalWithdrawNoKey) return err } func (m *defaultAgentWithdrawalModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentWithdrawalIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncAgentWithdrawalIdPrefix, primary) } func (m *defaultAgentWithdrawalModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentWithdrawalRows, m.table) diff --git a/app/user/model/featureModel_gen.go b/app/user/model/featureModel_gen.go index 9d88dc7..a7c3a85 100644 --- a/app/user/model/featureModel_gen.go +++ b/app/user/model/featureModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( featureRowsExpectAutoSet = strings.Join(stringx.Remove(featureFieldNames, "`id`", "`create_time`", "`update_time`"), ",") featureRowsWithPlaceHolder = strings.Join(stringx.Remove(featureFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataFeatureIdPrefix = "cache:tydata:feature:id:" - cacheTydataFeatureApiIdPrefix = "cache:tydata:feature:apiId:" + cacheQncFeatureIdPrefix = "cache:qnc:feature:id:" + cacheQncFeatureApiIdPrefix = "cache:qnc:feature:apiId:" ) type ( @@ -76,21 +76,21 @@ func newFeatureModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultFeatureModel func (m *defaultFeatureModel) Insert(ctx context.Context, session sqlx.Session, data *Feature) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataFeatureApiIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureApiIdPrefix, data.ApiId) - tydataFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureIdPrefix, data.Id) + qncFeatureApiIdKey := fmt.Sprintf("%s%v", cacheQncFeatureApiIdPrefix, data.ApiId) + qncFeatureIdKey := fmt.Sprintf("%s%v", cacheQncFeatureIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?)", m.table, featureRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.ApiId, data.Name) } return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.ApiId, data.Name) - }, tydataFeatureApiIdKey, tydataFeatureIdKey) + }, qncFeatureApiIdKey, qncFeatureIdKey) } func (m *defaultFeatureModel) FindOne(ctx context.Context, id int64) (*Feature, error) { - tydataFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureIdPrefix, id) + qncFeatureIdKey := fmt.Sprintf("%s%v", cacheQncFeatureIdPrefix, id) var resp Feature - err := m.QueryRowCtx(ctx, &resp, tydataFeatureIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncFeatureIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", featureRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -105,9 +105,9 @@ func (m *defaultFeatureModel) FindOne(ctx context.Context, id int64) (*Feature, } func (m *defaultFeatureModel) FindOneByApiId(ctx context.Context, apiId string) (*Feature, error) { - tydataFeatureApiIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureApiIdPrefix, apiId) + qncFeatureApiIdKey := fmt.Sprintf("%s%v", cacheQncFeatureApiIdPrefix, apiId) var resp Feature - err := m.QueryRowIndexCtx(ctx, &resp, tydataFeatureApiIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncFeatureApiIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `api_id` = ? and del_state = ? limit 1", featureRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, apiId, globalkey.DelStateNo); err != nil { return nil, err @@ -129,15 +129,15 @@ func (m *defaultFeatureModel) Update(ctx context.Context, session sqlx.Session, if err != nil { return nil, err } - tydataFeatureApiIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureApiIdPrefix, data.ApiId) - tydataFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureIdPrefix, data.Id) + qncFeatureApiIdKey := fmt.Sprintf("%s%v", cacheQncFeatureApiIdPrefix, data.ApiId) + qncFeatureIdKey := fmt.Sprintf("%s%v", cacheQncFeatureIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, featureRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ApiId, newData.Name, newData.Id) } return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ApiId, newData.Name, newData.Id) - }, tydataFeatureApiIdKey, tydataFeatureIdKey) + }, qncFeatureApiIdKey, qncFeatureIdKey) } func (m *defaultFeatureModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *Feature) error { @@ -152,15 +152,15 @@ func (m *defaultFeatureModel) UpdateWithVersion(ctx context.Context, session sql if err != nil { return err } - tydataFeatureApiIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureApiIdPrefix, data.ApiId) - tydataFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureIdPrefix, data.Id) + qncFeatureApiIdKey := fmt.Sprintf("%s%v", cacheQncFeatureApiIdPrefix, data.ApiId) + qncFeatureIdKey := fmt.Sprintf("%s%v", cacheQncFeatureIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, featureRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ApiId, newData.Name, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ApiId, newData.Name, newData.Id, oldVersion) - }, tydataFeatureApiIdKey, tydataFeatureIdKey) + }, qncFeatureApiIdKey, qncFeatureIdKey) if err != nil { return err } @@ -179,7 +179,7 @@ func (m *defaultFeatureModel) DeleteSoft(ctx context.Context, session sqlx.Sessi data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "FeatureModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "FeatureModel delete err : %+v", err) } return nil } @@ -383,19 +383,19 @@ func (m *defaultFeatureModel) Delete(ctx context.Context, session sqlx.Session, return err } - tydataFeatureApiIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureApiIdPrefix, data.ApiId) - tydataFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataFeatureIdPrefix, id) + qncFeatureApiIdKey := fmt.Sprintf("%s%v", cacheQncFeatureApiIdPrefix, data.ApiId) + qncFeatureIdKey := fmt.Sprintf("%s%v", cacheQncFeatureIdPrefix, id) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataFeatureApiIdKey, tydataFeatureIdKey) + }, qncFeatureApiIdKey, qncFeatureIdKey) return err } func (m *defaultFeatureModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataFeatureIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncFeatureIdPrefix, primary) } func (m *defaultFeatureModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", featureRows, m.table) diff --git a/app/user/model/globalNotificationsModel_gen.go b/app/user/model/globalNotificationsModel_gen.go index 20b4499..6fb3f53 100644 --- a/app/user/model/globalNotificationsModel_gen.go +++ b/app/user/model/globalNotificationsModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,7 +26,7 @@ var ( globalNotificationsRowsExpectAutoSet = strings.Join(stringx.Remove(globalNotificationsFieldNames, "`id`", "`create_time`", "`update_time`"), ",") globalNotificationsRowsWithPlaceHolder = strings.Join(stringx.Remove(globalNotificationsFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataGlobalNotificationsIdPrefix = "cache:tydata:globalNotifications:id:" + cacheQncGlobalNotificationsIdPrefix = "cache:qnc:globalNotifications:id:" ) type ( @@ -80,20 +80,20 @@ func newGlobalNotificationsModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultG func (m *defaultGlobalNotificationsModel) Insert(ctx context.Context, session sqlx.Session, data *GlobalNotifications) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheTydataGlobalNotificationsIdPrefix, data.Id) + qncGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheQncGlobalNotificationsIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, globalNotificationsRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.Title, data.Content, data.NotificationPage, data.StartDate, data.EndDate, data.StartTime, data.EndTime, data.Status, data.DelState, data.Version, data.DeleteTime) } return conn.ExecCtx(ctx, query, data.Title, data.Content, data.NotificationPage, data.StartDate, data.EndDate, data.StartTime, data.EndTime, data.Status, data.DelState, data.Version, data.DeleteTime) - }, tydataGlobalNotificationsIdKey) + }, qncGlobalNotificationsIdKey) } func (m *defaultGlobalNotificationsModel) FindOne(ctx context.Context, id int64) (*GlobalNotifications, error) { - tydataGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheTydataGlobalNotificationsIdPrefix, id) + qncGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheQncGlobalNotificationsIdPrefix, id) var resp GlobalNotifications - err := m.QueryRowCtx(ctx, &resp, tydataGlobalNotificationsIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncGlobalNotificationsIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", globalNotificationsRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -108,14 +108,14 @@ func (m *defaultGlobalNotificationsModel) FindOne(ctx context.Context, id int64) } func (m *defaultGlobalNotificationsModel) Update(ctx context.Context, session sqlx.Session, data *GlobalNotifications) (sql.Result, error) { - tydataGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheTydataGlobalNotificationsIdPrefix, data.Id) + qncGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheQncGlobalNotificationsIdPrefix, data.Id) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, globalNotificationsRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.Title, data.Content, data.NotificationPage, data.StartDate, data.EndDate, data.StartTime, data.EndTime, data.Status, data.DelState, data.Version, data.DeleteTime, data.Id) } return conn.ExecCtx(ctx, query, data.Title, data.Content, data.NotificationPage, data.StartDate, data.EndDate, data.StartTime, data.EndTime, data.Status, data.DelState, data.Version, data.DeleteTime, data.Id) - }, tydataGlobalNotificationsIdKey) + }, qncGlobalNotificationsIdKey) } func (m *defaultGlobalNotificationsModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *GlobalNotifications) error { @@ -126,14 +126,14 @@ func (m *defaultGlobalNotificationsModel) UpdateWithVersion(ctx context.Context, var sqlResult sql.Result var err error - tydataGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheTydataGlobalNotificationsIdPrefix, data.Id) + qncGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheQncGlobalNotificationsIdPrefix, data.Id) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, globalNotificationsRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, data.Title, data.Content, data.NotificationPage, data.StartDate, data.EndDate, data.StartTime, data.EndTime, data.Status, data.DelState, data.Version, data.DeleteTime, data.Id, oldVersion) } return conn.ExecCtx(ctx, query, data.Title, data.Content, data.NotificationPage, data.StartDate, data.EndDate, data.StartTime, data.EndTime, data.Status, data.DelState, data.Version, data.DeleteTime, data.Id, oldVersion) - }, tydataGlobalNotificationsIdKey) + }, qncGlobalNotificationsIdKey) if err != nil { return err } @@ -152,7 +152,7 @@ func (m *defaultGlobalNotificationsModel) DeleteSoft(ctx context.Context, sessio data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "GlobalNotificationsModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "GlobalNotificationsModel delete err : %+v", err) } return nil } @@ -351,18 +351,18 @@ func (m *defaultGlobalNotificationsModel) SelectBuilder() squirrel.SelectBuilder return squirrel.Select().From(m.table) } func (m *defaultGlobalNotificationsModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { - tydataGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheTydataGlobalNotificationsIdPrefix, id) + qncGlobalNotificationsIdKey := fmt.Sprintf("%s%v", cacheQncGlobalNotificationsIdPrefix, id) _, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataGlobalNotificationsIdKey) + }, qncGlobalNotificationsIdKey) return err } func (m *defaultGlobalNotificationsModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataGlobalNotificationsIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncGlobalNotificationsIdPrefix, primary) } func (m *defaultGlobalNotificationsModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", globalNotificationsRows, m.table) diff --git a/app/user/model/orderModel_gen.go b/app/user/model/orderModel_gen.go index 8aca5bb..37495c0 100644 --- a/app/user/model/orderModel_gen.go +++ b/app/user/model/orderModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( orderRowsExpectAutoSet = strings.Join(stringx.Remove(orderFieldNames, "`id`", "`create_time`", "`update_time`"), ",") orderRowsWithPlaceHolder = strings.Join(stringx.Remove(orderFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataOrderIdPrefix = "cache:tydata:order:id:" - cacheTydataOrderOrderNoPrefix = "cache:tydata:order:orderNo:" + cacheQncOrderIdPrefix = "cache:qnc:order:id:" + cacheQncOrderOrderNoPrefix = "cache:qnc:order:orderNo:" ) type ( @@ -85,21 +85,21 @@ func newOrderModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultOrderModel { func (m *defaultOrderModel) Insert(ctx context.Context, session sqlx.Session, data *Order) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataOrderIdKey := fmt.Sprintf("%s%v", cacheTydataOrderIdPrefix, data.Id) - tydataOrderOrderNoKey := fmt.Sprintf("%s%v", cacheTydataOrderOrderNoPrefix, data.OrderNo) + qncOrderIdKey := fmt.Sprintf("%s%v", cacheQncOrderIdPrefix, data.Id) + qncOrderOrderNoKey := fmt.Sprintf("%s%v", cacheQncOrderOrderNoPrefix, data.OrderNo) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, orderRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.OrderNo, data.UserId, data.ProductId, data.PaymentPlatform, data.PaymentScene, data.PlatformOrderId, data.Amount, data.Status, data.DelState, data.Version, data.PayTime, data.RefundTime, data.CloseTime, data.DeleteTime) } return conn.ExecCtx(ctx, query, data.OrderNo, data.UserId, data.ProductId, data.PaymentPlatform, data.PaymentScene, data.PlatformOrderId, data.Amount, data.Status, data.DelState, data.Version, data.PayTime, data.RefundTime, data.CloseTime, data.DeleteTime) - }, tydataOrderIdKey, tydataOrderOrderNoKey) + }, qncOrderIdKey, qncOrderOrderNoKey) } func (m *defaultOrderModel) FindOne(ctx context.Context, id int64) (*Order, error) { - tydataOrderIdKey := fmt.Sprintf("%s%v", cacheTydataOrderIdPrefix, id) + qncOrderIdKey := fmt.Sprintf("%s%v", cacheQncOrderIdPrefix, id) var resp Order - err := m.QueryRowCtx(ctx, &resp, tydataOrderIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncOrderIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", orderRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -114,9 +114,9 @@ func (m *defaultOrderModel) FindOne(ctx context.Context, id int64) (*Order, erro } func (m *defaultOrderModel) FindOneByOrderNo(ctx context.Context, orderNo string) (*Order, error) { - tydataOrderOrderNoKey := fmt.Sprintf("%s%v", cacheTydataOrderOrderNoPrefix, orderNo) + qncOrderOrderNoKey := fmt.Sprintf("%s%v", cacheQncOrderOrderNoPrefix, orderNo) var resp Order - err := m.QueryRowIndexCtx(ctx, &resp, tydataOrderOrderNoKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncOrderOrderNoKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `order_no` = ? and del_state = ? limit 1", orderRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, orderNo, globalkey.DelStateNo); err != nil { return nil, err @@ -138,15 +138,15 @@ func (m *defaultOrderModel) Update(ctx context.Context, session sqlx.Session, ne if err != nil { return nil, err } - tydataOrderIdKey := fmt.Sprintf("%s%v", cacheTydataOrderIdPrefix, data.Id) - tydataOrderOrderNoKey := fmt.Sprintf("%s%v", cacheTydataOrderOrderNoPrefix, data.OrderNo) + qncOrderIdKey := fmt.Sprintf("%s%v", cacheQncOrderIdPrefix, data.Id) + qncOrderOrderNoKey := fmt.Sprintf("%s%v", cacheQncOrderOrderNoPrefix, data.OrderNo) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, orderRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Id) } return conn.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Id) - }, tydataOrderIdKey, tydataOrderOrderNoKey) + }, qncOrderIdKey, qncOrderOrderNoKey) } func (m *defaultOrderModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *Order) error { @@ -161,15 +161,15 @@ func (m *defaultOrderModel) UpdateWithVersion(ctx context.Context, session sqlx. if err != nil { return err } - tydataOrderIdKey := fmt.Sprintf("%s%v", cacheTydataOrderIdPrefix, data.Id) - tydataOrderOrderNoKey := fmt.Sprintf("%s%v", cacheTydataOrderOrderNoPrefix, data.OrderNo) + qncOrderIdKey := fmt.Sprintf("%s%v", cacheQncOrderIdPrefix, data.Id) + qncOrderOrderNoKey := fmt.Sprintf("%s%v", cacheQncOrderOrderNoPrefix, data.OrderNo) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, orderRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.OrderNo, newData.UserId, newData.ProductId, newData.PaymentPlatform, newData.PaymentScene, newData.PlatformOrderId, newData.Amount, newData.Status, newData.DelState, newData.Version, newData.PayTime, newData.RefundTime, newData.CloseTime, newData.DeleteTime, newData.Id, oldVersion) - }, tydataOrderIdKey, tydataOrderOrderNoKey) + }, qncOrderIdKey, qncOrderOrderNoKey) if err != nil { return err } @@ -188,7 +188,7 @@ func (m *defaultOrderModel) DeleteSoft(ctx context.Context, session sqlx.Session data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "OrderModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "OrderModel delete err : %+v", err) } return nil } @@ -392,19 +392,19 @@ func (m *defaultOrderModel) Delete(ctx context.Context, session sqlx.Session, id return err } - tydataOrderIdKey := fmt.Sprintf("%s%v", cacheTydataOrderIdPrefix, id) - tydataOrderOrderNoKey := fmt.Sprintf("%s%v", cacheTydataOrderOrderNoPrefix, data.OrderNo) + qncOrderIdKey := fmt.Sprintf("%s%v", cacheQncOrderIdPrefix, id) + qncOrderOrderNoKey := fmt.Sprintf("%s%v", cacheQncOrderOrderNoPrefix, data.OrderNo) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataOrderIdKey, tydataOrderOrderNoKey) + }, qncOrderIdKey, qncOrderOrderNoKey) return err } func (m *defaultOrderModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataOrderIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncOrderIdPrefix, primary) } func (m *defaultOrderModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", orderRows, m.table) diff --git a/app/user/model/productFeatureModel_gen.go b/app/user/model/productFeatureModel_gen.go index c1ac4c2..af10f3d 100644 --- a/app/user/model/productFeatureModel_gen.go +++ b/app/user/model/productFeatureModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( productFeatureRowsExpectAutoSet = strings.Join(stringx.Remove(productFeatureFieldNames, "`id`", "`create_time`", "`update_time`"), ",") productFeatureRowsWithPlaceHolder = strings.Join(stringx.Remove(productFeatureFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataProductFeatureIdPrefix = "cache:tydata:productFeature:id:" - cacheTydataProductFeatureProductIdFeatureIdPrefix = "cache:tydata:productFeature:productId:featureId:" + cacheQncProductFeatureIdPrefix = "cache:qnc:productFeature:id:" + cacheQncProductFeatureProductIdFeatureIdPrefix = "cache:qnc:productFeature:productId:featureId:" ) type ( @@ -79,21 +79,21 @@ func newProductFeatureModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultProduc func (m *defaultProductFeatureModel) Insert(ctx context.Context, session sqlx.Session, data *ProductFeature) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataProductFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataProductFeatureIdPrefix, data.Id) - tydataProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheTydataProductFeatureProductIdFeatureIdPrefix, data.ProductId, data.FeatureId) + qncProductFeatureIdKey := fmt.Sprintf("%s%v", cacheQncProductFeatureIdPrefix, data.Id) + qncProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheQncProductFeatureProductIdFeatureIdPrefix, data.ProductId, data.FeatureId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, productFeatureRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.ProductId, data.FeatureId, data.DeleteTime, data.DelState, data.Version, data.Sort, data.IsImportant, data.Enable) } return conn.ExecCtx(ctx, query, data.ProductId, data.FeatureId, data.DeleteTime, data.DelState, data.Version, data.Sort, data.IsImportant, data.Enable) - }, tydataProductFeatureIdKey, tydataProductFeatureProductIdFeatureIdKey) + }, qncProductFeatureIdKey, qncProductFeatureProductIdFeatureIdKey) } func (m *defaultProductFeatureModel) FindOne(ctx context.Context, id int64) (*ProductFeature, error) { - tydataProductFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataProductFeatureIdPrefix, id) + qncProductFeatureIdKey := fmt.Sprintf("%s%v", cacheQncProductFeatureIdPrefix, id) var resp ProductFeature - err := m.QueryRowCtx(ctx, &resp, tydataProductFeatureIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncProductFeatureIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", productFeatureRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -108,9 +108,9 @@ func (m *defaultProductFeatureModel) FindOne(ctx context.Context, id int64) (*Pr } func (m *defaultProductFeatureModel) FindOneByProductIdFeatureId(ctx context.Context, productId int64, featureId int64) (*ProductFeature, error) { - tydataProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheTydataProductFeatureProductIdFeatureIdPrefix, productId, featureId) + qncProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheQncProductFeatureProductIdFeatureIdPrefix, productId, featureId) var resp ProductFeature - err := m.QueryRowIndexCtx(ctx, &resp, tydataProductFeatureProductIdFeatureIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncProductFeatureProductIdFeatureIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `product_id` = ? and `feature_id` = ? and del_state = ? limit 1", productFeatureRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, productId, featureId, globalkey.DelStateNo); err != nil { return nil, err @@ -132,15 +132,15 @@ func (m *defaultProductFeatureModel) Update(ctx context.Context, session sqlx.Se if err != nil { return nil, err } - tydataProductFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataProductFeatureIdPrefix, data.Id) - tydataProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheTydataProductFeatureProductIdFeatureIdPrefix, data.ProductId, data.FeatureId) + qncProductFeatureIdKey := fmt.Sprintf("%s%v", cacheQncProductFeatureIdPrefix, data.Id) + qncProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheQncProductFeatureProductIdFeatureIdPrefix, data.ProductId, data.FeatureId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, productFeatureRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.ProductId, newData.FeatureId, newData.DeleteTime, newData.DelState, newData.Version, newData.Sort, newData.IsImportant, newData.Enable, newData.Id) } return conn.ExecCtx(ctx, query, newData.ProductId, newData.FeatureId, newData.DeleteTime, newData.DelState, newData.Version, newData.Sort, newData.IsImportant, newData.Enable, newData.Id) - }, tydataProductFeatureIdKey, tydataProductFeatureProductIdFeatureIdKey) + }, qncProductFeatureIdKey, qncProductFeatureProductIdFeatureIdKey) } func (m *defaultProductFeatureModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *ProductFeature) error { @@ -155,15 +155,15 @@ func (m *defaultProductFeatureModel) UpdateWithVersion(ctx context.Context, sess if err != nil { return err } - tydataProductFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataProductFeatureIdPrefix, data.Id) - tydataProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheTydataProductFeatureProductIdFeatureIdPrefix, data.ProductId, data.FeatureId) + qncProductFeatureIdKey := fmt.Sprintf("%s%v", cacheQncProductFeatureIdPrefix, data.Id) + qncProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheQncProductFeatureProductIdFeatureIdPrefix, data.ProductId, data.FeatureId) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, productFeatureRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.ProductId, newData.FeatureId, newData.DeleteTime, newData.DelState, newData.Version, newData.Sort, newData.IsImportant, newData.Enable, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.ProductId, newData.FeatureId, newData.DeleteTime, newData.DelState, newData.Version, newData.Sort, newData.IsImportant, newData.Enable, newData.Id, oldVersion) - }, tydataProductFeatureIdKey, tydataProductFeatureProductIdFeatureIdKey) + }, qncProductFeatureIdKey, qncProductFeatureProductIdFeatureIdKey) if err != nil { return err } @@ -182,7 +182,7 @@ func (m *defaultProductFeatureModel) DeleteSoft(ctx context.Context, session sql data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "ProductFeatureModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "ProductFeatureModel delete err : %+v", err) } return nil } @@ -386,19 +386,19 @@ func (m *defaultProductFeatureModel) Delete(ctx context.Context, session sqlx.Se return err } - tydataProductFeatureIdKey := fmt.Sprintf("%s%v", cacheTydataProductFeatureIdPrefix, id) - tydataProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheTydataProductFeatureProductIdFeatureIdPrefix, data.ProductId, data.FeatureId) + qncProductFeatureIdKey := fmt.Sprintf("%s%v", cacheQncProductFeatureIdPrefix, id) + qncProductFeatureProductIdFeatureIdKey := fmt.Sprintf("%s%v:%v", cacheQncProductFeatureProductIdFeatureIdPrefix, data.ProductId, data.FeatureId) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataProductFeatureIdKey, tydataProductFeatureProductIdFeatureIdKey) + }, qncProductFeatureIdKey, qncProductFeatureProductIdFeatureIdKey) return err } func (m *defaultProductFeatureModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataProductFeatureIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncProductFeatureIdPrefix, primary) } func (m *defaultProductFeatureModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", productFeatureRows, m.table) diff --git a/app/user/model/productModel_gen.go b/app/user/model/productModel_gen.go index c0d176a..d7a70a9 100644 --- a/app/user/model/productModel_gen.go +++ b/app/user/model/productModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( productRowsExpectAutoSet = strings.Join(stringx.Remove(productFieldNames, "`id`", "`create_time`", "`update_time`"), ",") productRowsWithPlaceHolder = strings.Join(stringx.Remove(productFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataProductIdPrefix = "cache:tydata:product:id:" - cacheTydataProductProductEnPrefix = "cache:tydata:product:productEn:" + cacheQncProductIdPrefix = "cache:qnc:product:id:" + cacheQncProductProductEnPrefix = "cache:qnc:product:productEn:" ) type ( @@ -80,21 +80,21 @@ func newProductModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultProductModel func (m *defaultProductModel) Insert(ctx context.Context, session sqlx.Session, data *Product) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataProductIdKey := fmt.Sprintf("%s%v", cacheTydataProductIdPrefix, data.Id) - tydataProductProductEnKey := fmt.Sprintf("%s%v", cacheTydataProductProductEnPrefix, data.ProductEn) + qncProductIdKey := fmt.Sprintf("%s%v", cacheQncProductIdPrefix, data.Id) + qncProductProductEnKey := fmt.Sprintf("%s%v", cacheQncProductProductEnPrefix, data.ProductEn) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, productRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.ProductName, data.ProductEn, data.Description, data.Notes, data.CostPrice, data.SellPrice) } return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.ProductName, data.ProductEn, data.Description, data.Notes, data.CostPrice, data.SellPrice) - }, tydataProductIdKey, tydataProductProductEnKey) + }, qncProductIdKey, qncProductProductEnKey) } func (m *defaultProductModel) FindOne(ctx context.Context, id int64) (*Product, error) { - tydataProductIdKey := fmt.Sprintf("%s%v", cacheTydataProductIdPrefix, id) + qncProductIdKey := fmt.Sprintf("%s%v", cacheQncProductIdPrefix, id) var resp Product - err := m.QueryRowCtx(ctx, &resp, tydataProductIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncProductIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", productRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -109,9 +109,9 @@ func (m *defaultProductModel) FindOne(ctx context.Context, id int64) (*Product, } func (m *defaultProductModel) FindOneByProductEn(ctx context.Context, productEn string) (*Product, error) { - tydataProductProductEnKey := fmt.Sprintf("%s%v", cacheTydataProductProductEnPrefix, productEn) + qncProductProductEnKey := fmt.Sprintf("%s%v", cacheQncProductProductEnPrefix, productEn) var resp Product - err := m.QueryRowIndexCtx(ctx, &resp, tydataProductProductEnKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncProductProductEnKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `product_en` = ? and del_state = ? limit 1", productRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, productEn, globalkey.DelStateNo); err != nil { return nil, err @@ -133,15 +133,15 @@ func (m *defaultProductModel) Update(ctx context.Context, session sqlx.Session, if err != nil { return nil, err } - tydataProductIdKey := fmt.Sprintf("%s%v", cacheTydataProductIdPrefix, data.Id) - tydataProductProductEnKey := fmt.Sprintf("%s%v", cacheTydataProductProductEnPrefix, data.ProductEn) + qncProductIdKey := fmt.Sprintf("%s%v", cacheQncProductIdPrefix, data.Id) + qncProductProductEnKey := fmt.Sprintf("%s%v", cacheQncProductProductEnPrefix, data.ProductEn) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, productRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ProductName, newData.ProductEn, newData.Description, newData.Notes, newData.CostPrice, newData.SellPrice, newData.Id) } return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ProductName, newData.ProductEn, newData.Description, newData.Notes, newData.CostPrice, newData.SellPrice, newData.Id) - }, tydataProductIdKey, tydataProductProductEnKey) + }, qncProductIdKey, qncProductProductEnKey) } func (m *defaultProductModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *Product) error { @@ -156,15 +156,15 @@ func (m *defaultProductModel) UpdateWithVersion(ctx context.Context, session sql if err != nil { return err } - tydataProductIdKey := fmt.Sprintf("%s%v", cacheTydataProductIdPrefix, data.Id) - tydataProductProductEnKey := fmt.Sprintf("%s%v", cacheTydataProductProductEnPrefix, data.ProductEn) + qncProductIdKey := fmt.Sprintf("%s%v", cacheQncProductIdPrefix, data.Id) + qncProductProductEnKey := fmt.Sprintf("%s%v", cacheQncProductProductEnPrefix, data.ProductEn) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, productRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ProductName, newData.ProductEn, newData.Description, newData.Notes, newData.CostPrice, newData.SellPrice, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.ProductName, newData.ProductEn, newData.Description, newData.Notes, newData.CostPrice, newData.SellPrice, newData.Id, oldVersion) - }, tydataProductIdKey, tydataProductProductEnKey) + }, qncProductIdKey, qncProductProductEnKey) if err != nil { return err } @@ -183,7 +183,7 @@ func (m *defaultProductModel) DeleteSoft(ctx context.Context, session sqlx.Sessi data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "ProductModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "ProductModel delete err : %+v", err) } return nil } @@ -387,19 +387,19 @@ func (m *defaultProductModel) Delete(ctx context.Context, session sqlx.Session, return err } - tydataProductIdKey := fmt.Sprintf("%s%v", cacheTydataProductIdPrefix, id) - tydataProductProductEnKey := fmt.Sprintf("%s%v", cacheTydataProductProductEnPrefix, data.ProductEn) + qncProductIdKey := fmt.Sprintf("%s%v", cacheQncProductIdPrefix, id) + qncProductProductEnKey := fmt.Sprintf("%s%v", cacheQncProductProductEnPrefix, data.ProductEn) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataProductIdKey, tydataProductProductEnKey) + }, qncProductIdKey, qncProductProductEnKey) return err } func (m *defaultProductModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataProductIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncProductIdPrefix, primary) } func (m *defaultProductModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", productRows, m.table) diff --git a/app/user/model/queryModel.go b/app/user/model/queryModel.go index 6ea78ff..4c63b98 100644 --- a/app/user/model/queryModel.go +++ b/app/user/model/queryModel.go @@ -3,8 +3,8 @@ package model import ( "context" "fmt" + "qnc-server/common/globalkey" "time" - "tydata-server/common/globalkey" "github.com/zeromicro/go-zero/core/stores/cache" "github.com/zeromicro/go-zero/core/stores/sqlx" diff --git a/app/user/model/queryModel_gen.go b/app/user/model/queryModel_gen.go index 12fb5ab..e67923f 100644 --- a/app/user/model/queryModel_gen.go +++ b/app/user/model/queryModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( queryRowsExpectAutoSet = strings.Join(stringx.Remove(queryFieldNames, "`id`", "`create_time`", "`update_time`"), ",") queryRowsWithPlaceHolder = strings.Join(stringx.Remove(queryFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataQueryIdPrefix = "cache:tydata:query:id:" - cacheTydataQueryOrderIdPrefix = "cache:tydata:query:orderId:" + cacheQncQueryIdPrefix = "cache:qnc:query:id:" + cacheQncQueryOrderIdPrefix = "cache:qnc:query:orderId:" ) type ( @@ -80,21 +80,21 @@ func newQueryModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultQueryModel { func (m *defaultQueryModel) Insert(ctx context.Context, session sqlx.Session, data *Query) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataQueryIdKey := fmt.Sprintf("%s%v", cacheTydataQueryIdPrefix, data.Id) - tydataQueryOrderIdKey := fmt.Sprintf("%s%v", cacheTydataQueryOrderIdPrefix, data.OrderId) + qncQueryIdKey := fmt.Sprintf("%s%v", cacheQncQueryIdPrefix, data.Id) + qncQueryOrderIdKey := fmt.Sprintf("%s%v", cacheQncQueryOrderIdPrefix, data.OrderId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, queryRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.OrderId, data.UserId, data.ProductId, data.QueryParams, data.QueryData, data.QueryState, data.DelState, data.Version, data.DeleteTime) } return conn.ExecCtx(ctx, query, data.OrderId, data.UserId, data.ProductId, data.QueryParams, data.QueryData, data.QueryState, data.DelState, data.Version, data.DeleteTime) - }, tydataQueryIdKey, tydataQueryOrderIdKey) + }, qncQueryIdKey, qncQueryOrderIdKey) } func (m *defaultQueryModel) FindOne(ctx context.Context, id int64) (*Query, error) { - tydataQueryIdKey := fmt.Sprintf("%s%v", cacheTydataQueryIdPrefix, id) + qncQueryIdKey := fmt.Sprintf("%s%v", cacheQncQueryIdPrefix, id) var resp Query - err := m.QueryRowCtx(ctx, &resp, tydataQueryIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncQueryIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", queryRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -109,9 +109,9 @@ func (m *defaultQueryModel) FindOne(ctx context.Context, id int64) (*Query, erro } func (m *defaultQueryModel) FindOneByOrderId(ctx context.Context, orderId int64) (*Query, error) { - tydataQueryOrderIdKey := fmt.Sprintf("%s%v", cacheTydataQueryOrderIdPrefix, orderId) + qncQueryOrderIdKey := fmt.Sprintf("%s%v", cacheQncQueryOrderIdPrefix, orderId) var resp Query - err := m.QueryRowIndexCtx(ctx, &resp, tydataQueryOrderIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncQueryOrderIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `order_id` = ? and del_state = ? limit 1", queryRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, orderId, globalkey.DelStateNo); err != nil { return nil, err @@ -133,15 +133,15 @@ func (m *defaultQueryModel) Update(ctx context.Context, session sqlx.Session, ne if err != nil { return nil, err } - tydataQueryIdKey := fmt.Sprintf("%s%v", cacheTydataQueryIdPrefix, data.Id) - tydataQueryOrderIdKey := fmt.Sprintf("%s%v", cacheTydataQueryOrderIdPrefix, data.OrderId) + qncQueryIdKey := fmt.Sprintf("%s%v", cacheQncQueryIdPrefix, data.Id) + qncQueryOrderIdKey := fmt.Sprintf("%s%v", cacheQncQueryOrderIdPrefix, data.OrderId) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, queryRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.OrderId, newData.UserId, newData.ProductId, newData.QueryParams, newData.QueryData, newData.QueryState, newData.DelState, newData.Version, newData.DeleteTime, newData.Id) } return conn.ExecCtx(ctx, query, newData.OrderId, newData.UserId, newData.ProductId, newData.QueryParams, newData.QueryData, newData.QueryState, newData.DelState, newData.Version, newData.DeleteTime, newData.Id) - }, tydataQueryIdKey, tydataQueryOrderIdKey) + }, qncQueryIdKey, qncQueryOrderIdKey) } func (m *defaultQueryModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *Query) error { @@ -156,15 +156,15 @@ func (m *defaultQueryModel) UpdateWithVersion(ctx context.Context, session sqlx. if err != nil { return err } - tydataQueryIdKey := fmt.Sprintf("%s%v", cacheTydataQueryIdPrefix, data.Id) - tydataQueryOrderIdKey := fmt.Sprintf("%s%v", cacheTydataQueryOrderIdPrefix, data.OrderId) + qncQueryIdKey := fmt.Sprintf("%s%v", cacheQncQueryIdPrefix, data.Id) + qncQueryOrderIdKey := fmt.Sprintf("%s%v", cacheQncQueryOrderIdPrefix, data.OrderId) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, queryRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.OrderId, newData.UserId, newData.ProductId, newData.QueryParams, newData.QueryData, newData.QueryState, newData.DelState, newData.Version, newData.DeleteTime, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.OrderId, newData.UserId, newData.ProductId, newData.QueryParams, newData.QueryData, newData.QueryState, newData.DelState, newData.Version, newData.DeleteTime, newData.Id, oldVersion) - }, tydataQueryIdKey, tydataQueryOrderIdKey) + }, qncQueryIdKey, qncQueryOrderIdKey) if err != nil { return err } @@ -183,7 +183,7 @@ func (m *defaultQueryModel) DeleteSoft(ctx context.Context, session sqlx.Session data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "QueryModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "QueryModel delete err : %+v", err) } return nil } @@ -387,19 +387,19 @@ func (m *defaultQueryModel) Delete(ctx context.Context, session sqlx.Session, id return err } - tydataQueryIdKey := fmt.Sprintf("%s%v", cacheTydataQueryIdPrefix, id) - tydataQueryOrderIdKey := fmt.Sprintf("%s%v", cacheTydataQueryOrderIdPrefix, data.OrderId) + qncQueryIdKey := fmt.Sprintf("%s%v", cacheQncQueryIdPrefix, id) + qncQueryOrderIdKey := fmt.Sprintf("%s%v", cacheQncQueryOrderIdPrefix, data.OrderId) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataQueryIdKey, tydataQueryOrderIdKey) + }, qncQueryIdKey, qncQueryOrderIdKey) return err } func (m *defaultQueryModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataQueryIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncQueryIdPrefix, primary) } func (m *defaultQueryModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", queryRows, m.table) diff --git a/app/user/model/userAuthModel_gen.go b/app/user/model/userAuthModel_gen.go index 012a9a5..3b2bc18 100644 --- a/app/user/model/userAuthModel_gen.go +++ b/app/user/model/userAuthModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,9 +26,9 @@ var ( userAuthRowsExpectAutoSet = strings.Join(stringx.Remove(userAuthFieldNames, "`id`", "`create_time`", "`update_time`"), ",") userAuthRowsWithPlaceHolder = strings.Join(stringx.Remove(userAuthFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataUserAuthIdPrefix = "cache:tydata:userAuth:id:" - cacheTydataUserAuthAuthTypeAuthKeyPrefix = "cache:tydata:userAuth:authType:authKey:" - cacheTydataUserAuthUserIdAuthTypePrefix = "cache:tydata:userAuth:userId:authType:" + cacheQncUserAuthIdPrefix = "cache:qnc:userAuth:id:" + cacheQncUserAuthAuthTypeAuthKeyPrefix = "cache:qnc:userAuth:authType:authKey:" + cacheQncUserAuthUserIdAuthTypePrefix = "cache:qnc:userAuth:userId:authType:" ) type ( @@ -79,22 +79,22 @@ func newUserAuthModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultUserAuthMode func (m *defaultUserAuthModel) Insert(ctx context.Context, session sqlx.Session, data *UserAuth) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthAuthTypeAuthKeyPrefix, data.AuthType, data.AuthKey) - tydataUserAuthIdKey := fmt.Sprintf("%s%v", cacheTydataUserAuthIdPrefix, data.Id) - tydataUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthUserIdAuthTypePrefix, data.UserId, data.AuthType) + qncUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthAuthTypeAuthKeyPrefix, data.AuthType, data.AuthKey) + qncUserAuthIdKey := fmt.Sprintf("%s%v", cacheQncUserAuthIdPrefix, data.Id) + qncUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthUserIdAuthTypePrefix, data.UserId, data.AuthType) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?)", m.table, userAuthRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.UserId, data.AuthKey, data.AuthType) } return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.UserId, data.AuthKey, data.AuthType) - }, tydataUserAuthAuthTypeAuthKeyKey, tydataUserAuthIdKey, tydataUserAuthUserIdAuthTypeKey) + }, qncUserAuthAuthTypeAuthKeyKey, qncUserAuthIdKey, qncUserAuthUserIdAuthTypeKey) } func (m *defaultUserAuthModel) FindOne(ctx context.Context, id int64) (*UserAuth, error) { - tydataUserAuthIdKey := fmt.Sprintf("%s%v", cacheTydataUserAuthIdPrefix, id) + qncUserAuthIdKey := fmt.Sprintf("%s%v", cacheQncUserAuthIdPrefix, id) var resp UserAuth - err := m.QueryRowCtx(ctx, &resp, tydataUserAuthIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncUserAuthIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", userAuthRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -109,9 +109,9 @@ func (m *defaultUserAuthModel) FindOne(ctx context.Context, id int64) (*UserAuth } func (m *defaultUserAuthModel) FindOneByAuthTypeAuthKey(ctx context.Context, authType string, authKey string) (*UserAuth, error) { - tydataUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthAuthTypeAuthKeyPrefix, authType, authKey) + qncUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthAuthTypeAuthKeyPrefix, authType, authKey) var resp UserAuth - err := m.QueryRowIndexCtx(ctx, &resp, tydataUserAuthAuthTypeAuthKeyKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncUserAuthAuthTypeAuthKeyKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `auth_type` = ? and `auth_key` = ? and del_state = ? limit 1", userAuthRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, authType, authKey, globalkey.DelStateNo); err != nil { return nil, err @@ -129,9 +129,9 @@ func (m *defaultUserAuthModel) FindOneByAuthTypeAuthKey(ctx context.Context, aut } func (m *defaultUserAuthModel) FindOneByUserIdAuthType(ctx context.Context, userId int64, authType string) (*UserAuth, error) { - tydataUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthUserIdAuthTypePrefix, userId, authType) + qncUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthUserIdAuthTypePrefix, userId, authType) var resp UserAuth - err := m.QueryRowIndexCtx(ctx, &resp, tydataUserAuthUserIdAuthTypeKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncUserAuthUserIdAuthTypeKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `user_id` = ? and `auth_type` = ? and del_state = ? limit 1", userAuthRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, userId, authType, globalkey.DelStateNo); err != nil { return nil, err @@ -153,16 +153,16 @@ func (m *defaultUserAuthModel) Update(ctx context.Context, session sqlx.Session, if err != nil { return nil, err } - tydataUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthAuthTypeAuthKeyPrefix, data.AuthType, data.AuthKey) - tydataUserAuthIdKey := fmt.Sprintf("%s%v", cacheTydataUserAuthIdPrefix, data.Id) - tydataUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthUserIdAuthTypePrefix, data.UserId, data.AuthType) + qncUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthAuthTypeAuthKeyPrefix, data.AuthType, data.AuthKey) + qncUserAuthIdKey := fmt.Sprintf("%s%v", cacheQncUserAuthIdPrefix, data.Id) + qncUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthUserIdAuthTypePrefix, data.UserId, data.AuthType) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, userAuthRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.UserId, newData.AuthKey, newData.AuthType, newData.Id) } return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.UserId, newData.AuthKey, newData.AuthType, newData.Id) - }, tydataUserAuthAuthTypeAuthKeyKey, tydataUserAuthIdKey, tydataUserAuthUserIdAuthTypeKey) + }, qncUserAuthAuthTypeAuthKeyKey, qncUserAuthIdKey, qncUserAuthUserIdAuthTypeKey) } func (m *defaultUserAuthModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *UserAuth) error { @@ -177,16 +177,16 @@ func (m *defaultUserAuthModel) UpdateWithVersion(ctx context.Context, session sq if err != nil { return err } - tydataUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthAuthTypeAuthKeyPrefix, data.AuthType, data.AuthKey) - tydataUserAuthIdKey := fmt.Sprintf("%s%v", cacheTydataUserAuthIdPrefix, data.Id) - tydataUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthUserIdAuthTypePrefix, data.UserId, data.AuthType) + qncUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthAuthTypeAuthKeyPrefix, data.AuthType, data.AuthKey) + qncUserAuthIdKey := fmt.Sprintf("%s%v", cacheQncUserAuthIdPrefix, data.Id) + qncUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthUserIdAuthTypePrefix, data.UserId, data.AuthType) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, userAuthRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.UserId, newData.AuthKey, newData.AuthType, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.UserId, newData.AuthKey, newData.AuthType, newData.Id, oldVersion) - }, tydataUserAuthAuthTypeAuthKeyKey, tydataUserAuthIdKey, tydataUserAuthUserIdAuthTypeKey) + }, qncUserAuthAuthTypeAuthKeyKey, qncUserAuthIdKey, qncUserAuthUserIdAuthTypeKey) if err != nil { return err } @@ -205,7 +205,7 @@ func (m *defaultUserAuthModel) DeleteSoft(ctx context.Context, session sqlx.Sess data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "UserAuthModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "UserAuthModel delete err : %+v", err) } return nil } @@ -409,20 +409,20 @@ func (m *defaultUserAuthModel) Delete(ctx context.Context, session sqlx.Session, return err } - tydataUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthAuthTypeAuthKeyPrefix, data.AuthType, data.AuthKey) - tydataUserAuthIdKey := fmt.Sprintf("%s%v", cacheTydataUserAuthIdPrefix, id) - tydataUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheTydataUserAuthUserIdAuthTypePrefix, data.UserId, data.AuthType) + qncUserAuthAuthTypeAuthKeyKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthAuthTypeAuthKeyPrefix, data.AuthType, data.AuthKey) + qncUserAuthIdKey := fmt.Sprintf("%s%v", cacheQncUserAuthIdPrefix, id) + qncUserAuthUserIdAuthTypeKey := fmt.Sprintf("%s%v:%v", cacheQncUserAuthUserIdAuthTypePrefix, data.UserId, data.AuthType) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataUserAuthAuthTypeAuthKeyKey, tydataUserAuthIdKey, tydataUserAuthUserIdAuthTypeKey) + }, qncUserAuthAuthTypeAuthKeyKey, qncUserAuthIdKey, qncUserAuthUserIdAuthTypeKey) return err } func (m *defaultUserAuthModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataUserAuthIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncUserAuthIdPrefix, primary) } func (m *defaultUserAuthModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", userAuthRows, m.table) diff --git a/app/user/model/userModel_gen.go b/app/user/model/userModel_gen.go index 1b4f1bb..6ea265a 100644 --- a/app/user/model/userModel_gen.go +++ b/app/user/model/userModel_gen.go @@ -17,7 +17,7 @@ import ( "github.com/zeromicro/go-zero/core/stores/sqlc" "github.com/zeromicro/go-zero/core/stores/sqlx" "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" ) var ( @@ -26,8 +26,8 @@ var ( userRowsExpectAutoSet = strings.Join(stringx.Remove(userFieldNames, "`id`", "`create_time`", "`update_time`"), ",") userRowsWithPlaceHolder = strings.Join(stringx.Remove(userFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - cacheTydataUserIdPrefix = "cache:tydata:user:id:" - cacheTydataUserMobilePrefix = "cache:tydata:user:mobile:" + cacheQncUserIdPrefix = "cache:qnc:user:id:" + cacheQncUserMobilePrefix = "cache:qnc:user:mobile:" ) type ( @@ -64,7 +64,7 @@ type ( Version int64 `db:"version"` // 版本号 Mobile string `db:"mobile"` Password sql.NullString `db:"password"` - Nickname string `db:"nickname"` + Nickname sql.NullString `db:"nickname"` Info string `db:"info"` Inside int64 `db:"inside"` } @@ -79,21 +79,21 @@ func newUserModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultUserModel { func (m *defaultUserModel) Insert(ctx context.Context, session sqlx.Session, data *User) (sql.Result, error) { data.DelState = globalkey.DelStateNo - tydataUserIdKey := fmt.Sprintf("%s%v", cacheTydataUserIdPrefix, data.Id) - tydataUserMobileKey := fmt.Sprintf("%s%v", cacheTydataUserMobilePrefix, data.Mobile) + qncUserIdKey := fmt.Sprintf("%s%v", cacheQncUserIdPrefix, data.Id) + qncUserMobileKey := fmt.Sprintf("%s%v", cacheQncUserMobilePrefix, data.Mobile) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, userRowsExpectAutoSet) if session != nil { return session.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.Mobile, data.Password, data.Nickname, data.Info, data.Inside) } return conn.ExecCtx(ctx, query, data.DeleteTime, data.DelState, data.Version, data.Mobile, data.Password, data.Nickname, data.Info, data.Inside) - }, tydataUserIdKey, tydataUserMobileKey) + }, qncUserIdKey, qncUserMobileKey) } func (m *defaultUserModel) FindOne(ctx context.Context, id int64) (*User, error) { - tydataUserIdKey := fmt.Sprintf("%s%v", cacheTydataUserIdPrefix, id) + qncUserIdKey := fmt.Sprintf("%s%v", cacheQncUserIdPrefix, id) var resp User - err := m.QueryRowCtx(ctx, &resp, tydataUserIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { + err := m.QueryRowCtx(ctx, &resp, qncUserIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", userRows, m.table) return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) }) @@ -108,9 +108,9 @@ func (m *defaultUserModel) FindOne(ctx context.Context, id int64) (*User, error) } func (m *defaultUserModel) FindOneByMobile(ctx context.Context, mobile string) (*User, error) { - tydataUserMobileKey := fmt.Sprintf("%s%v", cacheTydataUserMobilePrefix, mobile) + qncUserMobileKey := fmt.Sprintf("%s%v", cacheQncUserMobilePrefix, mobile) var resp User - err := m.QueryRowIndexCtx(ctx, &resp, tydataUserMobileKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { + err := m.QueryRowIndexCtx(ctx, &resp, qncUserMobileKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { query := fmt.Sprintf("select %s from %s where `mobile` = ? and del_state = ? limit 1", userRows, m.table) if err := conn.QueryRowCtx(ctx, &resp, query, mobile, globalkey.DelStateNo); err != nil { return nil, err @@ -132,15 +132,15 @@ func (m *defaultUserModel) Update(ctx context.Context, session sqlx.Session, new if err != nil { return nil, err } - tydataUserIdKey := fmt.Sprintf("%s%v", cacheTydataUserIdPrefix, data.Id) - tydataUserMobileKey := fmt.Sprintf("%s%v", cacheTydataUserMobilePrefix, data.Mobile) + qncUserIdKey := fmt.Sprintf("%s%v", cacheQncUserIdPrefix, data.Id) + qncUserMobileKey := fmt.Sprintf("%s%v", cacheQncUserMobilePrefix, data.Mobile) return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, userRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.Mobile, newData.Password, newData.Nickname, newData.Info, newData.Inside, newData.Id) } return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.Mobile, newData.Password, newData.Nickname, newData.Info, newData.Inside, newData.Id) - }, tydataUserIdKey, tydataUserMobileKey) + }, qncUserIdKey, qncUserMobileKey) } func (m *defaultUserModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *User) error { @@ -155,15 +155,15 @@ func (m *defaultUserModel) UpdateWithVersion(ctx context.Context, session sqlx.S if err != nil { return err } - tydataUserIdKey := fmt.Sprintf("%s%v", cacheTydataUserIdPrefix, data.Id) - tydataUserMobileKey := fmt.Sprintf("%s%v", cacheTydataUserMobilePrefix, data.Mobile) + qncUserIdKey := fmt.Sprintf("%s%v", cacheQncUserIdPrefix, data.Id) + qncUserMobileKey := fmt.Sprintf("%s%v", cacheQncUserMobilePrefix, data.Mobile) sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, userRowsWithPlaceHolder) if session != nil { return session.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.Mobile, newData.Password, newData.Nickname, newData.Info, newData.Inside, newData.Id, oldVersion) } return conn.ExecCtx(ctx, query, newData.DeleteTime, newData.DelState, newData.Version, newData.Mobile, newData.Password, newData.Nickname, newData.Info, newData.Inside, newData.Id, oldVersion) - }, tydataUserIdKey, tydataUserMobileKey) + }, qncUserIdKey, qncUserMobileKey) if err != nil { return err } @@ -182,7 +182,7 @@ func (m *defaultUserModel) DeleteSoft(ctx context.Context, session sqlx.Session, data.DelState = globalkey.DelStateYes data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "UserModel delete err : %v", err) + return errors.Wrapf(errors.New("delete soft failed "), "UserModel delete err : %+v", err) } return nil } @@ -386,19 +386,19 @@ func (m *defaultUserModel) Delete(ctx context.Context, session sqlx.Session, id return err } - tydataUserIdKey := fmt.Sprintf("%s%v", cacheTydataUserIdPrefix, id) - tydataUserMobileKey := fmt.Sprintf("%s%v", cacheTydataUserMobilePrefix, data.Mobile) + qncUserIdKey := fmt.Sprintf("%s%v", cacheQncUserIdPrefix, id) + qncUserMobileKey := fmt.Sprintf("%s%v", cacheQncUserMobilePrefix, data.Mobile) _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { query := fmt.Sprintf("delete from %s where `id` = ?", m.table) if session != nil { return session.ExecCtx(ctx, query, id) } return conn.ExecCtx(ctx, query, id) - }, tydataUserIdKey, tydataUserMobileKey) + }, qncUserIdKey, qncUserMobileKey) return err } func (m *defaultUserModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataUserIdPrefix, primary) + return fmt.Sprintf("%s%v", cacheQncUserIdPrefix, primary) } func (m *defaultUserModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", userRows, m.table) diff --git a/common/interceptor/rpcserver/loggerInterceptor.go b/common/interceptor/rpcserver/loggerInterceptor.go index 9fc0f39..d323839 100644 --- a/common/interceptor/rpcserver/loggerInterceptor.go +++ b/common/interceptor/rpcserver/loggerInterceptor.go @@ -3,7 +3,7 @@ package rpcserver import ( "context" - "tydata-server/common/xerr" + "qnc-server/common/xerr" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" diff --git a/common/result/httpResult.go b/common/result/httpResult.go index 99eb8f4..1b0609a 100644 --- a/common/result/httpResult.go +++ b/common/result/httpResult.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "tydata-server/common/xerr" + "qnc-server/common/xerr" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" diff --git a/common/result/jobResult.go b/common/result/jobResult.go index 65f6ff0..d18476f 100644 --- a/common/result/jobResult.go +++ b/common/result/jobResult.go @@ -3,7 +3,7 @@ package result import ( "context" - "tydata-server/common/xerr" + "qnc-server/common/xerr" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/logx" diff --git a/common/uniqueid/sn.go b/common/uniqueid/sn.go index 33dddee..9660b9d 100644 --- a/common/uniqueid/sn.go +++ b/common/uniqueid/sn.go @@ -2,16 +2,16 @@ package uniqueid import ( "fmt" + "qnc-server/common/tool" "time" - "tydata-server/common/tool" ) // 生成sn单号 type SnPrefix string const ( - SN_PREFIX_HOMESTAY_ORDER SnPrefix = "HSO" //民宿订单前缀 tydata-server_order/homestay_order - SN_PREFIX_THIRD_PAYMENT SnPrefix = "PMT" //第三方支付流水记录前缀 tydata-server_payment/third_payment + SN_PREFIX_HOMESTAY_ORDER SnPrefix = "HSO" //民宿订单前缀 qnc-server_order/homestay_order + SN_PREFIX_THIRD_PAYMENT SnPrefix = "PMT" //第三方支付流水记录前缀 qnc-server_payment/third_payment ) // 生成单号 diff --git a/common/xerr/errCode.go b/common/xerr/errCode.go index 0d92ac5..4d872e0 100644 --- a/common/xerr/errCode.go +++ b/common/xerr/errCode.go @@ -15,6 +15,7 @@ const DB_UPDATE_AFFECTED_ZERO_ERROR uint32 = 100006 const PARAM_VERIFICATION_ERROR uint32 = 100007 const CUSTOM_ERROR uint32 = 100008 const USER_NOT_FOUND uint32 = 100009 + const LOGIN_FAILED uint32 = 200001 const LOGIC_QUERY_WAIT uint32 = 200002 const LOGIC_QUERY_ERROR uint32 = 200003 diff --git a/deploy/script/encrypt_mobile.go b/deploy/script/encrypt_mobile.go new file mode 100644 index 0000000..01ee18f --- /dev/null +++ b/deploy/script/encrypt_mobile.go @@ -0,0 +1,102 @@ +package script + +import ( + "fmt" + "log" + "qnc-server/pkg/lzkit/crypto" + + "github.com/zeromicro/go-zero/core/stores/sqlx" +) + +const ( + // 请替换为实际的数据库连接信息 + dbHost = "localhost" + dbPort = "21001" + dbUser = "qnc" + dbPassword = "5vg67b3UNHu8" + dbName = "qnc" + // 请替换为实际的加密密钥 + secretKey = "ff83609b2b24fc73196aac3d3dfb874f" +) + +func RunEncryptMobile() { + fmt.Println("开始加密手机号") + // 连接数据库 + dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=True&loc=Local", + dbUser, dbPassword, dbHost, dbPort, dbName) + db := sqlx.NewMysql(dsn) + + // 加密user表的mobile字段 + if err := encryptUserMobile(db); err != nil { + log.Fatalf("加密user表mobile字段失败: %v", err) + } + + // 加密user_auth表的auth_key字段 + if err := encryptUserAuthKey(db); err != nil { + log.Fatalf("加密user_auth表auth_key字段失败: %v", err) + } + + fmt.Println("加密完成！") +} + +func encryptUserMobile(db sqlx.SqlConn) error { + // 查询所有未加密的手机号 + query := "SELECT id, mobile FROM user WHERE mobile IS NOT NULL AND mobile != ''" + var rows []struct { + ID int64 `db:"id"` + Mobile string `db:"mobile"` + } + if err := db.QueryRows(&rows, query); err != nil { + return fmt.Errorf("查询user表失败: %v", err) + } + + // 准备更新语句 + updateStmt := "UPDATE user SET mobile = ? WHERE id = ?" + + // 处理每一行 + for _, row := range rows { + // 加密手机号 + encryptedMobile, err := crypto.EncryptMobile(row.Mobile, secretKey) + if err != nil { + return fmt.Errorf("加密手机号失败: %v", err) + } + + // 更新数据库 + if _, err := db.Exec(updateStmt, encryptedMobile, row.ID); err != nil { + return fmt.Errorf("更新user表失败: %v", err) + } + } + + return nil +} + +func encryptUserAuthKey(db sqlx.SqlConn) error { + // 查询所有需要加密的auth_key + query := "SELECT id, auth_key FROM user_auth WHERE auth_type = 'app_mobile' AND auth_key IS NOT NULL AND auth_key != ''" + var rows []struct { + ID int64 `db:"id"` + AuthKey string `db:"auth_key"` + } + if err := db.QueryRows(&rows, query); err != nil { + return fmt.Errorf("查询user_auth表失败: %v", err) + } + + // 准备更新语句 + updateStmt := "UPDATE user_auth SET auth_key = ? WHERE id = ?" + + // 处理每一行 + for _, row := range rows { + // 加密auth_key + encryptedAuthKey, err := crypto.EncryptMobile(row.AuthKey, secretKey) + if err != nil { + return fmt.Errorf("加密auth_key失败: %v", err) + } + + // 更新数据库 + if _, err := db.Exec(updateStmt, encryptedAuthKey, row.ID); err != nil { + return fmt.Errorf("更新user_auth表失败: %v", err) + } + } + + return nil +} diff --git a/deploy/script/gen_models.ps1 b/deploy/script/gen_models.ps1 new file mode 100644 index 0000000..b1faf64 --- /dev/null +++ b/deploy/script/gen_models.ps1 @@ -0,0 +1,39 @@ +# 设置输出编码为UTF-8 +[Console]::OutputEncoding = [System.Text.Encoding]::UTF8 +# 数据库连接信息 - 修改了URL格式 +$DB_URL = "qnc:5vg67b3UNHu8@(127.0.0.1:21001)/qnc" +$OUTPUT_DIR = "./model" +$TEMPLATE_DIR = "../template" + +# 表名列表 +$tables = @( + # "agent", + # "agent_active_stat", + # "agent_audit", + # "agent_closure", + # "agent_commission", + # "agent_commission_deduction", + # "agent_link", + # "agent_membership_config", + # "agent_membership_recharge_order", + # "agent_membership_user_config", + # "agent_order", + # "agent_platform_deduction", + # "agent_product_config", + # "agent_rewards", + # "agent_wallet", + # "agent_withdrawal", + # "feature", + # "global_notifications", + # "order", + # "product", + # "product_feature", + # "query", + "user" + # "user_auth" +) + +# 为每个表生成模型 +foreach ($table in $tables) { + goctl model mysql datasource -url="qnc:5vg67b3UNHu8@tcp(127.0.0.1:21001)/qnc" -table="$table" -dir="./model" --home="../template" -cache=true --style=goZero +} diff --git a/deploy/script/go.mod b/deploy/script/go.mod deleted file mode 100644 index c27eb0c..0000000 --- a/deploy/script/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module script - -go 1.23.4 diff --git a/deploy/script/model/agentActiveStatModel.go b/deploy/script/model/agentActiveStatModel.go deleted file mode 100644 index 86ce2ef..0000000 --- a/deploy/script/model/agentActiveStatModel.go +++ /dev/null @@ -1,27 +0,0 @@ -package model - -import ( - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) - -var _ AgentActiveStatModel = (*customAgentActiveStatModel)(nil) - -type ( - // AgentActiveStatModel is an interface to be customized, add more methods here, - // and implement the added methods in customAgentActiveStatModel. - AgentActiveStatModel interface { - agentActiveStatModel - } - - customAgentActiveStatModel struct { - *defaultAgentActiveStatModel - } -) - -// NewAgentActiveStatModel returns a model for the database table. -func NewAgentActiveStatModel(conn sqlx.SqlConn, c cache.CacheConf) AgentActiveStatModel { - return &customAgentActiveStatModel{ - defaultAgentActiveStatModel: newAgentActiveStatModel(conn, c), - } -} diff --git a/deploy/script/model/agentActiveStatModel_gen.go b/deploy/script/model/agentActiveStatModel_gen.go deleted file mode 100644 index af443da..0000000 --- a/deploy/script/model/agentActiveStatModel_gen.go +++ /dev/null @@ -1,408 +0,0 @@ -// Code generated by goctl. DO NOT EDIT! - -package model - -import ( - "context" - "database/sql" - "fmt" - "strings" - - "time" - - "github.com/Masterminds/squirrel" - "github.com/pkg/errors" - "github.com/zeromicro/go-zero/core/stores/builder" - "github.com/zeromicro/go-zero/core/stores/cache" - "github.com/zeromicro/go-zero/core/stores/sqlc" - "github.com/zeromicro/go-zero/core/stores/sqlx" - "github.com/zeromicro/go-zero/core/stringx" - "tydata-server/common/globalkey" -) - -var ( - agentActiveStatFieldNames = builder.RawFieldNames(&AgentActiveStat{}) - agentActiveStatRows = strings.Join(agentActiveStatFieldNames, ",") - agentActiveStatRowsExpectAutoSet = strings.Join(stringx.Remove(agentActiveStatFieldNames, "`id`", "`create_time`", "`update_time`"), ",") - agentActiveStatRowsWithPlaceHolder = strings.Join(stringx.Remove(agentActiveStatFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" - - cacheTydataAgentActiveStatIdPrefix = "cache:tydata:agentActiveStat:id:" - cacheTydataAgentActiveStatAgentIdStatDatePrefix = "cache:tydata:agentActiveStat:agentId:statDate:" -) - -type ( - agentActiveStatModel interface { - Insert(ctx context.Context, session sqlx.Session, data *AgentActiveStat) (sql.Result, error) - FindOne(ctx context.Context, id int64) (*AgentActiveStat, error) - FindOneByAgentIdStatDate(ctx context.Context, agentId int64, statDate time.Time) (*AgentActiveStat, error) - Update(ctx context.Context, session sqlx.Session, data *AgentActiveStat) (sql.Result, error) - UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentActiveStat) error - Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error - SelectBuilder() squirrel.SelectBuilder - DeleteSoft(ctx context.Context, session sqlx.Session, data *AgentActiveStat) error - FindSum(ctx context.Context, sumBuilder squirrel.SelectBuilder, field string) (float64, error) - FindCount(ctx context.Context, countBuilder squirrel.SelectBuilder, field string) (int64, error) - FindAll(ctx context.Context, rowBuilder squirrel.SelectBuilder, orderBy string) ([]*AgentActiveStat, error) - FindPageListByPage(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentActiveStat, error) - FindPageListByPageWithTotal(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentActiveStat, int64, error) - FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*AgentActiveStat, error) - FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*AgentActiveStat, error) - Delete(ctx context.Context, session sqlx.Session, id int64) error - } - - defaultAgentActiveStatModel struct { - sqlc.CachedConn - table string - } - - AgentActiveStat struct { - Id int64 `db:"id"` // 主键ID - AgentId int64 `db:"agent_id"` // 代理ID - StatDate time.Time `db:"stat_date"` // 统计日期 - ActiveNumber int64 `db:"active_number"` // 下级活跃数 - CreateTime time.Time `db:"create_time"` // 创建时间 - UpdateTime time.Time `db:"update_time"` // 更新时间 - DeleteTime sql.NullTime `db:"delete_time"` // 删除时间 - DelState int64 `db:"del_state"` // 删除状态 - Version int64 `db:"version"` // 版本号 - } -) - -func newAgentActiveStatModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentActiveStatModel { - return &defaultAgentActiveStatModel{ - CachedConn: sqlc.NewConn(conn, c), - table: "`agent_active_stat`", - } -} - -func (m *defaultAgentActiveStatModel) Insert(ctx context.Context, session sqlx.Session, data *AgentActiveStat) (sql.Result, error) { - data.DelState = globalkey.DelStateNo - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, data.Id) - return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?)", m.table, agentActiveStatRowsExpectAutoSet) - if session != nil { - return session.ExecCtx(ctx, query, data.AgentId, data.StatDate, data.ActiveNumber, data.DeleteTime, data.DelState, data.Version) - } - return conn.ExecCtx(ctx, query, data.AgentId, data.StatDate, data.ActiveNumber, data.DeleteTime, data.DelState, data.Version) - }, tydataAgentActiveStatAgentIdStatDateKey, tydataAgentActiveStatIdKey) -} - -func (m *defaultAgentActiveStatModel) FindOne(ctx context.Context, id int64) (*AgentActiveStat, error) { - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, id) - var resp AgentActiveStat - err := m.QueryRowCtx(ctx, &resp, tydataAgentActiveStatIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error { - query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentActiveStatRows, m.table) - return conn.QueryRowCtx(ctx, v, query, id, globalkey.DelStateNo) - }) - switch err { - case nil: - return &resp, nil - case sqlc.ErrNotFound: - return nil, ErrNotFound - default: - return nil, err - } -} - -func (m *defaultAgentActiveStatModel) FindOneByAgentIdStatDate(ctx context.Context, agentId int64, statDate time.Time) (*AgentActiveStat, error) { - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, agentId, statDate) - var resp AgentActiveStat - err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentActiveStatAgentIdStatDateKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) { - query := fmt.Sprintf("select %s from %s where `agent_id` = ? and `stat_date` = ? and del_state = ? limit 1", agentActiveStatRows, m.table) - if err := conn.QueryRowCtx(ctx, &resp, query, agentId, statDate, globalkey.DelStateNo); err != nil { - return nil, err - } - return resp.Id, nil - }, m.queryPrimary) - switch err { - case nil: - return &resp, nil - case sqlc.ErrNotFound: - return nil, ErrNotFound - default: - return nil, err - } -} - -func (m *defaultAgentActiveStatModel) Update(ctx context.Context, session sqlx.Session, newData *AgentActiveStat) (sql.Result, error) { - data, err := m.FindOne(ctx, newData.Id) - if err != nil { - return nil, err - } - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, data.Id) - return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentActiveStatRowsWithPlaceHolder) - if session != nil { - return session.ExecCtx(ctx, query, newData.AgentId, newData.StatDate, newData.ActiveNumber, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - } - return conn.ExecCtx(ctx, query, newData.AgentId, newData.StatDate, newData.ActiveNumber, newData.DeleteTime, newData.DelState, newData.Version, newData.Id) - }, tydataAgentActiveStatAgentIdStatDateKey, tydataAgentActiveStatIdKey) -} - -func (m *defaultAgentActiveStatModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentActiveStat) error { - - oldVersion := newData.Version - newData.Version += 1 - - var sqlResult sql.Result - var err error - - data, err := m.FindOne(ctx, newData.Id) - if err != nil { - return err - } - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, data.Id) - sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentActiveStatRowsWithPlaceHolder) - if session != nil { - return session.ExecCtx(ctx, query, newData.AgentId, newData.StatDate, newData.ActiveNumber, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - } - return conn.ExecCtx(ctx, query, newData.AgentId, newData.StatDate, newData.ActiveNumber, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion) - }, tydataAgentActiveStatAgentIdStatDateKey, tydataAgentActiveStatIdKey) - if err != nil { - return err - } - updateCount, err := sqlResult.RowsAffected() - if err != nil { - return err - } - if updateCount == 0 { - return ErrNoRowsUpdate - } - - return nil -} - -func (m *defaultAgentActiveStatModel) DeleteSoft(ctx context.Context, session sqlx.Session, data *AgentActiveStat) error { - data.DelState = globalkey.DelStateYes - data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true} - if err := m.UpdateWithVersion(ctx, session, data); err != nil { - return errors.Wrapf(errors.New("delete soft failed "), "AgentActiveStatModel delete err : %v", err) - } - return nil -} - -func (m *defaultAgentActiveStatModel) FindSum(ctx context.Context, builder squirrel.SelectBuilder, field string) (float64, error) { - - if len(field) == 0 { - return 0, errors.Wrapf(errors.New("FindSum Least One Field"), "FindSum Least One Field") - } - - builder = builder.Columns("IFNULL(SUM(" + field + "),0)") - - query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() - if err != nil { - return 0, err - } - - var resp float64 - err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...) - switch err { - case nil: - return resp, nil - default: - return 0, err - } -} - -func (m *defaultAgentActiveStatModel) FindCount(ctx context.Context, builder squirrel.SelectBuilder, field string) (int64, error) { - - if len(field) == 0 { - return 0, errors.Wrapf(errors.New("FindCount Least One Field"), "FindCount Least One Field") - } - - builder = builder.Columns("COUNT(" + field + ")") - - query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() - if err != nil { - return 0, err - } - - var resp int64 - err = m.QueryRowNoCacheCtx(ctx, &resp, query, values...) - switch err { - case nil: - return resp, nil - default: - return 0, err - } -} - -func (m *defaultAgentActiveStatModel) FindAll(ctx context.Context, builder squirrel.SelectBuilder, orderBy string) ([]*AgentActiveStat, error) { - - builder = builder.Columns(agentActiveStatRows) - - if orderBy == "" { - builder = builder.OrderBy("id DESC") - } else { - builder = builder.OrderBy(orderBy) - } - - query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).ToSql() - if err != nil { - return nil, err - } - - var resp []*AgentActiveStat - err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) - switch err { - case nil: - return resp, nil - default: - return nil, err - } -} - -func (m *defaultAgentActiveStatModel) FindPageListByPage(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentActiveStat, error) { - - builder = builder.Columns(agentActiveStatRows) - - if orderBy == "" { - builder = builder.OrderBy("id DESC") - } else { - builder = builder.OrderBy(orderBy) - } - - if page < 1 { - page = 1 - } - offset := (page - 1) * pageSize - - query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql() - if err != nil { - return nil, err - } - - var resp []*AgentActiveStat - err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) - switch err { - case nil: - return resp, nil - default: - return nil, err - } -} - -func (m *defaultAgentActiveStatModel) FindPageListByPageWithTotal(ctx context.Context, builder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*AgentActiveStat, int64, error) { - - total, err := m.FindCount(ctx, builder, "id") - if err != nil { - return nil, 0, err - } - - builder = builder.Columns(agentActiveStatRows) - - if orderBy == "" { - builder = builder.OrderBy("id DESC") - } else { - builder = builder.OrderBy(orderBy) - } - - if page < 1 { - page = 1 - } - offset := (page - 1) * pageSize - - query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).Offset(uint64(offset)).Limit(uint64(pageSize)).ToSql() - if err != nil { - return nil, total, err - } - - var resp []*AgentActiveStat - err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) - switch err { - case nil: - return resp, total, nil - default: - return nil, total, err - } -} - -func (m *defaultAgentActiveStatModel) FindPageListByIdDESC(ctx context.Context, builder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*AgentActiveStat, error) { - - builder = builder.Columns(agentActiveStatRows) - - if preMinId > 0 { - builder = builder.Where(" id < ? ", preMinId) - } - - query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id DESC").Limit(uint64(pageSize)).ToSql() - if err != nil { - return nil, err - } - - var resp []*AgentActiveStat - err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) - switch err { - case nil: - return resp, nil - default: - return nil, err - } -} - -func (m *defaultAgentActiveStatModel) FindPageListByIdASC(ctx context.Context, builder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*AgentActiveStat, error) { - - builder = builder.Columns(agentActiveStatRows) - - if preMaxId > 0 { - builder = builder.Where(" id > ? ", preMaxId) - } - - query, values, err := builder.Where("del_state = ?", globalkey.DelStateNo).OrderBy("id ASC").Limit(uint64(pageSize)).ToSql() - if err != nil { - return nil, err - } - - var resp []*AgentActiveStat - err = m.QueryRowsNoCacheCtx(ctx, &resp, query, values...) - switch err { - case nil: - return resp, nil - default: - return nil, err - } -} - -func (m *defaultAgentActiveStatModel) Trans(ctx context.Context, fn func(ctx context.Context, session sqlx.Session) error) error { - - return m.TransactCtx(ctx, func(ctx context.Context, session sqlx.Session) error { - return fn(ctx, session) - }) - -} - -func (m *defaultAgentActiveStatModel) SelectBuilder() squirrel.SelectBuilder { - return squirrel.Select().From(m.table) -} -func (m *defaultAgentActiveStatModel) Delete(ctx context.Context, session sqlx.Session, id int64) error { - data, err := m.FindOne(ctx, id) - if err != nil { - return err - } - - tydataAgentActiveStatAgentIdStatDateKey := fmt.Sprintf("%s%v:%v", cacheTydataAgentActiveStatAgentIdStatDatePrefix, data.AgentId, data.StatDate) - tydataAgentActiveStatIdKey := fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, id) - _, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) { - query := fmt.Sprintf("delete from %s where `id` = ?", m.table) - if session != nil { - return session.ExecCtx(ctx, query, id) - } - return conn.ExecCtx(ctx, query, id) - }, tydataAgentActiveStatAgentIdStatDateKey, tydataAgentActiveStatIdKey) - return err -} -func (m *defaultAgentActiveStatModel) formatPrimary(primary interface{}) string { - return fmt.Sprintf("%s%v", cacheTydataAgentActiveStatIdPrefix, primary) -} -func (m *defaultAgentActiveStatModel) queryPrimary(ctx context.Context, conn sqlx.SqlConn, v, primary interface{}) error { - query := fmt.Sprintf("select %s from %s where `id` = ? and del_state = ? limit 1", agentActiveStatRows, m.table) - return conn.QueryRowCtx(ctx, v, query, primary, globalkey.DelStateNo) -} - -func (m *defaultAgentActiveStatModel) tableName() string { - return m.table -} diff --git a/deploy/script/model/vars.go b/deploy/script/model/vars.go index 9267571..81462b5 100644 --- a/deploy/script/model/vars.go +++ b/deploy/script/model/vars.go @@ -1,9 +1,9 @@ package model import ( - "errors" - "github.com/zeromicro/go-zero/core/stores/sqlx" + "errors" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) var ErrNotFound = sqlx.ErrNotFound -var ErrNoRowsUpdate = errors.New("update db no rows change") +var ErrNoRowsUpdate = errors.New("update db no rows change") \ No newline at end of file diff --git a/deploy/template/api/handler.tpl b/deploy/template/api/handler.tpl index e7ba9dd..dcd3729 100644 --- a/deploy/template/api/handler.tpl +++ b/deploy/template/api/handler.tpl @@ -3,8 +3,8 @@ package {{.PkgName}} import ( "net/http" - "tydata-server/common/result" - "tydata-server/pkg/lzkit/validator" + "qnc-server/common/result" + "qnc-server/pkg/lzkit/validator" "github.com/zeromicro/go-zero/rest/httpx" {{.ImportPackages}} ) diff --git a/deploy/template/api/main.tpl b/deploy/template/api/main.tpl index ae89629..71be5cb 100644 --- a/deploy/template/api/main.tpl +++ b/deploy/template/api/main.tpl @@ -5,7 +5,7 @@ import ( "fmt" {{.importPackages}} - "tydata-server/common/middleware" + "qnc-server/common/middleware" ) var configFile = flag.String("f", "etc/{{.serviceName}}.yaml", "the config file") diff --git a/deploy/template/model/import-no-cache.tpl b/deploy/template/model/import-no-cache.tpl index b74144b..2b5e853 100644 --- a/deploy/template/model/import-no-cache.tpl +++ b/deploy/template/model/import-no-cache.tpl @@ -6,7 +6,7 @@ import ( {{if .time}}"time"{{end}} - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" "github.com/Masterminds/squirrel" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/builder" diff --git a/deploy/template/model/import.tpl b/deploy/template/model/import.tpl index 94de49d..3cd8038 100644 --- a/deploy/template/model/import.tpl +++ b/deploy/template/model/import.tpl @@ -6,7 +6,7 @@ import ( {{if .time}}"time"{{end}} - "tydata-server/common/globalkey" + "qnc-server/common/globalkey" "github.com/Masterminds/squirrel" "github.com/pkg/errors" "github.com/zeromicro/go-zero/core/stores/builder" diff --git a/deploy/template/rpc/main.tpl b/deploy/template/rpc/main.tpl index 45e3a11..d7bea24 100644 --- a/deploy/template/rpc/main.tpl +++ b/deploy/template/rpc/main.tpl @@ -5,7 +5,7 @@ import ( "fmt" {{.imports}} - "tydata-server/common/interceptor/rpcserver" + "qnc-server/common/interceptor/rpcserver" "github.com/zeromicro/go-zero/core/conf" "github.com/zeromicro/go-zero/core/service" diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f43b4a3..2d9fe5d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -2,14 +2,14 @@ services: mysql: image: mysql:8.0.34 - container_name: tydata_mysql + container_name: qnc_mysql environment: # 时区上海 - Time zone Shanghai (Change if needed) TZ: Asia/Shanghai # root 密码 - root password MYSQL_ROOT_PASSWORD: yfg87gyuYiy1 - MYSQL_DATABASE: tydata - MYSQL_USER: tydata + MYSQL_DATABASE: qnc + MYSQL_USER: qnc MYSQL_PASSWORD: 5vg67b3UNHu8 ports: - "21001:3306" @@ -20,19 +20,19 @@ services: command: # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) # Modify the Mysql 8.0 default password strategy to the original strategy (MySQL8.0 to change its default strategy will cause the password to be unable to match) - --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci --explicit_defaults_for_timestamp=true --lower_case_table_names=1 + --default-authentication-plugin=mysql_native_password privileged: true restart: always networks: - - tydata_net + - qnc_net redis: image: redis:7.4.0 - container_name: tydata_redis + container_name: qnc_redis ports: - "21002:6379" environment: @@ -45,39 +45,39 @@ services: privileged: true restart: always networks: - - tydata_net + - qnc_net asynqmon: image: hibiken/asynqmon:latest - container_name: tydata_asynqmon + container_name: qnc_asynqmon ports: - "21003:8080" environment: - TZ=Asia/Shanghai command: - - '--redis-addr=tydata_redis:6379' + - '--redis-addr=qnc_redis:6379' - '--redis-password=3m3WsgyCKWqz' restart: always networks: - - tydata_net + - qnc_net depends_on: - redis phpmyadmin: image: phpmyadmin/phpmyadmin - container_name: phpmyadmin_container + container_name: qnc_phpmyadmin restart: unless-stopped environment: - PMA_HOST: tydata_mysql + PMA_HOST: qnc_mysql PMA_PORT: 3306 - PMA_USER: tydata + PMA_USER: qnc PMA_PASSWORD: 5vg67b3UNHu8 ports: - "21004:80" depends_on: - mysql networks: - - tydata_net + - qnc_net networks: - tydata_net: + qnc_net: driver: bridge diff --git a/docker-compose.service.yml b/docker-compose.service.yml index b852253..519aa07 100644 --- a/docker-compose.service.yml +++ b/docker-compose.service.yml @@ -14,7 +14,7 @@ services: ports: - "28080:8080" networks: - - tydata_net + - qnc_net - service_net environment: - TZ=Asia/Shanghai @@ -23,7 +23,7 @@ services: networks: # 连接到现有的环境网络 - tydata_net: + qnc_net: external: true # 服务内部网络 service_net: diff --git a/docker-compose.yml b/docker-compose.yml index 8aefd43..386ecdd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,14 +4,14 @@ services: mysql: image: mysql:8.0.34 - container_name: tydata_mysql + container_name: qnc_mysql environment: # 时区上海 - Time zone Shanghai (Change if needed) TZ: Asia/Shanghai # root 密码 - root password MYSQL_ROOT_PASSWORD: yfg87gyuYiy1 - MYSQL_DATABASE: tydata - MYSQL_USER: tydata + MYSQL_DATABASE: qnc + MYSQL_USER: qnc MYSQL_PASSWORD: 5vg67b3UNHu8 ports: - "21001:3306" @@ -30,12 +30,12 @@ services: privileged: true restart: always networks: - - tydata_net + - qnc_net - 1panel-network redis: image: redis:7.4.0 - container_name: tydata_redis + container_name: qnc_redis ports: - "21002:6379" environment: @@ -48,26 +48,26 @@ services: privileged: true restart: always networks: - - tydata_net + - qnc_net asynqmon: image: hibiken/asynqmon:latest - container_name: tydata_asynqmon + container_name: qnc_asynqmon ports: - "21003:8080" environment: - TZ=Asia/Shanghai command: - - '--redis-addr=tydata_redis:6379' + - '--redis-addr=qnc_redis:6379' - '--redis-password=3m3WsgyCKWqz' restart: always networks: - - tydata_net + - qnc_net depends_on: - redis main: - container_name: tydata_main + container_name: qnc_main build: context: . dockerfile: ./app/user/cmd/api/Dockerfile @@ -80,11 +80,11 @@ services: - mysql - redis networks: - - tydata_net + - qnc_net restart: always networks: - tydata_net: + qnc_net: driver: bridge 1panel-network: external: true diff --git a/go.mod b/go.mod index 5ff63f0..7e70e0d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module tydata-server +module qnc-server go 1.22.4 diff --git a/pkg/lzkit/crypto/README.md b/pkg/lzkit/crypto/README.md index bd8d77e..0468c0d 100644 --- a/pkg/lzkit/crypto/README.md +++ b/pkg/lzkit/crypto/README.md @@ -25,7 +25,7 @@ ```go import ( "fmt" - "tydata-server/pkg/lzkit/crypto" + "qnc-server/pkg/lzkit/crypto" ) func encryptMobileExample() { diff --git a/pkg/lzkit/md5/example_test.go b/pkg/lzkit/md5/example_test.go index 26a5e96..ffbd961 100644 --- a/pkg/lzkit/md5/example_test.go +++ b/pkg/lzkit/md5/example_test.go @@ -3,7 +3,7 @@ package md5_test import ( "fmt" "log" - "tydata-server/pkg/lzkit/md5" + "qnc-server/pkg/lzkit/md5" ) func Example() {